From kwrobot at kitware.com  Thu Oct  1 00:01:09 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu,  1 Oct 2015 00:01:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1366-gab99010
Message-ID: <20151001040109.4F817BF27C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  ab99010a34fe88a81b6560f53ee5f18af6e33d8b (commit)
      from  5c50b396865c2fbd61cf43c5c4c287113208f32c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab99010a34fe88a81b6560f53ee5f18af6e33d8b
commit ab99010a34fe88a81b6560f53ee5f18af6e33d8b
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Oct 1 00:01:06 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 1 00:01:06 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a70f763..3fc74d8 100644
--- 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 3)
-set(CMake_VERSION_PATCH 20150930)
+set(CMake_VERSION_PATCH 20151001)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 09:02:21 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 09:02:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3421-g60e17b8
Message-ID: <20151001130221.B82BBBF831@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  60e17b88cf7896c5ccb444974dfaa26fd3025da1 (commit)
       via  45c06c1d13f6317fe18e35dc0ae3d9fefdea77f1 (commit)
       via  b6b35d0b64b0112f70d493f779abcae404e534b3 (commit)
       via  6653b235a7c9d16f77d9edf334888b8f23cf9e49 (commit)
       via  0ebdf64d138ce3061d128edd7a55c6dd31668bc7 (commit)
      from  b82ae22bf8d81ce4abfe340c52fdde41e9fe3776 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60e17b88cf7896c5ccb444974dfaa26fd3025da1
commit 60e17b88cf7896c5ccb444974dfaa26fd3025da1
Merge: b82ae22 45c06c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:02:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 09:02:19 2015 -0400

    Merge topic 'vs-win10-sdk' into next
    
    45c06c1d VS: Add support for selecting the Windows 10 SDK
    b6b35d0b VS: Add hook to initialize Windows platform settings
    6653b235 Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME
    0ebdf64d cmSystemTools: Add VersionCompareGreater helper


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45c06c1d13f6317fe18e35dc0ae3d9fefdea77f1
commit 45c06c1d13f6317fe18e35dc0ae3d9fefdea77f1
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Sep 30 13:22:43 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:01:42 2015 -0400

    VS: Add support for selecting the Windows 10 SDK
    
    Teach the VS 2015 generator to produce a WindowsTargetPlatformVersion
    value.  Use the CMAKE_SYSTEM_VERSION to specify the version and if not
    set choose a default based on available SDKs.  Activate this behavior
    when targeting Windows 10.
    
    Co-Author: Brad King <brad.king at kitware.com>

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 635db00..2116900 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -82,6 +82,7 @@ Variables that Provide Information
    /variable/CMAKE_VS_NsightTegra_VERSION
    /variable/CMAKE_VS_PLATFORM_NAME
    /variable/CMAKE_VS_PLATFORM_TOOLSET
+   /variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
    /variable/CMAKE_XCODE_PLATFORM_TOOLSET
    /variable/PROJECT_BINARY_DIR
    /variable/PROJECT-NAME_BINARY_DIR
diff --git a/Help/release/dev/vs-win10-sdk.rst b/Help/release/dev/vs-win10-sdk.rst
new file mode 100644
index 0000000..50eb391
--- /dev/null
+++ b/Help/release/dev/vs-win10-sdk.rst
@@ -0,0 +1,6 @@
+vs-win10-sdk
+------------
+
+* The :generator:`Visual Studio 14 2015` generator learned to select
+  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
+  variable and the SDKs available on the host.
diff --git a/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst b/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
new file mode 100644
index 0000000..6392849
--- /dev/null
+++ b/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
@@ -0,0 +1,11 @@
+CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
+----------------------------------------
+
+Visual Studio Windows Target Platform Version.
+
+When targeting Windows 10 and above Visual Studio 2015 and above support
+specification of a target Windows version to select a corresponding SDK.
+The :variable:`CMAKE_SYSTEM_VERSION` variable may be set to specify a
+version.  Otherwise CMake computes a default version based on the Windows
+SDK versions available.  The chosen Windows target version number is provided
+in ``CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION``.
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index df6daf3..81c2509 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -209,6 +209,9 @@ Id flags: ${testflags}
     else()
       set(id_system_version "")
     endif()
+    if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION)
+      set(id_WindowsTargetPlatformVersion "<WindowsTargetPlatformVersion>${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}</WindowsTargetPlatformVersion>")
+    endif()
     if(id_platform STREQUAL ARM)
       set(id_WindowsSDKDesktopARMSupport "<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>")
     else()
diff --git a/Modules/CompilerId/VS-10.vcxproj.in b/Modules/CompilerId/VS-10.vcxproj.in
index a17d03d..2870a11 100644
--- a/Modules/CompilerId/VS-10.vcxproj.in
+++ b/Modules/CompilerId/VS-10.vcxproj.in
@@ -12,6 +12,7 @@
     <Keyword>Win32Proj</Keyword>
     @id_system@
     @id_system_version@
+    @id_WindowsTargetPlatformVersion@
     @id_WindowsSDKDesktopARMSupport@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 49c5616..f4861dc 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -74,6 +74,10 @@ public:
   /** Return the CMAKE_SYSTEM_VERSION.  */
   std::string const& GetSystemVersion() const { return this->SystemVersion; }
 
+  /** Return the Windows version targeted on VS 2015 and above.  */
+  std::string const& GetWindowsTargetPlatformVersion() const
+    { return this->WindowsTargetPlatformVersion; }
+
   /** Return true if building for WindowsCE */
   bool TargetsWindowsCE() const
     { return this->SystemIsWindowsCE; }
@@ -120,6 +124,7 @@ protected:
 
   std::string GeneratorToolset;
   std::string DefaultPlatformToolset;
+  std::string WindowsTargetPlatformVersion;
   std::string SystemName;
   std::string SystemVersion;
   std::string NsightTegraVersion;
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index d73eedf..74679d8 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -111,6 +111,34 @@ cmGlobalVisualStudio14Generator::MatchesGeneratorName(
 }
 
 //----------------------------------------------------------------------------
+bool cmGlobalVisualStudio14Generator::InitializeWindows(cmMakefile* mf)
+{
+  if (cmHasLiteralPrefix(this->SystemVersion, "10.0"))
+    {
+    return this->SelectWindows10SDK(mf);
+    }
+  return true;
+}
+
+//----------------------------------------------------------------------------
+bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf)
+{
+  // Find the default version of the Windows 10 SDK.
+  this->WindowsTargetPlatformVersion = this->GetWindows10SDKVersion();
+  if (this->WindowsTargetPlatformVersion.empty())
+    {
+    std::ostringstream  e;
+    e << "Could not find an appropriate version of the Windows 10 SDK"
+      << " installed on this machine";
+    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    return false;
+    }
+  mf->AddDefinition("CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION",
+                    this->WindowsTargetPlatformVersion.c_str());
+  return true;
+}
+
+//----------------------------------------------------------------------------
 void cmGlobalVisualStudio14Generator::WriteSLNHeader(std::ostream& fout)
 {
   // Visual Studio 14 writes .sln format 12.00
@@ -137,3 +165,55 @@ cmGlobalVisualStudio14Generator::IsWindowsDesktopToolsetInstalled() const
   return cmSystemTools::GetRegistrySubKeys(desktop10Key,
     vc14, cmSystemTools::KeyWOW64_32);
 }
+
+//----------------------------------------------------------------------------
+std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
+{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  // This logic is taken from the vcvarsqueryregistry.bat file from VS2015
+  // Try HKLM and then HKCU.
+  std::string win10Root;
+  if (!cmSystemTools::ReadRegistryValue(
+        "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+        "Windows Kits\\Installed Roots;KitsRoot10", win10Root,
+        cmSystemTools::KeyWOW64_32) &&
+      !cmSystemTools::ReadRegistryValue(
+        "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\"
+        "Windows Kits\\Installed Roots;KitsRoot10", win10Root,
+        cmSystemTools::KeyWOW64_32))
+    {
+    return std::string();
+    }
+
+  std::vector<std::string> sdks;
+  std::string path = win10Root + "Include/*";
+  // Grab the paths of the different SDKs that are installed
+  cmSystemTools::GlobDirs(path, sdks);
+  if (!sdks.empty())
+    {
+    // Only use the filename, which will be the SDK version.
+    for (std::vector<std::string>::iterator i = sdks.begin();
+         i != sdks.end(); ++i)
+      {
+      *i = cmSystemTools::GetFilenameName(*i);
+      }
+
+    // Sort the results to make sure we select the most recent one that
+    // has a version less or equal to our version of the operating system
+    std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
+
+    for (std::vector<std::string>::iterator i = sdks.begin();
+         i != sdks.end(); ++i)
+      {
+      // Find the SDK less or equal to our specified version
+      if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
+        {
+        // This is the most recent SDK that we can run safely
+        return *i;
+        }
+      }
+    }
+#endif
+  // Return an empty string
+  return std::string();
+}
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index 02c6274..fcade85 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -30,12 +30,16 @@ public:
 
   virtual const char* GetToolsVersion() { return "14.0"; }
 protected:
+  virtual bool InitializeWindows(cmMakefile* mf);
   virtual const char* GetIDEVersion() { return "14.0"; }
+  virtual bool SelectWindows10SDK(cmMakefile* mf);
 
   // Used to verify that the Desktop toolset for the current generator is
   // installed on the machine.
   virtual bool IsWindowsDesktopToolsetInstalled() const;
 
+  std::string GetWindows10SDKVersion();
+
 private:
   class Factory;
 };
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6c71313..91f2476 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3006,6 +3006,8 @@ IsXamlSource(const std::string& sourceFile)
 
 void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
 {
+  cmGlobalVisualStudio10Generator* gg =
+    static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
   bool isAppContainer = false;
   bool const isWindowsPhone = this->GlobalGenerator->TargetsWindowsPhone();
   bool const isWindowsStore = this->GlobalGenerator->TargetsWindowsStore();
@@ -3062,6 +3064,14 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     this->WriteString("<WindowsSDKDesktopARMSupport>true"
                       "</WindowsSDKDesktopARMSupport>\n", 2);
     }
+  std::string const& targetPlatformVersion =
+    gg->GetWindowsTargetPlatformVersion();
+  if (!targetPlatformVersion.empty())
+    {
+    this->WriteString("<WindowsTargetPlatformVersion>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
+      "</WindowsTargetPlatformVersion>\n";
+    }
 }
 
 void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6b35d0b64b0112f70d493f779abcae404e534b3
commit b6b35d0b64b0112f70d493f779abcae404e534b3
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Sep 23 14:27:07 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 08:53:37 2015 -0400

    VS: Add hook to initialize Windows platform settings
    
    Give VS 10+ generators a chance to choose Windows platform settings just
    as they already can for WindowsCE, WindowsStore, and WindowsPhone.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 44d632d..59e8f8c 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -176,7 +176,14 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts,
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
 {
-  if (this->SystemName == "WindowsCE")
+  if (this->SystemName == "Windows")
+    {
+    if (!this->InitializeWindows(mf))
+      {
+      return false;
+      }
+    }
+  else if (this->SystemName == "WindowsCE")
     {
     this->SystemIsWindowsCE = true;
     if (!this->InitializeWindowsCE(mf))
@@ -184,7 +191,7 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
       return false;
       }
     }
-  else if(this->SystemName == "WindowsPhone")
+  else if (this->SystemName == "WindowsPhone")
     {
     this->SystemIsWindowsPhone = true;
     if(!this->InitializeWindowsPhone(mf))
@@ -192,7 +199,7 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
       return false;
       }
     }
-  else if(this->SystemName == "WindowsStore")
+  else if (this->SystemName == "WindowsStore")
     {
     this->SystemIsWindowsStore = true;
     if(!this->InitializeWindowsStore(mf))
@@ -229,6 +236,12 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
 }
 
 //----------------------------------------------------------------------------
+bool cmGlobalVisualStudio10Generator::InitializeWindows(cmMakefile*)
+{
+  return true;
+}
+
+//----------------------------------------------------------------------------
 bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf)
 {
   if (this->DefaultPlatformName != "Win32")
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 8de7b09..49c5616 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -105,6 +105,7 @@ public:
 protected:
   virtual void Generate();
   virtual bool InitializeSystem(cmMakefile* mf);
+  virtual bool InitializeWindows(cmMakefile* mf);
   virtual bool InitializeWindowsCE(cmMakefile* mf);
   virtual bool InitializeWindowsPhone(cmMakefile* mf);
   virtual bool InitializeWindowsStore(cmMakefile* mf);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6653b235a7c9d16f77d9edf334888b8f23cf9e49
commit 6653b235a7c9d16f77d9edf334888b8f23cf9e49
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Sep 23 14:27:07 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 08:53:36 2015 -0400

    Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME
    
    Teach CMakeDetermineSystem to check for a CMAKE_SYSTEM_VERSION setting
    even when CMAKE_SYSTEM_NAME is not set.  This will allow builds on the
    host OS to target other versions of the OS without full cross-compiling.

diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index fa14641..d9f7579 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -123,7 +123,9 @@ elseif(CMAKE_VS_WINCE_VERSION)
   set(PRESET_CMAKE_SYSTEM_NAME TRUE)
 else()
   set(CMAKE_SYSTEM_NAME      "${CMAKE_HOST_SYSTEM_NAME}")
-  set(CMAKE_SYSTEM_VERSION   "${CMAKE_HOST_SYSTEM_VERSION}")
+  if(NOT DEFINED CMAKE_SYSTEM_VERSION)
+    set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
+  endif()
   set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}")
   set(CMAKE_CROSSCOMPILING FALSE)
   set(PRESET_CMAKE_SYSTEM_NAME FALSE)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ebdf64d138ce3061d128edd7a55c6dd31668bc7
commit 0ebdf64d138ce3061d128edd7a55c6dd31668bc7
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Sep 30 13:22:43 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 08:53:36 2015 -0400

    cmSystemTools: Add VersionCompareGreater helper
    
    Wrap a call to VersionCompare with OP_GREATER in a signature suitable
    for use with std::sort.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index d3c1f16..a031da5 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2777,6 +2777,14 @@ bool cmSystemTools::VersionCompare(cmSystemTools::CompareOp op,
 }
 
 //----------------------------------------------------------------------------
+bool cmSystemTools::VersionCompareGreater(std::string const& lhs,
+                                          std::string const& rhs)
+{
+  return cmSystemTools::VersionCompare(
+    cmSystemTools::CompareOp::OP_GREATER, lhs.c_str(), rhs.c_str());
+}
+
+//----------------------------------------------------------------------------
 bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg,
                                 bool* removed)
 {
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index e88170a..b6b0978 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -294,6 +294,8 @@ public:
    * Compare versions
    */
   static bool VersionCompare(CompareOp op, const char* lhs, const char* rhs);
+  static bool VersionCompareGreater(std::string const& lhs,
+                                    std::string const& rhs);
 
   /**
    * Determine the file type based on the extension

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-variables.7.rst                  |    1 +
 Help/release/dev/vs-win10-sdk.rst                  |    6 ++
 .../CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst   |   11 +++
 Modules/CMakeDetermineCompilerId.cmake             |    3 +
 Modules/CMakeDetermineSystem.cmake                 |    4 +-
 Modules/CompilerId/VS-10.vcxproj.in                |    1 +
 Source/cmGlobalVisualStudio10Generator.cxx         |   19 ++++-
 Source/cmGlobalVisualStudio10Generator.h           |    6 ++
 Source/cmGlobalVisualStudio14Generator.cxx         |   80 ++++++++++++++++++++
 Source/cmGlobalVisualStudio14Generator.h           |    4 +
 Source/cmSystemTools.cxx                           |    8 ++
 Source/cmSystemTools.h                             |    2 +
 Source/cmVisualStudio10TargetGenerator.cxx         |   10 +++
 13 files changed, 151 insertions(+), 4 deletions(-)
 create mode 100644 Help/release/dev/vs-win10-sdk.rst
 create mode 100644 Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 09:47:23 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 09:47:23 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3426-gbf7a609
Message-ID: <20151001134723.425E2BF2F5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  bf7a609459b8dcbfb59b4da57c7cbe1787a56c6a (commit)
       via  bd0cb84c06f325439c32fe0dee4e05452d0f4cb6 (commit)
       via  8bdbd3e1b740e34fc7e68120536fb5c8f1deedee (commit)
       via  b5979e9168a0a965c0e29785c487784d978af9c2 (commit)
       via  c326dc92fc6677df1d8e7ed345356a5001accd0e (commit)
      from  60e17b88cf7896c5ccb444974dfaa26fd3025da1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf7a609459b8dcbfb59b4da57c7cbe1787a56c6a
commit bf7a609459b8dcbfb59b4da57c7cbe1787a56c6a
Merge: 60e17b8 bd0cb84
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:47:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 09:47:22 2015 -0400

    Merge topic 'cpack-tests-fix' into next
    
    bd0cb84c Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* tests
    8bdbd3e1 Tests: Add trailing newlines to generated sources in RunCMake.CPack_* tests
    b5979e91 fixup! CPack: fix TGZ test missing compiler errors
    c326dc92 fixup! CPack: fix TGZ test missing compiler errors


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd0cb84c06f325439c32fe0dee4e05452d0f4cb6
commit bd0cb84c06f325439c32fe0dee4e05452d0f4cb6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:38:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:38:46 2015 -0400

    Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* tests
    
    The DEPENDENCIES test case uses install(TARGETS) and so generates a warning:
    
     CMake Warning in CMakeLists.txt:
       WARNING: Target "test_prog" has runtime paths which cannot be changed
       during install.  To change runtime paths, OS X version 10.6 or newer is
       required.  Therefore, runtime paths will not be changed when installing.
       CMAKE_BUILD_WITH_INSTALL_RPATH may be used to work around this limitation.
    
    Set CMAKE_BUILD_WITH_INSTALL_RPATH to avoid the warning since we do not
    need to run the binaries from the build tree anyway.

diff --git a/Tests/RunCMake/CPack/DEPENDENCIES.cmake b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
index 8a0ba35..4f6d65f 100644
--- a/Tests/RunCMake/CPack/DEPENDENCIES.cmake
+++ b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
@@ -1,3 +1,5 @@
+set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
+
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
     "int test_lib();\n")
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bdbd3e1b740e34fc7e68120536fb5c8f1deedee
commit 8bdbd3e1b740e34fc7e68120536fb5c8f1deedee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:27:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:29:28 2015 -0400

    Tests: Add trailing newlines to generated sources in RunCMake.CPack_* tests
    
    This avoids compiler warnings on stderr while building them.

diff --git a/Tests/RunCMake/CPack/DEPENDENCIES.cmake b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
index 0aef925..8a0ba35 100644
--- a/Tests/RunCMake/CPack/DEPENDENCIES.cmake
+++ b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
@@ -1,11 +1,11 @@
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
-    "int test_lib();")
+    "int test_lib();\n")
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp"
-    "#include \"test_lib.hpp\"\nint test_lib() {return 0;}")
+    "#include \"test_lib.hpp\"\nint test_lib() {return 0;}\n")
 add_library(test_lib SHARED "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp")
 
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp"
-    "#include \"test_lib.hpp\"\nint main() {return test_lib();}")
+    "#include \"test_lib.hpp\"\nint main() {return test_lib();}\n")
 add_executable(test_prog "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
 target_link_libraries(test_prog test_lib)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5979e9168a0a965c0e29785c487784d978af9c2
commit b5979e9168a0a965c0e29785c487784d978af9c2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:26:30 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:29:21 2015 -0400

    fixup! CPack: fix TGZ test missing compiler errors
    
    Use run_cmake_command wrapper.

diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 153ff50..aef1086 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -10,14 +10,12 @@ function(run_cpack_test TEST_NAME types build)
     file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
     # execute cmake
-    unset(RunCMake_TEST_COMMAND)
     set(RunCMake_TEST_OPTIONS "-DGENERATOR_TYPE=${TEST_TYPE}")
     run_cmake(${TEST_NAME})
 
     # execute optional build step
     if(build)
-      set(RunCMake_TEST_COMMAND "${CMAKE_COMMAND}" --build "${RunCMake_TEST_BINARY_DIR}")
-      run_cmake(${TEST_NAME})
+      run_cmake_command(${TEST_NAME}-Build "${CMAKE_COMMAND}" --build "${RunCMake_TEST_BINARY_DIR}")
     endif()
 
     # execute cpack

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c326dc92fc6677df1d8e7ed345356a5001accd0e
commit c326dc92fc6677df1d8e7ed345356a5001accd0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:25:25 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:25:27 2015 -0400

    fixup! CPack: fix TGZ test missing compiler errors
    
    We know the CMAKE_COMMAND is always available.

diff --git a/Tests/RunCMake/CPack/TGZ/Helpers.cmake b/Tests/RunCMake/CPack/TGZ/Helpers.cmake
index 4ce2590..f14d532 100644
--- a/Tests/RunCMake/CPack/TGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/TGZ/Helpers.cmake
@@ -1,7 +1,7 @@
 set(ALL_FILES_GLOB "*.tar.gz")
 
 function(getPackageContent FILE RESULT_VAR)
-  execute_process(COMMAND ${TAR_EXECUTABLE} -ztvf ${FILE}
+  execute_process(COMMAND ${CMAKE_COMMAND} -E tar -ztvf ${FILE}
           OUTPUT_VARIABLE package_content_
           ERROR_QUIET
           OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake b/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
index c244984..dbaf682 100644
--- a/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
+++ b/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
@@ -1,4 +1,4 @@
 function(get_test_prerequirements found_var config_file)
-  file(WRITE "${config_file}" "set(TAR_EXECUTABLE \"${CMAKE_COMMAND}\" -E tar)")
+  file(WRITE "${config_file}" "")
   set(${found_var} true PARENT_SCOPE)
 endfunction()

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/CPack/CPackTestHelpers.cmake    |    4 +---
 Tests/RunCMake/CPack/DEPENDENCIES.cmake        |    8 +++++---
 Tests/RunCMake/CPack/TGZ/Helpers.cmake         |    2 +-
 Tests/RunCMake/CPack/TGZ/Prerequirements.cmake |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 09:50:01 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 09:50:01 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3430-gadce44b
Message-ID: <20151001135002.01401BF3EB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  adce44b9f9b85b5cf7ccaa5b25d1088925845180 (commit)
       via  1b13af46accba6ed73bf2975221def388cd5e90d (commit)
       via  981068b79f3703a095f5aa254da6c7d3f997a265 (commit)
       via  e8954d0b3b6f7b29a00ec0238fc91d84021f0705 (commit)
      from  bf7a609459b8dcbfb59b4da57c7cbe1787a56c6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adce44b9f9b85b5cf7ccaa5b25d1088925845180
commit adce44b9f9b85b5cf7ccaa5b25d1088925845180
Merge: bf7a609 1b13af4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:50:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 09:50:01 2015 -0400

    Merge topic 'cpack-tests-fix' into next
    
    1b13af46 Tests: Fix RunCMake.CPack_* tests to use proper CMake generator
    981068b7 Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* tests
    e8954d0b Tests: Add trailing newlines to generated sources in RunCMake.CPack_* tests


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b13af46accba6ed73bf2975221def388cd5e90d
commit 1b13af46accba6ed73bf2975221def388cd5e90d
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Sep 30 22:13:12 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:48:04 2015 -0400

    Tests: Fix RunCMake.CPack_* tests to use proper CMake generator
    
    Use the run_cmake() function to generate the test build tree with
    the proper CMake generator and also to verify that it succeeds.
    Drop our PreTestError helper as it is no longer needed.

diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 7ea2a24..aef1086 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -10,47 +10,12 @@ function(run_cpack_test TEST_NAME types build)
     file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
 
     # execute cmake
-    execute_process(
-      COMMAND "${CMAKE_COMMAND}" -DRunCMake_TEST=${TEST_NAME}
-          -DGENERATOR_TYPE=${TEST_TYPE} "${RunCMake_SOURCE_DIR}"
-      WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}"
-      RESULT_VARIABLE res
-      OUTPUT_FILE "${RunCMake_TEST_BINARY_DIR}/test_output.txt"
-      ERROR_FILE "${RunCMake_TEST_BINARY_DIR}/test_error.txt"
-      )
-
-    if(res)
-      run_cmake_command(
-        ${TEST_TYPE}/${TEST_NAME}
-        "${CMAKE_COMMAND}"
-          -DRunCMake_TEST_STEP=configure
-          -Dreturn_code=${res}
-          "-Dbin_dir=${RunCMake_TEST_BINARY_DIR}"
-          -P "${RunCMake_SOURCE_DIR}/PreTestError.cmake"
-        )
-      return()
-    endif()
+    set(RunCMake_TEST_OPTIONS "-DGENERATOR_TYPE=${TEST_TYPE}")
+    run_cmake(${TEST_NAME})
 
     # execute optional build step
     if(build)
-      execute_process(
-        COMMAND "${CMAKE_COMMAND}" --build "${RunCMake_TEST_BINARY_DIR}"
-        RESULT_VARIABLE res
-        OUTPUT_FILE "${RunCMake_TEST_BINARY_DIR}/test_output.txt"
-        ERROR_FILE "${RunCMake_TEST_BINARY_DIR}/test_error.txt"
-        )
-    endif()
-
-    if(res)
-      run_cmake_command(
-        ${TEST_TYPE}/${TEST_NAME}
-        "${CMAKE_COMMAND}"
-          -DRunCMake_TEST_STEP=build
-          -Dreturn_code=${res}
-          "-Dbin_dir=${RunCMake_TEST_BINARY_DIR}"
-          -P "${RunCMake_SOURCE_DIR}/PreTestError.cmake"
-        )
-      return()
+      run_cmake_command(${TEST_NAME}-Build "${CMAKE_COMMAND}" --build "${RunCMake_TEST_BINARY_DIR}")
     endif()
 
     # execute cpack
diff --git a/Tests/RunCMake/CPack/PreTestError.cmake b/Tests/RunCMake/CPack/PreTestError.cmake
deleted file mode 100644
index f88f2e8..0000000
--- a/Tests/RunCMake/CPack/PreTestError.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-file(READ "${bin_dir}/test_output.txt" output)
-file(READ "${bin_dir}/test_error.txt" error)
-
-message(FATAL_ERROR "Error in pre-test phase '${RunCMake_TEST_STEP}'!\n"
-        "Return code: '${return_code}'\n"
-        "Info output: '${output}'\n"
-        "Error output: '${error}'")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=981068b79f3703a095f5aa254da6c7d3f997a265
commit 981068b79f3703a095f5aa254da6c7d3f997a265
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:38:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:47:41 2015 -0400

    Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* tests
    
    The DEPENDENCIES test case uses install(TARGETS) and so generates a warning:
    
     CMake Warning in CMakeLists.txt:
       WARNING: Target "test_prog" has runtime paths which cannot be changed
       during install.  To change runtime paths, OS X version 10.6 or newer is
       required.  Therefore, runtime paths will not be changed when installing.
       CMAKE_BUILD_WITH_INSTALL_RPATH may be used to work around this limitation.
    
    Set CMAKE_BUILD_WITH_INSTALL_RPATH to avoid the warning since we do not
    need to run the binaries from the build tree anyway.

diff --git a/Tests/RunCMake/CPack/DEPENDENCIES.cmake b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
index 8a0ba35..4f6d65f 100644
--- a/Tests/RunCMake/CPack/DEPENDENCIES.cmake
+++ b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
@@ -1,3 +1,5 @@
+set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
+
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
     "int test_lib();\n")
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8954d0b3b6f7b29a00ec0238fc91d84021f0705
commit e8954d0b3b6f7b29a00ec0238fc91d84021f0705
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:27:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:47:41 2015 -0400

    Tests: Add trailing newlines to generated sources in RunCMake.CPack_* tests
    
    This avoids compiler warnings on stderr while building them.

diff --git a/Tests/RunCMake/CPack/DEPENDENCIES.cmake b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
index 0aef925..8a0ba35 100644
--- a/Tests/RunCMake/CPack/DEPENDENCIES.cmake
+++ b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
@@ -1,11 +1,11 @@
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
-    "int test_lib();")
+    "int test_lib();\n")
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp"
-    "#include \"test_lib.hpp\"\nint test_lib() {return 0;}")
+    "#include \"test_lib.hpp\"\nint test_lib() {return 0;}\n")
 add_library(test_lib SHARED "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp")
 
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp"
-    "#include \"test_lib.hpp\"\nint main() {return test_lib();}")
+    "#include \"test_lib.hpp\"\nint main() {return test_lib();}\n")
 add_executable(test_prog "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
 target_link_libraries(test_prog test_lib)
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 09:56:18 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 09:56:18 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3432-g0b741be
Message-ID: <20151001135618.A6357BF5EE@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0b741bec4266a6507cd56f2f12cf743499df627b (commit)
       via  18a4a742d0a8e27f765070ab837c395d69a72959 (commit)
      from  adce44b9f9b85b5cf7ccaa5b25d1088925845180 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b741bec4266a6507cd56f2f12cf743499df627b
commit 0b741bec4266a6507cd56f2f12cf743499df627b
Merge: adce44b 18a4a74
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:56:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 09:56:18 2015 -0400

    Merge topic 'vs-win10-sdk' into next
    
    18a4a742 fixup! cmSystemTools: Add VersionCompareGreater helper


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18a4a742d0a8e27f765070ab837c395d69a72959
commit 18a4a742d0a8e27f765070ab837c395d69a72959
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:54:26 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:55:33 2015 -0400

    fixup! cmSystemTools: Add VersionCompareGreater helper

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index a031da5..2c5aa8a 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2781,7 +2781,7 @@ bool cmSystemTools::VersionCompareGreater(std::string const& lhs,
                                           std::string const& rhs)
 {
   return cmSystemTools::VersionCompare(
-    cmSystemTools::CompareOp::OP_GREATER, lhs.c_str(), rhs.c_str());
+    cmSystemTools::OP_GREATER, lhs.c_str(), rhs.c_str());
 }
 
 //----------------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:
 Source/cmSystemTools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 10:28:21 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 10:28:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3434-g399b5bf
Message-ID: <20151001142822.C4038BF91D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  399b5bfd37b1fcd48e566cb7c8908333b6cc1dc8 (commit)
       via  85d7a610a2a5e5f82a8e4b3e1322c54e27862633 (commit)
      from  0b741bec4266a6507cd56f2f12cf743499df627b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=399b5bfd37b1fcd48e566cb7c8908333b6cc1dc8
commit 399b5bfd37b1fcd48e566cb7c8908333b6cc1dc8
Merge: 0b741be 85d7a61
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 10:28:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 10:28:20 2015 -0400

    Merge topic 'test-FindPackageModeMakefileTest-flags' into next
    
    85d7a610 Tests: Use consistent C++ flags FindPackageModeMakefileTest


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85d7a610a2a5e5f82a8e4b3e1322c54e27862633
commit 85d7a610a2a5e5f82a8e4b3e1322c54e27862633
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 10:20:34 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 10:26:55 2015 -0400

    Tests: Use consistent C++ flags FindPackageModeMakefileTest
    
    Rather than using the CXXFLAGS environment variable in the make-only
    build, copy the CMAKE_CXX_FLAGS used to build the files on the CMake
    side.  This will account for any changes made by CompileFlags.cmake
    or cache-provided flags.

diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in
index e4df9d6..8e7ff72 100644
--- a/Tests/FindPackageModeMakefileTest/Makefile.in
+++ b/Tests/FindPackageModeMakefileTest/Makefile.in
@@ -4,6 +4,7 @@ include cmakeExecutable.mk
 CMAKE_CURRENT_BINARY_DIR = "@CMAKE_CURRENT_BINARY_DIR@"
 CMAKE_CXX_COMPILER = "@CMAKE_CXX_COMPILER@"
 CMAKE_CXX_COMPILER_ID = "@CMAKE_CXX_COMPILER_ID@"
+CMAKE_CXX_FLAGS = @CMAKE_CXX_FLAGS@
 
 CMAKE_FOO = $(CMAKE) --find-package -DCMAKE_MODULE_PATH=$(CMAKE_CURRENT_BINARY_DIR) -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=$(CMAKE_CXX_COMPILER_ID)
 
@@ -14,7 +15,7 @@ all: pngtest
 main.o: clean main.cpp
 	@$(CMAKE_FOO) -DMODE=COMPILE >$(tmp)
 	@foo="`cat $(tmp)`"; \
-	 printf '"%s" %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CXXFLAGS)" "$$foo" >$(tmp)
+	 printf '"%s" %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$$foo" >$(tmp)
 	@cat $(tmp)
 	@sh $(tmp)
 	@rm -f $(tmp)
@@ -22,7 +23,7 @@ main.o: clean main.cpp
 pngtest: main.o
 	@$(CMAKE_FOO) -DMODE=LINK >$(tmp)
 	@foo="`cat $(tmp)`"; \
-	 printf '"%s" %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CXXFLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
+	 printf '"%s" %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
 	@cat $(tmp)
 	@sh $(tmp)
 	@rm -f $(tmp)

-----------------------------------------------------------------------

Summary of changes:
 Tests/FindPackageModeMakefileTest/Makefile.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 10:52:38 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 10:52:38 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3436-gaaa4be4
Message-ID: <20151001145238.DB3F5BF583@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  aaa4be441968ee9e6344e182ef7e0f8e081f9b34 (commit)
       via  7bc202ccd49b42eacac78d7494f7aab0599f9c7b (commit)
      from  399b5bfd37b1fcd48e566cb7c8908333b6cc1dc8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaa4be441968ee9e6344e182ef7e0f8e081f9b34
commit aaa4be441968ee9e6344e182ef7e0f8e081f9b34
Merge: 399b5bf 7bc202c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 10:52:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 10:52:38 2015 -0400

    Merge topic 'test-VSGNUFortran-oracle-link' into next
    
    7bc202cc Tests: Simplify VSGNUFortran Oracle-specific link lines


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bc202ccd49b42eacac78d7494f7aab0599f9c7b
commit 7bc202ccd49b42eacac78d7494f7aab0599f9c7b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 10:48:38 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 10:48:38 2015 -0400

    Tests: Simplify VSGNUFortran Oracle-specific link lines
    
    On an Oracle 12.4 build the c_using_fortran executable cannot find the
    "fsu" library at runtime.  Since this is an implementation detail of the
    "hello" library, link that library to it privately so that "-lfsu" does
    not propagate to the executables consuming it.

diff --git a/Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt b/Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt
index 3ee1855..f68e38e 100644
--- a/Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt
+++ b/Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt
@@ -35,12 +35,12 @@ add_library(hello SHARED hello.f)
 add_library(world SHARED world.f)
 target_link_libraries(hello world)
 if(CMAKE_Fortran_COMPILER_ID MATCHES SunPro)
-  target_link_libraries(hello fsu)
+  target_link_libraries(hello PRIVATE fsu)
   if(CMAKE_Fortran_PLATFORM_ID MATCHES SunOS)
-    target_link_libraries(hello sunmath m)
+    target_link_libraries(hello PRIVATE sunmath m)
     test_sunquad(CMAKE_HAS_SUNQUAD)
     if(CMAKE_HAS_SUNQUAD)
-      target_link_libraries(hello sunquad)
+      target_link_libraries(hello PRIVATE sunquad)
     endif()
   endif()
 endif()

-----------------------------------------------------------------------

Summary of changes:
 Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 11:02:36 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 11:02:36 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1369-g5303c18
Message-ID: <20151001150237.294CDBF94A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  5303c187b1f741afe076aa3eaaceade086c22a53 (commit)
       via  f90acf522b1a03af9b5a7bea1d3f50285504fce8 (commit)
       via  e67e0155d9dfbcf9691b0863978b441545a89565 (commit)
      from  ab99010a34fe88a81b6560f53ee5f18af6e33d8b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5303c187b1f741afe076aa3eaaceade086c22a53
commit 5303c187b1f741afe076aa3eaaceade086c22a53
Merge: ab99010 f90acf5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 11:02:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 11:02:34 2015 -0400

    Merge topic 'fix-warnings'
    
    f90acf52 cmVisualStudio10TargetGenerator: Fix unsigned integer constant type
    e67e0155 cmMakefile: Avoid name conflict with Solaris global typedef


-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx                      |    4 ++--
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 11:02:39 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 11:02:39 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1372-g59202e1
Message-ID: <20151001150240.515A2BF58E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  59202e17ffe6925fab182df45d8d37aef6460ddc (commit)
       via  8b4873a1b025d7f47c90f3cafc93ca152b9e4652 (commit)
       via  e90f463a312e18fd6498799de1522b96d84fd012 (commit)
      from  5303c187b1f741afe076aa3eaaceade086c22a53 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59202e17ffe6925fab182df45d8d37aef6460ddc
commit 59202e17ffe6925fab182df45d8d37aef6460ddc
Merge: 5303c18 8b4873a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 11:02:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 11:02:38 2015 -0400

    Merge topic 'compiler-links-statically'
    
    8b4873a1 Disable shared library support when compiler links statically
    e90f463a Drop executable symbol export if platform does not support shared libs


-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeCCompiler.cmake.in        |    1 +
 Modules/CMakeCInformation.cmake        |    4 ++++
 Modules/CMakeCXXCompiler.cmake.in      |    1 +
 Modules/CMakeCXXInformation.cmake      |    4 ++++
 Modules/CMakeDetermineCompilerId.cmake |    8 ++++++++
 Modules/CMakeFortranCompiler.cmake.in  |    1 +
 Modules/CMakeFortranInformation.cmake  |    4 ++++
 Source/cmLocalGenerator.cxx            |    4 +++-
 8 files changed, 26 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 11:02:58 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 11:02:58 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3440-g1f5436a
Message-ID: <20151001150258.C494ABF94D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1f5436a61959cfe5b0a2dbf979691e1d21e6776c (commit)
       via  59202e17ffe6925fab182df45d8d37aef6460ddc (commit)
       via  5303c187b1f741afe076aa3eaaceade086c22a53 (commit)
       via  ab99010a34fe88a81b6560f53ee5f18af6e33d8b (commit)
      from  aaa4be441968ee9e6344e182ef7e0f8e081f9b34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f5436a61959cfe5b0a2dbf979691e1d21e6776c
commit 1f5436a61959cfe5b0a2dbf979691e1d21e6776c
Merge: aaa4be4 59202e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 11:02:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 11:02:52 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  1 14:12:35 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  1 Oct 2015 14:12:35 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3442-ge23d906
Message-ID: <20151001181236.0D0A6BEDF8@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e23d906921f653bc7ef6bd1f6f261851a418edd1 (commit)
       via  ec725815c9941967085c5b492e5a83305ccc490b (commit)
      from  1f5436a61959cfe5b0a2dbf979691e1d21e6776c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e23d906921f653bc7ef6bd1f6f261851a418edd1
commit e23d906921f653bc7ef6bd1f6f261851a418edd1
Merge: 1f5436a ec72581
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 14:12:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 14:12:32 2015 -0400

    Merge topic 'release-binaries-windows-cmake-path' into next
    
    ec725815 Utilities/Release: Update path to 'cmake.exe' on Windows build machine


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec725815c9941967085c5b492e5a83305ccc490b
commit ec725815c9941967085c5b492e5a83305ccc490b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 14:11:05 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 14:11:05 2015 -0400

    Utilities/Release: Update path to 'cmake.exe' on Windows build machine

diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake
index 25acc17..ecfd7c5 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -1,6 +1,6 @@
 set(CMAKE_RELEASE_DIRECTORY "c:/cygwin/home/dashboard/CMakeReleaseDirectory")
 set(CONFIGURE_WITH_CMAKE TRUE)
-set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake\\ 2.8/bin/cmake.exe")
+set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake/bin/cmake.exe")
 set(PROCESSORS 8)
 set(HOST dash2win64)
 set(CPACK_BINARY_GENERATORS "NSIS ZIP")

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/dash2win64_release.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Oct  2 00:01:08 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri,  2 Oct 2015 00:01:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1373-g02bc311
Message-ID: <20151002040108.DBF86BFA2D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  02bc311138ad8ac0c3653e836a02d54245ae4b12 (commit)
      from  59202e17ffe6925fab182df45d8d37aef6460ddc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02bc311138ad8ac0c3653e836a02d54245ae4b12
commit 02bc311138ad8ac0c3653e836a02d54245ae4b12
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Oct 2 00:01:06 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 2 00:01:06 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3fc74d8..f9eeef3 100644
--- 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 3)
-set(CMake_VERSION_PATCH 20151001)
+set(CMake_VERSION_PATCH 20151002)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 09:42:14 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 09:42:14 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3445-g6d8ad4e
Message-ID: <20151002134214.4646BBEF97@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6d8ad4e922aa85e22e5681c5ec999bffd9626b8d (commit)
       via  e1f21a06ef2c02dc5e01f91af18ba86991bfc54e (commit)
       via  852c41eac0a44c3168b6d9cedf34bbb1e354bece (commit)
      from  e23d906921f653bc7ef6bd1f6f261851a418edd1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d8ad4e922aa85e22e5681c5ec999bffd9626b8d
commit 6d8ad4e922aa85e22e5681c5ec999bffd9626b8d
Merge: e23d906 e1f21a0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:42:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 09:42:13 2015 -0400

    Merge topic 'vs-win10-sdk' into next
    
    e1f21a06 fixup! Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME
    852c41ea Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1f21a06ef2c02dc5e01f91af18ba86991bfc54e
commit e1f21a06ef2c02dc5e01f91af18ba86991bfc54e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:41:48 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:41:48 2015 -0400

    fixup! Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME

diff --git a/Help/variable/CMAKE_SYSTEM_VERSION.rst b/Help/variable/CMAKE_SYSTEM_VERSION.rst
index f388ccf..aba8ca3 100644
--- a/Help/variable/CMAKE_SYSTEM_VERSION.rst
+++ b/Help/variable/CMAKE_SYSTEM_VERSION.rst
@@ -12,6 +12,13 @@ then ``CMAKE_SYSTEM_VERSION`` is by default set to the same value as the
 :variable:`CMAKE_HOST_SYSTEM_VERSION` variable so that the build targets
 the host system version.
 
+In the case of a host build then ``CMAKE_SYSTEM_VERSION`` may be set
+explicitly when first configuring a new build tree in order to enable
+targeting the build for a different version of the host operating system
+than is actually running on the host.  This is allowed and not considered
+cross compiling so long as the binaries built for the specified OS version
+can still run on the host.
+
 System Version for Cross Compiling
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=852c41eac0a44c3168b6d9cedf34bbb1e354bece
commit 852c41eac0a44c3168b6d9cedf34bbb1e354bece
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:36:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:36:52 2015 -0400

    Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation
    
    Specify their meaning for host builds and when cross compiling.
    Sepcify their relationship in each case.

diff --git a/Help/variable/CMAKE_SYSTEM_NAME.rst b/Help/variable/CMAKE_SYSTEM_NAME.rst
index 0466da4..c3a42e5 100644
--- a/Help/variable/CMAKE_SYSTEM_NAME.rst
+++ b/Help/variable/CMAKE_SYSTEM_NAME.rst
@@ -1,8 +1,20 @@
 CMAKE_SYSTEM_NAME
 -----------------
 
-Name of the operating system CMake is building for.
+The name of the operating system for which CMake is to build.
+See the :variable:`CMAKE_SYSTEM_VERSION` variable for the OS version.
 
-This is the name of the operating system on which CMake is targeting.  This
-variable is the same as :variable:`CMAKE_HOST_SYSTEM_NAME` if you build for the
-host system instead of the target system when cross compiling.
+System Name for Host Builds
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``CMAKE_SYSTEM_NAME`` is by default set to the same value as the
+:variable:`CMAKE_HOST_SYSTEM_NAME` variable so that the build
+targets the host system.
+
+System Name for Cross Compiling
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``CMAKE_SYSTEM_NAME`` may be set explicitly when first configuring a new build
+tree in order to enable :ref:`cross compiling <Cross Compiling Toolchain>`.
+In this case the :variable:`CMAKE_SYSTEM_VERSION` variable must also be
+set explicitly.
diff --git a/Help/variable/CMAKE_SYSTEM_VERSION.rst b/Help/variable/CMAKE_SYSTEM_VERSION.rst
index 3b3cdc5..f388ccf 100644
--- a/Help/variable/CMAKE_SYSTEM_VERSION.rst
+++ b/Help/variable/CMAKE_SYSTEM_VERSION.rst
@@ -1,8 +1,21 @@
 CMAKE_SYSTEM_VERSION
 --------------------
 
-The operating system version CMake is building for.
+The version of the operating system for which CMake is to build.
+See the :variable:`CMAKE_SYSTEM_NAME` variable for the OS name.
 
-This variable is the same as :variable:`CMAKE_HOST_SYSTEM_VERSION` if
-you build for the host system instead of the target system when
-cross compiling.
+System Version for Host Builds
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When the :variable:`CMAKE_SYSTEM_NAME` variable takes its default value
+then ``CMAKE_SYSTEM_VERSION`` is by default set to the same value as the
+:variable:`CMAKE_HOST_SYSTEM_VERSION` variable so that the build targets
+the host system version.
+
+System Version for Cross Compiling
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When the :variable:`CMAKE_SYSTEM_NAME` variable is set explicitly to
+enable :ref:`cross compiling <Cross Compiling Toolchain>` then the
+value of ``CMAKE_SYSTEM_VERSION`` must also be set explicitly to specify
+the target system version.

-----------------------------------------------------------------------

Summary of changes:
 Help/variable/CMAKE_SYSTEM_NAME.rst    |   20 ++++++++++++++++----
 Help/variable/CMAKE_SYSTEM_VERSION.rst |   28 ++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 09:44:34 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 09:44:34 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3451-gacadaba
Message-ID: <20151002134434.5B5FDBF202@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  acadaba878e375554b6350b4257ee03ded5a03c9 (commit)
       via  d04e743b64e084c090b630c5bfc8c1c14ec96f1b (commit)
       via  5dfc4c5f50f3198186320320cfed699872e5ece0 (commit)
       via  61c472a287305490bef2047784d7670d8354cbf3 (commit)
       via  b31ac171a4acdc8d8eb1d08c5b5f61ec90a9dbaa (commit)
       via  70688609412421c3efa168f9c210a9e4e06a5578 (commit)
      from  6d8ad4e922aa85e22e5681c5ec999bffd9626b8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acadaba878e375554b6350b4257ee03ded5a03c9
commit acadaba878e375554b6350b4257ee03ded5a03c9
Merge: 6d8ad4e d04e743
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:44:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 09:44:33 2015 -0400

    Merge topic 'vs-win10-sdk' into next
    
    d04e743b VS: Add support for selecting the Windows 10 SDK
    5dfc4c5f VS: Add hook to initialize Windows platform settings
    61c472a2 cmSystemTools: Add VersionCompareGreater helper
    b31ac171 Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME
    70688609 Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d04e743b64e084c090b630c5bfc8c1c14ec96f1b
commit d04e743b64e084c090b630c5bfc8c1c14ec96f1b
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Sep 30 13:22:43 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:43:24 2015 -0400

    VS: Add support for selecting the Windows 10 SDK
    
    Teach the VS 2015 generator to produce a WindowsTargetPlatformVersion
    value.  Use the CMAKE_SYSTEM_VERSION to specify the version and if not
    set choose a default based on available SDKs.  Activate this behavior
    when targeting Windows 10.
    
    Co-Author: Brad King <brad.king at kitware.com>

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 635db00..2116900 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -82,6 +82,7 @@ Variables that Provide Information
    /variable/CMAKE_VS_NsightTegra_VERSION
    /variable/CMAKE_VS_PLATFORM_NAME
    /variable/CMAKE_VS_PLATFORM_TOOLSET
+   /variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
    /variable/CMAKE_XCODE_PLATFORM_TOOLSET
    /variable/PROJECT_BINARY_DIR
    /variable/PROJECT-NAME_BINARY_DIR
diff --git a/Help/release/dev/vs-win10-sdk.rst b/Help/release/dev/vs-win10-sdk.rst
new file mode 100644
index 0000000..50eb391
--- /dev/null
+++ b/Help/release/dev/vs-win10-sdk.rst
@@ -0,0 +1,6 @@
+vs-win10-sdk
+------------
+
+* The :generator:`Visual Studio 14 2015` generator learned to select
+  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
+  variable and the SDKs available on the host.
diff --git a/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst b/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
new file mode 100644
index 0000000..6392849
--- /dev/null
+++ b/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
@@ -0,0 +1,11 @@
+CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
+----------------------------------------
+
+Visual Studio Windows Target Platform Version.
+
+When targeting Windows 10 and above Visual Studio 2015 and above support
+specification of a target Windows version to select a corresponding SDK.
+The :variable:`CMAKE_SYSTEM_VERSION` variable may be set to specify a
+version.  Otherwise CMake computes a default version based on the Windows
+SDK versions available.  The chosen Windows target version number is provided
+in ``CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION``.
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index df6daf3..81c2509 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -209,6 +209,9 @@ Id flags: ${testflags}
     else()
       set(id_system_version "")
     endif()
+    if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION)
+      set(id_WindowsTargetPlatformVersion "<WindowsTargetPlatformVersion>${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}</WindowsTargetPlatformVersion>")
+    endif()
     if(id_platform STREQUAL ARM)
       set(id_WindowsSDKDesktopARMSupport "<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>")
     else()
diff --git a/Modules/CompilerId/VS-10.vcxproj.in b/Modules/CompilerId/VS-10.vcxproj.in
index a17d03d..2870a11 100644
--- a/Modules/CompilerId/VS-10.vcxproj.in
+++ b/Modules/CompilerId/VS-10.vcxproj.in
@@ -12,6 +12,7 @@
     <Keyword>Win32Proj</Keyword>
     @id_system@
     @id_system_version@
+    @id_WindowsTargetPlatformVersion@
     @id_WindowsSDKDesktopARMSupport@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 49c5616..f4861dc 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -74,6 +74,10 @@ public:
   /** Return the CMAKE_SYSTEM_VERSION.  */
   std::string const& GetSystemVersion() const { return this->SystemVersion; }
 
+  /** Return the Windows version targeted on VS 2015 and above.  */
+  std::string const& GetWindowsTargetPlatformVersion() const
+    { return this->WindowsTargetPlatformVersion; }
+
   /** Return true if building for WindowsCE */
   bool TargetsWindowsCE() const
     { return this->SystemIsWindowsCE; }
@@ -120,6 +124,7 @@ protected:
 
   std::string GeneratorToolset;
   std::string DefaultPlatformToolset;
+  std::string WindowsTargetPlatformVersion;
   std::string SystemName;
   std::string SystemVersion;
   std::string NsightTegraVersion;
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index d73eedf..74679d8 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -111,6 +111,34 @@ cmGlobalVisualStudio14Generator::MatchesGeneratorName(
 }
 
 //----------------------------------------------------------------------------
+bool cmGlobalVisualStudio14Generator::InitializeWindows(cmMakefile* mf)
+{
+  if (cmHasLiteralPrefix(this->SystemVersion, "10.0"))
+    {
+    return this->SelectWindows10SDK(mf);
+    }
+  return true;
+}
+
+//----------------------------------------------------------------------------
+bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf)
+{
+  // Find the default version of the Windows 10 SDK.
+  this->WindowsTargetPlatformVersion = this->GetWindows10SDKVersion();
+  if (this->WindowsTargetPlatformVersion.empty())
+    {
+    std::ostringstream  e;
+    e << "Could not find an appropriate version of the Windows 10 SDK"
+      << " installed on this machine";
+    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    return false;
+    }
+  mf->AddDefinition("CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION",
+                    this->WindowsTargetPlatformVersion.c_str());
+  return true;
+}
+
+//----------------------------------------------------------------------------
 void cmGlobalVisualStudio14Generator::WriteSLNHeader(std::ostream& fout)
 {
   // Visual Studio 14 writes .sln format 12.00
@@ -137,3 +165,55 @@ cmGlobalVisualStudio14Generator::IsWindowsDesktopToolsetInstalled() const
   return cmSystemTools::GetRegistrySubKeys(desktop10Key,
     vc14, cmSystemTools::KeyWOW64_32);
 }
+
+//----------------------------------------------------------------------------
+std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
+{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  // This logic is taken from the vcvarsqueryregistry.bat file from VS2015
+  // Try HKLM and then HKCU.
+  std::string win10Root;
+  if (!cmSystemTools::ReadRegistryValue(
+        "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+        "Windows Kits\\Installed Roots;KitsRoot10", win10Root,
+        cmSystemTools::KeyWOW64_32) &&
+      !cmSystemTools::ReadRegistryValue(
+        "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\"
+        "Windows Kits\\Installed Roots;KitsRoot10", win10Root,
+        cmSystemTools::KeyWOW64_32))
+    {
+    return std::string();
+    }
+
+  std::vector<std::string> sdks;
+  std::string path = win10Root + "Include/*";
+  // Grab the paths of the different SDKs that are installed
+  cmSystemTools::GlobDirs(path, sdks);
+  if (!sdks.empty())
+    {
+    // Only use the filename, which will be the SDK version.
+    for (std::vector<std::string>::iterator i = sdks.begin();
+         i != sdks.end(); ++i)
+      {
+      *i = cmSystemTools::GetFilenameName(*i);
+      }
+
+    // Sort the results to make sure we select the most recent one that
+    // has a version less or equal to our version of the operating system
+    std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
+
+    for (std::vector<std::string>::iterator i = sdks.begin();
+         i != sdks.end(); ++i)
+      {
+      // Find the SDK less or equal to our specified version
+      if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
+        {
+        // This is the most recent SDK that we can run safely
+        return *i;
+        }
+      }
+    }
+#endif
+  // Return an empty string
+  return std::string();
+}
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index 02c6274..fcade85 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -30,12 +30,16 @@ public:
 
   virtual const char* GetToolsVersion() { return "14.0"; }
 protected:
+  virtual bool InitializeWindows(cmMakefile* mf);
   virtual const char* GetIDEVersion() { return "14.0"; }
+  virtual bool SelectWindows10SDK(cmMakefile* mf);
 
   // Used to verify that the Desktop toolset for the current generator is
   // installed on the machine.
   virtual bool IsWindowsDesktopToolsetInstalled() const;
 
+  std::string GetWindows10SDKVersion();
+
 private:
   class Factory;
 };
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6c71313..91f2476 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3006,6 +3006,8 @@ IsXamlSource(const std::string& sourceFile)
 
 void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
 {
+  cmGlobalVisualStudio10Generator* gg =
+    static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
   bool isAppContainer = false;
   bool const isWindowsPhone = this->GlobalGenerator->TargetsWindowsPhone();
   bool const isWindowsStore = this->GlobalGenerator->TargetsWindowsStore();
@@ -3062,6 +3064,14 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     this->WriteString("<WindowsSDKDesktopARMSupport>true"
                       "</WindowsSDKDesktopARMSupport>\n", 2);
     }
+  std::string const& targetPlatformVersion =
+    gg->GetWindowsTargetPlatformVersion();
+  if (!targetPlatformVersion.empty())
+    {
+    this->WriteString("<WindowsTargetPlatformVersion>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
+      "</WindowsTargetPlatformVersion>\n";
+    }
 }
 
 void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dfc4c5f50f3198186320320cfed699872e5ece0
commit 5dfc4c5f50f3198186320320cfed699872e5ece0
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Sep 23 14:27:07 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:43:24 2015 -0400

    VS: Add hook to initialize Windows platform settings
    
    Give VS 10+ generators a chance to choose Windows platform settings just
    as they already can for WindowsCE, WindowsStore, and WindowsPhone.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 44d632d..59e8f8c 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -176,7 +176,14 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts,
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
 {
-  if (this->SystemName == "WindowsCE")
+  if (this->SystemName == "Windows")
+    {
+    if (!this->InitializeWindows(mf))
+      {
+      return false;
+      }
+    }
+  else if (this->SystemName == "WindowsCE")
     {
     this->SystemIsWindowsCE = true;
     if (!this->InitializeWindowsCE(mf))
@@ -184,7 +191,7 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
       return false;
       }
     }
-  else if(this->SystemName == "WindowsPhone")
+  else if (this->SystemName == "WindowsPhone")
     {
     this->SystemIsWindowsPhone = true;
     if(!this->InitializeWindowsPhone(mf))
@@ -192,7 +199,7 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
       return false;
       }
     }
-  else if(this->SystemName == "WindowsStore")
+  else if (this->SystemName == "WindowsStore")
     {
     this->SystemIsWindowsStore = true;
     if(!this->InitializeWindowsStore(mf))
@@ -229,6 +236,12 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
 }
 
 //----------------------------------------------------------------------------
+bool cmGlobalVisualStudio10Generator::InitializeWindows(cmMakefile*)
+{
+  return true;
+}
+
+//----------------------------------------------------------------------------
 bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf)
 {
   if (this->DefaultPlatformName != "Win32")
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 8de7b09..49c5616 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -105,6 +105,7 @@ public:
 protected:
   virtual void Generate();
   virtual bool InitializeSystem(cmMakefile* mf);
+  virtual bool InitializeWindows(cmMakefile* mf);
   virtual bool InitializeWindowsCE(cmMakefile* mf);
   virtual bool InitializeWindowsPhone(cmMakefile* mf);
   virtual bool InitializeWindowsStore(cmMakefile* mf);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61c472a287305490bef2047784d7670d8354cbf3
commit 61c472a287305490bef2047784d7670d8354cbf3
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Sep 30 13:22:43 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:43:24 2015 -0400

    cmSystemTools: Add VersionCompareGreater helper
    
    Wrap a call to VersionCompare with OP_GREATER in a signature suitable
    for use with std::sort.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index d3c1f16..2c5aa8a 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2777,6 +2777,14 @@ bool cmSystemTools::VersionCompare(cmSystemTools::CompareOp op,
 }
 
 //----------------------------------------------------------------------------
+bool cmSystemTools::VersionCompareGreater(std::string const& lhs,
+                                          std::string const& rhs)
+{
+  return cmSystemTools::VersionCompare(
+    cmSystemTools::OP_GREATER, lhs.c_str(), rhs.c_str());
+}
+
+//----------------------------------------------------------------------------
 bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg,
                                 bool* removed)
 {
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index e88170a..b6b0978 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -294,6 +294,8 @@ public:
    * Compare versions
    */
   static bool VersionCompare(CompareOp op, const char* lhs, const char* rhs);
+  static bool VersionCompareGreater(std::string const& lhs,
+                                    std::string const& rhs);
 
   /**
    * Determine the file type based on the extension

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b31ac171a4acdc8d8eb1d08c5b5f61ec90a9dbaa
commit b31ac171a4acdc8d8eb1d08c5b5f61ec90a9dbaa
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Sep 23 14:27:07 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:43:24 2015 -0400

    Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME
    
    Teach CMakeDetermineSystem to check for a CMAKE_SYSTEM_VERSION setting
    even when CMAKE_SYSTEM_NAME is not set.  This will allow builds on the
    host OS to target other versions of the OS without full cross-compiling.

diff --git a/Help/variable/CMAKE_SYSTEM_VERSION.rst b/Help/variable/CMAKE_SYSTEM_VERSION.rst
index f388ccf..aba8ca3 100644
--- a/Help/variable/CMAKE_SYSTEM_VERSION.rst
+++ b/Help/variable/CMAKE_SYSTEM_VERSION.rst
@@ -12,6 +12,13 @@ then ``CMAKE_SYSTEM_VERSION`` is by default set to the same value as the
 :variable:`CMAKE_HOST_SYSTEM_VERSION` variable so that the build targets
 the host system version.
 
+In the case of a host build then ``CMAKE_SYSTEM_VERSION`` may be set
+explicitly when first configuring a new build tree in order to enable
+targeting the build for a different version of the host operating system
+than is actually running on the host.  This is allowed and not considered
+cross compiling so long as the binaries built for the specified OS version
+can still run on the host.
+
 System Version for Cross Compiling
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index fa14641..d9f7579 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -123,7 +123,9 @@ elseif(CMAKE_VS_WINCE_VERSION)
   set(PRESET_CMAKE_SYSTEM_NAME TRUE)
 else()
   set(CMAKE_SYSTEM_NAME      "${CMAKE_HOST_SYSTEM_NAME}")
-  set(CMAKE_SYSTEM_VERSION   "${CMAKE_HOST_SYSTEM_VERSION}")
+  if(NOT DEFINED CMAKE_SYSTEM_VERSION)
+    set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
+  endif()
   set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}")
   set(CMAKE_CROSSCOMPILING FALSE)
   set(PRESET_CMAKE_SYSTEM_NAME FALSE)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70688609412421c3efa168f9c210a9e4e06a5578
commit 70688609412421c3efa168f9c210a9e4e06a5578
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:36:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:42:28 2015 -0400

    Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation
    
    Specify their meaning for host builds and when cross compiling.
    Sepcify their relationship in each case.

diff --git a/Help/variable/CMAKE_SYSTEM_NAME.rst b/Help/variable/CMAKE_SYSTEM_NAME.rst
index 0466da4..c3a42e5 100644
--- a/Help/variable/CMAKE_SYSTEM_NAME.rst
+++ b/Help/variable/CMAKE_SYSTEM_NAME.rst
@@ -1,8 +1,20 @@
 CMAKE_SYSTEM_NAME
 -----------------
 
-Name of the operating system CMake is building for.
+The name of the operating system for which CMake is to build.
+See the :variable:`CMAKE_SYSTEM_VERSION` variable for the OS version.
 
-This is the name of the operating system on which CMake is targeting.  This
-variable is the same as :variable:`CMAKE_HOST_SYSTEM_NAME` if you build for the
-host system instead of the target system when cross compiling.
+System Name for Host Builds
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``CMAKE_SYSTEM_NAME`` is by default set to the same value as the
+:variable:`CMAKE_HOST_SYSTEM_NAME` variable so that the build
+targets the host system.
+
+System Name for Cross Compiling
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``CMAKE_SYSTEM_NAME`` may be set explicitly when first configuring a new build
+tree in order to enable :ref:`cross compiling <Cross Compiling Toolchain>`.
+In this case the :variable:`CMAKE_SYSTEM_VERSION` variable must also be
+set explicitly.
diff --git a/Help/variable/CMAKE_SYSTEM_VERSION.rst b/Help/variable/CMAKE_SYSTEM_VERSION.rst
index 3b3cdc5..f388ccf 100644
--- a/Help/variable/CMAKE_SYSTEM_VERSION.rst
+++ b/Help/variable/CMAKE_SYSTEM_VERSION.rst
@@ -1,8 +1,21 @@
 CMAKE_SYSTEM_VERSION
 --------------------
 
-The operating system version CMake is building for.
+The version of the operating system for which CMake is to build.
+See the :variable:`CMAKE_SYSTEM_NAME` variable for the OS name.
 
-This variable is the same as :variable:`CMAKE_HOST_SYSTEM_VERSION` if
-you build for the host system instead of the target system when
-cross compiling.
+System Version for Host Builds
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When the :variable:`CMAKE_SYSTEM_NAME` variable takes its default value
+then ``CMAKE_SYSTEM_VERSION`` is by default set to the same value as the
+:variable:`CMAKE_HOST_SYSTEM_VERSION` variable so that the build targets
+the host system version.
+
+System Version for Cross Compiling
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When the :variable:`CMAKE_SYSTEM_NAME` variable is set explicitly to
+enable :ref:`cross compiling <Cross Compiling Toolchain>` then the
+value of ``CMAKE_SYSTEM_VERSION`` must also be set explicitly to specify
+the target system version.

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 09:53:45 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 09:53:45 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3453-g2cfd757
Message-ID: <20151002135345.A4B9CBF907@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2cfd757b8eed5dfddd3bf5eb5464040676478c71 (commit)
       via  3f077996f58ca905125fc2387614b24c68c6f09e (commit)
      from  acadaba878e375554b6350b4257ee03ded5a03c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cfd757b8eed5dfddd3bf5eb5464040676478c71
commit 2cfd757b8eed5dfddd3bf5eb5464040676478c71
Merge: acadaba 3f07799
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:53:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 09:53:44 2015 -0400

    Merge topic 'vs-win10-sdk' into next
    
    3f077996 VS: Add support for selecting the Windows 10 SDK (#15670)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f077996f58ca905125fc2387614b24c68c6f09e
commit 3f077996f58ca905125fc2387614b24c68c6f09e
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Wed Sep 30 13:22:43 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:53:25 2015 -0400

    VS: Add support for selecting the Windows 10 SDK (#15670)
    
    Teach the VS 2015 generator to produce a WindowsTargetPlatformVersion
    value.  Use the CMAKE_SYSTEM_VERSION to specify the version and if not
    set choose a default based on available SDKs.  Activate this behavior
    when targeting Windows 10.
    
    Co-Author: Brad King <brad.king at kitware.com>

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 635db00..2116900 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -82,6 +82,7 @@ Variables that Provide Information
    /variable/CMAKE_VS_NsightTegra_VERSION
    /variable/CMAKE_VS_PLATFORM_NAME
    /variable/CMAKE_VS_PLATFORM_TOOLSET
+   /variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
    /variable/CMAKE_XCODE_PLATFORM_TOOLSET
    /variable/PROJECT_BINARY_DIR
    /variable/PROJECT-NAME_BINARY_DIR
diff --git a/Help/release/dev/vs-win10-sdk.rst b/Help/release/dev/vs-win10-sdk.rst
new file mode 100644
index 0000000..50eb391
--- /dev/null
+++ b/Help/release/dev/vs-win10-sdk.rst
@@ -0,0 +1,6 @@
+vs-win10-sdk
+------------
+
+* The :generator:`Visual Studio 14 2015` generator learned to select
+  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
+  variable and the SDKs available on the host.
diff --git a/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst b/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
new file mode 100644
index 0000000..6392849
--- /dev/null
+++ b/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
@@ -0,0 +1,11 @@
+CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
+----------------------------------------
+
+Visual Studio Windows Target Platform Version.
+
+When targeting Windows 10 and above Visual Studio 2015 and above support
+specification of a target Windows version to select a corresponding SDK.
+The :variable:`CMAKE_SYSTEM_VERSION` variable may be set to specify a
+version.  Otherwise CMake computes a default version based on the Windows
+SDK versions available.  The chosen Windows target version number is provided
+in ``CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION``.
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index df6daf3..81c2509 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -209,6 +209,9 @@ Id flags: ${testflags}
     else()
       set(id_system_version "")
     endif()
+    if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION)
+      set(id_WindowsTargetPlatformVersion "<WindowsTargetPlatformVersion>${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}</WindowsTargetPlatformVersion>")
+    endif()
     if(id_platform STREQUAL ARM)
       set(id_WindowsSDKDesktopARMSupport "<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>")
     else()
diff --git a/Modules/CompilerId/VS-10.vcxproj.in b/Modules/CompilerId/VS-10.vcxproj.in
index a17d03d..2870a11 100644
--- a/Modules/CompilerId/VS-10.vcxproj.in
+++ b/Modules/CompilerId/VS-10.vcxproj.in
@@ -12,6 +12,7 @@
     <Keyword>Win32Proj</Keyword>
     @id_system@
     @id_system_version@
+    @id_WindowsTargetPlatformVersion@
     @id_WindowsSDKDesktopARMSupport@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 49c5616..f4861dc 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -74,6 +74,10 @@ public:
   /** Return the CMAKE_SYSTEM_VERSION.  */
   std::string const& GetSystemVersion() const { return this->SystemVersion; }
 
+  /** Return the Windows version targeted on VS 2015 and above.  */
+  std::string const& GetWindowsTargetPlatformVersion() const
+    { return this->WindowsTargetPlatformVersion; }
+
   /** Return true if building for WindowsCE */
   bool TargetsWindowsCE() const
     { return this->SystemIsWindowsCE; }
@@ -120,6 +124,7 @@ protected:
 
   std::string GeneratorToolset;
   std::string DefaultPlatformToolset;
+  std::string WindowsTargetPlatformVersion;
   std::string SystemName;
   std::string SystemVersion;
   std::string NsightTegraVersion;
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index d73eedf..74679d8 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -111,6 +111,34 @@ cmGlobalVisualStudio14Generator::MatchesGeneratorName(
 }
 
 //----------------------------------------------------------------------------
+bool cmGlobalVisualStudio14Generator::InitializeWindows(cmMakefile* mf)
+{
+  if (cmHasLiteralPrefix(this->SystemVersion, "10.0"))
+    {
+    return this->SelectWindows10SDK(mf);
+    }
+  return true;
+}
+
+//----------------------------------------------------------------------------
+bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf)
+{
+  // Find the default version of the Windows 10 SDK.
+  this->WindowsTargetPlatformVersion = this->GetWindows10SDKVersion();
+  if (this->WindowsTargetPlatformVersion.empty())
+    {
+    std::ostringstream  e;
+    e << "Could not find an appropriate version of the Windows 10 SDK"
+      << " installed on this machine";
+    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    return false;
+    }
+  mf->AddDefinition("CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION",
+                    this->WindowsTargetPlatformVersion.c_str());
+  return true;
+}
+
+//----------------------------------------------------------------------------
 void cmGlobalVisualStudio14Generator::WriteSLNHeader(std::ostream& fout)
 {
   // Visual Studio 14 writes .sln format 12.00
@@ -137,3 +165,55 @@ cmGlobalVisualStudio14Generator::IsWindowsDesktopToolsetInstalled() const
   return cmSystemTools::GetRegistrySubKeys(desktop10Key,
     vc14, cmSystemTools::KeyWOW64_32);
 }
+
+//----------------------------------------------------------------------------
+std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
+{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  // This logic is taken from the vcvarsqueryregistry.bat file from VS2015
+  // Try HKLM and then HKCU.
+  std::string win10Root;
+  if (!cmSystemTools::ReadRegistryValue(
+        "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+        "Windows Kits\\Installed Roots;KitsRoot10", win10Root,
+        cmSystemTools::KeyWOW64_32) &&
+      !cmSystemTools::ReadRegistryValue(
+        "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\"
+        "Windows Kits\\Installed Roots;KitsRoot10", win10Root,
+        cmSystemTools::KeyWOW64_32))
+    {
+    return std::string();
+    }
+
+  std::vector<std::string> sdks;
+  std::string path = win10Root + "Include/*";
+  // Grab the paths of the different SDKs that are installed
+  cmSystemTools::GlobDirs(path, sdks);
+  if (!sdks.empty())
+    {
+    // Only use the filename, which will be the SDK version.
+    for (std::vector<std::string>::iterator i = sdks.begin();
+         i != sdks.end(); ++i)
+      {
+      *i = cmSystemTools::GetFilenameName(*i);
+      }
+
+    // Sort the results to make sure we select the most recent one that
+    // has a version less or equal to our version of the operating system
+    std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
+
+    for (std::vector<std::string>::iterator i = sdks.begin();
+         i != sdks.end(); ++i)
+      {
+      // Find the SDK less or equal to our specified version
+      if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
+        {
+        // This is the most recent SDK that we can run safely
+        return *i;
+        }
+      }
+    }
+#endif
+  // Return an empty string
+  return std::string();
+}
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index 02c6274..fcade85 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -30,12 +30,16 @@ public:
 
   virtual const char* GetToolsVersion() { return "14.0"; }
 protected:
+  virtual bool InitializeWindows(cmMakefile* mf);
   virtual const char* GetIDEVersion() { return "14.0"; }
+  virtual bool SelectWindows10SDK(cmMakefile* mf);
 
   // Used to verify that the Desktop toolset for the current generator is
   // installed on the machine.
   virtual bool IsWindowsDesktopToolsetInstalled() const;
 
+  std::string GetWindows10SDKVersion();
+
 private:
   class Factory;
 };
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6c71313..91f2476 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3006,6 +3006,8 @@ IsXamlSource(const std::string& sourceFile)
 
 void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
 {
+  cmGlobalVisualStudio10Generator* gg =
+    static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
   bool isAppContainer = false;
   bool const isWindowsPhone = this->GlobalGenerator->TargetsWindowsPhone();
   bool const isWindowsStore = this->GlobalGenerator->TargetsWindowsStore();
@@ -3062,6 +3064,14 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     this->WriteString("<WindowsSDKDesktopARMSupport>true"
                       "</WindowsSDKDesktopARMSupport>\n", 2);
     }
+  std::string const& targetPlatformVersion =
+    gg->GetWindowsTargetPlatformVersion();
+  if (!targetPlatformVersion.empty())
+    {
+    this->WriteString("<WindowsTargetPlatformVersion>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
+      "</WindowsTargetPlatformVersion>\n";
+    }
 }
 
 void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 09:58:16 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 09:58:16 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1376-g8f545d9
Message-ID: <20151002135816.7BBFBBFB73@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  8f545d950166f49bebf92d270d373e7cb98060b8 (commit)
       via  b31ac171a4acdc8d8eb1d08c5b5f61ec90a9dbaa (commit)
       via  70688609412421c3efa168f9c210a9e4e06a5578 (commit)
      from  02bc311138ad8ac0c3653e836a02d54245ae4b12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f545d950166f49bebf92d270d373e7cb98060b8
commit 8f545d950166f49bebf92d270d373e7cb98060b8
Merge: 02bc311 b31ac17
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:58:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 09:58:15 2015 -0400

    Merge topic 'explicit-system-version'
    
    b31ac171 Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME
    70688609 Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation


-----------------------------------------------------------------------

Summary of changes:
 Help/variable/CMAKE_SYSTEM_NAME.rst    |   20 ++++++++++++++++----
 Help/variable/CMAKE_SYSTEM_VERSION.rst |   28 ++++++++++++++++++++++++----
 Modules/CMakeDetermineSystem.cmake     |    4 +++-
 3 files changed, 43 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 09:58:18 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 09:58:18 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1380-gd80161b
Message-ID: <20151002135818.ED4B1BFB73@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  d80161b08c7f858a222ac6d51262461e5ef7b507 (commit)
       via  3f077996f58ca905125fc2387614b24c68c6f09e (commit)
       via  5dfc4c5f50f3198186320320cfed699872e5ece0 (commit)
       via  61c472a287305490bef2047784d7670d8354cbf3 (commit)
      from  8f545d950166f49bebf92d270d373e7cb98060b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d80161b08c7f858a222ac6d51262461e5ef7b507
commit d80161b08c7f858a222ac6d51262461e5ef7b507
Merge: 8f545d9 3f07799
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:58:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 09:58:17 2015 -0400

    Merge topic 'vs-win10-sdk'
    
    3f077996 VS: Add support for selecting the Windows 10 SDK (#15670)
    5dfc4c5f VS: Add hook to initialize Windows platform settings
    61c472a2 cmSystemTools: Add VersionCompareGreater helper


-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-variables.7.rst                  |    1 +
 Help/release/dev/vs-win10-sdk.rst                  |    6 ++
 .../CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst   |   11 +++
 Modules/CMakeDetermineCompilerId.cmake             |    3 +
 Modules/CompilerId/VS-10.vcxproj.in                |    1 +
 Source/cmGlobalVisualStudio10Generator.cxx         |   19 ++++-
 Source/cmGlobalVisualStudio10Generator.h           |    6 ++
 Source/cmGlobalVisualStudio14Generator.cxx         |   80 ++++++++++++++++++++
 Source/cmGlobalVisualStudio14Generator.h           |    4 +
 Source/cmSystemTools.cxx                           |    8 ++
 Source/cmSystemTools.h                             |    2 +
 Source/cmVisualStudio10TargetGenerator.cxx         |   10 +++
 12 files changed, 148 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/vs-win10-sdk.rst
 create mode 100644 Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 09:58:21 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 09:58:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1382-gb7d0c33
Message-ID: <20151002135821.0A8EBBFB78@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  b7d0c33c91bdf760e0afaec72912149eadd76afb (commit)
       via  ec725815c9941967085c5b492e5a83305ccc490b (commit)
      from  d80161b08c7f858a222ac6d51262461e5ef7b507 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7d0c33c91bdf760e0afaec72912149eadd76afb
commit b7d0c33c91bdf760e0afaec72912149eadd76afb
Merge: d80161b ec72581
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:58:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 09:58:19 2015 -0400

    Merge topic 'release-binaries-windows-cmake-path'
    
    ec725815 Utilities/Release: Update path to 'cmake.exe' on Windows build machine


-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/dash2win64_release.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 09:58:24 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 09:58:24 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1386-g8deb083
Message-ID: <20151002135824.F011BBFB8B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  8deb0835e6dff3c15792790b95c83b3b8f8d8ff1 (commit)
       via  1b13af46accba6ed73bf2975221def388cd5e90d (commit)
       via  981068b79f3703a095f5aa254da6c7d3f997a265 (commit)
       via  e8954d0b3b6f7b29a00ec0238fc91d84021f0705 (commit)
      from  b7d0c33c91bdf760e0afaec72912149eadd76afb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8deb0835e6dff3c15792790b95c83b3b8f8d8ff1
commit 8deb0835e6dff3c15792790b95c83b3b8f8d8ff1
Merge: b7d0c33 1b13af4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:58:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 09:58:23 2015 -0400

    Merge topic 'cpack-tests-fix'
    
    1b13af46 Tests: Fix RunCMake.CPack_* tests to use proper CMake generator
    981068b7 Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* tests
    e8954d0b Tests: Add trailing newlines to generated sources in RunCMake.CPack_* tests


-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/CPack/CPackTestHelpers.cmake |   41 ++-------------------------
 Tests/RunCMake/CPack/DEPENDENCIES.cmake     |    8 ++++--
 Tests/RunCMake/CPack/PreTestError.cmake     |    7 -----
 3 files changed, 8 insertions(+), 48 deletions(-)
 delete mode 100644 Tests/RunCMake/CPack/PreTestError.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 09:59:01 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 09:59:01 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3459-gfc11bd0
Message-ID: <20151002135901.32DAABFBE0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fc11bd08ff3c97399c117220d3e1dcb7e24ca67a (commit)
       via  8deb0835e6dff3c15792790b95c83b3b8f8d8ff1 (commit)
       via  b7d0c33c91bdf760e0afaec72912149eadd76afb (commit)
       via  d80161b08c7f858a222ac6d51262461e5ef7b507 (commit)
       via  8f545d950166f49bebf92d270d373e7cb98060b8 (commit)
       via  02bc311138ad8ac0c3653e836a02d54245ae4b12 (commit)
      from  2cfd757b8eed5dfddd3bf5eb5464040676478c71 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc11bd08ff3c97399c117220d3e1dcb7e24ca67a
commit fc11bd08ff3c97399c117220d3e1dcb7e24ca67a
Merge: 2cfd757 8deb083
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 09:58:53 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 09:58:53 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 10:53:26 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 10:53:26 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3462-g0736851
Message-ID: <20151002145326.38BD8BFA5A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  07368517a278448a751b1adef771a73b28ca22e0 (commit)
       via  8a5fe539212dbf286b89d093f5ced2d0088091d2 (commit)
       via  fda8218b82189de6ed0bada1487e0ad4d516567e (commit)
      from  fc11bd08ff3c97399c117220d3e1dcb7e24ca67a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07368517a278448a751b1adef771a73b28ca22e0
commit 07368517a278448a751b1adef771a73b28ca22e0
Merge: fc11bd0 8a5fe53
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:53:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 10:53:24 2015 -0400

    Merge topic 'doc-3.4-relnotes' into next
    
    8a5fe539 Help: Organize and revise 3.4 release notes
    fda8218b Help: Consolidate 3.4 release notes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a5fe539212dbf286b89d093f5ced2d0088091d2
commit 8a5fe539212dbf286b89d093f5ced2d0088091d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:38:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 10:49:53 2015 -0400

    Help: Organize and revise 3.4 release notes
    
    Add section headers similar to the 3.3 release notes and move each
    individual bullet into an appropriate section.  Revise a few bullets.

diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst
index 448ea35..b6f9702 100644
--- a/Help/release/3.4.rst
+++ b/Help/release/3.4.rst
@@ -7,6 +7,16 @@ CMake 3.4 Release Notes
 
 Changes made since CMake 3.4 include the following.
 
+New Features
+============
+
+Generators
+----------
+
+* The :generator:`Visual Studio 14 2015` generator learned to select
+  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
+  variable and the SDKs available on the host.
+
 * CMake learned rudimentary support for the Apple Swift language.  When using
   the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
   the ``Swift`` language with the :command:`enable_language` command or the
@@ -14,76 +24,96 @@ Changes made since CMake 3.4 include the following.
   Xcode is too old).  Then one may list ``.swift`` source files in targets
   for compilation.
 
-* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
-  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
-  introduced to initialize the
-  :prop_tgt:`LINK_SEARCH_START_STATIC` and
-  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
-  respectively.
+Commands
+--------
 
-* On Windows with MS-compatible tools, CMake learned to optionally
-  generate a module definition (``.def``) file for ``SHARED`` libraries.
-  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
+* The :command:`find_program` command learned a ``NAMES_PER_DIR``
+  option to consdier all given ``NAMES`` in each directory before
+  moving on to the next directory.
+
+* The :command:`get_filename_component` command learned a new ``BASE_DIR``
+  subcommand.  This is used to specify a base directory when calculating an
+  absolute path from a relative path.
+
+* The :command:`if` command learned a new ``TEST`` operator that evaluates
+  to true if a given test name has been defined by the :command:`add_test`
+  command.  See policy :policy:`CMP0064`.
+
+* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :command:`install(FILES)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :command:`string` command learned a new ``APPEND`` subcommand.
+
+Variables
+---------
 
 * The :ref:`Makefile Generators` and the :generator:`Ninja` generator
-  learned to add compiler launcher tools like distcc and ccache along with the
-  compiler for ``C`` and ``CXX`` languages.  See the
+  learned to add compiler launcher tools like distcc and ccache along
+  with the compiler for ``C`` and ``CXX`` languages.  See the
   :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
   :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
 
-* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
-  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
+* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
+  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
+  introduced to initialize the
+  :prop_tgt:`LINK_SEARCH_START_STATIC` and
+  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
+  respectively.
 
-* The :module:`CPackDeb` module now correctly excludes symlinks during package checksum calculation.
+Properties
+----------
 
-* The :module:`CPackDeb` module learned to set package dependencies
-  per component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS` and
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`.
+* :ref:`Visual Studio Generators` learned to support additonal
+  target properties to customize projects for NVIDIA Nsight
+  Tegra Visual Studio Edition:
 
-* :module:`CPackDeb` no longer uses fakeroot and system tar program for packaging.
+  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
+  * :prop_tgt:`ANDROID_ARCH`
+  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
+  * :prop_tgt:`ANDROID_PROCESS_MAX`
+  * :prop_tgt:`ANDROID_PROGUARD`
+  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
+  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
+  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
+  * :prop_tgt:`ANDROID_STL_TYPE`
 
-* The :module:`CPack` module learned to package empty directories.
+* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
+  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
+  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
 
-* The :module:`CPack` module no longer mangles settings with CMake-special
-  characters when they're used as defaults for other settings. The macro
-  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
+* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
+  were introduced to allow project code to query where a target is defined.
 
-* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
-  which can be used to ensure the cpack program receives the settings' values
-  exactly as they were set, even if they contain CMake-special characters.
-  For compatibility, it's off by default.
+* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
 
-* :manual:`ctest(1)` learned options
-  ``--test-output-size-passed`` and ``--test-output-size-failed``
-  to customize the limit on test output size submitted when
-  running as a :ref:`Dashboard Client`.
+* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
+  :ref:`Makefile Generators` whether to generate commands to print output
+  after each target is completed.
 
-* CTest learned to optionally measure the CPU load during parallel
-  testing and avoid starting tests that may cause the load to exceed
-  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
-  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
-  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
-  option of the :command:`ctest_test` command.
+* On Windows with MS-compatible tools, CMake learned to optionally
+  generate a module definition (``.def``) file for ``SHARED`` libraries.
+  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
 
-* The :module:`CMakeExpandImportedTargets` module is now documented
-  as deprecated.  See module documentation for an explanation.
+Modules
+-------
 
 * The :module:`ExternalProject` module :command:`ExternalProject_Add`
   function ``GIT_SUBMODULES`` option now also limits the set of
   submodules that are initialized in addition to the prior behavior
   of limiting the set of submodules that are updated.
 
-* Use "git stash save --all" only if supported. The --all option for git-stash
-  wasn't introduced until git version 1.7.6.
-
 * The :module:`ExternalProject` module learned new ``USES_TERMINAL``
-  arguments for giving steps exclusive terminal access.  Especially
+  arguments for giving steps exclusive terminal access.  This is
   useful with the :generator:`Ninja` generator to monitor CMake
   superbuild progress and prevent CPU oversubscription.
 
@@ -97,14 +127,17 @@ Changes made since CMake 3.4 include the following.
 
 * The :module:`FindIce` module now provides imported targets.
 
+* The :module:`FindJava` module learned to optionally find
+  the ``idlj`` and ``jarsigner`` tools.
+
 * The :module:`FindOpenSSL` module now provides imported targets.
 
 * The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
   option to search only for static libraries.
 
-* The :command:`find_program` command learned a ``NAMES_PER_DIR``
-  option to consdier all given ``NAMES`` in each directory before
-  moving on to the next directory.
+* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
+  command which may be used to query for arbitrary variables from a package
+  (such as for related tools or data and plugin install paths).
 
 * The :module:`FindProtobuf` module gained a new
   :command:`protobuf_generate_python` function to generate python
@@ -121,33 +154,10 @@ Changes made since CMake 3.4 include the following.
 * The :module:`FindZLIB` module learned to search separately for
   debug and release variants.
 
-* A new ``$<SHELL_PATH:...>``
-  :manual:`generator expression <cmake-generator-expressions(7)>`
-  has been added.
-
-* The :command:`get_filename_component` command learned a new ``BASE_DIR``
-  subcommand.  This is used to specify a base directory when calculating an
-  absolute path from a relative path.
-
 * The :module:`GNUInstallDirs` module learned special default values
   for certain installation prefixes according to the `GNU Coding
   Standards`_ and the `Filesystem Hierarchy Standard`_.
 
-.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
-
-* Add a new TEST operator to if() that evaluates to true
-  if a given test name has been defined.
-
-* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
-
-* The :command:`install(FILES)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
-
-* The :module:`FindJava` module learned to optionally find
-  the ``idlj`` and ``jarsigner`` tools.
-
 * The :module:`UseJava` module ``add_jar`` function learned
   to support response files (e.g. ``@srcs.txt``) for source
   specification.
@@ -159,73 +169,101 @@ Changes made since CMake 3.4 include the following.
 * The :module:`UseJava` module gained a new ``create_javah``
   function to create C headers from Java classes.
 
-* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
-  :ref:`Makefile Generators` whether to generate commands to print output
-  after each target is completed.
+.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
+
+Generator Expressions
+---------------------
+
+* A new ``$<SHELL_PATH:...>``
+  :manual:`generator expression <cmake-generator-expressions(7)>`
+  has been added.
+
+CTest
+-----
+
+* CTest learned to optionally measure the CPU load during parallel
+  testing and avoid starting tests that may cause the load to exceed
+  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
+  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
+  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
+  option of the :command:`ctest_test` command.
+
+* :manual:`ctest(1)` learned options
+  ``--test-output-size-passed`` and ``--test-output-size-failed``
+  to customize the limit on test output size submitted when
+  running as a :ref:`Dashboard Client`.
+
+CPack
+-----
+
+* The :module:`CPackDeb` module learned to set package dependencies
+  per component.  See variables:
+
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`
+
+* The :module:`CPack` module learned to package empty directories.
+
+* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
+  which can be used to ensure the cpack program receives the settings' values
+  exactly as they were set, even if they contain CMake-special characters.
+  For compatibility, it's off by default.
+
+Other
+-----
 
 * The :manual:`Compile Features <cmake-compile-features(7)>` functionality
   is now aware of features supported by GNU C compilers on Windows.
 
-* The ``SONAME`` field is no longer set for ``MODULE`` libraries
-  created with the :command:`add_library` command.  ``MODULE``
-  libraries are meant for explicit dynamic loading at runtime.
-  They cannot be linked so ``SONAME`` is not useful.
-
 * CMake learned to honor ``*.manifest`` source files with MSVC tools.
   Manifest files named as sources of ``.exe`` and ``.dll`` targets
   will be merged with linker-generated manifests and embedded in the
   binary.
 
-* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
-  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
-  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
+  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
 
-* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+* :manual:`cmake(1)` gained a new ``--trace-expand`` command line option
+  that is like ``--trace`` but expands variable references in the output.
 
-* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
-  command which may be used to query for arbitrary variables from a package
-  (such as for related tools or data and plugin install paths).
+Deprecated and Removed Features
+===============================
+
+* The :module:`CMakeExpandImportedTargets` module is now documented
+  as deprecated.  See module documentation for an explanation.
 
 * The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
   effect.  Previously it was partially implemented and unreliable.
 
-* CMake no longer links executables with flags to export symbols
-  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
-  See policy :policy:`CMP0065`.
-
-* The :command:`string` command learned a new ``APPEND`` subcommand.
-
-* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
-  were introduced to allow project code to query where a target is defined.
+Other Changes
+=============
 
 * The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
   :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
   work in environments where only CXX is enabled.
 
-* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
-  variable references in the output.
+* The :module:`CPackDeb` module now correctly excludes symlinks during package
+  checksum calculation.
 
-* :ref:`Visual Studio Generators` learned to support additonal
-  target properties to customize projects for NVIDIA Nsight
-  Tegra Visual Studio Edition:
+* The :module:`CPackDeb` no longer uses fakeroot and system tar program for
+  packaging.
 
-  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
-  * :prop_tgt:`ANDROID_ARCH`
-  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
-  * :prop_tgt:`ANDROID_PROCESS_MAX`
-  * :prop_tgt:`ANDROID_PROGUARD`
-  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
-  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
-  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
-  * :prop_tgt:`ANDROID_STL_TYPE`
+* The :module:`CPack` module no longer mangles settings with CMake-special
+  characters when they're used as defaults for other settings. The macro
+  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
 
-* The :generator:`Visual Studio 14 2015` generator learned to select
-  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
-  variable and the SDKs available on the host.
+* CMake no longer links executables with flags to export symbols
+  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
+  See policy :policy:`CMP0065`.
+
+* The ``SONAME`` field is no longer set for ``MODULE`` libraries
+  created with the :command:`add_library` command.  ``MODULE``
+  libraries are meant for explicit dynamic loading at runtime.
+  They cannot be linked so ``SONAME`` is not useful.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fda8218b82189de6ed0bada1487e0ad4d516567e
commit fda8218b82189de6ed0bada1487e0ad4d516567e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:16:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 10:23:09 2015 -0400

    Help: Consolidate 3.4 release notes
    
    Move all development release notes into a new version-specific document:
    
     tail -q -n +3 Help/release/dev/* > Help/release/3.4.rst
     git rm -- Help/release/dev/*
    
    except the sample topic:
    
     git checkout HEAD -- Help/release/dev/0-sample-topic.rst
    
    Reference the new document from the release notes index document.
    Add a title and intro sentence to the new document by hand.

diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst
new file mode 100644
index 0000000..448ea35
--- /dev/null
+++ b/Help/release/3.4.rst
@@ -0,0 +1,231 @@
+CMake 3.4 Release Notes
+***********************
+
+.. only:: html
+
+  .. contents::
+
+Changes made since CMake 3.4 include the following.
+
+* CMake learned rudimentary support for the Apple Swift language.  When using
+  the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
+  the ``Swift`` language with the :command:`enable_language` command or the
+  :command:`project` command (this is an error with other generators or when
+  Xcode is too old).  Then one may list ``.swift`` source files in targets
+  for compilation.
+
+* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
+  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
+  introduced to initialize the
+  :prop_tgt:`LINK_SEARCH_START_STATIC` and
+  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
+  respectively.
+
+* On Windows with MS-compatible tools, CMake learned to optionally
+  generate a module definition (``.def``) file for ``SHARED`` libraries.
+  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
+
+* The :ref:`Makefile Generators` and the :generator:`Ninja` generator
+  learned to add compiler launcher tools like distcc and ccache along with the
+  compiler for ``C`` and ``CXX`` languages.  See the
+  :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
+  :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
+
+* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
+  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
+
+* The :module:`CPackDeb` module now correctly excludes symlinks during package checksum calculation.
+
+* The :module:`CPackDeb` module learned to set package dependencies
+  per component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS` and
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`.
+
+* :module:`CPackDeb` no longer uses fakeroot and system tar program for packaging.
+
+* The :module:`CPack` module learned to package empty directories.
+
+* The :module:`CPack` module no longer mangles settings with CMake-special
+  characters when they're used as defaults for other settings. The macro
+  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
+
+* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
+  which can be used to ensure the cpack program receives the settings' values
+  exactly as they were set, even if they contain CMake-special characters.
+  For compatibility, it's off by default.
+
+* :manual:`ctest(1)` learned options
+  ``--test-output-size-passed`` and ``--test-output-size-failed``
+  to customize the limit on test output size submitted when
+  running as a :ref:`Dashboard Client`.
+
+* CTest learned to optionally measure the CPU load during parallel
+  testing and avoid starting tests that may cause the load to exceed
+  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
+  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
+  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
+  option of the :command:`ctest_test` command.
+
+* The :module:`CMakeExpandImportedTargets` module is now documented
+  as deprecated.  See module documentation for an explanation.
+
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  function ``GIT_SUBMODULES`` option now also limits the set of
+  submodules that are initialized in addition to the prior behavior
+  of limiting the set of submodules that are updated.
+
+* Use "git stash save --all" only if supported. The --all option for git-stash
+  wasn't introduced until git version 1.7.6.
+
+* The :module:`ExternalProject` module learned new ``USES_TERMINAL``
+  arguments for giving steps exclusive terminal access.  Especially
+  useful with the :generator:`Ninja` generator to monitor CMake
+  superbuild progress and prevent CPU oversubscription.
+
+* The :module:`FindBISON` module ``BISON_TARGET`` macro learned a
+  new ``DEFINES_FILE`` option to specify a custom output header
+  to be generated.
+
+* The :module:`FindHDF5` module learend a new ``HDF5_PREFER_PARALLEL``
+  option allowing users to specify that a parallel HDF5 tool is
+  preferred if both are available.
+
+* The :module:`FindIce` module now provides imported targets.
+
+* The :module:`FindOpenSSL` module now provides imported targets.
+
+* The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
+  option to search only for static libraries.
+
+* The :command:`find_program` command learned a ``NAMES_PER_DIR``
+  option to consdier all given ``NAMES`` in each directory before
+  moving on to the next directory.
+
+* The :module:`FindProtobuf` module gained a new
+  :command:`protobuf_generate_python` function to generate python
+  sources from ``.proto`` files.
+
+* The :module:`FindTIFF` module learned to search separately for
+  debug and release variants.
+
+* The :module:`FindwxWidgets` module learned to support version requests.
+
+* The :module:`FindXercesC` module learned to search separately for
+  debug and release variants.
+
+* The :module:`FindZLIB` module learned to search separately for
+  debug and release variants.
+
+* A new ``$<SHELL_PATH:...>``
+  :manual:`generator expression <cmake-generator-expressions(7)>`
+  has been added.
+
+* The :command:`get_filename_component` command learned a new ``BASE_DIR``
+  subcommand.  This is used to specify a base directory when calculating an
+  absolute path from a relative path.
+
+* The :module:`GNUInstallDirs` module learned special default values
+  for certain installation prefixes according to the `GNU Coding
+  Standards`_ and the `Filesystem Hierarchy Standard`_.
+
+.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
+
+* Add a new TEST operator to if() that evaluates to true
+  if a given test name has been defined.
+
+* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :command:`install(FILES)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :module:`FindJava` module learned to optionally find
+  the ``idlj`` and ``jarsigner`` tools.
+
+* The :module:`UseJava` module ``add_jar`` function learned
+  to support response files (e.g. ``@srcs.txt``) for source
+  specification.
+
+* The :module:`UseJava` module ``install_jar`` function learned
+  new ``DESTINATION`` and ``COMPONENT`` options to specify
+  the corresponding :command:`install` command options.
+
+* The :module:`UseJava` module gained a new ``create_javah``
+  function to create C headers from Java classes.
+
+* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
+  :ref:`Makefile Generators` whether to generate commands to print output
+  after each target is completed.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU C compilers on Windows.
+
+* The ``SONAME`` field is no longer set for ``MODULE`` libraries
+  created with the :command:`add_library` command.  ``MODULE``
+  libraries are meant for explicit dynamic loading at runtime.
+  They cannot be linked so ``SONAME`` is not useful.
+
+* CMake learned to honor ``*.manifest`` source files with MSVC tools.
+  Manifest files named as sources of ``.exe`` and ``.dll`` targets
+  will be merged with linker-generated manifests and embedded in the
+  binary.
+
+* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
+  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
+  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
+  command which may be used to query for arbitrary variables from a package
+  (such as for related tools or data and plugin install paths).
+
+* The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
+  effect.  Previously it was partially implemented and unreliable.
+
+* CMake no longer links executables with flags to export symbols
+  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
+  See policy :policy:`CMP0065`.
+
+* The :command:`string` command learned a new ``APPEND`` subcommand.
+
+* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
+  were introduced to allow project code to query where a target is defined.
+
+* The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
+  :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
+  work in environments where only CXX is enabled.
+
+* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
+  variable references in the output.
+
+* :ref:`Visual Studio Generators` learned to support additonal
+  target properties to customize projects for NVIDIA Nsight
+  Tegra Visual Studio Edition:
+
+  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
+  * :prop_tgt:`ANDROID_ARCH`
+  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
+  * :prop_tgt:`ANDROID_PROCESS_MAX`
+  * :prop_tgt:`ANDROID_PROGUARD`
+  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
+  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
+  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
+  * :prop_tgt:`ANDROID_STL_TYPE`
+
+* The :generator:`Visual Studio 14 2015` generator learned to select
+  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
+  variable and the SDKs available on the host.
diff --git a/Help/release/dev/CPack-updates.rst b/Help/release/dev/CPack-updates.rst
deleted file mode 100644
index ea0780f..0000000
--- a/Help/release/dev/CPack-updates.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-CPack-updates
--------------
-
-* The :module:`CPack` module no longer mangles settings with CMake-special
-  characters when they're used as defaults for other settings. The macro
-  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
-
-* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
-  which can be used to ensure the cpack program receives the settings' values
-  exactly as they were set, even if they contain CMake-special characters.
-  For compatibility, it's off by default.
diff --git a/Help/release/dev/ConcurrentFortran-compiler-id.rst b/Help/release/dev/ConcurrentFortran-compiler-id.rst
deleted file mode 100644
index 71e79aa..0000000
--- a/Help/release/dev/ConcurrentFortran-compiler-id.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-ConcurrentFortran-compiler-id
------------------------------
-
-* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
-  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
diff --git a/Help/release/dev/ExternalProject-USES_TERMINAL.rst b/Help/release/dev/ExternalProject-USES_TERMINAL.rst
deleted file mode 100644
index 415540d..0000000
--- a/Help/release/dev/ExternalProject-USES_TERMINAL.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalProject-USES_TERMINAL
------------------------------
-
-* The :module:`ExternalProject` module learned new ``USES_TERMINAL``
-  arguments for giving steps exclusive terminal access.  Especially
-  useful with the :generator:`Ninja` generator to monitor CMake
-  superbuild progress and prevent CPU oversubscription.
diff --git a/Help/release/dev/ExternalProject_init_selected_submodules.rst b/Help/release/dev/ExternalProject_init_selected_submodules.rst
deleted file mode 100644
index e642c19..0000000
--- a/Help/release/dev/ExternalProject_init_selected_submodules.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalProject_init_selected_submodules
-----------------------------------------
-
-* The :module:`ExternalProject` module :command:`ExternalProject_Add`
-  function ``GIT_SUBMODULES`` option now also limits the set of
-  submodules that are initialized in addition to the prior behavior
-  of limiting the set of submodules that are updated.
diff --git a/Help/release/dev/ExternalProject_stash_save_all.rst b/Help/release/dev/ExternalProject_stash_save_all.rst
deleted file mode 100644
index e00ed44..0000000
--- a/Help/release/dev/ExternalProject_stash_save_all.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-ExternalProject_stash_save_all
-------------------------------
-
-* Use "git stash save --all" only if supported. The --all option for git-stash
-  wasn't introduced until git version 1.7.6.
diff --git a/Help/release/dev/FindBISON-DEFINES_FILE.rst b/Help/release/dev/FindBISON-DEFINES_FILE.rst
deleted file mode 100644
index 815d560..0000000
--- a/Help/release/dev/FindBISON-DEFINES_FILE.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-FindBISON-DEFINES_FILE
-----------------------
-
-* The :module:`FindBISON` module ``BISON_TARGET`` macro learned a
-  new ``DEFINES_FILE`` option to specify a custom output header
-  to be generated.
diff --git a/Help/release/dev/FindHDF5-updates.rst b/Help/release/dev/FindHDF5-updates.rst
deleted file mode 100644
index a9297bb..0000000
--- a/Help/release/dev/FindHDF5-updates.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-FindHDF5-updates
-----------------
-
-* The :module:`FindHDF5` module learend a new ``HDF5_PREFER_PARALLEL``
-  option allowing users to specify that a parallel HDF5 tool is
-  preferred if both are available.
diff --git a/Help/release/dev/FindIce-imported-targets.rst b/Help/release/dev/FindIce-imported-targets.rst
deleted file mode 100644
index 7e1b2f4..0000000
--- a/Help/release/dev/FindIce-imported-targets.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindIce-imported-targets
-------------------------
-
-* The :module:`FindIce` module now provides imported targets.
diff --git a/Help/release/dev/FindOpenSSL-imported-targets.rst b/Help/release/dev/FindOpenSSL-imported-targets.rst
deleted file mode 100644
index 63090af..0000000
--- a/Help/release/dev/FindOpenSSL-imported-targets.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindOpenSSL-imported-targets
-----------------------------
-
-* The :module:`FindOpenSSL` module now provides imported targets.
diff --git a/Help/release/dev/FindOpenSSL-static-libs.rst b/Help/release/dev/FindOpenSSL-static-libs.rst
deleted file mode 100644
index 69ec6f2..0000000
--- a/Help/release/dev/FindOpenSSL-static-libs.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindOpenSSL-static-libs
------------------------
-
-* The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
-  option to search only for static libraries.
diff --git a/Help/release/dev/FindProtobuf-python-extension.rst b/Help/release/dev/FindProtobuf-python-extension.rst
deleted file mode 100644
index 95463bf..0000000
--- a/Help/release/dev/FindProtobuf-python-extension.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-FindProtobuf-python-extension
------------------------------
-
-* The :module:`FindProtobuf` module gained a new
-  :command:`protobuf_generate_python` function to generate python
-  sources from ``.proto`` files.
diff --git a/Help/release/dev/FindTIFF-updates.rst b/Help/release/dev/FindTIFF-updates.rst
deleted file mode 100644
index 083e40f..0000000
--- a/Help/release/dev/FindTIFF-updates.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindTIFF-updates
-----------------
-
-* The :module:`FindTIFF` module learned to search separately for
-  debug and release variants.
diff --git a/Help/release/dev/FindXercesC-updates.rst b/Help/release/dev/FindXercesC-updates.rst
deleted file mode 100644
index 47a8ada..0000000
--- a/Help/release/dev/FindXercesC-updates.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindXercesC-updates
--------------------
-
-* The :module:`FindXercesC` module learned to search separately for
-  debug and release variants.
diff --git a/Help/release/dev/FindZLIB-per-config.rst b/Help/release/dev/FindZLIB-per-config.rst
deleted file mode 100644
index 97fd6ef..0000000
--- a/Help/release/dev/FindZLIB-per-config.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindZLIB-per-config
--------------------
-
-* The :module:`FindZLIB` module learned to search separately for
-  debug and release variants.
diff --git a/Help/release/dev/FindwxWidgets-updates.rst b/Help/release/dev/FindwxWidgets-updates.rst
deleted file mode 100644
index aa470f2..0000000
--- a/Help/release/dev/FindwxWidgets-updates.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindwxWidgets-updates
----------------------
-
-* The :module:`FindwxWidgets` module learned to support version requests.
diff --git a/Help/release/dev/GNUInstallDirs-special-prefixes.rst b/Help/release/dev/GNUInstallDirs-special-prefixes.rst
deleted file mode 100644
index 83c1352..0000000
--- a/Help/release/dev/GNUInstallDirs-special-prefixes.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-GNUInstallDirs-special-prefixes
--------------------------------
-
-* The :module:`GNUInstallDirs` module learned special default values
-  for certain installation prefixes according to the `GNU Coding
-  Standards`_ and the `Filesystem Hierarchy Standard`_.
-
-.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
diff --git a/Help/release/dev/OUTPUT_DIRECTORY-genex.rst b/Help/release/dev/OUTPUT_DIRECTORY-genex.rst
deleted file mode 100644
index 8b839c0..0000000
--- a/Help/release/dev/OUTPUT_DIRECTORY-genex.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OUTPUT_DIRECTORY-genex
-----------------------
-
-* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
-  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
-  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/OUTPUT_NAME-genex.rst b/Help/release/dev/OUTPUT_NAME-genex.rst
deleted file mode 100644
index 0a39820..0000000
--- a/Help/release/dev/OUTPUT_NAME-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-OUTPUT_NAME-genex
------------------
-
-* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/Threads-CXX.rst b/Help/release/dev/Threads-CXX.rst
deleted file mode 100644
index 2e34a01..0000000
--- a/Help/release/dev/Threads-CXX.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Threads-CXX
-------------
-
-* The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
-  :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
-  work in environments where only CXX is enabled.
diff --git a/Help/release/dev/add-apple-swift-language.rst b/Help/release/dev/add-apple-swift-language.rst
deleted file mode 100644
index 60ce5d8..0000000
--- a/Help/release/dev/add-apple-swift-language.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-add-apple-swift-language
-------------------------
-
-* CMake learned rudimentary support for the Apple Swift language.  When using
-  the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
-  the ``Swift`` language with the :command:`enable_language` command or the
-  :command:`project` command (this is an error with other generators or when
-  Xcode is too old).  Then one may list ``.swift`` source files in targets
-  for compilation.
diff --git a/Help/release/dev/add-link-search-static-properties-defaults.rst b/Help/release/dev/add-link-search-static-properties-defaults.rst
deleted file mode 100644
index 98dda30..0000000
--- a/Help/release/dev/add-link-search-static-properties-defaults.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-add-link-search-static-properties-defaults
-------------------------------------------
-
-* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
-  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
-  introduced to initialize the
-  :prop_tgt:`LINK_SEARCH_START_STATIC` and
-  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
-  respectively.
diff --git a/Help/release/dev/auto_export_dll_symbols.rst b/Help/release/dev/auto_export_dll_symbols.rst
deleted file mode 100644
index 9db2b5e..0000000
--- a/Help/release/dev/auto_export_dll_symbols.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-auto_export_dll_symbols
------------------------
-
-* On Windows with MS-compatible tools, CMake learned to optionally
-  generate a module definition (``.def``) file for ``SHARED`` libraries.
-  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
diff --git a/Help/release/dev/compiler-launcher.rst b/Help/release/dev/compiler-launcher.rst
deleted file mode 100644
index 3ba692d..0000000
--- a/Help/release/dev/compiler-launcher.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-compiler-launcher
------------------
-
-* The :ref:`Makefile Generators` and the :generator:`Ninja` generator
-  learned to add compiler launcher tools like distcc and ccache along with the
-  compiler for ``C`` and ``CXX`` languages.  See the
-  :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
-  :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
diff --git a/Help/release/dev/cpack-deb-checksum-on-symlinks.rts b/Help/release/dev/cpack-deb-checksum-on-symlinks.rts
deleted file mode 100644
index 9bfeded..0000000
--- a/Help/release/dev/cpack-deb-checksum-on-symlinks.rts
+++ /dev/null
@@ -1,4 +0,0 @@
-cpack-deb-checksum-on-symlinks
-------------------------------
-
-* The :module:`CPackDeb` module now correctly excludes symlinks during package checksum calculation.
diff --git a/Help/release/dev/cpack-deb-component-dependencies.rst b/Help/release/dev/cpack-deb-component-dependencies.rst
deleted file mode 100644
index 2714222..0000000
--- a/Help/release/dev/cpack-deb-component-dependencies.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-cpack-deb-component-dependencies
---------------------------------
-
-* The :module:`CPackDeb` module learned to set package dependencies
-  per component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS` and
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`.
diff --git a/Help/release/dev/cpack-deb-fakeroot-removal.rts b/Help/release/dev/cpack-deb-fakeroot-removal.rts
deleted file mode 100644
index e0b97d1..0000000
--- a/Help/release/dev/cpack-deb-fakeroot-removal.rts
+++ /dev/null
@@ -1,4 +0,0 @@
-cpack-deb-fakeroot-removal
---------------------------
-
-* :module:`CPackDeb` no longer uses fakeroot and system tar program for packaging.
diff --git a/Help/release/dev/cpack-package-empty-dirs.rts b/Help/release/dev/cpack-package-empty-dirs.rts
deleted file mode 100644
index 1f56e1a..0000000
--- a/Help/release/dev/cpack-package-empty-dirs.rts
+++ /dev/null
@@ -1,4 +0,0 @@
-cpack-package-empty-dirs
-------------------------
-
-* The :module:`CPack` module learned to package empty directories.
diff --git a/Help/release/dev/ctest-custom-output-size.rst b/Help/release/dev/ctest-custom-output-size.rst
deleted file mode 100644
index 8098b93..0000000
--- a/Help/release/dev/ctest-custom-output-size.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ctest-custom-output-size
-------------------------
-
-* :manual:`ctest(1)` learned options
-  ``--test-output-size-passed`` and ``--test-output-size-failed``
-  to customize the limit on test output size submitted when
-  running as a :ref:`Dashboard Client`.
diff --git a/Help/release/dev/ctest-test-load-option.rst b/Help/release/dev/ctest-test-load-option.rst
deleted file mode 100644
index 069f49a..0000000
--- a/Help/release/dev/ctest-test-load-option.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-ctest-test-load-option
-----------------------
-
-* CTest learned to optionally measure the CPU load during parallel
-  testing and avoid starting tests that may cause the load to exceed
-  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
-  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
-  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
-  option of the :command:`ctest_test` command.
diff --git a/Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst b/Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst
deleted file mode 100644
index 3bdaebe..0000000
--- a/Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-doc-CMakeExpandImportedTargets-deprecated
------------------------------------------
-
-* The :module:`CMakeExpandImportedTargets` module is now documented
-  as deprecated.  See module documentation for an explanation.
diff --git a/Help/release/dev/find_program-NAMES_PER_DIR.rst b/Help/release/dev/find_program-NAMES_PER_DIR.rst
deleted file mode 100644
index 04cd170..0000000
--- a/Help/release/dev/find_program-NAMES_PER_DIR.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-find_program-NAMES_PER_DIR
---------------------------
-
-* The :command:`find_program` command learned a ``NAMES_PER_DIR``
-  option to consdier all given ``NAMES`` in each directory before
-  moving on to the next directory.
diff --git a/Help/release/dev/genex-SHELL_PATH.rst b/Help/release/dev/genex-SHELL_PATH.rst
deleted file mode 100644
index 86af720..0000000
--- a/Help/release/dev/genex-SHELL_PATH.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-genex-SHELL_PATH
-----------------
-
-* A new ``$<SHELL_PATH:...>``
-  :manual:`generator expression <cmake-generator-expressions(7)>`
-  has been added.
diff --git a/Help/release/dev/get-filename-component-base-dir.rst b/Help/release/dev/get-filename-component-base-dir.rst
deleted file mode 100644
index c0df759..0000000
--- a/Help/release/dev/get-filename-component-base-dir.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-get-filename-component-base-dir
--------------------------------
-
-* The :command:`get_filename_component` command learned a new ``BASE_DIR``
-  subcommand.  This is used to specify a base directory when calculating an
-  absolute path from a relative path.
diff --git a/Help/release/dev/if-TEST.rst b/Help/release/dev/if-TEST.rst
deleted file mode 100644
index 05bf71c..0000000
--- a/Help/release/dev/if-TEST.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-if-TEST
--------
-
-* Add a new TEST operator to if() that evaluates to true
-  if a given test name has been defined.
diff --git a/Help/release/dev/install-directory-dest-genex.rst b/Help/release/dev/install-directory-dest-genex.rst
deleted file mode 100644
index 2b83bbd..0000000
--- a/Help/release/dev/install-directory-dest-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-install-directory-dest-genex
-----------------------------
-
-* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/install-files-dest-genex.rst b/Help/release/dev/install-files-dest-genex.rst
deleted file mode 100644
index b7aa8b3..0000000
--- a/Help/release/dev/install-files-dest-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-install-files-dest-genex
-------------------------
-
-* The :command:`install(FILES)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/java-updates.rst b/Help/release/dev/java-updates.rst
deleted file mode 100644
index 8fd4ed6..0000000
--- a/Help/release/dev/java-updates.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-java-updates
-------------
-
-* The :module:`FindJava` module learned to optionally find
-  the ``idlj`` and ``jarsigner`` tools.
-
-* The :module:`UseJava` module ``add_jar`` function learned
-  to support response files (e.g. ``@srcs.txt``) for source
-  specification.
-
-* The :module:`UseJava` module ``install_jar`` function learned
-  new ``DESTINATION`` and ``COMPONENT`` options to specify
-  the corresponding :command:`install` command options.
-
-* The :module:`UseJava` module gained a new ``create_javah``
-  function to create C headers from Java classes.
diff --git a/Help/release/dev/makefile-target-messages.rst b/Help/release/dev/makefile-target-messages.rst
deleted file mode 100644
index 3d2cd9b..0000000
--- a/Help/release/dev/makefile-target-messages.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-makefile-target-messages
-------------------------
-
-* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
-  :ref:`Makefile Generators` whether to generate commands to print output
-  after each target is completed.
diff --git a/Help/release/dev/mingw-compile-features-C.rst b/Help/release/dev/mingw-compile-features-C.rst
deleted file mode 100644
index b3f99f1..0000000
--- a/Help/release/dev/mingw-compile-features-C.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-mingw-compile-features-C
-------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU C compilers on Windows.
diff --git a/Help/release/dev/modules-no-soname.rst b/Help/release/dev/modules-no-soname.rst
deleted file mode 100644
index 8fe74f8..0000000
--- a/Help/release/dev/modules-no-soname.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-modules-no-soname
------------------
-
-* The ``SONAME`` field is no longer set for ``MODULE`` libraries
-  created with the :command:`add_library` command.  ``MODULE``
-  libraries are meant for explicit dynamic loading at runtime.
-  They cannot be linked so ``SONAME`` is not useful.
diff --git a/Help/release/dev/ms-manifest-files.rst b/Help/release/dev/ms-manifest-files.rst
deleted file mode 100644
index 94fbe83..0000000
--- a/Help/release/dev/ms-manifest-files.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ms-manifest-files
------------------
-
-* CMake learned to honor ``*.manifest`` source files with MSVC tools.
-  Manifest files named as sources of ``.exe`` and ``.dll`` targets
-  will be merged with linker-generated manifests and embedded in the
-  binary.
diff --git a/Help/release/dev/pkg-config-variable-function.rst b/Help/release/dev/pkg-config-variable-function.rst
deleted file mode 100644
index e181d13..0000000
--- a/Help/release/dev/pkg-config-variable-function.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-pkg-config-variable-function
-----------------------------
-
-* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
-  command which may be used to query for arbitrary variables from a package
-  (such as for related tools or data and plugin install paths).
diff --git a/Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst b/Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst
deleted file mode 100644
index dd52ace..0000000
--- a/Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-remove-CMAKE_USE_RELATIVE_PATHS
--------------------------------
-
-* The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
-  effect.  Previously it was partially implemented and unreliable.
diff --git a/Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst b/Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst
deleted file mode 100644
index f8ce044..0000000
--- a/Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-restrict-shlib-link-flags-to-enable-exports
--------------------------------------------
-
-* CMake no longer links executables with flags to export symbols
-  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
-  See policy :policy:`CMP0065`.
diff --git a/Help/release/dev/string-append.rst b/Help/release/dev/string-append.rst
deleted file mode 100644
index 190b51e..0000000
--- a/Help/release/dev/string-append.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-string-append
--------------
-
-* The :command:`string` command learned a new ``APPEND`` subcommand.
diff --git a/Help/release/dev/target-directory-properties.rst b/Help/release/dev/target-directory-properties.rst
deleted file mode 100644
index 5ab2938..0000000
--- a/Help/release/dev/target-directory-properties.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-target-directory-properties
----------------------------
-
-* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
-  were introduced to allow project code to query where a target is defined.
diff --git a/Help/release/dev/trace-expand.rst b/Help/release/dev/trace-expand.rst
deleted file mode 100644
index 383326e..0000000
--- a/Help/release/dev/trace-expand.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-trace-expand
-------------
-
-* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
-  variable references in the output.
diff --git a/Help/release/dev/vs-nsight-tegra-attributes.rst b/Help/release/dev/vs-nsight-tegra-attributes.rst
deleted file mode 100644
index 7ebea33..0000000
--- a/Help/release/dev/vs-nsight-tegra-attributes.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-vs-nsight-tegra-attributes
---------------------------
-
-* :ref:`Visual Studio Generators` learned to support additonal
-  target properties to customize projects for NVIDIA Nsight
-  Tegra Visual Studio Edition:
-
-  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
-  * :prop_tgt:`ANDROID_ARCH`
-  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
-  * :prop_tgt:`ANDROID_PROCESS_MAX`
-  * :prop_tgt:`ANDROID_PROGUARD`
-  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
-  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
-  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
-  * :prop_tgt:`ANDROID_STL_TYPE`
diff --git a/Help/release/dev/vs-win10-sdk.rst b/Help/release/dev/vs-win10-sdk.rst
deleted file mode 100644
index 50eb391..0000000
--- a/Help/release/dev/vs-win10-sdk.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-vs-win10-sdk
-------------
-
-* The :generator:`Visual Studio 14 2015` generator learned to select
-  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
-  variable and the SDKs available on the host.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index b558e9d..752acbd 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -13,6 +13,7 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   3.4 <3.4>
    3.3 <3.3>
    3.2 <3.2>
    3.1 <3.1>

-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.4.rst                               |  269 ++++++++++++++++++++
 Help/release/dev/CPack-updates.rst                 |   11 -
 Help/release/dev/ConcurrentFortran-compiler-id.rst |    5 -
 Help/release/dev/ExternalProject-USES_TERMINAL.rst |    7 -
 .../ExternalProject_init_selected_submodules.rst   |    7 -
 .../release/dev/ExternalProject_stash_save_all.rst |    5 -
 Help/release/dev/FindBISON-DEFINES_FILE.rst        |    6 -
 Help/release/dev/FindHDF5-updates.rst              |    6 -
 Help/release/dev/FindIce-imported-targets.rst      |    4 -
 Help/release/dev/FindOpenSSL-imported-targets.rst  |    4 -
 Help/release/dev/FindOpenSSL-static-libs.rst       |    5 -
 Help/release/dev/FindProtobuf-python-extension.rst |    6 -
 Help/release/dev/FindTIFF-updates.rst              |    5 -
 Help/release/dev/FindXercesC-updates.rst           |    5 -
 Help/release/dev/FindZLIB-per-config.rst           |    5 -
 Help/release/dev/FindwxWidgets-updates.rst         |    4 -
 .../dev/GNUInstallDirs-special-prefixes.rst        |    9 -
 Help/release/dev/OUTPUT_DIRECTORY-genex.rst        |    7 -
 Help/release/dev/OUTPUT_NAME-genex.rst             |    5 -
 Help/release/dev/Threads-CXX.rst                   |    6 -
 Help/release/dev/add-apple-swift-language.rst      |    9 -
 .../add-link-search-static-properties-defaults.rst |    9 -
 Help/release/dev/auto_export_dll_symbols.rst       |    6 -
 Help/release/dev/compiler-launcher.rst             |    8 -
 .../release/dev/cpack-deb-checksum-on-symlinks.rts |    4 -
 .../dev/cpack-deb-component-dependencies.rst       |   12 -
 Help/release/dev/cpack-deb-fakeroot-removal.rts    |    4 -
 Help/release/dev/cpack-package-empty-dirs.rts      |    4 -
 Help/release/dev/ctest-custom-output-size.rst      |    7 -
 Help/release/dev/ctest-test-load-option.rst        |    9 -
 .../doc-CMakeExpandImportedTargets-deprecated.rst  |    5 -
 Help/release/dev/find_program-NAMES_PER_DIR.rst    |    6 -
 Help/release/dev/genex-SHELL_PATH.rst              |    6 -
 .../dev/get-filename-component-base-dir.rst        |    6 -
 Help/release/dev/if-TEST.rst                       |    5 -
 Help/release/dev/install-directory-dest-genex.rst  |    5 -
 Help/release/dev/install-files-dest-genex.rst      |    5 -
 Help/release/dev/java-updates.rst                  |   16 --
 Help/release/dev/makefile-target-messages.rst      |    6 -
 Help/release/dev/mingw-compile-features-C.rst      |    5 -
 Help/release/dev/modules-no-soname.rst             |    7 -
 Help/release/dev/ms-manifest-files.rst             |    7 -
 Help/release/dev/pkg-config-variable-function.rst  |    6 -
 .../dev/remove-CMAKE_USE_RELATIVE_PATHS.rst        |    5 -
 ...restrict-shlib-link-flags-to-enable-exports.rst |    6 -
 Help/release/dev/string-append.rst                 |    4 -
 Help/release/dev/target-directory-properties.rst   |    5 -
 Help/release/dev/trace-expand.rst                  |    5 -
 Help/release/dev/vs-nsight-tegra-attributes.rst    |   21 --
 Help/release/dev/vs-win10-sdk.rst                  |    6 -
 Help/release/index.rst                             |    1 +
 51 files changed, 270 insertions(+), 321 deletions(-)
 create mode 100644 Help/release/3.4.rst
 delete mode 100644 Help/release/dev/CPack-updates.rst
 delete mode 100644 Help/release/dev/ConcurrentFortran-compiler-id.rst
 delete mode 100644 Help/release/dev/ExternalProject-USES_TERMINAL.rst
 delete mode 100644 Help/release/dev/ExternalProject_init_selected_submodules.rst
 delete mode 100644 Help/release/dev/ExternalProject_stash_save_all.rst
 delete mode 100644 Help/release/dev/FindBISON-DEFINES_FILE.rst
 delete mode 100644 Help/release/dev/FindHDF5-updates.rst
 delete mode 100644 Help/release/dev/FindIce-imported-targets.rst
 delete mode 100644 Help/release/dev/FindOpenSSL-imported-targets.rst
 delete mode 100644 Help/release/dev/FindOpenSSL-static-libs.rst
 delete mode 100644 Help/release/dev/FindProtobuf-python-extension.rst
 delete mode 100644 Help/release/dev/FindTIFF-updates.rst
 delete mode 100644 Help/release/dev/FindXercesC-updates.rst
 delete mode 100644 Help/release/dev/FindZLIB-per-config.rst
 delete mode 100644 Help/release/dev/FindwxWidgets-updates.rst
 delete mode 100644 Help/release/dev/GNUInstallDirs-special-prefixes.rst
 delete mode 100644 Help/release/dev/OUTPUT_DIRECTORY-genex.rst
 delete mode 100644 Help/release/dev/OUTPUT_NAME-genex.rst
 delete mode 100644 Help/release/dev/Threads-CXX.rst
 delete mode 100644 Help/release/dev/add-apple-swift-language.rst
 delete mode 100644 Help/release/dev/add-link-search-static-properties-defaults.rst
 delete mode 100644 Help/release/dev/auto_export_dll_symbols.rst
 delete mode 100644 Help/release/dev/compiler-launcher.rst
 delete mode 100644 Help/release/dev/cpack-deb-checksum-on-symlinks.rts
 delete mode 100644 Help/release/dev/cpack-deb-component-dependencies.rst
 delete mode 100644 Help/release/dev/cpack-deb-fakeroot-removal.rts
 delete mode 100644 Help/release/dev/cpack-package-empty-dirs.rts
 delete mode 100644 Help/release/dev/ctest-custom-output-size.rst
 delete mode 100644 Help/release/dev/ctest-test-load-option.rst
 delete mode 100644 Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst
 delete mode 100644 Help/release/dev/find_program-NAMES_PER_DIR.rst
 delete mode 100644 Help/release/dev/genex-SHELL_PATH.rst
 delete mode 100644 Help/release/dev/get-filename-component-base-dir.rst
 delete mode 100644 Help/release/dev/if-TEST.rst
 delete mode 100644 Help/release/dev/install-directory-dest-genex.rst
 delete mode 100644 Help/release/dev/install-files-dest-genex.rst
 delete mode 100644 Help/release/dev/java-updates.rst
 delete mode 100644 Help/release/dev/makefile-target-messages.rst
 delete mode 100644 Help/release/dev/mingw-compile-features-C.rst
 delete mode 100644 Help/release/dev/modules-no-soname.rst
 delete mode 100644 Help/release/dev/ms-manifest-files.rst
 delete mode 100644 Help/release/dev/pkg-config-variable-function.rst
 delete mode 100644 Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst
 delete mode 100644 Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst
 delete mode 100644 Help/release/dev/string-append.rst
 delete mode 100644 Help/release/dev/target-directory-properties.rst
 delete mode 100644 Help/release/dev/trace-expand.rst
 delete mode 100644 Help/release/dev/vs-nsight-tegra-attributes.rst
 delete mode 100644 Help/release/dev/vs-win10-sdk.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 10:56:49 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 10:56:49 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1388-g487fe8c
Message-ID: <20151002145649.B6D6FBFBA7@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  487fe8c97d7067d7acf02c61ed6c8e7524c5f21b (commit)
       via  7bc202ccd49b42eacac78d7494f7aab0599f9c7b (commit)
      from  8deb0835e6dff3c15792790b95c83b3b8f8d8ff1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=487fe8c97d7067d7acf02c61ed6c8e7524c5f21b
commit 487fe8c97d7067d7acf02c61ed6c8e7524c5f21b
Merge: 8deb083 7bc202c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:56:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 10:56:48 2015 -0400

    Merge topic 'test-VSGNUFortran-oracle-link'
    
    7bc202cc Tests: Simplify VSGNUFortran Oracle-specific link lines


-----------------------------------------------------------------------

Summary of changes:
 Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 10:56:51 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 10:56:51 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1390-g9b5554c
Message-ID: <20151002145651.ADA80BFBA7@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  9b5554cda122e8be179cbc2bbe9ed82ed26b20b0 (commit)
       via  85d7a610a2a5e5f82a8e4b3e1322c54e27862633 (commit)
      from  487fe8c97d7067d7acf02c61ed6c8e7524c5f21b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b5554cda122e8be179cbc2bbe9ed82ed26b20b0
commit 9b5554cda122e8be179cbc2bbe9ed82ed26b20b0
Merge: 487fe8c 85d7a61
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:56:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 10:56:50 2015 -0400

    Merge topic 'test-FindPackageModeMakefileTest-flags'
    
    85d7a610 Tests: Use consistent C++ flags FindPackageModeMakefileTest


-----------------------------------------------------------------------

Summary of changes:
 Tests/FindPackageModeMakefileTest/Makefile.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 10:56:53 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 10:56:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1394-g7555bab
Message-ID: <20151002145653.B5903BFBB1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  7555babbcf4b2b68bdfe99649be3b6076230518b (commit)
       via  5fdf75947822bc17d30a9e60022a4fc77b4cdf63 (commit)
       via  c824b23d15b92247f3527f1b884c23d34e6749b5 (commit)
       via  61bc0f7363ca2917707d57fefb52b79b0114bb19 (commit)
      from  9b5554cda122e8be179cbc2bbe9ed82ed26b20b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7555babbcf4b2b68bdfe99649be3b6076230518b
commit 7555babbcf4b2b68bdfe99649be3b6076230518b
Merge: 9b5554c 5fdf759
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:56:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 10:56:52 2015 -0400

    Merge topic 'compiler-features-solaris'
    
    5fdf7594 Tests: Suppress WriteCompilerDetectionHeader failure on SunPro
    c824b23d Features: Fix C++98 flags on Oracle SolarisStudio 12.4 on Linux
    61bc0f73 Features: Disable support for Oracle SolarisStudio on non-Linux


-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-compile-features.7.rst           |    2 +-
 Modules/Compiler/SunPro-CXX.cmake                  |   32 ++++++++++++--------
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |    3 +-
 3 files changed, 22 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 10:57:11 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 10:57:11 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3466-g0279f66
Message-ID: <20151002145711.1F27EBFBBF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0279f665b4c3fb1ac83fcb92a7f0f6be413d2b73 (commit)
       via  7555babbcf4b2b68bdfe99649be3b6076230518b (commit)
       via  9b5554cda122e8be179cbc2bbe9ed82ed26b20b0 (commit)
       via  487fe8c97d7067d7acf02c61ed6c8e7524c5f21b (commit)
      from  07368517a278448a751b1adef771a73b28ca22e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0279f665b4c3fb1ac83fcb92a7f0f6be413d2b73
commit 0279f665b4c3fb1ac83fcb92a7f0f6be413d2b73
Merge: 0736851 7555bab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:57:04 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 10:57:04 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 10:57:33 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 10:57:33 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3469-g2977e8e
Message-ID: <20151002145733.EF015BFC09@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2977e8e345bf27c147a3da97dbbb6b12d83ee3e9 (commit)
       via  dc5fb20e10d8737af62c29930eece8e2e4a9e948 (commit)
       via  32e54f1a6b1deca20a00b194467ec9204346a4ae (commit)
      from  0279f665b4c3fb1ac83fcb92a7f0f6be413d2b73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2977e8e345bf27c147a3da97dbbb6b12d83ee3e9
commit 2977e8e345bf27c147a3da97dbbb6b12d83ee3e9
Merge: 0279f66 dc5fb20
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:57:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 10:57:32 2015 -0400

    Merge topic 'doc-3.4-relnotes' into next
    
    dc5fb20e Help: Organize and revise 3.4 release notes
    32e54f1a Help: Consolidate 3.4 release notes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc5fb20e10d8737af62c29930eece8e2e4a9e948
commit dc5fb20e10d8737af62c29930eece8e2e4a9e948
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:38:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 10:57:24 2015 -0400

    Help: Organize and revise 3.4 release notes
    
    Add section headers similar to the 3.3 release notes and move each
    individual bullet into an appropriate section.  Revise a few bullets.

diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst
index 448ea35..b6f9702 100644
--- a/Help/release/3.4.rst
+++ b/Help/release/3.4.rst
@@ -7,6 +7,16 @@ CMake 3.4 Release Notes
 
 Changes made since CMake 3.4 include the following.
 
+New Features
+============
+
+Generators
+----------
+
+* The :generator:`Visual Studio 14 2015` generator learned to select
+  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
+  variable and the SDKs available on the host.
+
 * CMake learned rudimentary support for the Apple Swift language.  When using
   the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
   the ``Swift`` language with the :command:`enable_language` command or the
@@ -14,76 +24,96 @@ Changes made since CMake 3.4 include the following.
   Xcode is too old).  Then one may list ``.swift`` source files in targets
   for compilation.
 
-* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
-  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
-  introduced to initialize the
-  :prop_tgt:`LINK_SEARCH_START_STATIC` and
-  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
-  respectively.
+Commands
+--------
 
-* On Windows with MS-compatible tools, CMake learned to optionally
-  generate a module definition (``.def``) file for ``SHARED`` libraries.
-  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
+* The :command:`find_program` command learned a ``NAMES_PER_DIR``
+  option to consdier all given ``NAMES`` in each directory before
+  moving on to the next directory.
+
+* The :command:`get_filename_component` command learned a new ``BASE_DIR``
+  subcommand.  This is used to specify a base directory when calculating an
+  absolute path from a relative path.
+
+* The :command:`if` command learned a new ``TEST`` operator that evaluates
+  to true if a given test name has been defined by the :command:`add_test`
+  command.  See policy :policy:`CMP0064`.
+
+* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :command:`install(FILES)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :command:`string` command learned a new ``APPEND`` subcommand.
+
+Variables
+---------
 
 * The :ref:`Makefile Generators` and the :generator:`Ninja` generator
-  learned to add compiler launcher tools like distcc and ccache along with the
-  compiler for ``C`` and ``CXX`` languages.  See the
+  learned to add compiler launcher tools like distcc and ccache along
+  with the compiler for ``C`` and ``CXX`` languages.  See the
   :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
   :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
 
-* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
-  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
+* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
+  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
+  introduced to initialize the
+  :prop_tgt:`LINK_SEARCH_START_STATIC` and
+  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
+  respectively.
 
-* The :module:`CPackDeb` module now correctly excludes symlinks during package checksum calculation.
+Properties
+----------
 
-* The :module:`CPackDeb` module learned to set package dependencies
-  per component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS` and
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`.
+* :ref:`Visual Studio Generators` learned to support additonal
+  target properties to customize projects for NVIDIA Nsight
+  Tegra Visual Studio Edition:
 
-* :module:`CPackDeb` no longer uses fakeroot and system tar program for packaging.
+  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
+  * :prop_tgt:`ANDROID_ARCH`
+  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
+  * :prop_tgt:`ANDROID_PROCESS_MAX`
+  * :prop_tgt:`ANDROID_PROGUARD`
+  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
+  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
+  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
+  * :prop_tgt:`ANDROID_STL_TYPE`
 
-* The :module:`CPack` module learned to package empty directories.
+* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
+  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
+  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
 
-* The :module:`CPack` module no longer mangles settings with CMake-special
-  characters when they're used as defaults for other settings. The macro
-  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
+* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
+  were introduced to allow project code to query where a target is defined.
 
-* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
-  which can be used to ensure the cpack program receives the settings' values
-  exactly as they were set, even if they contain CMake-special characters.
-  For compatibility, it's off by default.
+* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
 
-* :manual:`ctest(1)` learned options
-  ``--test-output-size-passed`` and ``--test-output-size-failed``
-  to customize the limit on test output size submitted when
-  running as a :ref:`Dashboard Client`.
+* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
+  :ref:`Makefile Generators` whether to generate commands to print output
+  after each target is completed.
 
-* CTest learned to optionally measure the CPU load during parallel
-  testing and avoid starting tests that may cause the load to exceed
-  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
-  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
-  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
-  option of the :command:`ctest_test` command.
+* On Windows with MS-compatible tools, CMake learned to optionally
+  generate a module definition (``.def``) file for ``SHARED`` libraries.
+  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
 
-* The :module:`CMakeExpandImportedTargets` module is now documented
-  as deprecated.  See module documentation for an explanation.
+Modules
+-------
 
 * The :module:`ExternalProject` module :command:`ExternalProject_Add`
   function ``GIT_SUBMODULES`` option now also limits the set of
   submodules that are initialized in addition to the prior behavior
   of limiting the set of submodules that are updated.
 
-* Use "git stash save --all" only if supported. The --all option for git-stash
-  wasn't introduced until git version 1.7.6.
-
 * The :module:`ExternalProject` module learned new ``USES_TERMINAL``
-  arguments for giving steps exclusive terminal access.  Especially
+  arguments for giving steps exclusive terminal access.  This is
   useful with the :generator:`Ninja` generator to monitor CMake
   superbuild progress and prevent CPU oversubscription.
 
@@ -97,14 +127,17 @@ Changes made since CMake 3.4 include the following.
 
 * The :module:`FindIce` module now provides imported targets.
 
+* The :module:`FindJava` module learned to optionally find
+  the ``idlj`` and ``jarsigner`` tools.
+
 * The :module:`FindOpenSSL` module now provides imported targets.
 
 * The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
   option to search only for static libraries.
 
-* The :command:`find_program` command learned a ``NAMES_PER_DIR``
-  option to consdier all given ``NAMES`` in each directory before
-  moving on to the next directory.
+* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
+  command which may be used to query for arbitrary variables from a package
+  (such as for related tools or data and plugin install paths).
 
 * The :module:`FindProtobuf` module gained a new
   :command:`protobuf_generate_python` function to generate python
@@ -121,33 +154,10 @@ Changes made since CMake 3.4 include the following.
 * The :module:`FindZLIB` module learned to search separately for
   debug and release variants.
 
-* A new ``$<SHELL_PATH:...>``
-  :manual:`generator expression <cmake-generator-expressions(7)>`
-  has been added.
-
-* The :command:`get_filename_component` command learned a new ``BASE_DIR``
-  subcommand.  This is used to specify a base directory when calculating an
-  absolute path from a relative path.
-
 * The :module:`GNUInstallDirs` module learned special default values
   for certain installation prefixes according to the `GNU Coding
   Standards`_ and the `Filesystem Hierarchy Standard`_.
 
-.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
-
-* Add a new TEST operator to if() that evaluates to true
-  if a given test name has been defined.
-
-* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
-
-* The :command:`install(FILES)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
-
-* The :module:`FindJava` module learned to optionally find
-  the ``idlj`` and ``jarsigner`` tools.
-
 * The :module:`UseJava` module ``add_jar`` function learned
   to support response files (e.g. ``@srcs.txt``) for source
   specification.
@@ -159,73 +169,101 @@ Changes made since CMake 3.4 include the following.
 * The :module:`UseJava` module gained a new ``create_javah``
   function to create C headers from Java classes.
 
-* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
-  :ref:`Makefile Generators` whether to generate commands to print output
-  after each target is completed.
+.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
+
+Generator Expressions
+---------------------
+
+* A new ``$<SHELL_PATH:...>``
+  :manual:`generator expression <cmake-generator-expressions(7)>`
+  has been added.
+
+CTest
+-----
+
+* CTest learned to optionally measure the CPU load during parallel
+  testing and avoid starting tests that may cause the load to exceed
+  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
+  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
+  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
+  option of the :command:`ctest_test` command.
+
+* :manual:`ctest(1)` learned options
+  ``--test-output-size-passed`` and ``--test-output-size-failed``
+  to customize the limit on test output size submitted when
+  running as a :ref:`Dashboard Client`.
+
+CPack
+-----
+
+* The :module:`CPackDeb` module learned to set package dependencies
+  per component.  See variables:
+
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`
+
+* The :module:`CPack` module learned to package empty directories.
+
+* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
+  which can be used to ensure the cpack program receives the settings' values
+  exactly as they were set, even if they contain CMake-special characters.
+  For compatibility, it's off by default.
+
+Other
+-----
 
 * The :manual:`Compile Features <cmake-compile-features(7)>` functionality
   is now aware of features supported by GNU C compilers on Windows.
 
-* The ``SONAME`` field is no longer set for ``MODULE`` libraries
-  created with the :command:`add_library` command.  ``MODULE``
-  libraries are meant for explicit dynamic loading at runtime.
-  They cannot be linked so ``SONAME`` is not useful.
-
 * CMake learned to honor ``*.manifest`` source files with MSVC tools.
   Manifest files named as sources of ``.exe`` and ``.dll`` targets
   will be merged with linker-generated manifests and embedded in the
   binary.
 
-* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
-  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
-  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
+  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
 
-* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+* :manual:`cmake(1)` gained a new ``--trace-expand`` command line option
+  that is like ``--trace`` but expands variable references in the output.
 
-* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
-  command which may be used to query for arbitrary variables from a package
-  (such as for related tools or data and plugin install paths).
+Deprecated and Removed Features
+===============================
+
+* The :module:`CMakeExpandImportedTargets` module is now documented
+  as deprecated.  See module documentation for an explanation.
 
 * The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
   effect.  Previously it was partially implemented and unreliable.
 
-* CMake no longer links executables with flags to export symbols
-  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
-  See policy :policy:`CMP0065`.
-
-* The :command:`string` command learned a new ``APPEND`` subcommand.
-
-* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
-  were introduced to allow project code to query where a target is defined.
+Other Changes
+=============
 
 * The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
   :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
   work in environments where only CXX is enabled.
 
-* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
-  variable references in the output.
+* The :module:`CPackDeb` module now correctly excludes symlinks during package
+  checksum calculation.
 
-* :ref:`Visual Studio Generators` learned to support additonal
-  target properties to customize projects for NVIDIA Nsight
-  Tegra Visual Studio Edition:
+* The :module:`CPackDeb` no longer uses fakeroot and system tar program for
+  packaging.
 
-  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
-  * :prop_tgt:`ANDROID_ARCH`
-  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
-  * :prop_tgt:`ANDROID_PROCESS_MAX`
-  * :prop_tgt:`ANDROID_PROGUARD`
-  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
-  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
-  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
-  * :prop_tgt:`ANDROID_STL_TYPE`
+* The :module:`CPack` module no longer mangles settings with CMake-special
+  characters when they're used as defaults for other settings. The macro
+  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
 
-* The :generator:`Visual Studio 14 2015` generator learned to select
-  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
-  variable and the SDKs available on the host.
+* CMake no longer links executables with flags to export symbols
+  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
+  See policy :policy:`CMP0065`.
+
+* The ``SONAME`` field is no longer set for ``MODULE`` libraries
+  created with the :command:`add_library` command.  ``MODULE``
+  libraries are meant for explicit dynamic loading at runtime.
+  They cannot be linked so ``SONAME`` is not useful.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32e54f1a6b1deca20a00b194467ec9204346a4ae
commit 32e54f1a6b1deca20a00b194467ec9204346a4ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:16:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 10:57:23 2015 -0400

    Help: Consolidate 3.4 release notes
    
    Move all development release notes into a new version-specific document:
    
     tail -q -n +3 Help/release/dev/* > Help/release/3.4.rst
     git rm -- Help/release/dev/*
    
    except the sample topic:
    
     git checkout HEAD -- Help/release/dev/0-sample-topic.rst
    
    Reference the new document from the release notes index document.
    Add a title and intro sentence to the new document by hand.

diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst
new file mode 100644
index 0000000..448ea35
--- /dev/null
+++ b/Help/release/3.4.rst
@@ -0,0 +1,231 @@
+CMake 3.4 Release Notes
+***********************
+
+.. only:: html
+
+  .. contents::
+
+Changes made since CMake 3.4 include the following.
+
+* CMake learned rudimentary support for the Apple Swift language.  When using
+  the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
+  the ``Swift`` language with the :command:`enable_language` command or the
+  :command:`project` command (this is an error with other generators or when
+  Xcode is too old).  Then one may list ``.swift`` source files in targets
+  for compilation.
+
+* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
+  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
+  introduced to initialize the
+  :prop_tgt:`LINK_SEARCH_START_STATIC` and
+  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
+  respectively.
+
+* On Windows with MS-compatible tools, CMake learned to optionally
+  generate a module definition (``.def``) file for ``SHARED`` libraries.
+  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
+
+* The :ref:`Makefile Generators` and the :generator:`Ninja` generator
+  learned to add compiler launcher tools like distcc and ccache along with the
+  compiler for ``C`` and ``CXX`` languages.  See the
+  :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
+  :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
+
+* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
+  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
+
+* The :module:`CPackDeb` module now correctly excludes symlinks during package checksum calculation.
+
+* The :module:`CPackDeb` module learned to set package dependencies
+  per component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS` and
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`.
+
+* :module:`CPackDeb` no longer uses fakeroot and system tar program for packaging.
+
+* The :module:`CPack` module learned to package empty directories.
+
+* The :module:`CPack` module no longer mangles settings with CMake-special
+  characters when they're used as defaults for other settings. The macro
+  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
+
+* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
+  which can be used to ensure the cpack program receives the settings' values
+  exactly as they were set, even if they contain CMake-special characters.
+  For compatibility, it's off by default.
+
+* :manual:`ctest(1)` learned options
+  ``--test-output-size-passed`` and ``--test-output-size-failed``
+  to customize the limit on test output size submitted when
+  running as a :ref:`Dashboard Client`.
+
+* CTest learned to optionally measure the CPU load during parallel
+  testing and avoid starting tests that may cause the load to exceed
+  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
+  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
+  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
+  option of the :command:`ctest_test` command.
+
+* The :module:`CMakeExpandImportedTargets` module is now documented
+  as deprecated.  See module documentation for an explanation.
+
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  function ``GIT_SUBMODULES`` option now also limits the set of
+  submodules that are initialized in addition to the prior behavior
+  of limiting the set of submodules that are updated.
+
+* Use "git stash save --all" only if supported. The --all option for git-stash
+  wasn't introduced until git version 1.7.6.
+
+* The :module:`ExternalProject` module learned new ``USES_TERMINAL``
+  arguments for giving steps exclusive terminal access.  Especially
+  useful with the :generator:`Ninja` generator to monitor CMake
+  superbuild progress and prevent CPU oversubscription.
+
+* The :module:`FindBISON` module ``BISON_TARGET`` macro learned a
+  new ``DEFINES_FILE`` option to specify a custom output header
+  to be generated.
+
+* The :module:`FindHDF5` module learend a new ``HDF5_PREFER_PARALLEL``
+  option allowing users to specify that a parallel HDF5 tool is
+  preferred if both are available.
+
+* The :module:`FindIce` module now provides imported targets.
+
+* The :module:`FindOpenSSL` module now provides imported targets.
+
+* The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
+  option to search only for static libraries.
+
+* The :command:`find_program` command learned a ``NAMES_PER_DIR``
+  option to consdier all given ``NAMES`` in each directory before
+  moving on to the next directory.
+
+* The :module:`FindProtobuf` module gained a new
+  :command:`protobuf_generate_python` function to generate python
+  sources from ``.proto`` files.
+
+* The :module:`FindTIFF` module learned to search separately for
+  debug and release variants.
+
+* The :module:`FindwxWidgets` module learned to support version requests.
+
+* The :module:`FindXercesC` module learned to search separately for
+  debug and release variants.
+
+* The :module:`FindZLIB` module learned to search separately for
+  debug and release variants.
+
+* A new ``$<SHELL_PATH:...>``
+  :manual:`generator expression <cmake-generator-expressions(7)>`
+  has been added.
+
+* The :command:`get_filename_component` command learned a new ``BASE_DIR``
+  subcommand.  This is used to specify a base directory when calculating an
+  absolute path from a relative path.
+
+* The :module:`GNUInstallDirs` module learned special default values
+  for certain installation prefixes according to the `GNU Coding
+  Standards`_ and the `Filesystem Hierarchy Standard`_.
+
+.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
+
+* Add a new TEST operator to if() that evaluates to true
+  if a given test name has been defined.
+
+* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :command:`install(FILES)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :module:`FindJava` module learned to optionally find
+  the ``idlj`` and ``jarsigner`` tools.
+
+* The :module:`UseJava` module ``add_jar`` function learned
+  to support response files (e.g. ``@srcs.txt``) for source
+  specification.
+
+* The :module:`UseJava` module ``install_jar`` function learned
+  new ``DESTINATION`` and ``COMPONENT`` options to specify
+  the corresponding :command:`install` command options.
+
+* The :module:`UseJava` module gained a new ``create_javah``
+  function to create C headers from Java classes.
+
+* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
+  :ref:`Makefile Generators` whether to generate commands to print output
+  after each target is completed.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU C compilers on Windows.
+
+* The ``SONAME`` field is no longer set for ``MODULE`` libraries
+  created with the :command:`add_library` command.  ``MODULE``
+  libraries are meant for explicit dynamic loading at runtime.
+  They cannot be linked so ``SONAME`` is not useful.
+
+* CMake learned to honor ``*.manifest`` source files with MSVC tools.
+  Manifest files named as sources of ``.exe`` and ``.dll`` targets
+  will be merged with linker-generated manifests and embedded in the
+  binary.
+
+* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
+  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
+  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
+  command which may be used to query for arbitrary variables from a package
+  (such as for related tools or data and plugin install paths).
+
+* The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
+  effect.  Previously it was partially implemented and unreliable.
+
+* CMake no longer links executables with flags to export symbols
+  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
+  See policy :policy:`CMP0065`.
+
+* The :command:`string` command learned a new ``APPEND`` subcommand.
+
+* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
+  were introduced to allow project code to query where a target is defined.
+
+* The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
+  :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
+  work in environments where only CXX is enabled.
+
+* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
+  variable references in the output.
+
+* :ref:`Visual Studio Generators` learned to support additonal
+  target properties to customize projects for NVIDIA Nsight
+  Tegra Visual Studio Edition:
+
+  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
+  * :prop_tgt:`ANDROID_ARCH`
+  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
+  * :prop_tgt:`ANDROID_PROCESS_MAX`
+  * :prop_tgt:`ANDROID_PROGUARD`
+  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
+  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
+  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
+  * :prop_tgt:`ANDROID_STL_TYPE`
+
+* The :generator:`Visual Studio 14 2015` generator learned to select
+  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
+  variable and the SDKs available on the host.
diff --git a/Help/release/dev/CPack-updates.rst b/Help/release/dev/CPack-updates.rst
deleted file mode 100644
index ea0780f..0000000
--- a/Help/release/dev/CPack-updates.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-CPack-updates
--------------
-
-* The :module:`CPack` module no longer mangles settings with CMake-special
-  characters when they're used as defaults for other settings. The macro
-  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
-
-* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
-  which can be used to ensure the cpack program receives the settings' values
-  exactly as they were set, even if they contain CMake-special characters.
-  For compatibility, it's off by default.
diff --git a/Help/release/dev/ConcurrentFortran-compiler-id.rst b/Help/release/dev/ConcurrentFortran-compiler-id.rst
deleted file mode 100644
index 71e79aa..0000000
--- a/Help/release/dev/ConcurrentFortran-compiler-id.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-ConcurrentFortran-compiler-id
------------------------------
-
-* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
-  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
diff --git a/Help/release/dev/ExternalProject-USES_TERMINAL.rst b/Help/release/dev/ExternalProject-USES_TERMINAL.rst
deleted file mode 100644
index 415540d..0000000
--- a/Help/release/dev/ExternalProject-USES_TERMINAL.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalProject-USES_TERMINAL
------------------------------
-
-* The :module:`ExternalProject` module learned new ``USES_TERMINAL``
-  arguments for giving steps exclusive terminal access.  Especially
-  useful with the :generator:`Ninja` generator to monitor CMake
-  superbuild progress and prevent CPU oversubscription.
diff --git a/Help/release/dev/ExternalProject_init_selected_submodules.rst b/Help/release/dev/ExternalProject_init_selected_submodules.rst
deleted file mode 100644
index e642c19..0000000
--- a/Help/release/dev/ExternalProject_init_selected_submodules.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalProject_init_selected_submodules
-----------------------------------------
-
-* The :module:`ExternalProject` module :command:`ExternalProject_Add`
-  function ``GIT_SUBMODULES`` option now also limits the set of
-  submodules that are initialized in addition to the prior behavior
-  of limiting the set of submodules that are updated.
diff --git a/Help/release/dev/ExternalProject_stash_save_all.rst b/Help/release/dev/ExternalProject_stash_save_all.rst
deleted file mode 100644
index e00ed44..0000000
--- a/Help/release/dev/ExternalProject_stash_save_all.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-ExternalProject_stash_save_all
-------------------------------
-
-* Use "git stash save --all" only if supported. The --all option for git-stash
-  wasn't introduced until git version 1.7.6.
diff --git a/Help/release/dev/FindBISON-DEFINES_FILE.rst b/Help/release/dev/FindBISON-DEFINES_FILE.rst
deleted file mode 100644
index 815d560..0000000
--- a/Help/release/dev/FindBISON-DEFINES_FILE.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-FindBISON-DEFINES_FILE
-----------------------
-
-* The :module:`FindBISON` module ``BISON_TARGET`` macro learned a
-  new ``DEFINES_FILE`` option to specify a custom output header
-  to be generated.
diff --git a/Help/release/dev/FindHDF5-updates.rst b/Help/release/dev/FindHDF5-updates.rst
deleted file mode 100644
index a9297bb..0000000
--- a/Help/release/dev/FindHDF5-updates.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-FindHDF5-updates
-----------------
-
-* The :module:`FindHDF5` module learend a new ``HDF5_PREFER_PARALLEL``
-  option allowing users to specify that a parallel HDF5 tool is
-  preferred if both are available.
diff --git a/Help/release/dev/FindIce-imported-targets.rst b/Help/release/dev/FindIce-imported-targets.rst
deleted file mode 100644
index 7e1b2f4..0000000
--- a/Help/release/dev/FindIce-imported-targets.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindIce-imported-targets
-------------------------
-
-* The :module:`FindIce` module now provides imported targets.
diff --git a/Help/release/dev/FindOpenSSL-imported-targets.rst b/Help/release/dev/FindOpenSSL-imported-targets.rst
deleted file mode 100644
index 63090af..0000000
--- a/Help/release/dev/FindOpenSSL-imported-targets.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindOpenSSL-imported-targets
-----------------------------
-
-* The :module:`FindOpenSSL` module now provides imported targets.
diff --git a/Help/release/dev/FindOpenSSL-static-libs.rst b/Help/release/dev/FindOpenSSL-static-libs.rst
deleted file mode 100644
index 69ec6f2..0000000
--- a/Help/release/dev/FindOpenSSL-static-libs.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindOpenSSL-static-libs
------------------------
-
-* The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
-  option to search only for static libraries.
diff --git a/Help/release/dev/FindProtobuf-python-extension.rst b/Help/release/dev/FindProtobuf-python-extension.rst
deleted file mode 100644
index 95463bf..0000000
--- a/Help/release/dev/FindProtobuf-python-extension.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-FindProtobuf-python-extension
------------------------------
-
-* The :module:`FindProtobuf` module gained a new
-  :command:`protobuf_generate_python` function to generate python
-  sources from ``.proto`` files.
diff --git a/Help/release/dev/FindTIFF-updates.rst b/Help/release/dev/FindTIFF-updates.rst
deleted file mode 100644
index 083e40f..0000000
--- a/Help/release/dev/FindTIFF-updates.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindTIFF-updates
-----------------
-
-* The :module:`FindTIFF` module learned to search separately for
-  debug and release variants.
diff --git a/Help/release/dev/FindXercesC-updates.rst b/Help/release/dev/FindXercesC-updates.rst
deleted file mode 100644
index 47a8ada..0000000
--- a/Help/release/dev/FindXercesC-updates.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindXercesC-updates
--------------------
-
-* The :module:`FindXercesC` module learned to search separately for
-  debug and release variants.
diff --git a/Help/release/dev/FindZLIB-per-config.rst b/Help/release/dev/FindZLIB-per-config.rst
deleted file mode 100644
index 97fd6ef..0000000
--- a/Help/release/dev/FindZLIB-per-config.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindZLIB-per-config
--------------------
-
-* The :module:`FindZLIB` module learned to search separately for
-  debug and release variants.
diff --git a/Help/release/dev/FindwxWidgets-updates.rst b/Help/release/dev/FindwxWidgets-updates.rst
deleted file mode 100644
index aa470f2..0000000
--- a/Help/release/dev/FindwxWidgets-updates.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindwxWidgets-updates
----------------------
-
-* The :module:`FindwxWidgets` module learned to support version requests.
diff --git a/Help/release/dev/GNUInstallDirs-special-prefixes.rst b/Help/release/dev/GNUInstallDirs-special-prefixes.rst
deleted file mode 100644
index 83c1352..0000000
--- a/Help/release/dev/GNUInstallDirs-special-prefixes.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-GNUInstallDirs-special-prefixes
--------------------------------
-
-* The :module:`GNUInstallDirs` module learned special default values
-  for certain installation prefixes according to the `GNU Coding
-  Standards`_ and the `Filesystem Hierarchy Standard`_.
-
-.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
diff --git a/Help/release/dev/OUTPUT_DIRECTORY-genex.rst b/Help/release/dev/OUTPUT_DIRECTORY-genex.rst
deleted file mode 100644
index 8b839c0..0000000
--- a/Help/release/dev/OUTPUT_DIRECTORY-genex.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OUTPUT_DIRECTORY-genex
-----------------------
-
-* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
-  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
-  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/OUTPUT_NAME-genex.rst b/Help/release/dev/OUTPUT_NAME-genex.rst
deleted file mode 100644
index 0a39820..0000000
--- a/Help/release/dev/OUTPUT_NAME-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-OUTPUT_NAME-genex
------------------
-
-* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/Threads-CXX.rst b/Help/release/dev/Threads-CXX.rst
deleted file mode 100644
index 2e34a01..0000000
--- a/Help/release/dev/Threads-CXX.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Threads-CXX
-------------
-
-* The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
-  :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
-  work in environments where only CXX is enabled.
diff --git a/Help/release/dev/add-apple-swift-language.rst b/Help/release/dev/add-apple-swift-language.rst
deleted file mode 100644
index 60ce5d8..0000000
--- a/Help/release/dev/add-apple-swift-language.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-add-apple-swift-language
-------------------------
-
-* CMake learned rudimentary support for the Apple Swift language.  When using
-  the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
-  the ``Swift`` language with the :command:`enable_language` command or the
-  :command:`project` command (this is an error with other generators or when
-  Xcode is too old).  Then one may list ``.swift`` source files in targets
-  for compilation.
diff --git a/Help/release/dev/add-link-search-static-properties-defaults.rst b/Help/release/dev/add-link-search-static-properties-defaults.rst
deleted file mode 100644
index 98dda30..0000000
--- a/Help/release/dev/add-link-search-static-properties-defaults.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-add-link-search-static-properties-defaults
-------------------------------------------
-
-* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
-  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
-  introduced to initialize the
-  :prop_tgt:`LINK_SEARCH_START_STATIC` and
-  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
-  respectively.
diff --git a/Help/release/dev/auto_export_dll_symbols.rst b/Help/release/dev/auto_export_dll_symbols.rst
deleted file mode 100644
index 9db2b5e..0000000
--- a/Help/release/dev/auto_export_dll_symbols.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-auto_export_dll_symbols
------------------------
-
-* On Windows with MS-compatible tools, CMake learned to optionally
-  generate a module definition (``.def``) file for ``SHARED`` libraries.
-  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
diff --git a/Help/release/dev/compiler-launcher.rst b/Help/release/dev/compiler-launcher.rst
deleted file mode 100644
index 3ba692d..0000000
--- a/Help/release/dev/compiler-launcher.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-compiler-launcher
------------------
-
-* The :ref:`Makefile Generators` and the :generator:`Ninja` generator
-  learned to add compiler launcher tools like distcc and ccache along with the
-  compiler for ``C`` and ``CXX`` languages.  See the
-  :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
-  :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
diff --git a/Help/release/dev/cpack-deb-checksum-on-symlinks.rts b/Help/release/dev/cpack-deb-checksum-on-symlinks.rts
deleted file mode 100644
index 9bfeded..0000000
--- a/Help/release/dev/cpack-deb-checksum-on-symlinks.rts
+++ /dev/null
@@ -1,4 +0,0 @@
-cpack-deb-checksum-on-symlinks
-------------------------------
-
-* The :module:`CPackDeb` module now correctly excludes symlinks during package checksum calculation.
diff --git a/Help/release/dev/cpack-deb-component-dependencies.rst b/Help/release/dev/cpack-deb-component-dependencies.rst
deleted file mode 100644
index 2714222..0000000
--- a/Help/release/dev/cpack-deb-component-dependencies.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-cpack-deb-component-dependencies
---------------------------------
-
-* The :module:`CPackDeb` module learned to set package dependencies
-  per component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS` and
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`.
diff --git a/Help/release/dev/cpack-deb-fakeroot-removal.rts b/Help/release/dev/cpack-deb-fakeroot-removal.rts
deleted file mode 100644
index e0b97d1..0000000
--- a/Help/release/dev/cpack-deb-fakeroot-removal.rts
+++ /dev/null
@@ -1,4 +0,0 @@
-cpack-deb-fakeroot-removal
---------------------------
-
-* :module:`CPackDeb` no longer uses fakeroot and system tar program for packaging.
diff --git a/Help/release/dev/cpack-package-empty-dirs.rts b/Help/release/dev/cpack-package-empty-dirs.rts
deleted file mode 100644
index 1f56e1a..0000000
--- a/Help/release/dev/cpack-package-empty-dirs.rts
+++ /dev/null
@@ -1,4 +0,0 @@
-cpack-package-empty-dirs
-------------------------
-
-* The :module:`CPack` module learned to package empty directories.
diff --git a/Help/release/dev/ctest-custom-output-size.rst b/Help/release/dev/ctest-custom-output-size.rst
deleted file mode 100644
index 8098b93..0000000
--- a/Help/release/dev/ctest-custom-output-size.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ctest-custom-output-size
-------------------------
-
-* :manual:`ctest(1)` learned options
-  ``--test-output-size-passed`` and ``--test-output-size-failed``
-  to customize the limit on test output size submitted when
-  running as a :ref:`Dashboard Client`.
diff --git a/Help/release/dev/ctest-test-load-option.rst b/Help/release/dev/ctest-test-load-option.rst
deleted file mode 100644
index 069f49a..0000000
--- a/Help/release/dev/ctest-test-load-option.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-ctest-test-load-option
-----------------------
-
-* CTest learned to optionally measure the CPU load during parallel
-  testing and avoid starting tests that may cause the load to exceed
-  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
-  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
-  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
-  option of the :command:`ctest_test` command.
diff --git a/Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst b/Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst
deleted file mode 100644
index 3bdaebe..0000000
--- a/Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-doc-CMakeExpandImportedTargets-deprecated
------------------------------------------
-
-* The :module:`CMakeExpandImportedTargets` module is now documented
-  as deprecated.  See module documentation for an explanation.
diff --git a/Help/release/dev/find_program-NAMES_PER_DIR.rst b/Help/release/dev/find_program-NAMES_PER_DIR.rst
deleted file mode 100644
index 04cd170..0000000
--- a/Help/release/dev/find_program-NAMES_PER_DIR.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-find_program-NAMES_PER_DIR
---------------------------
-
-* The :command:`find_program` command learned a ``NAMES_PER_DIR``
-  option to consdier all given ``NAMES`` in each directory before
-  moving on to the next directory.
diff --git a/Help/release/dev/genex-SHELL_PATH.rst b/Help/release/dev/genex-SHELL_PATH.rst
deleted file mode 100644
index 86af720..0000000
--- a/Help/release/dev/genex-SHELL_PATH.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-genex-SHELL_PATH
-----------------
-
-* A new ``$<SHELL_PATH:...>``
-  :manual:`generator expression <cmake-generator-expressions(7)>`
-  has been added.
diff --git a/Help/release/dev/get-filename-component-base-dir.rst b/Help/release/dev/get-filename-component-base-dir.rst
deleted file mode 100644
index c0df759..0000000
--- a/Help/release/dev/get-filename-component-base-dir.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-get-filename-component-base-dir
--------------------------------
-
-* The :command:`get_filename_component` command learned a new ``BASE_DIR``
-  subcommand.  This is used to specify a base directory when calculating an
-  absolute path from a relative path.
diff --git a/Help/release/dev/if-TEST.rst b/Help/release/dev/if-TEST.rst
deleted file mode 100644
index 05bf71c..0000000
--- a/Help/release/dev/if-TEST.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-if-TEST
--------
-
-* Add a new TEST operator to if() that evaluates to true
-  if a given test name has been defined.
diff --git a/Help/release/dev/install-directory-dest-genex.rst b/Help/release/dev/install-directory-dest-genex.rst
deleted file mode 100644
index 2b83bbd..0000000
--- a/Help/release/dev/install-directory-dest-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-install-directory-dest-genex
-----------------------------
-
-* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/install-files-dest-genex.rst b/Help/release/dev/install-files-dest-genex.rst
deleted file mode 100644
index b7aa8b3..0000000
--- a/Help/release/dev/install-files-dest-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-install-files-dest-genex
-------------------------
-
-* The :command:`install(FILES)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/java-updates.rst b/Help/release/dev/java-updates.rst
deleted file mode 100644
index 8fd4ed6..0000000
--- a/Help/release/dev/java-updates.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-java-updates
-------------
-
-* The :module:`FindJava` module learned to optionally find
-  the ``idlj`` and ``jarsigner`` tools.
-
-* The :module:`UseJava` module ``add_jar`` function learned
-  to support response files (e.g. ``@srcs.txt``) for source
-  specification.
-
-* The :module:`UseJava` module ``install_jar`` function learned
-  new ``DESTINATION`` and ``COMPONENT`` options to specify
-  the corresponding :command:`install` command options.
-
-* The :module:`UseJava` module gained a new ``create_javah``
-  function to create C headers from Java classes.
diff --git a/Help/release/dev/makefile-target-messages.rst b/Help/release/dev/makefile-target-messages.rst
deleted file mode 100644
index 3d2cd9b..0000000
--- a/Help/release/dev/makefile-target-messages.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-makefile-target-messages
-------------------------
-
-* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
-  :ref:`Makefile Generators` whether to generate commands to print output
-  after each target is completed.
diff --git a/Help/release/dev/mingw-compile-features-C.rst b/Help/release/dev/mingw-compile-features-C.rst
deleted file mode 100644
index b3f99f1..0000000
--- a/Help/release/dev/mingw-compile-features-C.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-mingw-compile-features-C
-------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU C compilers on Windows.
diff --git a/Help/release/dev/modules-no-soname.rst b/Help/release/dev/modules-no-soname.rst
deleted file mode 100644
index 8fe74f8..0000000
--- a/Help/release/dev/modules-no-soname.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-modules-no-soname
------------------
-
-* The ``SONAME`` field is no longer set for ``MODULE`` libraries
-  created with the :command:`add_library` command.  ``MODULE``
-  libraries are meant for explicit dynamic loading at runtime.
-  They cannot be linked so ``SONAME`` is not useful.
diff --git a/Help/release/dev/ms-manifest-files.rst b/Help/release/dev/ms-manifest-files.rst
deleted file mode 100644
index 94fbe83..0000000
--- a/Help/release/dev/ms-manifest-files.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ms-manifest-files
------------------
-
-* CMake learned to honor ``*.manifest`` source files with MSVC tools.
-  Manifest files named as sources of ``.exe`` and ``.dll`` targets
-  will be merged with linker-generated manifests and embedded in the
-  binary.
diff --git a/Help/release/dev/pkg-config-variable-function.rst b/Help/release/dev/pkg-config-variable-function.rst
deleted file mode 100644
index e181d13..0000000
--- a/Help/release/dev/pkg-config-variable-function.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-pkg-config-variable-function
-----------------------------
-
-* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
-  command which may be used to query for arbitrary variables from a package
-  (such as for related tools or data and plugin install paths).
diff --git a/Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst b/Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst
deleted file mode 100644
index dd52ace..0000000
--- a/Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-remove-CMAKE_USE_RELATIVE_PATHS
--------------------------------
-
-* The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
-  effect.  Previously it was partially implemented and unreliable.
diff --git a/Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst b/Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst
deleted file mode 100644
index f8ce044..0000000
--- a/Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-restrict-shlib-link-flags-to-enable-exports
--------------------------------------------
-
-* CMake no longer links executables with flags to export symbols
-  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
-  See policy :policy:`CMP0065`.
diff --git a/Help/release/dev/string-append.rst b/Help/release/dev/string-append.rst
deleted file mode 100644
index 190b51e..0000000
--- a/Help/release/dev/string-append.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-string-append
--------------
-
-* The :command:`string` command learned a new ``APPEND`` subcommand.
diff --git a/Help/release/dev/target-directory-properties.rst b/Help/release/dev/target-directory-properties.rst
deleted file mode 100644
index 5ab2938..0000000
--- a/Help/release/dev/target-directory-properties.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-target-directory-properties
----------------------------
-
-* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
-  were introduced to allow project code to query where a target is defined.
diff --git a/Help/release/dev/trace-expand.rst b/Help/release/dev/trace-expand.rst
deleted file mode 100644
index 383326e..0000000
--- a/Help/release/dev/trace-expand.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-trace-expand
-------------
-
-* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
-  variable references in the output.
diff --git a/Help/release/dev/vs-nsight-tegra-attributes.rst b/Help/release/dev/vs-nsight-tegra-attributes.rst
deleted file mode 100644
index 7ebea33..0000000
--- a/Help/release/dev/vs-nsight-tegra-attributes.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-vs-nsight-tegra-attributes
---------------------------
-
-* :ref:`Visual Studio Generators` learned to support additonal
-  target properties to customize projects for NVIDIA Nsight
-  Tegra Visual Studio Edition:
-
-  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
-  * :prop_tgt:`ANDROID_ARCH`
-  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
-  * :prop_tgt:`ANDROID_PROCESS_MAX`
-  * :prop_tgt:`ANDROID_PROGUARD`
-  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
-  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
-  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
-  * :prop_tgt:`ANDROID_STL_TYPE`
diff --git a/Help/release/dev/vs-win10-sdk.rst b/Help/release/dev/vs-win10-sdk.rst
deleted file mode 100644
index 50eb391..0000000
--- a/Help/release/dev/vs-win10-sdk.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-vs-win10-sdk
-------------
-
-* The :generator:`Visual Studio 14 2015` generator learned to select
-  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
-  variable and the SDKs available on the host.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index b558e9d..752acbd 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -13,6 +13,7 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   3.4 <3.4>
    3.3 <3.3>
    3.2 <3.2>
    3.1 <3.1>

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 16:19:22 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 16:19:22 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3471-g32fc001
Message-ID: <20151002201922.20365BF4DF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  32fc0010896ca65ad6904377c53831e9fb062a25 (commit)
       via  458121116a05665ebc0cf6a066977c00b8e55e5c (commit)
      from  2977e8e345bf27c147a3da97dbbb6b12d83ee3e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32fc0010896ca65ad6904377c53831e9fb062a25
commit 32fc0010896ca65ad6904377c53831e9fb062a25
Merge: 2977e8e 4581211
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 16:19:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 16:19:17 2015 -0400

    Merge topic 'vs-win10-sdk' into next
    
    45812111 VS: Select latest Windows 10 SDK if no specific version was requested


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=458121116a05665ebc0cf6a066977c00b8e55e5c
commit 458121116a05665ebc0cf6a066977c00b8e55e5c
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Oct 2 11:34:55 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 16:18:44 2015 -0400

    VS: Select latest Windows 10 SDK if no specific version was requested
    
    If CMAKE_SYSTEM_VERSION is just "10.0" then use the latest SDK available
    since no particular version was requested.

diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index 74679d8..661dddd 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -202,14 +202,23 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
     // has a version less or equal to our version of the operating system
     std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
 
-    for (std::vector<std::string>::iterator i = sdks.begin();
-         i != sdks.end(); ++i)
+    // Select a suitable SDK version.
+    if (this->SystemVersion == "10.0")
+      {
+      // Use the latest Windows 10 SDK since no build version was given.
+      return sdks.at(0);
+      }
+    else
       {
       // Find the SDK less or equal to our specified version
-      if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
+      for (std::vector<std::string>::iterator i = sdks.begin();
+           i != sdks.end(); ++i)
         {
-        // This is the most recent SDK that we can run safely
-        return *i;
+        if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
+          {
+          // This is the most recent SDK that we can run safely
+          return *i;
+          }
         }
       }
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio14Generator.cxx |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct  2 16:43:25 2015
From: brad.king at kitware.com (Brad King)
Date: Fri,  2 Oct 2015 16:43:25 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3475-g5106bd2
Message-ID: <20151002204325.8E86FBEF82@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5106bd2f04d5f08376eea921135bdc1a184e26af (commit)
       via  ebb78d9183de143804f6479f2ba7f476d5f8866f (commit)
       via  8c426183d17c0de9f04e6f03ba57bd58f9797b3b (commit)
       via  d1b87d72f964ae57966c5f02ee9e32236bd59338 (commit)
      from  32fc0010896ca65ad6904377c53831e9fb062a25 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5106bd2f04d5f08376eea921135bdc1a184e26af
commit 5106bd2f04d5f08376eea921135bdc1a184e26af
Merge: 32fc001 ebb78d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 16:43:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 16:43:23 2015 -0400

    Merge topic 'vs-win10-store' into next
    
    ebb78d91 This change adds support for Windows 10 Universal (Store) Applications.
    8c426183 MSVC: Add system libs for WindowsStore on VS 2015
    d1b87d72 VS: Select Windows 10 Store SDK and toolset for VS 2015


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebb78d9183de143804f6479f2ba7f476d5f8866f
commit ebb78d9183de143804f6479f2ba7f476d5f8866f
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Oct 2 11:34:55 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 16:42:24 2015 -0400

    This change adds support for Windows 10 Universal (Store) Applications.
    
    A Windows 10 Universal Application can be targeted by setting:
    CMAKE_SYSTEM_NAME=WindowsStore and CMAKE_SYSTEM_VERSION=10.0
    There are no WindowsPhone apps, universal apps target both phone and store.
    Specifying the CMAKE_SYSTEM_VERSION to be 10.0 will use the latest Windows
    10 SDK installed. If you want to specify a specific SDK, you can make
    CMAKE_SYSTEM_VERSION to be more specific (10.0.10240.0 for RTM for example).
    
    New Properties Added:
    VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION: Target Property.
    Specifies the minimum version of the OS that the project can target.
    
    VS_DESKTOP_EXTENSIONS_VERSION, VS_MOBILE_EXTENSIONS_VERSIONS,
    VS_IOT_EXTENSIONS_VERSION: Target property. When specifying these properties
    a reference to the version of the SDK specified will be added to the
    target allowing to target the extended functionality in a universal project.
    To match the version of the SDK being used, use
    CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
    
    VS_IOT_STARTUP_TASK: Target property. Specifies that the target should be
    built as an IOT continuous background task.

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index ac893c2..931363c 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -254,17 +254,22 @@ Properties on Targets
    /prop_tgt/TYPE
    /prop_tgt/VERSION
    /prop_tgt/VISIBILITY_INLINES_HIDDEN
+   /prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION
    /prop_tgt/VS_DOTNET_REFERENCES
    /prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION
    /prop_tgt/VS_GLOBAL_KEYWORD
    /prop_tgt/VS_GLOBAL_PROJECT_TYPES
    /prop_tgt/VS_GLOBAL_ROOTNAMESPACE
    /prop_tgt/VS_GLOBAL_variable
+   /prop_tgt/VS_IOT_EXTENSIONS_VERSION
+   /prop_tgt/VS_IOT_STARTUP_TASK
    /prop_tgt/VS_KEYWORD
+   /prop_tgt/VS_MOBILE_EXTENSIONS_VERSION
    /prop_tgt/VS_SCC_AUXPATH
    /prop_tgt/VS_SCC_LOCALPATH
    /prop_tgt/VS_SCC_PROJECTNAME
    /prop_tgt/VS_SCC_PROVIDER
+   /prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
    /prop_tgt/VS_WINRT_COMPONENT
    /prop_tgt/VS_WINRT_EXTENSIONS
    /prop_tgt/VS_WINRT_REFERENCES
diff --git a/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst b/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
new file mode 100644
index 0000000..19d1620
--- /dev/null
+++ b/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
@@ -0,0 +1,10 @@
+VS_DESKTOP_EXTENSIONS_VERSION
+-----------------------------
+
+Visual Studio Windows 10 Desktop Extensions Version
+
+Specifies the version of the Desktop Extensions that should be included in the
+target. For example ``10.0.10240.0``. If the value is not specified, the Desktop
+Extensions will not be included. To use the same version of the extensions as
+the Windows 10 SDK that is being used, you can use the
+:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
diff --git a/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst b/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
new file mode 100644
index 0000000..27c8a3d
--- /dev/null
+++ b/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
@@ -0,0 +1,10 @@
+VS_IOT_EXTENSIONS_VERSION
+-------------------------
+
+Visual Studio Windows 10 IoT Extensions Version
+
+Specifies the version of the IoT Extensions that should be included in the
+target. For example ``10.0.10240.0``. If the value is not specified, the IoT
+Extensions will not be included. To use the same version of the extensions as
+the Windows 10 SDK that is being used, you can use the
+:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
diff --git a/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst b/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
new file mode 100644
index 0000000..add50cb
--- /dev/null
+++ b/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
@@ -0,0 +1,6 @@
+VS_IOT_STARTUP_TASK
+-------------------
+
+Visual Studio Windows 10 IoT Continuous Background Task
+
+Specifies that the target should be compiled as a Continuous Background Task library.
diff --git a/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst b/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
new file mode 100644
index 0000000..be3c9a0
--- /dev/null
+++ b/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
@@ -0,0 +1,10 @@
+VS_MOBILE_EXTENSIONS_VERSION
+----------------------------
+
+Visual Studio Windows 10 Mobile Extensions Version
+
+Specifies the version of the Mobile Extensions that should be included in the
+target. For example ``10.0.10240.0``. If the value is not specified, the Mobile
+Extensions will not be included. To use the same version of the extensions as
+the Windows 10 SDK that is being used, you can use the
+:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
diff --git a/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst b/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
new file mode 100644
index 0000000..1ad7a71
--- /dev/null
+++ b/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
@@ -0,0 +1,10 @@
+VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
+--------------------------------------
+
+Visual Studio Windows Target Platform Minimum Version
+
+For Windows 10. Specifies the minimum version of the OS that is being
+targeted. For example ``10.0.10240.0``. If the value is not specified, the
+value of :variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` will be used on
+WindowsStore projects otherwise the target platform minimum version will not
+be specified for the project.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 91f2476..491addc 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -463,6 +463,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Import Project=\"" VS10_USER_PROPS "\""
                     " Condition=\"exists('" VS10_USER_PROPS "')\""
                     " Label=\"LocalAppDataPlatform\" />\n", 2);
+  this->WritePlatformExtensions();
   this->WriteString("</ImportGroup>\n", 1);
   this->WriteString("<PropertyGroup Label=\"UserMacros\" />\n", 1);
   this->WriteWinRTPackageCertificateKeyFile();
@@ -475,6 +476,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteXamlFilesGroup();
   this->WriteWinRTReferences();
   this->WriteProjectReferences();
+  this->WriteSDKReferences();
   this->WriteString(
     "<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.targets\""
     " />\n", 1);
@@ -1307,6 +1309,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
     {
     tool = "XML";
     }
+
   if(this->NsightTegra)
     {
     // Nsight Tegra needs specific file types to check up-to-dateness.
@@ -2590,7 +2593,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
+       this->Target->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2661,7 +2665,7 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(
-      "  <LinkLibraryDependencies>false</LinkLibraryDependencies>\n", 2);
+      "<LinkLibraryDependencies>false</LinkLibraryDependencies>\n", 3);
     this->WriteString("</ProjectReference>\n", 2);
     }
 }
@@ -2896,6 +2900,101 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
   this->WriteString("</ItemGroup>\n", 1);
 }
 
+void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
+{
+  // This only applies to Windows 10 apps
+  if (this->GlobalGenerator->TargetsWindowsStore() &&
+      cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
+    {
+    const char* desktopExtensionsVersion =
+      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+    if (desktopExtensionsVersion)
+      {
+      this->WriteSinglePlatformExtension("WindowsDesktop",
+                                         desktopExtensionsVersion);
+      }
+    const char* mobileExtensionsVersion =
+      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+    if (mobileExtensionsVersion)
+      {
+      this->WriteSinglePlatformExtension("WindowsMobile",
+                                         mobileExtensionsVersion);
+      }
+    }
+}
+
+void cmVisualStudio10TargetGenerator::WriteSinglePlatformExtension(
+  std::string const& extension,
+  std::string const& version
+  )
+{
+      this->WriteString("<Import Project=", 2);
+      (*this->BuildFileStream)
+        << "\"$([Microsoft.Build.Utilities.ToolLocationHelper]"
+        << "::GetPlatformExtensionSDKLocation(`"
+        << extension <<", Version=" << version
+        << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+        << "$(ExtensionSDKDirectoryRoot), null))"
+        << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+        << extension << ".props\" "
+        << "Condition=\"exists('$("
+        << "[Microsoft.Build.Utilities.ToolLocationHelper]"
+        << "::GetPlatformExtensionSDKLocation(`"
+        << extension << ", Version=" << version
+        << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+        << "$(ExtensionSDKDirectoryRoot), null))"
+        << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+        << extension << ".props')\" />\n";
+}
+
+void cmVisualStudio10TargetGenerator::WriteSDKReferences()
+{
+  // This only applies to Windows 10 apps
+  if (this->GlobalGenerator->TargetsWindowsStore() &&
+      cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
+    {
+    const char* desktopExtensionsVersion =
+      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+    const char* mobileExtensionsVersion =
+      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+    const char* iotExtensionsVersion =
+      this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
+
+    if(desktopExtensionsVersion || mobileExtensionsVersion ||
+       iotExtensionsVersion)
+      {
+      this->WriteString("<ItemGroup>\n", 1);
+      if(desktopExtensionsVersion)
+        {
+        this->WriteSingleSDKReference("WindowsDesktop",
+                                      desktopExtensionsVersion);
+        }
+      if(mobileExtensionsVersion)
+        {
+        this->WriteSingleSDKReference("WindowsMobile",
+                                      mobileExtensionsVersion);
+        }
+      if(iotExtensionsVersion)
+        {
+        this->WriteSingleSDKReference("WindowsIoT",
+                                      iotExtensionsVersion);
+        }
+      this->WriteString("</ItemGroup>\n", 1);
+      }
+    }
+}
+
+void cmVisualStudio10TargetGenerator::WriteSingleSDKReference(
+  std::string const& extension,
+  std::string const& version
+  )
+{
+  this->WriteString("<SDKReference Include=\"", 2);
+  (*this->BuildFileStream) << extension
+    << ", Version=" << version << "\" />\n";
+}
+
+
 void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
@@ -3018,13 +3117,27 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     (*this->BuildFileStream) << (isWindowsPhone ?
                                  "Windows Phone" : "Windows Store")
                              << "</ApplicationType>\n";
-    this->WriteString("<ApplicationTypeRevision>", 2);
-    (*this->BuildFileStream) << cmVS10EscapeXML(v)
-                             << "</ApplicationTypeRevision>\n";
     this->WriteString("<DefaultLanguage>en-US"
                       "</DefaultLanguage>\n", 2);
-    if(v == "8.1")
+    if (cmHasLiteralPrefix(v, "10.0"))
+      {
+      this->WriteString("<ApplicationTypeRevision>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML("10.0")
+                               << "</ApplicationTypeRevision>\n";
+      // Visual Studio 14.0 is necessary for building 10.0 apps
+      this->WriteString("<MinimumVisualStudioVersion>14.0"
+        "</MinimumVisualStudioVersion>\n", 2);
+
+      if(this->Target->GetType() < cmTarget::UTILITY)
+        {
+        isAppContainer = true;
+        }
+      }
+    else if(v == "8.1")
       {
+      this->WriteString("<ApplicationTypeRevision>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML(v)
+                               << "</ApplicationTypeRevision>\n";
       // Visual Studio 12.0 is necessary for building 8.1 apps
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
@@ -3036,6 +3149,9 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       }
     else if (v == "8.0")
       {
+      this->WriteString("<ApplicationTypeRevision>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML(v)
+                               << "</ApplicationTypeRevision>\n";
       // Visual Studio 11.0 is necessary for building 8.0 apps
       this->WriteString("<MinimumVisualStudioVersion>11.0"
                         "</MinimumVisualStudioVersion>\n", 2);
@@ -3072,6 +3188,30 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
       "</WindowsTargetPlatformVersion>\n";
     }
+  const char* targetPlatformMinVersion =
+      this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+  if(targetPlatformMinVersion)
+    {
+    this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformMinVersion) <<
+      "</WindowsTargetPlatformMinVersion>\n";
+    }
+  else if (isWindowsStore && cmHasLiteralPrefix(v, "10.0"))
+    {
+    // If the min version is not set, then use the TargetPlatformVersion
+    if (!targetPlatformVersion.empty())
+      {
+      this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
+        "</WindowsTargetPlatformMinVersion>\n";
+      }
+    }
+
+  // Added IoT Startup Task support
+  if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
+    {
+    this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
+    }
 }
 
 void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
@@ -3124,7 +3264,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
             {
             this->IsMissingFiles = true;
             }
-          else if (v == "8.1")
+          else if (v == "8.1" || cmHasLiteralPrefix(v, "10.0"))
             {
             this->IsMissingFiles = true;
             }
@@ -3158,6 +3298,10 @@ void cmVisualStudio10TargetGenerator::WriteMissingFiles()
      {
      this->WriteMissingFilesWS81();
      }
+   else if (cmHasLiteralPrefix(v, "10.0"))
+     {
+     this->WriteMissingFilesWS10_0();
+     }
    }
 }
 
@@ -3363,7 +3507,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
 }
 
 void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
-{
+  {
   std::string manifestFile =
     this->DefaultArtifactDir + "/package.appxManifest";
   std::string artifactDir =
@@ -3417,7 +3561,65 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
     "</Package>\n";
 
   this->WriteCommonMissingFiles(manifestFile);
-}
+  }
+
+void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
+  {
+  std::string manifestFile =
+    this->DefaultArtifactDir + "/package.appxManifest";
+  std::string artifactDir =
+    this->LocalGenerator->GetTargetDirectory(*this->Target);
+  this->ConvertToWindowsSlash(artifactDir);
+  std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
+  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+
+  cmGeneratedFileStream fout(manifestFile.c_str());
+  fout.SetCopyIfDifferent(true);
+
+  fout <<
+    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+    "<Package\n\t"
+    "xmlns=\"http://schemas.microsoft.com/appx/manifest/foundation/windows10\""
+    "\txmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\"\n"
+    "\txmlns:uap=\"http://schemas.microsoft.com/appx/manifest/uap/windows10\""
+    "\n\tIgnorableNamespaces=\"uap mp\">\n\n"
+    "\t<Identity Name=\"" << this->GUID << "\" Publisher=\"CN=CMake\""
+    " Version=\"1.0.0.0\" />\n"
+    "\t<mp:PhoneIdentity PhoneProductId=\"" << this->GUID <<
+    "\" PhonePublisherId=\"00000000-0000-0000-0000-000000000000\"/>\n"
+    "\t<Properties>\n"
+    "\t\t<DisplayName>" << targetNameXML << "</DisplayName>\n"
+    "\t\t<PublisherDisplayName>CMake</PublisherDisplayName>\n"
+    "\t\t<Logo>" << artifactDirXML << "\\StoreLogo.png</Logo>\n"
+    "\t</Properties>\n"
+    "\t<Dependencies>\n"
+    "\t\t<TargetDeviceFamily Name=\"Windows.Universal\" "
+    "MinVersion=\"10.0.0.0\" MaxVersionTested=\"10.0.0.0\" />\n"
+    "\t</Dependencies>\n"
+
+    "\t<Resources>\n"
+    "\t\t<Resource Language=\"x-generate\" />\n"
+    "\t</Resources>\n"
+    "\t<Applications>\n"
+    "\t\t<Application Id=\"App\""
+    " Executable=\"" << targetNameXML << ".exe\""
+    " EntryPoint=\"" << targetNameXML << ".App\">\n"
+    "\t\t\t<uap:VisualElements\n"
+    "\t\t\t\tDisplayName=\"" << targetNameXML << "\"\n"
+    "\t\t\t\tDescription=\"" << targetNameXML << "\"\n"
+    "\t\t\t\tBackgroundColor=\"#336699\"\n"
+    "\t\t\t\tSquare150x150Logo=\"" << artifactDirXML << "\\Logo.png\"\n"
+    "\t\t\t\tSquare44x44Logo=\"" << artifactDirXML <<
+    "\\SmallLogo44x44.png\">\n"
+    "\t\t\t\t<uap:SplashScreen"
+    " Image=\"" << artifactDirXML << "\\SplashScreen.png\" />\n"
+    "\t\t\t</uap:VisualElements>\n"
+    "\t\t</Application>\n"
+    "\t</Applications>\n"
+    "</Package>\n";
+
+  this->WriteCommonMissingFiles(manifestFile);
+  }
 
 void
 cmVisualStudio10TargetGenerator
@@ -3442,6 +3644,14 @@ cmVisualStudio10TargetGenerator
   (*this->BuildFileStream) << cmVS10EscapeXML(smallLogo) << "\" />\n";
   this->AddedFiles.push_back(smallLogo);
 
+  std::string smallLogo44 = this->DefaultArtifactDir + "/SmallLogo44x44.png";
+  cmSystemTools::CopyAFile(templateFolder + "/SmallLogo44x44.png",
+                           smallLogo44, false);
+  this->ConvertToWindowsSlash(smallLogo44);
+  this->WriteString("<Image Include=\"", 2);
+  (*this->BuildFileStream) << cmVS10EscapeXML(smallLogo44) << "\" />\n";
+  this->AddedFiles.push_back(smallLogo44);
+
   std::string logo = this->DefaultArtifactDir + "/Logo.png";
   cmSystemTools::CopyAFile(templateFolder + "/Logo.png",
                            logo, false);
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index f2aaf05..15ed9f2 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -78,6 +78,13 @@ private:
   void WriteMissingFilesWP81();
   void WriteMissingFilesWS80();
   void WriteMissingFilesWS81();
+  void WriteMissingFilesWS10_0();
+  void WritePlatformExtensions();
+  void WriteSinglePlatformExtension(std::string const& extension,
+                                    std::string const& version);
+  void WriteSDKReferences();
+  void WriteSingleSDKReference(std::string const& extension,
+                               std::string const& version);
   void WriteCommonMissingFiles(const std::string& manifestFile);
   void WriteTargetSpecificReferences();
 
diff --git a/Templates/Windows/SmallLogo44x44.png b/Templates/Windows/SmallLogo44x44.png
new file mode 100644
index 0000000..28810b7
Binary files /dev/null and b/Templates/Windows/SmallLogo44x44.png differ
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dc65a2e..c82cb68 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1955,13 +1955,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     set(reg_vs10 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]")
     set(reg_vs11 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;InstallDir]")
     set(reg_vs12 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0;InstallDir]")
+    set(reg_vs14 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]")
     set(reg_ws80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]")
     set(reg_ws81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]")
+    set(reg_ws10_0 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\Build Tools for Windows 10;srcPath]")
     set(reg_wp80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.0;InstallationFolder]")
     set(reg_wp81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.1;InstallationFolder]")
     select_wince_sdk(reg_wince wince_sdk)
     set(reg_tegra "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Nsight Tegra;sdkRoot]")
-    foreach(reg vs10 vs11 vs12 ws80 ws81 wp80 wp81 wince tegra)
+    foreach(reg vs10 vs11 vs12 vs14 ws80 ws81 ws10_0 wp80 wp81 wince tegra)
       get_filename_component(r "${reg_${reg}}" ABSOLUTE)
       if(IS_DIRECTORY "${r}")
         set(${reg} 1)
@@ -2008,6 +2010,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
                           -DCMAKE_SYSTEM_VERSION=8.1
         )
     endif()
+    if(vs14 AND ws10_0)
+      add_test_VSWinStorePhone(vs14-store10_0-X86 "Visual Studio 14 2015" WindowsStore 10.0)
+      add_test_VSWinStorePhone(vs14-store10_0-ARM "Visual Studio 14 2015 ARM" WindowsStore 10.0)
+      add_test_VSWinStorePhone(vs14-store10_0-X64 "Visual Studio 14 2015 Win64" WindowsStore 10.0)
+    endif()
     if(vs11 AND wp80)
       add_test_VSWinStorePhone(vs11-phone80-X86 "Visual Studio 11 2012" WindowsPhone 8.0)
       add_test_VSWinStorePhone(vs11-phone80-ARM "Visual Studio 11 2012 ARM" WindowsPhone 8.0)
diff --git a/Tests/VSWinStorePhone/CMakeLists.txt b/Tests/VSWinStorePhone/CMakeLists.txt
index 8357d5f..ae82755 100644
--- a/Tests/VSWinStorePhone/CMakeLists.txt
+++ b/Tests/VSWinStorePhone/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.0)
 project(VSWinStorePhone)
-
-if(MSVC_VERSION GREATER 1700)
+if(MSVC_VERSION GREATER 1899)
+  set(COMPILER_VERSION "14")
+elseif(MSVC_VERSION GREATER 1700)
   set(COMPILER_VERSION "12")
 elseif(MSVC_VERSION GREATER 1600)
   set(COMPILER_VERSION "11")
@@ -91,6 +92,7 @@ elseif (NOT "${PLATFORM}" STREQUAL "DESKTOP")
     set(ASSET_FILES ${ASSET_FILES}
     Direct3DApp1/Assets/Logo.png
     Direct3DApp1/Assets/SmallLogo.png
+    Direct3DApp1/Assets/SmallLogo44x44.png
     Direct3DApp1/Assets/SplashScreen.png
     Direct3DApp1/Assets/StoreLogo.png
     )
@@ -124,4 +126,15 @@ source_group("Resource Files" FILES ${RESOURCE_FILES})
 
 add_executable(${EXE_NAME} WIN32 ${SOURCE_FILES} ${HEADER_FILES} ${RESOURCE_FILES})
 set_property(TARGET ${EXE_NAME} PROPERTY VS_WINRT_COMPONENT TRUE)
+
+string(SUBSTRING "${CMAKE_SYSTEM_VERSION}" 0, 4, SHORT_VERSION)
+
+if("${SHORT_VERSION}" STREQUAL "10.0")
+  message(STATUS "Targeting Windows 10. Setting Extensions to version ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+  set_property(TARGET ${EXE_NAME} PROPERTY VS_DESKTOP_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+  set_property(TARGET ${EXE_NAME} PROPERTY VS_MOBILE_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+  set_property(TARGET ${EXE_NAME} PROPERTY VS_IOT_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+endif()
+
+
 target_link_libraries(${EXE_NAME} d3d11)
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png
new file mode 100644
index 0000000..28810b7
Binary files /dev/null and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png differ
diff --git a/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in b/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in
new file mode 100644
index 0000000..6b27ab7
--- /dev/null
+++ b/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  IgnorableNamespaces="uap mp">
+
+  <Identity Name="@PACKAGE_GUID@" Publisher="CN=mgong" Version="1.1.0.0" />
+  <mp:PhoneIdentity PhoneProductId="@PACKAGE_GUID@" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>@SHORT_NAME@</DisplayName>
+    <PublisherDisplayName>mgong</PublisherDisplayName>
+    <Logo>Assets/StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.65535.65535" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="@SHORT_NAME at .App">
+      <uap:VisualElements
+        DisplayName="@SHORT_NAME@"
+        Description="@SHORT_NAME@"
+        BackgroundColor="#336699"
+        Square150x150Logo="Assets/Logo.png"
+        Square44x44Logo="Assets/SmallLogo44x44.png">
+        <uap:SplashScreen Image="Assets/SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+</Package>

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c426183d17c0de9f04e6f03ba57bd58f9797b3b
commit 8c426183d17c0de9f04e6f03ba57bd58f9797b3b
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Oct 2 11:34:55 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 16:41:41 2015 -0400

    MSVC: Add system libs for WindowsStore on VS 2015
    
    Use WindowsApp.lib for a Universal Application Platform project.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 8594596..b421b0d 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -179,7 +179,9 @@ elseif(WINDOWS_PHONE OR WINDOWS_STORE)
   set(_PLATFORM_DEFINES "/DWIN32")
   set(_FLAGS_C " /DUNICODE /D_UNICODE")
   set(_FLAGS_CXX " /DUNICODE /D_UNICODE /GR /EHsc")
-  if(WINDOWS_PHONE)
+  if(WINDOWS_STORE AND MSVC_VERSION GREATER 1899)
+    set(CMAKE_C_STANDARD_LIBRARIES_INIT "WindowsApp.lib")
+  elseif(WINDOWS_PHONE)
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "WindowsPhoneCore.lib RuntimeObject.lib PhoneAppModelHost.lib")
   elseif(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1b87d72f964ae57966c5f02ee9e32236bd59338
commit d1b87d72f964ae57966c5f02ee9e32236bd59338
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Oct 2 11:34:55 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 16:34:11 2015 -0400

    VS: Select Windows 10 Store SDK and toolset for VS 2015

diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index 661dddd..41825fb 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -121,6 +121,34 @@ bool cmGlobalVisualStudio14Generator::InitializeWindows(cmMakefile* mf)
 }
 
 //----------------------------------------------------------------------------
+bool cmGlobalVisualStudio14Generator::InitializeWindowsStore(cmMakefile* mf)
+{
+  std::ostringstream  e;
+  if(!this->SelectWindowsStoreToolset(this->DefaultPlatformToolset))
+    {
+    if(this->DefaultPlatformToolset.empty())
+      {
+      e << this->GetName() << " supports Windows Store '8.0', '8.1' and "
+        "'10.0', but not '" << this->SystemVersion <<
+        "'.  Check CMAKE_SYSTEM_VERSION.";
+      }
+    else
+      {
+      e << "A Windows Store component with CMake requires both the Windows "
+        << "Desktop SDK as well as the Windows Store '" << this->SystemVersion
+        << "' SDK. Please make sure that you have both installed";
+      }
+    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    return false;
+    }
+  if (cmHasLiteralPrefix(this->SystemVersion, "10.0"))
+    {
+    return this->SelectWindows10SDK(mf);
+    }
+  return true;
+}
+
+//----------------------------------------------------------------------------
 bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf)
 {
   // Find the default version of the Windows 10 SDK.
@@ -139,6 +167,28 @@ bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf)
 }
 
 //----------------------------------------------------------------------------
+bool
+cmGlobalVisualStudio14Generator::SelectWindowsStoreToolset(
+  std::string& toolset) const
+{
+  if (cmHasLiteralPrefix(this->SystemVersion, "10.0"))
+    {
+    if (this->IsWindowsStoreToolsetInstalled() &&
+        this->IsWindowsDesktopToolsetInstalled())
+      {
+      toolset = "v140";
+      return true;
+      }
+    else
+      {
+      return false;
+      }
+    }
+  return
+    this->cmGlobalVisualStudio12Generator::SelectWindowsStoreToolset(toolset);
+}
+
+//----------------------------------------------------------------------------
 void cmGlobalVisualStudio14Generator::WriteSLNHeader(std::ostream& fout)
 {
   // Visual Studio 14 writes .sln format 12.00
@@ -167,6 +217,19 @@ cmGlobalVisualStudio14Generator::IsWindowsDesktopToolsetInstalled() const
 }
 
 //----------------------------------------------------------------------------
+bool
+cmGlobalVisualStudio14Generator::IsWindowsStoreToolsetInstalled() const
+{
+  const char universal10Key[] =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+    "VisualStudio\\14.0\\Setup\\Build Tools for Windows 10;SrcPath";
+
+  std::string win10SDK;
+  return cmSystemTools::ReadRegistryValue(universal10Key,
+    win10SDK, cmSystemTools::KeyWOW64_32);
+}
+
+//----------------------------------------------------------------------------
 std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index fcade85..76c15d9 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -31,6 +31,13 @@ public:
   virtual const char* GetToolsVersion() { return "14.0"; }
 protected:
   virtual bool InitializeWindows(cmMakefile* mf);
+  virtual bool InitializeWindowsStore(cmMakefile* mf);
+  virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
+
+  // These aren't virtual because we need to check if the selected version
+  // of the toolset is installed
+  bool IsWindowsStoreToolsetInstalled() const;
+
   virtual const char* GetIDEVersion() { return "14.0"; }
   virtual bool SelectWindows10SDK(cmMakefile* mf);
 

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    5 +
 Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst    |   10 +
 Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst        |   10 +
 Help/prop_tgt/VS_IOT_STARTUP_TASK.rst              |    6 +
 Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst     |   10 +
 .../VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst     |   10 +
 Modules/Platform/Windows-MSVC.cmake                |    4 +-
 Source/cmGlobalVisualStudio14Generator.cxx         |   63 ++++++
 Source/cmGlobalVisualStudio14Generator.h           |    7 +
 Source/cmVisualStudio10TargetGenerator.cxx         |  228 +++++++++++++++++++-
 Source/cmVisualStudio10TargetGenerator.h           |    7 +
 Templates/Windows/SmallLogo44x44.png               |  Bin 0 -> 554 bytes
 Tests/CMakeLists.txt                               |    9 +-
 Tests/VSWinStorePhone/CMakeLists.txt               |   17 +-
 .../Direct3DApp1/Assets/SmallLogo44x44.png         |  Bin 0 -> 554 bytes
 ...ifest.in => Package_vc14.store.appxmanifest.in} |   30 +--
 16 files changed, 388 insertions(+), 28 deletions(-)
 create mode 100644 Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
 create mode 100644 Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
 create mode 100644 Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
 create mode 100644 Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
 create mode 100644 Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
 create mode 100644 Templates/Windows/SmallLogo44x44.png
 create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png
 copy Tests/VSWinStorePhone/cmake/{Package_vc12.wp.appxmanifest.in => Package_vc14.store.appxmanifest.in} (52%)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Oct  3 00:01:07 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat,  3 Oct 2015 00:01:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1395-g7a6c3ff
Message-ID: <20151003040107.950C0BF84D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  7a6c3ff01b68545c776e8917ab9fff99e3182be5 (commit)
      from  7555babbcf4b2b68bdfe99649be3b6076230518b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a6c3ff01b68545c776e8917ab9fff99e3182be5
commit 7a6c3ff01b68545c776e8917ab9fff99e3182be5
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Oct 3 00:01:05 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Oct 3 00:01:05 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f9eeef3..b4f77ec 100644
--- 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 3)
-set(CMake_VERSION_PATCH 20151002)
+set(CMake_VERSION_PATCH 20151003)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Oct  4 00:01:07 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun,  4 Oct 2015 00:01:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1396-gfb4e14d
Message-ID: <20151004040107.2B00EBF672@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  fb4e14d281b87746f122b6b52de35eb5997b06be (commit)
      from  7a6c3ff01b68545c776e8917ab9fff99e3182be5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb4e14d281b87746f122b6b52de35eb5997b06be
commit fb4e14d281b87746f122b6b52de35eb5997b06be
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Oct 4 00:01:04 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Oct 4 00:01:04 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index b4f77ec..3462047 100644
--- 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 3)
-set(CMake_VERSION_PATCH 20151003)
+set(CMake_VERSION_PATCH 20151004)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sun Oct  4 16:48:32 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sun,  4 Oct 2015 16:48:32 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3477-g32f9ebc
Message-ID: <20151004204832.453D9BF1F6@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  32f9ebcfd62deafd542c9b5d408ce0c6b7cadf87 (commit)
       via  91d10d7821bf73999159d753790e3f55f442d333 (commit)
      from  5106bd2f04d5f08376eea921135bdc1a184e26af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32f9ebcfd62deafd542c9b5d408ce0c6b7cadf87
commit 32f9ebcfd62deafd542c9b5d408ce0c6b7cadf87
Merge: 5106bd2 91d10d7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 4 16:48:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 4 16:48:31 2015 -0400

    Merge topic 'doc-3.4-relnotes' into next
    
    91d10d78 fixup! Help: Organize and revise 3.4 release notes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91d10d7821bf73999159d753790e3f55f442d333
commit 91d10d7821bf73999159d753790e3f55f442d333
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 4 22:47:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 4 22:47:58 2015 +0200

    fixup! Help: Organize and revise 3.4 release notes

diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst
index b6f9702..8cc0796 100644
--- a/Help/release/3.4.rst
+++ b/Help/release/3.4.rst
@@ -28,7 +28,7 @@ Commands
 --------
 
 * The :command:`find_program` command learned a ``NAMES_PER_DIR``
-  option to consdier all given ``NAMES`` in each directory before
+  option to consider all given ``NAMES`` in each directory before
   moving on to the next directory.
 
 * The :command:`get_filename_component` command learned a new ``BASE_DIR``

-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.4.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Oct  5 00:01:06 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon,  5 Oct 2015 00:01:06 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1397-ga57f5ab
Message-ID: <20151005040106.C9CCABF56A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  a57f5abdf667544b15bee6eb75e92fc806a6e763 (commit)
      from  fb4e14d281b87746f122b6b52de35eb5997b06be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a57f5abdf667544b15bee6eb75e92fc806a6e763
commit a57f5abdf667544b15bee6eb75e92fc806a6e763
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Oct 5 00:01:04 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 5 00:01:04 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3462047..087ed53 100644
--- 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 3)
-set(CMake_VERSION_PATCH 20151004)
+set(CMake_VERSION_PATCH 20151005)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 09:16:40 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 09:16:40 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3479-g8989d26
Message-ID: <20151005131640.A2892BF33E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8989d268cfea91747d054a4820054ddd26af864e (commit)
       via  2775768f348bb082d1b2f1d8793f65ba832dc8df (commit)
      from  32f9ebcfd62deafd542c9b5d408ce0c6b7cadf87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8989d268cfea91747d054a4820054ddd26af864e
commit 8989d268cfea91747d054a4820054ddd26af864e
Merge: 32f9ebc 2775768
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:16:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 09:16:39 2015 -0400

    Merge topic 'FindMatlab-v8.6' into next
    
    2775768f FindMatlab: Add support for Matlab R2015b


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2775768f348bb082d1b2f1d8793f65ba832dc8df
commit 2775768f348bb082d1b2f1d8793f65ba832dc8df
Author:     Francesco Romano <francesco.romano.1987 at gmail.com>
AuthorDate: Sat Oct 3 10:49:16 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:16:14 2015 -0400

    FindMatlab: Add support for Matlab R2015b

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index a47a69c..7a36719 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -229,6 +229,7 @@ if(NOT MATLAB_ADDITIONAL_VERSIONS)
 endif()
 
 set(MATLAB_VERSIONS_MAPPING
+  "R2015b=8.6"
   "R2015a=8.5"
   "R2014b=8.4"
   "R2014a=8.3"

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindMatlab.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 09:45:27 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 09:45:27 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3482-gd5aff18
Message-ID: <20151005134527.D94E0BEDF8@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d5aff18791bb13788726569d3dc10efe826f721f (commit)
       via  4c690ddcdc0ade5b807f56d50c5a175fd3ad78fd (commit)
       via  a8319493eb92dc849eeffc16dda9e16a44cea020 (commit)
      from  8989d268cfea91747d054a4820054ddd26af864e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5aff18791bb13788726569d3dc10efe826f721f
commit d5aff18791bb13788726569d3dc10efe826f721f
Merge: 8989d26 4c690dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:45:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 09:45:27 2015 -0400

    Merge topic 'vs-win10-store' into next
    
    4c690ddc fixup! This change adds support for Windows 10 Universal (Store) Applications.
    a8319493 Help: Document Windows 10 Universal Applications in cmake-toolchains(7)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c690ddcdc0ade5b807f56d50c5a175fd3ad78fd
commit 4c690ddcdc0ade5b807f56d50c5a175fd3ad78fd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:44:56 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:44:56 2015 -0400

    fixup! This change adds support for Windows 10 Universal (Store) Applications.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 491addc..d1ef6c2 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2928,23 +2928,23 @@ void cmVisualStudio10TargetGenerator::WriteSinglePlatformExtension(
   std::string const& version
   )
 {
-      this->WriteString("<Import Project=", 2);
-      (*this->BuildFileStream)
-        << "\"$([Microsoft.Build.Utilities.ToolLocationHelper]"
-        << "::GetPlatformExtensionSDKLocation(`"
-        << extension <<", Version=" << version
-        << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
-        << "$(ExtensionSDKDirectoryRoot), null))"
-        << "\\DesignTime\\CommonConfiguration\\Neutral\\"
-        << extension << ".props\" "
-        << "Condition=\"exists('$("
-        << "[Microsoft.Build.Utilities.ToolLocationHelper]"
-        << "::GetPlatformExtensionSDKLocation(`"
-        << extension << ", Version=" << version
-        << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
-        << "$(ExtensionSDKDirectoryRoot), null))"
-        << "\\DesignTime\\CommonConfiguration\\Neutral\\"
-        << extension << ".props')\" />\n";
+  this->WriteString("<Import Project=", 2);
+  (*this->BuildFileStream)
+    << "\"$([Microsoft.Build.Utilities.ToolLocationHelper]"
+    << "::GetPlatformExtensionSDKLocation(`"
+    << extension <<", Version=" << version
+    << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+    << "$(ExtensionSDKDirectoryRoot), null))"
+    << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+    << extension << ".props\" "
+    << "Condition=\"exists('$("
+    << "[Microsoft.Build.Utilities.ToolLocationHelper]"
+    << "::GetPlatformExtensionSDKLocation(`"
+    << extension << ", Version=" << version
+    << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+    << "$(ExtensionSDKDirectoryRoot), null))"
+    << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+    << extension << ".props')\" />\n";
 }
 
 void cmVisualStudio10TargetGenerator::WriteSDKReferences()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8319493eb92dc849eeffc16dda9e16a44cea020
commit a8319493eb92dc849eeffc16dda9e16a44cea020
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:41:49 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:44:34 2015 -0400

    Help: Document Windows 10 Universal Applications in cmake-toolchains(7)

diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index a06dce7..492fcac 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -220,6 +220,23 @@ Windows CE to use.  Currently version 8.0 (Windows Embedded Compact 2013) is
 supported out of the box.  Other versions may require one to set
 :variable:`CMAKE_GENERATOR_TOOLSET` to the correct value.
 
+Cross Compiling for Windows 10 Universal Applications
+-----------------------------------------------------
+
+A toolchain file to configure a Visual Studio generator for a
+Windows 10 Universal Application may look like this:
+
+.. code-block:: cmake
+
+  set(CMAKE_SYSTEM_NAME WindowsStore)
+  set(CMAKE_SYSTEM_VERSION 10.0)
+
+A Windows 10 Universal Application targets both Windows Store and
+Windows Phone.  Specify the :variable:`CMAKE_SYSTEM_VERSION` variable
+to be ``10.0`` to build with the latest available Windows 10 SDK.
+Specify a more specific version (e.g. ``10.0.10240.0`` for RTM)
+to build with the corresponding SDK.
+
 Cross Compiling for Windows Phone
 ---------------------------------
 

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-toolchains.7.rst         |   17 ++++++++++++++
 Source/cmVisualStudio10TargetGenerator.cxx |   34 ++++++++++++++--------------
 2 files changed, 34 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 09:45:43 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 09:45:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3486-g3d101d1
Message-ID: <20151005134543.814C9BF06D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3d101d15a5db6e72088aec6ca62035aeb2b2f10d (commit)
       via  54b339ceb3ec54ff7806dd807113c59b6e48d931 (commit)
       via  2875ae3a2e1ac2088074b4705cb7b75ce77df91b (commit)
       via  2798dbdacbc8a3c4648d61c0a73a3b5791ccf593 (commit)
      from  d5aff18791bb13788726569d3dc10efe826f721f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d101d15a5db6e72088aec6ca62035aeb2b2f10d
commit 3d101d15a5db6e72088aec6ca62035aeb2b2f10d
Merge: d5aff18 54b339c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:45:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 09:45:42 2015 -0400

    Merge topic 'vs-win10-store' into next
    
    54b339ce Help: Document Windows 10 Universal Applications in cmake-toolchains(7)
    2875ae3a VS: Add support for Windows 10 Universal (Store) Applications
    2798dbda VS: Refactor indentation of LinkLibraryDependencies


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54b339ceb3ec54ff7806dd807113c59b6e48d931
commit 54b339ceb3ec54ff7806dd807113c59b6e48d931
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:41:49 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:43:57 2015 -0400

    Help: Document Windows 10 Universal Applications in cmake-toolchains(7)

diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index a06dce7..492fcac 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -220,6 +220,23 @@ Windows CE to use.  Currently version 8.0 (Windows Embedded Compact 2013) is
 supported out of the box.  Other versions may require one to set
 :variable:`CMAKE_GENERATOR_TOOLSET` to the correct value.
 
+Cross Compiling for Windows 10 Universal Applications
+-----------------------------------------------------
+
+A toolchain file to configure a Visual Studio generator for a
+Windows 10 Universal Application may look like this:
+
+.. code-block:: cmake
+
+  set(CMAKE_SYSTEM_NAME WindowsStore)
+  set(CMAKE_SYSTEM_VERSION 10.0)
+
+A Windows 10 Universal Application targets both Windows Store and
+Windows Phone.  Specify the :variable:`CMAKE_SYSTEM_VERSION` variable
+to be ``10.0`` to build with the latest available Windows 10 SDK.
+Specify a more specific version (e.g. ``10.0.10240.0`` for RTM)
+to build with the corresponding SDK.
+
 Cross Compiling for Windows Phone
 ---------------------------------
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2875ae3a2e1ac2088074b4705cb7b75ce77df91b
commit 2875ae3a2e1ac2088074b4705cb7b75ce77df91b
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Oct 2 11:34:55 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:34:53 2015 -0400

    VS: Add support for Windows 10 Universal (Store) Applications
    
    Teach the VS 2015 generator to support WindowsStore 10.0 applications.
    Add target properties to customize them:
    
    * VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION: Specifies the minimum version
      of the OS that the project can target.
    
    * VS_DESKTOP_EXTENSIONS_VERSION, VS_MOBILE_EXTENSIONS_VERSIONS,
      VS_IOT_EXTENSIONS_VERSION: Add a reference to the version of the SDK
      specified to the target allowing to target the extended functionality in
      a universal project.
    
    * VS_IOT_STARTUP_TASK: Specifies that the target should be
      built as an IOT continuous background task.

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index ac893c2..931363c 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -254,17 +254,22 @@ Properties on Targets
    /prop_tgt/TYPE
    /prop_tgt/VERSION
    /prop_tgt/VISIBILITY_INLINES_HIDDEN
+   /prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION
    /prop_tgt/VS_DOTNET_REFERENCES
    /prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION
    /prop_tgt/VS_GLOBAL_KEYWORD
    /prop_tgt/VS_GLOBAL_PROJECT_TYPES
    /prop_tgt/VS_GLOBAL_ROOTNAMESPACE
    /prop_tgt/VS_GLOBAL_variable
+   /prop_tgt/VS_IOT_EXTENSIONS_VERSION
+   /prop_tgt/VS_IOT_STARTUP_TASK
    /prop_tgt/VS_KEYWORD
+   /prop_tgt/VS_MOBILE_EXTENSIONS_VERSION
    /prop_tgt/VS_SCC_AUXPATH
    /prop_tgt/VS_SCC_LOCALPATH
    /prop_tgt/VS_SCC_PROJECTNAME
    /prop_tgt/VS_SCC_PROVIDER
+   /prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
    /prop_tgt/VS_WINRT_COMPONENT
    /prop_tgt/VS_WINRT_EXTENSIONS
    /prop_tgt/VS_WINRT_REFERENCES
diff --git a/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst b/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
new file mode 100644
index 0000000..19d1620
--- /dev/null
+++ b/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
@@ -0,0 +1,10 @@
+VS_DESKTOP_EXTENSIONS_VERSION
+-----------------------------
+
+Visual Studio Windows 10 Desktop Extensions Version
+
+Specifies the version of the Desktop Extensions that should be included in the
+target. For example ``10.0.10240.0``. If the value is not specified, the Desktop
+Extensions will not be included. To use the same version of the extensions as
+the Windows 10 SDK that is being used, you can use the
+:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
diff --git a/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst b/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
new file mode 100644
index 0000000..27c8a3d
--- /dev/null
+++ b/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
@@ -0,0 +1,10 @@
+VS_IOT_EXTENSIONS_VERSION
+-------------------------
+
+Visual Studio Windows 10 IoT Extensions Version
+
+Specifies the version of the IoT Extensions that should be included in the
+target. For example ``10.0.10240.0``. If the value is not specified, the IoT
+Extensions will not be included. To use the same version of the extensions as
+the Windows 10 SDK that is being used, you can use the
+:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
diff --git a/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst b/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
new file mode 100644
index 0000000..add50cb
--- /dev/null
+++ b/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
@@ -0,0 +1,6 @@
+VS_IOT_STARTUP_TASK
+-------------------
+
+Visual Studio Windows 10 IoT Continuous Background Task
+
+Specifies that the target should be compiled as a Continuous Background Task library.
diff --git a/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst b/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
new file mode 100644
index 0000000..be3c9a0
--- /dev/null
+++ b/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
@@ -0,0 +1,10 @@
+VS_MOBILE_EXTENSIONS_VERSION
+----------------------------
+
+Visual Studio Windows 10 Mobile Extensions Version
+
+Specifies the version of the Mobile Extensions that should be included in the
+target. For example ``10.0.10240.0``. If the value is not specified, the Mobile
+Extensions will not be included. To use the same version of the extensions as
+the Windows 10 SDK that is being used, you can use the
+:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
diff --git a/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst b/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
new file mode 100644
index 0000000..1ad7a71
--- /dev/null
+++ b/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
@@ -0,0 +1,10 @@
+VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
+--------------------------------------
+
+Visual Studio Windows Target Platform Minimum Version
+
+For Windows 10. Specifies the minimum version of the OS that is being
+targeted. For example ``10.0.10240.0``. If the value is not specified, the
+value of :variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` will be used on
+WindowsStore projects otherwise the target platform minimum version will not
+be specified for the project.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 9cc0393..d1ef6c2 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -463,6 +463,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Import Project=\"" VS10_USER_PROPS "\""
                     " Condition=\"exists('" VS10_USER_PROPS "')\""
                     " Label=\"LocalAppDataPlatform\" />\n", 2);
+  this->WritePlatformExtensions();
   this->WriteString("</ImportGroup>\n", 1);
   this->WriteString("<PropertyGroup Label=\"UserMacros\" />\n", 1);
   this->WriteWinRTPackageCertificateKeyFile();
@@ -475,6 +476,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteXamlFilesGroup();
   this->WriteWinRTReferences();
   this->WriteProjectReferences();
+  this->WriteSDKReferences();
   this->WriteString(
     "<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.targets\""
     " />\n", 1);
@@ -1307,6 +1309,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
     {
     tool = "XML";
     }
+
   if(this->NsightTegra)
     {
     // Nsight Tegra needs specific file types to check up-to-dateness.
@@ -2590,7 +2593,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
+       this->Target->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2896,6 +2900,101 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
   this->WriteString("</ItemGroup>\n", 1);
 }
 
+void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
+{
+  // This only applies to Windows 10 apps
+  if (this->GlobalGenerator->TargetsWindowsStore() &&
+      cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
+    {
+    const char* desktopExtensionsVersion =
+      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+    if (desktopExtensionsVersion)
+      {
+      this->WriteSinglePlatformExtension("WindowsDesktop",
+                                         desktopExtensionsVersion);
+      }
+    const char* mobileExtensionsVersion =
+      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+    if (mobileExtensionsVersion)
+      {
+      this->WriteSinglePlatformExtension("WindowsMobile",
+                                         mobileExtensionsVersion);
+      }
+    }
+}
+
+void cmVisualStudio10TargetGenerator::WriteSinglePlatformExtension(
+  std::string const& extension,
+  std::string const& version
+  )
+{
+  this->WriteString("<Import Project=", 2);
+  (*this->BuildFileStream)
+    << "\"$([Microsoft.Build.Utilities.ToolLocationHelper]"
+    << "::GetPlatformExtensionSDKLocation(`"
+    << extension <<", Version=" << version
+    << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+    << "$(ExtensionSDKDirectoryRoot), null))"
+    << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+    << extension << ".props\" "
+    << "Condition=\"exists('$("
+    << "[Microsoft.Build.Utilities.ToolLocationHelper]"
+    << "::GetPlatformExtensionSDKLocation(`"
+    << extension << ", Version=" << version
+    << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+    << "$(ExtensionSDKDirectoryRoot), null))"
+    << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+    << extension << ".props')\" />\n";
+}
+
+void cmVisualStudio10TargetGenerator::WriteSDKReferences()
+{
+  // This only applies to Windows 10 apps
+  if (this->GlobalGenerator->TargetsWindowsStore() &&
+      cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
+    {
+    const char* desktopExtensionsVersion =
+      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+    const char* mobileExtensionsVersion =
+      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+    const char* iotExtensionsVersion =
+      this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
+
+    if(desktopExtensionsVersion || mobileExtensionsVersion ||
+       iotExtensionsVersion)
+      {
+      this->WriteString("<ItemGroup>\n", 1);
+      if(desktopExtensionsVersion)
+        {
+        this->WriteSingleSDKReference("WindowsDesktop",
+                                      desktopExtensionsVersion);
+        }
+      if(mobileExtensionsVersion)
+        {
+        this->WriteSingleSDKReference("WindowsMobile",
+                                      mobileExtensionsVersion);
+        }
+      if(iotExtensionsVersion)
+        {
+        this->WriteSingleSDKReference("WindowsIoT",
+                                      iotExtensionsVersion);
+        }
+      this->WriteString("</ItemGroup>\n", 1);
+      }
+    }
+}
+
+void cmVisualStudio10TargetGenerator::WriteSingleSDKReference(
+  std::string const& extension,
+  std::string const& version
+  )
+{
+  this->WriteString("<SDKReference Include=\"", 2);
+  (*this->BuildFileStream) << extension
+    << ", Version=" << version << "\" />\n";
+}
+
+
 void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
@@ -3018,13 +3117,27 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     (*this->BuildFileStream) << (isWindowsPhone ?
                                  "Windows Phone" : "Windows Store")
                              << "</ApplicationType>\n";
-    this->WriteString("<ApplicationTypeRevision>", 2);
-    (*this->BuildFileStream) << cmVS10EscapeXML(v)
-                             << "</ApplicationTypeRevision>\n";
     this->WriteString("<DefaultLanguage>en-US"
                       "</DefaultLanguage>\n", 2);
-    if(v == "8.1")
+    if (cmHasLiteralPrefix(v, "10.0"))
+      {
+      this->WriteString("<ApplicationTypeRevision>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML("10.0")
+                               << "</ApplicationTypeRevision>\n";
+      // Visual Studio 14.0 is necessary for building 10.0 apps
+      this->WriteString("<MinimumVisualStudioVersion>14.0"
+        "</MinimumVisualStudioVersion>\n", 2);
+
+      if(this->Target->GetType() < cmTarget::UTILITY)
+        {
+        isAppContainer = true;
+        }
+      }
+    else if(v == "8.1")
       {
+      this->WriteString("<ApplicationTypeRevision>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML(v)
+                               << "</ApplicationTypeRevision>\n";
       // Visual Studio 12.0 is necessary for building 8.1 apps
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
@@ -3036,6 +3149,9 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       }
     else if (v == "8.0")
       {
+      this->WriteString("<ApplicationTypeRevision>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML(v)
+                               << "</ApplicationTypeRevision>\n";
       // Visual Studio 11.0 is necessary for building 8.0 apps
       this->WriteString("<MinimumVisualStudioVersion>11.0"
                         "</MinimumVisualStudioVersion>\n", 2);
@@ -3072,6 +3188,30 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
       "</WindowsTargetPlatformVersion>\n";
     }
+  const char* targetPlatformMinVersion =
+      this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+  if(targetPlatformMinVersion)
+    {
+    this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformMinVersion) <<
+      "</WindowsTargetPlatformMinVersion>\n";
+    }
+  else if (isWindowsStore && cmHasLiteralPrefix(v, "10.0"))
+    {
+    // If the min version is not set, then use the TargetPlatformVersion
+    if (!targetPlatformVersion.empty())
+      {
+      this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
+        "</WindowsTargetPlatformMinVersion>\n";
+      }
+    }
+
+  // Added IoT Startup Task support
+  if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
+    {
+    this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
+    }
 }
 
 void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
@@ -3124,7 +3264,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
             {
             this->IsMissingFiles = true;
             }
-          else if (v == "8.1")
+          else if (v == "8.1" || cmHasLiteralPrefix(v, "10.0"))
             {
             this->IsMissingFiles = true;
             }
@@ -3158,6 +3298,10 @@ void cmVisualStudio10TargetGenerator::WriteMissingFiles()
      {
      this->WriteMissingFilesWS81();
      }
+   else if (cmHasLiteralPrefix(v, "10.0"))
+     {
+     this->WriteMissingFilesWS10_0();
+     }
    }
 }
 
@@ -3363,7 +3507,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
 }
 
 void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
-{
+  {
   std::string manifestFile =
     this->DefaultArtifactDir + "/package.appxManifest";
   std::string artifactDir =
@@ -3417,7 +3561,65 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
     "</Package>\n";
 
   this->WriteCommonMissingFiles(manifestFile);
-}
+  }
+
+void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
+  {
+  std::string manifestFile =
+    this->DefaultArtifactDir + "/package.appxManifest";
+  std::string artifactDir =
+    this->LocalGenerator->GetTargetDirectory(*this->Target);
+  this->ConvertToWindowsSlash(artifactDir);
+  std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
+  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+
+  cmGeneratedFileStream fout(manifestFile.c_str());
+  fout.SetCopyIfDifferent(true);
+
+  fout <<
+    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+    "<Package\n\t"
+    "xmlns=\"http://schemas.microsoft.com/appx/manifest/foundation/windows10\""
+    "\txmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\"\n"
+    "\txmlns:uap=\"http://schemas.microsoft.com/appx/manifest/uap/windows10\""
+    "\n\tIgnorableNamespaces=\"uap mp\">\n\n"
+    "\t<Identity Name=\"" << this->GUID << "\" Publisher=\"CN=CMake\""
+    " Version=\"1.0.0.0\" />\n"
+    "\t<mp:PhoneIdentity PhoneProductId=\"" << this->GUID <<
+    "\" PhonePublisherId=\"00000000-0000-0000-0000-000000000000\"/>\n"
+    "\t<Properties>\n"
+    "\t\t<DisplayName>" << targetNameXML << "</DisplayName>\n"
+    "\t\t<PublisherDisplayName>CMake</PublisherDisplayName>\n"
+    "\t\t<Logo>" << artifactDirXML << "\\StoreLogo.png</Logo>\n"
+    "\t</Properties>\n"
+    "\t<Dependencies>\n"
+    "\t\t<TargetDeviceFamily Name=\"Windows.Universal\" "
+    "MinVersion=\"10.0.0.0\" MaxVersionTested=\"10.0.0.0\" />\n"
+    "\t</Dependencies>\n"
+
+    "\t<Resources>\n"
+    "\t\t<Resource Language=\"x-generate\" />\n"
+    "\t</Resources>\n"
+    "\t<Applications>\n"
+    "\t\t<Application Id=\"App\""
+    " Executable=\"" << targetNameXML << ".exe\""
+    " EntryPoint=\"" << targetNameXML << ".App\">\n"
+    "\t\t\t<uap:VisualElements\n"
+    "\t\t\t\tDisplayName=\"" << targetNameXML << "\"\n"
+    "\t\t\t\tDescription=\"" << targetNameXML << "\"\n"
+    "\t\t\t\tBackgroundColor=\"#336699\"\n"
+    "\t\t\t\tSquare150x150Logo=\"" << artifactDirXML << "\\Logo.png\"\n"
+    "\t\t\t\tSquare44x44Logo=\"" << artifactDirXML <<
+    "\\SmallLogo44x44.png\">\n"
+    "\t\t\t\t<uap:SplashScreen"
+    " Image=\"" << artifactDirXML << "\\SplashScreen.png\" />\n"
+    "\t\t\t</uap:VisualElements>\n"
+    "\t\t</Application>\n"
+    "\t</Applications>\n"
+    "</Package>\n";
+
+  this->WriteCommonMissingFiles(manifestFile);
+  }
 
 void
 cmVisualStudio10TargetGenerator
@@ -3442,6 +3644,14 @@ cmVisualStudio10TargetGenerator
   (*this->BuildFileStream) << cmVS10EscapeXML(smallLogo) << "\" />\n";
   this->AddedFiles.push_back(smallLogo);
 
+  std::string smallLogo44 = this->DefaultArtifactDir + "/SmallLogo44x44.png";
+  cmSystemTools::CopyAFile(templateFolder + "/SmallLogo44x44.png",
+                           smallLogo44, false);
+  this->ConvertToWindowsSlash(smallLogo44);
+  this->WriteString("<Image Include=\"", 2);
+  (*this->BuildFileStream) << cmVS10EscapeXML(smallLogo44) << "\" />\n";
+  this->AddedFiles.push_back(smallLogo44);
+
   std::string logo = this->DefaultArtifactDir + "/Logo.png";
   cmSystemTools::CopyAFile(templateFolder + "/Logo.png",
                            logo, false);
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index f2aaf05..15ed9f2 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -78,6 +78,13 @@ private:
   void WriteMissingFilesWP81();
   void WriteMissingFilesWS80();
   void WriteMissingFilesWS81();
+  void WriteMissingFilesWS10_0();
+  void WritePlatformExtensions();
+  void WriteSinglePlatformExtension(std::string const& extension,
+                                    std::string const& version);
+  void WriteSDKReferences();
+  void WriteSingleSDKReference(std::string const& extension,
+                               std::string const& version);
   void WriteCommonMissingFiles(const std::string& manifestFile);
   void WriteTargetSpecificReferences();
 
diff --git a/Templates/Windows/SmallLogo44x44.png b/Templates/Windows/SmallLogo44x44.png
new file mode 100644
index 0000000..28810b7
Binary files /dev/null and b/Templates/Windows/SmallLogo44x44.png differ
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dc65a2e..c82cb68 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1955,13 +1955,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     set(reg_vs10 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]")
     set(reg_vs11 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;InstallDir]")
     set(reg_vs12 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0;InstallDir]")
+    set(reg_vs14 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]")
     set(reg_ws80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]")
     set(reg_ws81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]")
+    set(reg_ws10_0 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\Build Tools for Windows 10;srcPath]")
     set(reg_wp80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.0;InstallationFolder]")
     set(reg_wp81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.1;InstallationFolder]")
     select_wince_sdk(reg_wince wince_sdk)
     set(reg_tegra "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Nsight Tegra;sdkRoot]")
-    foreach(reg vs10 vs11 vs12 ws80 ws81 wp80 wp81 wince tegra)
+    foreach(reg vs10 vs11 vs12 vs14 ws80 ws81 ws10_0 wp80 wp81 wince tegra)
       get_filename_component(r "${reg_${reg}}" ABSOLUTE)
       if(IS_DIRECTORY "${r}")
         set(${reg} 1)
@@ -2008,6 +2010,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
                           -DCMAKE_SYSTEM_VERSION=8.1
         )
     endif()
+    if(vs14 AND ws10_0)
+      add_test_VSWinStorePhone(vs14-store10_0-X86 "Visual Studio 14 2015" WindowsStore 10.0)
+      add_test_VSWinStorePhone(vs14-store10_0-ARM "Visual Studio 14 2015 ARM" WindowsStore 10.0)
+      add_test_VSWinStorePhone(vs14-store10_0-X64 "Visual Studio 14 2015 Win64" WindowsStore 10.0)
+    endif()
     if(vs11 AND wp80)
       add_test_VSWinStorePhone(vs11-phone80-X86 "Visual Studio 11 2012" WindowsPhone 8.0)
       add_test_VSWinStorePhone(vs11-phone80-ARM "Visual Studio 11 2012 ARM" WindowsPhone 8.0)
diff --git a/Tests/VSWinStorePhone/CMakeLists.txt b/Tests/VSWinStorePhone/CMakeLists.txt
index 8357d5f..ae82755 100644
--- a/Tests/VSWinStorePhone/CMakeLists.txt
+++ b/Tests/VSWinStorePhone/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.0)
 project(VSWinStorePhone)
-
-if(MSVC_VERSION GREATER 1700)
+if(MSVC_VERSION GREATER 1899)
+  set(COMPILER_VERSION "14")
+elseif(MSVC_VERSION GREATER 1700)
   set(COMPILER_VERSION "12")
 elseif(MSVC_VERSION GREATER 1600)
   set(COMPILER_VERSION "11")
@@ -91,6 +92,7 @@ elseif (NOT "${PLATFORM}" STREQUAL "DESKTOP")
     set(ASSET_FILES ${ASSET_FILES}
     Direct3DApp1/Assets/Logo.png
     Direct3DApp1/Assets/SmallLogo.png
+    Direct3DApp1/Assets/SmallLogo44x44.png
     Direct3DApp1/Assets/SplashScreen.png
     Direct3DApp1/Assets/StoreLogo.png
     )
@@ -124,4 +126,15 @@ source_group("Resource Files" FILES ${RESOURCE_FILES})
 
 add_executable(${EXE_NAME} WIN32 ${SOURCE_FILES} ${HEADER_FILES} ${RESOURCE_FILES})
 set_property(TARGET ${EXE_NAME} PROPERTY VS_WINRT_COMPONENT TRUE)
+
+string(SUBSTRING "${CMAKE_SYSTEM_VERSION}" 0, 4, SHORT_VERSION)
+
+if("${SHORT_VERSION}" STREQUAL "10.0")
+  message(STATUS "Targeting Windows 10. Setting Extensions to version ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+  set_property(TARGET ${EXE_NAME} PROPERTY VS_DESKTOP_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+  set_property(TARGET ${EXE_NAME} PROPERTY VS_MOBILE_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+  set_property(TARGET ${EXE_NAME} PROPERTY VS_IOT_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+endif()
+
+
 target_link_libraries(${EXE_NAME} d3d11)
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png
new file mode 100644
index 0000000..28810b7
Binary files /dev/null and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png differ
diff --git a/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in b/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in
new file mode 100644
index 0000000..6b27ab7
--- /dev/null
+++ b/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  IgnorableNamespaces="uap mp">
+
+  <Identity Name="@PACKAGE_GUID@" Publisher="CN=mgong" Version="1.1.0.0" />
+  <mp:PhoneIdentity PhoneProductId="@PACKAGE_GUID@" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>@SHORT_NAME@</DisplayName>
+    <PublisherDisplayName>mgong</PublisherDisplayName>
+    <Logo>Assets/StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.65535.65535" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="@SHORT_NAME at .App">
+      <uap:VisualElements
+        DisplayName="@SHORT_NAME@"
+        Description="@SHORT_NAME@"
+        BackgroundColor="#336699"
+        Square150x150Logo="Assets/Logo.png"
+        Square44x44Logo="Assets/SmallLogo44x44.png">
+        <uap:SplashScreen Image="Assets/SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+</Package>

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2798dbdacbc8a3c4648d61c0a73a3b5791ccf593
commit 2798dbdacbc8a3c4648d61c0a73a3b5791ccf593
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Oct 2 11:34:55 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:24:50 2015 -0400

    VS: Refactor indentation of LinkLibraryDependencies
    
    Use our indentation specifier instead of hard-coding spaces.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 91f2476..9cc0393 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2661,7 +2661,7 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(
-      "  <LinkLibraryDependencies>false</LinkLibraryDependencies>\n", 2);
+      "<LinkLibraryDependencies>false</LinkLibraryDependencies>\n", 3);
     this->WriteString("</ProjectReference>\n", 2);
     }
 }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 09:47:55 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 09:47:55 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3488-g921d229
Message-ID: <20151005134755.47EFEBF210@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  921d229c5bde51a6b96062defe7381f0eaf5c582 (commit)
       via  b882668f4fffb7eae8ada45844f1d72627279834 (commit)
      from  3d101d15a5db6e72088aec6ca62035aeb2b2f10d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=921d229c5bde51a6b96062defe7381f0eaf5c582
commit 921d229c5bde51a6b96062defe7381f0eaf5c582
Merge: 3d101d1 b882668
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:47:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 09:47:54 2015 -0400

    Merge topic 'vs-win10-store' into next
    
    b882668f fixup! VS: Add support for Windows 10 Universal (Store) Applications


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b882668f4fffb7eae8ada45844f1d72627279834
commit b882668f4fffb7eae8ada45844f1d72627279834
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:47:39 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:47:39 2015 -0400

    fixup! VS: Add support for Windows 10 Universal (Store) Applications

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index d1ef6c2..d62ad88 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3507,7 +3507,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
 }
 
 void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
-  {
+{
   std::string manifestFile =
     this->DefaultArtifactDir + "/package.appxManifest";
   std::string artifactDir =
@@ -3561,10 +3561,10 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
     "</Package>\n";
 
   this->WriteCommonMissingFiles(manifestFile);
-  }
+}
 
 void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
-  {
+{
   std::string manifestFile =
     this->DefaultArtifactDir + "/package.appxManifest";
   std::string artifactDir =
@@ -3619,7 +3619,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
     "</Package>\n";
 
   this->WriteCommonMissingFiles(manifestFile);
-  }
+}
 
 void
 cmVisualStudio10TargetGenerator

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 09:49:21 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 09:49:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3491-gea08e6e
Message-ID: <20151005134921.5C403BF378@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ea08e6e8681357225d6100dcab53a2d9d90fe082 (commit)
       via  2402bb8cfd63078623779a3704227915324e52d4 (commit)
       via  1be2f12cf241f0d46095e17a561cd70da49ff549 (commit)
      from  921d229c5bde51a6b96062defe7381f0eaf5c582 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea08e6e8681357225d6100dcab53a2d9d90fe082
commit ea08e6e8681357225d6100dcab53a2d9d90fe082
Merge: 921d229 2402bb8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:49:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 09:49:20 2015 -0400

    Merge topic 'vs-win10-store' into next
    
    2402bb8c Help: Document Windows 10 Universal Applications in cmake-toolchains(7)
    1be2f12c VS: Add support for Windows 10 Universal (Store) Applications


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2402bb8cfd63078623779a3704227915324e52d4
commit 2402bb8cfd63078623779a3704227915324e52d4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:41:49 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:48:15 2015 -0400

    Help: Document Windows 10 Universal Applications in cmake-toolchains(7)

diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index a06dce7..492fcac 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -220,6 +220,23 @@ Windows CE to use.  Currently version 8.0 (Windows Embedded Compact 2013) is
 supported out of the box.  Other versions may require one to set
 :variable:`CMAKE_GENERATOR_TOOLSET` to the correct value.
 
+Cross Compiling for Windows 10 Universal Applications
+-----------------------------------------------------
+
+A toolchain file to configure a Visual Studio generator for a
+Windows 10 Universal Application may look like this:
+
+.. code-block:: cmake
+
+  set(CMAKE_SYSTEM_NAME WindowsStore)
+  set(CMAKE_SYSTEM_VERSION 10.0)
+
+A Windows 10 Universal Application targets both Windows Store and
+Windows Phone.  Specify the :variable:`CMAKE_SYSTEM_VERSION` variable
+to be ``10.0`` to build with the latest available Windows 10 SDK.
+Specify a more specific version (e.g. ``10.0.10240.0`` for RTM)
+to build with the corresponding SDK.
+
 Cross Compiling for Windows Phone
 ---------------------------------
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1be2f12cf241f0d46095e17a561cd70da49ff549
commit 1be2f12cf241f0d46095e17a561cd70da49ff549
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Oct 2 11:34:55 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:48:11 2015 -0400

    VS: Add support for Windows 10 Universal (Store) Applications
    
    Teach the VS 2015 generator to support WindowsStore 10.0 applications.
    Add target properties to customize them:
    
    * VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION: Specifies the minimum version
      of the OS that the project can target.
    
    * VS_DESKTOP_EXTENSIONS_VERSION, VS_MOBILE_EXTENSIONS_VERSIONS,
      VS_IOT_EXTENSIONS_VERSION: Add a reference to the version of the SDK
      specified to the target allowing to target the extended functionality in
      a universal project.
    
    * VS_IOT_STARTUP_TASK: Specifies that the target should be
      built as an IOT continuous background task.

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index ac893c2..931363c 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -254,17 +254,22 @@ Properties on Targets
    /prop_tgt/TYPE
    /prop_tgt/VERSION
    /prop_tgt/VISIBILITY_INLINES_HIDDEN
+   /prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION
    /prop_tgt/VS_DOTNET_REFERENCES
    /prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION
    /prop_tgt/VS_GLOBAL_KEYWORD
    /prop_tgt/VS_GLOBAL_PROJECT_TYPES
    /prop_tgt/VS_GLOBAL_ROOTNAMESPACE
    /prop_tgt/VS_GLOBAL_variable
+   /prop_tgt/VS_IOT_EXTENSIONS_VERSION
+   /prop_tgt/VS_IOT_STARTUP_TASK
    /prop_tgt/VS_KEYWORD
+   /prop_tgt/VS_MOBILE_EXTENSIONS_VERSION
    /prop_tgt/VS_SCC_AUXPATH
    /prop_tgt/VS_SCC_LOCALPATH
    /prop_tgt/VS_SCC_PROJECTNAME
    /prop_tgt/VS_SCC_PROVIDER
+   /prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
    /prop_tgt/VS_WINRT_COMPONENT
    /prop_tgt/VS_WINRT_EXTENSIONS
    /prop_tgt/VS_WINRT_REFERENCES
diff --git a/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst b/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
new file mode 100644
index 0000000..19d1620
--- /dev/null
+++ b/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
@@ -0,0 +1,10 @@
+VS_DESKTOP_EXTENSIONS_VERSION
+-----------------------------
+
+Visual Studio Windows 10 Desktop Extensions Version
+
+Specifies the version of the Desktop Extensions that should be included in the
+target. For example ``10.0.10240.0``. If the value is not specified, the Desktop
+Extensions will not be included. To use the same version of the extensions as
+the Windows 10 SDK that is being used, you can use the
+:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
diff --git a/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst b/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
new file mode 100644
index 0000000..27c8a3d
--- /dev/null
+++ b/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
@@ -0,0 +1,10 @@
+VS_IOT_EXTENSIONS_VERSION
+-------------------------
+
+Visual Studio Windows 10 IoT Extensions Version
+
+Specifies the version of the IoT Extensions that should be included in the
+target. For example ``10.0.10240.0``. If the value is not specified, the IoT
+Extensions will not be included. To use the same version of the extensions as
+the Windows 10 SDK that is being used, you can use the
+:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
diff --git a/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst b/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
new file mode 100644
index 0000000..add50cb
--- /dev/null
+++ b/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
@@ -0,0 +1,6 @@
+VS_IOT_STARTUP_TASK
+-------------------
+
+Visual Studio Windows 10 IoT Continuous Background Task
+
+Specifies that the target should be compiled as a Continuous Background Task library.
diff --git a/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst b/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
new file mode 100644
index 0000000..be3c9a0
--- /dev/null
+++ b/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
@@ -0,0 +1,10 @@
+VS_MOBILE_EXTENSIONS_VERSION
+----------------------------
+
+Visual Studio Windows 10 Mobile Extensions Version
+
+Specifies the version of the Mobile Extensions that should be included in the
+target. For example ``10.0.10240.0``. If the value is not specified, the Mobile
+Extensions will not be included. To use the same version of the extensions as
+the Windows 10 SDK that is being used, you can use the
+:variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` variable.
diff --git a/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst b/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
new file mode 100644
index 0000000..1ad7a71
--- /dev/null
+++ b/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
@@ -0,0 +1,10 @@
+VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
+--------------------------------------
+
+Visual Studio Windows Target Platform Minimum Version
+
+For Windows 10. Specifies the minimum version of the OS that is being
+targeted. For example ``10.0.10240.0``. If the value is not specified, the
+value of :variable:`CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION` will be used on
+WindowsStore projects otherwise the target platform minimum version will not
+be specified for the project.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 9cc0393..d62ad88 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -463,6 +463,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Import Project=\"" VS10_USER_PROPS "\""
                     " Condition=\"exists('" VS10_USER_PROPS "')\""
                     " Label=\"LocalAppDataPlatform\" />\n", 2);
+  this->WritePlatformExtensions();
   this->WriteString("</ImportGroup>\n", 1);
   this->WriteString("<PropertyGroup Label=\"UserMacros\" />\n", 1);
   this->WriteWinRTPackageCertificateKeyFile();
@@ -475,6 +476,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteXamlFilesGroup();
   this->WriteWinRTReferences();
   this->WriteProjectReferences();
+  this->WriteSDKReferences();
   this->WriteString(
     "<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.targets\""
     " />\n", 1);
@@ -1307,6 +1309,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
     {
     tool = "XML";
     }
+
   if(this->NsightTegra)
     {
     // Nsight Tegra needs specific file types to check up-to-dateness.
@@ -2590,7 +2593,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
+       this->Target->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2896,6 +2900,101 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
   this->WriteString("</ItemGroup>\n", 1);
 }
 
+void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
+{
+  // This only applies to Windows 10 apps
+  if (this->GlobalGenerator->TargetsWindowsStore() &&
+      cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
+    {
+    const char* desktopExtensionsVersion =
+      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+    if (desktopExtensionsVersion)
+      {
+      this->WriteSinglePlatformExtension("WindowsDesktop",
+                                         desktopExtensionsVersion);
+      }
+    const char* mobileExtensionsVersion =
+      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+    if (mobileExtensionsVersion)
+      {
+      this->WriteSinglePlatformExtension("WindowsMobile",
+                                         mobileExtensionsVersion);
+      }
+    }
+}
+
+void cmVisualStudio10TargetGenerator::WriteSinglePlatformExtension(
+  std::string const& extension,
+  std::string const& version
+  )
+{
+  this->WriteString("<Import Project=", 2);
+  (*this->BuildFileStream)
+    << "\"$([Microsoft.Build.Utilities.ToolLocationHelper]"
+    << "::GetPlatformExtensionSDKLocation(`"
+    << extension <<", Version=" << version
+    << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+    << "$(ExtensionSDKDirectoryRoot), null))"
+    << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+    << extension << ".props\" "
+    << "Condition=\"exists('$("
+    << "[Microsoft.Build.Utilities.ToolLocationHelper]"
+    << "::GetPlatformExtensionSDKLocation(`"
+    << extension << ", Version=" << version
+    << "`, $(TargetPlatformIdentifier), $(TargetPlatformVersion), null, "
+    << "$(ExtensionSDKDirectoryRoot), null))"
+    << "\\DesignTime\\CommonConfiguration\\Neutral\\"
+    << extension << ".props')\" />\n";
+}
+
+void cmVisualStudio10TargetGenerator::WriteSDKReferences()
+{
+  // This only applies to Windows 10 apps
+  if (this->GlobalGenerator->TargetsWindowsStore() &&
+      cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
+    {
+    const char* desktopExtensionsVersion =
+      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+    const char* mobileExtensionsVersion =
+      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+    const char* iotExtensionsVersion =
+      this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
+
+    if(desktopExtensionsVersion || mobileExtensionsVersion ||
+       iotExtensionsVersion)
+      {
+      this->WriteString("<ItemGroup>\n", 1);
+      if(desktopExtensionsVersion)
+        {
+        this->WriteSingleSDKReference("WindowsDesktop",
+                                      desktopExtensionsVersion);
+        }
+      if(mobileExtensionsVersion)
+        {
+        this->WriteSingleSDKReference("WindowsMobile",
+                                      mobileExtensionsVersion);
+        }
+      if(iotExtensionsVersion)
+        {
+        this->WriteSingleSDKReference("WindowsIoT",
+                                      iotExtensionsVersion);
+        }
+      this->WriteString("</ItemGroup>\n", 1);
+      }
+    }
+}
+
+void cmVisualStudio10TargetGenerator::WriteSingleSDKReference(
+  std::string const& extension,
+  std::string const& version
+  )
+{
+  this->WriteString("<SDKReference Include=\"", 2);
+  (*this->BuildFileStream) << extension
+    << ", Version=" << version << "\" />\n";
+}
+
+
 void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
@@ -3018,13 +3117,27 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     (*this->BuildFileStream) << (isWindowsPhone ?
                                  "Windows Phone" : "Windows Store")
                              << "</ApplicationType>\n";
-    this->WriteString("<ApplicationTypeRevision>", 2);
-    (*this->BuildFileStream) << cmVS10EscapeXML(v)
-                             << "</ApplicationTypeRevision>\n";
     this->WriteString("<DefaultLanguage>en-US"
                       "</DefaultLanguage>\n", 2);
-    if(v == "8.1")
+    if (cmHasLiteralPrefix(v, "10.0"))
+      {
+      this->WriteString("<ApplicationTypeRevision>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML("10.0")
+                               << "</ApplicationTypeRevision>\n";
+      // Visual Studio 14.0 is necessary for building 10.0 apps
+      this->WriteString("<MinimumVisualStudioVersion>14.0"
+        "</MinimumVisualStudioVersion>\n", 2);
+
+      if(this->Target->GetType() < cmTarget::UTILITY)
+        {
+        isAppContainer = true;
+        }
+      }
+    else if(v == "8.1")
       {
+      this->WriteString("<ApplicationTypeRevision>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML(v)
+                               << "</ApplicationTypeRevision>\n";
       // Visual Studio 12.0 is necessary for building 8.1 apps
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
@@ -3036,6 +3149,9 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       }
     else if (v == "8.0")
       {
+      this->WriteString("<ApplicationTypeRevision>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML(v)
+                               << "</ApplicationTypeRevision>\n";
       // Visual Studio 11.0 is necessary for building 8.0 apps
       this->WriteString("<MinimumVisualStudioVersion>11.0"
                         "</MinimumVisualStudioVersion>\n", 2);
@@ -3072,6 +3188,30 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
       "</WindowsTargetPlatformVersion>\n";
     }
+  const char* targetPlatformMinVersion =
+      this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+  if(targetPlatformMinVersion)
+    {
+    this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
+    (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformMinVersion) <<
+      "</WindowsTargetPlatformMinVersion>\n";
+    }
+  else if (isWindowsStore && cmHasLiteralPrefix(v, "10.0"))
+    {
+    // If the min version is not set, then use the TargetPlatformVersion
+    if (!targetPlatformVersion.empty())
+      {
+      this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
+      (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
+        "</WindowsTargetPlatformMinVersion>\n";
+      }
+    }
+
+  // Added IoT Startup Task support
+  if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
+    {
+    this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
+    }
 }
 
 void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
@@ -3124,7 +3264,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
             {
             this->IsMissingFiles = true;
             }
-          else if (v == "8.1")
+          else if (v == "8.1" || cmHasLiteralPrefix(v, "10.0"))
             {
             this->IsMissingFiles = true;
             }
@@ -3158,6 +3298,10 @@ void cmVisualStudio10TargetGenerator::WriteMissingFiles()
      {
      this->WriteMissingFilesWS81();
      }
+   else if (cmHasLiteralPrefix(v, "10.0"))
+     {
+     this->WriteMissingFilesWS10_0();
+     }
    }
 }
 
@@ -3419,6 +3563,64 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
   this->WriteCommonMissingFiles(manifestFile);
 }
 
+void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
+{
+  std::string manifestFile =
+    this->DefaultArtifactDir + "/package.appxManifest";
+  std::string artifactDir =
+    this->LocalGenerator->GetTargetDirectory(*this->Target);
+  this->ConvertToWindowsSlash(artifactDir);
+  std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
+  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+
+  cmGeneratedFileStream fout(manifestFile.c_str());
+  fout.SetCopyIfDifferent(true);
+
+  fout <<
+    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+    "<Package\n\t"
+    "xmlns=\"http://schemas.microsoft.com/appx/manifest/foundation/windows10\""
+    "\txmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\"\n"
+    "\txmlns:uap=\"http://schemas.microsoft.com/appx/manifest/uap/windows10\""
+    "\n\tIgnorableNamespaces=\"uap mp\">\n\n"
+    "\t<Identity Name=\"" << this->GUID << "\" Publisher=\"CN=CMake\""
+    " Version=\"1.0.0.0\" />\n"
+    "\t<mp:PhoneIdentity PhoneProductId=\"" << this->GUID <<
+    "\" PhonePublisherId=\"00000000-0000-0000-0000-000000000000\"/>\n"
+    "\t<Properties>\n"
+    "\t\t<DisplayName>" << targetNameXML << "</DisplayName>\n"
+    "\t\t<PublisherDisplayName>CMake</PublisherDisplayName>\n"
+    "\t\t<Logo>" << artifactDirXML << "\\StoreLogo.png</Logo>\n"
+    "\t</Properties>\n"
+    "\t<Dependencies>\n"
+    "\t\t<TargetDeviceFamily Name=\"Windows.Universal\" "
+    "MinVersion=\"10.0.0.0\" MaxVersionTested=\"10.0.0.0\" />\n"
+    "\t</Dependencies>\n"
+
+    "\t<Resources>\n"
+    "\t\t<Resource Language=\"x-generate\" />\n"
+    "\t</Resources>\n"
+    "\t<Applications>\n"
+    "\t\t<Application Id=\"App\""
+    " Executable=\"" << targetNameXML << ".exe\""
+    " EntryPoint=\"" << targetNameXML << ".App\">\n"
+    "\t\t\t<uap:VisualElements\n"
+    "\t\t\t\tDisplayName=\"" << targetNameXML << "\"\n"
+    "\t\t\t\tDescription=\"" << targetNameXML << "\"\n"
+    "\t\t\t\tBackgroundColor=\"#336699\"\n"
+    "\t\t\t\tSquare150x150Logo=\"" << artifactDirXML << "\\Logo.png\"\n"
+    "\t\t\t\tSquare44x44Logo=\"" << artifactDirXML <<
+    "\\SmallLogo44x44.png\">\n"
+    "\t\t\t\t<uap:SplashScreen"
+    " Image=\"" << artifactDirXML << "\\SplashScreen.png\" />\n"
+    "\t\t\t</uap:VisualElements>\n"
+    "\t\t</Application>\n"
+    "\t</Applications>\n"
+    "</Package>\n";
+
+  this->WriteCommonMissingFiles(manifestFile);
+}
+
 void
 cmVisualStudio10TargetGenerator
 ::WriteCommonMissingFiles(const std::string& manifestFile)
@@ -3442,6 +3644,14 @@ cmVisualStudio10TargetGenerator
   (*this->BuildFileStream) << cmVS10EscapeXML(smallLogo) << "\" />\n";
   this->AddedFiles.push_back(smallLogo);
 
+  std::string smallLogo44 = this->DefaultArtifactDir + "/SmallLogo44x44.png";
+  cmSystemTools::CopyAFile(templateFolder + "/SmallLogo44x44.png",
+                           smallLogo44, false);
+  this->ConvertToWindowsSlash(smallLogo44);
+  this->WriteString("<Image Include=\"", 2);
+  (*this->BuildFileStream) << cmVS10EscapeXML(smallLogo44) << "\" />\n";
+  this->AddedFiles.push_back(smallLogo44);
+
   std::string logo = this->DefaultArtifactDir + "/Logo.png";
   cmSystemTools::CopyAFile(templateFolder + "/Logo.png",
                            logo, false);
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index f2aaf05..15ed9f2 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -78,6 +78,13 @@ private:
   void WriteMissingFilesWP81();
   void WriteMissingFilesWS80();
   void WriteMissingFilesWS81();
+  void WriteMissingFilesWS10_0();
+  void WritePlatformExtensions();
+  void WriteSinglePlatformExtension(std::string const& extension,
+                                    std::string const& version);
+  void WriteSDKReferences();
+  void WriteSingleSDKReference(std::string const& extension,
+                               std::string const& version);
   void WriteCommonMissingFiles(const std::string& manifestFile);
   void WriteTargetSpecificReferences();
 
diff --git a/Templates/Windows/SmallLogo44x44.png b/Templates/Windows/SmallLogo44x44.png
new file mode 100644
index 0000000..28810b7
Binary files /dev/null and b/Templates/Windows/SmallLogo44x44.png differ
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dc65a2e..c82cb68 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1955,13 +1955,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     set(reg_vs10 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]")
     set(reg_vs11 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;InstallDir]")
     set(reg_vs12 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0;InstallDir]")
+    set(reg_vs14 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]")
     set(reg_ws80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]")
     set(reg_ws81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]")
+    set(reg_ws10_0 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\Build Tools for Windows 10;srcPath]")
     set(reg_wp80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.0;InstallationFolder]")
     set(reg_wp81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.1;InstallationFolder]")
     select_wince_sdk(reg_wince wince_sdk)
     set(reg_tegra "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Nsight Tegra;sdkRoot]")
-    foreach(reg vs10 vs11 vs12 ws80 ws81 wp80 wp81 wince tegra)
+    foreach(reg vs10 vs11 vs12 vs14 ws80 ws81 ws10_0 wp80 wp81 wince tegra)
       get_filename_component(r "${reg_${reg}}" ABSOLUTE)
       if(IS_DIRECTORY "${r}")
         set(${reg} 1)
@@ -2008,6 +2010,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
                           -DCMAKE_SYSTEM_VERSION=8.1
         )
     endif()
+    if(vs14 AND ws10_0)
+      add_test_VSWinStorePhone(vs14-store10_0-X86 "Visual Studio 14 2015" WindowsStore 10.0)
+      add_test_VSWinStorePhone(vs14-store10_0-ARM "Visual Studio 14 2015 ARM" WindowsStore 10.0)
+      add_test_VSWinStorePhone(vs14-store10_0-X64 "Visual Studio 14 2015 Win64" WindowsStore 10.0)
+    endif()
     if(vs11 AND wp80)
       add_test_VSWinStorePhone(vs11-phone80-X86 "Visual Studio 11 2012" WindowsPhone 8.0)
       add_test_VSWinStorePhone(vs11-phone80-ARM "Visual Studio 11 2012 ARM" WindowsPhone 8.0)
diff --git a/Tests/VSWinStorePhone/CMakeLists.txt b/Tests/VSWinStorePhone/CMakeLists.txt
index 8357d5f..ae82755 100644
--- a/Tests/VSWinStorePhone/CMakeLists.txt
+++ b/Tests/VSWinStorePhone/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.0)
 project(VSWinStorePhone)
-
-if(MSVC_VERSION GREATER 1700)
+if(MSVC_VERSION GREATER 1899)
+  set(COMPILER_VERSION "14")
+elseif(MSVC_VERSION GREATER 1700)
   set(COMPILER_VERSION "12")
 elseif(MSVC_VERSION GREATER 1600)
   set(COMPILER_VERSION "11")
@@ -91,6 +92,7 @@ elseif (NOT "${PLATFORM}" STREQUAL "DESKTOP")
     set(ASSET_FILES ${ASSET_FILES}
     Direct3DApp1/Assets/Logo.png
     Direct3DApp1/Assets/SmallLogo.png
+    Direct3DApp1/Assets/SmallLogo44x44.png
     Direct3DApp1/Assets/SplashScreen.png
     Direct3DApp1/Assets/StoreLogo.png
     )
@@ -124,4 +126,15 @@ source_group("Resource Files" FILES ${RESOURCE_FILES})
 
 add_executable(${EXE_NAME} WIN32 ${SOURCE_FILES} ${HEADER_FILES} ${RESOURCE_FILES})
 set_property(TARGET ${EXE_NAME} PROPERTY VS_WINRT_COMPONENT TRUE)
+
+string(SUBSTRING "${CMAKE_SYSTEM_VERSION}" 0, 4, SHORT_VERSION)
+
+if("${SHORT_VERSION}" STREQUAL "10.0")
+  message(STATUS "Targeting Windows 10. Setting Extensions to version ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+  set_property(TARGET ${EXE_NAME} PROPERTY VS_DESKTOP_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+  set_property(TARGET ${EXE_NAME} PROPERTY VS_MOBILE_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+  set_property(TARGET ${EXE_NAME} PROPERTY VS_IOT_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+endif()
+
+
 target_link_libraries(${EXE_NAME} d3d11)
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png
new file mode 100644
index 0000000..28810b7
Binary files /dev/null and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png differ
diff --git a/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in b/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in
new file mode 100644
index 0000000..6b27ab7
--- /dev/null
+++ b/Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  IgnorableNamespaces="uap mp">
+
+  <Identity Name="@PACKAGE_GUID@" Publisher="CN=mgong" Version="1.1.0.0" />
+  <mp:PhoneIdentity PhoneProductId="@PACKAGE_GUID@" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>@SHORT_NAME@</DisplayName>
+    <PublisherDisplayName>mgong</PublisherDisplayName>
+    <Logo>Assets/StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.65535.65535" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="@SHORT_NAME at .App">
+      <uap:VisualElements
+        DisplayName="@SHORT_NAME@"
+        Description="@SHORT_NAME@"
+        BackgroundColor="#336699"
+        Square150x150Logo="Assets/Logo.png"
+        Square44x44Logo="Assets/SmallLogo44x44.png">
+        <uap:SplashScreen Image="Assets/SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+</Package>

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:04:08 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:04:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1399-g99c7c23
Message-ID: <20151005140408.93EA5BFC11@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  99c7c23abe6342ca2ecab1f04cf396362bd56930 (commit)
       via  2775768f348bb082d1b2f1d8793f65ba832dc8df (commit)
      from  a57f5abdf667544b15bee6eb75e92fc806a6e763 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99c7c23abe6342ca2ecab1f04cf396362bd56930
commit 99c7c23abe6342ca2ecab1f04cf396362bd56930
Merge: a57f5ab 2775768
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 10:04:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 10:04:07 2015 -0400

    Merge topic 'FindMatlab-v8.6'
    
    2775768f FindMatlab: Add support for Matlab R2015b


-----------------------------------------------------------------------

Summary of changes:
 Modules/FindMatlab.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:04:10 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:04:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1401-g518dc27
Message-ID: <20151005140410.92171BE896@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  518dc277281cf2280f9846f2ce2039440cda4ba9 (commit)
       via  458121116a05665ebc0cf6a066977c00b8e55e5c (commit)
      from  99c7c23abe6342ca2ecab1f04cf396362bd56930 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=518dc277281cf2280f9846f2ce2039440cda4ba9
commit 518dc277281cf2280f9846f2ce2039440cda4ba9
Merge: 99c7c23 4581211
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 10:04:09 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 10:04:09 2015 -0400

    Merge topic 'vs-win10-sdk'
    
    45812111 VS: Select latest Windows 10 SDK if no specific version was requested


-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio14Generator.cxx |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:04:13 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:04:13 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1407-g6c25ceb
Message-ID: <20151005140413.2876DBFC2F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  6c25ceb6a841c9d24090f39851e1a89986ab9d4c (commit)
       via  2402bb8cfd63078623779a3704227915324e52d4 (commit)
       via  1be2f12cf241f0d46095e17a561cd70da49ff549 (commit)
       via  2798dbdacbc8a3c4648d61c0a73a3b5791ccf593 (commit)
       via  8c426183d17c0de9f04e6f03ba57bd58f9797b3b (commit)
       via  d1b87d72f964ae57966c5f02ee9e32236bd59338 (commit)
      from  518dc277281cf2280f9846f2ce2039440cda4ba9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c25ceb6a841c9d24090f39851e1a89986ab9d4c
commit 6c25ceb6a841c9d24090f39851e1a89986ab9d4c
Merge: 518dc27 2402bb8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 10:04:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 10:04:11 2015 -0400

    Merge topic 'vs-win10-store'
    
    2402bb8c Help: Document Windows 10 Universal Applications in cmake-toolchains(7)
    1be2f12c VS: Add support for Windows 10 Universal (Store) Applications
    2798dbda VS: Refactor indentation of LinkLibraryDependencies
    8c426183 MSVC: Add system libs for WindowsStore on VS 2015
    d1b87d72 VS: Select Windows 10 Store SDK and toolset for VS 2015


-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-properties.7.rst                 |    5 +
 Help/manual/cmake-toolchains.7.rst                 |   17 ++
 Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst    |   10 +
 Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst        |   10 +
 Help/prop_tgt/VS_IOT_STARTUP_TASK.rst              |    6 +
 Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst     |   10 +
 .../VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst     |   10 +
 Modules/Platform/Windows-MSVC.cmake                |    4 +-
 Source/cmGlobalVisualStudio14Generator.cxx         |   63 ++++++
 Source/cmGlobalVisualStudio14Generator.h           |    7 +
 Source/cmVisualStudio10TargetGenerator.cxx         |  224 +++++++++++++++++++-
 Source/cmVisualStudio10TargetGenerator.h           |    7 +
 Templates/Windows/SmallLogo44x44.png               |  Bin 0 -> 554 bytes
 Tests/CMakeLists.txt                               |    9 +-
 Tests/VSWinStorePhone/CMakeLists.txt               |   17 +-
 .../Direct3DApp1/Assets/SmallLogo44x44.png         |  Bin 0 -> 554 bytes
 ...ifest.in => Package_vc14.store.appxmanifest.in} |   30 +--
 17 files changed, 403 insertions(+), 26 deletions(-)
 create mode 100644 Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
 create mode 100644 Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
 create mode 100644 Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
 create mode 100644 Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
 create mode 100644 Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
 create mode 100644 Templates/Windows/SmallLogo44x44.png
 create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png
 copy Tests/VSWinStorePhone/cmake/{Package_vc12.wp.appxmanifest.in => Package_vc14.store.appxmanifest.in} (52%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:04:32 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:04:32 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3498-g7036223
Message-ID: <20151005140432.1B41EBFC3C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  703622358d7fe6fb16be6562839baf263a91a68c (commit)
       via  6c25ceb6a841c9d24090f39851e1a89986ab9d4c (commit)
       via  518dc277281cf2280f9846f2ce2039440cda4ba9 (commit)
       via  99c7c23abe6342ca2ecab1f04cf396362bd56930 (commit)
       via  a57f5abdf667544b15bee6eb75e92fc806a6e763 (commit)
       via  fb4e14d281b87746f122b6b52de35eb5997b06be (commit)
       via  7a6c3ff01b68545c776e8917ab9fff99e3182be5 (commit)
      from  ea08e6e8681357225d6100dcab53a2d9d90fe082 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=703622358d7fe6fb16be6562839baf263a91a68c
commit 703622358d7fe6fb16be6562839baf263a91a68c
Merge: ea08e6e 6c25ceb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 10:04:20 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 10:04:20 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:05:53 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:05:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3501-gf31edb0
Message-ID: <20151005140553.BF7FFBF93E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f31edb03fa1b58375003cbe32c63b2a5106e7f20 (commit)
       via  19ce56e2746f3315d0697160f7d5e084ff1ef23d (commit)
       via  c922aa18924c7c0b04258f24f8ca888de407a6dd (commit)
      from  703622358d7fe6fb16be6562839baf263a91a68c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f31edb03fa1b58375003cbe32c63b2a5106e7f20
commit f31edb03fa1b58375003cbe32c63b2a5106e7f20
Merge: 7036223 19ce56e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 10:05:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 10:05:52 2015 -0400

    Merge topic 'doc-3.4-relnotes' into next
    
    19ce56e2 Help: Organize and revise 3.4 release notes
    c922aa18 Help: Consolidate 3.4 release notes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19ce56e2746f3315d0697160f7d5e084ff1ef23d
commit 19ce56e2746f3315d0697160f7d5e084ff1ef23d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:38:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 10:05:26 2015 -0400

    Help: Organize and revise 3.4 release notes
    
    Add section headers similar to the 3.3 release notes and move each
    individual bullet into an appropriate section.  Revise a few bullets.

diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst
index 448ea35..8cc0796 100644
--- a/Help/release/3.4.rst
+++ b/Help/release/3.4.rst
@@ -7,6 +7,16 @@ CMake 3.4 Release Notes
 
 Changes made since CMake 3.4 include the following.
 
+New Features
+============
+
+Generators
+----------
+
+* The :generator:`Visual Studio 14 2015` generator learned to select
+  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
+  variable and the SDKs available on the host.
+
 * CMake learned rudimentary support for the Apple Swift language.  When using
   the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
   the ``Swift`` language with the :command:`enable_language` command or the
@@ -14,76 +24,96 @@ Changes made since CMake 3.4 include the following.
   Xcode is too old).  Then one may list ``.swift`` source files in targets
   for compilation.
 
-* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
-  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
-  introduced to initialize the
-  :prop_tgt:`LINK_SEARCH_START_STATIC` and
-  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
-  respectively.
+Commands
+--------
 
-* On Windows with MS-compatible tools, CMake learned to optionally
-  generate a module definition (``.def``) file for ``SHARED`` libraries.
-  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
+* The :command:`find_program` command learned a ``NAMES_PER_DIR``
+  option to consider all given ``NAMES`` in each directory before
+  moving on to the next directory.
+
+* The :command:`get_filename_component` command learned a new ``BASE_DIR``
+  subcommand.  This is used to specify a base directory when calculating an
+  absolute path from a relative path.
+
+* The :command:`if` command learned a new ``TEST`` operator that evaluates
+  to true if a given test name has been defined by the :command:`add_test`
+  command.  See policy :policy:`CMP0064`.
+
+* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :command:`install(FILES)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :command:`string` command learned a new ``APPEND`` subcommand.
+
+Variables
+---------
 
 * The :ref:`Makefile Generators` and the :generator:`Ninja` generator
-  learned to add compiler launcher tools like distcc and ccache along with the
-  compiler for ``C`` and ``CXX`` languages.  See the
+  learned to add compiler launcher tools like distcc and ccache along
+  with the compiler for ``C`` and ``CXX`` languages.  See the
   :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
   :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
 
-* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
-  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
+* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
+  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
+  introduced to initialize the
+  :prop_tgt:`LINK_SEARCH_START_STATIC` and
+  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
+  respectively.
 
-* The :module:`CPackDeb` module now correctly excludes symlinks during package checksum calculation.
+Properties
+----------
 
-* The :module:`CPackDeb` module learned to set package dependencies
-  per component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS` and
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`.
+* :ref:`Visual Studio Generators` learned to support additonal
+  target properties to customize projects for NVIDIA Nsight
+  Tegra Visual Studio Edition:
 
-* :module:`CPackDeb` no longer uses fakeroot and system tar program for packaging.
+  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
+  * :prop_tgt:`ANDROID_ARCH`
+  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
+  * :prop_tgt:`ANDROID_PROCESS_MAX`
+  * :prop_tgt:`ANDROID_PROGUARD`
+  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
+  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
+  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
+  * :prop_tgt:`ANDROID_STL_TYPE`
 
-* The :module:`CPack` module learned to package empty directories.
+* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
+  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
+  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
 
-* The :module:`CPack` module no longer mangles settings with CMake-special
-  characters when they're used as defaults for other settings. The macro
-  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
+* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
+  were introduced to allow project code to query where a target is defined.
 
-* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
-  which can be used to ensure the cpack program receives the settings' values
-  exactly as they were set, even if they contain CMake-special characters.
-  For compatibility, it's off by default.
+* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
 
-* :manual:`ctest(1)` learned options
-  ``--test-output-size-passed`` and ``--test-output-size-failed``
-  to customize the limit on test output size submitted when
-  running as a :ref:`Dashboard Client`.
+* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
+  :ref:`Makefile Generators` whether to generate commands to print output
+  after each target is completed.
 
-* CTest learned to optionally measure the CPU load during parallel
-  testing and avoid starting tests that may cause the load to exceed
-  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
-  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
-  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
-  option of the :command:`ctest_test` command.
+* On Windows with MS-compatible tools, CMake learned to optionally
+  generate a module definition (``.def``) file for ``SHARED`` libraries.
+  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
 
-* The :module:`CMakeExpandImportedTargets` module is now documented
-  as deprecated.  See module documentation for an explanation.
+Modules
+-------
 
 * The :module:`ExternalProject` module :command:`ExternalProject_Add`
   function ``GIT_SUBMODULES`` option now also limits the set of
   submodules that are initialized in addition to the prior behavior
   of limiting the set of submodules that are updated.
 
-* Use "git stash save --all" only if supported. The --all option for git-stash
-  wasn't introduced until git version 1.7.6.
-
 * The :module:`ExternalProject` module learned new ``USES_TERMINAL``
-  arguments for giving steps exclusive terminal access.  Especially
+  arguments for giving steps exclusive terminal access.  This is
   useful with the :generator:`Ninja` generator to monitor CMake
   superbuild progress and prevent CPU oversubscription.
 
@@ -97,14 +127,17 @@ Changes made since CMake 3.4 include the following.
 
 * The :module:`FindIce` module now provides imported targets.
 
+* The :module:`FindJava` module learned to optionally find
+  the ``idlj`` and ``jarsigner`` tools.
+
 * The :module:`FindOpenSSL` module now provides imported targets.
 
 * The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
   option to search only for static libraries.
 
-* The :command:`find_program` command learned a ``NAMES_PER_DIR``
-  option to consdier all given ``NAMES`` in each directory before
-  moving on to the next directory.
+* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
+  command which may be used to query for arbitrary variables from a package
+  (such as for related tools or data and plugin install paths).
 
 * The :module:`FindProtobuf` module gained a new
   :command:`protobuf_generate_python` function to generate python
@@ -121,33 +154,10 @@ Changes made since CMake 3.4 include the following.
 * The :module:`FindZLIB` module learned to search separately for
   debug and release variants.
 
-* A new ``$<SHELL_PATH:...>``
-  :manual:`generator expression <cmake-generator-expressions(7)>`
-  has been added.
-
-* The :command:`get_filename_component` command learned a new ``BASE_DIR``
-  subcommand.  This is used to specify a base directory when calculating an
-  absolute path from a relative path.
-
 * The :module:`GNUInstallDirs` module learned special default values
   for certain installation prefixes according to the `GNU Coding
   Standards`_ and the `Filesystem Hierarchy Standard`_.
 
-.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
-
-* Add a new TEST operator to if() that evaluates to true
-  if a given test name has been defined.
-
-* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
-
-* The :command:`install(FILES)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
-
-* The :module:`FindJava` module learned to optionally find
-  the ``idlj`` and ``jarsigner`` tools.
-
 * The :module:`UseJava` module ``add_jar`` function learned
   to support response files (e.g. ``@srcs.txt``) for source
   specification.
@@ -159,73 +169,101 @@ Changes made since CMake 3.4 include the following.
 * The :module:`UseJava` module gained a new ``create_javah``
   function to create C headers from Java classes.
 
-* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
-  :ref:`Makefile Generators` whether to generate commands to print output
-  after each target is completed.
+.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
+
+Generator Expressions
+---------------------
+
+* A new ``$<SHELL_PATH:...>``
+  :manual:`generator expression <cmake-generator-expressions(7)>`
+  has been added.
+
+CTest
+-----
+
+* CTest learned to optionally measure the CPU load during parallel
+  testing and avoid starting tests that may cause the load to exceed
+  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
+  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
+  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
+  option of the :command:`ctest_test` command.
+
+* :manual:`ctest(1)` learned options
+  ``--test-output-size-passed`` and ``--test-output-size-failed``
+  to customize the limit on test output size submitted when
+  running as a :ref:`Dashboard Client`.
+
+CPack
+-----
+
+* The :module:`CPackDeb` module learned to set package dependencies
+  per component.  See variables:
+
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`
+  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`
+
+* The :module:`CPack` module learned to package empty directories.
+
+* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
+  which can be used to ensure the cpack program receives the settings' values
+  exactly as they were set, even if they contain CMake-special characters.
+  For compatibility, it's off by default.
+
+Other
+-----
 
 * The :manual:`Compile Features <cmake-compile-features(7)>` functionality
   is now aware of features supported by GNU C compilers on Windows.
 
-* The ``SONAME`` field is no longer set for ``MODULE`` libraries
-  created with the :command:`add_library` command.  ``MODULE``
-  libraries are meant for explicit dynamic loading at runtime.
-  They cannot be linked so ``SONAME`` is not useful.
-
 * CMake learned to honor ``*.manifest`` source files with MSVC tools.
   Manifest files named as sources of ``.exe`` and ``.dll`` targets
   will be merged with linker-generated manifests and embedded in the
   binary.
 
-* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
-  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
-  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
+  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
 
-* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+* :manual:`cmake(1)` gained a new ``--trace-expand`` command line option
+  that is like ``--trace`` but expands variable references in the output.
 
-* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
-  command which may be used to query for arbitrary variables from a package
-  (such as for related tools or data and plugin install paths).
+Deprecated and Removed Features
+===============================
+
+* The :module:`CMakeExpandImportedTargets` module is now documented
+  as deprecated.  See module documentation for an explanation.
 
 * The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
   effect.  Previously it was partially implemented and unreliable.
 
-* CMake no longer links executables with flags to export symbols
-  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
-  See policy :policy:`CMP0065`.
-
-* The :command:`string` command learned a new ``APPEND`` subcommand.
-
-* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
-  were introduced to allow project code to query where a target is defined.
+Other Changes
+=============
 
 * The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
   :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
   work in environments where only CXX is enabled.
 
-* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
-  variable references in the output.
+* The :module:`CPackDeb` module now correctly excludes symlinks during package
+  checksum calculation.
 
-* :ref:`Visual Studio Generators` learned to support additonal
-  target properties to customize projects for NVIDIA Nsight
-  Tegra Visual Studio Edition:
+* The :module:`CPackDeb` no longer uses fakeroot and system tar program for
+  packaging.
 
-  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
-  * :prop_tgt:`ANDROID_ARCH`
-  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
-  * :prop_tgt:`ANDROID_PROCESS_MAX`
-  * :prop_tgt:`ANDROID_PROGUARD`
-  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
-  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
-  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
-  * :prop_tgt:`ANDROID_STL_TYPE`
+* The :module:`CPack` module no longer mangles settings with CMake-special
+  characters when they're used as defaults for other settings. The macro
+  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
 
-* The :generator:`Visual Studio 14 2015` generator learned to select
-  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
-  variable and the SDKs available on the host.
+* CMake no longer links executables with flags to export symbols
+  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
+  See policy :policy:`CMP0065`.
+
+* The ``SONAME`` field is no longer set for ``MODULE`` libraries
+  created with the :command:`add_library` command.  ``MODULE``
+  libraries are meant for explicit dynamic loading at runtime.
+  They cannot be linked so ``SONAME`` is not useful.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c922aa18924c7c0b04258f24f8ca888de407a6dd
commit c922aa18924c7c0b04258f24f8ca888de407a6dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 10:16:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 10:05:26 2015 -0400

    Help: Consolidate 3.4 release notes
    
    Move all development release notes into a new version-specific document:
    
     tail -q -n +3 Help/release/dev/* > Help/release/3.4.rst
     git rm -- Help/release/dev/*
    
    except the sample topic:
    
     git checkout HEAD -- Help/release/dev/0-sample-topic.rst
    
    Reference the new document from the release notes index document.
    Add a title and intro sentence to the new document by hand.

diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst
new file mode 100644
index 0000000..448ea35
--- /dev/null
+++ b/Help/release/3.4.rst
@@ -0,0 +1,231 @@
+CMake 3.4 Release Notes
+***********************
+
+.. only:: html
+
+  .. contents::
+
+Changes made since CMake 3.4 include the following.
+
+* CMake learned rudimentary support for the Apple Swift language.  When using
+  the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
+  the ``Swift`` language with the :command:`enable_language` command or the
+  :command:`project` command (this is an error with other generators or when
+  Xcode is too old).  Then one may list ``.swift`` source files in targets
+  for compilation.
+
+* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
+  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
+  introduced to initialize the
+  :prop_tgt:`LINK_SEARCH_START_STATIC` and
+  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
+  respectively.
+
+* On Windows with MS-compatible tools, CMake learned to optionally
+  generate a module definition (``.def``) file for ``SHARED`` libraries.
+  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
+
+* The :ref:`Makefile Generators` and the :generator:`Ninja` generator
+  learned to add compiler launcher tools like distcc and ccache along with the
+  compiler for ``C`` and ``CXX`` languages.  See the
+  :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
+  :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
+
+* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
+  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
+
+* The :module:`CPackDeb` module now correctly excludes symlinks during package checksum calculation.
+
+* The :module:`CPackDeb` module learned to set package dependencies
+  per component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`,
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS` and
+  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`.
+
+* :module:`CPackDeb` no longer uses fakeroot and system tar program for packaging.
+
+* The :module:`CPack` module learned to package empty directories.
+
+* The :module:`CPack` module no longer mangles settings with CMake-special
+  characters when they're used as defaults for other settings. The macro
+  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
+
+* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
+  which can be used to ensure the cpack program receives the settings' values
+  exactly as they were set, even if they contain CMake-special characters.
+  For compatibility, it's off by default.
+
+* :manual:`ctest(1)` learned options
+  ``--test-output-size-passed`` and ``--test-output-size-failed``
+  to customize the limit on test output size submitted when
+  running as a :ref:`Dashboard Client`.
+
+* CTest learned to optionally measure the CPU load during parallel
+  testing and avoid starting tests that may cause the load to exceed
+  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
+  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
+  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
+  option of the :command:`ctest_test` command.
+
+* The :module:`CMakeExpandImportedTargets` module is now documented
+  as deprecated.  See module documentation for an explanation.
+
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+  function ``GIT_SUBMODULES`` option now also limits the set of
+  submodules that are initialized in addition to the prior behavior
+  of limiting the set of submodules that are updated.
+
+* Use "git stash save --all" only if supported. The --all option for git-stash
+  wasn't introduced until git version 1.7.6.
+
+* The :module:`ExternalProject` module learned new ``USES_TERMINAL``
+  arguments for giving steps exclusive terminal access.  Especially
+  useful with the :generator:`Ninja` generator to monitor CMake
+  superbuild progress and prevent CPU oversubscription.
+
+* The :module:`FindBISON` module ``BISON_TARGET`` macro learned a
+  new ``DEFINES_FILE`` option to specify a custom output header
+  to be generated.
+
+* The :module:`FindHDF5` module learend a new ``HDF5_PREFER_PARALLEL``
+  option allowing users to specify that a parallel HDF5 tool is
+  preferred if both are available.
+
+* The :module:`FindIce` module now provides imported targets.
+
+* The :module:`FindOpenSSL` module now provides imported targets.
+
+* The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
+  option to search only for static libraries.
+
+* The :command:`find_program` command learned a ``NAMES_PER_DIR``
+  option to consdier all given ``NAMES`` in each directory before
+  moving on to the next directory.
+
+* The :module:`FindProtobuf` module gained a new
+  :command:`protobuf_generate_python` function to generate python
+  sources from ``.proto`` files.
+
+* The :module:`FindTIFF` module learned to search separately for
+  debug and release variants.
+
+* The :module:`FindwxWidgets` module learned to support version requests.
+
+* The :module:`FindXercesC` module learned to search separately for
+  debug and release variants.
+
+* The :module:`FindZLIB` module learned to search separately for
+  debug and release variants.
+
+* A new ``$<SHELL_PATH:...>``
+  :manual:`generator expression <cmake-generator-expressions(7)>`
+  has been added.
+
+* The :command:`get_filename_component` command learned a new ``BASE_DIR``
+  subcommand.  This is used to specify a base directory when calculating an
+  absolute path from a relative path.
+
+* The :module:`GNUInstallDirs` module learned special default values
+  for certain installation prefixes according to the `GNU Coding
+  Standards`_ and the `Filesystem Hierarchy Standard`_.
+
+.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
+
+* Add a new TEST operator to if() that evaluates to true
+  if a given test name has been defined.
+
+* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :command:`install(FILES)` command ``DESTINATION`` option learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :module:`FindJava` module learned to optionally find
+  the ``idlj`` and ``jarsigner`` tools.
+
+* The :module:`UseJava` module ``add_jar`` function learned
+  to support response files (e.g. ``@srcs.txt``) for source
+  specification.
+
+* The :module:`UseJava` module ``install_jar`` function learned
+  new ``DESTINATION`` and ``COMPONENT`` options to specify
+  the corresponding :command:`install` command options.
+
+* The :module:`UseJava` module gained a new ``create_javah``
+  function to create C headers from Java classes.
+
+* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
+  :ref:`Makefile Generators` whether to generate commands to print output
+  after each target is completed.
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+  is now aware of features supported by GNU C compilers on Windows.
+
+* The ``SONAME`` field is no longer set for ``MODULE`` libraries
+  created with the :command:`add_library` command.  ``MODULE``
+  libraries are meant for explicit dynamic loading at runtime.
+  They cannot be linked so ``SONAME`` is not useful.
+
+* CMake learned to honor ``*.manifest`` source files with MSVC tools.
+  Manifest files named as sources of ``.exe`` and ``.dll`` targets
+  will be merged with linker-generated manifests and embedded in the
+  binary.
+
+* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
+  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
+  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
+  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
+
+* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
+  command which may be used to query for arbitrary variables from a package
+  (such as for related tools or data and plugin install paths).
+
+* The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
+  effect.  Previously it was partially implemented and unreliable.
+
+* CMake no longer links executables with flags to export symbols
+  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
+  See policy :policy:`CMP0065`.
+
+* The :command:`string` command learned a new ``APPEND`` subcommand.
+
+* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
+  were introduced to allow project code to query where a target is defined.
+
+* The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
+  :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
+  work in environments where only CXX is enabled.
+
+* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
+  variable references in the output.
+
+* :ref:`Visual Studio Generators` learned to support additonal
+  target properties to customize projects for NVIDIA Nsight
+  Tegra Visual Studio Edition:
+
+  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
+  * :prop_tgt:`ANDROID_ARCH`
+  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
+  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
+  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
+  * :prop_tgt:`ANDROID_PROCESS_MAX`
+  * :prop_tgt:`ANDROID_PROGUARD`
+  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
+  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
+  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
+  * :prop_tgt:`ANDROID_STL_TYPE`
+
+* The :generator:`Visual Studio 14 2015` generator learned to select
+  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
+  variable and the SDKs available on the host.
diff --git a/Help/release/dev/CPack-updates.rst b/Help/release/dev/CPack-updates.rst
deleted file mode 100644
index ea0780f..0000000
--- a/Help/release/dev/CPack-updates.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-CPack-updates
--------------
-
-* The :module:`CPack` module no longer mangles settings with CMake-special
-  characters when they're used as defaults for other settings. The macro
-  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.
-
-* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
-  which can be used to ensure the cpack program receives the settings' values
-  exactly as they were set, even if they contain CMake-special characters.
-  For compatibility, it's off by default.
diff --git a/Help/release/dev/ConcurrentFortran-compiler-id.rst b/Help/release/dev/ConcurrentFortran-compiler-id.rst
deleted file mode 100644
index 71e79aa..0000000
--- a/Help/release/dev/ConcurrentFortran-compiler-id.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-ConcurrentFortran-compiler-id
------------------------------
-
-* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
-  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.
diff --git a/Help/release/dev/ExternalProject-USES_TERMINAL.rst b/Help/release/dev/ExternalProject-USES_TERMINAL.rst
deleted file mode 100644
index 415540d..0000000
--- a/Help/release/dev/ExternalProject-USES_TERMINAL.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalProject-USES_TERMINAL
------------------------------
-
-* The :module:`ExternalProject` module learned new ``USES_TERMINAL``
-  arguments for giving steps exclusive terminal access.  Especially
-  useful with the :generator:`Ninja` generator to monitor CMake
-  superbuild progress and prevent CPU oversubscription.
diff --git a/Help/release/dev/ExternalProject_init_selected_submodules.rst b/Help/release/dev/ExternalProject_init_selected_submodules.rst
deleted file mode 100644
index e642c19..0000000
--- a/Help/release/dev/ExternalProject_init_selected_submodules.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalProject_init_selected_submodules
-----------------------------------------
-
-* The :module:`ExternalProject` module :command:`ExternalProject_Add`
-  function ``GIT_SUBMODULES`` option now also limits the set of
-  submodules that are initialized in addition to the prior behavior
-  of limiting the set of submodules that are updated.
diff --git a/Help/release/dev/ExternalProject_stash_save_all.rst b/Help/release/dev/ExternalProject_stash_save_all.rst
deleted file mode 100644
index e00ed44..0000000
--- a/Help/release/dev/ExternalProject_stash_save_all.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-ExternalProject_stash_save_all
-------------------------------
-
-* Use "git stash save --all" only if supported. The --all option for git-stash
-  wasn't introduced until git version 1.7.6.
diff --git a/Help/release/dev/FindBISON-DEFINES_FILE.rst b/Help/release/dev/FindBISON-DEFINES_FILE.rst
deleted file mode 100644
index 815d560..0000000
--- a/Help/release/dev/FindBISON-DEFINES_FILE.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-FindBISON-DEFINES_FILE
-----------------------
-
-* The :module:`FindBISON` module ``BISON_TARGET`` macro learned a
-  new ``DEFINES_FILE`` option to specify a custom output header
-  to be generated.
diff --git a/Help/release/dev/FindHDF5-updates.rst b/Help/release/dev/FindHDF5-updates.rst
deleted file mode 100644
index a9297bb..0000000
--- a/Help/release/dev/FindHDF5-updates.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-FindHDF5-updates
-----------------
-
-* The :module:`FindHDF5` module learend a new ``HDF5_PREFER_PARALLEL``
-  option allowing users to specify that a parallel HDF5 tool is
-  preferred if both are available.
diff --git a/Help/release/dev/FindIce-imported-targets.rst b/Help/release/dev/FindIce-imported-targets.rst
deleted file mode 100644
index 7e1b2f4..0000000
--- a/Help/release/dev/FindIce-imported-targets.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindIce-imported-targets
-------------------------
-
-* The :module:`FindIce` module now provides imported targets.
diff --git a/Help/release/dev/FindOpenSSL-imported-targets.rst b/Help/release/dev/FindOpenSSL-imported-targets.rst
deleted file mode 100644
index 63090af..0000000
--- a/Help/release/dev/FindOpenSSL-imported-targets.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindOpenSSL-imported-targets
-----------------------------
-
-* The :module:`FindOpenSSL` module now provides imported targets.
diff --git a/Help/release/dev/FindOpenSSL-static-libs.rst b/Help/release/dev/FindOpenSSL-static-libs.rst
deleted file mode 100644
index 69ec6f2..0000000
--- a/Help/release/dev/FindOpenSSL-static-libs.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindOpenSSL-static-libs
------------------------
-
-* The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
-  option to search only for static libraries.
diff --git a/Help/release/dev/FindProtobuf-python-extension.rst b/Help/release/dev/FindProtobuf-python-extension.rst
deleted file mode 100644
index 95463bf..0000000
--- a/Help/release/dev/FindProtobuf-python-extension.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-FindProtobuf-python-extension
------------------------------
-
-* The :module:`FindProtobuf` module gained a new
-  :command:`protobuf_generate_python` function to generate python
-  sources from ``.proto`` files.
diff --git a/Help/release/dev/FindTIFF-updates.rst b/Help/release/dev/FindTIFF-updates.rst
deleted file mode 100644
index 083e40f..0000000
--- a/Help/release/dev/FindTIFF-updates.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindTIFF-updates
-----------------
-
-* The :module:`FindTIFF` module learned to search separately for
-  debug and release variants.
diff --git a/Help/release/dev/FindXercesC-updates.rst b/Help/release/dev/FindXercesC-updates.rst
deleted file mode 100644
index 47a8ada..0000000
--- a/Help/release/dev/FindXercesC-updates.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindXercesC-updates
--------------------
-
-* The :module:`FindXercesC` module learned to search separately for
-  debug and release variants.
diff --git a/Help/release/dev/FindZLIB-per-config.rst b/Help/release/dev/FindZLIB-per-config.rst
deleted file mode 100644
index 97fd6ef..0000000
--- a/Help/release/dev/FindZLIB-per-config.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindZLIB-per-config
--------------------
-
-* The :module:`FindZLIB` module learned to search separately for
-  debug and release variants.
diff --git a/Help/release/dev/FindwxWidgets-updates.rst b/Help/release/dev/FindwxWidgets-updates.rst
deleted file mode 100644
index aa470f2..0000000
--- a/Help/release/dev/FindwxWidgets-updates.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-FindwxWidgets-updates
----------------------
-
-* The :module:`FindwxWidgets` module learned to support version requests.
diff --git a/Help/release/dev/GNUInstallDirs-special-prefixes.rst b/Help/release/dev/GNUInstallDirs-special-prefixes.rst
deleted file mode 100644
index 83c1352..0000000
--- a/Help/release/dev/GNUInstallDirs-special-prefixes.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-GNUInstallDirs-special-prefixes
--------------------------------
-
-* The :module:`GNUInstallDirs` module learned special default values
-  for certain installation prefixes according to the `GNU Coding
-  Standards`_ and the `Filesystem Hierarchy Standard`_.
-
-.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
diff --git a/Help/release/dev/OUTPUT_DIRECTORY-genex.rst b/Help/release/dev/OUTPUT_DIRECTORY-genex.rst
deleted file mode 100644
index 8b839c0..0000000
--- a/Help/release/dev/OUTPUT_DIRECTORY-genex.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OUTPUT_DIRECTORY-genex
-----------------------
-
-* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
-  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
-  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/OUTPUT_NAME-genex.rst b/Help/release/dev/OUTPUT_NAME-genex.rst
deleted file mode 100644
index 0a39820..0000000
--- a/Help/release/dev/OUTPUT_NAME-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-OUTPUT_NAME-genex
------------------
-
-* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/Threads-CXX.rst b/Help/release/dev/Threads-CXX.rst
deleted file mode 100644
index 2e34a01..0000000
--- a/Help/release/dev/Threads-CXX.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Threads-CXX
-------------
-
-* The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
-  :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
-  work in environments where only CXX is enabled.
diff --git a/Help/release/dev/add-apple-swift-language.rst b/Help/release/dev/add-apple-swift-language.rst
deleted file mode 100644
index 60ce5d8..0000000
--- a/Help/release/dev/add-apple-swift-language.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-add-apple-swift-language
-------------------------
-
-* CMake learned rudimentary support for the Apple Swift language.  When using
-  the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
-  the ``Swift`` language with the :command:`enable_language` command or the
-  :command:`project` command (this is an error with other generators or when
-  Xcode is too old).  Then one may list ``.swift`` source files in targets
-  for compilation.
diff --git a/Help/release/dev/add-link-search-static-properties-defaults.rst b/Help/release/dev/add-link-search-static-properties-defaults.rst
deleted file mode 100644
index 98dda30..0000000
--- a/Help/release/dev/add-link-search-static-properties-defaults.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-add-link-search-static-properties-defaults
-------------------------------------------
-
-* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
-  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
-  introduced to initialize the
-  :prop_tgt:`LINK_SEARCH_START_STATIC` and
-  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
-  respectively.
diff --git a/Help/release/dev/auto_export_dll_symbols.rst b/Help/release/dev/auto_export_dll_symbols.rst
deleted file mode 100644
index 9db2b5e..0000000
--- a/Help/release/dev/auto_export_dll_symbols.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-auto_export_dll_symbols
------------------------
-
-* On Windows with MS-compatible tools, CMake learned to optionally
-  generate a module definition (``.def``) file for ``SHARED`` libraries.
-  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.
diff --git a/Help/release/dev/compiler-launcher.rst b/Help/release/dev/compiler-launcher.rst
deleted file mode 100644
index 3ba692d..0000000
--- a/Help/release/dev/compiler-launcher.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-compiler-launcher
------------------
-
-* The :ref:`Makefile Generators` and the :generator:`Ninja` generator
-  learned to add compiler launcher tools like distcc and ccache along with the
-  compiler for ``C`` and ``CXX`` languages.  See the
-  :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
-  :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
diff --git a/Help/release/dev/cpack-deb-checksum-on-symlinks.rts b/Help/release/dev/cpack-deb-checksum-on-symlinks.rts
deleted file mode 100644
index 9bfeded..0000000
--- a/Help/release/dev/cpack-deb-checksum-on-symlinks.rts
+++ /dev/null
@@ -1,4 +0,0 @@
-cpack-deb-checksum-on-symlinks
-------------------------------
-
-* The :module:`CPackDeb` module now correctly excludes symlinks during package checksum calculation.
diff --git a/Help/release/dev/cpack-deb-component-dependencies.rst b/Help/release/dev/cpack-deb-component-dependencies.rst
deleted file mode 100644
index 2714222..0000000
--- a/Help/release/dev/cpack-deb-component-dependencies.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-cpack-deb-component-dependencies
---------------------------------
-
-* The :module:`CPackDeb` module learned to set package dependencies
-  per component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`,
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS` and
-  :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`.
diff --git a/Help/release/dev/cpack-deb-fakeroot-removal.rts b/Help/release/dev/cpack-deb-fakeroot-removal.rts
deleted file mode 100644
index e0b97d1..0000000
--- a/Help/release/dev/cpack-deb-fakeroot-removal.rts
+++ /dev/null
@@ -1,4 +0,0 @@
-cpack-deb-fakeroot-removal
---------------------------
-
-* :module:`CPackDeb` no longer uses fakeroot and system tar program for packaging.
diff --git a/Help/release/dev/cpack-package-empty-dirs.rts b/Help/release/dev/cpack-package-empty-dirs.rts
deleted file mode 100644
index 1f56e1a..0000000
--- a/Help/release/dev/cpack-package-empty-dirs.rts
+++ /dev/null
@@ -1,4 +0,0 @@
-cpack-package-empty-dirs
-------------------------
-
-* The :module:`CPack` module learned to package empty directories.
diff --git a/Help/release/dev/ctest-custom-output-size.rst b/Help/release/dev/ctest-custom-output-size.rst
deleted file mode 100644
index 8098b93..0000000
--- a/Help/release/dev/ctest-custom-output-size.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ctest-custom-output-size
-------------------------
-
-* :manual:`ctest(1)` learned options
-  ``--test-output-size-passed`` and ``--test-output-size-failed``
-  to customize the limit on test output size submitted when
-  running as a :ref:`Dashboard Client`.
diff --git a/Help/release/dev/ctest-test-load-option.rst b/Help/release/dev/ctest-test-load-option.rst
deleted file mode 100644
index 069f49a..0000000
--- a/Help/release/dev/ctest-test-load-option.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-ctest-test-load-option
-----------------------
-
-* CTest learned to optionally measure the CPU load during parallel
-  testing and avoid starting tests that may cause the load to exceed
-  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
-  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
-  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
-  option of the :command:`ctest_test` command.
diff --git a/Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst b/Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst
deleted file mode 100644
index 3bdaebe..0000000
--- a/Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-doc-CMakeExpandImportedTargets-deprecated
------------------------------------------
-
-* The :module:`CMakeExpandImportedTargets` module is now documented
-  as deprecated.  See module documentation for an explanation.
diff --git a/Help/release/dev/find_program-NAMES_PER_DIR.rst b/Help/release/dev/find_program-NAMES_PER_DIR.rst
deleted file mode 100644
index 04cd170..0000000
--- a/Help/release/dev/find_program-NAMES_PER_DIR.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-find_program-NAMES_PER_DIR
---------------------------
-
-* The :command:`find_program` command learned a ``NAMES_PER_DIR``
-  option to consdier all given ``NAMES`` in each directory before
-  moving on to the next directory.
diff --git a/Help/release/dev/genex-SHELL_PATH.rst b/Help/release/dev/genex-SHELL_PATH.rst
deleted file mode 100644
index 86af720..0000000
--- a/Help/release/dev/genex-SHELL_PATH.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-genex-SHELL_PATH
-----------------
-
-* A new ``$<SHELL_PATH:...>``
-  :manual:`generator expression <cmake-generator-expressions(7)>`
-  has been added.
diff --git a/Help/release/dev/get-filename-component-base-dir.rst b/Help/release/dev/get-filename-component-base-dir.rst
deleted file mode 100644
index c0df759..0000000
--- a/Help/release/dev/get-filename-component-base-dir.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-get-filename-component-base-dir
--------------------------------
-
-* The :command:`get_filename_component` command learned a new ``BASE_DIR``
-  subcommand.  This is used to specify a base directory when calculating an
-  absolute path from a relative path.
diff --git a/Help/release/dev/if-TEST.rst b/Help/release/dev/if-TEST.rst
deleted file mode 100644
index 05bf71c..0000000
--- a/Help/release/dev/if-TEST.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-if-TEST
--------
-
-* Add a new TEST operator to if() that evaluates to true
-  if a given test name has been defined.
diff --git a/Help/release/dev/install-directory-dest-genex.rst b/Help/release/dev/install-directory-dest-genex.rst
deleted file mode 100644
index 2b83bbd..0000000
--- a/Help/release/dev/install-directory-dest-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-install-directory-dest-genex
-----------------------------
-
-* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/install-files-dest-genex.rst b/Help/release/dev/install-files-dest-genex.rst
deleted file mode 100644
index b7aa8b3..0000000
--- a/Help/release/dev/install-files-dest-genex.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-install-files-dest-genex
-------------------------
-
-* The :command:`install(FILES)` command ``DESTINATION`` option learned to
-  support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/java-updates.rst b/Help/release/dev/java-updates.rst
deleted file mode 100644
index 8fd4ed6..0000000
--- a/Help/release/dev/java-updates.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-java-updates
-------------
-
-* The :module:`FindJava` module learned to optionally find
-  the ``idlj`` and ``jarsigner`` tools.
-
-* The :module:`UseJava` module ``add_jar`` function learned
-  to support response files (e.g. ``@srcs.txt``) for source
-  specification.
-
-* The :module:`UseJava` module ``install_jar`` function learned
-  new ``DESTINATION`` and ``COMPONENT`` options to specify
-  the corresponding :command:`install` command options.
-
-* The :module:`UseJava` module gained a new ``create_javah``
-  function to create C headers from Java classes.
diff --git a/Help/release/dev/makefile-target-messages.rst b/Help/release/dev/makefile-target-messages.rst
deleted file mode 100644
index 3d2cd9b..0000000
--- a/Help/release/dev/makefile-target-messages.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-makefile-target-messages
-------------------------
-
-* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
-  :ref:`Makefile Generators` whether to generate commands to print output
-  after each target is completed.
diff --git a/Help/release/dev/mingw-compile-features-C.rst b/Help/release/dev/mingw-compile-features-C.rst
deleted file mode 100644
index b3f99f1..0000000
--- a/Help/release/dev/mingw-compile-features-C.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-mingw-compile-features-C
-------------------------
-
-* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
-  is now aware of features supported by GNU C compilers on Windows.
diff --git a/Help/release/dev/modules-no-soname.rst b/Help/release/dev/modules-no-soname.rst
deleted file mode 100644
index 8fe74f8..0000000
--- a/Help/release/dev/modules-no-soname.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-modules-no-soname
------------------
-
-* The ``SONAME`` field is no longer set for ``MODULE`` libraries
-  created with the :command:`add_library` command.  ``MODULE``
-  libraries are meant for explicit dynamic loading at runtime.
-  They cannot be linked so ``SONAME`` is not useful.
diff --git a/Help/release/dev/ms-manifest-files.rst b/Help/release/dev/ms-manifest-files.rst
deleted file mode 100644
index 94fbe83..0000000
--- a/Help/release/dev/ms-manifest-files.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-ms-manifest-files
------------------
-
-* CMake learned to honor ``*.manifest`` source files with MSVC tools.
-  Manifest files named as sources of ``.exe`` and ``.dll`` targets
-  will be merged with linker-generated manifests and embedded in the
-  binary.
diff --git a/Help/release/dev/pkg-config-variable-function.rst b/Help/release/dev/pkg-config-variable-function.rst
deleted file mode 100644
index e181d13..0000000
--- a/Help/release/dev/pkg-config-variable-function.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-pkg-config-variable-function
-----------------------------
-
-* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
-  command which may be used to query for arbitrary variables from a package
-  (such as for related tools or data and plugin install paths).
diff --git a/Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst b/Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst
deleted file mode 100644
index dd52ace..0000000
--- a/Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-remove-CMAKE_USE_RELATIVE_PATHS
--------------------------------
-
-* The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
-  effect.  Previously it was partially implemented and unreliable.
diff --git a/Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst b/Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst
deleted file mode 100644
index f8ce044..0000000
--- a/Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-restrict-shlib-link-flags-to-enable-exports
--------------------------------------------
-
-* CMake no longer links executables with flags to export symbols
-  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
-  See policy :policy:`CMP0065`.
diff --git a/Help/release/dev/string-append.rst b/Help/release/dev/string-append.rst
deleted file mode 100644
index 190b51e..0000000
--- a/Help/release/dev/string-append.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-string-append
--------------
-
-* The :command:`string` command learned a new ``APPEND`` subcommand.
diff --git a/Help/release/dev/target-directory-properties.rst b/Help/release/dev/target-directory-properties.rst
deleted file mode 100644
index 5ab2938..0000000
--- a/Help/release/dev/target-directory-properties.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-target-directory-properties
----------------------------
-
-* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
-  were introduced to allow project code to query where a target is defined.
diff --git a/Help/release/dev/trace-expand.rst b/Help/release/dev/trace-expand.rst
deleted file mode 100644
index 383326e..0000000
--- a/Help/release/dev/trace-expand.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-trace-expand
-------------
-
-* Add ``--trace-expand`` argument to CMake. Acts like ``--trace``, but expands
-  variable references in the output.
diff --git a/Help/release/dev/vs-nsight-tegra-attributes.rst b/Help/release/dev/vs-nsight-tegra-attributes.rst
deleted file mode 100644
index 7ebea33..0000000
--- a/Help/release/dev/vs-nsight-tegra-attributes.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-vs-nsight-tegra-attributes
---------------------------
-
-* :ref:`Visual Studio Generators` learned to support additonal
-  target properties to customize projects for NVIDIA Nsight
-  Tegra Visual Studio Edition:
-
-  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
-  * :prop_tgt:`ANDROID_ARCH`
-  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
-  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
-  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
-  * :prop_tgt:`ANDROID_PROCESS_MAX`
-  * :prop_tgt:`ANDROID_PROGUARD`
-  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
-  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
-  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
-  * :prop_tgt:`ANDROID_STL_TYPE`
diff --git a/Help/release/dev/vs-win10-sdk.rst b/Help/release/dev/vs-win10-sdk.rst
deleted file mode 100644
index 50eb391..0000000
--- a/Help/release/dev/vs-win10-sdk.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-vs-win10-sdk
-------------
-
-* The :generator:`Visual Studio 14 2015` generator learned to select
-  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
-  variable and the SDKs available on the host.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index b558e9d..752acbd 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -13,6 +13,7 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   3.4 <3.4>
    3.3 <3.3>
    3.2 <3.2>
    3.1 <3.1>

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:08:35 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:08:35 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1410-g3187de2
Message-ID: <20151005140837.4ABAFBE13F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  3187de20fd9949ab90df4651f5d1ae0d218a9afd (commit)
       via  19ce56e2746f3315d0697160f7d5e084ff1ef23d (commit)
       via  c922aa18924c7c0b04258f24f8ca888de407a6dd (commit)
      from  6c25ceb6a841c9d24090f39851e1a89986ab9d4c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3187de20fd9949ab90df4651f5d1ae0d218a9afd
commit 3187de20fd9949ab90df4651f5d1ae0d218a9afd
Merge: 6c25ceb 19ce56e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 10:08:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 10:08:34 2015 -0400

    Merge topic 'doc-3.4-relnotes'
    
    19ce56e2 Help: Organize and revise 3.4 release notes
    c922aa18 Help: Consolidate 3.4 release notes


-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.4.rst                               |  269 ++++++++++++++++++++
 Help/release/dev/CPack-updates.rst                 |   11 -
 Help/release/dev/ConcurrentFortran-compiler-id.rst |    5 -
 Help/release/dev/ExternalProject-USES_TERMINAL.rst |    7 -
 .../ExternalProject_init_selected_submodules.rst   |    7 -
 .../release/dev/ExternalProject_stash_save_all.rst |    5 -
 Help/release/dev/FindBISON-DEFINES_FILE.rst        |    6 -
 Help/release/dev/FindHDF5-updates.rst              |    6 -
 Help/release/dev/FindIce-imported-targets.rst      |    4 -
 Help/release/dev/FindOpenSSL-imported-targets.rst  |    4 -
 Help/release/dev/FindOpenSSL-static-libs.rst       |    5 -
 Help/release/dev/FindProtobuf-python-extension.rst |    6 -
 Help/release/dev/FindTIFF-updates.rst              |    5 -
 Help/release/dev/FindXercesC-updates.rst           |    5 -
 Help/release/dev/FindZLIB-per-config.rst           |    5 -
 Help/release/dev/FindwxWidgets-updates.rst         |    4 -
 .../dev/GNUInstallDirs-special-prefixes.rst        |    9 -
 Help/release/dev/OUTPUT_DIRECTORY-genex.rst        |    7 -
 Help/release/dev/OUTPUT_NAME-genex.rst             |    5 -
 Help/release/dev/Threads-CXX.rst                   |    6 -
 Help/release/dev/add-apple-swift-language.rst      |    9 -
 .../add-link-search-static-properties-defaults.rst |    9 -
 Help/release/dev/auto_export_dll_symbols.rst       |    6 -
 Help/release/dev/compiler-launcher.rst             |    8 -
 .../release/dev/cpack-deb-checksum-on-symlinks.rts |    4 -
 .../dev/cpack-deb-component-dependencies.rst       |   12 -
 Help/release/dev/cpack-deb-fakeroot-removal.rts    |    4 -
 Help/release/dev/cpack-package-empty-dirs.rts      |    4 -
 Help/release/dev/ctest-custom-output-size.rst      |    7 -
 Help/release/dev/ctest-test-load-option.rst        |    9 -
 .../doc-CMakeExpandImportedTargets-deprecated.rst  |    5 -
 Help/release/dev/find_program-NAMES_PER_DIR.rst    |    6 -
 Help/release/dev/genex-SHELL_PATH.rst              |    6 -
 .../dev/get-filename-component-base-dir.rst        |    6 -
 Help/release/dev/if-TEST.rst                       |    5 -
 Help/release/dev/install-directory-dest-genex.rst  |    5 -
 Help/release/dev/install-files-dest-genex.rst      |    5 -
 Help/release/dev/java-updates.rst                  |   16 --
 Help/release/dev/makefile-target-messages.rst      |    6 -
 Help/release/dev/mingw-compile-features-C.rst      |    5 -
 Help/release/dev/modules-no-soname.rst             |    7 -
 Help/release/dev/ms-manifest-files.rst             |    7 -
 Help/release/dev/pkg-config-variable-function.rst  |    6 -
 .../dev/remove-CMAKE_USE_RELATIVE_PATHS.rst        |    5 -
 ...restrict-shlib-link-flags-to-enable-exports.rst |    6 -
 Help/release/dev/string-append.rst                 |    4 -
 Help/release/dev/target-directory-properties.rst   |    5 -
 Help/release/dev/trace-expand.rst                  |    5 -
 Help/release/dev/vs-nsight-tegra-attributes.rst    |   21 --
 Help/release/dev/vs-win10-sdk.rst                  |    6 -
 Help/release/index.rst                             |    1 +
 51 files changed, 270 insertions(+), 321 deletions(-)
 create mode 100644 Help/release/3.4.rst
 delete mode 100644 Help/release/dev/CPack-updates.rst
 delete mode 100644 Help/release/dev/ConcurrentFortran-compiler-id.rst
 delete mode 100644 Help/release/dev/ExternalProject-USES_TERMINAL.rst
 delete mode 100644 Help/release/dev/ExternalProject_init_selected_submodules.rst
 delete mode 100644 Help/release/dev/ExternalProject_stash_save_all.rst
 delete mode 100644 Help/release/dev/FindBISON-DEFINES_FILE.rst
 delete mode 100644 Help/release/dev/FindHDF5-updates.rst
 delete mode 100644 Help/release/dev/FindIce-imported-targets.rst
 delete mode 100644 Help/release/dev/FindOpenSSL-imported-targets.rst
 delete mode 100644 Help/release/dev/FindOpenSSL-static-libs.rst
 delete mode 100644 Help/release/dev/FindProtobuf-python-extension.rst
 delete mode 100644 Help/release/dev/FindTIFF-updates.rst
 delete mode 100644 Help/release/dev/FindXercesC-updates.rst
 delete mode 100644 Help/release/dev/FindZLIB-per-config.rst
 delete mode 100644 Help/release/dev/FindwxWidgets-updates.rst
 delete mode 100644 Help/release/dev/GNUInstallDirs-special-prefixes.rst
 delete mode 100644 Help/release/dev/OUTPUT_DIRECTORY-genex.rst
 delete mode 100644 Help/release/dev/OUTPUT_NAME-genex.rst
 delete mode 100644 Help/release/dev/Threads-CXX.rst
 delete mode 100644 Help/release/dev/add-apple-swift-language.rst
 delete mode 100644 Help/release/dev/add-link-search-static-properties-defaults.rst
 delete mode 100644 Help/release/dev/auto_export_dll_symbols.rst
 delete mode 100644 Help/release/dev/compiler-launcher.rst
 delete mode 100644 Help/release/dev/cpack-deb-checksum-on-symlinks.rts
 delete mode 100644 Help/release/dev/cpack-deb-component-dependencies.rst
 delete mode 100644 Help/release/dev/cpack-deb-fakeroot-removal.rts
 delete mode 100644 Help/release/dev/cpack-package-empty-dirs.rts
 delete mode 100644 Help/release/dev/ctest-custom-output-size.rst
 delete mode 100644 Help/release/dev/ctest-test-load-option.rst
 delete mode 100644 Help/release/dev/doc-CMakeExpandImportedTargets-deprecated.rst
 delete mode 100644 Help/release/dev/find_program-NAMES_PER_DIR.rst
 delete mode 100644 Help/release/dev/genex-SHELL_PATH.rst
 delete mode 100644 Help/release/dev/get-filename-component-base-dir.rst
 delete mode 100644 Help/release/dev/if-TEST.rst
 delete mode 100644 Help/release/dev/install-directory-dest-genex.rst
 delete mode 100644 Help/release/dev/install-files-dest-genex.rst
 delete mode 100644 Help/release/dev/java-updates.rst
 delete mode 100644 Help/release/dev/makefile-target-messages.rst
 delete mode 100644 Help/release/dev/mingw-compile-features-C.rst
 delete mode 100644 Help/release/dev/modules-no-soname.rst
 delete mode 100644 Help/release/dev/ms-manifest-files.rst
 delete mode 100644 Help/release/dev/pkg-config-variable-function.rst
 delete mode 100644 Help/release/dev/remove-CMAKE_USE_RELATIVE_PATHS.rst
 delete mode 100644 Help/release/dev/restrict-shlib-link-flags-to-enable-exports.rst
 delete mode 100644 Help/release/dev/string-append.rst
 delete mode 100644 Help/release/dev/target-directory-properties.rst
 delete mode 100644 Help/release/dev/trace-expand.rst
 delete mode 100644 Help/release/dev/vs-nsight-tegra-attributes.rst
 delete mode 100644 Help/release/dev/vs-win10-sdk.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:08:54 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:08:54 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-3503-g3e6ec16
Message-ID: <20151005140854.C3136BFCCE@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3e6ec166b290cedc476b5c29d2f4c87b5fb0f754 (commit)
       via  3187de20fd9949ab90df4651f5d1ae0d218a9afd (commit)
      from  f31edb03fa1b58375003cbe32c63b2a5106e7f20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e6ec166b290cedc476b5c29d2f4c87b5fb0f754
commit 3e6ec166b290cedc476b5c29d2f4c87b5fb0f754
Merge: f31edb0 3187de2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 10:08:48 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 10:08:48 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From cmake-commits at cmake.org  Mon Oct  5 10:23:39 2015
From: cmake-commits at cmake.org (cmake-commits at cmake.org)
Date: Mon,  5 Oct 2015 10:23:39 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1414-g091fbd6
Message-ID: <20151005142339.50BBCBFA4F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  091fbd69644e26043d1a7fe5c7a0b04d22066ca8 (commit)
       via  7037ead2bac3f90aed51861f38fce69d1d6df2e1 (commit)
       via  86cc45e3e35cfab243a441bb16e50104ead0b193 (commit)
       via  850dcbf59a6834218fa685fab34edbbb9c336ae7 (commit)
      from  3187de20fd9949ab90df4651f5d1ae0d218a9afd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake              |    2 +-
 Utilities/Release/upload_release.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From cmake-commits at cmake.org  Mon Oct  5 10:23:43 2015
From: cmake-commits at cmake.org (cmake-commits at cmake.org)
Date: Mon,  5 Oct 2015 10:23:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1415-g98557c1
Message-ID: <20151005142343.A57D7BFA54@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
  discards  3e6ec166b290cedc476b5c29d2f4c87b5fb0f754 (commit)
  discards  f31edb03fa1b58375003cbe32c63b2a5106e7f20 (commit)
  discards  703622358d7fe6fb16be6562839baf263a91a68c (commit)
  discards  ea08e6e8681357225d6100dcab53a2d9d90fe082 (commit)
  discards  921d229c5bde51a6b96062defe7381f0eaf5c582 (commit)
  discards  b882668f4fffb7eae8ada45844f1d72627279834 (commit)
  discards  3d101d15a5db6e72088aec6ca62035aeb2b2f10d (commit)
  discards  d5aff18791bb13788726569d3dc10efe826f721f (commit)
  discards  4c690ddcdc0ade5b807f56d50c5a175fd3ad78fd (commit)
  discards  a8319493eb92dc849eeffc16dda9e16a44cea020 (commit)
  discards  54b339ceb3ec54ff7806dd807113c59b6e48d931 (commit)
  discards  2875ae3a2e1ac2088074b4705cb7b75ce77df91b (commit)
  discards  8989d268cfea91747d054a4820054ddd26af864e (commit)
  discards  32f9ebcfd62deafd542c9b5d408ce0c6b7cadf87 (commit)
  discards  91d10d7821bf73999159d753790e3f55f442d333 (commit)
  discards  5106bd2f04d5f08376eea921135bdc1a184e26af (commit)
  discards  ebb78d9183de143804f6479f2ba7f476d5f8866f (commit)
  discards  32fc0010896ca65ad6904377c53831e9fb062a25 (commit)
  discards  2977e8e345bf27c147a3da97dbbb6b12d83ee3e9 (commit)
  discards  dc5fb20e10d8737af62c29930eece8e2e4a9e948 (commit)
  discards  32e54f1a6b1deca20a00b194467ec9204346a4ae (commit)
  discards  0279f665b4c3fb1ac83fcb92a7f0f6be413d2b73 (commit)
  discards  07368517a278448a751b1adef771a73b28ca22e0 (commit)
  discards  8a5fe539212dbf286b89d093f5ced2d0088091d2 (commit)
  discards  fda8218b82189de6ed0bada1487e0ad4d516567e (commit)
  discards  fc11bd08ff3c97399c117220d3e1dcb7e24ca67a (commit)
  discards  2cfd757b8eed5dfddd3bf5eb5464040676478c71 (commit)
  discards  acadaba878e375554b6350b4257ee03ded5a03c9 (commit)
  discards  d04e743b64e084c090b630c5bfc8c1c14ec96f1b (commit)
  discards  6d8ad4e922aa85e22e5681c5ec999bffd9626b8d (commit)
  discards  e1f21a06ef2c02dc5e01f91af18ba86991bfc54e (commit)
  discards  852c41eac0a44c3168b6d9cedf34bbb1e354bece (commit)
  discards  e23d906921f653bc7ef6bd1f6f261851a418edd1 (commit)
  discards  1f5436a61959cfe5b0a2dbf979691e1d21e6776c (commit)
  discards  aaa4be441968ee9e6344e182ef7e0f8e081f9b34 (commit)
  discards  399b5bfd37b1fcd48e566cb7c8908333b6cc1dc8 (commit)
  discards  0b741bec4266a6507cd56f2f12cf743499df627b (commit)
  discards  18a4a742d0a8e27f765070ab837c395d69a72959 (commit)
  discards  adce44b9f9b85b5cf7ccaa5b25d1088925845180 (commit)
  discards  bf7a609459b8dcbfb59b4da57c7cbe1787a56c6a (commit)
  discards  bd0cb84c06f325439c32fe0dee4e05452d0f4cb6 (commit)
  discards  8bdbd3e1b740e34fc7e68120536fb5c8f1deedee (commit)
  discards  b5979e9168a0a965c0e29785c487784d978af9c2 (commit)
  discards  c326dc92fc6677df1d8e7ed345356a5001accd0e (commit)
  discards  60e17b88cf7896c5ccb444974dfaa26fd3025da1 (commit)
  discards  45c06c1d13f6317fe18e35dc0ae3d9fefdea77f1 (commit)
  discards  b6b35d0b64b0112f70d493f779abcae404e534b3 (commit)
  discards  6653b235a7c9d16f77d9edf334888b8f23cf9e49 (commit)
  discards  0ebdf64d138ce3061d128edd7a55c6dd31668bc7 (commit)
  discards  b82ae22bf8d81ce4abfe340c52fdde41e9fe3776 (commit)
  discards  55653c8be853c2bcbae9595dcf278fa27e2cf37e (commit)
  discards  239d0e025739f5885d49304e93fc896aa27928ba (commit)
  discards  dbd960a80fcc80a9f0dd1c16c7c16711af4d0b46 (commit)
  discards  3e55efe28a5bdca48951589f34ff191e696f3782 (commit)
  discards  ffc7b31943346ec70de4537873d20ea98b76326c (commit)
  discards  a244712902a31dd495434ecef5ab82a7b172c638 (commit)
  discards  dd75fc27af2c737f0c6d78fe39578529ce5012da (commit)
  discards  4bcfaef9173923b2a6bd5f3900fb2c3189865905 (commit)
  discards  6a46f51b508611bc6ee56e417f327ff85c4f1066 (commit)
  discards  59b8d5e81eeb77f9e507e01c8ff0fcd68f40f415 (commit)
  discards  a41ead566cf8b0d1890ad820858ae6fd4334f8de (commit)
  discards  a00cb0cbeea37a2d896275dfef76060481822da7 (commit)
  discards  c5b521e2b99e8b8025990588f77d15340ab743b2 (commit)
  discards  25e051b55896f9ba705ad58efa7f79abc64fa250 (commit)
  discards  eccf4cd362ea11c18871014045e7635c482a37bb (commit)
  discards  e3eb67f7bcf91008086675f7f023210b594fe925 (commit)
  discards  847bd5efb03d8394bc41cfcb8e2b72e20e7cfb6e (commit)
  discards  23d020c8d63de9e03a5e42267759df2b7310ebac (commit)
  discards  3542ea29b292696be6bd281523427d3edef06fd3 (commit)
  discards  64823832e250189e6a6a72a598425ce54f270b19 (commit)
  discards  4cae0e8232e0f6bc6b623929616ab8bb0f0759b5 (commit)
  discards  c92b688866ea491b20e5f0b48aeaba95f8ff971b (commit)
  discards  27271a21256bf7013efd013f711ac48589f82bc7 (commit)
  discards  43cd3b6e7df6601d592add614cc7d3048b7aeaaa (commit)
  discards  bc94797f57c070c631ac5b4a67103f3a5105ab8c (commit)
  discards  fa69fe931bc9de62f2e118d31e9b60d6e17d8a6e (commit)
  discards  1cbe7f404c787738f87e13e7474ad171e6074398 (commit)
  discards  ab7387a0cd50b18557af244095e23e1b682b674c (commit)
  discards  b6c030bb1e2d6cda878311e496f63585569277ef (commit)
  discards  252d45e8929105b15b87983428ae4f7a0b8b1a9b (commit)
  discards  5b97fe36ac3549ba3508d5b2b179ffb43752dd45 (commit)
  discards  5fc32440df1f11d2b393a5d80c16a9d69ad82e06 (commit)
  discards  24b0c9811a3a2400cdbec5ec714807053e021ea3 (commit)
  discards  ac6cbeec793a5b2ca0e95a8b374fc2b02e1519a3 (commit)
  discards  6207fca3c8248dc11103deb0a0a9bc354b8da3d6 (commit)
  discards  b1f0a6f21f5f1dd5fe976c7d8027c2dcfbb1850d (commit)
  discards  a2e3f84a5f63476f0d726544a935c336ea8588e5 (commit)
  discards  aa7274d72651c28dfa7f8791208fbe57d0f75c3f (commit)
  discards  42730ac4f6debc07e91c90718899ed29a841f460 (commit)
  discards  54912eae899621cb107574275329026bfee62ed4 (commit)
  discards  1720e12bea119032968ecf8a83835c549d106c7a (commit)
  discards  dad180e984c83da8c1ff0d21903d974fef6cd9eb (commit)
  discards  c827a4666fc6cff0cdbb6680ad71db975154b245 (commit)
  discards  feacfe3d4bf66d2f43efd6eb5549a1db53f2fe49 (commit)
  discards  dcaaf9a31d5642214a283b6d466098647523ee64 (commit)
  discards  570500207fd69a212bf4f7ed4a158e2319e27729 (commit)
  discards  515e662eda8c49304e2e91d278ca745d295b936c (commit)
  discards  a6d1d7162bb78f212918e04ec90a41df38a10903 (commit)
  discards  6c58ccb9a6b961ad5d230a75182002612ff79698 (commit)
  discards  124dc4a28d1f51aeff6591697fd34f97ce6b12fa (commit)
  discards  cf947f4f892164a40b826d85b2ea744b965a1116 (commit)
  discards  2e6539012ad7a2099dce5559bc13246d7bb1e88d (commit)
  discards  b622a6455f8043461044e2130d8996e7fbd14116 (commit)
  discards  81b6e2cd421c95b293991e15dce109a41cae7f44 (commit)
  discards  770ba5a1cb285e255915e24cc5dd8b9ef2c1edda (commit)
  discards  c39119b40afd95ceb72eee0b0cc06de40ee9dd71 (commit)
  discards  1af2a1923d16ba8692ba83cd1e1c86bfdc890531 (commit)
  discards  0f78b9e05eafc6621cdbdc8ea77119d778d78ebf (commit)
  discards  6cbc793fdd1b97803b0b96809732f53ab1adf79d (commit)
  discards  dddedd4a3b7c78c73e595be06f505dbda4b08980 (commit)
  discards  20077c1be0f45b3b540457358c47dcb6ea00664a (commit)
  discards  c645a4f94e9e56130e85cec63b53f656876b173b (commit)
  discards  f09a9eccacc66592011dd93f4a9cd90f74c0ad73 (commit)
  discards  6f74269346105ee5a1b2c8f342fb477c76a95a61 (commit)
  discards  02c3a0b1c376d54be020d87be36d27dc5dc87154 (commit)
  discards  db631c74762e5c223ea6e327acc2eebaf8ff601d (commit)
  discards  0c95d70fff1b9bd0b2e8694874ad88c8ef9e6f9c (commit)
  discards  477a8047d3de7ec07e54ddd0f9717eb574f6bc7a (commit)
  discards  320460699063f83ea959d89f4f03d026108e3109 (commit)
  discards  ff41c88af4590a4b076c77e15aa7d640eb9f7396 (commit)
  discards  c090805380f7335a0e570945fbb77b44238ec6a5 (commit)
  discards  f89517a3a52c0399ced0407a968c2b93dbdeb4aa (commit)
  discards  1a65af9ffd1bd072a00ea75e701b3bd20d7e046d (commit)
  discards  65211b81602892a34facb72b95ccd17673d15f95 (commit)
  discards  4dffb6af919b9e3de64f84b7da05fe64a369dff9 (commit)
  discards  d1912e51ceb55ae0b847e045dbd1f277b1fff42d (commit)
  discards  d255a9c0e5d915230608ecc333787c133cbdb264 (commit)
  discards  9163059ccf5f3f4cd652012a6ce25be800d7b470 (commit)
  discards  0fe79c067090dd880826e5334a30af955e15c5e2 (commit)
  discards  98c72cdeccb98017e39438af8186811c8f998197 (commit)
  discards  901dd53403db10b5c88be8c9ccd9fab3eaed1068 (commit)
  discards  39347d38b42e28a53d9fa30cc1b78b6be7866878 (commit)
  discards  480f526a9e9fc79d561cb5daf3b2457d797c0e6d (commit)
  discards  527deefa0a4bede3d45edd867afe2a1a5eb8a7bd (commit)
  discards  e165b1250c78a907fd1162aa68f334a96ddceb93 (commit)
  discards  cad1b3eca50f296a8eacf3252c9eae8bdb606d9b (commit)
  discards  a0717a6812ae7c599267d57f6ba37ee6937a715c (commit)
  discards  8adf6ab5be58d130dc294a897b23f113dfc08220 (commit)
  discards  d6b6e47b1df0f6e8d1201be99ce9f8e5b28c9a04 (commit)
  discards  43218affaaa2acd87e1b9e91f7de6947cc694e4d (commit)
  discards  fe4a12530e09bc66be61ce9972250bfe26478a8a (commit)
  discards  296e684caf35a26d312e9a638c34df9e27caea16 (commit)
  discards  924cade82a7f70b68390d2745ec1075a1ef6145b (commit)
  discards  350d20c9fca2f6e4d49f2177dd62de4ff85333ee (commit)
  discards  ca3090c4dd17b2fbdb2fdce72d33846e33403258 (commit)
  discards  24fca85c8985c8e72da36dad2f6296ba89a3c427 (commit)
  discards  0cea45e48783bb37d60f067c0e6a658b7ac84757 (commit)
  discards  55559a4f884454348ee7711238c05563ca58855d (commit)
  discards  5a93c936996b87d748da707058b374f2f71e25ca (commit)
  discards  0f5c8e098d6a0e5da25aaea60b089f7d11205ab1 (commit)
  discards  95c39028ede8b8ba988f6d0f6964b0f7ce2bf76b (commit)
  discards  49f11b9e51506c26a019685c153ee54dee3a0c0e (commit)
  discards  f135fafd934a5e12507c8c97cfc7c0fce990fd0d (commit)
  discards  9a97251d3771512962d21c4237b5c3d56b232e5b (commit)
  discards  e652087a0118d580cb45df4a34bffb79e537c13a (commit)
  discards  10a06618949302bba33e04347b2d072d804dbeaf (commit)
  discards  3f6b267d17cddb67e4251bb0ff28bb1a21498417 (commit)
  discards  e4b1728c2cd4feadad6122bef836f507e974d1aa (commit)
  discards  d44cb3277ce4810acb223140b3aafc35a5c31893 (commit)
  discards  eb99bf2d6861ba6cfc282265a5947453032c68dc (commit)
  discards  be4dc65ba74a26d742558a0e05e4748b18f4b4aa (commit)
  discards  da0bdab6d9788728bf0671b22a287dd1b5517f42 (commit)
  discards  84ae6a68a62b3739015dba75a785ae6b939a882a (commit)
  discards  096946bd49b2342a347c700947b5fdf930f6cc08 (commit)
  discards  58c40573e265ae38d64738cf4033373df0f2a6a5 (commit)
  discards  6d9d7045893e99bc713958ec93f30fcf62555b6f (commit)
  discards  6685dcd54221f56e1047142fd728000c9484101a (commit)
  discards  5ba56a89c82689102294b412784d9c938cf7f472 (commit)
  discards  6930abc0d88ae587a717b9343780ac32499da4c1 (commit)
  discards  80963782a3726472dacfc82f357d5ceccca3b543 (commit)
  discards  8db1b40ef504bc2ac102877bc767d608891d16f4 (commit)
  discards  6f9516c587aad56212b06f64a35c7037acec84e2 (commit)
  discards  da378b6182c89d31d97524efd086fcb119ef0572 (commit)
  discards  8633df503365e43cb966938bc3bb895a08da0862 (commit)
  discards  f7b8e9fc7446ba57138811776dac5a06acfd3f06 (commit)
  discards  1d7e2081cd4adc0e1dc35c50d3fcd7cc785d4816 (commit)
  discards  f7b4f40af838f66acbef763f215d697dd12cdff6 (commit)
  discards  8831ba64a606c4eae7e16e41a83533711c075bf0 (commit)
  discards  e723550b1a75d8a9e7b4615bbf70222237eb2ba1 (commit)
  discards  2c738c945175b554db1e79672bff076620185063 (commit)
  discards  451505b3bb8a400552c99d31e9f0c26f15fa3059 (commit)
  discards  98366c3d0b5bd189e0aee10bf8846b38f07d4ccc (commit)
  discards  7defd7c0006bbdf054c85ada3508b8bb7487da86 (commit)
  discards  7c7a3c35add0380622e827866985aa9bde286676 (commit)
  discards  47462f48357918309a2019510586bae2410ddcb7 (commit)
  discards  0ef2e214ed204ae9ef41ce01d5eaf6ea92c81a57 (commit)
  discards  dec07adacff8a62c0c68b4ab3caf0f2be03aa45a (commit)
  discards  b1c162ff8874a23434e314254f00b91e9efd699a (commit)
  discards  95d21a818a0531e148c527c0c64d176c812e718e (commit)
  discards  98908b0f3ed997294d4ab40b04d191cf278d658e (commit)
  discards  281ecf26db4308e41de0eaa3707d216e1806b5a4 (commit)
  discards  f820b7d4700407c0adaf92384c8b90505facc403 (commit)
  discards  f8c9ef8166b8c712de5b8e42a1e13b6f97de4637 (commit)
  discards  8a51c00fa602978c21690a26ed6e9be453522a2b (commit)
  discards  f8e759449c838dda772f8661aef526ae972f4717 (commit)
  discards  d83fd9c217a0b4ded9192cb3bfd9aa6491bdb7be (commit)
  discards  1e93f285d05f0ded484e036673c82da7cfff9d28 (commit)
  discards  41e188f2887bc5dbec025ef3681f7f52ff17dcb2 (commit)
  discards  86ab3c8aba2bf0df0ef65665f5b767a07f3aed34 (commit)
  discards  2514fa98368ff890eeb225f350bbcac1086e70da (commit)
  discards  6a392fab6fb23973fec0161a9551f9eccaba5e05 (commit)
  discards  aab1f2ff8e1e9f47c9b7cee91d3a10d71016f75b (commit)
  discards  962666ce90baefe72e5a05399b2c1b9b161eaeba (commit)
  discards  a3aa333df53f705c1b4f831e50f84c5449631811 (commit)
  discards  152d75e3e010dd5e661af402f4085268b8cb70f1 (commit)
  discards  b8998e6df2ff8175dbb102736b376def4b96503f (commit)
  discards  d2f678dd713355a30a857c33cbf927753c9d8c8c (commit)
  discards  25f005d61282de0d8b68391fe4feb26dde037e0e (commit)
  discards  6b5d9d8bbbafe101ff1f5123168d058280edf4ff (commit)
  discards  1edcf7ad8f33a103bfbc4b08ddde4c9056353d81 (commit)
  discards  acd16632eed08e6058770f7aea146a98510c49c4 (commit)
  discards  4679cbe9aa905d891ab07dc70eaacbaa50b5bc5e (commit)
  discards  df4909a5335424d6dd67cf05e39f6d219ce4f322 (commit)
  discards  2cdc6d0941cd1c83e3a89cb4913f2b419afde70c (commit)
  discards  3f83ce6cf1872a23f10233f4c062cfd143334ecd (commit)
  discards  e66e92256a93c69c45e0207e3cb349f7d71bf245 (commit)
  discards  9f1ee3e46814023ffddd629479801b4d2678b6b9 (commit)
  discards  95c58026b648ad68e89f3e90b6840fd5a89c3043 (commit)
  discards  d3f6ff43cf7dd25f80172733991dc9d3087c2eca (commit)
  discards  26cae90ba94639139cc788b8572ac77d22e1b5d1 (commit)
  discards  9cdf5f2afd6bd40fa73bf88a17484c7229ffb850 (commit)
  discards  77201729619377b7ece124e1ab4347038cbbb833 (commit)
  discards  5c7e0a97e953d0905b0d9e7bbc042cfbb6b6dfa0 (commit)
  discards  706468066fa82df76cc7dfdc717cabfb0fcd39f2 (commit)
  discards  9f734464b70668b695accc386738c9e2e3c45c2d (commit)
  discards  719c5e535018405e5af72dead1c86fe50a013798 (commit)
  discards  09b972f5056af71d6d6ff85baa2e4e5b5e266ab1 (commit)
  discards  5f52553b93ab3e1eda049d91d6317af0df18dc5a (commit)
  discards  cdd155511105c4d58a261f52cf5b06dd91f3a31b (commit)
  discards  1ed2b02276428ade4664e755ae53ebaae6383c7a (commit)
  discards  d02c5b6e4dda77812f4de5410283aaeba5c0488e (commit)
  discards  aacc182c0deda1dc8f98767737dd14afc2b2f78b (commit)
  discards  bb263cf5190cc181944ad126fafbfb4b3cd9ffdf (commit)
  discards  26a027a34aec37d0c9baa9e043bb3fb2118a8e5e (commit)
  discards  9c8534cd68bdfa1e3f479e3bd9c8681a26a05a4d (commit)
  discards  244bb3caa32a08d6719f0f3f1b63509e5373372f (commit)
  discards  53a6318c7a9afa8de467665f6c78e18ce6c3b43d (commit)
  discards  43e2f07d76df5db597cb0d236074eb0b393a0d9f (commit)
  discards  44d49c09a1849e2db2d024d09b4bafa65caac5b7 (commit)
  discards  1fc22fa9416cc8fc787434645c77bad29ddee702 (commit)
  discards  7850cfecff44ecdf0f8cefcc5f0d15b68df2941f (commit)
  discards  ab2c1d35afa9e7263a390d44b7bc614a013057bf (commit)
  discards  41c2bdc200b923cc646a9a67988f11cdb92cd9bf (commit)
  discards  1050e4e3c2c9e145b2751225bc25a0ec9fd666db (commit)
  discards  70e8db6e20749a484dd677d7094780c5f4b451c6 (commit)
  discards  b0dd1222dc588c3d04a88dd6cf5551b0d691a334 (commit)
  discards  c5a48f11b8223be1350237834a6137fcd394630f (commit)
  discards  3b099fd3eddbe1775d0cc1360704a0e824532c80 (commit)
  discards  8954f8fa8a8d28cb06abdf1630e1229ea818b596 (commit)
  discards  437b8acb6c501f736fdba6b26bfa6122581e198e (commit)
  discards  5a8e53453a4bef49663723fec57cb22253c7c34f (commit)
  discards  971346addd9858b96acf81496f8d4091536235e9 (commit)
  discards  e69ed005747de6eeb05f0605c3ec80f780ed5317 (commit)
  discards  f020f9f42183a94cdcd33fb14e9fc8d5eb721964 (commit)
  discards  c3072e67ac04f7c1a21c194dd1e4abe530c537ec (commit)
  discards  6200814c97918824b093c4ec6b47183f1f341c01 (commit)
  discards  41547e3a5d045d4cc549f8e2202bdea1ff002c29 (commit)
  discards  8d64312707846dfb1611c97f2d5986e04389d552 (commit)
  discards  13731202f402f6e9d8227560fcc1278f483b530b (commit)
  discards  d89405d63c1ab165e84799d00635ecf3294fb400 (commit)
  discards  80095c1c08502d5dfe589eb2447a6c9ad8785c77 (commit)
  discards  d0843f5a8b58a3a1d08189e94c4ae9f445bad724 (commit)
  discards  43281fa5cdc480cc7601cd6d8c5901c7c0c6f40e (commit)
  discards  b18e0e3c34fd2a931bbec5fe3e45a67588746d27 (commit)
  discards  19d6c7b3a63a4ebb655507424e6116ed576ffc98 (commit)
  discards  8ed641f0e562f9406f6c301562866a46093e1806 (commit)
  discards  b671db13f6b02650459380a0a23eb36cead25bb4 (commit)
  discards  cf6b25fc0bcb78685da6299dddd1190eaa3ef910 (commit)
  discards  de4a71d2fb812d6a33e97163ef1523c6b1527c47 (commit)
  discards  61be8860d3f7a6ff4b6db6c0d09e408fe6856838 (commit)
  discards  f965340521169353fe6afe49c6732da3a0cd866e (commit)
  discards  90366bb8135bce021c2b5f63d24662b1951d0272 (commit)
  discards  c4392cd780cead83a8f34b50802e433905ecce71 (commit)
  discards  c480d186f5ca58687e4e89be8468410c3234e804 (commit)
  discards  ffc29f2d200d366de03bca6cc0c2d414b1b5e850 (commit)
  discards  cbffa2d6e4b6543ac06379814b494ef4cbb5ef68 (commit)
  discards  89717916b8c973c292a4c0a058ee552fcbf40850 (commit)
  discards  f1a93c6a3bd676834bf2f88b983e6eca4e1e3072 (commit)
  discards  c03af46e3e69ad8279d8ba9b5f353b92b87f3296 (commit)
  discards  92313fa5d52220bd667ca0f9c290064940d3070a (commit)
  discards  3b8fcf9bc2162af9f8e7bf12eb3c557d271366f9 (commit)
  discards  de6e88f26acc2145ee839737a7a8d6fcc0e1f1cd (commit)
  discards  87cc1f23f451f2f0c9ca6186d1c06f00438abaac (commit)
  discards  6968cb0bd08a46072a39ea3d0b760f7add0e71fa (commit)
  discards  eda9e88e44b7db1a31f80b6bd23f78a7dcf56037 (commit)
  discards  a0f72e6bd9cd4a9d9c75843d045a29db85e9d8d2 (commit)
  discards  e78b540825d31b2f8402507abcd6f68c7a672c5c (commit)
  discards  f1591efe91e174c878a87d4f3b8d0b7152c81ef6 (commit)
  discards  02633f3aa982356157964bbc9ebe8eb176e69b93 (commit)
  discards  5b4649c63fbc291a74823e9eeaa1721c1a10b004 (commit)
  discards  feeb443eb738676b104d04982cbc5d6e1d0e149e (commit)
  discards  4f048bd7148be8d85752026f781f8f5599b68c35 (commit)
  discards  b5743ddb3fe4426b6cc6704314b69102f1f7e0eb (commit)
  discards  2a60d39fb82d5f57a953400f082443aa14f9af4e (commit)
  discards  ecbf6d2818fe01476c6e0c202e6ebd9c2800d67b (commit)
  discards  ba7ade5f8eb03574d026d1ee3120b11c532c1809 (commit)
  discards  a9c1239f10399184244de02bbbcfd0db1c1dfba3 (commit)
  discards  0cb936d7f3c97311dc1516c2eeb310d42aa3539b (commit)
  discards  ee6e5ad92f47cfddd3d352f64357fea4db84eaf9 (commit)
  discards  35ee6832faf64aaadd78d4b7af47b5d949683a17 (commit)
  discards  29f979f1f440bb3f88415c13685da58b46f0d591 (commit)
  discards  fea3a1685297dc8940e8df446d697663fff08f4e (commit)
  discards  a6e7eaf75d90623bc0c76f08fcadced2beb8d644 (commit)
  discards  74fee403ba2938309a1ede93de60a5111b32657c (commit)
  discards  de269594f9f6a869cf5fd7b1d70563e1e08b48c2 (commit)
  discards  b483bb3091e1cd8ddb532162179519de1a975fa0 (commit)
  discards  e4b783275a79ba8d448af6a9dc4e1151cfc92661 (commit)
  discards  7dc04f4f901934e28bba3acf45931d53458b469e (commit)
  discards  962583a78c051c31ce158fb3a6de2eb8fef7d091 (commit)
  discards  159edb7a4d45639ea72f0c1761caa5266165f521 (commit)
  discards  a0e5961567b370d16bb5b86876f64f600a72f5cb (commit)
  discards  0b61fe05d3b02dccfba8e4adf9b21f0c294058e7 (commit)
  discards  ec1e2920551647fd08407b26ef9fc5561061e238 (commit)
  discards  b937b173e28042dbee74f2beeb526e38890a68e3 (commit)
  discards  716f9bf961b3739587d820369ad958a4fca33287 (commit)
  discards  7b9bab0f445c8d56f4c0e95e5d28edda6df14d99 (commit)
  discards  271bc8d13beb1c24cabc30d4da8e1466825bd3a3 (commit)
  discards  e96e8a73a860b987db0387516113c46b13c4aa4a (commit)
  discards  fc17b892f14cc9aa408fdac3f9c3505183cae3ce (commit)
  discards  9d30536687643c374a0074a9b45be5a671b3b4f8 (commit)
  discards  1202e18f997ceca217539a67534492d4912c036b (commit)
  discards  bcb5fcebe81f80c4f97e7955617132b4d8bbbe69 (commit)
  discards  10e937ad99ceadfed9dd4ebc89fd76f8b4afb4ea (commit)
  discards  6504dfb69a64795277cad6969d1c2b267535d287 (commit)
  discards  77691638b2eeec0ab70a7851f5820e7f8a384c3f (commit)
  discards  6729ca6133294c86b1d6ae6870616181f0b6d8d1 (commit)
  discards  a0544f782ca86fc9858f4228faf95390ab56198f (commit)
  discards  da4f811fb4c193553595f2aa1bc925b48677b6ef (commit)
  discards  ad0aec244b522a1e5d7cf36227bd476524f80d8e (commit)
  discards  c5d4c36737b09e00c2570b0842467573eb66bb51 (commit)
  discards  bf2541a9c24d1b9631552e2b803192bd3fcdf7a4 (commit)
  discards  bd806a3353f3365d28ad212c5fca2bbbd86d58ec (commit)
  discards  d76f31550c9051558da636b859283dad64919bf1 (commit)
  discards  a7d96ecc983b16aa135d3f3a36d6b4d9d605ca85 (commit)
  discards  abc1d65cdb258222c12aa05c856f13efa2ca038f (commit)
  discards  664a9b09edd414a6be33eaa5b7d5e7536c47cd5c (commit)
  discards  76c59007dd3944e23848b7d5912a59a7d3db6398 (commit)
  discards  68dba7f7198557833a7b1339254b00a1f6f4ec75 (commit)
  discards  9f5b349e0a8f423eee9852b9c44408c6c1f9395d (commit)
  discards  4653dc36efc23e6a35449521a7d7a7688b0ab288 (commit)
  discards  c4c34af1a8e951026178db532f18660e0a7f28bf (commit)
  discards  40a85b503c9eaa579c5b497f7f7155911f7a67c3 (commit)
  discards  35f46e30fe43345610408874db2504614bc72d47 (commit)
  discards  af2a0b5b0facf8b08ebffaefa5a2a3f8723851d5 (commit)
  discards  82df6286943681765a47d55b431eae952960f5d3 (commit)
  discards  ef34192b04d49f21d39ecb9ceebfd5d95ec35bc2 (commit)
  discards  1b87abf73a6a1ac97cfc79f92baba28ee536e489 (commit)
  discards  37278dc705eb7cdb395a0d7b970cc4d82d2bf118 (commit)
  discards  24ea86e9c04630c070baf897d361aa64ebaed781 (commit)
  discards  ffbe3728a00d941115ac59c3cd3778a35eb03053 (commit)
  discards  ab5441a9540c4bf649927845a08214de6152f353 (commit)
  discards  14161a21f0e873dbc71ef770813494264f6449d8 (commit)
  discards  53ec40614e8a0e638a9ef83f6b859fe4ec46c0b7 (commit)
  discards  ec8e5fb3af5a24712dc3d4948de88cd4fda83cab (commit)
  discards  a01af51341752f994023d73559d45fd12f02c652 (commit)
  discards  ec5077cfa1f42eb7e10138098d1a4693fe6ce402 (commit)
  discards  143579c319472facbcfc3285f0b6b0ab56f1bde3 (commit)
  discards  c8c79835fc8e3a062dd3a04b1d7d7d465d7e3a61 (commit)
  discards  c212867961e4ce5ce99fbc682324aed4627e7a6f (commit)
  discards  045a845d4744b8604ccdddb9091d3d7177b9a690 (commit)
  discards  acd9b4d39300c8b3285bdc92c0db08b0bbf75574 (commit)
  discards  e9b171516ce17f0c8eb2dc964b8997ff1f4e5b30 (commit)
  discards  6e4c9000aa52c0b8140e612cb27fb4e4fc6ac82c (commit)
  discards  e81aa1a379fa721c800caef75c74e26e8acb9585 (commit)
  discards  6f95ab5feffdefbb9d0070c6fb56972dcda9655f (commit)
  discards  993e178cfd3fab54f089fe28a03257a41409d7ba (commit)
  discards  f8aeb20b2c7da9b67adc960d44d0f7ce588d8b7c (commit)
  discards  57323ce547ed6f3abcb68de6354c64758faed2fd (commit)
  discards  128f7e34e99de725b7750531d9285763818e58ab (commit)
  discards  69b867af86b42d356f034529519e55fa6e7fb2f5 (commit)
  discards  2e9af45119f95cfcffa64f233d1e178339b0f0ad (commit)
  discards  9cd82856fa6c614afc5867dba0c126436650665c (commit)
  discards  20b9a25ff62a44977b9b72c340db9f68e3c76617 (commit)
  discards  18b3833be1944ac2b7d0ba87d0df496aa7a4fc5f (commit)
  discards  27c79a2c65d67fd118667898456a4255c024e3f0 (commit)
  discards  89b5d899740196524b0d024ba46293fc4fb8aeda (commit)
  discards  1248582c79708e3e63a495582cbf548cdcd86b6c (commit)
  discards  dcb2768be80e93b202f0d6a9751211686a63cc22 (commit)
  discards  8314b5611d72bd0c566019cf34b738de04c08f44 (commit)
  discards  fdf16cf5a7e686e0f95e9b312930f440f0033e47 (commit)
  discards  a3b677dfcf5062a84dfebf72a5f24da241e00dba (commit)
  discards  e6cc5a9fff4689e8b0818e0a21f59f65f1ce7fd3 (commit)
  discards  5487b1be38c2003132ec4ddbb1dca615474777e4 (commit)
  discards  54329e174573e7d6f5aa497074e4a37bd8167750 (commit)
  discards  92875bd700ec97b97a2b5ab8137e56a69d8774c2 (commit)
  discards  666ea054fea69ab350a52374caaef139c1528e7f (commit)
  discards  b5e1777f2ca44ee1de0f24cdf5551abc6f3db60c (commit)
  discards  7c567af0e6a5062043f80e04a16ef64db5bff754 (commit)
  discards  0c2bfcf32048db82050c15bed36cb0419799b9c1 (commit)
  discards  12eaeeb08d00f001b8471dc0f2fe011966c1e923 (commit)
  discards  745f0dc5076a91e021df968a5fa820879b235c26 (commit)
  discards  18a1e129f5f68ecc33af8a4b7b634d34c95ada91 (commit)
  discards  92fa6e593a56f74a380286db73a191aa3fbf8548 (commit)
  discards  ed8a460aaec9162ff5185dd5578960392d24cf44 (commit)
  discards  a0446d9337da8e1d8105e5b662b4a0e6857112f4 (commit)
  discards  f1b98931036d13e03c960fd1616699948821e67a (commit)
  discards  09ffe6116bd70d779e69b539e555d2baf5475910 (commit)
  discards  a79ac02fccd3905b039abba782f24d58746ed985 (commit)
  discards  34141ce58174d8180359bd95389c25255e8cf2b7 (commit)
  discards  86a032131804072d41d80d57cd569657372109ab (commit)
  discards  8d31860874ab4968b69ea93d6240fa66fe1bb60c (commit)
  discards  5f930bc86b28003e502ad1e416565bfe43a4e6a7 (commit)
  discards  41249dd27ba2eba664341ead170027015361aa2d (commit)
  discards  6c803a5e62cb16cafc16088abce7e29e1a36449f (commit)
  discards  86c7715ae169ac35e8d846a4ff23baf6d82d7bcc (commit)
  discards  4df395dd4db45f1a40ada8ea84b6f92924b5bf5c (commit)
  discards  3872a99e5d422e043c1da0572d2478d4756be60b (commit)
  discards  4a9a096507ed7a88e18c4358e27cd7e2911dc6b0 (commit)
  discards  8eb8b417660ccfe9dce3ee532aa465d468b3a915 (commit)
  discards  83a8b1e1adfefc5ad3ed4ebe925f86a457a0f55b (commit)
  discards  4daa9e76f860281b3e2db526ab06821a4316be70 (commit)
  discards  25bd677f8135f6d574ed66576a39de20fd0ff6c4 (commit)
  discards  923d2bae0c5d7a234c901ee2cc24ee295e0369af (commit)
  discards  9ddfd6c6be7d003eaa03e7c4878cf4c83b0518f4 (commit)
  discards  151847ee0369bdc1305c75d5aa7f2aa450998964 (commit)
  discards  8dd5a85278db6340240f39051f37259255ef3968 (commit)
  discards  6a1393e5afdbc3deae5f34b85da5ac683a4630ea (commit)
  discards  975e5508025450edfd26f13d93905fcdf8ff266b (commit)
  discards  f3175f9efae20517d3f32f357b76ec2f87e88519 (commit)
  discards  5259219860a040eb81f50ea05ee47447d8220b4c (commit)
  discards  cfbf38704d2ee4caedf3fff51244855b076a152d (commit)
  discards  6985b37195c2b0336f3702cba64fb83d52a7d2b1 (commit)
  discards  bb946e544e4895670f946c252234c101c37443d0 (commit)
  discards  8be433e2fbbab9a4b6634246d1b69c2d5fd27380 (commit)
  discards  a9b52abbd4278e4c566965bcd2ba5b853f9f9ba2 (commit)
  discards  ff052f9ccbb188794c94caec70c266f6d6619da0 (commit)
  discards  41523a932cbc67eab2d39e781e5ac095f0d03fdd (commit)
  discards  6d420db78cc25fcd4c5086662c337d5ded2b7413 (commit)
  discards  30e7bedffc28633623efea619f099fbd782a5f50 (commit)
  discards  8a4be5dae3c0fcbbe5d8f3aa083dcba080cf401a (commit)
  discards  60a389d03c17e9879271bdeac471673784be23c5 (commit)
  discards  8c9e49abb1e345dbf794adc5f328180c471804dd (commit)
  discards  f2f84a2425f8fc2623facd3cac3798d4a7be2d45 (commit)
  discards  90915aca8716a600313fe900a6a41921ad25f205 (commit)
  discards  3e47e59c4cbd4d0f5caf977c58564b5b2ea6b7ca (commit)
  discards  982fffce537f6bb5dbf9c332bbaf065fd6f1f502 (commit)
  discards  c7c0d1a6057d7b4bcffe94032844cb3b852d51fd (commit)
  discards  e4888da8ab906ac2f4e3f8dfca98db351e5855d0 (commit)
  discards  08fe7b5f1ed86b9a635967ef1c0b8adc83495a1b (commit)
  discards  15f0d580d295ecb663147529f5880d95bc8764c8 (commit)
  discards  43e4275aebc0effbb5527cc529b45193a2409f97 (commit)
  discards  f2f717b4e0c74163552bbf7dd3e23e2ed0b3671f (commit)
  discards  63eed714b4bbc542f15dc9466a5a15fd2c9811da (commit)
  discards  3f4a27b904532e0e3bd3ff06cd7bbc039f8d4fa0 (commit)
  discards  c61f2a6a622abbde8168f40f65209958a7abe2ac (commit)
  discards  d26edfde157b408fd74c195ed5191e1234dbdb76 (commit)
  discards  38a311861de628be8789a388377c3b2c0853ab7e (commit)
  discards  dfca023503108d992e4ca4ba5fff5e325d2d56f9 (commit)
  discards  aed5df3a0c30c0c726a8305deefaf68c664b5596 (commit)
  discards  2bc3f46b84e882e8cd079f9261aa6a8c7e174a07 (commit)
  discards  35958cc2431370c00d8e5c8cdfd67c795abacce5 (commit)
  discards  a4ee0be8ac1c472c69b442b5c73c053d9f13c8bb (commit)
  discards  ccb0e424db31ee42e571db6f8ecc80954a43f165 (commit)
  discards  dfa4dfab869ba282d4c96c285ecc4e542d05f3eb (commit)
  discards  1f6e7a550275e2d561b5fdd70ab84ebaa616c473 (commit)
  discards  d1d01e4adcb36b23a37489a5d6a940f4536aa4dc (commit)
  discards  f552aedf2f3d8aba1e8123e5adce58ca15078a56 (commit)
  discards  44881dfa3dc16d8d949d6a7adffbf950cc575e4a (commit)
  discards  3307b0726c86219dab836b01fac298ec899bd4a1 (commit)
  discards  fcae8fa974c753a3c6b7051ba2506cbbeb4c733e (commit)
  discards  b8179759b8cbeebab8f3655eef0f1c90c84b786f (commit)
  discards  1e467c89c581a55903a18cc8e1e78ae2b399bc4b (commit)
  discards  c385ba9ce373becde24fe12da0f7f9d8aa43e25c (commit)
  discards  265baffacf353df0a5e1cca0422b3b8dd67eb619 (commit)
  discards  8033831b5e3475ea52eaf83ab219615dee2be1df (commit)
  discards  52bfa089205632b0a64185c37741786877846f62 (commit)
  discards  3f9f0a62a433a3cae1749a93fb95459fbfdb61e6 (commit)
  discards  45fa2e6213939bfe87bb6467dbccea226eba12a3 (commit)
  discards  f0d384aa8b6eff101c1701db3542a0c7419cc8dc (commit)
  discards  01742a7c1c9cc531e98e11f1497c8598be731189 (commit)
  discards  26f1c64fc48a8f86f4e83e6c5ae29ced03e641a4 (commit)
  discards  321d8265d108dc9645a84975841d9d89124d471d (commit)
  discards  51e62249592aedb7b5acfbe649004020efb5073d (commit)
  discards  9025eeb71d2499e18ec53bad7c6766f576074990 (commit)
  discards  13bfc90b30f10c06eabacd22332a33c348057863 (commit)
  discards  54ec4cc692fbc7ff41aef5dd3b11dec0891ff3ac (commit)
  discards  b53baca15b6531a1f4c68f8bdbd1bdf10bc1ec94 (commit)
  discards  1bc2c6d2dadfbbedb7dee9a2d2f2baa830866d13 (commit)
  discards  f4b633a3612d290d6986bbfc56ff2d69807a134b (commit)
  discards  70c864ae8ffec43956e751a2ab600862b4fdac7d (commit)
  discards  b104667b9132bdc13fe42bde140378d579bfb3e6 (commit)
  discards  5ce9fe1efde6b17acdd0b3ae1dac0b65c0254893 (commit)
  discards  71dd6bfbbdcc4a91322ae233021c91d6899c2691 (commit)
  discards  f3eb5815cc507f0bd07db36c57dda10033db1436 (commit)
  discards  203306cfc18d29686c6f6742d7960356c044438d (commit)
  discards  9746b09d4eac6252e4edca12b204284367af8c93 (commit)
  discards  cf3138b2ec9150f33bf1fc9c5893a3b8135f8605 (commit)
  discards  586a95d01184aa2300a3a32572c688cbf648106c (commit)
  discards  8a72b18cb37592bd896d12570cbe82787b9cdc74 (commit)
  discards  293e9f7a61810ac30789e5f34b416125f327d03a (commit)
  discards  f83cd172f23d35bdf2552dfcc781914f7b46e968 (commit)
  discards  cb09b3a0ea2bacd67523ebd85af6890b674caea8 (commit)
  discards  2af56500e8be3074ebb58060909d070b2557e17a (commit)
  discards  6a01363837ba4aec29d788cdf89023a5470de460 (commit)
  discards  77d483541c406847646ae1a355a4693e7b48e3e9 (commit)
  discards  772e19214951cd767510ff2a464e9ffb5b5e220c (commit)
  discards  0e79b982a0066b31aa19fe942827d7967a51571f (commit)
  discards  34a9e968aff1c1c27ec49776e1dd54c0e59478da (commit)
  discards  f90a2971aa49543f0d74a555abea1d0252205dc9 (commit)
  discards  821468acc73560aabb6fa9904db511b5d992450e (commit)
  discards  b29ffb2a677590cafe21cc6e5dc2d14b00428108 (commit)
  discards  379e4cc554992f78a636c2a70c0630863d6be4b9 (commit)
  discards  f07317cab18e849592c87e5c5839a40c10ca1ebb (commit)
  discards  e5359b73955e09a9269b7d4c49f95d08f9432b69 (commit)
  discards  9d22e557598eea0ccae4442d6d43b58c724219ae (commit)
  discards  b3d2df0cb3733f8b4bebc970df89bed2724f321a (commit)
  discards  3b5cf7d90a2ed5294f81d9e7b2748085a69e04fb (commit)
  discards  0f5112eb9e189e9a5b8b946e41c825ddd6875d82 (commit)
  discards  0ef3eae3a17803fcf0a4de7bf87f217da134663d (commit)
  discards  9bbf90981849096ccabb54f8832756ba7f290a16 (commit)
  discards  d315f2bee2e1801032cc56e8e4f344725b29548e (commit)
  discards  8dc7f6c425ebdf1db8280e3b5f64a52729db64da (commit)
  discards  967ddfb3100032f45a846c58f36073bb0e82926d (commit)
  discards  a741812b5189b0d0d61d7b1119410e8b0f722613 (commit)
  discards  900816d1c3ede65e83e3de4253a5a560a3e4c994 (commit)
  discards  7507ca2302b7c34bf08c83cfe2c7cc1f6be0a57e (commit)
  discards  371fe92e82ecadede532a211c1ec36f7039268d7 (commit)
  discards  b19023dd1d340cb6677beeec37e67746417e7569 (commit)
  discards  ac74eff5bb5cb1827cb4636a0bdf9a9baab248ce (commit)
  discards  e1fcdb66be61bcc5d7c5ca9adc05860aec3b17cc (commit)
  discards  698baeca7519b75caa4958f187bc57e32da63aad (commit)
  discards  7ccd4a7ceeeb5ec04c62cf5c2c6f7e31430bc254 (commit)
  discards  66e7c747675286ca46ec0f0c84d0f64658ebea72 (commit)
  discards  6a502f0a67f7fdd3fb0d830e020e5860fd2b956c (commit)
  discards  ea832ddfa542fb8ba40c322d25ca084ecfb1747b (commit)
  discards  641e0de381f80f39de9651d4a9def7726f26fbe5 (commit)
  discards  f9f62d445a65a236b67ea05c3bde0e9e47966d81 (commit)
  discards  15d1c4c8a99c226987884bc487fdd1c4608d6e85 (commit)
  discards  53b616680069cde4f2c4d06cb31228a141bf92b8 (commit)
  discards  a72a99b0d2474f09620e1a52a46e3ba74b1d99fa (commit)
  discards  3b788d5d723bbc6c4e5849943f421e4c6aa509df (commit)
  discards  2cdac1ac2011281e5fbba7b1641a729597cc0ba8 (commit)
  discards  c2de8617cec667afe49da3f592964a25fe7b50e0 (commit)
  discards  fa22a66e8f60e2ee4c5308e3a239a977dd54c70e (commit)
  discards  5176697fa5333dadef7e5627ba187f557d77a8c2 (commit)
  discards  05faeb9ad6d27696a5ba92af27f3bbcc8f90c5a1 (commit)
  discards  5328d0bd617c6cdcbed1413924cc434acb32dd0b (commit)
  discards  101e2c1853a6edfdf10fe7786e695defc613b3b5 (commit)
  discards  5e9b2b657002a916fec48aad86653c59de343c07 (commit)
  discards  566f149abf8bab6956f43010375cde30dd67125d (commit)
  discards  6fbcda20e178eaa6fb5c4fd0a78f3623f190ae60 (commit)
  discards  b95c988484b1a65d6c94fbba53c756316449ef14 (commit)
  discards  b847cf94af02e660f611e333e384d35c6c38f5c1 (commit)
  discards  5c88e5ff5584216463fdc9ec87a10829ca537f5b (commit)
  discards  927ceca89e5da76b142bd598fb460bd796caf889 (commit)
  discards  1e744a06addbbf60545c6bc29441810af552e9d6 (commit)
  discards  4ffc76e24f669f0b6c0119fa2a64088983f4691b (commit)
  discards  c2182a307118524bf6bbe567dfff849e396ee796 (commit)
  discards  96b63ec87594298906b28adeac7d02da4859b097 (commit)
  discards  28edac28a33131410ecdb414fd00372925f9836d (commit)
  discards  6792bac389454c54660335f98f3a07163da17467 (commit)
  discards  59ebf292bbe8a039dd0530cd84e7b58448b3770c (commit)
  discards  12af1245ee99372e77d8ae50feb3cc25c33c8362 (commit)
  discards  94644f864db95d61c680f92d6cfd1a4928305331 (commit)
  discards  ccb4496f6451a4bcbf20f5cf67c7f2e7451e581b (commit)
  discards  e585982cbb2910be05cd2a50aec455fc6f6528d2 (commit)
  discards  9e70086973b3cca74a9455535467dc9dd3b889bf (commit)
  discards  76c351181ab69f57ab741ea869b20e5526dea4cb (commit)
  discards  ef4fdfd49a02952ca5b2e347f0c041fbf3ae48a1 (commit)
  discards  ef9431a968e2ef77159a1ac1c8fa931c8a179eb2 (commit)
  discards  d09514361491425ce25c27518167a2ce78c568c8 (commit)
  discards  784e1d001a151d17884b124cc12e5a9ef9878477 (commit)
  discards  0ff2e1ea2a7b70ee828f3738df884378917f261e (commit)
  discards  a9a750bb9372b9b4dbdb506510f99e50fcf1b21b (commit)
  discards  09c5d93651499887187095c297561d490c51dafe (commit)
  discards  d680282224da579f124c8b26efb71b70db87fd47 (commit)
  discards  aeeed727d50330deef90ef09c24639fa62f3010d (commit)
  discards  4836df6df1c01a46d75c8c32cae1fc51bd0332cd (commit)
  discards  2617827b99961436ef7fe7ea4cb50cfc4c5fc203 (commit)
  discards  f5e9a738f976e8793bbae348f9535e64b9022e47 (commit)
  discards  ece6945b9d40fb47c3ac1070db9e1b46739b6448 (commit)
  discards  e4e4417bec7b089637832a4026a5130aa99da587 (commit)
  discards  b3ee076f10eeaa5fcfb01d7e90820bdccbd3d397 (commit)
  discards  976bdbf6a94dedb41a7988bff83153173faf043b (commit)
  discards  06c2a30f336d417964cabae520885eb4eee5d77e (commit)
  discards  0c1b27f050d3890cef1fd621a36cc53bd9dda7b7 (commit)
  discards  87892dcb3dbaf65489caacf2e5eb2a5a26b711a6 (commit)
  discards  873c9f072c79bc6a80fe5acb8c0386665cf979ef (commit)
  discards  9bfcb9d4edc48a47beff5bdeb0e476012ef3fce9 (commit)
  discards  f91dd93d9afdb02268c285214abed9d8cc50f191 (commit)
  discards  4898c4c0b79a0f39eb198d4b463688447b09d813 (commit)
  discards  0aa85bd05d6f1b19ee839a955b1ae7f45fd96761 (commit)
  discards  55933ca008a56fd038f80437ec815c3592dca676 (commit)
  discards  622b158d186c4e38bed4097a7422d43c1e26bad1 (commit)
  discards  61b3fdd7ce4424d6b986e5670c50c092483a7f3d (commit)
  discards  4d8072b195d6547a92de835ef27ae205cc7c6609 (commit)
  discards  2d347e68723dbd6e86877856ebff3bd13e5c4dab (commit)
  discards  88f26ac1060a9062361f232c4ef4e5f78cd5c4f8 (commit)
  discards  81fb482213b07ef4909de7d8246f120848b17437 (commit)
  discards  09bd59c75114dd177c685a62a34a3010ff2250a0 (commit)
  discards  8d45ba34d64cb5d7d71d8ade8b5f2226cd9e4734 (commit)
  discards  2962880e25943d5c7670ca34986366c3f41fb67d (commit)
  discards  6ee49bf15acc52ea8b0a32c3e64bfaf75be95846 (commit)
  discards  7707a52f41947c1db1674563a6258f908c8efd6f (commit)
  discards  ec0bc1765d8bff3c13835eff266ecfee9ecf00aa (commit)
  discards  a523d3a3fbcb0fedf90a3bf88450ce56e9c46298 (commit)
  discards  8f95633f6049542a3b59872dd9ef03690131427f (commit)
  discards  7996f986c4c5099ed537e49cf3ae85d6fb3366a5 (commit)
  discards  033677678a2d019a319dfa275f109ad1fac5e644 (commit)
  discards  9f3742039a438838739486a150a47699ca336013 (commit)
  discards  f81ff045d42b85312e87431ca8ba79a04c548b65 (commit)
  discards  21373d85a2f6ddf4bd8f2ccaae0cd916fe2b10d8 (commit)
  discards  19f3c0e1acb7a22a504e4451de252f97ae5c880d (commit)
  discards  0ee67ade934579d161fa7e2bb350b7dc3c0dd038 (commit)
  discards  a41b5ad17f6436b956c46d2844a309ea7231c08e (commit)
  discards  772fa0b5189745928a6bc9320e605121eaccdf1b (commit)
  discards  0c3cfc2ee4b82d3d6790cbc217978b1460b2b034 (commit)
  discards  ad1abb4b319f2f901d072338abce670276af415d (commit)
  discards  00a065a117555251d94957fb0e02e0524e17166a (commit)
  discards  b4c1aeaf9ed65c8956aefd8ced6171bca05ba9fa (commit)
  discards  ef4a3106b217aad59dd969349d835617d926ae47 (commit)
  discards  849ccc59e315e64b2c2c98d79ba2108810c461ca (commit)
  discards  d70e7e1491ec53571d1948c89cf658393ebee406 (commit)
  discards  7a826b20db6797d1d49ca9851ee744c94dd9374e (commit)
  discards  f23c21d028ecebc11ac724ea663d783eb477f4f8 (commit)
  discards  7b03a6bd559fdfabf7bab274cb3f99f9bc212edc (commit)
  discards  7a64f35d714da66a43a22e8501a2cec383e04025 (commit)
  discards  1c9e979cb8839e59d5e33bb9dd0d3316ac7403ca (commit)
  discards  50e7fa615cfcb63b337640d353fc153a74ac1fde (commit)
  discards  a3d0518c64d2a3848487ac0d2fc93af622bacc61 (commit)
  discards  dc02e143313548eaced4e4c6c0635f69e518aaca (commit)
  discards  bbc1c4930d4220341cb40b885a8385b553a76962 (commit)
  discards  b9a41481f81d86c22ad88379d72dd2eea62e96c2 (commit)
  discards  59a0a2d11440695747a570f960f42c84f1933b46 (commit)
  discards  660c297e03628a15c10fe9d3b325dabbdd6f3201 (commit)
  discards  5cb05849d91a178621011729d6c409f91cb011c6 (commit)
  discards  638e36e30d9430d2fe134d1a4c3903e37b589ff4 (commit)
  discards  19e9b6d4a22c2b4e6d3f66a701fe3283b555d186 (commit)
  discards  9908727dfa4a0bfeb38aaf5e1111e5127361aee8 (commit)
  discards  6c485ea8009341d0c746ed3bac3c5d31e6bcea7f (commit)
  discards  0138a0e9116567f5e9c45e36d657d01e3953e6fe (commit)
  discards  9faef0000924a39cb82f54bb91a9ca734a4c8643 (commit)
  discards  536fc37c4505057b3ba2b0d79a28828c47b42a22 (commit)
  discards  1768830551a16cb7ac420d575acb2e7e625eb879 (commit)
  discards  cfcd894286a8e301ee4dbec4ad06cfd268e3e8df (commit)
  discards  98ec73c459d7daa6800811726799559f0d0a12e2 (commit)
  discards  67d456147dbf34266b59d71284c41d72a9fa95e2 (commit)
  discards  b500f8f98f79db2889013912b6784ac0473e487e (commit)
  discards  3ece2f822e82c3c3da587a8c99a901abd343d60c (commit)
  discards  cfbf9805546b650f448273e9cfc1f7bbdff86bcc (commit)
  discards  284bfd60c02a99c4da5a5b51a8ae39f3ca926fdf (commit)
  discards  300f3e937c0739efaaac7a3a1ddd1931cf0e6841 (commit)
  discards  4c849cab1b87c33f6ae57962dc2150a8c61b7d39 (commit)
  discards  34aeda59a141683d6b8ff5dbbce4a6a3f9ca724b (commit)
  discards  60c550f84bc4a5a479392e0fe7d0b2a52d50524e (commit)
  discards  f131a5287a3b8a9f37fe1edef6cc95efd9ef78ef (commit)
  discards  d394212a00197cb777c5cd5b2a887a4a909110eb (commit)
  discards  bdae9ffe9dcc02c110bc5344ea137a82b42c745c (commit)
  discards  0221184fdd5441ea2456fe1ff0fbedbeb8c1a837 (commit)
  discards  ac00a76e6a3cb80f1b91d7fbf3ca466ef9484908 (commit)
  discards  fe6dfb29181101040f540ded717ebf19c1469cd9 (commit)
  discards  814b038ad7c36209408efbf12183a54afde37a7c (commit)
  discards  f14489162bdef3afcc7c6da88adaf1b7aac10a81 (commit)
  discards  96e04e199be36cfdd3ebda4a8714cc498e661bea (commit)
  discards  30053d2113a57e86404da58bfb0e4e3d44c46743 (commit)
  discards  1297f3dfb106803a002d8f0505bb5d54983c62cf (commit)
  discards  a545cecbf50d59685021f45c51b6f34052b55f82 (commit)
  discards  4e4b0eedf8184e832991b63e8109b1b04c925da5 (commit)
  discards  29dfc9fdd943f4f651ad6f293a30528209af847b (commit)
  discards  eb47176870eedef7af8b53d98887d4326cb509de (commit)
  discards  d7fc7c3a403170035359e8e3b173725a04b6c1ff (commit)
  discards  c7501577fbc81d257017a5edfe0520da67e226eb (commit)
  discards  456ea8c2a62f646f3b0192273cb49d8462f8ce02 (commit)
  discards  27ebbf3f4ed8b79fbe7c2c01c5faf43a242a52a1 (commit)
  discards  505e1bd266469a4ed2452a333f1e40b9a4ab69d1 (commit)
  discards  3dd1d3512061c46b8b5a5a66353bc0e8782cc5fb (commit)
  discards  31dcb50a5166c60c65fad2bfc8a757d5c2a4aac9 (commit)
  discards  c12be0dce8d045b3759296f5ce0607e80820f27d (commit)
  discards  d4ab0ebf35edd9fa74ce915f6f0b23e006217fe3 (commit)
  discards  c660fc32242906a361ca99c513465278bcc0fe97 (commit)
  discards  415769c967b1b583fe350dd077b1142935b04361 (commit)
  discards  1637bd5ec532d0226b9e9c335eba853f27cd5fa2 (commit)
  discards  8354d1e6ce354692d0b5a157531c1428530d2737 (commit)
  discards  524481c809df3cb7b962af97ba1c9078dc5884c3 (commit)
  discards  6819c083c3617d2a255c728fc0564306bdd15631 (commit)
  discards  73b5206f39e5e85314184ddc7c1f84a9b3dd7999 (commit)
  discards  2c52ad3b97745c24abaff1fbe1005cefed58b7b3 (commit)
  discards  3296f9c8f9aa1f418fd9c8b195588df7e1ddee14 (commit)
  discards  393825a583930bd45ccdc021c918500b0ead55c5 (commit)
  discards  db93f638b03edb5c72e62ec3155768d278840eca (commit)
  discards  824a39818d33bc5b25af7757f8deadc04d28db70 (commit)
  discards  5e1d63010b81e6dd61e681f86d37d8cb69b604f8 (commit)
  discards  d6ef5f480846881bd110fd82ddd2e954be99b95e (commit)
  discards  bf6eff2ec7712a601736160c192eaa3b3fe4ae0a (commit)
  discards  42f1d1166fff8f78ca9e5e5465bbae4047a7a94f (commit)
  discards  3ab78a691cb97354401bbbfc4b1658844f3896f3 (commit)
  discards  0c0852b1b0fe29ad445f4f0842343c39cf8e7c13 (commit)
  discards  c9ea75ec01b55b1793ea626964cbefcf4811ee2e (commit)
  discards  81e1e20c6f12c50c99f0353b50160ec7fe19f261 (commit)
  discards  3b595b4d66009263f1d6bb675f285f4b24508b2e (commit)
  discards  e559aba7ae577ed629aea40a5059d9d43d28fb0c (commit)
  discards  c4643d56966b19299bf05170a9a9241312ef390f (commit)
  discards  907ea3b6ed95b9ae3648868b77d744e82330fd9a (commit)
  discards  24c06319347e706c83422af382a72a9f82b47eff (commit)
  discards  6a9aa5b378422f8d0d89b53e181c4bec2104f082 (commit)
  discards  4527e186cb891f4dfe7c025066566a4f7d1a4346 (commit)
  discards  f4b24bc49a0679983a5640c03aa49b636f31efda (commit)
  discards  5abe76d8bfafd0935d897c5f22e1485eef0c6904 (commit)
  discards  80267fb9587aec657286305580fee4fc390c3cb9 (commit)
  discards  a3443d29fec62f29990eda358e1d8dd16cff811c (commit)
  discards  a420708f5280718f95507b6262b430d7594979bd (commit)
  discards  49cdbc8e6bc079daa593e557a93a928dd01e7638 (commit)
  discards  b2a7e6d6957d6def858382c1370feafac5371987 (commit)
  discards  788a368bb48a56e2ea91a9ab6aaeb717ef8c3615 (commit)
  discards  f55e338e34017b32301a081a4ccc5967ecfbf0e3 (commit)
  discards  c9b737643982b4db614a73518fd5c3773cab6be3 (commit)
  discards  e66a7d6973fa58bb3bf37b540f67e2c33bb9fae2 (commit)
  discards  9fe5cfd082e84c09aa63aea6aff4bad407e22033 (commit)
  discards  4bec7bd580c9d127ce08172cd5ae0b36a585725a (commit)
  discards  eef231cab61ba3511d7c2b6d63b5de9003c8ee78 (commit)
  discards  306c9361ce1fffc85b2ffe88132885cf5955f1ba (commit)
  discards  61a0fe4648d7e2c65c1fb62641f6c6e3dea2afb3 (commit)
  discards  2d83690fe2c785b5cda0fb6c0822b879071a649d (commit)
  discards  b5cc08fa9acd1678a671b7a4cefaa9c901bb15b7 (commit)
  discards  6428e163380112586eff21c301f4d4b19d7d0a15 (commit)
  discards  027d00e82a294652a3fb73c04510da8f15bfaacc (commit)
  discards  3a4935a1dccd4886c8f7a4c03d416157d1937f81 (commit)
  discards  e3e1e3d47072b631f0a857079a6b6e362f31d9a7 (commit)
  discards  cdaed8a166e4ea74d1ca9ca3435bb00edbf63bbc (commit)
  discards  dcbfac8bc394d307386069c84d6ac7282b88bc8e (commit)
  discards  f4ee08f7a1a82f955741bac5d8bf94c484e89f22 (commit)
  discards  8b8e175c162944513de1bf722dcf0b03abe27258 (commit)
  discards  8f32935592cb7012f491b7e3467f567abfb287f1 (commit)
  discards  886e5bb6027951150f08192923d9b9925b69d2f4 (commit)
  discards  838f8b25efd85267613ab3ff1e18d6206f6127c5 (commit)
  discards  4ecece742b6941e3d98288254e2e6eeabef22233 (commit)
  discards  6020a97deeab6dcb2cbac14fde0a10f9d511a974 (commit)
  discards  132099ec2612bee91c6202f831f6164dd78a437b (commit)
  discards  dbbcde63a4027122f1456969040132263a75ddf4 (commit)
  discards  171a295d6eb9dfcfd2e2262bded0df0a804c944f (commit)
  discards  2f3b67c8eaa170d65fb27a3a55e7b7cc4d944f18 (commit)
  discards  0b1ee3f37d9e25a3408f8a25b655dc1e3a6e84ce (commit)
  discards  1e6b6f4760f83ea4e62b44975bec2fed2940068b (commit)
  discards  609ea96766d11e143fa1fa5d08efe756fc6eec5e (commit)
  discards  afb0e7d7faa79e71049a2e9c52fe92f89b173f3e (commit)
  discards  6d10c61fbcee0fd1aaa91c571594708261041337 (commit)
  discards  3fb42748e4361c2cbd2ccd2e67251c703b1caf25 (commit)
  discards  04f2b72bcfb40c826c1a93520dc0623ec7e7d20d (commit)
  discards  aaba29b1689a0833dd14cce51154127e62a4baa3 (commit)
  discards  649dced42143e24afa54fe1b9b597f946c047929 (commit)
  discards  4e2f5af4f8c3b22fd99f8aca23401a05216917b6 (commit)
  discards  5c69f02a3ade91bfb85d6c782ca16ac31d993e69 (commit)
  discards  54f235ecda0700d9ffea68ee6b254c5ef822dae0 (commit)
  discards  cae7bef9d6a51a38fef0cb0f40fb965fca92c1b1 (commit)
  discards  d50b6fb52f6b1d418da51113533a3c5aece5858b (commit)
  discards  f6b552c0d50e274a1f6b77140586eb814b0724e3 (commit)
  discards  1a6de5ad88bc7f92f9c573aba5fd64e7601dfa0d (commit)
  discards  ac549b47cdfbfa8f587b0ac228096472961b3d78 (commit)
  discards  775b29b01099f7cd1477031d4b0e147a4f8f0df8 (commit)
  discards  9fc7e85fcb4522f1ad6e92fc9000fff59d417d27 (commit)
  discards  5af5ae973126f7cbdb0f9ebf8140ea8f387b9a24 (commit)
  discards  5ad9b19a7167779b5375d575473152a02280b4d8 (commit)
  discards  68d427ad7e670b381bac62e8255bff8c539c3aa0 (commit)
  discards  dade9fd21bcf200698ced089ac475447d4f04cea (commit)
  discards  65e51dff4210a84a33ceaba5adef6927999c2508 (commit)
  discards  4dc6b1ce6e7470160c2c787e2f3a7cc6a36fd814 (commit)
  discards  e2bc81c0730a45282781c5382bf85c8864b6f600 (commit)
  discards  71153b039cc975c06d341264fce4578cbb0daaeb (commit)
  discards  d1671c43e1c045002fc87c91a85d6e9b7a54ab97 (commit)
  discards  ea5d502e1bbd15aa5b43158caba2f42bd764ba52 (commit)
  discards  c7fa36d3ea7da82bfdfc147d985303b0b5a3a6b7 (commit)
  discards  c25a6f43e2f8b1a4f632ac37cc614c8ca6690b86 (commit)
  discards  a4b33ad43fa817cea5b66457d413255dd230a159 (commit)
  discards  1dac5ab737d1286f1e023fad3c0b26d2d57566a3 (commit)
  discards  b0190e6d2273999a93481ff0a03f38e94c05c6e2 (commit)
  discards  279714548e5cc50e515c0c9c09c17d9ec45420b1 (commit)
  discards  b8f0363506ae5daa40f9635032dd3ba45c659cf6 (commit)
  discards  fbe703adf5f78d050c3317ad338add067a0889d6 (commit)
  discards  4c8cbce8b9a875e4d34544dded53ba0db1891eb1 (commit)
  discards  69e527a1c2f170afb6dbb5179fe2f97d609496ea (commit)
  discards  bb20daab87518c42a264f14820a7f32644cfd9ac (commit)
  discards  6b64e252425e54995786e3547ae6348462211461 (commit)
  discards  4ccb6de8681083cb15099fd69a9f01ed4515a2a3 (commit)
  discards  c708917308f23dda4f9ed94eab33e758c1cf0c94 (commit)
  discards  225e2d5bacae40956e489d8232f150607cc7b75a (commit)
  discards  cc3f200789ad997065b195d01c137c0470551eff (commit)
  discards  dde71b8431a75dcbe91d302779f15abaa9471c3d (commit)
  discards  979cf19aa17a4f7f4662b43d17b06cec9c32ad45 (commit)
  discards  b695b3b9853fbb03fb135c391593d90298cc17f0 (commit)
  discards  8618bdc60bfe0f81fe5ce1e1c31afdcf69eb692e (commit)
  discards  43e2c0863b0c71fe5573a8d9def948fa7c40cdff (commit)
  discards  542160830ac3284eea8fc988d3103cdb5b99a56e (commit)
  discards  9b72aec7b3624b6bb8e409e52a29263591856f81 (commit)
  discards  fef2009bd53ee5089d51ff253d603097a9dfebab (commit)
  discards  67df5c9aeee85453af8e53562b97f21dd4a40c55 (commit)
  discards  6e13042cec7ca40cdb1a52ae92ccb6693bcba53b (commit)
  discards  f08cc08dc647b09d2b5d6e0f681bd551c957db97 (commit)
  discards  7ba7ce98d5f19b64c44d731344fdef26317cd69c (commit)
  discards  010f4f8c6a8e6d45d7f49aa083d12f65de714557 (commit)
  discards  03dd19a3eef57d6edfff017dae4aba0a62d9f165 (commit)
  discards  3bbd5425d31e179dbb1b70d944ac24523b0eb46b (commit)
  discards  ffdce7ed84af2fd2e4e189789ea83a70785f03ad (commit)
  discards  95f456d39b5983119956e071d9d2ac8084eb86d5 (commit)
  discards  0cc9e0588bdca72028ae13571470f3a11fe80b1a (commit)
  discards  bc0e24a0d70a4042d505fb9324e5a718603ef75c (commit)
  discards  a4634fb344e70d913df2d9dbeb41ec697648f4b0 (commit)
  discards  6ec9f59bb05083853f5b25bd8af8733c1c53d650 (commit)
  discards  a987e5f5315554be4705eb4be5c0188b068235c0 (commit)
  discards  4237e9d3fde9f6fce5cb7fe8c85c21686d8708a5 (commit)
  discards  047b83c77099879ad16da674930fce5d5df9ac4d (commit)
  discards  8b501eeb2bba213580ca900f7ad6251e1c8b79e5 (commit)
  discards  ce14c83b5a4115531a6fce4f7523458371a562b3 (commit)
  discards  1faf5abf53a36491e7c374f80b635278691f76e2 (commit)
  discards  345897936dd1bdfb43fba555bffad7d8159c1eec (commit)
  discards  3eeeec4015d83fc87f48042c3125c4ac76689537 (commit)
  discards  7d31d99d990b2c64d65a6b82a5f8308024ebb057 (commit)
  discards  c392759a43873a46522fe104db3281d7da3cc24f (commit)
  discards  da69b3979d6e90bff5ce72b49f9c3b8e8496b648 (commit)
  discards  4730a457d0b9d2f14a07744aea5144e76cb7c266 (commit)
  discards  058624ce98b34dc2bd63c62f89000bf6fdef03c3 (commit)
  discards  23ac9e58959cb125a91b45e80d131ab448d66eec (commit)
  discards  d88f83077b3b2c200d58d21bdad65308729ebfd8 (commit)
  discards  83122c32ab533dbb32ce4ce6de70b069a217b437 (commit)
  discards  1fe2c9a166727d14b5cc56bfe0425f9be12e578e (commit)
  discards  398cdc2be369239bcd9bac5f98fe937a1253f664 (commit)
  discards  906c9a26630e4fcf2360dd9e824b0191ecaf887f (commit)
  discards  ae94ca1c5902dc12ddd7eb7a9e4b197ddde5c884 (commit)
  discards  239c6d37e28e3a979122999e8555696865fb4824 (commit)
  discards  6b479d5ee112efce1565fb8cbdebe389af3a9337 (commit)
  discards  230c212756e641cbfc6327ce796ffa0f617a4c24 (commit)
  discards  37554424986199c41fc8825d81490ba75f271edb (commit)
  discards  94052592b9aa298ed367542841f44cca23b927be (commit)
  discards  ddcae2f2e80e10ef8c1a1e32ef9bfd67272ea766 (commit)
  discards  24c9ec4569f08e2320fd1c4f43e01bf9cfefae5a (commit)
  discards  976bd2a8ea0b0d66de06d1c21a483bb29d3ea903 (commit)
  discards  615dec8af09469e9243b473b7b8a1f970bb7d00f (commit)
  discards  ba3f3e3b43ae3ce8e61a62b90f57c6cfdf6d2243 (commit)
  discards  026814ad56e9da194baa1597a4de222227920ca5 (commit)
  discards  97eb20f5421c5cfff2df84617404686089ea71fc (commit)
  discards  2d60391127bb5be1b4d55a44f8fbc406a3c4eff6 (commit)
  discards  efb9ccca7fd0bb2ca0ec6f4f65d0b4f0ccb83ad4 (commit)
  discards  f62f61a08402f7e4239674fd03a6e93631017021 (commit)
  discards  ad2b607bf7d072fe3c7363446cb81884be7f4221 (commit)
  discards  a58ead9b2f2c8810d8841975ab18486cacb149e9 (commit)
  discards  7965ba9d008172695aeeb48d327e3942c3684fa9 (commit)
  discards  a57b7aa45efdad49fc8ba2c9ea0525ab5c991b2c (commit)
  discards  d8d6f19e30d0568f1af1297dd616fba0901c388e (commit)
  discards  76d273e3fbab5af282a6402f66820ed926da7717 (commit)
  discards  0c86673edbb9956dc29c31242e244fb1b02013c7 (commit)
  discards  ef2771706a641607c146edc738f76e0205ed8577 (commit)
  discards  13b878b534dbfeb2995569f486e3b0684ef584aa (commit)
  discards  2ee3bd6f3e99be2dc1bf2b3111681838f0b8d268 (commit)
  discards  d78e96868e693343cef845dff140432d08e543db (commit)
  discards  3f834d0477db40bfb619b19ca66969e04d36a323 (commit)
  discards  925cb2ee6c3614195fc1786a3c909ec3092f3b89 (commit)
  discards  f8d61cbe5066a6d8ce3e09afc40cdf1ea0e73631 (commit)
  discards  e48c57b81341ee14e0ac61f683224b1dd7b544f0 (commit)
  discards  6d0cf23c5d225f629bfc076eac4340cfac28e597 (commit)
  discards  662af68dd367056396d8c48f9854137ff05f45ba (commit)
  discards  31677be7228d3890ec7d77757a55dbf70db76ad6 (commit)
  discards  1ee82fb5e1e83c43d30cc65c857dcdf81aa313d7 (commit)
  discards  abfa7948673c618437c0b9cdaf7588591f334cf2 (commit)
  discards  3350a96d57f0694be3cb0a305aad9ae82b75e790 (commit)
  discards  c83c1680cf1ac9b5d01efc3bdf0a7c012326403f (commit)
  discards  2ec5b3466da91b08b3f087f62625a4b6bf88208c (commit)
  discards  cb91af0e2e44760abbe34853a3b89a5f300e15ad (commit)
  discards  130c3373df6e87821111adbdeb7efefd17556686 (commit)
  discards  1d8f34ecc7322e30cdcad137460581f5f32ffa4f (commit)
  discards  18b2a26e4339737e4e215382b7035b2570ef8bd0 (commit)
  discards  c395f3b87e9e2581fb7a2498c85d48d89c2d07b2 (commit)
  discards  707018a6c38c5120cdb953fef0c6561e23fdd73b (commit)
  discards  53c52cbf6449e2c45d4aca0b9b601111b72f24a4 (commit)
  discards  4149496303f97bed90f2043c40df59b8490e7be3 (commit)
  discards  de140650d16cfdf43c09b32d44dd3996012e7731 (commit)
  discards  2650762ff98c0c77cfc70209da308dc9d83ba974 (commit)
  discards  ebbdeee5ae3b52963ac3511e6aee14506fb07a90 (commit)
  discards  13d7afe429e80c84b0dffe7d82fde70ee4862fe3 (commit)
  discards  48d38cedf73fdb2b7872289e6636ff79033e59e9 (commit)
  discards  8c976738ce700a7827874dab05ae14c555a8b08a (commit)
  discards  66ef59ba503d970a80691fe828f369a258ce69ff (commit)
  discards  9d6f7d3675da15c8f430a110d2b8a349fcf6d4ae (commit)
  discards  3c748aa6a81d3af4af2552ec10f21c22a4cd39e8 (commit)
  discards  7935934a89e062dbab0ca396b40560edc9e904d9 (commit)
  discards  d6beb377729cc79b3e5718c9d2cc8b751137b889 (commit)
  discards  dd06c55ee9cc330627a6d85f964f69ffa90bf315 (commit)
  discards  c6f45bed359dee2cfe947de76ce808eb99ad20da (commit)
  discards  bdfebf91ec9b245742af1fe98de1ad47e497616c (commit)
  discards  99fa567ffdb1c5b7d9e102a8949364ed635c6146 (commit)
  discards  bb97f53ab24e11aa632c6e50e34d7353c36dfacc (commit)
  discards  0af8a7369d11d820c9fc172c1e3463ead2a4f37e (commit)
  discards  54f23ec7baf5330421abea12be6aba90d4af3503 (commit)
  discards  047a275024b22fa8aaab13b020d4a4580cc234dd (commit)
  discards  a4709b427bb9f8e9f129478783977322a7b88497 (commit)
  discards  4ee079e7c2bb5bc8b10d8cd0abd4317ab888d900 (commit)
  discards  e65cdf6014d296356c40c37403e1f48302933ccf (commit)
  discards  d0ccd406c34e56a1ead7387eae091c4f92db5c00 (commit)
  discards  dd3e78c0c841ff3abeaa8bcbb6d721b8fbef01b4 (commit)
  discards  031923b3789733fd2dac507201b703335fb74a9f (commit)
  discards  95d50adcd018fff80ddecddab4b4842fba37e790 (commit)
  discards  42ee51028e9a977e61df50c105a0de782d1f40b7 (commit)
  discards  669fce43e925f66f792651d050a50d7978716bd3 (commit)
  discards  68ce826eca2d3cd22de7bab57bf5d9c129486523 (commit)
  discards  e63dcb41ddd21175acbd57588f5df92397c46d09 (commit)
  discards  bc028a4aa580c4f162af5c77d766a34c7026c609 (commit)
  discards  aac63e39213c28b139ce4793684e199190aa659a (commit)
  discards  1e0d21e449ca1baed38683acb052f46e26526d73 (commit)
  discards  d5b5aac6c174e169fcd12391011e3d2c22ef961e (commit)
  discards  59a722f73a98fcc6695d62dcc9069bfbcaadff46 (commit)
  discards  5b3c3d5e14c22ec7a96f5514bfff6d1b1e2232bc (commit)
  discards  ea7051f5c47d4618279e084ddac1627a973e1140 (commit)
  discards  fcc510ba32975dfc6257ac5998aeba58cda3088a (commit)
  discards  c06c74f32f5318789bd72ddb41cec9759d6a9339 (commit)
  discards  e12067e28975b01aca849ee1d55656d3ba23c694 (commit)
  discards  3760cc890b0a13b4cf31dda77047e92b3ac2ea19 (commit)
  discards  fc28823e87b86b5aed3ec355889a352ca171994e (commit)
  discards  db3100f7ab4b844070f6cdbd8fa61eb90f404166 (commit)
  discards  8a89793258af88c11d63c3426fe07f6aee66f963 (commit)
  discards  47f6495f520447e66eda98bdb9fc622f651e164d (commit)
  discards  9c840669c250dd37348be973b63b7e29ce0f6363 (commit)
  discards  86a622bb3bde32bce5e660747b9811356c84e42d (commit)
  discards  23642b4e767611e283f33f0ae3a1bf0bdd8b0017 (commit)
  discards  f2b1f037358d7298ca302f5b5a676bd03ad77604 (commit)
  discards  db6e978ee79797f6899a7a965cc105a945f99caa (commit)
  discards  de2d705c0e0c4e0de910cc5f3874fc898d455634 (commit)
  discards  9f4b3c8e60590576dbad108cd6a739679301ed3e (commit)
  discards  49b4dc1ec857ceeccd63c3a7f5d8bb5167a16f41 (commit)
  discards  cd7c204cef7bf52e49aa20cfa669d9db5ddcb08f (commit)
  discards  f7a6b821224f5d54f8b255a2d547f51d434d2a34 (commit)
  discards  41a64c59c6276e247d801248dc5be21ded76cc0d (commit)
  discards  4bd1cd9a5c80bdf858777450ecdbdd71f80ad83e (commit)
  discards  82c377564b26a346e6a75c71956d2633f7463ef2 (commit)
  discards  a8b2a0e500424abed91cb06a58baef8e5c26dd77 (commit)
  discards  381788822634315ca6f5be46cebdf9e2a80aeba3 (commit)
  discards  6d031d2891ab567ae6d868bb5959b877bbf225ab (commit)
  discards  77d8a8b8ac2177e4a193fa602a76483ce99319d2 (commit)
  discards  3f9edf779b2363f10ac6acaa915a55ccb872b347 (commit)
  discards  ec2f478af178d35606a3b4024879df1121e5bf20 (commit)
  discards  452ec942b08a83390736cc9b50f6006adef38bde (commit)
  discards  50c11c585e9b2a8050c31a6b7179379fa2472b23 (commit)
  discards  3009936bba98cbe03514c60567ab104a2b22a526 (commit)
  discards  2c5b01bc544299e6461ffb04e004e39dedb03b0c (commit)
  discards  7580640aec82a7a175c3f9054df4a44233ecbd7c (commit)
  discards  25053a1b5691b774e4fe800f4bca97aeecbc9547 (commit)
  discards  9ab2eb2d622ad18cb027ada68ba95d4b5817ac30 (commit)
  discards  11bce89dc927b7928dafb24989d437f03bd41f54 (commit)
  discards  f0a5a551cc64a0d6188f9a6ee1969348eb6e80c7 (commit)
  discards  4085e2bde2a87b9526b2fdc2dfd4bd9329c367fd (commit)
  discards  a62d22ed4cf8be3e53718add6be1c4dd7db2922e (commit)
  discards  97b5cddf8e80efbca9ecfe324aed94e27225618c (commit)
  discards  cfd751f140d546810fc2fa718f00a069e18ea1fd (commit)
  discards  c783951c1fa1f6508145a845b0a00b2d1b17eeb0 (commit)
  discards  133ea6a940d698a75c118c5d3e7350c472f6e8fb (commit)
  discards  5cc55b9331b7b8844c331657ac60c3293dce9fc3 (commit)
  discards  176546cf838362e249598060cedf57d1365940f4 (commit)
  discards  3c77f9ca3a67d5c94251154a391991b8b2146be5 (commit)
  discards  910b10207f43694f66036569b5604b023d39ab03 (commit)
  discards  354bbd881d3e46aa40e2a566967174682c0521b2 (commit)
  discards  1071024a6036cb74f7f6c55c05e715ce58a322f9 (commit)
  discards  968e1ca548746ff92770c11ec5e524af548f4419 (commit)
  discards  ffc27b83b4f3a31c1c38cdc7edc8a6d37ed1977d (commit)
  discards  7c451647fdf53736196b68c493315275348edb05 (commit)
  discards  c0d4cf3dc6cba3e6e71556ac48573826a4d52c17 (commit)
  discards  f6ce58e7952ec8cf8fda391de3b398d64736b50d (commit)
  discards  2a8606e92535835e91a2b0ac00104a663f31f6a4 (commit)
  discards  ac39bd910e3e2f606b722e2495373a58efedde59 (commit)
  discards  44288bd6da0141a91e7afb3cfd3664f8b4c6084c (commit)
  discards  90016ac72a2151ac28ad5ae6baa38b65a11a38ff (commit)
  discards  15556c7db7df7f59f1010ea3f86ccb35f36b10e0 (commit)
  discards  fe3a255a93ca247460915aeabdb905217355b788 (commit)
  discards  d5d7ae969c778663d4da0c5f18b5826b128ff7d2 (commit)
  discards  53ba657602648ac20b6710c46daa043807dc8c2a (commit)
  discards  1950f478ffcf738794485180c165dedbc744dbf6 (commit)
  discards  5a827c6ab7ac480fb5c0bd2a5643c22fd0ddabc9 (commit)
  discards  e69c5efa1d6929522c47c68fab6a245664769e53 (commit)
  discards  d3a63396fbe3a43857a37edb88e08d00802e9adb (commit)
  discards  47fd39fe1260259d088704c323e119d075f314af (commit)
  discards  3bd4785affc66f194847fc5effdaa78e40087fb0 (commit)
  discards  02beed7e24a93e6d684415ba1773d33bd9df50cf (commit)
  discards  38b76360744534506296bde467e3fadb13a2eea9 (commit)
  discards  a3ae53efa53aea6e705948173e92d716d8710700 (commit)
  discards  6b9a9d3dd66c4de66cf0d35f1d3e5f810b4a2a8e (commit)
  discards  a393b45f3953d13da0585a8c01721c85639dd487 (commit)
  discards  64688437a69269725b7f73ced318252e5ee090a1 (commit)
  discards  ff84e914b247dc3c692086323aed69f0a8942d2e (commit)
  discards  c71fd71080f2c3d78ee82980c2306cd345cb6d06 (commit)
  discards  1341adc5d45a5273c1e36904a2957e151fdaa1c9 (commit)
  discards  16a84de3ade279d8eb8e56c88efc85eba200098a (commit)
  discards  5d414a138f9e5d1d3a2054d289961aa5c66693a7 (commit)
  discards  8f8d824d2b7c8ed4ff911e223141a45eebb5569e (commit)
  discards  244e93644116719d208a7e55606ba267225e362f (commit)
  discards  7e49926499c76e427441eed29277c176eb779194 (commit)
  discards  4b0e72cf72e52b09be07fde986b9fc3431c2124e (commit)
  discards  e699c0d6f9e8937c6d78b7da13ddc657492b7810 (commit)
  discards  e540a5464bda433d5850908065e73261b9c4fea1 (commit)
  discards  940f14edf440b4a58ed4f22468ae9bf474b46629 (commit)
  discards  8b0fd7f79a86971233d8561ed9fc8cc2d6df9372 (commit)
  discards  1e7713c82c352d6f69a4add9614611d4e3b6f0de (commit)
  discards  2b5ca8ec591cb9e7c3f7415c022662293773ebda (commit)
  discards  cb7e276d6a39ebf79ddb060532f7c11066784a5b (commit)
  discards  302edf850e34b008b921e40e756b81d9fde5d1ad (commit)
  discards  bbfd6cbd9f339015c1cefa27773953f69b6d3c68 (commit)
  discards  632cb7761c2b69224dda45151ff7ff9bf3ebbce8 (commit)
  discards  1f652e5949b2309bfc1bd102d21092117ff069b0 (commit)
  discards  77abc4d7ff48dfae64a698c3627d43d08c8dccdd (commit)
  discards  3513808281430af404f390d881b6a9b5447d960f (commit)
  discards  e341befa19cbd538ea804dc519caa10930ef7dad (commit)
  discards  da967933e0e81bc065ccb53a7a4ab69302f42371 (commit)
  discards  4fbbae36ecfc5f281256da93e02539b88fe92d15 (commit)
  discards  a324ef1b3f9041eea32fa45991896c8dec0c8541 (commit)
  discards  2c76fc32078d21454c0cb4d4ddf0c771adad9e0a (commit)
  discards  5c5ab106dd68ebd3105a877c325b94892504a0a2 (commit)
  discards  b952bb3f9be968de54032135237c67bbc0dd0a70 (commit)
  discards  6daea501377f8347c5b081f03fdd22cfdb76f538 (commit)
  discards  798a5ac620ee63abc5d61b6db6f65db1b34a3605 (commit)
  discards  05a79e3349482f58ccd70f87ac7b852d451b1abd (commit)
  discards  8fcae6727a7355bf01a77250f2c5fe0df8fda82a (commit)
  discards  a12e80dd27edd9499f1a252549254866b2dcb827 (commit)
  discards  fde8e00e2c7ab16e09b2716b4c661b2c299bac6b (commit)
  discards  9b59c178718b7cf1c007d758f59d603ad2856627 (commit)
  discards  6648c4d2f8a390350e5361f4f7c5d1ee12911fae (commit)
  discards  63ddd44c50cff1ec78513b97d1d7d45b3e2950fb (commit)
  discards  e7c376aa9c250e79918b3a01db301308912cb41a (commit)
  discards  875f5a9449cf2ec596566c2e7496c93c34320009 (commit)
  discards  756e89674e89efb180380a4b87141ca0e90e6191 (commit)
  discards  d96fe03397e73823846626446f1b9dbc11d7ed44 (commit)
  discards  95e71fbe954c252fa8562507f52e2ada01ff160f (commit)
  discards  ebef362af12f7be46edfce4af9e93e124ece17e3 (commit)
  discards  520d76306f8eca0b3b6792e6734deb7f893d23a2 (commit)
  discards  57c42044578479ca3e734eb251728627dfcb8c9a (commit)
  discards  83bfb2dfe55e77b9a3d0e655bd30aa23399c29e6 (commit)
  discards  3bb7b1f045b47e4f83ed2c9e07cc9bfc4285be7c (commit)
  discards  fe5391eecaf19d2741cb25f6690dbc21c05aeae7 (commit)
  discards  c0497de1233b363afd983bc97af00b5d7fe27950 (commit)
  discards  4031d184b53b6cff621e30663f80c7d86bee7aa8 (commit)
  discards  7c8954af013c05f373c6753e17860dddd42eaee1 (commit)
  discards  0482b6b05eb3386880330ebbe0da534e88fed5cf (commit)
  discards  03a5fe5ebc82e96f56d8d3aa7c4fff32799823a3 (commit)
  discards  e673ea37477d270aae309542366f1d93c246fa88 (commit)
  discards  adecd54b8a3e357489c2492898a5594217e4db29 (commit)
  discards  c635339b0039d677100f7212ed02d8f0dc3f492d (commit)
  discards  f510c88a6e2265dfd5492d9a966d2adae3a8c3f0 (commit)
  discards  6d715db16259bce2236e7b4f592bcc05d24618be (commit)
  discards  73ec307977649a0f010f51372e889b60214302ad (commit)
  discards  0e23fad87886b633cfd5ba15f0a67e51401ab871 (commit)
  discards  65b5eff92be74aec23d84bde226838613cc2ed7d (commit)
  discards  7a9a0505fe3d187de146baa5bf7fa513376c8427 (commit)
  discards  2879cd92a5eb965e03302eec44e212a4198c94bd (commit)
  discards  245e10c1674df5d8a7a0adce2660f1e934455a93 (commit)
  discards  aad914b0157e07ae75c7b95cd3056c6ee52249ca (commit)
  discards  348c91d7cced1089b349cf91eee7afaf967e45e6 (commit)
  discards  b3c1ffa8c5b38866434bb5db5e0c788684db83d5 (commit)
  discards  fb4089c62bc756a56f34986dfe106ca19a965d17 (commit)
  discards  478c0780ab0e6e922246e30a23a158a1be6ad3ac (commit)
  discards  30d5da6572d3629ac0759dc03fe068301e92f0df (commit)
  discards  9519272851b2ec9cd0602e1d7414ccfc1ec30d3b (commit)
  discards  19caafbc0c0a234ac110f229f7ecaa1d03e0fc23 (commit)
  discards  a2c60a99a2df41305c5c09724d17bf599cf8bd14 (commit)
  discards  22b2c5560a6500c163fddc0e74197145a6cdf117 (commit)
  discards  a158d931d05fe3cea541494c01185a1c2cb7cc20 (commit)
  discards  0cc640238b70edd09234a4eae5258651a6ae585a (commit)
  discards  136ccd27b69beccd6d893fbaeb909f2915d41c48 (commit)
  discards  3b36794bf535ae16c72cc3b363cc954ff680fed9 (commit)
  discards  31b43bf4663f8612fa4e7ed01633deaa018961da (commit)
  discards  9350e396795b07338169fda51189498b487fc324 (commit)
  discards  627d9c0530e161807959550ddf3dae7cc1f605dd (commit)
  discards  d1f71f9c85a2cf86945baa1747de5c2756637070 (commit)
  discards  f39ec367a96d93f2a0117c7b61df30a54fbc3fc2 (commit)
  discards  2a843615a947e0b8455b7da5fdd2ed7a609fb8f2 (commit)
  discards  a45307477f84bfc58127f346c1f26bd917d6a4ea (commit)
  discards  2f3c0dbac88f7f7a4cce62fd6ef64b048dfe10f2 (commit)
  discards  bef7a0f785b8192e11d26ae761d0ae7a2856d8a6 (commit)
  discards  59a9f3c275a5f5f763d392802da3ff2ae4d1b8f5 (commit)
  discards  425a983649ec4f59b33a22b6f94cb91232ac872a (commit)
  discards  8cf3ec5418a8f248feb6b5250d9131892531d34e (commit)
  discards  61f8705cff754bcb0e4866c1007ccfd714a57307 (commit)
  discards  3ef7f4e4545e27212046730feea1d181dfb3ef4b (commit)
  discards  0f0a97cac1ed50a3296c06c8259845b9213c9ddd (commit)
  discards  33f6436d739691e8578c87e98739bd26262e118f (commit)
  discards  274f2fbf6e819cb92286ac3b580b406a6c6f7c34 (commit)
  discards  5a1ce558bd6354b1656e147cecc3738ff3a2ed90 (commit)
  discards  dcee4eee037ad10207e1436d04ffc4efbcd3665c (commit)
  discards  21ea08a634b72b31c64ed1c40f2b1335713622d4 (commit)
  discards  fe3594afe1630308526f579cdab7a087bdbf5290 (commit)
  discards  b8a1aff82bb487f75357f4881ed7696f2623a138 (commit)
  discards  3302e8fd81a3fc200f1fb83891639e33ac5126f8 (commit)
  discards  29f2ec1e8bd91bb14248f446890f3d510cfb6002 (commit)
  discards  f27459f23ffb233928261de8272da67aca7089cd (commit)
  discards  307fa71eae9bb1fb5dcc09daa7a271c886330959 (commit)
  discards  d726f0467fdb283af70ed0854a335b4dd8d3aaef (commit)
  discards  23c6a8a1f73e10e8bc02a72a9a0fa41445af7485 (commit)
  discards  f9225c4b929932edfb603c2bf93b80ced99580fe (commit)
  discards  8461d3ef795535dbf18495328cabd54fb25fc5d3 (commit)
  discards  b0bd29f8e55562f2c14d8786c0e465be89d5fd48 (commit)
  discards  1da265b05c7f23532992a7916772c1b139becc72 (commit)
  discards  4295b84a31a1b97773912f3854fb2129cf4cd2a9 (commit)
  discards  27458764cf805ff9108276bfe75d5734768004eb (commit)
  discards  4a95d13b9c711498204bcffb9e7ec02e46460df5 (commit)
  discards  83a1b62f4ee15f6bd906540b951da7b9a2ae15ac (commit)
  discards  5a6ca0b81f7835f86abf9f1467b98247e4463edd (commit)
  discards  549965f7207741ebac8125f28b22ec32de6aa0e6 (commit)
  discards  587a99a5afd6f6f7d7442cb32ede860916073eed (commit)
  discards  81442d2f2f5161f7b10bda7b5c7747832677160a (commit)
  discards  b31befa035f6b3294fea71ffdcf1fc889688ffb9 (commit)
  discards  3553d2fdfc6203136ad240702e4c77bdc349416d (commit)
  discards  8bd6bdd2b6289196bb45103b50b7f41729938dc1 (commit)
  discards  28c2e75eae70dace83ec6d51b77622ba592a148e (commit)
  discards  cb73dc2b25fcea8e60853e13411f8013de09f6b9 (commit)
  discards  e9ac5066f92e4418c176d5563b22d7d469dfe93c (commit)
  discards  427aa20814b97726b52efaef54905d0ed1aa4e2c (commit)
  discards  22c1a69a9c472bd2530ddb2c0a5dae38465f2271 (commit)
  discards  b4bb7753d5094346c64cb45cfb315d1e93f12dcb (commit)
  discards  e2d702941ae6ced5e094182d933d8d12721bc7ac (commit)
  discards  aba6d41ba00b9ecd397ed76bb97a4b1780c0a959 (commit)
  discards  0815f476a47898cbb967ac684960a68dcc64ead7 (commit)
  discards  f6feed2c6d8fedb888a7b1fbb66d870c645c2251 (commit)
  discards  0b2500ebacc92ddddf00ea4adc2bc55a5bc0ced4 (commit)
  discards  3492f289d900d8a785270455cdbdd0b49a6490a9 (commit)
  discards  db70a1c79decc497a0c42ee543d57dfc53ae8000 (commit)
  discards  93f0c176d8abd604902c8ecafa41b4b4a1a9b12b (commit)
  discards  1aa00000ee9cc3514467d66832d127aa955a99fb (commit)
  discards  adce5f39a42fa780c07e23c2a89d6ec47f66331c (commit)
  discards  8572cce92cb678eba225161478fbb8dff3bc15ee (commit)
  discards  f95a1e6ebae47a3d2897d82f4485d1faf94bcb09 (commit)
  discards  5fb814d7f968e10a6a02e2a78b7dccb7c34b026b (commit)
  discards  383ae666d2bfad26165c87c9edfebea52c82119e (commit)
  discards  e7db0856abb64c72187654d60ddb37b92c32a461 (commit)
  discards  781beea3f7d6c8473d7b7090c76e2c7099d4968e (commit)
  discards  0c62b16f28c7663d52d996edad4cf1b98813d0a1 (commit)
  discards  81aef5efa638ad70264764af5a8790343b0d92cd (commit)
  discards  4bba0342d18b9720fd2f256f6a1eca66719dcf7e (commit)
  discards  7b9e4b50b82f3235775a2d016702905bd948373a (commit)
  discards  bb0e698f451ab24e63c485ff8398c71f8988590b (commit)
  discards  afb84b31e8277b2955284ad34708f58ea1db744f (commit)
  discards  baae0995abb15e6f5e2a4933ad34c1858a9042fd (commit)
  discards  cbb5037d0a246d998672da3e1b3fb517909ec5ae (commit)
  discards  05bd71ce438bb92348f0948661ead92cbf09d982 (commit)
  discards  dd64a8b53b8e06979e28ffae61970037ce522f7a (commit)
  discards  ee0d75a5f81aadecb6d0b94b78c9f21bff5aba44 (commit)
  discards  6e4e98de6e3bb604281e3f387ecee619c5f23709 (commit)
  discards  938acba9e0f7fe6cc3a7eec5de4a10021a0aef05 (commit)
  discards  be205eb56d91414749b7a6073e14747e840d1aba (commit)
  discards  1bd6d804a909be8884bf5dd234d8f6125c92d5a9 (commit)
  discards  d222009a0fe7bf9d060b3ce49e0e720046936f89 (commit)
  discards  65e833dbf0b8372e719c6140cc1373e46e078ae8 (commit)
  discards  1ce989a66c3aa97d1a8ca933123335d279671e83 (commit)
  discards  2714f048b387b5387c248aa186b7892f4473055f (commit)
  discards  544d3aa3038b565de500ef2f53f54b482c261296 (commit)
  discards  5dc07198725d60d9cee3abf78f23ca9177a2fdd1 (commit)
  discards  723f56e7c2848d587aae854410c86d3030508b9d (commit)
  discards  82b706b70fbaa9b7469e03b3ef63ab8b66a49b5b (commit)
  discards  2706b1fde45c27145805032aa0daa432b5f882b3 (commit)
  discards  16a97e777828f96d2b6eee2106817fbd13f6c261 (commit)
  discards  55e097ae0cc3b0a722ed56883c5f9ada772d5c09 (commit)
  discards  65d9ff20a94bcd0439dfd8dd4a29e30bd1a49dd3 (commit)
  discards  a19a796b4f8c2eb2da33b2c23337596d1f109521 (commit)
  discards  47c898cfc53430626eab7448c8657ecae15815d9 (commit)
  discards  4af3f7ef11fd9118f259c5d9b05747c964ef620b (commit)
  discards  29637d6c119ed98b28099023e3203ade09b6c6c9 (commit)
  discards  3975e01b69b97fdcb887bb3607481a616e678a9a (commit)
  discards  8c746162c33a1c207bf30a0261d35c8c7204898e (commit)
  discards  967364dea4fb2a13bfe22f73d8343bccf15d3883 (commit)
  discards  fb65bd6b653a30e83faf97c73e0de1961f6e5c7e (commit)
  discards  6d6d147685f57d578a1859de7202fa776bdeba72 (commit)
  discards  3394db5b8debc195eae4275ae1e9c8e74611d422 (commit)
  discards  7899f6955a3e4782db656c46390087f4c8a8e205 (commit)
  discards  a9aa0cb7ff9fa14ab7e4798fa2a373e26190f51c (commit)
  discards  199ea5b65360275f0bc489dff1ddbefc064cd271 (commit)
  discards  4413ed800ccfd7adb73eda166442245eb286fe82 (commit)
  discards  2a9b8c6cf786ec1eb0fbfa3be87223b7ec59f1dc (commit)
  discards  f057d0f906bbf98891c02e403f4c0cf41f3cf8a8 (commit)
  discards  81fd86fa1998a107ab1de090b91c396c1f9e79a5 (commit)
  discards  bdf76620f8239763df27dce59f2695de6ac03392 (commit)
  discards  1549af20a9fbeac6535f6f7134afeb3a4849de74 (commit)
  discards  6b24fa692f950a95e500ad3f41c51b9db642afa4 (commit)
  discards  9fbba28928d5fe8d5ab3b2750287dae28d2464f1 (commit)
  discards  22d1597f20869110edca4411236e8f5263cd5ece (commit)
  discards  45a48d7e23bae2590516118643d592f02f69ff4e (commit)
  discards  da0480be5d8d03c5c5c4f14fbc4e1dcfed532620 (commit)
  discards  d42ee02881817f90451a6fdb0f983ab5fd56a3e5 (commit)
  discards  fdc227c297b54f0f7e8c158cdc6bb3ccdc8f01d4 (commit)
  discards  28dc5b7e6b208e5a3e7be2b9e16ac9c1a3bc6635 (commit)
  discards  107011a18580b70dffa1b643b93ecd6715303da9 (commit)
  discards  e05d78a040d22d1d918c8704824e800ac9c0cfe1 (commit)
  discards  e55a1b5e7d74cc5f7ead80b2b22ee768c2918520 (commit)
  discards  d915e804eeb73f8fb926d2313015ce4aada906ec (commit)
  discards  7c8e1606394017c70f6f425e0aa09194628160a3 (commit)
  discards  b31d8febcd4a4a6c0a00d1c764d7bd7cc0f7d770 (commit)
  discards  f01a8823aea16407ea1bc57bb3c3fdc87cc4609e (commit)
  discards  35626e57859a1382f2ed4d90a87faa16dc46e1c4 (commit)
  discards  87a4d23c36a3c879baf3e8fd57ac56b1a68f27d8 (commit)
  discards  b40e8c4ae752205aa134d656bfa852610d258322 (commit)
  discards  e3e5e61313db5f60e3bea86887366d34d27fbca9 (commit)
  discards  2c510e4a0aac11113dae0cfcb3aeb0882bb75bfa (commit)
  discards  7ae1629a1572808cb5819844a19d8b9d38391682 (commit)
  discards  dee38f80347d2e0c9bf8c542b9704fa9e79b1377 (commit)
  discards  1e9d42f393fe30563f7d398569f17f105d2ae2cf (commit)
  discards  f8a81669a04ed091f9dd5d335645f914046d5ddb (commit)
  discards  82bfbf88966baeeb7d3891cc6b3cb32a707dd6b2 (commit)
  discards  b676998c3dab97c953a71eb3368b71fc521b239a (commit)
  discards  433b71f2084e0690e6ee37712745399f63c2b242 (commit)
  discards  6166a4a2536ec0142a12ee0ae04eee6591863e06 (commit)
  discards  dbae465c288e3240837213570b3e1e992482c180 (commit)
  discards  7d2db56ef9735e47ccdaf8dba994ac10bc1d7ef1 (commit)
  discards  ba0ba5da9319c34f1f9fb50178c9d76f90e14f20 (commit)
  discards  3a9ec35c7b11d020b7ef5d0b0943bb02e35c0fc5 (commit)
  discards  211666900dfa38fbcc9f65ff3894fa875a99a597 (commit)
  discards  5f9c5fc547988250733a07154b6ac941376c9273 (commit)
  discards  9c587a085e66c23fcb76e56fa9a63dab0443e4e9 (commit)
  discards  53728a7819fe1e76bb606ae63d2b96a13bf799bb (commit)
  discards  bcd34ed976acd56c73a696ee99c265ad3d01a849 (commit)
  discards  348de9be921cdf647c9baeb75a3b4c09194f58e0 (commit)
  discards  aa85121e38ce0d4a310564affe61f10abe8c1b2a (commit)
  discards  ae65b8ef2e424c26f8dfdb1178f64f5aca02b000 (commit)
  discards  6ba4780f2a66af33b444b6a61b3abb7120cedd0b (commit)
  discards  07c34bf5d2ea7308093701fed2439f5fdfe4601e (commit)
  discards  2e9e1ed6a29665d507fab7a0d94b926e6882f6e3 (commit)
  discards  620f112bfee9c66dc0f86eefc9fd1dcaa4faa436 (commit)
  discards  bb1bffebea884264d5b789c70893606e8c2d7fc6 (commit)
  discards  50b744d67de9a53b3c8b71ba4e496d032050403a (commit)
  discards  f83e8cf401a89f8643567b2036b22f2ff4af0101 (commit)
  discards  918362e1aa1cd4774ab206a5886dd010081c445c (commit)
  discards  c0e6fddeab9989fd17c21f12ce3589500788f087 (commit)
  discards  8905462b46630efda17495a254ad88b641ea6cf9 (commit)
  discards  b9f495778a8d380ab55ec2bc797f248650fc6e3d (commit)
  discards  18f407e3cb1a515714594be1f720cba6cfcc459c (commit)
  discards  cf94e23fe77ee54e2255488bdcfa8b371a566c35 (commit)
  discards  70799b1c35689803baab2562ab1a9be8f71d3223 (commit)
  discards  193a3f8d4b8894d58f1ef4b23645bb21118b50c2 (commit)
  discards  83634cd106d2c6bdc9acf76a7dfda805e10bb5b2 (commit)
  discards  0d3e88f4cc6f09fba727d0c24da5c575995f40a2 (commit)
  discards  16eb6672505d6ea397d4541064d7a086eccae967 (commit)
  discards  29a67b5c4446ab5838049ddb7d29e583e5afacb6 (commit)
  discards  ef2f8151f27459ea2e1b4c0e03cfb6c7adfe61c9 (commit)
  discards  b95b360a9f39a997e1dad0c5ea7376427f5fac9e (commit)
  discards  9704640cd2e087fdc664d361f4ec70a0b5e4fd88 (commit)
  discards  06126c975271115a7347e26ba3b9cdae5cf17283 (commit)
  discards  205ce37d41d68f0329747a16e432d0708042d8fa (commit)
  discards  92d71ce588823d2f1cd30b691619087db572b1cd (commit)
  discards  dc230dc142b3ea312eeeac27811dff4a0b3096da (commit)
  discards  aac903001cadb9c9ed166ac9cafa1466a59d806a (commit)
  discards  ad9e76d493019ecd30e914960f3df733aa44b786 (commit)
  discards  3704f34f8a8132d1b4cbe6041bbd7a99494c4481 (commit)
  discards  c8d4d22f10318295eb55dbf65795d42c3443411d (commit)
  discards  4a085a641c97ef1d2d10e05ddf31cfd345d98ffd (commit)
  discards  80fbbfe0e72aedd7048bed84f9021e49bc2a5bae (commit)
  discards  8a100aff162116bac950e5265277937c5f1da109 (commit)
  discards  d151f0063701e6788bd60bfc5faae9fc3f95fcb7 (commit)
  discards  ed292a4a7ff7fd6effcb3426a28c359ec227a7a9 (commit)
  discards  85884568123fdaec3cd03405055c5c2ccc29f7a7 (commit)
  discards  e1b4f743d3956ee327ba972726c369e1099931d2 (commit)
  discards  c4f52ff0f613258de06af0b3a51f2c4d6a82819b (commit)
  discards  3264bd81fb352fd8145505b56a90ad17f659de04 (commit)
  discards  2869b7f060fbb67582bbe707f39f95400ebd8f00 (commit)
  discards  e8ecbee357e8d0ba7f647e2af9b370de6864a2b6 (commit)
  discards  c9f9a4e9f476c44ad6631c4f67755fed52723df5 (commit)
  discards  f407c761a4596a14409af7a49ec1a59f9ff3960f (commit)
  discards  61b891403064dc3f22ad07fc80c0b3c43adab5e0 (commit)
  discards  c3fdb140242e08d8cbed4f5386f5632be6439d41 (commit)
  discards  8eeb3c1bdf3e12bfc3a97e5dc3837bf91a4f6ecd (commit)
  discards  3e26c51aad713a9ddb479f1e5f6ed3890a0171d8 (commit)
  discards  523db7ab14911c2c55271c74497ec2c5d5f33c4d (commit)
  discards  35433d24e78e91d592290393ab1884671cadfc76 (commit)
  discards  4882d4b80732fd6077336f439ed0d80fcccb1eae (commit)
  discards  678e77c8af25bc70e80668dca1c097dd3a00e077 (commit)
  discards  672e02aa72352fa82a725c9684ebf6d74ef7349d (commit)
  discards  f00fb7f66f637f963529d4b717727921df85d904 (commit)
  discards  2dc12b73833eabf125fa7f2613bf6822fe784468 (commit)
  discards  31f11f68dc1ca8c537690aa429a5de601f3cbf5b (commit)
  discards  1c13d65a462c31df23ef9dcdd8f3e8ae004494c7 (commit)
  discards  b219cce55112593e4701cc6a159ed35db0cbbfb1 (commit)
  discards  976fbac9dc99fb4657254c33243013c83929b220 (commit)
  discards  f62c764dcc5dce9154f0da53eb3a63d8b8910357 (commit)
  discards  989eb6e0c7fd750aa2fae38471e6a0c1e699edd9 (commit)
  discards  1915a0d7a0dfa4af4c874714413a4c9a28bd2936 (commit)
  discards  ff266fda8d3a7e1b138b7081ffc48e5a5b3758c2 (commit)
  discards  70fe080186153a66d0d0c3a77bbcc87185013afa (commit)
  discards  a4bc358520b55ddb3e3334a874adea4bf914662d (commit)
  discards  0a744808b78e2fa932e4712716f454acd0b632c1 (commit)
  discards  7a7006b652ff3d8f360470c00f487b902a670121 (commit)
  discards  11577c0ade97738113978a05833d49c61d81954a (commit)
  discards  de15dfa302e8b61cb8685bb50471b0518d97f652 (commit)
  discards  d3316fbe347510ca19322aef97e7786500aa5c04 (commit)
  discards  dae3f26d20cfe0523afe66a08a849632fb4bfac6 (commit)
  discards  6f85533f954855fcb6940e6d05e1f87d60ca3de4 (commit)
  discards  1abe053fd68b39210eeac8bc6aec1e80d6d56690 (commit)
  discards  9c2923d68d6bb17b49ed1c18da99091db60e90a2 (commit)
  discards  d2a32b8861652e09275b6dd518e90fa327f1852d (commit)
  discards  98e548c7d3567d937e40f6762eed5c8597778e2a (commit)
  discards  4a530a64174830a7da169cea2b8a51b84839a5a9 (commit)
  discards  98f7dde2b46c80bb5699c04578447112d6e670d2 (commit)
  discards  954f01fd726fcff850c2e0a2e87d55a4c4952f7f (commit)
  discards  72f948b63cb7b6b050e016a358d58f8013cc5b17 (commit)
  discards  afecd0d6d006310a0d49b2e274c91508c23c7e50 (commit)
  discards  64d31fcc0b3cd8e9c6409eb58c6d8982729632d0 (commit)
  discards  a277d404afcf3c4f7a4841207088921094679eae (commit)
  discards  97e653d63d34837eabff6f0a837eee92a9cf854a (commit)
  discards  2e078e2ef548922668b09bc97e69bbac50db2585 (commit)
  discards  a388d4612a25ddeb0b0fe6fb918cfdaeb1eb3241 (commit)
  discards  4de73280442b7afe3d27ba7dc42e08f0bf5f0ca5 (commit)
  discards  6fcc1b2d0711ce11d06a4d1f0b2d36886aa4c2a8 (commit)
  discards  ddd8dc8f76f080cb5dbab182a06441e1ffd95e39 (commit)
  discards  c5ff7a1958f96b354898dc44cb3a4efccc7066c2 (commit)
  discards  65eb2968db30ec3190ff98fb2ad7a49543d2fbab (commit)
  discards  7e3d0883ac7f0fd833f3d03969f14f43fe5e12ab (commit)
  discards  85476891eea712834ae7bed6d56d9644a1062b2f (commit)
  discards  7b87cb1016aef245dc4e7181afaa14bc5495d49e (commit)
  discards  ab2fe730640fb34ee1df3eddad1801ca102193f5 (commit)
  discards  415de942f70dc90820fcb257ec2f6b44923a41b4 (commit)
  discards  e79bc4696fdbba1194141ed4de6e593dbb68111d (commit)
  discards  8f634bde87b884e817f9d38257930d327f6ce72b (commit)
  discards  14fc4e1449c48aba916710aac336e7dc989258fd (commit)
  discards  1df0f0d628c0b5f405d0ae1b2d9ed159fb11283d (commit)
  discards  89a5cc37dfde7bc271f86932a2f37eda8765508d (commit)
  discards  dab7d98dcf5d183c5973db3c88204246e6973eea (commit)
  discards  523f543bd87dc17ac864e1a41a31449a955ff307 (commit)
  discards  3efb25a22bb887f92df8bbb6f819f29b09f17670 (commit)
  discards  38a18e8a9d7e63a526117aaa2ac394035f38d5ec (commit)
  discards  3dcdb6b49646b518774e519d0d61a0cc0afbf93b (commit)
  discards  1ded7c87e8a074dd708f9be03b2b26f36359b2c4 (commit)
  discards  1cb40f16678694bcdf17790894ae1ffdb7e469c5 (commit)
  discards  ecf15b4ff5562e37fc370f3c9f9244adc1b8e7af (commit)
  discards  e3e53b205b135a6b7d769a291003a63db655cbe9 (commit)
  discards  74997f6f19ed6f2ffd6d9f2d4df41fb65bd70f12 (commit)
  discards  d94eb6bf40064f76266ea756855e82399d210444 (commit)
  discards  5144f70e01af28a63332f28cac878423ccebef29 (commit)
  discards  981fe8f34bbfa11eaaf39a2f10fc6be1f25369b8 (commit)
  discards  6ecc3406215477d344df8b10543ae990586103a9 (commit)
  discards  ce29c80d3d533e8b79d06ccadd880b0b0413e0fb (commit)
  discards  3123ffd3e1fb2651e49f247e932e30689e1a5a5f (commit)
  discards  e01ad8f59c84be5467677c81e2ce1b11b4f1d0f2 (commit)
  discards  5dd3341b0f97257d1262118ea32eabc817e2e507 (commit)
  discards  3f99fd2daf1b9ac89419d6ddc37542eaf5b5b8e8 (commit)
  discards  9ab64be4926fc764e76a96a33186ac7c28202c0b (commit)
  discards  08bce458d60eece4a22c3e1a56a881fc3b3357b2 (commit)
  discards  78e796da460fb5d52e9ae1c827b3752cfc04ae04 (commit)
  discards  e6208d093139f42d923b0b622a2678fc859da9ce (commit)
  discards  32094f9c7c7dcb1d893a31ce5256178770268be3 (commit)
  discards  3d0efdaf68b888d3c62a397dba72e437b1fed111 (commit)
  discards  0bbc1a067740f9a7535196f7ca9f57e5b2d30996 (commit)
  discards  7ab052ade7f7567534186b062c47b06880e626ef (commit)
  discards  067a96a216cb2e793e29dde7c2d56c1ee044200c (commit)
  discards  4134060d569f06f7005aca7ed0cf848bbb211728 (commit)
  discards  c515b240dcb4613e9ca70477c8fcb028fbc499f6 (commit)
  discards  973587f5d9a4575124136d4b36d13ba757989b7e (commit)
  discards  32b5df2b007705df8fad2a5546e19668516e335e (commit)
  discards  c7a3fc0e3d02175c49c9f73d4c28cfb330c4f5f9 (commit)
  discards  6411037555f1bf7141671d5d8893dd6a3db7643b (commit)
  discards  30e6ff951d52772b6bb73654ea33752368a92fe7 (commit)
  discards  29c72b9951e9b6eeeaec5d938a61b3fbfe150e26 (commit)
  discards  9c4ac083c7b6d7035489b5f21bc424caeca24056 (commit)
  discards  8c8d324ba71708a68bf4e73c144ab547af891294 (commit)
  discards  0fab16a9baf1eebf13bb11664aec3da2f97ab173 (commit)
  discards  5add92c986d0ade75d7e702ad446702ab5db6b62 (commit)
  discards  6f9f8060eabd2b41efa8e730353e949fab3a58f4 (commit)
  discards  29ca03c178146aa4a7c9701ad4a3ed569ad2946c (commit)
  discards  aff42eb45d8dca37fc1caa5ee7172482ab3ebcd7 (commit)
  discards  7220168914ae1a2ce72d11f04f614bf67944c94e (commit)
  discards  ccba156ffbd61a32a6d52276af2cccea5e908b3b (commit)
  discards  227703ee1f118083d3a0a2890a4d83f99297aba0 (commit)
  discards  f626b083bb424ac1cedf6c096ffde613ccf0873a (commit)
  discards  63eb9f6a325d36569c68c59af4cc1ba69169dc76 (commit)
  discards  c36bd361f7115e781fa73e1ade55dd4ec0c44e68 (commit)
  discards  f1cac2bb6f269687a6140bece5528b1fdb128091 (commit)
  discards  b90298c4a9f56b763ad7b89ed9bfe3bc8675dcea (commit)
  discards  09e6d0853b56d7592809bdb8fb33ab13813a4483 (commit)
  discards  56c91fbcd55e3f810e6796295227e2d57b40f120 (commit)
  discards  3e9a0523a986cd6f76ffd4c835f1c9339d068c0a (commit)
  discards  c7bc8c01801fb850a1d246a3c8457cb54d76ad4b (commit)
  discards  2deae6cdaec6d164eacf6ec17664a41795f68519 (commit)
  discards  21e760aa9060549815ad7c53fb09e362e7cf7f20 (commit)
  discards  a8fa7cb5d3f7cfad55d3ff0699b5fbd6cc208f21 (commit)
  discards  5a352e6c318780d2c9174562fb96bda989f34add (commit)
  discards  e0be361bb12298c5bbf71b332f591b928c1bb79b (commit)
  discards  9a358574ac2d51f0267c38323ee89afdc680de5e (commit)
  discards  9cb0ac12b1610ade11259d1787342319a3f9b375 (commit)
  discards  47aeac35a7f4602efd8ce2c8d99031c4d99457e9 (commit)
  discards  4ef5c6aa93d8da68aff0f6d840f7ab17a5ab8e42 (commit)
  discards  1a536bf9d48fdd7d3e325e8765feb95eeedc53e0 (commit)
  discards  c4cbf441827b844cfaa0628478a8557d14d0ea52 (commit)
  discards  97cf80fd5ec3df4a281452111a6a3968ef0ea872 (commit)
  discards  a99e897c5224051003cc94abd3aabfcb9c8be349 (commit)
  discards  04394d01f670363d3c459c794e53722ae4580172 (commit)
  discards  5b4c1f26095ab8a8355e5326bdd4d430bba42c19 (commit)
  discards  c3a1c82950fdd24aa6736ab25d641194dd9dbd74 (commit)
  discards  e4097bfc7a1e64819d070e82233151e577a50d96 (commit)
  discards  9cd2ff9b8f18396b9750002a6ab4e5a1050bff60 (commit)
  discards  778a69573177e8d9f624f1b1f0a789aa4d8d63a3 (commit)
  discards  0dacae35bf40d1787860de909274eaaf6f377b1e (commit)
  discards  a43558934e0465d6258f373efd073f91d901a54f (commit)
  discards  f074efbf369210d7b61ec58ef48f3471b585fd95 (commit)
  discards  ddf60dae50a503c1fd7ea460dc13921e470cdc44 (commit)
  discards  7feb1fdf575061903a8c2736bbe0e7a241e57b51 (commit)
  discards  33a9e4b2211a74b3034c80d37b3e5eadecb8da45 (commit)
  discards  12c07211af5e2dd188436ba7351331cbdfdd67a8 (commit)
  discards  ff766a5d58f109450c11ac63a686f8129e33c614 (commit)
  discards  baf485b35ef80ef2f0c58716de02bee0c2960f5c (commit)
  discards  22872e8e3ac7e538deaa72fdb5ff312d539d46c4 (commit)
  discards  ce401b860457dd1aaab3af16150f1cb8aa2c2c72 (commit)
  discards  f8e88b04371970a758d1d47cb02a2bdde697f8e7 (commit)
  discards  e030aff24bc3bfd56b8d8e2567326cfa9382519f (commit)
  discards  97b5de6df0826cd4d4f706f5df5d11d8cb5137d2 (commit)
  discards  5be9e8f54c5a407356af587b28a6a82de527cdda (commit)
  discards  0ed780ea44448d4036eb90ee39566deaaf0ac22e (commit)
  discards  b646352f8ae420b9fa8035481d5bd1a55430dd70 (commit)
  discards  3faad24c0fa9477039131634b273fa8c5b43195d (commit)
  discards  8c3193c1872da07cef8d77473bd977727a7a79a1 (commit)
  discards  efdeee5959385baa82287700b7f57200229a7fc6 (commit)
  discards  fb393252d7bd48943b13c1824d32bb2d753a902d (commit)
  discards  6ad639ba3957e8f6378ecb9a8cba92033d0630e1 (commit)
  discards  f5350a90875848979d56e6843b2e61c5a6b2a725 (commit)
  discards  c8891e501394653b679a6befa17cde940edc0adf (commit)
  discards  ccabdee8344ae239957c4576d1d236c5f8bc179f (commit)
  discards  1e2a6be0eccc50a323ee4464b3e36a2610ea94e4 (commit)
  discards  dd128f84e8bf1e035d0297a13c22d6dd5edc77ef (commit)
  discards  c4d260c8e4205a05e8a1decb76e02c3d36a94793 (commit)
  discards  3abae9fdabfd8ae919a08321c645bb63584773f6 (commit)
  discards  8ffcaf17f9e125c9b907c66f94017c1a1e22a44a (commit)
  discards  4f866c382384da1e9fba1c3dacd14b90d48475cc (commit)
  discards  26fbf4b9638f9e071b973bc5db7cc8614265f9ca (commit)
  discards  0632b9a2726aeb20eec1796b62cc5b104a325ac9 (commit)
  discards  a50492d800abc6287c35ea77ea29e19994376e29 (commit)
  discards  ccc30aa9cbbb69e6ff0c4baac99b3cfdc7ce19d5 (commit)
  discards  462f182d25bad09362888cbd85ced31d7cf78680 (commit)
  discards  33b4fa4018401e32c896d806500fb9b6823400b0 (commit)
  discards  380b8455c61c66bbd610c01aa4761e05700f888e (commit)
  discards  f7c7c4ab64039a1b06e775813b9392f7a300acf6 (commit)
  discards  6a8c31b7d4352543208efcce12b7a0e966a29b21 (commit)
  discards  350e3b1a510f8c19a2f8a2937744778073ce7dec (commit)
  discards  b193153ced9b42cdd4f436b87bc15c63ead2c468 (commit)
  discards  685c3cc5560ace475dcddcbb30e98f67b02f3514 (commit)
  discards  43aefeb2dc8fdf31a4338215ada3f8ba7177bc84 (commit)
  discards  257f7e5e675e7d0f04ec789dbb23a9c4985088ce (commit)
  discards  d5f65f1307f3d4e67d31f333cf34a97588cfe033 (commit)
  discards  209bd4163bcaa2709fe7d5127f8060bcd95f734e (commit)
  discards  7a5e4a7b46e1e8d0377b05e57dd1f80b29142a7c (commit)
  discards  e69ff1eaae0fed54aeb9af6c8b46e23139ccb207 (commit)
  discards  c7512801262090ce0570539434716d88fd09da1e (commit)
  discards  2a0d0afeb9483bbfa60105f42ace246c7e605e51 (commit)
  discards  dec057e2cf5e41d72b42ba3c2d8ae1cb3803a3a8 (commit)
  discards  6bfd310d1bedf7acce15ebbfb36c0a6b7b82a0b2 (commit)
  discards  825fdc8b0febb04c1b442614c0b07ab918120aa0 (commit)
  discards  cad35b1f63a9b1a3dabd3762cace806e1d025fc1 (commit)
  discards  8a86cb765e4183a2a9ce8947519246201dbb9159 (commit)
  discards  5b63355440ed3a551eeeda65fafc84e25032246a (commit)
  discards  a0e6a84259d4f680c124a1401f1a9434773ea87c (commit)
  discards  46e51436e3038261bd9a80d2f350e965e7921298 (commit)
  discards  a29a88ca512bb924a496984f5c44615c085553a8 (commit)
  discards  9c78bd2764369306a2b4801e518f9d57c1cc74ec (commit)
  discards  b48fd0064b9cbb70ea1129086b70bf6c17c90a9d (commit)
  discards  82e1694f385e55596a746d4c9d8ad06917154d51 (commit)
  discards  d5b1839a2f22f2b60b35bf709a86c9916f4411cc (commit)
  discards  f6b76828f4f8e405d903a6d3491b1b3b84011b82 (commit)
  discards  bbd48562b35bf9b7c3eb7c47eaa8a3deb9299a6e (commit)
  discards  48c58230191b648f94d24c2034db140348adee91 (commit)
  discards  da18c216d5291ec793d143463a61f48688b52388 (commit)
  discards  78cd6ad10cb7c8c2737d5ba934266b7a2a3fa08c (commit)
  discards  3f11c2d4ba807cd14a6dadae63d80f61361e2e13 (commit)
  discards  9f87078447f4a210c79ef08e48c001470a7d1cbd (commit)
  discards  2b3319e6ed7bd6eb4b57c129503e422340211fba (commit)
  discards  dc2e330860d8943d784f96f24c00af648d4dce6b (commit)
  discards  13d959a7f0fea7a504dbedf7a759bacb84e58b1d (commit)
  discards  55357db2cb883589969959fadc5dc66be3c383de (commit)
  discards  bd5323ebea446fcf077f3db21452c6ec0d36f1e5 (commit)
  discards  3f1d31429e5ba28be1cd550e05040865c1555b7a (commit)
  discards  bd0ac691974bf42078b4cbdee1b06a21b25b222a (commit)
  discards  257ba138b44872dbe305b3ef6d6d1685c00647fe (commit)
  discards  e0167a141f74b7f39471150010c328202b4859b7 (commit)
  discards  2376c7ef8149c7bad49a73d8d62ba09fbdd84883 (commit)
  discards  f047237fc18b734bcec3d488ba7c8c3ce80d582b (commit)
  discards  2d55817a742f7fc95a639d09e791c479f80b6af4 (commit)
  discards  82a57813903cf10d81627768c81f30fb645d83f0 (commit)
  discards  39424c7e55ef26e2e3f6a98203b6b8fb41c7164c (commit)
  discards  fe378c25ffd82b470a35bff6f4c80c3f8e880f84 (commit)
  discards  0f6c9e6300ac03458cd1a64d7a733fc37e6319ec (commit)
  discards  3ee6f3e4246f9654dda8df67e2d79f7ac999e3b7 (commit)
  discards  86907c983872159978b1b29b0d05949fe9612bf4 (commit)
  discards  d7b9ced9344deb3b93771eca616b02e98fe7dedf (commit)
  discards  691aa02ebaca94f0ff85c0a0e4d06403bb20079d (commit)
  discards  64d1346035c4126296c2a09a8f8250c99feb3bda (commit)
  discards  502bcaa047397b1e113dd574fdf2ec1e06fda3d4 (commit)
  discards  f6f05443fc31a3ffbd6f302d52e8e3af2da7b8b3 (commit)
  discards  d6d246f7531e7ce242caff3b684fcc3859f48524 (commit)
  discards  79066b4fb3ee8c563ae0d3eace433300b31ab63a (commit)
  discards  070fe4e6987595d4846940ba272af01c3aeef857 (commit)
  discards  5bd6a68e44c88c40d17471414a7b4bb45727f693 (commit)
  discards  802050d15436fbfeaa5e7c7f8844abf937cbdfe8 (commit)
  discards  b8705e5901a2c0eeed0b37af1d6fe624805f78e4 (commit)
  discards  522f022cab57570a8f7032882b120fe52dc6ead5 (commit)
  discards  5eb4f36a6c9a39c81265e3afa5a368146c3c5a6c (commit)
  discards  e278ef4a699d40ca1f172a5bd1e9e80a67cd7a67 (commit)
  discards  17e5fd016cb22599224bc822aa8c37c7dd31357b (commit)
  discards  3aeb0a8b4d2a8e190938e311736ad3f3c6becc52 (commit)
  discards  cbe021fc7c33453d5d6c919fb281be4ba6e0b350 (commit)
  discards  ad114af43792b25a332d02d049fa4360d24d5a06 (commit)
  discards  ab94bcc7d357659cd59f6dbd7feb05ca6154ee19 (commit)
  discards  3da86aa441bc3fd018231550f25a03a54056b082 (commit)
  discards  fcf6ddb97788ded7e3453205c4db7ac87299be93 (commit)
  discards  0d84f9c049b8217147f13c202dc15a076a37b34b (commit)
  discards  64da1b03a82130722246361b25deeac7c0c6dcd9 (commit)
  discards  d50e588a1886c21aae17123058dba267d308d689 (commit)
  discards  972832ecc3694ac634ff9a5016fd11da7bca1599 (commit)
  discards  c4a663992657e921904feb67cf53102a66e74a11 (commit)
  discards  096d8293aee19486c4a316d6d0b62bb92022dfc9 (commit)
  discards  65d77e3293979e056a22596277c944e27e97aca8 (commit)
  discards  071482f9956ae5f6eb8daa3562c6e826d3637ca9 (commit)
  discards  0f5b0d4716529430e524bd753b9b68b29330a8ba (commit)
  discards  009b92e3f83522d3256594a34e342d20915383e3 (commit)
  discards  38aea16943f70bc60506d8b914df109181259ac1 (commit)
  discards  2eb5104ad81b264b6aaac360b4a82f53a47653dd (commit)
  discards  38c32c2d7b278f553b715d157df9361897a1efd7 (commit)
  discards  b66827462430f64b059891aa40240690fc0b4139 (commit)
  discards  78469c201fa70ec7ac03e7bde61b336af7bad90e (commit)
  discards  d2d657f0c95267224b74ed17a93e31ca89d4ca4c (commit)
  discards  625164d83a9c1daa3191fe0efd4999e39d62fc75 (commit)
  discards  1a3ee89a91cab5884a13e2d34474b10fd62a6558 (commit)
  discards  dcfd16c0c135215196781245b1456f186441ebe0 (commit)
  discards  7a6a8e96914bd206a714755c35d2a1368d0acd3d (commit)
  discards  5e77dc0b1a93c9c873a7426a6b231c4303ac622e (commit)
  discards  481a1b7d7ef717248487bf8d939310edaf53467e (commit)
  discards  e53860733e9868ceb85771e78111c586eac92a0f (commit)
  discards  e59a7d7ec541f588335974bd00efb0e6275c308b (commit)
  discards  87deaee2e45dfc626c4d6883dfbaeca83448556d (commit)
  discards  99fde03f90b909eee7a3d8dcd8fc7f391d581ead (commit)
  discards  413a13f7fd48ab67d479e2f127293c8ad7781a3c (commit)
  discards  2b0af9c4e074f5c8171b4bae46c4212356c29c9b (commit)
  discards  c505d2d9e51d05c4f0437b4b3d9704a8f884e9c2 (commit)
  discards  4ca9da63c2d62979335afef1a146bcc992cc35f1 (commit)
  discards  81895aa46f06d1fea6c5a2a1faaa8dea935eb651 (commit)
  discards  0946d154e7e742ee78320b2da7d00c720091f1a8 (commit)
  discards  18263079dac8a044cb2cf1dfa288608be2839c29 (commit)
  discards  e76d71542f056aedc2620747760ea1a6fad1dfad (commit)
  discards  33b956d6dbfd411a09c94791e91f278f8d3dbbe6 (commit)
  discards  892c77dcf864681fc478abf156ec2625619cce2e (commit)
  discards  9bd4c4da891a9adcceeb7f9801b23d8c4d4ec734 (commit)
  discards  fa20f87d1dc948d4cb1373148460f03973608b9c (commit)
  discards  048953b11be03bccd7d0a16566c092cc506c4233 (commit)
  discards  d44e70761f94d2cf0b52fb028ff2bf520525bb3c (commit)
  discards  588d9a8dc2ddf3780641ebec95b6cae15004eaca (commit)
  discards  7f6c8331d132568f41e9593cb12d2c7e5d8c5324 (commit)
  discards  89b7e49ebf6d9d9c64ad35e928f9daa74d78689e (commit)
  discards  f59c9f0cc5acc726408c978b42dae2b7465570be (commit)
  discards  fafe9a1a5ef81e28a5c22129508412274b51707e (commit)
  discards  4a9120277a42a1cafc80cc2acdcbb2a2bf464623 (commit)
  discards  62275956c1951e86ad013f8454d709ef9849bae4 (commit)
  discards  c8be06c52ddfc10355d00dececf3e5e469bd1593 (commit)
  discards  5f654be0342fa580f071501f51c2149b96a35231 (commit)
  discards  3272d0abcb5383b6e2a90c57a94c0a406bcc07ee (commit)
  discards  773d6fafdf9b8812a4a1b9ca4cc6286f50e8ab4c (commit)
  discards  ceb1833d4c78f5756fe8024c24997d1a33901590 (commit)
  discards  f2ee169d5e439544d28cb81831a10db3913724b5 (commit)
  discards  3b0a47cddf40e22e4341af33030c15a1251ba8a8 (commit)
  discards  88ecf38ede983f26082f1512c247e9af2fbb4b8d (commit)
  discards  053ce6c906ad95861eaf12e9fe0ef9fcb8d1f6ad (commit)
  discards  fd43eaed1cc7bf7aba60f5d49a3c2dfa2ac998a7 (commit)
  discards  934d07f6001c40b520b30d1c792c1f89555babf5 (commit)
  discards  b394b8b7fca4095acb538cf4d1db89caf8c35bea (commit)
  discards  9561cf0e324c1b1dbd6eb57ff46a2763094023d2 (commit)
  discards  c078fe86b25206bde63d8bb16338ce84efb0bc21 (commit)
  discards  3e09fc3ffb8e0d5d00ec46edc373029d860d43b2 (commit)
  discards  cb90e2e0e9b59731f7939be03451c247a2a5197b (commit)
  discards  f02de6ccfe5fd8635350d73783818757230a8f85 (commit)
  discards  eae9367375076820fbb15d4f70360a4976a89218 (commit)
  discards  d441c6e9eede95b06c90465147bc6abffbbebc56 (commit)
  discards  5d7653a0aba19f4793f9bec3b2b07d787bbf5624 (commit)
  discards  fbfb15030c1e5fc1bb472b61b8b0e73c0265da0a (commit)
  discards  0aa3facb6d91bf5a4d39568444554bbc232880fa (commit)
  discards  6c8d3cc07f9136662852e0181bdf16ce9a664d54 (commit)
  discards  b07403cb06c56ca364a1c21d9d57be0579bbca44 (commit)
  discards  a0412429b1542badfdae26fbd0a4c40b4fe51001 (commit)
  discards  8340e9e6df571329af9427dc47e87f71799984a6 (commit)
  discards  e5d3d2a8723f304cd5f4b7008df60e2b2bd7df69 (commit)
  discards  909239eba626468e8842303a06f2b12c19606a59 (commit)
  discards  f14b78139f872d702d2198a4d137cb40cf3fde78 (commit)
  discards  2685880c4ab31b159ebcbffdd5fd99ffb305b86a (commit)
  discards  6fdf1bdacf56d22121af6d0997ed88abce838f25 (commit)
  discards  1eb9a7476c6671ecfd5a6ffea5664a839c5badf5 (commit)
  discards  d0430c0a3eb965aca4f8df4496e06917b352d7fe (commit)
  discards  b5b1405f2e1b8078acfb6954418bd5eeb993685c (commit)
  discards  17308871e7ddd1f2e3954c7da430ed5464ddc5b6 (commit)
  discards  5f69be6cb6110645b9bb5f45ae1cee565c4efc71 (commit)
  discards  6e60ff567461859f22b5e81003fe4dd2d6cabf5e (commit)
  discards  c0e109d9bdbadc882abb8c10ae91c202f09e5fe2 (commit)
  discards  5dd34e3888edd458d119c9f742c381eb6b06afcb (commit)
  discards  c2786ef980d5f42dd5ab2cdfcba2bf7bef7e54f2 (commit)
  discards  5c0b4377a23bf3abf11ad23cbac6f542ad09195e (commit)
  discards  485590e8b15a3f58d85bdf8c741ffce9a3d072d9 (commit)
  discards  b8ef22891b9b2aae9a53be8b143fb332e31801f5 (commit)
  discards  32b7617fd3128dc9f3c4e9198c80ad8ee9b1cc45 (commit)
  discards  0c1569ccd5cf7fc7b05c255f85616db08b880a85 (commit)
  discards  4734ecf7984884887bbaff0592b63d7b0057eb1c (commit)
  discards  eafb3eee02e59d4ff8987f57d9cab4f72fd12f06 (commit)
  discards  22c6064708add4d69d70a0232a27561e89f64c89 (commit)
  discards  ab47821433d5cd164a50e6c8468af5b1798b644a (commit)
  discards  5b6816a64e60b34252afeea13ffe122044a60f13 (commit)
  discards  8c93328befb1ed614315823da17a99957693a914 (commit)
  discards  eefacae6aff8b518c5b644b8148c3de0cdf84a01 (commit)
  discards  b4ff45b69fc216f1507b98722e073f5c7357ff69 (commit)
  discards  e519d849de1be8c6d80d9406c6b828a4acf37395 (commit)
  discards  7361966ee0221f706fa27de6422a35a71044ef88 (commit)
  discards  be855332d9b52fe2474d90fd08f7dea798b126f6 (commit)
  discards  a62a39e3c03dd5a0731ade875dce5a7de9f9d892 (commit)
  discards  0cfa3d0bc1d0bbbc694e5ad64e5d73e0eb0158b9 (commit)
  discards  ad034c4a97a777f7a2f42a35110599b4fd99ac9c (commit)
  discards  9c323873a433cab7b90616cee08eb4374cc1a54f (commit)
  discards  4551b90e7395e2c4e5680c8101ac494b7c7ab77e (commit)
  discards  0eb70376014b73c4970489c49000fcc6e46478cb (commit)
  discards  b64c894238344222acf7292718d699fa420324db (commit)
  discards  5af7740bd25582cb03bbda81c8badc47c98e325b (commit)
  discards  30c71d915bf2feb6a37791f840f6519ebcf624d8 (commit)
  discards  83e53b7d4799ee8cbbff834321c6a0d8fb869267 (commit)
  discards  1965936bb20f40951a1ee597769e4b92e3ae7713 (commit)
  discards  87c81096f92e860a6ebcaac0d29c427d9c6fd1bd (commit)
  discards  25fcf27cc84dda5fb1316aa99e73ee7dc1bec355 (commit)
  discards  e5e2563e92ced9bd5718645b8999596f4a841632 (commit)
  discards  1ca1dd80314bc6182b3b2d01c3bf60f7b39693cf (commit)
  discards  df2cb683e045c7906bcca5d0bf7614d8e1360286 (commit)
  discards  a1c8ac3911b6af3f34a634ff9c7cb3657abdc228 (commit)
  discards  5d3276f7d3a1b99fc985d0fa587987c1271fc407 (commit)
  discards  f15c3b309c34b0a700cf9312ca50357f386feedb (commit)
  discards  0406436e8a1ad973afc64fbab779b616f6c896d5 (commit)
  discards  0317aa7488a8dc26e0dcc3370f1b32847ca9a78c (commit)
  discards  62426472d6b2126c0c615dececef351754d2cc4b (commit)
  discards  e3d1399d7e2380b9958252c479c3d81336a7e546 (commit)
  discards  e03171ecb554c3688ad776b44ce5e2728ea4210e (commit)
  discards  3873507a77446696877cf0043c61babf601a7a36 (commit)
  discards  0925f5f17364ed7e98349aebdb616e68efc392c6 (commit)
  discards  324dcf1cfff8ab7ddea0e3697f215487fcb39c72 (commit)
  discards  97dde6df6613bd671e4525e6fb78eeb8f2094139 (commit)
  discards  0c7f85c5608b2b8e4a15ff935990c7c34d8a89de (commit)
  discards  d07d4fb2281706fc861353c5b37fe100c982bfb5 (commit)
  discards  ce0cf4d99389ca9bdb0631f72bb8b2e2fa0a9e84 (commit)
  discards  e54b8fd0b32b2fc7f2f2c2c6cc819ffd458d6688 (commit)
  discards  ff763c5f0b9c2ef2e8994a445d3354139608340d (commit)
  discards  5c4b0a6a06f8970351f9d397a0eac31c0a7f8a49 (commit)
  discards  b1ecabfb34fcf0f3d27e8784e32e312c0f38f79c (commit)
  discards  e9dfb61458d87cfe476f8aab0d48eb4f2ea3fd53 (commit)
  discards  19f831e636d7075445c506ce05cb075d7b8e5a02 (commit)
  discards  8cc87a99b96dda61688eb430c48fd06da902faf0 (commit)
  discards  352ef3970ebc3f30bb2bb04502d7db8206955da8 (commit)
  discards  9771642b4171dec73b523b85fc2e31a8bbae3c76 (commit)
  discards  ecf2d0dcb3050a391dd59f39b26787f2fa2e6dee (commit)
  discards  fe3cbb78721dc84d01ab030422a67013d1595f3d (commit)
  discards  d2e9ccbc7f3de688d3ec187ab093607eab8d82d7 (commit)
  discards  7fe42a11e81a157a0dc4f504af2394cf24a80834 (commit)
  discards  def006e5fed52be4f418e0d51c6dbbef1f1392b7 (commit)
  discards  f06220dc8a4550af398d653c68a1deee392a81a2 (commit)
  discards  e7c9ac90937aaaa68b67709217142afe2e6c8e40 (commit)
  discards  4b60809ceb4842bbd39d5c0d04616ce90cc44ebf (commit)
  discards  c078a36a23189eb3c11bf128c978f9484d149f26 (commit)
  discards  2beb245b57e47bf41ef2a7a469f74cfd16420748 (commit)
  discards  fe09e6f9165d594c1a455f99f99c2700237957b6 (commit)
  discards  333b0bc7055efb1369fa6cda0586e68553c8ebe3 (commit)
  discards  91b3ae8e25e439340421573b3a270648a39a5e2f (commit)
  discards  5da2e18f384f4a748eb0e440b482a444deede5d5 (commit)
  discards  585e9da0e2262c11b7be1a728f88dddb31c2ed0b (commit)
  discards  00dae1a7ccfa4b375c2044b8a435b9728ac46366 (commit)
  discards  5fdda16a1b39d00ab50581ef14430188e0cebe85 (commit)
  discards  e2360a21863e56dd789e6faa4d61f3d06c15efa5 (commit)
  discards  c21e1b39cd4d319699f43c1bf2667adedce04d36 (commit)
  discards  faf46fb0e3ba96dae42a1603b9b9dbf18bb77b33 (commit)
  discards  bf249fee1180546d8cd1b563f05946a72940271f (commit)
  discards  e8af2e89b0b2cffb45ebf3894b0817cd13d462dd (commit)
  discards  6452291c5cd51cb6ea611b0cfcfbc1619c213ae8 (commit)
  discards  2a6f4b082107d24141a7478d9ecac41355328a90 (commit)
  discards  93030679028c692bb96fc11c8e52e8f145dd1e30 (commit)
  discards  1de07797a39e03033f4f8cde7be3b4b6c4c5e816 (commit)
  discards  229e7f8a25efc971ad6869787565f96b3c167a7b (commit)
  discards  97d65a7ecf2ce711c87c53ef7be205b9b987efc2 (commit)
  discards  884eb43e9b752e15f80f5ce69bd18388794f5adb (commit)
  discards  e58ec8faabd019c0a13219cfb86a5585a67a4b66 (commit)
  discards  26d88d323f21fa292b6a2990f3522e7f87ff0787 (commit)
  discards  7998915e3bf8aa18940d488ec3238b195615723a (commit)
  discards  003099bc92fd3f0cdd97e7524900f28a84db2a5a (commit)
  discards  fbde295974f8dd6a04bde1a48e2cd43034b3af98 (commit)
  discards  8ccdfb754a5f3b4c74b7725677bf0900785fa47d (commit)
  discards  24fad5b0f0ddd90bd6fd6c47e263527e99299dd3 (commit)
  discards  0a129deab731bd65c60ef5bd45f1c865de601e78 (commit)
  discards  e30db74ac6ae38de0f76f95db26a3b81606e32d9 (commit)
  discards  16853cc3dc6fd428658f2a976fadfbbc82ab7af6 (commit)
  discards  11911857ed48cbd5e1c71a8c646e90e033cca99a (commit)
  discards  12378c07b22829b19e1c7ef47a3cda4f213164ba (commit)
  discards  bee7a4441c7d2a65041eeaee63131ea610c6ecc4 (commit)
  discards  e86309701d5d613a74fc8153c67a142c449c1d37 (commit)
  discards  3ef9d2461099cbfa69689df2ad84aefcbf38e34a (commit)
  discards  2a8dbc4de0da103a064b0372f1ac8481664f6e83 (commit)
  discards  74f7ccb53dbe088315bf558f3ed0f917b8a820d9 (commit)
  discards  2b131bef1f3b7f0b85ae10974547117f9f647de9 (commit)
  discards  43993aab796f7a91da26f228c8fc026af3513108 (commit)
  discards  adfbae333bffef484a851a7e6c97d5a8ca459bc5 (commit)
  discards  6d42ecb5775b3a9b83e96b3f8db2c62a0f5913fe (commit)
  discards  d71d2d58dfb31a670e0c19ab5a17f5152b04d676 (commit)
  discards  89b62475deb926de0abac3130d02a1b3d6fe219b (commit)
  discards  5d6f4b8df932f684ab590174993c046d5659e399 (commit)
  discards  166aa7af334bed63966f64b46fcac7ddfca952b1 (commit)
  discards  f63f8cb58d53d9a1afe06a48a356c35d86f6ae9b (commit)
  discards  35c50cda083346dda956c8efe0b92c4745a84482 (commit)
  discards  44560cfe22c12ea37199e698e8354904f9ec5811 (commit)
  discards  60330aadeacaf101fc72c1c22015be8af7fd46fb (commit)
  discards  954b488d95c741596e6102d6ed151be90d66c667 (commit)
  discards  7057d680899acd98d7d8c1f700d3e0845251dd7d (commit)
  discards  b9d228c839be235b02eb5d8c8b8e713692ed6295 (commit)
  discards  c993b54d2825ec241f08eba214119f5347944fa7 (commit)
  discards  f57487c0de4735d1fa995d28a4262cd093046564 (commit)
  discards  b704a70345c60887b39b438cadd29c9d2f08abfd (commit)
  discards  e8351d01690f1f06e22827673d700120a94e388e (commit)
  discards  4e2ba4659441c6724c26c5b59a054b623c47d7f2 (commit)
  discards  203c5567d04f1c925588e54b7c0c1c002219dcaa (commit)
  discards  c8a7fa16f5036b192ba98c646e08b88d97b7382c (commit)
  discards  24f93e99d832b9194a158b2f5605a55580b12c52 (commit)
  discards  b7728743f9c78ef15a0dcc30b9f22e44d0c65fb9 (commit)
  discards  1a99eb71ed71060d4152fd4deca7edffee197d61 (commit)
  discards  3787c8703cdf5ac481b3d4aaa8dedc5d5ac9790c (commit)
  discards  ac81846d83a3fffc007ef6043b004bbb7a244a1f (commit)
  discards  e9312e3d62c94747351f6d054e260db57a14e01f (commit)
  discards  68b7a08265a098a336f59b6a03b5c1cd83c6fdd4 (commit)
  discards  38633cced6a8d0e72a930b36fa899c865f3c5184 (commit)
  discards  7d085383fa2ae270fb1046dc8a335f5e6f3f44ed (commit)
  discards  11836f68df2a2370f87b3a11a743148bd2a6949a (commit)
  discards  704fbe08de5af1aa788282e1e7f6933d09b49fb7 (commit)
  discards  bf2aa215bb7f85fb78ad6e32ea55a07912db85c7 (commit)
  discards  7554c8025346ff44c43deda4b0782e718558df8c (commit)
  discards  4d2319b68ef712516dae37a280807c86b31ca256 (commit)
  discards  9dc1f849c6affec461f9112fca2e92e73268d533 (commit)
  discards  b2ba8a917d2d89ad5c43c855d510e9e39b7e7e0a (commit)
  discards  62962cff865d4c8656609d59a41252ece2846c9f (commit)
  discards  308bc4145198d6ae54c09d1be24f40aefe11804e (commit)
  discards  f095fdbba2509ad886c1713e1b286bc774726125 (commit)
  discards  7797c9c97b63e8e7ad7de9ad6f6ab995f9c1ddcf (commit)
  discards  43bacced9aad5ce4129290178bb3765cedeb2be3 (commit)
  discards  80afb179e9755baca949e9c7424768a7ae40650b (commit)
  discards  6edc86ff309de6a2322ec201d6f833159ad408b6 (commit)
  discards  d50bb530ba4db134a0674a17908bcda9ab5d1537 (commit)
  discards  c47cc24981b873ce0a22374512be67aae9c1a4d1 (commit)
  discards  67033efd33fd5dd0dd2cd6e6dd7623b9f56dc166 (commit)
  discards  691648d421fa202f070e1fb4409891eac58cfacd (commit)
  discards  b5bc9fe838f2012967ce6534328cd302b88dbbef (commit)
  discards  92f1ccd9c8060338d64f86847cc06d733a14d258 (commit)
  discards  e1a732f9fc89f451401fd497e1c76479b641fa55 (commit)
  discards  a2b7b1ec3a449e561d1dd9c65a26bd5023d4fc79 (commit)
  discards  63b168329acd6e491d296de560be11e6c5322304 (commit)
  discards  a8ad9afc1d37102a11bd957033f9f065425d6bb2 (commit)
  discards  9ad5d3a866edf06012af697a8949c6369010a44a (commit)
  discards  ac05313642c35cb3cee047d897614896bd7ce063 (commit)
  discards  ca67de7f3bfb0947024441b360c427b487c959cf (commit)
  discards  2b0cb5307e473f0d168128a283568814198f3454 (commit)
  discards  e00704afc2453496edc759a14714cf2eec96b1a5 (commit)
  discards  d6be2feb81a87aec7b5d22e017101c05c404947f (commit)
  discards  8f8838de833bb293c7c2e2718916ec7389096aa3 (commit)
  discards  b0e7c8b3119d8e4157a35846fc9c08254036b40c (commit)
  discards  315f7cd6ad06a20b04a99fac00d7477bba0e5bb6 (commit)
  discards  ad3d80b5d899465dac9821d98cd65199f8c6d9ee (commit)
  discards  53554f792e8a723390e745b01be5ac473013c281 (commit)
  discards  572cf0901cd24a29bef4ee47db212d905b0db403 (commit)
  discards  d7aaa481c99eefdb4088ff1a6c3d39ba7ff54e2a (commit)
  discards  d4682cd5aa51d282af7bcf1ffad050b9bd2321ba (commit)
  discards  342b338618266360ddacc2eba3557f51478399ed (commit)
  discards  58684af31446487f352a22120a8ce3de2cd935fe (commit)
  discards  108dbdef5770dbf289c93d17c95834f104033744 (commit)
  discards  d403585544108ad363abee509aca3ec4c333d8e3 (commit)
  discards  c9f6b5dc97b82d5fbbf1d45e99e3f2bcda052768 (commit)
  discards  054e13e2db7a6054e0014022eb319320ca78a137 (commit)
  discards  3fd185801ce42f1267d9463abeb37913bd56eabb (commit)
  discards  c1a69a460d2f3eb20ff7c3ed25ebd699e4f6fb66 (commit)
  discards  63b2059ea92974bf2162ba2ee34c930906b7da9e (commit)
  discards  ce7e0688d1792550a92cdb0530474160e7b20948 (commit)
  discards  507f72acaa17aa336e928e05e1e3cc7d49c07bd1 (commit)
  discards  5d1e88d7ac9fa35481b6acb9a2523c364dfd476c (commit)
  discards  dbcb4464ac665b238087eeecd634d7ab51913713 (commit)
  discards  2fc23bc53942df11b9107772eebd9f9a4b2c62a9 (commit)
  discards  1fa54edcbf30fed8df32f30e0cc4466af6775436 (commit)
  discards  d536b447c65401b0a3e3383d4aed457d641d468f (commit)
  discards  8a2406a57e01585050c4d451a209eeb16d83b106 (commit)
  discards  295f35d4a302e844c9acf7277122d9d2308f262b (commit)
  discards  e7c86afe9b8913a8b76c75fdcb83b85f511949d2 (commit)
  discards  12c3fcde52e8bdd5eed37e2f07a559ca72e5cd3d (commit)
  discards  ec38bf5bffc3abb491ca90aaf78276eeb222fef7 (commit)
  discards  de4f88673bc6ff7c342d98b3a6322ae1a2cea710 (commit)
  discards  85615c055a275edbab3c8dfb53f563003ea21841 (commit)
  discards  95423594649a7df0fe254c44379b48c32e0183f6 (commit)
  discards  83b997d41a65361e5bd56c601b2896146606cc96 (commit)
  discards  82c1f16f8c74f6cba2cf2cc2e98062559a0c072e (commit)
  discards  7d2c58c859f3f2a0ef0291a39b6496ae3655fd53 (commit)
  discards  991e27ab5a6d3b245139ace9fde4a8efaae2f109 (commit)
  discards  4f7a93d21a9f9be423a9977aae575b0356246506 (commit)
  discards  763a73ba7bf964ee67a3f89241426ff194bb3cd1 (commit)
  discards  8a99f6d24c67cdc2ab68c18cbe4da7174f9a8b62 (commit)
  discards  89eee4640c4429da70ddf32689d80e47c07213fb (commit)
  discards  833be0ef44fbdecfe7785693396c69b9ebb9bd80 (commit)
  discards  109cb9a679b71f61829745c86b1d1aed153a049c (commit)
  discards  88b6f02a1624d03aad79a7fff41e0c85b69e5f41 (commit)
  discards  76e4fea2e61b35f16982973c8b25d954907c086a (commit)
  discards  abf480d40e0f5b628ba7c91efcfd839eb1f6a5a8 (commit)
  discards  dcae581eee3c3ef75f0dd5d8241e8ae898e9db74 (commit)
  discards  8ec6b905a24f367e12486e39ef47ef5d2a3ba495 (commit)
  discards  52a9b25dc586855b12f9b800c5ec92b25a60b45c (commit)
  discards  3ccef8a62aeebdae33d860f493a1d102cb033b61 (commit)
  discards  833e0523e54a9ade85f4f5aae5c331e2b5facd88 (commit)
  discards  9a1806a4d0a4c12ddabad06f16719dd34893d2f4 (commit)
  discards  c4c6bc8962120c24dd37eadabfb58d3a69f023a5 (commit)
  discards  2ceef36bfd7eaf937f2a3ffc387c2be160cdb31b (commit)
  discards  1ad0a084548422430887a0ee44ea456030401c32 (commit)
  discards  a29387483823040d0d754d300333098c68e9f823 (commit)
  discards  3d1166d1f8f61da181e3374c4b900a0fa2604035 (commit)
  discards  7a57d3615f4020783e44f06c3aad4b24dbc342d3 (commit)
  discards  0753c59f4551e65b9f6d422def093f55da338ad9 (commit)
  discards  3dfe9c05dfd7eb52e3ff6dc8da0d258070bb5fbd (commit)
  discards  870d4341f25524a1c58a25e2289f8c00ed584845 (commit)
  discards  d3f9a669e35cd7002bc481e04580bd26189e438c (commit)
  discards  172a21790ba117af6a03e35c69213a89a5cb86f3 (commit)
  discards  ceafbeb10b6ecaeb6e30be58a62025382a3d8cbc (commit)
  discards  b142dcad64a324b652929f426e2ac59a32dde0c8 (commit)
  discards  55d86fe893b47d5a464e94aa25b055dac65f33ee (commit)
  discards  60e4e1924e9a23bad42cd5130cedb0881cec6c0b (commit)
  discards  a66464b9fcd1bbae36ba5daf31c57c64cd030fc5 (commit)
  discards  a51db76d50082dfceb071cc14f8138400544d19f (commit)
  discards  3159f3e09f9a7b241bc09c587a16b4ae0c402c51 (commit)
  discards  5ee1e014643e51769c709a7cf3d54b3ff7e3262f (commit)
  discards  924c5ac4df84d99578ffe9628593578190a3e2b9 (commit)
  discards  8fd90bb8c5609308ab60acc48a9674dcd47b42a2 (commit)
  discards  b8cab7ab603c1e7d050241424ddb8d4d693d669a (commit)
  discards  40d76cb243af425872eb00beb086cf4f10b4aa92 (commit)
  discards  41ec14b9b24271d79bd14e806995233d4d7ac687 (commit)
  discards  df7db2f989140c4c90ae2b4da10a9c21b1412d92 (commit)
  discards  2fd79f500ee68644bad8ca7a4a780cf69fe376d3 (commit)
  discards  805f726cc05104a5a7234f0307cec9e9cee098db (commit)
  discards  7c404c8261b4d7d2d6c41fcf2aa5c992366997b7 (commit)
  discards  384d6dde2674ff971c4bde5306637b443bc96abf (commit)
  discards  3a10e1458d48b95dd4a064e74e15d3dc7f08c311 (commit)
  discards  532974435f9b723aa6f8f52ffc0cfed46c91d421 (commit)
  discards  b39c01dbb626bbbf2ce145311824997ad8965b33 (commit)
  discards  00055af64dfbb8d6d797cc31d11a8152f2101eca (commit)
  discards  3a379e4c0669f66563f30a507ecdcac72fe44859 (commit)
  discards  daf3f0f7090a38bf0655cc858908de801649beb4 (commit)
  discards  7b20344c1532898e021ae4afb44b0ac7e9fe0932 (commit)
  discards  db60a9cc008402fe3243e470131f80017b946f3a (commit)
  discards  83ef27fdf1bb1c23a1bf57d27cc4dad3f1f4a729 (commit)
  discards  7eba9a95f811b63b4ddca88ba320de03280fb640 (commit)
  discards  4d73673ff03d1f60314eac2fde5db6483db2de1c (commit)
  discards  0bc9f68549ca9d8420e93b1aac0ca88478cf276d (commit)
  discards  044833f9862b3c5657aff6d5e939f6e1c6cef8ed (commit)
  discards  043e3b04bedfa2050d023eb91e961dfe6a489c5c (commit)
  discards  3acb236e86a081e522417b0881f87d08f904ee3d (commit)
  discards  05358225bec5e483fbc5c39e7b2221c2927aabe5 (commit)
  discards  91dd5ba7234299e15ea2db9be988c4a9409f1d4b (commit)
  discards  e64d1fa914fff8a8114f15e8ffc641e69c50f551 (commit)
  discards  d8ab6a7b12c2f5c89f20c8c2bc96e0ace161af43 (commit)
  discards  2d4b0b35fadb0d16bf4dce27ce358e413d52aea5 (commit)
  discards  7855f91d3195cfa79809b807d172f23610b0b18c (commit)
  discards  b2013981aa08e41ee8e122835d592a0aa297e1ff (commit)
  discards  681a35f22fc69811e87132232b911d4d8b4f27a9 (commit)
  discards  f30c8d2b441a79c6198be95de9ec5f550d64639e (commit)
  discards  83fff0acbf438666c430257a3ec59c7d9ba5c415 (commit)
  discards  3e1342f66a7e77baeced473728b4c87edc2bf338 (commit)
  discards  48f303b26f68fdfc0ac6edbdd075030ec37993ea (commit)
  discards  b997ce4c9f57ca3b50cb93937930728b59a69f5c (commit)
  discards  b69e00ef11fcb1f5be98c89521c5b68606dd6ccc (commit)
  discards  b2b45dbc92f9035986a0243099b4b4158873d6eb (commit)
  discards  b310a8f3458a88856539d702c700532018e4f2ee (commit)
  discards  c1f423e58a730dd9b97671f771345d1729be16ac (commit)
  discards  1f123a85461e1e91c361a4c6960cb8fd3cf5b8eb (commit)
  discards  355ad2ff51df36120b703729d75366c9459fec93 (commit)
  discards  ce04885e702fc43249723e4ddccf7754309b1308 (commit)
  discards  b3b7311cb83d335afcff7091f9f2e96d3d363ea8 (commit)
  discards  014ea4ea7a1e89b820ec26c3fad3cc9cb679247d (commit)
  discards  44f28f251662b3698241fbf9254bece31524293f (commit)
  discards  3a4c05e38d92e47507d5f6437fe378d93d76dc61 (commit)
  discards  82d0b4cbe30859dc26caec2f2e6faff11febd806 (commit)
  discards  2d1d12bcf498a3e7a58ff7d11467c89c77e29211 (commit)
  discards  b995b1706f8444b0eee51463b1d0b47c62c81515 (commit)
  discards  d38b825e354a18b334f0557b873b6850fa41e9fe (commit)
  discards  5497b5a41645a1df739fc0dff1bfcd5c57d04173 (commit)
  discards  f137f00243965ee0f7312f8fcafb8b233689e199 (commit)
  discards  568e75e2001297830f836c817b808fc6d5ac12f6 (commit)
  discards  63b7ee1583b6ae3cdf5566b90d86454730ed61c3 (commit)
  discards  5222eb6337fe0f7959887204b261ecb57b357bf1 (commit)
  discards  38e773e2c6efb2c318165964bae4aa95a694cea1 (commit)
  discards  a2d5323bff7ede7cb62407c7ad69f8431860d06c (commit)
  discards  ef02f50e55b46ee9c60b0a3f49065461a722b0ae (commit)
  discards  9119441562ebe7b54b6e2b7d7dd23b4f2d4deed4 (commit)
  discards  e9a218891cba249df9fd0612d1ea95b292e63833 (commit)
  discards  640a2de1a06ce062809330538db9331502fbcf58 (commit)
  discards  5932837d98e99edba95af45c4880ed507dc5ddcd (commit)
  discards  f80c403068a5b98372da6af88263af5dae3ee095 (commit)
  discards  f0f8ce3fc4da5900a7c38597787724f83addf982 (commit)
  discards  3aa2efcfb4b2393b534b34bb0f5d5b47ccfb6f9a (commit)
  discards  07f329d2a9206332714f1de6fb15747c2e615b78 (commit)
  discards  28c038f28d8594b2604b33e709a836063201e3e6 (commit)
  discards  ab3724d4200bad5803edc9d404264466d9b2ac5b (commit)
  discards  5caa629819570acee67864331c453c3535c1c77d (commit)
  discards  056c6d00c251bec3bb9e542ca09a2d83254cdbab (commit)
  discards  2391aed0e2100d7cfa17738635729f371f99893d (commit)
  discards  5ccfa1a41c046c9f0db384fda3151d815131dedc (commit)
  discards  61bf98d1fa5b00a1769cf6dfa7ef2bc4723f0004 (commit)
  discards  29ac20ebcffb58b610b6713fff6b9ea475a86842 (commit)
  discards  6ad4ea7baa433296f82133898e6eaf45bd6cd08f (commit)
  discards  c94dec14b30fcff16c91df0102ef96299e0ab147 (commit)
  discards  e1a72359424392e4417a403222f4dbb49152eae9 (commit)
  discards  1e3b22f6d1379a14406a3a3a89c504a7bca2a863 (commit)
  discards  1e97629e39c01a41a8343a0d2b5cdc7ea5e472c5 (commit)
  discards  1ac9e00e2707b4b826383616158a7b306c2f2b74 (commit)
  discards  23a7d0babd375e57c60e56ee1434aab82e2b3bfa (commit)
  discards  e8046d7779247b31ee651abfcbe3be429aae4190 (commit)
  discards  5a919c2389342205c99ba51f6f8ef57c978607b9 (commit)
  discards  0fae1c377fbed45b45d8a1b5a624fa6b6cb297af (commit)
  discards  5dc6ebb7cb65e01efe4d8ee9c3b6ed7e5c81e5a0 (commit)
  discards  09345b773824c5ae0f4b232218c98f6d9b405335 (commit)
  discards  1a6837185a13bd10fefc22e73930c7623a845ad7 (commit)
  discards  da4fd959e23e6775e31f7911d56f6f862279bb6b (commit)
  discards  f5ba69f99b7d2620409c9fe650a39005120e2df7 (commit)
  discards  0efeb967c31ca2ab2fb38ffde27f20349517c423 (commit)
  discards  142f26c3b782fd558d4d0d11756516b2380b67be (commit)
  discards  84533831fddbb42fb04ee9b193ea6ac3c67ec064 (commit)
  discards  7b9ea5012013c6f8c26e19084a1ea66136b84939 (commit)
  discards  1f30b2e8dfdff2379cfc408bdf5d42aa1ad9092b (commit)
  discards  434e29a09cd7ae7195b30d3311290cca7cb0e007 (commit)
  discards  be3425b53e9033950a71dde897e7a47a2f7ef6d5 (commit)
  discards  c7ca73b16e135ef599feaf8bb4971ba434ab0a31 (commit)
  discards  c2b8218563aa73173833131b1b107511f765dc28 (commit)
  discards  c1528cf8ae58cf8b37c3e0bd6ecdb1e18ec4b7d0 (commit)
  discards  541191bf9bf9da11893f4a4e0aef7315db8637ad (commit)
  discards  55d6c5a91f7261edcc1e62866fa186647f8325f3 (commit)
  discards  82a256e44096483fd8c09cffc7faf8f519298ff8 (commit)
  discards  9e18e80a4235f5c8ff453057ff58349a1171fbac (commit)
  discards  9477e5fc3796d4e9d4e66a78ebdcdd9855013a2c (commit)
  discards  bc61da9da1eefbca0c01d53a0f409d38de5aa418 (commit)
  discards  ff4fef0db4e585e543ea270bf099791c65692143 (commit)
  discards  2ef3f2c2b67f47a8b649aa1c9b83cbfe4b81e674 (commit)
  discards  c057802e482031a7a05e86e8fc0931c1ebd76ddb (commit)
  discards  484c49d69550d895ac90570f594bab6ad611050d (commit)
  discards  975108b7b25b3628868e438384ca7cdbd5c6888f (commit)
  discards  468f4c8e856221bc34eb5b21936d9ae4f8db74f8 (commit)
  discards  2f76a6b7b06467fd1080c7b80657f1f9f30e6c23 (commit)
  discards  59e6bc2cb25956eabefc11bb1a50952a4078dc71 (commit)
  discards  f286bc11e75e18b11c3625e85bae4fc6f61c5ef0 (commit)
  discards  2cb5708a212e532963d70795d234db593ca5a892 (commit)
  discards  aa8cd1ededcf9770759f7d9b5cae7f2c58cd3908 (commit)
  discards  0402b578f22fc6a8c982e2b0824dae25c3d9bc3b (commit)
  discards  b5a805f2f36aaeb183ec7a2e9f7b7736381a06ff (commit)
  discards  010092def04d5cf9cb37d47a4b1d0e5901a23c7f (commit)
  discards  74ed9a8c5943e043ec3b24d9f55d900b26b61205 (commit)
  discards  812496a6a94eb46290b63a69a831658165893a06 (commit)
  discards  6abd2a91bd952aab90b8954d44284ee670916afc (commit)
  discards  e06e2c16a14b2095fb3f4aed5cacfbe12bad1657 (commit)
  discards  0f7740f1342241af4a82b67379b12c2e88fe97f7 (commit)
  discards  2045137c5a2c98fe92bd8f67c50c55397c176854 (commit)
  discards  32857d96bf17ba9943c26b3ae42eb744f01efa4b (commit)
  discards  f5ef691b27eff45bd77b5f09e86a0bc9f69a1b4a (commit)
  discards  eaeccc5fc9bea3227c3bf1d6a4da915fd1eea627 (commit)
  discards  6e8c521268f4aa496e9aec9130a1f4d9a4654ec4 (commit)
  discards  dbe3fc87bd9389ea028b9f024f5d5d15ed81de57 (commit)
  discards  84c26be931f7d24d51c478e52753c3c2204f7389 (commit)
  discards  90cc6d71587a98361d7f627ea560ed654d41cd88 (commit)
  discards  4d868e122b49e63e7e0ad2474e631cd059858aa6 (commit)
  discards  a9376c9020332fd687d8c3a9e35373fd6d0d8e3b (commit)
  discards  66826cd41dcea7e43d8ad74e9167f8afd285d364 (commit)
  discards  e59ace963a314a3a4a9edd324f5f2103945fd6f6 (commit)
  discards  5b810f62f12feabf0a77265b68ac5d33c6e7161c (commit)
  discards  b50e351fde72e4054607a0b248361abf59c15364 (commit)
  discards  03c32aad6839bce09cb8398b16e8bb9ae0758390 (commit)
  discards  07a71c9e7f2e11c5b87bd7f4f4eb8b8042fd7aad (commit)
  discards  1dc15ca4be6f66cfe33c86b41665cb7c4962567a (commit)
  discards  09af4381285dd5f0f44ca30aa3443bafd4317bc8 (commit)
  discards  70d6d5f03ccdce6373add0bc3bce95281cf1143f (commit)
  discards  a02d42580fb0da4378ff3fe512ca366b55f03ed5 (commit)
  discards  72a12fb34610456a4be3cc00540f6c9e90f9bf22 (commit)
  discards  06d21584b51c2de5d520e3d201053a2a7d0af5be (commit)
  discards  ef14e90a3fad93cc61c05560c364b8e22b9cbc92 (commit)
  discards  3c593df0194efff4e9b83a179af8fe1e71f2aef3 (commit)
  discards  b315ab28ceabbf3735b54fce6cb0d894d2adc773 (commit)
  discards  599eeb0057688f32a1f4ee26993d85627af6c52b (commit)
  discards  3619ae8de984c60ce34c3471ef95a38f61eeaf99 (commit)
  discards  0a6a39952fd764fc005041806dccb4945128be74 (commit)
  discards  afeb51082864437d99ad97375f24e1f960466c49 (commit)
  discards  29450b7c1f9c9f9a3c64d49e0c53c28590247276 (commit)
  discards  fe8eb21f76a0a61ef19d48002958757ece0ce298 (commit)
  discards  572f5cd0f989be995ddffee88cad9fe465569cbb (commit)
  discards  2f67bcf5266384a557dceaa17161616a5d2044dd (commit)
  discards  54391ec936461f964127223c2832fa7a4f297f14 (commit)
  discards  d4a14a7820e7a3a2a5648f52ae7b027d1b5ed6f5 (commit)
  discards  1070aa3f78dd5d8b78080cc3921a8d786799493a (commit)
  discards  d0681b13d8785d1aed8b520d6be11e8f83dbb5e5 (commit)
  discards  aaf9b53f2ec25dbad9df7a457c46694de3c10d83 (commit)
  discards  cf7c5a0c7b11b6622c1e475be267a550cacca78c (commit)
  discards  2020cee1a8030aa2cc762216fc41f79a58e9ed20 (commit)
  discards  553626cab6cb2a9173422359f2e1e62d1912c6b9 (commit)
  discards  2c96d8121c0b5d524d432361f1e628eccffd5f72 (commit)
  discards  5355cb142ed77f2f4ada6a0d5abc21f09be150da (commit)
  discards  8d3c59f6a1e48f3b5788860933fd6ba9e53f846b (commit)
  discards  c9852e1ba279747a4b70eb4eadd781695c72073d (commit)
  discards  676b77c77c611b1ac58db420d743ae1b16ca03ea (commit)
  discards  01066f3643a68ed4bb67504f3809f1c82e6e3cea (commit)
  discards  a8dcd688efb9b9fbeb0fdcb57dd0818a1542d621 (commit)
  discards  33abc98e41ac1388f48a27575a94dcefddf100bb (commit)
  discards  42bb8d70c1ce9bf9b3230cb06b7bfe822048f3fd (commit)
  discards  8337df7a3e04e0a602c136307ad784a7399789dd (commit)
  discards  9a42299207bf0df4c694ab4396752a26ca86c3f5 (commit)
  discards  cf74b910b77c173a543910d01b2240a9c9c6fd54 (commit)
  discards  0202752dc07a9b34620f023a8acd572614d2f0cd (commit)
  discards  3389e78806c07cdabadf556c19fda84379644fca (commit)
  discards  0891463e49665a6ef5b325585bb39016cbb6326e (commit)
  discards  4465af8594615f2b913d1ee92f571da27319994a (commit)
  discards  3c383a3d45b67d74b365ee51137ed7da3a3a3e38 (commit)
  discards  29a8121ffbc39629b15b5210b30ab9851800f49b (commit)
  discards  a6101179de70dfffbe4a9f8ca37a7b5114e3fe2d (commit)
  discards  3bae6910db6787463cee904bcb62aaca533238a1 (commit)
  discards  e591a1131a651503cd46e37a31456e13b928da51 (commit)
  discards  641a3e3f88314ef78a27c55f92a369c844a24b4f (commit)
  discards  da68b59e51199d851b8d956cbfbdf8c8f2e487f5 (commit)
  discards  ca6952860c9fda285bee5ce7c199cca0ece1c519 (commit)
  discards  f36f86bc1afdc548dfc45ebf602f2869346a1f04 (commit)
  discards  586c866adc831e902a41ecd9f06a10ab7f1e7a57 (commit)
  discards  b042e8c3c02d1e054881271be331af01c5afed79 (commit)
  discards  3227cb17227ab93ee066799b93a39490e318d2d3 (commit)
  discards  e8ade3a149616209617bec927abdb917304d5a99 (commit)
  discards  856b08211b9d112f4992e4939782eb8ed0ded094 (commit)
  discards  ba5c785567b3af2c3221f5550d5561e4c96f6366 (commit)
  discards  44e1fd0af4defe80e903a18d72e5ff8488b0bc42 (commit)
  discards  646eb9b2a5504e4114b87cfb60cec292a306ddb2 (commit)
  discards  28c028e5fb5d0f542a74df738b4658d112c49b95 (commit)
  discards  24bc47b6ac2b29d32157d56a05c92b17af9cbbcf (commit)
  discards  8b4b2ca686abfbc4f74496c2c6a17c1fe3f646c2 (commit)
  discards  5aec9ec2daa282453fffd8d382876f467936a277 (commit)
  discards  f6cb54884b64cac39a4a6799c3572c84997c7dc8 (commit)
  discards  03230b4b5cf33762774ee425373d03940225658d (commit)
  discards  581b046dcfc911310c1f211254b794d7569625a4 (commit)
  discards  d82e2f2329b71885389efa3d93d4135f63382158 (commit)
  discards  82e0301fc55157c88ffa10c5800e426d5b7348f4 (commit)
  discards  3c43441cb4df12b9f07414f3b51c31adf15bf14e (commit)
  discards  022ec2434d23adc7e0a3bae74306d64649ac8a96 (commit)
  discards  37a62d1369d416386f17c4d45b68dcf8806d755a (commit)
  discards  c27ccf3f4bf1ff5c0460a04e5eb922aaefcca102 (commit)
  discards  09a2d64e53add41e64b6fdcefb8fb27a572bec5d (commit)
  discards  7adb2986543d84509f02d39f7c1bdeb74b2a2c0e (commit)
  discards  9e7d00f54032ceacafa586e709fc7b1a41f6f268 (commit)
  discards  e3df38c4525346736a3bd509bed3dd0efc187b76 (commit)
  discards  769f02cab22f0679b53772589b22d6fcf0105a45 (commit)
  discards  180d845c33dfcc4d68ed568ada35f97668f54095 (commit)
  discards  cabaff038464f5fdbf1dfccfbcbd59de352118dc (commit)
  discards  cbc46dec0195c886c04fb0f9c10a332879695808 (commit)
  discards  34b34978cc19a5cb359e3fa6c5f9212d967809a8 (commit)
  discards  f62acd003585277709746eb63bad8e4ad4ebf062 (commit)
  discards  cb3736cf935f99acf0b5ede08fb1208e6e874279 (commit)
  discards  cc9fb54cf9d634c7f4bc04b5350a533d95d4aafe (commit)
  discards  bf80323e4e8f95feb87d6869c75f2cb44b077481 (commit)
  discards  d6e9154e368d61f355c897fd8d9374a416f01d78 (commit)
  discards  10d3bf00fa084984dccd6ae6654dd1028969d150 (commit)
  discards  7a802efbf4512c9038083a786be910078f058f7a (commit)
  discards  a3e776782e41fd6c26ac13319434a9027c010b0e (commit)
  discards  eb672500311c81c1922399cf6095852a0612bbef (commit)
  discards  f2bac56eaa50204f5f2ce188607f622e7bff633f (commit)
  discards  f8845e56f4b494189403bead9186257e84b99969 (commit)
  discards  d9077d198e9cd0efdaea3a140cb7d5ab9ca833e5 (commit)
  discards  3f4567550c1bd7db5b55773be46a1f08de19fbb8 (commit)
  discards  a0340c21719bd16512bec3bca20e0f25704803c9 (commit)
  discards  408cd6d1aa7f6ed126b0e363843b4b390cb0d309 (commit)
  discards  8af6a3f58bcf8d9b6b6754e80d3f82b3d29ec896 (commit)
  discards  c4cf686c9c5fe59e79ef0bb0e706c70748fd62cd (commit)
  discards  54818a44c0d7e5b076b6c6d0dc15413167293297 (commit)
  discards  81270fc8fd58da00bde1e25334fdfc6f2e6f1302 (commit)
  discards  b094dc58b8bab0f594c517092d1a52e9b7641ec1 (commit)
  discards  8146700588e76aee4c02dd16bfb5f786d7d3a8e4 (commit)
  discards  291c02429ce1df2e0d080c85562319d8a9fc5d9c (commit)
  discards  6769105151ee3e30b51d82f4b837e50a530b7cc0 (commit)
  discards  a485d7e5d7e19f45f2bd01f1b5f0598c0ce670cc (commit)
  discards  8b953130b0c41258944c9de32f2324dbf8285c30 (commit)
  discards  f9d17fe94ccbfbee0c0de0ad405696d1051335be (commit)
  discards  f88a82607f2394e9ccb8e7fc6bd8e5797ce3d3c8 (commit)
  discards  ae4af61668e9ebc38eb8a8e85f5a0af3d6517d89 (commit)
  discards  7805063ac86f4b85350d5a8033cf8d897beaac78 (commit)
  discards  3747f839a66de5f1bc678d3d32867d17ff95703b (commit)
  discards  5571f336c94e580cae30d6dc65aec2b2d92c3b13 (commit)
  discards  fe78b21c66c9dc9e3edda70c9ef705c0b005c5bd (commit)
  discards  f2b70d0d37492c580a7f76cb6db22c667d35acbd (commit)
  discards  f47a1907e683e7dbf09dcce92e314abb34c71d98 (commit)
  discards  dcd81731fa862f1914129392c9ad4b216b7ea62c (commit)
  discards  2310dfdc144d32666e05769e2947a61828ee2a2c (commit)
  discards  4b6cbb7dfb21f2cb684796a9711d8c8edf312c19 (commit)
  discards  9e7ae5f1be633f3241f635df0a9dcc3465c21348 (commit)
  discards  a2556feeb11dc3b758898bdc8ccd44a063401f7d (commit)
  discards  02493a5a171bfc1077703982a3bafc3e2b493ecf (commit)
  discards  b48810b703bd8a53f3739440f936bb95f0f052b9 (commit)
  discards  fdf759ddf39fffe648bc05aab840cd859c47bc71 (commit)
  discards  1c92c5d833fc96a3aedb1166812c098126ee90f5 (commit)
  discards  4685519531363cda73a5b1fded7edf8e9ff8aae7 (commit)
  discards  70b0cbb9e68f4e4e46a856ce1ae968fbfaf27a48 (commit)
  discards  4f8124e6c591534d26d38ccd6d2d2eb25d6a6a29 (commit)
  discards  ed34628d7e81c7dc9f982a882f47e1426a7e24a8 (commit)
  discards  f0b67e1cf49c0d181d5f2d5b6fccda68e0c23492 (commit)
  discards  1073d788a0fec128d862662332b31f2df8735e01 (commit)
  discards  809ebda37ec24c6f3484fb680860a9ed96923317 (commit)
  discards  29055df340d2acb30e28b3e8ae99be27bc742d30 (commit)
  discards  8585242bf1f51a43cc44b8178cae063d3f429fb4 (commit)
  discards  020f4663a873363527a509ea1f8caf203f00b3e3 (commit)
  discards  9b3b28373e25cef2cb452589c30695646ff8333e (commit)
  discards  9aaa69834766809ce40e72720bab55ddc58b9868 (commit)
  discards  99955e0dc8228f878d4b934d7526f54b3d92d2e7 (commit)
  discards  bc814f981c54da35c5060a888e82b8fd02ff1687 (commit)
  discards  19e5e0ba40034c9628afaa0c470b08f161284924 (commit)
  discards  1010c09cf784dc75832736ea5887b0dfaa9dff48 (commit)
  discards  a175c2f096f612d64fa0ae11bf541051d933b5bb (commit)
  discards  898ccde4de1e9ef285d2a06b63d5455bd975d2f5 (commit)
  discards  0fb452574f25304b78281011f6efb64c34f7b537 (commit)
  discards  219c12f2eefbd17b84747d2ed8a0ad2f66000501 (commit)
       via  98557c16c5a93b81f586dde9ab7b2c2e238d6978 (commit)
       via  091fbd69644e26043d1a7fe5c7a0b04d22066ca8 (commit)
       via  7037ead2bac3f90aed51861f38fce69d1d6df2e1 (commit)
       via  86cc45e3e35cfab243a441bb16e50104ead0b193 (commit)
       via  850dcbf59a6834218fa685fab34edbbb9c336ae7 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (3e6ec166b290cedc476b5c29d2f4c87b5fb0f754)
            \
             N -- N -- N (98557c16c5a93b81f586dde9ab7b2c2e238d6978)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98557c16c5a93b81f586dde9ab7b2c2e238d6978
commit 98557c16c5a93b81f586dde9ab7b2c2e238d6978
Merge: 7037ead 091fbd6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 10:19:26 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 10:19:26 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake              |    2 +-
 Utilities/Release/upload_release.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From cmake-commits at cmake.org  Mon Oct  5 10:23:46 2015
From: cmake-commits at cmake.org (cmake-commits at cmake.org)
Date: Mon,  5 Oct 2015 10:23:46 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, release, updated. v3.3.2-1412-g86cc45e
Message-ID: <20151005142346.EC58DBFA5A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, release has been updated
       via  86cc45e3e35cfab243a441bb16e50104ead0b193 (commit)
       via  850dcbf59a6834218fa685fab34edbbb9c336ae7 (commit)
       via  3187de20fd9949ab90df4651f5d1ae0d218a9afd (commit)
       via  19ce56e2746f3315d0697160f7d5e084ff1ef23d (commit)
       via  c922aa18924c7c0b04258f24f8ca888de407a6dd (commit)
       via  6c25ceb6a841c9d24090f39851e1a89986ab9d4c (commit)
       via  518dc277281cf2280f9846f2ce2039440cda4ba9 (commit)
       via  99c7c23abe6342ca2ecab1f04cf396362bd56930 (commit)
       via  2402bb8cfd63078623779a3704227915324e52d4 (commit)
       via  1be2f12cf241f0d46095e17a561cd70da49ff549 (commit)
       via  2798dbdacbc8a3c4648d61c0a73a3b5791ccf593 (commit)
       via  2775768f348bb082d1b2f1d8793f65ba832dc8df (commit)
       via  a57f5abdf667544b15bee6eb75e92fc806a6e763 (commit)
       via  fb4e14d281b87746f122b6b52de35eb5997b06be (commit)
       via  7a6c3ff01b68545c776e8917ab9fff99e3182be5 (commit)
       via  8c426183d17c0de9f04e6f03ba57bd58f9797b3b (commit)
       via  d1b87d72f964ae57966c5f02ee9e32236bd59338 (commit)
       via  458121116a05665ebc0cf6a066977c00b8e55e5c (commit)
       via  7555babbcf4b2b68bdfe99649be3b6076230518b (commit)
       via  9b5554cda122e8be179cbc2bbe9ed82ed26b20b0 (commit)
       via  487fe8c97d7067d7acf02c61ed6c8e7524c5f21b (commit)
       via  8deb0835e6dff3c15792790b95c83b3b8f8d8ff1 (commit)
       via  b7d0c33c91bdf760e0afaec72912149eadd76afb (commit)
       via  d80161b08c7f858a222ac6d51262461e5ef7b507 (commit)
       via  8f545d950166f49bebf92d270d373e7cb98060b8 (commit)
       via  3f077996f58ca905125fc2387614b24c68c6f09e (commit)
       via  b31ac171a4acdc8d8eb1d08c5b5f61ec90a9dbaa (commit)
       via  5dfc4c5f50f3198186320320cfed699872e5ece0 (commit)
       via  61c472a287305490bef2047784d7670d8354cbf3 (commit)
       via  70688609412421c3efa168f9c210a9e4e06a5578 (commit)
       via  02bc311138ad8ac0c3653e836a02d54245ae4b12 (commit)
       via  ec725815c9941967085c5b492e5a83305ccc490b (commit)
       via  59202e17ffe6925fab182df45d8d37aef6460ddc (commit)
       via  5303c187b1f741afe076aa3eaaceade086c22a53 (commit)
       via  7bc202ccd49b42eacac78d7494f7aab0599f9c7b (commit)
       via  85d7a610a2a5e5f82a8e4b3e1322c54e27862633 (commit)
       via  1b13af46accba6ed73bf2975221def388cd5e90d (commit)
       via  981068b79f3703a095f5aa254da6c7d3f997a265 (commit)
       via  e8954d0b3b6f7b29a00ec0238fc91d84021f0705 (commit)
       via  ab99010a34fe88a81b6560f53ee5f18af6e33d8b (commit)
       via  8b4873a1b025d7f47c90f3cafc93ca152b9e4652 (commit)
       via  e90f463a312e18fd6498799de1522b96d84fd012 (commit)
       via  5fdf75947822bc17d30a9e60022a4fc77b4cdf63 (commit)
       via  c824b23d15b92247f3527f1b884c23d34e6749b5 (commit)
       via  5c50b396865c2fbd61cf43c5c4c287113208f32c (commit)
       via  2cf71cbdf69564ea7d76ebe80a34c6cd0f5a5ce3 (commit)
       via  f90acf522b1a03af9b5a7bea1d3f50285504fce8 (commit)
       via  e67e0155d9dfbcf9691b0863978b441545a89565 (commit)
       via  11733d2dae0a844c2cfa5824bb1cac7b6a405c16 (commit)
       via  61bc0f7363ca2917707d57fefb52b79b0114bb19 (commit)
       via  0429c3843d6a6e617157205886b00b4aec78cd4b (commit)
       via  def90d5fa5d6a69abd4975d9fe4d07b0c21c6712 (commit)
       via  cc144ebfd8b3a7b89e07c3b22b6a9e8540e5d0e2 (commit)
       via  f23ab1a1501cf82a04b9f24c3324e314afd53fab (commit)
       via  130f11634073e259b9ea1b48ab341dc7ac2ce4b9 (commit)
       via  ee1b04110866d1e6bddba2346c0cc19507fc6ed0 (commit)
       via  6a072563d2c81f653986318882f9782469a58936 (commit)
       via  ddd082fb1fc4a771e84162bd9ef2553ef44bad7c (commit)
       via  1d11f3ca68a5e4862b3641334e26d78a50cca2b4 (commit)
       via  9bc6eb8e1f50d50bcbcf5b95f7121c31eb10abf2 (commit)
       via  1fe390201df041cebcfcb5e6cc401f8ece2d6072 (commit)
       via  59a729b2be6614427f3fd74f60412f17e6618d30 (commit)
       via  db70fcb110940a189e91177bb0e21e90f0f5e310 (commit)
       via  9298f56dcedb888ff140b6b1aab90be91162d50f (commit)
       via  ecd71c9c1a0735cb84234344387f4138a1853fa5 (commit)
       via  19c6f4eefce4f58538dd750af5d014bba23192f3 (commit)
       via  749a140a0c635dca69e03245bfd6e0f2f4f43753 (commit)
       via  1ff96bf69c06b3cb55bd41ef1a958031d074baeb (commit)
       via  fa5284f07f20e6d62ca5d2dab36ecc48c0511eba (commit)
       via  6c6a8c5d5a648b5847042f55fd36ba9a51b0166a (commit)
       via  5b4652842784fc7da2f4b9a04569bad4bda04a84 (commit)
       via  664fd4d1dad678f0e1d734d24cca777182b1479b (commit)
       via  bc92647b9179eed8b8de61a3c6785d9d96ccd0cc (commit)
       via  5ed2292d3a5a914c2c6a8432e77ecce633fbfc63 (commit)
       via  ac5ead4a9ccf9995a8a7afdfd7a7a5e46668c23a (commit)
       via  cfcd5e8518d4f729e92f66ff61881e7d19ef1751 (commit)
       via  b0b255aaa7b7c59557c9415500b6a68b6e96b495 (commit)
       via  c0574fd06731045d6c0a3a0f092216f7d2836ef1 (commit)
       via  ca6ba3fee544997b72579e97f9c64eb1a24a7fc9 (commit)
       via  4480a9262da520730e48dc1b749245a84591fd8c (commit)
       via  51e4863782f45c0cb8b89c4ae1ddf0a40e366d40 (commit)
       via  203eada65ea33f5739c99096d18619fbec0ec135 (commit)
       via  5642449a69b7e8ed0a0fbaf1607ef34ebae239c6 (commit)
       via  77c6a339af39869608dcaccf578a6cdd84d2efaa (commit)
       via  732f551187964451e922e0d95dcc21114d109f88 (commit)
       via  8544f16d1e3222b3014ee66a7619f175da8ce21a (commit)
       via  9096daaf5ca23aa4004954c0408b15ef5e6f4ca4 (commit)
       via  a100888b757ec48781d873824e13b0255602162d (commit)
       via  256c78ad4474d9e1d86b5ac420fb95b7eeb17b90 (commit)
       via  1e83a963d8983f09f5fe6fbf7d268f920b4ed7d0 (commit)
       via  12f0e13c5f546a721d893adedba327c18c5c9e5e (commit)
       via  65ff75d3f5bf117508ba046779cdad323e077220 (commit)
       via  64b78c147fdfa6a9125371c01acfdfce3666c890 (commit)
       via  c3c20d3ce3acbf6afd6a54dd846fd78b82623312 (commit)
       via  8b6ec29d4096b4ea59ef502360845e25a9bcb47e (commit)
       via  9470b056fc0be0910f90230e0635d4a2e2baa81a (commit)
       via  b7491b1cda7096aa914c79a1b2fc7768e90aa951 (commit)
       via  e791c85419e81b937f0c1215073b2d09ee6c1555 (commit)
       via  6210ec644ae3a9e602a24e87d86da7d0b2942d21 (commit)
       via  a3ceb998d7768592b670abd2a8d0dd2777c84789 (commit)
       via  dced2fe10f55222ece04c12693d68e13e30771d0 (commit)
       via  f9a77e76e4e1c19c094ff770487e677a92a1198b (commit)
       via  c3633e7a416373e6c8e8f87b4920a8a41c5afd82 (commit)
       via  946e86151915d9f55e432fb8b3672c3106f0cdd8 (commit)
       via  29ad06947244d1a0f04deaf5360e2f1d1765d903 (commit)
       via  64b7baac4af392edb8c536ccbbe2a628eeb66c29 (commit)
       via  1ec54fff11220a8532d38bccfef001afc58fb405 (commit)
       via  bc3e1e4b5586c4404591e5f01461376eb51391d1 (commit)
       via  414cc18a9a76e78b586edbd6eb34cc0060cae796 (commit)
       via  da7276cf948e62c22d39bdd2548254d18180344a (commit)
       via  6e2a4087f2ff93fcea8391963a4101fce52ee94d (commit)
       via  993d064197b36de9e18131afc4ace753b8570d0b (commit)
       via  4fa1755315860eb4103971be0d950812b27a85c2 (commit)
       via  02f95f9b7cc56aee8e4d73ea951bad34b622ec9b (commit)
       via  5a83303f50e7eadddae9bad0d13a7f751f733136 (commit)
       via  910ea2100425289ec4f13327141b5c45ede320bd (commit)
       via  ede54544f1cbaa623628317887ffc34fce4bc89b (commit)
       via  fff9434d455600320be1809c6d64577eeb21d6aa (commit)
       via  66db914adfd8cbb846fcf82e290fe006a800a36d (commit)
       via  0b38424cf26fea866c54b75347de0c5c8a8d15d3 (commit)
       via  9924a212f671dfcc2b20d2a29da23bc440247f19 (commit)
       via  a27bc0ccacff7bc590ace2ce941f0552d05fd14c (commit)
       via  4eb77a1c1dab65441808d0fb4cf7984a38d8a166 (commit)
       via  67040500ea2dbc36be89880ad732da1707d26dbb (commit)
       via  a7fe4413d5d2e156c8b9f126e713f0a1085ad1f7 (commit)
       via  7c0b22a84e59c17e588da451ced454c6bc4232c2 (commit)
       via  710bde43aa5ed1ccfbcffa01d3d86a4eecbbe849 (commit)
       via  cbfae8c3f2c971441d4943a630efe7b186ee0c44 (commit)
       via  bd189cc24e2292ab80dde7c0d0ac1cd9fafb2d35 (commit)
       via  8bfff68642cfba9de42fa854d90a7cecbc507c83 (commit)
       via  2c2479fbed07457529156be637540ae5e0b0afe7 (commit)
       via  194bb06803c7dc005d9825de13bdb91fe6b7628f (commit)
       via  c5f07e0537f2b671f271ad8ac4b6c0a529cd4beb (commit)
       via  dd408de46b45926f7dfdd27cabb4dce95708d011 (commit)
       via  8a88089bbef4d72aa2c448877637c5ab34f6907c (commit)
       via  934aa454d0029c0cba26c7f971bdb76a1d789dc2 (commit)
       via  61b48e70bc8d9add8b056030ebef97ffdb92512b (commit)
       via  02ccef2ae586ce342cb76eaec61db0e2132081a4 (commit)
       via  69ab5f55026c7e884a70f04aa7ddef776f74305b (commit)
       via  17aa6fd36284ad937bfce370cf8d5e5de87a334b (commit)
       via  c3b3284c931d6368e4f100fc19ed8f2efdebd9fa (commit)
       via  377971661609607dd2c4bd66166c655371d70820 (commit)
       via  20ed8bbd025de9af4d28979f95254018a64c129f (commit)
       via  b761e90d70435ce55d5e69addfb90ffcd18bd652 (commit)
       via  7de868c4d7c8bfe35d201ed480328f3177a1325b (commit)
       via  44f2ade2cb8474cfc3e9f593958557a8761d89c0 (commit)
       via  d13758514cd69ac10e5351f2a56b5706df6a3a78 (commit)
       via  2e6063068c94d4045e699fed51e6d1e9af344bbf (commit)
       via  81739e9215ef10d870f14404b0ec5eb4bee16ce4 (commit)
       via  442d17ef6c50a3ffc83ed6a860dc05febd85f1b4 (commit)
       via  fcd9f85660bb0de569a5a5770b98eb7d922fbd6b (commit)
       via  da7c8a8dae10a4fd2f33798bc8aec8a3c238b2af (commit)
       via  4be709a6b715acb4100fceb4394ad5215d8b555b (commit)
       via  f1365f32064d6e56c1cbdf27bb18b9c7a8490330 (commit)
       via  4da5a22774f3c6b94743951acda3c56b433f0498 (commit)
       via  40c7b4612341e4230516ef32a97449051379790a (commit)
       via  03bfe71ae055ed9e5dbeb619967ee44e5f555459 (commit)
       via  dce7d8befb94e2531d6c7d68b78b4b4a67ca024f (commit)
       via  b58de9fe2ba4ac3e194403ecd118fd54681ffae8 (commit)
       via  47b060aee0871bdb5fea63b398a1f1cb07fa3b37 (commit)
       via  7279f2939e98ae9ecfb8fda2dc82f6b0048b9316 (commit)
       via  b15f4e9b86bc3dc31b6a01c0ffc30747f467ec1f (commit)
       via  9784af1b50a142c0160058734c7e12cee5f2a15e (commit)
       via  402bf096ec4aac75af096c3708ce51efaf4589d0 (commit)
       via  cec45e27f6dc2657b00902bcaef5bd93ae16ead7 (commit)
       via  51b83f1445521a210eee7e92ed03aff8fe8e9dc6 (commit)
       via  70c0cc72f085b4252e8b3578cdf1624b36c4e2c8 (commit)
       via  71c67e83bfe65f449b69b610b5be71164e5eee64 (commit)
       via  936a95d4059ce3c57b79a1bf28dd4f2bdf26ba29 (commit)
       via  1f4358134f2cf5b9fe72088d6534084a8fb71a52 (commit)
       via  38830fc0cabb742cf95160429cc99cdb5326cce7 (commit)
       via  dd8285c6880e08e4c6cbb0e2ca1a1684df3e11d1 (commit)
       via  4f640afc1aa571a4a1a9083b62e3d2787db84bf3 (commit)
       via  82a0c7be3f6a00119f3ba00b0d1a4f73cbbb140c (commit)
       via  17009189f8bbf264b386bb610deafdd0d8ce53c2 (commit)
       via  358b56414563d2100bbbb6e482e8441d29fa8f55 (commit)
       via  bc2e54db5516ed884f0affe020e52256f0c8b3d5 (commit)
       via  ba7f7067cafe187d5f95b87c959751cdf1a8b0b6 (commit)
       via  0da7a4d4c7da611f16c29b59f48aaf484b6ac85b (commit)
       via  da295f450da2781e82632b6a5df29df6fbf7daad (commit)
       via  7c7874c86ef14f2866d38d5ee85709db6e71d217 (commit)
       via  2514e4265c1914f53f9445f331ddb7183f0d9501 (commit)
       via  b98f7712eab7fd928e7e332124b2a6fdcdfec7e6 (commit)
       via  b5de2bd9dea2d1b7bd2c128e0b1dff0f3bbda02b (commit)
       via  fd47df45030733341858fa33ee96015d64c73c03 (commit)
       via  6e3151f6ccd035ffd704d3cb0162c873d5e95e15 (commit)
       via  109a7a245acf0c367ac092f6c9a20661e7a31529 (commit)
       via  828c05b9f567e0652ebbee6df2799a189ff586fe (commit)
       via  c73fbda66b5985e4ba99499f871ffd19bcf32aaa (commit)
       via  e3ace61212db5c960132ef0868f49cf05fe1c021 (commit)
       via  7235334a2f1b9a627cc1cdbc701ae0768b6e32c3 (commit)
       via  418f08d029e35f1776810d3ff3488e702004b023 (commit)
       via  2b3aad83f2efd0eecd4fa7471e40adcdfc63cfc4 (commit)
       via  309026147a04d4a4744f6cca50717fe869069fea (commit)
       via  732e86ef3ab872c3394730f489bd5a91217fd1ed (commit)
       via  b3c176b7dbceb2c4e34489cd97ad6c929819ce62 (commit)
       via  0d5605120bd88c40878ef8248f47889ea2321e6d (commit)
       via  9c7bb9f1039aaafa19f5e5b68b6336f148c20f0a (commit)
       via  7f7f1eecfd6834b8a499f0fde49469a10a1b2905 (commit)
       via  eb154697c054c43f59dd61bf3edeaf34bf76ad21 (commit)
       via  becb14c9552578954bc99e2428b8e6f383eadb55 (commit)
       via  7044e8ee4baa8250fd9c4e915b13d53c7f543ea3 (commit)
       via  415405a308239f2904c9e2d30e4a3d699ccf01a0 (commit)
       via  4f2ff6019bbc94fd6a875699dd812f2819131dab (commit)
       via  81b748ae1d57dacc9db98e74b23c9215f29b09ac (commit)
       via  0ed4094fadbd5a35677fa0170cd6e469053eb654 (commit)
       via  19934b67e96c91f927a1887ce85a3e6b30b2f9a0 (commit)
       via  f8bc4e1118d133a45974a56239cfe768785ca09f (commit)
       via  a9d32dffb9397ce98806176f759fea4e77acf076 (commit)
       via  bd0d9407cd1b5298509801690d39f39421333ea2 (commit)
       via  851915a58c664d813ae62bbe56b2a14435b2df08 (commit)
       via  e134e53b47fc9f0337529ce2b6851cec6319a8af (commit)
       via  da00be6359055ffdb2067a9ec1e817eb782ad145 (commit)
       via  d488b5c9764805222d33d50cc070fd4f71aab262 (commit)
       via  6d620f5ad7fc9767a7232659cde1d7c9abf78285 (commit)
       via  73a058f85680a044aeeecd815f8d6cc34fd29f3d (commit)
       via  438fabf242bae84dde71d51298b43c2b6fa760eb (commit)
       via  f38625be7a6284495d3617bc64725f2873284b01 (commit)
       via  1a75a966503c6aa76a564e23c4cf3695c4afc1ea (commit)
       via  fa73ee025fb979fe8668483ca04f8be8f69b2f5b (commit)
       via  7c5b6ed5c851266b4f6dae5ef864509627acdaf8 (commit)
       via  b04c38159eb4db35770f541f7671fe33a3f32bc2 (commit)
       via  6fd548f2205c73215812fda416fbe6f0dd166bb9 (commit)
       via  febeabbf0b221a19bd4bf16ba7620af22d8dba17 (commit)
       via  ea2db3bb02b356ce46065789f60c1ed1a77eb995 (commit)
       via  c57334fae9c1b007d227d81f1078706d1399746f (commit)
       via  6a06ec8d8aff186b277efee9fc76e62c3a9ea835 (commit)
       via  2db092b1f60b3677a2d44d5563bec216ae687e2f (commit)
       via  46915ab963639a5c6b0681d984f84059dccf70be (commit)
       via  982850a86698d41d6998b4d538c128949570efdf (commit)
       via  0ec62015471eee37cb99765578e0db8b2f633350 (commit)
       via  f3c3b428514f008941b19d027ac5fddb87809ce1 (commit)
       via  7046eedd387c97838f9daf5419e1081d75a53beb (commit)
       via  da1a02f77f45781c325f4916851ff42cd90b85d9 (commit)
       via  6c442e5a899e07a85038c4f9c65dfe224ac9485e (commit)
       via  443b0fdb3dcfc2da9297857d4f51baf66d3b7836 (commit)
       via  ffa6f057b4ae07c9dc7b9e1d12ecc0a2e19333a1 (commit)
       via  cda189356e7e0a897377c3d7ed02ea3a3ad1de5a (commit)
       via  be2bac558f1bed4b762e55f6f97fd70a6140520e (commit)
       via  4fe1331f8422de6468a65d0b741ca8e058a2276d (commit)
       via  7a6e5f06e7a32c894313b3a07c3d3c9abad8d2ca (commit)
       via  401229759c2a738b085b3337babdded645415664 (commit)
       via  2ec97b13028b51904c6bf1cb402cadee126dadfa (commit)
       via  075de28b3606211d48fc428c7af3be8ade3e6cfa (commit)
       via  050a14f4a7117936b54b4205a5fba70d88cb266a (commit)
       via  3809150a3895c5e15793a6801ca1bd0eb1ee61b1 (commit)
       via  5f2c47c44c984e58887ac8c62f6319f75128cb13 (commit)
       via  75644dafe54c21902f14cfe58cb8338b553b69d8 (commit)
       via  ef29f5ef895f64ad7312ffe48029eee925ac3ae0 (commit)
       via  7de8f67af3fce3df9aee2b2a1c703fcbf4df6625 (commit)
       via  6dad4c25b06ae232c766d76747b080373fb2499d (commit)
       via  f660a6890cdd8931d5f820f34d59ab9217a6d02b (commit)
       via  31117bb17c4e764bb60b8c9c6847a631cc9ecf3c (commit)
       via  75ad8d342119be9e71006c2f352755ad9565963b (commit)
       via  e32604d67be88dda63601eec5bfe734657b0d2ac (commit)
       via  8af34749fe95e03596db0fd79184e2adf8d8b1fb (commit)
       via  db7f069a4b33f3e8b45142b67289e51c142c90b4 (commit)
       via  f844993c243ae271469d33347402bf3174dff683 (commit)
       via  e52aa5619cc2cbc30adb80d9008986c03c9b9637 (commit)
       via  5d6aa3648bb6d8f3be320fc08e16e810a782c054 (commit)
       via  2e11afd2f72c6f2e5d69831a8f960a61dd2b28ec (commit)
       via  3f4e5e8c3d3926af0a0f000005b4c1547cb3fd15 (commit)
       via  2468eb33b98fc4b315a40e14f146c29590ba666b (commit)
       via  fd26a19afc24ac6ce62c4c31ec589c0d296f15de (commit)
       via  97ffbcd8a4be25bbc661c68cb7d866bf9d5008d4 (commit)
       via  ed258d606b87dacc465dad73b04f1c3e270b627c (commit)
       via  fb45c37160e4f8d839a2c29bce80cae7563cfd3a (commit)
       via  158f7e31dc685859f5a53d88e965382c6361efb1 (commit)
       via  08ce3f486e789275104a390d2d34f36a90c5fd2f (commit)
       via  4734df5f79d7101bf425f21065ab5c853bacc388 (commit)
       via  8e8824149fb6525f1a6da5f9c825a67765ce240b (commit)
       via  8fb496a6c56fcfd3ca35a6cfae20cee1cf3651ca (commit)
       via  118137538184ff5caba54e28f26fe48834049b07 (commit)
       via  24b7e3f8fdb3385a577d5d6bbb17e69ee53d10bc (commit)
       via  4c7744c891b878d9c8298f7e861e2475081abb06 (commit)
       via  150e1b27c54cf4e19e19ad7836e6bbfb9fbb5266 (commit)
       via  72797dec8f8dca151d821be57b78a04ba27e1d5e (commit)
       via  3d7c366a3a75294b31df2bbdb40b84dbba196208 (commit)
       via  bae6eee13a37b9af42ad4a7af65e8e1a9139485c (commit)
       via  fe0e9a35cec24f653c60f48b9f0250aec7e5000b (commit)
       via  e07e02d8c0fab3d952c2e87fc7a916c139292645 (commit)
       via  51ec922223ecc6cc4bf06dec680719c36944cadc (commit)
       via  1e2f5dc9229c98006b9643b4b6a2e40d71c37eb0 (commit)
       via  5ed30f30f53fc21fb4d29f1f6e4f0c1f241f7b70 (commit)
       via  01b6ecdb41ec0a60f8abc70555aca6eb1463fe3f (commit)
       via  9c4a500f75e821ec6afb303a6ef5d951dcdc5c63 (commit)
       via  87a9061d57d2838b3793644a051542e329d305fa (commit)
       via  ac77a569946d19766016841fa8b2c6174badf07e (commit)
       via  4de7c8126b43d93f781afaf0b990cc8814105017 (commit)
       via  2a7772ff4ca88319d65e025a49883ef2f2487aeb (commit)
       via  f281c6214ba932e5a5c9d8bae67313fc8bfa8ec9 (commit)
       via  a3d384881b58975939289b3fac3158acb4dda09c (commit)
       via  05d22864d2bd685c04e05bd395b0ed36ced8b8e3 (commit)
       via  6bdb62cf0f8464304b5c6d868b85de423953c1d9 (commit)
       via  36fb1e230202d4986983dcda1d83065fffceb279 (commit)
       via  08659ff4cbeb6ceee312479fcd9b4f8d694f95d6 (commit)
       via  d8e233d87845d8e52328bd5be8a04a363653cf67 (commit)
       via  15aacb684a4416dc287cb165394b1115e9c4c4cc (commit)
       via  8122fbd0f57f546d46c5a9659fb12f1740042966 (commit)
       via  6089fde554aedb4888c7114fa433d14375b8a213 (commit)
       via  04de900704c24567521dd29c0bdb46786eea5e71 (commit)
       via  fbe0de92f0cec56d12219125547edced7b3fd413 (commit)
       via  63591b94ab1be542f5fe5635d5f2068ddbe619e2 (commit)
       via  96a8890c7d5c8fed7b5c48bc9640c94f8fd66761 (commit)
       via  2fbc41f38ae07c6c5943750b000296cd69a8b03b (commit)
       via  0e7f34c0a9a6ad8dbcdad32910d87b8d8671cd51 (commit)
       via  8bfa34b78e30a2fbc49e7eb67dde7b412ead9305 (commit)
       via  70ea1d91fad093e9ed8939a309688eef2458d697 (commit)
       via  4da3315db365f3c80ce5202047955f0f2ec9312f (commit)
       via  20b7e79d211589eed2668474966e77d00025eb37 (commit)
       via  92901684d4cec7d6166b5fe80ba117ba79d79a39 (commit)
       via  7f1e896d8e8a8290c8bc8a2ce4a5765950fed817 (commit)
       via  a897f136c833ea7d642147580d2b6b5833a10a04 (commit)
       via  d17ecf1164148072d03a0a3ff2da96b4f5d2b806 (commit)
       via  3b906c8003161f704cc33553f98b57d9dda461b9 (commit)
       via  9cdf6ef48d62fed477cc9cf48995d7c91382f5f6 (commit)
       via  1aa29f0db614f1292cff24633d61218d82490d1e (commit)
       via  9e64fda6a77b49b394835dadba0e2951580eb86b (commit)
       via  d778a1c2ff56c425678bb9ec630c4fbd3d63bbbc (commit)
       via  2a8813d62c1bc7b8789b71469356222f5cde5c00 (commit)
       via  ea080e3eb3f97679c959b8bf185e152e2d8f2db5 (commit)
       via  20f6007053f09e4c8ca9b8615f3c78ea726e2c3a (commit)
       via  4da60024adfb312883b93e5e3cacd928aa2e79ce (commit)
       via  874a265c94ff17e07a96969c0a7f8f98a66b1074 (commit)
       via  d2b8229d02ff7362f36674ab3470f11aea13088e (commit)
       via  b9856862fe46b04b25d99c3488899d6b12bd6e1a (commit)
       via  407ff47eca85c6d73c9cefee0d1b0afef41e0b19 (commit)
       via  cf74fc24d4e2b2910921323ea1862bc234919585 (commit)
       via  e7777cc5635e95d3b36aaf4e9a528c92534aca30 (commit)
       via  d38794996fce79a84b3172706e2e2e3e5e31b9f2 (commit)
       via  18252b58879697a19fd1c1cf8d06b94b987e4849 (commit)
       via  d1dc344cf1f38a4a5a2f32775e89a247d067cf0d (commit)
       via  18d7f8fbfbf9a03ff0742c26a349a2030cecb9d5 (commit)
       via  6f7edb87ea07ee50874728cceb8a01648ab16964 (commit)
       via  7d891cde021bf941bc79c39076531cb1889c2a27 (commit)
       via  369a8cde378ab97826cf4a6d9ef2053bd70ddc0f (commit)
       via  11097f52311f5605c545e9ca4a25ee03a811d523 (commit)
       via  89958fd06e16d4ec413f5d011550331734561607 (commit)
       via  c5cc3441b379e2bc6e70efd6dbd530edebbf0024 (commit)
       via  1b79433a6d7cdd1da1a0af74240f2299c78e4112 (commit)
       via  8ea7611bc3650c75c86d22a3127cb117dbcaa9be (commit)
       via  fc1990c93384d1d2122cd4e11398a8197b006504 (commit)
       via  fdbfc9f6777696bdba60feafb9bb9a2f3fe02828 (commit)
       via  907a919be15e262eee75c10d06ce314e912abdbe (commit)
       via  ed4de3c9849f323c735929ad3e32d2450ce303a9 (commit)
       via  bf32b95efed986eed7f5e0c568c5bc9559bcb854 (commit)
       via  4b8b91688f2b2fd18a2bda182dd8a1c7a201ff3d (commit)
       via  72c11e590273d100c49f472afc3a7569b233ff00 (commit)
       via  ea1e57169ccde2d9eab9c903bbd9e887080fc667 (commit)
       via  e1c58e0bfaa6c72293a5f7e3c44977faab596683 (commit)
       via  7c33b0f9a6d648659a66d71263e7b0b631bce01a (commit)
       via  29eed26aa63103daf7a50265124bc0be58c64a0d (commit)
       via  b4338c88df301082662c8c2808501e4700f41124 (commit)
       via  61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8 (commit)
       via  f7f73df1b3e58f55178f899352b6ffa9b4b14cb6 (commit)
       via  19e7db07e36b03e7d57b80c8f9732347116d8c5d (commit)
       via  21d99aa345f0af53987cd745384d28f639044507 (commit)
       via  7b33d4efe18f0e63ab9ecb7f3420265b9ca48cb8 (commit)
       via  dd2b88777fa549bf261a84a0914a5a8171ae0a56 (commit)
       via  0e08ab6ef165791e582fce9aecc2a288075a7da4 (commit)
       via  d73c445a25a4c778c12c29f0b8473ae4c3afcaac (commit)
       via  d833df1228b3482be36be8517839f4b23c789bf3 (commit)
       via  e92c59e77f0e5aaf72d0f9f80dab33ac83d8a42c (commit)
       via  02ab8e30c1a8617616669cb67022b7fc1f84647d (commit)
       via  e0cf77b3109e74cbc4c050e9907dacc9f0f40f70 (commit)
       via  9e21b01a4d4781cdcfb8990bdf72a11c83da3887 (commit)
       via  49d293a795c42c0325aa677d6a7c0f55c647da91 (commit)
       via  ca96be228345d93f51cb4edbd0428b709f529b84 (commit)
       via  76fa8596997da889349b759990ea93dcd4c34c8f (commit)
       via  51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455 (commit)
       via  08ae6ced4d5bbdb536a79e561eed54b28ae56836 (commit)
       via  e18f6fe276ea3ca576bb5f8fb910a6532280d900 (commit)
       via  d01e3c31c9027983663918d5cbcba2a61aeb2f9f (commit)
       via  5f6718c003dce82a64b7fee6e3cd95ecfc11548b (commit)
       via  9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25 (commit)
       via  352e8e95b65e19cca10b4aec0c626787dfbb1ba1 (commit)
       via  97db5c567894c253173ab45c919925ce010ab05e (commit)
       via  a036a4160597f83c13d2e513e2240e5a57b19a38 (commit)
       via  616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e (commit)
       via  2e4eb137b91f93c0fb48351a613790435a3fd63e (commit)
       via  ec56d244512ae87e4e3e1fcf01aa0ef80ead8763 (commit)
       via  1e5349a5a0162cf5f75639717d374e73358df7b2 (commit)
       via  746c9f8882affae813f12e48c01332f251d86fbf (commit)
       via  2b9a25d7f723a9876e2979de8e6c06881e0312dc (commit)
       via  3e08b4df95208286d8891d76234f7910ff5c1d1c (commit)
       via  357bf469c7a6c6adad1f3269474989af9b203994 (commit)
       via  ebf8d0a99ac6eb231180b3315b976bcc58baa9f3 (commit)
       via  bd096d30e05fe66a0bf702fe7e366b0042ea14ae (commit)
       via  ff8ac8ee6ab3ee686621445456a765fa33c1a873 (commit)
       via  0bd7279fd9608702b7790822c80f3c284de8e7e4 (commit)
       via  2f2d4da9dd031cdf9f8a0cadcbdffe38c2170353 (commit)
       via  7fdc9a8b5f63f645b5aedede4fd18e0c1d1c39c5 (commit)
       via  92041eec49ab4968b2d4f09e3bd71a3720d86036 (commit)
       via  acb006229dbc531303538f4de1dc4d16d27369a5 (commit)
       via  83b8a927e5a992480e96b0be36ea0426a924c41f (commit)
       via  9b6a743b801dffa9f7ccab0c3e73fa8d22f3b8b9 (commit)
       via  90a22c3ac5d38a83d4d487030277db4021c1913a (commit)
       via  674dc0b33566b433b6ac5751f965b7d0ff952e73 (commit)
       via  11d5088a2f02994dc14c72170c73f7d60b0fba03 (commit)
       via  ac0bb4333d13e633e26d107f288162d7d6a37b3a (commit)
       via  92b835ec9d17b190b13da93702f0eb416b665a48 (commit)
       via  3e2865b46744e543af3045331b31b94df2ebe1ad (commit)
       via  27e4b21dfa926a522bb32674b8836ebb79d51bc5 (commit)
       via  445077cbd2343050250eb0d541633010db659312 (commit)
       via  0d0b9b52f8a538a6327e2e9f848b943474afc682 (commit)
       via  6904b6efdc2ea35c3490ba33cb352b03ea3085f5 (commit)
       via  a97bb6ae3f70febd207ef2373287237249f082e5 (commit)
       via  2985b9c00348c81d3cba9603e50a22da4e54cefa (commit)
       via  f96b6af18aebc5791047bc6d7b33375ac570c6e9 (commit)
       via  ba6533e658f63d9446993882788f03263d32fe1b (commit)
       via  ef0bf87939d40c3a42129c82e3233fd9a27a5da8 (commit)
       via  81ad5622b486cd246d2407448461517b21787cf6 (commit)
       via  ad262917d96aa4d6faeff3c9dfecf684cebbe123 (commit)
       via  c2b7336ff3122c57a235aeaa1699ba5627ecf3ce (commit)
       via  69329fff70300debf10b62ac08a6bcee9ae7bc3c (commit)
       via  0431f2c4d7cbfcd873bc34caee9ed09253e8c8ad (commit)
       via  abe9505df94e9a1511238c41f9d4459064148c94 (commit)
       via  d4a24c0e953e0032a2e483917850b7f8f387bbb2 (commit)
       via  83981cf5931aaa2d9bbf4f99ea55c99736173fdf (commit)
       via  771e79a2bf97e2e5de40106396358adc773014f1 (commit)
       via  3846ebcf2b60b73e3eec848bd3dd41711eac5dc4 (commit)
       via  a7f5d70dde50ac74726f3c23d276d2fdac70d659 (commit)
       via  d051086ccec5cd4b381cf47afb0e7fe962ed4c0b (commit)
       via  db4cb92bda8b43c3d66d27533622bb802e823589 (commit)
       via  e6ccbf6f30fb7b893b00a7c26fa165065eed4323 (commit)
       via  8bfb0c53dae93d697ca5d92ff79068af351fe56b (commit)
       via  2cb3e5740269757f6f93d24a4d13570ee72de318 (commit)
       via  6d3d099b4a2d8b020fb1a9ebeb29b17b3fb6c9d6 (commit)
       via  0db9d9278760c90be1fbf5c4eeb93ef9c524041a (commit)
       via  84b847e42fde288bc102198aedeb68e19b41ef1e (commit)
       via  6220241fd0bb7902c932742a7aa3d6a96fd0e919 (commit)
       via  6353816786caccfef7acb3fd72aa28e0366da405 (commit)
       via  20993de46444e0f74700a641b54a8ca7e015bac4 (commit)
       via  f8ca51a054732d5b0e2c6052ee102b748bd5848c (commit)
       via  d67584ccc4262c103a180504cb294e3ad6b6910d (commit)
       via  33df7f36d0b99a87880ee76d39b5814c98e78bd1 (commit)
       via  7f551b4f2635816553c2ff7dacef78254875116e (commit)
       via  cd6293cdf8cf04fca70497a2474989b773fe922e (commit)
       via  de6b2895824fdac9a25fa9cd2f0f7c38b29547dc (commit)
       via  e35ee02d6e6aa5d1e9bc50d7c378dcbbabcf52bd (commit)
       via  00f2298f0788404cf170ed6ab50b73ef890b4302 (commit)
       via  6254ba95784ae29616b17ad8b42d4f31560c2c65 (commit)
       via  cf0a78dc4ce7debb62ceb4d12235ea75e19bebe2 (commit)
       via  48fe617e667d2e6b1e471cfb56346de51f984ba5 (commit)
       via  d2c2319d6479d4319ef298f6178b00e953a9b179 (commit)
       via  cdb9984bff78b8f76c3b8c3f622928e4f29920a1 (commit)
       via  96dafff97fb4674db3c47b89902722edef45fc65 (commit)
       via  90eb6de68ff809b39515a1ac2cff823e86c205e2 (commit)
       via  84aa2519b00177450b97d328065332ea192f76b8 (commit)
       via  d030a46913479442ca12c6d193be546b9f471ca0 (commit)
       via  9aeee9c60887cf2a5528116c5e1d215f35b2f09f (commit)
       via  637c56b4e0ce0205f3f28a670881aad07320ff17 (commit)
       via  b3f2299e0600f3488aaeb78ebf66d1108201ea17 (commit)
       via  6ce940ac9701c93be01ed169c6bd23b22e04782f (commit)
       via  e8c0341d86e3f2b9658dfc594641f9ba1b29165b (commit)
       via  290b0f94b597f5a833f59cc8f70f1627bf8d1aa9 (commit)
       via  a8f884824167c09b5f988b6add0a0b3370b6be8a (commit)
       via  1869eacb3d2e897695007f210da219a0ee73cba8 (commit)
       via  67f60958b61941264b0e2a63ad527dd346a6b1e3 (commit)
       via  e876963fc9e03018a189f4433050d459a475afbf (commit)
       via  44ffb9cdb4329c5ed9b724659f234d26da336b5a (commit)
       via  8f89f8b1e9693abbc50d917c04846000bf14e189 (commit)
       via  524610f967e5289810a0d67a2942493d8f61d1dd (commit)
       via  0e14c7ee6375fcaa975194557523f5a1a8686a8a (commit)
       via  ddb7f280ce4e7a76dc66c53e933df9e11ee35e20 (commit)
       via  867b5be8b89c9b4f18ea604e1c61a154d0335c4c (commit)
       via  6c832219eadb6062c5026817ed86b81e583c8e5d (commit)
       via  3fcf383763e80b90e30fa06b29e0751ca19ab983 (commit)
       via  223f4a662fbe2caff92186e0875737fe3727a4fd (commit)
       via  ae026f5458c5c919031a41310321ae26cd56fae0 (commit)
       via  e3078aa15328439e239b2beb4085dc644ec465ec (commit)
       via  7441fde34abf5a3eab58917b8bf4acb89d72c00c (commit)
       via  ad0b0089ab9f094192f6109067d79ef5e66c85b7 (commit)
       via  314c9ae33bfd304c9622b89ec62bca052f6e0d39 (commit)
       via  7fbc56ac400fe7aaafaa581bca2f2848287ce7fd (commit)
       via  65c434e1b0247a47df763a616d1c8fdb20daba5c (commit)
       via  be56feb6184e80eab5ce93b5ab81308452a5559f (commit)
       via  45f52003962f2f5ae58be2dd779f441bb4ca01f7 (commit)
       via  af9fc277536f37980ccdab699a934b3c42e9fba9 (commit)
       via  9b44018d520cfabc347d6d79cafdf0a37c62b4e0 (commit)
       via  5f05b56284f9a76aa90562186aebd383a3ca9349 (commit)
       via  95925a60fce8a7b60fbea9873d9bb9fadf47cd02 (commit)
       via  f4150bd88d80f4a236ea5b0d648d8cc3122092fc (commit)
       via  0178754725c61dc6778f8591db1433a6c07e9f6f (commit)
       via  64e527dbe3c55a01320b97cff38626171f96f686 (commit)
       via  c4d78b8bc05d44b8a46b5d2db6b52b42a101ef2d (commit)
       via  e7f937155f6f8b117d6292b3ffe6cf63c8eda9c0 (commit)
       via  2370a99400c6450606e25562386cf40bc9c41f38 (commit)
       via  58043880b944b1fc09d55f44f4abb4a52adfd288 (commit)
       via  eeeb0eb751d98c73fefd42d50f9c92fb7af1e0e8 (commit)
       via  d5d86ecf50ea5fee2ce85c5ebe0695e477024741 (commit)
       via  9135e3707d18b3fc37274acc3fca3b9352309a09 (commit)
       via  aaf9532bbc2b45288de3350fa9379c10315c98d4 (commit)
       via  744e6c497c01cb3a3129ca66d1cabfa83e17dbd4 (commit)
       via  884c63176f79b03e1cb57a24ad70760be000214d (commit)
       via  bff27391a91d1410ef33187c0c35acc0a709720d (commit)
       via  d8a571483950527c7f44b813a3b73eb1dbbc5435 (commit)
       via  3fa1b9641dd16ad93c64737fd2eeb131cca70f76 (commit)
       via  55e3927634a4b071c1cf52cc2dc406b8973b82cc (commit)
       via  04168cbb593be0d58326b09346e90a6348a862ff (commit)
       via  2394584ce2fa4ff88bb8b196e5a75fc5f848ba4a (commit)
       via  b9eb3cd1405d423bf0156fabc3340c396b1f308c (commit)
       via  f5d2b7a6942ee291f8e0d4e8a7a7869037913de7 (commit)
       via  1f39ee5bebf66aac33e7e1fa1172c048c13dfd2d (commit)
       via  c259b8302648de1387e21e9ea907cd1a2cb49933 (commit)
       via  75e511eeaf77848ffef00d570cb10243764f51d2 (commit)
       via  6954c8936f52dcf7710e4b72b2e090b79bf38d1c (commit)
       via  1fc645bd9cffb3170743de5c983f2407eeaaa086 (commit)
       via  0f070dd3e12408e0e33945c3c8f585268c4b0db9 (commit)
       via  25e04ddffeba6d4b1c9deab1ea42038c322cec83 (commit)
       via  4bbe261cd34818379d06b68d2e153a98cfccfcf5 (commit)
       via  b5f17d1b8038f2ed64faf4e56d3e407e7a848d52 (commit)
       via  29c1385675df37146465e820d303de3cdd703e8c (commit)
       via  a4bd30104fe6df3e4a6a37d0abb640a28126009d (commit)
       via  04e708d8df71234750b3ea00e2d9ada0dd7def82 (commit)
       via  86bb2ce75793ff12905596edc83ecabf2bce22df (commit)
       via  3bb707f0a1408dc0381ecbf4ec934e9f14d8927c (commit)
       via  4476feac33a88942ebbe2d988c7db4a575de716f (commit)
       via  badde9c2a11afd8f9127f757e964d0d94c777aad (commit)
       via  def5795bac507ca15f40f46ba3024e81fdcc150b (commit)
       via  c450686ef20597d43d4f019b315275cc8a6ba4a2 (commit)
       via  870d839f0d050e1db117c945d478938db657072e (commit)
       via  cecd0d186db5a415ef9fe261310cba020eb040a2 (commit)
       via  f9865743ed942b1932d664d136a4ad505b724bf6 (commit)
       via  4ae9362b5be154781543b9255e06366a528db359 (commit)
       via  162e7b5675673cb5521a2b1e98c0dc66d3bad4fd (commit)
       via  3755250f8e52f809368d9b340da006272cd91a2c (commit)
       via  e8585f45f57e23bc9eca068d8bee02888066d722 (commit)
       via  6db713c07f2f1b14f695e123008522daf3d26527 (commit)
       via  9b2f69925a59ac5bafdfafb650a2f2f785348085 (commit)
       via  f799ffb5cb895855ac2aba54765622b81db5be38 (commit)
       via  899458ab20876aeea915a59e9bfb459d92d264de (commit)
       via  3c37d2642d9000a2d01bc46ad0ea74a741bdb658 (commit)
       via  e72a5b2c0b51f90970fc4ef27969cee9990be862 (commit)
       via  404d16e7bc1b18027f719cd8642d0a90c679c396 (commit)
       via  c66835fc37fa3dec32a437010648fee0b210a1a5 (commit)
       via  3e94f94b898aa183badd2ac8be52d20b007d5b26 (commit)
       via  625225bbe6a84350759d7116a6cd5ad2f850e635 (commit)
       via  a712575da1a0e6117c4682100e3b9df72b964b2a (commit)
       via  f1d08e59239339103abc88f499f1c0fa427174b7 (commit)
       via  868be9c6403e6221096e03763eb1944c487b3c9e (commit)
       via  fb329c0bc130e0afef086d6d154890bdde773e40 (commit)
       via  b9ec9392da21a3421e48c6961976060d872faffb (commit)
       via  76a54a4486e26b893644447a81da11f864c2cc80 (commit)
       via  e89ea3d190492e41b37425ff021311c2b471f1b9 (commit)
       via  a41ebd4ee5b01c92958a28ca2e57b2b6446bf334 (commit)
       via  462fbd1ecac6968f6c0695737c8e432c9660121c (commit)
       via  a38ea312c02eec6e4ee61015f70920999bf79ff9 (commit)
       via  bc9103ed5b326b480140b43934bb762f9c9ec5f5 (commit)
       via  581379cadf87c78af48c57a61b0abd89f4c99d92 (commit)
       via  f4885a94ed20daca102bdca8acebd10084a034b2 (commit)
       via  9cba05c6845ececd68f3f57c50c1953658ba48be (commit)
       via  8ca1c2b2b351ee7c600a041cc31d36cfe9d16d30 (commit)
       via  89b483f2b6f136509168ea4764072bae119ef618 (commit)
       via  da3b62cffd5a33a23d963beecc92305055c1bfee (commit)
       via  a0dab7b774d5b7a619fd26926c2faf11f9d70309 (commit)
       via  cb99eff642e44bd2617d323261e996aadfafe4de (commit)
       via  4071a7470723f98eac1e5f412f1d1bc27c882a36 (commit)
       via  7727d485d39cdc63539d5645b4e977109ca1ffed (commit)
       via  3f2f1a949c5e262ba7cb6d2d3eaaaf67394b6fdf (commit)
       via  0f27bcc9ecc9e713adc0d64a8354e85efa97ae9c (commit)
       via  5c8e1ca283421e1be8005e3b31adb8867d5fc652 (commit)
       via  e06ea8373f434fa581cc7c88366fa483b741aebd (commit)
       via  ba1065ab7b3c293245b3bbe733f8f062b9aa7ac9 (commit)
       via  1628a8af77b74a279d778b7f15959f7d96fec2ef (commit)
       via  7f0b83e0185f4e131110a61d898cec4a96bd9a7d (commit)
       via  fb77c2c54bc341e76a83f646e6d75662c44179fc (commit)
       via  64e6bc5ca3bf15239829f18a71511df2f04181b3 (commit)
       via  ff5bb2efbe9f7bb4a1824b0ad727713fcd6bc54a (commit)
       via  db292564293ce6899728fa172614d4eec59b429f (commit)
       via  021bf871a6ffa51b6bd0f5834e8a5049c54f8b30 (commit)
       via  724fa682705a17bef0c74b9dcf09bc9cf1761dde (commit)
       via  17ecfd8210b4db74753c4565b10a2b75dfa4c480 (commit)
       via  758664b7ad018aa19072fe5c359a702c472faae2 (commit)
       via  72250e68db07969675661ccb2eab791c8de034f7 (commit)
       via  6699834d6298eabe53f2c15d051fbe16cc9014c3 (commit)
       via  75e3a8e811b290cb9921887f2b086377af90880f (commit)
       via  79a364376ca7b4b598b4827031a7515ffd497f24 (commit)
       via  fb3035a92c9c7038d0c5fdc3fd8268ac371d673b (commit)
       via  970a741f7db74e67d6b33dc80b39ac2f3cd8b855 (commit)
       via  a07d16085b14e7257254d824b3e800406bc63873 (commit)
       via  0576aa6085823744c1cd594649e071688b207d5a (commit)
       via  d427b5ec7121255a4cb9bee961e93fc445f15d19 (commit)
       via  675ef165f213a6db1f9d0dfbebf6a0afc5469494 (commit)
       via  7a7922e0201fee6a6f45c702f96ca57a295c68fe (commit)
       via  9b449e9c5d79465a807c052c6707e83a1df9efbc (commit)
       via  37ab2f38aea33cd217f0d9f6982804129c35d81c (commit)
       via  a0b32a348d34d387b9b60da43f6f146cbd07ca6a (commit)
       via  91e8d35ab8ec2d62478a42eff10af88713497fad (commit)
       via  602cdc06a01b7c5c0eb444111382b09040f677ee (commit)
       via  706542615828488a5ad197d0ef3dd5e42eb739c4 (commit)
       via  d25819bc2623b5144ffc57b694500993ac5759b4 (commit)
       via  e36a05fd7f7d008c4c1e75ebf46eac3072ef71b1 (commit)
       via  dc64d8250b686c26a557f58dfad46a0a2101299e (commit)
       via  ce254de60e32dd1be95b430d37dc9bb67911d158 (commit)
       via  e6883772ff661017f927633ec863fa4a671c27a5 (commit)
       via  1cb7237b51ad56934e4348fdebe85750c2927a99 (commit)
       via  6731eab90cbd692d0e5d98df6db6da0ffd69a881 (commit)
       via  7216742ea61bd8853cf490d7605c6c7c0cffe187 (commit)
       via  50c9f521e2debce5beb538050fd12d802964a4b1 (commit)
       via  b583800203aea14aa03629bd27ad07d3f9440b17 (commit)
       via  c180f0cbc224bf7f3fe9bcfdeea2d3c712c61084 (commit)
       via  586b2e5e3633db1e1749dc2bdd69f6240b714139 (commit)
       via  48c6e7f2cfc95fc851cf9711d9588f3498e647c4 (commit)
       via  6a77a77a62f6bfb66cea622621d6d1b68e775664 (commit)
       via  8dc6cbcb248979a10ba96c9e7ce19fe18f009586 (commit)
       via  8c076a8bdba8c5bc77fc01b3fafafa100fb59657 (commit)
       via  5790aca4adfc21e9e042e93fa0dd290aab91be5c (commit)
       via  422d3f68de6bfa5c3fad68d2b030f2a618a821a2 (commit)
       via  9e5114764637236849f62f4a82b525d5931b256e (commit)
       via  6e5953e9a441068f753e79f68af176ac34486234 (commit)
       via  f33ccc270e29f8df34144a56e14c476b1b48f0af (commit)
       via  489ab9cb3aba79c9f3c1c08d3507b0e19e8ca9c0 (commit)
       via  4e3c7725d0d724d7a8a0e8305d15713e01b20503 (commit)
       via  2f16e608436193f465d4bac181db36464fa88e22 (commit)
       via  815a2c09d3651c86e954e5626b573054add23ab3 (commit)
       via  16b889da9a625d4501beb2150e2635c9608c729e (commit)
       via  3d0a719b703a2d4dd9b38b54847453a3f5a2d7f7 (commit)
       via  e8592e555fb3f19dd8a5b88948603c72b2a17a8d (commit)
       via  7979e25c8b9214a6a1097d5aa3937d6277556342 (commit)
       via  874e70bc57f54e5fc898a169797a0b1e45df31f6 (commit)
       via  c5ac2b9df36a57d3b88e80a2d1c382d753faf2da (commit)
       via  cf4bbf734ceee8cd67bf2ec1fbdb2d9bfedaf3e5 (commit)
       via  203b20df98512094cc74061fd1b76e87bd2d3afb (commit)
       via  b28b07db47b181718643399bd2aedc3e6d1b29c4 (commit)
       via  101ba25e6a2c177f9f3a81f3879a171256806756 (commit)
       via  29886ce76482a8c857841015b58d1e91a9ee5c8e (commit)
       via  197f4de110a59332757360110b1e90f6b07e1c97 (commit)
       via  44e071aeff4d533f116a7721919f9036c5d5a1d1 (commit)
       via  772ecef4b8037d5ce59d24772c05829872aff406 (commit)
       via  1f54bc1cf35707a5f1410ff4c6632d7cba351c40 (commit)
       via  7568199b4de18ed56ad8ef735c145c4a44327355 (commit)
       via  3cefadbff07d68c5a6846835ea87cc35eae55a0b (commit)
       via  6d8a125e4988d5cb269b3d1e29a6114ecd0c47a4 (commit)
       via  5f66900e71fdc33b40c46bf8a87b35d88d280769 (commit)
       via  c5b8841fd96727a290e148e8b5132f893f8b4d4e (commit)
       via  8f75ea3b5e0b43118a6ecba4dc11a583d287705c (commit)
       via  56f0540b5183036b46babbfc9b9ec0979e54992f (commit)
       via  19b546ef766acedfcc9e19541c71b6a56d7fe630 (commit)
       via  f8be9ba9c258698ed88a7510cf2ba3335491f3da (commit)
       via  bc1097e3d9a2d9545db849f9eef657477d83509a (commit)
       via  204aecdf82aa583b213464411069de4c8d7af64b (commit)
       via  3dd6f0a5bc0b6457c82df0b980a8f6ac87d1a6f9 (commit)
       via  73e4df99cb4d63f5ea8babb40656a74305d77e12 (commit)
       via  193699376af09bd77875d4ddfd10c3feb13ecdd2 (commit)
       via  32f131b0ca68bc88bbb32dbf03e76dfba24defe5 (commit)
       via  10040601a2e13cbb0653a20c55c1c696b5cacf29 (commit)
       via  d9da6ee29fe0267ed347860f24f21be647ac81e8 (commit)
       via  27252b2414f5034b16a447273e1f249fdf317b72 (commit)
       via  1689c91d8d7667426fdca694d801b6189f68d37e (commit)
       via  dd11f72ced8a5a42ae0a1d7ca8a51b94e670a66f (commit)
       via  d035e9687a2d28e2f64ec3a316f8abea57e49d63 (commit)
       via  38ed5866ed212effe0217f193f728ee54ea7378b (commit)
       via  772ca69f803a8f294d6e04f9e258becc35179233 (commit)
       via  afeb4eb243e01df5c7396dc346f2629b21115e2c (commit)
       via  35aab9df9f299d62edaa6ce611aa30614deb9e9d (commit)
       via  22590805bffe74c3b4998152556561a2c2b6d177 (commit)
       via  91c1b13d6e369190d6c8293d27cda1f6fba160d3 (commit)
       via  78141e799cac1f25e9d21e487ccaea3381a3715d (commit)
       via  55706506c7bd84ded84a85042ac8bd72f4506411 (commit)
       via  73e3de381d87a635e303e2076a46cb739466c1a4 (commit)
       via  370e2c6785ce9167c9945763505353816780326c (commit)
       via  4f0a6d462e1c22d7c681aac5dd77ce73a560f9f2 (commit)
       via  d356bced9b362be1396c91854e0684da6ec6f507 (commit)
       via  94226751cb9beb7aa1939e9395d4999e30b30600 (commit)
       via  105011e08fafe23cb4cfd4fcb1468187f9d81f21 (commit)
       via  d882d4770fec6d65d82d818b4979cb5763d253c1 (commit)
       via  145735b748ab04505ab7a885a54fbd175ccecee2 (commit)
       via  42526efec45993466cbc605eb2cee70194eed4a6 (commit)
       via  43c94281401cfa89bcbe7110727845ed5df984ec (commit)
       via  863b0a8ee9eb7a19226a37edd1d8a398462379a1 (commit)
       via  fccb3e2dae4993650a980799e571bf6ae6e304e6 (commit)
       via  2eee2943cce2a7aea7a11b93f2459f5f333eb84c (commit)
       via  26f5445bb461910efd42bc80a99a63dd53b49643 (commit)
       via  a309409ead0bde721a17e8b3c4e89fe6a2181423 (commit)
       via  f83e84028ac28ce098ea76bd857ae1663c295494 (commit)
       via  b3f0e35308993de825f00ec18fc6559e6609c9b0 (commit)
       via  34c437411dad89c671261269f2067129584a4259 (commit)
       via  4329a71c128f8a8fca48a8827226d09f61fcbe85 (commit)
       via  c93230ac3838231f2f44986e224da1bdaf9a7dfe (commit)
       via  ee26add4f4062d8b53f22e161027a573dc03399c (commit)
       via  c8a5f5ae60c911298fc3c0f168ac3652223722a4 (commit)
       via  f8076644ce21c5c20cb0d368d25c191a05364481 (commit)
       via  7c809fa2a675b7e669e76683f73397e38dd22999 (commit)
       via  6da99de3236fbaeebf6a4fc66f7d68f43a59902f (commit)
       via  d6bb319b09d056428468d8894f7d7dd2cb0d963e (commit)
       via  7a460852fa1bc9df22d4c54bac3d57f909488608 (commit)
       via  d560bfd2739f2594119c49d82485b99bb4fbbe1f (commit)
       via  89e2a080e977b9632fa13c627b6a5370250d6ed5 (commit)
       via  62720e44be3e9f28e4c1e7d38206b2c51d34745e (commit)
       via  e27d737e27fbfc8cfde020ec02d6b2c74afb6885 (commit)
       via  8d2de00244f8338664c16bd8d8ebb03c6f0cb83f (commit)
       via  3df705681be123d93146156fec3166b41b19465a (commit)
       via  a45fed81e5fd5d9b280c8dd70d50c9606a982a0b (commit)
       via  f0aa660772565545cbcda9ed8ae946b8d5097416 (commit)
       via  766839c56da82e12b6986fb5cf7c8d86442615bc (commit)
       via  47803e6f8e98984e740acf2f7c0a217de58717cd (commit)
       via  7da4c9d4edbdd6df6aa2a9467d6f32a98fc8cac4 (commit)
       via  97f10e488a5153e45d6a27a730cc1ecbaae7d559 (commit)
       via  4b86f5edc91ba649908f5b6ab0fb7f1154e38066 (commit)
       via  5ff813c7a62d6c37b86bbf9a988a91baa4d5b9e6 (commit)
       via  38d4ba3564b9a37f8042888ffd63bf736852b6b8 (commit)
       via  90bad039c44195b742740613a34b90697254fdd2 (commit)
       via  803a7982b4403c690d7b7fa8c49d00a5abae3471 (commit)
       via  c971338416d7376d8b710b5c18957f6a800b3de0 (commit)
       via  244c5b5dcdc5af1f91a79a81f7f7ec4047759fe8 (commit)
       via  12bc571c13eda8d504eac788d6b3e5e8d83e3ad3 (commit)
       via  41abdc17df99662a8e99ba895050dbc8c0e34b8e (commit)
       via  a15b69cbc75f475601f41c516330c679915676e4 (commit)
       via  e26f53a88b2fd16fc54513adfbb8eaab26dd102f (commit)
       via  64aacb24b65e5496b4148437ed96363ae06e8200 (commit)
       via  1aa13f2b58e477095f76d28a8d9bb1b83a9dd1f5 (commit)
       via  1ab59f688f647abe1bc0b5e7a187ec0bac988e0f (commit)
       via  cc23f0e9d38fe3f880ada549af4e552fc13fc655 (commit)
       via  3d287de4ea99718ffe2ac6b855c2786d67946be2 (commit)
       via  e72806fb30dd9162aa1b05cb478ae51d1ecd27fa (commit)
       via  87b869c1da77f673f6397eff48b09cfb5f44f5f9 (commit)
       via  258470bd367552994ba61b8746e04d1514ac34a6 (commit)
       via  4a1173fda09afe8fd861b45b77d83260cec688df (commit)
       via  331e791a3e18d8335960c0161d30dbe04e3a6fe5 (commit)
       via  3da431379bae33374edd7c62c6f4261b4e3a663f (commit)
       via  9a59ae5c198f7c413bcaf29f1ab107a265677b95 (commit)
       via  d951f5429a116e6174f9cdb983945cb01cf37553 (commit)
       via  975426ceb339cf7a17f57ffba2757bb368669f93 (commit)
       via  7ac2b1256b09044b86c6bd926cc239133beab088 (commit)
       via  14e49ed15615e7f2bcb58aa4540683250006f5c7 (commit)
       via  623dcc85a447b9ce0f09cffa8cd296cd8a51ad9d (commit)
       via  94d53d1664b1e792e8088880cfd206e8e81ff625 (commit)
       via  6508cc5355d74a148e9a8d7feca99d60b9748168 (commit)
       via  25ec835571741d5339fb653e06e79896d72f8e8a (commit)
       via  db519cae57122dc6584226aac951674b49301efc (commit)
       via  5c02ae4ac9dec3a275d3965ccdcfdb564686dc79 (commit)
       via  ebacce3f0b0cef6116e91d408d591ff67285c420 (commit)
       via  757a1f54085af4645ee1946329e24538162ac054 (commit)
       via  52dbe654dea7562564be9d880540e6bc706998ba (commit)
       via  65a5e0c671fc7d42525a6279aebf9a74de2c97a7 (commit)
       via  348354333a82ce98d733dc2ee939186c53c506f9 (commit)
       via  614786cc5c8cf6f504112a722aabf8dddc154d2c (commit)
       via  12c3f24827d2459154fcc9773b279f96c303e591 (commit)
       via  6c0e9ee276e9e35a970990baec09c0c2c85b3804 (commit)
       via  af0de01c6b3395fb1dba5d2ee0a94c19a9b464e9 (commit)
       via  6ae8b30bf4127011284a66541ed2116fcb45f007 (commit)
       via  a5fc17b5098ee27fd7ae457ca6c5743bacc384a7 (commit)
       via  0a01e6c6e7bd428ca0ec99a00924b5b498c6e637 (commit)
       via  f0005bb484bc2b85a169ef7816e33d8e2f16e109 (commit)
       via  9432b14e916421a727265f9a05dc1fbe6c6ec381 (commit)
       via  5d0a8b1abc3f8a6d8d23772251b4ef2758d2def6 (commit)
       via  afb674ab46a7d6ff3d1801315f3d852bdba79d0c (commit)
       via  1c46b6aed0db88c97189713f291164f98df780a9 (commit)
       via  da98b89612d59906bd938d58a9072b3ce68864de (commit)
       via  129640f279259e51fbb0e81a5bec2ec2dfac543e (commit)
       via  d0915bc86f294707411ae525e70fa20965f1aeec (commit)
       via  1feafc643b1c50fd0fa8171a4170065ca39d4d4c (commit)
       via  6c3d0e9a6bf88a03442acf1f0bc1ef1575779d46 (commit)
       via  8515f26a6381e32d8d15064afd030eb1392ce2d8 (commit)
       via  609e8b181a4bf49c5095fff33365606db30e7921 (commit)
       via  82e77d74304707255265a564678b38ea372813dd (commit)
       via  6e11703c6c9526724040f72c48e2f18616290080 (commit)
       via  e91f096e1beba3c3d6f71e5c7cbc337c9d9d7282 (commit)
       via  d4736d53cd61f2cbbb36bec682663b74b01dddce (commit)
       via  1687060b587ded9e65153280c8ab364b05614b64 (commit)
       via  60fe4b540b40330e050dbd755204cecbc62d6a37 (commit)
       via  fe2e503ea4abe83ce091bfa2c8cf4d977fba388a (commit)
       via  22809b1665dd2b561fda280d486d099bad6ac877 (commit)
       via  fbcbf7f29d630c8a291f0d0e543defbf1b8208df (commit)
       via  4c10461a877d8ca8f18c952c2c143320337d04a7 (commit)
       via  a8c3698526cfa11c61d9dfd8c0f9fa8d2c7ff10a (commit)
       via  7e27a42ebde342cc78dc5e3ae8b03f152eab498a (commit)
       via  a23fcc9558f9f2788fc828f7473060ea1f035f55 (commit)
       via  4e41913f9acb6a33f6a4eb1b88577fb7499e99d6 (commit)
       via  e5e529701812bdfe7ea1c3ffe682bd576b9c05a8 (commit)
       via  3ef8aaaa71786b32ed88a29e48dd17d32f5a8a79 (commit)
       via  5f662b3887c3e92adfcad1bc92eabfd86db263b7 (commit)
       via  0368552d7fcdd35a0cb52043a8567e66d62bccd3 (commit)
       via  5edb3354854bd2de4f9ea0e2c4af4069f46a4830 (commit)
       via  ff1019bfac1380681989242fa904c2d9fe13fd38 (commit)
       via  3a755559d1e865189d78bef8e5abd06d7fb8724e (commit)
       via  e90372a0db3248d4b78d8d7d7020c66cb5dc3803 (commit)
       via  70c21301b274a28dde75b4f2adb141f9b170eb80 (commit)
       via  7371d8f3b49c020a14f6324ba5264d17c7dbbaee (commit)
       via  613bc08ac15b74a395ef0eca7668f7192b438204 (commit)
       via  aa2407d84d8bcd983b3df294032831bbd54cf25d (commit)
       via  610572b7d27e122ebf8e5c5d430019844567a996 (commit)
       via  2e94cba3565105aaa23720d9ffdcb9fe1ccee6b9 (commit)
       via  fb9355c50e366bd0f7cb6df6ea19118bd7dae899 (commit)
       via  29e8b7bfcc8b3530fb4fd2dd04dca59744588b61 (commit)
       via  1ef9b2b6007356ab26cdec42bdf9c79d53745bf6 (commit)
       via  5c14f78005ba5b4a2ccf0899fc50805a9de7b9ee (commit)
       via  a1209be550172a95d3254158c121abf184e60bcd (commit)
       via  32e4f6beca6f13165ec5a40bf363d005ebda9263 (commit)
       via  34b902a5a6fd55ef3857d74aab986a8d96d57659 (commit)
       via  aaa322a5cb5603742273282fb12f1e368697a625 (commit)
       via  22b8f23849a8996c921332b3689405b967eaaa6e (commit)
       via  8697dca7f13026d2d160a1df9ecd047e404d255b (commit)
       via  c96fe0b40d562b65831376f927b6fd96cf999a52 (commit)
       via  700d537e60896b1317df3271e3d3673a0920d4c7 (commit)
       via  6d79eda769a5693ed4657f50c97ef5a0c9ba2e1b (commit)
       via  3942ec32ddd977ca899a129b8a9821284fd3df5f (commit)
       via  a034dc0df4b74d13cdba29e58f4b6afd0dc160d6 (commit)
       via  aeb74ae9f9f5289336b2603022cc86cf6316a946 (commit)
       via  98d6e9ec2dd0a935b1ebfed50b6e9ecab719557d (commit)
       via  16dffb313697d175ed76701f4a06ecbbeedcb627 (commit)
       via  eda29e66320f0722d3f508d5b607d7fa8771227f (commit)
       via  eb2b23e0d9648a5e70b8c7f917f1bfa2f058dfcd (commit)
       via  be938ab3f8872346336cdbe4fb613c5c5e36e03d (commit)
       via  2a2a5601251b4d06320c233ef9510a6909ff2823 (commit)
       via  24dd88d156c9c5dcca1ac6b07fa6e67502a4132b (commit)
       via  dce1b2991c58f583a6d038dbef1cb4b92307829f (commit)
       via  35fb0bb8c09cfc5fd75ad87fac58799e5054b7ce (commit)
       via  9e293194472134d059282f5f3155358315f3e1dc (commit)
       via  57f03e59ba92989aaf3600399f11ffb308cc663e (commit)
       via  57ab0f70b50e8c308f12248494fcc233e83210a4 (commit)
       via  570938cbfd132ad0e586327466109aad87c21ede (commit)
       via  ec38e4c84faa276e664f950b417a71c3901485f6 (commit)
       via  dfb025bf126080f6bb209f6f40ff909c4f5c5c97 (commit)
       via  9f2dca805c8010636d4be7ef03d96bfc131c9809 (commit)
       via  c7a8e74b8c7ade9efb68b8bd36fd6d741f2dba7e (commit)
       via  5b60eaf619baf4dfa2bc1a3f1109ff742a04f532 (commit)
       via  50b17a6112704ad3897b1ccc87a0061cf7949ee7 (commit)
       via  ba2668588213688243174a9cc8d7f034661b2a73 (commit)
       via  5ab3a946518870d0dbd1fe606d1bc89d336769c4 (commit)
       via  496f4cd07d20e91750ec920e05a4aef4e4bdc9ba (commit)
       via  de80993a2020e64259f12f608d11d1ace9a719a6 (commit)
       via  611220f77af9e2c5e174aa7ff9fa8bba982374ef (commit)
       via  bbad6ba53771dc77bfdf74bab7173374084d434c (commit)
       via  e4dc83ade5f8b44d44f21d3f90185bf0264e5d9d (commit)
       via  72f43fa13ddb544f84891f14619e622baf29ae38 (commit)
       via  58811998fb63975cc92abab23044630bc11cd26d (commit)
       via  57a69f934173eceaaf87e15074baf4e19402a687 (commit)
       via  0e0258c8b9c6cab7c55c90687b30d65a83783c2f (commit)
       via  a8e5d838edcb692ff69c2073cf692d7067f52c67 (commit)
       via  d568eefe104e480706a2e6ceb16df4376d4becbf (commit)
       via  e7d5c142c6ed1aca4eff85781bb03ebba8fb69bc (commit)
       via  068e7962bb8a90ae9ae6b7d6da520a70701820af (commit)
       via  42f0155bb9f7cb65c7af103ec1170f4193244d69 (commit)
       via  cd530df88ff17a3b150ab62b930fab0da2df8605 (commit)
       via  ecca8fd90806158dd61f769bd7882e7ee73f3f48 (commit)
       via  eebe732bb61bb69f50edae9b7fb171266b216752 (commit)
       via  fd1944580266c3c84234b28e2102fc787ed5c00d (commit)
       via  295480b923338de82bdaa965aed9960d582a1750 (commit)
       via  98b9645bcebf009643cff4e265cfcd31b56d80f5 (commit)
       via  096dd3c9634d331fcb0c4cdf74f6fcda04b755cf (commit)
       via  5593f28fac6d2aeb909370c4daaa19f419e5d596 (commit)
       via  41d6044bcfed908a6197502b038bea86a5ad3526 (commit)
       via  7987d9857e581b5266d98d79aa71a8f45611f203 (commit)
       via  63de609ef147e665ebd8d7622f580a74a417287b (commit)
       via  9d5082b26ebffe1e834c5c13e22bba02933e5c59 (commit)
       via  280dde34dda52559411376be17591755f4b6358f (commit)
       via  0679c73b6ebcf2b336c1f69d93d6539b27ccaaff (commit)
       via  cb21c548db00560b4aa226606f2f1e80d45deb15 (commit)
       via  d74abbea895d032e5b4efa43854ad57417b8ab40 (commit)
       via  91a159245fc5978c20245b60360e55e204f468a4 (commit)
       via  317df61fc817d4013baf225242be905e434ff2f5 (commit)
       via  983d7b5c3a3dcacbad7a9ab2396aeb317d677006 (commit)
       via  bbb507aebcb3559ae6e7d34ef02443e2d6ec3869 (commit)
       via  6ed9c7e024d66d89ab303ba0d299fa4ee099f91b (commit)
       via  8f0a5d84e3fa894c687089d5f6dd6463c47968d8 (commit)
       via  8329fc016fd0b6e82b9bc1da9e857206d11b9bbe (commit)
       via  5447ca1a94309fa394be3a8233090b33e81e4c9f (commit)
       via  d0dcce15f4cc4e7c100556fbd016c59f64d0d238 (commit)
       via  658bfc5c525bd21ecd68847cd19bda7102245c35 (commit)
       via  f4a25874a2cb5468e7ecce6812e5833e10943017 (commit)
       via  3c45471c2d4a0c08b88f10161d4b166a27165e31 (commit)
       via  71e69fc93b9f1a0829d04b9e44107c92458efe20 (commit)
       via  84e18056668491d5a7e0068c9287455151a18197 (commit)
       via  26d1a9d356ad3122f7d07dcd93d12767726807cf (commit)
       via  d546133d49432d24561760730b6e09213b5d136c (commit)
       via  594bafe52773c940fc3fb9cd9022a4d1a3a194c7 (commit)
       via  b98ded7644e383d45812a3375a650e164057e997 (commit)
       via  10f2065249d780568b4460872b783531e7ebec0b (commit)
       via  e76a950c887e4ba90d4ef78043359861e0c79717 (commit)
       via  afed51933709cae475a09cb6b3cc8e5d2fe346a2 (commit)
       via  51f818bf24cbfc542489edf6e0dbdda2d35a4787 (commit)
       via  900554b021b00f9e64d21cb1aabf01b27cf800cd (commit)
       via  9644a2d11c06a547c82097028a86bff976f12040 (commit)
       via  1e77de7411e982c007c884d05039c4f5ffbd8756 (commit)
       via  c1bf1a59ffe983086b30aee3e0299b80f9c8a817 (commit)
       via  8d336875b3cea99e5c458d3e299d8caf8bc84b75 (commit)
       via  514a1dff5b532c94dca2f77ed6d8742f45c48ddc (commit)
       via  c7b39d06f9b1b5843682f52992634c8dad22aece (commit)
       via  b2de25adeda1c37c8d626432df25fce7cd2ab032 (commit)
       via  d6239507b2f08bd1fee53c84af3998a14fa9819b (commit)
       via  ef17bbefd7c504af65f2e6c52f5d7fa8e82d087e (commit)
       via  a89c02ce3d53aa6459a3d76d9f5c0573da88ceb3 (commit)
       via  b19587e7d7ff90a25d1a75fc987d911d966d77f6 (commit)
       via  783c375766b1e5656dd34dd99281fceb7ed7aab2 (commit)
       via  e00e8713de13570b8ca41291c0a863a8be00686c (commit)
       via  4c3d431210d8c30b4b6fc67f75af73406dd396fa (commit)
       via  90b3b5e42c1d0a8b228314451706f49cfbb7e047 (commit)
       via  1fe71e2ef04e20ff8e1de888820496fc922bffe0 (commit)
       via  8ea0b81d20d3fff15e4aa35d68945cb1f0f011ec (commit)
       via  59678037a972fd5a3d7bbb9487dc86a15913220f (commit)
       via  02e5eba17d3b94257ad32129941ef8a03fbf0924 (commit)
       via  91d24972865be24355005fbb876eca6306a39ea5 (commit)
       via  7e9f908ef54a3c2fe42ae8f9376c77e5bc988a9a (commit)
       via  3b09398ae27f0e4b5975920ac2787427ffc6ccc4 (commit)
       via  45c5f8cad2f95ccfada50e1b65e56918f3c6c5c4 (commit)
       via  23876eda9f1d4b5725407aef7d218fc3ce4113cb (commit)
       via  265b9db7c2c865c5aad821bf9a377ea84dfe431e (commit)
       via  863175742bcf92fa589a92fbae319524e5460771 (commit)
       via  dec8d1ccf895195b8a2db72685948607c7c085f7 (commit)
       via  500ce3f11338a7bafeba0e9e623fd04b3802e5d9 (commit)
       via  5b2754d41fcef287ff76c9d909d9bc2f506b4d03 (commit)
       via  e13c18974307ecd0f11e2ecfde64f1aea80c6304 (commit)
       via  ae64efa1ce9097f27c1dbfb2b6a14ccf512e16b7 (commit)
       via  93b393e74c3a7508fe013b423809e7e35f9bc8a0 (commit)
       via  64aa41b2480384be22881a3bacc8960ec57b0f11 (commit)
       via  ce597a022b32231559c75843f4df6108120c5d57 (commit)
       via  b953d526d10d41b631b82f576eac12d9cdfee6b7 (commit)
       via  760a280fb72518016b2e2237305c67c8d8473439 (commit)
       via  533798275cd9cfff0fce8080b199918e870c8393 (commit)
       via  04b45acc3dbaffc1938ce7dd65aea8466683fdc8 (commit)
       via  4572d8b34e5ac0985dc3beaefbe9dde514aa0ff4 (commit)
       via  41bb831fc910d85d79811dc367b25c0880cbe6ac (commit)
       via  0d48bb627388e24a961d36ea6d152eb866676ac1 (commit)
       via  9ebc7502b2e4cf991e721b695aead2c366eb0bef (commit)
       via  27ec21dbb2370ac71aebc0089d4269f27661f4b8 (commit)
       via  c6055d9d4c2f37822866981f5cea1f7389431d49 (commit)
       via  cbe3ee58ca568ede66ff04abb6b73ac39b092701 (commit)
       via  cff2dc34f98fd0960a5ec1b37d9bf5f937c31efc (commit)
       via  5505bff7ae85b84fbdb60604de6bb4a515cd3e8a (commit)
       via  2007d11caf6696f44d85bab165a665c5c4bf48f5 (commit)
       via  a622b829bd5fdb38c82fd3810e1b1f8cdb5ee0d8 (commit)
       via  4efda261fead9f677144ffc6bc2b612a1d1dbcb6 (commit)
       via  881613c4abbbca35223678d6b17da418958a0005 (commit)
       via  357342602db67e456e9afc9697328d490ab0fc41 (commit)
       via  640fc5b54a8e7f9e000d5a661f0656a8701639b5 (commit)
       via  54cc0c0e1f98508892ce653591178c86ff067364 (commit)
       via  e77c46664c384211294b6bdfef99c92212826cc6 (commit)
       via  8e7d3030773aae4b1784383abd6af4e5cec087c6 (commit)
       via  6083ec9a78fd48c66087f9c9e887b9b405c69999 (commit)
       via  647b533bce48b741a6b048a1e62b24b9bb2f8d23 (commit)
       via  52f22616852e6a6e8f642f84fa821e0c8678a679 (commit)
       via  e7fbd489e0da88e2fd70aa039da4f4173ee24028 (commit)
       via  fc1c7cf85d045323a38c1de7ada213ecfee542a9 (commit)
       via  4dc4570734e70c47c8bb6d658c1014f29068e106 (commit)
       via  12c82fd8c0612b1360627b6717c4d5744abd4fa0 (commit)
       via  f19653eb947c11f452be240d9a9a9daa4cbf635d (commit)
       via  0fcbd704f8da5ef3ddbe9964c9affb14fc16d640 (commit)
       via  a5412fbab45c9386f95fba3567e38c7b1cf8308d (commit)
       via  536b6c7519e221573cdf96db13b9d72b65c80b0b (commit)
       via  601ff0ec55517bc2a80e9a8cc2340f1c18b93490 (commit)
       via  386e1f796ca622e87f822b71e121c611cc184d47 (commit)
       via  651acac3389360b9f03900ed22e91031e6ef9aa3 (commit)
       via  3e6b2ab6832f77a7e073b55331352a88a5d28488 (commit)
       via  506f6bc0d269653cbba27257b9fed350365037c3 (commit)
       via  32e9276a086c8ec78d0d6ff15bf576571118c3d7 (commit)
       via  47d1f1189c53f02010d16ef541835c016fd8302d (commit)
       via  47765a5767808b6c2ff350ee31cf53e71a8d9d05 (commit)
       via  540f02531bb8ceadd94cc1ebcf543f9d8b0eac48 (commit)
       via  77fa27a9f5875334a11caf2cbbb3790edc836095 (commit)
       via  5bd01a4b695e68efb5e6c91fb726d160ef911aec (commit)
       via  27373f550e13b032803873348057b0e80b0c0086 (commit)
       via  b2eff70f6b3a2abb5e5ce27a331717c319200a83 (commit)
       via  6cc660920d7aa40845a7309e3d799cd30cd657f8 (commit)
       via  7054df7df2925f327be1b6003b6b415fed3a5903 (commit)
       via  94755bd34ddd79630f4908b8a9a2e7f002f95800 (commit)
       via  eb8eaaecbe4aaf950a217d53c477461794fe6db8 (commit)
       via  6b9a7938be3278fd18e73794b51e76a5e1dd6e1d (commit)
       via  fe3c6787785f624c6d74c91fa05f11c01d431585 (commit)
       via  606b29d427c362bfcb222c5063dfb629ee27c0d9 (commit)
       via  8c0afaf45098dccaee51b50b40593ffb67c3e42a (commit)
       via  f0cad1939f10ccdcf1b5e8ad150b7e10471f92a3 (commit)
       via  1d3984780df87c6963b0aae1c392a570c890161b (commit)
       via  d560b46f5232f84476d68d96d44e5e755d391090 (commit)
       via  7a409983292e0917cf1299d55ca601a92fd4a36e (commit)
       via  ead29a4e3d1e01d7e6b43a27b1c15f7fb3b8ecb5 (commit)
       via  1b05417e3c04bccd38c9e0c6b4819508dcb25ccf (commit)
       via  e7251049a49e745bbd95006a3946db3ba9086072 (commit)
       via  e5ca59b456d3a1a51d0b5387ec9d04a51beaa0be (commit)
       via  0699e0d3e4305fc4e615c36b831d0171c2f8c757 (commit)
       via  860c2055e5a0b700f25fbf63f64d29443d889f0b (commit)
       via  e6cf1c489cbebf41524de389895c58bc644fd7f8 (commit)
       via  9efc21e7388e3af24476173a252103d8accc5d95 (commit)
       via  c736de7b284ecc93bac48106e88417e0e6c92ad6 (commit)
       via  6f94b03c976088d177891ff69a9fad88de42e420 (commit)
       via  80d75246d475865210aa5bc09e0824b230cd074d (commit)
       via  179aa0bb0a8654efe6e3e606afdf104dbfeb3881 (commit)
       via  e30fe3eba211056491f832d469a5176653071c9e (commit)
       via  93bd1540756ec9cfb60cf9bbac57beedf9bd3433 (commit)
       via  fdfa89d9f5d0e2001ffb1d75810acc402c92f117 (commit)
       via  dc822da8158af5b568ca01fbb519d7170553376a (commit)
       via  38ddabb194ec6b0ab19dcfac27378c6e91cbde02 (commit)
       via  c8f46af11b43719281a375ef7841830756022d76 (commit)
       via  e3f5e5d5b401c377719b89cb86c65131315a2582 (commit)
       via  b1e43a5647a978fc60b7845d85ebe000fa9f5d3b (commit)
       via  fbd7fd0f84cc73565ccc58f74691d5c89544eb29 (commit)
       via  704e624f19eb4ca05380865ff3a0681c2b8f369d (commit)
       via  f0cd7324b603627a32bc16f3774cc8d253838471 (commit)
       via  abeee541133d9fa73a55386aadd94aebe0cdbb92 (commit)
       via  92b3bd50fe0d3a170bd4905882e1ee4512b1c914 (commit)
       via  1dd96df94d13374303cd016c598581394816de27 (commit)
       via  42d042064952a5aafebb583a5245ec41367dbbbf (commit)
       via  4b486ccb1b1280e0a3c28eb65146ed32eb8775e1 (commit)
       via  ef39edc303895c06083cdedf72c002f51a999d4a (commit)
       via  2ffa8ae29c3caa192eed47399c87680af09d08f0 (commit)
       via  9f9d26465fec48f9fe3310079c2414b314feaab1 (commit)
       via  9a271e13236d81b79e3e367a6898e09d3dcf28d0 (commit)
       via  809159c9b7f7cfcb2addeaf968ef2dba740c3606 (commit)
       via  9a1ef0dcfd5284801033c4915d58a856fbe29625 (commit)
       via  fed5eb5b0e0e955bf01351b93c43cc248fd9f5ed (commit)
       via  eacacacdceb4a259ba76edb2219c7f8e6cb3f47e (commit)
       via  0837538e461cfdbc5c673d7f2bf64f6631099bdf (commit)
       via  f4875bbdd6cc090f5c79f358c55c8b936c6254fd (commit)
       via  7891f5d7e70e650cac940a4b942390492191e656 (commit)
       via  73bfad72d3b9ce021074b612bfa0a24bd6a6b04a (commit)
       via  6a56740e27fe74b757ff48999a2f152816ee8e52 (commit)
       via  058074d499805aa4579c8986b84459f9993f6fad (commit)
       via  ab8240189dd67cc15c5aed59b8c0ffde99d3b403 (commit)
       via  0b22c0b815974de148b5fed3a33a3337380347c9 (commit)
       via  b2f51aef0d518be6be6fba05147dd53125cdb731 (commit)
       via  cdb5b65752c5a009ac3bb7425637da808a7a9bca (commit)
       via  beee79373222ea01008cd137dd9a3ffa59cbe347 (commit)
       via  abfa5f2d1fac0a55b430e078884ad1ae252d20cd (commit)
       via  9d41f6d87b28c46d8a6d52f2de91976819e6b4d0 (commit)
       via  a4a2518dd47bd37f2204a0209c2eeb632d191d1e (commit)
       via  e7dcdd1011719b031d580d9094ad1f8c4701ef38 (commit)
       via  001f9b361711b479ee0d530056e44b7444edfcff (commit)
       via  889b22e2cab163be390d7856ef2939b9e2143ad3 (commit)
       via  6f6664f578426e15e6e101f20a0c54a7b2820e96 (commit)
       via  ab4b66283215a19b9e7339c64af4d86f40165ba6 (commit)
       via  5827d9a626918c91eef4ff84bd115c0d35013a7d (commit)
       via  3723fe94e6ec01143ec91433deb5741efe10cfe2 (commit)
       via  6b4fccd1a69b7da0cadb50026d3a5056c5fc0b05 (commit)
       via  53f8ef66a55fd5ad5359f1100ef96b1af9d3bf23 (commit)
       via  228643af6d8c0e29735c3fdf7b25c161a11a68c9 (commit)
       via  cd4d2e9c79356be9ec6a0fe2b3ec3731254bb9ef (commit)
       via  748f1eaee3b834008837d0b43d23ee8b052e9403 (commit)
       via  aa550e04f3e3a44db9ba02649f3b15929f3226a6 (commit)
       via  a672b16a3a528d6dbfcba7758a798eeb87bd57ee (commit)
       via  d3d4d6275a2fdcc735da44d99a37644d90dd8338 (commit)
       via  c66d232c9c138dcf54f5314aafb7ab32590b106d (commit)
       via  0d457c319934e6f321b838ea58ad4365e41f6f0b (commit)
       via  66e0681ea0293aac6f3547224cef85593cbe4595 (commit)
       via  8c1460653e8f21b9e09324617836aeec18f350b7 (commit)
       via  ad91d0edd5b8e56dc6afffa38e01bcc7d0d265cd (commit)
       via  df97bea2427706d56dc15587b88e0f268ee37622 (commit)
       via  bb7eefe4dd4b1385b830ac0f784af883a3d91985 (commit)
       via  cedd6e65d22870524eaee1394f023cf001d56aff (commit)
       via  30faf20caf43c93f9211622124d6b91dffdedb42 (commit)
       via  65de27b856496a756c5f234bba89bedae60dc476 (commit)
       via  42272a82ca0992d40200bb881df41407f8386b8c (commit)
       via  b98574dab2f4fb28c53025c5204cc06ece7de0c2 (commit)
       via  3b60232ebcde69789a6c26f5c523ad107a7099c5 (commit)
       via  6ece2df941e75bfbcbfc4aa510ed92c4e71de35d (commit)
       via  86bbcdfeb8ca692c5af9e3f29887cb82de9260b7 (commit)
       via  2a249d734b16a05ac09bd44573b015e024ad276b (commit)
       via  b33b5cd3170c08f61cbc05fc2a2e462a09703879 (commit)
       via  18fdf13192ba1f1e8ac84b29f44d3d0b0549607e (commit)
       via  43fafabd99304effee88d6f3efa148c2d1a50039 (commit)
       via  d8a3208222b5cc717c927f0674152e0319b18fb0 (commit)
       via  9ce7a663d6d50c6f2d7a3fbc76ed10c5af6a91a5 (commit)
       via  2b18cdcaba48ffeee753d97d8241dbf2a8333493 (commit)
       via  d7725a178bd498f7b50634490b6846ab9bb245f2 (commit)
       via  ecca26855a786bb126341e7fba59557325e54f7b (commit)
       via  c14f20f7dd827bd1b9164b3641db697776de85bf (commit)
       via  c823f04e0cbc4753cc5b6d5c9f45b9f015a12568 (commit)
       via  7383e4d722809e2460bd4e87ea7fdbef5f64c303 (commit)
       via  2531b9095491966c7dbcf717a8b6d3dc72c0fb9f (commit)
       via  938bbc4352cf34532dc1f52998ec7d23532df765 (commit)
       via  fd23fc57115d21ad08da6b131ec9abe141e583e5 (commit)
       via  bf11253163b54f7c18b001cb00973a6341ee859b (commit)
       via  edae40239e64f8ea6c03d28601c9e7403a354f65 (commit)
       via  e494763997c2e28ead2269f21a1c6a66a815ac2e (commit)
       via  140b18648030135fbfc8fb074317c77d93a4b584 (commit)
       via  d2475bb5c4488a0ef6015f13ee46ddc7a2e4455b (commit)
       via  238aac23514ecdae0d4edb71033e443f30e94158 (commit)
       via  329098a9a0e81e67bd760f53811cce582a3ebdcd (commit)
       via  91158a3369e0f06600a9ada93222535d53361035 (commit)
       via  821f91d6ab668bbfcfc645a872acf91f71f76ff1 (commit)
       via  02fd035689ab5bbb12a16f47bca214600a9a2fde (commit)
       via  8f86407cfd4331dc1f2eb67f4f179ed8fe9dea06 (commit)
       via  069aa93b555293679f4b8c07623133ba62a74ee4 (commit)
       via  61bbbdcf9c0d1aed584fb976cd20c55ee9077850 (commit)
       via  de70c922d9c846cf3a6fabfbedd054c02f4b8934 (commit)
       via  8ea69dfef1e81a9811fe8a3d7198580dd21cb48f (commit)
       via  2963cb2a559fd27edd53b7fb7036cba0adc8b9ca (commit)
       via  4ff09893232b26b5c2961fb1e2a31836cad00a35 (commit)
       via  7de8276ca92db0630009eeab865afc445a30e1b8 (commit)
       via  65086ad778b5d8312e4168fc5ed670e545be7d4b (commit)
       via  7e86f567aca6b913689dc2d8c17a17936284b811 (commit)
       via  e5d37f23f1ad2a485b09c0975289ea73025dcb7f (commit)
       via  42747fcc73478073eaaee4c906ffe03c0b33c632 (commit)
       via  d1db123e1c3eeba3fcc27b8ae2f65c7ae8f91a7f (commit)
       via  30d44efaf86194271c70f90a8fafa94a7d56f92c (commit)
       via  6361f680568c81e0391fa56cf9a7f4637bd745dc (commit)
       via  94704d759cc8939f3573122d36d52c4598fd04ba (commit)
       via  4127a638b053940171b2619be0534a32353dae03 (commit)
       via  a8e54460243b0650145c8684f3d8deb8a712376a (commit)
       via  dbafb01580a0d35e33e6577ad07002f4dd345236 (commit)
       via  27ff19a96a7d12f2ed6d9683ef733eff6378472a (commit)
       via  9b7904d528754143ac8c04ac7cc5113746f4978b (commit)
       via  58853582be7c8a362db5d220c87025a1c19d1c8a (commit)
       via  8fbd9584af44100bbddd0f4031b57c5bc2530837 (commit)
       via  d59ab785858d8028eb9452a61571ffa688d90136 (commit)
       via  a33fb493de9098a22c4a3bd58a49e32ee156f0f8 (commit)
       via  9aed0cd1002deb63eed77381ec4bc3e515d92d12 (commit)
       via  b14fd0f72442d6332a978c9804b8777fed1b7ee8 (commit)
       via  3ae8e84ef5c94e5fa250b4e2466aa6632a233bb2 (commit)
       via  ef97d4429f3b6aa56ee2266c6ecfa47032858d82 (commit)
       via  5647b243be2c5016dfd558d17547f0ddf89046f0 (commit)
       via  8c492cadeb67522712369415bcfb734d83996d56 (commit)
       via  701226de270f9894a3cc77ee81cdbcf0504d5f76 (commit)
       via  799c1575898a937fd1fbc0789c4158c9df799fcd (commit)
       via  c6976b0b78c3a6d63126a11eca7eb52339ed82cc (commit)
       via  d4a8a554ea2b3af2ea850cf003e35ac23118a33b (commit)
       via  faec4e611d08ea2f75d2127e3ca3f5e9a427465b (commit)
       via  09993d888a31a3944378dd60cc4aef0daaf056dc (commit)
       via  48c6a92b286522cf350412d6dd3219b263e9ab5b (commit)
       via  e28e110d221a50687cc9922743366b2f34ccd852 (commit)
       via  3f5200ec5f17de36d0db1729d61e520fb014abe5 (commit)
       via  0a34ea597a954f49335559108bf3fa3382734657 (commit)
       via  be5997ef77dccc866ddb96bdfd2f529f74988eef (commit)
       via  5bf9bfda3f364b27ca91eacab18ec4dad2cc59f7 (commit)
       via  f346d88d102c627e98f630ae1c9d26cc899f76d8 (commit)
       via  b661403177edb1d22b89cc4a0ea69a8f93ad2ad2 (commit)
       via  6708d21664baf3bab6f8af143c373de7af84bffc (commit)
       via  0818737c851dce18a6da442ee73029b0de22ad56 (commit)
       via  dd7e42758d4874c087bbbc6ae062f36455f6d49c (commit)
       via  92cecd936999f9a4c67332d1aeaba3ff120fbbc2 (commit)
       via  276c62253e3f25eda4acbf0049a70c7d622c9ea2 (commit)
       via  7e3ac12df45fa42b590971accaf1db89b1a0ffb6 (commit)
       via  f62d301b9257542f5460902c400af3f947f10a66 (commit)
       via  07c550caa20d4b1d6ebc08269d744ff6a45c0a6d (commit)
       via  8bf5a80b9668a31b85aaac00d1682228bbbbac5e (commit)
       via  dffc307c81220ffc243abc3b87ecfd694bd4cd35 (commit)
       via  99d160385e22ab7bd8e712d5a58460940573cfcd (commit)
       via  5ff47ea93d490616292aae88847b42d56200d9e7 (commit)
       via  327490e698db7a74f6a8e8543e99c6c7c9333a8f (commit)
       via  bbfebcbc13df87173dd8cb59cd34e1e0b3e1c0cc (commit)
       via  1cb8d95509006c6533aaefe5a5ea3fe37692b564 (commit)
       via  7e79931e44c308f3cd25346187eb3b0a2b8b6b24 (commit)
       via  ebd5eeb6567b89697c57c4203a4c38b988c7bfaa (commit)
       via  e5f991f62f30864ccc14d10f348e56a249c1562c (commit)
       via  b702415d3a14cc2c561e4327ca27d720bbec886a (commit)
       via  17183f9250327284d5370f8d0e78e00e00098b74 (commit)
       via  806609c7024dbf07a639a9d77074d4bc82ae1b8a (commit)
       via  dcc2a7ccd4f8d9612b224d7106a4c3cfcd48e6fc (commit)
       via  6c098a4a720293c32ae308bee351e3431a350ab0 (commit)
       via  086b19aeda24bab60f7e4cd17feb2e3a070878a9 (commit)
       via  8306108fd6ed58833d5d33cf6425665457dcd902 (commit)
       via  2fd05f411b758e4060b537a6c9461634ad1362b2 (commit)
       via  2a56a21c838875a80bc7450fcc0955a5e60da7cf (commit)
       via  eaafe3bd56c891b11df670396825df09868c9c93 (commit)
       via  1051c4c810a4d4f2aad7c1140af2e75c906bfbcd (commit)
       via  bd5bf762c821ca6175095cdabb46237afb6aa3fa (commit)
       via  2d14021a850376be3b57145dfbfda8c57f5fffea (commit)
       via  f74b524e41ce1afc6633bd7853bc4d49d0d8202f (commit)
       via  6de440e201052c8b84c712f6c42cca7210e23ef3 (commit)
       via  93904772d7382ca46f2e73be9222c556c1ca79f2 (commit)
       via  60eb396f104ff6c662029b16f8859288776afbe8 (commit)
       via  6b5e94baa20685780c56158d4f41bc784c9ce49f (commit)
       via  d0c0efb5ccc57cc01e25fc5e21a16e0c86d1ea70 (commit)
       via  4d56aeff74ae52de74f33a20ecd6f45c04c5bae3 (commit)
       via  56e5d4e18095734a4418159f05dfc1e5c53f2877 (commit)
       via  5ab7dd544e2d10bf6b05ab046a852b84eee63126 (commit)
       via  bddfe77d12ee7d6ecaa3c4fa8ade1c4c0cab5760 (commit)
       via  2bf22a4b908592e363fc9aa93b3d09fbb5387b4d (commit)
       via  b24b58bb7b100794846786521f1977f048ecf5b6 (commit)
       via  69c5f134a6d681e7e66052ad40e8e74cebf64e61 (commit)
       via  9579be1043a5d0156006a483f2a4724627fcbf14 (commit)
       via  6ccb534df3a131d87ea14082fea05484039fc524 (commit)
       via  e77142350de1dec03ca788e3d3e278b7b9358fb5 (commit)
       via  5aa556be560b782d149b53bccc12dfc2be2bda0b (commit)
       via  bb88668addb3746f6f043533f0405914834a0421 (commit)
       via  a3b210fd6cb85cba76f867e93d94dd835fa3278a (commit)
       via  8ec60c675a3fb4294776b2d644974361b145c444 (commit)
       via  dee197fe610b5fe50403da796539b63a74430bd3 (commit)
       via  b2b41b83ff594555f3b80c6c2fd12e10e1e97458 (commit)
       via  2e9333a1d0979c4d6ecfe8fd16382ea6526dec9c (commit)
       via  ec6d6be57d5a032bd7c29bc440c8c8710eb426e8 (commit)
       via  24a08255856e9b3a44b55f2f138ce0b25b785928 (commit)
       via  c7180e822b4f6ca37a5175e66016ca3a748f4727 (commit)
       via  91611c39eb58006ced851f9eff50dd721c516aab (commit)
       via  8848298831e435909b52cb015d5b8d2b985f507b (commit)
       via  a38c2711e9110b5b8d8122cdf1aaf25d65f5ea3b (commit)
       via  f4144af90598fb4ae55ecd260d0b64be9d822673 (commit)
       via  820986edfff97779bb0c84fd9da3b284921c8ae4 (commit)
       via  b3e2e332eb9c2a7d73ec872664cee896248c6c38 (commit)
       via  61c0113c13fe4a65c394e56cc0354db0b80d9c4c (commit)
       via  080489b8a92253bedbb67cc7958351350f4b2341 (commit)
       via  8bfaadfa394c9b462259ea13df6b2df7c4544ab4 (commit)
       via  782657db48e0d5f0d33a19ad51678d36ddfa7ad5 (commit)
       via  a863c59f70a7556c010990a362e4d13792670148 (commit)
       via  076760a63c665dd2269c74d415e323f55969f544 (commit)
       via  569f4785371399628dd401e2522dccc54c73e34e (commit)
       via  f971ab04cfdcb73e1ac2b182caf302172aebe6a8 (commit)
       via  217c243db04a21763848ac048edf153cd93bd883 (commit)
       via  eb05dcd6c9b587eeb8738d9f08459d94733708f6 (commit)
       via  cfae7fa4082e73d4282be98fa99a07c18dd53d24 (commit)
       via  ccf7760f0035e2e0458ba59e29ab302a2d07c388 (commit)
       via  81eb2c58a17f7e34cda79897ea7dec24bf798dd2 (commit)
       via  5c837686287eb22e73af76d2ab7f32d5bf8cb9ec (commit)
       via  c10ab014344e693a65d7cfbfb9b4e0f8a8b155f9 (commit)
       via  3404f8a081a03441c6747de50f2155ae28115c07 (commit)
       via  a1858136c28326212d15cfd0a4412281f46b9cb0 (commit)
       via  ad47e6e5bc4822dc5bc9d82ae1d7590aee4ece95 (commit)
       via  254be613b803816a918c12d7d7eca40a7c9f7c09 (commit)
       via  826b6e68184759cda496f0073a8f59b2155cfdaf (commit)
       via  e53072d638c2cca3258ffccbec75bb5c70d34a3f (commit)
       via  b7166afa6d385c4f0a0610f43ea00c8e5613a003 (commit)
       via  27f229b9707f3a87c3ed0d469b5b2d08c80076c5 (commit)
       via  9166b49d70746dcd36e6e891c78734b559e0fccf (commit)
       via  384a0dba63b166d94a199b12f104e53496a3302a (commit)
       via  5e24ff17a22b780947e98eabc1d25320104f7b21 (commit)
       via  d5aaa2b96f7d93aaa8e11e8d5e9cf0c2b1739290 (commit)
       via  fff3c6cd1c49ba1aa8a256e26294db65710c9d18 (commit)
       via  a6e661b848fc180b03e7d72739c9a4a077a97e3f (commit)
       via  fe38bb2c29ab4273cfefb1b343b80388bea2893e (commit)
       via  ac10fc0958c94e17d89a686d1addae0ac18dc648 (commit)
       via  6af9fa1294e86d61b01034e0c9f12375d69f3120 (commit)
       via  155ef535974ab9e78e98da00b63f31bd5c848bd0 (commit)
       via  4fa99b9922cf811b6f3cb2fac17d9b58a33c0d6e (commit)
       via  0e346427a254024b8eafe52956e8f4ba05d856ed (commit)
       via  664156c2314302ad94c684561fdf56c847613de9 (commit)
       via  41cd8547c4780e4db383591307c9330dd9775703 (commit)
       via  a53f1af79f5b602751d2a3a68e3eb36deba53c23 (commit)
       via  c780524a967ef8e814ad4fcd4e424cdb8fe58f73 (commit)
       via  ea69c7cb962c61e6cb1ef339a83f9f17a7ed370d (commit)
       via  66a2675e2bd4e32c32ff8e4147c3c679734c4445 (commit)
       via  078b60f05c9750b79e0efb322fafeddd8450f6c0 (commit)
       via  54676a0e4cf30d9f026a0f6521f7171a75f85803 (commit)
       via  7cd539b163a58f8b594e2318bdc7e7d7b1ba6577 (commit)
       via  0d204c1c1dabba2dc87957e9ce6bcd32aab70dae (commit)
       via  5f0dad75a9dd9bb9e7b2f917806588563c3ed39e (commit)
       via  c65a060e1b19a463312f9003bc4d7793db9630e5 (commit)
       via  e2e6cb7348dfffddb5d93f679fc8c69fffd3d1dc (commit)
       via  9223c6cb12bba4444ea05d420e9eb562f861b242 (commit)
       via  940ea9ff4af0429396fc55d0f5643b848ff972af (commit)
       via  ab00ff8d7a748779d880dba0b0daff145d745a7b (commit)
       via  8bcec4d22993614e746fdbae54ba66862a85dfe1 (commit)
       via  c8bd37ec685c02736618af83ac894e96fc1e6ab8 (commit)
       via  5f30f1754ac9a701cbd311bab86250dd237d86fd (commit)
       via  f17e89c00406d243370f03c8df28efb8e128bbad (commit)
       via  ee5c40a5f8e7dbbea7b0576c184003a7f86646ba (commit)
       via  f43defaec4e8610e90886a831dcc0a15fdeea1cb (commit)
       via  5e92047421a60a7287ff00fdc9dec33b1acc94ec (commit)
       via  ee223dfa9138cfe960d5d7a6dc14b044b7e032bf (commit)
       via  e5ed8b22cb540425f7806257a96b834dcb3fb2c7 (commit)
       via  b6b4a1cb12c6aed2637961f380247f8234e864ef (commit)
       via  1199ebf1c53f7f591e412617afdaaf4ccd5bc0ff (commit)
       via  15c6a4c9199e245a31d1e4cf45bd35f279bbc44d (commit)
       via  502430e39cb6c3c860baf90cd9a0c400503e16af (commit)
       via  da4cddd787500b9da71e7c7877de9a17c6a7d1fc (commit)
       via  157396b131c3d7f5c7324972afaf3e185ee726b5 (commit)
       via  5f61ed991b3b6b9f61edc97a10b257d3343c7302 (commit)
       via  e726fc025a3543c0be8a4eb217b0a80f9c16051c (commit)
       via  6d1cef1aed6d86c0651aecb9cd0fd384db6de90c (commit)
       via  83af11d4112443ed732cd240eb0bfdfd27048825 (commit)
       via  84672a84097444e1c280ec40d2a77f905cdb09cb (commit)
       via  c1113705d7469e87f1f988ea1c86f0bbf96dd219 (commit)
       via  919b116f98f20e685999ab8e94415c11228d7d88 (commit)
       via  f8bc48413cc360f9dea377761ea833f3244bc74a (commit)
       via  b405f01daaeaeda98d448e2f0d71ea685757a5bd (commit)
       via  698f75971bee336133d21260db069bb139bd3d76 (commit)
       via  9cbb9ed4c946b957df1a99910d5b60cdb269bb89 (commit)
       via  081f6d917253046158ec43916073023d7fa181b4 (commit)
       via  0efe4944e1ae18b9204209b3ddf5811905e22357 (commit)
       via  bc1211fa7d5c8262b075e010667aed41f5205a75 (commit)
       via  98133d3d4db5fe4cf5dbb0cd16235e19b753b55e (commit)
       via  03e22481886c6ea97440f54ef84df84969e5969f (commit)
       via  90ad087ab9075cc9648df0623502da0caa44e971 (commit)
       via  7195ec92b2f34ef16ff1382fb00f527a3609f3bf (commit)
       via  31ce82d46d4150d0726929c8e37546bf84ead673 (commit)
       via  d5690088683baee7e62716f6c7e89640bb77b4aa (commit)
       via  71d52459900e2be0c78091cb2df6506b22c2c211 (commit)
       via  6863c0d52cecfc980ba512ddc891878071ff86b0 (commit)
       via  493388ce48cb4188068c6f0379bb2afa60c0a41a (commit)
       via  bcf258032fe79c75965722f25ec5f76ff472a19c (commit)
       via  b6667729cb40dec8aff28464152dfa1b7c92decc (commit)
       via  07ee7bac74260942121552bed94a18101b6e7002 (commit)
       via  f9285727dc73365ff190de530a63dffbf725eabd (commit)
       via  c9ee5de4af1ef11f946196052fbb5b6c536fb27f (commit)
       via  a3a8177eddfdfc89fae9331ca794abbc67f5d543 (commit)
       via  22d09ecf33f3d07925003995b76b7e8aa788c04f (commit)
       via  821a711b6ff59fd1fa0c0cbaa43178cee1718078 (commit)
       via  1c65ce52454db3cd7d9aff47e30456a50825de44 (commit)
       via  ab660b8d223ee3a2753cfe2dc38969f02cf13593 (commit)
       via  12e534c2b8ad0009aba746ee6e4b47423c52f3e3 (commit)
       via  eb859263aeffc79d73d046dbf9f5656e4c9739ef (commit)
       via  29985ad8948af74d8b6ad4e58428f65434e68f0c (commit)
       via  801b799f9d5f1d904c4605d19b798ed489be925d (commit)
       via  223e2ec28dab4360f573932dfc0991744ddc0918 (commit)
       via  d78fbb6ad460dee47f53a0680368c2f536087800 (commit)
       via  1adcec3983c4c017f4e0d79e5bb7d68742ec58ea (commit)
       via  7f14943e5c7d508e937d45cb2608b07dd7c1e2b0 (commit)
       via  3e49888ff01c61f9d21911ca0b2ac7f482f5f26e (commit)
       via  f7be278a30d2dee93184de624aac29bbc29cb79d (commit)
       via  82986700d132a25f4ef8ad2756b767661af7fab8 (commit)
       via  a53d920290f15a55737c944f3abf563d8d5d002d (commit)
       via  d6011a61e94ef181a0aa6044216b6e8d327343e9 (commit)
       via  5a5a81e550325e1d5fdd0bb86429188e069e192d (commit)
       via  2848f93d1aa8420fa57351385aefe8042b675540 (commit)
       via  1594edba9ead291eaf3a9b4e63ba41edc43d4f99 (commit)
       via  c3f40f4fd98388a2fd31c707e7225d33a7fc76f6 (commit)
       via  52b9d828ab482f5eaae3313d821d9a4a492f069b (commit)
       via  fe603c7dfb8a3d0dfc892b46f9df0b4c32a892f9 (commit)
       via  8fc53c3ce89e76a4e5cf1968307c513041e9a7b7 (commit)
       via  7ab0806fef24d4982adbbef9b37f48111d2eced4 (commit)
       via  3de3544fcd38680652d5bbe0790b78477ffa26f1 (commit)
       via  8c64c4783dde25d84b1549945b95d192c1b7fd68 (commit)
       via  25b4483ef8d6f6f074f05cf99e0282abf22d8939 (commit)
       via  e2f349864dea91bec1d4c07428ab94225ff589dd (commit)
       via  d17aa60659a1a69f9101c61a149eca5842291226 (commit)
       via  ccc6fe94453444ebd5e655a9f90a5d074049f846 (commit)
       via  21c92a00bf50afedf52388c5f5a73cba7f756561 (commit)
       via  f5690cc57c0cd18ee8619332379f523c8fac46a1 (commit)
       via  d18852d5961584125ae113fae23f4b55a760e159 (commit)
       via  c8997d1b32c866b9f45c3af51e4abc431ca2ebc7 (commit)
       via  25136d73945f9e0a6fbfc4abfde61e4dbd10e6c6 (commit)
       via  534cc47cd603b10aecb212576d03c9f687dce292 (commit)
       via  092133b1bace24c718a5798a800570a3f384e618 (commit)
       via  77ee6db50529abc784408d10156d5e4be61b8f18 (commit)
       via  124243c0eb6977690d4f99f17e8019c748af3668 (commit)
       via  9d68bd6a249e3c58fe4f7cb383ce27c14417c43c (commit)
       via  4c192fb53152a61015eb29c0a3826adeec16f8f8 (commit)
       via  046aafff12e6fa9834c7c114a59389df404ddf18 (commit)
       via  021c4b6f2bced25c9adbb472b94148987e1b6398 (commit)
       via  8174e5cd9424a7f45174562f21eb80eb06a3f3d0 (commit)
       via  34e1d6db722b34bb6b4f7b8a7ea53a0bb61c5f58 (commit)
       via  54cb76f299ebcdd07e59d3d0c61f1aa0ffe03a33 (commit)
       via  4ab7d407a5e46f91bf57fb1f9be7387ba989e0ec (commit)
       via  e133e40937031004d11b0d16289cee1bf0dc5e4f (commit)
       via  c197c6928128558e24ee094286e494e74b272f20 (commit)
       via  b661d6c631884e48b27353b0ee9f4f0eb6f5eea7 (commit)
       via  40844a1487ea576987ecec148f77bbeebea9433d (commit)
       via  b1ff32afc67799d08130d457347290a41e426ed0 (commit)
       via  dd0417c7becb9d00bf60827d299b3d520bb138c5 (commit)
       via  125c48660ce5f58e8fa9371cfb9c192f42b19401 (commit)
       via  92b8b1fc3d885091cfef210216b682a389eaf2fb (commit)
       via  7f3e16239fd120eded5e23ee8a836d9e73119244 (commit)
       via  d9df7fa70c854207bb36b45ca0fdca6665bd4bd8 (commit)
       via  db24e41b9d939fb8ad9106f7a8511670505a8ad0 (commit)
       via  4cd13e80f00d4441112f400ff774d91a7fecfff8 (commit)
       via  3e087a408b4a5bad1eb079c61c982ce2dab0973a (commit)
       via  e04217010345fd350d3ddd7897e47eb47eaec1d8 (commit)
       via  c26696eb404888cec525bf3ee2e538ae8532156f (commit)
       via  41fef23b9b8bfa795e2d61e27b12f055ef9bbc39 (commit)
       via  647488570bfe7ce210bfd0675df0eb5147e36ab6 (commit)
       via  6f148e4a48f3f879998e67d9bb30de07f5cf5608 (commit)
       via  5181fae264444ad7736614ceb1e78c51def2b97c (commit)
       via  3ac4b90bfdcca97f1f63056c97afee38cf66ea12 (commit)
       via  7c0aa672fe4f1b5c4a15a89d90cd80009a1399d0 (commit)
       via  9058e27a431b01319b18cc4099780fa017ada113 (commit)
       via  1c48edf8fc8cec71c780cbb1c587f10df0ab7185 (commit)
       via  93cc2eef38eab76831916bfee9d6fe16fbaaf4c1 (commit)
       via  cb1a9c7b9cc48ac1f908ece7bb55a342bd943fec (commit)
       via  f573bd22e4049746b53789fc0502cff8423dbe56 (commit)
       via  ccbc2259137fe61a770bb0b5538a20bf5e00bc8f (commit)
       via  44a8115797cc3f804d653928d71b126b39e29210 (commit)
       via  1981c9718b7099670b03535a241c735477d6bc6c (commit)
       via  353e422b2ad3d51dfc6c6db968ebcece10cbcc8d (commit)
       via  00bfa047481ed9f75444cb4954d7d72f616aef0f (commit)
       via  db74ce5820e0d0a99649c6b472de74277e3fa6bf (commit)
       via  59e21ffa134faf0b089d9a704b3763e7f6f237d5 (commit)
       via  242dcc2c22535c00348de18bba41605428ccdb73 (commit)
       via  1cff330b0fcd635f47047bd1a2d94f344e88c0f9 (commit)
       via  2f1bd62b2308c234b5c4bc749afa27c7b616bdf1 (commit)
       via  0f2a132437d7a553e20cc0427279c212b428e55d (commit)
       via  4d8b79ad7e132ff876d131526a03a21c4f424f33 (commit)
       via  8680520feab8421f79c9762f1d3b6b92384c0b1e (commit)
       via  6d7abb6326d422dabdf72e8486b492ac20f8b347 (commit)
       via  50a1bd3df13d47167d55fb1584b2c1bc7235884b (commit)
       via  092f1539af99e031c99a74d5a0f24731f58bf10a (commit)
       via  cdf2cba3e71b92c5bddf7afe760c131953f999a4 (commit)
       via  8d0347b57166cc14a2c6668742d801d5d2828772 (commit)
       via  ca140c2e898ca74a7daa305449b136b1294a41f0 (commit)
       via  d5dc4169ac1c4dd5abd385b1e8499119df88c657 (commit)
       via  4e5c70abe27997f17318cc6aca38eeddec486798 (commit)
       via  7b9c75860d25479a153831740d289e8aca540f4d (commit)
       via  1b323949fe6770fa36846a5a85d049121c7ce2c4 (commit)
       via  a82441572493e4f420fca24041b594da9d3c14e6 (commit)
       via  1f4ef39603f3184ac3f78e1f52529947303b1bd1 (commit)
       via  91cd014d6452371056bb3f96de29967f506b3bd7 (commit)
       via  bccbe281ff7039e145814d1858a45f38bb681173 (commit)
       via  6cafd8ed0bc8458ba2c6eb0e792c894cf4f37f90 (commit)
       via  0886880e3b8e5510f861b2e573b311c16db9d657 (commit)
       via  d6fe79f3abc211361f0aee909e08fd6a1531a68b (commit)
       via  5a1c8806bfded9e68280542fa7573f21eb125e95 (commit)
       via  b49aef6b10e4c84d31c1fe48a10878109397c553 (commit)
       via  94070b8dfa9f12b13a6794e41e605920e80da696 (commit)
       via  2b083b19ebe7ee11fa0f9aa68bfc22616106c5a0 (commit)
       via  5ec8a043025c3f3c6bcc6fe38c2c78127e973bee (commit)
       via  7657e8b1df64ed3b5429be34416e8756b659d525 (commit)
       via  4e8f242d170ab46d4071254a3a81f7db264b8bc7 (commit)
       via  d65e01235da2473e669d6e5c40988ad4015f0dc4 (commit)
       via  f059ed165bafff94f9bcd3823e12a8ce1f5ec647 (commit)
       via  a653611db0d6e23456c5ef90f95e19ea5d70a428 (commit)
       via  69a038a9e90a8839b69f4cb8826688be611e8b0d (commit)
       via  0863797037b82f01cb356cb2cd4cdcef7ca8ae48 (commit)
       via  27e11c6fea8e863b59c0fdfd63f1e9f2528dbac4 (commit)
       via  363caa2fa540190ea394122fca3cb72d951823ad (commit)
       via  6e570f857acd3322640db72112f2dc37b69396cf (commit)
       via  c85367f408befa419185a4fec4816ea0ee3e1ee6 (commit)
       via  0cc7c9a74368d1db8acc1a98dec79a1eb472e74b (commit)
       via  3d8c6cd9648089c389c1496fb910d664a5773ab4 (commit)
       via  e44e6bcc045916fcab3b3798d9aa9951c35c1878 (commit)
       via  1335992c8f4e8b96f1a21d5dcc7d65a9fbd84c11 (commit)
       via  721b7e3e56f8a9e7f6daf1602dcc5cd85677fc84 (commit)
       via  758392f51f4c1653c2f4dce936fb1a44d86d6a21 (commit)
       via  cf1233a0eab7cec757d2929cc7373f94ba4fa8a8 (commit)
       via  942df88bf83e99abbfbd69207369096fa7cf67a2 (commit)
       via  da28f11523644cdc2138a0cde2c4c015948ff46c (commit)
       via  eb7b6f6db4b2de70aae80fd8143e701b0cfa4268 (commit)
       via  499ebb6564800c23bfb6e7b1b706a6202b3f971a (commit)
       via  80b433b05ea921e6144c10260cfeafb4b25e5bc1 (commit)
       via  52919ac8ac22e1646f8f46907fe9c8e753d954cf (commit)
       via  b68f2ea8ae26b23639df5978116375b47b4123c3 (commit)
       via  17e13f0a2de8dca416521cb5ad9775bf46030c83 (commit)
       via  14e2c3ad181e2090cb0846fb87743f7543484d08 (commit)
       via  d3bb5da9294ddbfcc5fddf7ba3dafd2c3e0b32b2 (commit)
       via  4a96a4e3bead6dfbcdfc7953739f2cd135c1af0c (commit)
      from  650c630a663b2d0663e6ef6acda2a5fb94e5a621 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Auxiliary/cmake-indent.vim                         |    2 +-
 Auxiliary/cmake-mode.el                            |  191 +-
 Auxiliary/cmake-syntax.vim                         |    2 +-
 CMakeCPack.cmake                                   |   67 +-
 CMakeCPackOptions.cmake.in                         |  126 +-
 CMakeLists.txt                                     |   37 +-
 CONTRIBUTING.rst                                   |    4 +-
 CTestCustom.cmake.in                               |   21 +-
 Help/command/FIND_XXX.txt                          |   68 +-
 Help/command/FIND_XXX_MAC.txt                      |   24 -
 Help/command/FIND_XXX_ROOT.txt                     |   16 +-
 Help/command/add_library.rst                       |    2 +
 Help/command/add_subdirectory.rst                  |   14 +-
 Help/command/aux_source_directory.rst              |    2 +-
 Help/command/build_name.rst                        |    5 +-
 Help/command/cmake_host_system_information.rst     |    6 +-
 Help/command/cmake_minimum_required.rst            |    2 +-
 Help/command/create_test_sourcelist.rst            |   18 +-
 Help/command/ctest_memcheck.rst                    |    1 +
 Help/command/ctest_read_custom_files.rst           |    3 +
 Help/command/ctest_run_script.rst                  |    6 +-
 Help/command/ctest_start.rst                       |    2 +-
 Help/command/ctest_test.rst                        |   13 +-
 Help/command/define_property.rst                   |   28 +-
 Help/command/else.rst                              |    2 +-
 Help/command/elseif.rst                            |    2 +-
 Help/command/enable_language.rst                   |    2 +-
 Help/command/enable_testing.rst                    |    8 +-
 Help/command/endforeach.rst                        |    4 +-
 Help/command/endfunction.rst                       |    2 +-
 Help/command/endif.rst                             |    2 +-
 Help/command/endmacro.rst                          |    2 +-
 Help/command/endwhile.rst                          |    2 +-
 Help/command/exec_program.rst                      |    8 +-
 Help/command/execute_process.rst                   |   14 +-
 Help/command/export.rst                            |   18 +-
 Help/command/export_library_dependencies.rst       |   12 +-
 Help/command/find_file.rst                         |   29 +-
 Help/command/find_library.rst                      |   51 +-
 Help/command/find_package.rst                      |    7 +-
 Help/command/find_path.rst                         |   35 +-
 Help/command/find_program.rst                      |   22 +-
 Help/command/fltk_wrap_ui.rst                      |    2 +-
 Help/command/foreach.rst                           |    6 +-
 Help/command/get_cmake_property.rst                |    8 +-
 Help/command/get_directory_property.rst            |    6 +-
 Help/command/get_filename_component.rst            |   47 +-
 Help/command/get_source_file_property.rst          |   10 +-
 Help/command/get_target_property.rst               |    6 +-
 Help/command/get_test_property.rst                 |    8 +-
 Help/command/if.rst                                |    4 +
 Help/command/include.rst                           |   18 +-
 Help/command/include_external_msproject.rst        |    6 +-
 Help/command/include_regular_expression.rst        |    4 +-
 Help/command/install.rst                           |    8 +
 Help/command/install_files.rst                     |   18 +-
 Help/command/install_programs.rst                  |   23 +-
 Help/command/install_targets.rst                   |   12 +-
 Help/command/link_directories.rst                  |    8 +-
 Help/command/list.rst                              |   48 +-
 Help/command/load_cache.rst                        |    4 +-
 Help/command/load_command.rst                      |    6 +-
 Help/command/make_directory.rst                    |    2 +-
 Help/command/mark_as_advanced.rst                  |    8 +-
 Help/command/math.rst                              |    2 +-
 Help/command/message.rst                           |    2 +-
 Help/command/option.rst                            |    6 +-
 Help/command/qt_wrap_cpp.rst                       |    2 +-
 Help/command/qt_wrap_ui.rst                        |    6 +-
 Help/command/remove.rst                            |    8 +-
 Help/command/remove_definitions.rst                |    6 +-
 Help/command/return.rst                            |   14 +-
 Help/command/separate_arguments.rst                |    8 +-
 Help/command/set_property.rst                      |    3 +
 Help/command/set_target_properties.rst             |   92 +-
 Help/command/string.rst                            |  314 +-
 Help/command/subdirs.rst                           |   12 +-
 Help/command/try_compile.rst                       |   14 +
 Help/command/unset.rst                             |   10 +-
 Help/command/utility_source.rst                    |    4 +-
 Help/command/variable_requires.rst                 |    8 +-
 Help/command/while.rst                             |    8 +-
 Help/command/write_file.rst                        |   14 +-
 Help/manual/LINKS.txt                              |   10 +-
 Help/manual/cmake-buildsystem.7.rst                |   16 +
 Help/manual/cmake-commands.7.rst                   |    2 +-
 Help/manual/cmake-compile-features.7.rst           |    2 +-
 Help/manual/cmake-developer.7.rst                  |    6 +-
 Help/manual/cmake-generator-expressions.7.rst      |    4 +
 Help/manual/cmake-policies.7.rst                   |    2 +
 Help/manual/cmake-properties.7.rst                 |   25 +
 Help/manual/cmake-toolchains.7.rst                 |   39 +-
 Help/manual/cmake-variables.7.rst                  |   44 +
 Help/manual/cmake.1.rst                            |   12 +-
 Help/manual/ctest.1.rst                            |   20 +
 Help/policy/CMP0064.rst                            |   17 +
 Help/policy/CMP0065.rst                            |   27 +
 Help/prop_dir/INCLUDE_REGULAR_EXPRESSION.rst       |    5 +-
 Help/prop_gbl/RULE_LAUNCH_COMPILE.rst              |   10 +-
 Help/prop_gbl/RULE_LAUNCH_CUSTOM.rst               |   10 +-
 Help/prop_gbl/RULE_LAUNCH_LINK.rst                 |   10 +-
 Help/prop_gbl/TARGET_MESSAGES.rst                  |   20 +
 Help/prop_sf/OBJECT_DEPENDS.rst                    |   13 +-
 Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst   |    8 +
 Help/prop_tgt/ANDROID_ARCH.rst                     |   17 +
 Help/prop_tgt/ANDROID_ASSETS_DIRECTORIES.rst       |    9 +
 Help/prop_tgt/ANDROID_JAR_DEPENDENCIES.rst         |    7 +
 Help/prop_tgt/ANDROID_JAR_DIRECTORIES.rst          |   14 +
 Help/prop_tgt/ANDROID_JAVA_SOURCE_DIR.rst          |    8 +
 Help/prop_tgt/ANDROID_NATIVE_LIB_DEPENDENCIES.rst  |   14 +
 Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst   |   16 +
 Help/prop_tgt/ANDROID_PROCESS_MAX.rst              |    8 +
 Help/prop_tgt/ANDROID_PROGUARD.rst                 |    9 +
 Help/prop_tgt/ANDROID_PROGUARD_CONFIG_PATH.rst     |    9 +
 Help/prop_tgt/ANDROID_SECURE_PROPS_PATH.rst        |    8 +
 Help/prop_tgt/ANDROID_SKIP_ANT_STEP.rst            |    6 +
 Help/prop_tgt/ANDROID_STL_TYPE.rst                 |   15 +
 Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst  |    3 +
 Help/prop_tgt/BINARY_DIR.rst                       |    6 +
 Help/prop_tgt/CONFIG_OUTPUT_NAME.rst               |    5 +-
 Help/prop_tgt/ENABLE_EXPORTS.rst                   |    5 +-
 Help/prop_tgt/FRAMEWORK.rst                        |    4 +-
 Help/prop_tgt/FRAMEWORK_VERSION.rst                |    5 +
 Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst           |   13 +
 Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst  |    3 +
 Help/prop_tgt/LINK_SEARCH_END_STATIC.rst           |    8 +-
 Help/prop_tgt/LINK_SEARCH_START_STATIC.rst         |    7 +-
 Help/prop_tgt/NO_SONAME.rst                        |    6 +-
 Help/prop_tgt/OUTPUT_NAME.rst                      |   13 +
 Help/prop_tgt/OUTPUT_NAME_CONFIG.rst               |    3 +-
 Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst  |    3 +
 Help/prop_tgt/SOURCE_DIR.rst                       |    6 +
 Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst    |   10 +
 Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst        |   10 +
 Help/prop_tgt/VS_IOT_STARTUP_TASK.rst              |    6 +
 Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst     |   10 +
 .../VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst     |   10 +
 Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst       |   18 +
 Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt             |    7 +-
 Help/release/3.4.rst                               |  269 ++
 Help/release/index.rst                             |    1 +
 Help/variable/APPLE.rst                            |    4 +-
 Help/variable/BORLAND.rst                          |    4 +-
 Help/variable/BUILD_SHARED_LIBS.rst                |    6 +-
 Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst |    4 +-
 .../CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst       |    5 +
 Help/variable/CMAKE_ANDROID_ARCH.rst               |    5 +
 Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst |    5 +
 Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst   |    5 +
 Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst    |    5 +
 Help/variable/CMAKE_ANDROID_JAVA_SOURCE_DIR.rst    |    5 +
 .../CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst      |    5 +
 .../CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst       |    5 +
 Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst        |    5 +
 Help/variable/CMAKE_ANDROID_PROGUARD.rst           |    5 +
 .../CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst         |    5 +
 Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst  |    5 +
 Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst      |    5 +
 Help/variable/CMAKE_ANDROID_STL_TYPE.rst           |    5 +
 Help/variable/CMAKE_ARGC.rst                       |    5 +-
 Help/variable/CMAKE_ARGV0.rst                      |    8 +-
 Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst       |   12 +-
 Help/variable/CMAKE_AUTORCC.rst                    |    4 +-
 Help/variable/CMAKE_AUTOUIC.rst                    |    4 +-
 Help/variable/CMAKE_BINARY_DIR.rst                 |    2 +-
 Help/variable/CMAKE_BUILD_TYPE.rst                 |   25 +-
 Help/variable/CMAKE_BUILD_WITH_INSTALL_RPATH.rst   |   10 +-
 Help/variable/CMAKE_CACHEFILE_DIR.rst              |    6 +-
 Help/variable/CMAKE_CACHE_MAJOR_VERSION.rst        |    2 +-
 Help/variable/CMAKE_CACHE_MINOR_VERSION.rst        |    2 +-
 Help/variable/CMAKE_CACHE_PATCH_VERSION.rst        |    2 +-
 Help/variable/CMAKE_CFG_INTDIR.rst                 |   21 +-
 Help/variable/CMAKE_CL_64.rst                      |    4 +-
 Help/variable/CMAKE_COLOR_MAKEFILE.rst             |    4 +-
 Help/variable/CMAKE_COMMAND.rst                    |    8 +-
 Help/variable/CMAKE_COMPILER_IS_GNULANG.rst        |    6 +-
 Help/variable/CMAKE_CONFIGURATION_TYPES.rst        |    6 +-
 Help/variable/CMAKE_CONFIG_POSTFIX.rst             |    6 +-
 Help/variable/CMAKE_CTEST_COMMAND.rst              |    8 +-
 Help/variable/CMAKE_CURRENT_BINARY_DIR.rst         |    2 +-
 Help/variable/CMAKE_CURRENT_LIST_DIR.rst           |    6 +-
 Help/variable/CMAKE_CURRENT_LIST_FILE.rst          |    2 +-
 Help/variable/CMAKE_CXX_COMPILE_FEATURES.rst       |    4 +-
 Help/variable/CMAKE_CXX_EXTENSIONS.rst             |    2 +-
 Help/variable/CMAKE_CXX_STANDARD.rst               |    2 +-
 Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst      |    2 +-
 Help/variable/CMAKE_C_COMPILE_FEATURES.rst         |    4 +-
 Help/variable/CMAKE_C_EXTENSIONS.rst               |    2 +-
 Help/variable/CMAKE_C_STANDARD.rst                 |    2 +-
 Help/variable/CMAKE_C_STANDARD_REQUIRED.rst        |    2 +-
 Help/variable/CMAKE_DEBUG_POSTFIX.rst              |    4 +-
 Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst    |    6 +-
 .../CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst     |    9 +-
 Help/variable/CMAKE_DL_LIBS.rst                    |    6 +-
 Help/variable/CMAKE_EDIT_COMMAND.rst               |    6 +-
 Help/variable/CMAKE_ENABLE_EXPORTS.rst             |   22 +
 Help/variable/CMAKE_ERROR_DEPRECATED.rst           |    4 +-
 ...CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst |    5 +-
 Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst          |    4 +-
 Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst    |    2 +-
 Help/variable/CMAKE_EXTRA_GENERATOR.rst            |    9 +-
 .../CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst        |    2 +-
 Help/variable/CMAKE_FIND_APPBUNDLE.rst             |   22 +
 Help/variable/CMAKE_FIND_FRAMEWORK.rst             |   22 +
 Help/variable/CMAKE_FIND_LIBRARY_PREFIXES.rst      |    6 +-
 Help/variable/CMAKE_FIND_LIBRARY_SUFFIXES.rst      |    6 +-
 Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst     |    6 +-
 .../variable/CMAKE_FIND_PACKAGE_WARN_NO_MODULE.rst |   18 +-
 Help/variable/CMAKE_FIND_ROOT_PATH.rst             |    4 +-
 Help/variable/CMAKE_Fortran_FORMAT.rst             |    6 +-
 Help/variable/CMAKE_Fortran_MODDIR_DEFAULT.rst     |    6 +-
 Help/variable/CMAKE_Fortran_MODDIR_FLAG.rst        |    2 +-
 Help/variable/CMAKE_Fortran_MODOUT_FLAG.rst        |    2 +-
 Help/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst   |    2 +-
 Help/variable/CMAKE_GENERATOR.rst                  |    4 +-
 Help/variable/CMAKE_GENERATOR_PLATFORM.rst         |    4 +-
 Help/variable/CMAKE_GENERATOR_TOOLSET.rst          |    4 +-
 Help/variable/CMAKE_GNUtoMS.rst                    |    6 +-
 Help/variable/CMAKE_HOST_APPLE.rst                 |    4 +-
 Help/variable/CMAKE_HOST_SYSTEM_NAME.rst           |    2 +-
 Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst      |    4 +-
 Help/variable/CMAKE_HOST_SYSTEM_VERSION.rst        |    2 +-
 Help/variable/CMAKE_HOST_UNIX.rst                  |    4 +-
 Help/variable/CMAKE_HOST_WIN32.rst                 |    4 +-
 Help/variable/CMAKE_IMPORT_LIBRARY_PREFIX.rst      |    2 +-
 Help/variable/CMAKE_IMPORT_LIBRARY_SUFFIX.rst      |    2 +-
 Help/variable/CMAKE_INCLUDE_CURRENT_DIR.rst        |    8 +-
 .../CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE.rst     |   10 +-
 Help/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.rst |    7 +-
 .../CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst   |    4 +-
 .../CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.rst       |    8 +-
 Help/variable/CMAKE_INSTALL_NAME_DIR.rst           |    6 +-
 Help/variable/CMAKE_INSTALL_PREFIX.rst             |   25 +-
 Help/variable/CMAKE_INSTALL_RPATH.rst              |    2 +-
 .../variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst |    6 +-
 Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst        |    7 +-
 Help/variable/CMAKE_LANG_ARCHIVE_CREATE.rst        |    7 +-
 Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst        |    7 +-
 Help/variable/CMAKE_LANG_COMPILER.rst              |    4 +-
 .../CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst     |    6 +-
 Help/variable/CMAKE_LANG_COMPILER_ID.rst           |    1 +
 Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst     |    6 +
 Help/variable/CMAKE_LANG_COMPILER_LOADED.rst       |    4 +-
 Help/variable/CMAKE_LANG_COMPILE_OBJECT.rst        |    2 +-
 Help/variable/CMAKE_LANG_CREATE_SHARED_LIBRARY.rst |    2 +-
 Help/variable/CMAKE_LANG_CREATE_SHARED_MODULE.rst  |    2 +-
 Help/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.rst |    2 +-
 Help/variable/CMAKE_LANG_FLAGS.rst                 |    2 +-
 Help/variable/CMAKE_LANG_FLAGS_DEBUG.rst           |    4 +-
 Help/variable/CMAKE_LANG_FLAGS_MINSIZEREL.rst      |    6 +-
 Help/variable/CMAKE_LANG_FLAGS_RELEASE.rst         |    4 +-
 Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst  |    6 +-
 .../variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst |    4 +-
 .../CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst     |    6 +-
 .../CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst        |    4 +-
 .../CMAKE_LANG_GHS_KERNEL_FLAGS_RELWITHDEBINFO.rst |    6 +-
 .../CMAKE_LANG_IMPLICIT_INCLUDE_DIRECTORIES.rst    |    2 +-
 .../CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES.rst       |    8 +-
 ...KE_LANG_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES.rst |    2 +-
 .../CMAKE_LANG_IMPLICIT_LINK_LIBRARIES.rst         |    2 +-
 Help/variable/CMAKE_LANG_LIBRARY_ARCHITECTURE.rst  |    8 +-
 Help/variable/CMAKE_LANG_LINKER_PREFERENCE.rst     |    4 +-
 .../CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES.rst    |    2 +-
 Help/variable/CMAKE_LANG_OUTPUT_EXTENSION.rst      |    4 +-
 Help/variable/CMAKE_LANG_SIMULATE_ID.rst           |    4 +-
 Help/variable/CMAKE_LANG_SIMULATE_VERSION.rst      |    4 +-
 Help/variable/CMAKE_LANG_SIZEOF_DATA_PTR.rst       |    4 +-
 Help/variable/CMAKE_LIBRARY_ARCHITECTURE.rst       |    4 +-
 Help/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.rst |    4 +-
 Help/variable/CMAKE_LIBRARY_PATH_FLAG.rst          |    2 +-
 Help/variable/CMAKE_LINK_DEF_FILE_FLAG.rst         |    4 +-
 Help/variable/CMAKE_LINK_DEPENDS_NO_SHARED.rst     |    2 +-
 Help/variable/CMAKE_LINK_INTERFACE_LIBRARIES.rst   |    4 +-
 Help/variable/CMAKE_LINK_LIBRARY_FLAG.rst          |    2 +-
 Help/variable/CMAKE_LINK_LIBRARY_SUFFIX.rst        |    2 +-
 Help/variable/CMAKE_LINK_SEARCH_END_STATIC.rst     |   19 +
 Help/variable/CMAKE_LINK_SEARCH_START_STATIC.rst   |   20 +
 Help/variable/CMAKE_MACOSX_BUNDLE.rst              |    6 +-
 Help/variable/CMAKE_MAKE_PROGRAM.rst               |   10 +-
 Help/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.rst |    8 +-
 Help/variable/CMAKE_MFC_FLAG.rst                   |    6 +-
 Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst   |    6 +-
 Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG.rst |    2 +-
 Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst     |    4 +-
 Help/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.rst    |    4 +-
 Help/variable/CMAKE_PARENT_LIST_FILE.rst           |    8 +-
 Help/variable/CMAKE_POLICY_DEFAULT_CMPNNNN.rst     |   19 +-
 Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst     |    6 +-
 Help/variable/CMAKE_POSITION_INDEPENDENT_CODE.rst  |    9 +-
 Help/variable/CMAKE_PROJECT_NAME.rst               |    2 +-
 Help/variable/CMAKE_ROOT.rst                       |    4 +-
 Help/variable/CMAKE_SCRIPT_MODE_FILE.rst           |    9 +-
 Help/variable/CMAKE_SHARED_LIBRARY_PREFIX.rst      |    4 +-
 Help/variable/CMAKE_SHARED_LIBRARY_SUFFIX.rst      |    4 +-
 Help/variable/CMAKE_SHARED_LINKER_FLAGS_CONFIG.rst |    2 +-
 Help/variable/CMAKE_SHARED_MODULE_PREFIX.rst       |    2 +-
 Help/variable/CMAKE_SHARED_MODULE_SUFFIX.rst       |    2 +-
 Help/variable/CMAKE_SIZEOF_VOID_P.rst              |    6 +-
 .../variable/CMAKE_SKIP_INSTALL_ALL_DEPENDENCY.rst |   12 +-
 Help/variable/CMAKE_SKIP_INSTALL_RPATH.rst         |    2 +-
 Help/variable/CMAKE_SKIP_INSTALL_RULES.rst         |    5 +-
 Help/variable/CMAKE_SKIP_RPATH.rst                 |    4 +-
 Help/variable/CMAKE_SOURCE_DIR.rst                 |    2 +-
 Help/variable/CMAKE_STAGING_PREFIX.rst             |   11 +-
 Help/variable/CMAKE_STATIC_LIBRARY_PREFIX.rst      |    4 +-
 Help/variable/CMAKE_STATIC_LIBRARY_SUFFIX.rst      |    4 +-
 Help/variable/CMAKE_STATIC_LINKER_FLAGS_CONFIG.rst |    2 +-
 Help/variable/CMAKE_SYSTEM.rst                     |    2 +-
 Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst      |    7 +
 Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst      |    8 +
 Help/variable/CMAKE_SYSTEM_NAME.rst                |   20 +-
 Help/variable/CMAKE_SYSTEM_PROCESSOR.rst           |    2 +-
 Help/variable/CMAKE_SYSTEM_VERSION.rst             |   28 +-
 Help/variable/CMAKE_TOOLCHAIN_FILE.rst             |    6 +-
 Help/variable/CMAKE_TRY_COMPILE_CONFIGURATION.rst  |    7 +-
 Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.rst   |   20 +-
 .../CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.rst        |    7 +-
 Help/variable/CMAKE_USE_RELATIVE_PATHS.rst         |    9 +-
 Help/variable/CMAKE_VERBOSE_MAKEFILE.rst           |    2 +-
 .../CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst  |    8 +-
 .../CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst     |    4 +-
 Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst        |    2 +-
 .../CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst   |   11 +
 Help/variable/CMAKE_WARN_DEPRECATED.rst            |    4 +-
 .../CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst |    7 +-
 Help/variable/CMAKE_WIN32_EXECUTABLE.rst           |    6 +-
 Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst |    6 +
 .../CMAKE_XCODE_ATTRIBUTE_an-attribute.rst         |    4 +-
 Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst     |    6 +-
 Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst |    6 +-
 .../CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst |    6 +-
 ...CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst |    9 +-
 Help/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.rst |   11 +-
 Help/variable/CPACK_INSTALL_SCRIPT.rst             |    2 +-
 Help/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst   |   12 +-
 Help/variable/CPACK_SET_DESTDIR.rst                |   31 +-
 .../CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst |    7 +-
 Help/variable/CTEST_CHANGE_ID.rst                  |    9 +
 Help/variable/CTEST_COVERAGE_COMMAND.rst           |   20 +-
 Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst    |    7 +
 Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst     |    7 +
 Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst         |    7 +
 Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst  |    7 +
 Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst   |    7 +
 ...TEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst |    8 +
 .../CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS.rst      |    8 +
 .../CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS.rst    |    8 +
 ...TEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE.rst |    8 +
 Help/variable/CTEST_CUSTOM_MEMCHECK_IGNORE.rst     |    7 +
 Help/variable/CTEST_CUSTOM_POST_MEMCHECK.rst       |    6 +
 Help/variable/CTEST_CUSTOM_POST_TEST.rst           |    6 +
 Help/variable/CTEST_CUSTOM_PRE_MEMCHECK.rst        |    7 +
 Help/variable/CTEST_CUSTOM_PRE_TEST.rst            |    6 +
 Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst         |    7 +
 Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst   |    7 +
 Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst       |    7 +
 Help/variable/CTEST_CUSTOM_XXX.txt                 |    2 +
 Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst        |    7 +
 Help/variable/CTEST_MEMORYCHECK_TYPE.rst           |    5 +-
 Help/variable/CTEST_TEST_LOAD.rst                  |    7 +
 Help/variable/CYGWIN.rst                           |    4 +-
 Help/variable/ENV.rst                              |    4 +-
 Help/variable/EXECUTABLE_OUTPUT_PATH.rst           |    4 +-
 Help/variable/LIBRARY_OUTPUT_PATH.rst              |    8 +-
 Help/variable/MINGW.rst                            |    4 +-
 Help/variable/MSVC.rst                             |    4 +-
 Help/variable/MSVC10.rst                           |    4 +-
 Help/variable/MSVC11.rst                           |    4 +-
 Help/variable/MSVC12.rst                           |    4 +-
 Help/variable/MSVC14.rst                           |    4 +-
 Help/variable/MSVC60.rst                           |    4 +-
 Help/variable/MSVC70.rst                           |    4 +-
 Help/variable/MSVC71.rst                           |    4 +-
 Help/variable/MSVC80.rst                           |    4 +-
 Help/variable/MSVC90.rst                           |    4 +-
 Help/variable/MSVC_IDE.rst                         |    4 +-
 Help/variable/UNIX.rst                             |    6 +-
 Help/variable/WIN32.rst                            |    4 +-
 Help/variable/XCODE_VERSION.rst                    |    4 +-
 .../BasicConfigVersion-AnyNewerVersion.cmake.in    |    8 +-
 Modules/BasicConfigVersion-ExactVersion.cmake.in   |   10 +-
 .../BasicConfigVersion-SameMajorVersion.cmake.in   |   10 +-
 Modules/CMakeASMInformation.cmake                  |    2 +-
 Modules/CMakeASM_MASMInformation.cmake             |    2 +-
 Modules/CMakeCCompiler.cmake.in                    |   10 +-
 Modules/CMakeCCompilerId.c.in                      |   11 +
 Modules/CMakeCInformation.cmake                    |    8 +-
 Modules/CMakeCXXCompiler.cmake.in                  |   10 +-
 Modules/CMakeCXXCompilerId.cpp.in                  |   10 +
 Modules/CMakeCXXInformation.cmake                  |    8 +-
 Modules/CMakeClDeps.cmake                          |   34 -
 Modules/CMakeDetermineCCompiler.cmake              |   12 +-
 Modules/CMakeDetermineCXXCompiler.cmake            |   12 +-
 Modules/CMakeDetermineCompilerId.cmake             |  134 +-
 Modules/CMakeDetermineFortranCompiler.cmake        |   16 +
 Modules/CMakeDetermineSwiftCompiler.cmake          |   53 +
 Modules/CMakeDetermineSystem.cmake                 |    4 +-
 Modules/CMakeExpandImportedTargets.cmake           |   16 +-
 ...atorDetermineCompilerMacrosAndIncludeDirs.cmake |    4 +
 Modules/CMakeFortranCompiler.cmake.in              |    1 +
 Modules/CMakeFortranInformation.cmake              |    8 +-
 Modules/CMakeGenericSystem.cmake                   |    5 +-
 Modules/CMakeParseImplicitLinkInfo.cmake           |    2 +-
 Modules/CMakeRCInformation.cmake                   |    2 +-
 Modules/CMakeSwiftCompiler.cmake.in                |    5 +
 Modules/CMakeSwiftInformation.cmake                |   41 +
 Modules/CMakeTestSwiftCompiler.cmake               |   65 +
 Modules/CPack.cmake                                |  133 +-
 Modules/CPackComponent.cmake                       |    4 +-
 Modules/CPackDeb.cmake                             |  131 +-
 Modules/CPackNSIS.cmake                            |    2 +-
 Modules/CPackRPM.cmake                             |   77 +-
 Modules/CTestCoverageCollectGCOV.cmake             |    2 +-
 Modules/CheckForPthreads.c                         |    2 +-
 Modules/CheckFunctionExists.c                      |    3 +
 Modules/CheckFunctionExists.cmake                  |   14 +-
 Modules/CheckLibraryExists.cmake                   |   13 +-
 Modules/CheckSymbolExists.cmake                    |   10 +-
 Modules/Compiler/AppleClang-C.cmake                |    7 +-
 Modules/Compiler/AppleClang-CXX.cmake              |   13 +-
 Modules/Compiler/CCur-Fortran.cmake                |    1 +
 Modules/Compiler/Clang-C.cmake                     |   11 +-
 Modules/Compiler/Clang-CXX.cmake                   |    9 +-
 Modules/Compiler/Cray-DetermineCompiler.cmake      |    2 +-
 Modules/Compiler/GNU-C.cmake                       |   16 +-
 Modules/Compiler/GNU-CXX.cmake                     |    7 +-
 Modules/Compiler/GNU-DetermineCompiler.cmake       |    4 +-
 Modules/Compiler/GNU.cmake                         |    4 +-
 Modules/Compiler/HP-C.cmake                        |    4 +-
 Modules/Compiler/HP-CXX.cmake                      |    4 +-
 Modules/Compiler/HP-Fortran.cmake                  |    4 +-
 Modules/Compiler/IAR-ASM.cmake                     |    2 +-
 Modules/Compiler/IAR-C.cmake                       |    6 +-
 Modules/Compiler/IAR-CXX.cmake                     |    6 +-
 Modules/Compiler/IAR.cmake                         |    4 +-
 Modules/Compiler/Intel-C.cmake                     |    4 +-
 Modules/Compiler/Intel-CXX.cmake                   |    4 +-
 Modules/Compiler/Intel-Fortran.cmake               |    4 +-
 Modules/Compiler/PGI.cmake                         |    4 +-
 Modules/Compiler/QCC-CXX.cmake                     |    2 +-
 Modules/Compiler/SunPro-C.cmake                    |    4 +-
 Modules/Compiler/SunPro-CXX.cmake                  |   35 +-
 Modules/Compiler/SunPro-Fortran.cmake              |    4 +-
 Modules/Compiler/TI-ASM.cmake                      |    2 +-
 Modules/Compiler/TI-C.cmake                        |    6 +-
 Modules/Compiler/TI-CXX.cmake                      |    6 +-
 Modules/Compiler/XL-ASM.cmake                      |    3 +-
 Modules/Compiler/XL-C.cmake                        |    3 +-
 Modules/Compiler/XL-CXX.cmake                      |    2 +-
 Modules/Compiler/XL.cmake                          |    4 +-
 Modules/CompilerId/VS-10.vcxproj.in                |    1 +
 Modules/CompilerId/main.swift.in                   |    1 +
 Modules/DartConfiguration.tcl.in                   |    5 +
 Modules/ExternalProject.cmake                      |  117 +-
 Modules/FindBISON.cmake                            |  155 +-
 Modules/FindBZip2.cmake                            |    6 +-
 Modules/FindBoost.cmake                            |    6 +-
 Modules/FindCUDA.cmake                             |   37 +-
 Modules/FindHDF5.cmake                             |   34 +-
 Modules/FindIce.cmake                              |  134 +-
 Modules/FindJNI.cmake                              |   14 +-
 Modules/FindJava.cmake                             |   94 +-
 Modules/FindKDE4.cmake                             |    2 +-
 Modules/FindMPI.cmake                              |    8 +-
 Modules/FindMatlab.cmake                           |    1 +
 Modules/FindOpenSSL.cmake                          |  167 +-
 Modules/FindPackageHandleStandardArgs.cmake        |    2 +-
 Modules/FindPkgConfig.cmake                        |   42 +-
 Modules/FindProtobuf.cmake                         |   84 +-
 Modules/FindPythonInterp.cmake                     |    2 +-
 Modules/FindPythonLibs.cmake                       |  121 +-
 Modules/FindTIFF.cmake                             |   14 +-
 Modules/FindThreads.cmake                          |   27 +-
 Modules/FindXercesC.cmake                          |   16 +-
 Modules/FindZLIB.cmake                             |   45 +-
 Modules/FindwxWidgets.cmake                        |   43 +-
 Modules/GNUInstallDirs.cmake                       |  130 +-
 Modules/GenerateExportHeader.cmake                 |    2 +-
 Modules/GetPrerequisites.cmake                     |   38 +
 Modules/Internal/FeatureTesting.cmake              |    2 +-
 Modules/Platform/ARTOS-GNU-C.cmake                 |    9 +
 Modules/Platform/ARTOS.cmake                       |   17 +
 Modules/Platform/BlueGeneQ-base.cmake              |    4 +-
 Modules/Platform/CYGWIN-windres.cmake              |    2 +-
 Modules/Platform/Darwin-NAG-Fortran.cmake          |    2 +-
 Modules/Platform/Darwin.cmake                      |    2 +-
 Modules/Platform/Euros.cmake                       |   19 +
 Modules/Platform/GHS-MULTI-Initialize.cmake        |   36 +-
 Modules/Platform/Generic-SDCC-C.cmake              |    2 +-
 Modules/Platform/HP-UX-HP-C.cmake                  |    6 +-
 Modules/Platform/HP-UX-HP-CXX.cmake                |    4 +-
 Modules/Platform/HP-UX-HP-Fortran.cmake            |    4 +-
 Modules/Platform/HP-UX.cmake                       |   25 +-
 Modules/Platform/IRIX64.cmake                      |    8 +-
 Modules/Platform/Linux-CCur-Fortran.cmake          |    1 +
 Modules/Platform/Linux-GNU-Fortran.cmake           |    1 +
 Modules/Platform/SunOS.cmake                       |    8 -
 Modules/Platform/Windows-Embarcadero.cmake         |   10 +-
 Modules/Platform/Windows-GNU.cmake                 |    2 +-
 Modules/Platform/Windows-MSVC.cmake                |   17 +-
 Modules/Platform/Windows-wcl386.cmake              |    8 +-
 Modules/Platform/Windows-windres.cmake             |    2 +-
 Modules/ProcessorCount.cmake                       |   29 +-
 Modules/UseJava.cmake                              |  245 +-
 Modules/UseSWIG.cmake                              |   10 +-
 Modules/UseVTK40.cmake                             |   29 -
 Modules/UseVTKBuildSettings40.cmake                |   38 -
 Modules/UseVTKConfig40.cmake                       |  409 --
 Modules/readme.txt                                 |    2 +-
 README.rst                                         |   14 +-
 Source/CMakeLists.txt                              |   54 +-
 Source/CMakeVersion.cmake                          |    6 +-
 Source/CPack/IFW/cmCPackIFWGenerator.cxx           |    2 +-
 Source/CPack/OSXScriptLauncher.cxx                 |   11 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx           |    4 +-
 Source/CPack/WiX/cmWIXAccessControlList.cxx        |    2 +-
 Source/CPack/WiX/cmWIXPatch.cxx                    |    2 +-
 Source/CPack/WiX/cmWIXSourceWriter.cxx             |    2 +-
 Source/CPack/cmCPackArchiveGenerator.cxx           |    4 +-
 Source/CPack/cmCPackDebGenerator.cxx               |  320 +-
 Source/CPack/cmCPackGenerator.cxx                  |   16 +-
 Source/CPack/cmCPackNSISGenerator.cxx              |    6 +-
 Source/CPack/cmCPackSTGZGenerator.cxx              |    3 +-
 Source/CPack/cpack.cxx                             |   10 +-
 Source/CTest/cmCTestBuildHandler.cxx               |   10 +-
 Source/CTest/cmCTestCoverageHandler.cxx            |   37 +-
 Source/CTest/cmCTestCoverageHandler.h              |    2 +-
 Source/CTest/cmCTestGIT.cxx                        |    1 -
 Source/CTest/cmCTestGenericHandler.cxx             |    2 +
 Source/CTest/cmCTestGenericHandler.h               |    3 +
 Source/CTest/cmCTestHandlerCommand.cxx             |    6 +
 Source/CTest/cmCTestLaunch.cxx                     |    5 +-
 Source/CTest/cmCTestMultiProcessHandler.cxx        |  159 +-
 Source/CTest/cmCTestMultiProcessHandler.h          |    4 +
 Source/CTest/cmCTestP4.cxx                         |    1 -
 Source/CTest/cmCTestRunTest.cxx                    |    3 +-
 Source/CTest/cmCTestScriptHandler.cxx              |   46 +-
 Source/CTest/cmCTestTestCommand.cxx                |   33 +
 Source/CTest/cmCTestTestCommand.h                  |    1 +
 Source/CTest/cmCTestTestHandler.cxx                |   34 +-
 Source/CTest/cmCTestTestHandler.h                  |    5 +
 Source/CTest/cmCTestUpdateHandler.cxx              |    4 +-
 Source/CTest/cmParseJacocoCoverage.cxx             |  139 +-
 Source/CTest/cmProcess.cxx                         |   19 +-
 Source/CTest/cmProcess.h                           |    7 +-
 Source/Checks/cm_c11_thread_local.c                |    2 +
 Source/Checks/cm_c11_thread_local.cmake            |   33 +
 Source/CursesDialog/CMakeLists.txt                 |    3 +-
 Source/CursesDialog/cmCursesLongMessageForm.cxx    |    8 +-
 Source/CursesDialog/cmCursesMainForm.cxx           |   17 +-
 Source/CursesDialog/cmCursesStringWidget.cxx       |   25 +-
 Source/CursesDialog/cmCursesWidget.cxx             |    2 +-
 Source/QtDialog/CMakeLists.txt                     |   83 +-
 Source/QtDialog/Info.plist.in                      |    2 +
 Source/QtIFW/CMake.Dialogs.QtGUI.qs                |   21 +
 Source/QtIFW/CMake.Documentation.SphinxHTML.qs.in  |   21 +
 Source/QtIFW/CMake.qs.in                           |   22 +
 Source/QtIFW/installscript.qs.in                   |    8 +-
 Source/bindexplib.cxx                              |  439 ++
 Source/cmAlgorithms.h                              |   84 +-
 Source/cmArchiveWrite.cxx                          |   85 +-
 Source/cmArchiveWrite.h                            |   96 +-
 Source/cmBuildNameCommand.h                        |    1 -
 Source/cmCMakeHostSystemInformationCommand.cxx     |    4 +-
 Source/cmCMakePolicyCommand.cxx                    |   16 +
 Source/cmCPackPropertiesGenerator.cxx              |   16 +-
 Source/cmCPackPropertiesGenerator.h                |    6 +-
 Source/cmCPluginAPI.cxx                            |   22 +-
 Source/cmCTest.cxx                                 |  109 +-
 Source/cmCTest.h                                   |    6 +
 Source/cmCacheManager.cxx                          |   11 +-
 Source/cmCallVisualStudioMacro.cxx                 |    2 +-
 Source/cmCommand.h                                 |    9 -
 Source/cmCommandArgumentParserHelper.cxx           |    7 +-
 Source/cmCommandArgumentParserHelper.h             |    8 +-
 Source/cmCommonTargetGenerator.cxx                 |  431 ++
 Source/cmCommonTargetGenerator.h                   |   96 +
 Source/cmComputeComponentGraph.h                   |    4 +-
 Source/cmComputeLinkDepends.cxx                    |   37 +-
 Source/cmComputeLinkDepends.h                      |   26 +-
 Source/cmComputeLinkInformation.cxx                |   94 +-
 Source/cmComputeLinkInformation.h                  |   43 +-
 Source/cmComputeTargetDepends.cxx                  |   84 +-
 Source/cmComputeTargetDepends.h                    |   16 +-
 Source/cmConditionEvaluator.cxx                    |   42 +-
 Source/cmConditionEvaluator.h                      |    1 +
 Source/cmCoreTryCompile.cxx                        |   34 +-
 Source/cmCryptoHash.cxx                            |    2 +-
 Source/cmCurl.cxx                                  |    2 +-
 Source/cmCustomCommand.cxx                         |   55 +-
 Source/cmCustomCommand.h                           |   10 +-
 Source/cmCustomCommandGenerator.cxx                |   28 +-
 Source/cmCustomCommandGenerator.h                  |    4 +-
 Source/cmDefinitions.cxx                           |   14 +-
 Source/cmDefinitions.h                             |   17 +-
 Source/cmDependsFortran.cxx                        |  525 +--
 Source/cmDependsFortran.h                          |   19 +-
 Source/cmDependsFortranLexer.cxx                   | 2414 -----------
 Source/cmDependsFortranLexer.h                     |  348 --
 Source/cmDependsFortranLexer.in.l                  |  190 -
 Source/cmDependsFortranParser.cxx                  | 2088 ----------
 Source/cmDependsFortranParser.h                    |   96 -
 Source/cmDependsFortranParser.y                    |  282 --
 Source/cmDependsFortranParserTokens.h              |  122 -
 Source/cmDocumentation.h                           |    1 -
 Source/cmExecProgramCommand.cxx                    |    6 +-
 Source/cmExecProgramCommand.h                      |    6 -
 Source/cmExportBuildFileGenerator.cxx              |   47 +-
 Source/cmExportBuildFileGenerator.h                |    7 +-
 Source/cmExportCommand.cxx                         |    6 +
 Source/cmExportFileGenerator.cxx                   |   64 +-
 Source/cmExportFileGenerator.h                     |   12 +-
 Source/cmExportInstallFileGenerator.cxx            |   22 +-
 Source/cmExportInstallFileGenerator.h              |    3 +-
 Source/cmExportLibraryDependenciesCommand.cxx      |    8 +-
 Source/cmExportLibraryDependenciesCommand.h        |    1 -
 Source/cmExportTryCompileFileGenerator.cxx         |   14 +-
 Source/cmExportTryCompileFileGenerator.h           |    8 +-
 Source/cmExtraCodeBlocksGenerator.cxx              |   30 +-
 Source/cmExtraCodeBlocksGenerator.h                |    5 +-
 Source/cmExtraCodeLiteGenerator.cxx                |   18 -
 Source/cmExtraEclipseCDT4Generator.cxx             |    3 +-
 Source/cmFileCommand.cxx                           |   31 +-
 Source/cmFindBase.cxx                              |    4 +-
 Source/cmFindLibraryCommand.cxx                    |   12 +-
 Source/cmFindPackageCommand.cxx                    |    2 +-
 Source/cmFindProgramCommand.cxx                    |  153 +-
 Source/cmFindProgramCommand.h                      |   10 +-
 Source/cmFortranLexer.cxx                          | 2413 +++++++++++
 Source/cmFortranLexer.h                            |  348 ++
 Source/cmFortranLexer.in.l                         |  190 +
 Source/cmFortranParser.cxx                         | 1895 +++++++++
 Source/cmFortranParser.h                           |  175 +
 Source/cmFortranParser.y                           |  279 ++
 Source/cmFortranParserImpl.cxx                     |  408 ++
 Source/cmFortranParserTokens.h                     |  129 +
 Source/cmFunctionCommand.cxx                       |   34 +-
 Source/cmGeneratedFileStream.h                     |    4 +-
 Source/cmGeneratorExpression.cxx                   |    6 +-
 Source/cmGeneratorExpression.h                     |    5 +-
 Source/cmGeneratorExpressionDAGChecker.cxx         |    2 +-
 Source/cmGeneratorExpressionEvaluationFile.cxx     |   42 +-
 Source/cmGeneratorExpressionEvaluationFile.h       |   15 +-
 Source/cmGeneratorExpressionNode.cxx               |  110 +-
 Source/cmGeneratorTarget.cxx                       | 4240 ++++++++++++++++++--
 Source/cmGeneratorTarget.h                         |  311 +-
 Source/cmGetCMakePropertyCommand.cxx               |   19 +-
 Source/cmGetDirectoryPropertyCommand.cxx           |   43 +-
 Source/cmGetDirectoryPropertyCommand.h             |    5 +-
 Source/cmGetFilenameComponentCommand.cxx           |   24 +-
 Source/cmGetPropertyCommand.cxx                    |   31 +-
 Source/cmGetSourceFilePropertyCommand.cxx          |    6 +-
 Source/cmGetTargetPropertyCommand.cxx              |    6 +-
 Source/cmGetTestPropertyCommand.cxx                |    6 +-
 Source/cmGhsMultiTargetGenerator.cxx               |   57 +-
 Source/cmGhsMultiTargetGenerator.h                 |    3 +-
 Source/cmGlobalBorlandMakefileGenerator.cxx        |    4 +-
 Source/cmGlobalBorlandMakefileGenerator.h          |    3 +-
 Source/cmGlobalCommonGenerator.cxx                 |   21 +
 Source/cmGlobalCommonGenerator.h                   |   27 +
 Source/cmGlobalGenerator.cxx                       |  592 +--
 Source/cmGlobalGenerator.h                         |  119 +-
 Source/cmGlobalGhsMultiGenerator.cxx               |    5 +-
 Source/cmGlobalGhsMultiGenerator.h                 |    3 +-
 Source/cmGlobalJOMMakefileGenerator.cxx            |   28 +-
 Source/cmGlobalJOMMakefileGenerator.h              |    3 +
 Source/cmGlobalKdevelopGenerator.cxx               |    8 +-
 Source/cmGlobalMSYSMakefileGenerator.cxx           |    6 +-
 Source/cmGlobalNMakeMakefileGenerator.cxx          |   28 +-
 Source/cmGlobalNMakeMakefileGenerator.h            |    3 +
 Source/cmGlobalNinjaGenerator.cxx                  |   95 +-
 Source/cmGlobalNinjaGenerator.h                    |   39 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx          |  165 +-
 Source/cmGlobalUnixMakefileGenerator3.h            |   19 +-
 Source/cmGlobalVisualStudio10Generator.cxx         |   37 +-
 Source/cmGlobalVisualStudio10Generator.h           |   11 +-
 Source/cmGlobalVisualStudio11Generator.h           |    5 +-
 Source/cmGlobalVisualStudio12Generator.h           |    5 +-
 Source/cmGlobalVisualStudio14Generator.cxx         |  165 +
 Source/cmGlobalVisualStudio14Generator.h           |   16 +
 Source/cmGlobalVisualStudio6Generator.cxx          |   11 +-
 Source/cmGlobalVisualStudio6Generator.h            |    5 +-
 Source/cmGlobalVisualStudio71Generator.cxx         |    6 +-
 Source/cmGlobalVisualStudio7Generator.cxx          |   94 +-
 Source/cmGlobalVisualStudio7Generator.h            |    8 +-
 Source/cmGlobalVisualStudio8Generator.cxx          |   28 +-
 Source/cmGlobalVisualStudio8Generator.h            |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx           |  156 +-
 Source/cmGlobalVisualStudioGenerator.h             |   21 +-
 Source/cmGlobalXCodeGenerator.cxx                  |  127 +-
 Source/cmGlobalXCodeGenerator.h                    |    4 +-
 Source/cmGraphVizWriter.cxx                        |    7 +-
 Source/cmGraphVizWriter.h                          |   15 +-
 Source/cmIfCommand.cxx                             |    9 +-
 Source/cmIncludeCommand.cxx                        |    1 +
 Source/cmInstallCommand.cxx                        |   13 +-
 Source/cmInstallDirectoryGenerator.cxx             |   47 +-
 Source/cmInstallDirectoryGenerator.h               |   11 +
 Source/cmInstallExportGenerator.cxx                |   13 +-
 Source/cmInstallExportGenerator.h                  |    8 +-
 Source/cmInstallFilesCommand.cxx                   |    2 +-
 Source/cmInstallFilesCommand.h                     |    6 -
 Source/cmInstallFilesGenerator.cxx                 |   46 +-
 Source/cmInstallFilesGenerator.h                   |   17 +-
 Source/cmInstallGenerator.h                        |    2 +
 Source/cmInstallProgramsCommand.cxx                |    2 +-
 Source/cmInstallProgramsCommand.h                  |    6 -
 Source/cmInstallTargetGenerator.cxx                |   88 +-
 Source/cmInstallTargetGenerator.h                  |   20 +-
 Source/cmInstallTargetsCommand.h                   |    6 -
 Source/cmInstalledFile.cxx                         |    4 +-
 Source/cmLinkDirectoriesCommand.cxx                |    2 +-
 Source/cmLinkItem.h                                |  121 +
 Source/cmLinkLibrariesCommand.h                    |    6 -
 Source/cmLinkedTree.h                              |  195 +
 Source/cmListCommand.cxx                           |   12 +-
 Source/cmListFileCache.cxx                         |   60 +-
 Source/cmListFileCache.h                           |   53 +-
 Source/cmLoadCommandCommand.h                      |    1 -
 Source/cmLocalCommonGenerator.cxx                  |   39 +
 Source/cmLocalCommonGenerator.h                    |   37 +
 Source/cmLocalGenerator.cxx                        | 1021 +----
 Source/cmLocalGenerator.h                          |  155 +-
 Source/cmLocalGhsMultiGenerator.cxx                |    7 +-
 Source/cmLocalGhsMultiGenerator.h                  |    3 +-
 Source/cmLocalNinjaGenerator.cxx                   |   88 +-
 Source/cmLocalNinjaGenerator.h                     |   30 +-
 Source/cmLocalUnixMakefileGenerator3.cxx           |   93 +-
 Source/cmLocalUnixMakefileGenerator3.h             |   43 +-
 Source/cmLocalVisualStudio10Generator.cxx          |   11 +-
 Source/cmLocalVisualStudio10Generator.h            |    4 +-
 Source/cmLocalVisualStudio6Generator.cxx           |  159 +-
 Source/cmLocalVisualStudio6Generator.h             |    5 +-
 Source/cmLocalVisualStudio7Generator.cxx           |  158 +-
 Source/cmLocalVisualStudio7Generator.h             |    4 +-
 Source/cmLocalVisualStudioGenerator.cxx            |   10 +-
 Source/cmLocalVisualStudioGenerator.h              |    4 +-
 Source/cmLocalXCodeGenerator.cxx                   |    5 +-
 Source/cmLocalXCodeGenerator.h                     |    4 +-
 Source/cmMacroCommand.cxx                          |   30 +-
 Source/cmMakeDepend.cxx                            |    2 +-
 Source/cmMakeDirectoryCommand.h                    |    6 -
 Source/cmMakefile.cxx                              | 1386 +++----
 Source/cmMakefile.h                                |  276 +-
 Source/cmMakefileExecutableTargetGenerator.cxx     |   16 +-
 Source/cmMakefileLibraryTargetGenerator.cxx        |   83 +-
 Source/cmMakefileTargetGenerator.cxx               |  451 +--
 Source/cmMakefileTargetGenerator.h                 |   54 +-
 Source/cmMakefileUtilityTargetGenerator.cxx        |    2 +-
 Source/cmMessageCommand.cxx                        |    2 +-
 Source/cmNinjaNormalTargetGenerator.cxx            |   95 +-
 Source/cmNinjaTargetGenerator.cxx                  |  349 +-
 Source/cmNinjaTargetGenerator.h                    |   45 +-
 Source/cmNinjaUtilityTargetGenerator.cxx           |    6 +-
 Source/cmOSXBundleGenerator.cxx                    |   16 +-
 Source/cmOrderDirectories.cxx                      |    8 +-
 Source/cmOrderDirectories.h                        |   11 +-
 Source/cmOutputConverter.cxx                       | 1065 +++++
 Source/cmOutputConverter.h                         |  183 +
 Source/cmOutputRequiredFilesCommand.h              |    1 -
 Source/cmPolicies.cxx                              |   47 +-
 Source/cmPolicies.h                                |   21 +-
 Source/cmProcessTools.cxx                          |    2 +-
 Source/cmProcessTools.h                            |    6 +-
 Source/cmProjectCommand.cxx                        |    5 +-
 Source/cmProperty.cxx                              |    7 +-
 Source/cmProperty.h                                |    6 +-
 Source/cmPropertyDefinitionMap.cxx                 |    8 +-
 Source/cmPropertyDefinitionMap.h                   |    4 +-
 Source/cmPropertyMap.cxx                           |   29 +-
 Source/cmPropertyMap.h                             |   18 +-
 Source/cmQtAutoGeneratorInitializer.cxx            | 1074 +++++
 Source/cmQtAutoGeneratorInitializer.h              |   67 +
 Source/cmQtAutoGenerators.cxx                      | 1068 +----
 Source/cmQtAutoGenerators.h                        |   31 +-
 Source/cmRemoveCommand.h                           |    6 -
 Source/cmScriptGenerator.h                         |    3 -
 Source/cmSetCommand.cxx                            |    6 +-
 Source/cmSetPropertyCommand.cxx                    |   10 +-
 Source/cmSetTestsPropertiesCommand.cxx             |    6 +-
 Source/cmSourceFile.cxx                            |   19 +-
 Source/cmSourceFile.h                              |    4 +-
 Source/cmStandardIncludes.h                        |    8 -
 Source/cmState.cxx                                 | 1168 +++++-
 Source/cmState.h                                   |  206 +-
 Source/cmStringCommand.cxx                         |   42 +-
 Source/cmStringCommand.h                           |    1 +
 Source/cmSubdirCommand.h                           |    6 -
 Source/cmSubdirDependsCommand.h                    |    1 -
 Source/cmSystemTools.cxx                           |  196 +-
 Source/cmSystemTools.h                             |   14 +-
 Source/cmTarget.cxx                                | 4111 +++----------------
 Source/cmTarget.h                                  |  429 +-
 Source/cmTargetCompileOptionsCommand.cxx           |    3 +-
 Source/cmTargetDepend.h                            |   13 +-
 Source/cmTargetIncludeDirectoriesCommand.cxx       |   23 +-
 Source/cmTest.cxx                                  |   18 +-
 Source/cmTestGenerator.cxx                         |   35 +-
 Source/cmTestGenerator.h                           |    4 +
 Source/cmUseMangledMesaCommand.h                   |    1 -
 Source/cmUtilitySourceCommand.h                    |    1 -
 Source/cmVariableRequiresCommand.h                 |    1 -
 Source/cmVariableWatchCommand.cxx                  |   16 +-
 Source/cmVisualStudio10TargetGenerator.cxx         |  528 ++-
 Source/cmVisualStudio10TargetGenerator.h           |   10 +
 Source/cmVisualStudioGeneratorOptions.cxx          |   14 +-
 Source/cmWriteFileCommand.h                        |    6 -
 Source/cmXCode21Object.cxx                         |    2 +-
 Source/cmXCodeObject.cxx                           |    6 +-
 Source/cmXMLSafe.cxx                               |    8 +-
 Source/cmXMLSafe.h                                 |    8 +-
 Source/cmake.cxx                                   |   98 +-
 Source/cmake.h                                     |   10 +-
 Source/cmake.version.manifest                      |   18 +
 Source/cmakemain.cxx                               |   10 +-
 Source/cmcmd.cxx                                   |  480 ++-
 Source/cmcmd.h                                     |   14 -
 Source/ctest.cxx                                   |    5 +
 Source/kwsys/CMakeEmptyInputFile.in                |    1 -
 Source/kwsys/CMakeLists.txt                        |  217 +-
 Source/kwsys/CONTRIBUTING.rst                      |    2 +-
 Source/kwsys/CTestCustom.cmake.in                  |   14 +
 Source/kwsys/CommandLineArguments.cxx              |  103 +-
 Source/kwsys/CommandLineArguments.hxx.in           |   56 +-
 Source/kwsys/Configure.hxx.in                      |  144 -
 Source/kwsys/Directory.cxx                         |   21 +-
 Source/kwsys/Directory.hxx.in                      |   16 +-
 Source/kwsys/DynamicLoader.cxx                     |   28 +-
 Source/kwsys/DynamicLoader.hxx.in                  |   18 +-
 Source/kwsys/Encoding.hxx.in                       |   22 +-
 Source/kwsys/EncodingC.c                           |   14 +-
 Source/kwsys/EncodingCXX.cxx                       |   16 +-
 Source/kwsys/FStream.hxx.in                        |    6 +-
 Source/kwsys/Glob.cxx                              |   93 +-
 Source/kwsys/Glob.hxx.in                           |   44 +-
 Source/kwsys/IOStream.cxx                          |   88 +-
 Source/kwsys/IOStream.hxx.in                       |   32 +-
 Source/kwsys/Process.h.in                          |  131 +-
 Source/kwsys/ProcessUNIX.c                         |  357 +-
 Source/kwsys/ProcessWin32.c                        |  613 ++-
 Source/kwsys/RegularExpression.hxx.in              |   60 +-
 Source/kwsys/String.hxx.in                         |   10 +-
 Source/kwsys/System.c                              |  585 +--
 Source/kwsys/System.h.in                           |   98 -
 Source/kwsys/SystemInformation.cxx                 |  442 +-
 Source/kwsys/SystemInformation.hxx.in              |   39 +-
 Source/kwsys/SystemTools.cxx                       | 1152 +++---
 Source/kwsys/SystemTools.hxx.in                    |  459 ++-
 Source/kwsys/hash_fun.hxx.in                       |   46 +-
 Source/kwsys/hash_map.hxx.in                       |  124 +-
 Source/kwsys/hash_set.hxx.in                       |  122 +-
 Source/kwsys/hashtable.hxx.in                      |  387 +-
 Source/kwsys/kwsysPlatformTestsCXX.cxx             |  287 +-
 Source/kwsys/kwsys_cstddef.hxx.in                  |   35 -
 Source/kwsys/kwsys_ios_fstream.h.in                |   46 -
 Source/kwsys/kwsys_ios_iosfwd.h.in                 |   49 -
 Source/kwsys/kwsys_ios_iostream.h.in               |   99 -
 Source/kwsys/kwsys_ios_sstream.h.in                |  199 -
 Source/kwsys/kwsys_stl.hxx.in                      |   49 -
 Source/kwsys/kwsys_stl_string.hxx.in               |  123 -
 Source/kwsys/testCommandLineArguments.cxx          |   70 +-
 Source/kwsys/testCommandLineArguments1.cxx         |   34 +-
 Source/kwsys/testDynamicLoader.cxx                 |   27 +-
 Source/kwsys/testEncoding.cxx                      |    3 +-
 Source/kwsys/testFStream.cxx                       |   21 +-
 Source/kwsys/testHashSTL.cxx                       |   10 +-
 Source/kwsys/testIOS.cxx                           |   73 +-
 Source/kwsys/testProcess.c                         |  293 +-
 Source/kwsys/testSystemInformation.cxx             |   23 +-
 Source/kwsys/testSystemTools.cxx                   |  522 ++-
 Templates/CPack.GenericDescription.txt             |    2 +-
 Templates/CPack.GenericLicense.txt                 |    2 +-
 Templates/Windows/SmallLogo44x44.png               |  Bin 0 -> 554 bytes
 Tests/BuildDepends/CMakeLists.txt                  |   21 +-
 Tests/BuildDepends/Project/CMakeLists.txt          |   12 +
 .../Project/object_depends.cxx}                    |    0
 .../Project/object_depends_check.cmake             |    7 +
 Tests/CMakeLib/testVisualStudioSlnParser.cxx       |   60 +-
 Tests/CMakeLib/testXMLParser.cxx                   |    4 +-
 Tests/CMakeLists.txt                               |  128 +-
 Tests/CMakeOnly/Test.cmake.in                      |    6 +
 Tests/CMakeTests/GetPropertyTest.cmake.in          |   96 -
 Tests/CMakeTests/IfTest.cmake.in                   |   11 -
 Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in     |    7 +
 Tests/CMakeTests/List-Get-CMP0007-Warn.cmake       |    6 -
 Tests/CMakeTests/ListTest.cmake.in                 |   53 -
 Tests/CMakeTests/WhileTest.cmake.in                |   40 -
 Tests/CPackComponents/CMakeLists.txt               |    2 +-
 Tests/CPackComponentsDEB/CMakeLists.txt            |   37 +
 ...yResult-components-lintian-dpkgdeb-checks.cmake |    2 +-
 .../CPackComponentsDEB/RunCPackVerifyResult.cmake  |   12 +-
 Tests/CPackComponentsDEB/license.txt               |    2 +-
 Tests/CPackComponentsForAll/license.txt            |    2 +-
 Tests/CPackWiXGenerator/CMakeLists.txt             |    2 +-
 Tests/CTestCoverageCollectGCOV/test.cmake.in       |    6 +-
 Tests/CTestTest2/test.cmake.in                     |   13 +-
 Tests/CTestTestConfigFileInBuildDir/CMakeLists.txt |    3 -
 .../CTestConfig.cmake                              |    7 -
 Tests/CTestTestConfigFileInBuildDir/test1.cmake.in |   19 -
 Tests/CTestTestConfigFileInBuildDir/test2.cmake.in |   19 -
 Tests/CTestUpdateCVS.cmake.in                      |   19 +
 Tests/CTestUpdateCommon.cmake                      |   32 +-
 Tests/CTestUpdateGIT.cmake.in                      |   35 +-
 Tests/CTestUpdateHG.cmake.in                       |   19 +
 Tests/CTestUpdateSVN.cmake.in                      |   19 +
 Tests/Contracts/Trilinos/CMakeLists.txt            |    2 +-
 Tests/ExportImport/Export/CMakeLists.txt           |   58 +-
 Tests/ExportImport/Export/Interface/CMakeLists.txt |    4 +
 Tests/ExportImport/Export/testExe4.c               |   24 +
 Tests/ExportImport/Export/testLib7.c               |    1 +
 Tests/ExportImport/Export/testLibNoSONAME.c        |    7 +
 Tests/ExportImport/Import/A/CMakeLists.txt         |   58 +
 .../ExportImport/Import/A/check_lib_nosoname.cmake |    7 +
 Tests/ExportImport/Import/A/check_lib_soname.cmake |    7 +
 Tests/ExportImport/Import/A/imp_testExe1.c         |    6 +-
 Tests/ExportImport/Import/Interface/CMakeLists.txt |   11 +
 Tests/ExternalProject/CMakeLists.txt               |   60 +
 Tests/ExternalProject/Example/CMakeLists.txt       |    2 +-
 Tests/ExternalProject/gitrepo-sub.tgz              |  Bin 0 -> 1911 bytes
 Tests/FindGTK2/CMakeLists.txt                      |    3 +
 Tests/FindOpenSSL/CMakeLists.txt                   |    9 +
 Tests/FindOpenSSL/rand/CMakeLists.txt              |   14 +
 Tests/FindOpenSSL/rand/main.cc                     |   22 +
 Tests/FindPackageModeMakefileTest/Makefile.in      |    5 +-
 Tests/FindThreads/C-only/CMakeLists.txt            |   10 +
 Tests/FindThreads/CMakeLists.txt                   |   11 +
 Tests/FindThreads/CXX-only/CMakeLists.txt          |   13 +
 Tests/FortranC/Flags.cmake.in                      |    6 +
 Tests/GeneratorExpression/CMakeLists.txt           |   26 +-
 Tests/GeneratorExpression/check-common.cmake       |    4 +-
 Tests/GeneratorExpression/check-part1.cmake        |    2 +-
 Tests/GeneratorExpression/check-part4.cmake        |   15 +
 .../SystemIncludeDirectories/CMakeLists.txt        |   10 +
 .../TargetIncludeDirectories/CMakeLists.txt        |    6 +-
 Tests/Java/CMakeLists.txt                          |    4 +
 Tests/JavaJavah/B.cpp                              |   10 +
 Tests/JavaJavah/B.java                             |   19 +
 Tests/JavaJavah/CMakeLists.txt                     |   20 +
 Tests/JavaJavah/HelloWorld2.java                   |   10 +
 Tests/MSManifest/CMakeLists.txt                    |    5 +
 Tests/MSManifest/Subdir/CMakeLists.txt             |    9 +
 Tests/MSManifest/Subdir/check.cmake                |    6 +
 .../LinkInterfaceLoop => MSManifest/Subdir}/main.c |    0
 Tests/MSManifest/Subdir/test.manifest.in           |    4 +
 Tests/Module/GenerateExportHeader/CMakeLists.txt   |    4 +-
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |    3 +-
 Tests/OutOfBinary/CMakeLists.txt                   |    2 +
 Tests/OutOfBinary/outexe.c                         |    2 +
 Tests/OutOfSource/SubDir/CMakeLists.txt            |    2 +
 Tests/OutOfSource/SubDir/subdir.c                  |    1 +
 Tests/Plugin/CMakeLists.txt                        |    9 +-
 Tests/Plugin/PluginTest/CMakeLists.txt             |   17 +-
 Tests/Plugin/check_mod_soname.cmake                |   17 +-
 Tests/Plugin/src/example_exe.cxx                   |   20 +-
 Tests/QtAutogen/CMakeLists.txt                     |   36 +-
 Tests/QtAutogen/automoc_rerun/CMakeLists.txt       |   27 +
 .../res1/input.txt.in => automoc_rerun/input.txt}  |    0
 Tests/QtAutogen/automoc_rerun/res1.qrc             |    5 +
 Tests/QtAutogen/automoc_rerun/test1.cpp            |    5 +
 Tests/QtAutogen/automoc_rerun/test1.h.in1          |    8 +
 Tests/QtAutogen/automoc_rerun/test1.h.in2          |    7 +
 .../simple.cxx => QtAutogen/targetObjectsTest.cpp} |    0
 Tests/RegexEscapeString.cmake                      |    4 -
 Tests/RunCMake/AutoExportDll/AutoExport.cmake      |    7 +
 .../AutoExportDll/AutoExportBuild-stderr.txt       |    1 +
 .../{CMP0057 => AutoExportDll}/CMakeLists.txt      |    0
 Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake    |   26 +
 Tests/RunCMake/AutoExportDll/foo.c                 |   15 +
 Tests/RunCMake/AutoExportDll/hello.cxx             |   13 +
 Tests/RunCMake/AutoExportDll/hello.h               |   18 +
 Tests/RunCMake/AutoExportDll/say.cxx               |   37 +
 Tests/RunCMake/AutoExportDll/sub/CMakeLists.txt    |    5 +
 Tests/RunCMake/AutoExportDll/sub/sub.cxx           |    4 +
 Tests/RunCMake/AutoExportDll/world.cxx             |    6 +
 Tests/RunCMake/BuildDepends/C-Exe-Manifest.cmake   |   19 +
 .../BuildDepends/C-Exe-Manifest.step1.cmake        |    6 +
 .../BuildDepends/C-Exe-Manifest.step2.cmake        |    6 +
 Tests/RunCMake/BuildDepends/C-Exe.cmake            |   12 +
 Tests/RunCMake/BuildDepends/C-Exe.step1.cmake      |    3 +
 Tests/RunCMake/BuildDepends/C-Exe.step2.cmake      |    3 +
 Tests/RunCMake/BuildDepends/CMakeLists.txt         |    3 +
 Tests/RunCMake/BuildDepends/RunCMakeTest.cmake     |   40 +
 Tests/RunCMake/BuildDepends/check.cmake            |   37 +
 .../BuildDepends}/main.c                           |    0
 Tests/RunCMake/CMP0019/CMP0019-WARN-stderr.txt     |    6 +-
 Tests/RunCMake/CMP0026/RunCMakeTest.cmake          |    1 +
 .../clear-cached-information-dir/CMakeLists.txt    |    2 +
 .../CMP0026/clear-cached-information.cmake         |   14 +
 Tests/RunCMake/CMP0064/CMP0064-NEW.cmake           |    5 +
 Tests/RunCMake/CMP0064/CMP0064-OLD.cmake           |    7 +
 Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt     |   10 +
 Tests/RunCMake/CMP0064/CMP0064-WARN.cmake          |    7 +
 Tests/RunCMake/CMP0064/CMakeLists.txt              |    3 +
 Tests/RunCMake/CMP0064/RunCMakeTest.cmake          |    5 +
 .../RunCMake/CMP0065/BuildTargetInSubProject.cmake |   15 +
 Tests/RunCMake/CMP0065/CMakeLists.txt              |    3 +
 Tests/RunCMake/CMP0065/NEWBad.cmake                |    4 +
 Tests/RunCMake/CMP0065/NEWGood.cmake               |    4 +
 Tests/RunCMake/CMP0065/OLDBad1.cmake               |    4 +
 Tests/RunCMake/CMP0065/OLDBad2.cmake               |    4 +
 Tests/RunCMake/CMP0065/RunCMakeTest.cmake          |    8 +
 Tests/RunCMake/CMP0065/WARN-OFF.cmake              |    3 +
 Tests/RunCMake/CMP0065/WARN-ON-stderr.txt          |   10 +
 Tests/RunCMake/CMP0065/WARN-ON.cmake               |    3 +
 Tests/RunCMake/CMP0065/subproject/CMakeLists.txt   |   22 +
 Tests/RunCMake/CMP0065/subproject/main.c           |    7 +
 Tests/RunCMake/CMakeLists.txt                      |   67 +-
 Tests/RunCMake/CPack/CMakeLists.txt                |   12 +
 Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake    |    5 +
 Tests/RunCMake/CPack/CPackTestHelpers.cmake        |   41 +
 .../DEB/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake   |    5 +
 .../CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake |    2 +
 .../CPack/DEB/DEB_EXTRA-ExpectedFiles.cmake        |    9 +
 .../CPack/DEB/DEB_EXTRA-VerifyResult.cmake         |   17 +
 .../CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake     |   14 +
 .../CPack/DEB/DEPENDENCIES-VerifyResult.cmake      |   34 +
 .../CPack/DEB/DEPENDENCIES-specifics.cmake         |   21 +
 .../CPack/DEB/EMPTY_DIR-ExpectedFiles.cmake        |    5 +
 Tests/RunCMake/CPack/DEB/EMPTY_DIR-specifics.cmake |    1 +
 Tests/RunCMake/CPack/DEB/Helpers.cmake             |   51 +
 .../RunCMake/CPack/DEB/MINIMAL-ExpectedFiles.cmake |    5 +
 Tests/RunCMake/CPack/DEB/MINIMAL-specifics.cmake   |    1 +
 Tests/RunCMake/CPack/DEB/Prerequirements.cmake     |    8 +
 Tests/RunCMake/CPack/DEB_EXTRA.cmake               |   38 +
 Tests/RunCMake/CPack/DEPENDENCIES.cmake            |   20 +
 Tests/RunCMake/CPack/EMPTY_DIR.cmake               |    4 +
 Tests/RunCMake/CPack/MINIMAL.cmake                 |    3 +
 .../PARTIALLY_RELOCATABLE_WARNING.cmake}           |    0
 Tests/RunCMake/CPack/README.txt                    |   99 +
 .../RPM/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake   |    5 +
 .../CPack/RPM/COMPONENTS_EMPTY_DIR-stderr.txt      |    1 +
 .../CPack/RPM/DEPENDENCIES-ExpectedFiles.cmake     |   13 +
 .../CPack/RPM/DEPENDENCIES-VerifyResult.cmake      |   45 +
 .../CPack/RPM/DEPENDENCIES-specifics.cmake         |   22 +
 .../CPack/RPM/EMPTY_DIR-ExpectedFiles.cmake        |    5 +
 Tests/RunCMake/CPack/RPM/EMPTY_DIR-stderr.txt      |    1 +
 Tests/RunCMake/CPack/RPM/Helpers.cmake             |   10 +
 .../RunCMake/CPack/RPM/MINIMAL-ExpectedFiles.cmake |    5 +
 Tests/RunCMake/CPack/RPM/MINIMAL-stderr.txt        |    1 +
 ...RTIALLY_RELOCATABLE_WARNING-ExpectedFiles.cmake |    5 +
 .../RPM/PARTIALLY_RELOCATABLE_WARNING-stderr.txt}  |    0
 Tests/RunCMake/CPack/RPM/Prerequirements.cmake     |   16 +
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |   12 +
 .../TGZ/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake   |    3 +
 .../CPack/TGZ/COMPONENTS_EMPTY_DIR-specifics.cmake |    1 +
 .../CPack/TGZ/EMPTY_DIR-ExpectedFiles.cmake        |    3 +
 Tests/RunCMake/CPack/TGZ/Helpers.cmake             |   10 +
 .../RunCMake/CPack/TGZ/MINIMAL-ExpectedFiles.cmake |    5 +
 Tests/RunCMake/CPack/TGZ/Prerequirements.cmake     |    4 +
 Tests/RunCMake/CPack/VerifyResult.cmake            |   92 +
 Tests/RunCMake/CPackConfig/CMakeLists.txt          |    6 +
 Tests/RunCMake/CPackConfig/Default-check.cmake     |    7 +
 Tests/RunCMake/CPackConfig/Default.cmake           |    3 +
 Tests/RunCMake/CPackConfig/RunCMakeTest.cmake      |    6 +
 Tests/RunCMake/CPackConfig/Simple-check.cmake      |    3 +
 Tests/RunCMake/CPackConfig/Simple.cmake            |    1 +
 Tests/RunCMake/CPackConfig/Special-check.cmake     |    5 +
 Tests/RunCMake/CPackConfig/Special.cmake           |    3 +
 Tests/RunCMake/CPackConfig/Verbatim-check.cmake    |   10 +
 Tests/RunCMake/CPackConfig/Verbatim.cmake          |    5 +
 Tests/RunCMake/CPackConfig/check.cmake             |   10 +
 Tests/RunCMake/CPackRPM/CMakeLists.txt             |    7 -
 Tests/RunCMake/CPackRPM/RunCMakeTest.cmake         |   17 -
 .../CTestCommandLine/LabelCount-stdout.txt         |    7 +
 .../CTestCommandLine/MergeOutput-stdout.txt        |   13 +
 .../MergeOutput.cmake                              |    0
 Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake |   86 +
 .../CTestCommandLine/TestOutputSize-check.cmake    |   17 +
 .../CTestCommandLine/TestOutputSize-result.txt     |    1 +
 .../CTestCommandLine/TestOutputSize-stderr.txt     |    1 +
 .../CTestCommandLine/test-load-fail-stderr.txt     |    1 +
 .../CTestCommandLine/test-load-fail-stdout.txt     |    2 +
 .../CTestCommandLine/test-load-invalid-stderr.txt  |    1 +
 .../CTestCommandLine/test-load-invalid-stdout.txt  |    7 +
 .../test-load-pass-stderr.txt}                     |    0
 .../CTestCommandLine/test-load-pass-stdout.txt     |    7 +
 Tests/RunCMake/CommandLine/BuildDir.cmake          |    1 +
 .../{Build.cmake => BuildDir/CMakeLists.txt}       |    0
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake      |   21 +
 Tests/RunCMake/CommandLine/Wdev-stderr.txt         |    6 +
 Tests/RunCMake/CommandLine/Wdev.cmake              |    5 +
 Tests/RunCMake/CommandLine/Wno-dev.cmake           |    5 +
 .../build-bad-dir-result.txt}                      |    0
 .../RunCMake/CommandLine/build-bad-dir-stderr.txt  |    2 +
 .../build-no-dir-result.txt}                       |    0
 Tests/RunCMake/CommandLine/build-no-dir-stderr.txt |    1 +
 Tests/RunCMake/CommandLine/trace-expand-stderr.txt |    2 +
 .../RunCMake/CommandLine/trace-expand.cmake        |    0
 Tests/RunCMake/CompileDefinitions/CMakeLists.txt   |    3 +
 .../RunCMake/CompileDefinitions/RunCMakeTest.cmake |    3 +
 .../SetEmpty-result.txt}                           |    0
 .../CompileDefinitions/SetEmpty-stderr.txt         |    3 +
 Tests/RunCMake/CompileDefinitions/SetEmpty.cmake   |   12 +
 Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake  |    2 +-
 Tests/RunCMake/CompilerLauncher/C-Build-stdout.txt |    1 +
 .../CompilerLauncher/C-launch-Build-stdout.txt     |    1 +
 .../C-launch.cmake                                 |    0
 Tests/RunCMake/CompilerLauncher/C.cmake            |    4 +
 .../{CMP0057 => CompilerLauncher}/CMakeLists.txt   |    0
 .../RunCMake/CompilerLauncher/CXX-Build-stdout.txt |    1 +
 .../CompilerLauncher/CXX-launch-Build-stdout.txt   |    1 +
 .../CXX-launch.cmake                               |    0
 Tests/RunCMake/CompilerLauncher/CXX.cmake          |    4 +
 Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake |   23 +
 Tests/RunCMake/CompilerLauncher/main.c             |    3 +
 .../main.cxx                                       |    0
 .../CompilerNotFound/BadCompilerC-stderr-JOM.txt   |   17 +
 .../CompilerNotFound/BadCompilerC-stderr-NMake.txt |   17 +
 .../CompilerNotFound/BadCompilerCXX-stderr-JOM.txt |   17 +
 .../BadCompilerCXX-stderr-NMake.txt                |   17 +
 .../BadCompilerCandCXX-stderr-JOM.txt              |   35 +
 .../BadCompilerCandCXX-stderr-NMake.txt            |   35 +
 Tests/RunCMake/CompilerNotFound/RunCMakeTest.cmake |   14 +
 Tests/RunCMake/ExternalProject/RunCMakeTest.cmake  |    1 +
 .../ExternalProject/UsesTerminal-check.cmake       |   97 +
 Tests/RunCMake/ExternalProject/UsesTerminal.cmake  |   45 +
 .../FindPkgConfig_GET_VARIABLE-stdout.txt          |    1 +
 .../FindPkgConfig/FindPkgConfig_GET_VARIABLE.cmake |    9 +
 Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake    |    6 +
 Tests/RunCMake/GNUInstallDirs/CMakeLists.txt       |    3 +
 Tests/RunCMake/GNUInstallDirs/Common.cmake         |   28 +
 Tests/RunCMake/GNUInstallDirs/Opt-stderr.txt       |   28 +
 Tests/RunCMake/GNUInstallDirs/Opt.cmake            |    2 +
 Tests/RunCMake/GNUInstallDirs/Root-stderr.txt      |   28 +
 Tests/RunCMake/GNUInstallDirs/Root.cmake           |    2 +
 Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake   |    6 +
 Tests/RunCMake/GNUInstallDirs/Usr-stderr.txt       |   28 +
 Tests/RunCMake/GNUInstallDirs/Usr.cmake            |    2 +
 Tests/RunCMake/GNUInstallDirs/UsrLocal-stderr.txt  |   28 +
 Tests/RunCMake/GNUInstallDirs/UsrLocal.cmake       |    2 +
 .../BadSHELL_PATH-result.txt}                      |    0
 .../GeneratorExpression/BadSHELL_PATH-stderr.txt   |   17 +
 .../GeneratorExpression/BadSHELL_PATH.cmake        |    4 +
 .../ImportedTarget-TARGET_PDB_FILE-result.txt}     |    0
 .../ImportedTarget-TARGET_PDB_FILE-stderr.txt      |    8 +
 .../ImportedTarget-TARGET_PDB_FILE.cmake           |    2 +
 .../OUTPUT_NAME-recursion-result.txt}              |    0
 .../OUTPUT_NAME-recursion-stderr.txt               |    4 +
 .../OUTPUT_NAME-recursion.cmake                    |    3 +
 .../GeneratorExpression/RunCMakeTest.cmake         |    4 +
 .../TARGET_FILE-recursion-result.txt}              |    0
 .../TARGET_FILE-recursion-stderr.txt               |    4 +
 .../TARGET_FILE-recursion.cmake                    |    4 +
 .../DetermineFail-result.txt}                      |    0
 Tests/RunCMake/Languages/DetermineFail-stderr.txt  |    5 +
 Tests/RunCMake/Languages/DetermineFail.cmake       |    2 +
 .../Modules/CMakeDetermineFailCompiler.cmake       |    1 +
 Tests/RunCMake/Languages/RunCMakeTest.cmake        |    2 +
 Tests/RunCMake/LinkStatic/CMakeLists.txt           |    3 +
 Tests/RunCMake/LinkStatic/LINK_SEARCH_STATIC.cmake |   73 +
 Tests/{ => RunCMake}/LinkStatic/LinkStatic.c       |    0
 Tests/RunCMake/LinkStatic/RunCMakeTest.cmake       |    3 +
 Tests/RunCMake/Make/CMakeLists.txt                 |    3 +
 Tests/RunCMake/Make/RunCMakeTest.cmake             |   17 +
 .../Make/TargetMessages-OFF-build-stdout.txt       |    5 +
 Tests/RunCMake/Make/TargetMessages-OFF.cmake       |    2 +
 .../Make/TargetMessages-ON-build-stdout.txt        |    8 +
 Tests/RunCMake/Make/TargetMessages-ON.cmake        |    2 +
 .../Make/TargetMessages-VAR-OFF-build-stdout.txt   |    5 +
 Tests/RunCMake/Make/TargetMessages-VAR-OFF.cmake   |    1 +
 .../Make/TargetMessages-VAR-ON-build-stdout.txt    |    8 +
 Tests/RunCMake/Make/TargetMessages-VAR-ON.cmake    |    1 +
 Tests/RunCMake/PolicyScope/CMakeLists.txt          |    3 +
 Tests/RunCMake/PolicyScope/RunCMakeTest.cmake      |    4 +
 .../dir-in-macro-generate-time-result.txt}         |    0
 .../dir-in-macro-generate-time-stderr.txt          |    5 +
 .../PolicyScope/dir-in-macro-generate-time.cmake   |    2 +
 .../PolicyScope/dir-in-macro-include.cmake         |    6 +
 Tests/RunCMake/PolicyScope/dir1/CMakeLists.txt     |    5 +
 .../PolicyScope/dir1/foo.cpp}                      |    0
 .../parent-dir-generate-time-result.txt}           |    0
 .../PolicyScope/parent-dir-generate-time.cmake     |    7 +
 Tests/RunCMake/RunCMake.cmake                      |   15 +-
 Tests/RunCMake/Swift/CMakeLists.txt                |    3 +
 .../NotSupported-result.txt}                       |    0
 Tests/RunCMake/Swift/NotSupported-stderr.txt       |    5 +
 Tests/RunCMake/Swift/NotSupported.cmake            |    1 +
 Tests/RunCMake/Swift/RunCMakeTest.cmake            |    9 +
 .../XcodeTooOld-result.txt}                        |    0
 Tests/RunCMake/Swift/XcodeTooOld-stderr.txt        |    5 +
 Tests/RunCMake/Swift/XcodeTooOld.cmake             |    1 +
 Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt     |    4 +-
 Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt     |    4 +-
 Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt     |    4 +-
 Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt     |    4 +-
 Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt   |    4 +-
 Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt   |    4 +-
 Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt   |    4 +-
 Tests/RunCMake/Syntax/BracketNoSpace3-stderr.txt   |    4 +-
 Tests/RunCMake/Syntax/BracketNoSpace4-stderr.txt   |    4 +-
 Tests/RunCMake/Syntax/BracketNoSpace5-stderr.txt   |    4 +-
 Tests/RunCMake/Syntax/ParenInENV-stderr.txt        |    4 +-
 Tests/RunCMake/Syntax/ParenNoSpace1-stderr.txt     |   12 +-
 Tests/RunCMake/Syntax/StringNoSpace-stderr.txt     |    8 +-
 .../RunCMake/TargetPolicies/PolicyList-stderr.txt  |    1 +
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake     |   52 +
 Tests/RunCMake/XcodeProject/XcodeBundles.cmake     |   45 +
 .../XcodeInstallIOS-install-stdout.txt             |    2 +
 Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake  |   12 +
 .../RunCMake/XcodeProject/XcodeTbdStub-stdout.txt  |    1 +
 Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake     |    2 +
 Tests/RunCMake/XcodeProject/foo.cpp                |    1 +
 Tests/RunCMake/XcodeProject/main.m                 |    3 +
 Tests/RunCMake/XcodeProject/osx.cmake              |   18 +
 .../RunCMake/ctest_build/BuildChangeId-check.cmake |   12 +
 Tests/RunCMake/ctest_build/RunCMakeTest.cmake      |    9 +
 .../RunCMake/ctest_start/ConfigInBuild-stdout.txt  |    7 +
 .../RunCMake/ctest_start/ConfigInSource-stdout.txt |    7 +
 Tests/RunCMake/ctest_start/RunCMakeTest.cmake      |   13 +
 Tests/RunCMake/ctest_test/CMakeLists.txt.in        |    1 +
 .../CTestTestLoadFail-result.txt}                  |    0
 .../ctest_test/CTestTestLoadFail-stderr.txt        |    1 +
 .../ctest_test/CTestTestLoadFail-stdout.txt        |    2 +
 .../ctest_test/CTestTestLoadInvalid-stderr.txt     |    1 +
 .../ctest_test/CTestTestLoadInvalid-stdout.txt     |    7 +
 .../ctest_test/CTestTestLoadPass-stdout.txt        |    7 +
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake       |   66 +
 Tests/RunCMake/ctest_test/TestChangeId-check.cmake |   12 +
 .../TestLoadFail-result.txt}                       |    0
 Tests/RunCMake/ctest_test/TestLoadFail-stderr.txt  |    1 +
 Tests/RunCMake/ctest_test/TestLoadFail-stdout.txt  |    2 +
 .../RunCMake/ctest_test/TestLoadInvalid-stderr.txt |    1 +
 .../RunCMake/ctest_test/TestLoadInvalid-stdout.txt |    7 +
 Tests/RunCMake/ctest_test/TestLoadOrder-stderr.txt |    1 +
 Tests/RunCMake/ctest_test/TestLoadOrder-stdout.txt |    7 +
 Tests/RunCMake/ctest_test/TestLoadPass-stdout.txt  |    7 +
 .../RunCMake/ctest_test/TestOutputSize-check.cmake |   17 +
 Tests/RunCMake/ctest_test/test.cmake.in            |    2 +
 Tests/RunCMake/export/AppendExport-stderr.txt      |    2 +-
 Tests/RunCMake/export/AppendExport.cmake           |    1 +
 Tests/RunCMake/export/CMakeLists.txt               |    2 +-
 .../CustomTarget-result.txt}                       |    0
 Tests/RunCMake/export/CustomTarget-stderr.txt      |    4 +
 Tests/RunCMake/export/CustomTarget.cmake           |    2 +
 Tests/RunCMake/export/OldIface-stderr.txt          |    2 +-
 Tests/RunCMake/export/OldIface.cmake               |    1 +
 Tests/RunCMake/export/RunCMakeTest.cmake           |    1 +
 Tests/RunCMake/find_program/A/testA                |    1 +
 Tests/RunCMake/find_program/A/testAandB            |    1 +
 Tests/RunCMake/find_program/B/testAandB            |    1 +
 Tests/RunCMake/find_program/B/testB                |    1 +
 Tests/RunCMake/find_program/CMakeLists.txt         |    3 +
 Tests/RunCMake/find_program/DirsPerName-stdout.txt |    1 +
 Tests/RunCMake/find_program/DirsPerName.cmake      |    6 +
 Tests/RunCMake/find_program/EnvAndHints-stdout.txt |    1 +
 Tests/RunCMake/find_program/EnvAndHints.cmake      |    8 +
 Tests/RunCMake/find_program/NamesPerDir-stdout.txt |    1 +
 Tests/RunCMake/find_program/NamesPerDir.cmake      |    6 +
 Tests/RunCMake/find_program/RunCMakeTest.cmake     |   10 +
 .../RunCMake/find_program/Win/testCom.com          |    0
 .../RunCMake/find_program/Win/testCom.exe          |    0
 .../RunCMake/find_program/Win/testExe.exe          |    0
 Tests/RunCMake/find_program/WindowsCom-stdout.txt  |    1 +
 Tests/RunCMake/find_program/WindowsCom.cmake       |    6 +
 Tests/RunCMake/find_program/WindowsExe-stdout.txt  |    1 +
 Tests/RunCMake/find_program/WindowsExe.cmake       |    6 +
 .../RunCMake/get_filename_component/CMakeLists.txt |    2 +-
 .../get_filename_component/KnownComponents.cmake   |  110 +
 .../BadArgument-result.txt}                        |    0
 Tests/RunCMake/get_property/BadArgument-stderr.txt |    4 +
 .../get_property/BadArgument.cmake}                |    0
 .../BadDirectory-result.txt}                       |    0
 .../RunCMake/get_property/BadDirectory-stderr.txt  |    6 +
 .../get_property/BadDirectory.cmake}               |    0
 .../BadScope-result.txt}                           |    0
 Tests/RunCMake/get_property/BadScope-stderr.txt    |    5 +
 .../get_property/BadScope.cmake}                   |    0
 .../BadTarget-result.txt}                          |    0
 Tests/RunCMake/get_property/BadTarget-stderr.txt   |    5 +
 .../get_property/BadTarget.cmake}                  |    0
 .../BadTest-result.txt}                            |    0
 Tests/RunCMake/get_property/BadTest-stderr.txt     |    4 +
 .../get_property/BadTest.cmake}                    |    0
 .../GlobalName-result.txt}                         |    0
 Tests/RunCMake/get_property/GlobalName-stderr.txt  |    4 +
 .../get_property/GlobalName.cmake}                 |    0
 .../MissingArgument-result.txt}                    |    0
 .../get_property/MissingArgument-stderr.txt        |    4 +
 .../get_property/MissingArgument.cmake}            |    0
 .../NoCache-result.txt}                            |    0
 Tests/RunCMake/get_property/NoCache-stderr.txt     |    4 +
 .../get_property/NoCache.cmake}                    |    0
 .../NoProperty-result.txt}                         |    0
 Tests/RunCMake/get_property/NoProperty-stderr.txt  |    4 +
 .../get_property/NoProperty.cmake}                 |    0
 .../NoSource-result.txt}                           |    0
 Tests/RunCMake/get_property/NoSource-stderr.txt    |    4 +
 .../get_property/NoSource.cmake}                   |    0
 .../NoTarget-result.txt}                           |    0
 Tests/RunCMake/get_property/NoTarget-stderr.txt    |    4 +
 .../get_property/NoTarget.cmake}                   |    0
 .../NoTest-result.txt}                             |    0
 Tests/RunCMake/get_property/NoTest-stderr.txt      |    4 +
 .../get_property/NoTest.cmake}                     |    0
 Tests/RunCMake/get_property/RunCMakeTest.cmake     |   14 +
 .../VariableName-result.txt}                       |    0
 .../RunCMake/get_property/VariableName-stderr.txt  |    4 +
 .../get_property/VariableName.cmake}               |    0
 .../get_property/target_properties-stderr.txt      |    6 +-
 .../RunCMake/get_property/target_properties.cmake  |    2 +
 .../InvalidArgument1-result.txt}                   |    0
 Tests/RunCMake/if/InvalidArgument1-stderr.txt      |    8 +
 .../if/InvalidArgument1.cmake}                     |    0
 Tests/RunCMake/if/RunCMakeTest.cmake               |    4 +
 .../if/TestNameThatDoesNotExist-stdout.txt         |    1 +
 Tests/RunCMake/if/TestNameThatDoesNotExist.cmake   |    6 +
 Tests/RunCMake/if/TestNameThatExists-stdout.txt    |    1 +
 Tests/RunCMake/if/TestNameThatExists.cmake         |    7 +
 .../include_directories/DirectoryBefore-stdout.txt |    1 +
 .../include_directories/DirectoryBefore.cmake      |    4 +
 .../include_directories/RunCMakeTest.cmake         |    1 +
 .../DIRECTORY-DESTINATION-bad-result.txt}          |    0
 .../DIRECTORY-DESTINATION-bad-stderr.txt}          |    0
 .../install/DIRECTORY-DESTINATION-bad.cmake        |    1 +
 .../FILES-DESTINATION-bad-result.txt}              |    0
 .../FILES-DESTINATION-bad-stderr.txt}              |    0
 Tests/RunCMake/install/FILES-DESTINATION-bad.cmake |    1 +
 Tests/RunCMake/install/RunCMakeTest.cmake          |    2 +
 Tests/RunCMake/list/GET-CMP0007-WARN-stderr.txt    |    8 +
 Tests/RunCMake/list/GET-CMP0007-WARN.cmake         |    7 +
 .../GET-InvalidIndex-result.txt}                   |    0
 Tests/RunCMake/list/GET-InvalidIndex-stderr.txt    |    4 +
 .../list/GET-InvalidIndex.cmake}                   |    0
 .../INSERT-InvalidIndex-result.txt}                |    0
 Tests/RunCMake/list/INSERT-InvalidIndex-stderr.txt |    4 +
 .../list/INSERT-InvalidIndex.cmake}                |    0
 .../InvalidSubcommand-result.txt}                  |    0
 Tests/RunCMake/list/InvalidSubcommand-stderr.txt   |    4 +
 .../list/InvalidSubcommand.cmake}                  |    0
 .../LENGTH-TooManyArguments-result.txt}            |    0
 .../list/LENGTH-TooManyArguments-stderr.txt        |    4 +
 .../list/LENGTH-TooManyArguments.cmake}            |    0
 .../NoArguments-result.txt}                        |    0
 Tests/RunCMake/list/NoArguments-stderr.txt         |    4 +
 .../list/NoArguments.cmake}                        |    0
 .../REMOVE_AT-InvalidIndex-result.txt}             |    0
 .../list/REMOVE_AT-InvalidIndex-stderr.txt         |    4 +
 .../list/REMOVE_AT-InvalidIndex.cmake}             |    0
 .../REMOVE_AT-NotList-result.txt}                  |    0
 Tests/RunCMake/list/REMOVE_AT-NotList-stderr.txt   |    4 +
 .../list/REMOVE_AT-NotList.cmake}                  |    0
 .../REMOVE_DUPLICATES-NotList-result.txt}          |    0
 .../list/REMOVE_DUPLICATES-NotList-stderr.txt      |    4 +
 .../list/REMOVE_DUPLICATES-NotList.cmake}          |    0
 .../REMOVE_DUPLICATES-TooManyArguments-result.txt} |    0
 .../REMOVE_DUPLICATES-TooManyArguments-stderr.txt  |    4 +
 .../list/REMOVE_DUPLICATES-TooManyArguments.cmake} |    0
 .../REMOVE_ITEM-NotList-result.txt}                |    0
 Tests/RunCMake/list/REMOVE_ITEM-NotList-stderr.txt |    4 +
 .../list/REMOVE_ITEM-NotList.cmake}                |    0
 .../REVERSE-NotList-result.txt}                    |    0
 Tests/RunCMake/list/REVERSE-NotList-stderr.txt     |    4 +
 .../list/REVERSE-NotList.cmake}                    |    0
 .../REVERSE-TooManyArguments-result.txt}           |    0
 .../list/REVERSE-TooManyArguments-stderr.txt       |    4 +
 .../list/REVERSE-TooManyArguments.cmake}           |    0
 Tests/RunCMake/list/RunCMakeTest.cmake             |   19 +
 .../SORT-NotList-result.txt}                       |    0
 Tests/RunCMake/list/SORT-NotList-stderr.txt        |    4 +
 .../list/SORT-NotList.cmake}                       |    0
 .../SORT-TooManyArguments-result.txt}              |    0
 .../RunCMake/list/SORT-TooManyArguments-stderr.txt |    4 +
 .../list/SORT-TooManyArguments.cmake}              |    0
 .../set_property/COMPILE_DEFINITIONS-stdout.txt    |    2 +
 .../set_property/COMPILE_DEFINITIONS.cmake         |    3 +
 .../set_property/COMPILE_FEATURES-stdout.txt       |    1 +
 Tests/RunCMake/set_property/COMPILE_FEATURES.cmake |    2 +
 .../set_property/COMPILE_OPTIONS-stdout.txt        |    2 +
 Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake  |    3 +
 Tests/RunCMake/set_property/Common.cmake           |   28 +
 .../set_property/INCLUDE_DIRECTORIES-stdout.txt    |    2 +
 .../set_property/INCLUDE_DIRECTORIES.cmake         |    3 +
 .../set_property/LINK_LIBRARIES-stdout.txt         |    1 +
 Tests/RunCMake/set_property/LINK_LIBRARIES.cmake   |    9 +-
 Tests/RunCMake/set_property/RunCMakeTest.cmake     |    6 +
 Tests/RunCMake/set_property/SOURCES-stdout.txt     |    1 +
 Tests/RunCMake/set_property/SOURCES.cmake          |    2 +
 Tests/RunCMake/set_property/USER_PROP-stdout.txt   |    2 +
 Tests/RunCMake/set_property/USER_PROP.cmake        |    3 +
 Tests/RunCMake/string/Append.cmake                 |   58 +
 .../AppendNoArgs-result.txt}                       |    0
 Tests/RunCMake/string/AppendNoArgs-stderr.txt      |    4 +
 Tests/RunCMake/string/AppendNoArgs.cmake           |    1 +
 Tests/RunCMake/string/RunCMakeTest.cmake           |    3 +
 .../target_link_libraries/RunCMakeTest.cmake       |    1 +
 .../target_link_libraries/SharedDepNotTarget.cmake |   10 +
 Tests/RunCMake/{CMP0004 => while}/CMakeLists.txt   |    0
 .../EndAlone-result.txt}                           |    0
 Tests/RunCMake/while/EndAlone-stderr.txt           |    5 +
 .../while/EndAlone.cmake}                          |    0
 .../EndAloneArgs-result.txt}                       |    0
 Tests/RunCMake/while/EndAloneArgs-stderr.txt       |    5 +
 .../while/EndAloneArgs.cmake}                      |    0
 Tests/RunCMake/while/EndMismatch-stderr.txt        |   13 +
 .../while/EndMismatch.cmake}                       |    0
 .../EndMissing-result.txt}                         |    0
 Tests/RunCMake/while/EndMissing-stderr.txt         |    6 +
 .../while/EndMissing.cmake}                        |    0
 .../MissingArgument-result.txt}                    |    0
 Tests/RunCMake/while/MissingArgument-stderr.txt    |    4 +
 .../while/MissingArgument.cmake}                   |    0
 Tests/RunCMake/while/RunCMakeTest.cmake            |    7 +
 Tests/SimpleInstall/CMakeLists.txt                 |   10 +-
 Tests/SimpleInstallS2/CMakeLists.txt               |   10 +-
 Tests/SwiftMix/CMain.c                             |    4 +
 Tests/SwiftMix/CMakeLists.txt                      |    5 +
 .../hello.f => Tests/SwiftMix/ObjC-Swift.h         |    0
 Tests/SwiftMix/ObjCMain.m                          |    4 +
 Tests/SwiftMix/SwiftMain.swift                     |   12 +
 Tests/SwiftOnly/CMakeLists.txt                     |    4 +
 Tests/SwiftOnly/main.swift                         |    1 +
 Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt   |    6 +-
 Tests/VSNsightTegra/CMakeLists.txt                 |   19 +-
 Tests/VSNsightTegra/proguard-android.txt           |   57 +
 Tests/VSResource/CMakeLists.txt                    |    3 +
 Tests/VSResource/lib.cpp                           |    1 +
 Tests/VSResource/lib.rc                            |    4 +
 Tests/VSResource/main.cpp                          |    4 +-
 Tests/VSWinStorePhone/CMakeLists.txt               |   17 +-
 .../Direct3DApp1/Assets/SmallLogo44x44.png         |  Bin 0 -> 554 bytes
 .../cmake/Package_vc14.store.appxmanifest.in       |   36 +
 Tests/iOSNavApp/CMakeLists.txt                     |    1 -
 Utilities/Doxygen/doc_makeall.sh.in                |   26 +-
 Utilities/Release/Cygwin/README.cygwin.in          |    2 +-
 Utilities/Release/create-cmake-release.cmake       |    2 +-
 Utilities/Release/dash2win64_cygwin.cmake          |    2 +
 Utilities/Release/dash2win64_release.cmake         |    4 +-
 Utilities/Release/dashmacmini2_release.cmake       |    3 +-
 Utilities/Release/dashmacmini5_release.cmake       |    5 +-
 Utilities/Release/ibm_aix_release.cmake            |   15 -
 Utilities/Release/linux64_release.cmake            |    8 +-
 Utilities/Release/magrathea_release.cmake          |    8 +-
 Utilities/Release/release_cmake.sh.in              |   12 +-
 Utilities/Release/upload_release.cmake             |    2 +-
 Utilities/Sphinx/CMakeLists.txt                    |   14 +-
 Utilities/Sphinx/templates/layout.html             |    2 +-
 .../cmcurl/CMake/CurlCheckCSourceCompiles.cmake    |   71 -
 Utilities/cmcurl/CMake/CurlCheckCSourceRuns.cmake  |   83 -
 Utilities/cmcurl/CMake/CurlTests.c                 |  316 +-
 Utilities/cmcurl/CMake/FindGSS.cmake               |  289 ++
 Utilities/cmcurl/CMake/Macros.cmake                |    8 +-
 Utilities/cmcurl/CMake/OtherTests.cmake            |  200 +-
 .../cmcurl/CMake/Platforms/WindowsCache.cmake      |    2 +-
 Utilities/cmcurl/CMakeLists.txt                    |  516 ++-
 Utilities/cmcurl/COPYING                           |    2 +-
 Utilities/cmcurl/README-CMake.txt                  |    8 +-
 Utilities/cmcurl/include/curl/curl.h               |   94 +-
 Utilities/cmcurl/include/curl/curlver.h            |   18 +-
 Utilities/cmcurl/include/curl/mprintf.h            |    9 +-
 Utilities/cmcurl/include/curl/multi.h              |   38 +-
 Utilities/cmcurl/include/curl/typecheck-gcc.h      |    2 +
 Utilities/cmcurl/lib/CMakeLists.txt                |   28 +-
 Utilities/cmcurl/lib/Makefile.inc                  |   86 +-
 Utilities/cmcurl/lib/amigaos.c                     |    4 +-
 Utilities/cmcurl/lib/asyn-ares.c                   |   37 +-
 Utilities/cmcurl/lib/asyn-thread.c                 |   45 +-
 Utilities/cmcurl/lib/base64.c                      |   23 +-
 Utilities/cmcurl/lib/bundles.c                     |  110 -
 Utilities/cmcurl/lib/bundles.h                     |   45 -
 Utilities/cmcurl/lib/conncache.c                   |  179 +-
 Utilities/cmcurl/lib/conncache.h                   |   21 +-
 Utilities/cmcurl/lib/connect.c                     |  227 +-
 Utilities/cmcurl/lib/connect.h                     |    2 +-
 Utilities/cmcurl/lib/cookie.c                      |  208 +-
 Utilities/cmcurl/lib/curl_addrinfo.c               |   59 +-
 Utilities/cmcurl/lib/curl_addrinfo.h               |    4 +
 Utilities/cmcurl/lib/curl_config.h.cmake           |   12 +-
 Utilities/cmcurl/lib/curl_des.c                    |   63 +
 Utilities/cmcurl/lib/curl_des.h                    |   34 +
 Utilities/cmcurl/lib/curl_endian.c                 |  236 ++
 Utilities/cmcurl/lib/curl_endian.h                 |   70 +
 Utilities/cmcurl/lib/curl_fnmatch.c                |    7 +-
 Utilities/cmcurl/lib/curl_gssapi.c                 |   53 +-
 Utilities/cmcurl/lib/curl_gssapi.h                 |   19 +-
 Utilities/cmcurl/lib/curl_md4.h                    |   12 +-
 Utilities/cmcurl/lib/curl_memory.h                 |    3 +
 Utilities/cmcurl/lib/curl_memrchr.c                |    8 +-
 Utilities/cmcurl/lib/curl_multibyte.c              |   18 +-
 Utilities/cmcurl/lib/curl_multibyte.h              |   12 +-
 Utilities/cmcurl/lib/curl_ntlm.c                   |   79 +-
 Utilities/cmcurl/lib/curl_ntlm.h                   |   10 +-
 Utilities/cmcurl/lib/curl_ntlm_core.c              |  292 +-
 Utilities/cmcurl/lib/curl_ntlm_core.h              |   59 +-
 Utilities/cmcurl/lib/curl_ntlm_msgs.c              |  461 +--
 Utilities/cmcurl/lib/curl_ntlm_msgs.h              |   34 -
 Utilities/cmcurl/lib/curl_ntlm_wb.c                |   46 +-
 Utilities/cmcurl/lib/curl_ntlm_wb.h                |    7 +-
 Utilities/cmcurl/lib/curl_printf.h                 |   56 +
 Utilities/cmcurl/lib/curl_rtmp.c                   |   27 +-
 Utilities/cmcurl/lib/curl_sasl.c                   | 1158 +++++-
 Utilities/cmcurl/lib/curl_sasl.h                   |  164 +-
 Utilities/cmcurl/lib/curl_sasl_gssapi.c            |  392 ++
 Utilities/cmcurl/lib/curl_sasl_sspi.c              |  861 +++-
 Utilities/cmcurl/lib/curl_sec.h                    |    4 +-
 Utilities/cmcurl/lib/curl_setup.h                  |   53 +-
 Utilities/cmcurl/lib/curl_sspi.c                   |   30 +-
 Utilities/cmcurl/lib/curl_sspi.h                   |  191 +-
 Utilities/cmcurl/lib/curl_threads.c                |   15 +-
 Utilities/cmcurl/lib/curl_threads.h                |    9 +-
 Utilities/cmcurl/lib/curlx.h                       |    5 +-
 Utilities/cmcurl/lib/dict.c                        |   16 +-
 Utilities/cmcurl/lib/easy.c                        |  180 +-
 Utilities/cmcurl/lib/escape.c                      |   28 +-
 Utilities/cmcurl/lib/file.c                        |   63 +-
 Utilities/cmcurl/lib/fileinfo.c                    |    6 +-
 Utilities/cmcurl/lib/formdata.c                    |  127 +-
 Utilities/cmcurl/lib/ftp.c                         |  305 +-
 Utilities/cmcurl/lib/ftp.h                         |   11 +-
 Utilities/cmcurl/lib/ftplistparser.c               |   57 +-
 Utilities/cmcurl/lib/getinfo.c                     |   55 +-
 Utilities/cmcurl/lib/gopher.c                      |   16 +-
 Utilities/cmcurl/lib/hash.c                        |   72 +-
 Utilities/cmcurl/lib/hash.h                        |   10 +-
 Utilities/cmcurl/lib/hmac.c                        |    6 +-
 Utilities/cmcurl/lib/hostasyn.c                    |   24 +-
 Utilities/cmcurl/lib/hostcheck.c                   |    7 +-
 Utilities/cmcurl/lib/hostip.c                      |  287 +-
 Utilities/cmcurl/lib/hostip.h                      |   22 +-
 Utilities/cmcurl/lib/hostip4.c                     |   15 +-
 Utilities/cmcurl/lib/hostip6.c                     |   17 +-
 Utilities/cmcurl/lib/hostsyn.c                     |    6 +-
 Utilities/cmcurl/lib/http.c                        |  378 +-
 Utilities/cmcurl/lib/http.h                        |   64 +-
 Utilities/cmcurl/lib/http2.c                       | 1184 ++++--
 Utilities/cmcurl/lib/http2.h                       |   17 +-
 Utilities/cmcurl/lib/http_chunks.c                 |   12 +-
 Utilities/cmcurl/lib/http_digest.c                 |  549 +--
 Utilities/cmcurl/lib/http_digest.h                 |   21 +-
 Utilities/cmcurl/lib/http_negotiate.c              |  163 +-
 Utilities/cmcurl/lib/http_negotiate.h              |    6 +-
 Utilities/cmcurl/lib/http_negotiate_sspi.c         |  118 +-
 Utilities/cmcurl/lib/http_proxy.c                  |   64 +-
 Utilities/cmcurl/lib/http_proxy.h                  |    7 +-
 Utilities/cmcurl/lib/idn_win32.c                   |   29 +-
 Utilities/cmcurl/lib/if2ip.c                       |   87 +-
 Utilities/cmcurl/lib/if2ip.h                       |   13 +-
 Utilities/cmcurl/lib/imap.c                        |  989 +----
 Utilities/cmcurl/lib/imap.h                        |   23 +-
 Utilities/cmcurl/lib/inet_ntop.c                   |    3 +-
 Utilities/cmcurl/lib/inet_ntop.h                   |    4 +-
 Utilities/cmcurl/lib/krb5.c                        |   36 +-
 Utilities/cmcurl/lib/ldap.c                        |  622 ++-
 Utilities/cmcurl/lib/md4.c                         |  502 +--
 Utilities/cmcurl/lib/md5.c                         |  579 +--
 Utilities/cmcurl/lib/memdebug.c                    |   39 +-
 Utilities/cmcurl/lib/memdebug.h                    |   20 +-
 Utilities/cmcurl/lib/multi.c                       |  819 ++--
 Utilities/cmcurl/lib/multihandle.h                 |   52 +-
 Utilities/cmcurl/lib/multiif.h                     |   22 +-
 Utilities/cmcurl/lib/netrc.c                       |   20 +-
 Utilities/cmcurl/lib/non-ascii.c                   |   55 +-
 Utilities/cmcurl/lib/nwlib.c                       |    8 +-
 Utilities/cmcurl/lib/openldap.c                    |  142 +-
 Utilities/cmcurl/lib/parsedate.c                   |    2 +-
 Utilities/cmcurl/lib/pingpong.c                    |   56 +-
 Utilities/cmcurl/lib/pipeline.c                    |  119 +-
 Utilities/cmcurl/lib/pipeline.h                    |   12 +
 Utilities/cmcurl/lib/pop3.c                        |  972 +----
 Utilities/cmcurl/lib/pop3.h                        |   23 +-
 Utilities/cmcurl/lib/progress.c                    |    6 +-
 Utilities/cmcurl/lib/rtsp.c                        |   24 +-
 Utilities/cmcurl/lib/security.c                    |  187 +-
 Utilities/cmcurl/lib/select.c                      |   12 +-
 Utilities/cmcurl/lib/sendf.c                       |  218 +-
 Utilities/cmcurl/lib/sendf.h                       |    6 +-
 Utilities/cmcurl/lib/setup-os400.h                 |   18 +-
 Utilities/cmcurl/lib/setup-vms.h                   |   47 +-
 Utilities/cmcurl/lib/share.c                       |   27 +-
 Utilities/cmcurl/lib/share.h                       |    4 +-
 Utilities/cmcurl/lib/slist.c                       |    4 +-
 Utilities/cmcurl/lib/smb.c                         |  976 +++++
 Utilities/cmcurl/lib/smb.h                         |  271 ++
 Utilities/cmcurl/lib/smtp.c                        | 1019 +----
 Utilities/cmcurl/lib/smtp.h                        |   23 +-
 Utilities/cmcurl/lib/socks.c                       |   42 +-
 Utilities/cmcurl/lib/socks_gssapi.c                |   80 +-
 Utilities/cmcurl/lib/socks_sspi.c                  |   59 +-
 Utilities/cmcurl/lib/splay.c                       |   10 +-
 Utilities/cmcurl/lib/ssh.c                         |  160 +-
 Utilities/cmcurl/lib/ssh.h                         |   36 +-
 Utilities/cmcurl/lib/strdup.c                      |   33 +-
 Utilities/cmcurl/lib/strdup.h                      |    3 +-
 Utilities/cmcurl/lib/strerror.c                    |   38 +-
 Utilities/cmcurl/lib/strtoofft.h                   |   11 +-
 Utilities/cmcurl/lib/telnet.c                      |  165 +-
 Utilities/cmcurl/lib/tftp.c                        |  163 +-
 Utilities/cmcurl/lib/timeval.c                     |   12 +-
 Utilities/cmcurl/lib/transfer.c                    |  145 +-
 Utilities/cmcurl/lib/transfer.h                    |    5 +-
 Utilities/cmcurl/lib/url.c                         |  744 ++--
 Utilities/cmcurl/lib/url.h                         |    6 +-
 Utilities/cmcurl/lib/urldata.h                     |  162 +-
 Utilities/cmcurl/lib/version.c                     |   23 +-
 Utilities/cmcurl/lib/vtls/axtls.c                  |   34 +-
 Utilities/cmcurl/lib/vtls/axtls.h                  |   23 +-
 Utilities/cmcurl/lib/vtls/curl_darwinssl.c         | 2485 ------------
 Utilities/cmcurl/lib/vtls/curl_darwinssl.h         |   77 -
 Utilities/cmcurl/lib/vtls/curl_schannel.c          | 1346 -------
 Utilities/cmcurl/lib/vtls/curl_schannel.h          |  137 -
 Utilities/cmcurl/lib/vtls/cyassl.c                 |  273 +-
 Utilities/cmcurl/lib/vtls/cyassl.h                 |   30 +-
 Utilities/cmcurl/lib/vtls/darwinssl.c              | 2484 ++++++++++++
 Utilities/cmcurl/lib/vtls/darwinssl.h              |   76 +
 Utilities/cmcurl/lib/vtls/gskit.c                  |  326 +-
 Utilities/cmcurl/lib/vtls/gskit.h                  |   26 +-
 Utilities/cmcurl/lib/vtls/gtls.c                   |  398 +-
 Utilities/cmcurl/lib/vtls/gtls.h                   |   37 +-
 Utilities/cmcurl/lib/vtls/nss.c                    |  599 +--
 Utilities/cmcurl/lib/vtls/nssg.h                   |   41 +-
 Utilities/cmcurl/lib/vtls/openssl.c                | 1091 +++--
 Utilities/cmcurl/lib/vtls/openssl.h                |   35 +-
 Utilities/cmcurl/lib/vtls/polarssl.c               |  197 +-
 Utilities/cmcurl/lib/vtls/polarssl.h               |   26 +-
 Utilities/cmcurl/lib/vtls/polarssl_threadlock.c    |    5 +-
 Utilities/cmcurl/lib/vtls/qssl.c                   |  527 ---
 Utilities/cmcurl/lib/vtls/qssl.h                   |   62 -
 Utilities/cmcurl/lib/vtls/schannel.c               | 1501 +++++++
 Utilities/cmcurl/lib/vtls/schannel.h               |  118 +
 Utilities/cmcurl/lib/vtls/vtls.c                   |  355 +-
 Utilities/cmcurl/lib/vtls/vtls.h                   |   55 +-
 Utilities/cmcurl/lib/wildcard.c                    |   20 +-
 Utilities/cmcurl/lib/x509asn1.c                    |   55 +-
 Utilities/cmcurl/lib/x509asn1.h                    |   11 +-
 Utilities/cmjsoncpp/src/lib_json/json_reader.cpp   |    2 +-
 Utilities/cmjsoncpp/src/lib_json/json_writer.cpp   |    4 +-
 bootstrap                                          |  279 +-
 1626 files changed, 52976 insertions(+), 39732 deletions(-)
 delete mode 100644 Help/command/FIND_XXX_MAC.txt
 create mode 100644 Help/policy/CMP0064.rst
 create mode 100644 Help/policy/CMP0065.rst
 create mode 100644 Help/prop_gbl/TARGET_MESSAGES.rst
 create mode 100644 Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst
 create mode 100644 Help/prop_tgt/ANDROID_ARCH.rst
 create mode 100644 Help/prop_tgt/ANDROID_ASSETS_DIRECTORIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_JAR_DEPENDENCIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_JAR_DIRECTORIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_JAVA_SOURCE_DIR.rst
 create mode 100644 Help/prop_tgt/ANDROID_NATIVE_LIB_DEPENDENCIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst
 create mode 100644 Help/prop_tgt/ANDROID_PROCESS_MAX.rst
 create mode 100644 Help/prop_tgt/ANDROID_PROGUARD.rst
 create mode 100644 Help/prop_tgt/ANDROID_PROGUARD_CONFIG_PATH.rst
 create mode 100644 Help/prop_tgt/ANDROID_SECURE_PROPS_PATH.rst
 create mode 100644 Help/prop_tgt/ANDROID_SKIP_ANT_STEP.rst
 create mode 100644 Help/prop_tgt/ANDROID_STL_TYPE.rst
 create mode 100644 Help/prop_tgt/BINARY_DIR.rst
 create mode 100644 Help/prop_tgt/FRAMEWORK_VERSION.rst
 create mode 100644 Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
 create mode 100644 Help/prop_tgt/SOURCE_DIR.rst
 create mode 100644 Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
 create mode 100644 Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
 create mode 100644 Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
 create mode 100644 Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
 create mode 100644 Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
 create mode 100644 Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst
 create mode 100644 Help/release/3.4.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_ARCH.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_JAVA_SOURCE_DIR.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_PROGUARD.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_STL_TYPE.rst
 create mode 100644 Help/variable/CMAKE_ENABLE_EXPORTS.rst
 create mode 100644 Help/variable/CMAKE_FIND_APPBUNDLE.rst
 create mode 100644 Help/variable/CMAKE_FIND_FRAMEWORK.rst
 create mode 100644 Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
 create mode 100644 Help/variable/CMAKE_LINK_SEARCH_END_STATIC.rst
 create mode 100644 Help/variable/CMAKE_LINK_SEARCH_START_STATIC.rst
 create mode 100644 Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst
 create mode 100644 Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst
 create mode 100644 Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
 create mode 100644 Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst
 create mode 100644 Help/variable/CTEST_CHANGE_ID.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_MEMCHECK_IGNORE.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_POST_MEMCHECK.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_POST_TEST.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_PRE_MEMCHECK.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_PRE_TEST.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst
 create mode 100644 Help/variable/CTEST_CUSTOM_XXX.txt
 create mode 100644 Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst
 create mode 100644 Help/variable/CTEST_TEST_LOAD.rst
 delete mode 100644 Modules/CMakeClDeps.cmake
 create mode 100644 Modules/CMakeDetermineSwiftCompiler.cmake
 create mode 100644 Modules/CMakeSwiftCompiler.cmake.in
 create mode 100644 Modules/CMakeSwiftInformation.cmake
 create mode 100644 Modules/CMakeTestSwiftCompiler.cmake
 create mode 100644 Modules/Compiler/CCur-Fortran.cmake
 create mode 100644 Modules/CompilerId/main.swift.in
 create mode 100644 Modules/Platform/ARTOS-GNU-C.cmake
 create mode 100644 Modules/Platform/ARTOS.cmake
 create mode 100644 Modules/Platform/Euros.cmake
 create mode 100644 Modules/Platform/Linux-CCur-Fortran.cmake
 delete mode 100644 Modules/UseVTK40.cmake
 delete mode 100644 Modules/UseVTKBuildSettings40.cmake
 delete mode 100644 Modules/UseVTKConfig40.cmake
 create mode 100644 Source/Checks/cm_c11_thread_local.c
 create mode 100644 Source/Checks/cm_c11_thread_local.cmake
 create mode 100644 Source/QtIFW/CMake.Dialogs.QtGUI.qs
 create mode 100644 Source/QtIFW/CMake.Documentation.SphinxHTML.qs.in
 create mode 100644 Source/QtIFW/CMake.qs.in
 create mode 100644 Source/bindexplib.cxx
 create mode 100644 Source/cmCommonTargetGenerator.cxx
 create mode 100644 Source/cmCommonTargetGenerator.h
 delete mode 100644 Source/cmDependsFortranLexer.cxx
 delete mode 100644 Source/cmDependsFortranLexer.h
 delete mode 100644 Source/cmDependsFortranLexer.in.l
 delete mode 100644 Source/cmDependsFortranParser.cxx
 delete mode 100644 Source/cmDependsFortranParser.h
 delete mode 100644 Source/cmDependsFortranParser.y
 delete mode 100644 Source/cmDependsFortranParserTokens.h
 create mode 100644 Source/cmFortranLexer.cxx
 create mode 100644 Source/cmFortranLexer.h
 create mode 100644 Source/cmFortranLexer.in.l
 create mode 100644 Source/cmFortranParser.cxx
 create mode 100644 Source/cmFortranParser.h
 create mode 100644 Source/cmFortranParser.y
 create mode 100644 Source/cmFortranParserImpl.cxx
 create mode 100644 Source/cmFortranParserTokens.h
 create mode 100644 Source/cmGlobalCommonGenerator.cxx
 create mode 100644 Source/cmGlobalCommonGenerator.h
 create mode 100644 Source/cmLinkItem.h
 create mode 100644 Source/cmLinkedTree.h
 create mode 100644 Source/cmLocalCommonGenerator.cxx
 create mode 100644 Source/cmLocalCommonGenerator.h
 create mode 100644 Source/cmOutputConverter.cxx
 create mode 100644 Source/cmOutputConverter.h
 create mode 100644 Source/cmQtAutoGeneratorInitializer.cxx
 create mode 100644 Source/cmQtAutoGeneratorInitializer.h
 create mode 100644 Source/cmake.version.manifest
 delete mode 100644 Source/kwsys/CMakeEmptyInputFile.in
 create mode 100644 Source/kwsys/CTestCustom.cmake.in
 delete mode 100644 Source/kwsys/kwsys_cstddef.hxx.in
 delete mode 100644 Source/kwsys/kwsys_ios_fstream.h.in
 delete mode 100644 Source/kwsys/kwsys_ios_iosfwd.h.in
 delete mode 100644 Source/kwsys/kwsys_ios_iostream.h.in
 delete mode 100644 Source/kwsys/kwsys_ios_sstream.h.in
 delete mode 100644 Source/kwsys/kwsys_stl.hxx.in
 delete mode 100644 Source/kwsys/kwsys_stl_string.hxx.in
 create mode 100644 Templates/Windows/SmallLogo44x44.png
 copy Tests/{FindPackageTest/Exporter/dummy.c => BuildDepends/Project/object_depends.cxx} (100%)
 create mode 100644 Tests/BuildDepends/Project/object_depends_check.cmake
 delete mode 100644 Tests/CMakeTests/List-Get-CMP0007-Warn.cmake
 delete mode 100644 Tests/CTestTestConfigFileInBuildDir/CMakeLists.txt
 delete mode 100644 Tests/CTestTestConfigFileInBuildDir/CTestConfig.cmake
 delete mode 100644 Tests/CTestTestConfigFileInBuildDir/test1.cmake.in
 delete mode 100644 Tests/CTestTestConfigFileInBuildDir/test2.cmake.in
 create mode 100644 Tests/ExportImport/Export/testExe4.c
 create mode 100644 Tests/ExportImport/Export/testLib7.c
 create mode 100644 Tests/ExportImport/Export/testLibNoSONAME.c
 create mode 100644 Tests/ExportImport/Import/A/check_lib_nosoname.cmake
 create mode 100644 Tests/ExportImport/Import/A/check_lib_soname.cmake
 create mode 100644 Tests/ExternalProject/gitrepo-sub.tgz
 create mode 100644 Tests/FindOpenSSL/CMakeLists.txt
 create mode 100644 Tests/FindOpenSSL/rand/CMakeLists.txt
 create mode 100644 Tests/FindOpenSSL/rand/main.cc
 create mode 100644 Tests/FindThreads/C-only/CMakeLists.txt
 create mode 100644 Tests/FindThreads/CMakeLists.txt
 create mode 100644 Tests/FindThreads/CXX-only/CMakeLists.txt
 create mode 100644 Tests/GeneratorExpression/check-part4.cmake
 create mode 100644 Tests/JavaJavah/B.cpp
 create mode 100644 Tests/JavaJavah/B.java
 create mode 100644 Tests/JavaJavah/CMakeLists.txt
 create mode 100644 Tests/JavaJavah/HelloWorld2.java
 create mode 100644 Tests/MSManifest/CMakeLists.txt
 create mode 100644 Tests/MSManifest/Subdir/CMakeLists.txt
 create mode 100644 Tests/MSManifest/Subdir/check.cmake
 copy Tests/{CMakeOnly/LinkInterfaceLoop => MSManifest/Subdir}/main.c (100%)
 create mode 100644 Tests/MSManifest/Subdir/test.manifest.in
 create mode 100644 Tests/OutOfBinary/outexe.c
 create mode 100644 Tests/OutOfSource/SubDir/subdir.c
 create mode 100644 Tests/QtAutogen/automoc_rerun/CMakeLists.txt
 copy Tests/QtAutogen/{autorcc_depends/res1/input.txt.in => automoc_rerun/input.txt} (100%)
 create mode 100644 Tests/QtAutogen/automoc_rerun/res1.qrc
 create mode 100644 Tests/QtAutogen/automoc_rerun/test1.cpp
 create mode 100644 Tests/QtAutogen/automoc_rerun/test1.h.in1
 create mode 100644 Tests/QtAutogen/automoc_rerun/test1.h.in2
 copy Tests/{CTestTestCycle/simple.cxx => QtAutogen/targetObjectsTest.cpp} (100%)
 delete mode 100644 Tests/RegexEscapeString.cmake
 create mode 100644 Tests/RunCMake/AutoExportDll/AutoExport.cmake
 create mode 100644 Tests/RunCMake/AutoExportDll/AutoExportBuild-stderr.txt
 copy Tests/RunCMake/{CMP0057 => AutoExportDll}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/AutoExportDll/foo.c
 create mode 100644 Tests/RunCMake/AutoExportDll/hello.cxx
 create mode 100644 Tests/RunCMake/AutoExportDll/hello.h
 create mode 100644 Tests/RunCMake/AutoExportDll/say.cxx
 create mode 100644 Tests/RunCMake/AutoExportDll/sub/CMakeLists.txt
 create mode 100644 Tests/RunCMake/AutoExportDll/sub/sub.cxx
 create mode 100644 Tests/RunCMake/AutoExportDll/world.cxx
 create mode 100644 Tests/RunCMake/BuildDepends/C-Exe-Manifest.cmake
 create mode 100644 Tests/RunCMake/BuildDepends/C-Exe-Manifest.step1.cmake
 create mode 100644 Tests/RunCMake/BuildDepends/C-Exe-Manifest.step2.cmake
 create mode 100644 Tests/RunCMake/BuildDepends/C-Exe.cmake
 create mode 100644 Tests/RunCMake/BuildDepends/C-Exe.step1.cmake
 create mode 100644 Tests/RunCMake/BuildDepends/C-Exe.step2.cmake
 create mode 100644 Tests/RunCMake/BuildDepends/CMakeLists.txt
 create mode 100644 Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/BuildDepends/check.cmake
 copy Tests/{CMakeOnly/LinkInterfaceLoop => RunCMake/BuildDepends}/main.c (100%)
 create mode 100644 Tests/RunCMake/CMP0026/clear-cached-information-dir/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CMP0026/clear-cached-information.cmake
 create mode 100644 Tests/RunCMake/CMP0064/CMP0064-NEW.cmake
 create mode 100644 Tests/RunCMake/CMP0064/CMP0064-OLD.cmake
 create mode 100644 Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0064/CMP0064-WARN.cmake
 create mode 100644 Tests/RunCMake/CMP0064/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CMP0064/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake
 create mode 100644 Tests/RunCMake/CMP0065/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CMP0065/NEWBad.cmake
 create mode 100644 Tests/RunCMake/CMP0065/NEWGood.cmake
 create mode 100644 Tests/RunCMake/CMP0065/OLDBad1.cmake
 create mode 100644 Tests/RunCMake/CMP0065/OLDBad2.cmake
 create mode 100644 Tests/RunCMake/CMP0065/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CMP0065/WARN-OFF.cmake
 create mode 100644 Tests/RunCMake/CMP0065/WARN-ON-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0065/WARN-ON.cmake
 create mode 100644 Tests/RunCMake/CMP0065/subproject/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CMP0065/subproject/main.c
 create mode 100644 Tests/RunCMake/CPack/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake
 create mode 100644 Tests/RunCMake/CPack/CPackTestHelpers.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/DEB_EXTRA-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/EMPTY_DIR-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/EMPTY_DIR-specifics.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/Helpers.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/MINIMAL-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/MINIMAL-specifics.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/Prerequirements.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB_EXTRA.cmake
 create mode 100644 Tests/RunCMake/CPack/DEPENDENCIES.cmake
 create mode 100644 Tests/RunCMake/CPack/EMPTY_DIR.cmake
 create mode 100644 Tests/RunCMake/CPack/MINIMAL.cmake
 rename Tests/RunCMake/{CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake => CPack/PARTIALLY_RELOCATABLE_WARNING.cmake} (100%)
 create mode 100644 Tests/RunCMake/CPack/README.txt
 create mode 100644 Tests/RunCMake/CPack/RPM/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/COMPONENTS_EMPTY_DIR-stderr.txt
 create mode 100644 Tests/RunCMake/CPack/RPM/DEPENDENCIES-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/DEPENDENCIES-VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/EMPTY_DIR-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/EMPTY_DIR-stderr.txt
 create mode 100644 Tests/RunCMake/CPack/RPM/Helpers.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/MINIMAL-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/MINIMAL-stderr.txt
 create mode 100644 Tests/RunCMake/CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-ExpectedFiles.cmake
 rename Tests/RunCMake/{CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt => CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/CPack/RPM/Prerequirements.cmake
 create mode 100644 Tests/RunCMake/CPack/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CPack/TGZ/COMPONENTS_EMPTY_DIR-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/TGZ/COMPONENTS_EMPTY_DIR-specifics.cmake
 create mode 100644 Tests/RunCMake/CPack/TGZ/EMPTY_DIR-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/TGZ/Helpers.cmake
 create mode 100644 Tests/RunCMake/CPack/TGZ/MINIMAL-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
 create mode 100644 Tests/RunCMake/CPack/VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CPackConfig/Default-check.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Default.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Simple-check.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Simple.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Special-check.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Special.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Verbatim-check.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/Verbatim.cmake
 create mode 100644 Tests/RunCMake/CPackConfig/check.cmake
 delete mode 100644 Tests/RunCMake/CPackRPM/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/CPackRPM/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CTestCommandLine/LabelCount-stdout.txt
 create mode 100644 Tests/RunCMake/CTestCommandLine/MergeOutput-stdout.txt
 copy Tests/RunCMake/{execute_process => CTestCommandLine}/MergeOutput.cmake (100%)
 create mode 100644 Tests/RunCMake/CTestCommandLine/TestOutputSize-check.cmake
 create mode 100644 Tests/RunCMake/CTestCommandLine/TestOutputSize-result.txt
 create mode 100644 Tests/RunCMake/CTestCommandLine/TestOutputSize-stderr.txt
 create mode 100644 Tests/RunCMake/CTestCommandLine/test-load-fail-stderr.txt
 create mode 100644 Tests/RunCMake/CTestCommandLine/test-load-fail-stdout.txt
 create mode 100644 Tests/RunCMake/CTestCommandLine/test-load-invalid-stderr.txt
 create mode 100644 Tests/RunCMake/CTestCommandLine/test-load-invalid-stdout.txt
 copy Tests/RunCMake/{ctest_start/StartQuiet-stdout.txt => CTestCommandLine/test-load-pass-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestCommandLine/test-load-pass-stdout.txt
 create mode 100644 Tests/RunCMake/CommandLine/BuildDir.cmake
 copy Tests/RunCMake/CommandLine/{Build.cmake => BuildDir/CMakeLists.txt} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/build-bad-dir-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/build-bad-dir-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/build-no-dir-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/build-no-dir-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/trace-expand-stderr.txt
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/trace-expand.cmake (100%)
 create mode 100644 Tests/RunCMake/CompileDefinitions/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CompileDefinitions/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CompileDefinitions/SetEmpty-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CompileDefinitions/SetEmpty-stderr.txt
 create mode 100644 Tests/RunCMake/CompileDefinitions/SetEmpty.cmake
 create mode 100644 Tests/RunCMake/CompilerLauncher/C-Build-stdout.txt
 create mode 100644 Tests/RunCMake/CompilerLauncher/C-launch-Build-stdout.txt
 copy Tests/RunCMake/{IncludeWhatYouUse => CompilerLauncher}/C-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/CompilerLauncher/C.cmake
 copy Tests/RunCMake/{CMP0057 => CompilerLauncher}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/CompilerLauncher/CXX-Build-stdout.txt
 create mode 100644 Tests/RunCMake/CompilerLauncher/CXX-launch-Build-stdout.txt
 copy Tests/RunCMake/{IncludeWhatYouUse => CompilerLauncher}/CXX-launch.cmake (100%)
 create mode 100644 Tests/RunCMake/CompilerLauncher/CXX.cmake
 create mode 100644 Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CompilerLauncher/main.c
 copy Tests/RunCMake/{IncludeWhatYouUse => CompilerLauncher}/main.cxx (100%)
 create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerC-stderr-JOM.txt
 create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerC-stderr-NMake.txt
 create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerCXX-stderr-JOM.txt
 create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerCXX-stderr-NMake.txt
 create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerCandCXX-stderr-JOM.txt
 create mode 100644 Tests/RunCMake/CompilerNotFound/BadCompilerCandCXX-stderr-NMake.txt
 create mode 100644 Tests/RunCMake/ExternalProject/UsesTerminal-check.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/UsesTerminal.cmake
 create mode 100644 Tests/RunCMake/FindPkgConfig/FindPkgConfig_GET_VARIABLE-stdout.txt
 create mode 100644 Tests/RunCMake/FindPkgConfig/FindPkgConfig_GET_VARIABLE.cmake
 create mode 100644 Tests/RunCMake/GNUInstallDirs/CMakeLists.txt
 create mode 100644 Tests/RunCMake/GNUInstallDirs/Common.cmake
 create mode 100644 Tests/RunCMake/GNUInstallDirs/Opt-stderr.txt
 create mode 100644 Tests/RunCMake/GNUInstallDirs/Opt.cmake
 create mode 100644 Tests/RunCMake/GNUInstallDirs/Root-stderr.txt
 create mode 100644 Tests/RunCMake/GNUInstallDirs/Root.cmake
 create mode 100644 Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/GNUInstallDirs/Usr-stderr.txt
 create mode 100644 Tests/RunCMake/GNUInstallDirs/Usr.cmake
 create mode 100644 Tests/RunCMake/GNUInstallDirs/UsrLocal-stderr.txt
 create mode 100644 Tests/RunCMake/GNUInstallDirs/UsrLocal.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/BadSHELL_PATH-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/BadSHELL_PATH-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorExpression/BadSHELL_PATH.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/ImportedTarget-TARGET_PDB_FILE-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/OUTPUT_NAME-recursion-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/OUTPUT_NAME-recursion-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorExpression/OUTPUT_NAME-recursion.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/TARGET_FILE-recursion-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/TARGET_FILE-recursion-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorExpression/TARGET_FILE-recursion.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Languages/DetermineFail-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Languages/DetermineFail-stderr.txt
 create mode 100644 Tests/RunCMake/Languages/DetermineFail.cmake
 create mode 100644 Tests/RunCMake/Languages/Modules/CMakeDetermineFailCompiler.cmake
 create mode 100644 Tests/RunCMake/LinkStatic/CMakeLists.txt
 create mode 100644 Tests/RunCMake/LinkStatic/LINK_SEARCH_STATIC.cmake
 copy Tests/{ => RunCMake}/LinkStatic/LinkStatic.c (100%)
 create mode 100644 Tests/RunCMake/LinkStatic/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/Make/CMakeLists.txt
 create mode 100644 Tests/RunCMake/Make/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/Make/TargetMessages-OFF-build-stdout.txt
 create mode 100644 Tests/RunCMake/Make/TargetMessages-OFF.cmake
 create mode 100644 Tests/RunCMake/Make/TargetMessages-ON-build-stdout.txt
 create mode 100644 Tests/RunCMake/Make/TargetMessages-ON.cmake
 create mode 100644 Tests/RunCMake/Make/TargetMessages-VAR-OFF-build-stdout.txt
 create mode 100644 Tests/RunCMake/Make/TargetMessages-VAR-OFF.cmake
 create mode 100644 Tests/RunCMake/Make/TargetMessages-VAR-ON-build-stdout.txt
 create mode 100644 Tests/RunCMake/Make/TargetMessages-VAR-ON.cmake
 create mode 100644 Tests/RunCMake/PolicyScope/CMakeLists.txt
 create mode 100644 Tests/RunCMake/PolicyScope/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => PolicyScope/dir-in-macro-generate-time-result.txt} (100%)
 create mode 100644 Tests/RunCMake/PolicyScope/dir-in-macro-generate-time-stderr.txt
 create mode 100644 Tests/RunCMake/PolicyScope/dir-in-macro-generate-time.cmake
 create mode 100644 Tests/RunCMake/PolicyScope/dir-in-macro-include.cmake
 create mode 100644 Tests/RunCMake/PolicyScope/dir1/CMakeLists.txt
 copy Tests/{CTestTestCycle/simple.cxx => RunCMake/PolicyScope/dir1/foo.cpp} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => PolicyScope/parent-dir-generate-time-result.txt} (100%)
 create mode 100644 Tests/RunCMake/PolicyScope/parent-dir-generate-time.cmake
 create mode 100644 Tests/RunCMake/Swift/CMakeLists.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Swift/NotSupported-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Swift/NotSupported-stderr.txt
 create mode 100644 Tests/RunCMake/Swift/NotSupported.cmake
 create mode 100644 Tests/RunCMake/Swift/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Swift/XcodeTooOld-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Swift/XcodeTooOld-stderr.txt
 create mode 100644 Tests/RunCMake/Swift/XcodeTooOld.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeBundles.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeInstallIOS-install-stdout.txt
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/foo.cpp
 create mode 100644 Tests/RunCMake/XcodeProject/main.m
 create mode 100644 Tests/RunCMake/XcodeProject/osx.cmake
 create mode 100644 Tests/RunCMake/ctest_build/BuildChangeId-check.cmake
 create mode 100644 Tests/RunCMake/ctest_start/ConfigInBuild-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_start/ConfigInSource-stdout.txt
 copy Tests/RunCMake/{ctest_build/BuildFailure-result.txt => ctest_test/CTestTestLoadFail-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_test/CTestTestLoadFail-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_test/CTestTestLoadFail-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/CTestTestLoadInvalid-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_test/CTestTestLoadInvalid-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/CTestTestLoadPass-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/TestChangeId-check.cmake
 copy Tests/RunCMake/{ctest_build/BuildFailure-result.txt => ctest_test/TestLoadFail-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ctest_test/TestLoadFail-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_test/TestLoadFail-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/TestLoadInvalid-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_test/TestLoadInvalid-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/TestLoadOrder-stderr.txt
 create mode 100644 Tests/RunCMake/ctest_test/TestLoadOrder-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/TestLoadPass-stdout.txt
 create mode 100644 Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => export/CustomTarget-result.txt} (100%)
 create mode 100644 Tests/RunCMake/export/CustomTarget-stderr.txt
 create mode 100644 Tests/RunCMake/export/CustomTarget.cmake
 create mode 100755 Tests/RunCMake/find_program/A/testA
 create mode 100755 Tests/RunCMake/find_program/A/testAandB
 create mode 100755 Tests/RunCMake/find_program/B/testAandB
 create mode 100755 Tests/RunCMake/find_program/B/testB
 create mode 100644 Tests/RunCMake/find_program/CMakeLists.txt
 create mode 100644 Tests/RunCMake/find_program/DirsPerName-stdout.txt
 create mode 100644 Tests/RunCMake/find_program/DirsPerName.cmake
 create mode 100644 Tests/RunCMake/find_program/EnvAndHints-stdout.txt
 create mode 100644 Tests/RunCMake/find_program/EnvAndHints.cmake
 create mode 100644 Tests/RunCMake/find_program/NamesPerDir-stdout.txt
 create mode 100644 Tests/RunCMake/find_program/NamesPerDir.cmake
 create mode 100644 Tests/RunCMake/find_program/RunCMakeTest.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_program/Win/testCom.com (100%)
 mode change 100644 => 100755
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_program/Win/testCom.exe (100%)
 mode change 100644 => 100755
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_program/Win/testExe.exe (100%)
 mode change 100644 => 100755
 create mode 100644 Tests/RunCMake/find_program/WindowsCom-stdout.txt
 create mode 100644 Tests/RunCMake/find_program/WindowsCom.cmake
 create mode 100644 Tests/RunCMake/find_program/WindowsExe-stdout.txt
 create mode 100644 Tests/RunCMake/find_program/WindowsExe.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/BadArgument-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/BadArgument-stderr.txt
 rename Tests/{CMakeTests/GetProperty-Bad-Argument.cmake => RunCMake/get_property/BadArgument.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/BadDirectory-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/BadDirectory-stderr.txt
 rename Tests/{CMakeTests/GetProperty-Bad-Directory.cmake => RunCMake/get_property/BadDirectory.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/BadScope-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/BadScope-stderr.txt
 rename Tests/{CMakeTests/GetProperty-Bad-Scope.cmake => RunCMake/get_property/BadScope.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/BadTarget-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/BadTarget-stderr.txt
 rename Tests/{CMakeTests/GetProperty-Bad-Target.cmake => RunCMake/get_property/BadTarget.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/BadTest-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/BadTest-stderr.txt
 rename Tests/{CMakeTests/GetProperty-Bad-Test.cmake => RunCMake/get_property/BadTest.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/GlobalName-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/GlobalName-stderr.txt
 rename Tests/{CMakeTests/GetProperty-Global-Name.cmake => RunCMake/get_property/GlobalName.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/MissingArgument-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/MissingArgument-stderr.txt
 rename Tests/{CMakeTests/GetProperty-Missing-Argument.cmake => RunCMake/get_property/MissingArgument.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/NoCache-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/NoCache-stderr.txt
 rename Tests/{CMakeTests/GetProperty-No-Cache.cmake => RunCMake/get_property/NoCache.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/NoProperty-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/NoProperty-stderr.txt
 rename Tests/{CMakeTests/GetProperty-No-Property.cmake => RunCMake/get_property/NoProperty.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/NoSource-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/NoSource-stderr.txt
 rename Tests/{CMakeTests/GetProperty-No-Source.cmake => RunCMake/get_property/NoSource.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/NoTarget-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/NoTarget-stderr.txt
 rename Tests/{CMakeTests/GetProperty-No-Target.cmake => RunCMake/get_property/NoTarget.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/NoTest-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/NoTest-stderr.txt
 rename Tests/{CMakeTests/GetProperty-No-Test.cmake => RunCMake/get_property/NoTest.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => get_property/VariableName-result.txt} (100%)
 create mode 100644 Tests/RunCMake/get_property/VariableName-stderr.txt
 rename Tests/{CMakeTests/GetProperty-Variable-Name.cmake => RunCMake/get_property/VariableName.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => if/InvalidArgument1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/if/InvalidArgument1-stderr.txt
 rename Tests/{CMakeTests/If-Invalid-Argument.cmake => RunCMake/if/InvalidArgument1.cmake} (100%)
 create mode 100644 Tests/RunCMake/if/TestNameThatDoesNotExist-stdout.txt
 create mode 100644 Tests/RunCMake/if/TestNameThatDoesNotExist.cmake
 create mode 100644 Tests/RunCMake/if/TestNameThatExists-stdout.txt
 create mode 100644 Tests/RunCMake/if/TestNameThatExists.cmake
 create mode 100644 Tests/RunCMake/include_directories/DirectoryBefore-stdout.txt
 create mode 100644 Tests/RunCMake/include_directories/DirectoryBefore.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => install/DIRECTORY-DESTINATION-bad-result.txt} (100%)
 copy Tests/RunCMake/{XcodeProject/XcodeAttributeGenexError-stderr.txt => install/DIRECTORY-DESTINATION-bad-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/install/DIRECTORY-DESTINATION-bad.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => install/FILES-DESTINATION-bad-result.txt} (100%)
 copy Tests/RunCMake/{XcodeProject/XcodeAttributeGenexError-stderr.txt => install/FILES-DESTINATION-bad-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/install/FILES-DESTINATION-bad.cmake
 create mode 100644 Tests/RunCMake/list/GET-CMP0007-WARN-stderr.txt
 create mode 100644 Tests/RunCMake/list/GET-CMP0007-WARN.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/GET-InvalidIndex-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/GET-InvalidIndex-stderr.txt
 rename Tests/{CMakeTests/List-Get-Invalid-Index.cmake => RunCMake/list/GET-InvalidIndex.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/INSERT-InvalidIndex-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/INSERT-InvalidIndex-stderr.txt
 rename Tests/{CMakeTests/List-Insert-Invalid-Index.cmake => RunCMake/list/INSERT-InvalidIndex.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/InvalidSubcommand-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/InvalidSubcommand-stderr.txt
 rename Tests/{CMakeTests/List-Invalid-Subcommand.cmake => RunCMake/list/InvalidSubcommand.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/LENGTH-TooManyArguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/LENGTH-TooManyArguments-stderr.txt
 rename Tests/{CMakeTests/List-Length-Too-Many-Arguments.cmake => RunCMake/list/LENGTH-TooManyArguments.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/NoArguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/NoArguments-stderr.txt
 rename Tests/{CMakeTests/List-No-Arguments.cmake => RunCMake/list/NoArguments.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/REMOVE_AT-InvalidIndex-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/REMOVE_AT-InvalidIndex-stderr.txt
 rename Tests/{CMakeTests/List-Remove_At-Invalid-Index.cmake => RunCMake/list/REMOVE_AT-InvalidIndex.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/REMOVE_AT-NotList-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/REMOVE_AT-NotList-stderr.txt
 rename Tests/{CMakeTests/List-Remove_At-Nonexistent-List.cmake => RunCMake/list/REMOVE_AT-NotList.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/REMOVE_DUPLICATES-NotList-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/REMOVE_DUPLICATES-NotList-stderr.txt
 rename Tests/{CMakeTests/List-Remove_Duplicates-Nonexistent-List.cmake => RunCMake/list/REMOVE_DUPLICATES-NotList.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/REMOVE_DUPLICATES-TooManyArguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/REMOVE_DUPLICATES-TooManyArguments-stderr.txt
 rename Tests/{CMakeTests/List-Remove_Duplicates-Too-Many-Arguments.cmake => RunCMake/list/REMOVE_DUPLICATES-TooManyArguments.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/REMOVE_ITEM-NotList-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/REMOVE_ITEM-NotList-stderr.txt
 rename Tests/{CMakeTests/List-Remove_Item-Nonexistent-List.cmake => RunCMake/list/REMOVE_ITEM-NotList.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/REVERSE-NotList-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/REVERSE-NotList-stderr.txt
 rename Tests/{CMakeTests/List-Reverse-Nonexistent-List.cmake => RunCMake/list/REVERSE-NotList.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/REVERSE-TooManyArguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/REVERSE-TooManyArguments-stderr.txt
 rename Tests/{CMakeTests/List-Reverse-Too-Many-Arguments.cmake => RunCMake/list/REVERSE-TooManyArguments.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/SORT-NotList-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/SORT-NotList-stderr.txt
 rename Tests/{CMakeTests/List-Sort-Nonexistent-List.cmake => RunCMake/list/SORT-NotList.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/SORT-TooManyArguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/list/SORT-TooManyArguments-stderr.txt
 rename Tests/{CMakeTests/List-Sort-Too-Many-Arguments.cmake => RunCMake/list/SORT-TooManyArguments.cmake} (100%)
 create mode 100644 Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
 create mode 100644 Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake
 create mode 100644 Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt
 create mode 100644 Tests/RunCMake/set_property/COMPILE_FEATURES.cmake
 create mode 100644 Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
 create mode 100644 Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake
 create mode 100644 Tests/RunCMake/set_property/Common.cmake
 create mode 100644 Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
 create mode 100644 Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake
 create mode 100644 Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt
 create mode 100644 Tests/RunCMake/set_property/SOURCES-stdout.txt
 create mode 100644 Tests/RunCMake/set_property/SOURCES.cmake
 create mode 100644 Tests/RunCMake/set_property/USER_PROP-stdout.txt
 create mode 100644 Tests/RunCMake/set_property/USER_PROP.cmake
 create mode 100644 Tests/RunCMake/string/Append.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => string/AppendNoArgs-result.txt} (100%)
 create mode 100644 Tests/RunCMake/string/AppendNoArgs-stderr.txt
 create mode 100644 Tests/RunCMake/string/AppendNoArgs.cmake
 create mode 100644 Tests/RunCMake/target_link_libraries/SharedDepNotTarget.cmake
 copy Tests/RunCMake/{CMP0004 => while}/CMakeLists.txt (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => while/EndAlone-result.txt} (100%)
 create mode 100644 Tests/RunCMake/while/EndAlone-stderr.txt
 rename Tests/{CMakeTests/While-Endwhile-Alone.cmake => RunCMake/while/EndAlone.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => while/EndAloneArgs-result.txt} (100%)
 create mode 100644 Tests/RunCMake/while/EndAloneArgs-stderr.txt
 rename Tests/{CMakeTests/While-Endwhile-Alone-Args.cmake => RunCMake/while/EndAloneArgs.cmake} (100%)
 create mode 100644 Tests/RunCMake/while/EndMismatch-stderr.txt
 rename Tests/{CMakeTests/While-Endwhile-Mismatch.cmake => RunCMake/while/EndMismatch.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => while/EndMissing-result.txt} (100%)
 create mode 100644 Tests/RunCMake/while/EndMissing-stderr.txt
 rename Tests/{CMakeTests/While-Missing-Endwhile.cmake => RunCMake/while/EndMissing.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => while/MissingArgument-result.txt} (100%)
 create mode 100644 Tests/RunCMake/while/MissingArgument-stderr.txt
 rename Tests/{CMakeTests/While-Missing-Argument.cmake => RunCMake/while/MissingArgument.cmake} (100%)
 create mode 100644 Tests/RunCMake/while/RunCMakeTest.cmake
 create mode 100644 Tests/SwiftMix/CMain.c
 create mode 100644 Tests/SwiftMix/CMakeLists.txt
 copy Modules/IntelVSImplicitPath/hello.f => Tests/SwiftMix/ObjC-Swift.h (100%)
 create mode 100644 Tests/SwiftMix/ObjCMain.m
 create mode 100644 Tests/SwiftMix/SwiftMain.swift
 create mode 100644 Tests/SwiftOnly/CMakeLists.txt
 create mode 100644 Tests/SwiftOnly/main.swift
 create mode 100644 Tests/VSNsightTegra/proguard-android.txt
 create mode 100644 Tests/VSResource/lib.cpp
 create mode 100644 Tests/VSResource/lib.rc
 create mode 100644 Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png
 create mode 100644 Tests/VSWinStorePhone/cmake/Package_vc14.store.appxmanifest.in
 delete mode 100644 Utilities/Release/ibm_aix_release.cmake
 delete mode 100644 Utilities/cmcurl/CMake/CurlCheckCSourceCompiles.cmake
 delete mode 100644 Utilities/cmcurl/CMake/CurlCheckCSourceRuns.cmake
 create mode 100644 Utilities/cmcurl/CMake/FindGSS.cmake
 delete mode 100644 Utilities/cmcurl/lib/bundles.c
 delete mode 100644 Utilities/cmcurl/lib/bundles.h
 create mode 100644 Utilities/cmcurl/lib/curl_des.c
 create mode 100644 Utilities/cmcurl/lib/curl_des.h
 create mode 100644 Utilities/cmcurl/lib/curl_endian.c
 create mode 100644 Utilities/cmcurl/lib/curl_endian.h
 create mode 100644 Utilities/cmcurl/lib/curl_printf.h
 create mode 100644 Utilities/cmcurl/lib/curl_sasl_gssapi.c
 create mode 100644 Utilities/cmcurl/lib/smb.c
 create mode 100644 Utilities/cmcurl/lib/smb.h
 delete mode 100644 Utilities/cmcurl/lib/vtls/curl_darwinssl.c
 delete mode 100644 Utilities/cmcurl/lib/vtls/curl_darwinssl.h
 delete mode 100644 Utilities/cmcurl/lib/vtls/curl_schannel.c
 delete mode 100644 Utilities/cmcurl/lib/vtls/curl_schannel.h
 create mode 100644 Utilities/cmcurl/lib/vtls/darwinssl.c
 create mode 100644 Utilities/cmcurl/lib/vtls/darwinssl.h
 delete mode 100644 Utilities/cmcurl/lib/vtls/qssl.c
 delete mode 100644 Utilities/cmcurl/lib/vtls/qssl.h
 create mode 100644 Utilities/cmcurl/lib/vtls/schannel.c
 create mode 100644 Utilities/cmcurl/lib/vtls/schannel.h


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:34:43 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:34:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1416-gf2791da
Message-ID: <20151005143443.6D58EBFCDA@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  f2791da132a42cb71384065b340ae212679fc336 (commit)
       via  679a5d2185b15dcd0ff73f7c1c2d7d527c53de53 (commit)
      from  091fbd69644e26043d1a7fe5c7a0b04d22066ca8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.4.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:34:43 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:34:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1418-g558dbeb
Message-ID: <20151005143443.8E2C9BFCF0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  558dbeb599340556d0d9cb629624e53feebc9a70 (commit)
       via  f2791da132a42cb71384065b340ae212679fc336 (commit)
       via  679a5d2185b15dcd0ff73f7c1c2d7d527c53de53 (commit)
      from  98557c16c5a93b81f586dde9ab7b2c2e238d6978 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=558dbeb599340556d0d9cb629624e53feebc9a70
commit 558dbeb599340556d0d9cb629624e53feebc9a70
Merge: 98557c1 f2791da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 10:34:14 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 10:34:14 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.4.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 10:34:43 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 10:34:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, release, updated. v3.3.2-1413-g679a5d2
Message-ID: <20151005143443.AC6ABBFCF1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, release has been updated
       via  679a5d2185b15dcd0ff73f7c1c2d7d527c53de53 (commit)
      from  86cc45e3e35cfab243a441bb16e50104ead0b193 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.4.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 11:41:25 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 11:41:25 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1420-geb1640a
Message-ID: <20151005154125.228E4BCFBD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  eb1640ad737262b7197d544c012e62bcdcc17f56 (commit)
       via  821e17785ecd4a329842dc6c5b093eb30cc4f160 (commit)
      from  558dbeb599340556d0d9cb629624e53feebc9a70 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb1640ad737262b7197d544c012e62bcdcc17f56
commit eb1640ad737262b7197d544c012e62bcdcc17f56
Merge: 558dbeb 821e177
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 11:41:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 11:41:24 2015 -0400

    Merge topic 'FindOpenSSL-msvc-static-rt' into next
    
    821e1778 FindOpenSSL: Add support for static MSVC runtime


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=821e17785ecd4a329842dc6c5b093eb30cc4f160
commit 821e17785ecd4a329842dc6c5b093eb30cc4f160
Author:     Thijs Wenker <me at thoys.nl>
AuthorDate: Thu Oct 1 16:41:58 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 11:40:09 2015 -0400

    FindOpenSSL: Add support for static MSVC runtime
    
    Add an OPENSSL_MSVC_STATIC_RT option to switch from the default search
    for `/MD` libraries to look for `/MT` libraries instead.

diff --git a/Help/release/dev/FindOpenSSL-msvc-static-rt.rst b/Help/release/dev/FindOpenSSL-msvc-static-rt.rst
new file mode 100644
index 0000000..6e0ee27
--- /dev/null
+++ b/Help/release/dev/FindOpenSSL-msvc-static-rt.rst
@@ -0,0 +1,6 @@
+FindOpenSSL-msvc-static-rt
+--------------------------
+
+* The :module:`FindOpenSSL` module gained a new
+  ``OPENSSL_MSVC_STATIC_RT`` option to search for libraries using
+  the MSVC static runtime.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index d75e8ab..a0f4c52 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -37,6 +37,7 @@
 #
 # Set ``OPENSSL_ROOT_DIR`` to the root directory of an OpenSSL installation.
 # Set ``OPENSSL_USE_STATIC_LIBS`` to ``TRUE`` to look for static libraries.
+# Set ``OPENSSL_MSVC_STATIC_RT`` set ``TRUE`` to choose the MT version of the lib.
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
@@ -113,7 +114,7 @@ if(WIN32 AND NOT CYGWIN)
     # /MD and /MDd are the standard values - if someone wants to use
     # others, the libnames have to change here too
     # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
-    # TODO: handle /MT and static lib
+    # enable OPENSSL_MSVC_STATIC_RT to get the libs build /MT (Multithreaded no-DLL)
     # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
     #   * MD for dynamic-release
     #   * MDd for dynamic-debug
@@ -126,6 +127,12 @@ if(WIN32 AND NOT CYGWIN)
     # ssleay32MD.lib is identical to ../ssleay32.lib
     # enable OPENSSL_USE_STATIC_LIBS to use the static libs located in lib/VC/static
 
+    if (OPENSSL_MSVC_STATIC_RT)
+      set(_OPENSSL_MSVC_RT_MODE "MT")
+    else ()
+      set(_OPENSSL_MSVC_RT_MODE "MD")
+    endif ()
+
     if(OPENSSL_USE_STATIC_LIBS)
       set(_OPENSSL_PATH_SUFFIXES
         "lib"
@@ -142,7 +149,7 @@ if(WIN32 AND NOT CYGWIN)
 
     find_library(LIB_EAY_DEBUG
       NAMES
-        libeay32MDd
+        libeay32${_OPENSSL_MSVC_RT_MODE}d
         libeay32d
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
@@ -151,7 +158,7 @@ if(WIN32 AND NOT CYGWIN)
 
     find_library(LIB_EAY_RELEASE
       NAMES
-        libeay32MD
+        libeay32${_OPENSSL_MSVC_RT_MODE}
         libeay32
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
@@ -160,7 +167,7 @@ if(WIN32 AND NOT CYGWIN)
 
     find_library(SSL_EAY_DEBUG
       NAMES
-        ssleay32MDd
+        ssleay32${_OPENSSL_MSVC_RT_MODE}d
         ssleay32d
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
@@ -169,7 +176,7 @@ if(WIN32 AND NOT CYGWIN)
 
     find_library(SSL_EAY_RELEASE
       NAMES
-        ssleay32MD
+        ssleay32${_OPENSSL_MSVC_RT_MODE}
         ssleay32
         ssl
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindOpenSSL-msvc-static-rt.rst |    6 ++++++
 Modules/FindOpenSSL.cmake                       |   17 ++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 Help/release/dev/FindOpenSSL-msvc-static-rt.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 11:54:43 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 11:54:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1422-ga826581
Message-ID: <20151005155443.BC100BF8BD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a8265810e35ddfcb3d6fe8e979bcb2b810e5a885 (commit)
       via  d8119d08d9922c6428fce180a64d95b475f348ca (commit)
      from  eb1640ad737262b7197d544c012e62bcdcc17f56 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8265810e35ddfcb3d6fe8e979bcb2b810e5a885
commit a8265810e35ddfcb3d6fe8e979bcb2b810e5a885
Merge: eb1640a d8119d0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 11:54:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 11:54:43 2015 -0400

    Merge topic 'release-no-old-osx' into next
    
    d8119d08 Utilities/Release: Drop OS X ppc/i386 binary


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8119d08d9922c6428fce180a64d95b475f348ca
commit d8119d08d9922c6428fce180a64d95b475f348ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 11:53:14 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 11:54:18 2015 -0400

    Utilities/Release: Drop OS X ppc/i386 binary
    
    Users with OS X 10.5 or below can build from source or use an older
    CMake version.

diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 4cfa2ed..76057d1 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -7,8 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
 
 set(RELEASE_SCRIPTS_BATCH_1
   dash2win64_release.cmake    # Windows
-  dashmacmini2_release.cmake  # Mac Darwin universal ppc;i386
-  dashmacmini5_release.cmake  # Mac Darwin64 universal x86_64;i386
+  dashmacmini5_release.cmake  # OS X x86_64
   magrathea_release.cmake     # Linux
   linux64_release.cmake       # Linux x86_64
 )

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/create-cmake-release.cmake |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct  5 12:43:09 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  5 Oct 2015 12:43:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1425-ge72bb58
Message-ID: <20151005164309.8C323BD346@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e72bb585d8cb967d0471f3d5067cce0784054340 (commit)
       via  d945b36a93ab9f935c4e369d5c75be8b47d48f7a (commit)
       via  48f8b6acf3a8083b5a52bbe1ec3adc10c515d710 (commit)
      from  a8265810e35ddfcb3d6fe8e979bcb2b810e5a885 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e72bb585d8cb967d0471f3d5067cce0784054340
commit e72bb585d8cb967d0471f3d5067cce0784054340
Merge: a826581 d945b36
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 12:43:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 12:43:08 2015 -0400

    Merge topic 'cmGeneratorTarget-exports' into next
    
    d945b36a cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget.
    48f8b6ac cmExportFileGenerator: Evaluate genex with cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d945b36a93ab9f935c4e369d5c75be8b47d48f7a
commit d945b36a93ab9f935c4e369d5c75be8b47d48f7a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 01:08:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:42:27 2015 +0200

    cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget.

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index ba66531..026584c 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -76,8 +76,12 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
   dummyHead.SetType(cmTarget::EXECUTABLE, "try_compile_dummy_exe");
   dummyHead.SetMakefile(tgt->GetMakefile());
 
-  std::string result = cge->Evaluate(tgt->GetMakefile(), this->Config,
-                                     false, &dummyHead, tgt, &dagChecker);
+  cmGeneratorTarget* gtgt =
+      tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+
+  std::string result = cge->Evaluate(gtgt->Target->GetMakefile(), this->Config,
+                                     false, &dummyHead,
+                                     gtgt->Target, &dagChecker);
 
   const std::set<cmTarget const*> &allTargets = cge->GetAllTargetsSeen();
   for(std::set<cmTarget const*>::const_iterator li = allTargets.begin();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48f8b6acf3a8083b5a52bbe1ec3adc10c515d710
commit 48f8b6acf3a8083b5a52bbe1ec3adc10c515d710
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 01:07:03 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:42:27 2015 +0200

    cmExportFileGenerator: Evaluate genex with cmGeneratorTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 9a7d73f..881acee 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -436,7 +436,9 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  cmTarget *target = tei->Target;
+  cmGeneratorTarget *target = tei->Target->GetMakefile()
+                                 ->GetGlobalGenerator()
+                                 ->GetGeneratorTarget(tei->Target);
   assert(preprocessRule == cmGeneratorExpression::InstallInterface);
 
   const char *propName = "INTERFACE_INCLUDE_DIRECTORIES";
@@ -450,12 +452,12 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                             true);
   this->ReplaceInstallPrefix(dirs);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(dirs);
-  std::string exportDirs = cge->Evaluate(target->GetMakefile(), "",
-                                         false, target);
+  std::string exportDirs = cge->Evaluate(target->Target->GetMakefile(), "",
+                                         false, target->Target);
 
   if (cge->GetHadContextSensitiveCondition())
     {
-    cmMakefile* mf = target->GetMakefile();
+    cmMakefile* mf = target->Target->GetMakefile();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" is installed with "
     "INCLUDES DESTINATION set to a context sensitive path.  Paths which "
@@ -486,10 +488,10 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    if (!checkInterfaceDirs(prepro, target->Target, propName))
       {
       return;
       }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportFileGenerator.cxx           |   14 ++++++++------
 Source/cmExportTryCompileFileGenerator.cxx |    8 ++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct  5 12:43:51 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  5 Oct 2015 12:43:51 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1433-g8a2fb65
Message-ID: <20151005164351.345E9BD90D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8a2fb65090dd95053d3d5e24e645868530355636 (commit)
       via  616f03114eb41218dc3278e72b52d8de09e40365 (commit)
       via  9eea0486bfe5dfd497e6a8fca9e3c2551169c24e (commit)
       via  2eca0559881c36061f84ea4fcd955ac32d9d427a (commit)
       via  21f428f4c0adf7045e852be30739cd1243aa96fe (commit)
       via  a9588e90bbddbfe71b1d33d63d38eedaf397023f (commit)
       via  4407eee01365d89d370d8e8b89f3ec0a65420046 (commit)
       via  a09c545d3a518d771b66b59f92821af3d55d7d4b (commit)
      from  e72bb585d8cb967d0471f3d5067cce0784054340 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a2fb65090dd95053d3d5e24e645868530355636
commit 8a2fb65090dd95053d3d5e24e645868530355636
Merge: e72bb58 616f031
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 12:43:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 12:43:50 2015 -0400

    Merge topic 'refactor-computation' into next
    
    616f0311 cmGlobalGenerator: Move path computation to Compute.
    9eea0486 cmGlobalGenerator: Do more computation at compute time.
    2eca0559 cmGlobalGenerator: De-virtualize Compute().
    21f428f4 VisualStudio: Replace Compute override with AddExtraIDETargets override.
    a9588e90 VisualStudio10: Initialize the LongestSource at generate time.
    4407eee0 cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute().
    a09c545d Xcode: Extract a AddExtraIDETargets method.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=616f03114eb41218dc3278e72b52d8de09e40365
commit 616f03114eb41218dc3278e72b52d8de09e40365
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 09:22:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:43:18 2015 +0200

    cmGlobalGenerator: Move path computation to Compute.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index cae5466..3d073ca 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1305,26 +1305,24 @@ bool cmGlobalGenerator::Compute()
     return false;
     }
 
+  for (i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
+    }
+
   return true;
 }
 
 void cmGlobalGenerator::Generate()
 {
-  unsigned int i;
-
   // Create a map from local generator to the complete set of targets
   // it builds by default.
   this->InitializeProgressMarks();
 
   this->ProcessEvaluationFiles();
 
-  for (i = 0; i < this->LocalGenerators.size(); ++i)
-    {
-    this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
-    }
-
   // Generate project files
-  for (i = 0; i < this->LocalGenerators.size(); ++i)
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
     this->SetCurrentMakefile(this->LocalGenerators[i]->GetMakefile());
     this->LocalGenerators[i]->Generate();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9eea0486bfe5dfd497e6a8fca9e3c2551169c24e
commit 9eea0486bfe5dfd497e6a8fca9e3c2551169c24e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 09:21:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:43:18 2015 +0200

    cmGlobalGenerator: Do more computation at compute time.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 27f860e..cae5466 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1284,13 +1284,6 @@ bool cmGlobalGenerator::Compute()
 
   this->AddExtraIDETargets();
 
-  return true;
-}
-
-void cmGlobalGenerator::Generate()
-{
-  unsigned int i;
-
   // Trace the dependencies, after that no custom commands should be added
   // because their dependencies might not be handled correctly
   for (i = 0; i < this->LocalGenerators.size(); ++i)
@@ -1309,9 +1302,16 @@ void cmGlobalGenerator::Generate()
   // Compute the inter-target dependencies.
   if(!this->ComputeTargetDepends())
     {
-    return;
+    return false;
     }
 
+  return true;
+}
+
+void cmGlobalGenerator::Generate()
+{
+  unsigned int i;
+
   // Create a map from local generator to the complete set of targets
   // it builds by default.
   this->InitializeProgressMarks();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2eca0559881c36061f84ea4fcd955ac32d9d427a
commit 2eca0559881c36061f84ea4fcd955ac32d9d427a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 15 20:50:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:43:18 2015 +0200

    cmGlobalGenerator: De-virtualize Compute().
    
    It now implements the NVI pattern.

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index e73aac2..f233f1d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -83,7 +83,7 @@ public:
    */
   virtual void Configure();
 
-  virtual bool Compute();
+  bool Compute();
   virtual void AddExtraIDETargets() {}
 
   enum TargetTypes {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21f428f4c0adf7045e852be30739cd1243aa96fe
commit 21f428f4c0adf7045e852be30739cd1243aa96fe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 15 20:47:35 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:43:18 2015 +0200

    VisualStudio: Replace Compute override with AddExtraIDETargets override.

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 70c00e9..86a8f87 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -348,13 +348,9 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
 }
 
 //----------------------------------------------------------------------------
-bool cmGlobalVisualStudio8Generator::Compute()
+void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
 {
-  if (!cmGlobalVisualStudio7Generator::Compute())
-    {
-    return false;
-    }
-
+  cmGlobalVisualStudio7Generator::AddExtraIDETargets();
   if(this->AddCheckTarget())
     {
     // All targets depend on the build-system check target.
@@ -368,7 +364,6 @@ bool cmGlobalVisualStudio8Generator::Compute()
         }
       }
     }
-  return true;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index 1c61103..9d6c64f 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -67,7 +67,7 @@ public:
     return !this->WindowsCEVersion.empty(); }
 
 protected:
-  virtual bool Compute();
+  virtual void AddExtraIDETargets();
   virtual const char* GetIDEVersion() { return "8.0"; }
 
   virtual std::string FindDevEnvCommand();
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 7552d67..d45aa27 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -64,13 +64,8 @@ std::string cmGlobalVisualStudioGenerator::GetRegistryBase(
 }
 
 //----------------------------------------------------------------------------
-bool cmGlobalVisualStudioGenerator::Compute()
+void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
 {
-  if (!cmGlobalGenerator::Compute())
-    {
-    return false;
-    }
-
   // Add a special target that depends on ALL projects for easy build
   // of one configuration only.
   const char* no_working_dir = 0;
@@ -144,7 +139,6 @@ bool cmGlobalVisualStudioGenerator::Compute()
       static_cast<cmLocalVisualStudioGenerator*>(*lgi);
     lg->AddCMakeListsRules();
     }
-  return true;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index c940eb3..41d0b88 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -111,7 +111,7 @@ public:
     cmGeneratorTarget*, std::vector<cmCustomCommand>& commands,
     std::string const& configName);
 protected:
-  virtual bool Compute();
+  virtual void AddExtraIDETargets();
 
   // Does this VS version link targets to each other if there are
   // dependencies in the SLN file?  This was done for VS versions

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9588e90bbddbfe71b1d33d63d38eedaf397023f
commit a9588e90bbddbfe71b1d33d63d38eedaf397023f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 15 20:48:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:43:17 2015 +0200

    VisualStudio10: Initialize the LongestSource at generate time.
    
    There is no need to initialize it at compute time.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 59e8f8c..161b532 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -325,19 +325,9 @@ cmLocalGenerator* cmGlobalVisualStudio10Generator::CreateLocalGenerator(
   return new cmLocalVisualStudio10Generator(this, mf);
 }
 
-//----------------------------------------------------------------------------
-bool cmGlobalVisualStudio10Generator::Compute()
-{
-  if (!cmGlobalVisualStudio8Generator::Compute())
-    {
-    return false;
-    }
-  this->LongestSource = LongestSourcePath();
-  return true;
-}
-
 void cmGlobalVisualStudio10Generator::Generate()
 {
+  this->LongestSource = LongestSourcePath();
   this->cmGlobalVisualStudio8Generator::Generate();
   if(this->LongestSource.Length > 0)
     {
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index f4861dc..7600a0d 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -45,8 +45,6 @@ public:
     std::vector<std::string> const& makeOptions = std::vector<std::string>()
     );
 
-  virtual bool Compute();
-
   ///! create the correct local generator
   virtual cmLocalGenerator *CreateLocalGenerator(cmMakefile* mf);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4407eee01365d89d370d8e8b89f3ec0a65420046
commit 4407eee01365d89d370d8e8b89f3ec0a65420046
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 15 20:37:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:43:17 2015 +0200

    cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute().
    
    Relieve the Xcode generator of having to reimplement Compute().

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 4a48b5d..27f860e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1282,6 +1282,8 @@ bool cmGlobalGenerator::Compute()
       }
     }
 
+  this->AddExtraIDETargets();
+
   return true;
 }
 
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ba74c9e..e73aac2 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -84,6 +84,7 @@ public:
   virtual void Configure();
 
   virtual bool Compute();
+  virtual void AddExtraIDETargets() {}
 
   enum TargetTypes {
     AllTargets,
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index e209b64..746e1a7 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -376,17 +376,6 @@ cmGlobalXCodeGenerator::CreateLocalGenerator(cmMakefile* mf)
   return new cmLocalXCodeGenerator(this, mf);
 }
 
-//----------------------------------------------------------------------------
-bool cmGlobalXCodeGenerator::Compute()
-{
-  if (!cmGlobalGenerator::Compute())
-    {
-      return false;
-    }
-  this->AddExtraIDETargets();
-  return true;
-}
-
 void cmGlobalXCodeGenerator::AddExtraIDETargets()
 {
   std::map<std::string, std::vector<cmLocalGenerator*> >::iterator it;
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 413a7bc..9daf0ab 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -87,8 +87,7 @@ public:
   virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
   void AppendFlag(std::string& flags, std::string const& flag);
 protected:
-  virtual bool Compute();
-  void AddExtraIDETargets();
+  virtual void AddExtraIDETargets();
   virtual void Generate();
 private:
   cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a09c545d3a518d771b66b59f92821af3d55d7d4b
commit a09c545d3a518d771b66b59f92821af3d55d7d4b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 15 20:36:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:43:17 2015 +0200

    Xcode: Extract a AddExtraIDETargets method.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 33babec..e209b64 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -383,7 +383,12 @@ bool cmGlobalXCodeGenerator::Compute()
     {
       return false;
     }
+  this->AddExtraIDETargets();
+  return true;
+}
 
+void cmGlobalXCodeGenerator::AddExtraIDETargets()
+{
   std::map<std::string, std::vector<cmLocalGenerator*> >::iterator it;
   // make sure extra targets are added before calling
   // the parent generate which will call trace depends
@@ -394,7 +399,6 @@ bool cmGlobalXCodeGenerator::Compute()
     // add ALL_BUILD, INSTALL, etc
     this->AddExtraTargets(root, it->second);
     }
-  return true;
 }
 
 void cmGlobalXCodeGenerator::Generate()
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 102c036..413a7bc 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -88,6 +88,7 @@ public:
   void AppendFlag(std::string& flags, std::string const& flag);
 protected:
   virtual bool Compute();
+  void AddExtraIDETargets();
   virtual void Generate();
 private:
   cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget,

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx               |   26 +++++++++++++-------------
 Source/cmGlobalGenerator.h                 |    3 ++-
 Source/cmGlobalVisualStudio10Generator.cxx |   12 +-----------
 Source/cmGlobalVisualStudio10Generator.h   |    2 --
 Source/cmGlobalVisualStudio8Generator.cxx  |    9 ++-------
 Source/cmGlobalVisualStudio8Generator.h    |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |    8 +-------
 Source/cmGlobalVisualStudioGenerator.h     |    2 +-
 Source/cmGlobalXCodeGenerator.cxx          |    9 +--------
 Source/cmGlobalXCodeGenerator.h            |    2 +-
 10 files changed, 23 insertions(+), 52 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 13:08:55 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 13:08:55 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1437-gbf024a7
Message-ID: <20151005170855.41D67BFBD5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  bf024a798e96a2cf2dcae8b704258b162588e243 (commit)
       via  a5041efeed15f3c389909d4fa748b8f1bcaf24d7 (commit)
       via  4f2ccc7ce37df18d0ac15cfec8030df6ade95b04 (commit)
       via  abb935f986e1de5f836f2220572d47cddb54ce6d (commit)
      from  8a2fb65090dd95053d3d5e24e645868530355636 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf024a798e96a2cf2dcae8b704258b162588e243
commit bf024a798e96a2cf2dcae8b704258b162588e243
Merge: 8a2fb65 a5041ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:08:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 13:08:54 2015 -0400

    Merge topic 'release-no-old-osx' into next
    
    a5041efe Tests: Rename OS X nightly release binary test
    4f2ccc7c Utilities/Release: Drop unused OS X ppc/i386 release script
    abb935f9 Tests: Drop nightly OS X ppc/i386 binary


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5041efeed15f3c389909d4fa748b8f1bcaf24d7
commit a5041efeed15f3c389909d4fa748b8f1bcaf24d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:07:55 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:07:55 2015 -0400

    Tests: Rename OS X nightly release binary test
    
    The Mac64 build is now the primary and only OS X build, so just name it
    "OSX".

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 46a1243..1861d82 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -687,7 +687,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   if(CMAKE_BUILD_NIGHTLY_RELEASES)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
       dash2win64_release.cmake)
-    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac64
+    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
       dashmacmini5_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux
       magrathea_release.cmake)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f2ccc7ce37df18d0ac15cfec8030df6ade95b04
commit 4f2ccc7ce37df18d0ac15cfec8030df6ade95b04
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:07:32 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:07:32 2015 -0400

    Utilities/Release: Drop unused OS X ppc/i386 release script

diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
deleted file mode 100644
index cd4c5a1..0000000
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(PROCESSORS 2)
-set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
-set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc  <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>  -shared-libgcc -lstdc++-static\\\")")
-set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
-set(HOST dashmacmini2)
-set(MAKE_PROGRAM "make")
-set(MAKE "${MAKE_PROGRAM} -j2")
-set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
-set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size
-set(INITIAL_CACHE "
-CMAKE_BUILD_TYPE:STRING=Release
-CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
-CMAKE_USE_OPENSSL:BOOL=ON
-OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
-OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include
-OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a
-CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
-CPACK_SYSTEM_NAME:STRING=Darwin-universal
-BUILD_QtDialog:BOOL=TRUE
-CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
-CMake_INSTALL_DEPENDENCIES:BOOL=ON
-QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.0/install/bin/qmake
-")
-get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
-include(${path}/release_cmake.cmake)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abb935f986e1de5f836f2220572d47cddb54ce6d
commit abb935f986e1de5f836f2220572d47cddb54ce6d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:06:15 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:06:38 2015 -0400

    Tests: Drop nightly OS X ppc/i386 binary
    
    Users with OS X 10.5 or below can build from source or use an older
    CMake version.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c82cb68..46a1243 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -687,8 +687,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   if(CMAKE_BUILD_NIGHTLY_RELEASES)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
       dash2win64_release.cmake)
-    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac
-      dashmacmini2_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac64
       dashmacmini5_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt                         |    4 +---
 Utilities/Release/dashmacmini2_release.cmake |   25 -------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 Utilities/Release/dashmacmini2_release.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct  5 13:09:50 2015
From: brad.king at kitware.com (Brad King)
Date: Mon,  5 Oct 2015 13:09:50 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1441-ga6f88ed
Message-ID: <20151005170950.DB569BC02C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a6f88ed63fd27070a98b52582ab582374824bf30 (commit)
       via  992c43d2ed0bdede5d9d0389c51b8e28bb22cd96 (commit)
       via  45fa326b6ccceae1858ef3f30c11341c8b397d73 (commit)
       via  9cbab63ee143662a94fa050b95d02e9f14342907 (commit)
      from  bf024a798e96a2cf2dcae8b704258b162588e243 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6f88ed63fd27070a98b52582ab582374824bf30
commit a6f88ed63fd27070a98b52582ab582374824bf30
Merge: bf024a7 992c43d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:09:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 13:09:50 2015 -0400

    Merge topic 'release-no-old-osx' into next
    
    992c43d2 Tests: Rename OS X nightly release binary test
    45fa326b Utilities/Release: Drop OS X ppc/i386 binary
    9cbab63e Tests: Drop nightly OS X ppc/i386 binary


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=992c43d2ed0bdede5d9d0389c51b8e28bb22cd96
commit 992c43d2ed0bdede5d9d0389c51b8e28bb22cd96
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:07:55 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:09:36 2015 -0400

    Tests: Rename OS X nightly release binary test
    
    The "Mac64" build is now the primary and only OS X build, so just name
    it "OSX".

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 46a1243..1861d82 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -687,7 +687,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   if(CMAKE_BUILD_NIGHTLY_RELEASES)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
       dash2win64_release.cmake)
-    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac64
+    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
       dashmacmini5_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux
       magrathea_release.cmake)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45fa326b6ccceae1858ef3f30c11341c8b397d73
commit 45fa326b6ccceae1858ef3f30c11341c8b397d73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 11:53:14 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:09:04 2015 -0400

    Utilities/Release: Drop OS X ppc/i386 binary
    
    Users with OS X 10.5 or below can build from source or use an older
    CMake version.

diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 4cfa2ed..76057d1 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -7,8 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
 
 set(RELEASE_SCRIPTS_BATCH_1
   dash2win64_release.cmake    # Windows
-  dashmacmini2_release.cmake  # Mac Darwin universal ppc;i386
-  dashmacmini5_release.cmake  # Mac Darwin64 universal x86_64;i386
+  dashmacmini5_release.cmake  # OS X x86_64
   magrathea_release.cmake     # Linux
   linux64_release.cmake       # Linux x86_64
 )
diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
deleted file mode 100644
index cd4c5a1..0000000
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-set(PROCESSORS 2)
-set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
-set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc  <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>  -shared-libgcc -lstdc++-static\\\")")
-set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
-set(HOST dashmacmini2)
-set(MAKE_PROGRAM "make")
-set(MAKE "${MAKE_PROGRAM} -j2")
-set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
-set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size
-set(INITIAL_CACHE "
-CMAKE_BUILD_TYPE:STRING=Release
-CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
-CMAKE_USE_OPENSSL:BOOL=ON
-OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
-OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include
-OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a
-CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
-CPACK_SYSTEM_NAME:STRING=Darwin-universal
-BUILD_QtDialog:BOOL=TRUE
-CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
-CMake_INSTALL_DEPENDENCIES:BOOL=ON
-QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.0/install/bin/qmake
-")
-get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
-include(${path}/release_cmake.cmake)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cbab63ee143662a94fa050b95d02e9f14342907
commit 9cbab63ee143662a94fa050b95d02e9f14342907
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 13:06:15 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 13:09:04 2015 -0400

    Tests: Drop nightly OS X ppc/i386 binary
    
    Users with OS X 10.5 or below can build from source or use an older
    CMake version.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c82cb68..46a1243 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -687,8 +687,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   if(CMAKE_BUILD_NIGHTLY_RELEASES)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
       dash2win64_release.cmake)
-    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac
-      dashmacmini2_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac64
       dashmacmini5_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct  5 13:22:21 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  5 Oct 2015 13:22:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1455-g963efb9
Message-ID: <20151005172221.B32C0BF753@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  963efb9ec9970f7107face767083dc90adcec60c (commit)
       via  a2b981ed9bedfddd39186d13832cbfc4534617c9 (commit)
       via  f7738fd122ac38fb3785e6366193fe5095b23b88 (commit)
       via  b2054e1661e5c607cf25e1ac127982f58e29dd44 (commit)
       via  1e757c318b38566aea1c9312a6fb5a3accd3966b (commit)
       via  5fb730174dc5e0c07dfc7aec27e3d6e60c79e3d3 (commit)
       via  86f7fc5d55da5cf569c516f2d1fb8b69603c1be2 (commit)
       via  2aa3f500c49e6c81f4d4b821d6ae71ef2589cb07 (commit)
       via  59b91107d16c2f2ba68791ae67c53bdcc0d32e05 (commit)
       via  7254f6452596f438f0607ece559be7ad556b190a (commit)
       via  975b753997849507684da7d529d1bbe0ffd3ade9 (commit)
       via  f75ec6044c593d0ff042e13b940d2c674910b683 (commit)
       via  f3158e45b8fde882603e1d9b2262a5c64e25c1ee (commit)
       via  493b17f8c7fb171fd7ca36cc0b29257939609298 (commit)
      from  a6f88ed63fd27070a98b52582ab582374824bf30 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=963efb9ec9970f7107face767083dc90adcec60c
commit 963efb9ec9970f7107face767083dc90adcec60c
Merge: a6f88ed a2b981e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 13:22:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 13:22:20 2015 -0400

    Merge topic 'refactor-qt-autogen' into next
    
    a2b981ed QtAutogen: Port API to cmGeneratorTarget.
    f7738fd1 cmLocalGenerator: Constify target in API.
    b2054e16 QtAutogen: Port global generator to cmGeneratorTarget.
    1e757c31 QtAutogen: Use a target type between loops.
    5fb73017 QtAutogen: Make some private statics file static.
    86f7fc5d QtAutogen: Move SetupAutoRccTarget method.
    2aa3f500 QtAutogen: Move MergeRccOptions method.
    59b91107 QtAutogen: Move GetRccExecutable method.
    7254f645 QtAutogen: Move SetupAutoUicTarget method.
    975b7539 QtAutogen: Move GetUicOpts method.
    f75ec604 QtAutogen: Move SetupAutoMocTarget method.
    f3158e45 QtAutogen: Move GetCompileDefinitionsAndDirectories method.
    493b17f8 QtAutogen: Move SetupSourceFiles method.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2b981ed9bedfddd39186d13832cbfc4534617c9
commit a2b981ed9bedfddd39186d13832cbfc4534617c9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 19:21:30 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 19:22:02 2015 +0200

    QtAutogen: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 21ada71..309884f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1267,7 +1267,7 @@ bool cmGlobalGenerator::Compute()
   for (std::vector<cmGeneratorTarget const*>::iterator it =
        autogenTargets.begin(); it != autogenTargets.end(); ++it)
     {
-    cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget((*it)->Target);
+    cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(*it);
     }
 #endif
 
@@ -1451,15 +1451,14 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
 
       cmGeneratorTarget* gt = this->GetGeneratorTarget(&ti->second);
 
-      cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt->Target);
+      cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt);
       filteredTargets.push_back(gt);
       }
     for(std::vector<cmGeneratorTarget*>::iterator ti = filteredTargets.begin();
         ti != filteredTargets.end(); ++ti)
       {
-      cmTarget* target = (*ti)->Target;
       cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
-           this->LocalGenerators[i], target);
+           this->LocalGenerators[i], *ti);
       autogenTargets.push_back(*ti);
       }
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index fe888b7..d988665 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -25,19 +25,16 @@
 # include "cmGlobalVisualStudioGenerator.h"
 #endif
 
-static void SetupSourceFiles(cmTarget const* target,
+static void SetupSourceFiles(cmGeneratorTarget const* target,
                                    std::vector<std::string>& skipMoc,
                                    std::vector<std::string>& mocSources,
                                    std::vector<std::string>& mocHeaders,
                                    std::vector<std::string>& skipUic)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   std::vector<cmSourceFile*> srcFiles;
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  gtgt->GetConfigCommonSourceFiles(srcFiles);
+  target->GetConfigCommonSourceFiles(srcFiles);
 
   std::vector<std::string> newRccFiles;
 
@@ -67,7 +64,7 @@ static void SetupSourceFiles(cmTarget const* target,
         std::string basename = cmsys::SystemTools::
                                       GetFilenameWithoutLastExtension(absFile);
 
-        std::string rcc_output_dir = target->GetSupportDirectory();
+        std::string rcc_output_dir = target->Target->GetSupportDirectory();
         cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -104,40 +101,37 @@ static void SetupSourceFiles(cmTarget const* target,
       fileIt != newRccFiles.end();
       ++fileIt)
     {
-    const_cast<cmTarget*>(target)->AddSource(*fileIt);
+    const_cast<cmTarget*>(target->Target)->AddSource(*fileIt);
     }
 }
 
-static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
+static void GetCompileDefinitionsAndDirectories(cmGeneratorTarget const* target,
                                                 const std::string& config,
                                                 std::string &incs,
                                                 std::string &defs)
 {
-  cmMakefile* makefile = target->GetMakefile();
-  cmGlobalGenerator* globalGen = makefile->GetGlobalGenerator();
   std::vector<std::string> includeDirs;
-  cmGeneratorTarget *gtgt = globalGen->GetGeneratorTarget(target);
-  cmLocalGenerator *localGen = gtgt->GetLocalGenerator();
+  cmLocalGenerator *localGen = target->GetLocalGenerator();
   // Get the include dirs for this target, without stripping the implicit
   // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
-  localGen->GetIncludeDirectories(includeDirs, gtgt, "CXX", config, false);
+  localGen->GetIncludeDirectories(includeDirs, target, "CXX", config, false);
 
   incs = cmJoin(includeDirs, ";");
 
   std::set<std::string> defines;
-  localGen->AddCompileDefinitions(defines, target, config, "CXX");
+  localGen->AddCompileDefinitions(defines, target->Target, config, "CXX");
 
   defs += cmJoin(defines, ";");
 }
 
-static void SetupAutoMocTarget(cmTarget const* target,
+static void SetupAutoMocTarget(cmGeneratorTarget const* target,
                           const std::string &autogenTargetName,
                           std::vector<std::string> const& skipMoc,
                           std::vector<std::string> const& mocHeaders,
                           std::map<std::string, std::string> &configIncludes,
                           std::map<std::string, std::string> &configDefines)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   const char* tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
   std::string _moc_options = (tmp!=0 ? tmp : "");
@@ -222,22 +216,20 @@ static void SetupAutoMocTarget(cmTarget const* target,
     }
 }
 
-static void GetUicOpts(cmTarget const* target, const std::string& config,
+static void GetUicOpts(cmGeneratorTarget const* target,
+                       const std::string& config,
                        std::string &optString)
 {
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
   std::vector<std::string> opts;
-  gtgt->GetAutoUicOptions(opts, config);
+  target->GetAutoUicOptions(opts, config);
   optString = cmJoin(opts, ";");
 }
 
-static void SetupAutoUicTarget(cmTarget const* target,
+static void SetupAutoUicTarget(cmGeneratorTarget const* target,
                           std::vector<std::string> const& skipUic,
                           std::map<std::string, std::string> &configUicOptions)
 {
-  cmMakefile *makefile = target->GetMakefile();
+  cmMakefile *makefile = target->Target->GetMakefile();
 
   std::set<std::string> skipped;
   skipped.insert(skipUic.begin(), skipUic.end());
@@ -340,12 +332,9 @@ static void SetupAutoUicTarget(cmTarget const* target,
     }
 }
 
-static std::string GetRccExecutable(cmTarget const* target)
+static std::string GetRccExecutable(cmGeneratorTarget const* target)
 {
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  cmMakefile *makefile = target->GetMakefile();
+  cmMakefile *makefile = target->Target->GetMakefile();
   const char *qtVersion = makefile->GetDefinition("_target_qt_version");
   if (!qtVersion)
     {
@@ -355,7 +344,8 @@ static std::string GetRccExecutable(cmTarget const* target)
       qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
       }
     if (const char *targetQtVersion =
-        gtgt->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
+        target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION",
+                                                        ""))
       {
       qtVersion = targetQtVersion;
       }
@@ -434,7 +424,7 @@ static void MergeRccOptions(std::vector<std::string> &opts,
 }
 
 std::string GetAutogenTargetName(
-    cmTarget const* target)
+    cmGeneratorTarget const* target)
 {
   std::string autogenTargetName = target->GetName();
   autogenTargetName += "_automoc";
@@ -442,9 +432,9 @@ std::string GetAutogenTargetName(
 }
 
 std::string GetAutogenTargetDir(
-    cmTarget const* target)
+    cmGeneratorTarget const* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
   std::string targetDir = makefile->GetCurrentBinaryDirectory();
   targetDir += makefile->GetCMakeInstance()->GetCMakeFilesDirectory();
   targetDir += "/";
@@ -485,7 +475,7 @@ static std::string ReadAll(const std::string& filename)
 }
 
 static std::string ListQt5RccInputs(cmSourceFile* sf,
-                                            cmTarget const* target,
+                                            cmGeneratorTarget const* target,
                                             std::vector<std::string>& depends)
 {
   std::string rccCommand
@@ -591,17 +581,14 @@ static std::string ListQt4RccInputs(cmSourceFile* sf,
   return entriesList;
 }
 
-static void SetupAutoRccTarget(cmTarget const* target)
+static void SetupAutoRccTarget(cmGeneratorTarget const* target)
 {
   std::string _rcc_files;
   const char* sepRccFiles = "";
-  cmMakefile *makefile = target->GetMakefile();
+  cmMakefile *makefile = target->Target->GetMakefile();
 
   std::vector<cmSourceFile*> srcFiles;
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  gtgt->GetConfigCommonSourceFiles(srcFiles);
+  target->GetConfigCommonSourceFiles(srcFiles);
 
   std::string qrcInputs;
   const char* qrcInputsSep = "";
@@ -705,9 +692,10 @@ static void SetupAutoRccTarget(cmTarget const* target)
               GetRccExecutable(target).c_str());
 }
 
-void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
+void cmQtAutoGeneratorInitializer::InitializeAutogenSources(
+    cmGeneratorTarget* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   if (target->GetPropertyAsBool("AUTOMOC"))
     {
@@ -720,15 +708,15 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
     makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
                             mocCppFile.c_str(), false);
 
-    target->AddSource(mocCppFile);
+    target->Target->AddSource(mocCppFile);
     }
 }
 
 void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                                  cmLocalGenerator* lg,
-                                                 cmTarget* target)
+                                                 cmGeneratorTarget* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
   if (qtMajorVersion == "")
@@ -825,9 +813,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
         )
     {
     std::vector<cmSourceFile*> srcFiles;
-    cmGeneratorTarget* gtgt =
-        lg->GetGlobalGenerator()->GetGeneratorTarget(target);
-    gtgt->GetConfigCommonSourceFiles(srcFiles);
+    target->GetConfigCommonSourceFiles(srcFiles);
     for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
         fileIt != srcFiles.end();
         ++fileIt)
@@ -846,7 +832,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           std::string basename = cmsys::SystemTools::
                                   GetFilenameWithoutLastExtension(absFile);
 
-          std::string rcc_output_dir = target->GetSupportDirectory();
+          std::string rcc_output_dir = target->Target->GetSupportDirectory();
           cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
           std::string rcc_output_file = rcc_output_dir;
           rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -916,17 +902,17 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
     else
       {
       // inherit FOLDER property from target (#13688)
-      copyTargetProperty(autogenTarget, target, "FOLDER");
+      copyTargetProperty(gt->Target, target->Target, "FOLDER");
       }
 
-    target->AddUtility(autogenTargetName);
+    target->Target->AddUtility(autogenTargetName);
     }
 }
 
 void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
-    cmTarget const* target)
+    cmGeneratorTarget const* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   // forget the variables added here afterwards again:
   cmMakefile::ScopePushPop varScope(makefile);
@@ -947,11 +933,8 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     {
     qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
     }
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
   if (const char *targetQtVersion =
-      gtgt->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
+      target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
     {
     qtVersion = targetQtVersion;
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.h b/Source/cmQtAutoGeneratorInitializer.h
index ad5c85c..eaf140d 100644
--- a/Source/cmQtAutoGeneratorInitializer.h
+++ b/Source/cmQtAutoGeneratorInitializer.h
@@ -21,15 +21,16 @@
 #include <map>
 
 class cmSourceFile;
-class cmTarget;
+class cmGeneratorTarget;
 class cmLocalGenerator;
 
 class cmQtAutoGeneratorInitializer
 {
 public:
-  static void InitializeAutogenSources(cmTarget* target);
-  static void InitializeAutogenTarget(cmLocalGenerator* lg, cmTarget* target);
-  static void SetupAutoGenerateTarget(cmTarget const* target);
+  static void InitializeAutogenSources(cmGeneratorTarget* target);
+  static void InitializeAutogenTarget(cmLocalGenerator* lg,
+                                      cmGeneratorTarget* target);
+  static void SetupAutoGenerateTarget(cmGeneratorTarget const* target);
 };
 
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7738fd122ac38fb3785e6366193fe5095b23b88
commit f7738fd122ac38fb3785e6366193fe5095b23b88
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 19:15:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 19:22:02 2015 +0200

    cmLocalGenerator: Constify target in API.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3230403..b26151c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1180,7 +1180,7 @@ void cmLocalGenerator::AddCompileOptions(
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
-                                             cmGeneratorTarget* target,
+                                             cmGeneratorTarget const* target,
                                              const std::string& lang,
                                              const std::string& config,
                                              bool stripImplicitInclDirs
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 6ea414a..33fede1 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -171,7 +171,7 @@ public:
 
   /** Get the include flags for the current makefile and language.  */
   void GetIncludeDirectories(std::vector<std::string>& dirs,
-                             cmGeneratorTarget* target,
+                             cmGeneratorTarget const* target,
                              const std::string& lang = "C",
                              const std::string& config = "",
                              bool stripImplicitInclDirs = true) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2054e1661e5c607cf25e1ac127982f58e29dd44
commit b2054e1661e5c607cf25e1ac127982f58e29dd44
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 19:21:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 19:21:59 2015 +0200

    QtAutogen: Port global generator to cmGeneratorTarget.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 53c859d..21ada71 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1251,7 +1251,7 @@ bool cmGlobalGenerator::Compute()
 #ifdef CMAKE_BUILD_WITH_CMAKE
   // Iterate through all targets and set up automoc for those which have
   // the AUTOMOC, AUTOUIC or AUTORCC property set
-  std::vector<cmTarget const*> autogenTargets =
+  std::vector<cmGeneratorTarget const*> autogenTargets =
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
@@ -1264,10 +1264,10 @@ bool cmGlobalGenerator::Compute()
     }
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
-  for (std::vector<cmTarget const*>::iterator it = autogenTargets.begin();
-       it != autogenTargets.end(); ++it)
+  for (std::vector<cmGeneratorTarget const*>::iterator it =
+       autogenTargets.begin(); it != autogenTargets.end(); ++it)
     {
-    cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(*it);
+    cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget((*it)->Target);
     }
 #endif
 
@@ -1403,17 +1403,17 @@ bool cmGlobalGenerator::ComputeTargetDepends()
 }
 
 //----------------------------------------------------------------------------
-std::vector<const cmTarget*>
+std::vector<const cmGeneratorTarget*>
 cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
 {
-  std::vector<const cmTarget*> autogenTargets;
+  std::vector<const cmGeneratorTarget*> autogenTargets;
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
     cmTargets& targets =
       this->LocalGenerators[i]->GetMakefile()->GetTargets();
-    std::vector<cmTarget*> filteredTargets;
+    std::vector<cmGeneratorTarget*> filteredTargets;
     filteredTargets.reserve(targets.size());
     for(cmTargets::iterator ti = targets.begin();
         ti != targets.end(); ++ti)
@@ -1449,16 +1449,18 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
         continue;
         }
 
-      cmQtAutoGeneratorInitializer::InitializeAutogenSources(&ti->second);
-      filteredTargets.push_back(&ti->second);
+      cmGeneratorTarget* gt = this->GetGeneratorTarget(&ti->second);
+
+      cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt->Target);
+      filteredTargets.push_back(gt);
       }
-    for(std::vector<cmTarget*>::iterator ti = filteredTargets.begin();
+    for(std::vector<cmGeneratorTarget*>::iterator ti = filteredTargets.begin();
         ti != filteredTargets.end(); ++ti)
       {
-      cmTarget* target = *ti;
+      cmTarget* target = (*ti)->Target;
       cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
            this->LocalGenerators[i], target);
-      autogenTargets.push_back(target);
+      autogenTargets.push_back(*ti);
       }
     }
 #endif
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ba74c9e..25e06cd 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -384,7 +384,7 @@ protected:
 
   virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const;
 
-  std::vector<cmTarget const*> CreateQtAutoGeneratorsTargets();
+  std::vector<const cmGeneratorTarget*> CreateQtAutoGeneratorsTargets();
 
   std::string SelectMakeProgram(const std::string& makeProgram,
                                 const std::string& makeDefault = "") const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e757c318b38566aea1c9312a6fb5a3accd3966b
commit 1e757c318b38566aea1c9312a6fb5a3accd3966b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 19:21:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 19:21:56 2015 +0200

    QtAutogen: Use a target type between loops.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 4a48b5d..53c859d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1413,8 +1413,8 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
     {
     cmTargets& targets =
       this->LocalGenerators[i]->GetMakefile()->GetTargets();
-    std::vector<std::string> targetNames;
-    targetNames.reserve(targets.size());
+    std::vector<cmTarget*> filteredTargets;
+    filteredTargets.reserve(targets.size());
     for(cmTargets::iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
@@ -1450,13 +1450,12 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
         }
 
       cmQtAutoGeneratorInitializer::InitializeAutogenSources(&ti->second);
-      targetNames.push_back(ti->second.GetName());
+      filteredTargets.push_back(&ti->second);
       }
-    for(std::vector<std::string>::iterator ti = targetNames.begin();
-        ti != targetNames.end(); ++ti)
+    for(std::vector<cmTarget*>::iterator ti = filteredTargets.begin();
+        ti != filteredTargets.end(); ++ti)
       {
-      cmTarget* target = this->LocalGenerators[i]
-                              ->GetMakefile()->FindTarget(*ti, true);
+      cmTarget* target = *ti;
       cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
            this->LocalGenerators[i], target);
       autogenTargets.push_back(target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fb730174dc5e0c07dfc7aec27e3d6e60c79e3d3
commit 5fb730174dc5e0c07dfc7aec27e3d6e60c79e3d3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 19:21:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 19:21:48 2015 +0200

    QtAutogen: Make some private statics file static.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index a2a72d4..fe888b7 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -25,7 +25,7 @@
 # include "cmGlobalVisualStudioGenerator.h"
 #endif
 
-void cmQtAutoGeneratorInitializer::SetupSourceFiles(cmTarget const* target,
+static void SetupSourceFiles(cmTarget const* target,
                                    std::vector<std::string>& skipMoc,
                                    std::vector<std::string>& mocSources,
                                    std::vector<std::string>& mocHeaders,
@@ -130,7 +130,7 @@ static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
   defs += cmJoin(defines, ";");
 }
 
-void cmQtAutoGeneratorInitializer::SetupAutoMocTarget(cmTarget const* target,
+static void SetupAutoMocTarget(cmTarget const* target,
                           const std::string &autogenTargetName,
                           std::vector<std::string> const& skipMoc,
                           std::vector<std::string> const& mocHeaders,
@@ -233,7 +233,7 @@ static void GetUicOpts(cmTarget const* target, const std::string& config,
   optString = cmJoin(opts, ";");
 }
 
-void cmQtAutoGeneratorInitializer::SetupAutoUicTarget(cmTarget const* target,
+static void SetupAutoUicTarget(cmTarget const* target,
                           std::vector<std::string> const& skipUic,
                           std::map<std::string, std::string> &configUicOptions)
 {
@@ -340,8 +340,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoUicTarget(cmTarget const* target,
     }
 }
 
-std::string cmQtAutoGeneratorInitializer::GetRccExecutable(
-    cmTarget const* target)
+static std::string GetRccExecutable(cmTarget const* target)
 {
   cmGeneratorTarget *gtgt = target->GetMakefile()
                                   ->GetGlobalGenerator()
@@ -391,8 +390,7 @@ std::string cmQtAutoGeneratorInitializer::GetRccExecutable(
   return std::string();
 }
 
-void cmQtAutoGeneratorInitializer::MergeRccOptions(
-                         std::vector<std::string> &opts,
+static void MergeRccOptions(std::vector<std::string> &opts,
                          const std::vector<std::string> &fileOpts,
                          bool isQt5)
 {
@@ -435,7 +433,7 @@ void cmQtAutoGeneratorInitializer::MergeRccOptions(
   opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
 }
 
-std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
+std::string GetAutogenTargetName(
     cmTarget const* target)
 {
   std::string autogenTargetName = target->GetName();
@@ -443,14 +441,14 @@ std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
   return autogenTargetName;
 }
 
-std::string cmQtAutoGeneratorInitializer::GetAutogenTargetDir(
+std::string GetAutogenTargetDir(
     cmTarget const* target)
 {
   cmMakefile* makefile = target->GetMakefile();
   std::string targetDir = makefile->GetCurrentBinaryDirectory();
   targetDir += makefile->GetCMakeInstance()->GetCMakeFilesDirectory();
   targetDir += "/";
-  targetDir += cmQtAutoGeneratorInitializer::GetAutogenTargetName(target);
+  targetDir += GetAutogenTargetName(target);
   targetDir += ".dir/";
   return targetDir;
 }
@@ -486,12 +484,12 @@ static std::string ReadAll(const std::string& filename)
   return stream.str();
 }
 
-std::string cmQtAutoGeneratorInitializer::ListQt5RccInputs(cmSourceFile* sf,
+static std::string ListQt5RccInputs(cmSourceFile* sf,
                                             cmTarget const* target,
                                             std::vector<std::string>& depends)
 {
   std::string rccCommand
-      = cmQtAutoGeneratorInitializer::GetRccExecutable(target);
+      = GetRccExecutable(target);
   std::vector<std::string> qrcEntries;
 
   std::vector<std::string> command;
@@ -557,7 +555,7 @@ std::string cmQtAutoGeneratorInitializer::ListQt5RccInputs(cmSourceFile* sf,
   return cmJoin(qrcEntries, "@list_sep@");
 }
 
-std::string cmQtAutoGeneratorInitializer::ListQt4RccInputs(cmSourceFile* sf,
+static std::string ListQt4RccInputs(cmSourceFile* sf,
                                             std::vector<std::string>& depends)
 {
   const std::string qrcContents = ReadAll(sf->GetFullPath());
@@ -593,7 +591,7 @@ std::string cmQtAutoGeneratorInitializer::ListQt4RccInputs(cmSourceFile* sf,
   return entriesList;
 }
 
-void cmQtAutoGeneratorInitializer::SetupAutoRccTarget(cmTarget const* target)
+static void SetupAutoRccTarget(cmTarget const* target)
 {
   std::string _rcc_files;
   const char* sepRccFiles = "";
@@ -647,7 +645,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoRccTarget(cmTarget const* target)
           {
           std::vector<std::string> optsVec;
           cmSystemTools::ExpandListArgument(prop, optsVec);
-          cmQtAutoGeneratorInitializer::MergeRccOptions(rccOptions, optsVec,
+          MergeRccOptions(rccOptions, optsVec,
                                 strcmp(qtVersion, "5") == 0);
           }
 
@@ -675,14 +673,11 @@ void cmQtAutoGeneratorInitializer::SetupAutoRccTarget(cmTarget const* target)
           {
           if (qtMajorVersion == "5")
             {
-            entriesList = cmQtAutoGeneratorInitializer::ListQt5RccInputs(sf,
-                                                               target,
-                                                               depends);
+            entriesList = ListQt5RccInputs(sf, target, depends);
             }
           else
             {
-            entriesList =
-                cmQtAutoGeneratorInitializer::ListQt4RccInputs(sf, depends);
+            entriesList = ListQt4RccInputs(sf, depends);
             }
           if (entriesList.empty())
             {
@@ -707,7 +702,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoRccTarget(cmTarget const* target)
             cmOutputConverter::EscapeForCMake(rccFileOptions).c_str());
 
   makefile->AddDefinition("_qt_rcc_executable",
-              cmQtAutoGeneratorInitializer::GetRccExecutable(target).c_str());
+              GetRccExecutable(target).c_str());
 }
 
 void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
@@ -716,8 +711,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
 
   if (target->GetPropertyAsBool("AUTOMOC"))
     {
-    std::string automocTargetName =
-        cmQtAutoGeneratorInitializer::GetAutogenTargetName(target);
+    std::string automocTargetName = GetAutogenTargetName(target);
     std::string mocCppFile = makefile->GetCurrentBinaryDirectory();
     mocCppFile += "/";
     mocCppFile += automocTargetName;
@@ -743,11 +737,9 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
     }
 
   // create a custom target for running generators at buildtime:
-  std::string autogenTargetName =
-      cmQtAutoGeneratorInitializer::GetAutogenTargetName(target);
+  std::string autogenTargetName = GetAutogenTargetName(target);
 
-  std::string targetDir =
-      cmQtAutoGeneratorInitializer::GetAutogenTargetDir(target);
+  std::string targetDir = GetAutogenTargetDir(target);
 
   cmCustomCommandLine currentLine;
   currentLine.push_back(cmSystemTools::GetCMakeCommand());
@@ -864,12 +856,11 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
             {
             if (qtMajorVersion == "5")
               {
-              cmQtAutoGeneratorInitializer::ListQt5RccInputs(sf, target,
-                                                              depends);
+              ListQt5RccInputs(sf, target, depends);
               }
             else
               {
-              cmQtAutoGeneratorInitializer::ListQt4RccInputs(sf, depends);
+              ListQt4RccInputs(sf, depends);
               }
 #if defined(_WIN32) && !defined(__CYGWIN__)
             // Cannot use PRE_BUILD because the resource files themselves
@@ -942,16 +933,14 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
   static_cast<void>(varScope);
 
   // create a custom target for running generators at buildtime:
-  std::string autogenTargetName =
-      cmQtAutoGeneratorInitializer::GetAutogenTargetName(target);
+  std::string autogenTargetName = GetAutogenTargetName(target);
 
   makefile->AddDefinition("_moc_target_name",
           cmOutputConverter::EscapeForCMake(autogenTargetName).c_str());
   makefile->AddDefinition("_origin_target_name",
           cmOutputConverter::EscapeForCMake(target->GetName()).c_str());
 
-  std::string targetDir =
-      cmQtAutoGeneratorInitializer::GetAutogenTargetDir(target);
+  std::string targetDir = GetAutogenTargetDir(target);
 
   const char *qtVersion = makefile->GetDefinition("Qt5Core_VERSION_MAJOR");
   if (!qtVersion)
@@ -983,25 +972,23 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
       || target->GetPropertyAsBool("AUTOUIC")
       || target->GetPropertyAsBool("AUTORCC"))
     {
-    cmQtAutoGeneratorInitializer::SetupSourceFiles(target, skipMoc,
-                                         mocSources, mocHeaders, skipUic);
+    SetupSourceFiles(target, skipMoc, mocSources, mocHeaders, skipUic);
     }
   makefile->AddDefinition("_cpp_files",
           cmOutputConverter::EscapeForCMake(cmJoin(mocSources, ";")).c_str());
   if (target->GetPropertyAsBool("AUTOMOC"))
     {
-    cmQtAutoGeneratorInitializer::SetupAutoMocTarget(target, autogenTargetName,
+    SetupAutoMocTarget(target, autogenTargetName,
                              skipMoc, mocHeaders,
                              configIncludes, configDefines);
     }
   if (target->GetPropertyAsBool("AUTOUIC"))
     {
-    cmQtAutoGeneratorInitializer::SetupAutoUicTarget(target, skipUic,
-                                                      configUicOptions);
+    SetupAutoUicTarget(target, skipUic, configUicOptions);
     }
   if (target->GetPropertyAsBool("AUTORCC"))
     {
-    cmQtAutoGeneratorInitializer::SetupAutoRccTarget(target);
+    SetupAutoRccTarget(target);
     }
 
   const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT");
diff --git a/Source/cmQtAutoGeneratorInitializer.h b/Source/cmQtAutoGeneratorInitializer.h
index c22f172..ad5c85c 100644
--- a/Source/cmQtAutoGeneratorInitializer.h
+++ b/Source/cmQtAutoGeneratorInitializer.h
@@ -30,38 +30,6 @@ public:
   static void InitializeAutogenSources(cmTarget* target);
   static void InitializeAutogenTarget(cmLocalGenerator* lg, cmTarget* target);
   static void SetupAutoGenerateTarget(cmTarget const* target);
-
-  static std::string GetAutogenTargetName(cmTarget const* target);
-  static std::string GetAutogenTargetDir(cmTarget const* target);
-
-private:
-  static void SetupSourceFiles(cmTarget const* target,
-                        std::vector<std::string>& skipMoc,
-                        std::vector<std::string>& mocSources,
-                        std::vector<std::string>& mocHeaders,
-                        std::vector<std::string>& skipUic);
-
-  static void SetupAutoMocTarget(cmTarget const* target,
-                          const std::string &autogenTargetName,
-                          const std::vector<std::string>& skipMoc,
-                          const std::vector<std::string>& mocHeaders,
-                          std::map<std::string, std::string> &configIncludes,
-                          std::map<std::string, std::string> &configDefines);
-  static void SetupAutoUicTarget(cmTarget const* target,
-                        const std::vector<std::string>& skipUic,
-                        std::map<std::string, std::string> &configUicOptions);
-  static void SetupAutoRccTarget(cmTarget const* target);
-
-  static void MergeRccOptions(std::vector<std::string> &opts,
-                       const std::vector<std::string> &fileOpts, bool isQt5);
-
-  static std::string GetRccExecutable(cmTarget const* target);
-
-  static std::string ListQt5RccInputs(cmSourceFile* sf, cmTarget const* target,
-                               std::vector<std::string>& depends);
-
-  static std::string ListQt4RccInputs(cmSourceFile* sf,
-                               std::vector<std::string>& depends);
 };
 
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86f7fc5d55da5cf569c516f2d1fb8b69603c1be2
commit 86f7fc5d55da5cf569c516f2d1fb8b69603c1be2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 18:55:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:55:09 2015 +0200

    QtAutogen: Move SetupAutoRccTarget method.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 9bece40..a2a72d4 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -593,6 +593,122 @@ std::string cmQtAutoGeneratorInitializer::ListQt4RccInputs(cmSourceFile* sf,
   return entriesList;
 }
 
+void cmQtAutoGeneratorInitializer::SetupAutoRccTarget(cmTarget const* target)
+{
+  std::string _rcc_files;
+  const char* sepRccFiles = "";
+  cmMakefile *makefile = target->GetMakefile();
+
+  std::vector<cmSourceFile*> srcFiles;
+  cmGeneratorTarget *gtgt = target->GetMakefile()
+                                  ->GetGlobalGenerator()
+                                  ->GetGeneratorTarget(target);
+  gtgt->GetConfigCommonSourceFiles(srcFiles);
+
+  std::string qrcInputs;
+  const char* qrcInputsSep = "";
+
+  std::string rccFileFiles;
+  std::string rccFileOptions;
+  const char *optionSep = "";
+
+  const char *qtVersion = makefile->GetDefinition("_target_qt_version");
+
+  std::vector<std::string> rccOptions;
+  if (const char* opts = target->GetProperty("AUTORCC_OPTIONS"))
+    {
+    cmSystemTools::ExpandListArgument(opts, rccOptions);
+    }
+  std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
+  if (qtMajorVersion == "")
+    {
+    qtMajorVersion = makefile->GetSafeDefinition("Qt5Core_VERSION_MAJOR");
+    }
+
+  for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
+      fileIt != srcFiles.end();
+      ++fileIt)
+    {
+    cmSourceFile* sf = *fileIt;
+    std::string ext = sf->GetExtension();
+    if (ext == "qrc")
+      {
+      std::string absFile = cmsys::SystemTools::GetRealPath(
+                                                  sf->GetFullPath());
+      bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC"));
+
+      if (!skip)
+        {
+        _rcc_files += sepRccFiles;
+        _rcc_files += absFile;
+        sepRccFiles = ";";
+
+        if (const char *prop = sf->GetProperty("AUTORCC_OPTIONS"))
+          {
+          std::vector<std::string> optsVec;
+          cmSystemTools::ExpandListArgument(prop, optsVec);
+          cmQtAutoGeneratorInitializer::MergeRccOptions(rccOptions, optsVec,
+                                strcmp(qtVersion, "5") == 0);
+          }
+
+        if (!rccOptions.empty())
+          {
+          rccFileFiles += optionSep;
+          rccFileFiles += absFile;
+          rccFileOptions += optionSep;
+          }
+        const char *listSep = "";
+        for(std::vector<std::string>::const_iterator it = rccOptions.begin();
+            it != rccOptions.end();
+            ++it)
+          {
+          rccFileOptions += listSep;
+          rccFileOptions += *it;
+          listSep = "@list_sep@";
+          }
+        optionSep = ";";
+
+        std::vector<std::string> depends;
+
+        std::string entriesList;
+        if (!cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED")))
+          {
+          if (qtMajorVersion == "5")
+            {
+            entriesList = cmQtAutoGeneratorInitializer::ListQt5RccInputs(sf,
+                                                               target,
+                                                               depends);
+            }
+          else
+            {
+            entriesList =
+                cmQtAutoGeneratorInitializer::ListQt4RccInputs(sf, depends);
+            }
+          if (entriesList.empty())
+            {
+            return;
+            }
+          }
+        qrcInputs += qrcInputsSep;
+        qrcInputs += entriesList;
+        qrcInputsSep = ";";
+        }
+      }
+    }
+  makefile->AddDefinition("_qt_rcc_inputs_" + target->GetName(),
+                      cmOutputConverter::EscapeForCMake(qrcInputs).c_str());
+
+  makefile->AddDefinition("_rcc_files",
+          cmOutputConverter::EscapeForCMake(_rcc_files).c_str());
+
+  makefile->AddDefinition("_qt_rcc_options_files",
+              cmOutputConverter::EscapeForCMake(rccFileFiles).c_str());
+  makefile->AddDefinition("_qt_rcc_options_options",
+            cmOutputConverter::EscapeForCMake(rccFileOptions).c_str());
+
+  makefile->AddDefinition("_qt_rcc_executable",
+              cmQtAutoGeneratorInitializer::GetRccExecutable(target).c_str());
+}
 
 void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
 {
@@ -955,120 +1071,3 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
       }
     }
 }
-
-void cmQtAutoGeneratorInitializer::SetupAutoRccTarget(cmTarget const* target)
-{
-  std::string _rcc_files;
-  const char* sepRccFiles = "";
-  cmMakefile *makefile = target->GetMakefile();
-
-  std::vector<cmSourceFile*> srcFiles;
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  gtgt->GetConfigCommonSourceFiles(srcFiles);
-
-  std::string qrcInputs;
-  const char* qrcInputsSep = "";
-
-  std::string rccFileFiles;
-  std::string rccFileOptions;
-  const char *optionSep = "";
-
-  const char *qtVersion = makefile->GetDefinition("_target_qt_version");
-
-  std::vector<std::string> rccOptions;
-  if (const char* opts = target->GetProperty("AUTORCC_OPTIONS"))
-    {
-    cmSystemTools::ExpandListArgument(opts, rccOptions);
-    }
-  std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
-  if (qtMajorVersion == "")
-    {
-    qtMajorVersion = makefile->GetSafeDefinition("Qt5Core_VERSION_MAJOR");
-    }
-
-  for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
-      fileIt != srcFiles.end();
-      ++fileIt)
-    {
-    cmSourceFile* sf = *fileIt;
-    std::string ext = sf->GetExtension();
-    if (ext == "qrc")
-      {
-      std::string absFile = cmsys::SystemTools::GetRealPath(
-                                                  sf->GetFullPath());
-      bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC"));
-
-      if (!skip)
-        {
-        _rcc_files += sepRccFiles;
-        _rcc_files += absFile;
-        sepRccFiles = ";";
-
-        if (const char *prop = sf->GetProperty("AUTORCC_OPTIONS"))
-          {
-          std::vector<std::string> optsVec;
-          cmSystemTools::ExpandListArgument(prop, optsVec);
-          cmQtAutoGeneratorInitializer::MergeRccOptions(rccOptions, optsVec,
-                                strcmp(qtVersion, "5") == 0);
-          }
-
-        if (!rccOptions.empty())
-          {
-          rccFileFiles += optionSep;
-          rccFileFiles += absFile;
-          rccFileOptions += optionSep;
-          }
-        const char *listSep = "";
-        for(std::vector<std::string>::const_iterator it = rccOptions.begin();
-            it != rccOptions.end();
-            ++it)
-          {
-          rccFileOptions += listSep;
-          rccFileOptions += *it;
-          listSep = "@list_sep@";
-          }
-        optionSep = ";";
-
-        std::vector<std::string> depends;
-
-        std::string entriesList;
-        if (!cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED")))
-          {
-          if (qtMajorVersion == "5")
-            {
-            entriesList = cmQtAutoGeneratorInitializer::ListQt5RccInputs(sf,
-                                                               target,
-                                                               depends);
-            }
-          else
-            {
-            entriesList =
-                cmQtAutoGeneratorInitializer::ListQt4RccInputs(sf, depends);
-            }
-          if (entriesList.empty())
-            {
-            return;
-            }
-          }
-        qrcInputs += qrcInputsSep;
-        qrcInputs += entriesList;
-        qrcInputsSep = ";";
-        }
-      }
-    }
-  makefile->AddDefinition("_qt_rcc_inputs_" + target->GetName(),
-                      cmOutputConverter::EscapeForCMake(qrcInputs).c_str());
-
-  makefile->AddDefinition("_rcc_files",
-          cmOutputConverter::EscapeForCMake(_rcc_files).c_str());
-
-  makefile->AddDefinition("_qt_rcc_options_files",
-              cmOutputConverter::EscapeForCMake(rccFileFiles).c_str());
-  makefile->AddDefinition("_qt_rcc_options_options",
-            cmOutputConverter::EscapeForCMake(rccFileOptions).c_str());
-
-  makefile->AddDefinition("_qt_rcc_executable",
-              cmQtAutoGeneratorInitializer::GetRccExecutable(target).c_str());
-}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2aa3f500c49e6c81f4d4b821d6ae71ef2589cb07
commit 2aa3f500c49e6c81f4d4b821d6ae71ef2589cb07
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 18:50:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:50:47 2015 +0200

    QtAutogen: Move MergeRccOptions method.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 5cb22e9..9bece40 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -391,6 +391,50 @@ std::string cmQtAutoGeneratorInitializer::GetRccExecutable(
   return std::string();
 }
 
+void cmQtAutoGeneratorInitializer::MergeRccOptions(
+                         std::vector<std::string> &opts,
+                         const std::vector<std::string> &fileOpts,
+                         bool isQt5)
+{
+  static const char* valueOptions[] = {
+    "name",
+    "root",
+    "compress",
+    "threshold"
+  };
+  std::vector<std::string> extraOpts;
+  for(std::vector<std::string>::const_iterator it = fileOpts.begin();
+      it != fileOpts.end(); ++it)
+    {
+    std::vector<std::string>::iterator existingIt
+                                  = std::find(opts.begin(), opts.end(), *it);
+    if (existingIt != opts.end())
+      {
+      const char *o = it->c_str();
+      if (*o == '-')
+        {
+        ++o;
+        }
+      if (isQt5 && *o == '-')
+        {
+        ++o;
+        }
+      if (std::find_if(cmArrayBegin(valueOptions), cmArrayEnd(valueOptions),
+                  cmStrCmp(*it)) != cmArrayEnd(valueOptions))
+        {
+        assert(existingIt + 1 != opts.end());
+        *(existingIt + 1) = *(it + 1);
+        ++it;
+        }
+      }
+    else
+      {
+      extraOpts.push_back(*it);
+      }
+    }
+  opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
+}
+
 std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
     cmTarget const* target)
 {
@@ -912,50 +956,6 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     }
 }
 
-void cmQtAutoGeneratorInitializer::MergeRccOptions(
-                         std::vector<std::string> &opts,
-                         const std::vector<std::string> &fileOpts,
-                         bool isQt5)
-{
-  static const char* valueOptions[] = {
-    "name",
-    "root",
-    "compress",
-    "threshold"
-  };
-  std::vector<std::string> extraOpts;
-  for(std::vector<std::string>::const_iterator it = fileOpts.begin();
-      it != fileOpts.end(); ++it)
-    {
-    std::vector<std::string>::iterator existingIt
-                                  = std::find(opts.begin(), opts.end(), *it);
-    if (existingIt != opts.end())
-      {
-      const char *o = it->c_str();
-      if (*o == '-')
-        {
-        ++o;
-        }
-      if (isQt5 && *o == '-')
-        {
-        ++o;
-        }
-      if (std::find_if(cmArrayBegin(valueOptions), cmArrayEnd(valueOptions),
-                  cmStrCmp(*it)) != cmArrayEnd(valueOptions))
-        {
-        assert(existingIt + 1 != opts.end());
-        *(existingIt + 1) = *(it + 1);
-        ++it;
-        }
-      }
-    else
-      {
-      extraOpts.push_back(*it);
-      }
-    }
-  opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
-}
-
 void cmQtAutoGeneratorInitializer::SetupAutoRccTarget(cmTarget const* target)
 {
   std::string _rcc_files;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59b91107d16c2f2ba68791ae67c53bdcc0d32e05
commit 59b91107d16c2f2ba68791ae67c53bdcc0d32e05
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 18:50:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:50:00 2015 +0200

    QtAutogen: Move GetRccExecutable method.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index d998ae0..5cb22e9 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -340,6 +340,57 @@ void cmQtAutoGeneratorInitializer::SetupAutoUicTarget(cmTarget const* target,
     }
 }
 
+std::string cmQtAutoGeneratorInitializer::GetRccExecutable(
+    cmTarget const* target)
+{
+  cmGeneratorTarget *gtgt = target->GetMakefile()
+                                  ->GetGlobalGenerator()
+                                  ->GetGeneratorTarget(target);
+  cmMakefile *makefile = target->GetMakefile();
+  const char *qtVersion = makefile->GetDefinition("_target_qt_version");
+  if (!qtVersion)
+    {
+    qtVersion = makefile->GetDefinition("Qt5Core_VERSION_MAJOR");
+    if (!qtVersion)
+      {
+      qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
+      }
+    if (const char *targetQtVersion =
+        gtgt->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
+      {
+      qtVersion = targetQtVersion;
+      }
+    }
+
+  std::string targetName = target->GetName();
+  if (strcmp(qtVersion, "5") == 0)
+    {
+    cmTarget *qt5Rcc = makefile->FindTargetToUse("Qt5::rcc");
+    if (!qt5Rcc)
+      {
+      cmSystemTools::Error("Qt5::rcc target not found ",
+                          targetName.c_str());
+      return std::string();
+      }
+    return qt5Rcc->ImportedGetLocation("");
+    }
+  else if (strcmp(qtVersion, "4") == 0)
+    {
+    cmTarget *qt4Rcc = makefile->FindTargetToUse("Qt4::rcc");
+    if (!qt4Rcc)
+      {
+      cmSystemTools::Error("Qt4::rcc target not found ",
+                          targetName.c_str());
+      return std::string();
+      }
+    return qt4Rcc->ImportedGetLocation("");
+    }
+
+  cmSystemTools::Error("The CMAKE_AUTORCC feature supports only Qt 4 and "
+                      "Qt 5 ", targetName.c_str());
+  return std::string();
+}
+
 std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
     cmTarget const* target)
 {
@@ -1021,54 +1072,3 @@ void cmQtAutoGeneratorInitializer::SetupAutoRccTarget(cmTarget const* target)
   makefile->AddDefinition("_qt_rcc_executable",
               cmQtAutoGeneratorInitializer::GetRccExecutable(target).c_str());
 }
-
-std::string cmQtAutoGeneratorInitializer::GetRccExecutable(
-    cmTarget const* target)
-{
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  cmMakefile *makefile = target->GetMakefile();
-  const char *qtVersion = makefile->GetDefinition("_target_qt_version");
-  if (!qtVersion)
-    {
-    qtVersion = makefile->GetDefinition("Qt5Core_VERSION_MAJOR");
-    if (!qtVersion)
-      {
-      qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
-      }
-    if (const char *targetQtVersion =
-        gtgt->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
-      {
-      qtVersion = targetQtVersion;
-      }
-    }
-
-  std::string targetName = target->GetName();
-  if (strcmp(qtVersion, "5") == 0)
-    {
-    cmTarget *qt5Rcc = makefile->FindTargetToUse("Qt5::rcc");
-    if (!qt5Rcc)
-      {
-      cmSystemTools::Error("Qt5::rcc target not found ",
-                          targetName.c_str());
-      return std::string();
-      }
-    return qt5Rcc->ImportedGetLocation("");
-    }
-  else if (strcmp(qtVersion, "4") == 0)
-    {
-    cmTarget *qt4Rcc = makefile->FindTargetToUse("Qt4::rcc");
-    if (!qt4Rcc)
-      {
-      cmSystemTools::Error("Qt4::rcc target not found ",
-                          targetName.c_str());
-      return std::string();
-      }
-    return qt4Rcc->ImportedGetLocation("");
-    }
-
-  cmSystemTools::Error("The CMAKE_AUTORCC feature supports only Qt 4 and "
-                      "Qt 5 ", targetName.c_str());
-  return std::string();
-}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7254f6452596f438f0607ece559be7ad556b190a
commit 7254f6452596f438f0607ece559be7ad556b190a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 18:48:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:48:41 2015 +0200

    QtAutogen: Move SetupAutoUicTarget method.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index ef2f2a5..d998ae0 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -233,6 +233,113 @@ static void GetUicOpts(cmTarget const* target, const std::string& config,
   optString = cmJoin(opts, ";");
 }
 
+void cmQtAutoGeneratorInitializer::SetupAutoUicTarget(cmTarget const* target,
+                          std::vector<std::string> const& skipUic,
+                          std::map<std::string, std::string> &configUicOptions)
+{
+  cmMakefile *makefile = target->GetMakefile();
+
+  std::set<std::string> skipped;
+  skipped.insert(skipUic.begin(), skipUic.end());
+
+  makefile->AddDefinition("_skip_uic",
+          cmOutputConverter::EscapeForCMake(cmJoin(skipUic, ";")).c_str());
+
+  std::vector<cmSourceFile*> uiFilesWithOptions
+                                        = makefile->GetQtUiFilesWithOptions();
+
+  const char *qtVersion = makefile->GetDefinition("_target_qt_version");
+
+  std::string _uic_opts;
+  std::vector<std::string> configs;
+  const std::string& config = makefile->GetConfigurations(configs);
+  GetUicOpts(target, config, _uic_opts);
+
+  if (!_uic_opts.empty())
+    {
+    _uic_opts = cmOutputConverter::EscapeForCMake(_uic_opts);
+    makefile->AddDefinition("_uic_target_options", _uic_opts.c_str());
+    }
+  for (std::vector<std::string>::const_iterator li = configs.begin();
+       li != configs.end(); ++li)
+    {
+    std::string config_uic_opts;
+    GetUicOpts(target, *li, config_uic_opts);
+    if (config_uic_opts != _uic_opts)
+      {
+      configUicOptions[*li] =
+                    cmOutputConverter::EscapeForCMake(config_uic_opts);
+      if(_uic_opts.empty())
+        {
+        _uic_opts = config_uic_opts;
+        }
+      }
+    }
+
+  std::string uiFileFiles;
+  std::string uiFileOptions;
+  const char* sep = "";
+
+  for(std::vector<cmSourceFile*>::const_iterator fileIt =
+      uiFilesWithOptions.begin();
+      fileIt != uiFilesWithOptions.end();
+      ++fileIt)
+    {
+    cmSourceFile* sf = *fileIt;
+    std::string absFile = cmsys::SystemTools::GetRealPath(
+                                                    sf->GetFullPath());
+
+    if (!skipped.insert(absFile).second)
+      {
+      continue;
+      }
+    uiFileFiles += sep;
+    uiFileFiles += absFile;
+    uiFileOptions += sep;
+    std::string opts = sf->GetProperty("AUTOUIC_OPTIONS");
+    cmSystemTools::ReplaceString(opts, ";", "@list_sep@");
+    uiFileOptions += opts;
+    sep = ";";
+    }
+
+  makefile->AddDefinition("_qt_uic_options_files",
+              cmOutputConverter::EscapeForCMake(uiFileFiles).c_str());
+  makefile->AddDefinition("_qt_uic_options_options",
+            cmOutputConverter::EscapeForCMake(uiFileOptions).c_str());
+
+  std::string targetName = target->GetName();
+  if (strcmp(qtVersion, "5") == 0)
+    {
+    cmTarget *qt5Uic = makefile->FindTargetToUse("Qt5::uic");
+    if (!qt5Uic)
+      {
+      // Project does not use Qt5Widgets, but has AUTOUIC ON anyway
+      }
+    else
+      {
+      makefile->AddDefinition("_qt_uic_executable",
+                              qt5Uic->ImportedGetLocation(""));
+      }
+    }
+  else if (strcmp(qtVersion, "4") == 0)
+    {
+    cmTarget *qt4Uic = makefile->FindTargetToUse("Qt4::uic");
+    if (!qt4Uic)
+      {
+      cmSystemTools::Error("Qt4::uic target not found ",
+                          targetName.c_str());
+      return;
+      }
+    makefile->AddDefinition("_qt_uic_executable",
+                            qt4Uic->ImportedGetLocation(""));
+    }
+  else
+    {
+    cmSystemTools::Error("The CMAKE_AUTOUIC feature supports only Qt 4 and "
+                        "Qt 5 ", targetName.c_str());
+    }
+}
+
 std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
     cmTarget const* target)
 {
@@ -754,113 +861,6 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     }
 }
 
-void cmQtAutoGeneratorInitializer::SetupAutoUicTarget(cmTarget const* target,
-                          std::vector<std::string> const& skipUic,
-                          std::map<std::string, std::string> &configUicOptions)
-{
-  cmMakefile *makefile = target->GetMakefile();
-
-  std::set<std::string> skipped;
-  skipped.insert(skipUic.begin(), skipUic.end());
-
-  makefile->AddDefinition("_skip_uic",
-          cmOutputConverter::EscapeForCMake(cmJoin(skipUic, ";")).c_str());
-
-  std::vector<cmSourceFile*> uiFilesWithOptions
-                                        = makefile->GetQtUiFilesWithOptions();
-
-  const char *qtVersion = makefile->GetDefinition("_target_qt_version");
-
-  std::string _uic_opts;
-  std::vector<std::string> configs;
-  const std::string& config = makefile->GetConfigurations(configs);
-  GetUicOpts(target, config, _uic_opts);
-
-  if (!_uic_opts.empty())
-    {
-    _uic_opts = cmOutputConverter::EscapeForCMake(_uic_opts);
-    makefile->AddDefinition("_uic_target_options", _uic_opts.c_str());
-    }
-  for (std::vector<std::string>::const_iterator li = configs.begin();
-       li != configs.end(); ++li)
-    {
-    std::string config_uic_opts;
-    GetUicOpts(target, *li, config_uic_opts);
-    if (config_uic_opts != _uic_opts)
-      {
-      configUicOptions[*li] =
-                    cmOutputConverter::EscapeForCMake(config_uic_opts);
-      if(_uic_opts.empty())
-        {
-        _uic_opts = config_uic_opts;
-        }
-      }
-    }
-
-  std::string uiFileFiles;
-  std::string uiFileOptions;
-  const char* sep = "";
-
-  for(std::vector<cmSourceFile*>::const_iterator fileIt =
-      uiFilesWithOptions.begin();
-      fileIt != uiFilesWithOptions.end();
-      ++fileIt)
-    {
-    cmSourceFile* sf = *fileIt;
-    std::string absFile = cmsys::SystemTools::GetRealPath(
-                                                    sf->GetFullPath());
-
-    if (!skipped.insert(absFile).second)
-      {
-      continue;
-      }
-    uiFileFiles += sep;
-    uiFileFiles += absFile;
-    uiFileOptions += sep;
-    std::string opts = sf->GetProperty("AUTOUIC_OPTIONS");
-    cmSystemTools::ReplaceString(opts, ";", "@list_sep@");
-    uiFileOptions += opts;
-    sep = ";";
-    }
-
-  makefile->AddDefinition("_qt_uic_options_files",
-              cmOutputConverter::EscapeForCMake(uiFileFiles).c_str());
-  makefile->AddDefinition("_qt_uic_options_options",
-            cmOutputConverter::EscapeForCMake(uiFileOptions).c_str());
-
-  std::string targetName = target->GetName();
-  if (strcmp(qtVersion, "5") == 0)
-    {
-    cmTarget *qt5Uic = makefile->FindTargetToUse("Qt5::uic");
-    if (!qt5Uic)
-      {
-      // Project does not use Qt5Widgets, but has AUTOUIC ON anyway
-      }
-    else
-      {
-      makefile->AddDefinition("_qt_uic_executable",
-                              qt5Uic->ImportedGetLocation(""));
-      }
-    }
-  else if (strcmp(qtVersion, "4") == 0)
-    {
-    cmTarget *qt4Uic = makefile->FindTargetToUse("Qt4::uic");
-    if (!qt4Uic)
-      {
-      cmSystemTools::Error("Qt4::uic target not found ",
-                          targetName.c_str());
-      return;
-      }
-    makefile->AddDefinition("_qt_uic_executable",
-                            qt4Uic->ImportedGetLocation(""));
-    }
-  else
-    {
-    cmSystemTools::Error("The CMAKE_AUTOUIC feature supports only Qt 4 and "
-                        "Qt 5 ", targetName.c_str());
-    }
-}
-
 void cmQtAutoGeneratorInitializer::MergeRccOptions(
                          std::vector<std::string> &opts,
                          const std::vector<std::string> &fileOpts,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=975b753997849507684da7d529d1bbe0ffd3ade9
commit 975b753997849507684da7d529d1bbe0ffd3ade9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 18:47:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:47:49 2015 +0200

    QtAutogen: Move GetUicOpts method.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index b9bd275..ef2f2a5 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -222,6 +222,17 @@ void cmQtAutoGeneratorInitializer::SetupAutoMocTarget(cmTarget const* target,
     }
 }
 
+static void GetUicOpts(cmTarget const* target, const std::string& config,
+                       std::string &optString)
+{
+  cmGeneratorTarget *gtgt = target->GetMakefile()
+                                  ->GetGlobalGenerator()
+                                  ->GetGeneratorTarget(target);
+  std::vector<std::string> opts;
+  gtgt->GetAutoUicOptions(opts, config);
+  optString = cmJoin(opts, ";");
+}
+
 std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
     cmTarget const* target)
 {
@@ -743,17 +754,6 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     }
 }
 
-static void GetUicOpts(cmTarget const* target, const std::string& config,
-                       std::string &optString)
-{
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  std::vector<std::string> opts;
-  gtgt->GetAutoUicOptions(opts, config);
-  optString = cmJoin(opts, ";");
-}
-
 void cmQtAutoGeneratorInitializer::SetupAutoUicTarget(cmTarget const* target,
                           std::vector<std::string> const& skipUic,
                           std::map<std::string, std::string> &configUicOptions)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f75ec6044c593d0ff042e13b940d2c674910b683
commit f75ec6044c593d0ff042e13b940d2c674910b683
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 18:46:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:46:58 2015 +0200

    QtAutogen: Move SetupAutoMocTarget method.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 76006fa..b9bd275 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -130,6 +130,98 @@ static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
   defs += cmJoin(defines, ";");
 }
 
+void cmQtAutoGeneratorInitializer::SetupAutoMocTarget(cmTarget const* target,
+                          const std::string &autogenTargetName,
+                          std::vector<std::string> const& skipMoc,
+                          std::vector<std::string> const& mocHeaders,
+                          std::map<std::string, std::string> &configIncludes,
+                          std::map<std::string, std::string> &configDefines)
+{
+  cmMakefile* makefile = target->GetMakefile();
+
+  const char* tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
+  std::string _moc_options = (tmp!=0 ? tmp : "");
+  makefile->AddDefinition("_moc_options",
+          cmOutputConverter::EscapeForCMake(_moc_options).c_str());
+  makefile->AddDefinition("_skip_moc",
+          cmOutputConverter::EscapeForCMake(cmJoin(skipMoc, ";")).c_str());
+  makefile->AddDefinition("_moc_headers",
+          cmOutputConverter::EscapeForCMake(cmJoin(mocHeaders, ";")).c_str());
+  bool relaxedMode = makefile->IsOn("CMAKE_AUTOMOC_RELAXED_MODE");
+  makefile->AddDefinition("_moc_relaxed_mode", relaxedMode ? "TRUE" : "FALSE");
+
+  std::string _moc_incs;
+  std::string _moc_compile_defs;
+  std::vector<std::string> configs;
+  const std::string& config = makefile->GetConfigurations(configs);
+  GetCompileDefinitionsAndDirectories(target, config,
+                                      _moc_incs, _moc_compile_defs);
+
+  makefile->AddDefinition("_moc_incs",
+          cmOutputConverter::EscapeForCMake(_moc_incs).c_str());
+  makefile->AddDefinition("_moc_compile_defs",
+          cmOutputConverter::EscapeForCMake(_moc_compile_defs).c_str());
+
+  for (std::vector<std::string>::const_iterator li = configs.begin();
+       li != configs.end(); ++li)
+    {
+    std::string config_moc_incs;
+    std::string config_moc_compile_defs;
+    GetCompileDefinitionsAndDirectories(target, *li,
+                                        config_moc_incs,
+                                        config_moc_compile_defs);
+    if (config_moc_incs != _moc_incs)
+      {
+      configIncludes[*li] =
+                    cmOutputConverter::EscapeForCMake(config_moc_incs);
+      if(_moc_incs.empty())
+        {
+        _moc_incs = config_moc_incs;
+        }
+      }
+    if (config_moc_compile_defs != _moc_compile_defs)
+      {
+      configDefines[*li] =
+            cmOutputConverter::EscapeForCMake(config_moc_compile_defs);
+      if(_moc_compile_defs.empty())
+        {
+        _moc_compile_defs = config_moc_compile_defs;
+        }
+      }
+    }
+
+  const char *qtVersion = makefile->GetDefinition("_target_qt_version");
+  if (strcmp(qtVersion, "5") == 0)
+    {
+    cmTarget *qt5Moc = makefile->FindTargetToUse("Qt5::moc");
+    if (!qt5Moc)
+      {
+      cmSystemTools::Error("Qt5::moc target not found ",
+                          autogenTargetName.c_str());
+      return;
+      }
+    makefile->AddDefinition("_qt_moc_executable",
+                            qt5Moc->ImportedGetLocation(""));
+    }
+  else if (strcmp(qtVersion, "4") == 0)
+    {
+    cmTarget *qt4Moc = makefile->FindTargetToUse("Qt4::moc");
+    if (!qt4Moc)
+      {
+      cmSystemTools::Error("Qt4::moc target not found ",
+                          autogenTargetName.c_str());
+      return;
+      }
+    makefile->AddDefinition("_qt_moc_executable",
+                            qt4Moc->ImportedGetLocation(""));
+    }
+  else
+    {
+    cmSystemTools::Error("The CMAKE_AUTOMOC feature supports only Qt 4 and "
+                        "Qt 5 ", autogenTargetName.c_str());
+    }
+}
+
 std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
     cmTarget const* target)
 {
@@ -651,98 +743,6 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     }
 }
 
-void cmQtAutoGeneratorInitializer::SetupAutoMocTarget(cmTarget const* target,
-                          const std::string &autogenTargetName,
-                          std::vector<std::string> const& skipMoc,
-                          std::vector<std::string> const& mocHeaders,
-                          std::map<std::string, std::string> &configIncludes,
-                          std::map<std::string, std::string> &configDefines)
-{
-  cmMakefile* makefile = target->GetMakefile();
-
-  const char* tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
-  std::string _moc_options = (tmp!=0 ? tmp : "");
-  makefile->AddDefinition("_moc_options",
-          cmOutputConverter::EscapeForCMake(_moc_options).c_str());
-  makefile->AddDefinition("_skip_moc",
-          cmOutputConverter::EscapeForCMake(cmJoin(skipMoc, ";")).c_str());
-  makefile->AddDefinition("_moc_headers",
-          cmOutputConverter::EscapeForCMake(cmJoin(mocHeaders, ";")).c_str());
-  bool relaxedMode = makefile->IsOn("CMAKE_AUTOMOC_RELAXED_MODE");
-  makefile->AddDefinition("_moc_relaxed_mode", relaxedMode ? "TRUE" : "FALSE");
-
-  std::string _moc_incs;
-  std::string _moc_compile_defs;
-  std::vector<std::string> configs;
-  const std::string& config = makefile->GetConfigurations(configs);
-  GetCompileDefinitionsAndDirectories(target, config,
-                                      _moc_incs, _moc_compile_defs);
-
-  makefile->AddDefinition("_moc_incs",
-          cmOutputConverter::EscapeForCMake(_moc_incs).c_str());
-  makefile->AddDefinition("_moc_compile_defs",
-          cmOutputConverter::EscapeForCMake(_moc_compile_defs).c_str());
-
-  for (std::vector<std::string>::const_iterator li = configs.begin();
-       li != configs.end(); ++li)
-    {
-    std::string config_moc_incs;
-    std::string config_moc_compile_defs;
-    GetCompileDefinitionsAndDirectories(target, *li,
-                                        config_moc_incs,
-                                        config_moc_compile_defs);
-    if (config_moc_incs != _moc_incs)
-      {
-      configIncludes[*li] =
-                    cmOutputConverter::EscapeForCMake(config_moc_incs);
-      if(_moc_incs.empty())
-        {
-        _moc_incs = config_moc_incs;
-        }
-      }
-    if (config_moc_compile_defs != _moc_compile_defs)
-      {
-      configDefines[*li] =
-            cmOutputConverter::EscapeForCMake(config_moc_compile_defs);
-      if(_moc_compile_defs.empty())
-        {
-        _moc_compile_defs = config_moc_compile_defs;
-        }
-      }
-    }
-
-  const char *qtVersion = makefile->GetDefinition("_target_qt_version");
-  if (strcmp(qtVersion, "5") == 0)
-    {
-    cmTarget *qt5Moc = makefile->FindTargetToUse("Qt5::moc");
-    if (!qt5Moc)
-      {
-      cmSystemTools::Error("Qt5::moc target not found ",
-                          autogenTargetName.c_str());
-      return;
-      }
-    makefile->AddDefinition("_qt_moc_executable",
-                            qt5Moc->ImportedGetLocation(""));
-    }
-  else if (strcmp(qtVersion, "4") == 0)
-    {
-    cmTarget *qt4Moc = makefile->FindTargetToUse("Qt4::moc");
-    if (!qt4Moc)
-      {
-      cmSystemTools::Error("Qt4::moc target not found ",
-                          autogenTargetName.c_str());
-      return;
-      }
-    makefile->AddDefinition("_qt_moc_executable",
-                            qt4Moc->ImportedGetLocation(""));
-    }
-  else
-    {
-    cmSystemTools::Error("The CMAKE_AUTOMOC feature supports only Qt 4 and "
-                        "Qt 5 ", autogenTargetName.c_str());
-    }
-}
-
 static void GetUicOpts(cmTarget const* target, const std::string& config,
                        std::string &optString)
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3158e45b8fde882603e1d9b2262a5c64e25c1ee
commit f3158e45b8fde882603e1d9b2262a5c64e25c1ee
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 18:46:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:46:11 2015 +0200

    QtAutogen: Move GetCompileDefinitionsAndDirectories method.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 216c5b4..76006fa 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -108,6 +108,28 @@ void cmQtAutoGeneratorInitializer::SetupSourceFiles(cmTarget const* target,
     }
 }
 
+static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
+                                                const std::string& config,
+                                                std::string &incs,
+                                                std::string &defs)
+{
+  cmMakefile* makefile = target->GetMakefile();
+  cmGlobalGenerator* globalGen = makefile->GetGlobalGenerator();
+  std::vector<std::string> includeDirs;
+  cmGeneratorTarget *gtgt = globalGen->GetGeneratorTarget(target);
+  cmLocalGenerator *localGen = gtgt->GetLocalGenerator();
+  // Get the include dirs for this target, without stripping the implicit
+  // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
+  localGen->GetIncludeDirectories(includeDirs, gtgt, "CXX", config, false);
+
+  incs = cmJoin(includeDirs, ";");
+
+  std::set<std::string> defines;
+  localGen->AddCompileDefinitions(defines, target, config, "CXX");
+
+  defs += cmJoin(defines, ";");
+}
+
 std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
     cmTarget const* target)
 {
@@ -489,28 +511,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
     }
 }
 
-static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
-                                                const std::string& config,
-                                                std::string &incs,
-                                                std::string &defs)
-{
-  cmMakefile* makefile = target->GetMakefile();
-  cmGlobalGenerator* globalGen = makefile->GetGlobalGenerator();
-  std::vector<std::string> includeDirs;
-  cmGeneratorTarget *gtgt = globalGen->GetGeneratorTarget(target);
-  cmLocalGenerator *localGen = gtgt->GetLocalGenerator();
-  // Get the include dirs for this target, without stripping the implicit
-  // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
-  localGen->GetIncludeDirectories(includeDirs, gtgt, "CXX", config, false);
-
-  incs = cmJoin(includeDirs, ";");
-
-  std::set<std::string> defines;
-  localGen->AddCompileDefinitions(defines, target, config, "CXX");
-
-  defs += cmJoin(defines, ";");
-}
-
 void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     cmTarget const* target)
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=493b17f8c7fb171fd7ca36cc0b29257939609298
commit 493b17f8c7fb171fd7ca36cc0b29257939609298
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 18:45:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 18:45:21 2015 +0200

    QtAutogen: Move SetupSourceFiles method.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 24e7ed8..216c5b4 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -25,6 +25,89 @@
 # include "cmGlobalVisualStudioGenerator.h"
 #endif
 
+void cmQtAutoGeneratorInitializer::SetupSourceFiles(cmTarget const* target,
+                                   std::vector<std::string>& skipMoc,
+                                   std::vector<std::string>& mocSources,
+                                   std::vector<std::string>& mocHeaders,
+                                   std::vector<std::string>& skipUic)
+{
+  cmMakefile* makefile = target->GetMakefile();
+
+  std::vector<cmSourceFile*> srcFiles;
+  cmGeneratorTarget *gtgt = target->GetMakefile()
+                                  ->GetGlobalGenerator()
+                                  ->GetGeneratorTarget(target);
+  gtgt->GetConfigCommonSourceFiles(srcFiles);
+
+  std::vector<std::string> newRccFiles;
+
+  for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
+      fileIt != srcFiles.end();
+      ++fileIt)
+    {
+    cmSourceFile* sf = *fileIt;
+    std::string absFile = cmsys::SystemTools::GetRealPath(
+                                                    sf->GetFullPath());
+    bool skipFileForMoc =
+        cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"));
+    bool generated = cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"));
+
+    if(cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC")))
+      {
+      skipUic.push_back(absFile);
+      }
+
+    std::string ext = sf->GetExtension();
+
+    if (target->GetPropertyAsBool("AUTORCC"))
+      {
+      if (ext == "qrc"
+          && !cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC")))
+        {
+        std::string basename = cmsys::SystemTools::
+                                      GetFilenameWithoutLastExtension(absFile);
+
+        std::string rcc_output_dir = target->GetSupportDirectory();
+        cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
+        std::string rcc_output_file = rcc_output_dir;
+        rcc_output_file += "/qrc_" + basename + ".cpp";
+        makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
+                                rcc_output_file.c_str(), false);
+        makefile->GetOrCreateSource(rcc_output_file, true);
+        newRccFiles.push_back(rcc_output_file);
+        }
+      }
+
+    if (!generated)
+      {
+      if (skipFileForMoc)
+        {
+        skipMoc.push_back(absFile);
+        }
+      else
+        {
+        cmSystemTools::FileFormat fileType = cmSystemTools::GetFileFormat(
+                                                                ext.c_str());
+        if (fileType == cmSystemTools::CXX_FILE_FORMAT)
+          {
+          mocSources.push_back(absFile);
+          }
+        else if (fileType == cmSystemTools::HEADER_FILE_FORMAT)
+          {
+          mocHeaders.push_back(absFile);
+          }
+        }
+      }
+    }
+
+  for(std::vector<std::string>::const_iterator fileIt = newRccFiles.begin();
+      fileIt != newRccFiles.end();
+      ++fileIt)
+    {
+    const_cast<cmTarget*>(target)->AddSource(*fileIt);
+    }
+}
+
 std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
     cmTarget const* target)
 {
@@ -568,89 +651,6 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     }
 }
 
-void cmQtAutoGeneratorInitializer::SetupSourceFiles(cmTarget const* target,
-                                   std::vector<std::string>& skipMoc,
-                                   std::vector<std::string>& mocSources,
-                                   std::vector<std::string>& mocHeaders,
-                                   std::vector<std::string>& skipUic)
-{
-  cmMakefile* makefile = target->GetMakefile();
-
-  std::vector<cmSourceFile*> srcFiles;
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  gtgt->GetConfigCommonSourceFiles(srcFiles);
-
-  std::vector<std::string> newRccFiles;
-
-  for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
-      fileIt != srcFiles.end();
-      ++fileIt)
-    {
-    cmSourceFile* sf = *fileIt;
-    std::string absFile = cmsys::SystemTools::GetRealPath(
-                                                    sf->GetFullPath());
-    bool skipFileForMoc =
-        cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"));
-    bool generated = cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"));
-
-    if(cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC")))
-      {
-      skipUic.push_back(absFile);
-      }
-
-    std::string ext = sf->GetExtension();
-
-    if (target->GetPropertyAsBool("AUTORCC"))
-      {
-      if (ext == "qrc"
-          && !cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC")))
-        {
-        std::string basename = cmsys::SystemTools::
-                                      GetFilenameWithoutLastExtension(absFile);
-
-        std::string rcc_output_dir = target->GetSupportDirectory();
-        cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
-        std::string rcc_output_file = rcc_output_dir;
-        rcc_output_file += "/qrc_" + basename + ".cpp";
-        makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
-                                rcc_output_file.c_str(), false);
-        makefile->GetOrCreateSource(rcc_output_file, true);
-        newRccFiles.push_back(rcc_output_file);
-        }
-      }
-
-    if (!generated)
-      {
-      if (skipFileForMoc)
-        {
-        skipMoc.push_back(absFile);
-        }
-      else
-        {
-        cmSystemTools::FileFormat fileType = cmSystemTools::GetFileFormat(
-                                                                ext.c_str());
-        if (fileType == cmSystemTools::CXX_FILE_FORMAT)
-          {
-          mocSources.push_back(absFile);
-          }
-        else if (fileType == cmSystemTools::HEADER_FILE_FORMAT)
-          {
-          mocHeaders.push_back(absFile);
-          }
-        }
-      }
-    }
-
-  for(std::vector<std::string>::const_iterator fileIt = newRccFiles.begin();
-      fileIt != newRccFiles.end();
-      ++fileIt)
-    {
-    const_cast<cmTarget*>(target)->AddSource(*fileIt);
-    }
-}
-
 void cmQtAutoGeneratorInitializer::SetupAutoMocTarget(cmTarget const* target,
                           const std::string &autogenTargetName,
                           std::vector<std::string> const& skipMoc,

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx            |   30 +-
 Source/cmGlobalGenerator.h              |    2 +-
 Source/cmLocalGenerator.cxx             |    2 +-
 Source/cmLocalGenerator.h               |    2 +-
 Source/cmQtAutoGeneratorInitializer.cxx | 1707 +++++++++++++++----------------
 Source/cmQtAutoGeneratorInitializer.h   |   41 +-
 6 files changed, 861 insertions(+), 923 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct  5 13:57:04 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  5 Oct 2015 13:57:04 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1457-gaec059f
Message-ID: <20151005175704.23FB8BF80F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  aec059ff3e82ce5077c9125728b11d1bb53b3862 (commit)
       via  0eef5e37a8744883aea2276049e27757bc142c02 (commit)
      from  963efb9ec9970f7107face767083dc90adcec60c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aec059ff3e82ce5077c9125728b11d1bb53b3862
commit aec059ff3e82ce5077c9125728b11d1bb53b3862
Merge: 963efb9 0eef5e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 13:57:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 13:57:03 2015 -0400

    Merge topic 'refactor-qt-autogen' into next
    
    0eef5e37 fixup! QtAutogen: Port API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0eef5e37a8744883aea2276049e27757bc142c02
commit 0eef5e37a8744883aea2276049e27757bc142c02
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 19:56:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 19:56:26 2015 +0200

    fixup! QtAutogen: Port API to cmGeneratorTarget.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index d988665..c03b5c8 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -873,7 +873,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                        workingDirectory.c_str());
     cc.SetEscapeOldStyle(false);
     cc.SetEscapeAllowMakeVars(true);
-    target->AddPreBuildCommand(cc);
+    target->Target->AddPreBuildCommand(cc);
     }
   else
 #endif

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct  5 13:57:27 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  5 Oct 2015 13:57:27 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1459-g91fe16a
Message-ID: <20151005175727.BA119BF830@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  91fe16a558a5eea82e57ef12945104e0f6d372c9 (commit)
       via  984b5ead5b86301c2a8ca5da6c515ba2a9e2396c (commit)
      from  aec059ff3e82ce5077c9125728b11d1bb53b3862 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91fe16a558a5eea82e57ef12945104e0f6d372c9
commit 91fe16a558a5eea82e57ef12945104e0f6d372c9
Merge: aec059f 984b5ea
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 13:57:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 13:57:27 2015 -0400

    Merge topic 'refactor-qt-autogen' into next
    
    984b5ead QtAutogen: Port API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=984b5ead5b86301c2a8ca5da6c515ba2a9e2396c
commit 984b5ead5b86301c2a8ca5da6c515ba2a9e2396c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 19:21:30 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 19:57:16 2015 +0200

    QtAutogen: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 21ada71..309884f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1267,7 +1267,7 @@ bool cmGlobalGenerator::Compute()
   for (std::vector<cmGeneratorTarget const*>::iterator it =
        autogenTargets.begin(); it != autogenTargets.end(); ++it)
     {
-    cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget((*it)->Target);
+    cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(*it);
     }
 #endif
 
@@ -1451,15 +1451,14 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
 
       cmGeneratorTarget* gt = this->GetGeneratorTarget(&ti->second);
 
-      cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt->Target);
+      cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt);
       filteredTargets.push_back(gt);
       }
     for(std::vector<cmGeneratorTarget*>::iterator ti = filteredTargets.begin();
         ti != filteredTargets.end(); ++ti)
       {
-      cmTarget* target = (*ti)->Target;
       cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
-           this->LocalGenerators[i], target);
+           this->LocalGenerators[i], *ti);
       autogenTargets.push_back(*ti);
       }
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index fe888b7..c03b5c8 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -25,19 +25,16 @@
 # include "cmGlobalVisualStudioGenerator.h"
 #endif
 
-static void SetupSourceFiles(cmTarget const* target,
+static void SetupSourceFiles(cmGeneratorTarget const* target,
                                    std::vector<std::string>& skipMoc,
                                    std::vector<std::string>& mocSources,
                                    std::vector<std::string>& mocHeaders,
                                    std::vector<std::string>& skipUic)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   std::vector<cmSourceFile*> srcFiles;
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  gtgt->GetConfigCommonSourceFiles(srcFiles);
+  target->GetConfigCommonSourceFiles(srcFiles);
 
   std::vector<std::string> newRccFiles;
 
@@ -67,7 +64,7 @@ static void SetupSourceFiles(cmTarget const* target,
         std::string basename = cmsys::SystemTools::
                                       GetFilenameWithoutLastExtension(absFile);
 
-        std::string rcc_output_dir = target->GetSupportDirectory();
+        std::string rcc_output_dir = target->Target->GetSupportDirectory();
         cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -104,40 +101,37 @@ static void SetupSourceFiles(cmTarget const* target,
       fileIt != newRccFiles.end();
       ++fileIt)
     {
-    const_cast<cmTarget*>(target)->AddSource(*fileIt);
+    const_cast<cmTarget*>(target->Target)->AddSource(*fileIt);
     }
 }
 
-static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
+static void GetCompileDefinitionsAndDirectories(cmGeneratorTarget const* target,
                                                 const std::string& config,
                                                 std::string &incs,
                                                 std::string &defs)
 {
-  cmMakefile* makefile = target->GetMakefile();
-  cmGlobalGenerator* globalGen = makefile->GetGlobalGenerator();
   std::vector<std::string> includeDirs;
-  cmGeneratorTarget *gtgt = globalGen->GetGeneratorTarget(target);
-  cmLocalGenerator *localGen = gtgt->GetLocalGenerator();
+  cmLocalGenerator *localGen = target->GetLocalGenerator();
   // Get the include dirs for this target, without stripping the implicit
   // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
-  localGen->GetIncludeDirectories(includeDirs, gtgt, "CXX", config, false);
+  localGen->GetIncludeDirectories(includeDirs, target, "CXX", config, false);
 
   incs = cmJoin(includeDirs, ";");
 
   std::set<std::string> defines;
-  localGen->AddCompileDefinitions(defines, target, config, "CXX");
+  localGen->AddCompileDefinitions(defines, target->Target, config, "CXX");
 
   defs += cmJoin(defines, ";");
 }
 
-static void SetupAutoMocTarget(cmTarget const* target,
+static void SetupAutoMocTarget(cmGeneratorTarget const* target,
                           const std::string &autogenTargetName,
                           std::vector<std::string> const& skipMoc,
                           std::vector<std::string> const& mocHeaders,
                           std::map<std::string, std::string> &configIncludes,
                           std::map<std::string, std::string> &configDefines)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   const char* tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
   std::string _moc_options = (tmp!=0 ? tmp : "");
@@ -222,22 +216,20 @@ static void SetupAutoMocTarget(cmTarget const* target,
     }
 }
 
-static void GetUicOpts(cmTarget const* target, const std::string& config,
+static void GetUicOpts(cmGeneratorTarget const* target,
+                       const std::string& config,
                        std::string &optString)
 {
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
   std::vector<std::string> opts;
-  gtgt->GetAutoUicOptions(opts, config);
+  target->GetAutoUicOptions(opts, config);
   optString = cmJoin(opts, ";");
 }
 
-static void SetupAutoUicTarget(cmTarget const* target,
+static void SetupAutoUicTarget(cmGeneratorTarget const* target,
                           std::vector<std::string> const& skipUic,
                           std::map<std::string, std::string> &configUicOptions)
 {
-  cmMakefile *makefile = target->GetMakefile();
+  cmMakefile *makefile = target->Target->GetMakefile();
 
   std::set<std::string> skipped;
   skipped.insert(skipUic.begin(), skipUic.end());
@@ -340,12 +332,9 @@ static void SetupAutoUicTarget(cmTarget const* target,
     }
 }
 
-static std::string GetRccExecutable(cmTarget const* target)
+static std::string GetRccExecutable(cmGeneratorTarget const* target)
 {
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  cmMakefile *makefile = target->GetMakefile();
+  cmMakefile *makefile = target->Target->GetMakefile();
   const char *qtVersion = makefile->GetDefinition("_target_qt_version");
   if (!qtVersion)
     {
@@ -355,7 +344,8 @@ static std::string GetRccExecutable(cmTarget const* target)
       qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
       }
     if (const char *targetQtVersion =
-        gtgt->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
+        target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION",
+                                                        ""))
       {
       qtVersion = targetQtVersion;
       }
@@ -434,7 +424,7 @@ static void MergeRccOptions(std::vector<std::string> &opts,
 }
 
 std::string GetAutogenTargetName(
-    cmTarget const* target)
+    cmGeneratorTarget const* target)
 {
   std::string autogenTargetName = target->GetName();
   autogenTargetName += "_automoc";
@@ -442,9 +432,9 @@ std::string GetAutogenTargetName(
 }
 
 std::string GetAutogenTargetDir(
-    cmTarget const* target)
+    cmGeneratorTarget const* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
   std::string targetDir = makefile->GetCurrentBinaryDirectory();
   targetDir += makefile->GetCMakeInstance()->GetCMakeFilesDirectory();
   targetDir += "/";
@@ -485,7 +475,7 @@ static std::string ReadAll(const std::string& filename)
 }
 
 static std::string ListQt5RccInputs(cmSourceFile* sf,
-                                            cmTarget const* target,
+                                            cmGeneratorTarget const* target,
                                             std::vector<std::string>& depends)
 {
   std::string rccCommand
@@ -591,17 +581,14 @@ static std::string ListQt4RccInputs(cmSourceFile* sf,
   return entriesList;
 }
 
-static void SetupAutoRccTarget(cmTarget const* target)
+static void SetupAutoRccTarget(cmGeneratorTarget const* target)
 {
   std::string _rcc_files;
   const char* sepRccFiles = "";
-  cmMakefile *makefile = target->GetMakefile();
+  cmMakefile *makefile = target->Target->GetMakefile();
 
   std::vector<cmSourceFile*> srcFiles;
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  gtgt->GetConfigCommonSourceFiles(srcFiles);
+  target->GetConfigCommonSourceFiles(srcFiles);
 
   std::string qrcInputs;
   const char* qrcInputsSep = "";
@@ -705,9 +692,10 @@ static void SetupAutoRccTarget(cmTarget const* target)
               GetRccExecutable(target).c_str());
 }
 
-void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
+void cmQtAutoGeneratorInitializer::InitializeAutogenSources(
+    cmGeneratorTarget* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   if (target->GetPropertyAsBool("AUTOMOC"))
     {
@@ -720,15 +708,15 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
     makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
                             mocCppFile.c_str(), false);
 
-    target->AddSource(mocCppFile);
+    target->Target->AddSource(mocCppFile);
     }
 }
 
 void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                                  cmLocalGenerator* lg,
-                                                 cmTarget* target)
+                                                 cmGeneratorTarget* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
   if (qtMajorVersion == "")
@@ -825,9 +813,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
         )
     {
     std::vector<cmSourceFile*> srcFiles;
-    cmGeneratorTarget* gtgt =
-        lg->GetGlobalGenerator()->GetGeneratorTarget(target);
-    gtgt->GetConfigCommonSourceFiles(srcFiles);
+    target->GetConfigCommonSourceFiles(srcFiles);
     for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
         fileIt != srcFiles.end();
         ++fileIt)
@@ -846,7 +832,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           std::string basename = cmsys::SystemTools::
                                   GetFilenameWithoutLastExtension(absFile);
 
-          std::string rcc_output_dir = target->GetSupportDirectory();
+          std::string rcc_output_dir = target->Target->GetSupportDirectory();
           cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
           std::string rcc_output_file = rcc_output_dir;
           rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -887,7 +873,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                        workingDirectory.c_str());
     cc.SetEscapeOldStyle(false);
     cc.SetEscapeAllowMakeVars(true);
-    target->AddPreBuildCommand(cc);
+    target->Target->AddPreBuildCommand(cc);
     }
   else
 #endif
@@ -916,17 +902,17 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
     else
       {
       // inherit FOLDER property from target (#13688)
-      copyTargetProperty(autogenTarget, target, "FOLDER");
+      copyTargetProperty(gt->Target, target->Target, "FOLDER");
       }
 
-    target->AddUtility(autogenTargetName);
+    target->Target->AddUtility(autogenTargetName);
     }
 }
 
 void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
-    cmTarget const* target)
+    cmGeneratorTarget const* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   // forget the variables added here afterwards again:
   cmMakefile::ScopePushPop varScope(makefile);
@@ -947,11 +933,8 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     {
     qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
     }
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
   if (const char *targetQtVersion =
-      gtgt->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
+      target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
     {
     qtVersion = targetQtVersion;
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.h b/Source/cmQtAutoGeneratorInitializer.h
index ad5c85c..eaf140d 100644
--- a/Source/cmQtAutoGeneratorInitializer.h
+++ b/Source/cmQtAutoGeneratorInitializer.h
@@ -21,15 +21,16 @@
 #include <map>
 
 class cmSourceFile;
-class cmTarget;
+class cmGeneratorTarget;
 class cmLocalGenerator;
 
 class cmQtAutoGeneratorInitializer
 {
 public:
-  static void InitializeAutogenSources(cmTarget* target);
-  static void InitializeAutogenTarget(cmLocalGenerator* lg, cmTarget* target);
-  static void SetupAutoGenerateTarget(cmTarget const* target);
+  static void InitializeAutogenSources(cmGeneratorTarget* target);
+  static void InitializeAutogenTarget(cmLocalGenerator* lg,
+                                      cmGeneratorTarget* target);
+  static void SetupAutoGenerateTarget(cmGeneratorTarget const* target);
 };
 
 #endif

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct  5 15:01:50 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon,  5 Oct 2015 15:01:50 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1466-g6d62f50
Message-ID: <20151005190150.C3932BF9E5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6d62f50d47b15612ecfd7d29d9826edea2893d54 (commit)
       via  74d565e0e91f31e5fb25c74f998a2e4553c0842e (commit)
       via  09466690f05a2d81383409962cda2213fd366d8c (commit)
       via  0a73044579a687d1f610a3b6d65e801d2f217435 (commit)
       via  3339a7508e2d90cbc832490e64f593c1ab935097 (commit)
       via  6da4cd8fb9a2583c7ba08c403ec3a5aeb264730f (commit)
       via  94cc4e74aec3bc76e94a426d94cd1015c8a9749e (commit)
      from  91fe16a558a5eea82e57ef12945104e0f6d372c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d62f50d47b15612ecfd7d29d9826edea2893d54
commit 6d62f50d47b15612ecfd7d29d9826edea2893d54
Merge: 91fe16a 74d565e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 15:01:49 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 15:01:49 2015 -0400

    Merge topic 'clean-up-cmLocalGenerator' into next
    
    74d565e0 Remove unused cmLocalGenerator include.
    09466690 Add cmOutputConverter include where needed.
    0a730445 cmake: Remove needless cmLocalGenerator creation.
    3339a750 CTest: Port away from cmLocalGenerator.
    6da4cd8f CTest: Remove needless cmLocalGenerator creation.
    94cc4e74 CPack: Remove needless cmLocalGenerator creation.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74d565e0e91f31e5fb25c74f998a2e4553c0842e
commit 74d565e0e91f31e5fb25c74f998a2e4553c0842e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 20:45:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 20:59:56 2015 +0200

    Remove unused cmLocalGenerator include.

diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
index 43d34ee..4eb23c1 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
@@ -24,7 +24,6 @@
 #include <cmsys/RegularExpression.hxx>
 
 #include <cmGlobalGenerator.h>
-#include <cmLocalGenerator.h>
 #include <cmSystemTools.h>
 #include <cmMakefile.h>
 #include <cmGeneratedFileStream.h>
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index 70de757..db985db 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -14,7 +14,6 @@
 
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
 #include "cmMakefile.h"
 #include "cmGeneratedFileStream.h"
diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
index 6605f16..1f905c0 100644
--- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
+++ b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
@@ -14,7 +14,6 @@
 
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
 #include "cmMakefile.h"
 #include "cmGeneratedFileStream.h"
diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx
index f1e8539..f5cb53c 100644
--- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx
+++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx
@@ -14,7 +14,6 @@
 
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
 #include "cmMakefile.h"
 #include "cmGeneratedFileStream.h"
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 6cdda28..52fbdaf 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -13,7 +13,6 @@
 #include "cmCPackNSISGenerator.h"
 
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
 #include "cmMakefile.h"
 #include "cmGeneratedFileStream.h"
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx
index d533af8..8940f54 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -13,7 +13,6 @@
 
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
 #include "cmMakefile.h"
 #include "cmGeneratedFileStream.h"
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 880663f..8fdc036 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -13,7 +13,6 @@
 
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
 #include "cmMakefile.h"
 #include "cmGeneratedFileStream.h"
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 109dcb7..68b893f 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -14,7 +14,6 @@
 
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
 #include "cmMakefile.h"
 #include "cmCPackLog.h"
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 213b7ef..f6447ec 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -18,7 +18,6 @@
 #include "cmCPackGenerator.h"
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 
 #include "cmCPackLog.h"
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 6dbb245..0d74f48 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -15,7 +15,6 @@
 #include "cmCTest.h"
 #include "cmake.h"
 #include "cmMakefile.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 #include "cmGeneratedFileStream.h"
 #include "cmXMLWriter.h"
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx
index e19e4f4..36576c5 100644
--- a/Source/CTest/cmCTestStartCommand.cxx
+++ b/Source/CTest/cmCTestStartCommand.cxx
@@ -12,7 +12,6 @@
 #include "cmCTestStartCommand.h"
 
 #include "cmCTest.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 #include "cmCTestVC.h"
 #include "cmGeneratedFileStream.h"
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index 963e501..bf2f34a 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -15,7 +15,6 @@
 #include "cmCTest.h"
 #include "cmake.h"
 #include "cmMakefile.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 #include "cmVersion.h"
 #include "cmGeneratedFileStream.h"
diff --git a/Source/cmAddDependenciesCommand.cxx b/Source/cmAddDependenciesCommand.cxx
index 3a74946..01e5253 100644
--- a/Source/cmAddDependenciesCommand.cxx
+++ b/Source/cmAddDependenciesCommand.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmAddDependenciesCommand.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 
 // cmDependenciesCommand
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx
index 62fafa5..64d4fca 100644
--- a/Source/cmBuildCommand.cxx
+++ b/Source/cmBuildCommand.cxx
@@ -11,7 +11,6 @@
 ============================================================================*/
 #include "cmBuildCommand.h"
 
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 
 //----------------------------------------------------------------------
diff --git a/Source/cmEnableTestingCommand.cxx b/Source/cmEnableTestingCommand.cxx
index aa41ef7..6a7fd46 100644
--- a/Source/cmEnableTestingCommand.cxx
+++ b/Source/cmEnableTestingCommand.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmEnableTestingCommand.h"
-#include "cmLocalGenerator.h"
 
 // we do this in the final pass so that we now the subdirs have all
 // been defined
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 96ea77b..6a1d7f3 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -11,7 +11,6 @@
 ============================================================================*/
 #include "cmExportCommand.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmGeneratedFileStream.h"
 #include "cmake.h"
 
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 87faf84..df95d9d 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -15,7 +15,6 @@
 #include "cmHexFileConverter.h"
 #include "cmInstallType.h"
 #include "cmFileTimeComparison.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 #include "cmCryptoHash.h"
 #include "cmAlgorithms.h"
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index 248ce59..1a91183 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -12,7 +12,6 @@
 #include "cmGetCMakePropertyCommand.h"
 
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmake.h"
 #include "cmState.h"
 #include "cmAlgorithms.h"
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 4c42f53..617a811 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -15,7 +15,6 @@
 #include "cmState.h"
 #include "cmTest.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmSourceFile.h"
 #include "cmPropertyDefinition.h"
 
diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index 06217bb..b1c13ac 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmSetTargetPropertiesCommand.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 
 // cmSetTargetPropertiesCommand
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 86f0a7a..37383be 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -12,7 +12,6 @@
 #include "cmSourceFile.h"
 
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmSystemTools.h"
 #include "cmake.h"
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index 4a87cc2..b8d5c02 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -12,7 +12,6 @@
 #include "cmSourceFileLocation.h"
 
 #include "cmMakefile.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 #include "cmSystemTools.h"
 #include "cmAlgorithms.h"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09466690f05a2d81383409962cda2213fd366d8c
commit 09466690f05a2d81383409962cda2213fd366d8c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 20:57:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 20:58:06 2015 +0200

    Add cmOutputConverter include where needed.

diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 20448c1..a03808f 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -11,6 +11,7 @@
 ============================================================================*/
 #include "cmIfCommand.h"
 #include "cmStringCommand.h"
+#include "cmOutputConverter.h"
 
 #include "cmConditionEvaluator.h"
 
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index bff2986..5050229 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -12,7 +12,7 @@
 #include "cmListFileCache.h"
 
 #include "cmListFileLexer.h"
-#include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
 #include "cmSystemTools.h"
 #include "cmMakefile.h"
 #include "cmVersion.h"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a73044579a687d1f610a3b6d65e801d2f217435
commit 0a73044579a687d1f610a3b6d65e801d2f217435
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 20:52:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 20:52:26 2015 +0200

    cmake: Remove needless cmLocalGenerator creation.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 386f6a5..2aa092a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -378,20 +378,19 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
     this->SetHomeOutputDirectory(cmSystemTools::GetCurrentWorkingDirectory());
     cmState::Snapshot snapshot = this->GetCurrentSnapshot();
     cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
-    cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
-    lg->GetMakefile()->SetCurrentBinaryDirectory
+    mf->SetCurrentBinaryDirectory
       (cmSystemTools::GetCurrentWorkingDirectory());
-    lg->GetMakefile()->SetCurrentSourceDirectory
+    mf->SetCurrentSourceDirectory
       (cmSystemTools::GetCurrentWorkingDirectory());
     if (this->GetWorkingMode() != NORMAL_MODE)
       {
       std::string file(cmSystemTools::CollapseFullPath(path));
       cmSystemTools::ConvertToUnixSlashes(file);
-      lg->GetMakefile()->SetScriptModeFile(file.c_str());
+      mf->SetScriptModeFile(file.c_str());
 
-      lg->GetMakefile()->SetArgcArgv(args);
+      mf->SetArgcArgv(args);
       }
-    if (!lg->GetMakefile()->ReadListFile(path))
+    if (!mf->ReadListFile(path))
       {
       cmSystemTools::Error("Error processing file: ", path);
       }
@@ -1906,7 +1905,6 @@ int cmake::CheckBuildSystem()
   cm.SetHomeOutputDirectory("");
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot()));
-  cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator(mf.get()));
   if(!mf->ReadListFile(this->CheckBuildSystemArgument.c_str()) ||
      cmSystemTools::GetErrorOccuredFlag())
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3339a7508e2d90cbc832490e64f593c1ab935097
commit 3339a7508e2d90cbc832490e64f593c1ab935097
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 20:03:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 20:46:59 2015 +0200

    CTest: Port away from cmLocalGenerator.

diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index c1ba279..2f125aa 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -16,7 +16,6 @@
 #include "cmake.h"
 #include "cmFunctionBlocker.h"
 #include "cmMakefile.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 #include "cmGeneratedFileStream.h"
 
@@ -86,7 +85,6 @@ cmCTestScriptHandler::cmCTestScriptHandler()
   this->EmptyBinDir = false;
   this->EmptyBinDirOnce = false;
   this->Makefile = 0;
-  this->LocalGenerator = 0;
   this->CMake = 0;
   this->GlobalGenerator = 0;
 
@@ -128,9 +126,6 @@ void cmCTestScriptHandler::Initialize()
   delete this->Makefile;
   this->Makefile = 0;
 
-  delete this->LocalGenerator;
-  this->LocalGenerator = 0;
-
   delete this->GlobalGenerator;
   this->GlobalGenerator = 0;
 
@@ -141,7 +136,6 @@ void cmCTestScriptHandler::Initialize()
 cmCTestScriptHandler::~cmCTestScriptHandler()
 {
   delete this->Makefile;
-  delete this->LocalGenerator;
   delete this->GlobalGenerator;
   delete this->CMake;
 }
@@ -179,15 +173,14 @@ int cmCTestScriptHandler::ProcessHandler()
 
 void cmCTestScriptHandler::UpdateElapsedTime()
 {
-  if (this->LocalGenerator)
+  if (this->Makefile)
     {
     // set the current elapsed time
     char timeString[20];
     int itime = static_cast<unsigned int>(cmSystemTools::GetTime()
                                           - this->ScriptStartTime);
     sprintf(timeString,"%i",itime);
-    this->LocalGenerator->GetMakefile()->AddDefinition("CTEST_ELAPSED_TIME",
-                                                   timeString);
+    this->Makefile->AddDefinition("CTEST_ELAPSED_TIME", timeString);
     }
 }
 
@@ -316,7 +309,6 @@ void cmCTestScriptHandler::CreateCMake()
     {
     delete this->CMake;
     delete this->GlobalGenerator;
-    delete this->LocalGenerator;
     delete this->Makefile;
     }
   this->CMake = new cmake;
@@ -327,8 +319,6 @@ void cmCTestScriptHandler::CreateCMake()
 
   cmState::Snapshot snapshot = this->CMake->GetCurrentSnapshot();
   this->Makefile = new cmMakefile(this->GlobalGenerator, snapshot);
-  this->LocalGenerator =
-      this->GlobalGenerator->CreateLocalGenerator(this->Makefile);
 
   this->CMake->SetProgressCallback(ctestScriptProgressCallback, this->CTest);
 
diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h
index 42c2f20..c9d0b6a 100644
--- a/Source/CTest/cmCTestScriptHandler.h
+++ b/Source/CTest/cmCTestScriptHandler.h
@@ -18,7 +18,6 @@
 #include "cmListFileCache.h"
 
 class cmMakefile;
-class cmLocalGenerator;
 class cmGlobalGenerator;
 class cmake;
 class cmCTestCommand;
@@ -166,7 +165,6 @@ private:
   double ScriptStartTime;
 
   cmMakefile *Makefile;
-  cmLocalGenerator *LocalGenerator;
   cmGlobalGenerator *GlobalGenerator;
   cmake *CMake;
 };

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6da4cd8fb9a2583c7ba08c403ec3a5aeb264730f
commit 6da4cd8fb9a2583c7ba08c403ec3a5aeb264730f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 20:01:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 20:46:59 2015 +0200

    CTest: Remove needless cmLocalGenerator creation.

diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index fb0cce6..ca5d05a 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -728,7 +728,6 @@ int cmCTestLaunch::Main(int argc, const char* const argv[])
 
 //----------------------------------------------------------------------------
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmake.h"
 #include <cmsys/auto_ptr.hxx>
@@ -739,8 +738,6 @@ void cmCTestLaunch::LoadConfig()
   cm.SetHomeOutputDirectory("");
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot()));
-  cmsys::auto_ptr<cmLocalGenerator> lg(
-        gg.CreateLocalGenerator(mf.get()));
   std::string fname = this->LogDir;
   fname += "CTestLaunchConfig.cmake";
   if(cmSystemTools::FileExists(fname.c_str()) &&
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index f9678e7..968a307 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -24,7 +24,6 @@
 #include <cmsys/FStream.hxx>
 #include "cmMakefile.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmCommand.h"
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"
@@ -1593,8 +1592,6 @@ void cmCTestTestHandler::GetListOfTests()
   cm.SetHomeOutputDirectory("");
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot()));
-  cmsys::auto_ptr<cmLocalGenerator> lg(
-        gg.CreateLocalGenerator(mf.get()));
   mf->AddDefinition("CTEST_CONFIGURATION_TYPE",
     this->CTest->GetConfigType().c_str());
 
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 6e55d89..67eb042 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -14,7 +14,6 @@
 #include "cmCTest.h"
 #include "cmake.h"
 #include "cmMakefile.h"
-#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 #include <cmsys/Base64.h>
 #include <cmsys/Directory.hxx>
@@ -520,7 +519,6 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
   cm.SetHomeOutputDirectory("");
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot()));
-  cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator(mf.get()));
   if ( !this->ReadCustomConfigurationFileTree(this->BinaryDir.c_str(),
                                               mf.get()) )
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94cc4e74aec3bc76e94a426d94cd1015c8a9749e
commit 94cc4e74aec3bc76e94a426d94cd1015c8a9749e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 19:58:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 5 19:59:23 2015 +0200

    CPack: Remove needless cmLocalGenerator creation.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index def9fc7..2f69c25 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmCPackLog.h"
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
 #include "cmGeneratedFileStream.h"
 #include "cmCPackComponentGroup.h"
 #include "cmXMLSafe.h"
@@ -723,8 +722,6 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
         cmGlobalGenerator gg(&cm);
         cmsys::auto_ptr<cmMakefile> mf(
               new cmMakefile(&gg, cm.GetCurrentSnapshot()));
-        cmsys::auto_ptr<cmLocalGenerator> lg(
-              gg.CreateLocalGenerator(mf.get()));
         std::string realInstallDirectory = tempInstallDirectory;
         if ( !installSubDirectory.empty() && installSubDirectory != "/" )
           {
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index cb9cbc4..213b7ef 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -204,8 +204,6 @@ int main (int argc, char const* const* argv)
   cmGlobalGenerator cmgg(&cminst);
   cmsys::auto_ptr<cmMakefile> globalMF(
         new cmMakefile(&cmgg, cminst.GetCurrentSnapshot()));
-  cmsys::auto_ptr<cmLocalGenerator> cmlg(
-        cmgg.CreateLocalGenerator(globalMF.get()));
 #if defined(__CYGWIN__)
   globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0");
 #endif

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/IFW/cmCPackIFWGenerator.cxx      |    1 -
 Source/CPack/cmCPackArchiveGenerator.cxx      |    1 -
 Source/CPack/cmCPackCygwinBinaryGenerator.cxx |    1 -
 Source/CPack/cmCPackCygwinSourceGenerator.cxx |    1 -
 Source/CPack/cmCPackGenerator.cxx             |    3 ---
 Source/CPack/cmCPackNSISGenerator.cxx         |    1 -
 Source/CPack/cmCPackOSXX11Generator.cxx       |    1 -
 Source/CPack/cmCPackPackageMakerGenerator.cxx |    1 -
 Source/CPack/cmCPackSTGZGenerator.cxx         |    1 -
 Source/CPack/cpack.cxx                        |    3 ---
 Source/CTest/cmCTestBuildHandler.cxx          |    1 -
 Source/CTest/cmCTestLaunch.cxx                |    3 ---
 Source/CTest/cmCTestScriptHandler.cxx         |   14 ++------------
 Source/CTest/cmCTestScriptHandler.h           |    2 --
 Source/CTest/cmCTestStartCommand.cxx          |    1 -
 Source/CTest/cmCTestTestHandler.cxx           |    3 ---
 Source/CTest/cmCTestUpdateHandler.cxx         |    1 -
 Source/cmAddDependenciesCommand.cxx           |    1 -
 Source/cmBuildCommand.cxx                     |    1 -
 Source/cmCTest.cxx                            |    2 --
 Source/cmEnableTestingCommand.cxx             |    1 -
 Source/cmExportCommand.cxx                    |    1 -
 Source/cmFileCommand.cxx                      |    1 -
 Source/cmGetCMakePropertyCommand.cxx          |    1 -
 Source/cmGetPropertyCommand.cxx               |    1 -
 Source/cmIfCommand.cxx                        |    1 +
 Source/cmListFileCache.cxx                    |    2 +-
 Source/cmSetTargetPropertiesCommand.cxx       |    1 -
 Source/cmSourceFile.cxx                       |    1 -
 Source/cmSourceFileLocation.cxx               |    1 -
 Source/cmake.cxx                              |   12 +++++-------
 31 files changed, 9 insertions(+), 57 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Oct  6 00:01:08 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue,  6 Oct 2015 00:01:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1417-g3709e95
Message-ID: <20151006040108.87EA2BF7AC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  3709e950f4ed7545a38c2506c19ee90ee58fa920 (commit)
      from  f2791da132a42cb71384065b340ae212679fc336 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3709e950f4ed7545a38c2506c19ee90ee58fa920
commit 3709e950f4ed7545a38c2506c19ee90ee58fa920
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Oct 6 00:01:06 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 6 00:01:06 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 1fd5993..d36e648 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151005)
+set(CMake_VERSION_PATCH 20151006)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 09:10:08 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 09:10:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1469-g7581b99
Message-ID: <20151006131008.2007CBBEC3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7581b99a1b8fd2ae3f4b92c530c73fd35649ccae (commit)
       via  3758af12fab8bc3c6279400621be94c4aa540a70 (commit)
       via  3709e950f4ed7545a38c2506c19ee90ee58fa920 (commit)
      from  6d62f50d47b15612ecfd7d29d9826edea2893d54 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7581b99a1b8fd2ae3f4b92c530c73fd35649ccae
commit 7581b99a1b8fd2ae3f4b92c530c73fd35649ccae
Merge: 6d62f50 3758af1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 09:10:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 09:10:06 2015 -0400

    Merge topic 'cpack-nsis-bitmap' into next
    
    3758af12 CPackNSIS: Add options to set the bitmap for NSIS installer left side
    3709e950 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3758af12fab8bc3c6279400621be94c4aa540a70
commit 3758af12fab8bc3c6279400621be94c4aa540a70
Author:     Colin Tracey <ctracey at nvidia.com>
AuthorDate: Fri Sep 25 15:06:08 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 09:08:37 2015 -0400

    CPackNSIS: Add options to set the bitmap for NSIS installer left side
    
    set MUI_WELCOMEFINISHPAGE_BITMAP
    set MUI_UNWELCOMEFINISHPAGE_BITMAP

diff --git a/Help/release/dev/cpack-nsis-bitmap.rst b/Help/release/dev/cpack-nsis-bitmap.rst
new file mode 100644
index 0000000..c5ccfb5
--- /dev/null
+++ b/Help/release/dev/cpack-nsis-bitmap.rst
@@ -0,0 +1,6 @@
+cpack-nsis-bitmap
+-----------------
+
+* The :module:`CPackNSIS` module learned new variables to add bitmaps to the
+  installer.  See the :variable:`CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP`
+  and :variable:`CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP` variables.
diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake
index c6b3d19..db5984a 100644
--- a/Modules/CPackNSIS.cmake
+++ b/Modules/CPackNSIS.cmake
@@ -30,6 +30,14 @@
 #
 #  undocumented.
 #
+# .. variable:: CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP
+#
+#  The filename of a bitmap to use as the NSIS MUI_WELCOMEFINISHPAGE_BITMAP.
+#
+# .. variable:: CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP
+#
+#  The filename of a bitmap to use as the NSIS MUI_UNWELCOMEFINISHPAGE_BITMAP.
+#
 # .. variable:: CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS
 #
 #  Extra NSIS commands that will be added to the beginning of the install
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 76310af..1ef3d28 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -542,6 +542,8 @@ FunctionEnd
 ; Define some macro setting for the gui
 @CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
 @CPACK_NSIS_INSTALLER_ICON_CODE@
+ at CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE@
+ at CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE@
 @CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
 @CPACK_NSIS_INSTALLER_MUI_FINISHPAGE_RUN_CODE@
 
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 6cdda28..705b864 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -158,6 +158,28 @@ int cmCPackNSISGenerator::PackageFiles()
                             installerIconCode.c_str());
     }
 
+  if (this->IsSet("CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP"))
+    {
+    std::string installerBitmapCode =
+      "!define MUI_WELCOMEFINISHPAGE_BITMAP \"";
+    installerBitmapCode +=
+      this->GetOption("CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP");
+    installerBitmapCode += "\"\n";
+    this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE",
+                            installerBitmapCode.c_str());
+    }
+
+  if (this->IsSet("CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP"))
+    {
+    std::string installerBitmapCode =
+      "!define MUI_UNWELCOMEFINISHPAGE_BITMAP \"";
+    installerBitmapCode +=
+      this->GetOption("CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP");
+    installerBitmapCode += "\"\n";
+    this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE",
+                            installerBitmapCode.c_str());
+    }
+
   if(this->IsSet("CPACK_NSIS_MUI_FINISHPAGE_RUN"))
     {
     std::string installerRunCode = "!define MUI_FINISHPAGE_RUN \"$INSTDIR\\";

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/cpack-nsis-bitmap.rst |    6 ++++++
 Modules/CPackNSIS.cmake                |    8 ++++++++
 Modules/NSIS.template.in               |    2 ++
 Source/CMakeVersion.cmake              |    2 +-
 Source/CPack/cmCPackNSISGenerator.cxx  |   22 ++++++++++++++++++++++
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/cpack-nsis-bitmap.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 09:31:26 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 09:31:26 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1471-gfab3860
Message-ID: <20151006133126.7F27BBFCEC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fab3860de1e08981f48638142cb2f85a7e9897df (commit)
       via  3e72e9eb1958a5126146c21679e0812e5bddecd3 (commit)
      from  7581b99a1b8fd2ae3f4b92c530c73fd35649ccae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fab3860de1e08981f48638142cb2f85a7e9897df
commit fab3860de1e08981f48638142cb2f85a7e9897df
Merge: 7581b99 3e72e9e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 09:31:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 09:31:25 2015 -0400

    Merge topic 'cmake-script-mode-directory-vars' into next
    
    3e72e9eb Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e72e9eb1958a5126146c21679e0812e5bddecd3
commit 3e72e9eb1958a5126146c21679e0812e5bddecd3
Author:     Tamas Kenez <tamas.kenez at gmail.com>
AuthorDate: Mon Oct 5 22:12:30 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 09:23:32 2015 -0400

    Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode

diff --git a/Help/variable/CMAKE_BINARY_DIR.rst b/Help/variable/CMAKE_BINARY_DIR.rst
index f8dd8ab..3b323b7 100644
--- a/Help/variable/CMAKE_BINARY_DIR.rst
+++ b/Help/variable/CMAKE_BINARY_DIR.rst
@@ -6,3 +6,8 @@ The path to the top level of the build tree.
 This is the full path to the top level of the current CMake build
 tree.  For an in-source build, this would be the same as
 :variable:`CMAKE_SOURCE_DIR`.
+
+When run in -P script mode, CMake sets the variables
+:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
+:variable:`CMAKE_CURRENT_BINARY_DIR` and
+:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory.
diff --git a/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst b/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst
index cc3b639..40496b5 100644
--- a/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst
+++ b/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst
@@ -8,3 +8,8 @@ processed by cmake.  Each directory added by :command:`add_subdirectory` will
 create a binary directory in the build tree, and as it is being
 processed this variable will be set.  For in-source builds this is the
 current source directory being processed.
+
+When run in -P script mode, CMake sets the variables
+:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
+:variable:`CMAKE_CURRENT_BINARY_DIR` and
+:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory.
diff --git a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
index db063a4..728291e 100644
--- a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
+++ b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
@@ -5,3 +5,11 @@ The path to the source directory currently being processed.
 
 This the full path to the source directory that is currently being
 processed by cmake.
+
+When run in -P script mode, CMake sets this variable to the current
+working directory.
+
+When run in -P script mode, CMake sets the variables
+:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
+:variable:`CMAKE_CURRENT_BINARY_DIR` and
+:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory.
diff --git a/Help/variable/CMAKE_SOURCE_DIR.rst b/Help/variable/CMAKE_SOURCE_DIR.rst
index 3df0226..3644bbb 100644
--- a/Help/variable/CMAKE_SOURCE_DIR.rst
+++ b/Help/variable/CMAKE_SOURCE_DIR.rst
@@ -6,3 +6,11 @@ The path to the top level of the source tree.
 This is the full path to the top level of the current CMake source
 tree.  For an in-source build, this would be the same as
 :variable:`CMAKE_BINARY_DIR`.
+
+When run in -P script mode, CMake sets this variable to the current
+working directory.
+
+When run in -P script mode, CMake sets the variables
+:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
+:variable:`CMAKE_CURRENT_BINARY_DIR` and
+:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory.
diff --git a/Tests/RunCMake/CommandLine/P_working-dir.cmake b/Tests/RunCMake/CommandLine/P_working-dir.cmake
new file mode 100644
index 0000000..4ea0293
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/P_working-dir.cmake
@@ -0,0 +1,14 @@
+if(NOT IS_DIRECTORY "${EXPECTED_WORKING_DIR}")
+  message(FATAL_ERROR "EXPECTED_WORKING_DIR is not a directory: ${EXPECTED_WORKING_DIR}")
+endif()
+
+foreach(d CMAKE_BINARY_DIR CMAKE_CURRENT_BINARY_DIR CMAKE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+  if(NOT DEFINED ${d})
+    message(FATAL_ERROR "${d} is not defined")
+  endif()
+  if(EXPECTED_WORKING_DIR STREQUAL "${${d}}")
+    message(STATUS "${d} is the expected working directory (${EXPECTED_WORKING_DIR})")
+  else()
+    message(FATAL_ERROR "${d} = \"${${d}}\" is not the expected working directory (${EXPECTED_WORKING_DIR})")
+  endif()
+endforeach()
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index cef6368..2d94e29 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -115,6 +115,7 @@ run_cmake_command(E_sleep-bad-arg2 ${CMAKE_COMMAND} -E sleep 1 -1)
 run_cmake_command(E_sleep-one-tenth ${CMAKE_COMMAND} -E sleep 0.1)
 
 run_cmake_command(P_directory ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR})
+run_cmake_command(P_working-dir ${CMAKE_COMMAND} -DEXPECTED_WORKING_DIR=${RunCMake_BINARY_DIR}/P_working-dir-build -P ${RunCMake_SOURCE_DIR}/P_working-dir.cmake)
 
 set(RunCMake_TEST_OPTIONS
   "-DFOO=-DBAR:BOOL=BAZ")

-----------------------------------------------------------------------

Summary of changes:
 Help/variable/CMAKE_BINARY_DIR.rst             |    5 +++++
 Help/variable/CMAKE_CURRENT_BINARY_DIR.rst     |    5 +++++
 Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst     |    8 ++++++++
 Help/variable/CMAKE_SOURCE_DIR.rst             |    8 ++++++++
 Tests/RunCMake/CommandLine/P_working-dir.cmake |   14 ++++++++++++++
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake  |    1 +
 6 files changed, 41 insertions(+)
 create mode 100644 Tests/RunCMake/CommandLine/P_working-dir.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 09:34:25 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 09:34:25 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1473-g8b9266c
Message-ID: <20151006133425.52ED4BF81B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8b9266c92d3b6f2cc33ccc113a367fea04f31ba4 (commit)
       via  1451bdf2a4f86e88034b29ee7fb604f45b91f956 (commit)
      from  fab3860de1e08981f48638142cb2f85a7e9897df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b9266c92d3b6f2cc33ccc113a367fea04f31ba4
commit 8b9266c92d3b6f2cc33ccc113a367fea04f31ba4
Merge: fab3860 1451bdf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 09:34:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 09:34:24 2015 -0400

    Merge topic 'cmake-script-mode-directory-vars' into next
    
    1451bdf2 fixup! Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1451bdf2a4f86e88034b29ee7fb604f45b91f956
commit 1451bdf2a4f86e88034b29ee7fb604f45b91f956
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 09:34:18 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 09:34:18 2015 -0400

    fixup! Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode

diff --git a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
index 728291e..c1b755a 100644
--- a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
+++ b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
@@ -6,9 +6,6 @@ The path to the source directory currently being processed.
 This the full path to the source directory that is currently being
 processed by cmake.
 
-When run in -P script mode, CMake sets this variable to the current
-working directory.
-
 When run in -P script mode, CMake sets the variables
 :variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
 :variable:`CMAKE_CURRENT_BINARY_DIR` and
diff --git a/Help/variable/CMAKE_SOURCE_DIR.rst b/Help/variable/CMAKE_SOURCE_DIR.rst
index 3644bbb..416fbe1 100644
--- a/Help/variable/CMAKE_SOURCE_DIR.rst
+++ b/Help/variable/CMAKE_SOURCE_DIR.rst
@@ -7,9 +7,6 @@ This is the full path to the top level of the current CMake source
 tree.  For an in-source build, this would be the same as
 :variable:`CMAKE_BINARY_DIR`.
 
-When run in -P script mode, CMake sets this variable to the current
-working directory.
-
 When run in -P script mode, CMake sets the variables
 :variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
 :variable:`CMAKE_CURRENT_BINARY_DIR` and

-----------------------------------------------------------------------

Summary of changes:
 Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst |    3 ---
 Help/variable/CMAKE_SOURCE_DIR.rst         |    3 ---
 2 files changed, 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 09:34:38 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 09:34:38 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1475-g93d9a39
Message-ID: <20151006133438.D862ABFDB4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  93d9a39bcf9942e5763a2c67c2f100053c057eb8 (commit)
       via  8bb908b1084b5db1a6f8197a4d26b67984587ee4 (commit)
      from  8b9266c92d3b6f2cc33ccc113a367fea04f31ba4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93d9a39bcf9942e5763a2c67c2f100053c057eb8
commit 93d9a39bcf9942e5763a2c67c2f100053c057eb8
Merge: 8b9266c 8bb908b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 09:34:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 09:34:38 2015 -0400

    Merge topic 'cmake-script-mode-directory-vars' into next
    
    8bb908b1 Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bb908b1084b5db1a6f8197a4d26b67984587ee4
commit 8bb908b1084b5db1a6f8197a4d26b67984587ee4
Author:     Tamas Kenez <tamas.kenez at gmail.com>
AuthorDate: Mon Oct 5 22:12:30 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 09:34:28 2015 -0400

    Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode

diff --git a/Help/variable/CMAKE_BINARY_DIR.rst b/Help/variable/CMAKE_BINARY_DIR.rst
index f8dd8ab..3b323b7 100644
--- a/Help/variable/CMAKE_BINARY_DIR.rst
+++ b/Help/variable/CMAKE_BINARY_DIR.rst
@@ -6,3 +6,8 @@ The path to the top level of the build tree.
 This is the full path to the top level of the current CMake build
 tree.  For an in-source build, this would be the same as
 :variable:`CMAKE_SOURCE_DIR`.
+
+When run in -P script mode, CMake sets the variables
+:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
+:variable:`CMAKE_CURRENT_BINARY_DIR` and
+:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory.
diff --git a/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst b/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst
index cc3b639..40496b5 100644
--- a/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst
+++ b/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst
@@ -8,3 +8,8 @@ processed by cmake.  Each directory added by :command:`add_subdirectory` will
 create a binary directory in the build tree, and as it is being
 processed this variable will be set.  For in-source builds this is the
 current source directory being processed.
+
+When run in -P script mode, CMake sets the variables
+:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
+:variable:`CMAKE_CURRENT_BINARY_DIR` and
+:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory.
diff --git a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
index db063a4..c1b755a 100644
--- a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
+++ b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst
@@ -5,3 +5,8 @@ The path to the source directory currently being processed.
 
 This the full path to the source directory that is currently being
 processed by cmake.
+
+When run in -P script mode, CMake sets the variables
+:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
+:variable:`CMAKE_CURRENT_BINARY_DIR` and
+:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory.
diff --git a/Help/variable/CMAKE_SOURCE_DIR.rst b/Help/variable/CMAKE_SOURCE_DIR.rst
index 3df0226..416fbe1 100644
--- a/Help/variable/CMAKE_SOURCE_DIR.rst
+++ b/Help/variable/CMAKE_SOURCE_DIR.rst
@@ -6,3 +6,8 @@ The path to the top level of the source tree.
 This is the full path to the top level of the current CMake source
 tree.  For an in-source build, this would be the same as
 :variable:`CMAKE_BINARY_DIR`.
+
+When run in -P script mode, CMake sets the variables
+:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`,
+:variable:`CMAKE_CURRENT_BINARY_DIR` and
+:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory.
diff --git a/Tests/RunCMake/CommandLine/P_working-dir.cmake b/Tests/RunCMake/CommandLine/P_working-dir.cmake
new file mode 100644
index 0000000..4ea0293
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/P_working-dir.cmake
@@ -0,0 +1,14 @@
+if(NOT IS_DIRECTORY "${EXPECTED_WORKING_DIR}")
+  message(FATAL_ERROR "EXPECTED_WORKING_DIR is not a directory: ${EXPECTED_WORKING_DIR}")
+endif()
+
+foreach(d CMAKE_BINARY_DIR CMAKE_CURRENT_BINARY_DIR CMAKE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+  if(NOT DEFINED ${d})
+    message(FATAL_ERROR "${d} is not defined")
+  endif()
+  if(EXPECTED_WORKING_DIR STREQUAL "${${d}}")
+    message(STATUS "${d} is the expected working directory (${EXPECTED_WORKING_DIR})")
+  else()
+    message(FATAL_ERROR "${d} = \"${${d}}\" is not the expected working directory (${EXPECTED_WORKING_DIR})")
+  endif()
+endforeach()
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index cef6368..2d94e29 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -115,6 +115,7 @@ run_cmake_command(E_sleep-bad-arg2 ${CMAKE_COMMAND} -E sleep 1 -1)
 run_cmake_command(E_sleep-one-tenth ${CMAKE_COMMAND} -E sleep 0.1)
 
 run_cmake_command(P_directory ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR})
+run_cmake_command(P_working-dir ${CMAKE_COMMAND} -DEXPECTED_WORKING_DIR=${RunCMake_BINARY_DIR}/P_working-dir-build -P ${RunCMake_SOURCE_DIR}/P_working-dir.cmake)
 
 set(RunCMake_TEST_OPTIONS
   "-DFOO=-DBAR:BOOL=BAZ")

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 09:45:45 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 09:45:45 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1477-g6e49b3c
Message-ID: <20151006134545.2D6B3BF0DD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6e49b3c19d945d5a0822e3a8457451593b8b9369 (commit)
       via  f3a5e6f689b17b02ff433d7c313f508874b93c0f (commit)
      from  93d9a39bcf9942e5763a2c67c2f100053c057eb8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e49b3c19d945d5a0822e3a8457451593b8b9369
commit 6e49b3c19d945d5a0822e3a8457451593b8b9369
Merge: 93d9a39 f3a5e6f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 09:45:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 09:45:44 2015 -0400

    Merge topic 'refactor-qt-autogen' into next
    
    f3a5e6f6 fixup! QtAutogen: Port API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3a5e6f689b17b02ff433d7c313f508874b93c0f
commit f3a5e6f689b17b02ff433d7c313f508874b93c0f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 09:44:18 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 09:44:18 2015 -0400

    fixup! QtAutogen: Port API to cmGeneratorTarget.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index c03b5c8..2703f4c 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -105,10 +105,11 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
     }
 }
 
-static void GetCompileDefinitionsAndDirectories(cmGeneratorTarget const* target,
-                                                const std::string& config,
-                                                std::string &incs,
-                                                std::string &defs)
+static void GetCompileDefinitionsAndDirectories(
+  cmGeneratorTarget const* target,
+  const std::string& config,
+  std::string &incs,
+  std::string &defs)
 {
   std::vector<std::string> includeDirs;
   cmLocalGenerator *localGen = target->GetLocalGenerator();

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:14:02 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:14:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1479-ga5971e8
Message-ID: <20151006141402.4AE6BBE957@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a5971e8b348e48ff5bbb489992d41905f6aa5d65 (commit)
       via  fab35c95cbf47e583cbf86b1db1ac3e77ce7035e (commit)
      from  6e49b3c19d945d5a0822e3a8457451593b8b9369 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5971e8b348e48ff5bbb489992d41905f6aa5d65
commit a5971e8b348e48ff5bbb489992d41905f6aa5d65
Merge: 6e49b3c fab35c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:14:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:14:01 2015 -0400

    Merge topic 'release-cygwin-subdir' into next
    
    fab35c95 Utilities/Release: Move cygwin packages to a subdirectory


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fab35c95cbf47e583cbf86b1db1ac3e77ce7035e
commit fab35c95cbf47e583cbf86b1db1ac3e77ce7035e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:13:28 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:13:28 2015 -0400

    Utilities/Release: Move cygwin packages to a subdirectory

diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake
index c0cd761..ca590ed 100644
--- a/Utilities/Release/dash2win64_cygwin.cmake
+++ b/Utilities/Release/dash2win64_cygwin.cmake
@@ -28,4 +28,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 # allows us to produce cygwin builds in the short term.
 set(EXTRA_CTEST_ARGS "-E ExternalProject")
 
+set(LOCAL_DIR cygwin)
+
 include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index 4c4dd8a..c50602d 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -119,27 +119,34 @@ foreach(gen ${generators})
     set(SUFFIXES ${SUFFIXES} "*.exe")
   endif()
 endforeach()
+
+if(LOCAL_DIR)
+  file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${LOCAL_DIR}")
+else()
+  set(LOCAL_DIR .)
+endif()
+
 # copy all the files over from the remote machine
 set(PROJECT_PREFIX cmake-)
 foreach(suffix ${SUFFIXES})
-  message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .")
+  message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}")
   execute_process(COMMAND
-    scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .
+    scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}
     RESULT_VARIABLE result)
   if(${result} GREATER 0)
-    message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .")
+    message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}")
   endif()
 endforeach()
 
 # if there are extra files to copy get them as well
 if(extra_files)
   foreach(f ${extra_files})
-    message("scp ${HOST}:${FINAL_PATH}/${f} .")
+    message("scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}")
     execute_process(COMMAND
-      scp ${HOST}:${FINAL_PATH}/${f} .
+      scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}
       RESULT_VARIABLE result)
     if(${result} GREATER 0)
-      message("error getting file back scp ${HOST}:${FINAL_PATH}/${f} .")
+      message("error getting file back scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}")
     endif()
   endforeach()
 endif()

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/dash2win64_cygwin.cmake |    2 ++
 Utilities/Release/release_cmake.cmake     |   19 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:32:26 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:32:26 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1482-gfc4520b
Message-ID: <20151006143226.415F7BFC55@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fc4520b4b8a2656ba636fc58a4923e1b9c475c6e (commit)
       via  062473842f3c926944cbc2a32c7703bc1204890d (commit)
       via  b6702d40dd9ab512a8cd56dd202ebe8cdbdb03d9 (commit)
      from  a5971e8b348e48ff5bbb489992d41905f6aa5d65 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc4520b4b8a2656ba636fc58a4923e1b9c475c6e
commit fc4520b4b8a2656ba636fc58a4923e1b9c475c6e
Merge: a5971e8 0624738
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:32:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:32:25 2015 -0400

    Merge topic 'fix-spelling-typos' into next
    
    06247384 bootstrap: Fix spelling of "succeeded"
    b6702d40 Modules: Fix spelling of "succeeded" in check messages


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=062473842f3c926944cbc2a32c7703bc1204890d
commit 062473842f3c926944cbc2a32c7703bc1204890d
Author:     Terrell Russell <terrellrussell at gmail.com>
AuthorDate: Mon Oct 5 21:42:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:27:00 2015 -0400

    bootstrap: Fix spelling of "succeeded"

diff --git a/bootstrap b/bootstrap
index 31e9b89..ca4fd5e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -572,7 +572,7 @@ cmake_try_run ()
     echo "Test produced non-zero return code"
     return 3
   fi
-  echo "Test succeded"
+  echo "Test succeeded"
   return 0
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6702d40dd9ab512a8cd56dd202ebe8cdbdb03d9
commit b6702d40dd9ab512a8cd56dd202ebe8cdbdb03d9
Author:     Terrell Russell <terrellrussell at gmail.com>
AuthorDate: Mon Oct 5 21:42:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:26:19 2015 -0400

    Modules: Fix spelling of "succeeded" in check messages
    
    Change "succeded" to "succeeded" everywhere.

diff --git a/Modules/CheckCSourceCompiles.cmake b/Modules/CheckCSourceCompiles.cmake
index 6e80fb5..c2b1723 100644
--- a/Modules/CheckCSourceCompiles.cmake
+++ b/Modules/CheckCSourceCompiles.cmake
@@ -93,7 +93,7 @@ macro(CHECK_C_SOURCE_COMPILES SOURCE VAR)
         message(STATUS "Performing Test ${VAR} - Success")
       endif()
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n"
+        "Performing C SOURCE FILE Test ${VAR} succeeded with the following output:\n"
         "${OUTPUT}\n"
         "Source file was:\n${SOURCE}\n")
     else()
diff --git a/Modules/CheckCSourceRuns.cmake b/Modules/CheckCSourceRuns.cmake
index 0ce423c..5afeab6 100644
--- a/Modules/CheckCSourceRuns.cmake
+++ b/Modules/CheckCSourceRuns.cmake
@@ -81,7 +81,7 @@ macro(CHECK_C_SOURCE_RUNS SOURCE VAR)
         message(STATUS "Performing Test ${VAR} - Success")
       endif()
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n"
+        "Performing C SOURCE FILE Test ${VAR} succeeded with the following output:\n"
         "${OUTPUT}\n"
         "Return value: ${${VAR}}\n"
         "Source file was:\n${SOURCE}\n")
diff --git a/Modules/CheckCXXSourceCompiles.cmake b/Modules/CheckCXXSourceCompiles.cmake
index 6d52ec6..f8736e2 100644
--- a/Modules/CheckCXXSourceCompiles.cmake
+++ b/Modules/CheckCXXSourceCompiles.cmake
@@ -94,7 +94,7 @@ macro(CHECK_CXX_SOURCE_COMPILES SOURCE VAR)
         message(STATUS "Performing Test ${VAR} - Success")
       endif()
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n"
+        "Performing C++ SOURCE FILE Test ${VAR} succeeded with the following output:\n"
         "${OUTPUT}\n"
         "Source file was:\n${SOURCE}\n")
     else()
diff --git a/Modules/CheckCXXSourceRuns.cmake b/Modules/CheckCXXSourceRuns.cmake
index 3c06d75..84b661d 100644
--- a/Modules/CheckCXXSourceRuns.cmake
+++ b/Modules/CheckCXXSourceRuns.cmake
@@ -82,7 +82,7 @@ macro(CHECK_CXX_SOURCE_RUNS SOURCE VAR)
         message(STATUS "Performing Test ${VAR} - Success")
       endif()
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n"
+        "Performing C++ SOURCE FILE Test ${VAR} succeeded with the following output:\n"
         "${OUTPUT}\n"
         "Return value: ${${VAR}}\n"
         "Source file was:\n${SOURCE}\n")
diff --git a/Modules/CheckFortranSourceCompiles.cmake b/Modules/CheckFortranSourceCompiles.cmake
index f90d05b..0bdcffa 100644
--- a/Modules/CheckFortranSourceCompiles.cmake
+++ b/Modules/CheckFortranSourceCompiles.cmake
@@ -94,7 +94,7 @@ macro(CHECK_Fortran_SOURCE_COMPILES SOURCE VAR)
         message(STATUS "Performing Test ${VAR} - Success")
       endif()
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Performing Fortran SOURCE FILE Test ${VAR} succeded with the following output:\n"
+        "Performing Fortran SOURCE FILE Test ${VAR} succeeded with the following output:\n"
         "${OUTPUT}\n"
         "Source file was:\n${SOURCE}\n")
     else()

-----------------------------------------------------------------------

Summary of changes:
 Modules/CheckCSourceCompiles.cmake       |    2 +-
 Modules/CheckCSourceRuns.cmake           |    2 +-
 Modules/CheckCXXSourceCompiles.cmake     |    2 +-
 Modules/CheckCXXSourceRuns.cmake         |    2 +-
 Modules/CheckFortranSourceCompiles.cmake |    2 +-
 bootstrap                                |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:47:35 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:47:35 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1485-gf0dba83
Message-ID: <20151006144735.8F913BF35D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f0dba830863feecb9b147632ae5b49c209249dc1 (commit)
       via  d0c3bf65d560659303e6d3e96da4e6c2c749d3b8 (commit)
       via  bca73252130b7f60fc12b7bcbbc95a3153047bd3 (commit)
      from  fc4520b4b8a2656ba636fc58a4923e1b9c475c6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0dba830863feecb9b147632ae5b49c209249dc1
commit f0dba830863feecb9b147632ae5b49c209249dc1
Merge: fc4520b d0c3bf6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:47:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:47:33 2015 -0400

    Merge topic 'update-kwsys' into next
    
    d0c3bf65 Merge branch 'upstream-kwsys' into update-kwsys
    bca73252 KWSys 2015-10-06 (d79801bb)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0c3bf65d560659303e6d3e96da4e6c2c749d3b8
commit d0c3bf65d560659303e6d3e96da4e6c2c749d3b8
Merge: f2791da bca7325
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:32:55 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:32:55 2015 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bca73252130b7f60fc12b7bcbbc95a3153047bd3
commit bca73252130b7f60fc12b7bcbbc95a3153047bd3
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Tue Oct 6 10:28:20 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:32:51 2015 -0400

    KWSys 2015-10-06 (d79801bb)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ d79801bb | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 2089567a..d79801bb
    Brad King (1):
          e56e3292 Encoding: Support building on Windows with WIN32_LEAN_AND_MEAN
    
    Terrell Russell (1):
          d79801bb SystemTools: Fix spelling of "succeeded" in comments

diff --git a/EncodingCXX.cxx b/EncodingCXX.cxx
index 7d9b3e4..597d4bd 100644
--- a/EncodingCXX.cxx
+++ b/EncodingCXX.cxx
@@ -38,6 +38,7 @@
 // Windows API.
 #if defined(_WIN32)
 # include <windows.h>
+# include <shellapi.h>
 #endif
 
 namespace KWSYS_NAMESPACE
diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in
index d2d1d40..bba5a5c 100644
--- a/SystemTools.hxx.in
+++ b/SystemTools.hxx.in
@@ -703,13 +703,13 @@ public:
 
   /**
    * Create a symbolic link if the platform supports it.  Returns whether
-   * creation succeded.
+   * creation succeeded.
    */
   static bool CreateSymlink(const std::string& origName, const std::string& newName);
 
   /**
    * Read the contents of a symbolic link.  Returns whether reading
-   * succeded.
+   * succeeded.
    */
   static bool ReadSymlink(const std::string& newName, std::string& origName);
 

-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/EncodingCXX.cxx    |    1 +
 Source/kwsys/SystemTools.hxx.in |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:57:30 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:57:30 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1487-ga868359
Message-ID: <20151006145730.D18E2BFB07@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a868359d4b10a917c30174613c1aeb6bdf5d6fdf (commit)
       via  15c02cf14edd823b96660e65772a9db568a25bdc (commit)
      from  f0dba830863feecb9b147632ae5b49c209249dc1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a868359d4b10a917c30174613c1aeb6bdf5d6fdf
commit a868359d4b10a917c30174613c1aeb6bdf5d6fdf
Merge: f0dba83 15c02cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:57:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:57:30 2015 -0400

    Merge topic 'refactor-qt-autogen' into next
    
    15c02cf1 QtAutogen: Port API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15c02cf14edd823b96660e65772a9db568a25bdc
commit 15c02cf14edd823b96660e65772a9db568a25bdc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 5 19:21:30 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:56:44 2015 -0400

    QtAutogen: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 21ada71..309884f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1267,7 +1267,7 @@ bool cmGlobalGenerator::Compute()
   for (std::vector<cmGeneratorTarget const*>::iterator it =
        autogenTargets.begin(); it != autogenTargets.end(); ++it)
     {
-    cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget((*it)->Target);
+    cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(*it);
     }
 #endif
 
@@ -1451,15 +1451,14 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
 
       cmGeneratorTarget* gt = this->GetGeneratorTarget(&ti->second);
 
-      cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt->Target);
+      cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt);
       filteredTargets.push_back(gt);
       }
     for(std::vector<cmGeneratorTarget*>::iterator ti = filteredTargets.begin();
         ti != filteredTargets.end(); ++ti)
       {
-      cmTarget* target = (*ti)->Target;
       cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
-           this->LocalGenerators[i], target);
+           this->LocalGenerators[i], *ti);
       autogenTargets.push_back(*ti);
       }
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index fe888b7..2703f4c 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -25,19 +25,16 @@
 # include "cmGlobalVisualStudioGenerator.h"
 #endif
 
-static void SetupSourceFiles(cmTarget const* target,
+static void SetupSourceFiles(cmGeneratorTarget const* target,
                                    std::vector<std::string>& skipMoc,
                                    std::vector<std::string>& mocSources,
                                    std::vector<std::string>& mocHeaders,
                                    std::vector<std::string>& skipUic)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   std::vector<cmSourceFile*> srcFiles;
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  gtgt->GetConfigCommonSourceFiles(srcFiles);
+  target->GetConfigCommonSourceFiles(srcFiles);
 
   std::vector<std::string> newRccFiles;
 
@@ -67,7 +64,7 @@ static void SetupSourceFiles(cmTarget const* target,
         std::string basename = cmsys::SystemTools::
                                       GetFilenameWithoutLastExtension(absFile);
 
-        std::string rcc_output_dir = target->GetSupportDirectory();
+        std::string rcc_output_dir = target->Target->GetSupportDirectory();
         cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -104,40 +101,38 @@ static void SetupSourceFiles(cmTarget const* target,
       fileIt != newRccFiles.end();
       ++fileIt)
     {
-    const_cast<cmTarget*>(target)->AddSource(*fileIt);
+    const_cast<cmTarget*>(target->Target)->AddSource(*fileIt);
     }
 }
 
-static void GetCompileDefinitionsAndDirectories(cmTarget const* target,
-                                                const std::string& config,
-                                                std::string &incs,
-                                                std::string &defs)
+static void GetCompileDefinitionsAndDirectories(
+  cmGeneratorTarget const* target,
+  const std::string& config,
+  std::string &incs,
+  std::string &defs)
 {
-  cmMakefile* makefile = target->GetMakefile();
-  cmGlobalGenerator* globalGen = makefile->GetGlobalGenerator();
   std::vector<std::string> includeDirs;
-  cmGeneratorTarget *gtgt = globalGen->GetGeneratorTarget(target);
-  cmLocalGenerator *localGen = gtgt->GetLocalGenerator();
+  cmLocalGenerator *localGen = target->GetLocalGenerator();
   // Get the include dirs for this target, without stripping the implicit
   // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667
-  localGen->GetIncludeDirectories(includeDirs, gtgt, "CXX", config, false);
+  localGen->GetIncludeDirectories(includeDirs, target, "CXX", config, false);
 
   incs = cmJoin(includeDirs, ";");
 
   std::set<std::string> defines;
-  localGen->AddCompileDefinitions(defines, target, config, "CXX");
+  localGen->AddCompileDefinitions(defines, target->Target, config, "CXX");
 
   defs += cmJoin(defines, ";");
 }
 
-static void SetupAutoMocTarget(cmTarget const* target,
+static void SetupAutoMocTarget(cmGeneratorTarget const* target,
                           const std::string &autogenTargetName,
                           std::vector<std::string> const& skipMoc,
                           std::vector<std::string> const& mocHeaders,
                           std::map<std::string, std::string> &configIncludes,
                           std::map<std::string, std::string> &configDefines)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   const char* tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
   std::string _moc_options = (tmp!=0 ? tmp : "");
@@ -222,22 +217,20 @@ static void SetupAutoMocTarget(cmTarget const* target,
     }
 }
 
-static void GetUicOpts(cmTarget const* target, const std::string& config,
+static void GetUicOpts(cmGeneratorTarget const* target,
+                       const std::string& config,
                        std::string &optString)
 {
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
   std::vector<std::string> opts;
-  gtgt->GetAutoUicOptions(opts, config);
+  target->GetAutoUicOptions(opts, config);
   optString = cmJoin(opts, ";");
 }
 
-static void SetupAutoUicTarget(cmTarget const* target,
+static void SetupAutoUicTarget(cmGeneratorTarget const* target,
                           std::vector<std::string> const& skipUic,
                           std::map<std::string, std::string> &configUicOptions)
 {
-  cmMakefile *makefile = target->GetMakefile();
+  cmMakefile *makefile = target->Target->GetMakefile();
 
   std::set<std::string> skipped;
   skipped.insert(skipUic.begin(), skipUic.end());
@@ -340,12 +333,9 @@ static void SetupAutoUicTarget(cmTarget const* target,
     }
 }
 
-static std::string GetRccExecutable(cmTarget const* target)
+static std::string GetRccExecutable(cmGeneratorTarget const* target)
 {
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  cmMakefile *makefile = target->GetMakefile();
+  cmMakefile *makefile = target->Target->GetMakefile();
   const char *qtVersion = makefile->GetDefinition("_target_qt_version");
   if (!qtVersion)
     {
@@ -355,7 +345,8 @@ static std::string GetRccExecutable(cmTarget const* target)
       qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
       }
     if (const char *targetQtVersion =
-        gtgt->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
+        target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION",
+                                                        ""))
       {
       qtVersion = targetQtVersion;
       }
@@ -434,7 +425,7 @@ static void MergeRccOptions(std::vector<std::string> &opts,
 }
 
 std::string GetAutogenTargetName(
-    cmTarget const* target)
+    cmGeneratorTarget const* target)
 {
   std::string autogenTargetName = target->GetName();
   autogenTargetName += "_automoc";
@@ -442,9 +433,9 @@ std::string GetAutogenTargetName(
 }
 
 std::string GetAutogenTargetDir(
-    cmTarget const* target)
+    cmGeneratorTarget const* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
   std::string targetDir = makefile->GetCurrentBinaryDirectory();
   targetDir += makefile->GetCMakeInstance()->GetCMakeFilesDirectory();
   targetDir += "/";
@@ -485,7 +476,7 @@ static std::string ReadAll(const std::string& filename)
 }
 
 static std::string ListQt5RccInputs(cmSourceFile* sf,
-                                            cmTarget const* target,
+                                            cmGeneratorTarget const* target,
                                             std::vector<std::string>& depends)
 {
   std::string rccCommand
@@ -591,17 +582,14 @@ static std::string ListQt4RccInputs(cmSourceFile* sf,
   return entriesList;
 }
 
-static void SetupAutoRccTarget(cmTarget const* target)
+static void SetupAutoRccTarget(cmGeneratorTarget const* target)
 {
   std::string _rcc_files;
   const char* sepRccFiles = "";
-  cmMakefile *makefile = target->GetMakefile();
+  cmMakefile *makefile = target->Target->GetMakefile();
 
   std::vector<cmSourceFile*> srcFiles;
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
-  gtgt->GetConfigCommonSourceFiles(srcFiles);
+  target->GetConfigCommonSourceFiles(srcFiles);
 
   std::string qrcInputs;
   const char* qrcInputsSep = "";
@@ -705,9 +693,10 @@ static void SetupAutoRccTarget(cmTarget const* target)
               GetRccExecutable(target).c_str());
 }
 
-void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
+void cmQtAutoGeneratorInitializer::InitializeAutogenSources(
+    cmGeneratorTarget* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   if (target->GetPropertyAsBool("AUTOMOC"))
     {
@@ -720,15 +709,15 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources(cmTarget* target)
     makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
                             mocCppFile.c_str(), false);
 
-    target->AddSource(mocCppFile);
+    target->Target->AddSource(mocCppFile);
     }
 }
 
 void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                                  cmLocalGenerator* lg,
-                                                 cmTarget* target)
+                                                 cmGeneratorTarget* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
   if (qtMajorVersion == "")
@@ -825,9 +814,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
         )
     {
     std::vector<cmSourceFile*> srcFiles;
-    cmGeneratorTarget* gtgt =
-        lg->GetGlobalGenerator()->GetGeneratorTarget(target);
-    gtgt->GetConfigCommonSourceFiles(srcFiles);
+    target->GetConfigCommonSourceFiles(srcFiles);
     for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
         fileIt != srcFiles.end();
         ++fileIt)
@@ -846,7 +833,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           std::string basename = cmsys::SystemTools::
                                   GetFilenameWithoutLastExtension(absFile);
 
-          std::string rcc_output_dir = target->GetSupportDirectory();
+          std::string rcc_output_dir = target->Target->GetSupportDirectory();
           cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
           std::string rcc_output_file = rcc_output_dir;
           rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -887,7 +874,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                        workingDirectory.c_str());
     cc.SetEscapeOldStyle(false);
     cc.SetEscapeAllowMakeVars(true);
-    target->AddPreBuildCommand(cc);
+    target->Target->AddPreBuildCommand(cc);
     }
   else
 #endif
@@ -916,17 +903,17 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
     else
       {
       // inherit FOLDER property from target (#13688)
-      copyTargetProperty(autogenTarget, target, "FOLDER");
+      copyTargetProperty(gt->Target, target->Target, "FOLDER");
       }
 
-    target->AddUtility(autogenTargetName);
+    target->Target->AddUtility(autogenTargetName);
     }
 }
 
 void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
-    cmTarget const* target)
+    cmGeneratorTarget const* target)
 {
-  cmMakefile* makefile = target->GetMakefile();
+  cmMakefile* makefile = target->Target->GetMakefile();
 
   // forget the variables added here afterwards again:
   cmMakefile::ScopePushPop varScope(makefile);
@@ -947,11 +934,8 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(
     {
     qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
     }
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
   if (const char *targetQtVersion =
-      gtgt->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
+      target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", ""))
     {
     qtVersion = targetQtVersion;
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.h b/Source/cmQtAutoGeneratorInitializer.h
index ad5c85c..eaf140d 100644
--- a/Source/cmQtAutoGeneratorInitializer.h
+++ b/Source/cmQtAutoGeneratorInitializer.h
@@ -21,15 +21,16 @@
 #include <map>
 
 class cmSourceFile;
-class cmTarget;
+class cmGeneratorTarget;
 class cmLocalGenerator;
 
 class cmQtAutoGeneratorInitializer
 {
 public:
-  static void InitializeAutogenSources(cmTarget* target);
-  static void InitializeAutogenTarget(cmLocalGenerator* lg, cmTarget* target);
-  static void SetupAutoGenerateTarget(cmTarget const* target);
+  static void InitializeAutogenSources(cmGeneratorTarget* target);
+  static void InitializeAutogenTarget(cmLocalGenerator* lg,
+                                      cmGeneratorTarget* target);
+  static void SetupAutoGenerateTarget(cmGeneratorTarget const* target);
 };
 
 #endif

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:58:59 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:58:59 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1431-g9d5bfa5
Message-ID: <20151006145859.8D760BFB8B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  9d5bfa53e63c894b1c774258882877f57d61638f (commit)
       via  15c02cf14edd823b96660e65772a9db568a25bdc (commit)
       via  f7738fd122ac38fb3785e6366193fe5095b23b88 (commit)
       via  b2054e1661e5c607cf25e1ac127982f58e29dd44 (commit)
       via  1e757c318b38566aea1c9312a6fb5a3accd3966b (commit)
       via  5fb730174dc5e0c07dfc7aec27e3d6e60c79e3d3 (commit)
       via  86f7fc5d55da5cf569c516f2d1fb8b69603c1be2 (commit)
       via  2aa3f500c49e6c81f4d4b821d6ae71ef2589cb07 (commit)
       via  59b91107d16c2f2ba68791ae67c53bdcc0d32e05 (commit)
       via  7254f6452596f438f0607ece559be7ad556b190a (commit)
       via  975b753997849507684da7d529d1bbe0ffd3ade9 (commit)
       via  f75ec6044c593d0ff042e13b940d2c674910b683 (commit)
       via  f3158e45b8fde882603e1d9b2262a5c64e25c1ee (commit)
       via  493b17f8c7fb171fd7ca36cc0b29257939609298 (commit)
      from  3709e950f4ed7545a38c2506c19ee90ee58fa920 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d5bfa53e63c894b1c774258882877f57d61638f
commit 9d5bfa53e63c894b1c774258882877f57d61638f
Merge: 3709e95 15c02cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:58:58 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:58:58 2015 -0400

    Merge topic 'refactor-qt-autogen'
    
    15c02cf1 QtAutogen: Port API to cmGeneratorTarget.
    f7738fd1 cmLocalGenerator: Constify target in API.
    b2054e16 QtAutogen: Port global generator to cmGeneratorTarget.
    1e757c31 QtAutogen: Use a target type between loops.
    5fb73017 QtAutogen: Make some private statics file static.
    86f7fc5d QtAutogen: Move SetupAutoRccTarget method.
    2aa3f500 QtAutogen: Move MergeRccOptions method.
    59b91107 QtAutogen: Move GetRccExecutable method.
    7254f645 QtAutogen: Move SetupAutoUicTarget method.
    975b7539 QtAutogen: Move GetUicOpts method.
    f75ec604 QtAutogen: Move SetupAutoMocTarget method.
    f3158e45 QtAutogen: Move GetCompileDefinitionsAndDirectories method.
    493b17f8 QtAutogen: Move SetupSourceFiles method.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx            |   30 +-
 Source/cmGlobalGenerator.h              |    2 +-
 Source/cmLocalGenerator.cxx             |    2 +-
 Source/cmLocalGenerator.h               |    2 +-
 Source/cmQtAutoGeneratorInitializer.cxx | 1692 +++++++++++++++----------------
 Source/cmQtAutoGeneratorInitializer.h   |   41 +-
 6 files changed, 854 insertions(+), 915 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:59:02 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:59:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1439-gc914d2b
Message-ID: <20151006145902.E7985BFBA2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  c914d2bda278b588c1dca3e0fa5ec97a64c56c3c (commit)
       via  616f03114eb41218dc3278e72b52d8de09e40365 (commit)
       via  9eea0486bfe5dfd497e6a8fca9e3c2551169c24e (commit)
       via  2eca0559881c36061f84ea4fcd955ac32d9d427a (commit)
       via  21f428f4c0adf7045e852be30739cd1243aa96fe (commit)
       via  a9588e90bbddbfe71b1d33d63d38eedaf397023f (commit)
       via  4407eee01365d89d370d8e8b89f3ec0a65420046 (commit)
       via  a09c545d3a518d771b66b59f92821af3d55d7d4b (commit)
      from  9d5bfa53e63c894b1c774258882877f57d61638f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c914d2bda278b588c1dca3e0fa5ec97a64c56c3c
commit c914d2bda278b588c1dca3e0fa5ec97a64c56c3c
Merge: 9d5bfa5 616f031
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:59:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:59:00 2015 -0400

    Merge topic 'refactor-computation'
    
    616f0311 cmGlobalGenerator: Move path computation to Compute.
    9eea0486 cmGlobalGenerator: Do more computation at compute time.
    2eca0559 cmGlobalGenerator: De-virtualize Compute().
    21f428f4 VisualStudio: Replace Compute override with AddExtraIDETargets override.
    a9588e90 VisualStudio10: Initialize the LongestSource at generate time.
    4407eee0 cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute().
    a09c545d Xcode: Extract a AddExtraIDETargets method.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx               |   26 +++++++++++++-------------
 Source/cmGlobalGenerator.h                 |    3 ++-
 Source/cmGlobalVisualStudio10Generator.cxx |   12 +-----------
 Source/cmGlobalVisualStudio10Generator.h   |    2 --
 Source/cmGlobalVisualStudio8Generator.cxx  |    9 ++-------
 Source/cmGlobalVisualStudio8Generator.h    |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |    8 +-------
 Source/cmGlobalVisualStudioGenerator.h     |    2 +-
 Source/cmGlobalXCodeGenerator.cxx          |    9 +--------
 Source/cmGlobalXCodeGenerator.h            |    2 +-
 10 files changed, 23 insertions(+), 52 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:59:07 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:59:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1446-g53d90de
Message-ID: <20151006145907.DA793BFB95@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  53d90de3d9b536bcee45acc40183569895a9776e (commit)
       via  74d565e0e91f31e5fb25c74f998a2e4553c0842e (commit)
       via  09466690f05a2d81383409962cda2213fd366d8c (commit)
       via  0a73044579a687d1f610a3b6d65e801d2f217435 (commit)
       via  3339a7508e2d90cbc832490e64f593c1ab935097 (commit)
       via  6da4cd8fb9a2583c7ba08c403ec3a5aeb264730f (commit)
       via  94cc4e74aec3bc76e94a426d94cd1015c8a9749e (commit)
      from  c914d2bda278b588c1dca3e0fa5ec97a64c56c3c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53d90de3d9b536bcee45acc40183569895a9776e
commit 53d90de3d9b536bcee45acc40183569895a9776e
Merge: c914d2b 74d565e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:59:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:59:06 2015 -0400

    Merge topic 'clean-up-cmLocalGenerator'
    
    74d565e0 Remove unused cmLocalGenerator include.
    09466690 Add cmOutputConverter include where needed.
    0a730445 cmake: Remove needless cmLocalGenerator creation.
    3339a750 CTest: Port away from cmLocalGenerator.
    6da4cd8f CTest: Remove needless cmLocalGenerator creation.
    94cc4e74 CPack: Remove needless cmLocalGenerator creation.


-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/IFW/cmCPackIFWGenerator.cxx      |    1 -
 Source/CPack/cmCPackArchiveGenerator.cxx      |    1 -
 Source/CPack/cmCPackCygwinBinaryGenerator.cxx |    1 -
 Source/CPack/cmCPackCygwinSourceGenerator.cxx |    1 -
 Source/CPack/cmCPackGenerator.cxx             |    3 ---
 Source/CPack/cmCPackNSISGenerator.cxx         |    1 -
 Source/CPack/cmCPackOSXX11Generator.cxx       |    1 -
 Source/CPack/cmCPackPackageMakerGenerator.cxx |    1 -
 Source/CPack/cmCPackSTGZGenerator.cxx         |    1 -
 Source/CPack/cpack.cxx                        |    3 ---
 Source/CTest/cmCTestBuildHandler.cxx          |    1 -
 Source/CTest/cmCTestLaunch.cxx                |    3 ---
 Source/CTest/cmCTestScriptHandler.cxx         |   14 ++------------
 Source/CTest/cmCTestScriptHandler.h           |    2 --
 Source/CTest/cmCTestStartCommand.cxx          |    1 -
 Source/CTest/cmCTestTestHandler.cxx           |    3 ---
 Source/CTest/cmCTestUpdateHandler.cxx         |    1 -
 Source/cmAddDependenciesCommand.cxx           |    1 -
 Source/cmBuildCommand.cxx                     |    1 -
 Source/cmCTest.cxx                            |    2 --
 Source/cmEnableTestingCommand.cxx             |    1 -
 Source/cmExportCommand.cxx                    |    1 -
 Source/cmFileCommand.cxx                      |    1 -
 Source/cmGetCMakePropertyCommand.cxx          |    1 -
 Source/cmGetPropertyCommand.cxx               |    1 -
 Source/cmIfCommand.cxx                        |    1 +
 Source/cmListFileCache.cxx                    |    2 +-
 Source/cmSetTargetPropertiesCommand.cxx       |    1 -
 Source/cmSourceFile.cxx                       |    1 -
 Source/cmSourceFileLocation.cxx               |    1 -
 Source/cmake.cxx                              |   12 +++++-------
 31 files changed, 9 insertions(+), 57 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:59:10 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:59:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1448-g5d315f3
Message-ID: <20151006145910.10C8BBFB96@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  5d315f32236dfebf3561789d17aaaab2d86c504d (commit)
       via  821e17785ecd4a329842dc6c5b093eb30cc4f160 (commit)
      from  53d90de3d9b536bcee45acc40183569895a9776e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d315f32236dfebf3561789d17aaaab2d86c504d
commit 5d315f32236dfebf3561789d17aaaab2d86c504d
Merge: 53d90de 821e177
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:59:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:59:08 2015 -0400

    Merge topic 'FindOpenSSL-msvc-static-rt'
    
    821e1778 FindOpenSSL: Add support for static MSVC runtime


-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindOpenSSL-msvc-static-rt.rst |    6 ++++++
 Modules/FindOpenSSL.cmake                       |   17 ++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 Help/release/dev/FindOpenSSL-msvc-static-rt.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:59:15 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:59:15 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master, updated. v3.3.2-1451-g256bf88
Message-ID: <20151006145915.442D3BFBA2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  256bf8876a2e460afc37dbe17eb34482944be20b (commit)
       via  d945b36a93ab9f935c4e369d5c75be8b47d48f7a (commit)
       via  48f8b6acf3a8083b5a52bbe1ec3adc10c515d710 (commit)
      from  5d315f32236dfebf3561789d17aaaab2d86c504d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=256bf8876a2e460afc37dbe17eb34482944be20b
commit 256bf8876a2e460afc37dbe17eb34482944be20b
Merge: 5d315f3 d945b36
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:59:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:59:13 2015 -0400

    Merge topic 'cmGeneratorTarget-exports'
    
    d945b36a cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget.
    48f8b6ac cmExportFileGenerator: Evaluate genex with cmGeneratorTarget.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportFileGenerator.cxx           |   14 ++++++++------
 Source/cmExportTryCompileFileGenerator.cxx |    8 ++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 10:59:34 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 10:59:34 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.3.2-1493-g5f80b1b
Message-ID: <20151006145934.AEC39BFB95@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5f80b1b146e2f39b8998cb49ff734e2fc5bcac91 (commit)
       via  256bf8876a2e460afc37dbe17eb34482944be20b (commit)
       via  5d315f32236dfebf3561789d17aaaab2d86c504d (commit)
       via  53d90de3d9b536bcee45acc40183569895a9776e (commit)
       via  c914d2bda278b588c1dca3e0fa5ec97a64c56c3c (commit)
       via  9d5bfa53e63c894b1c774258882877f57d61638f (commit)
      from  a868359d4b10a917c30174613c1aeb6bdf5d6fdf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f80b1b146e2f39b8998cb49ff734e2fc5bcac91
commit 5f80b1b146e2f39b8998cb49ff734e2fc5bcac91
Merge: a868359 256bf88
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:59:27 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:59:27 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From robert.maynard at kitware.com  Tue Oct  6 11:41:54 2015
From: robert.maynard at kitware.com (Robert Maynard)
Date: Tue,  6 Oct 2015 11:41:54 -0400 (EDT)
Subject: [Cmake-commits] CMake annotated tag, v3.4.0-rc1, created. v3.4.0-rc1
Message-ID: <20151006154154.7DE5CBCE7B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The annotated tag, v3.4.0-rc1 has been created
        at  2b9bd8ea2dff25c70bb2067383c977e3db40dc67 (tag)
   tagging  679a5d2185b15dcd0ff73f7c1c2d7d527c53de53 (commit)
  replaces  v3.3.2
 tagged by  Brad King
        on  Tue Oct 6 10:45:01 2015 -0400

- Log -----------------------------------------------------------------
CMake 3.4.0-rc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJWE95tAAoJEC0s7xA0khaEQGQP/R6aq8wnFaijocRVsagJQsnz
aFmZwioY/Q4q/q+Sk8qrNjnpf+agbjgVqprMkxiUyoYIu27pTTJ6JjP1qX56kPX8
f3QRx6evUnKbM7r2gw3a87qFfy6olKHd1sJH1MR/YOKzfbP0G4GeVacoFEODDuJE
GVN5e6OukFEJ+/6NGOsySPLZ1pxkNGFDPVUJSdEf4rtQfGvFyD+yaJVGwPXQ9F3H
m2DT4HLwzidITYLzxt6vl929wvOsMXE6t2GFHqIY1xTilyUQ6+oFNzFNbIGBngml
WZIr6as/cqSOW2DeW56HIVmr9Teih0GbH15fSAxgYMDU7BEmwuAtBTs1tNQRc/vU
ZKNiaJQCnlVqJoSdmecmabAT02Dc5UZ6/bagjVC/TVl1xJasLhwXW/5CfQ+u+CYD
6B0D05lRWOBaCjMIWBE0oXkzNTi/CkTDFjOVNRQOIGpj0R+JhEqFXzibo2BbH/8B
z4aT/IJsNrm7CLLT+vZcOXSzEc5Et49JZQg55t7COeFZ8v0c+OzlI+9VF4DHAG0R
S/phccmoO1rG9AzREaya1Nmz+yTWv1G/NmyMGJM5hK6ZaQe5lxYgFOG2G9imLHHu
+B/KSd07GDHhhCmBkXFo17vUTJCf1wftdFw9bmdpqosqKhXoCMJJ/z1UdhdvfP73
9loelpmtI4qF+65RCMuA
=1wLg
-----END PGP SIGNATURE-----

A. Jo?l Lamotte (2):
      FindProtobuf: Search x64 directories in VS-built protobuf source (#14833)
      ExternalProject: Tell "hg clone" not to implicitly update

Alex Turbov (1):
      GNUInstallDirs: Add special cases for certain prefixes

Andreas Bergmeier (1):
      FindProtobuf: Add protobuf_generate_python function

Bastien Schatt (1):
      cmLocalVisualStudioGenerator: Use computed .obj extension (#13685)

Ben Boeckel (7):
      cmake: add --trace-expand option
      FindPkgConfig: use execute_process to strip trailing whitespace
      CTestCoverageCollectGCOV: replace tabulators
      CTEST_CUSTOM_*: treat variables as lists
      ctest_read_custom_files: mention that ctest does this automatically
      FindPkgConfig: add a command to query arbitrary variables
      Help: document CTEST_CUSTOM_* variables

Ben Webb (1):
      FindSWIG: Do not generate erroneous outputs with -noproxy

Betsy McPhail (2):
      ctest: Optionally avoid starting tests that may exceed a given CPU load
      CTest: Show the number of tests for each label in the summary

Bill Hoffman (12):
      Add options to launch the compiler through tools like ccache or distcc
      FindCUDA: Resolve a host compiler symlink only if it is Apple cc -> clang
      bindexplib: Import original implementation from CERN
      bindexplib: Add copyright/license notice block
      bindexplib: Drop code that CMake does not need
      bindexplib: Wrap long lines
      bindexplib: Build source as part of CMakeLib
      bindexplib: Teach DumpFile to return errors
      bindexplib: Fix treatment of some symbols
      bindexplib: Add support for "/bigobj" format objects
      Windows: Optionally generate DLL module definition files automatically
      Windows: Fix 64-bit DLL module definition file generation on VS 2015

Bill Somerville (2):
      GetPrerequisites: Add error checks for execute_process() calls
      GetPrerequisites: Optionally filter "objdump" output for speed

Brad King (590):
      Merge branch 'release'
      Begin post-3.3 development
      CTest: Capture test stdout/stderr through one pipe (#15600)
      VS: Compute project GUIDs deterministically
      Merge topic 'CPackDeb-dpkg-shlibdeps-check-flag'
      Merge topic 'vs-deterministic-guid'
      Merge topic 'ctest-merge-test-output'
      Merge topic 'minor-cleanups'
      Merge topic 'rename-cmState-API'
      Merge topic 'remove-CMAKE_USE_RELATIVE_PATHS'
      Merge topic 'cmMakefile-Configure'
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge branch 'release'
      Merge topic 'update-kwsys'
      Help: Add notes for topic 'ExternalProject_init_selected_submodules'
      Merge topic 'ExternalProject_init_selected_submodules'
      Merge topic 'doc-add_custom_command-clarify-TARGET_FILE'
      Merge topic 'vs-deterministic-guid'
      Merge topic 'extract-cmLinkedTree'
      Merge topic 'extract-cmOutputConverter'
      Merge topic 'move-Feature-API'
      Merge topic 'minor-cleanups'
      Merge topic 'clean-up-cmMakefile'
      Merge topic 'data-layout'
      Help: Document CMAKE_SYSTEM_FRAMEWORK_PATH variable
      Help: Document CMAKE_SYSTEM_APPBUNDLE_PATH variable
      Help: Document CMAKE_FIND_APPBUNDLE and CMAKE_FIND_FRAMEWORK
      Help: Improve documentation formatting of find_* commands
      Help: Document find_* command versioned/unversioned name ordering
      Utilities/Release: Update to more recent Qt 4.8 on OS X
      Merge topic 'FindwxWidgets-versioned-executable'
      Merge topic 'cmake-gui-osx-install-command-line'
      Merge topic 'revert-mingw-no-find_library-dll'
      Merge topic 'ctest-script-mode-no-legacy-cygwin'
      Merge topic 'doc-drop-incorrect-cmake-developer-advice'
      Merge topic 'doc-find-command-cleanup'
      Merge topic 'doc-find-versioned-location'
      Merge topic 'doc-formatting'
      Merge topic 'move-CMP0059-handling'
      Merge topic 'binary-release-osx-qt-4.8-update'
      FindBISON: Improve documentation formatting
      Merge topic 'doc-policy-OLD-deprecated'
      Merge branch 'release'
      Merge branch 'release'
      Tests: Simplify CTest.UpdateGIT QUIET mode test
      Tests: Teach CTest.Update* tests to check ctest_update return code
      ctest_update: Fix RETURN_VALUE on VCS tool failure (#15610)
      Help: Add notes for topic 'FindBISON-DEFINES_FILE'
      Merge topic 'minor-cleanups'
      Merge topic 'fix-CMP0009-future-states'
      Merge topic 'FindBISON-DEFINES_FILE'
      Tests: Extend RunCMake.CommandLine to cover --build with no arg
      cmake: Fix --build <relative-dir> for VS generators (#15609)
      Merge topic 'fix-fast-special-targets'
      Merge topic 'ctest_update-RETURN_VALUE'
      Merge topic 'compiler-launcher'
      Merge topic 'FindCUDA-fix-ccache'
      Fix preprocessor checks WIN32 => _WIN32
      Utilities/Release: Update to openssl-1.0.2c
      Merge branch 'upstream-kwsys' into update-kwsys
      GNUInstallDirs: Improve documentation formatting
      Merge topic 'cpack-rpm-and-deb-runcmake-tests'
      Merge topic 'cmake--build-dir'
      Merge topic 'fix-windows-preprocessor-checks'
      Merge topic 'update-prebuilt-openssl'
      GNU: Drop -rdynamic flag from Fortran
      GNUInstallDirs: Add test cases
      Help: Add notes for topic 'GNUInstallDirs-special-prefixes'
      Merge topic 'GNUInstallDirs-doc-format'
      Merge topic 'quote-doxygen-tools'
      Merge topic 'update-kwsys'
      Merge topic 'linux-GNU-Fortran-no-rdynamic'
      CMakeDetermineCompilerId: Optionally try some flags before no flags
      CMakeDetermineCompilerId: Refactor id build/check loop logic
      CMakeDetermineCompilerId: Try matching compiler output to detect id
      Add support for Concurrent Fortran 77 Compiler
      Help: Add notes for topic 'ConcurrentFortran-compiler-id'
      Merge topic 'Embarcadero-ninja-link-pool'
      Merge topic 'doc-CMAKE_GENERATOR_PLATFORM-typo'
      Merge topic 'ConcurrentFortran-compiler-id'
      Merge topic 'GNUInstallDirs-special-prefixes'
      Merge branch 'release'
      QtAutogen: Always run autogen step even when rcc is enabled (#15608)
      Merge branch 'fix-function-missing-end' into release-3.2
      Merge topic 'doc-cmake-buildsystem-typo'
      Merge topic 'fix-Qt5Autogen-test'
      Merge topic 'clean-up-cmListFileArgument'
      Merge topic 'clean-up-ReadListFile'
      Merge topic 'minor-cleanups'
      QtAutogen: Add comment explaining why rcc cannot use PRE_BUILD
      Merge topic 'qt-autogen-always-run'
      Merge topic 'fix-function-missing-end'
      Merge topic 'use-generator-target'
      Merge branch 'release-3.2'
      Merge branch 'release'
      Export: Escape exported property values when writing CMake language files
      Merge topic 'FindIce-updates'
      Merge topic 'emacs-mode-prog-mode-hooks'
      Merge topic 'cmake-gui-osx-install-command-line'
      Merge topic 'export-escaping'
      Merge topic 'doc-ctest_test-STRIDE-typo'
      Merge topic 'doc-find-path-variables'
      Merge topic 'doc-CheckIncludeFile-distinction'
      CMakeDetermineCompilerId: Simplify src reference in IDE projects
      Merge topic 'fix-target_link_libraries-wrong-dir'
      Merge branch 'release'
      VS: Add /machine: flag to Librarian tool (#11240)
      Merge branch 'release'
      Merge topic 'FindMatlab-doc-section-headers'
      Merge topic 'vs-librarian-machine-flag-default'
      Merge topic 'compiler-id-simplify-ide-src'
      enable_language: Allow CMakeDetermine<LANG>Compiler module to fail early
      CMakeDetermineCompilerId: Use per-language regex to match Xcode compiler tool
      Tests: Teach RunCMake infrastructure to optionally timeout
      cmSystemTools: Add StringToULong helper
      Merge topic 'enable_language-fail-earlier'
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge topic 'compiler-id-xcode-tool-per-language'
      Merge topic 'clean-up-cmMakefile'
      Merge topic 'use-generator-target'
      Merge topic 'update-kwsys'
      CONTRIBUTING: Spell "offered" correctly
      README: Fix typo "the the" => "the"
      XL: Drop -qalias=noansi from default C flags
      Merge topic 'ctest-test-load'
      Merge topic 'fix-readme-typos'
      Merge topic 'xlc-no-qalias-flag'
      Merge topic 'show-number-of-tests'
      Add rudimentary support for the Apple Swift language with Xcode
      Utilities/Sphinx: Add CMake_OPTIONAL_COMPONENT macro
      Merge topic 'osx-pythondotorg-libs'
      Merge topic 'fortran-module-preprocessor-defs'
      Merge topic 'ctest-progress-ticks'
      Merge topic 'refactor-cmListFileBacktrace'
      Merge topic 'ExternalProject-USES_TERMINAL'
      Merge topic 'tar-portability'
      Merge branch 'release'
      cmake: Preserve cached CMAKE_GENERATOR when an error occurs (#15640)
      Merge branch 'upstream-kwsys' into update-kwsys
      cmLocalGenerator: Remove unused include
      cmLocalVisualStudio7Generator: Remove unused include
      cmOutputConverter: Adopt EscapeWindowsShellArgument method
      cmOutputConverter: Adopt command line escaping code
      Merge topic 'auto_export_dll_symbols'
      Merge topic 'add-apple-swift-language'
      Merge topic 'cmake-install-components'
      Merge topic 'preserve-generator-on-failure'
      Merge topic 'string-append'
      AppleClang: Use modern C++14 standard flags for Apple Clang 6.1
      Merge topic 'update-kwsys'
      Merge topic 'empty-LINK_LIBRARIES'
      Merge topic 'CheckCompilerFlag-do-not-use-FLAGS'
      Merge topic 'eclipse-cygwin-paths'
      Merge topic 'cpack-ifw-framework-version'
      Merge topic 'FindXercesC-versioned-library'
      Help: Add notes for topic 'FindIce-imported-targets'
      Add common base classes to Makefile and Ninja generators
      cmCommonTargetGenerator: Adopt basic target generator members
      cmLocalUnixMakefileGenerator3: Provide GetConfigName() accessor
      cmLocalCommonGenerator: Adopt ConfigName member
      cmCommonTargetGenerator: Adopt ConfigName member
      cmCommonTargetGenerator: Adopt GetFeature and friends
      cmCommonTargetGenerator: Adopt ModuleDefinitionFile member
      cmCommonTargetGenerator: Adopt Convert method
      cmCommonTargetGenerator: Adopt AddFortranFlags and friends
      cmCommonTargetGenerator: Adopt AppendFortranFormatFlags
      cmCommonTargetGenerator: Adopt GetFrameworkFlags
      cmNinjaTargetGenerator: Add Fortran flag generation
      cmNinjaTargetGenerator: Factor out AddIncludeFlags helper
      cmMakefileTargetGenerator: Fix comment typo
      cmNinjaTargetGenerator: Add OX X framework flags
      cmCommonTargetGenerator: Adopt GetFlags method
      cmCommonTargetGenerator: Adopt GetDefines method
      cmNinjaTargetGenerator: Use GetDefines method
      Help: Improve OUTPUT_NAME documentation formatting
      cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
      Merge topic 'compiler-feature-AppleClang-std-flags'
      Merge topic 'FindIce-imported-targets'
      Merge topic 'move-command-line-escape-code'
      Merge topic 'factor-out-common-generator'
      Merge topic 'OUTPUT_NAME-genex'
      Merge topic 'autorcc-qt-5.1'
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge topic 'update-kwsys'
      Utilities/Release: Update to openssl-1.0.2d
      Merge topic 'update-prebuilt-openssl'
      Merge topic 'FindMPI-Intel-5'
      Merge topic 'fix-command-rename'
      Merge branch 'release'
      cmNinjaTargetGenerator: Restore addition of Fortran format flags
      Place <DEFINES> before <FLAGS> consistently across compilers
      Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables
      Merge branch 'release'
      Tests: Move CTestTestConfigFileInBuildDir into RunCMake.ctest_start
      Tests: Move command failure cases into RunCMake infrastructure
      Merge topic 'factor-out-common-generator'
      Merge topic 'FindXercesC-versioned-library-2'
      Merge topic 'refactor-rule-var-includes'
      Merge topic 'coverage_no_tests'
      CMakeGenericSystem: Recognize Watcom WMake generator as Makefile generator
      Tests: Add test for TARGET_MESSAGES global property
      Help: Link to cmake-properties.7 manual from set_property docs
      Help: Link to cmake-properties.7 manual from set_target_properties docs
      Help: Document Apple Framework creation with an example (#15651)
      Merge topic 'tests-no-match-full-path'
      Merge topic 'doc-set_target_properties-cleanup'
      Merge topic 'doc-apple-framework-creation'
      Merge topic 'add-Euros-platform-module'
      Merge topic 'vs-nsight-tegra-attributes'
      Merge topic 'makefile-target-messages'
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge topic 'update-kwsys'
      Merge topic 'cpack-per-component-extra-control-file'
      Merge topic 'ctest-change-id'
      CMakeExpandImportedTargets: Document as deprecated
      Merge topic 'doc-CMakeExpandImportedTargets-deprecated'
      Merge topic 'remove-ListFileStack'
      Merge topic 'minor-cleanups'
      Merge topic 'clean-up-include_regular_expression'
      Merge topic 'remove-Properties-accessor'
      Merge topic 'cmState-Directory'
      Merge topic 'remove-special-LINK_DIRECTORIES-handling'
      Merge topic 'remove-special-MACROS-handling'
      Merge topic 'KDE4-NO_POLICY_SCOPE'
      Help: Add notes for topic 'doc-CMakeExpandImportedTargets-deprecated'
      Merge topic 'doc-CMakeExpandImportedTargets-deprecated'
      Merge branch 'release'
      Tests: Teach RunCMake.export to enable languages only when needed
      export: Reject custom target exports earlier (#15657)
      Merge topic 'vs-compiler-feature-2015-update'
      Merge branch 'release'
      Merge topic 'FindBZip2-check-with-prototype'
      Merge topic 'target-directory-properties'
      Merge topic 'export-no-custom-target'
      Tests: Extend BuildDepends test to cover OBJECT_DEPENDS
      Merge topic 'test-OBJECT_DEPENDS'
      Merge topic 'osx-iframework'
      Merge branch 'release'
      Utilities/Release: Drop IBM AIX release scripts
      Merge branch 'release'
      cmState: Fix compilation on IBM XL compiler
      Merge topic 'cmRange-API'
      Merge topic 'refactor-cmMakefile-properties'
      Merge topic 'policy-refactor'
      Merge topic 'drop-aix-release-scripts'
      Merge topic 'trace-expand'
      cmDependsFortranLexer: Remove trailing blank line
      cmDependsFortran: Move FindIncludeFile method into parser class
      cmDependsFortran: Simplify storage of preprocessor definitions
      cmFortranParser: Factor out of cmDependsFortran
      cmFortranParser: Port to bison 3
      cmNinjaTargetGenerator: Factor out compile command exporter
      Merge topic 'emacs-mode-updates'
      Merge topic 'fortran-parser-updates'
      Merge topic 'refactor-ninja-command-exporter'
      Merge topic 'cmake-gui-install-plugin'
      Merge topic 'cmake-install-dependencies-option'
      Merge topic 'ctest-add_subdirectory-crash'
      Merge topic 'cmConditionEvaluator-minor-cleanup'
      Merge topic 'use-generator-target'
      cmCommonTargetGenerator: Adopt linked target directory computation
      Merge topic 'ninja-implib-byproduct'
      Merge topic 'minor-cleanups'
      cmMakefile: Return target from all AddUtilityCommand signatures
      cmDependsFortran: Use string to store module directory
      cmCommonTargetGenerator: Return string from GetFortranModuleDirectory
      cmCommonTargetGenerator: Store working directory for relative paths
      cmCommonTargetGenerator: Factor out Fortran module directory computation
      Merge topic 'cmCommonTargetGenerator-GetLinkedTargetDirectories'
      Merge topic 'refactor-fortran-module-directory'
      SunOS: Drop special case for linking C++ shared libraries with gcc (#15673)
      Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)
      Merge topic 'fix-cray-version'
      Merge topic 'SunOS-link-CXX-normally'
      Merge topic 'refactor-install'
      Merge topic 'cmake-W-options'
      Merge topic 'FindOpenSSL-cleanup'
      Merge topic 'doc-string-FIND-failure-case'
      Merge branch 'upstream-kwsys' into update-kwsys
      CTestCustom: Ignore kwsys.testProcess-10 for MemCheck as KWSys does
      Tests: In CTestTest2 skip the kwsys.testProcess-10 test that leaks
      FindMPI: Drop unnecessary and incorrect use of GetPrerequisites
      Merge topic 'update-kwsys'
      Merge topic 'fix-xcode-quoting'
      Merge topic 'fix-windows-version-detection'
      Merge topic 'FindMPI-drop-GetPrerequisites'
      Merge topic 'GetPrerequisites-updates'
      Merge topic 'if-test'
      cmake: Do not treat developer warnings as errors by default in scripts
      Help: Refine RULE_LAUNCH_{COMPILE,CUSTOM,LINK} global property docs
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge topic 'cmake-W-options'
      Merge topic 'doc-ninja-rule-launchers'
      Merge topic 'update-kwsys'
      Do not install 3rd-party dependencies by default
      Merge topic 'java-updates'
      Merge topic 'xcode-improve-quoting'
      Ninja: Honor the LINK_DEPENDS target property (#14796)
      Merge topic 'fix-missing-subdir-error'
      Merge topic 'compiler-version-Fortran'
      Merge topic 'refactor-evaluation-files'
      Merge topic 'cmState-policies'
      Merge topic 'use-generator-target'
      Merge topic 'install-no-runtime-deps-by-default'
      Merge topic 'ninja-LINK_DEPENDS'
      Merge topic 'cpack-rpm-documentation-fixes'
      Reject TARGET_PDB_FILE for imported targets instead of crashing
      Merge topic 'fix-TARGET_FILE-imported'
      Merge topic 'change-nmake-env-warning'
      Merge topic 'fix-get-filename-component'
      Merge topic 'fix-process-error-handling'
      Merge topic 'ninja-version-handling'
      bootstrap: Do not build Ninja generator
      Merge topic 'rm-Makefile-LocalGenerator'
      Merge topic 'use-generator-target'
      Merge topic 'global-generator-makefiles'
      Merge topic 'bootstrap-no-ninja'
      Tests: Fix CMAKE_MAKE_PROGRAM selection in CMakeOnly tests
      Tests: Fix CMAKE_MAKE_PROGRAM selection in FortranC.Flags test
      Merge topic 'target_include_directories-relative-SYSTEM-dirs'
      Merge topic 'ctest-report-compiler-version'
      Merge topic 'ExternalProject-hg-clone-without-update'
      Merge topic 'FindProtobuf-vs-x64'
      Merge topic 'tests-use-CMAKE_MAKE_PROGRAM'
      cmCurl: Tolerate lack of CURLOPT_CAPATH support
      Merge branch 'curl-upstream' into update-curl
      Merge branch 'release'
      cmComputeLinkInformation: Lookup a target only if we have one
      Merge topic 'fix-hpux-link-search-shared-flags'
      Merge topic 'add-link-search-static-properties-defaults'
      Merge topic 'FindPkgConfig-capital-messages'
      Merge topic 'OUTPUT_DIRECTORY-genex'
      Help: Add notes for topic 'add-link-search-static-properties-defaults'
      Merge topic 'add-link-search-static-properties-defaults'
      FindOpenSSL: Revise and format module documentation
      Merge branch 'release'
      curl: Fix check for gethostbyname_r with 5 arguments
      curl: Update configuration of build within CMake
      curl: Update README-CMake.txt for new snapshot
      Merge topic 'use-generator-target'
      Merge topic 'FindOpenSSL-imported-targets'
      Merge topic 'compiler-id-ancient-gcc-version'
      Merge topic 'update-curl'
      Merge topic 'FindTIFF-updates'
      Merge topic 'FindXercesC-updates'
      Merge topic 'FindBoost-1.59'
      Merge topic 'emacs-mode-font-lock'
      Merge topic 'extended-length-paths'
      Merge topic 'propagate-link-search-to-try_compile'
      Merge topic 'build-subdir'
      Merge topic 'cmake-gui-high-resolution'
      Merge topic 'add-ARTOS-platform-module'
      Merge topic 'finpkgconfig-if-deref'
      HP-UX: Do not use ".sl" extension for shared libs on Itanium
      Tests: Cover NO_SONAME property for SHARED libraries
      Remove use of include <cmsys/ios/*> and cmsys_ios::*
      Remove use of include <cmsys/stl/*> and cmsys_stl::*
      Merge topic 'determine-compiler-CMP0054'
      Merge topic 'get-filename-component-base-dir'
      Merge topic 'hp-ux-itanium-shared-libs'
      Merge topic 'vs-fix-obj-extension'
      Merge topic 'sublime-msvc-includes'
      Merge topic 'OUTPUT_NAME-genex-no-recursion'
      Merge topic 'FindCUDA-vs2013-separate-compilation'
      Merge topic 'modules-no-soname'
      Merge topic 'improve-variable-help-formatting'
      Remove use of include <cmsys/IOStream.hxx> from KWSys
      include_directories: Fix regression in BEFORE option (#15693)
      Merge topic 'fix-include_directories-BEFORE'
      Merge topic 'generators-use-cmLocalGenerator'
      Merge topic 'refactor-progress'
      Merge topic 'remove-unused-cmPolicies'
      Merge topic 'ios-app-bundle-layout'
      Merge topic 'cmState-definitions'
      Merge topic 'drop-cmsys-std-layer'
      Merge topic 'cmState-prop_dir'
      Merge topic 'FindJNI-linux-x32'
      Merge topic 'fix-load-command-doc-classification'
      Merge topic 'fphsa-typo'
      Merge topic 'libarchive-modern-apis'
      Merge topic 'consistent-empty'
      Merge topic 'java-updates'
      Merge topic 'apple-tbd-stubs'
      Merge topic 'FindJNI-suse-and-ibm'
      Merge topic 'refactor-progress'
      Merge topic 'refactor-features'
      Merge topic 'rm-cmLocalGenerator-Children'
      Merge topic 'cmState-ProjectName'
      Merge topic 'minor-cleanups'
      Merge topic 'use-generator-target'
      Simplify condition for using rpcrt4 library on Windows
      Merge topic 'GenerateExportHeader-cygwin-dllexport'
      Merge topic 'generate-time-generators'
      Merge topic 'refactor-compute'
      Merge topic 'cpack-config-generation-test'
      Merge topic 'FindJNI-mips'
      Merge topic 'fix-ctest-xml-double-encoding'
      Merge topic 'vs-store-phone-cert-thumbs'
      Merge topic 'makefile-color-when-needed'
      Tests: Remove use of include <kwsys/{ios,stl}> and kwsys_{ios,stl}::
      Merge branch 'upstream-kwsys' into update-kwsys
      Revert LINK_SEARCH_{START,END}_STATIC behavior change
      cmSystemTools: Use CreateFileW explicitly to pass wchar_t path
      Merge topic 'add-link-search-static-properties-defaults'
      Merge topic 'update-kwsys'
      Merge topic 'vs-store-phone-cert-thumbs'
      Merge topic 'fix-ios-install'
      Merge topic 'jacoco_find_files'
      Merge topic 'drop-cmsys-std-layer'
      cmSystemTools: Skip ComputeCertificateThumbprint during bootstrap
      Merge topic 'modules-no-soname'
      Merge topic 'swift2-compatibility'
      Merge topic 'FindHDF5-updates'
      cmFindLibraryCommand: Avoid repeating search for the same name
      cmFindProgramCommand: Use Names member instead of passing it
      cmSystemTools: Drop unused StringEndsWith method
      Tests: Add explicit testing for find_program
      cmFindProgramCommand: Re-implement search using more flexible approach
      find_program: Optionally consider all names in each directory
      Merge branch 'upstream-kwsys' into update-kwsys
      bootstrap: Remove unused KWSys configuration
      Utilities/Release: Refactor bootstrap argument construction
      Utilities/Release: Install docs in unversioned directory (#15692)
      Tests: Move LINK_SEARCH_{START,END}_STATIC case to dedicated test
      Merge topic 'vs-store-phone-cert-thumbs'
      Merge topic 'add-link-search-static-properties-defaults'
      Merge topic 'release-scripts-doc-dir'
      cmTarget: Fix buildsystem property empty value set and append operations
      cmTarget: Fix memory leak when SOURCES property is cleared
      Tests: Cover set_property for buildsystem target properties
      Tests: Fix Plugin test on Watcom compiler
      Merge topic 'update-kwsys'
      Merge topic 'FindZLIB-per-config'
      Merge topic 'FindOpenSSL-static-libs'
      Merge topic 'find_program-NAMES_PER_DIR'
      Merge topic 'fix-buildsystem-target-properties'
      Record compile features for GNU C on Windows (#15727)
      Help: Add notes for topic 'FindwxWidgets-updates'
      Re-order 'ar' options 'cq' => 'qc'
      Merge topic 'vs14-win8-store-phone'
      Merge topic 'wbpvf_no_deref'
      Merge topic 'doc-get_filename_component-typo'
      Merge topic 'fix-xcode-gtk2-tests'
      Merge topic 'more-swift2-fixes'
      cmSystemTools: Factor out a cm_isspace helper
      cmSystemTools: Fix TrimWhitespace for non-ascii strings (#15735)
      Merge topic 'ghs-updates'
      Merge topic 'ar-option-order'
      Merge topic 'mingw-compile-features-C'
      Merge topic 'apple-no-libnetwork'
      Merge topic 'FindSWIG-noproxy'
      Merge topic 'FindwxWidgets-updates'
      Merge topic 'cpack-deb-component-dependencies'
      Merge topic 'cpack-cmake-special-characters-mangling'
      Features: Extract strings from test binary more reliably (#15736)
      Revert "Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)"
      Merge topic 'revert-fix-windows-version-detection'
      Merge topic 'compiler-features-robustness'
      Merge topic 'fix-TrimWhitespace'
      Tests: Cover set_property for buildsystem directory properties
      CMakeParseImplicitLinkInfo: Do not match "VAR=..." as link line (#15737)
      Help: Document limitations of the OBJECT_DEPENDS source file property
      Merge topic 'fix-makefile-progress'
      Merge topic 'doc-OBJECT_DEPENDS-limitations'
      Merge topic 'fix-implicit-lib-redhat-hardened-ld'
      Merge topic 'fix-buildsystem-property-append'
      Merge topic 'FindHDF5-updates'
      Merge topic 'fix_64bit_autodef'
      Merge branch 'upstream-kwsys' into update-kwsys
      Help: Organize string command docs into sections
      Help: Document string(REGEX) input concatentation (#15742)
      Merge topic 'extend-windows-version-detection'
      Merge branch 'fix-bad-search-ordering' into test-search-ordering
      Tests: Cover find_program when the environment duplicate some HINTS
      Merge topic 'update-kwsys'
      Merge topic 'doc-string-REGEX-concat'
      Merge topic 'jsoncpp-portability'
      Merge topic 'FindProtobuf-python-extension'
      Merge topic 'ccmake-portability'
      Merge topic 'test-search-ordering'
      Merge topic 'detect-c11-broken-thread-local'
      Modules: Drop unused VTK 4.0 support modules
      Merge branch 'release'
      Merge topic 'remove-UseVTKConfig40'
      Tests: Teach RunCMake to tolerate 'Time Machine' lines in test output
      Tests: Teach RunCMake to tolerate 'Bullseye Testing' lines in test output
      Tests: Teach RunCMake infrastructure to use custom check.cmake file
      Tests: Add RunCMake.BuildDepends test
      VS: Add manifest tool settings to VS 8 and 9 project files
      Ninja: Always add OBJECT_DIR variable to link rules
      MSVC: Rewrite manifest file handling with Makefile and Ninja
      Add support for *.manifest source files with MSVC tools
      Merge topic 'FindPython-updates'
      Merge branch 'release'
      Merge topic 'cpack-deb-fakeroot-removal'
      Merge topic 'ExternalProject_stash_save_all'
      Merge topic 'test-RunCMake-exclude-more-output'
      Merge topic 'test-RunCMake-BuildDepends'
      Merge topic 'ms-manifest-files'
      Merge topic 'cmake-gui-qt5-package'
      Merge topic 'FindPython-updates'
      Merge topic 'compute-default-dialect'
      CMakeDetermineCompilerId: Drop unused code path
      Ninja: Refactor lookup of cmcldeps location
      Ninja: Detect MSVC /showIncludes prefix with compiler flags (#15596)
      CTest: Document and test custom output size settings
      Merge topic 'ctest-custom-output-size'
      Merge topic 'ninja-refactor-msvc-deps'
      Merge topic 'fix-compatibility-mode-LOCATION'
      Merge topic 'cpack-deb-checksum-on-symlinks'
      Merge topic 'cpack-verbatim-variables'
      Merge topic 'pkg-config-variable-function'
      CMP0064: Fix recorded version of introduction to be 3.4
      VS: Refactor target ordering logic
      VS: Fix rebuild with regeneration after input CMake code change (#15754)
      Merge topic 'fix-windows-version-detection'
      Merge topic 'fix-policy-CMP0064-version'
      Merge topic 'restrict-shlib-link-flags-to-enable-exports'
      Merge topic 'ctest-variable-docs'
      Merge topic 'cpack-package-empty-dirs'
      Revert topic 'cmake-W-options' (#15747)
      Merge branch 'improve-variable-help-formatting' into revert-cmake-W-options
      Tests: Simplify GeneratorExpression check implementation
      Merge topic 'fix-forced-toolchain-dialect'
      Merge topic 'cpack-package-empty-dirs'
      Merge topic 'vs-target-ordering'
      Tests: Cover install(FILES) with a genex DESTINATION
      Merge topic 'install-files-dest-genex'
      cmCoreTryCompile: Fix internal argument vector construction
      Tests: Fix RunCMake.BuildDepends filesystem delay for Borland Makefiles
      Merge topic 'fix-max-path-initialization'
      Merge topic 'Threads-CXX'
      Merge topic 'install-directory-dest-genex'
      Merge topic 'fix-try_compile-internal-argv'
      Revert topic 'cpack-package-empty-dirs'
      Ninja: Fix OBJECT_DIR placeholder substitution in link rules
      Ninja: Centralize path conversion in global generator (#15757)
      Replace http://www.cmake.org URLs with https://cmake.org
      Merge topic 'revert-cmake-W-options'
      Merge topic 'revert-cpack-package-empty-dirs'
      Merge branch 'upstream-kwsys' into update-kwsys
      Merge topic 'jsoncpp-add-missing-cast'
      Merge topic 'test-RunCMake-BuildDepends-Borland'
      Merge topic 'genex-SHELL_PATH'
      Merge topic 'test-fix-C-comments'
      Merge topic 'ninja-cleanup-path-conversion'
      Merge topic 'update-kwsys'
      Merge topic 'test-Wno-dev'
      Merge topic 'optimize-variable-replacement'
      Merge topic 'minor-cleanups'
      Merge topic 'link-https-cmake.org'
      Merge topic 'ProcessorCount-SunOS-psrinfo'
      Merge topic 'cpack-package-empty-dirs'
      Merge topic 'simplify-qt-autogen'
      Merge topic 'fix-qtautogen-with-object-library-Ninja'
      Merge topic 'vs-old-rule-files'
      Merge branch 'upstream-kwsys' into update-kwsys
      Features: Disable support for Oracle SolarisStudio on non-Linux
      cmMakefile: Avoid name conflict with Solaris global typedef
      cmVisualStudio10TargetGenerator: Fix unsigned integer constant type
      Merge topic 'update-kwsys'
      Merge topic 'FindOpenSSL-imported-targets'
      Features: Fix C++98 flags on Oracle SolarisStudio 12.4 on Linux
      Tests: Suppress WriteCompilerDetectionHeader failure on SunPro
      Disable shared library support when compiler links statically
      Tests: Add trailing newlines to generated sources in RunCMake.CPack_* tests
      Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* tests
      Tests: Use consistent C++ flags FindPackageModeMakefileTest
      Tests: Simplify VSGNUFortran Oracle-specific link lines
      Merge topic 'fix-warnings'
      Merge topic 'compiler-links-statically'
      Utilities/Release: Update path to 'cmake.exe' on Windows build machine
      Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation
      Merge topic 'explicit-system-version'
      Merge topic 'vs-win10-sdk'
      Merge topic 'release-binaries-windows-cmake-path'
      Merge topic 'cpack-tests-fix'
      Merge topic 'test-VSGNUFortran-oracle-link'
      Merge topic 'test-FindPackageModeMakefileTest-flags'
      Merge topic 'compiler-features-solaris'
      Help: Document Windows 10 Universal Applications in cmake-toolchains(7)
      Merge topic 'FindMatlab-v8.6'
      Merge topic 'vs-win10-sdk'
      Merge topic 'vs-win10-store'
      Help: Consolidate 3.4 release notes
      Help: Organize and revise 3.4 release notes
      Merge topic 'doc-3.4-relnotes'
      Help: Drop development topic notes to prepare release
      CMake 3.4.0-rc1 version update
      Help: Fix version reference in 3.4 release notes

Christopher Meng (2):
      FindPkgConfig: Capitalize first letter of all message()s
      Help: Fix typo in get_filename_component docs

Chuck Atkins (7):
      HP-UX: Fix linker search type flags for C shared libs on HP-UX
      Allow LINK_SEARCH_{START,END}_STATIC props to have default values.
      try_compile: Propogate the CMAKE_LINK_SEARCH_ variables
      try_compile: Update documentation for other propagated variables
      CMP0065: Restrict the use of CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS
      try_compile: Propogate CMP0065 to the generated project.
      Drop executable symbol export if platform does not support shared libs

Clifford Yapp (1):
      Add SOURCE_DIR and BINARY_DIR target properties

Clinton Stimpson (3):
      cmake: Add support for "--build ." in subdirectory (#15696)
      cmSystemTools: Use extended length paths for Windows apis.
      cmake-gui:  Improve packaging of Qt5 libraries.

Curl Upstream (1):
      curl 7.44.0 (reduced)

Daniel Pfeifer (4):
      CTest: hide progress ticks in verbose output
      string: add APPEND subcommand
      FindIce: create imported targets for components
      CTest: Report to CDash the compiler version used to build the project

Daniele E. Domenichelli (3):
      ExternalProject: Add unit tests for GIT_SUBMODULES argument
      ExternalProject: Use GIT_VERSION_STRING instead of custom method
      ExternalProject: Use "git stash save --all" only if supported (#15722)

David Gobbi (6):
      FindPython{Interp,Libs}: Add versions 3.5 and 3.6
      FindPythonLibs: Remove PYTHON_INCLUDE_PATH as input
      FindPythonLibs: Fix OS X framework include directory search path
      FindPythonLibs: Match include dir to library version
      FindPythonLibs: Use python executable prefix as a hint
      FindPythonLibs: unset temporary _PREFIX variable

Domen Vrankar (20):
      Tests: Add RunCMake tests for CPack{Deb,RPM}
      Tests: Move RunCMake.CPackRPM case into RunCMake.CPack_RPM test
      Tests/RunCMake/CPack: found files should be preserved
      Tests/RunCMake/CPack/DEB: add verifyDebControl
      CPack/DEB: Remove duplicate string(TOUPPER) calls
      CPack/DEB: component version of PACKAGE_CONTROL_EXTRA
      CPack/RPM: undocumented variables
      Tests/RunCMake/CPack: Enable CXX language in tests
      Tests/RunCMake/CPack/DEB: Add getPackageInfo helper function
      Tests/RunCMake/CPack: Bump verify result cmake version
      Tests/RunCMake/CPack: Add dependencies tests
      CPack/Deb: enable per component setting of dependencies
      CPack/DEB: test preserve extra config file permissions
      CPack/Deb: checksum on symlinks release notes
      CPack: allow packaging of empty directories
      CPack: remove accidental changes
      SystemTools: set time file permissions
      SystemTools: time operations on directories
      CPack: allow packaging of empty directories
      Tests: Fix RunCMake.CPack_* tests to use proper CMake generator

Dominic Meiser (1):
      FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)

Eon Jeong (3):
      FindBISON: Use BISON_TARGET macro argument names internally
      FindBISON: Use CMAKE_PARSE_ARGUMENTS to parse arguments
      FindBISON: Add DEFINES_FILE option to pass --defines=FILE

Felix Geyer (1):
      Do not set SONAME for MODULE library targets (#15705)

Francesco Romano (1):
      FindMatlab: Add support for Matlab R2015b

Francois Best (1):
      cmake-gui: Add support for HiDPI (Retina) screens on OS X

Frank-Christian Otto (1):
      CPack/RPM: missing PACKAGE_CONFLICTS documentation

Geoff Viola (3):
      GHS: Find latest 'int' directory
      GHS: Tell MULTI to delete .elf.ael file
      GHS: Fix generated file path slashes and quoting for 6.1.6

Gilles Khouzam (13):
      VS: Windows Store/Phone package cert thumbprint
      VS: Find Desktop SDK for current VS version (#15662)
      Windows: Set CMAKE_HOST_SYSTEM_VERSION with three components
      Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 (#15674)
      cmSystemTools: Add VersionCompareGreater helper
      VS: Add hook to initialize Windows platform settings
      Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME
      VS: Add support for selecting the Windows 10 SDK (#15670)
      VS: Select latest Windows 10 SDK if no specific version was requested
      VS: Select Windows 10 Store SDK and toolset for VS 2015
      MSVC: Add system libs for WindowsStore on VS 2015
      VS: Refactor indentation of LinkLibraryDependencies
      VS: Add support for Windows 10 Universal (Store) Applications

Gregor Jasny (17):
      Xcode: Invert quoting logic to whitelist of characters
      target_include_directories: Support relative SYSTEM include dirs (#15464)
      cmTarget: Remove unused AddSystemIncludeDirectories overload
      Extra Generator: Populate MSVC system include paths from environment (#15597)
      Fix iOS Bundle layouts (#15669)
      Darwin: Add support for tbd library stub files
      Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to PlatformIsAppleIos
      Fix installation of iOS targets (#12506)
      Xcode: Add unit test for iOS project install (#12506)
      Swift: Use dump instead of println
      Swift: Make SwiftMix compatible with Swift 2
      Swift: Fix Compiler-Id detection for Swift 2
      Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10
      Swift: Remove positive Swift language tests
      Swift: Add proper Swift compiler test
      GTK2: Add --build-project to all GTK2 tests
      curl: Do not use libnetwork on Apple platforms

James Johnston (14):
      Embarcadero: Run at most one linker invocation at a time (#15620)
      ExternalProject: Added new USES_TERMINAL options
      Help: Document string(FIND) return value when no match is found
      nmake/jom: Only warn about bad VS environment if compiler not found.
      get_filename_component: Tests now check for proper CACHE usage.
      get_filename_component: Added initial tests for PROGRAM component.
      get_filename_component: Fix bug where CACHE was ignored.
      cmCTestCoverageHandle:  Improve error handling.
      cmcmd:  Improve error handling when executing a process.
      Ninja: Centralized required Ninja version numbers and comparisons.
      Ninja: Prevent generating if installed Ninja version is too old.
      get_filename_component:  Teach new BASE_DIR parameter.
      Help: Improve formatting of variable documentation
      Help:  Fix classification of load_command in command TOC.

Joerg Sonnenberger (3):
      jsoncpp: Fix compilation as C99 on Solaris
      ccmake: Pass format string to 'printw' (#15738)
      ccmake: Avoid using non-portable 'curcol' field (#15739)

Jostein Kj?nigsen (1):
      cmake-mode.el: Add support for prog-mode hooks (#15521)

Justin Cook (1):
      Cray: Fix compiler version detection (#15664)

KWSys Robot (13):
      KWSys 2015-06-03 (8533a79b)
      KWSys 2015-06-15 (d217407c)
      KWSys 2015-07-02 (1f19c187)
      KWSys 2015-07-07 (8504e845)
      KWSys 2015-07-08 (d3ba91e1)
      KWSys 2015-07-10 (c9336bcf)
      KWSys 2015-07-30 (f63febb7)
      KWSys 2015-08-03 (dad68c33)
      KWSys 2015-08-24 (cdaf522c)
      KWSys 2015-08-28 (dc3fdd7f)
      KWSys 2015-09-11 (cfeb27cc)
      KWSys 2015-09-25 (dc4e4a55)
      KWSys 2015-09-28 (2089567a)

Kars de Jong (2):
      GNU-DetermineCompiler: Add support for very old versions of GCC
      Add support for ARTOS platform using GNU C with ac compiler driver

Kitware Robot (126):
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      Rename Fortran parser infrastructure to drop "Depends" prefix
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp

Konstantin Podsvirov (11):
      CMake: Install COMPONENTs
      CMake: Install COMPONENTs (QtDialog)
      CMake: Install COMPONENTs (sphinx-man)
      CMake: New option CMake_INSTALL_COMPONENTS
      CMake: Fix Web Site shortcut in IFW installer for Windows
      CMake: optional show LGPLv2.1 license when install cmake-gui component
      CMake: Add cmakexbuild component as REQUIRED to Tools group for IFW installer
      cmake-gui: Install Qt5 Windows platform plugin
      CMake: Add CMake_INSTALL_DEPENDENCIES option
      FindOpenSSL: Provide imported targets OpenSSL::{SSL,Crypto}
      Help: Add notes for topic 'FindOpenSSL-imported-targets'

Marc Chevrier (8):
      FindJava: Add support for idlj and jarsigner tools
      UseJava: Teach add_jar to support file syntax for sources
      UseJava: Teach install_jar new DESTINATION and COMPONENT options
      UseJava: Add support for javah tool
      FindJNI: Add support for SuSE platform and IBM Java SDK
      jsoncpp: Add missing cast to convert from char to UInt
      Tests: Use C-Style comments in C sources and headers
      ProcessorCount: Implement with psrinfo tool on recent SunOS versions

Markus Grech (1):
      Eclipse: Fix paths in target links on cygwin

Matt McCormick (3):
      FindPythonLibs: Find the python.org libraries (#14809)
      ExternalProject: Avoid if() auto-dereference of a "TEST" variable
      if: Add "TEST <test>" condition

Michael Ensslin (1):
      Makefile: Optionally disable target completion messages in build output

Michael Scott (4):
      Help: Improve formatting of command documentation
      cmake: Add -W options to control deprecation warnings and errors
      FindZLIB: Find debug and release variants separately
      Tests: Add case for -Wdev and -Wno-dev with non-message() warnings (#15747)

Michael St?rmer (1):
      Utilities/Doxygen: Support tools installed in paths with spaces

Mike Pagel (1):
      VS: Prevent generated "rule" files from causing rebuilds

Mikhail Filimonov (1):
      VS: Add more Nsight Tegra generator Android property settings

Nils Gladitz (2):
      VS: Use cmUuid RFC 4122 compliant hash based UUID generation
      Ninja: Make import libraries BYPRODUCTs instead of regular OUTPUTs

Paul Romano (3):
      FindHDF5: Fix support for HL and Fortran_HL components
      FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HL
      FindHDF5: Add NAMES_PER_DIR and introduce HDF5_PREFER_PARALLEL

P?der Rezs? (1):
      Use modern libarchive APIs

Raffi Enficiaud (7):
      cmGeneratedFileStream: Fix spelling in comment
      Tests: Make RunCMake.CPack error messages more readable
      cmArchiveWrite: control user/group, permissions and recursive file adding
      CPackDeb: use of libarchive and removal of fakeroot
      CPackDeb: preventing md5sum on symlinks
      CPackDeb: allow empty directories in component packages
      CPackDeb: allow empty directories in component packages

Ralf Habacker (1):
      FindBZip2: Check BZIP2_NEED_PREFIX with real prototype

Raphael Kubo da Costa (2):
      Tests: Use a less strict regular expression to look for "SONAME"
      Avoid using C11 to build CMake if _Thread_local support is broken

Robert Goulet (6):
      Add generator expression support to OUTPUT_NAME target property
      cmTarget: Detect and diagnose recursion in GetOutputInfo
      Add generator expression support to OUTPUT_DIRECTORY target properties
      cmGeneratorTarget: Avoid recursion in GetOutputName method
      install: Allow generator expressions in FILES DESTINATION
      install: Allow generator expressions in DIRECTORY DESTINATION

Roger Leigh (9):
      FindIce: Update for Ice version 3.6.0
      FindIce: Find all Ice executables
      FindXercesC: Find versioned library on Windows
      FindIce: document imported targets
      FindXercesC: Also search for xerces-c_2 (#15648)
      FindTIFF: Find debug and release libraries separately
      FindXercesC: Find debug and release libraries separately
      FindXercesC: Add support for 3D_1 variant of the library
      FindBoost: Add support for Boost 1.59

Rolf Eike Beer (9):
      FindPkgConfig: remove variable dereference
      FPHSA: fix typo in documentation
      write_basic_package_version_file: remove variable dereferences in templates
      FindThreads: add simple testcase
      Check(Function|Library|Symbol)Exists: make it work if only C++ is enabled
      FindThreads: replace CheckIncludeFiles by CheckIncludeFile
      FindThreads: make the call to try_run() work also if only C++ is enabled
      FindThreads: fix printing a pointer value in test code
      FindThreads: officially announce it works with only C++ enabled

Roman Donchenko (4):
      cmArchiveWrite: do not store sparse files when using standard tar formats
      CPack generator independent tests
      CPack: don't mangle CMake-special characters when applying default settings
      Introduction of CPACK_VERBATIM_VARIABLES variable

Roman W?ger (1):
      CTest: Add options to limit output of passed and failed tests

Roy Crihfield (7):
      cmake-mode.el: Minor clean-up
      cmake-mode.el: Use `rx' for regexps
      cmake-mode.el: Rename function to be consistent
      cmake-mode.el: Add font-lock for keywords and variables
      cmake-mode.el: Derive cmake-mode from prog-mode
      cmake-mode.el: Fix function name font-lock
      cmake-mode.el: Refine variable font-lock

Sebastian Schuberth (1):
      cmConditionEvaluator: Remove superfluous spaces in expressions

Silvio Traversaro (1):
      ExternalProject: Initialize only selected git submodules (#15590)

Simon Richter (3):
      FindwxWidgets: allow specifying required version
      FindwxWidgets: Expect wxWidgets 3.1
      FindwxWidgets: Add wxWidgets webview component

Stanimir Kabaivanov (1):
      Add EUROS RTOS platform description file

Stefan Kislinskiy (1):
      Genex: Add a SHELL_PATH expression

Stephen Kelly (444):
      cmMakefile: Simplify CMP0000 handling.
      cmMakefile: Add API for elseif to create backtrace.
      cmMakefile: Make cmListFileBacktrace default constructible.
      cmGlobalGenerator: Don't use else after a return.
      cmListFileBacktrace: Internalize the step of making paths relative.
      cmVariableWatchCommand: Simplify error reporting.
      cmState: Add CreateBaseSnapshot method.
      cmState: Rename CreateSnapshot method.
      cmState: Rename GetParent method.
      Remove CMAKE_USE_RELATIVE_PATHS variable.
      Port away from obsolete method.
      cmLocalGenerator: Remove obsolete method.
      cmLocalGenerator: Remove 'optional' parameter from Convert.
      cmLocalGenerator: De-virtualize Configure().
      Merge Configure state with GeneratingBuildSystem state.
      cmLocalGenerator: ComputeObjectMaxPath just before generating.
      cmMakefile: Refactor directories specified with the subdirs command.
      cmake: Replace CurrentLocalGenerator concept with CurrentMakefile.
      cmMakefile: Move Configure responsibility from cmLocalGenerator.
      cmMakefile: Implement ConfigureSubDirectory in terms of cmMakefile.
      cmMakefile: Store unconfigured cmMakefiles.
      cmMakefile: Introduce a local cmMakefile variable.
      cmLocalGenerator: Remove some commented lines of code.
      cmState::Snapshot: Provide accessor for the cmState.
      cmState: Extend Snapshot concept with a SnapshotType.
      cmState: Group BuildsystemDirectory state together in a struct.
      cmState: Extract a cmLinkedTree container adaptor.
      cmMakefile: Create a unified raii for function scopes.
      cmMakefile: Create a unified raii for macro scopes.
      cmOutputConverter: Extract from cmLocalGenerator.
      cmMakefile: Make the cmState::Snapshot accessible.
      cmComputeLinkInformation: Port to cmOutputConverter.
      cmCommandArgumentParserHelper: Port to cmOutputConverter.
      cmCustomCommandGenerator: Port to cmOutputConverter.
      cmTarget: Port to cmOutputConverter.
      cmListFileBacktrace: Replace local generator with cmState::Snapshot.
      Port static calls from cmLocalGenerator to cmOutputConverter.
      cmMakefile: Inline PushScope into PushFunctionScope.
      cmMakefile: Out-of-line the cmMakefileCall.
      cmMakefile: Remove unused GetPolicies method.
      cmMakefile: Simplify InitializeFromParent method.
      cmPolicies: Replace UNDEFINED bitset with WARN bitset.
      cmGeneratorTarget: Move Feature API from cmTarget.
      cmLocalGenerator: Add Feature API from cmMakefile.
      cmPolicies: Store all statuses in a single bitset.
      cmProperty: Remove needless Name member.
      Constify property definition API.
      cmPropertyMap: Remove scope parameter from API where not used.
      cmPropertyMap: Require a non-empty name parameter.
      cmPropertyMap: Remove chaining logic.
      cmTarget: Use method abstraction for policy status.
      cmTarget: Replace PolicyStatus members with PolicyMap.
      cmTarget: Re-arrange data layout.
      cmSourceFile: Re-arrange data.
      cmMakefile: Re-arrange data layout.
      cmLocalUnixMakefileGenerator: Re-arrange data layout.
      cmComputeLinkInformation: Re-arrange data layout.
      cmCommandArgumentParserHelper: Re-arrange data.
      cmComputeComponentGraph: Re-arrange data layout.
      cmGlobalGenerator: Re-arrange data layout.
      cmGraphVizWriter: Re-arrange data layout.
      cmInstallFilesGenerator: Re-arrange data layout.
      cmInstallTargetGenerator: Re-arrange data layout.
      cmOrderDirectories: Re-arrange data layout.
      cmProcessTools: Re-arrange data layout.
      cmQtAutoGenerators: Re-arrange data layout.
      cmDocumentation: Remove unused include.
      cmExportTryCompileFileGenerator: Remove unused variable.
      cmExportTryCompileFileGenerator: Add newline between methods.
      cmComputeLinkDepends: Re-arrange data layout.
      cmCustomCommand: Re-arrange data layout.
      cmCustomCommand: Remove special member functions.
      cmMakefile: Simplify handling of CACHE_VARIABLES property.
      cmGetCMakePropertyCommand: Don't explicitly specify default param.
      cmMakefile: Remove cacheOnly option from GetDefinitions.
      cmGetDirectoryPropertyCommand: Extract StoreResult method.
      cmGetDirectoryPropertyCommand: Move variable to the point of use.
      cmMakefile: Move CMP0059 handling to command code.
      project(): Remove unused variable.
      cmLocalGenerator: Remove ConfigureFinalPass.
      cmFileCommand: Fix implementation of CMP0009.
      cmLocalUnixMakefileGenerator3: Remove unused variable.
      cmGlobalGenerator: Add ComputeHomeRelativeOutputPath method.
      Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).
      cmMakefile: Move listfile parsing responsibility.
      cmMakefile: Change return type of ReadListFileInternal.
      cmMakefile: Rename variables.
      cmMakefile: Move a container population.
      cmMakefile: Move check for unused variables.
      cmMakefile: Split file handling from execution.
      cmMakefile: Simplify condition handling.
      cmMakefile: Change order of raii scopes.
      cmMakefile: Move include scope out of ReadListFileInternal.
      cmMakefile: Remove File from IncludeScope.
      cmMakefile: Move IncludeScope instance.
      cmMakefile: Move IncludeScope to ReadDependentFile.
      cmMakefile: Move resource management into the IncludeScope.
      cmMakefile: Inline ReadListFileInternal into caller.
      cmMakefile: Rename parameter.
      cmMakefile: Move ListFile parsing responsibility out of internal method.
      cmMakefile: Move IncludeScope.
      cmMakefile: Make the IncludeScope more responsible.
      cmMakefile: Simplify filename handling.
      cmOutputConverter: Constify API.
      cmMakefile: Use cmOutputConverter instead of cmLocalGenerator.
      cmLocalGenerator: Add IssueMessage method.
      cmake: Update the current snapshot when Resetting.
      cmMacroCommand: Store the FilePath when creating the prototype.
      cmFunctionCommand: Store the FilePath when creating the prototype.
      cmMakefile: Add filename context to ExpandArguments.
      cmMakefile: Use GetExecutionFileStack method.
      cmListFileArgument: Remove FilePath member.
      cmMakefile: Move IsRoot API from cmLocalGenerator.
      cmMakefile: Use member directly instead of through method.
      cmLocalUnixMakefileGenerator3: Remove unused method.
      QtAutogen: Get the global generator from the Makefile.
      cmLocalGenerator: Constify GetIncludeDirectories method.
      C::B: Get the Makefile from the LocalGenerator, not vice-versa.
      cmGeneratorTarget: Add accessor for cmLocalGenerator.
      GHS: Use a cmGeneratorTarget in generator API.
      cmGlobalGenerator: Create GeneratorTargets with a local generator.
      cmGeneratorTarget: Require a cmLocalGenerator to construct.
      cmNinjaGenerator: Require cmGeneratorTarget.
      cmMakefileTargetGenerator: Require cmGeneratorTarget.
      Get the local generator from the GeneratorTarget.
      cmMakefile: Move the IncludeScope to where it is used.
      cmMakefile: Add automatic scopes to listfile readers.
      cmMakefile: Move the lexical scope.
      cmMakefile: Make listfile scopes responsible for logical checks.
      cmMakefile: Remove IncludeScope Quiet call.
      cmMakefile: Add filename to ReadListFile auto scopes.
      cmMakefile: Avoid invoking EnforceDirectoryLevelRules.
      cmMakefile: Don't use string comparison to check directory level.
      cmMakefile: Inline ProcessBuildsystemFile into only caller.
      cmMakefile: Compute the filename processed in a scope.
      cmMakefile: Expand the scope of scoped buildsystem file state.
      cmMakefile: Rename a variable.
      cmMakefile: Merge two Scope types and instances.
      cmComputeTargetDepends: Change API to use cmGeneratorTarget.
      cmGlobalGenerator: Map local generators to generator targets.
      cmLinkedTree: Add operator* to the iterator.
      cmMakefile: Split CallStack into two pieces.
      cmState: Store snapshots for more different types.
      cmState: Add GetCallStackParent method.
      cmState: Store execution context.
      cmMakefile: Access the execution list file from the cmState.
      cmMakefile: Create a scoped context for parsing listfiles.
      cmMakefile: Create intermediate variables for snapshot frames.
      cmMakefile: Set the FilePath on the frame from the cmState.
      cmListFile: Remove FilePath member from cmListFileContext.
      cmListFileBacktrace: Implement in terms of cmState::Snapshot.
      CodeLite: Remove unused code.
      cmMakefile: Remove dead code.
      cmMakefile: Fix indentation.
      Genex: Store a backtrace, not a pointer to one.
      cmListFileBacktrace: Constify API.
      cmMakefile: Implement FormatListFileStack in terms of cmState.
      cmMakefile: Implement LISTFILE_STACK property in terms of cmState.
      cmMakefile: Simplify setting of current snapshot.
      cmMakefile: Remove obsolete condition.
      cmMakefile: Port some users of ListFileStack to cmState.
      cmMakefile: Remove unused ListFileStack.
      cmMakefile: Inline only use of GetLinkDirectories.
      cmMakefile: Remove special handling of LINK_DIRECTORIES property.
      cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION.
      cmGetCMakePropertyCommand: Clean up VARIABLES handling.
      cmState: Remove unused variable.
      cmMakefile: Add include which we use.
      cmLocalUnixMakefileGenerator3: Port away from the Parent.
      cmMakefile: Add a PropertyKeys accessor.
      cmMakefile: Remove GetProperties method.
      cmState: Forward-declare a type earlier.
      cmState: Extract a Directory class.
      cmMakefile: Remove special handling of MACROS property.
      KDE4: Find the Internal package with NO_POLICY_SCOPE.
      cmAlgorithms: Rename cmRange to cmMakeRange.
      cmAlgorithms: Move Range type out of private namespace.
      cmMakefile: Remove some references from APIs.
      cmMakefile: Out of line some API.
      cmMakefile: Separate storage of buildsystem properties and their origins.
      cmMakefile: Split accessors for compile definitions and origins.
      cmMakefile: Split accessors for compile options and origins.
      cmMakefile: Split accessors for include directories and origins.
      cmAlgorithms: Add some convenient typedefs.
      cmMakefile: Use Ranges for buildsystem property access.
      CompileDefinitions: Add unit test for setting empty content.
      cmMakefile: Don't clear buildsystem properties.
      cmAlgorithms: Add cmMakeReverseIterator.
      cmMakefile: Convert recursion to loop.
      cmPolicies: Store only state that users can set.
      cmPolicies: Enable RVO for internal method.
      cmMakefile: Inline internal policy status method.
      cmMakefile: Remove redundant condition from policy status computation.
      cmMakefile: Simplify computation of ancient policy status.
      cmMakefile: Remove CMP0001 handling to callers.
      cmPolicies: Replace unused include.
      cmState: Host buildsystem properties for directories.
      cmMakefile: Move the InitializeFromParent method
      cmCustomCommandGenerator: Require cmLocalGenerator in API.
      cmCPackPropertiesGenerator: Require cmLocalGenerator in API.
      cmGlobalGenerator: Split creation of generator object from initialization.
      cmGlobalGenerator: Extract method to create generator objects.
      cmGlobalGenerator: Add global targets at the end of Configure.
      cmLocalGenerator: Remove CreateCustomTargetsAndCommands method.
      cmLocalGenerator: Remove unused AddBuildTargetRule method.
      cmLocalGenerator: Remove unused AddCustomCommandToCreateObject method.
      cmTarget: Use reliable test for CMP0024 and CMP0026 OLD.
      cmGlobalGenerator: Create cmGeneratorTargets earlier.
      cmGlobalGenerator: Create cmGeneratorTargets before QtAutomoc.
      cmTarget: Inline GetLocation into deprecated callers.
      cmTarget: Create cmGeneratorTargets before reading deprecated LOCATION.
      cmIncludeCommand: Populate the cmGeneratorTargets in deprecated path.
      cmTarget: Restore the ImportedGetLocation method.
      Always access target location from a cmGeneratorTarget instance.
      Move GetLocation to cmGeneratorTarget.
      Move GetLocationForBuild to cmGeneratorTarget.
      Move GetFullPath to cmGeneratorTarget
      cmExportTryCompileFileGenerator: Create cmGeneratorTargets.
      Port cmExportBuildFileGenerator to cmGeneratorTarget.
      Port some of the cmExportFileGenerator API to cmGeneratorTarget.
      Fix include guard.
      cmGeneratorExpressionNode: Remove unused variable.
      cmMakefileTargetGenerator: Remove unused variable.
      cmMakefile: Move method out of line.
      Xcode: Skip Global targets when processing.
      VisualStudio: Skip global targets when processing.
      cmGlobalGenerator: Remove unused manifest accessor.
      cmGlobalGenerator: Remove the TargetManifest member.
      cmGlobalGenerator: Create a new Compute step before generation.
      cmGlobalGenerator: Return from Compute whether to generate.
      cmGlobalGenerator: Move FinalizeTargetCompileInfo to Compute().
      cmMakefile: Simplify generate-time cmGeneratorTarget creation.
      Xcode: Use allBuild target return value.
      cmGlobalGenerator: Move generation object creation to Compute().
      cmGlobalGenerator: Virtualize the Compute step and override it.
      cmGlobalGenerator: Move QtAutogen handling to Compute().
      cmScriptGenerator: Remove unused method.
      cmInstallCommand: Move the SetHaveInstallRule invocation.
      cmInstallGenerator: Add a Compute() virtual hook.
      cmInstallCommand: Store only a targetName, not a cmTarget.
      cmInstallTargetGenerator: Port to cmGeneratorTarget.
      Tests: Verify generate-time policy scope behavior.
      cmState: Add Snapshot Type accessor.
      cmMakefile: Re-order policy entries and barriers.
      cmMakefile: Move policy barriers inside cmState scopes.
      cmState: Remove call stack parent tracking.
      cmMakefile: Store EvaluationFiles.
      cmGeneratorExpressionEvaluationFile: Require generator context.
      cmState: Add Type for policy scope.
      cmLinkedTree: Add Clear API.
      cmState: Record the end position of each directory.
      cmState: Move PolicyState from cmMakefile.
      cmGlobalNinjaGenerator: Simplify usage of API.
      cmExportInstallFileGenerator: Simplify local generator access.
      cmGeneratorTarget: Move GetSOName from cmTarget..
      cmGeneratorTarget: Move GetAutoUicOptions from cmTarget.
      cmGeneratorTarget: Move IsLinkInterfaceDependent* from cmTarget.
      Export: Port more API to cmGeneratorTarget.
      cmGeneratorTarget: Move GetLinkInformation from cmTarget
      cmGeneratorTarget: Move CheckPropertyCompatibility from cmTarget.
      cmGeneratorTarget: Port internal API to cmGeneratorTarget.
      cmGeneratorTarget: Move LinkInterfaceDependent methods from cmTarget.
      cmGeneratorTarget: Make CompatibleType enum private again.
      cmGeneratorTarget: Move ReportPropertyOrigin from cmTarget.
      cmGeneratorTarget: Move GetLinkImplementationClosure
      cmGeneratorTarget: Move GetExecutableNames from cmTarget.
      cmGeneratorTarget: Move GetLibraryNames from cmTarget.
      cmGeneratorTarget: Move HasSOName from cmTarget.
      cmGeneratorTarget: Move GetCompilePDBPath from cmTarget.
      cmGeneratorTarget: Move GetPDBName from cmTarget.
      cmGeneratorTarget: Move NeedRelinkBeforeInstall from cmTarget.
      cmGeneratorTarget: Move IsChrPathUsed from cmTarget.
      cmGeneratorTarget: Move GetFullNameComponents from cmTarget.
      cmGeneratorTarget: Move GetMacContentDirectory from cmTarget.
      cmGeneratorTarget: Move GetInstallNameDir* from cmTarget.
      cmGeneratorTarget: Move GetAppBundleDirectory from cmTarget.
      cmGeneratorTarget: Move GetFullName from cmTarget.
      cmGeneratorTarget: Move GetFrameworkDirectory from cmTarget.
      cmGeneratorTarget: Move GetLinkerLanguage from cmTarget.
      cmGeneratorTarget: Move GetLinkClosure from cmTarget.
      cmMakefileTargetGenerator: Add accessor for GeneratorTarget.
      cmGeneratorTarget: Move IsBundleOnApple from cmTarget.
      cmComputeLinkInformation: Port to cmGeneratorTarget.
      cmComputeLinkDepends: Port to cmGeneratorTarget.
      cmGeneratorTarget: Move GetOutputName from cmTarget.
      cmGeneratorTarget: Move GetCompilePDBDirectory from cmTarget.
      cmGeneratorTarget: Move CompileInfoMap from cmTarget.
      cmOrderDirectories: Port to cmGeneratorTarget.
      cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.
      cmMakefile: Remove unused method.
      cmComputeLinkInformation: Simplify generator object access.
      cmLinkItem: Split to separate file.
      cmLinkImplementationLibraries: Move to namespace scope.
      cmGeneratorTarget: Prefer the local generator to access the global.
      cmGeneratorTarget: Port internal type to cmGeneratorTarget.
      cmGlobalGenerator: Store a container of cmMakefiles.
      cmake: Port configure-time code to cmMakefile.
      cmGlobalGenerator: Port configure-time code to cmMakefile.
      cmExportLibraryDependenciesCommand: Port to cmMakefile.
      cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators.
      cmGlobalGenerator: Base final target property computation on Makefiles.
      cmGlobalGenerator: Port Configure-time check to cmMakefile.
      cmGlobalGenerator: Port global target creation to cmMakefile.
      cmGlobalGenerator: Create global targets from cmMakefiles.
      cmGlobalGenerator: Port Find API to cmMakefile.
      cmQtAutoGenerators: Prefer a generator to access global generator.
      cmTarget: Request only the link libraries where needed.
      cmTarget: Split storage of include directories from genexes.
      cmTarget: Split storage of compile options from genexes.
      cmTarget: Split storage of compile features from genexes.
      cmTarget: Split storage of compile definitions from genexes.
      cmTarget: Use a simpler delete algorithm.
      cmMakefile: Extract InitializeVarScope method.
      cmDefinitions: Implement in terms of cmLinkedTree.
      cmMakefile: Decouple the container of cmDefinitions from scoping logic.
      cmState: Add a Base snapshot type.
      cmState: Add a VariableScope snapshot type.
      cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.
      cmTestGenerator: Require cmLocalGenerator, not cmMakefile.
      cmInstallExportGenerator: Require cmLocalGenerator, not cmMakefile.
      cmGlobalGenerator: Remove clearance of map.
      cmGlobalGenerator: Move LG to target map to subclass.
      cmGlobalGenerator: Rename progress initializer method.
      cmGlobalUnixMakefileGenerator3: Rename member.
      cmState: Make it possible to order cmState::Snapshot.
      cmGlobalUnixMakefileGenerator3: Change the progress container key.
      cmake: Remove unused cmPolicies member.
      cmState: Host variable definitions.
      cmMakefile: Inline GetDefinitions into GetProperty.
      cmState: Move directory Properties from cmMakefile.
      cmGlobalGenerator: Don't use else after return.
      cmGlobalGenerator: Refactor IsExcluded.
      cmGlobalGenerator: Convert IsExcluded to loop.
      cmState: Make Snapshot EqualityComparable.
      cmGlobalGenerator: Implement IsExcluded in terms of cmState::Snapshot.
      cmGlobalGenerator: Extract new IsExcluded overload.
      cmGlobalUnixMakefileGenerator3: Inline an IsExcluded call.
      cmGlobalUnixMakefileGenerator3: Implement progress in terms of cmState.
      cmLocalGenerator: Make GetFeature tail-recursive.
      cmLocalGenerator: Simplify GetFeature implementation.
      cmLocalGenerator: Convert GetFeature recursion to loop.
      cmLocalGenerator: Implement GetFeature in terms of cmState.
      cmState: Store Children states in parent state.
      cmLocalGenerator: Simplify condition.
      Makefiles: Remove valueless cast.
      cmLocalGenerator: Implement child traversal in terms of cmState.
      cmLocalGenerator: Remove unused Children member.
      Replace 'foo.size() > 0' pattern with !foo.empty().
      Replace 'foo.size() == 0' pattern with foo.empty().
      Replace 'foo.size() != 0' pattern with !foo.empty().
      Replace foo.size() pattern with !foo.empty().
      Replace '0 == instances.size()' with instances.empty().
      cmMakefile: Out-of-line GetProjectName.
      cmMakefile: Use std::string in ProjectName API.
      cmState: Move ProjectName from cmMakefile.
      cmGlobalGenerator: Implement FillProjectMap in terms of cmState.
      cmGeneratorTarget: Issue messages through the local generator.
      cmMakefile: Remove Internal class.
      Reduce uses of cmMakefile::GetGlobalGenerator.
      cmTarget: Fix indentation.
      cmTarget: Remove vestigal method declaration.
      cmMakefile: Fix style.
      cmGlobalGenerator: Implement VS6 check without virtual method.
      cmTarget: Move link interface libraries struct out.
      cmGeneratorTarget: Move ComputeLinkInterface from cmTarget.
      cmTarget: Move cmHeadToLinkInterfaceMap out.
      cmTarget: Add GetHeadToLinkInterfaceMap methods.
      cmGeneratorTarget: Move GetLinkInterface from cmTarget.
      cmGeneratorTarget: Move ComputeLinkInterface from cmTarget.
      cmGeneratorTarget: Move GetLinkInterfaceLibraries from cmTarget.
      cmGeneratorTarget: Move ComputeLinkInterfaceLibraries from cmTarget.
      cmGeneratorTarget: Move GetImportLinkInterface from cmTarget.
      cmGeneratorTarget: Move link iface helpers from cmTarget.
      cmGeneratorTarget: Move include directory processing from cmTarget.
      cmGeneratorTarget: Move compile options processing from cmTarget.
      cmGeneratorTarget: Move compile features processing from cmTarget.
      cmGeneratorTarget: Move compile defintions processing from cmTarget.
      cmLinkItem: Add cmLinkImplementation type.
      cmLinkItem: Add cmOptionalLinkImplementation type.
      cmTarget: Add GetLinkImplMap method.
      cmGeneratorTarget: Move GetLinkImplementation from cmTarget.
      cmGeneratorTarget: Move HaveBuildTreeRPath from cmTarget.
      cmGeneratorTarget: Move ComputeLinkImplementationLanguages from cmTarget.
      cmGeneratorTarget: Move GetLanguages from cmTarget.
      cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
      cmLocalGenerator: Remove Parent pointer.
      cmMakefile: Remove cmLocalGenerator member.
      cmGlobalGenerator: Require a snapshot to create a local generator.
      cmGlobalGenerator: Remove MakeLocalGenerator method.
      QtAutogen: Use a smart pointer.
      cmCTestScriptHandler: Simplify deletes.
      Ninja: Remove some incorrect comments adding no value.
      cmLocalGenerator: Create from already-constructed cmMakefile.
      cmGlobalGenerator: Avoid cmLocalGenerator until after Configure.
      cmGlobalGenerator: Rename method.
      cmGlobalGenerator: Fill the project map at compute time.
      cmMakefile: Skip Global targets for CMP0019 evaluation.
      cmGlobalGenerator: Create global targets directly after Configure.
      cmGlobalGenerator: Access makefile from makefiles container.
      cmGlobalGenerator: Process evaluation files after target depends.
      cmGeneratorTarget: Rename method to match operation.
      cmTarget: Only append non-empty values to buildsystem properties.
      cmMakefile: Use appropriate parameter name.
      cmState: Only append non-empty values to buildsystem properties.
      cmState: Return end snapshot for GetBuildsystemDirectoryParent.
      cmLocalGenerator: Always return the end snapshot state of a directory.
      Project: Determine default language dialect for the compiler.
      cmLocalGenerator: Simplify condition.
      cmGlobalGenerator: Add API for the configure step being finished.
      CMP0026: Use compatibility codepath until configure is finished (#15748)
      Project: Don't require computed default dialect if compiler was forced.
      Makefiles: Port to cmOutputConverter.
      Makefiles: Remove need to create local generator at configure time.
      cmMakefile: Create the local generator after configuring the makefile.
      cmGlobalGenerator: Create local generator after configuring the makefile.
      cmGlobalGenerator: Create local generators after all makefiles configured.
      cmGlobalGenerator: Remove unused method.
      cmGlobalGenerator: Create all local generators after Configure().
      cmLocalGenerator: Compute object max path on construction.
      QtAutogen: Add missing includes and forward declarations.
      QtAutogen: Don't use a member to store skipped uic files.
      QtAutogen: Rename variable.
      QtAutogen: Don't use members to initialize automoc targets.
      QtAutogen: Make internal method private.
      QtAutogen: Make some methods static.
      QtAutogen: Move condition to prior loop.
      QtAutogen: Move condition to prior loop.
      QtAutogen: Move initialization condition to caller.
      QtAutogen: Add _automoc.cpp sources before initializing.
      QtAutogen: Move Source initialization to prior loop.
      QtAutogen: Remove unnecessary dereference.
      QtAutogen: Simplify generator initialization API.
      QtAutogen: Split initializer methods into separate class.
      Build: Set CMP0053 to NEW.
      Ninja: Remove unused variable.
      cmGlobalGenerator: Devirtualize method.
      cmSetCommand: Fix typo in comment.
      cmSetCommand: Re-use local named variable.
      cmCommand: Remove IsDiscouraged interface.
      cmMakefile: Remove Configured state.
      VS: Remove impossible condition.
      QtAutogen: Split initializer class into separate file.
      QtAutogen: Port away from cmLocalGenerator.
      cmGlobalGenerator: Initialize generator targets on construction (#15729)

Thijs Wenker (3):
      FindOpenSSL: Remove extra whitespace
      FindOpenSSL: De-duplicate find_library path suffixes on Windows
      FindOpenSSL: Optionally search only for static libraries

Thomas Klausner (1):
      ccmake: Use more-portable call to set_field_buffer (#15740)

Thorsten Glaser (1):
      FindJNI: Add support for x32 architecture on Linux (#15710)

Tony Kelman (1):
      GenerateExportHeader: Use dllexport/dllimport on Cygwin

Yunqiang Su (1):
      FindJNI: Add mips64(el) mipsn32(el) support (#15714)

Zack Galbreath (5):
      Help: Fix typo in ctest_test documentation
      cmCTestMultiProcessHandler: Refactor RUN_SERIAL implementation
      ctest_coverage: Always do coverage for CTEST_EXTRA_COVERAGE_GLOB
      CTest: Optionally add a ChangeId attribute on XML Site tags
      ctest_coverage: Make Jacoco parser better at finding source files

-----------------------------------------------------------------------


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 11:58:20 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 11:58:20 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-83-g5636a89
Message-ID: <20151006155820.A0785BF9D8@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5636a8971908bd663f148081401cf48725bcf71c (commit)
       via  1bf66fed674bc1b7c463bd230f7c66df8aa86e79 (commit)
       via  6b575dec8d393c4a38c587ee97afa068eeb4b432 (commit)
      from  5f80b1b146e2f39b8998cb49ff734e2fc5bcac91 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5636a8971908bd663f148081401cf48725bcf71c
commit 5636a8971908bd663f148081401cf48725bcf71c
Merge: 5f80b1b 1bf66fe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 11:58:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 11:58:19 2015 -0400

    Merge topic 'FindOpenSSL-mingw' into next
    
    1bf66fed FindOpenSSL: Search for unix-named libraries first on MinGW (#15765)
    6b575dec FindOpenSSL: Tolerate tabs in header while parsing version (#15765)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bf66fed674bc1b7c463bd230f7c66df8aa86e79
commit 1bf66fed674bc1b7c463bd230f7c66df8aa86e79
Author:     Wayne Stambaugh <stambaughw at gmail.com>
AuthorDate: Sat Oct 3 11:40:00 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 11:55:46 2015 -0400

    FindOpenSSL: Search for unix-named libraries first on MinGW (#15765)
    
    Generalize the change made by commit v2.8.10~228^2~4 (FindOpenSSL: find
    cross-compiled OpenSSL from MinGW, 2012-07-23) to be used on builds
    hosted on Windows too.  When building for MinGW, consider library names
    that come with MinGW before looking for the main Windows distribution of
    OpenSSL.

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 3aea695..8b4b988 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -200,12 +200,8 @@ if(WIN32 AND NOT CYGWIN)
     set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
   elseif(MINGW)
     # same player, for MinGW
-    set(LIB_EAY_NAMES libeay32)
-    set(SSL_EAY_NAMES ssleay32)
-    if(CMAKE_CROSSCOMPILING)
-      list(APPEND LIB_EAY_NAMES crypto)
-      list(APPEND SSL_EAY_NAMES ssl)
-    endif()
+    set(LIB_EAY_NAMES crypto libeay32)
+    set(SSL_EAY_NAMES ssl ssleay32)
     find_library(LIB_EAY
       NAMES
         ${LIB_EAY_NAMES}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b575dec8d393c4a38c587ee97afa068eeb4b432
commit 6b575dec8d393c4a38c587ee97afa068eeb4b432
Author:     Wayne Stambaugh <stambaughw at gmail.com>
AuthorDate: Sat Oct 3 11:40:00 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 11:50:32 2015 -0400

    FindOpenSSL: Tolerate tabs in header while parsing version (#15765)
    
    Tolerate tabs instead of spaces in the "# define" line.

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index a0f4c52..3aea695 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -325,7 +325,7 @@ endfunction()
 if (OPENSSL_INCLUDE_DIR)
   if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
     file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
-         REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+         REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
 
     # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
     # The status gives if this is a developer or prerelease and is ignored here.

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindOpenSSL.cmake |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct  6 13:59:29 2015
From: brad.king at kitware.com (Brad King)
Date: Tue,  6 Oct 2015 13:59:29 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-86-g3d6c305
Message-ID: <20151006175929.710ECBFB70@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3d6c305c4e458276e6ebadfe88a3ca2a88c7e010 (commit)
       via  b520b1ca4ec3d51a031d44a25080931c5bb73b83 (commit)
       via  26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc (commit)
      from  5636a8971908bd663f148081401cf48725bcf71c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d6c305c4e458276e6ebadfe88a3ca2a88c7e010
commit 3d6c305c4e458276e6ebadfe88a3ca2a88c7e010
Merge: 5636a89 b520b1c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 13:59:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 13:59:28 2015 -0400

    Merge topic 'release-nightly-linux64' into next
    
    b520b1ca Tests: Add a nightly Linux 64-bit binary
    26a0b52d Tests: Rename Linux nightly release binary test to Linux32


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b520b1ca4ec3d51a031d44a25080931c5bb73b83
commit b520b1ca4ec3d51a031d44a25080931c5bb73b83
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 13:58:45 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 13:58:45 2015 -0400

    Tests: Add a nightly Linux 64-bit binary

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2b23360..3f28c25 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -691,6 +691,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
       dashmacmini5_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
       magrathea_release.cmake)
+    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64
+      linux64_release.cmake)
   endif()
 
   # add tests with more complex invocations

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc
commit 26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 13:56:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 13:56:19 2015 -0400

    Tests: Rename Linux nightly release binary test to Linux32
    
    Distinguish the name from a future 64-bit nightly binary.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1861d82..2b23360 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -689,7 +689,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
       dash2win64_release.cmake)
     ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
       dashmacmini5_release.cmake)
-    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux
+    ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
       magrathea_release.cmake)
   endif()
 

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct  6 16:03:42 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  6 Oct 2015 16:03:42 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-101-gc54c869
Message-ID: <20151006200342.9E5AABFCE9@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c54c869a7127352d7e2ca757c5ecd039d12ae2ab (commit)
       via  2921944e08dbe5ed51d3b402ab08c49966b26ed5 (commit)
       via  faa703b091317c76afaa8432c86f7abf8a31d53f (commit)
       via  092c8f35b6e9c0c2c468cc449fabaa81d574ca40 (commit)
       via  e804e2824f44d1cc86d0dca8a6aef9b179dfa6dd (commit)
       via  3fb8a61ed3ff288ea404bce4b0ccda047ddaa977 (commit)
       via  18be18f060e897bc51acd04d0e3e7c9f2c93ecfc (commit)
       via  2bb6c801a18a0e7672b991dbdc1efd879116747d (commit)
       via  5eeb043fb2b9febef44771855d14ea6acf63d5dd (commit)
       via  788c3cc9e8eb4777c0146d63d8d994456ac51d19 (commit)
       via  41eef9ccc94f1d6c4cff0c45f02ebcdbdf185725 (commit)
       via  156bd2c983b439478dff5fe84629b5a93e780a92 (commit)
       via  01e666c70e9c83ebd8c200d121b706868f69e617 (commit)
       via  bf28b7874b999224782fac72c5a74020bd6c47d3 (commit)
       via  9d653f9c1cc129be4fdce7f0e93c282760c7603e (commit)
      from  3d6c305c4e458276e6ebadfe88a3ca2a88c7e010 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c54c869a7127352d7e2ca757c5ecd039d12ae2ab
commit c54c869a7127352d7e2ca757c5ecd039d12ae2ab
Merge: 3d6c305 2921944
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 16:03:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 16:03:39 2015 -0400

    Merge topic 'cmGeneratorTarget-sources' into next
    
    2921944e cmTarget: Remove Compute method.
    faa703b0 cmGeneratorTarget: Move computed sources from cmTarget.
    092c8f35 cmGeneratorTarget: Inline GetSourceFiles from cmTarget.
    e804e282 cmGeneratorTarget: Move AddInterfaceEntries method.
    3fb8a61e cmTarget: Remove a conditional for generate-time source addition.
    18be18f0 cmTarget: Split storage of sources from genexes.
    2bb6c801 cmTarget: Add Compute API for sources.
    5eeb043f cmTarget: Add API for generate-time source addition.
    788c3cc9 cmGeneratorTarget: Add methods for generate-time source addition.
    41eef9cc Access sources through cmGeneratorTarget.
    156bd2c9 Xcode: Port away from unnecessary CMP0049 compatibility.
    01e666c7 cmTarget: Join strings conditionally.
    bf28b787 cmGeneratorTarget: Rename internal member.
    9d653f9c cmFLTKWrapUI: Remove CMake 2.2 compat code.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2921944e08dbe5ed51d3b402ab08c49966b26ed5
commit 2921944e08dbe5ed51d3b402ab08c49966b26ed5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:54:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:02:19 2015 +0200

    cmTarget: Remove Compute method.
    
    The following tests FAILED:
            146 - Qt5Autogen (Failed)
            148 - Qt4Autogen (Failed)
            298 - RunCMake.set_property (Failed)
            314 - RunCMake.File_Generate (Failed)

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a62d534..db842b0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1538,7 +1538,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
         ti != targets.end(); ++ti)
       {
       cmTarget* t = &ti->second;
-      t->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
       generatorTargets[t] = gt;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 5bace47..ab9d7e7 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -254,7 +254,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
     mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false,
                           no_working_directory, no_depends,
                           noCommandLines);
-  tgt->Compute();
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   mf->AddGeneratorTarget(tgt, gt);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index fd2d33a..d45aa27 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -86,7 +86,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           no_depends, no_commands, false,
                           "Build all projects");
 
-      allBuild->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 14bc340..3d52e3a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -456,7 +456,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         no_working_directory,
                         "echo", "Build all projects");
 
-  allbuild->Compute();
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
@@ -492,7 +491,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           no_working_directory,
                           "make", "-f", file.c_str());
 
-    check->Compute();
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     mf->AddGeneratorTarget(check, checkGt);
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 1b1b98e..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -885,8 +885,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 /*byproducts=*/rcc_output, depends,
                                 commandLines, false, autogenComment.c_str());
 
-    autogenTarget->Compute();
-
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     makefile->AddGeneratorTarget(autogenTarget, gt);
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e87aa16..abfc40b 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -361,10 +361,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 }
 
-void cmTarget::Compute()
-{
-}
-
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 71f0d1f..354eda2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -133,8 +133,6 @@ public:
   void AddPostBuildCommand(cmCustomCommand const &cmd)
     {this->PostBuildCommands.push_back(cmd);}
 
-  void Compute();
-
   /**
    * Add sources to the target.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faa703b091317c76afaa8432c86f7abf8a31d53f
commit faa703b091317c76afaa8432c86f7abf8a31d53f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 10:18:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:02:17 2015 +0200

    cmGeneratorTarget: Move computed sources from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 43ce882..3d5e89d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -269,7 +269,9 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
   DebugIncludesDone(false),
   DebugCompileOptionsDone(false),
   DebugCompileFeaturesDone(false),
-  DebugCompileDefinitionsDone(false)
+  DebugCompileDefinitionsDone(false),
+  DebugSourcesDone(false),
+  LinkImplementationLanguageIsContextDependent(true)
 {
   this->Makefile = this->Target->GetMakefile();
   this->LocalGenerator = lg;
@@ -296,6 +298,11 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
         t->GetCompileDefinitionsEntries(),
         t->GetCompileDefinitionsBacktraces(),
         this->CompileDefinitionsEntries);
+
+  CreatePropertyGeneratorExpressions(
+        t->GetSourceEntries(),
+        t->GetSourceBacktraces(),
+        this->SourceEntries, true);
 }
 
 cmGeneratorTarget::~cmGeneratorTarget()
@@ -304,6 +311,7 @@ cmGeneratorTarget::~cmGeneratorTarget()
   cmDeleteAll(this->CompileOptionsEntries);
   cmDeleteAll(this->CompileFeaturesEntries);
   cmDeleteAll(this->CompileDefinitionsEntries);
+  cmDeleteAll(this->SourceEntries);
   cmDeleteAll(this->LinkInformation);
   this->LinkInformation.clear();
 }
@@ -404,12 +412,30 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 
 void cmGeneratorTarget::AddSource(const std::string& src)
 {
-  this->Target->AddGenerateTimeSource(src);
+  this->Target->AddSource(src);
+  cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+  cmGeneratorExpression ge(lfbt);
+  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
+  cge->SetEvaluateForBuildsystem(true);
+  this->SourceEntries.push_back(
+                        new TargetPropertyEntry(cge));
 }
 
 void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   this->Target->AddTracedSources(srcs);
+  if (!srcs.empty())
+    {
+    std::string srcFiles = cmJoin(srcs, ";");
+    this->SourceFilesMap.clear();
+    this->LinkImplementationLanguageIsContextDependent = true;
+    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    cmGeneratorExpression ge(lfbt);
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
+    cge->SetEvaluateForBuildsystem(true);
+    this->SourceEntries.push_back(
+          new cmGeneratorTarget::TargetPropertyEntry(cge));
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -839,29 +865,216 @@ static void AddInterfaceEntries(
 }
 
 //----------------------------------------------------------------------------
+static bool processSources(cmGeneratorTarget const* tgt,
+      const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries,
+      std::vector<std::string> &srcs,
+      UNORDERED_SET<std::string> &uniqueSrcs,
+      cmGeneratorExpressionDAGChecker *dagChecker,
+      std::string const& config, bool debugSources)
+{
+  cmMakefile *mf = tgt->Target->GetMakefile();
+
+  bool contextDependent = false;
+
+  for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator
+      it = entries.begin(), end = entries.end(); it != end; ++it)
+    {
+    cmLinkImplItem const& item = (*it)->LinkImplItem;
+    std::string const& targetName = item;
+    std::vector<std::string> entrySources;
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+                                              config,
+                                              false,
+                                              tgt->Target,
+                                              tgt->Target,
+                                              dagChecker),
+                                    entrySources);
+
+    if ((*it)->ge->GetHadContextSensitiveCondition())
+      {
+      contextDependent = true;
+      }
+
+    for(std::vector<std::string>::iterator i = entrySources.begin();
+        i != entrySources.end(); ++i)
+      {
+      std::string& src = *i;
+      cmSourceFile* sf = mf->GetOrCreateSource(src);
+      std::string e;
+      std::string fullPath = sf->GetFullPath(&e);
+      if(fullPath.empty())
+        {
+        if(!e.empty())
+          {
+          cmake* cm = mf->GetCMakeInstance();
+          cm->IssueMessage(cmake::FATAL_ERROR, e,
+                          tgt->Target->GetBacktrace());
+          }
+        return contextDependent;
+        }
+
+      if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str()))
+        {
+        std::ostringstream err;
+        if (!targetName.empty())
+          {
+          err << "Target \"" << targetName << "\" contains relative "
+            "path in its INTERFACE_SOURCES:\n"
+            "  \"" << src << "\"";
+          }
+        else
+          {
+          err << "Found relative path while evaluating sources of "
+          "\"" << tgt->GetName() << "\":\n  \"" << src << "\"\n";
+          }
+        tgt->GetLocalGenerator()->IssueMessage(cmake::FATAL_ERROR, err.str());
+        return contextDependent;
+        }
+      src = fullPath;
+      }
+    std::string usedSources;
+    for(std::vector<std::string>::iterator
+          li = entrySources.begin(); li != entrySources.end(); ++li)
+      {
+      std::string src = *li;
+
+      if(uniqueSrcs.insert(src).second)
+        {
+        srcs.push_back(src);
+        if (debugSources)
+          {
+          usedSources += " * " + src + "\n";
+          }
+        }
+      }
+    if (!usedSources.empty())
+      {
+      mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
+                            std::string("Used sources for target ")
+                            + tgt->GetName() + ":\n"
+                            + usedSources, (*it)->ge->GetBacktrace());
+      }
+    }
+  return contextDependent;
+}
+
+//----------------------------------------------------------------------------
+void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files,
+                              const std::string& config) const
+{
+  assert(this->GetType() != cmTarget::INTERFACE_LIBRARY);
+
+  if (!this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+    {
+    // At configure-time, this method can be called as part of getting the
+    // LOCATION property or to export() a file to be include()d.  However
+    // there is no cmGeneratorTarget at configure-time, so search the SOURCES
+    // for TARGET_OBJECTS instead for backwards compatibility with OLD
+    // behavior of CMP0024 and CMP0026 only.
+
+    cmStringRange sourceEntries = this->Target->GetSourceEntries();
+    for(cmStringRange::const_iterator
+          i = sourceEntries.begin();
+        i != sourceEntries.end(); ++i)
+      {
+      std::string const& entry = *i;
+
+      std::vector<std::string> items;
+      cmSystemTools::ExpandListArgument(entry, items);
+      for (std::vector<std::string>::const_iterator
+          li = items.begin(); li != items.end(); ++li)
+        {
+        if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
+            (*li)[li->size() - 1] == '>')
+          {
+          continue;
+          }
+        files.push_back(*li);
+        }
+      }
+    return;
+    }
+
+  std::vector<std::string> debugProperties;
+  const char *debugProp =
+              this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES");
+  if (debugProp)
+    {
+    cmSystemTools::ExpandListArgument(debugProp, debugProperties);
+    }
+
+  bool debugSources = !this->DebugSourcesDone
+                    && std::find(debugProperties.begin(),
+                                 debugProperties.end(),
+                                 "SOURCES")
+                        != debugProperties.end();
+
+  if (this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+    {
+    this->DebugSourcesDone = true;
+    }
+
+  cmGeneratorExpressionDAGChecker dagChecker(this->GetName(),
+                                             "SOURCES", 0, 0);
+
+  UNORDERED_SET<std::string> uniqueSrcs;
+  bool contextDependentDirectSources = processSources(this,
+                 this->SourceEntries,
+                 files,
+                 uniqueSrcs,
+                 &dagChecker,
+                 config,
+                 debugSources);
+
+  std::vector<cmGeneratorTarget::TargetPropertyEntry*>
+    linkInterfaceSourcesEntries;
+
+  AddInterfaceEntries(
+    this, config, "INTERFACE_SOURCES",
+    linkInterfaceSourcesEntries);
+
+  std::vector<std::string>::size_type numFilesBefore = files.size();
+  bool contextDependentInterfaceSources = processSources(this,
+    linkInterfaceSourcesEntries,
+                            files,
+                            uniqueSrcs,
+                            &dagChecker,
+                            config,
+                            debugSources);
+
+  if (!contextDependentDirectSources
+      && !(contextDependentInterfaceSources && numFilesBefore < files.size()))
+    {
+    this->LinkImplementationLanguageIsContextDependent = false;
+    }
+
+  cmDeleteAll(linkInterfaceSourcesEntries);
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
                                        const std::string& config) const
 {
+
   // Lookup any existing link implementation for this configuration.
   std::string key = cmSystemTools::UpperCase(config);
 
-  cmTarget::SourceFilesMapType& sfm = this->Target->GetSourceFilesMap();
-  if(!this->Target->GetLinkImplementationLanguageIsContextDependent())
+  if(!this->LinkImplementationLanguageIsContextDependent)
     {
-    files = sfm.begin()->second;
+    files = this->SourceFilesMap.begin()->second;
     return;
     }
 
-  cmTarget::SourceFilesMapType::iterator
-    it = sfm.find(key);
-  if(it != sfm.end())
+  SourceFilesMapType::iterator
+    it = this->SourceFilesMap.find(key);
+  if(it != this->SourceFilesMap.end())
     {
     files = it->second;
     }
   else
     {
     std::vector<std::string> srcs;
-    this->Target->GetSourceFiles(srcs, config);
+    this->GetSourceFiles(srcs, config);
 
     std::set<cmSourceFile*> emitted;
 
@@ -874,7 +1087,7 @@ void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
         files.push_back(sf);
         }
       }
-    sfm[key] = files;
+    this->SourceFilesMap[key] = files;
     }
 }
 
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 0c6ad82..e8c5e04 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -441,10 +441,15 @@ private:
     GetImportLinkInterface(const std::string& config, cmTarget const* head,
                            bool usage_requirements_only) const;
 
+  typedef std::map<std::string, std::vector<cmSourceFile*> >
+                                                       SourceFilesMapType;
+  mutable SourceFilesMapType SourceFilesMap;
+
   std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries;
   std::vector<TargetPropertyEntry*> CompileOptionsEntries;
   std::vector<TargetPropertyEntry*> CompileFeaturesEntries;
   std::vector<TargetPropertyEntry*> CompileDefinitionsEntries;
+  std::vector<TargetPropertyEntry*> SourceEntries;
 
   void ExpandLinkItems(std::string const& prop, std::string const& value,
                        std::string const& config, cmTarget const* headTarget,
@@ -454,6 +459,9 @@ private:
   void LookupLinkItems(std::vector<std::string> const& names,
                        std::vector<cmLinkItem>& items) const;
 
+  void GetSourceFiles(std::vector<std::string>& files,
+                      const std::string& config) const;
+
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
@@ -462,6 +470,8 @@ private:
   mutable bool DebugCompileOptionsDone;
   mutable bool DebugCompileFeaturesDone;
   mutable bool DebugCompileDefinitionsDone;
+  mutable bool DebugSourcesDone;
+  mutable bool LinkImplementationLanguageIsContextDependent;
 
 public:
   std::vector<cmTarget const*> const&
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 8ff729f..e87aa16 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -101,21 +101,9 @@ public:
                    HeadToLinkImplementationMap> LinkImplMapType;
   LinkImplMapType LinkImplMap;
 
-  cmTarget::SourceFilesMapType SourceFilesMap;
-
   std::set<cmLinkItem> UtilityItems;
   bool UtilityItemsDone;
 
-  class TargetPropertyEntry {
-    static cmLinkImplItem NoLinkImplItem;
-  public:
-    TargetPropertyEntry(cmsys::auto_ptr<cmCompiledGeneratorExpression> cge,
-                        cmLinkImplItem const& item = NoLinkImplItem)
-      : ge(cge), LinkImplItem(item)
-    {}
-    const cmsys::auto_ptr<cmCompiledGeneratorExpression> ge;
-    cmLinkImplItem const& LinkImplItem;
-  };
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -126,16 +114,9 @@ public:
   std::vector<cmListFileBacktrace> CompileDefinitionsBacktraces;
   std::vector<std::string> SourceEntries;
   std::vector<cmListFileBacktrace> SourceBacktraces;
-  std::vector<TargetPropertyEntry*> SourceItems;
   std::vector<cmValueWithOrigin> LinkImplementationPropertyEntries;
-
-  void AddInterfaceEntries(
-    cmTarget const* thisTarget, std::string const& config,
-    std::string const& prop, std::vector<TargetPropertyEntry*>& entries);
 };
 
-cmLinkImplItem cmTargetInternals::TargetPropertyEntry::NoLinkImplItem;
-
 //----------------------------------------------------------------------------
 cmTargetInternals::~cmTargetInternals()
 {
@@ -154,8 +135,6 @@ cmTarget::cmTarget()
   this->IsApple = false;
   this->IsImportedTarget = false;
   this->BuildInterfaceIncludesAppended = false;
-  this->DebugSourcesDone = false;
-  this->LinkImplementationLanguageIsContextDependent = true;
 }
 
 void cmTarget::SetType(TargetType type, const std::string& name)
@@ -382,34 +361,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 }
 
-void CreatePropertyGeneratorExpressions(
-    std::vector<std::string> const& entries,
-    std::vector<cmListFileBacktrace> const& backtraces,
-    std::vector<cmTargetInternals::TargetPropertyEntry*>& items,
-    bool evaluateForBuildsystem = false)
-{
-  std::vector<cmListFileBacktrace>::const_iterator btIt = backtraces.begin();
-  for (std::vector<std::string>::const_iterator it = entries.begin();
-       it != entries.end(); ++it, ++btIt)
-    {
-    cmGeneratorExpression ge(*btIt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*it);
-    cge->SetEvaluateForBuildsystem(evaluateForBuildsystem);
-    items.push_back(new cmTargetInternals::TargetPropertyEntry(cge));
-    }
-}
-
 void cmTarget::Compute()
 {
-  CreatePropertyGeneratorExpressions(
-        this->Internal->SourceEntries,
-        this->Internal->SourceBacktraces,
-        this->Internal->SourceItems, true);
-}
-
-cmTarget::SourceFilesMapType& cmTarget::GetSourceFilesMap() const
-{
-  return this->Internal->SourceFilesMap;
 }
 
 //----------------------------------------------------------------------------
@@ -469,9 +422,7 @@ void cmTarget::FinishConfigure()
 //----------------------------------------------------------------------------
 void cmTarget::ClearLinkMaps()
 {
-  this->LinkImplementationLanguageIsContextDependent = true;
   this->Internal->LinkImplMap.clear();
-  this->Internal->SourceFilesMap.clear();
 }
 
 //----------------------------------------------------------------------------
@@ -553,207 +504,13 @@ bool cmTarget::IsXCTestOnApple() const
 }
 
 //----------------------------------------------------------------------------
-static bool processSources(cmTarget const* tgt,
-      const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries,
-      std::vector<std::string> &srcs,
-      UNORDERED_SET<std::string> &uniqueSrcs,
-      cmGeneratorExpressionDAGChecker *dagChecker,
-      std::string const& config, bool debugSources)
-{
-  cmMakefile *mf = tgt->GetMakefile();
-
-  bool contextDependent = false;
-
-  for (std::vector<cmTargetInternals::TargetPropertyEntry*>::const_iterator
-      it = entries.begin(), end = entries.end(); it != end; ++it)
-    {
-    cmLinkImplItem const& item = (*it)->LinkImplItem;
-    std::string const& targetName = item;
-    std::vector<std::string> entrySources;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
-                                              config,
-                                              false,
-                                              tgt,
-                                              tgt,
-                                              dagChecker),
-                                    entrySources);
-
-    if ((*it)->ge->GetHadContextSensitiveCondition())
-      {
-      contextDependent = true;
-      }
-
-    for(std::vector<std::string>::iterator i = entrySources.begin();
-        i != entrySources.end(); ++i)
-      {
-      std::string& src = *i;
-      cmSourceFile* sf = mf->GetOrCreateSource(src);
-      std::string e;
-      std::string fullPath = sf->GetFullPath(&e);
-      if(fullPath.empty())
-        {
-        if(!e.empty())
-          {
-          cmake* cm = mf->GetCMakeInstance();
-          cm->IssueMessage(cmake::FATAL_ERROR, e,
-                          tgt->GetBacktrace());
-          }
-        return contextDependent;
-        }
-
-      if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str()))
-        {
-        std::ostringstream err;
-        if (!targetName.empty())
-          {
-          err << "Target \"" << targetName << "\" contains relative "
-            "path in its INTERFACE_SOURCES:\n"
-            "  \"" << src << "\"";
-          }
-        else
-          {
-          err << "Found relative path while evaluating sources of "
-          "\"" << tgt->GetName() << "\":\n  \"" << src << "\"\n";
-          }
-        tgt->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, err.str());
-        return contextDependent;
-        }
-      src = fullPath;
-      }
-    std::string usedSources;
-    for(std::vector<std::string>::iterator
-          li = entrySources.begin(); li != entrySources.end(); ++li)
-      {
-      std::string src = *li;
-
-      if(uniqueSrcs.insert(src).second)
-        {
-        srcs.push_back(src);
-        if (debugSources)
-          {
-          usedSources += " * " + src + "\n";
-          }
-        }
-      }
-    if (!usedSources.empty())
-      {
-      mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
-                            std::string("Used sources for target ")
-                            + tgt->GetName() + ":\n"
-                            + usedSources, (*it)->ge->GetBacktrace());
-      }
-    }
-  return contextDependent;
-}
-
-//----------------------------------------------------------------------------
-void cmTarget::GetSourceFiles(std::vector<std::string> &files,
-                              const std::string& config) const
-{
-  assert(this->GetType() != INTERFACE_LIBRARY);
-
-  if (!this->GetMakefile()->GetGlobalGenerator()->GetConfigureDoneCMP0026())
-    {
-    // At configure-time, this method can be called as part of getting the
-    // LOCATION property or to export() a file to be include()d.  However
-    // there is no cmGeneratorTarget at configure-time, so search the SOURCES
-    // for TARGET_OBJECTS instead for backwards compatibility with OLD
-    // behavior of CMP0024 and CMP0026 only.
-
-    for(std::vector<std::string>::const_iterator
-          i = this->Internal->SourceEntries.begin();
-        i != this->Internal->SourceEntries.end(); ++i)
-      {
-      std::string const& entry = *i;
-
-      std::vector<std::string> items;
-      cmSystemTools::ExpandListArgument(entry, items);
-      for (std::vector<std::string>::const_iterator
-          li = items.begin(); li != items.end(); ++li)
-        {
-        if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
-            (*li)[li->size() - 1] == '>')
-          {
-          continue;
-          }
-        files.push_back(*li);
-        }
-      }
-    return;
-    }
-
-  std::vector<std::string> debugProperties;
-  const char *debugProp =
-              this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES");
-  if (debugProp)
-    {
-    cmSystemTools::ExpandListArgument(debugProp, debugProperties);
-    }
-
-  bool debugSources = !this->DebugSourcesDone
-                    && std::find(debugProperties.begin(),
-                                 debugProperties.end(),
-                                 "SOURCES")
-                        != debugProperties.end();
-
-  if (this->GetMakefile()->GetGlobalGenerator()->GetConfigureDoneCMP0026())
-    {
-    this->DebugSourcesDone = true;
-    }
-
-  cmGeneratorExpressionDAGChecker dagChecker(this->GetName(),
-                                             "SOURCES", 0, 0);
-
-  UNORDERED_SET<std::string> uniqueSrcs;
-  bool contextDependentDirectSources = processSources(this,
-                 this->Internal->SourceItems,
-                 files,
-                 uniqueSrcs,
-                 &dagChecker,
-                 config,
-                 debugSources);
-
-  std::vector<cmTargetInternals::TargetPropertyEntry*>
-    linkInterfaceSourcesEntries;
-
-  this->Internal->AddInterfaceEntries(
-    this, config, "INTERFACE_SOURCES",
-    linkInterfaceSourcesEntries);
-
-  std::vector<std::string>::size_type numFilesBefore = files.size();
-  bool contextDependentInterfaceSources = processSources(this,
-    linkInterfaceSourcesEntries,
-                            files,
-                            uniqueSrcs,
-                            &dagChecker,
-                            config,
-                            debugSources);
-
-  if (!contextDependentDirectSources
-      && !(contextDependentInterfaceSources && numFilesBefore < files.size()))
-    {
-    this->LinkImplementationLanguageIsContextDependent = false;
-    }
-
-  cmDeleteAll(linkInterfaceSourcesEntries);
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
     {
-    std::string srcFiles = cmJoin(srcs, ";");
-    this->Internal->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->SourceEntries.push_back(srcFiles);
+    this->Internal->SourceEntries.push_back(cmJoin(srcs, ";"));
     this->Internal->SourceBacktraces.push_back(lfbt);
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceItems.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
     }
 }
 
@@ -786,8 +543,6 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs)
     }
   if (!srcFiles.empty())
     {
-    this->Internal->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     this->Internal->SourceEntries.push_back(srcFiles);
     this->Internal->SourceBacktraces.push_back(lfbt);
@@ -916,8 +671,6 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
                    TargetPropertyEntryFinder(sfl))
                                       == this->Internal->SourceEntries.end())
     {
-    this->Internal->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     this->Internal->SourceEntries.push_back(src);
     this->Internal->SourceBacktraces.push_back(lfbt);
@@ -929,17 +682,6 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
   return this->Makefile->GetOrCreateSource(src);
 }
 
-void cmTarget::AddGenerateTimeSource(const std::string& src)
-{
-  cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-  cmGeneratorExpression ge(lfbt);
-  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
-  cge->SetEvaluateForBuildsystem(true);
-  this->Internal->SourceItems.push_back(
-                        new cmTargetInternals::TargetPropertyEntry(cge));
-  this->AddSource(src);
-}
-
 //----------------------------------------------------------------------------
 void cmTarget::MergeLinkLibraries( cmMakefile& mf,
                                    const std::string& selfname,
@@ -1234,6 +976,16 @@ cmBacktraceRange cmTarget::GetCompileDefinitionsBacktraces() const
   return cmMakeRange(this->Internal->CompileDefinitionsBacktraces);
 }
 
+cmStringRange cmTarget::GetSourceEntries() const
+{
+  return cmMakeRange(this->Internal->SourceEntries);
+}
+
+cmBacktraceRange cmTarget::GetSourceBacktraces() const
+{
+  return cmMakeRange(this->Internal->SourceBacktraces);
+}
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
 //----------------------------------------------------------------------------
 void
@@ -1649,7 +1401,6 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
-    this->Internal->SourceFilesMap.clear();
 
     this->Internal->SourceEntries.clear();
     this->Internal->SourceBacktraces.clear();
@@ -1749,7 +1500,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
-    this->Internal->SourceFilesMap.clear();
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     this->Internal->SourceEntries.push_back(value);
     this->Internal->SourceBacktraces.push_back(lfbt);
@@ -3424,32 +3174,6 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 }
 
-//----------------------------------------------------------------------------
-void cmTargetInternals::AddInterfaceEntries(
-  cmTarget const* thisTarget, std::string const& config,
-  std::string const& prop, std::vector<TargetPropertyEntry*>& entries)
-{
-  if(cmLinkImplementationLibraries const* impl =
-     thisTarget->GetLinkImplementationLibraries(config))
-    {
-    for (std::vector<cmLinkImplItem>::const_iterator
-           it = impl->Libraries.begin(), end = impl->Libraries.end();
-         it != end; ++it)
-      {
-      if(it->Target)
-        {
-        std::string genex =
-          "$<TARGET_PROPERTY:" + *it + "," + prop + ">";
-        cmGeneratorExpression ge(it->Backtrace);
-        cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex);
-        cge->SetEvaluateForBuildsystem(true);
-        entries.push_back(
-          new cmTargetInternals::TargetPropertyEntry(cge, *it));
-        }
-      }
-    }
-}
-
 cmOptionalLinkImplementation&
 cmTarget::GetLinkImplMap(std::string const& config) const
 {
@@ -3712,7 +3436,6 @@ cmTargetInternalPointer
 //----------------------------------------------------------------------------
 cmTargetInternalPointer::~cmTargetInternalPointer()
 {
-  cmDeleteAll(this->Pointer->SourceItems);
   delete this->Pointer;
 }
 
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 6024c38..71f0d1f 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -135,15 +135,6 @@ public:
 
   void Compute();
 
-  typedef std::map<std::string, std::vector<cmSourceFile*> >
-                                                       SourceFilesMapType;
-
-  SourceFilesMapType& GetSourceFilesMap() const;
-
-  bool GetLinkImplementationLanguageIsContextDependent() const {
-    return this->LinkImplementationLanguageIsContextDependent;
-  }
-
   /**
    * Add sources to the target.
    */
@@ -151,7 +142,6 @@ public:
   void AddTracedSources(std::vector<std::string> const& srcs);
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
-  void AddGenerateTimeSource(const std::string& src);
 
   enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
 
@@ -395,6 +385,9 @@ public:
   cmStringRange GetCompileDefinitionsEntries() const;
   cmBacktraceRange GetCompileDefinitionsBacktraces() const;
 
+  cmStringRange GetSourceEntries() const;
+  cmBacktraceRange GetSourceBacktraces() const;
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
   const LinkLibraryVectorType &GetLinkLibrariesForVS6() const {
   return this->LinkLibrariesForVS6;}
@@ -473,9 +466,6 @@ private:
   std::string ImportedGetFullPath(const std::string& config,
                                   bool implib) const;
 
-
-  void GetSourceFiles(std::vector<std::string> &files,
-                      const std::string& config) const;
 private:
   mutable cmPropertyMap Properties;
   std::set<std::string> SystemIncludeDirectories;
@@ -509,8 +499,6 @@ private:
   bool IsApple;
   bool IsImportedTarget;
   bool BuildInterfaceIncludesAppended;
-  mutable bool DebugSourcesDone;
-  mutable bool LinkImplementationLanguageIsContextDependent;
 #if defined(_WIN32) && !defined(__CYGWIN__)
   bool LinkLibrariesForVS6Analyzed;
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=092c8f35b6e9c0c2c468cc449fabaa81d574ca40
commit 092c8f35b6e9c0c2c468cc449fabaa81d574ca40
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 09:57:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:02:01 2015 +0200

    cmGeneratorTarget: Inline GetSourceFiles from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 357b972..43ce882 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -842,7 +842,40 @@ static void AddInterfaceEntries(
 void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
                                        const std::string& config) const
 {
-  this->Target->GetSourceFiles(files, config);
+  // Lookup any existing link implementation for this configuration.
+  std::string key = cmSystemTools::UpperCase(config);
+
+  cmTarget::SourceFilesMapType& sfm = this->Target->GetSourceFilesMap();
+  if(!this->Target->GetLinkImplementationLanguageIsContextDependent())
+    {
+    files = sfm.begin()->second;
+    return;
+    }
+
+  cmTarget::SourceFilesMapType::iterator
+    it = sfm.find(key);
+  if(it != sfm.end())
+    {
+    files = it->second;
+    }
+  else
+    {
+    std::vector<std::string> srcs;
+    this->Target->GetSourceFiles(srcs, config);
+
+    std::set<cmSourceFile*> emitted;
+
+    for(std::vector<std::string>::const_iterator i = srcs.begin();
+        i != srcs.end(); ++i)
+      {
+      cmSourceFile* sf = this->Makefile->GetOrCreateSource(*i);
+      if (emitted.insert(sf).second)
+        {
+        files.push_back(sf);
+        }
+      }
+    sfm[key] = files;
+    }
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fc9e963..8ff729f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -101,9 +101,7 @@ public:
                    HeadToLinkImplementationMap> LinkImplMapType;
   LinkImplMapType LinkImplMap;
 
-  typedef std::map<std::string, std::vector<cmSourceFile*> >
-                                                       SourceFilesMapType;
-  SourceFilesMapType SourceFilesMap;
+  cmTarget::SourceFilesMapType SourceFilesMap;
 
   std::set<cmLinkItem> UtilityItems;
   bool UtilityItemsDone;
@@ -409,6 +407,11 @@ void cmTarget::Compute()
         this->Internal->SourceItems, true);
 }
 
+cmTarget::SourceFilesMapType& cmTarget::GetSourceFilesMap() const
+{
+  return this->Internal->SourceFilesMap;
+}
+
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
@@ -736,46 +739,6 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
-                              const std::string& config) const
-{
-
-  // Lookup any existing link implementation for this configuration.
-  std::string key = cmSystemTools::UpperCase(config);
-
-  if(!this->LinkImplementationLanguageIsContextDependent)
-    {
-    files = this->Internal->SourceFilesMap.begin()->second;
-    return;
-    }
-
-  cmTargetInternals::SourceFilesMapType::iterator
-    it = this->Internal->SourceFilesMap.find(key);
-  if(it != this->Internal->SourceFilesMap.end())
-    {
-    files = it->second;
-    }
-  else
-    {
-    std::vector<std::string> srcs;
-    this->GetSourceFiles(srcs, config);
-
-    std::set<cmSourceFile*> emitted;
-
-    for(std::vector<std::string>::const_iterator i = srcs.begin();
-        i != srcs.end(); ++i)
-      {
-      cmSourceFile* sf = this->Makefile->GetOrCreateSource(*i);
-      if (emitted.insert(sf).second)
-        {
-        files.push_back(sf);
-        }
-      }
-    this->Internal->SourceFilesMap[key] = files;
-    }
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2f1671d..6024c38 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -135,11 +135,15 @@ public:
 
   void Compute();
 
-  /**
-   * Get the list of the source files used by this target
-   */
-  void GetSourceFiles(std::vector<cmSourceFile*> &files,
-                      const std::string& config) const;
+  typedef std::map<std::string, std::vector<cmSourceFile*> >
+                                                       SourceFilesMapType;
+
+  SourceFilesMapType& GetSourceFilesMap() const;
+
+  bool GetLinkImplementationLanguageIsContextDependent() const {
+    return this->LinkImplementationLanguageIsContextDependent;
+  }
+
   /**
    * Add sources to the target.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e804e2824f44d1cc86d0dca8a6aef9b179dfa6dd
commit e804e2824f44d1cc86d0dca8a6aef9b179dfa6dd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 09:45:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:02:01 2015 +0200

    cmGeneratorTarget: Move AddInterfaceEntries method.
    
    It will be needed here in a follow-up commit.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 83f9cd2..357b972 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -812,6 +812,33 @@ bool cmGeneratorTarget::GetPropertyAsBool(const std::string& prop) const
 }
 
 //----------------------------------------------------------------------------
+static void AddInterfaceEntries(
+  cmGeneratorTarget const* thisTarget, std::string const& config,
+  std::string const& prop,
+  std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries)
+{
+  if(cmLinkImplementationLibraries const* impl =
+     thisTarget->Target->GetLinkImplementationLibraries(config))
+    {
+    for (std::vector<cmLinkImplItem>::const_iterator
+           it = impl->Libraries.begin(), end = impl->Libraries.end();
+         it != end; ++it)
+      {
+      if(it->Target)
+        {
+        std::string genex =
+          "$<TARGET_PROPERTY:" + *it + "," + prop + ">";
+        cmGeneratorExpression ge(it->Backtrace);
+        cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex);
+        cge->SetEvaluateForBuildsystem(true);
+        entries.push_back(
+          new cmGeneratorTarget::TargetPropertyEntry(cge, *it));
+        }
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
                                        const std::string& config) const
 {
@@ -2177,34 +2204,6 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
     }
 }
 
-
-//----------------------------------------------------------------------------
-static void AddInterfaceEntries(
-  cmGeneratorTarget const* thisTarget, std::string const& config,
-  std::string const& prop,
-  std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries)
-{
-  if(cmLinkImplementationLibraries const* impl =
-     thisTarget->Target->GetLinkImplementationLibraries(config))
-    {
-    for (std::vector<cmLinkImplItem>::const_iterator
-           it = impl->Libraries.begin(), end = impl->Libraries.end();
-         it != end; ++it)
-      {
-      if(it->Target)
-        {
-        std::string genex =
-          "$<TARGET_PROPERTY:" + *it + "," + prop + ">";
-        cmGeneratorExpression ge(it->Backtrace);
-        cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex);
-        cge->SetEvaluateForBuildsystem(true);
-        entries.push_back(
-          new cmGeneratorTarget::TargetPropertyEntry(cge, *it));
-        }
-      }
-    }
-}
-
 //----------------------------------------------------------------------------
 std::vector<std::string>
 cmGeneratorTarget::GetIncludeDirectories(const std::string& config,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fb8a61ed3ff288ea404bce4b0ccda047ddaa977
commit 3fb8a61ed3ff288ea404bce4b0ccda047ddaa977
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:51:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:02:00 2015 +0200

    cmTarget: Remove a conditional for generate-time source addition.
    
    It is not really necessary.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6e1c488..fc9e963 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -968,19 +968,12 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
 
 void cmTarget::AddGenerateTimeSource(const std::string& src)
 {
-  cmSourceFileLocation sfl(this->Makefile, src);
-  if (std::find_if(this->Internal->SourceEntries.begin(),
-                   this->Internal->SourceEntries.end(),
-                   TargetPropertyEntryFinder(sfl))
-                                      == this->Internal->SourceEntries.end())
-    {
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceItems.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
-    }
+  cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+  cmGeneratorExpression ge(lfbt);
+  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
+  cge->SetEvaluateForBuildsystem(true);
+  this->Internal->SourceItems.push_back(
+                        new cmTargetInternals::TargetPropertyEntry(cge));
   this->AddSource(src);
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18be18f060e897bc51acd04d0e3e7c9f2c93ecfc
commit 18be18f060e897bc51acd04d0e3e7c9f2c93ecfc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 4 21:46:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:02:00 2015 +0200

    cmTarget: Split storage of sources from genexes.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 515b261..6e1c488 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -126,7 +126,9 @@ public:
   std::vector<cmListFileBacktrace> CompileFeaturesBacktraces;
   std::vector<std::string> CompileDefinitionsEntries;
   std::vector<cmListFileBacktrace> CompileDefinitionsBacktraces;
-  std::vector<TargetPropertyEntry*> SourceEntries;
+  std::vector<std::string> SourceEntries;
+  std::vector<cmListFileBacktrace> SourceBacktraces;
+  std::vector<TargetPropertyEntry*> SourceItems;
   std::vector<cmValueWithOrigin> LinkImplementationPropertyEntries;
 
   void AddInterfaceEntries(
@@ -385,7 +387,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
 void CreatePropertyGeneratorExpressions(
     std::vector<std::string> const& entries,
     std::vector<cmListFileBacktrace> const& backtraces,
-    std::vector<cmTargetInternals::TargetPropertyEntry*>& items)
+    std::vector<cmTargetInternals::TargetPropertyEntry*>& items,
+    bool evaluateForBuildsystem = false)
 {
   std::vector<cmListFileBacktrace>::const_iterator btIt = backtraces.begin();
   for (std::vector<std::string>::const_iterator it = entries.begin();
@@ -393,12 +396,17 @@ void CreatePropertyGeneratorExpressions(
     {
     cmGeneratorExpression ge(*btIt);
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*it);
+    cge->SetEvaluateForBuildsystem(evaluateForBuildsystem);
     items.push_back(new cmTargetInternals::TargetPropertyEntry(cge));
     }
 }
 
 void cmTarget::Compute()
 {
+  CreatePropertyGeneratorExpressions(
+        this->Internal->SourceEntries,
+        this->Internal->SourceBacktraces,
+        this->Internal->SourceItems, true);
 }
 
 //----------------------------------------------------------------------------
@@ -649,13 +657,11 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
     // for TARGET_OBJECTS instead for backwards compatibility with OLD
     // behavior of CMP0024 and CMP0026 only.
 
-    typedef cmTargetInternals::TargetPropertyEntry
-                                TargetPropertyEntry;
-    for(std::vector<TargetPropertyEntry*>::const_iterator
+    for(std::vector<std::string>::const_iterator
           i = this->Internal->SourceEntries.begin();
         i != this->Internal->SourceEntries.end(); ++i)
       {
-      std::string entry = (*i)->ge->GetInput();
+      std::string const& entry = *i;
 
       std::vector<std::string> items;
       cmSystemTools::ExpandListArgument(entry, items);
@@ -697,7 +703,7 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
 
   UNORDERED_SET<std::string> uniqueSrcs;
   bool contextDependentDirectSources = processSources(this,
-                 this->Internal->SourceEntries,
+                 this->Internal->SourceItems,
                  files,
                  uniqueSrcs,
                  &dagChecker,
@@ -778,10 +784,12 @@ void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    this->Internal->SourceEntries.push_back(srcFiles);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     cmGeneratorExpression ge(lfbt);
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
     cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceEntries.push_back(
+    this->Internal->SourceItems.push_back(
                           new cmTargetInternals::TargetPropertyEntry(cge));
     }
 }
@@ -818,11 +826,8 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs)
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceEntries.push_back(srcFiles);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     }
 }
 
@@ -926,10 +931,10 @@ public:
 
   }
 
-  bool operator()(cmTargetInternals::TargetPropertyEntry* entry)
+  bool operator()(std::string const& entry)
   {
     std::vector<std::string> files;
-    cmSystemTools::ExpandListArgument(entry->ge->GetInput(), files);
+    cmSystemTools::ExpandListArgument(entry, files);
     std::vector<cmSourceFileLocation> locations(files.size());
     std::transform(files.begin(), files.end(), locations.begin(),
                    CreateLocation(this->Needle.GetMakefile()));
@@ -951,11 +956,8 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceEntries.push_back(src);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     }
   if (cmGeneratorExpression::Find(src) != std::string::npos)
     {
@@ -966,6 +968,19 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
 
 void cmTarget::AddGenerateTimeSource(const std::string& src)
 {
+  cmSourceFileLocation sfl(this->Makefile, src);
+  if (std::find_if(this->Internal->SourceEntries.begin(),
+                   this->Internal->SourceEntries.end(),
+                   TargetPropertyEntryFinder(sfl))
+                                      == this->Internal->SourceEntries.end())
+    {
+    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    cmGeneratorExpression ge(lfbt);
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
+    cge->SetEvaluateForBuildsystem(true);
+    this->Internal->SourceItems.push_back(
+                          new cmTargetInternals::TargetPropertyEntry(cge));
+    }
   this->AddSource(src);
 }
 
@@ -1679,13 +1694,15 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
       return;
       }
     this->Internal->SourceFilesMap.clear();
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmDeleteAll(this->Internal->SourceEntries);
+
     this->Internal->SourceEntries.clear();
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceBacktraces.clear();
+    if (value)
+      {
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->SourceEntries.push_back(value);
+      this->Internal->SourceBacktraces.push_back(lfbt);
+      }
     }
   else
     {
@@ -1778,10 +1795,8 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
       }
     this->Internal->SourceFilesMap.clear();
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceEntries.push_back(value);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     }
   else
     {
@@ -2418,13 +2433,11 @@ const char *cmTarget::GetProperty(const std::string& prop,
 
       std::ostringstream ss;
       const char* sep = "";
-      typedef cmTargetInternals::TargetPropertyEntry
-                                  TargetPropertyEntry;
-      for(std::vector<TargetPropertyEntry*>::const_iterator
+      for(std::vector<std::string>::const_iterator
             i = this->Internal->SourceEntries.begin();
           i != this->Internal->SourceEntries.end(); ++i)
         {
-        std::string entry = (*i)->ge->GetInput();
+        std::string const& entry = *i;
 
         std::vector<std::string> files;
         cmSystemTools::ExpandListArgument(entry, files);
@@ -3076,13 +3089,11 @@ cmTarget::GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const
   // there is no cmGeneratorTarget at configure-time, so search the SOURCES
   // for TARGET_OBJECTS instead for backwards compatibility with OLD
   // behavior of CMP0024 and CMP0026 only.
-  typedef cmTargetInternals::TargetPropertyEntry
-                              TargetPropertyEntry;
-  for(std::vector<TargetPropertyEntry*>::const_iterator
+  for(std::vector<std::string>::const_iterator
         i = this->Internal->SourceEntries.begin();
       i != this->Internal->SourceEntries.end(); ++i)
     {
-    std::string entry = (*i)->ge->GetInput();
+    std::string const& entry = *i;
 
     std::vector<std::string> files;
     cmSystemTools::ExpandListArgument(entry, files);
@@ -3745,7 +3756,7 @@ cmTargetInternalPointer
 //----------------------------------------------------------------------------
 cmTargetInternalPointer::~cmTargetInternalPointer()
 {
-  cmDeleteAll(this->Pointer->SourceEntries);
+  cmDeleteAll(this->Pointer->SourceItems);
   delete this->Pointer;
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bb6c801a18a0e7672b991dbdc1efd879116747d
commit 2bb6c801a18a0e7672b991dbdc1efd879116747d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:44:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:02:00 2015 +0200

    cmTarget: Add Compute API for sources.
    
    This method is a refactoring artifact.  It will be removed in a
    follow-up.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index db842b0..a62d534 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1538,6 +1538,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
         ti != targets.end(); ++ti)
       {
       cmTarget* t = &ti->second;
+      t->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
       generatorTargets[t] = gt;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index ab9d7e7..5bace47 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -254,6 +254,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
     mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false,
                           no_working_directory, no_depends,
                           noCommandLines);
+  tgt->Compute();
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   mf->AddGeneratorTarget(tgt, gt);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d45aa27..fd2d33a 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -86,6 +86,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           no_depends, no_commands, false,
                           "Build all projects");
 
+      allBuild->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 3d52e3a..14bc340 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -456,6 +456,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         no_working_directory,
                         "echo", "Build all projects");
 
+  allbuild->Compute();
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
@@ -491,6 +492,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           no_working_directory,
                           "make", "-f", file.c_str());
 
+    check->Compute();
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     mf->AddGeneratorTarget(check, checkGt);
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 378f132..1b1b98e 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -885,6 +885,8 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 /*byproducts=*/rcc_output, depends,
                                 commandLines, false, autogenComment.c_str());
 
+    autogenTarget->Compute();
+
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     makefile->AddGeneratorTarget(autogenTarget, gt);
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 16378cc..515b261 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -397,6 +397,10 @@ void CreatePropertyGeneratorExpressions(
     }
 }
 
+void cmTarget::Compute()
+{
+}
+
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index cbf2ca9..2f1671d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -133,6 +133,8 @@ public:
   void AddPostBuildCommand(cmCustomCommand const &cmd)
     {this->PostBuildCommands.push_back(cmd);}
 
+  void Compute();
+
   /**
    * Get the list of the source files used by this target
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5eeb043fb2b9febef44771855d14ea6acf63d5dd
commit 5eeb043fb2b9febef44771855d14ea6acf63d5dd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:29:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:01:59 2015 +0200

    cmTarget: Add API for generate-time source addition.
    
    This method is a refactoring artifact.  It will be removed in a
    follow-up.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dc399d8..83f9cd2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -404,7 +404,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 
 void cmGeneratorTarget::AddSource(const std::string& src)
 {
-  this->Target->AddSource(src);
+  this->Target->AddGenerateTimeSource(src);
 }
 
 void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7fd8d86..16378cc 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -960,6 +960,11 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
   return this->Makefile->GetOrCreateSource(src);
 }
 
+void cmTarget::AddGenerateTimeSource(const std::string& src)
+{
+  this->AddSource(src);
+}
+
 //----------------------------------------------------------------------------
 void cmTarget::MergeLinkLibraries( cmMakefile& mf,
                                    const std::string& selfname,
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3e71dbd..cbf2ca9 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -145,6 +145,7 @@ public:
   void AddTracedSources(std::vector<std::string> const& srcs);
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
+  void AddGenerateTimeSource(const std::string& src);
 
   enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=788c3cc9e8eb4777c0146d63d8d994456ac51d19
commit 788c3cc9e8eb4777c0146d63d8d994456ac51d19
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 18:10:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:01:56 2015 +0200

    cmGeneratorTarget: Add methods for generate-time source addition.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3a865fc..dc399d8 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -402,6 +402,16 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
   return i->second;
 }
 
+void cmGeneratorTarget::AddSource(const std::string& src)
+{
+  this->Target->AddSource(src);
+}
+
+void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
+{
+  this->Target->AddTracedSources(srcs);
+}
+
 //----------------------------------------------------------------------------
 std::vector<cmSourceFile*> const*
 cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
@@ -1755,7 +1765,7 @@ void cmTargetTraceDependencies::Trace()
     }
   this->CurrentEntry = 0;
 
-  this->Target->AddTracedSources(this->NewSources);
+  this->GeneratorTarget->AddTracedSources(this->NewSources);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 6d5641b..0c6ad82 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -296,6 +296,9 @@ public:
   // Get the target base name.
   std::string GetOutputName(const std::string& config, bool implib) const;
 
+  void AddSource(const std::string& src);
+  void AddTracedSources(std::vector<std::string> const& srcs);
+
   /**
    * Flags for a given source file as used in this target. Typically assigned
    * via SET_TARGET_PROPERTIES when the property is a list of source files.
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 86a8f87..ab9d7e7 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -336,7 +336,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
        no_main_dependency, commandLines, "Checking Build System",
        no_working_directory, true))
     {
-    tgt->AddSource(file->GetFullPath());
+    gt->AddSource(file->GetFullPath());
     }
   else
     {
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 64fa12a..3d52e3a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -463,7 +463,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   std::string listfile = mf->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
-  allbuild->AddSource(listfile.c_str());
+  allBuildGt->AddSource(listfile.c_str());
 
   // Add XCODE depend helper
   std::string dir = mf->GetCurrentBinaryDirectory();
@@ -553,11 +553,13 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
         allbuild->AddUtility(target.GetName());
         }
 
+      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
+
       // Refer to the build configuration file for easy editing.
       listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
-      target.AddSource(listfile.c_str());
+      targetGT->AddSource(listfile.c_str());
       }
     }
 }
@@ -1401,7 +1403,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   if(cmSourceFile* sf = mf->GetOrCreateSource(fname.c_str()))
     {
     sf->SetProperty("LANGUAGE", llang.c_str());
-    cmtarget.AddSource(fname);
+    gtgt->AddSource(fname);
     }
 }
 
@@ -3069,17 +3071,18 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         continue;
         }
 
+      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+
       // add the soon to be generated Info.plist file as a source for a
       // MACOSX_BUNDLE file
       if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
         {
         std::string plist = this->ComputeInfoPListLocation(cmtarget);
         mf->GetOrCreateSource(plist, true);
-        cmtarget.AddSource(plist);
+        gtgt->AddSource(plist);
         }
 
       std::vector<cmSourceFile*> classes;
-      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
       if (!gtgt->GetConfigCommonSourceFiles(classes))
         {
         return false;
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index cc94cd4..ab215d1 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -243,7 +243,8 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
                                            no_working_directory, true);
   if(this->Makefile->GetSource(makefileIn.c_str()))
     {
-    tgt.AddSource(makefileIn);
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&tgt);
+    gt->AddSource(makefileIn);
     }
   else
     {
@@ -595,7 +596,8 @@ cmLocalVisualStudio6Generator
        origCommand.GetCommandLines(), comment,
        origCommand.GetWorkingDirectory().c_str()))
     {
-    target.AddSource(outsf->GetFullPath());
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&target);
+    gt->AddSource(outsf->GetFullPath());
     }
 
   // Replace the dependencies with the output of this rule so that the
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a4bce8a..8924564 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -112,7 +112,9 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules()
           }
         if(l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          l->second.AddSource(sf->GetFullPath());
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&l->second);
+          gt->AddSource(sf->GetFullPath());
           }
         }
       }
@@ -148,7 +150,9 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
            force.c_str(), no_depends, no_main_dependency,
            force_commands, " ", 0, true))
         {
-        tgt.AddSource(file->GetFullPath());
+        cmGeneratorTarget* gt =
+            this->GlobalGenerator->GetGeneratorTarget(&tgt);
+        gt->AddSource(file->GetFullPath());
         }
       }
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 2703f4c..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -101,7 +101,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
       fileIt != newRccFiles.end();
       ++fileIt)
     {
-    const_cast<cmTarget*>(target->Target)->AddSource(*fileIt);
+    const_cast<cmGeneratorTarget*>(target)->AddSource(*fileIt);
     }
 }
 
@@ -709,7 +709,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources(
     makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
                             mocCppFile.c_str(), false);
 
-    target->Target->AddSource(mocCppFile);
+    target->AddSource(mocCppFile);
     }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41eef9ccc94f1d6c4cff0c45f02ebcdbdf185725
commit 41eef9ccc94f1d6c4cff0c45f02ebcdbdf185725
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 17:51:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 20:20:36 2015 +0200

    Access sources through cmGeneratorTarget.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index dfd51c7..7915a6e 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -401,7 +401,9 @@ void cmExtraCodeBlocksGenerator
         case cmTarget::UTILITY: // can have sources since 2.6.3
           {
           std::vector<cmSourceFile*> sources;
-          ti->second.GetSourceFiles(sources,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
                si!=sources.end(); si++)
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index c2cff14..496c1a8 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -196,7 +196,9 @@ void cmExtraCodeLiteGenerator
         case cmTarget::MODULE_LIBRARY:
           {
           std::vector<cmSourceFile*> sources;
-          ti->second.GetSourceFiles(sources,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
                si!=sources.end(); si++)
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 44bf586..6dc18c2 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -562,7 +562,9 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
           // get the files from the source lists then add them to the groups
           cmTarget* tgt = const_cast<cmTarget*>(&ti->second);
           std::vector<cmSourceFile*> files;
-          tgt->GetSourceFiles(files,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(tgt);
+          gt->GetSourceFiles(files,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for(std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
               sfIt != files.end();
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 163a75b..11410a7 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -237,7 +237,7 @@ void cmExtraSublimeTextGenerator::
       cmGeneratorTarget *gtgt = this->GlobalGenerator
                                     ->GetGeneratorTarget(target);
       std::vector<cmSourceFile*> sourceFiles;
-      target->GetSourceFiles(sourceFiles,
+      gtgt->GetSourceFiles(sourceFiles,
                              makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       std::vector<cmSourceFile*>::const_iterator sourceFilesEnd =
         sourceFiles.end();
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4ed2939..3a865fc 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -449,7 +449,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
 #define IMPLEMENT_VISIT_IMPL(DATA, DATATYPE) \
   { \
   std::vector<cmSourceFile*> sourceFiles; \
-  this->Target->GetSourceFiles(sourceFiles, config); \
+  this->GetSourceFiles(sourceFiles, config); \
   TagVisitor<DATA ## Tag DATATYPE> visitor(this, data); \
   for(std::vector<cmSourceFile*>::const_iterator si = sourceFiles.begin(); \
       si != sourceFiles.end(); ++si) \
@@ -1683,7 +1683,7 @@ cmTargetTraceDependencies
         ci != configs.end(); ++ci)
       {
       std::vector<cmSourceFile*> sources;
-      this->Target->GetSourceFiles(sources, *ci);
+      this->GeneratorTarget->GetSourceFiles(sources, *ci);
       for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
           si != sources.end(); ++si)
         {
@@ -4444,12 +4444,12 @@ bool cmGeneratorTarget::GetConfigCommonSourceFiles(
 
   std::vector<std::string>::const_iterator it = configs.begin();
   const std::string& firstConfig = *it;
-  this->Target->GetSourceFiles(files, firstConfig);
+  this->GetSourceFiles(files, firstConfig);
 
   for ( ; it != configs.end(); ++it)
     {
     std::vector<cmSourceFile*> configFiles;
-    this->Target->GetSourceFiles(configFiles, *it);
+    this->GetSourceFiles(configFiles, *it);
     if (configFiles != files)
       {
       std::string firstConfigFiles;
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index cae5c2f..b1e05c9 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -172,7 +172,7 @@ std::vector<cmSourceFile *> cmGhsMultiTargetGenerator::GetSources() const
 {
   std::vector<cmSourceFile *> output;
   std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  this->Target->GetSourceFiles(output, config);
+  this->GeneratorTarget->GetSourceFiles(output, config);
   return output;
 }
 
@@ -572,7 +572,9 @@ bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(const cmTarget *target)
   std::vector<cmSourceFile *> sources;
   std::string config =
       target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  target->GetSourceFiles(sources, config);
+  cmGeneratorTarget* gt =
+      this->GetGlobalGenerator()->GetGeneratorTarget(target);
+  gt->GetSourceFiles(sources, config);
   for (std::vector<cmSourceFile *>::const_iterator sources_i = sources.begin();
        sources.end() != sources_i; ++sources_i)
     {
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 05f1029..db842b0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2949,10 +2949,12 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
       {
       configs.push_back("");
       }
+    cmGeneratorTarget* gt =
+        this->GetGeneratorTarget(target);
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
-      target->GetSourceFiles(sources, *ci);
+      gt->GetSourceFiles(sources, *ci);
       }
     std::vector<cmSourceFile*>::const_iterator sourcesEnd
         = cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 6dde1e3..e66bc2a 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -520,7 +520,9 @@ bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt)
   const std::string config =
     tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   std::vector<cmSourceFile *> tgtSources;
-  tgt->GetSourceFiles(tgtSources, config);
+  cmGeneratorTarget* gt =
+      this->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+  gt->GetSourceFiles(tgtSources, config);
   bool tgtInBuild = true;
   char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 138ddbb..c40f846 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -139,7 +139,9 @@ bool cmGlobalKdevelopGenerator
          ti != targets.end(); ti++)
       {
       std::vector<cmSourceFile*> sources;
-      ti->second.GetSourceFiles(sources, ti->second.GetMakefile()
+      cmGeneratorTarget* gt =
+          this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+      gt->GetSourceFiles(sources, ti->second.GetMakefile()
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
            si!=sources.end(); si++)
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b278087..cd499f6 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1149,7 +1149,7 @@ cmMakefileTargetGenerator
 {
   // Depend on all custom command outputs.
   std::vector<cmSourceFile*> sources;
-  this->Target->GetSourceFiles(sources,
+  this->GeneratorTarget->GetSourceFiles(sources,
                       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
       source != sources.end(); ++source)
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 84c19a3..24fcaf4 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -112,7 +112,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
   // Write rules for languages compiled in this target.
   std::set<std::string> languages;
   std::vector<cmSourceFile*> sourceFiles;
-  this->GetTarget()->GetSourceFiles(sourceFiles,
+  this->GetGeneratorTarget()->GetSourceFiles(sourceFiles,
     this->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::vector<cmSourceFile*>::const_iterator
         i = sourceFiles.begin(); i != sourceFiles.end(); ++i)
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 58b901a..df43c61 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -58,7 +58,7 @@ void cmNinjaUtilityTargetGenerator::Generate()
   std::vector<cmSourceFile*> sources;
   std::string config = this->GetMakefile()
                            ->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  this->GetTarget()->GetSourceFiles(sources, config);
+  this->GetGeneratorTarget()->GetSourceFiles(sources, config);
   for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
       source != sources.end(); ++source)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=156bd2c983b439478dff5fe84629b5a93e780a92
commit 156bd2c983b439478dff5fe84629b5a93e780a92
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 24 22:03:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 20:16:21 2015 +0200

    Xcode: Port away from unnecessary CMP0049 compatibility.
    
    The input does not need the conversion.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 746e1a7..64fa12a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -463,7 +463,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   std::string listfile = mf->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
-  allbuild->AddSourceCMP0049(listfile.c_str());
+  allbuild->AddSource(listfile.c_str());
 
   // Add XCODE depend helper
   std::string dir = mf->GetCurrentBinaryDirectory();
@@ -557,7 +557,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
-      target.AddSourceCMP0049(listfile.c_str());
+      target.AddSource(listfile.c_str());
       }
     }
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01e666c70e9c83ebd8c200d121b706868f69e617
commit 01e666c70e9c83ebd8c200d121b706868f69e617
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 18:32:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 20:16:20 2015 +0200

    cmTarget: Join strings conditionally.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index bb44956..7fd8d86 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -768,9 +768,9 @@ void cmTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
 //----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
-  std::string srcFiles = cmJoin(srcs, ";");
-  if (!srcFiles.empty())
+  if (!srcs.empty())
     {
+    std::string srcFiles = cmJoin(srcs, ";");
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf28b7874b999224782fac72c5a74020bd6c47d3
commit bf28b7874b999224782fac72c5a74020bd6c47d3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 18:47:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 20:16:20 2015 +0200

    cmGeneratorTarget: Rename internal member.
    
    Leave the old name available for another use.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 62598f4..4ed2939 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -406,8 +406,8 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 std::vector<cmSourceFile*> const*
 cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
 {
-  SourceEntriesType::const_iterator i = this->SourceEntries.find(sf);
-  if(i != this->SourceEntries.end())
+  SourceEntriesType::const_iterator i = this->SourceDepends.find(sf);
+  if(i != this->SourceDepends.end())
     {
     return &i->second.Depends;
     }
@@ -1723,7 +1723,7 @@ void cmTargetTraceDependencies::Trace()
     // Get the next source from the queue.
     cmSourceFile* sf = this->SourceQueue.front();
     this->SourceQueue.pop();
-    this->CurrentEntry = &this->GeneratorTarget->SourceEntries[sf];
+    this->CurrentEntry = &this->GeneratorTarget->SourceDepends[sf];
 
     // Queue dependencies added explicitly by the user.
     if(const char* additionalDeps = sf->GetProperty("OBJECT_DEPENDS"))
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 916f281..6d5641b 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -370,7 +370,7 @@ private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
   typedef std::map<cmSourceFile const*, SourceEntry> SourceEntriesType;
-  SourceEntriesType SourceEntries;
+  SourceEntriesType SourceDepends;
   mutable std::map<cmSourceFile const*, std::string> Objects;
   std::set<cmSourceFile const*> ExplicitObjectName;
   mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d653f9c1cc129be4fdce7f0e93c282760c7603e
commit 9d653f9c1cc129be4fdce7f0e93c282760c7603e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 18:05:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 20:16:20 2015 +0200

    cmFLTKWrapUI: Remove CMake 2.2 compat code.
    
    CMake 3.0 dropped CMake <= 2.4 compatibility.

diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx
index 12adfd9..d17d664 100644
--- a/Source/cmFLTKWrapUICommand.cxx
+++ b/Source/cmFLTKWrapUICommand.cxx
@@ -129,45 +129,6 @@ void cmFLTKWrapUICommand::FinalPass()
     cmSystemTools::Message(msg.c_str(),"Warning");
     return;
     }
-  std::vector<cmSourceFile*> srcs;
-  target->GetSourceFiles(srcs, "");
-  bool found = false;
-  for (unsigned int i = 0; i < srcs.size(); ++i)
-    {
-    if (srcs[i]->GetFullPath() ==
-        this->GeneratedSourcesClasses[0]->GetFullPath())
-      {
-      found = true;
-      break;
-      }
-    }
-  if (!found)
-    {
-    std::string msg =
-      "In CMake 2.2 the FLTK_WRAP_UI command sets a variable to the list of "
-      "source files that should be added to your executable or library. It "
-      "appears that you have not added these source files to your target. "
-      "You should change your CMakeLists.txt file to "
-      "directly add the generated files to the target. "
-      "For example FTLK_WRAP_UI(foo src1 src2 src3) "
-      "will create a variable named foo_FLTK_UI_SRCS that contains the list "
-      "of sources to add to your target when you call ADD_LIBRARY or "
-      "ADD_EXECUTABLE. For now CMake will add the sources to your target "
-      "for you as was done in CMake 2.0 and earlier. In the future this may "
-      "become an error.";
-    msg +="The problem was found while processing the source directory: ";
-    msg += this->Makefile->GetCurrentSourceDirectory();
-    cmSystemTools::Message(msg.c_str(),"Warning");
-    // first we add the rules for all the .fl to .h and .cxx files
-    size_t lastHeadersClass = this->GeneratedSourcesClasses.size();
-
-    // Generate code for all the .fl files
-    for(size_t classNum = 0; classNum < lastHeadersClass; classNum++)
-      {
-      this->Makefile->GetTargets()[this->Target]
-        .AddSource(this->GeneratedSourcesClasses[classNum]->GetFullPath());
-      }
-    }
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx     |    4 +-
 Source/cmExtraCodeLiteGenerator.cxx       |    4 +-
 Source/cmExtraEclipseCDT4Generator.cxx    |    4 +-
 Source/cmExtraSublimeTextGenerator.cxx    |    2 +-
 Source/cmFLTKWrapUICommand.cxx            |   39 ---
 Source/cmGeneratorTarget.cxx              |  331 ++++++++++++++++++++++---
 Source/cmGeneratorTarget.h                |   15 +-
 Source/cmGhsMultiTargetGenerator.cxx      |    6 +-
 Source/cmGlobalGenerator.cxx              |    4 +-
 Source/cmGlobalGhsMultiGenerator.cxx      |    4 +-
 Source/cmGlobalKdevelopGenerator.cxx      |    4 +-
 Source/cmGlobalVisualStudio8Generator.cxx |    2 +-
 Source/cmGlobalXCodeGenerator.cxx         |   13 +-
 Source/cmLocalVisualStudio6Generator.cxx  |    6 +-
 Source/cmLocalVisualStudio7Generator.cxx  |    8 +-
 Source/cmMakefileTargetGenerator.cxx      |    2 +-
 Source/cmNinjaNormalTargetGenerator.cxx   |    2 +-
 Source/cmNinjaUtilityTargetGenerator.cxx  |    2 +-
 Source/cmQtAutoGeneratorInitializer.cxx   |    4 +-
 Source/cmTarget.cxx                       |  375 +++--------------------------
 Source/cmTarget.h                         |   13 +-
 21 files changed, 392 insertions(+), 452 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct  6 16:04:52 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  6 Oct 2015 16:04:52 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-106-g4eafc01
Message-ID: <20151006200453.10EB3BFD0A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4eafc01acb0a24effedaa6b1f9d798a8f971d852 (commit)
       via  852e9b1b54d755dda1e8ca131c7aed247e8ab311 (commit)
       via  86db10d78e429b9a934649c15d2cad91c1860576 (commit)
       via  09898c15aacbeda92f34721c3283c730d00a66c3 (commit)
       via  f716460ed82134bd1ca09f49bfa507cb2645d96c (commit)
      from  c54c869a7127352d7e2ca757c5ecd039d12ae2ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4eafc01acb0a24effedaa6b1f9d798a8f971d852
commit 4eafc01acb0a24effedaa6b1f9d798a8f971d852
Merge: c54c869 852e9b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 16:04:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 16:04:50 2015 -0400

    Merge topic 'refactor-current-dir-initialization' into next
    
    852e9b1b cmState: Internalize the initialization of a snapshot from its parent.
    86db10d7 Remove now-unused directory setters.
    09898c15 Set the current dirs on the snapshot before creating the cmMakefile.
    f716460e cmMakefile: Move invokation to initialize snapshot.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=852e9b1b54d755dda1e8ca131c7aed247e8ab311
commit 852e9b1b54d755dda1e8ca131c7aed247e8ab311
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 00:33:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 21:50:44 2015 +0200

    cmState: Internalize the initialization of a snapshot from its parent.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2c9dfbb..c060505 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1761,8 +1761,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
                                            this->ContextStack.back()->Name,
                                            this->ContextStack.back()->Line);
 
-  newSnapshot.InitializeFromParent();
-
   newSnapshot.GetDirectory().SetCurrentSource(srcPath);
   newSnapshot.GetDirectory().SetCurrentBinary(binPath);
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index ce9ff32..db7519b 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -805,8 +805,10 @@ cmState::CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot,
   pos->Parent = origin;
   pos->Root = origin;
   pos->Vars = this->VarTree.Extend(origin);
+
   cmState::Snapshot snapshot = cmState::Snapshot(this, pos);
   originSnapshot.Position->BuildSystemDirectory->Children.push_back(snapshot);
+  snapshot.InitializeFromParent();
   return snapshot;
 }
 
diff --git a/Source/cmState.h b/Source/cmState.h
index 99e537c..1ffc4bf 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -75,8 +75,6 @@ public:
     Snapshot GetCallStackParent() const;
     SnapshotType GetType() const;
 
-    void InitializeFromParent();
-
     void SetPolicy(cmPolicies::PolicyID id, cmPolicies::PolicyStatus status);
     cmPolicies::PolicyStatus GetPolicy(cmPolicies::PolicyID id) const;
     bool HasDefinedPolicyCMP0011();
@@ -105,6 +103,9 @@ public:
     friend class cmState;
     friend class Directory;
     friend struct StrictWeakOrder;
+
+    void InitializeFromParent();
+
     cmState* State;
     cmState::PositionType Position;
   };

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86db10d78e429b9a934649c15d2cad91c1860576
commit 86db10d78e429b9a934649c15d2cad91c1860576
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 00:24:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 21:49:51 2015 +0200

    Remove now-unused directory setters.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 11a949f..2c9dfbb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1784,26 +1784,11 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
     }
 }
 
-void cmMakefile::SetCurrentSourceDirectory(const std::string& dir)
-{
-  this->StateSnapshot.GetDirectory().SetCurrentSource(dir);
-  this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
-                      this->StateSnapshot.GetDirectory().GetCurrentSource());
-}
-
 const char* cmMakefile::GetCurrentSourceDirectory() const
 {
   return this->StateSnapshot.GetDirectory().GetCurrentSource();
 }
 
-void cmMakefile::SetCurrentBinaryDirectory(const std::string& dir)
-{
-  this->StateSnapshot.GetDirectory().SetCurrentBinary(dir);
-  const char* binDir = this->StateSnapshot.GetDirectory().GetCurrentBinary();
-  cmSystemTools::MakeDirectory(binDir);
-  this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", binDir);
-}
-
 const char* cmMakefile::GetCurrentBinaryDirectory() const
 {
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8724c6e..459d34c 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -353,9 +353,7 @@ public:
    */
   void SetArgcArgv(const std::vector<std::string>& args);
 
-  void SetCurrentSourceDirectory(const std::string& dir);
   const char* GetCurrentSourceDirectory() const;
-  void SetCurrentBinaryDirectory(const std::string& dir);
   const char* GetCurrentBinaryDirectory() const;
 
   //@}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09898c15aacbeda92f34721c3283c730d00a66c3
commit 09898c15aacbeda92f34721c3283c730d00a66c3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 31 01:57:04 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 21:47:21 2015 +0200

    Set the current dirs on the snapshot before creating the cmMakefile.
    
    The cmMakefile should get a fully prepared snapshot and not clobber its
    definitions.  It should eventually be able to process list files from any
    starting-point snapshot, though that is some refactoring away still.

diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 2f125aa..b9016af 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -318,16 +318,13 @@ void cmCTestScriptHandler::CreateCMake()
   this->GlobalGenerator = new cmGlobalGenerator(this->CMake);
 
   cmState::Snapshot snapshot = this->CMake->GetCurrentSnapshot();
+  std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
+  snapshot.GetDirectory().SetCurrentSource(cwd);
+  snapshot.GetDirectory().SetCurrentBinary(cwd);
   this->Makefile = new cmMakefile(this->GlobalGenerator, snapshot);
 
   this->CMake->SetProgressCallback(ctestScriptProgressCallback, this->CTest);
 
-  // Set CMAKE_CURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR.
-  // Also, some commands need Makefile->GetCurrentSourceDirectory().
-  std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
-  this->Makefile->SetCurrentSourceDirectory(cwd);
-  this->Makefile->SetCurrentBinaryDirectory(cwd);
-
   // remove all cmake commands which are not scriptable, since they can't be
   // used in ctest scripts
   this->CMake->GetState()->RemoveUnscriptableCommands();
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 05f1029..715a927 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1108,16 +1108,16 @@ void cmGlobalGenerator::Configure()
   this->FirstTimeProgress = 0.0f;
   this->ClearGeneratorMembers();
 
-  cmMakefile* dirMf =
-      new cmMakefile(this, this->GetCMakeInstance()->GetCurrentSnapshot());
-  this->Makefiles.push_back(dirMf);
+  cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot();
 
-  // set the Start directories
-  dirMf->SetCurrentSourceDirectory
+  snapshot.GetDirectory().SetCurrentSource
     (this->CMakeInstance->GetHomeDirectory());
-  dirMf->SetCurrentBinaryDirectory
+  snapshot.GetDirectory().SetCurrentBinary
     (this->CMakeInstance->GetHomeOutputDirectory());
 
+  cmMakefile* dirMf = new cmMakefile(this, snapshot);
+  this->Makefiles.push_back(dirMf);
+
   this->BinaryDirectories.insert(
       this->CMakeInstance->GetHomeOutputDirectory());
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 0064713..cb13fcf 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -585,12 +585,11 @@ void cmGlobalUnixMakefileGenerator3
     else
       {
       cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot();
-      mf = new cmMakefile(this, snapshot);
-      // set the Start directories
-      mf->SetCurrentSourceDirectory
+      snapshot.GetDirectory().SetCurrentSource
         (this->CMakeInstance->GetHomeDirectory());
-      mf->SetCurrentBinaryDirectory
+      snapshot.GetDirectory().SetCurrentBinary
         (this->CMakeInstance->GetHomeOutputDirectory());
+      mf = new cmMakefile(this, snapshot);
       }
 
     std::string tname = targetName;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e522320..11a949f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -120,15 +120,34 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
   this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$");
 #endif
 
+  this->AddDefinition("CMAKE_SOURCE_DIR",
+                      this->GetCMakeInstance()->GetHomeDirectory());
+  this->AddDefinition("CMAKE_BINARY_DIR",
+                      this->GetCMakeInstance()->GetHomeOutputDirectory());
   {
-  const char* dir = this->GetCMakeInstance()->GetHomeDirectory();
-  this->AddDefinition("CMAKE_SOURCE_DIR", dir);
-  this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", dir);
+  const char* dir = this->StateSnapshot.GetDirectory().GetCurrentSource();
+  if (dir)
+    {
+    this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", dir);
+    }
+  else
+    {
+    this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
+                        this->GetCMakeInstance()->GetHomeDirectory());
+    }
   }
   {
-  const char* dir = this->GetCMakeInstance()->GetHomeOutputDirectory();
-  this->AddDefinition("CMAKE_BINARY_DIR", dir);
-  this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", dir);
+  const char* dir = this->StateSnapshot.GetDirectory().GetCurrentBinary();
+  if (dir)
+    {
+    cmSystemTools::MakeDirectory(dir);
+    this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", dir);
+    }
+  else
+    {
+    this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
+                        this->GetCMakeInstance()->GetHomeOutputDirectory());
+    }
   }
 }
 
@@ -1472,11 +1491,6 @@ void cmMakefile::AddLinkLibrary(const std::string& lib)
 
 void cmMakefile::InitializeFromParent(cmMakefile* parent)
 {
-  this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
-                      this->GetCurrentSourceDirectory());
-  this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
-                      this->GetCurrentBinaryDirectory());
-
   this->SystemIncludeDirectories = parent->SystemIncludeDirectories;
 
   // define flags
@@ -1747,14 +1761,13 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
                                            this->ContextStack.back()->Name,
                                            this->ContextStack.back()->Line);
 
-  cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot);
-  this->GetGlobalGenerator()->AddMakefile(subMf);
+  newSnapshot.InitializeFromParent();
 
-  // set the subdirs start dirs
-  subMf->SetCurrentSourceDirectory(srcPath);
-  subMf->SetCurrentBinaryDirectory(binPath);
+  newSnapshot.GetDirectory().SetCurrentSource(srcPath);
+  newSnapshot.GetDirectory().SetCurrentBinary(binPath);
 
-  subMf->StateSnapshot.InitializeFromParent();
+  cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot);
+  this->GetGlobalGenerator()->AddMakefile(subMf);
 
   if(excludeFromAll)
     {
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index bbeb3dc..36b1305 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -178,9 +178,10 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
   cmGlobalGenerator gg(&cm);
 
   cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
+  snapshot.GetDirectory().SetCurrentBinary(targetDirectory);
+  snapshot.GetDirectory().SetCurrentSource(targetDirectory);
+
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, snapshot));
-  mf->SetCurrentBinaryDirectory(targetDirectory);
-  mf->SetCurrentSourceDirectory(targetDirectory);
   gg.SetCurrentMakefile(mf.get());
 
   this->ReadAutogenInfoFile(mf.get(), targetDirectory, config);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2aa092a..183b6e7 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -377,10 +377,9 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
     this->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory());
     this->SetHomeOutputDirectory(cmSystemTools::GetCurrentWorkingDirectory());
     cmState::Snapshot snapshot = this->GetCurrentSnapshot();
-    cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
-    mf->SetCurrentBinaryDirectory
+    snapshot.GetDirectory().SetCurrentBinary
       (cmSystemTools::GetCurrentWorkingDirectory());
-    mf->SetCurrentSourceDirectory
+    snapshot.GetDirectory().SetCurrentSource
       (cmSystemTools::GetCurrentWorkingDirectory());
     if (this->GetWorkingMode() != NORMAL_MODE)
       {
@@ -418,13 +417,13 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
   this->SetGlobalGenerator(gg);
 
   cmState::Snapshot snapshot = this->GetCurrentSnapshot();
+  snapshot.GetDirectory().SetCurrentBinary
+    (cmSystemTools::GetCurrentWorkingDirectory());
+  snapshot.GetDirectory().SetCurrentSource
+    (cmSystemTools::GetCurrentWorkingDirectory());
   // read in the list file to fill the cache
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
   cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
-  mf->SetCurrentBinaryDirectory
-    (cmSystemTools::GetCurrentWorkingDirectory());
-  mf->SetCurrentSourceDirectory
-    (cmSystemTools::GetCurrentWorkingDirectory());
 
   mf->SetArgcArgv(args);
 
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index f44c77d..ca46111 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -769,11 +769,13 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         {
         cm.SetGlobalGenerator(ggd);
         cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
+        snapshot.GetDirectory().SetCurrentBinary
+          (cmSystemTools::GetCurrentWorkingDirectory());
+        snapshot.GetDirectory().SetCurrentSource
+          (cmSystemTools::GetCurrentWorkingDirectory());
         cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(ggd, snapshot));
         cmsys::auto_ptr<cmLocalGenerator> lgd(
               ggd->CreateLocalGenerator(mf.get()));
-        lgd->GetMakefile()->SetCurrentSourceDirectory(startDir);
-        lgd->GetMakefile()->SetCurrentBinaryDirectory(startOutDir);
 
         // Actually scan dependencies.
         return lgd->UpdateDependencies(depInfo.c_str(),

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f716460ed82134bd1ca09f49bfa507cb2645d96c
commit f716460ed82134bd1ca09f49bfa507cb2645d96c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 00:04:30 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 21:46:09 2015 +0200

    cmMakefile: Move invokation to initialize snapshot.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 077470d..e522320 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1472,8 +1472,6 @@ void cmMakefile::AddLinkLibrary(const std::string& lib)
 
 void cmMakefile::InitializeFromParent(cmMakefile* parent)
 {
-  this->StateSnapshot.InitializeFromParent();
-
   this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
                       this->GetCurrentSourceDirectory());
   this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
@@ -1755,6 +1753,9 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
   // set the subdirs start dirs
   subMf->SetCurrentSourceDirectory(srcPath);
   subMf->SetCurrentBinaryDirectory(binPath);
+
+  subMf->StateSnapshot.InitializeFromParent();
+
   if(excludeFromAll)
     {
     subMf->SetProperty("EXCLUDE_FROM_ALL", "TRUE");

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestScriptHandler.cxx     |    9 ++---
 Source/cmGlobalGenerator.cxx              |   12 +++---
 Source/cmGlobalUnixMakefileGenerator3.cxx |    7 ++--
 Source/cmMakefile.cxx                     |   59 ++++++++++++++---------------
 Source/cmMakefile.h                       |    2 -
 Source/cmQtAutoGenerators.cxx             |    5 ++-
 Source/cmState.cxx                        |    2 +
 Source/cmState.h                          |    5 ++-
 Source/cmake.cxx                          |   13 +++----
 Source/cmcmd.cxx                          |    6 ++-
 10 files changed, 58 insertions(+), 62 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct  6 16:14:13 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  6 Oct 2015 16:14:13 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-108-g4a19e49
Message-ID: <20151006201413.1A4EFBEDBE@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4a19e497cbdd9e2a17a259e0004f015af87f51fc (commit)
       via  f51ef97b068d174ecc502374dacf5b5559069499 (commit)
      from  4eafc01acb0a24effedaa6b1f9d798a8f971d852 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a19e497cbdd9e2a17a259e0004f015af87f51fc
commit 4a19e497cbdd9e2a17a259e0004f015af87f51fc
Merge: 4eafc01 f51ef97
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 16:14:12 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 16:14:12 2015 -0400

    Merge topic 'refactor-current-dir-initialization' into next
    
    f51ef97b fixup! Set the current dirs on the snapshot before creating the cmMakefile.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f51ef97b068d174ecc502374dacf5b5559069499
commit f51ef97b068d174ecc502374dacf5b5559069499
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 22:13:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:13:31 2015 +0200

    fixup! Set the current dirs on the snapshot before creating the cmMakefile.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 183b6e7..fececfd 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -381,6 +381,7 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
       (cmSystemTools::GetCurrentWorkingDirectory());
     snapshot.GetDirectory().SetCurrentSource
       (cmSystemTools::GetCurrentWorkingDirectory());
+    cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
     if (this->GetWorkingMode() != NORMAL_MODE)
       {
       std::string file(cmSystemTools::CollapseFullPath(path));

-----------------------------------------------------------------------

Summary of changes:
 Source/cmake.cxx |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct  6 16:38:01 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  6 Oct 2015 16:38:01 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-110-g884ba71
Message-ID: <20151006203801.B6227BFBFC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  884ba71d96fe4b62336f61c367f8cf785e3842df (commit)
       via  4553ab7075c7d87914cf45d714c7a3b995242d6d (commit)
      from  4a19e497cbdd9e2a17a259e0004f015af87f51fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=884ba71d96fe4b62336f61c367f8cf785e3842df
commit 884ba71d96fe4b62336f61c367f8cf785e3842df
Merge: 4a19e49 4553ab7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 16:38:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 16:38:01 2015 -0400

    Merge topic 'cmGeneratorTarget-sources' into next
    
    4553ab70 Port GHS.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4553ab7075c7d87914cf45d714c7a3b995242d6d
commit 4553ab7075c7d87914cf45d714c7a3b995242d6d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 22:37:39 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:37:39 2015 +0200

    Port GHS.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index b1e05c9..bfcef43 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -27,7 +27,7 @@ cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target)
   , LocalGenerator(static_cast<cmLocalGhsMultiGenerator *>(
                      target->GetLocalGenerator()))
   , Makefile(target->Target->GetMakefile())
-  , TargetGroup(DetermineIfTargetGroup(target->Target))
+  , TargetGroup(DetermineIfTargetGroup(target))
   , DynamicDownload(false)
 {
   this->RelBuildFilePath = this->GetRelBuildFilePath(target->Target);
@@ -178,10 +178,11 @@ std::vector<cmSourceFile *> cmGhsMultiTargetGenerator::GetSources() const
 
 GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag() const
 {
-  return cmGhsMultiTargetGenerator::GetGpjTag(this->Target);
+  return cmGhsMultiTargetGenerator::GetGpjTag(this->GeneratorTarget);
 }
 
-GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(const cmTarget *target)
+GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(
+    const cmGeneratorTarget *target)
 {
   GhsMultiGpj::Types output;
   if (cmGhsMultiTargetGenerator::DetermineIfTargetGroup(target))
@@ -566,15 +567,14 @@ bool cmGhsMultiTargetGenerator::IsNotKernel(std::string const &config,
   return output;
 }
 
-bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(const cmTarget *target)
+bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(
+    const cmGeneratorTarget *target)
 {
   bool output = false;
   std::vector<cmSourceFile *> sources;
   std::string config =
-      target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  cmGeneratorTarget* gt =
-      this->GetGlobalGenerator()->GetGeneratorTarget(target);
-  gt->GetSourceFiles(sources, config);
+      target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
+  target->GetSourceFiles(sources, config);
   for (std::vector<cmSourceFile *>::const_iterator sources_i = sources.begin();
        sources.end() != sources_i; ++sources_i)
     {
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index c29a31e..d1c17f4 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -36,7 +36,7 @@ public:
   bool IncludeThisTarget();
   std::vector<cmSourceFile *> GetSources() const;
   GhsMultiGpj::Types GetGpjTag() const;
-  static GhsMultiGpj::Types GetGpjTag(const cmTarget *target);
+  static GhsMultiGpj::Types GetGpjTag(const cmGeneratorTarget* target);
   const char *GetAbsBuildFilePath() const
   {
     return this->AbsBuildFilePath.c_str();
@@ -95,7 +95,7 @@ private:
   std::string GetOutputFilename(const std::string &config) const;
 
   bool IsNotKernel(std::string const &config, const std::string &language);
-  static bool DetermineIfTargetGroup(const cmTarget *target);
+  static bool DetermineIfTargetGroup(const cmGeneratorTarget* target);
   bool DetermineIfDynamicDownload(std::string const &config,
                                   const std::string &language);
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGhsMultiTargetGenerator.cxx |   16 ++++++++--------
 Source/cmGhsMultiTargetGenerator.h   |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct  6 16:38:40 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  6 Oct 2015 16:38:40 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-122-g4497396
Message-ID: <20151006203840.0E4E7BFC0A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  449739634258340947548467f73cc8c3479c2e90 (commit)
       via  947611f7d1d00bd7a3004104ea5a84e5bdd3d16d (commit)
       via  2f34cdd3793bfc53947f2bd6f5032523196c2943 (commit)
       via  b8d23e48a296e308a31717ab213b9661adf133e1 (commit)
       via  ff83742a8e8cf9443b08406a696aad8c70db8430 (commit)
       via  c1bf5253ab99e76c5ba8e67ebab1256ed97142a0 (commit)
       via  c4589e5dff619a2f0ff7c102fd8f9c012f2b01fd (commit)
       via  e6de22ed27da0eb141f099b15fc7eab3cf738731 (commit)
       via  dc581a1e0cc0186fcdc0d9ccc3f09c814eca700f (commit)
       via  f1011833f215daee03dc861ed50eb0d75500c4b2 (commit)
       via  97d89bdfb52435323eb8922dda92cd9198397df0 (commit)
       via  a9008a9b2c302d9a0b7deecb35e8a3d6291f0830 (commit)
      from  884ba71d96fe4b62336f61c367f8cf785e3842df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=449739634258340947548467f73cc8c3479c2e90
commit 449739634258340947548467f73cc8c3479c2e90
Merge: 884ba71 947611f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 16:38:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 16:38:38 2015 -0400

    Merge topic 'cmGeneratorTarget-sources' into next
    
    947611f7 cmTarget: Remove Compute method.
    2f34cdd3 cmGeneratorTarget: Move computed sources from cmTarget.
    b8d23e48 cmGeneratorTarget: Inline GetSourceFiles from cmTarget.
    ff83742a cmGeneratorTarget: Move AddInterfaceEntries method.
    c1bf5253 cmTarget: Remove a conditional for generate-time source addition.
    c4589e5d cmTarget: Split storage of sources from genexes.
    e6de22ed cmTarget: Add Compute API for sources.
    dc581a1e cmTarget: Add API for generate-time source addition.
    f1011833 cmGeneratorTarget: Add methods for generate-time source addition.
    97d89bdf Access sources through cmGeneratorTarget.
    a9008a9b GHS: Port API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=947611f7d1d00bd7a3004104ea5a84e5bdd3d16d
commit 947611f7d1d00bd7a3004104ea5a84e5bdd3d16d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:54:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:02 2015 +0200

    cmTarget: Remove Compute method.
    
    The following tests FAILED:
            146 - Qt5Autogen (Failed)
            148 - Qt4Autogen (Failed)
            298 - RunCMake.set_property (Failed)
            314 - RunCMake.File_Generate (Failed)

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a62d534..db842b0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1538,7 +1538,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
         ti != targets.end(); ++ti)
       {
       cmTarget* t = &ti->second;
-      t->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
       generatorTargets[t] = gt;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 5bace47..ab9d7e7 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -254,7 +254,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
     mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false,
                           no_working_directory, no_depends,
                           noCommandLines);
-  tgt->Compute();
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   mf->AddGeneratorTarget(tgt, gt);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index fd2d33a..d45aa27 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -86,7 +86,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           no_depends, no_commands, false,
                           "Build all projects");
 
-      allBuild->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 14bc340..3d52e3a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -456,7 +456,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         no_working_directory,
                         "echo", "Build all projects");
 
-  allbuild->Compute();
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
@@ -492,7 +491,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           no_working_directory,
                           "make", "-f", file.c_str());
 
-    check->Compute();
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     mf->AddGeneratorTarget(check, checkGt);
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 1b1b98e..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -885,8 +885,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 /*byproducts=*/rcc_output, depends,
                                 commandLines, false, autogenComment.c_str());
 
-    autogenTarget->Compute();
-
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     makefile->AddGeneratorTarget(autogenTarget, gt);
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e87aa16..abfc40b 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -361,10 +361,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 }
 
-void cmTarget::Compute()
-{
-}
-
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 71f0d1f..354eda2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -133,8 +133,6 @@ public:
   void AddPostBuildCommand(cmCustomCommand const &cmd)
     {this->PostBuildCommands.push_back(cmd);}
 
-  void Compute();
-
   /**
    * Add sources to the target.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f34cdd3793bfc53947f2bd6f5032523196c2943
commit 2f34cdd3793bfc53947f2bd6f5032523196c2943
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 10:18:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:02 2015 +0200

    cmGeneratorTarget: Move computed sources from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 43ce882..3d5e89d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -269,7 +269,9 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
   DebugIncludesDone(false),
   DebugCompileOptionsDone(false),
   DebugCompileFeaturesDone(false),
-  DebugCompileDefinitionsDone(false)
+  DebugCompileDefinitionsDone(false),
+  DebugSourcesDone(false),
+  LinkImplementationLanguageIsContextDependent(true)
 {
   this->Makefile = this->Target->GetMakefile();
   this->LocalGenerator = lg;
@@ -296,6 +298,11 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
         t->GetCompileDefinitionsEntries(),
         t->GetCompileDefinitionsBacktraces(),
         this->CompileDefinitionsEntries);
+
+  CreatePropertyGeneratorExpressions(
+        t->GetSourceEntries(),
+        t->GetSourceBacktraces(),
+        this->SourceEntries, true);
 }
 
 cmGeneratorTarget::~cmGeneratorTarget()
@@ -304,6 +311,7 @@ cmGeneratorTarget::~cmGeneratorTarget()
   cmDeleteAll(this->CompileOptionsEntries);
   cmDeleteAll(this->CompileFeaturesEntries);
   cmDeleteAll(this->CompileDefinitionsEntries);
+  cmDeleteAll(this->SourceEntries);
   cmDeleteAll(this->LinkInformation);
   this->LinkInformation.clear();
 }
@@ -404,12 +412,30 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 
 void cmGeneratorTarget::AddSource(const std::string& src)
 {
-  this->Target->AddGenerateTimeSource(src);
+  this->Target->AddSource(src);
+  cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+  cmGeneratorExpression ge(lfbt);
+  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
+  cge->SetEvaluateForBuildsystem(true);
+  this->SourceEntries.push_back(
+                        new TargetPropertyEntry(cge));
 }
 
 void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   this->Target->AddTracedSources(srcs);
+  if (!srcs.empty())
+    {
+    std::string srcFiles = cmJoin(srcs, ";");
+    this->SourceFilesMap.clear();
+    this->LinkImplementationLanguageIsContextDependent = true;
+    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    cmGeneratorExpression ge(lfbt);
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
+    cge->SetEvaluateForBuildsystem(true);
+    this->SourceEntries.push_back(
+          new cmGeneratorTarget::TargetPropertyEntry(cge));
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -839,29 +865,216 @@ static void AddInterfaceEntries(
 }
 
 //----------------------------------------------------------------------------
+static bool processSources(cmGeneratorTarget const* tgt,
+      const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries,
+      std::vector<std::string> &srcs,
+      UNORDERED_SET<std::string> &uniqueSrcs,
+      cmGeneratorExpressionDAGChecker *dagChecker,
+      std::string const& config, bool debugSources)
+{
+  cmMakefile *mf = tgt->Target->GetMakefile();
+
+  bool contextDependent = false;
+
+  for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator
+      it = entries.begin(), end = entries.end(); it != end; ++it)
+    {
+    cmLinkImplItem const& item = (*it)->LinkImplItem;
+    std::string const& targetName = item;
+    std::vector<std::string> entrySources;
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+                                              config,
+                                              false,
+                                              tgt->Target,
+                                              tgt->Target,
+                                              dagChecker),
+                                    entrySources);
+
+    if ((*it)->ge->GetHadContextSensitiveCondition())
+      {
+      contextDependent = true;
+      }
+
+    for(std::vector<std::string>::iterator i = entrySources.begin();
+        i != entrySources.end(); ++i)
+      {
+      std::string& src = *i;
+      cmSourceFile* sf = mf->GetOrCreateSource(src);
+      std::string e;
+      std::string fullPath = sf->GetFullPath(&e);
+      if(fullPath.empty())
+        {
+        if(!e.empty())
+          {
+          cmake* cm = mf->GetCMakeInstance();
+          cm->IssueMessage(cmake::FATAL_ERROR, e,
+                          tgt->Target->GetBacktrace());
+          }
+        return contextDependent;
+        }
+
+      if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str()))
+        {
+        std::ostringstream err;
+        if (!targetName.empty())
+          {
+          err << "Target \"" << targetName << "\" contains relative "
+            "path in its INTERFACE_SOURCES:\n"
+            "  \"" << src << "\"";
+          }
+        else
+          {
+          err << "Found relative path while evaluating sources of "
+          "\"" << tgt->GetName() << "\":\n  \"" << src << "\"\n";
+          }
+        tgt->GetLocalGenerator()->IssueMessage(cmake::FATAL_ERROR, err.str());
+        return contextDependent;
+        }
+      src = fullPath;
+      }
+    std::string usedSources;
+    for(std::vector<std::string>::iterator
+          li = entrySources.begin(); li != entrySources.end(); ++li)
+      {
+      std::string src = *li;
+
+      if(uniqueSrcs.insert(src).second)
+        {
+        srcs.push_back(src);
+        if (debugSources)
+          {
+          usedSources += " * " + src + "\n";
+          }
+        }
+      }
+    if (!usedSources.empty())
+      {
+      mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
+                            std::string("Used sources for target ")
+                            + tgt->GetName() + ":\n"
+                            + usedSources, (*it)->ge->GetBacktrace());
+      }
+    }
+  return contextDependent;
+}
+
+//----------------------------------------------------------------------------
+void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files,
+                              const std::string& config) const
+{
+  assert(this->GetType() != cmTarget::INTERFACE_LIBRARY);
+
+  if (!this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+    {
+    // At configure-time, this method can be called as part of getting the
+    // LOCATION property or to export() a file to be include()d.  However
+    // there is no cmGeneratorTarget at configure-time, so search the SOURCES
+    // for TARGET_OBJECTS instead for backwards compatibility with OLD
+    // behavior of CMP0024 and CMP0026 only.
+
+    cmStringRange sourceEntries = this->Target->GetSourceEntries();
+    for(cmStringRange::const_iterator
+          i = sourceEntries.begin();
+        i != sourceEntries.end(); ++i)
+      {
+      std::string const& entry = *i;
+
+      std::vector<std::string> items;
+      cmSystemTools::ExpandListArgument(entry, items);
+      for (std::vector<std::string>::const_iterator
+          li = items.begin(); li != items.end(); ++li)
+        {
+        if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
+            (*li)[li->size() - 1] == '>')
+          {
+          continue;
+          }
+        files.push_back(*li);
+        }
+      }
+    return;
+    }
+
+  std::vector<std::string> debugProperties;
+  const char *debugProp =
+              this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES");
+  if (debugProp)
+    {
+    cmSystemTools::ExpandListArgument(debugProp, debugProperties);
+    }
+
+  bool debugSources = !this->DebugSourcesDone
+                    && std::find(debugProperties.begin(),
+                                 debugProperties.end(),
+                                 "SOURCES")
+                        != debugProperties.end();
+
+  if (this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+    {
+    this->DebugSourcesDone = true;
+    }
+
+  cmGeneratorExpressionDAGChecker dagChecker(this->GetName(),
+                                             "SOURCES", 0, 0);
+
+  UNORDERED_SET<std::string> uniqueSrcs;
+  bool contextDependentDirectSources = processSources(this,
+                 this->SourceEntries,
+                 files,
+                 uniqueSrcs,
+                 &dagChecker,
+                 config,
+                 debugSources);
+
+  std::vector<cmGeneratorTarget::TargetPropertyEntry*>
+    linkInterfaceSourcesEntries;
+
+  AddInterfaceEntries(
+    this, config, "INTERFACE_SOURCES",
+    linkInterfaceSourcesEntries);
+
+  std::vector<std::string>::size_type numFilesBefore = files.size();
+  bool contextDependentInterfaceSources = processSources(this,
+    linkInterfaceSourcesEntries,
+                            files,
+                            uniqueSrcs,
+                            &dagChecker,
+                            config,
+                            debugSources);
+
+  if (!contextDependentDirectSources
+      && !(contextDependentInterfaceSources && numFilesBefore < files.size()))
+    {
+    this->LinkImplementationLanguageIsContextDependent = false;
+    }
+
+  cmDeleteAll(linkInterfaceSourcesEntries);
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
                                        const std::string& config) const
 {
+
   // Lookup any existing link implementation for this configuration.
   std::string key = cmSystemTools::UpperCase(config);
 
-  cmTarget::SourceFilesMapType& sfm = this->Target->GetSourceFilesMap();
-  if(!this->Target->GetLinkImplementationLanguageIsContextDependent())
+  if(!this->LinkImplementationLanguageIsContextDependent)
     {
-    files = sfm.begin()->second;
+    files = this->SourceFilesMap.begin()->second;
     return;
     }
 
-  cmTarget::SourceFilesMapType::iterator
-    it = sfm.find(key);
-  if(it != sfm.end())
+  SourceFilesMapType::iterator
+    it = this->SourceFilesMap.find(key);
+  if(it != this->SourceFilesMap.end())
     {
     files = it->second;
     }
   else
     {
     std::vector<std::string> srcs;
-    this->Target->GetSourceFiles(srcs, config);
+    this->GetSourceFiles(srcs, config);
 
     std::set<cmSourceFile*> emitted;
 
@@ -874,7 +1087,7 @@ void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
         files.push_back(sf);
         }
       }
-    sfm[key] = files;
+    this->SourceFilesMap[key] = files;
     }
 }
 
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 0c6ad82..e8c5e04 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -441,10 +441,15 @@ private:
     GetImportLinkInterface(const std::string& config, cmTarget const* head,
                            bool usage_requirements_only) const;
 
+  typedef std::map<std::string, std::vector<cmSourceFile*> >
+                                                       SourceFilesMapType;
+  mutable SourceFilesMapType SourceFilesMap;
+
   std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries;
   std::vector<TargetPropertyEntry*> CompileOptionsEntries;
   std::vector<TargetPropertyEntry*> CompileFeaturesEntries;
   std::vector<TargetPropertyEntry*> CompileDefinitionsEntries;
+  std::vector<TargetPropertyEntry*> SourceEntries;
 
   void ExpandLinkItems(std::string const& prop, std::string const& value,
                        std::string const& config, cmTarget const* headTarget,
@@ -454,6 +459,9 @@ private:
   void LookupLinkItems(std::vector<std::string> const& names,
                        std::vector<cmLinkItem>& items) const;
 
+  void GetSourceFiles(std::vector<std::string>& files,
+                      const std::string& config) const;
+
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
@@ -462,6 +470,8 @@ private:
   mutable bool DebugCompileOptionsDone;
   mutable bool DebugCompileFeaturesDone;
   mutable bool DebugCompileDefinitionsDone;
+  mutable bool DebugSourcesDone;
+  mutable bool LinkImplementationLanguageIsContextDependent;
 
 public:
   std::vector<cmTarget const*> const&
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 8ff729f..e87aa16 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -101,21 +101,9 @@ public:
                    HeadToLinkImplementationMap> LinkImplMapType;
   LinkImplMapType LinkImplMap;
 
-  cmTarget::SourceFilesMapType SourceFilesMap;
-
   std::set<cmLinkItem> UtilityItems;
   bool UtilityItemsDone;
 
-  class TargetPropertyEntry {
-    static cmLinkImplItem NoLinkImplItem;
-  public:
-    TargetPropertyEntry(cmsys::auto_ptr<cmCompiledGeneratorExpression> cge,
-                        cmLinkImplItem const& item = NoLinkImplItem)
-      : ge(cge), LinkImplItem(item)
-    {}
-    const cmsys::auto_ptr<cmCompiledGeneratorExpression> ge;
-    cmLinkImplItem const& LinkImplItem;
-  };
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -126,16 +114,9 @@ public:
   std::vector<cmListFileBacktrace> CompileDefinitionsBacktraces;
   std::vector<std::string> SourceEntries;
   std::vector<cmListFileBacktrace> SourceBacktraces;
-  std::vector<TargetPropertyEntry*> SourceItems;
   std::vector<cmValueWithOrigin> LinkImplementationPropertyEntries;
-
-  void AddInterfaceEntries(
-    cmTarget const* thisTarget, std::string const& config,
-    std::string const& prop, std::vector<TargetPropertyEntry*>& entries);
 };
 
-cmLinkImplItem cmTargetInternals::TargetPropertyEntry::NoLinkImplItem;
-
 //----------------------------------------------------------------------------
 cmTargetInternals::~cmTargetInternals()
 {
@@ -154,8 +135,6 @@ cmTarget::cmTarget()
   this->IsApple = false;
   this->IsImportedTarget = false;
   this->BuildInterfaceIncludesAppended = false;
-  this->DebugSourcesDone = false;
-  this->LinkImplementationLanguageIsContextDependent = true;
 }
 
 void cmTarget::SetType(TargetType type, const std::string& name)
@@ -382,34 +361,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 }
 
-void CreatePropertyGeneratorExpressions(
-    std::vector<std::string> const& entries,
-    std::vector<cmListFileBacktrace> const& backtraces,
-    std::vector<cmTargetInternals::TargetPropertyEntry*>& items,
-    bool evaluateForBuildsystem = false)
-{
-  std::vector<cmListFileBacktrace>::const_iterator btIt = backtraces.begin();
-  for (std::vector<std::string>::const_iterator it = entries.begin();
-       it != entries.end(); ++it, ++btIt)
-    {
-    cmGeneratorExpression ge(*btIt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*it);
-    cge->SetEvaluateForBuildsystem(evaluateForBuildsystem);
-    items.push_back(new cmTargetInternals::TargetPropertyEntry(cge));
-    }
-}
-
 void cmTarget::Compute()
 {
-  CreatePropertyGeneratorExpressions(
-        this->Internal->SourceEntries,
-        this->Internal->SourceBacktraces,
-        this->Internal->SourceItems, true);
-}
-
-cmTarget::SourceFilesMapType& cmTarget::GetSourceFilesMap() const
-{
-  return this->Internal->SourceFilesMap;
 }
 
 //----------------------------------------------------------------------------
@@ -469,9 +422,7 @@ void cmTarget::FinishConfigure()
 //----------------------------------------------------------------------------
 void cmTarget::ClearLinkMaps()
 {
-  this->LinkImplementationLanguageIsContextDependent = true;
   this->Internal->LinkImplMap.clear();
-  this->Internal->SourceFilesMap.clear();
 }
 
 //----------------------------------------------------------------------------
@@ -553,207 +504,13 @@ bool cmTarget::IsXCTestOnApple() const
 }
 
 //----------------------------------------------------------------------------
-static bool processSources(cmTarget const* tgt,
-      const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries,
-      std::vector<std::string> &srcs,
-      UNORDERED_SET<std::string> &uniqueSrcs,
-      cmGeneratorExpressionDAGChecker *dagChecker,
-      std::string const& config, bool debugSources)
-{
-  cmMakefile *mf = tgt->GetMakefile();
-
-  bool contextDependent = false;
-
-  for (std::vector<cmTargetInternals::TargetPropertyEntry*>::const_iterator
-      it = entries.begin(), end = entries.end(); it != end; ++it)
-    {
-    cmLinkImplItem const& item = (*it)->LinkImplItem;
-    std::string const& targetName = item;
-    std::vector<std::string> entrySources;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
-                                              config,
-                                              false,
-                                              tgt,
-                                              tgt,
-                                              dagChecker),
-                                    entrySources);
-
-    if ((*it)->ge->GetHadContextSensitiveCondition())
-      {
-      contextDependent = true;
-      }
-
-    for(std::vector<std::string>::iterator i = entrySources.begin();
-        i != entrySources.end(); ++i)
-      {
-      std::string& src = *i;
-      cmSourceFile* sf = mf->GetOrCreateSource(src);
-      std::string e;
-      std::string fullPath = sf->GetFullPath(&e);
-      if(fullPath.empty())
-        {
-        if(!e.empty())
-          {
-          cmake* cm = mf->GetCMakeInstance();
-          cm->IssueMessage(cmake::FATAL_ERROR, e,
-                          tgt->GetBacktrace());
-          }
-        return contextDependent;
-        }
-
-      if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str()))
-        {
-        std::ostringstream err;
-        if (!targetName.empty())
-          {
-          err << "Target \"" << targetName << "\" contains relative "
-            "path in its INTERFACE_SOURCES:\n"
-            "  \"" << src << "\"";
-          }
-        else
-          {
-          err << "Found relative path while evaluating sources of "
-          "\"" << tgt->GetName() << "\":\n  \"" << src << "\"\n";
-          }
-        tgt->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, err.str());
-        return contextDependent;
-        }
-      src = fullPath;
-      }
-    std::string usedSources;
-    for(std::vector<std::string>::iterator
-          li = entrySources.begin(); li != entrySources.end(); ++li)
-      {
-      std::string src = *li;
-
-      if(uniqueSrcs.insert(src).second)
-        {
-        srcs.push_back(src);
-        if (debugSources)
-          {
-          usedSources += " * " + src + "\n";
-          }
-        }
-      }
-    if (!usedSources.empty())
-      {
-      mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
-                            std::string("Used sources for target ")
-                            + tgt->GetName() + ":\n"
-                            + usedSources, (*it)->ge->GetBacktrace());
-      }
-    }
-  return contextDependent;
-}
-
-//----------------------------------------------------------------------------
-void cmTarget::GetSourceFiles(std::vector<std::string> &files,
-                              const std::string& config) const
-{
-  assert(this->GetType() != INTERFACE_LIBRARY);
-
-  if (!this->GetMakefile()->GetGlobalGenerator()->GetConfigureDoneCMP0026())
-    {
-    // At configure-time, this method can be called as part of getting the
-    // LOCATION property or to export() a file to be include()d.  However
-    // there is no cmGeneratorTarget at configure-time, so search the SOURCES
-    // for TARGET_OBJECTS instead for backwards compatibility with OLD
-    // behavior of CMP0024 and CMP0026 only.
-
-    for(std::vector<std::string>::const_iterator
-          i = this->Internal->SourceEntries.begin();
-        i != this->Internal->SourceEntries.end(); ++i)
-      {
-      std::string const& entry = *i;
-
-      std::vector<std::string> items;
-      cmSystemTools::ExpandListArgument(entry, items);
-      for (std::vector<std::string>::const_iterator
-          li = items.begin(); li != items.end(); ++li)
-        {
-        if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
-            (*li)[li->size() - 1] == '>')
-          {
-          continue;
-          }
-        files.push_back(*li);
-        }
-      }
-    return;
-    }
-
-  std::vector<std::string> debugProperties;
-  const char *debugProp =
-              this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES");
-  if (debugProp)
-    {
-    cmSystemTools::ExpandListArgument(debugProp, debugProperties);
-    }
-
-  bool debugSources = !this->DebugSourcesDone
-                    && std::find(debugProperties.begin(),
-                                 debugProperties.end(),
-                                 "SOURCES")
-                        != debugProperties.end();
-
-  if (this->GetMakefile()->GetGlobalGenerator()->GetConfigureDoneCMP0026())
-    {
-    this->DebugSourcesDone = true;
-    }
-
-  cmGeneratorExpressionDAGChecker dagChecker(this->GetName(),
-                                             "SOURCES", 0, 0);
-
-  UNORDERED_SET<std::string> uniqueSrcs;
-  bool contextDependentDirectSources = processSources(this,
-                 this->Internal->SourceItems,
-                 files,
-                 uniqueSrcs,
-                 &dagChecker,
-                 config,
-                 debugSources);
-
-  std::vector<cmTargetInternals::TargetPropertyEntry*>
-    linkInterfaceSourcesEntries;
-
-  this->Internal->AddInterfaceEntries(
-    this, config, "INTERFACE_SOURCES",
-    linkInterfaceSourcesEntries);
-
-  std::vector<std::string>::size_type numFilesBefore = files.size();
-  bool contextDependentInterfaceSources = processSources(this,
-    linkInterfaceSourcesEntries,
-                            files,
-                            uniqueSrcs,
-                            &dagChecker,
-                            config,
-                            debugSources);
-
-  if (!contextDependentDirectSources
-      && !(contextDependentInterfaceSources && numFilesBefore < files.size()))
-    {
-    this->LinkImplementationLanguageIsContextDependent = false;
-    }
-
-  cmDeleteAll(linkInterfaceSourcesEntries);
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
     {
-    std::string srcFiles = cmJoin(srcs, ";");
-    this->Internal->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->SourceEntries.push_back(srcFiles);
+    this->Internal->SourceEntries.push_back(cmJoin(srcs, ";"));
     this->Internal->SourceBacktraces.push_back(lfbt);
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceItems.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
     }
 }
 
@@ -786,8 +543,6 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs)
     }
   if (!srcFiles.empty())
     {
-    this->Internal->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     this->Internal->SourceEntries.push_back(srcFiles);
     this->Internal->SourceBacktraces.push_back(lfbt);
@@ -916,8 +671,6 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
                    TargetPropertyEntryFinder(sfl))
                                       == this->Internal->SourceEntries.end())
     {
-    this->Internal->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     this->Internal->SourceEntries.push_back(src);
     this->Internal->SourceBacktraces.push_back(lfbt);
@@ -929,17 +682,6 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
   return this->Makefile->GetOrCreateSource(src);
 }
 
-void cmTarget::AddGenerateTimeSource(const std::string& src)
-{
-  cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-  cmGeneratorExpression ge(lfbt);
-  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
-  cge->SetEvaluateForBuildsystem(true);
-  this->Internal->SourceItems.push_back(
-                        new cmTargetInternals::TargetPropertyEntry(cge));
-  this->AddSource(src);
-}
-
 //----------------------------------------------------------------------------
 void cmTarget::MergeLinkLibraries( cmMakefile& mf,
                                    const std::string& selfname,
@@ -1234,6 +976,16 @@ cmBacktraceRange cmTarget::GetCompileDefinitionsBacktraces() const
   return cmMakeRange(this->Internal->CompileDefinitionsBacktraces);
 }
 
+cmStringRange cmTarget::GetSourceEntries() const
+{
+  return cmMakeRange(this->Internal->SourceEntries);
+}
+
+cmBacktraceRange cmTarget::GetSourceBacktraces() const
+{
+  return cmMakeRange(this->Internal->SourceBacktraces);
+}
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
 //----------------------------------------------------------------------------
 void
@@ -1649,7 +1401,6 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
-    this->Internal->SourceFilesMap.clear();
 
     this->Internal->SourceEntries.clear();
     this->Internal->SourceBacktraces.clear();
@@ -1749,7 +1500,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
-    this->Internal->SourceFilesMap.clear();
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     this->Internal->SourceEntries.push_back(value);
     this->Internal->SourceBacktraces.push_back(lfbt);
@@ -3424,32 +3174,6 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 }
 
-//----------------------------------------------------------------------------
-void cmTargetInternals::AddInterfaceEntries(
-  cmTarget const* thisTarget, std::string const& config,
-  std::string const& prop, std::vector<TargetPropertyEntry*>& entries)
-{
-  if(cmLinkImplementationLibraries const* impl =
-     thisTarget->GetLinkImplementationLibraries(config))
-    {
-    for (std::vector<cmLinkImplItem>::const_iterator
-           it = impl->Libraries.begin(), end = impl->Libraries.end();
-         it != end; ++it)
-      {
-      if(it->Target)
-        {
-        std::string genex =
-          "$<TARGET_PROPERTY:" + *it + "," + prop + ">";
-        cmGeneratorExpression ge(it->Backtrace);
-        cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex);
-        cge->SetEvaluateForBuildsystem(true);
-        entries.push_back(
-          new cmTargetInternals::TargetPropertyEntry(cge, *it));
-        }
-      }
-    }
-}
-
 cmOptionalLinkImplementation&
 cmTarget::GetLinkImplMap(std::string const& config) const
 {
@@ -3712,7 +3436,6 @@ cmTargetInternalPointer
 //----------------------------------------------------------------------------
 cmTargetInternalPointer::~cmTargetInternalPointer()
 {
-  cmDeleteAll(this->Pointer->SourceItems);
   delete this->Pointer;
 }
 
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 6024c38..71f0d1f 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -135,15 +135,6 @@ public:
 
   void Compute();
 
-  typedef std::map<std::string, std::vector<cmSourceFile*> >
-                                                       SourceFilesMapType;
-
-  SourceFilesMapType& GetSourceFilesMap() const;
-
-  bool GetLinkImplementationLanguageIsContextDependent() const {
-    return this->LinkImplementationLanguageIsContextDependent;
-  }
-
   /**
    * Add sources to the target.
    */
@@ -151,7 +142,6 @@ public:
   void AddTracedSources(std::vector<std::string> const& srcs);
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
-  void AddGenerateTimeSource(const std::string& src);
 
   enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
 
@@ -395,6 +385,9 @@ public:
   cmStringRange GetCompileDefinitionsEntries() const;
   cmBacktraceRange GetCompileDefinitionsBacktraces() const;
 
+  cmStringRange GetSourceEntries() const;
+  cmBacktraceRange GetSourceBacktraces() const;
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
   const LinkLibraryVectorType &GetLinkLibrariesForVS6() const {
   return this->LinkLibrariesForVS6;}
@@ -473,9 +466,6 @@ private:
   std::string ImportedGetFullPath(const std::string& config,
                                   bool implib) const;
 
-
-  void GetSourceFiles(std::vector<std::string> &files,
-                      const std::string& config) const;
 private:
   mutable cmPropertyMap Properties;
   std::set<std::string> SystemIncludeDirectories;
@@ -509,8 +499,6 @@ private:
   bool IsApple;
   bool IsImportedTarget;
   bool BuildInterfaceIncludesAppended;
-  mutable bool DebugSourcesDone;
-  mutable bool LinkImplementationLanguageIsContextDependent;
 #if defined(_WIN32) && !defined(__CYGWIN__)
   bool LinkLibrariesForVS6Analyzed;
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8d23e48a296e308a31717ab213b9661adf133e1
commit b8d23e48a296e308a31717ab213b9661adf133e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 09:57:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:02 2015 +0200

    cmGeneratorTarget: Inline GetSourceFiles from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 357b972..43ce882 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -842,7 +842,40 @@ static void AddInterfaceEntries(
 void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
                                        const std::string& config) const
 {
-  this->Target->GetSourceFiles(files, config);
+  // Lookup any existing link implementation for this configuration.
+  std::string key = cmSystemTools::UpperCase(config);
+
+  cmTarget::SourceFilesMapType& sfm = this->Target->GetSourceFilesMap();
+  if(!this->Target->GetLinkImplementationLanguageIsContextDependent())
+    {
+    files = sfm.begin()->second;
+    return;
+    }
+
+  cmTarget::SourceFilesMapType::iterator
+    it = sfm.find(key);
+  if(it != sfm.end())
+    {
+    files = it->second;
+    }
+  else
+    {
+    std::vector<std::string> srcs;
+    this->Target->GetSourceFiles(srcs, config);
+
+    std::set<cmSourceFile*> emitted;
+
+    for(std::vector<std::string>::const_iterator i = srcs.begin();
+        i != srcs.end(); ++i)
+      {
+      cmSourceFile* sf = this->Makefile->GetOrCreateSource(*i);
+      if (emitted.insert(sf).second)
+        {
+        files.push_back(sf);
+        }
+      }
+    sfm[key] = files;
+    }
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fc9e963..8ff729f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -101,9 +101,7 @@ public:
                    HeadToLinkImplementationMap> LinkImplMapType;
   LinkImplMapType LinkImplMap;
 
-  typedef std::map<std::string, std::vector<cmSourceFile*> >
-                                                       SourceFilesMapType;
-  SourceFilesMapType SourceFilesMap;
+  cmTarget::SourceFilesMapType SourceFilesMap;
 
   std::set<cmLinkItem> UtilityItems;
   bool UtilityItemsDone;
@@ -409,6 +407,11 @@ void cmTarget::Compute()
         this->Internal->SourceItems, true);
 }
 
+cmTarget::SourceFilesMapType& cmTarget::GetSourceFilesMap() const
+{
+  return this->Internal->SourceFilesMap;
+}
+
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
@@ -736,46 +739,6 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
-                              const std::string& config) const
-{
-
-  // Lookup any existing link implementation for this configuration.
-  std::string key = cmSystemTools::UpperCase(config);
-
-  if(!this->LinkImplementationLanguageIsContextDependent)
-    {
-    files = this->Internal->SourceFilesMap.begin()->second;
-    return;
-    }
-
-  cmTargetInternals::SourceFilesMapType::iterator
-    it = this->Internal->SourceFilesMap.find(key);
-  if(it != this->Internal->SourceFilesMap.end())
-    {
-    files = it->second;
-    }
-  else
-    {
-    std::vector<std::string> srcs;
-    this->GetSourceFiles(srcs, config);
-
-    std::set<cmSourceFile*> emitted;
-
-    for(std::vector<std::string>::const_iterator i = srcs.begin();
-        i != srcs.end(); ++i)
-      {
-      cmSourceFile* sf = this->Makefile->GetOrCreateSource(*i);
-      if (emitted.insert(sf).second)
-        {
-        files.push_back(sf);
-        }
-      }
-    this->Internal->SourceFilesMap[key] = files;
-    }
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2f1671d..6024c38 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -135,11 +135,15 @@ public:
 
   void Compute();
 
-  /**
-   * Get the list of the source files used by this target
-   */
-  void GetSourceFiles(std::vector<cmSourceFile*> &files,
-                      const std::string& config) const;
+  typedef std::map<std::string, std::vector<cmSourceFile*> >
+                                                       SourceFilesMapType;
+
+  SourceFilesMapType& GetSourceFilesMap() const;
+
+  bool GetLinkImplementationLanguageIsContextDependent() const {
+    return this->LinkImplementationLanguageIsContextDependent;
+  }
+
   /**
    * Add sources to the target.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff83742a8e8cf9443b08406a696aad8c70db8430
commit ff83742a8e8cf9443b08406a696aad8c70db8430
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 09:45:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:02 2015 +0200

    cmGeneratorTarget: Move AddInterfaceEntries method.
    
    It will be needed here in a follow-up commit.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 83f9cd2..357b972 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -812,6 +812,33 @@ bool cmGeneratorTarget::GetPropertyAsBool(const std::string& prop) const
 }
 
 //----------------------------------------------------------------------------
+static void AddInterfaceEntries(
+  cmGeneratorTarget const* thisTarget, std::string const& config,
+  std::string const& prop,
+  std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries)
+{
+  if(cmLinkImplementationLibraries const* impl =
+     thisTarget->Target->GetLinkImplementationLibraries(config))
+    {
+    for (std::vector<cmLinkImplItem>::const_iterator
+           it = impl->Libraries.begin(), end = impl->Libraries.end();
+         it != end; ++it)
+      {
+      if(it->Target)
+        {
+        std::string genex =
+          "$<TARGET_PROPERTY:" + *it + "," + prop + ">";
+        cmGeneratorExpression ge(it->Backtrace);
+        cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex);
+        cge->SetEvaluateForBuildsystem(true);
+        entries.push_back(
+          new cmGeneratorTarget::TargetPropertyEntry(cge, *it));
+        }
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
                                        const std::string& config) const
 {
@@ -2177,34 +2204,6 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
     }
 }
 
-
-//----------------------------------------------------------------------------
-static void AddInterfaceEntries(
-  cmGeneratorTarget const* thisTarget, std::string const& config,
-  std::string const& prop,
-  std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries)
-{
-  if(cmLinkImplementationLibraries const* impl =
-     thisTarget->Target->GetLinkImplementationLibraries(config))
-    {
-    for (std::vector<cmLinkImplItem>::const_iterator
-           it = impl->Libraries.begin(), end = impl->Libraries.end();
-         it != end; ++it)
-      {
-      if(it->Target)
-        {
-        std::string genex =
-          "$<TARGET_PROPERTY:" + *it + "," + prop + ">";
-        cmGeneratorExpression ge(it->Backtrace);
-        cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex);
-        cge->SetEvaluateForBuildsystem(true);
-        entries.push_back(
-          new cmGeneratorTarget::TargetPropertyEntry(cge, *it));
-        }
-      }
-    }
-}
-
 //----------------------------------------------------------------------------
 std::vector<std::string>
 cmGeneratorTarget::GetIncludeDirectories(const std::string& config,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1bf5253ab99e76c5ba8e67ebab1256ed97142a0
commit c1bf5253ab99e76c5ba8e67ebab1256ed97142a0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:51:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:02 2015 +0200

    cmTarget: Remove a conditional for generate-time source addition.
    
    It is not really necessary.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6e1c488..fc9e963 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -968,19 +968,12 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
 
 void cmTarget::AddGenerateTimeSource(const std::string& src)
 {
-  cmSourceFileLocation sfl(this->Makefile, src);
-  if (std::find_if(this->Internal->SourceEntries.begin(),
-                   this->Internal->SourceEntries.end(),
-                   TargetPropertyEntryFinder(sfl))
-                                      == this->Internal->SourceEntries.end())
-    {
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceItems.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
-    }
+  cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+  cmGeneratorExpression ge(lfbt);
+  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
+  cge->SetEvaluateForBuildsystem(true);
+  this->Internal->SourceItems.push_back(
+                        new cmTargetInternals::TargetPropertyEntry(cge));
   this->AddSource(src);
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4589e5dff619a2f0ff7c102fd8f9c012f2b01fd
commit c4589e5dff619a2f0ff7c102fd8f9c012f2b01fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 4 21:46:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:01 2015 +0200

    cmTarget: Split storage of sources from genexes.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 515b261..6e1c488 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -126,7 +126,9 @@ public:
   std::vector<cmListFileBacktrace> CompileFeaturesBacktraces;
   std::vector<std::string> CompileDefinitionsEntries;
   std::vector<cmListFileBacktrace> CompileDefinitionsBacktraces;
-  std::vector<TargetPropertyEntry*> SourceEntries;
+  std::vector<std::string> SourceEntries;
+  std::vector<cmListFileBacktrace> SourceBacktraces;
+  std::vector<TargetPropertyEntry*> SourceItems;
   std::vector<cmValueWithOrigin> LinkImplementationPropertyEntries;
 
   void AddInterfaceEntries(
@@ -385,7 +387,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
 void CreatePropertyGeneratorExpressions(
     std::vector<std::string> const& entries,
     std::vector<cmListFileBacktrace> const& backtraces,
-    std::vector<cmTargetInternals::TargetPropertyEntry*>& items)
+    std::vector<cmTargetInternals::TargetPropertyEntry*>& items,
+    bool evaluateForBuildsystem = false)
 {
   std::vector<cmListFileBacktrace>::const_iterator btIt = backtraces.begin();
   for (std::vector<std::string>::const_iterator it = entries.begin();
@@ -393,12 +396,17 @@ void CreatePropertyGeneratorExpressions(
     {
     cmGeneratorExpression ge(*btIt);
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*it);
+    cge->SetEvaluateForBuildsystem(evaluateForBuildsystem);
     items.push_back(new cmTargetInternals::TargetPropertyEntry(cge));
     }
 }
 
 void cmTarget::Compute()
 {
+  CreatePropertyGeneratorExpressions(
+        this->Internal->SourceEntries,
+        this->Internal->SourceBacktraces,
+        this->Internal->SourceItems, true);
 }
 
 //----------------------------------------------------------------------------
@@ -649,13 +657,11 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
     // for TARGET_OBJECTS instead for backwards compatibility with OLD
     // behavior of CMP0024 and CMP0026 only.
 
-    typedef cmTargetInternals::TargetPropertyEntry
-                                TargetPropertyEntry;
-    for(std::vector<TargetPropertyEntry*>::const_iterator
+    for(std::vector<std::string>::const_iterator
           i = this->Internal->SourceEntries.begin();
         i != this->Internal->SourceEntries.end(); ++i)
       {
-      std::string entry = (*i)->ge->GetInput();
+      std::string const& entry = *i;
 
       std::vector<std::string> items;
       cmSystemTools::ExpandListArgument(entry, items);
@@ -697,7 +703,7 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
 
   UNORDERED_SET<std::string> uniqueSrcs;
   bool contextDependentDirectSources = processSources(this,
-                 this->Internal->SourceEntries,
+                 this->Internal->SourceItems,
                  files,
                  uniqueSrcs,
                  &dagChecker,
@@ -778,10 +784,12 @@ void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    this->Internal->SourceEntries.push_back(srcFiles);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     cmGeneratorExpression ge(lfbt);
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
     cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceEntries.push_back(
+    this->Internal->SourceItems.push_back(
                           new cmTargetInternals::TargetPropertyEntry(cge));
     }
 }
@@ -818,11 +826,8 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs)
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceEntries.push_back(srcFiles);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     }
 }
 
@@ -926,10 +931,10 @@ public:
 
   }
 
-  bool operator()(cmTargetInternals::TargetPropertyEntry* entry)
+  bool operator()(std::string const& entry)
   {
     std::vector<std::string> files;
-    cmSystemTools::ExpandListArgument(entry->ge->GetInput(), files);
+    cmSystemTools::ExpandListArgument(entry, files);
     std::vector<cmSourceFileLocation> locations(files.size());
     std::transform(files.begin(), files.end(), locations.begin(),
                    CreateLocation(this->Needle.GetMakefile()));
@@ -951,11 +956,8 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceEntries.push_back(src);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     }
   if (cmGeneratorExpression::Find(src) != std::string::npos)
     {
@@ -966,6 +968,19 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
 
 void cmTarget::AddGenerateTimeSource(const std::string& src)
 {
+  cmSourceFileLocation sfl(this->Makefile, src);
+  if (std::find_if(this->Internal->SourceEntries.begin(),
+                   this->Internal->SourceEntries.end(),
+                   TargetPropertyEntryFinder(sfl))
+                                      == this->Internal->SourceEntries.end())
+    {
+    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    cmGeneratorExpression ge(lfbt);
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
+    cge->SetEvaluateForBuildsystem(true);
+    this->Internal->SourceItems.push_back(
+                          new cmTargetInternals::TargetPropertyEntry(cge));
+    }
   this->AddSource(src);
 }
 
@@ -1679,13 +1694,15 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
       return;
       }
     this->Internal->SourceFilesMap.clear();
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmDeleteAll(this->Internal->SourceEntries);
+
     this->Internal->SourceEntries.clear();
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceBacktraces.clear();
+    if (value)
+      {
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->SourceEntries.push_back(value);
+      this->Internal->SourceBacktraces.push_back(lfbt);
+      }
     }
   else
     {
@@ -1778,10 +1795,8 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
       }
     this->Internal->SourceFilesMap.clear();
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceEntries.push_back(value);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     }
   else
     {
@@ -2418,13 +2433,11 @@ const char *cmTarget::GetProperty(const std::string& prop,
 
       std::ostringstream ss;
       const char* sep = "";
-      typedef cmTargetInternals::TargetPropertyEntry
-                                  TargetPropertyEntry;
-      for(std::vector<TargetPropertyEntry*>::const_iterator
+      for(std::vector<std::string>::const_iterator
             i = this->Internal->SourceEntries.begin();
           i != this->Internal->SourceEntries.end(); ++i)
         {
-        std::string entry = (*i)->ge->GetInput();
+        std::string const& entry = *i;
 
         std::vector<std::string> files;
         cmSystemTools::ExpandListArgument(entry, files);
@@ -3076,13 +3089,11 @@ cmTarget::GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const
   // there is no cmGeneratorTarget at configure-time, so search the SOURCES
   // for TARGET_OBJECTS instead for backwards compatibility with OLD
   // behavior of CMP0024 and CMP0026 only.
-  typedef cmTargetInternals::TargetPropertyEntry
-                              TargetPropertyEntry;
-  for(std::vector<TargetPropertyEntry*>::const_iterator
+  for(std::vector<std::string>::const_iterator
         i = this->Internal->SourceEntries.begin();
       i != this->Internal->SourceEntries.end(); ++i)
     {
-    std::string entry = (*i)->ge->GetInput();
+    std::string const& entry = *i;
 
     std::vector<std::string> files;
     cmSystemTools::ExpandListArgument(entry, files);
@@ -3745,7 +3756,7 @@ cmTargetInternalPointer
 //----------------------------------------------------------------------------
 cmTargetInternalPointer::~cmTargetInternalPointer()
 {
-  cmDeleteAll(this->Pointer->SourceEntries);
+  cmDeleteAll(this->Pointer->SourceItems);
   delete this->Pointer;
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6de22ed27da0eb141f099b15fc7eab3cf738731
commit e6de22ed27da0eb141f099b15fc7eab3cf738731
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:44:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:01 2015 +0200

    cmTarget: Add Compute API for sources.
    
    This method is a refactoring artifact.  It will be removed in a
    follow-up.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index db842b0..a62d534 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1538,6 +1538,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
         ti != targets.end(); ++ti)
       {
       cmTarget* t = &ti->second;
+      t->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
       generatorTargets[t] = gt;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index ab9d7e7..5bace47 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -254,6 +254,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
     mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false,
                           no_working_directory, no_depends,
                           noCommandLines);
+  tgt->Compute();
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   mf->AddGeneratorTarget(tgt, gt);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d45aa27..fd2d33a 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -86,6 +86,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           no_depends, no_commands, false,
                           "Build all projects");
 
+      allBuild->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 3d52e3a..14bc340 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -456,6 +456,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         no_working_directory,
                         "echo", "Build all projects");
 
+  allbuild->Compute();
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
@@ -491,6 +492,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           no_working_directory,
                           "make", "-f", file.c_str());
 
+    check->Compute();
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     mf->AddGeneratorTarget(check, checkGt);
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 378f132..1b1b98e 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -885,6 +885,8 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 /*byproducts=*/rcc_output, depends,
                                 commandLines, false, autogenComment.c_str());
 
+    autogenTarget->Compute();
+
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     makefile->AddGeneratorTarget(autogenTarget, gt);
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 16378cc..515b261 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -397,6 +397,10 @@ void CreatePropertyGeneratorExpressions(
     }
 }
 
+void cmTarget::Compute()
+{
+}
+
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index cbf2ca9..2f1671d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -133,6 +133,8 @@ public:
   void AddPostBuildCommand(cmCustomCommand const &cmd)
     {this->PostBuildCommands.push_back(cmd);}
 
+  void Compute();
+
   /**
    * Get the list of the source files used by this target
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc581a1e0cc0186fcdc0d9ccc3f09c814eca700f
commit dc581a1e0cc0186fcdc0d9ccc3f09c814eca700f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:29:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:01 2015 +0200

    cmTarget: Add API for generate-time source addition.
    
    This method is a refactoring artifact.  It will be removed in a
    follow-up.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dc399d8..83f9cd2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -404,7 +404,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 
 void cmGeneratorTarget::AddSource(const std::string& src)
 {
-  this->Target->AddSource(src);
+  this->Target->AddGenerateTimeSource(src);
 }
 
 void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7fd8d86..16378cc 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -960,6 +960,11 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
   return this->Makefile->GetOrCreateSource(src);
 }
 
+void cmTarget::AddGenerateTimeSource(const std::string& src)
+{
+  this->AddSource(src);
+}
+
 //----------------------------------------------------------------------------
 void cmTarget::MergeLinkLibraries( cmMakefile& mf,
                                    const std::string& selfname,
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3e71dbd..cbf2ca9 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -145,6 +145,7 @@ public:
   void AddTracedSources(std::vector<std::string> const& srcs);
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
+  void AddGenerateTimeSource(const std::string& src);
 
   enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1011833f215daee03dc861ed50eb0d75500c4b2
commit f1011833f215daee03dc861ed50eb0d75500c4b2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 18:10:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:01 2015 +0200

    cmGeneratorTarget: Add methods for generate-time source addition.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3a865fc..dc399d8 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -402,6 +402,16 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
   return i->second;
 }
 
+void cmGeneratorTarget::AddSource(const std::string& src)
+{
+  this->Target->AddSource(src);
+}
+
+void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
+{
+  this->Target->AddTracedSources(srcs);
+}
+
 //----------------------------------------------------------------------------
 std::vector<cmSourceFile*> const*
 cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
@@ -1755,7 +1765,7 @@ void cmTargetTraceDependencies::Trace()
     }
   this->CurrentEntry = 0;
 
-  this->Target->AddTracedSources(this->NewSources);
+  this->GeneratorTarget->AddTracedSources(this->NewSources);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 6d5641b..0c6ad82 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -296,6 +296,9 @@ public:
   // Get the target base name.
   std::string GetOutputName(const std::string& config, bool implib) const;
 
+  void AddSource(const std::string& src);
+  void AddTracedSources(std::vector<std::string> const& srcs);
+
   /**
    * Flags for a given source file as used in this target. Typically assigned
    * via SET_TARGET_PROPERTIES when the property is a list of source files.
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 86a8f87..ab9d7e7 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -336,7 +336,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
        no_main_dependency, commandLines, "Checking Build System",
        no_working_directory, true))
     {
-    tgt->AddSource(file->GetFullPath());
+    gt->AddSource(file->GetFullPath());
     }
   else
     {
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 64fa12a..3d52e3a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -463,7 +463,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   std::string listfile = mf->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
-  allbuild->AddSource(listfile.c_str());
+  allBuildGt->AddSource(listfile.c_str());
 
   // Add XCODE depend helper
   std::string dir = mf->GetCurrentBinaryDirectory();
@@ -553,11 +553,13 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
         allbuild->AddUtility(target.GetName());
         }
 
+      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
+
       // Refer to the build configuration file for easy editing.
       listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
-      target.AddSource(listfile.c_str());
+      targetGT->AddSource(listfile.c_str());
       }
     }
 }
@@ -1401,7 +1403,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   if(cmSourceFile* sf = mf->GetOrCreateSource(fname.c_str()))
     {
     sf->SetProperty("LANGUAGE", llang.c_str());
-    cmtarget.AddSource(fname);
+    gtgt->AddSource(fname);
     }
 }
 
@@ -3069,17 +3071,18 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         continue;
         }
 
+      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+
       // add the soon to be generated Info.plist file as a source for a
       // MACOSX_BUNDLE file
       if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
         {
         std::string plist = this->ComputeInfoPListLocation(cmtarget);
         mf->GetOrCreateSource(plist, true);
-        cmtarget.AddSource(plist);
+        gtgt->AddSource(plist);
         }
 
       std::vector<cmSourceFile*> classes;
-      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
       if (!gtgt->GetConfigCommonSourceFiles(classes))
         {
         return false;
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index cc94cd4..ab215d1 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -243,7 +243,8 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
                                            no_working_directory, true);
   if(this->Makefile->GetSource(makefileIn.c_str()))
     {
-    tgt.AddSource(makefileIn);
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&tgt);
+    gt->AddSource(makefileIn);
     }
   else
     {
@@ -595,7 +596,8 @@ cmLocalVisualStudio6Generator
        origCommand.GetCommandLines(), comment,
        origCommand.GetWorkingDirectory().c_str()))
     {
-    target.AddSource(outsf->GetFullPath());
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&target);
+    gt->AddSource(outsf->GetFullPath());
     }
 
   // Replace the dependencies with the output of this rule so that the
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a4bce8a..8924564 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -112,7 +112,9 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules()
           }
         if(l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          l->second.AddSource(sf->GetFullPath());
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&l->second);
+          gt->AddSource(sf->GetFullPath());
           }
         }
       }
@@ -148,7 +150,9 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
            force.c_str(), no_depends, no_main_dependency,
            force_commands, " ", 0, true))
         {
-        tgt.AddSource(file->GetFullPath());
+        cmGeneratorTarget* gt =
+            this->GlobalGenerator->GetGeneratorTarget(&tgt);
+        gt->AddSource(file->GetFullPath());
         }
       }
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 2703f4c..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -101,7 +101,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
       fileIt != newRccFiles.end();
       ++fileIt)
     {
-    const_cast<cmTarget*>(target->Target)->AddSource(*fileIt);
+    const_cast<cmGeneratorTarget*>(target)->AddSource(*fileIt);
     }
 }
 
@@ -709,7 +709,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources(
     makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
                             mocCppFile.c_str(), false);
 
-    target->Target->AddSource(mocCppFile);
+    target->AddSource(mocCppFile);
     }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97d89bdfb52435323eb8922dda92cd9198397df0
commit 97d89bdfb52435323eb8922dda92cd9198397df0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 17:51:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:36:00 2015 +0200

    Access sources through cmGeneratorTarget.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index dfd51c7..7915a6e 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -401,7 +401,9 @@ void cmExtraCodeBlocksGenerator
         case cmTarget::UTILITY: // can have sources since 2.6.3
           {
           std::vector<cmSourceFile*> sources;
-          ti->second.GetSourceFiles(sources,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
                si!=sources.end(); si++)
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index c2cff14..496c1a8 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -196,7 +196,9 @@ void cmExtraCodeLiteGenerator
         case cmTarget::MODULE_LIBRARY:
           {
           std::vector<cmSourceFile*> sources;
-          ti->second.GetSourceFiles(sources,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
                si!=sources.end(); si++)
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 44bf586..6dc18c2 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -562,7 +562,9 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
           // get the files from the source lists then add them to the groups
           cmTarget* tgt = const_cast<cmTarget*>(&ti->second);
           std::vector<cmSourceFile*> files;
-          tgt->GetSourceFiles(files,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(tgt);
+          gt->GetSourceFiles(files,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for(std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
               sfIt != files.end();
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 163a75b..11410a7 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -237,7 +237,7 @@ void cmExtraSublimeTextGenerator::
       cmGeneratorTarget *gtgt = this->GlobalGenerator
                                     ->GetGeneratorTarget(target);
       std::vector<cmSourceFile*> sourceFiles;
-      target->GetSourceFiles(sourceFiles,
+      gtgt->GetSourceFiles(sourceFiles,
                              makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       std::vector<cmSourceFile*>::const_iterator sourceFilesEnd =
         sourceFiles.end();
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4ed2939..3a865fc 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -449,7 +449,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
 #define IMPLEMENT_VISIT_IMPL(DATA, DATATYPE) \
   { \
   std::vector<cmSourceFile*> sourceFiles; \
-  this->Target->GetSourceFiles(sourceFiles, config); \
+  this->GetSourceFiles(sourceFiles, config); \
   TagVisitor<DATA ## Tag DATATYPE> visitor(this, data); \
   for(std::vector<cmSourceFile*>::const_iterator si = sourceFiles.begin(); \
       si != sourceFiles.end(); ++si) \
@@ -1683,7 +1683,7 @@ cmTargetTraceDependencies
         ci != configs.end(); ++ci)
       {
       std::vector<cmSourceFile*> sources;
-      this->Target->GetSourceFiles(sources, *ci);
+      this->GeneratorTarget->GetSourceFiles(sources, *ci);
       for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
           si != sources.end(); ++si)
         {
@@ -4444,12 +4444,12 @@ bool cmGeneratorTarget::GetConfigCommonSourceFiles(
 
   std::vector<std::string>::const_iterator it = configs.begin();
   const std::string& firstConfig = *it;
-  this->Target->GetSourceFiles(files, firstConfig);
+  this->GetSourceFiles(files, firstConfig);
 
   for ( ; it != configs.end(); ++it)
     {
     std::vector<cmSourceFile*> configFiles;
-    this->Target->GetSourceFiles(configFiles, *it);
+    this->GetSourceFiles(configFiles, *it);
     if (configFiles != files)
       {
       std::string firstConfigFiles;
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 46ea2f3..bfcef43 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -172,7 +172,7 @@ std::vector<cmSourceFile *> cmGhsMultiTargetGenerator::GetSources() const
 {
   std::vector<cmSourceFile *> output;
   std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  this->Target->GetSourceFiles(output, config);
+  this->GeneratorTarget->GetSourceFiles(output, config);
   return output;
 }
 
@@ -574,7 +574,7 @@ bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(
   std::vector<cmSourceFile *> sources;
   std::string config =
       target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  target->Target->GetSourceFiles(sources, config);
+  target->GetSourceFiles(sources, config);
   for (std::vector<cmSourceFile *>::const_iterator sources_i = sources.begin();
        sources.end() != sources_i; ++sources_i)
     {
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 05f1029..db842b0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2949,10 +2949,12 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
       {
       configs.push_back("");
       }
+    cmGeneratorTarget* gt =
+        this->GetGeneratorTarget(target);
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
-      target->GetSourceFiles(sources, *ci);
+      gt->GetSourceFiles(sources, *ci);
       }
     std::vector<cmSourceFile*>::const_iterator sourcesEnd
         = cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 6dde1e3..e66bc2a 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -520,7 +520,9 @@ bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt)
   const std::string config =
     tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   std::vector<cmSourceFile *> tgtSources;
-  tgt->GetSourceFiles(tgtSources, config);
+  cmGeneratorTarget* gt =
+      this->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+  gt->GetSourceFiles(tgtSources, config);
   bool tgtInBuild = true;
   char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 138ddbb..c40f846 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -139,7 +139,9 @@ bool cmGlobalKdevelopGenerator
          ti != targets.end(); ti++)
       {
       std::vector<cmSourceFile*> sources;
-      ti->second.GetSourceFiles(sources, ti->second.GetMakefile()
+      cmGeneratorTarget* gt =
+          this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+      gt->GetSourceFiles(sources, ti->second.GetMakefile()
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
            si!=sources.end(); si++)
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b278087..cd499f6 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1149,7 +1149,7 @@ cmMakefileTargetGenerator
 {
   // Depend on all custom command outputs.
   std::vector<cmSourceFile*> sources;
-  this->Target->GetSourceFiles(sources,
+  this->GeneratorTarget->GetSourceFiles(sources,
                       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
       source != sources.end(); ++source)
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 84c19a3..24fcaf4 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -112,7 +112,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
   // Write rules for languages compiled in this target.
   std::set<std::string> languages;
   std::vector<cmSourceFile*> sourceFiles;
-  this->GetTarget()->GetSourceFiles(sourceFiles,
+  this->GetGeneratorTarget()->GetSourceFiles(sourceFiles,
     this->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::vector<cmSourceFile*>::const_iterator
         i = sourceFiles.begin(); i != sourceFiles.end(); ++i)
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 58b901a..df43c61 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -58,7 +58,7 @@ void cmNinjaUtilityTargetGenerator::Generate()
   std::vector<cmSourceFile*> sources;
   std::string config = this->GetMakefile()
                            ->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  this->GetTarget()->GetSourceFiles(sources, config);
+  this->GetGeneratorTarget()->GetSourceFiles(sources, config);
   for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
       source != sources.end(); ++source)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9008a9b2c302d9a0b7deecb35e8a3d6291f0830
commit a9008a9b2c302d9a0b7deecb35e8a3d6291f0830
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 22:35:28 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 22:35:28 2015 +0200

    GHS: Port API to cmGeneratorTarget.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index cae5c2f..46ea2f3 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -27,7 +27,7 @@ cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target)
   , LocalGenerator(static_cast<cmLocalGhsMultiGenerator *>(
                      target->GetLocalGenerator()))
   , Makefile(target->Target->GetMakefile())
-  , TargetGroup(DetermineIfTargetGroup(target->Target))
+  , TargetGroup(DetermineIfTargetGroup(target))
   , DynamicDownload(false)
 {
   this->RelBuildFilePath = this->GetRelBuildFilePath(target->Target);
@@ -178,10 +178,11 @@ std::vector<cmSourceFile *> cmGhsMultiTargetGenerator::GetSources() const
 
 GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag() const
 {
-  return cmGhsMultiTargetGenerator::GetGpjTag(this->Target);
+  return cmGhsMultiTargetGenerator::GetGpjTag(this->GeneratorTarget);
 }
 
-GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(const cmTarget *target)
+GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(
+    const cmGeneratorTarget *target)
 {
   GhsMultiGpj::Types output;
   if (cmGhsMultiTargetGenerator::DetermineIfTargetGroup(target))
@@ -566,13 +567,14 @@ bool cmGhsMultiTargetGenerator::IsNotKernel(std::string const &config,
   return output;
 }
 
-bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(const cmTarget *target)
+bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(
+    const cmGeneratorTarget *target)
 {
   bool output = false;
   std::vector<cmSourceFile *> sources;
   std::string config =
-      target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  target->GetSourceFiles(sources, config);
+      target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
+  target->Target->GetSourceFiles(sources, config);
   for (std::vector<cmSourceFile *>::const_iterator sources_i = sources.begin();
        sources.end() != sources_i; ++sources_i)
     {
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index c29a31e..d1c17f4 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -36,7 +36,7 @@ public:
   bool IncludeThisTarget();
   std::vector<cmSourceFile *> GetSources() const;
   GhsMultiGpj::Types GetGpjTag() const;
-  static GhsMultiGpj::Types GetGpjTag(const cmTarget *target);
+  static GhsMultiGpj::Types GetGpjTag(const cmGeneratorTarget* target);
   const char *GetAbsBuildFilePath() const
   {
     return this->AbsBuildFilePath.c_str();
@@ -95,7 +95,7 @@ private:
   std::string GetOutputFilename(const std::string &config) const;
 
   bool IsNotKernel(std::string const &config, const std::string &language);
-  static bool DetermineIfTargetGroup(const cmTarget *target);
+  static bool DetermineIfTargetGroup(const cmGeneratorTarget* target);
   bool DetermineIfDynamicDownload(std::string const &config,
                                   const std::string &language);
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct  6 17:32:37 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue,  6 Oct 2015 17:32:37 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-125-g3af63d1
Message-ID: <20151006213237.11A1FBFAAE@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3af63d13e8827bf86b53a85376c5f76a67604e4f (commit)
       via  461a70ec71dffdd5fa390ed8171b9cd2d14e0070 (commit)
       via  c6dc5dd0186349d32e756dc2e8f877567bdc0e3c (commit)
      from  449739634258340947548467f73cc8c3479c2e90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3af63d13e8827bf86b53a85376c5f76a67604e4f
commit 3af63d13e8827bf86b53a85376c5f76a67604e4f
Merge: 4497396 461a70e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 17:32:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 17:32:36 2015 -0400

    Merge topic 'cmGeneratorTarget-sources' into next
    
    461a70ec fixup! Access sources through cmGeneratorTarget.
    c6dc5dd0 fixup! GHS: Port API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=461a70ec71dffdd5fa390ed8171b9cd2d14e0070
commit 461a70ec71dffdd5fa390ed8171b9cd2d14e0070
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 23:32:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 23:32:14 2015 +0200

    fixup! Access sources through cmGeneratorTarget.

diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 8c874f5..87cf58f 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -521,8 +521,7 @@ bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt)
   const std::string config =
     tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   std::vector<cmSourceFile *> tgtSources;
-  cmGeneratorTarget* gt =
-      this->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
   gt->GetSourceFiles(tgtSources, config);
   bool tgtInBuild = true;
   char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6dc5dd0186349d32e756dc2e8f877567bdc0e3c
commit c6dc5dd0186349d32e756dc2e8f877567bdc0e3c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 23:30:39 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 6 23:30:55 2015 +0200

    fixup! GHS: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index e66bc2a..8c874f5 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -509,7 +509,8 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
                                                   << " ";
-      GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag(tgt),
+      GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag(
+                                 tgtsI->second),
                                this->TargetFolderBuildStreams[folderName]);
       }
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGhsMultiGenerator.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Oct  7 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed,  7 Oct 2015 00:01:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-39-g2c4f902
Message-ID: <20151007040110.22A3BBFC2E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  2c4f9023360103ca7489ef821038c3b64a5415fc (commit)
      from  256bf8876a2e460afc37dbe17eb34482944be20b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c4f9023360103ca7489ef821038c3b64a5415fc
commit 2c4f9023360103ca7489ef821038c3b64a5415fc
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Oct 7 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Oct 7 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index d36e648..a4b06d4 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151006)
+set(CMake_VERSION_PATCH 20151007)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 02:37:51 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 02:37:51 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-127-gd812f33
Message-ID: <20151007063751.6F05EBFC5D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d812f3379a2b00d374b8b95be3b8297a590417b5 (commit)
       via  84786ee484cce6ad54d15bcdd9d9a6ed64df7c22 (commit)
      from  3af63d13e8827bf86b53a85376c5f76a67604e4f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d812f3379a2b00d374b8b95be3b8297a590417b5
commit d812f3379a2b00d374b8b95be3b8297a590417b5
Merge: 3af63d1 84786ee
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 02:37:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 02:37:50 2015 -0400

    Merge topic 'cmGeneratorTarget-sources' into next
    
    84786ee4 fixup! cmGeneratorTarget: Move computed sources from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84786ee484cce6ad54d15bcdd9d9a6ed64df7c22
commit 84786ee484cce6ad54d15bcdd9d9a6ed64df7c22
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 08:36:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:36:59 2015 +0200

    fixup! cmGeneratorTarget: Move computed sources from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3d5e89d..3fb0dc7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -419,6 +419,8 @@ void cmGeneratorTarget::AddSource(const std::string& src)
   cge->SetEvaluateForBuildsystem(true);
   this->SourceEntries.push_back(
                         new TargetPropertyEntry(cge));
+  this->SourceFilesMap.clear();
+  this->LinkImplementationLanguageIsContextDependent = true;
 }
 
 void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorTarget.cxx |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 02:38:30 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 02:38:30 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-139-g16df189
Message-ID: <20151007063830.4D5B2BFC2E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  16df189e1b4393bea525629cc7cca7da183fc5d7 (commit)
       via  4121d6722a0f268c2bd3be5faee83c766180ad0d (commit)
       via  dce6581b7b58c346796c8d3045f4ce70d9672755 (commit)
       via  7b6dc0fe45c7064ad741461bfaf19028e8539c78 (commit)
       via  33f87bb1f503c09a6b8018edf97b615f0e7f713d (commit)
       via  da1b0449d96d4044bc4633a40ac87b6d4a19912d (commit)
       via  fe113f0fd40696e50ac9aac48297466e3b649ad5 (commit)
       via  776ff8eb0b8d790c63f8ad6bb6689620e6e04cb4 (commit)
       via  64f73150b8e5e5cad216444c0468e8e59434d973 (commit)
       via  c38e30f68c7beffdc65af0f3799ae82ce60aaf67 (commit)
       via  5d3776a7ebb718ae6ed4724e0a8961cda68b6316 (commit)
       via  7ce0991a7a29e244aee3f61e9e8b1879e59d156c (commit)
      from  d812f3379a2b00d374b8b95be3b8297a590417b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16df189e1b4393bea525629cc7cca7da183fc5d7
commit 16df189e1b4393bea525629cc7cca7da183fc5d7
Merge: d812f33 4121d67
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 02:38:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 02:38:27 2015 -0400

    Merge topic 'cmGeneratorTarget-sources' into next
    
    4121d672 cmTarget: Remove Compute method.
    dce6581b cmGeneratorTarget: Move computed sources from cmTarget.
    7b6dc0fe cmGeneratorTarget: Inline GetSourceFiles from cmTarget.
    33f87bb1 cmGeneratorTarget: Move AddInterfaceEntries method.
    da1b0449 cmTarget: Remove a conditional for generate-time source addition.
    fe113f0f cmTarget: Split storage of sources from genexes.
    776ff8eb cmTarget: Add Compute API for sources.
    64f73150 cmTarget: Add API for generate-time source addition.
    c38e30f6 cmGeneratorTarget: Add methods for generate-time source addition.
    5d3776a7 Access sources through cmGeneratorTarget.
    7ce0991a GHS: Port API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4121d6722a0f268c2bd3be5faee83c766180ad0d
commit 4121d6722a0f268c2bd3be5faee83c766180ad0d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:54:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:58 2015 +0200

    cmTarget: Remove Compute method.
    
    The following tests FAILED:
            146 - Qt5Autogen (Failed)
            148 - Qt4Autogen (Failed)
            298 - RunCMake.set_property (Failed)
            314 - RunCMake.File_Generate (Failed)

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a62d534..db842b0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1538,7 +1538,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
         ti != targets.end(); ++ti)
       {
       cmTarget* t = &ti->second;
-      t->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
       generatorTargets[t] = gt;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 5bace47..ab9d7e7 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -254,7 +254,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
     mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false,
                           no_working_directory, no_depends,
                           noCommandLines);
-  tgt->Compute();
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   mf->AddGeneratorTarget(tgt, gt);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index fd2d33a..d45aa27 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -86,7 +86,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           no_depends, no_commands, false,
                           "Build all projects");
 
-      allBuild->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 14bc340..3d52e3a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -456,7 +456,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         no_working_directory,
                         "echo", "Build all projects");
 
-  allbuild->Compute();
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
@@ -492,7 +491,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           no_working_directory,
                           "make", "-f", file.c_str());
 
-    check->Compute();
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     mf->AddGeneratorTarget(check, checkGt);
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 1b1b98e..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -885,8 +885,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 /*byproducts=*/rcc_output, depends,
                                 commandLines, false, autogenComment.c_str());
 
-    autogenTarget->Compute();
-
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     makefile->AddGeneratorTarget(autogenTarget, gt);
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e87aa16..abfc40b 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -361,10 +361,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 }
 
-void cmTarget::Compute()
-{
-}
-
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 71f0d1f..354eda2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -133,8 +133,6 @@ public:
   void AddPostBuildCommand(cmCustomCommand const &cmd)
     {this->PostBuildCommands.push_back(cmd);}
 
-  void Compute();
-
   /**
    * Add sources to the target.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dce6581b7b58c346796c8d3045f4ce70d9672755
commit dce6581b7b58c346796c8d3045f4ce70d9672755
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 10:18:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:58 2015 +0200

    cmGeneratorTarget: Move computed sources from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 43ce882..3fb0dc7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -269,7 +269,9 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
   DebugIncludesDone(false),
   DebugCompileOptionsDone(false),
   DebugCompileFeaturesDone(false),
-  DebugCompileDefinitionsDone(false)
+  DebugCompileDefinitionsDone(false),
+  DebugSourcesDone(false),
+  LinkImplementationLanguageIsContextDependent(true)
 {
   this->Makefile = this->Target->GetMakefile();
   this->LocalGenerator = lg;
@@ -296,6 +298,11 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
         t->GetCompileDefinitionsEntries(),
         t->GetCompileDefinitionsBacktraces(),
         this->CompileDefinitionsEntries);
+
+  CreatePropertyGeneratorExpressions(
+        t->GetSourceEntries(),
+        t->GetSourceBacktraces(),
+        this->SourceEntries, true);
 }
 
 cmGeneratorTarget::~cmGeneratorTarget()
@@ -304,6 +311,7 @@ cmGeneratorTarget::~cmGeneratorTarget()
   cmDeleteAll(this->CompileOptionsEntries);
   cmDeleteAll(this->CompileFeaturesEntries);
   cmDeleteAll(this->CompileDefinitionsEntries);
+  cmDeleteAll(this->SourceEntries);
   cmDeleteAll(this->LinkInformation);
   this->LinkInformation.clear();
 }
@@ -404,12 +412,32 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 
 void cmGeneratorTarget::AddSource(const std::string& src)
 {
-  this->Target->AddGenerateTimeSource(src);
+  this->Target->AddSource(src);
+  cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+  cmGeneratorExpression ge(lfbt);
+  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
+  cge->SetEvaluateForBuildsystem(true);
+  this->SourceEntries.push_back(
+                        new TargetPropertyEntry(cge));
+  this->SourceFilesMap.clear();
+  this->LinkImplementationLanguageIsContextDependent = true;
 }
 
 void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   this->Target->AddTracedSources(srcs);
+  if (!srcs.empty())
+    {
+    std::string srcFiles = cmJoin(srcs, ";");
+    this->SourceFilesMap.clear();
+    this->LinkImplementationLanguageIsContextDependent = true;
+    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    cmGeneratorExpression ge(lfbt);
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
+    cge->SetEvaluateForBuildsystem(true);
+    this->SourceEntries.push_back(
+          new cmGeneratorTarget::TargetPropertyEntry(cge));
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -839,29 +867,216 @@ static void AddInterfaceEntries(
 }
 
 //----------------------------------------------------------------------------
+static bool processSources(cmGeneratorTarget const* tgt,
+      const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries,
+      std::vector<std::string> &srcs,
+      UNORDERED_SET<std::string> &uniqueSrcs,
+      cmGeneratorExpressionDAGChecker *dagChecker,
+      std::string const& config, bool debugSources)
+{
+  cmMakefile *mf = tgt->Target->GetMakefile();
+
+  bool contextDependent = false;
+
+  for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator
+      it = entries.begin(), end = entries.end(); it != end; ++it)
+    {
+    cmLinkImplItem const& item = (*it)->LinkImplItem;
+    std::string const& targetName = item;
+    std::vector<std::string> entrySources;
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+                                              config,
+                                              false,
+                                              tgt->Target,
+                                              tgt->Target,
+                                              dagChecker),
+                                    entrySources);
+
+    if ((*it)->ge->GetHadContextSensitiveCondition())
+      {
+      contextDependent = true;
+      }
+
+    for(std::vector<std::string>::iterator i = entrySources.begin();
+        i != entrySources.end(); ++i)
+      {
+      std::string& src = *i;
+      cmSourceFile* sf = mf->GetOrCreateSource(src);
+      std::string e;
+      std::string fullPath = sf->GetFullPath(&e);
+      if(fullPath.empty())
+        {
+        if(!e.empty())
+          {
+          cmake* cm = mf->GetCMakeInstance();
+          cm->IssueMessage(cmake::FATAL_ERROR, e,
+                          tgt->Target->GetBacktrace());
+          }
+        return contextDependent;
+        }
+
+      if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str()))
+        {
+        std::ostringstream err;
+        if (!targetName.empty())
+          {
+          err << "Target \"" << targetName << "\" contains relative "
+            "path in its INTERFACE_SOURCES:\n"
+            "  \"" << src << "\"";
+          }
+        else
+          {
+          err << "Found relative path while evaluating sources of "
+          "\"" << tgt->GetName() << "\":\n  \"" << src << "\"\n";
+          }
+        tgt->GetLocalGenerator()->IssueMessage(cmake::FATAL_ERROR, err.str());
+        return contextDependent;
+        }
+      src = fullPath;
+      }
+    std::string usedSources;
+    for(std::vector<std::string>::iterator
+          li = entrySources.begin(); li != entrySources.end(); ++li)
+      {
+      std::string src = *li;
+
+      if(uniqueSrcs.insert(src).second)
+        {
+        srcs.push_back(src);
+        if (debugSources)
+          {
+          usedSources += " * " + src + "\n";
+          }
+        }
+      }
+    if (!usedSources.empty())
+      {
+      mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
+                            std::string("Used sources for target ")
+                            + tgt->GetName() + ":\n"
+                            + usedSources, (*it)->ge->GetBacktrace());
+      }
+    }
+  return contextDependent;
+}
+
+//----------------------------------------------------------------------------
+void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files,
+                              const std::string& config) const
+{
+  assert(this->GetType() != cmTarget::INTERFACE_LIBRARY);
+
+  if (!this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+    {
+    // At configure-time, this method can be called as part of getting the
+    // LOCATION property or to export() a file to be include()d.  However
+    // there is no cmGeneratorTarget at configure-time, so search the SOURCES
+    // for TARGET_OBJECTS instead for backwards compatibility with OLD
+    // behavior of CMP0024 and CMP0026 only.
+
+    cmStringRange sourceEntries = this->Target->GetSourceEntries();
+    for(cmStringRange::const_iterator
+          i = sourceEntries.begin();
+        i != sourceEntries.end(); ++i)
+      {
+      std::string const& entry = *i;
+
+      std::vector<std::string> items;
+      cmSystemTools::ExpandListArgument(entry, items);
+      for (std::vector<std::string>::const_iterator
+          li = items.begin(); li != items.end(); ++li)
+        {
+        if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
+            (*li)[li->size() - 1] == '>')
+          {
+          continue;
+          }
+        files.push_back(*li);
+        }
+      }
+    return;
+    }
+
+  std::vector<std::string> debugProperties;
+  const char *debugProp =
+              this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES");
+  if (debugProp)
+    {
+    cmSystemTools::ExpandListArgument(debugProp, debugProperties);
+    }
+
+  bool debugSources = !this->DebugSourcesDone
+                    && std::find(debugProperties.begin(),
+                                 debugProperties.end(),
+                                 "SOURCES")
+                        != debugProperties.end();
+
+  if (this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+    {
+    this->DebugSourcesDone = true;
+    }
+
+  cmGeneratorExpressionDAGChecker dagChecker(this->GetName(),
+                                             "SOURCES", 0, 0);
+
+  UNORDERED_SET<std::string> uniqueSrcs;
+  bool contextDependentDirectSources = processSources(this,
+                 this->SourceEntries,
+                 files,
+                 uniqueSrcs,
+                 &dagChecker,
+                 config,
+                 debugSources);
+
+  std::vector<cmGeneratorTarget::TargetPropertyEntry*>
+    linkInterfaceSourcesEntries;
+
+  AddInterfaceEntries(
+    this, config, "INTERFACE_SOURCES",
+    linkInterfaceSourcesEntries);
+
+  std::vector<std::string>::size_type numFilesBefore = files.size();
+  bool contextDependentInterfaceSources = processSources(this,
+    linkInterfaceSourcesEntries,
+                            files,
+                            uniqueSrcs,
+                            &dagChecker,
+                            config,
+                            debugSources);
+
+  if (!contextDependentDirectSources
+      && !(contextDependentInterfaceSources && numFilesBefore < files.size()))
+    {
+    this->LinkImplementationLanguageIsContextDependent = false;
+    }
+
+  cmDeleteAll(linkInterfaceSourcesEntries);
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
                                        const std::string& config) const
 {
+
   // Lookup any existing link implementation for this configuration.
   std::string key = cmSystemTools::UpperCase(config);
 
-  cmTarget::SourceFilesMapType& sfm = this->Target->GetSourceFilesMap();
-  if(!this->Target->GetLinkImplementationLanguageIsContextDependent())
+  if(!this->LinkImplementationLanguageIsContextDependent)
     {
-    files = sfm.begin()->second;
+    files = this->SourceFilesMap.begin()->second;
     return;
     }
 
-  cmTarget::SourceFilesMapType::iterator
-    it = sfm.find(key);
-  if(it != sfm.end())
+  SourceFilesMapType::iterator
+    it = this->SourceFilesMap.find(key);
+  if(it != this->SourceFilesMap.end())
     {
     files = it->second;
     }
   else
     {
     std::vector<std::string> srcs;
-    this->Target->GetSourceFiles(srcs, config);
+    this->GetSourceFiles(srcs, config);
 
     std::set<cmSourceFile*> emitted;
 
@@ -874,7 +1089,7 @@ void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
         files.push_back(sf);
         }
       }
-    sfm[key] = files;
+    this->SourceFilesMap[key] = files;
     }
 }
 
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 0c6ad82..e8c5e04 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -441,10 +441,15 @@ private:
     GetImportLinkInterface(const std::string& config, cmTarget const* head,
                            bool usage_requirements_only) const;
 
+  typedef std::map<std::string, std::vector<cmSourceFile*> >
+                                                       SourceFilesMapType;
+  mutable SourceFilesMapType SourceFilesMap;
+
   std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries;
   std::vector<TargetPropertyEntry*> CompileOptionsEntries;
   std::vector<TargetPropertyEntry*> CompileFeaturesEntries;
   std::vector<TargetPropertyEntry*> CompileDefinitionsEntries;
+  std::vector<TargetPropertyEntry*> SourceEntries;
 
   void ExpandLinkItems(std::string const& prop, std::string const& value,
                        std::string const& config, cmTarget const* headTarget,
@@ -454,6 +459,9 @@ private:
   void LookupLinkItems(std::vector<std::string> const& names,
                        std::vector<cmLinkItem>& items) const;
 
+  void GetSourceFiles(std::vector<std::string>& files,
+                      const std::string& config) const;
+
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
@@ -462,6 +470,8 @@ private:
   mutable bool DebugCompileOptionsDone;
   mutable bool DebugCompileFeaturesDone;
   mutable bool DebugCompileDefinitionsDone;
+  mutable bool DebugSourcesDone;
+  mutable bool LinkImplementationLanguageIsContextDependent;
 
 public:
   std::vector<cmTarget const*> const&
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 8ff729f..e87aa16 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -101,21 +101,9 @@ public:
                    HeadToLinkImplementationMap> LinkImplMapType;
   LinkImplMapType LinkImplMap;
 
-  cmTarget::SourceFilesMapType SourceFilesMap;
-
   std::set<cmLinkItem> UtilityItems;
   bool UtilityItemsDone;
 
-  class TargetPropertyEntry {
-    static cmLinkImplItem NoLinkImplItem;
-  public:
-    TargetPropertyEntry(cmsys::auto_ptr<cmCompiledGeneratorExpression> cge,
-                        cmLinkImplItem const& item = NoLinkImplItem)
-      : ge(cge), LinkImplItem(item)
-    {}
-    const cmsys::auto_ptr<cmCompiledGeneratorExpression> ge;
-    cmLinkImplItem const& LinkImplItem;
-  };
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -126,16 +114,9 @@ public:
   std::vector<cmListFileBacktrace> CompileDefinitionsBacktraces;
   std::vector<std::string> SourceEntries;
   std::vector<cmListFileBacktrace> SourceBacktraces;
-  std::vector<TargetPropertyEntry*> SourceItems;
   std::vector<cmValueWithOrigin> LinkImplementationPropertyEntries;
-
-  void AddInterfaceEntries(
-    cmTarget const* thisTarget, std::string const& config,
-    std::string const& prop, std::vector<TargetPropertyEntry*>& entries);
 };
 
-cmLinkImplItem cmTargetInternals::TargetPropertyEntry::NoLinkImplItem;
-
 //----------------------------------------------------------------------------
 cmTargetInternals::~cmTargetInternals()
 {
@@ -154,8 +135,6 @@ cmTarget::cmTarget()
   this->IsApple = false;
   this->IsImportedTarget = false;
   this->BuildInterfaceIncludesAppended = false;
-  this->DebugSourcesDone = false;
-  this->LinkImplementationLanguageIsContextDependent = true;
 }
 
 void cmTarget::SetType(TargetType type, const std::string& name)
@@ -382,34 +361,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 }
 
-void CreatePropertyGeneratorExpressions(
-    std::vector<std::string> const& entries,
-    std::vector<cmListFileBacktrace> const& backtraces,
-    std::vector<cmTargetInternals::TargetPropertyEntry*>& items,
-    bool evaluateForBuildsystem = false)
-{
-  std::vector<cmListFileBacktrace>::const_iterator btIt = backtraces.begin();
-  for (std::vector<std::string>::const_iterator it = entries.begin();
-       it != entries.end(); ++it, ++btIt)
-    {
-    cmGeneratorExpression ge(*btIt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*it);
-    cge->SetEvaluateForBuildsystem(evaluateForBuildsystem);
-    items.push_back(new cmTargetInternals::TargetPropertyEntry(cge));
-    }
-}
-
 void cmTarget::Compute()
 {
-  CreatePropertyGeneratorExpressions(
-        this->Internal->SourceEntries,
-        this->Internal->SourceBacktraces,
-        this->Internal->SourceItems, true);
-}
-
-cmTarget::SourceFilesMapType& cmTarget::GetSourceFilesMap() const
-{
-  return this->Internal->SourceFilesMap;
 }
 
 //----------------------------------------------------------------------------
@@ -469,9 +422,7 @@ void cmTarget::FinishConfigure()
 //----------------------------------------------------------------------------
 void cmTarget::ClearLinkMaps()
 {
-  this->LinkImplementationLanguageIsContextDependent = true;
   this->Internal->LinkImplMap.clear();
-  this->Internal->SourceFilesMap.clear();
 }
 
 //----------------------------------------------------------------------------
@@ -553,207 +504,13 @@ bool cmTarget::IsXCTestOnApple() const
 }
 
 //----------------------------------------------------------------------------
-static bool processSources(cmTarget const* tgt,
-      const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries,
-      std::vector<std::string> &srcs,
-      UNORDERED_SET<std::string> &uniqueSrcs,
-      cmGeneratorExpressionDAGChecker *dagChecker,
-      std::string const& config, bool debugSources)
-{
-  cmMakefile *mf = tgt->GetMakefile();
-
-  bool contextDependent = false;
-
-  for (std::vector<cmTargetInternals::TargetPropertyEntry*>::const_iterator
-      it = entries.begin(), end = entries.end(); it != end; ++it)
-    {
-    cmLinkImplItem const& item = (*it)->LinkImplItem;
-    std::string const& targetName = item;
-    std::vector<std::string> entrySources;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
-                                              config,
-                                              false,
-                                              tgt,
-                                              tgt,
-                                              dagChecker),
-                                    entrySources);
-
-    if ((*it)->ge->GetHadContextSensitiveCondition())
-      {
-      contextDependent = true;
-      }
-
-    for(std::vector<std::string>::iterator i = entrySources.begin();
-        i != entrySources.end(); ++i)
-      {
-      std::string& src = *i;
-      cmSourceFile* sf = mf->GetOrCreateSource(src);
-      std::string e;
-      std::string fullPath = sf->GetFullPath(&e);
-      if(fullPath.empty())
-        {
-        if(!e.empty())
-          {
-          cmake* cm = mf->GetCMakeInstance();
-          cm->IssueMessage(cmake::FATAL_ERROR, e,
-                          tgt->GetBacktrace());
-          }
-        return contextDependent;
-        }
-
-      if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str()))
-        {
-        std::ostringstream err;
-        if (!targetName.empty())
-          {
-          err << "Target \"" << targetName << "\" contains relative "
-            "path in its INTERFACE_SOURCES:\n"
-            "  \"" << src << "\"";
-          }
-        else
-          {
-          err << "Found relative path while evaluating sources of "
-          "\"" << tgt->GetName() << "\":\n  \"" << src << "\"\n";
-          }
-        tgt->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, err.str());
-        return contextDependent;
-        }
-      src = fullPath;
-      }
-    std::string usedSources;
-    for(std::vector<std::string>::iterator
-          li = entrySources.begin(); li != entrySources.end(); ++li)
-      {
-      std::string src = *li;
-
-      if(uniqueSrcs.insert(src).second)
-        {
-        srcs.push_back(src);
-        if (debugSources)
-          {
-          usedSources += " * " + src + "\n";
-          }
-        }
-      }
-    if (!usedSources.empty())
-      {
-      mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
-                            std::string("Used sources for target ")
-                            + tgt->GetName() + ":\n"
-                            + usedSources, (*it)->ge->GetBacktrace());
-      }
-    }
-  return contextDependent;
-}
-
-//----------------------------------------------------------------------------
-void cmTarget::GetSourceFiles(std::vector<std::string> &files,
-                              const std::string& config) const
-{
-  assert(this->GetType() != INTERFACE_LIBRARY);
-
-  if (!this->GetMakefile()->GetGlobalGenerator()->GetConfigureDoneCMP0026())
-    {
-    // At configure-time, this method can be called as part of getting the
-    // LOCATION property or to export() a file to be include()d.  However
-    // there is no cmGeneratorTarget at configure-time, so search the SOURCES
-    // for TARGET_OBJECTS instead for backwards compatibility with OLD
-    // behavior of CMP0024 and CMP0026 only.
-
-    for(std::vector<std::string>::const_iterator
-          i = this->Internal->SourceEntries.begin();
-        i != this->Internal->SourceEntries.end(); ++i)
-      {
-      std::string const& entry = *i;
-
-      std::vector<std::string> items;
-      cmSystemTools::ExpandListArgument(entry, items);
-      for (std::vector<std::string>::const_iterator
-          li = items.begin(); li != items.end(); ++li)
-        {
-        if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
-            (*li)[li->size() - 1] == '>')
-          {
-          continue;
-          }
-        files.push_back(*li);
-        }
-      }
-    return;
-    }
-
-  std::vector<std::string> debugProperties;
-  const char *debugProp =
-              this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES");
-  if (debugProp)
-    {
-    cmSystemTools::ExpandListArgument(debugProp, debugProperties);
-    }
-
-  bool debugSources = !this->DebugSourcesDone
-                    && std::find(debugProperties.begin(),
-                                 debugProperties.end(),
-                                 "SOURCES")
-                        != debugProperties.end();
-
-  if (this->GetMakefile()->GetGlobalGenerator()->GetConfigureDoneCMP0026())
-    {
-    this->DebugSourcesDone = true;
-    }
-
-  cmGeneratorExpressionDAGChecker dagChecker(this->GetName(),
-                                             "SOURCES", 0, 0);
-
-  UNORDERED_SET<std::string> uniqueSrcs;
-  bool contextDependentDirectSources = processSources(this,
-                 this->Internal->SourceItems,
-                 files,
-                 uniqueSrcs,
-                 &dagChecker,
-                 config,
-                 debugSources);
-
-  std::vector<cmTargetInternals::TargetPropertyEntry*>
-    linkInterfaceSourcesEntries;
-
-  this->Internal->AddInterfaceEntries(
-    this, config, "INTERFACE_SOURCES",
-    linkInterfaceSourcesEntries);
-
-  std::vector<std::string>::size_type numFilesBefore = files.size();
-  bool contextDependentInterfaceSources = processSources(this,
-    linkInterfaceSourcesEntries,
-                            files,
-                            uniqueSrcs,
-                            &dagChecker,
-                            config,
-                            debugSources);
-
-  if (!contextDependentDirectSources
-      && !(contextDependentInterfaceSources && numFilesBefore < files.size()))
-    {
-    this->LinkImplementationLanguageIsContextDependent = false;
-    }
-
-  cmDeleteAll(linkInterfaceSourcesEntries);
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
     {
-    std::string srcFiles = cmJoin(srcs, ";");
-    this->Internal->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    this->Internal->SourceEntries.push_back(srcFiles);
+    this->Internal->SourceEntries.push_back(cmJoin(srcs, ";"));
     this->Internal->SourceBacktraces.push_back(lfbt);
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceItems.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
     }
 }
 
@@ -786,8 +543,6 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs)
     }
   if (!srcFiles.empty())
     {
-    this->Internal->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     this->Internal->SourceEntries.push_back(srcFiles);
     this->Internal->SourceBacktraces.push_back(lfbt);
@@ -916,8 +671,6 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
                    TargetPropertyEntryFinder(sfl))
                                       == this->Internal->SourceEntries.end())
     {
-    this->Internal->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     this->Internal->SourceEntries.push_back(src);
     this->Internal->SourceBacktraces.push_back(lfbt);
@@ -929,17 +682,6 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
   return this->Makefile->GetOrCreateSource(src);
 }
 
-void cmTarget::AddGenerateTimeSource(const std::string& src)
-{
-  cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-  cmGeneratorExpression ge(lfbt);
-  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
-  cge->SetEvaluateForBuildsystem(true);
-  this->Internal->SourceItems.push_back(
-                        new cmTargetInternals::TargetPropertyEntry(cge));
-  this->AddSource(src);
-}
-
 //----------------------------------------------------------------------------
 void cmTarget::MergeLinkLibraries( cmMakefile& mf,
                                    const std::string& selfname,
@@ -1234,6 +976,16 @@ cmBacktraceRange cmTarget::GetCompileDefinitionsBacktraces() const
   return cmMakeRange(this->Internal->CompileDefinitionsBacktraces);
 }
 
+cmStringRange cmTarget::GetSourceEntries() const
+{
+  return cmMakeRange(this->Internal->SourceEntries);
+}
+
+cmBacktraceRange cmTarget::GetSourceBacktraces() const
+{
+  return cmMakeRange(this->Internal->SourceBacktraces);
+}
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
 //----------------------------------------------------------------------------
 void
@@ -1649,7 +1401,6 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
-    this->Internal->SourceFilesMap.clear();
 
     this->Internal->SourceEntries.clear();
     this->Internal->SourceBacktraces.clear();
@@ -1749,7 +1500,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
-    this->Internal->SourceFilesMap.clear();
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
     this->Internal->SourceEntries.push_back(value);
     this->Internal->SourceBacktraces.push_back(lfbt);
@@ -3424,32 +3174,6 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 }
 
-//----------------------------------------------------------------------------
-void cmTargetInternals::AddInterfaceEntries(
-  cmTarget const* thisTarget, std::string const& config,
-  std::string const& prop, std::vector<TargetPropertyEntry*>& entries)
-{
-  if(cmLinkImplementationLibraries const* impl =
-     thisTarget->GetLinkImplementationLibraries(config))
-    {
-    for (std::vector<cmLinkImplItem>::const_iterator
-           it = impl->Libraries.begin(), end = impl->Libraries.end();
-         it != end; ++it)
-      {
-      if(it->Target)
-        {
-        std::string genex =
-          "$<TARGET_PROPERTY:" + *it + "," + prop + ">";
-        cmGeneratorExpression ge(it->Backtrace);
-        cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex);
-        cge->SetEvaluateForBuildsystem(true);
-        entries.push_back(
-          new cmTargetInternals::TargetPropertyEntry(cge, *it));
-        }
-      }
-    }
-}
-
 cmOptionalLinkImplementation&
 cmTarget::GetLinkImplMap(std::string const& config) const
 {
@@ -3712,7 +3436,6 @@ cmTargetInternalPointer
 //----------------------------------------------------------------------------
 cmTargetInternalPointer::~cmTargetInternalPointer()
 {
-  cmDeleteAll(this->Pointer->SourceItems);
   delete this->Pointer;
 }
 
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 6024c38..71f0d1f 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -135,15 +135,6 @@ public:
 
   void Compute();
 
-  typedef std::map<std::string, std::vector<cmSourceFile*> >
-                                                       SourceFilesMapType;
-
-  SourceFilesMapType& GetSourceFilesMap() const;
-
-  bool GetLinkImplementationLanguageIsContextDependent() const {
-    return this->LinkImplementationLanguageIsContextDependent;
-  }
-
   /**
    * Add sources to the target.
    */
@@ -151,7 +142,6 @@ public:
   void AddTracedSources(std::vector<std::string> const& srcs);
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
-  void AddGenerateTimeSource(const std::string& src);
 
   enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
 
@@ -395,6 +385,9 @@ public:
   cmStringRange GetCompileDefinitionsEntries() const;
   cmBacktraceRange GetCompileDefinitionsBacktraces() const;
 
+  cmStringRange GetSourceEntries() const;
+  cmBacktraceRange GetSourceBacktraces() const;
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
   const LinkLibraryVectorType &GetLinkLibrariesForVS6() const {
   return this->LinkLibrariesForVS6;}
@@ -473,9 +466,6 @@ private:
   std::string ImportedGetFullPath(const std::string& config,
                                   bool implib) const;
 
-
-  void GetSourceFiles(std::vector<std::string> &files,
-                      const std::string& config) const;
 private:
   mutable cmPropertyMap Properties;
   std::set<std::string> SystemIncludeDirectories;
@@ -509,8 +499,6 @@ private:
   bool IsApple;
   bool IsImportedTarget;
   bool BuildInterfaceIncludesAppended;
-  mutable bool DebugSourcesDone;
-  mutable bool LinkImplementationLanguageIsContextDependent;
 #if defined(_WIN32) && !defined(__CYGWIN__)
   bool LinkLibrariesForVS6Analyzed;
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b6dc0fe45c7064ad741461bfaf19028e8539c78
commit 7b6dc0fe45c7064ad741461bfaf19028e8539c78
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 09:57:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:58 2015 +0200

    cmGeneratorTarget: Inline GetSourceFiles from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 357b972..43ce882 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -842,7 +842,40 @@ static void AddInterfaceEntries(
 void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
                                        const std::string& config) const
 {
-  this->Target->GetSourceFiles(files, config);
+  // Lookup any existing link implementation for this configuration.
+  std::string key = cmSystemTools::UpperCase(config);
+
+  cmTarget::SourceFilesMapType& sfm = this->Target->GetSourceFilesMap();
+  if(!this->Target->GetLinkImplementationLanguageIsContextDependent())
+    {
+    files = sfm.begin()->second;
+    return;
+    }
+
+  cmTarget::SourceFilesMapType::iterator
+    it = sfm.find(key);
+  if(it != sfm.end())
+    {
+    files = it->second;
+    }
+  else
+    {
+    std::vector<std::string> srcs;
+    this->Target->GetSourceFiles(srcs, config);
+
+    std::set<cmSourceFile*> emitted;
+
+    for(std::vector<std::string>::const_iterator i = srcs.begin();
+        i != srcs.end(); ++i)
+      {
+      cmSourceFile* sf = this->Makefile->GetOrCreateSource(*i);
+      if (emitted.insert(sf).second)
+        {
+        files.push_back(sf);
+        }
+      }
+    sfm[key] = files;
+    }
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fc9e963..8ff729f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -101,9 +101,7 @@ public:
                    HeadToLinkImplementationMap> LinkImplMapType;
   LinkImplMapType LinkImplMap;
 
-  typedef std::map<std::string, std::vector<cmSourceFile*> >
-                                                       SourceFilesMapType;
-  SourceFilesMapType SourceFilesMap;
+  cmTarget::SourceFilesMapType SourceFilesMap;
 
   std::set<cmLinkItem> UtilityItems;
   bool UtilityItemsDone;
@@ -409,6 +407,11 @@ void cmTarget::Compute()
         this->Internal->SourceItems, true);
 }
 
+cmTarget::SourceFilesMapType& cmTarget::GetSourceFilesMap() const
+{
+  return this->Internal->SourceFilesMap;
+}
+
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
@@ -736,46 +739,6 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
-                              const std::string& config) const
-{
-
-  // Lookup any existing link implementation for this configuration.
-  std::string key = cmSystemTools::UpperCase(config);
-
-  if(!this->LinkImplementationLanguageIsContextDependent)
-    {
-    files = this->Internal->SourceFilesMap.begin()->second;
-    return;
-    }
-
-  cmTargetInternals::SourceFilesMapType::iterator
-    it = this->Internal->SourceFilesMap.find(key);
-  if(it != this->Internal->SourceFilesMap.end())
-    {
-    files = it->second;
-    }
-  else
-    {
-    std::vector<std::string> srcs;
-    this->GetSourceFiles(srcs, config);
-
-    std::set<cmSourceFile*> emitted;
-
-    for(std::vector<std::string>::const_iterator i = srcs.begin();
-        i != srcs.end(); ++i)
-      {
-      cmSourceFile* sf = this->Makefile->GetOrCreateSource(*i);
-      if (emitted.insert(sf).second)
-        {
-        files.push_back(sf);
-        }
-      }
-    this->Internal->SourceFilesMap[key] = files;
-    }
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2f1671d..6024c38 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -135,11 +135,15 @@ public:
 
   void Compute();
 
-  /**
-   * Get the list of the source files used by this target
-   */
-  void GetSourceFiles(std::vector<cmSourceFile*> &files,
-                      const std::string& config) const;
+  typedef std::map<std::string, std::vector<cmSourceFile*> >
+                                                       SourceFilesMapType;
+
+  SourceFilesMapType& GetSourceFilesMap() const;
+
+  bool GetLinkImplementationLanguageIsContextDependent() const {
+    return this->LinkImplementationLanguageIsContextDependent;
+  }
+
   /**
    * Add sources to the target.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33f87bb1f503c09a6b8018edf97b615f0e7f713d
commit 33f87bb1f503c09a6b8018edf97b615f0e7f713d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 13 09:45:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:57 2015 +0200

    cmGeneratorTarget: Move AddInterfaceEntries method.
    
    It will be needed here in a follow-up commit.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 83f9cd2..357b972 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -812,6 +812,33 @@ bool cmGeneratorTarget::GetPropertyAsBool(const std::string& prop) const
 }
 
 //----------------------------------------------------------------------------
+static void AddInterfaceEntries(
+  cmGeneratorTarget const* thisTarget, std::string const& config,
+  std::string const& prop,
+  std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries)
+{
+  if(cmLinkImplementationLibraries const* impl =
+     thisTarget->Target->GetLinkImplementationLibraries(config))
+    {
+    for (std::vector<cmLinkImplItem>::const_iterator
+           it = impl->Libraries.begin(), end = impl->Libraries.end();
+         it != end; ++it)
+      {
+      if(it->Target)
+        {
+        std::string genex =
+          "$<TARGET_PROPERTY:" + *it + "," + prop + ">";
+        cmGeneratorExpression ge(it->Backtrace);
+        cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex);
+        cge->SetEvaluateForBuildsystem(true);
+        entries.push_back(
+          new cmGeneratorTarget::TargetPropertyEntry(cge, *it));
+        }
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
                                        const std::string& config) const
 {
@@ -2177,34 +2204,6 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
     }
 }
 
-
-//----------------------------------------------------------------------------
-static void AddInterfaceEntries(
-  cmGeneratorTarget const* thisTarget, std::string const& config,
-  std::string const& prop,
-  std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries)
-{
-  if(cmLinkImplementationLibraries const* impl =
-     thisTarget->Target->GetLinkImplementationLibraries(config))
-    {
-    for (std::vector<cmLinkImplItem>::const_iterator
-           it = impl->Libraries.begin(), end = impl->Libraries.end();
-         it != end; ++it)
-      {
-      if(it->Target)
-        {
-        std::string genex =
-          "$<TARGET_PROPERTY:" + *it + "," + prop + ">";
-        cmGeneratorExpression ge(it->Backtrace);
-        cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex);
-        cge->SetEvaluateForBuildsystem(true);
-        entries.push_back(
-          new cmGeneratorTarget::TargetPropertyEntry(cge, *it));
-        }
-      }
-    }
-}
-
 //----------------------------------------------------------------------------
 std::vector<std::string>
 cmGeneratorTarget::GetIncludeDirectories(const std::string& config,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da1b0449d96d4044bc4633a40ac87b6d4a19912d
commit da1b0449d96d4044bc4633a40ac87b6d4a19912d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:51:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:57 2015 +0200

    cmTarget: Remove a conditional for generate-time source addition.
    
    It is not really necessary.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6e1c488..fc9e963 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -968,19 +968,12 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
 
 void cmTarget::AddGenerateTimeSource(const std::string& src)
 {
-  cmSourceFileLocation sfl(this->Makefile, src);
-  if (std::find_if(this->Internal->SourceEntries.begin(),
-                   this->Internal->SourceEntries.end(),
-                   TargetPropertyEntryFinder(sfl))
-                                      == this->Internal->SourceEntries.end())
-    {
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceItems.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
-    }
+  cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+  cmGeneratorExpression ge(lfbt);
+  cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
+  cge->SetEvaluateForBuildsystem(true);
+  this->Internal->SourceItems.push_back(
+                        new cmTargetInternals::TargetPropertyEntry(cge));
   this->AddSource(src);
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe113f0fd40696e50ac9aac48297466e3b649ad5
commit fe113f0fd40696e50ac9aac48297466e3b649ad5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 4 21:46:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:57 2015 +0200

    cmTarget: Split storage of sources from genexes.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 515b261..6e1c488 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -126,7 +126,9 @@ public:
   std::vector<cmListFileBacktrace> CompileFeaturesBacktraces;
   std::vector<std::string> CompileDefinitionsEntries;
   std::vector<cmListFileBacktrace> CompileDefinitionsBacktraces;
-  std::vector<TargetPropertyEntry*> SourceEntries;
+  std::vector<std::string> SourceEntries;
+  std::vector<cmListFileBacktrace> SourceBacktraces;
+  std::vector<TargetPropertyEntry*> SourceItems;
   std::vector<cmValueWithOrigin> LinkImplementationPropertyEntries;
 
   void AddInterfaceEntries(
@@ -385,7 +387,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
 void CreatePropertyGeneratorExpressions(
     std::vector<std::string> const& entries,
     std::vector<cmListFileBacktrace> const& backtraces,
-    std::vector<cmTargetInternals::TargetPropertyEntry*>& items)
+    std::vector<cmTargetInternals::TargetPropertyEntry*>& items,
+    bool evaluateForBuildsystem = false)
 {
   std::vector<cmListFileBacktrace>::const_iterator btIt = backtraces.begin();
   for (std::vector<std::string>::const_iterator it = entries.begin();
@@ -393,12 +396,17 @@ void CreatePropertyGeneratorExpressions(
     {
     cmGeneratorExpression ge(*btIt);
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*it);
+    cge->SetEvaluateForBuildsystem(evaluateForBuildsystem);
     items.push_back(new cmTargetInternals::TargetPropertyEntry(cge));
     }
 }
 
 void cmTarget::Compute()
 {
+  CreatePropertyGeneratorExpressions(
+        this->Internal->SourceEntries,
+        this->Internal->SourceBacktraces,
+        this->Internal->SourceItems, true);
 }
 
 //----------------------------------------------------------------------------
@@ -649,13 +657,11 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
     // for TARGET_OBJECTS instead for backwards compatibility with OLD
     // behavior of CMP0024 and CMP0026 only.
 
-    typedef cmTargetInternals::TargetPropertyEntry
-                                TargetPropertyEntry;
-    for(std::vector<TargetPropertyEntry*>::const_iterator
+    for(std::vector<std::string>::const_iterator
           i = this->Internal->SourceEntries.begin();
         i != this->Internal->SourceEntries.end(); ++i)
       {
-      std::string entry = (*i)->ge->GetInput();
+      std::string const& entry = *i;
 
       std::vector<std::string> items;
       cmSystemTools::ExpandListArgument(entry, items);
@@ -697,7 +703,7 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
 
   UNORDERED_SET<std::string> uniqueSrcs;
   bool contextDependentDirectSources = processSources(this,
-                 this->Internal->SourceEntries,
+                 this->Internal->SourceItems,
                  files,
                  uniqueSrcs,
                  &dagChecker,
@@ -778,10 +784,12 @@ void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    this->Internal->SourceEntries.push_back(srcFiles);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     cmGeneratorExpression ge(lfbt);
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
     cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceEntries.push_back(
+    this->Internal->SourceItems.push_back(
                           new cmTargetInternals::TargetPropertyEntry(cge));
     }
 }
@@ -818,11 +826,8 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs)
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceEntries.push_back(srcFiles);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     }
 }
 
@@ -926,10 +931,10 @@ public:
 
   }
 
-  bool operator()(cmTargetInternals::TargetPropertyEntry* entry)
+  bool operator()(std::string const& entry)
   {
     std::vector<std::string> files;
-    cmSystemTools::ExpandListArgument(entry->ge->GetInput(), files);
+    cmSystemTools::ExpandListArgument(entry, files);
     std::vector<cmSourceFileLocation> locations(files.size());
     std::transform(files.begin(), files.end(), locations.begin(),
                    CreateLocation(this->Needle.GetMakefile()));
@@ -951,11 +956,8 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
     this->Internal->SourceFilesMap.clear();
     this->LinkImplementationLanguageIsContextDependent = true;
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
-    cge->SetEvaluateForBuildsystem(true);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceEntries.push_back(src);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     }
   if (cmGeneratorExpression::Find(src) != std::string::npos)
     {
@@ -966,6 +968,19 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
 
 void cmTarget::AddGenerateTimeSource(const std::string& src)
 {
+  cmSourceFileLocation sfl(this->Makefile, src);
+  if (std::find_if(this->Internal->SourceEntries.begin(),
+                   this->Internal->SourceEntries.end(),
+                   TargetPropertyEntryFinder(sfl))
+                                      == this->Internal->SourceEntries.end())
+    {
+    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    cmGeneratorExpression ge(lfbt);
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src);
+    cge->SetEvaluateForBuildsystem(true);
+    this->Internal->SourceItems.push_back(
+                          new cmTargetInternals::TargetPropertyEntry(cge));
+    }
   this->AddSource(src);
 }
 
@@ -1679,13 +1694,15 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
       return;
       }
     this->Internal->SourceFilesMap.clear();
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmDeleteAll(this->Internal->SourceEntries);
+
     this->Internal->SourceEntries.clear();
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceBacktraces.clear();
+    if (value)
+      {
+      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+      this->Internal->SourceEntries.push_back(value);
+      this->Internal->SourceBacktraces.push_back(lfbt);
+      }
     }
   else
     {
@@ -1778,10 +1795,8 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
       }
     this->Internal->SourceFilesMap.clear();
     cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
-    this->Internal->SourceEntries.push_back(
-                          new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceEntries.push_back(value);
+    this->Internal->SourceBacktraces.push_back(lfbt);
     }
   else
     {
@@ -2418,13 +2433,11 @@ const char *cmTarget::GetProperty(const std::string& prop,
 
       std::ostringstream ss;
       const char* sep = "";
-      typedef cmTargetInternals::TargetPropertyEntry
-                                  TargetPropertyEntry;
-      for(std::vector<TargetPropertyEntry*>::const_iterator
+      for(std::vector<std::string>::const_iterator
             i = this->Internal->SourceEntries.begin();
           i != this->Internal->SourceEntries.end(); ++i)
         {
-        std::string entry = (*i)->ge->GetInput();
+        std::string const& entry = *i;
 
         std::vector<std::string> files;
         cmSystemTools::ExpandListArgument(entry, files);
@@ -3076,13 +3089,11 @@ cmTarget::GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const
   // there is no cmGeneratorTarget at configure-time, so search the SOURCES
   // for TARGET_OBJECTS instead for backwards compatibility with OLD
   // behavior of CMP0024 and CMP0026 only.
-  typedef cmTargetInternals::TargetPropertyEntry
-                              TargetPropertyEntry;
-  for(std::vector<TargetPropertyEntry*>::const_iterator
+  for(std::vector<std::string>::const_iterator
         i = this->Internal->SourceEntries.begin();
       i != this->Internal->SourceEntries.end(); ++i)
     {
-    std::string entry = (*i)->ge->GetInput();
+    std::string const& entry = *i;
 
     std::vector<std::string> files;
     cmSystemTools::ExpandListArgument(entry, files);
@@ -3745,7 +3756,7 @@ cmTargetInternalPointer
 //----------------------------------------------------------------------------
 cmTargetInternalPointer::~cmTargetInternalPointer()
 {
-  cmDeleteAll(this->Pointer->SourceEntries);
+  cmDeleteAll(this->Pointer->SourceItems);
   delete this->Pointer;
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=776ff8eb0b8d790c63f8ad6bb6689620e6e04cb4
commit 776ff8eb0b8d790c63f8ad6bb6689620e6e04cb4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:44:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:57 2015 +0200

    cmTarget: Add Compute API for sources.
    
    This method is a refactoring artifact.  It will be removed in a
    follow-up.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index db842b0..a62d534 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1538,6 +1538,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
         ti != targets.end(); ++ti)
       {
       cmTarget* t = &ti->second;
+      t->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
       generatorTargets[t] = gt;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index ab9d7e7..5bace47 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -254,6 +254,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
     mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false,
                           no_working_directory, no_depends,
                           noCommandLines);
+  tgt->Compute();
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   mf->AddGeneratorTarget(tgt, gt);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d45aa27..fd2d33a 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -86,6 +86,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           no_depends, no_commands, false,
                           "Build all projects");
 
+      allBuild->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 3d52e3a..14bc340 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -456,6 +456,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         no_working_directory,
                         "echo", "Build all projects");
 
+  allbuild->Compute();
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
@@ -491,6 +492,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           no_working_directory,
                           "make", "-f", file.c_str());
 
+    check->Compute();
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     mf->AddGeneratorTarget(check, checkGt);
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 378f132..1b1b98e 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -885,6 +885,8 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 /*byproducts=*/rcc_output, depends,
                                 commandLines, false, autogenComment.c_str());
 
+    autogenTarget->Compute();
+
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     makefile->AddGeneratorTarget(autogenTarget, gt);
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 16378cc..515b261 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -397,6 +397,10 @@ void CreatePropertyGeneratorExpressions(
     }
 }
 
+void cmTarget::Compute()
+{
+}
+
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index cbf2ca9..2f1671d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -133,6 +133,8 @@ public:
   void AddPostBuildCommand(cmCustomCommand const &cmd)
     {this->PostBuildCommands.push_back(cmd);}
 
+  void Compute();
+
   /**
    * Get the list of the source files used by this target
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64f73150b8e5e5cad216444c0468e8e59434d973
commit 64f73150b8e5e5cad216444c0468e8e59434d973
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:29:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:57 2015 +0200

    cmTarget: Add API for generate-time source addition.
    
    This method is a refactoring artifact.  It will be removed in a
    follow-up.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dc399d8..83f9cd2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -404,7 +404,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 
 void cmGeneratorTarget::AddSource(const std::string& src)
 {
-  this->Target->AddSource(src);
+  this->Target->AddGenerateTimeSource(src);
 }
 
 void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7fd8d86..16378cc 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -960,6 +960,11 @@ cmSourceFile* cmTarget::AddSource(const std::string& src)
   return this->Makefile->GetOrCreateSource(src);
 }
 
+void cmTarget::AddGenerateTimeSource(const std::string& src)
+{
+  this->AddSource(src);
+}
+
 //----------------------------------------------------------------------------
 void cmTarget::MergeLinkLibraries( cmMakefile& mf,
                                    const std::string& selfname,
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3e71dbd..cbf2ca9 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -145,6 +145,7 @@ public:
   void AddTracedSources(std::vector<std::string> const& srcs);
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
+  void AddGenerateTimeSource(const std::string& src);
 
   enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c38e30f68c7beffdc65af0f3799ae82ce60aaf67
commit c38e30f68c7beffdc65af0f3799ae82ce60aaf67
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 18:10:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:57 2015 +0200

    cmGeneratorTarget: Add methods for generate-time source addition.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3a865fc..dc399d8 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -402,6 +402,16 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
   return i->second;
 }
 
+void cmGeneratorTarget::AddSource(const std::string& src)
+{
+  this->Target->AddSource(src);
+}
+
+void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
+{
+  this->Target->AddTracedSources(srcs);
+}
+
 //----------------------------------------------------------------------------
 std::vector<cmSourceFile*> const*
 cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
@@ -1755,7 +1765,7 @@ void cmTargetTraceDependencies::Trace()
     }
   this->CurrentEntry = 0;
 
-  this->Target->AddTracedSources(this->NewSources);
+  this->GeneratorTarget->AddTracedSources(this->NewSources);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 6d5641b..0c6ad82 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -296,6 +296,9 @@ public:
   // Get the target base name.
   std::string GetOutputName(const std::string& config, bool implib) const;
 
+  void AddSource(const std::string& src);
+  void AddTracedSources(std::vector<std::string> const& srcs);
+
   /**
    * Flags for a given source file as used in this target. Typically assigned
    * via SET_TARGET_PROPERTIES when the property is a list of source files.
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 86a8f87..ab9d7e7 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -336,7 +336,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
        no_main_dependency, commandLines, "Checking Build System",
        no_working_directory, true))
     {
-    tgt->AddSource(file->GetFullPath());
+    gt->AddSource(file->GetFullPath());
     }
   else
     {
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 64fa12a..3d52e3a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -463,7 +463,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   std::string listfile = mf->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
-  allbuild->AddSource(listfile.c_str());
+  allBuildGt->AddSource(listfile.c_str());
 
   // Add XCODE depend helper
   std::string dir = mf->GetCurrentBinaryDirectory();
@@ -553,11 +553,13 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
         allbuild->AddUtility(target.GetName());
         }
 
+      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
+
       // Refer to the build configuration file for easy editing.
       listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
-      target.AddSource(listfile.c_str());
+      targetGT->AddSource(listfile.c_str());
       }
     }
 }
@@ -1401,7 +1403,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   if(cmSourceFile* sf = mf->GetOrCreateSource(fname.c_str()))
     {
     sf->SetProperty("LANGUAGE", llang.c_str());
-    cmtarget.AddSource(fname);
+    gtgt->AddSource(fname);
     }
 }
 
@@ -3069,17 +3071,18 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         continue;
         }
 
+      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+
       // add the soon to be generated Info.plist file as a source for a
       // MACOSX_BUNDLE file
       if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
         {
         std::string plist = this->ComputeInfoPListLocation(cmtarget);
         mf->GetOrCreateSource(plist, true);
-        cmtarget.AddSource(plist);
+        gtgt->AddSource(plist);
         }
 
       std::vector<cmSourceFile*> classes;
-      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
       if (!gtgt->GetConfigCommonSourceFiles(classes))
         {
         return false;
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index cc94cd4..ab215d1 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -243,7 +243,8 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
                                            no_working_directory, true);
   if(this->Makefile->GetSource(makefileIn.c_str()))
     {
-    tgt.AddSource(makefileIn);
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&tgt);
+    gt->AddSource(makefileIn);
     }
   else
     {
@@ -595,7 +596,8 @@ cmLocalVisualStudio6Generator
        origCommand.GetCommandLines(), comment,
        origCommand.GetWorkingDirectory().c_str()))
     {
-    target.AddSource(outsf->GetFullPath());
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&target);
+    gt->AddSource(outsf->GetFullPath());
     }
 
   // Replace the dependencies with the output of this rule so that the
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a4bce8a..8924564 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -112,7 +112,9 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules()
           }
         if(l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          l->second.AddSource(sf->GetFullPath());
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&l->second);
+          gt->AddSource(sf->GetFullPath());
           }
         }
       }
@@ -148,7 +150,9 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
            force.c_str(), no_depends, no_main_dependency,
            force_commands, " ", 0, true))
         {
-        tgt.AddSource(file->GetFullPath());
+        cmGeneratorTarget* gt =
+            this->GlobalGenerator->GetGeneratorTarget(&tgt);
+        gt->AddSource(file->GetFullPath());
         }
       }
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 2703f4c..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -101,7 +101,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
       fileIt != newRccFiles.end();
       ++fileIt)
     {
-    const_cast<cmTarget*>(target->Target)->AddSource(*fileIt);
+    const_cast<cmGeneratorTarget*>(target)->AddSource(*fileIt);
     }
 }
 
@@ -709,7 +709,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources(
     makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
                             mocCppFile.c_str(), false);
 
-    target->Target->AddSource(mocCppFile);
+    target->AddSource(mocCppFile);
     }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d3776a7ebb718ae6ed4724e0a8961cda68b6316
commit 5d3776a7ebb718ae6ed4724e0a8961cda68b6316
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 17:51:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:56 2015 +0200

    Access sources through cmGeneratorTarget.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index dfd51c7..7915a6e 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -401,7 +401,9 @@ void cmExtraCodeBlocksGenerator
         case cmTarget::UTILITY: // can have sources since 2.6.3
           {
           std::vector<cmSourceFile*> sources;
-          ti->second.GetSourceFiles(sources,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
                si!=sources.end(); si++)
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index c2cff14..496c1a8 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -196,7 +196,9 @@ void cmExtraCodeLiteGenerator
         case cmTarget::MODULE_LIBRARY:
           {
           std::vector<cmSourceFile*> sources;
-          ti->second.GetSourceFiles(sources,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
                si!=sources.end(); si++)
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 44bf586..6dc18c2 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -562,7 +562,9 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
           // get the files from the source lists then add them to the groups
           cmTarget* tgt = const_cast<cmTarget*>(&ti->second);
           std::vector<cmSourceFile*> files;
-          tgt->GetSourceFiles(files,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(tgt);
+          gt->GetSourceFiles(files,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for(std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
               sfIt != files.end();
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 163a75b..11410a7 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -237,7 +237,7 @@ void cmExtraSublimeTextGenerator::
       cmGeneratorTarget *gtgt = this->GlobalGenerator
                                     ->GetGeneratorTarget(target);
       std::vector<cmSourceFile*> sourceFiles;
-      target->GetSourceFiles(sourceFiles,
+      gtgt->GetSourceFiles(sourceFiles,
                              makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       std::vector<cmSourceFile*>::const_iterator sourceFilesEnd =
         sourceFiles.end();
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4ed2939..3a865fc 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -449,7 +449,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
 #define IMPLEMENT_VISIT_IMPL(DATA, DATATYPE) \
   { \
   std::vector<cmSourceFile*> sourceFiles; \
-  this->Target->GetSourceFiles(sourceFiles, config); \
+  this->GetSourceFiles(sourceFiles, config); \
   TagVisitor<DATA ## Tag DATATYPE> visitor(this, data); \
   for(std::vector<cmSourceFile*>::const_iterator si = sourceFiles.begin(); \
       si != sourceFiles.end(); ++si) \
@@ -1683,7 +1683,7 @@ cmTargetTraceDependencies
         ci != configs.end(); ++ci)
       {
       std::vector<cmSourceFile*> sources;
-      this->Target->GetSourceFiles(sources, *ci);
+      this->GeneratorTarget->GetSourceFiles(sources, *ci);
       for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
           si != sources.end(); ++si)
         {
@@ -4444,12 +4444,12 @@ bool cmGeneratorTarget::GetConfigCommonSourceFiles(
 
   std::vector<std::string>::const_iterator it = configs.begin();
   const std::string& firstConfig = *it;
-  this->Target->GetSourceFiles(files, firstConfig);
+  this->GetSourceFiles(files, firstConfig);
 
   for ( ; it != configs.end(); ++it)
     {
     std::vector<cmSourceFile*> configFiles;
-    this->Target->GetSourceFiles(configFiles, *it);
+    this->GetSourceFiles(configFiles, *it);
     if (configFiles != files)
       {
       std::string firstConfigFiles;
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 46ea2f3..bfcef43 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -172,7 +172,7 @@ std::vector<cmSourceFile *> cmGhsMultiTargetGenerator::GetSources() const
 {
   std::vector<cmSourceFile *> output;
   std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  this->Target->GetSourceFiles(output, config);
+  this->GeneratorTarget->GetSourceFiles(output, config);
   return output;
 }
 
@@ -574,7 +574,7 @@ bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(
   std::vector<cmSourceFile *> sources;
   std::string config =
       target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  target->Target->GetSourceFiles(sources, config);
+  target->GetSourceFiles(sources, config);
   for (std::vector<cmSourceFile *>::const_iterator sources_i = sources.begin();
        sources.end() != sources_i; ++sources_i)
     {
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 05f1029..db842b0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2949,10 +2949,12 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
       {
       configs.push_back("");
       }
+    cmGeneratorTarget* gt =
+        this->GetGeneratorTarget(target);
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
-      target->GetSourceFiles(sources, *ci);
+      gt->GetSourceFiles(sources, *ci);
       }
     std::vector<cmSourceFile*>::const_iterator sourcesEnd
         = cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 1ad727a..87cf58f 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -521,7 +521,8 @@ bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt)
   const std::string config =
     tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   std::vector<cmSourceFile *> tgtSources;
-  tgt->GetSourceFiles(tgtSources, config);
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
+  gt->GetSourceFiles(tgtSources, config);
   bool tgtInBuild = true;
   char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 138ddbb..c40f846 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -139,7 +139,9 @@ bool cmGlobalKdevelopGenerator
          ti != targets.end(); ti++)
       {
       std::vector<cmSourceFile*> sources;
-      ti->second.GetSourceFiles(sources, ti->second.GetMakefile()
+      cmGeneratorTarget* gt =
+          this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+      gt->GetSourceFiles(sources, ti->second.GetMakefile()
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
            si!=sources.end(); si++)
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b278087..cd499f6 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1149,7 +1149,7 @@ cmMakefileTargetGenerator
 {
   // Depend on all custom command outputs.
   std::vector<cmSourceFile*> sources;
-  this->Target->GetSourceFiles(sources,
+  this->GeneratorTarget->GetSourceFiles(sources,
                       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
       source != sources.end(); ++source)
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 84c19a3..24fcaf4 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -112,7 +112,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
   // Write rules for languages compiled in this target.
   std::set<std::string> languages;
   std::vector<cmSourceFile*> sourceFiles;
-  this->GetTarget()->GetSourceFiles(sourceFiles,
+  this->GetGeneratorTarget()->GetSourceFiles(sourceFiles,
     this->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::vector<cmSourceFile*>::const_iterator
         i = sourceFiles.begin(); i != sourceFiles.end(); ++i)
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 58b901a..df43c61 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -58,7 +58,7 @@ void cmNinjaUtilityTargetGenerator::Generate()
   std::vector<cmSourceFile*> sources;
   std::string config = this->GetMakefile()
                            ->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  this->GetTarget()->GetSourceFiles(sources, config);
+  this->GetGeneratorTarget()->GetSourceFiles(sources, config);
   for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
       source != sources.end(); ++source)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ce0991a7a29e244aee3f61e9e8b1879e59d156c
commit 7ce0991a7a29e244aee3f61e9e8b1879e59d156c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 22:35:28 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 08:37:56 2015 +0200

    GHS: Port API to cmGeneratorTarget.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index cae5c2f..46ea2f3 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -27,7 +27,7 @@ cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target)
   , LocalGenerator(static_cast<cmLocalGhsMultiGenerator *>(
                      target->GetLocalGenerator()))
   , Makefile(target->Target->GetMakefile())
-  , TargetGroup(DetermineIfTargetGroup(target->Target))
+  , TargetGroup(DetermineIfTargetGroup(target))
   , DynamicDownload(false)
 {
   this->RelBuildFilePath = this->GetRelBuildFilePath(target->Target);
@@ -178,10 +178,11 @@ std::vector<cmSourceFile *> cmGhsMultiTargetGenerator::GetSources() const
 
 GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag() const
 {
-  return cmGhsMultiTargetGenerator::GetGpjTag(this->Target);
+  return cmGhsMultiTargetGenerator::GetGpjTag(this->GeneratorTarget);
 }
 
-GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(const cmTarget *target)
+GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(
+    const cmGeneratorTarget *target)
 {
   GhsMultiGpj::Types output;
   if (cmGhsMultiTargetGenerator::DetermineIfTargetGroup(target))
@@ -566,13 +567,14 @@ bool cmGhsMultiTargetGenerator::IsNotKernel(std::string const &config,
   return output;
 }
 
-bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(const cmTarget *target)
+bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(
+    const cmGeneratorTarget *target)
 {
   bool output = false;
   std::vector<cmSourceFile *> sources;
   std::string config =
-      target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  target->GetSourceFiles(sources, config);
+      target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
+  target->Target->GetSourceFiles(sources, config);
   for (std::vector<cmSourceFile *>::const_iterator sources_i = sources.begin();
        sources.end() != sources_i; ++sources_i)
     {
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index c29a31e..d1c17f4 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -36,7 +36,7 @@ public:
   bool IncludeThisTarget();
   std::vector<cmSourceFile *> GetSources() const;
   GhsMultiGpj::Types GetGpjTag() const;
-  static GhsMultiGpj::Types GetGpjTag(const cmTarget *target);
+  static GhsMultiGpj::Types GetGpjTag(const cmGeneratorTarget* target);
   const char *GetAbsBuildFilePath() const
   {
     return this->AbsBuildFilePath.c_str();
@@ -95,7 +95,7 @@ private:
   std::string GetOutputFilename(const std::string &config) const;
 
   bool IsNotKernel(std::string const &config, const std::string &language);
-  static bool DetermineIfTargetGroup(const cmTarget *target);
+  static bool DetermineIfTargetGroup(const cmGeneratorTarget* target);
   bool DetermineIfDynamicDownload(std::string const &config,
                                   const std::string &language);
 
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 6dde1e3..1ad727a 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -509,7 +509,8 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
                                                   << " ";
-      GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag(tgt),
+      GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag(
+                                 tgtsI->second),
                                this->TargetFolderBuildStreams[folderName]);
       }
     }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From daniele.domenichelli at gmail.com  Wed Oct  7 03:25:11 2015
From: daniele.domenichelli at gmail.com (Daniele E. Domenichelli)
Date: Wed,  7 Oct 2015 03:25:11 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-141-g9990bef
Message-ID: <20151007072511.681F2BF86C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9990befcd93999ac476dd78ef4c74514da0673d2 (commit)
       via  33eb8fa34ba7fd86753a07555d62eef33ed92104 (commit)
      from  16df189e1b4393bea525629cc7cca7da183fc5d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9990befcd93999ac476dd78ef4c74514da0673d2
commit 9990befcd93999ac476dd78ef4c74514da0673d2
Merge: 16df189 33eb8fa
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Wed Oct 7 03:25:09 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 03:25:09 2015 -0400

    Merge topic 'FindGTK2_sigc++_c++11' into next
    
    33eb8fa3 FindGTK2: Enable c++11 for sigc++ 2.5.1 or later


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33eb8fa34ba7fd86753a07555d62eef33ed92104
commit 33eb8fa34ba7fd86753a07555d62eef33ed92104
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Oct 6 13:33:08 2015 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Tue Oct 6 18:19:07 2015 +0200

    FindGTK2: Enable c++11 for sigc++ 2.5.1 or later
    
    Starting with sigc++ 2.5.1, c++11 must be enabled in order to use
    sigc++. The GTK2::sigc++ imported target will automatically enable the
    required build flags in order to build with the version found on the
    system.

diff --git a/Help/release/dev/FindGTK2_sigc++_c++11.rst b/Help/release/dev/FindGTK2_sigc++_c++11.rst
new file mode 100644
index 0000000..2ba1459
--- /dev/null
+++ b/Help/release/dev/FindGTK2_sigc++_c++11.rst
@@ -0,0 +1,7 @@
+FindGTK2_sigc++_c++11
+---------------------
+
+* Starting with sigc++ 2.5.1, c++11 must be enabled in order to use
+  sigc++. The GTK2::sigc++ imported target will automatically enable the
+  required build flags in order to build with the version found on the
+  system.
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 72bb8eb..501055b 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -202,6 +202,43 @@ function(_GTK2_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr)
     endif()
 endfunction()
 
+
+#=============================================================
+# _GTK2_SIGCXX_GET_VERSION
+# Internal function to parse the version number in
+# sigc++config.h
+#   _OUT_major = Major version number
+#   _OUT_minor = Minor version number
+#   _OUT_micro = Micro version number
+#   _sigcxxversion_hdr = Header file to parse
+#=============================================================
+
+function(_GTK2_SIGCXX_GET_VERSION _OUT_major _OUT_minor _OUT_micro _sigcxxversion_hdr)
+    file(STRINGS ${_sigcxxversion_hdr} _contents REGEX "#define SIGCXX_M[A-Z]+_VERSION[ \t]+")
+    if(_contents)
+        string(REGEX REPLACE ".*#define SIGCXX_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" ${_OUT_major} "${_contents}")
+        string(REGEX REPLACE ".*#define SIGCXX_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" ${_OUT_minor} "${_contents}")
+        string(REGEX REPLACE ".*#define SIGCXX_MICRO_VERSION[ \t]+([0-9]+).*" "\\1" ${_OUT_micro} "${_contents}")
+
+        if(NOT ${_OUT_major} MATCHES "[0-9]+")
+            message(FATAL_ERROR "Version parsing failed for SIGCXX_MAJOR_VERSION!")
+        endif()
+        if(NOT ${_OUT_minor} MATCHES "[0-9]+")
+            message(FATAL_ERROR "Version parsing failed for SIGCXX_MINOR_VERSION!")
+        endif()
+        if(NOT ${_OUT_micro} MATCHES "[0-9]+")
+            message(FATAL_ERROR "Version parsing failed for SIGCXX_MICRO_VERSION!")
+        endif()
+
+        set(${_OUT_major} ${${_OUT_major}} PARENT_SCOPE)
+        set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE)
+        set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE)
+    else()
+        message(FATAL_ERROR "Include file ${_gtkversion_hdr} does not exist")
+    endif()
+endfunction()
+
+
 #=============================================================
 # _GTK2_FIND_INCLUDE_DIR
 # Internal function to find the GTK include directories
@@ -734,6 +771,25 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
         _GTK2_FIND_INCLUDE_DIR(SIGC++CONFIG sigc++config.h)
         _GTK2_FIND_LIBRARY    (SIGC++ sigc true true)
         _GTK2_ADD_TARGET      (SIGC++)
+        # Since sigc++ 2.5.1 c++11 support is required
+        _GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
+                                 GTK2_SIGC++_VERSION_MINOR
+                                 GTK2_SIGC++_VERSION_MICRO
+                                 ${GTK2_SIGC++CONFIG_INCLUDE_DIR}/sigc++config.h)
+        if(NOT ${GTK2_SIGC++_VERSION_MAJOR}.${GTK2_SIGC++_VERSION_MINOR}.${GTK2_SIGC++_VERSION_MICRO} VERSION_LESS 2.5.1)
+            # These are the features needed by clients in order to include the
+            # project headers:
+            set_property(TARGET GTK2::sigc++
+                         PROPERTY INTERFACE_COMPILE_FEATURES cxx_alias_templates
+                                                             cxx_auto_type
+                                                             cxx_decltype
+                                                             cxx_deleted_functions
+                                                             cxx_noexcept
+                                                             cxx_nullptr
+                                                             cxx_right_angle_brackets
+                                                             cxx_rvalue_references
+                                                             cxx_variadic_templates)
+        endif()
 
         _GTK2_FIND_INCLUDE_DIR(GLIBMM glibmm.h)
         _GTK2_FIND_INCLUDE_DIR(GLIBMMCONFIG glibmmconfig.h)

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindGTK2_sigc++_c++11.rst |    7 ++++
 Modules/FindGTK2.cmake                     |   56 ++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 Help/release/dev/FindGTK2_sigc++_c++11.rst


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 14:15:38 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 14:15:38 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-156-g79b5e37
Message-ID: <20151007181538.BB02DBF672@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  79b5e37a46ce05a28ec5d596ef57bf4f3072a3bb (commit)
       via  6b7b0ab93b0a957a7699564d0a1a2ec9da80af26 (commit)
       via  5af30a47f6a35aa1d5c41a12d5e3ef05320941d6 (commit)
       via  929719e63c127c5e621950142f9375544efdb2b8 (commit)
       via  9feb9c7f05b7b743b445af10636ae25f31af1147 (commit)
       via  0c0eac9eaaacfdf70759794604380c70f8d65b09 (commit)
       via  a09b1ec39c60823550d4b71b2259a735bf8faa95 (commit)
       via  dcc75e363d4e09ce3ba323a7a49b62d16125cb3b (commit)
       via  06ca5bac6eef5afa951fbf935cd496ff4da414ca (commit)
       via  1e37130c450c22f99a3c39ca79a5457b0b5ea38f (commit)
       via  bcb25eab9fba90e318d7fe91a662c096ab92e7a5 (commit)
       via  2b04f5bfea49c228205bb503532d8ee3e4e9be8c (commit)
       via  efce39b8ee2b80e6b6542bdf263a2d196d978126 (commit)
       via  3d00e7adc0cabc91ea8845f4037ba65278a1ad10 (commit)
       via  2c4f9023360103ca7489ef821038c3b64a5415fc (commit)
      from  9990befcd93999ac476dd78ef4c74514da0673d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79b5e37a46ce05a28ec5d596ef57bf4f3072a3bb
commit 79b5e37a46ce05a28ec5d596ef57bf4f3072a3bb
Merge: 9990bef 6b7b0ab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 14:15:35 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 14:15:35 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    6b7b0ab9 Remove some needless GetMakefile() calls.
    5af30a47 cmLocalGenerator: Add current source directory accessor.
    929719e6 cmLocalGenerator: Add current binary directory accessor.
    9feb9c7f cmLocalGenerator: Add Home directory accessors.
    0c0eac9e Eclipse: Port API to cmLocalGenerator.
    a09b1ec3 Kate: Remove unused variables.
    dcc75e36 Kate: Port API to cmLocalGenerator.
    06ca5bac export: Port internal method to cmGeneratorTarget.
    1e37130c cmLocalGenerator: Add cmake instance accessor.
    bcb25eab cmMakefile: Remove unused GetProjectName calls.
    2b04f5bf cmLocalGenerator: Add GetProjectName method.
    efce39b8 cmCPluginAPI: Inline code to get project name.
    3d00e7ad cmMakefile: Inline initialization of project name.
    2c4f9023 CMake Nightly Date Stamp

diff --cc Source/cmGlobalXCodeGenerator.cxx
index 3d52e3a,bfd426b..d4e5398
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@@ -460,13 -461,13 +461,13 @@@ cmGlobalXCodeGenerator::AddExtraTargets
    mf->AddGeneratorTarget(allbuild, allBuildGt);
  
    // Refer to the main build configuration file for easy editing.
-   std::string listfile = mf->GetCurrentSourceDirectory();
+   std::string listfile = root->GetCurrentSourceDirectory();
    listfile += "/";
    listfile += "CMakeLists.txt";
 -  allbuild->AddSourceCMP0049(listfile.c_str());
 +  allBuildGt->AddSource(listfile.c_str());
  
    // Add XCODE depend helper
-   std::string dir = mf->GetCurrentBinaryDirectory();
+   std::string dir = root->GetCurrentBinaryDirectory();
    cmCustomCommandLine makeHelper;
    if(this->XcodeVersion < 50)
      {
@@@ -553,13 -554,11 +554,13 @@@
          allbuild->AddUtility(target.GetName());
          }
  
 +      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
 +
        // Refer to the build configuration file for easy editing.
-       listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
+       listfile = lg->GetCurrentSourceDirectory();
        listfile += "/";
        listfile += "CMakeLists.txt";
 -      target.AddSourceCMP0049(listfile.c_str());
 +      targetGT->AddSource(listfile.c_str());
        }
      }
  }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b7b0ab93b0a957a7699564d0a1a2ec9da80af26
commit 6b7b0ab93b0a957a7699564d0a1a2ec9da80af26
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:42:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:15:12 2015 +0200

    Remove some needless GetMakefile() calls.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f3b651..4b6bd50 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -101,7 +101,7 @@ cmCustomCommandGenerator
       }
     else
       {
-      cmOutputConverter converter(this->LG->GetMakefile()->GetStateSnapshot());
+      cmOutputConverter converter(this->LG->GetStateSnapshot());
       cmd += converter.EscapeForShell(arg, this->MakeVars);
       }
     }
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index e4d9f10..8ac5cbc 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -139,7 +139,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator *lg)
       {
       std::ostringstream e;
       e << "Evaluation file \"" << this->Input << "\" cannot be read.";
-      lg->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
+      lg->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 775ad2b..3dd9e37 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -495,7 +495,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the directory-level
   // rules of the subdirectories.
   std::vector<cmState::Snapshot> children
-      = lg->GetMakefile()->GetStateSnapshot().GetChildren();
+      = lg->GetStateSnapshot().GetChildren();
   for(std::vector<cmState::Snapshot>::const_iterator
         ci = children.begin(); ci != children.end(); ++ci)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5af30a47f6a35aa1d5c41a12d5e3ef05320941d6
commit 5af30a47f6a35aa1d5c41a12d5e3ef05320941d6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:25:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:15:12 2015 +0200

    cmLocalGenerator: Add current source directory accessor.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 8687dad..efd5b58 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -497,7 +497,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
     std::string sourceLinkedResourceName = "[Source directory]";
     std::string linkSourceDirectory = this->GetEclipsePath(
-                                             mf->GetCurrentSourceDirectory());
+                                             lg->GetCurrentSourceDirectory());
     // .project dir can't be subdir of a linked resource dir
     if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
                                          linkSourceDirectory))
@@ -636,7 +636,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
        ++it)
     {
     std::string linkSourceDirectory = this->GetEclipsePath(
-                   it->second[0]->GetMakefile()->GetCurrentSourceDirectory());
+                   it->second[0]->GetCurrentSourceDirectory());
     // a linked resource must not point to a parent directory of .project or
     // .project itself
     if ((baseDir != linkSourceDirectory) &&
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 57a8741..45250d3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2105,7 +2105,7 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
   for(std::vector<cmLocalGenerator*>::const_iterator it =
       this->LocalGenerators.begin(); it != this->LocalGenerators.end(); ++it)
     {
-    std::string sd = (*it)->GetMakefile()->GetCurrentSourceDirectory();
+    std::string sd = (*it)->GetCurrentSourceDirectory();
     if (sd == start_dir)
       {
       return *it;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 656ce98..bfd426b 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -412,8 +412,9 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
   this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
-                           this->ProjectSourceDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
+        this->ProjectSourceDirectoryComponents);
   cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
                            this->ProjectOutputDirectoryComponents);
 
@@ -460,7 +461,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
-  std::string listfile = mf->GetCurrentSourceDirectory();
+  std::string listfile = root->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
   allbuild->AddSourceCMP0049(listfile.c_str());
@@ -554,7 +555,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
         }
 
       // Refer to the build configuration file for easy editing.
-      listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
+      listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
       target.AddSourceCMP0049(listfile.c_str());
@@ -3369,7 +3370,7 @@ bool cmGlobalXCodeGenerator
   // Point Xcode at the top of the source tree.
   {
   std::string pdir =
-    this->RelativeToBinary(root->GetMakefile()->GetCurrentSourceDirectory());
+    this->RelativeToBinary(root->GetCurrentSourceDirectory());
   this->RootObject->AddAttribute("projectDirPath",
                                  this->CreateString(pdir.c_str()));
   this->RootObject->AddAttribute("projectRoot", this->CreateString(""));
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8096bd7..c0c50c4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2883,6 +2883,11 @@ const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
+const char* cmLocalGenerator::GetCurrentSourceDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentSource();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7ca587e..8070667 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -259,6 +259,7 @@ public:
   const char* GetBinaryDirectory() const;
 
   const char* GetCurrentBinaryDirectory() const;
+  const char* GetCurrentSourceDirectory() const;
 
   /**
    * Generate a Mac OS X application bundle Info.plist file.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index f627cc5..84d5ea4 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -215,7 +215,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   if(!cmSystemTools::FileExists(makefileIn.c_str()))
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 8d622da..000b843 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -278,7 +278,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   stampName += "generate.stamp";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   makefileIn = cmSystemTools::CollapseFullPath(makefileIn.c_str());
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0b89d1d..b7ca26b 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1113,7 +1113,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index d792ba7..133d2ff 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -45,8 +45,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
-        cmMakefile *mf = target->Target->GetMakefile();
-        if (strcmp(mf->GetCurrentSourceDirectory(),
+        if (strcmp(target->GetLocalGenerator()->GetCurrentSourceDirectory(),
                    target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 8cefd7c..92b7a57 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2243,7 +2243,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 {
   // Look through the sources for AndroidManifest.xml and use
   // its location as the root source directory.
-  std::string rootDir = this->Makefile->GetCurrentSourceDirectory();
+  std::string rootDir = this->LocalGenerator->GetCurrentSourceDirectory();
   {
   std::vector<cmSourceFile const*> extraSources;
   this->GeneratorTarget->GetExtraSources(extraSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=929719e63c127c5e621950142f9375544efdb2b8
commit 929719e63c127c5e621950142f9375544efdb2b8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 25 00:13:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 19:56:44 2015 +0200

    cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 856dcd4..80f560f 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -160,7 +160,7 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
   if (mod_dir.empty())
     {
     mod_dir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
     }
 
   // Actually write dependencies to the streams.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 883b287..cb46f8c 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -76,8 +76,7 @@ void cmExtraCodeBlocksGenerator::Generate()
 void cmExtraCodeBlocksGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
@@ -331,7 +330,7 @@ void cmExtraCodeBlocksGenerator
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
@@ -522,11 +521,10 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
                                         cmLocalGenerator* lg,
                                         cmTarget* target) const
 {
-  cmMakefile *mf = lg->GetMakefile();
   // this file doesn't seem to be used by C::B in custom makefile mode,
   // but we generate a unique file for each OBJECT library so in case
   // C::B uses it in some way, the targets don't interfere with each other.
-  std::string filename = mf->GetCurrentBinaryDirectory();
+  std::string filename = lg->GetCurrentBinaryDirectory();
   filename += "/";
   filename += lg->GetTargetDirectory(*target);
   filename += "/";
@@ -553,14 +551,14 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
                                               const char* compiler)
 {
   cmMakefile const* makefile = lg->GetMakefile();
-  std::string makefileName = makefile->GetCurrentBinaryDirectory();
+  std::string makefileName = lg->GetCurrentBinaryDirectory();
   makefileName += "/Makefile";
 
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
     int cbTargetType = this->GetCBTargetType(target);
-    std::string workingDir = makefile->GetCurrentBinaryDirectory();
+    std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmTarget::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
@@ -657,7 +655,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   else // e.g. all and the GLOBAL and UTILITY targets
     {
     fout<<"         <Option working_dir=\""
-        << makefile->GetCurrentBinaryDirectory() << "\" />\n"
+        << lg->GetCurrentBinaryDirectory() << "\" />\n"
         <<"         <Option type=\"" << 4 << "\" />\n";
     }
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 763673e..b4b5c89 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -68,15 +68,15 @@ void cmExtraCodeLiteGenerator::Generate()
     const cmMakefile* mf =it->second[0]->GetMakefile();
     this->ConfigName = GetConfigurationName( mf );
 
-    if (strcmp(mf->GetCurrentBinaryDirectory(),
+    if (strcmp(it->second[0]->GetCurrentBinaryDirectory(),
                it->second[0]->GetBinaryDirectory()) == 0)
       {
-      workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
+      workspaceOutputDir   = it->second[0]->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
       workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
-      this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
+      this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();;
 
       fout.Open(workspaceFileName.c_str(), false, false);
       fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -91,8 +91,7 @@ void cmExtraCodeLiteGenerator::Generate()
        ++it)
     {
     // retrive project information
-    const cmMakefile* mf    = it->second[0]->GetMakefile();
-    std::string outputDir   = mf->GetCurrentBinaryDirectory();
+    std::string outputDir   = it->second[0]->GetCurrentBinaryDirectory();
     std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
@@ -121,8 +120,7 @@ void cmExtraCodeLiteGenerator::Generate()
 void cmExtraCodeLiteGenerator::CreateProjectFile(
   const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf    = lgs[0]->GetMakefile();
-  std::string outputDir   = mf->GetCurrentBinaryDirectory();
+  std::string outputDir   = lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 214e89f..8687dad 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -208,7 +208,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 
   std::string cacheEntryName = "CMAKE_ECLIPSE_ENVVAR_";
   cacheEntryName += envVar;
-  const char* cacheValue = mf->GetState()->GetInitializedCacheValue(
+  const char* cacheValue = lg->GetState()->GetInitializedCacheValue(
                                                        cacheEntryName);
 
   // now we have both, decide which one to use
@@ -1034,8 +1034,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        ++it)
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
-    std::string subdir = (*it)->Convert(makefile->GetCurrentBinaryDirectory(),
+    std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
       {
@@ -1096,7 +1095,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
                              ti->first.c_str());
 
           std::string cleanArgs = "-E chdir \"";
-          cleanArgs += makefile->GetCurrentBinaryDirectory();
+          cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f14a1cc..0c009c3 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -47,7 +47,7 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 void cmExtraKateGenerator::Generate()
 {
   cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  const cmMakefile* mf = lg->GetMakefile();
+  cmMakefile* mf = lg->GetMakefile();
   this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                           this->GetPathBasename(lg->GetBinaryDirectory()));
@@ -121,7 +121,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
-    std::string currentDir = makefile->GetCurrentBinaryDirectory();
+    std::string currentDir = (*it)->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 21587d6..133626e 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -77,8 +77,7 @@ void cmExtraSublimeTextGenerator::Generate()
 void cmExtraSublimeTextGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f82fcb3..ab24f94 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -49,8 +49,7 @@ void cmGlobalKdevelopGenerator::Generate()
       it!= this->GlobalGenerator->GetProjectMap().end();
       ++it)
     {
-    cmMakefile* mf = it->second[0]->GetMakefile();
-    std::string outputDir=mf->GetCurrentBinaryDirectory();
+    std::string outputDir=it->second[0]->GetCurrentBinaryDirectory();
     std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 59633d9..775ad2b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -163,7 +163,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
     {
     cmLocalUnixMakefileGenerator3 *lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    std::string markFileName = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    std::string markFileName = lg->GetCurrentBinaryDirectory();
     markFileName += "/";
     markFileName += cmake::GetCMakeFilesDirectory();
     markFileName += "/progress.marks";
@@ -395,7 +395,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
     {
     lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    tmpStr = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    tmpStr = lg->GetCurrentBinaryDirectory();
     tmpStr += cmake::GetCMakeFilesDirectory();
     tmpStr += "/CMakeDirectoryInformation.cmake";
     cmakefileStream << "  \"" <<
@@ -454,7 +454,7 @@ cmGlobalUnixMakefileGenerator3
                       bool check_relink)
 {
   // Get the relative path to the subdirectory from the top.
-  std::string makeTarget = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string makeTarget = lg->GetCurrentBinaryDirectory();
   makeTarget += "/";
   makeTarget += pass;
 
@@ -534,7 +534,7 @@ cmGlobalUnixMakefileGenerator3
     }
 
   // Begin the directory-level rules section.
-  std::string dir = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string dir = lg->GetCurrentBinaryDirectory();
   dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT,
                     cmLocalGenerator::MAKERULE);
   lg->WriteDivider(ruleFileStream);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 73a952b..1ca3bd7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -363,7 +363,7 @@ void cmGlobalVisualStudio7Generator
     return;
     }
   this->CurrentProject = root->GetProjectName();
-  std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = root->GetCurrentBinaryDirectory();
   fname += "/";
   fname += root->GetProjectName();
   fname += ".sln";
@@ -468,8 +468,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmMakefile* tmf = target->GetMakefile();
-        std::string dir = tmf->GetCurrentBinaryDirectory();
+        std::string dir = root->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
         if(dir == ".")
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index ea15eb4..656ce98 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -414,11 +414,11 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentBinaryDirectory(),
+  cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
                            this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
-    root->GetMakefile()->GetCurrentBinaryDirectory();
+    root->GetCurrentBinaryDirectory();
   this->CurrentXCodeHackMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentXCodeHackMakefile.c_str());
   this->CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
@@ -466,7 +466,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   allbuild->AddSourceCMP0049(listfile.c_str());
 
   // Add XCODE depend helper
-  std::string dir = mf->GetCurrentBinaryDirectory();
+  std::string dir = root->GetCurrentBinaryDirectory();
   cmCustomCommandLine makeHelper;
   if(this->XcodeVersion < 50)
     {
@@ -580,7 +580,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   std::vector<std::string>::iterator new_end =
     std::unique(lfiles.begin(), lfiles.end());
   lfiles.erase(new_end, lfiles.end());
-  this->CurrentReRunCMakeMakefile = mf->GetCurrentBinaryDirectory();
+  this->CurrentReRunCMakeMakefile = root->GetCurrentBinaryDirectory();
   this->CurrentReRunCMakeMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str());
   this->CurrentReRunCMakeMakefile += "/ReRunCMake.make";
@@ -1031,7 +1031,7 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen)
   this->CurrentLocalGenerator = gen;
   this->CurrentMakefile = gen->GetMakefile();
   std::string outdir =
-    cmSystemTools::CollapseFullPath(this->CurrentMakefile->
+    cmSystemTools::CollapseFullPath(this->CurrentLocalGenerator->
                                     GetCurrentBinaryDirectory());
   cmSystemTools::SplitPath(outdir.c_str(),
                            this->CurrentOutputDirectoryComponents);
@@ -1387,7 +1387,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // linker language.  This should convince Xcode to choose the proper
   // language.
   cmMakefile* mf = cmtarget.GetMakefile();
-  std::string fname = mf->GetCurrentBinaryDirectory();
+  std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
   fname += cmtarget.GetName();
@@ -1616,7 +1616,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 const & commands,
                                                 const char* name)
 {
-  std::string dir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string dir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   dir += "/CMakeScripts";
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
@@ -1637,7 +1637,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                     currentConfig->c_str());
     }
 
-  std::string cdir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string cdir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   cdir = this->ConvertToRelativeForXCode(cdir.c_str());
   std::string makecmd = "make -C ";
   makecmd += cdir;
@@ -1965,7 +1965,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Set attributes to specify the proper name for the target.
-  std::string pndir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   if(target.GetType() == cmTarget::STATIC_LIBRARY ||
      target.GetType() == cmTarget::SHARED_LIBRARY ||
      target.GetType() == cmTarget::MODULE_LIBRARY ||
@@ -3481,7 +3481,7 @@ bool cmGlobalXCodeGenerator
     }
   }
 
-  std::string symroot = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string symroot = root->GetCurrentBinaryDirectory();
   symroot += "/build";
   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
 
@@ -3724,7 +3724,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     {
     return;
     }
-  std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string xcodeDir = root->GetCurrentBinaryDirectory();
   xcodeDir += "/";
   xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 97b9405..f7c9cc2 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -64,7 +64,7 @@ void cmInstallExportGenerator::ComputeTempDir()
   // Choose a temporary directory in which to generate the import
   // files to be installed.
   this->TempDir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
   this->TempDir += cmake::GetCMakeFilesDirectory();
   this->TempDir += "/Export";
   if(this->Destination.empty())
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6c442f4..8096bd7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2878,6 +2878,11 @@ const char* cmLocalGenerator::GetBinaryDirectory() const
   return this->GetCMakeInstance()->GetHomeOutputDirectory();
 }
 
+const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentBinary();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2123f1e..7ca587e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -258,6 +258,8 @@ public:
   const char* GetSourceDirectory() const;
   const char* GetBinaryDirectory() const;
 
+  const char* GetCurrentBinaryDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index b1e1d3f..6319f0e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -363,7 +363,7 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(
   if (ccg.GetNumberOfCommands() > 0) {
     std::string wd = ccg.GetWorkingDirectory();
     if (wd.empty())
-      wd = this->GetMakefile()->GetCurrentBinaryDirectory();
+      wd = this->GetCurrentBinaryDirectory();
 
     std::ostringstream cdCmd;
 #ifdef _WIN32
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index f794def..f627cc5 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -111,14 +111,14 @@ void cmLocalVisualStudio6Generator::Generate()
 void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -163,7 +163,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       std::string::size_type pos = l->first.rfind('/');
       if(pos != std::string::npos)
         {
-        std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+        std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
         dir += l->first.substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
@@ -189,7 +189,7 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
@@ -577,9 +577,9 @@ cmLocalVisualStudio6Generator
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
-  char* output = new char[(strlen(this->Makefile->GetCurrentBinaryDirectory())
+  char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
                            + target.GetName().size() + 30)];
-  sprintf(output,"%s/%s_force_%i", this->Makefile->GetCurrentBinaryDirectory(),
+  sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
           target.GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
@@ -1962,7 +1962,7 @@ cmLocalVisualStudio6Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index f071109..8d622da 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -138,7 +138,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       cmCustomCommandLines force_commands;
       force_commands.push_back(force_command);
       std::string no_main_dependency = "";
-      std::string force = this->Makefile->GetCurrentBinaryDirectory();
+      std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
       force += tgt.GetName();
@@ -160,14 +160,14 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
 void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -196,7 +196,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 {
   // Touch a timestamp file used to determine when the project file is
   // out of date.
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += cmake::GetCMakeFilesDirectory();
   cmSystemTools::MakeDirectory(stampName.c_str());
   stampName += "/";
@@ -243,7 +243,7 @@ void cmLocalVisualStudio7Generator
   target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += lname;
   if(this->FortranProject)
@@ -272,7 +272,7 @@ void cmLocalVisualStudio7Generator
 //----------------------------------------------------------------------------
 cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += "/";
   stampName += cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
@@ -1719,7 +1719,7 @@ cmLocalVisualStudio7Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 8c700a1..0b89d1d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -419,7 +419,7 @@ void cmMakefileTargetGenerator
   this->WriteObjectBuildFile(obj, lang, source, depends);
 
   // The object file should be checked for dependency integrity.
-  std::string objFullPath = this->Makefile->GetCurrentBinaryDirectory();
+  std::string objFullPath = this->LocalGenerator->GetCurrentBinaryDirectory();
   objFullPath += "/";
   objFullPath += obj;
   objFullPath =
@@ -642,7 +642,7 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->Makefile->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->LocalGenerator->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";
@@ -698,7 +698,7 @@ cmMakefileTargetGenerator
   // Change the command working directory to the local build tree.
   this->LocalGenerator->CreateCDCommand
     (compileCommands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
   commands.insert(commands.end(),
                   compileCommands.begin(), compileCommands.end());
@@ -771,7 +771,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (preprocessCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         preprocessCommands.begin(),
@@ -828,7 +828,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (assemblyCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         assemblyCommands.begin(),
@@ -929,7 +929,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
                                            *this->Target);
   this->LocalGenerator->CreateCDCommand
     (commands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
 
   // Write the rule.
@@ -1119,7 +1119,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->InfoFileNameFull,
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..8cefd7c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -195,7 +195,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->BuildFileStream = 0;
   this->IsMissingFiles = false;
   this->DefaultArtifactDir =
-    this->Makefile->GetCurrentBinaryDirectory() + std::string("/") +
+    this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") +
     this->LocalGenerator->GetTargetDirectory(*this->Target);
 }
 
@@ -297,8 +297,7 @@ void cmVisualStudio10TargetGenerator::Generate()
       return;
       }
     }
-  cmMakefile* mf = this->Target->GetMakefile();
-  std::string path =  mf->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj";
@@ -951,7 +950,7 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path,
 {
   return forceRelative
     ? cmSystemTools::RelativePath(
-      this->Makefile->GetCurrentBinaryDirectory(), path.c_str())
+      this->LocalGenerator->GetCurrentBinaryDirectory(), path.c_str())
     : path.c_str();
 }
 
@@ -990,7 +989,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   this->AddMissingSourceGroups(groupsUsed, sourceGroups);
 
   // Write out group file
-  std::string path =  this->Makefile->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj.filters";
@@ -1448,7 +1447,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
     std::string sourceRel = this->ConvertPath(sf->GetFullPath(), true);
     size_t const maxLen = 250;
     if(sf->GetCustomCommand() ||
-       ((strlen(this->Makefile->GetCurrentBinaryDirectory()) + 1 +
+       ((strlen(this->LocalGenerator->GetCurrentBinaryDirectory()) + 1 +
          sourceRel.length()) <= maxLen))
       {
       forceRelative = true;
@@ -3313,7 +3312,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
   // For WP80, the manifest needs to be in the same folder as the project
   // this can cause an overwrite problem if projects aren't organized in
   // folders
-  std::string manifestFile = this->Makefile->GetCurrentBinaryDirectory() +
+  std::string manifestFile =
+      this->LocalGenerator->GetCurrentBinaryDirectory() +
                              std::string("/WMAppManifest.xml");
   std::string artifactDir =
     this->LocalGenerator->GetTargetDirectory(*this->Target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9feb9c7f05b7b743b445af10636ae25f31af1147
commit 9feb9c7f05b7b743b445af10636ae25f31af1147
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 01:17:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 19:55:51 2015 +0200

    cmLocalGenerator: Add Home directory accessors.
    
    Reduce reasons for cmLocalGenerator to have a cmMakefile.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d35b566..e97069f 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1975,8 +1975,9 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
       else if(use_link_rpath)
         {
         // Do not add any path inside the source or build tree.
-        const char* topSourceDir = this->Makefile->GetHomeDirectory();
-        const char* topBinaryDir = this->Makefile->GetHomeOutputDirectory();
+        const char* topSourceDir = this->CMakeInstance->GetHomeDirectory();
+        const char* topBinaryDir =
+            this->CMakeInstance->GetHomeOutputDirectory();
         if(!cmSystemTools::ComparePath(*ri, topSourceDir) &&
            !cmSystemTools::ComparePath(*ri, topBinaryDir) &&
            !cmSystemTools::IsSubDirectory(*ri, topSourceDir) &&
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 2a9b72c..c9b6100 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -245,8 +245,10 @@ static bool checkInterfaceDirs(const std::string &prepro,
 {
   const char* installDir =
             target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir = target->Makefile->GetHomeDirectory();
-  const char* topBinaryDir = target->Makefile->GetHomeOutputDirectory();
+  const char* topSourceDir =
+      target->GetLocalGenerator()->GetSourceDirectory();
+  const char* topBinaryDir =
+      target->GetLocalGenerator()->GetBinaryDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 408daab..883b287 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -273,7 +273,7 @@ void cmExtraCodeBlocksGenerator
         }
 
       const std::string &relative = cmSystemTools::RelativePath(
-                         it->second[0]->GetMakefile()->GetHomeDirectory(),
+                         it->second[0]->GetSourceDirectory(),
                          jt->c_str());
       std::vector<std::string> splitted;
       cmSystemTools::SplitPath(relative, splitted, false);
@@ -297,7 +297,7 @@ void cmExtraCodeBlocksGenerator
   tree.BuildVirtualFolder(virtualFolders);
   // And one for <Unit>
   std::string unitFiles;
-  tree.BuildUnit(unitFiles, std::string(mf->GetHomeDirectory()) + "/");
+  tree.BuildUnit(unitFiles, std::string(lgs[0]->GetSourceDirectory()) + "/");
 
   // figure out the compiler
   std::string compiler = this->GetCBCompilerId(mf);
@@ -332,7 +332,7 @@ void cmExtraCodeBlocksGenerator
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
           if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
                                make.c_str(), *lg, compiler.c_str());
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 1884da1..763673e 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -69,11 +69,11 @@ void cmExtraCodeLiteGenerator::Generate()
     this->ConfigName = GetConfigurationName( mf );
 
     if (strcmp(mf->GetCurrentBinaryDirectory(),
-               mf->GetHomeOutputDirectory()) == 0)
+               it->second[0]->GetBinaryDirectory()) == 0)
       {
       workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
-      workspaceSourcePath  = mf->GetHomeDirectory();
+      workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
       this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 659a9ae..214e89f 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -79,8 +79,8 @@ void cmExtraEclipseCDT4Generator
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::Generate()
 {
-  const cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
 
   std::string eclipseVersion = mf->GetSafeDefinition("CMAKE_ECLIPSE_VERSION");
   cmsys::RegularExpression regex(".*([0-9]+\\.[0-9]+).*");
@@ -106,8 +106,8 @@ void cmExtraEclipseCDT4Generator::Generate()
     }
 
   // TODO: Decide if these are local or member variables
-  this->HomeDirectory       = mf->GetHomeDirectory();
-  this->HomeOutputDirectory = mf->GetHomeOutputDirectory();
+  this->HomeDirectory       = lg->GetSourceDirectory();
+  this->HomeOutputDirectory = lg->GetBinaryDirectory();
 
   this->GenerateLinkedResources = mf->IsOn(
                                     "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
@@ -226,7 +226,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
     mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                            cacheEntryName.c_str(), cmState::STRING,
                            true);
-    mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+    mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
     }
   else if (envVarValue==0 && cacheValue!=0)
     {
@@ -247,7 +247,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
       mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                              cacheEntryName.c_str(), cmState::STRING,
                              true);
-      mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+      mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
       }
     }
 
@@ -1089,7 +1089,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           virtDir += prefix;
           virtDir += ti->first;
           std::string buildArgs = "-C \"";
-          buildArgs += makefile->GetHomeOutputDirectory();
+          buildArgs += (*it)->GetBinaryDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 104372c..f14a1cc 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -50,7 +50,7 @@ void cmExtraKateGenerator::Generate()
   const cmMakefile* mf = lg->GetMakefile();
   this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
-                          this->GetPathBasename(mf->GetHomeOutputDirectory()));
+                          this->GetPathBasename(lg->GetBinaryDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
   this->CreateKateProjectFile(lg);
@@ -61,8 +61,7 @@ void cmExtraKateGenerator::Generate()
 void cmExtraKateGenerator::CreateKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  const cmMakefile* mf = lg->GetMakefile();
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
   if (!fout)
@@ -73,9 +72,9 @@ void cmExtraKateGenerator::CreateKateProjectFile(
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"
-    "\t\"directory\": \"" << mf->GetHomeDirectory() << "\",\n"
-    "\t\"files\": [ { " << this->GenerateFilesString(mf) << "} ],\n";
-  this->WriteTargets(mf, fout);
+    "\t\"directory\": \"" << lg->GetSourceDirectory() << "\",\n"
+    "\t\"files\": [ { " << this->GenerateFilesString(lg) << "} ],\n";
+  this->WriteTargets(lg, fout);
   fout << "}\n";
 }
 
@@ -84,15 +83,15 @@ void
 cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
                                    cmGeneratedFileStream& fout) const
 {
-  cmMakefile* mf = lg->GetMakefile();
+  cmMakefile const* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
-  const char* homeOutputDir = mf->GetHomeOutputDirectory();
+  const char* homeOutputDir = lg->GetBinaryDirectory();
 
   fout <<
   "\t\"build\": {\n"
-  "\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
+  "\t\t\"directory\": \"" << lg->GetBinaryDirectory() << "\",\n"
   "\t\t\"default_target\": \"all\",\n"
   "\t\t\"clean_target\": \"clean\",\n";
 
@@ -123,7 +122,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
     std::string currentDir = makefile->GetCurrentBinaryDirectory();
-    bool topLevel = (currentDir == makefile->GetHomeOutputDirectory());
+    bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
       {
@@ -237,8 +236,7 @@ void
 cmExtraKateGenerator::CreateDummyKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  cmMakefile* mf = lg->GetMakefile();
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/";
   filename += this->ProjectName;
   filename += ".kateproject";
@@ -256,22 +254,21 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(
 std::string
 cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
 {
-  cmMakefile* mf = lg->GetMakefile();
-  std::string s = mf->GetHomeDirectory();
+  std::string s = lg->GetSourceDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"git\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/.svn";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"svn\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/";
 
   std::set<std::string> files;
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 363ab2f..21587d6 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -99,8 +99,8 @@ void cmExtraSublimeTextGenerator
     }
 
   const std::string &sourceRootRelativeToOutput = cmSystemTools::RelativePath(
-                     mf->GetHomeOutputDirectory(),
-                     mf->GetHomeDirectory());
+                     lgs[0]->GetBinaryDirectory(),
+                     lgs[0]->GetSourceDirectory());
   // Write the folder entries to the project file
   fout << "{\n";
   fout << "\t\"folders\":\n\t[\n\t";
@@ -108,8 +108,8 @@ void cmExtraSublimeTextGenerator
     {
       fout << "\t{\n\t\t\t\"path\": \"" << sourceRootRelativeToOutput << "\"";
       const std::string &outputRelativeToSourceRoot =
-        cmSystemTools::RelativePath(mf->GetHomeDirectory(),
-                                    mf->GetHomeOutputDirectory());
+        cmSystemTools::RelativePath(lgs[0]->GetSourceDirectory(),
+                                    lgs[0]->GetBinaryDirectory());
       if ((!outputRelativeToSourceRoot.empty()) &&
         ((outputRelativeToSourceRoot.length() < 3) ||
           (outputRelativeToSourceRoot.substr(0, 3) != "../")))
@@ -173,8 +173,8 @@ void cmExtraSublimeTextGenerator::
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index cae5c2f..a913e19 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -68,7 +68,9 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 std::string
 cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
 {
-  return target->GetMakefile()->GetHomeOutputDirectory();
+  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
+      ->GetGeneratorTarget(target);
+  return gt->GetLocalGenerator()->GetHomeOutputDirectory();
 }
 
 std::string
@@ -449,7 +451,7 @@ void cmGhsMultiTargetGenerator::WriteSources(
     cmSystemTools::ConvertToUnixSlashes(sgPath);
     cmGlobalGhsMultiGenerator::AddFilesUpToPath(
       this->GetFolderBuildStreams(), &this->FolderBuildStreams,
-      this->Makefile->GetHomeOutputDirectory(), sgPath,
+      this->LocalGenerator->GetHomeOutputDirectory(), sgPath,
       GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath);
 
     std::string fullSourcePath((*si)->GetFullPath());
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 05f1029..57a8741 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -399,7 +399,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
   bool fatalError = false;
 
   mf->AddDefinition("RUN_CONFIGURE", true);
-  std::string rootBin = mf->GetHomeOutputDirectory();
+  std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory();
   rootBin += cmake::GetCMakeFilesDirectory();
 
   // If the configuration files path has been set,
@@ -2879,10 +2879,8 @@ void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::WriteSummary()
 {
-  cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
-
   // Record all target directories in a central location.
-  std::string fname = mf->GetHomeOutputDirectory();
+  std::string fname = this->CMakeInstance->GetHomeOutputDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 6290907..f82fcb3 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -51,7 +51,7 @@ void cmGlobalKdevelopGenerator::Generate()
     {
     cmMakefile* mf = it->second[0]->GetMakefile();
     std::string outputDir=mf->GetCurrentBinaryDirectory();
-    std::string projectDir=mf->GetHomeDirectory();
+    std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9d8193b..32e6077 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1198,16 +1198,15 @@ void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
 void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
 {
   cmLocalGenerator *lg = this->LocalGenerators[0];
-  cmMakefile* mfRoot = lg->GetMakefile();
 
   std::ostringstream cmd;
   cmd << lg->ConvertToOutputFormat(cmSystemTools::GetCMakeCommand(),
                                    cmLocalGenerator::SHELL)
       << " -H"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetSourceDirectory(),
                                    cmLocalGenerator::SHELL)
       << " -B"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeOutputDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetBinaryDirectory(),
                                    cmLocalGenerator::SHELL);
   WriteRule(*this->RulesFileStream,
             "RERUN_CMAKE",
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 0064713..59633d9 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -785,7 +785,7 @@ cmGlobalUnixMakefileGenerator3
       depends.clear();
 
       cmLocalUnixMakefileGenerator3::EchoProgress progress;
-      progress.Dir = lg->GetMakefile()->GetHomeOutputDirectory();
+      progress.Dir = lg->GetBinaryDirectory();
       progress.Dir += cmake::GetCMakeFilesDirectory();
       {
       std::ostringstream progressArg;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 86a8f87..41021a1 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -312,10 +312,10 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
   std::string argH = "-H";
-  argH += mf->GetHomeDirectory();
+  argH += lg->GetSourceDirectory();
   commandLine.push_back(argH);
   std::string argB = "-B";
-  argB += mf->GetHomeOutputDirectory();
+  argB += lg->GetHomeOutputDirectory();
   commandLine.push_back(argB);
   commandLine.push_back("--check-stamp-list");
   commandLine.push_back(stampList.c_str());
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 840e89f..ea15eb4 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -588,7 +588,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = mf->GetHomeOutputDirectory();
+  std::string checkCache = root->GetHomeOutputDirectory();
   checkCache += "/";
   checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
   checkCache += "cmake.check_cache";
@@ -602,9 +602,9 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   makefileStream << "\n\t" <<
     this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
                  << " -H" << this->ConvertToRelativeForMake(
-                   mf->GetHomeDirectory())
+                   root->GetSourceDirectory())
                  << " -B" << this->ConvertToRelativeForMake(
-                   mf->GetHomeOutputDirectory()) << "\n";
+                   root->GetHomeOutputDirectory()) << "\n";
 }
 
 //----------------------------------------------------------------------------
@@ -3746,7 +3746,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
   // Since this call may have created new cache entries, save the cache:
   //
   root->GetMakefile()->GetCMakeInstance()->SaveCache(
-    root->GetMakefile()->GetHomeOutputDirectory());
+    root->GetHomeOutputDirectory());
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b7833cd..6c442f4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2868,6 +2868,16 @@ cmake* cmLocalGenerator::GetCMakeInstance() const
   return this->GlobalGenerator->GetCMakeInstance();
 }
 
+const char* cmLocalGenerator::GetSourceDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeDirectory();
+}
+
+const char* cmLocalGenerator::GetBinaryDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeOutputDirectory();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index b3bf8cd..2123f1e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -255,6 +255,9 @@ public:
 
   cmake* GetCMakeInstance() const;
 
+  const char* GetSourceDirectory() const;
+  const char* GetBinaryDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index b131a63..bf5afc1 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -399,7 +399,7 @@ cmLocalUnixMakefileGenerator3
       );
     }
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
 
   // Write the rule to the makefile.
@@ -449,7 +449,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefile2.c_str(),localName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
                           localName, depends, commands, true);
@@ -478,7 +478,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefileName.c_str(), makeTargetName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "fast build rule for target.",
                           localName, depends, commands, true);
@@ -496,7 +496,7 @@ void cmLocalUnixMakefileGenerator3
         commands.push_back(this->GetRecursiveMakeCall
                            (makefile2.c_str(), makeTargetName));
         this->CreateCDCommand(commands,
-                              this->Makefile->GetHomeOutputDirectory(),
+                              this->GetBinaryDirectory(),
                               cmLocalGenerator::START_OUTPUT);
         this->WriteMakeRule(ruleFileStream,
                             "Manual pre-install relink rule for target.",
@@ -750,13 +750,13 @@ cmLocalUnixMakefileGenerator3
   makefileStream
     << "# The top-level source directory on which CMake was run.\n"
     << "CMAKE_SOURCE_DIR = "
-    << this->Convert(this->Makefile->GetHomeDirectory(), FULL, SHELL)
+    << this->Convert(this->GetSourceDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
   makefileStream
     << "# The top-level build directory on which CMake was run.\n"
     << "CMAKE_BINARY_DIR = "
-    << this->Convert(this->Makefile->GetHomeOutputDirectory(), FULL, SHELL)
+    << this->Convert(this->GetBinaryDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
 }
@@ -889,7 +889,7 @@ void cmLocalUnixMakefileGenerator3
   if(!this->GetMakefile()->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
-                          this->Makefile->GetHomeOutputDirectory(),
+                          this->GetBinaryDirectory(),
                           cmLocalGenerator::START_OUTPUT);
     }
   this->WriteMakeRule(makefileStream,
@@ -1838,7 +1838,7 @@ void cmLocalUnixMakefileGenerator3
 
   depends.push_back("cmake_check_build_system");
 
-  std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+  std::string progressDir = this->GetBinaryDirectory();
   progressDir += cmake::GetCMakeFilesDirectory();
     {
     std::ostringstream progCmd;
@@ -1862,7 +1862,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
     {
     std::ostringstream progCmd;
@@ -1884,7 +1884,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                                this->Makefile->GetHomeOutputDirectory(),
+                                this->GetBinaryDirectory(),
                                 cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "The main clean target", "clean",
                       depends, commands, true);
@@ -1914,7 +1914,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back
     (this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "Prepare targets for installation.",
                       "preinstall", depends, commands, true);
@@ -1935,7 +1935,7 @@ void cmLocalUnixMakefileGenerator3
   runRule += " 1";
   commands.push_back(runRule);
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "clear depends",
                       "depend",
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index cc94cd4..f794def 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -112,7 +112,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -226,10 +226,10 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetHomeOutputDirectory();
   commandLine.push_back(args);
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a4bce8a..f071109 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -161,7 +161,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -290,10 +290,10 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetHomeOutputDirectory();
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
   std::string stampFilename = this->Convert(stampName.c_str(), FULL,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b278087..8c700a1 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1095,7 +1095,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // translation table for the dependency scanning process.
   depCmd << "cd "
          << (this->LocalGenerator->Convert(
-               this->Makefile->GetHomeOutputDirectory(),
+               this->LocalGenerator->GetBinaryDirectory(),
                cmLocalGenerator::FULL, cmLocalGenerator::SHELL))
          << " && ";
 #endif
@@ -1110,13 +1110,13 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // the state of our local generator sufficiently for its needs.
   depCmd << "$(CMAKE_COMMAND) -E cmake_depends \""
          << this->GlobalGenerator->GetName() << "\" "
-         << this->Convert(this->Makefile->GetHomeDirectory(),
+         << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetHomeOutputDirectory(),
+         << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
@@ -1242,7 +1242,7 @@ void
 cmMakefileTargetGenerator
 ::MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress& progress) const
 {
-  progress.Dir = this->Makefile->GetHomeOutputDirectory();
+  progress.Dir = this->LocalGenerator->GetBinaryDirectory();
   progress.Dir += cmake::GetCMakeFilesDirectory();
   std::ostringstream progressArg;
   progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 84c19a3..fb598e8 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -666,8 +666,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   if (!preLinkCmdLines.empty())
     {
     const std::string homeOutDir = localGen.ConvertToOutputFormat(
-                                              mf->GetHomeOutputDirectory(),
-                                              cmLocalGenerator::SHELL);
+                                            localGen.GetBinaryDirectory(),
+                                            cmLocalGenerator::SHELL);
     preLinkCmdLines.push_back("cd " + homeOutDir);
     }
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 6e6dc60..d792ba7 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -47,7 +47,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // in every directory, which we don't need.
         cmMakefile *mf = target->Target->GetMakefile();
         if (strcmp(mf->GetCurrentSourceDirectory(),
-                   mf->GetHomeDirectory()) == 0)
+                   target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
       }
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 58b901a..3e36589 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -103,13 +103,13 @@ void cmNinjaUtilityTargetGenerator::Generate()
       command,
       "$(CMAKE_SOURCE_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeDirectory(),
+        this->GetLocalGenerator()->GetSourceDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(
       command,
       "$(CMAKE_BINARY_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeOutputDirectory(),
+        this->GetLocalGenerator()->GetBinaryDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(command, "$(ARGS)", "");
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c0eac9eaaacfdf70759794604380c70f8d65b09
commit 0c0eac9eaaacfdf70759794604380c70f8d65b09
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:58:45 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 19:55:51 2015 +0200

    Eclipse: Port API to cmLocalGenerator.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index a17759a..659a9ae 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -196,8 +196,11 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
 
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
-                                            const char* envVar, cmMakefile* mf)
+                                            const char* envVar,
+                                            cmLocalGenerator* lg)
 {
+  cmMakefile* mf = lg->GetMakefile();
+
   // get the variables from the environment and from the cache and then
   // figure out which one to use:
 
@@ -360,17 +363,17 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
   //   but not necessarily when eclipse is open
   if (compilerId == "MSVC")
     {
-    AddEnvVar(fout, "PATH", mf);
-    AddEnvVar(fout, "INCLUDE", mf);
-    AddEnvVar(fout, "LIB", mf);
-    AddEnvVar(fout, "LIBPATH", mf);
+    AddEnvVar(fout, "PATH", lg);
+    AddEnvVar(fout, "INCLUDE", lg);
+    AddEnvVar(fout, "LIB", lg);
+    AddEnvVar(fout, "LIBPATH", lg);
     }
   else if (compilerId == "Intel")
     {
     // if the env.var is set, use this one and put it in the cache
     // if the env.var is not set, but the value is in the cache,
     // use it from the cache:
-    AddEnvVar(fout, "INTEL_LICENSE_FILE", mf);
+    AddEnvVar(fout, "INTEL_LICENSE_FILE", lg);
     }
   fout <<
     "</value>\n"
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index ef99760..16675f2 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -100,7 +100,7 @@ private:
                                    std::set<std::string>& emittedDirs);
 
   static void AddEnvVar(cmGeneratedFileStream& fout, const char* envVar,
-                        cmMakefile* mf);
+                        cmLocalGenerator* lg);
 
   void CreateLinksToSubprojects(cmGeneratedFileStream& fout,
                                 const std::string& baseDir);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a09b1ec39c60823550d4b71b2259a735bf8faa95
commit a09b1ec39c60823550d4b71b2259a735bf8faa95
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:48:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 19:55:44 2015 +0200

    Kate: Remove unused variables.

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 1305ce2..104372c 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -70,9 +70,6 @@ void cmExtraKateGenerator::CreateKateProjectFile(
     return;
     }
 
-  std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
-  std::string args = mf->GetSafeDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
-
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcc75e363d4e09ce3ba323a7a49b62d16125cb3b
commit dcc75e363d4e09ce3ba323a7a49b62d16125cb3b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:49:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 19:52:35 2015 +0200

    Kate: Port API to cmLocalGenerator.

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 126e3e1..1305ce2 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -53,13 +53,15 @@ void cmExtraKateGenerator::Generate()
                           this->GetPathBasename(mf->GetHomeOutputDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
-  this->CreateKateProjectFile(mf);
-  this->CreateDummyKateProjectFile(mf);
+  this->CreateKateProjectFile(lg);
+  this->CreateDummyKateProjectFile(lg);
 }
 
 
-void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
+void cmExtraKateGenerator::CreateKateProjectFile(
+    const cmLocalGenerator* lg) const
 {
+  const cmMakefile* mf = lg->GetMakefile();
   std::string filename = mf->GetHomeOutputDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
@@ -82,9 +84,10 @@ void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
 
 
 void
-cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
+cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
                                    cmGeneratedFileStream& fout) const
 {
+  cmMakefile* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
@@ -234,8 +237,10 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& fout,
 
 
 void
-cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
+cmExtraKateGenerator::CreateDummyKateProjectFile(
+    const cmLocalGenerator* lg) const
 {
+  cmMakefile* mf = lg->GetMakefile();
   std::string filename = mf->GetHomeOutputDirectory();
   filename += "/";
   filename += this->ProjectName;
@@ -252,8 +257,9 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
 
 
 std::string
-cmExtraKateGenerator::GenerateFilesString(const cmMakefile* mf) const
+cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
 {
+  cmMakefile* mf = lg->GetMakefile();
   std::string s = mf->GetHomeDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index f800feb..b20d0a7 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -39,9 +39,10 @@ public:
 
   virtual void Generate();
 private:
-  void CreateKateProjectFile(const cmMakefile* mf) const;
-  void CreateDummyKateProjectFile(const cmMakefile* mf) const;
-  void WriteTargets(const cmMakefile* mf, cmGeneratedFileStream& fout) const;
+  void CreateKateProjectFile(const cmLocalGenerator* lg) const;
+  void CreateDummyKateProjectFile(const cmLocalGenerator* lg) const;
+  void WriteTargets(const cmLocalGenerator* lg,
+                    cmGeneratedFileStream& fout) const;
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string&     target,
                     const std::string&     make,
@@ -49,7 +50,7 @@ private:
                     const std::string&     path,
                     const char*            homeOutputDir) const;
 
-  std::string GenerateFilesString(const cmMakefile* mf) const;
+  std::string GenerateFilesString(const cmLocalGenerator* lg) const;
   std::string GetPathBasename(const std::string& path) const;
   std::string GenerateProjectName(const std::string& name,
                                   const std::string& type,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06ca5bac6eef5afa951fbf935cd496ff4da414ca
commit 06ca5bac6eef5afa951fbf935cd496ff4da414ca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:44:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 19:52:35 2015 +0200

    export: Port internal method to cmGeneratorTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 881acee..2a9b72c 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -241,12 +241,12 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target, const std::string& prop)
+                      cmGeneratorTarget *target, const std::string& prop)
 {
   const char* installDir =
-            target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir = target->GetMakefile()->GetHomeDirectory();
-  const char* topBinaryDir = target->GetMakefile()->GetHomeOutputDirectory();
+            target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
+  const char* topSourceDir = target->Makefile->GetHomeDirectory();
+  const char* topBinaryDir = target->Makefile->GetHomeOutputDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
@@ -269,7 +269,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch (target->GetPolicyStatusCMP0041())
+        switch (target->Target->GetPolicyStatusCMP0041())
           {
           case cmPolicies::WARN:
             messageType = cmake::WARNING;
@@ -298,7 +298,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains relative path:\n"
            "  \"" << *li << "\"";
-      target->GetMakefile()->IssueMessage(messageType, e.str());
+      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
       }
     bool inBinary = isSubDirectory(li->c_str(), topBinaryDir);
     bool inSource = isSubDirectory(li->c_str(), topSourceDir);
@@ -316,7 +316,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         {
         if (!shouldContinue)
           {
-          switch(target->GetPolicyStatusCMP0052())
+          switch(target->Target->GetPolicyStatusCMP0052())
             {
             case cmPolicies::WARN:
               {
@@ -329,7 +329,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
                 "a subdirectory of the " << (inBinary ? "build" : "source")
                 << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
                 << "\"" << std::endl;
-              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+              target->GetLocalGenerator()->IssueMessage(cmake::AUTHOR_WARNING,
                                                   s.str());
               }
             case cmPolicies::OLD:
@@ -352,7 +352,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
-      target->GetMakefile()->IssueMessage(messageType, e.str());
+      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
       }
     if (!inSourceBuild)
       {
@@ -361,7 +361,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         e << "Target \"" << target->GetName() << "\" " << prop <<
             " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
-        target->GetMakefile()->IssueMessage(messageType, e.str());
+        target->GetLocalGenerator()->IssueMessage(messageType, e.str());
         }
       }
     }
@@ -421,7 +421,9 @@ void cmExportFileGenerator::PopulateSourcesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    cmGeneratorTarget* gt = target->GetMakefile()
+        ->GetGlobalGenerator()->GetGeneratorTarget(target);
+    if (!checkInterfaceDirs(prepro, gt, propName))
       {
       return;
       }
@@ -491,7 +493,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target->Target, propName))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e37130c450c22f99a3c39ca79a5457b0b5ea38f
commit 1e37130c450c22f99a3c39ca79a5457b0b5ea38f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:37:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 19:52:35 2015 +0200

    cmLocalGenerator: Add cmake instance accessor.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 341b2c3..b7833cd 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2863,6 +2863,11 @@ cmLocalGenerator
   return source.GetLanguage();
 }
 
+cmake* cmLocalGenerator::GetCMakeInstance() const
+{
+  return this->GlobalGenerator->GetCMakeInstance();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index c08701d..b3bf8cd 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -253,6 +253,8 @@ public:
    */
   bool NeedBackwardsCompatibility_2_4();
 
+  cmake* GetCMakeInstance() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcb25eab9fba90e318d7fe91a662c096ab92e7a5
commit bcb25eab9fba90e318d7fe91a662c096ab92e7a5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:45:55 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 19:52:18 2015 +0200

    cmMakefile: Remove unused GetProjectName calls.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ab9178d..5caa272 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2033,11 +2033,6 @@ void cmMakefile::SetProjectName(std::string const& p)
   this->StateSnapshot.SetProjectName(p);
 }
 
-std::string cmMakefile::GetProjectName() const
-{
-  return this->StateSnapshot.GetProjectName();
-}
-
 void cmMakefile::AddGlobalLinkInformation(const std::string& name,
                                           cmTarget& target)
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8724c6e..7057157 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -274,11 +274,6 @@ public:
    */
   void SetProjectName(std::string const& name);
 
-  /**
-   * Get the name of the project for this build.
-   */
-  std::string GetProjectName() const;
-
   /** Get the configurations to be generated.  */
   std::string GetConfigurations(std::vector<std::string>& configs,
                                 bool single = true) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b04f5bfea49c228205bb503532d8ee3e4e9be8c
commit 2b04f5bfea49c228205bb503532d8ee3e4e9be8c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:29:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 18:39:15 2015 +0200

    cmLocalGenerator: Add GetProjectName method.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index dfd51c7..408daab 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -78,7 +78,7 @@ void cmExtraCodeBlocksGenerator::CreateProjectFile(
 {
   const cmMakefile* mf=lgs[0]->GetMakefile();
   std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=mf->GetProjectName();
+  std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
   filename+=projectName+".cbp";
@@ -307,7 +307,7 @@ void cmExtraCodeBlocksGenerator
         "<CodeBlocks_project_file>\n"
         "   <FileVersion major=\"1\" minor=\"6\" />\n"
         "   <Project>\n"
-        "      <Option title=\"" << mf->GetProjectName()<<"\" />\n"
+        "      <Option title=\"" << lgs[0]->GetProjectName()<<"\" />\n"
         "      <Option makefile_is_custom=\"1\" />\n"
         "      <Option compiler=\"" << compiler << "\" />\n"
         "      "<<virtualFolders<<"\n"
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index c2cff14..1884da1 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -72,7 +72,7 @@ void cmExtraCodeLiteGenerator::Generate()
                mf->GetHomeOutputDirectory()) == 0)
       {
       workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
-      workspaceProjectName = mf->GetProjectName();
+      workspaceProjectName = it->second[0]->GetProjectName();
       workspaceSourcePath  = mf->GetHomeDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
@@ -93,7 +93,7 @@ void cmExtraCodeLiteGenerator::Generate()
     // retrive project information
     const cmMakefile* mf    = it->second[0]->GetMakefile();
     std::string outputDir   = mf->GetCurrentBinaryDirectory();
-    std::string projectName = mf->GetProjectName();
+    std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
     // Make the project file relative to the workspace
@@ -123,7 +123,7 @@ void cmExtraCodeLiteGenerator::CreateProjectFile(
 {
   const cmMakefile* mf    = lgs[0]->GetMakefile();
   std::string outputDir   = mf->GetCurrentBinaryDirectory();
-  std::string projectName = mf->GetProjectName();
+  std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
   filename += projectName + ".project";
@@ -143,7 +143,7 @@ void cmExtraCodeLiteGenerator
 
   ////////////////////////////////////
   fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-       "<CodeLite_Project Name=\"" << mf->GetProjectName()
+       "<CodeLite_Project Name=\"" << lgs[0]->GetProjectName()
        << "\" InternalType=\"\">\n";
 
   // Collect all used source files in the project
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 44bf586..a17759a 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -157,9 +157,8 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
   assert(this->HomeDirectory != this->HomeOutputDirectory);
 
   // set up the project name: <project>-Source@<baseSourcePathName>
-  const cmMakefile* mf
-     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
-  std::string name = this->GenerateProjectName(mf->GetProjectName(), "Source",
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  std::string name = this->GenerateProjectName(lg->GetProjectName(), "Source",
                                    this->GetPathBasename(this->HomeDirectory));
 
   const std::string filename = this->HomeDirectory + "/.project";
@@ -259,8 +258,8 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::CreateProjectFile()
 {
-  cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  cmMakefile* mf = lg->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.project";
 
@@ -280,7 +279,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
     "<projectDescription>\n"
     "\t<name>" <<
-    this->GenerateProjectName(mf->GetProjectName(),
+    this->GenerateProjectName(lg->GetProjectName(),
                               mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                               this->GetPathBasename(this->HomeOutputDirectory))
     << "</name>\n"
@@ -694,8 +693,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 {
   std::set<std::string> emmited;
 
-  const cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.cproject";
 
@@ -1149,8 +1148,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   fout << "</cconfiguration>\n"
           "</storageModule>\n"
           "<storageModule moduleId=\"cdtBuildSystem\" version=\"4.0.0\">\n"
-          "<project id=\"" << this->EscapeForXML(mf->GetProjectName())
-       << ".null.1\" name=\"" << this->EscapeForXML(mf->GetProjectName())
+          "<project id=\"" << this->EscapeForXML(lg->GetProjectName())
+       << ".null.1\" name=\"" << this->EscapeForXML(lg->GetProjectName())
        << "\"/>\n"
           "</storageModule>\n"
           "</cproject>\n"
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f83b5cf..126e3e1 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -46,9 +46,9 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 
 void cmExtraKateGenerator::Generate()
 {
-  const cmMakefile* mf
-     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
-  this->ProjectName = this->GenerateProjectName(mf->GetProjectName(),
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
+  this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                           this->GetPathBasename(mf->GetHomeOutputDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 163a75b..363ab2f 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -79,7 +79,7 @@ void cmExtraSublimeTextGenerator::CreateProjectFile(
 {
   const cmMakefile* mf=lgs[0]->GetMakefile();
   std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=mf->GetProjectName();
+  std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
                      outputDir + "/" + projectName + ".sublime-project";
@@ -302,7 +302,7 @@ void cmExtraSublimeTextGenerator::
     {
     fout << ",\n\t";
     }
-  fout << "\t{\n\t\t\t\"name\": \"" << makefile->GetProjectName() << " - " <<
+  fout << "\t{\n\t\t\t\"name\": \"" << lg->GetProjectName() << " - " <<
           targetName << "\",\n";
   fout << "\t\t\t\"cmd\": [" <<
           this->BuildMakeCommand(make, makefileName.c_str(), targetName) <<
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 138ddbb..6290907 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -52,7 +52,7 @@ void cmGlobalKdevelopGenerator::Generate()
     cmMakefile* mf = it->second[0]->GetMakefile();
     std::string outputDir=mf->GetCurrentBinaryDirectory();
     std::string projectDir=mf->GetHomeDirectory();
-    std::string projectName=mf->GetProjectName();
+    std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
     const std::vector<cmLocalGenerator*>& lgs= it->second;
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 14de698..d5e9417 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -260,7 +260,7 @@ void cmGlobalVisualStudio6Generator
     }
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetMakefile()->GetProjectName();
+  fname += root->GetProjectName();
   fname += ".dsw";
   cmsys::ofstream fout(fname.c_str());
   if(!fout)
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 05da022..73a952b 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -362,10 +362,10 @@ void cmGlobalVisualStudio7Generator
     {
     return;
     }
-  this->CurrentProject = root->GetMakefile()->GetProjectName();
+  this->CurrentProject = root->GetProjectName();
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetMakefile()->GetProjectName();
+  fname += root->GetProjectName();
   fname += ".sln";
   cmGeneratedFileStream fout(fname.c_str());
   fout.SetCopyIfDifferent(true);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d45aa27..6a25ed0 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -250,7 +250,7 @@ cmGlobalVisualStudioGenerator
         {
         topLevelSlnName = mf->GetCurrentBinaryDirectory();
         topLevelSlnName += "/";
-        topLevelSlnName += mf->GetProjectName();
+        topLevelSlnName += this->LocalGenerators[0]->GetProjectName();
         topLevelSlnName += ".sln";
         }
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 746e1a7..840e89f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -410,7 +410,7 @@ void cmGlobalXCodeGenerator::Generate()
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
-  this->CurrentProject = root->GetMakefile()->GetProjectName();
+  this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
@@ -3339,7 +3339,7 @@ bool cmGlobalXCodeGenerator
   this->RootObject->SetComment("Project object");
 
   std::string project_id = "PROJECT_";
-  project_id += root->GetMakefile()->GetProjectName();
+  project_id += root->GetProjectName();
   this->RootObject->SetId(this->GetOrCreateId(
     project_id.c_str(), this->RootObject->GetId()).c_str());
 
@@ -3726,7 +3726,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     }
   std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
   xcodeDir += "/";
-  xcodeDir += root->GetMakefile()->GetProjectName();
+  xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
   if(this->XcodeVersion > 20)
     {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b26151c..341b2c3 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2431,6 +2431,11 @@ const char* cmLocalGenerator::GetFeature(const std::string& feature,
   return 0;
 }
 
+std::string cmLocalGenerator::GetProjectName() const
+{
+  return this->StateSnapshot.GetProjectName();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::ConstructComment(cmCustomCommandGenerator const& ccg,
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 33fede1..c08701d 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -182,6 +182,8 @@ public:
                              const std::string& config,
                              const std::string& lang);
 
+  std::string GetProjectName() const;
+
   /** Compute the language used to compile the given source file.  */
   std::string GetSourceFileLanguage(const cmSourceFile& source);
 
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index c46adc1..b1e1d3f 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -183,7 +183,7 @@ void cmLocalNinjaGenerator::WriteProjectHeader(std::ostream& os)
 {
   cmGlobalNinjaGenerator::WriteDivider(os);
   os
-    << "# Project: " << this->GetMakefile()->GetProjectName() << std::endl
+    << "# Project: " << this->GetProjectName() << std::endl
     << "# Configuration: " << this->ConfigName << std::endl
     ;
   cmGlobalNinjaGenerator::WriteDivider(os);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efce39b8ee2b80e6b6542bdf263a2d196d978126
commit efce39b8ee2b80e6b6542bdf263a2d196d978126
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:19:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 18:39:15 2015 +0200

    cmCPluginAPI: Inline code to get project name.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 7da334e..e3efcdd 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -116,7 +116,7 @@ const char* CCONV cmGetProjectName(void *arg)
 {
   cmMakefile *mf = static_cast<cmMakefile *>(arg);
   static std::string name;
-  name = mf->GetProjectName();
+  name = mf->GetStateSnapshot().GetProjectName();
   return name.c_str();
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d00e7adc0cabc91ea8845f4037ba65278a1ad10
commit 3d00e7adc0cabc91ea8845f4037ba65278a1ad10
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:17:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 18:39:15 2015 +0200

    cmMakefile: Inline initialization of project name.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 077470d..ab9178d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1517,7 +1517,7 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
                     parent->GetProperty("LINK_DIRECTORIES"));
 
   // the initial project name
-  this->SetProjectName(parent->GetProjectName());
+  this->StateSnapshot.SetProjectName(parent->StateSnapshot.GetProjectName());
 
   // Copy include regular expressions.
   this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake                      |    2 +-
 Source/cmCPluginAPI.cxx                        |    2 +-
 Source/cmComputeLinkInformation.cxx            |    5 +-
 Source/cmCustomCommandGenerator.cxx            |    2 +-
 Source/cmDependsFortran.cxx                    |    2 +-
 Source/cmExportFileGenerator.cxx               |   28 ++++++-----
 Source/cmExtraCodeBlocksGenerator.cxx          |   24 +++++-----
 Source/cmExtraCodeLiteGenerator.cxx            |   24 +++++-----
 Source/cmExtraEclipseCDT4Generator.cxx         |   59 ++++++++++++------------
 Source/cmExtraEclipseCDT4Generator.h           |    2 +-
 Source/cmExtraKateGenerator.cxx                |   50 ++++++++++----------
 Source/cmExtraKateGenerator.h                  |    9 ++--
 Source/cmExtraSublimeTextGenerator.cxx         |   19 ++++----
 Source/cmGeneratorExpressionEvaluationFile.cxx |    2 +-
 Source/cmGhsMultiTargetGenerator.cxx           |    6 ++-
 Source/cmGlobalGenerator.cxx                   |    8 ++--
 Source/cmGlobalKdevelopGenerator.cxx           |    7 ++-
 Source/cmGlobalNinjaGenerator.cxx              |    5 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |   12 ++---
 Source/cmGlobalVisualStudio6Generator.cxx      |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx      |    9 ++--
 Source/cmGlobalVisualStudio8Generator.cxx      |    4 +-
 Source/cmGlobalVisualStudioGenerator.cxx       |    2 +-
 Source/cmGlobalXCodeGenerator.cxx              |   47 ++++++++++---------
 Source/cmInstallExportGenerator.cxx            |    2 +-
 Source/cmLocalGenerator.cxx                    |   30 ++++++++++++
 Source/cmLocalGenerator.h                      |   10 ++++
 Source/cmLocalNinjaGenerator.cxx               |    4 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |   24 +++++-----
 Source/cmLocalVisualStudio6Generator.cxx       |   24 +++++-----
 Source/cmLocalVisualStudio7Generator.cxx       |   24 +++++-----
 Source/cmMakefile.cxx                          |    7 +--
 Source/cmMakefile.h                            |    5 --
 Source/cmMakefileTargetGenerator.cxx           |   24 +++++-----
 Source/cmNinjaNormalTargetGenerator.cxx        |    4 +-
 Source/cmNinjaTargetGenerator.cxx              |    5 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |    4 +-
 Source/cmVisualStudio10TargetGenerator.cxx     |   16 +++----
 38 files changed, 272 insertions(+), 243 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 14:18:21 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 14:18:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-158-g5e86676
Message-ID: <20151007181821.59338BF964@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5e866769024f5a88fc7c28bbd6550266af71b0e6 (commit)
       via  af71c7b47947860d06c659647c6ff33ab3676284 (commit)
      from  79b5e37a46ce05a28ec5d596ef57bf4f3072a3bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e866769024f5a88fc7c28bbd6550266af71b0e6
commit 5e866769024f5a88fc7c28bbd6550266af71b0e6
Merge: 79b5e37 af71c7b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 14:18:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 14:18:20 2015 -0400

    Merge topic 'cmGeneratorTarget-sources' into next
    
    af71c7b4 cmTarget: Remove Compute method.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af71c7b47947860d06c659647c6ff33ab3676284
commit af71c7b47947860d06c659647c6ff33ab3676284
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 12 21:54:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:17:55 2015 +0200

    cmTarget: Remove Compute method.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a62d534..db842b0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1538,7 +1538,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
         ti != targets.end(); ++ti)
       {
       cmTarget* t = &ti->second;
-      t->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
       generatorTargets[t] = gt;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 5bace47..ab9d7e7 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -254,7 +254,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
     mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false,
                           no_working_directory, no_depends,
                           noCommandLines);
-  tgt->Compute();
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   mf->AddGeneratorTarget(tgt, gt);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index fd2d33a..d45aa27 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -86,7 +86,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           no_depends, no_commands, false,
                           "Build all projects");
 
-      allBuild->Compute();
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 14bc340..3d52e3a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -456,7 +456,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         no_working_directory,
                         "echo", "Build all projects");
 
-  allbuild->Compute();
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
@@ -492,7 +491,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           no_working_directory,
                           "make", "-f", file.c_str());
 
-    check->Compute();
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     mf->AddGeneratorTarget(check, checkGt);
     }
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 1b1b98e..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -885,8 +885,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 /*byproducts=*/rcc_output, depends,
                                 commandLines, false, autogenComment.c_str());
 
-    autogenTarget->Compute();
-
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     makefile->AddGeneratorTarget(autogenTarget, gt);
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e87aa16..abfc40b 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -361,10 +361,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 }
 
-void cmTarget::Compute()
-{
-}
-
 //----------------------------------------------------------------------------
 void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 71f0d1f..354eda2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -133,8 +133,6 @@ public:
   void AddPostBuildCommand(cmCustomCommand const &cmd)
     {this->PostBuildCommands.push_back(cmd);}
 
-  void Compute();
-
   /**
    * Add sources to the target.
    */

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 14:20:03 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 14:20:03 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-162-g09854f3
Message-ID: <20151007182003.100D3BFA99@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  09854f3ce8bcfb401eb27390c881d92a2a85a1da (commit)
       via  28749903b67d71b35f6ff74dab7c6db1a648a1c8 (commit)
       via  6c02f62f75735f6e60549ef53b06bd87e843bc35 (commit)
       via  360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7 (commit)
      from  5e866769024f5a88fc7c28bbd6550266af71b0e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09854f3ce8bcfb401eb27390c881d92a2a85a1da
commit 09854f3ce8bcfb401eb27390c881d92a2a85a1da
Merge: 5e86676 2874990
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 14:20:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 14:20:02 2015 -0400

    Merge topic 'refactor-current-dir-initialization' into next
    
    28749903 cmState: Internalize the initialization of a snapshot from its parent.
    6c02f62f Remove now-unused directory setters.
    360e4e1d Set the current dirs on the snapshot before creating the cmMakefile.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28749903b67d71b35f6ff74dab7c6db1a648a1c8
commit 28749903b67d71b35f6ff74dab7c6db1a648a1c8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 00:33:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:19:42 2015 +0200

    cmState: Internalize the initialization of a snapshot from its parent.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2c9dfbb..c060505 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1761,8 +1761,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
                                            this->ContextStack.back()->Name,
                                            this->ContextStack.back()->Line);
 
-  newSnapshot.InitializeFromParent();
-
   newSnapshot.GetDirectory().SetCurrentSource(srcPath);
   newSnapshot.GetDirectory().SetCurrentBinary(binPath);
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index ce9ff32..db7519b 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -805,8 +805,10 @@ cmState::CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot,
   pos->Parent = origin;
   pos->Root = origin;
   pos->Vars = this->VarTree.Extend(origin);
+
   cmState::Snapshot snapshot = cmState::Snapshot(this, pos);
   originSnapshot.Position->BuildSystemDirectory->Children.push_back(snapshot);
+  snapshot.InitializeFromParent();
   return snapshot;
 }
 
diff --git a/Source/cmState.h b/Source/cmState.h
index 99e537c..1ffc4bf 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -75,8 +75,6 @@ public:
     Snapshot GetCallStackParent() const;
     SnapshotType GetType() const;
 
-    void InitializeFromParent();
-
     void SetPolicy(cmPolicies::PolicyID id, cmPolicies::PolicyStatus status);
     cmPolicies::PolicyStatus GetPolicy(cmPolicies::PolicyID id) const;
     bool HasDefinedPolicyCMP0011();
@@ -105,6 +103,9 @@ public:
     friend class cmState;
     friend class Directory;
     friend struct StrictWeakOrder;
+
+    void InitializeFromParent();
+
     cmState* State;
     cmState::PositionType Position;
   };

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c02f62f75735f6e60549ef53b06bd87e843bc35
commit 6c02f62f75735f6e60549ef53b06bd87e843bc35
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 6 00:24:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:19:42 2015 +0200

    Remove now-unused directory setters.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 11a949f..2c9dfbb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1784,26 +1784,11 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
     }
 }
 
-void cmMakefile::SetCurrentSourceDirectory(const std::string& dir)
-{
-  this->StateSnapshot.GetDirectory().SetCurrentSource(dir);
-  this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
-                      this->StateSnapshot.GetDirectory().GetCurrentSource());
-}
-
 const char* cmMakefile::GetCurrentSourceDirectory() const
 {
   return this->StateSnapshot.GetDirectory().GetCurrentSource();
 }
 
-void cmMakefile::SetCurrentBinaryDirectory(const std::string& dir)
-{
-  this->StateSnapshot.GetDirectory().SetCurrentBinary(dir);
-  const char* binDir = this->StateSnapshot.GetDirectory().GetCurrentBinary();
-  cmSystemTools::MakeDirectory(binDir);
-  this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", binDir);
-}
-
 const char* cmMakefile::GetCurrentBinaryDirectory() const
 {
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8724c6e..459d34c 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -353,9 +353,7 @@ public:
    */
   void SetArgcArgv(const std::vector<std::string>& args);
 
-  void SetCurrentSourceDirectory(const std::string& dir);
   const char* GetCurrentSourceDirectory() const;
-  void SetCurrentBinaryDirectory(const std::string& dir);
   const char* GetCurrentBinaryDirectory() const;
 
   //@}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7
commit 360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 31 01:57:04 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:19:41 2015 +0200

    Set the current dirs on the snapshot before creating the cmMakefile.
    
    The cmMakefile should get a fully prepared snapshot and not clobber its
    definitions.  It should eventually be able to process list files from any
    starting-point snapshot, though that is some refactoring away still.

diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 2f125aa..b9016af 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -318,16 +318,13 @@ void cmCTestScriptHandler::CreateCMake()
   this->GlobalGenerator = new cmGlobalGenerator(this->CMake);
 
   cmState::Snapshot snapshot = this->CMake->GetCurrentSnapshot();
+  std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
+  snapshot.GetDirectory().SetCurrentSource(cwd);
+  snapshot.GetDirectory().SetCurrentBinary(cwd);
   this->Makefile = new cmMakefile(this->GlobalGenerator, snapshot);
 
   this->CMake->SetProgressCallback(ctestScriptProgressCallback, this->CTest);
 
-  // Set CMAKE_CURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR.
-  // Also, some commands need Makefile->GetCurrentSourceDirectory().
-  std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
-  this->Makefile->SetCurrentSourceDirectory(cwd);
-  this->Makefile->SetCurrentBinaryDirectory(cwd);
-
   // remove all cmake commands which are not scriptable, since they can't be
   // used in ctest scripts
   this->CMake->GetState()->RemoveUnscriptableCommands();
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 05f1029..715a927 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1108,16 +1108,16 @@ void cmGlobalGenerator::Configure()
   this->FirstTimeProgress = 0.0f;
   this->ClearGeneratorMembers();
 
-  cmMakefile* dirMf =
-      new cmMakefile(this, this->GetCMakeInstance()->GetCurrentSnapshot());
-  this->Makefiles.push_back(dirMf);
+  cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot();
 
-  // set the Start directories
-  dirMf->SetCurrentSourceDirectory
+  snapshot.GetDirectory().SetCurrentSource
     (this->CMakeInstance->GetHomeDirectory());
-  dirMf->SetCurrentBinaryDirectory
+  snapshot.GetDirectory().SetCurrentBinary
     (this->CMakeInstance->GetHomeOutputDirectory());
 
+  cmMakefile* dirMf = new cmMakefile(this, snapshot);
+  this->Makefiles.push_back(dirMf);
+
   this->BinaryDirectories.insert(
       this->CMakeInstance->GetHomeOutputDirectory());
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 0064713..cb13fcf 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -585,12 +585,11 @@ void cmGlobalUnixMakefileGenerator3
     else
       {
       cmState::Snapshot snapshot = this->CMakeInstance->GetCurrentSnapshot();
-      mf = new cmMakefile(this, snapshot);
-      // set the Start directories
-      mf->SetCurrentSourceDirectory
+      snapshot.GetDirectory().SetCurrentSource
         (this->CMakeInstance->GetHomeDirectory());
-      mf->SetCurrentBinaryDirectory
+      snapshot.GetDirectory().SetCurrentBinary
         (this->CMakeInstance->GetHomeOutputDirectory());
+      mf = new cmMakefile(this, snapshot);
       }
 
     std::string tname = targetName;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e522320..11a949f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -120,15 +120,34 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
   this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$");
 #endif
 
+  this->AddDefinition("CMAKE_SOURCE_DIR",
+                      this->GetCMakeInstance()->GetHomeDirectory());
+  this->AddDefinition("CMAKE_BINARY_DIR",
+                      this->GetCMakeInstance()->GetHomeOutputDirectory());
   {
-  const char* dir = this->GetCMakeInstance()->GetHomeDirectory();
-  this->AddDefinition("CMAKE_SOURCE_DIR", dir);
-  this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", dir);
+  const char* dir = this->StateSnapshot.GetDirectory().GetCurrentSource();
+  if (dir)
+    {
+    this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", dir);
+    }
+  else
+    {
+    this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
+                        this->GetCMakeInstance()->GetHomeDirectory());
+    }
   }
   {
-  const char* dir = this->GetCMakeInstance()->GetHomeOutputDirectory();
-  this->AddDefinition("CMAKE_BINARY_DIR", dir);
-  this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", dir);
+  const char* dir = this->StateSnapshot.GetDirectory().GetCurrentBinary();
+  if (dir)
+    {
+    cmSystemTools::MakeDirectory(dir);
+    this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", dir);
+    }
+  else
+    {
+    this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
+                        this->GetCMakeInstance()->GetHomeOutputDirectory());
+    }
   }
 }
 
@@ -1472,11 +1491,6 @@ void cmMakefile::AddLinkLibrary(const std::string& lib)
 
 void cmMakefile::InitializeFromParent(cmMakefile* parent)
 {
-  this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
-                      this->GetCurrentSourceDirectory());
-  this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
-                      this->GetCurrentBinaryDirectory());
-
   this->SystemIncludeDirectories = parent->SystemIncludeDirectories;
 
   // define flags
@@ -1747,14 +1761,13 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
                                            this->ContextStack.back()->Name,
                                            this->ContextStack.back()->Line);
 
-  cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot);
-  this->GetGlobalGenerator()->AddMakefile(subMf);
+  newSnapshot.InitializeFromParent();
 
-  // set the subdirs start dirs
-  subMf->SetCurrentSourceDirectory(srcPath);
-  subMf->SetCurrentBinaryDirectory(binPath);
+  newSnapshot.GetDirectory().SetCurrentSource(srcPath);
+  newSnapshot.GetDirectory().SetCurrentBinary(binPath);
 
-  subMf->StateSnapshot.InitializeFromParent();
+  cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot);
+  this->GetGlobalGenerator()->AddMakefile(subMf);
 
   if(excludeFromAll)
     {
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index bbeb3dc..36b1305 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -178,9 +178,10 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
   cmGlobalGenerator gg(&cm);
 
   cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
+  snapshot.GetDirectory().SetCurrentBinary(targetDirectory);
+  snapshot.GetDirectory().SetCurrentSource(targetDirectory);
+
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, snapshot));
-  mf->SetCurrentBinaryDirectory(targetDirectory);
-  mf->SetCurrentSourceDirectory(targetDirectory);
   gg.SetCurrentMakefile(mf.get());
 
   this->ReadAutogenInfoFile(mf.get(), targetDirectory, config);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2aa092a..fececfd 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -377,11 +377,11 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
     this->SetHomeDirectory(cmSystemTools::GetCurrentWorkingDirectory());
     this->SetHomeOutputDirectory(cmSystemTools::GetCurrentWorkingDirectory());
     cmState::Snapshot snapshot = this->GetCurrentSnapshot();
-    cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
-    mf->SetCurrentBinaryDirectory
+    snapshot.GetDirectory().SetCurrentBinary
       (cmSystemTools::GetCurrentWorkingDirectory());
-    mf->SetCurrentSourceDirectory
+    snapshot.GetDirectory().SetCurrentSource
       (cmSystemTools::GetCurrentWorkingDirectory());
+    cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
     if (this->GetWorkingMode() != NORMAL_MODE)
       {
       std::string file(cmSystemTools::CollapseFullPath(path));
@@ -418,13 +418,13 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
   this->SetGlobalGenerator(gg);
 
   cmState::Snapshot snapshot = this->GetCurrentSnapshot();
+  snapshot.GetDirectory().SetCurrentBinary
+    (cmSystemTools::GetCurrentWorkingDirectory());
+  snapshot.GetDirectory().SetCurrentSource
+    (cmSystemTools::GetCurrentWorkingDirectory());
   // read in the list file to fill the cache
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
   cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
-  mf->SetCurrentBinaryDirectory
-    (cmSystemTools::GetCurrentWorkingDirectory());
-  mf->SetCurrentSourceDirectory
-    (cmSystemTools::GetCurrentWorkingDirectory());
 
   mf->SetArgcArgv(args);
 
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index f44c77d..ca46111 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -769,11 +769,13 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         {
         cm.SetGlobalGenerator(ggd);
         cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
+        snapshot.GetDirectory().SetCurrentBinary
+          (cmSystemTools::GetCurrentWorkingDirectory());
+        snapshot.GetDirectory().SetCurrentSource
+          (cmSystemTools::GetCurrentWorkingDirectory());
         cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(ggd, snapshot));
         cmsys::auto_ptr<cmLocalGenerator> lgd(
               ggd->CreateLocalGenerator(mf.get()));
-        lgd->GetMakefile()->SetCurrentSourceDirectory(startDir);
-        lgd->GetMakefile()->SetCurrentBinaryDirectory(startOutDir);
 
         // Actually scan dependencies.
         return lgd->UpdateDependencies(depInfo.c_str(),

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 14:40:28 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 14:40:28 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-164-gbd87ae1
Message-ID: <20151007184028.DE25BBCEDD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  bd87ae1dcc2f2c01ea806268185b075f0bc97c9e (commit)
       via  a103f41a1a63912bb82f18d36a0bc5a849971b2f (commit)
      from  09854f3ce8bcfb401eb27390c881d92a2a85a1da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd87ae1dcc2f2c01ea806268185b075f0bc97c9e
commit bd87ae1dcc2f2c01ea806268185b075f0bc97c9e
Merge: 09854f3 a103f41
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 14:40:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 14:40:28 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    a103f41a fixup! cmLocalGenerator: Add Home directory accessors.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a103f41a1a63912bb82f18d36a0bc5a849971b2f
commit a103f41a1a63912bb82f18d36a0bc5a849971b2f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 20:40:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:40:09 2015 +0200

    fixup! cmLocalGenerator: Add Home directory accessors.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index a913e19..4a362d8 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -70,7 +70,7 @@ cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
 {
   cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
       ->GetGeneratorTarget(target);
-  return gt->GetLocalGenerator()->GetHomeOutputDirectory();
+  return gt->GetLocalGenerator()->GetBinaryDirectory();
 }
 
 std::string
@@ -451,7 +451,7 @@ void cmGhsMultiTargetGenerator::WriteSources(
     cmSystemTools::ConvertToUnixSlashes(sgPath);
     cmGlobalGhsMultiGenerator::AddFilesUpToPath(
       this->GetFolderBuildStreams(), &this->FolderBuildStreams,
-      this->LocalGenerator->GetHomeOutputDirectory(), sgPath,
+      this->LocalGenerator->GetBinaryDirectory(), sgPath,
       GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath);
 
     std::string fullSourcePath((*si)->GetFullPath());
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 41021a1..0a6844e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -315,7 +315,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
   argH += lg->GetSourceDirectory();
   commandLine.push_back(argH);
   std::string argB = "-B";
-  argB += lg->GetHomeOutputDirectory();
+  argB += lg->GetBinaryDirectory();
   commandLine.push_back(argB);
   commandLine.push_back("--check-stamp-list");
   commandLine.push_back(stampList.c_str());
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 84d5ea4..b84cbc5 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -229,7 +229,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 000b843..90c17c6 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -293,7 +293,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
   std::string stampFilename = this->Convert(stampName.c_str(), FULL,

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGhsMultiTargetGenerator.cxx      |    4 ++--
 Source/cmGlobalVisualStudio8Generator.cxx |    2 +-
 Source/cmLocalVisualStudio6Generator.cxx  |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx  |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 14:41:03 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 14:41:03 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-169-gfa30a5b
Message-ID: <20151007184103.569EABF00E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fa30a5b222994d34b85ee015fd00427cbce59703 (commit)
       via  c2a2122ddd75d1da54ce20fc31c38be541ba2495 (commit)
       via  5535c9e5591dbe2daabd8dcc454f39bd23331aca (commit)
       via  e8ae7ca36153d8729c19aee7e044810224d21fa5 (commit)
       via  c119635fa33e6c41005f09a1346787d73f189eab (commit)
      from  bd87ae1dcc2f2c01ea806268185b075f0bc97c9e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa30a5b222994d34b85ee015fd00427cbce59703
commit fa30a5b222994d34b85ee015fd00427cbce59703
Merge: bd87ae1 c2a2122
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 14:41:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 14:41:01 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    c2a2122d Remove some needless GetMakefile() calls.
    5535c9e5 cmLocalGenerator: Add current source directory accessor.
    e8ae7ca3 cmLocalGenerator: Add current binary directory accessor.
    c119635f cmLocalGenerator: Add Home directory accessors.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2a2122ddd75d1da54ce20fc31c38be541ba2495
commit c2a2122ddd75d1da54ce20fc31c38be541ba2495
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:42:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:40:41 2015 +0200

    Remove some needless GetMakefile() calls.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f3b651..4b6bd50 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -101,7 +101,7 @@ cmCustomCommandGenerator
       }
     else
       {
-      cmOutputConverter converter(this->LG->GetMakefile()->GetStateSnapshot());
+      cmOutputConverter converter(this->LG->GetStateSnapshot());
       cmd += converter.EscapeForShell(arg, this->MakeVars);
       }
     }
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index e4d9f10..8ac5cbc 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -139,7 +139,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator *lg)
       {
       std::ostringstream e;
       e << "Evaluation file \"" << this->Input << "\" cannot be read.";
-      lg->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
+      lg->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 775ad2b..3dd9e37 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -495,7 +495,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the directory-level
   // rules of the subdirectories.
   std::vector<cmState::Snapshot> children
-      = lg->GetMakefile()->GetStateSnapshot().GetChildren();
+      = lg->GetStateSnapshot().GetChildren();
   for(std::vector<cmState::Snapshot>::const_iterator
         ci = children.begin(); ci != children.end(); ++ci)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5535c9e5591dbe2daabd8dcc454f39bd23331aca
commit 5535c9e5591dbe2daabd8dcc454f39bd23331aca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:25:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:40:40 2015 +0200

    cmLocalGenerator: Add current source directory accessor.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 8687dad..efd5b58 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -497,7 +497,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
     std::string sourceLinkedResourceName = "[Source directory]";
     std::string linkSourceDirectory = this->GetEclipsePath(
-                                             mf->GetCurrentSourceDirectory());
+                                             lg->GetCurrentSourceDirectory());
     // .project dir can't be subdir of a linked resource dir
     if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
                                          linkSourceDirectory))
@@ -636,7 +636,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
        ++it)
     {
     std::string linkSourceDirectory = this->GetEclipsePath(
-                   it->second[0]->GetMakefile()->GetCurrentSourceDirectory());
+                   it->second[0]->GetCurrentSourceDirectory());
     // a linked resource must not point to a parent directory of .project or
     // .project itself
     if ((baseDir != linkSourceDirectory) &&
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 57a8741..45250d3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2105,7 +2105,7 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
   for(std::vector<cmLocalGenerator*>::const_iterator it =
       this->LocalGenerators.begin(); it != this->LocalGenerators.end(); ++it)
     {
-    std::string sd = (*it)->GetMakefile()->GetCurrentSourceDirectory();
+    std::string sd = (*it)->GetCurrentSourceDirectory();
     if (sd == start_dir)
       {
       return *it;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 656ce98..bfd426b 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -412,8 +412,9 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
   this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
-                           this->ProjectSourceDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
+        this->ProjectSourceDirectoryComponents);
   cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
                            this->ProjectOutputDirectoryComponents);
 
@@ -460,7 +461,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
-  std::string listfile = mf->GetCurrentSourceDirectory();
+  std::string listfile = root->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
   allbuild->AddSourceCMP0049(listfile.c_str());
@@ -554,7 +555,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
         }
 
       // Refer to the build configuration file for easy editing.
-      listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
+      listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
       target.AddSourceCMP0049(listfile.c_str());
@@ -3369,7 +3370,7 @@ bool cmGlobalXCodeGenerator
   // Point Xcode at the top of the source tree.
   {
   std::string pdir =
-    this->RelativeToBinary(root->GetMakefile()->GetCurrentSourceDirectory());
+    this->RelativeToBinary(root->GetCurrentSourceDirectory());
   this->RootObject->AddAttribute("projectDirPath",
                                  this->CreateString(pdir.c_str()));
   this->RootObject->AddAttribute("projectRoot", this->CreateString(""));
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8096bd7..c0c50c4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2883,6 +2883,11 @@ const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
+const char* cmLocalGenerator::GetCurrentSourceDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentSource();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7ca587e..8070667 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -259,6 +259,7 @@ public:
   const char* GetBinaryDirectory() const;
 
   const char* GetCurrentBinaryDirectory() const;
+  const char* GetCurrentSourceDirectory() const;
 
   /**
    * Generate a Mac OS X application bundle Info.plist file.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3a163f0..b84cbc5 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -215,7 +215,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   if(!cmSystemTools::FileExists(makefileIn.c_str()))
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5a68ab3..90c17c6 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -278,7 +278,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   stampName += "generate.stamp";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   makefileIn = cmSystemTools::CollapseFullPath(makefileIn.c_str());
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0b89d1d..b7ca26b 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1113,7 +1113,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index d792ba7..133d2ff 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -45,8 +45,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
-        cmMakefile *mf = target->Target->GetMakefile();
-        if (strcmp(mf->GetCurrentSourceDirectory(),
+        if (strcmp(target->GetLocalGenerator()->GetCurrentSourceDirectory(),
                    target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 8cefd7c..92b7a57 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2243,7 +2243,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 {
   // Look through the sources for AndroidManifest.xml and use
   // its location as the root source directory.
-  std::string rootDir = this->Makefile->GetCurrentSourceDirectory();
+  std::string rootDir = this->LocalGenerator->GetCurrentSourceDirectory();
   {
   std::vector<cmSourceFile const*> extraSources;
   this->GeneratorTarget->GetExtraSources(extraSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8ae7ca36153d8729c19aee7e044810224d21fa5
commit e8ae7ca36153d8729c19aee7e044810224d21fa5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 25 00:13:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:40:40 2015 +0200

    cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 856dcd4..80f560f 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -160,7 +160,7 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
   if (mod_dir.empty())
     {
     mod_dir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
     }
 
   // Actually write dependencies to the streams.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 883b287..cb46f8c 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -76,8 +76,7 @@ void cmExtraCodeBlocksGenerator::Generate()
 void cmExtraCodeBlocksGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
@@ -331,7 +330,7 @@ void cmExtraCodeBlocksGenerator
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
@@ -522,11 +521,10 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
                                         cmLocalGenerator* lg,
                                         cmTarget* target) const
 {
-  cmMakefile *mf = lg->GetMakefile();
   // this file doesn't seem to be used by C::B in custom makefile mode,
   // but we generate a unique file for each OBJECT library so in case
   // C::B uses it in some way, the targets don't interfere with each other.
-  std::string filename = mf->GetCurrentBinaryDirectory();
+  std::string filename = lg->GetCurrentBinaryDirectory();
   filename += "/";
   filename += lg->GetTargetDirectory(*target);
   filename += "/";
@@ -553,14 +551,14 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
                                               const char* compiler)
 {
   cmMakefile const* makefile = lg->GetMakefile();
-  std::string makefileName = makefile->GetCurrentBinaryDirectory();
+  std::string makefileName = lg->GetCurrentBinaryDirectory();
   makefileName += "/Makefile";
 
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
     int cbTargetType = this->GetCBTargetType(target);
-    std::string workingDir = makefile->GetCurrentBinaryDirectory();
+    std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmTarget::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
@@ -657,7 +655,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   else // e.g. all and the GLOBAL and UTILITY targets
     {
     fout<<"         <Option working_dir=\""
-        << makefile->GetCurrentBinaryDirectory() << "\" />\n"
+        << lg->GetCurrentBinaryDirectory() << "\" />\n"
         <<"         <Option type=\"" << 4 << "\" />\n";
     }
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 763673e..b4b5c89 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -68,15 +68,15 @@ void cmExtraCodeLiteGenerator::Generate()
     const cmMakefile* mf =it->second[0]->GetMakefile();
     this->ConfigName = GetConfigurationName( mf );
 
-    if (strcmp(mf->GetCurrentBinaryDirectory(),
+    if (strcmp(it->second[0]->GetCurrentBinaryDirectory(),
                it->second[0]->GetBinaryDirectory()) == 0)
       {
-      workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
+      workspaceOutputDir   = it->second[0]->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
       workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
-      this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
+      this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();;
 
       fout.Open(workspaceFileName.c_str(), false, false);
       fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -91,8 +91,7 @@ void cmExtraCodeLiteGenerator::Generate()
        ++it)
     {
     // retrive project information
-    const cmMakefile* mf    = it->second[0]->GetMakefile();
-    std::string outputDir   = mf->GetCurrentBinaryDirectory();
+    std::string outputDir   = it->second[0]->GetCurrentBinaryDirectory();
     std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
@@ -121,8 +120,7 @@ void cmExtraCodeLiteGenerator::Generate()
 void cmExtraCodeLiteGenerator::CreateProjectFile(
   const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf    = lgs[0]->GetMakefile();
-  std::string outputDir   = mf->GetCurrentBinaryDirectory();
+  std::string outputDir   = lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 214e89f..8687dad 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -208,7 +208,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 
   std::string cacheEntryName = "CMAKE_ECLIPSE_ENVVAR_";
   cacheEntryName += envVar;
-  const char* cacheValue = mf->GetState()->GetInitializedCacheValue(
+  const char* cacheValue = lg->GetState()->GetInitializedCacheValue(
                                                        cacheEntryName);
 
   // now we have both, decide which one to use
@@ -1034,8 +1034,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        ++it)
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
-    std::string subdir = (*it)->Convert(makefile->GetCurrentBinaryDirectory(),
+    std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
       {
@@ -1096,7 +1095,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
                              ti->first.c_str());
 
           std::string cleanArgs = "-E chdir \"";
-          cleanArgs += makefile->GetCurrentBinaryDirectory();
+          cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f14a1cc..0c009c3 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -47,7 +47,7 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 void cmExtraKateGenerator::Generate()
 {
   cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  const cmMakefile* mf = lg->GetMakefile();
+  cmMakefile* mf = lg->GetMakefile();
   this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                           this->GetPathBasename(lg->GetBinaryDirectory()));
@@ -121,7 +121,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
-    std::string currentDir = makefile->GetCurrentBinaryDirectory();
+    std::string currentDir = (*it)->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 21587d6..133626e 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -77,8 +77,7 @@ void cmExtraSublimeTextGenerator::Generate()
 void cmExtraSublimeTextGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f82fcb3..ab24f94 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -49,8 +49,7 @@ void cmGlobalKdevelopGenerator::Generate()
       it!= this->GlobalGenerator->GetProjectMap().end();
       ++it)
     {
-    cmMakefile* mf = it->second[0]->GetMakefile();
-    std::string outputDir=mf->GetCurrentBinaryDirectory();
+    std::string outputDir=it->second[0]->GetCurrentBinaryDirectory();
     std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 59633d9..775ad2b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -163,7 +163,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
     {
     cmLocalUnixMakefileGenerator3 *lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    std::string markFileName = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    std::string markFileName = lg->GetCurrentBinaryDirectory();
     markFileName += "/";
     markFileName += cmake::GetCMakeFilesDirectory();
     markFileName += "/progress.marks";
@@ -395,7 +395,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
     {
     lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    tmpStr = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    tmpStr = lg->GetCurrentBinaryDirectory();
     tmpStr += cmake::GetCMakeFilesDirectory();
     tmpStr += "/CMakeDirectoryInformation.cmake";
     cmakefileStream << "  \"" <<
@@ -454,7 +454,7 @@ cmGlobalUnixMakefileGenerator3
                       bool check_relink)
 {
   // Get the relative path to the subdirectory from the top.
-  std::string makeTarget = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string makeTarget = lg->GetCurrentBinaryDirectory();
   makeTarget += "/";
   makeTarget += pass;
 
@@ -534,7 +534,7 @@ cmGlobalUnixMakefileGenerator3
     }
 
   // Begin the directory-level rules section.
-  std::string dir = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string dir = lg->GetCurrentBinaryDirectory();
   dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT,
                     cmLocalGenerator::MAKERULE);
   lg->WriteDivider(ruleFileStream);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 73a952b..1ca3bd7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -363,7 +363,7 @@ void cmGlobalVisualStudio7Generator
     return;
     }
   this->CurrentProject = root->GetProjectName();
-  std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = root->GetCurrentBinaryDirectory();
   fname += "/";
   fname += root->GetProjectName();
   fname += ".sln";
@@ -468,8 +468,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmMakefile* tmf = target->GetMakefile();
-        std::string dir = tmf->GetCurrentBinaryDirectory();
+        std::string dir = root->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
         if(dir == ".")
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index ea15eb4..656ce98 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -414,11 +414,11 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentBinaryDirectory(),
+  cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
                            this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
-    root->GetMakefile()->GetCurrentBinaryDirectory();
+    root->GetCurrentBinaryDirectory();
   this->CurrentXCodeHackMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentXCodeHackMakefile.c_str());
   this->CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
@@ -466,7 +466,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   allbuild->AddSourceCMP0049(listfile.c_str());
 
   // Add XCODE depend helper
-  std::string dir = mf->GetCurrentBinaryDirectory();
+  std::string dir = root->GetCurrentBinaryDirectory();
   cmCustomCommandLine makeHelper;
   if(this->XcodeVersion < 50)
     {
@@ -580,7 +580,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   std::vector<std::string>::iterator new_end =
     std::unique(lfiles.begin(), lfiles.end());
   lfiles.erase(new_end, lfiles.end());
-  this->CurrentReRunCMakeMakefile = mf->GetCurrentBinaryDirectory();
+  this->CurrentReRunCMakeMakefile = root->GetCurrentBinaryDirectory();
   this->CurrentReRunCMakeMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str());
   this->CurrentReRunCMakeMakefile += "/ReRunCMake.make";
@@ -1031,7 +1031,7 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen)
   this->CurrentLocalGenerator = gen;
   this->CurrentMakefile = gen->GetMakefile();
   std::string outdir =
-    cmSystemTools::CollapseFullPath(this->CurrentMakefile->
+    cmSystemTools::CollapseFullPath(this->CurrentLocalGenerator->
                                     GetCurrentBinaryDirectory());
   cmSystemTools::SplitPath(outdir.c_str(),
                            this->CurrentOutputDirectoryComponents);
@@ -1387,7 +1387,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // linker language.  This should convince Xcode to choose the proper
   // language.
   cmMakefile* mf = cmtarget.GetMakefile();
-  std::string fname = mf->GetCurrentBinaryDirectory();
+  std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
   fname += cmtarget.GetName();
@@ -1616,7 +1616,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 const & commands,
                                                 const char* name)
 {
-  std::string dir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string dir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   dir += "/CMakeScripts";
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
@@ -1637,7 +1637,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                     currentConfig->c_str());
     }
 
-  std::string cdir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string cdir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   cdir = this->ConvertToRelativeForXCode(cdir.c_str());
   std::string makecmd = "make -C ";
   makecmd += cdir;
@@ -1965,7 +1965,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Set attributes to specify the proper name for the target.
-  std::string pndir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   if(target.GetType() == cmTarget::STATIC_LIBRARY ||
      target.GetType() == cmTarget::SHARED_LIBRARY ||
      target.GetType() == cmTarget::MODULE_LIBRARY ||
@@ -3481,7 +3481,7 @@ bool cmGlobalXCodeGenerator
     }
   }
 
-  std::string symroot = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string symroot = root->GetCurrentBinaryDirectory();
   symroot += "/build";
   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
 
@@ -3724,7 +3724,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     {
     return;
     }
-  std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string xcodeDir = root->GetCurrentBinaryDirectory();
   xcodeDir += "/";
   xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 97b9405..f7c9cc2 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -64,7 +64,7 @@ void cmInstallExportGenerator::ComputeTempDir()
   // Choose a temporary directory in which to generate the import
   // files to be installed.
   this->TempDir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
   this->TempDir += cmake::GetCMakeFilesDirectory();
   this->TempDir += "/Export";
   if(this->Destination.empty())
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6c442f4..8096bd7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2878,6 +2878,11 @@ const char* cmLocalGenerator::GetBinaryDirectory() const
   return this->GetCMakeInstance()->GetHomeOutputDirectory();
 }
 
+const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentBinary();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2123f1e..7ca587e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -258,6 +258,8 @@ public:
   const char* GetSourceDirectory() const;
   const char* GetBinaryDirectory() const;
 
+  const char* GetCurrentBinaryDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index b1e1d3f..6319f0e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -363,7 +363,7 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(
   if (ccg.GetNumberOfCommands() > 0) {
     std::string wd = ccg.GetWorkingDirectory();
     if (wd.empty())
-      wd = this->GetMakefile()->GetCurrentBinaryDirectory();
+      wd = this->GetCurrentBinaryDirectory();
 
     std::ostringstream cdCmd;
 #ifdef _WIN32
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 66b3dd3..3a163f0 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -111,14 +111,14 @@ void cmLocalVisualStudio6Generator::Generate()
 void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -163,7 +163,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       std::string::size_type pos = l->first.rfind('/');
       if(pos != std::string::npos)
         {
-        std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+        std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
         dir += l->first.substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
@@ -189,7 +189,7 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
@@ -577,9 +577,9 @@ cmLocalVisualStudio6Generator
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
-  char* output = new char[(strlen(this->Makefile->GetCurrentBinaryDirectory())
+  char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
                            + target.GetName().size() + 30)];
-  sprintf(output,"%s/%s_force_%i", this->Makefile->GetCurrentBinaryDirectory(),
+  sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
           target.GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
@@ -1962,7 +1962,7 @@ cmLocalVisualStudio6Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 9c25651..5a68ab3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -138,7 +138,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       cmCustomCommandLines force_commands;
       force_commands.push_back(force_command);
       std::string no_main_dependency = "";
-      std::string force = this->Makefile->GetCurrentBinaryDirectory();
+      std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
       force += tgt.GetName();
@@ -160,14 +160,14 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
 void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -196,7 +196,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 {
   // Touch a timestamp file used to determine when the project file is
   // out of date.
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += cmake::GetCMakeFilesDirectory();
   cmSystemTools::MakeDirectory(stampName.c_str());
   stampName += "/";
@@ -243,7 +243,7 @@ void cmLocalVisualStudio7Generator
   target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += lname;
   if(this->FortranProject)
@@ -272,7 +272,7 @@ void cmLocalVisualStudio7Generator
 //----------------------------------------------------------------------------
 cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += "/";
   stampName += cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
@@ -1719,7 +1719,7 @@ cmLocalVisualStudio7Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 8c700a1..0b89d1d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -419,7 +419,7 @@ void cmMakefileTargetGenerator
   this->WriteObjectBuildFile(obj, lang, source, depends);
 
   // The object file should be checked for dependency integrity.
-  std::string objFullPath = this->Makefile->GetCurrentBinaryDirectory();
+  std::string objFullPath = this->LocalGenerator->GetCurrentBinaryDirectory();
   objFullPath += "/";
   objFullPath += obj;
   objFullPath =
@@ -642,7 +642,7 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->Makefile->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->LocalGenerator->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";
@@ -698,7 +698,7 @@ cmMakefileTargetGenerator
   // Change the command working directory to the local build tree.
   this->LocalGenerator->CreateCDCommand
     (compileCommands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
   commands.insert(commands.end(),
                   compileCommands.begin(), compileCommands.end());
@@ -771,7 +771,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (preprocessCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         preprocessCommands.begin(),
@@ -828,7 +828,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (assemblyCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         assemblyCommands.begin(),
@@ -929,7 +929,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
                                            *this->Target);
   this->LocalGenerator->CreateCDCommand
     (commands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
 
   // Write the rule.
@@ -1119,7 +1119,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->InfoFileNameFull,
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..8cefd7c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -195,7 +195,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->BuildFileStream = 0;
   this->IsMissingFiles = false;
   this->DefaultArtifactDir =
-    this->Makefile->GetCurrentBinaryDirectory() + std::string("/") +
+    this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") +
     this->LocalGenerator->GetTargetDirectory(*this->Target);
 }
 
@@ -297,8 +297,7 @@ void cmVisualStudio10TargetGenerator::Generate()
       return;
       }
     }
-  cmMakefile* mf = this->Target->GetMakefile();
-  std::string path =  mf->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj";
@@ -951,7 +950,7 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path,
 {
   return forceRelative
     ? cmSystemTools::RelativePath(
-      this->Makefile->GetCurrentBinaryDirectory(), path.c_str())
+      this->LocalGenerator->GetCurrentBinaryDirectory(), path.c_str())
     : path.c_str();
 }
 
@@ -990,7 +989,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   this->AddMissingSourceGroups(groupsUsed, sourceGroups);
 
   // Write out group file
-  std::string path =  this->Makefile->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj.filters";
@@ -1448,7 +1447,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
     std::string sourceRel = this->ConvertPath(sf->GetFullPath(), true);
     size_t const maxLen = 250;
     if(sf->GetCustomCommand() ||
-       ((strlen(this->Makefile->GetCurrentBinaryDirectory()) + 1 +
+       ((strlen(this->LocalGenerator->GetCurrentBinaryDirectory()) + 1 +
          sourceRel.length()) <= maxLen))
       {
       forceRelative = true;
@@ -3313,7 +3312,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
   // For WP80, the manifest needs to be in the same folder as the project
   // this can cause an overwrite problem if projects aren't organized in
   // folders
-  std::string manifestFile = this->Makefile->GetCurrentBinaryDirectory() +
+  std::string manifestFile =
+      this->LocalGenerator->GetCurrentBinaryDirectory() +
                              std::string("/WMAppManifest.xml");
   std::string artifactDir =
     this->LocalGenerator->GetTargetDirectory(*this->Target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c119635fa33e6c41005f09a1346787d73f189eab
commit c119635fa33e6c41005f09a1346787d73f189eab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 01:17:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 20:40:40 2015 +0200

    cmLocalGenerator: Add Home directory accessors.
    
    Reduce reasons for cmLocalGenerator to have a cmMakefile.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d35b566..e97069f 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1975,8 +1975,9 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
       else if(use_link_rpath)
         {
         // Do not add any path inside the source or build tree.
-        const char* topSourceDir = this->Makefile->GetHomeDirectory();
-        const char* topBinaryDir = this->Makefile->GetHomeOutputDirectory();
+        const char* topSourceDir = this->CMakeInstance->GetHomeDirectory();
+        const char* topBinaryDir =
+            this->CMakeInstance->GetHomeOutputDirectory();
         if(!cmSystemTools::ComparePath(*ri, topSourceDir) &&
            !cmSystemTools::ComparePath(*ri, topBinaryDir) &&
            !cmSystemTools::IsSubDirectory(*ri, topSourceDir) &&
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 2a9b72c..c9b6100 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -245,8 +245,10 @@ static bool checkInterfaceDirs(const std::string &prepro,
 {
   const char* installDir =
             target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir = target->Makefile->GetHomeDirectory();
-  const char* topBinaryDir = target->Makefile->GetHomeOutputDirectory();
+  const char* topSourceDir =
+      target->GetLocalGenerator()->GetSourceDirectory();
+  const char* topBinaryDir =
+      target->GetLocalGenerator()->GetBinaryDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 408daab..883b287 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -273,7 +273,7 @@ void cmExtraCodeBlocksGenerator
         }
 
       const std::string &relative = cmSystemTools::RelativePath(
-                         it->second[0]->GetMakefile()->GetHomeDirectory(),
+                         it->second[0]->GetSourceDirectory(),
                          jt->c_str());
       std::vector<std::string> splitted;
       cmSystemTools::SplitPath(relative, splitted, false);
@@ -297,7 +297,7 @@ void cmExtraCodeBlocksGenerator
   tree.BuildVirtualFolder(virtualFolders);
   // And one for <Unit>
   std::string unitFiles;
-  tree.BuildUnit(unitFiles, std::string(mf->GetHomeDirectory()) + "/");
+  tree.BuildUnit(unitFiles, std::string(lgs[0]->GetSourceDirectory()) + "/");
 
   // figure out the compiler
   std::string compiler = this->GetCBCompilerId(mf);
@@ -332,7 +332,7 @@ void cmExtraCodeBlocksGenerator
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
           if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
                                make.c_str(), *lg, compiler.c_str());
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 1884da1..763673e 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -69,11 +69,11 @@ void cmExtraCodeLiteGenerator::Generate()
     this->ConfigName = GetConfigurationName( mf );
 
     if (strcmp(mf->GetCurrentBinaryDirectory(),
-               mf->GetHomeOutputDirectory()) == 0)
+               it->second[0]->GetBinaryDirectory()) == 0)
       {
       workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
-      workspaceSourcePath  = mf->GetHomeDirectory();
+      workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
       this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 659a9ae..214e89f 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -79,8 +79,8 @@ void cmExtraEclipseCDT4Generator
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::Generate()
 {
-  const cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
 
   std::string eclipseVersion = mf->GetSafeDefinition("CMAKE_ECLIPSE_VERSION");
   cmsys::RegularExpression regex(".*([0-9]+\\.[0-9]+).*");
@@ -106,8 +106,8 @@ void cmExtraEclipseCDT4Generator::Generate()
     }
 
   // TODO: Decide if these are local or member variables
-  this->HomeDirectory       = mf->GetHomeDirectory();
-  this->HomeOutputDirectory = mf->GetHomeOutputDirectory();
+  this->HomeDirectory       = lg->GetSourceDirectory();
+  this->HomeOutputDirectory = lg->GetBinaryDirectory();
 
   this->GenerateLinkedResources = mf->IsOn(
                                     "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
@@ -226,7 +226,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
     mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                            cacheEntryName.c_str(), cmState::STRING,
                            true);
-    mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+    mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
     }
   else if (envVarValue==0 && cacheValue!=0)
     {
@@ -247,7 +247,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
       mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                              cacheEntryName.c_str(), cmState::STRING,
                              true);
-      mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+      mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
       }
     }
 
@@ -1089,7 +1089,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           virtDir += prefix;
           virtDir += ti->first;
           std::string buildArgs = "-C \"";
-          buildArgs += makefile->GetHomeOutputDirectory();
+          buildArgs += (*it)->GetBinaryDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 104372c..f14a1cc 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -50,7 +50,7 @@ void cmExtraKateGenerator::Generate()
   const cmMakefile* mf = lg->GetMakefile();
   this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
-                          this->GetPathBasename(mf->GetHomeOutputDirectory()));
+                          this->GetPathBasename(lg->GetBinaryDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
   this->CreateKateProjectFile(lg);
@@ -61,8 +61,7 @@ void cmExtraKateGenerator::Generate()
 void cmExtraKateGenerator::CreateKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  const cmMakefile* mf = lg->GetMakefile();
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
   if (!fout)
@@ -73,9 +72,9 @@ void cmExtraKateGenerator::CreateKateProjectFile(
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"
-    "\t\"directory\": \"" << mf->GetHomeDirectory() << "\",\n"
-    "\t\"files\": [ { " << this->GenerateFilesString(mf) << "} ],\n";
-  this->WriteTargets(mf, fout);
+    "\t\"directory\": \"" << lg->GetSourceDirectory() << "\",\n"
+    "\t\"files\": [ { " << this->GenerateFilesString(lg) << "} ],\n";
+  this->WriteTargets(lg, fout);
   fout << "}\n";
 }
 
@@ -84,15 +83,15 @@ void
 cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
                                    cmGeneratedFileStream& fout) const
 {
-  cmMakefile* mf = lg->GetMakefile();
+  cmMakefile const* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
-  const char* homeOutputDir = mf->GetHomeOutputDirectory();
+  const char* homeOutputDir = lg->GetBinaryDirectory();
 
   fout <<
   "\t\"build\": {\n"
-  "\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
+  "\t\t\"directory\": \"" << lg->GetBinaryDirectory() << "\",\n"
   "\t\t\"default_target\": \"all\",\n"
   "\t\t\"clean_target\": \"clean\",\n";
 
@@ -123,7 +122,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
     std::string currentDir = makefile->GetCurrentBinaryDirectory();
-    bool topLevel = (currentDir == makefile->GetHomeOutputDirectory());
+    bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
       {
@@ -237,8 +236,7 @@ void
 cmExtraKateGenerator::CreateDummyKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  cmMakefile* mf = lg->GetMakefile();
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/";
   filename += this->ProjectName;
   filename += ".kateproject";
@@ -256,22 +254,21 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(
 std::string
 cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
 {
-  cmMakefile* mf = lg->GetMakefile();
-  std::string s = mf->GetHomeDirectory();
+  std::string s = lg->GetSourceDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"git\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/.svn";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"svn\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/";
 
   std::set<std::string> files;
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 363ab2f..21587d6 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -99,8 +99,8 @@ void cmExtraSublimeTextGenerator
     }
 
   const std::string &sourceRootRelativeToOutput = cmSystemTools::RelativePath(
-                     mf->GetHomeOutputDirectory(),
-                     mf->GetHomeDirectory());
+                     lgs[0]->GetBinaryDirectory(),
+                     lgs[0]->GetSourceDirectory());
   // Write the folder entries to the project file
   fout << "{\n";
   fout << "\t\"folders\":\n\t[\n\t";
@@ -108,8 +108,8 @@ void cmExtraSublimeTextGenerator
     {
       fout << "\t{\n\t\t\t\"path\": \"" << sourceRootRelativeToOutput << "\"";
       const std::string &outputRelativeToSourceRoot =
-        cmSystemTools::RelativePath(mf->GetHomeDirectory(),
-                                    mf->GetHomeOutputDirectory());
+        cmSystemTools::RelativePath(lgs[0]->GetSourceDirectory(),
+                                    lgs[0]->GetBinaryDirectory());
       if ((!outputRelativeToSourceRoot.empty()) &&
         ((outputRelativeToSourceRoot.length() < 3) ||
           (outputRelativeToSourceRoot.substr(0, 3) != "../")))
@@ -173,8 +173,8 @@ void cmExtraSublimeTextGenerator::
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index cae5c2f..4a362d8 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -68,7 +68,9 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 std::string
 cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
 {
-  return target->GetMakefile()->GetHomeOutputDirectory();
+  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
+      ->GetGeneratorTarget(target);
+  return gt->GetLocalGenerator()->GetBinaryDirectory();
 }
 
 std::string
@@ -449,7 +451,7 @@ void cmGhsMultiTargetGenerator::WriteSources(
     cmSystemTools::ConvertToUnixSlashes(sgPath);
     cmGlobalGhsMultiGenerator::AddFilesUpToPath(
       this->GetFolderBuildStreams(), &this->FolderBuildStreams,
-      this->Makefile->GetHomeOutputDirectory(), sgPath,
+      this->LocalGenerator->GetBinaryDirectory(), sgPath,
       GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath);
 
     std::string fullSourcePath((*si)->GetFullPath());
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 05f1029..57a8741 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -399,7 +399,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
   bool fatalError = false;
 
   mf->AddDefinition("RUN_CONFIGURE", true);
-  std::string rootBin = mf->GetHomeOutputDirectory();
+  std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory();
   rootBin += cmake::GetCMakeFilesDirectory();
 
   // If the configuration files path has been set,
@@ -2879,10 +2879,8 @@ void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::WriteSummary()
 {
-  cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
-
   // Record all target directories in a central location.
-  std::string fname = mf->GetHomeOutputDirectory();
+  std::string fname = this->CMakeInstance->GetHomeOutputDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 6290907..f82fcb3 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -51,7 +51,7 @@ void cmGlobalKdevelopGenerator::Generate()
     {
     cmMakefile* mf = it->second[0]->GetMakefile();
     std::string outputDir=mf->GetCurrentBinaryDirectory();
-    std::string projectDir=mf->GetHomeDirectory();
+    std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9d8193b..32e6077 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1198,16 +1198,15 @@ void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
 void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
 {
   cmLocalGenerator *lg = this->LocalGenerators[0];
-  cmMakefile* mfRoot = lg->GetMakefile();
 
   std::ostringstream cmd;
   cmd << lg->ConvertToOutputFormat(cmSystemTools::GetCMakeCommand(),
                                    cmLocalGenerator::SHELL)
       << " -H"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetSourceDirectory(),
                                    cmLocalGenerator::SHELL)
       << " -B"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeOutputDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetBinaryDirectory(),
                                    cmLocalGenerator::SHELL);
   WriteRule(*this->RulesFileStream,
             "RERUN_CMAKE",
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 0064713..59633d9 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -785,7 +785,7 @@ cmGlobalUnixMakefileGenerator3
       depends.clear();
 
       cmLocalUnixMakefileGenerator3::EchoProgress progress;
-      progress.Dir = lg->GetMakefile()->GetHomeOutputDirectory();
+      progress.Dir = lg->GetBinaryDirectory();
       progress.Dir += cmake::GetCMakeFilesDirectory();
       {
       std::ostringstream progressArg;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 86a8f87..0a6844e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -312,10 +312,10 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
   std::string argH = "-H";
-  argH += mf->GetHomeDirectory();
+  argH += lg->GetSourceDirectory();
   commandLine.push_back(argH);
   std::string argB = "-B";
-  argB += mf->GetHomeOutputDirectory();
+  argB += lg->GetBinaryDirectory();
   commandLine.push_back(argB);
   commandLine.push_back("--check-stamp-list");
   commandLine.push_back(stampList.c_str());
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 840e89f..ea15eb4 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -588,7 +588,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = mf->GetHomeOutputDirectory();
+  std::string checkCache = root->GetHomeOutputDirectory();
   checkCache += "/";
   checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
   checkCache += "cmake.check_cache";
@@ -602,9 +602,9 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   makefileStream << "\n\t" <<
     this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
                  << " -H" << this->ConvertToRelativeForMake(
-                   mf->GetHomeDirectory())
+                   root->GetSourceDirectory())
                  << " -B" << this->ConvertToRelativeForMake(
-                   mf->GetHomeOutputDirectory()) << "\n";
+                   root->GetHomeOutputDirectory()) << "\n";
 }
 
 //----------------------------------------------------------------------------
@@ -3746,7 +3746,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
   // Since this call may have created new cache entries, save the cache:
   //
   root->GetMakefile()->GetCMakeInstance()->SaveCache(
-    root->GetMakefile()->GetHomeOutputDirectory());
+    root->GetHomeOutputDirectory());
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b7833cd..6c442f4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2868,6 +2868,16 @@ cmake* cmLocalGenerator::GetCMakeInstance() const
   return this->GlobalGenerator->GetCMakeInstance();
 }
 
+const char* cmLocalGenerator::GetSourceDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeDirectory();
+}
+
+const char* cmLocalGenerator::GetBinaryDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeOutputDirectory();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index b3bf8cd..2123f1e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -255,6 +255,9 @@ public:
 
   cmake* GetCMakeInstance() const;
 
+  const char* GetSourceDirectory() const;
+  const char* GetBinaryDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index b131a63..bf5afc1 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -399,7 +399,7 @@ cmLocalUnixMakefileGenerator3
       );
     }
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
 
   // Write the rule to the makefile.
@@ -449,7 +449,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefile2.c_str(),localName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
                           localName, depends, commands, true);
@@ -478,7 +478,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefileName.c_str(), makeTargetName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "fast build rule for target.",
                           localName, depends, commands, true);
@@ -496,7 +496,7 @@ void cmLocalUnixMakefileGenerator3
         commands.push_back(this->GetRecursiveMakeCall
                            (makefile2.c_str(), makeTargetName));
         this->CreateCDCommand(commands,
-                              this->Makefile->GetHomeOutputDirectory(),
+                              this->GetBinaryDirectory(),
                               cmLocalGenerator::START_OUTPUT);
         this->WriteMakeRule(ruleFileStream,
                             "Manual pre-install relink rule for target.",
@@ -750,13 +750,13 @@ cmLocalUnixMakefileGenerator3
   makefileStream
     << "# The top-level source directory on which CMake was run.\n"
     << "CMAKE_SOURCE_DIR = "
-    << this->Convert(this->Makefile->GetHomeDirectory(), FULL, SHELL)
+    << this->Convert(this->GetSourceDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
   makefileStream
     << "# The top-level build directory on which CMake was run.\n"
     << "CMAKE_BINARY_DIR = "
-    << this->Convert(this->Makefile->GetHomeOutputDirectory(), FULL, SHELL)
+    << this->Convert(this->GetBinaryDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
 }
@@ -889,7 +889,7 @@ void cmLocalUnixMakefileGenerator3
   if(!this->GetMakefile()->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
-                          this->Makefile->GetHomeOutputDirectory(),
+                          this->GetBinaryDirectory(),
                           cmLocalGenerator::START_OUTPUT);
     }
   this->WriteMakeRule(makefileStream,
@@ -1838,7 +1838,7 @@ void cmLocalUnixMakefileGenerator3
 
   depends.push_back("cmake_check_build_system");
 
-  std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+  std::string progressDir = this->GetBinaryDirectory();
   progressDir += cmake::GetCMakeFilesDirectory();
     {
     std::ostringstream progCmd;
@@ -1862,7 +1862,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
     {
     std::ostringstream progCmd;
@@ -1884,7 +1884,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                                this->Makefile->GetHomeOutputDirectory(),
+                                this->GetBinaryDirectory(),
                                 cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "The main clean target", "clean",
                       depends, commands, true);
@@ -1914,7 +1914,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back
     (this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "Prepare targets for installation.",
                       "preinstall", depends, commands, true);
@@ -1935,7 +1935,7 @@ void cmLocalUnixMakefileGenerator3
   runRule += " 1";
   commands.push_back(runRule);
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "clear depends",
                       "depend",
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index cc94cd4..66b3dd3 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -112,7 +112,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -226,10 +226,10 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a4bce8a..9c25651 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -161,7 +161,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -290,10 +290,10 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
   std::string stampFilename = this->Convert(stampName.c_str(), FULL,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b278087..8c700a1 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1095,7 +1095,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // translation table for the dependency scanning process.
   depCmd << "cd "
          << (this->LocalGenerator->Convert(
-               this->Makefile->GetHomeOutputDirectory(),
+               this->LocalGenerator->GetBinaryDirectory(),
                cmLocalGenerator::FULL, cmLocalGenerator::SHELL))
          << " && ";
 #endif
@@ -1110,13 +1110,13 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // the state of our local generator sufficiently for its needs.
   depCmd << "$(CMAKE_COMMAND) -E cmake_depends \""
          << this->GlobalGenerator->GetName() << "\" "
-         << this->Convert(this->Makefile->GetHomeDirectory(),
+         << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetHomeOutputDirectory(),
+         << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
@@ -1242,7 +1242,7 @@ void
 cmMakefileTargetGenerator
 ::MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress& progress) const
 {
-  progress.Dir = this->Makefile->GetHomeOutputDirectory();
+  progress.Dir = this->LocalGenerator->GetBinaryDirectory();
   progress.Dir += cmake::GetCMakeFilesDirectory();
   std::ostringstream progressArg;
   progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 84c19a3..fb598e8 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -666,8 +666,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   if (!preLinkCmdLines.empty())
     {
     const std::string homeOutDir = localGen.ConvertToOutputFormat(
-                                              mf->GetHomeOutputDirectory(),
-                                              cmLocalGenerator::SHELL);
+                                            localGen.GetBinaryDirectory(),
+                                            cmLocalGenerator::SHELL);
     preLinkCmdLines.push_back("cd " + homeOutDir);
     }
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 6e6dc60..d792ba7 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -47,7 +47,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // in every directory, which we don't need.
         cmMakefile *mf = target->Target->GetMakefile();
         if (strcmp(mf->GetCurrentSourceDirectory(),
-                   mf->GetHomeDirectory()) == 0)
+                   target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
       }
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 58b901a..3e36589 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -103,13 +103,13 @@ void cmNinjaUtilityTargetGenerator::Generate()
       command,
       "$(CMAKE_SOURCE_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeDirectory(),
+        this->GetLocalGenerator()->GetSourceDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(
       command,
       "$(CMAKE_BINARY_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeOutputDirectory(),
+        this->GetLocalGenerator()->GetBinaryDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(command, "$(ARGS)", "");
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 15:33:16 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 15:33:16 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-172-g51b5214
Message-ID: <20151007193320.39C82BFBFF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  51b5214b4bd684bb6beddafc30a94f27dbcaf251 (commit)
       via  7bfa629436654ff4b5704bd0b252326b58e096ba (commit)
       via  a18b86b9c44ce4d669bf4719c2addf3f79628333 (commit)
      from  fa30a5b222994d34b85ee015fd00427cbce59703 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51b5214b4bd684bb6beddafc30a94f27dbcaf251
commit 51b5214b4bd684bb6beddafc30a94f27dbcaf251
Merge: fa30a5b 7bfa629
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 15:33:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 15:33:13 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    7bfa6294 fixup! cmLocalGenerator: Add Home directory accessors.
    a18b86b9 fixup! cmLocalGenerator: Add current binary directory accessor.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bfa629436654ff4b5704bd0b252326b58e096ba
commit 7bfa629436654ff4b5704bd0b252326b58e096ba
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 21:32:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 21:32:49 2015 +0200

    fixup! cmLocalGenerator: Add Home directory accessors.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1d6b8b9..201b02c 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -590,7 +590,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = root->GetHomeOutputDirectory();
+  std::string checkCache = root->GetBinaryDirectory();
   checkCache += "/";
   checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
   checkCache += "cmake.check_cache";
@@ -606,7 +606,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
                  << " -H" << this->ConvertToRelativeForMake(
                    root->GetSourceDirectory())
                  << " -B" << this->ConvertToRelativeForMake(
-                   root->GetHomeOutputDirectory()) << "\n";
+                   root->GetBinaryDirectory()) << "\n";
 }
 
 //----------------------------------------------------------------------------
@@ -3748,7 +3748,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
   // Since this call may have created new cache entries, save the cache:
   //
   root->GetMakefile()->GetCMakeInstance()->SaveCache(
-    root->GetHomeOutputDirectory());
+    root->GetBinaryDirectory());
 }
 
 //----------------------------------------------------------------------------

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a18b86b9c44ce4d669bf4719c2addf3f79628333
commit a18b86b9c44ce4d669bf4719c2addf3f79628333
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 21:32:34 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 21:32:34 2015 +0200

    fixup! cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bfd426b..1d6b8b9 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -415,8 +415,9 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
   cmSystemTools::SplitPath(
         this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
         this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
-                           this->ProjectOutputDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
+        this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
     root->GetCurrentBinaryDirectory();

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 16:01:36 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 16:01:36 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-180-gf6043d5
Message-ID: <20151007200136.DFBA1BFDEC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f6043d59e60d6aa4eb12cb091d4b906e01c4b607 (commit)
       via  56d29100ac34778a35c56740234ec2f837508f34 (commit)
       via  bf2a0a5aea5fd218de25f07450a7a69e3f3adcd7 (commit)
       via  eb68b0e5da527904d72b81e693624e7d9c697dd5 (commit)
       via  fd6692825f5e4b9787746e2811a8a53e33886138 (commit)
       via  8029773fbd01c8dafe1a6f7e0136ae9b7a5339e1 (commit)
       via  f1de916fda8bb37780f8c7ceb01517400ca718e6 (commit)
       via  5ce9220ececf0f71f9c2f14ed1b02e67ffefb56e (commit)
      from  51b5214b4bd684bb6beddafc30a94f27dbcaf251 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6043d59e60d6aa4eb12cb091d4b906e01c4b607
commit f6043d59e60d6aa4eb12cb091d4b906e01c4b607
Merge: 51b5214 56d2910
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 16:01:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 16:01:34 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    56d29100 Revert "cmLocalGenerator: Add Home directory accessors."
    bf2a0a5a Revert "cmLocalGenerator: Add current binary directory accessor."
    eb68b0e5 Revert "cmLocalGenerator: Add current source directory accessor."
    fd669282 Remove some needless GetMakefile() calls.
    8029773f cmLocalGenerator: Add current source directory accessor.
    f1de916f cmLocalGenerator: Add current binary directory accessor.
    5ce9220e cmLocalGenerator: Add Home directory accessors.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56d29100ac34778a35c56740234ec2f837508f34
commit 56d29100ac34778a35c56740234ec2f837508f34
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 22:01:04 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 22:01:04 2015 +0200

    Revert "cmLocalGenerator: Add Home directory accessors."
    
    This reverts commit 5ce9220ececf0f71f9c2f14ed1b02e67ffefb56e.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index e97069f..d35b566 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1975,9 +1975,8 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
       else if(use_link_rpath)
         {
         // Do not add any path inside the source or build tree.
-        const char* topSourceDir = this->CMakeInstance->GetHomeDirectory();
-        const char* topBinaryDir =
-            this->CMakeInstance->GetHomeOutputDirectory();
+        const char* topSourceDir = this->Makefile->GetHomeDirectory();
+        const char* topBinaryDir = this->Makefile->GetHomeOutputDirectory();
         if(!cmSystemTools::ComparePath(*ri, topSourceDir) &&
            !cmSystemTools::ComparePath(*ri, topBinaryDir) &&
            !cmSystemTools::IsSubDirectory(*ri, topSourceDir) &&
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index c9b6100..2a9b72c 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -245,10 +245,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
 {
   const char* installDir =
             target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir =
-      target->GetLocalGenerator()->GetSourceDirectory();
-  const char* topBinaryDir =
-      target->GetLocalGenerator()->GetBinaryDirectory();
+  const char* topSourceDir = target->Makefile->GetHomeDirectory();
+  const char* topBinaryDir = target->Makefile->GetHomeOutputDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 883b287..408daab 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -273,7 +273,7 @@ void cmExtraCodeBlocksGenerator
         }
 
       const std::string &relative = cmSystemTools::RelativePath(
-                         it->second[0]->GetSourceDirectory(),
+                         it->second[0]->GetMakefile()->GetHomeDirectory(),
                          jt->c_str());
       std::vector<std::string> splitted;
       cmSystemTools::SplitPath(relative, splitted, false);
@@ -297,7 +297,7 @@ void cmExtraCodeBlocksGenerator
   tree.BuildVirtualFolder(virtualFolders);
   // And one for <Unit>
   std::string unitFiles;
-  tree.BuildUnit(unitFiles, std::string(lgs[0]->GetSourceDirectory()) + "/");
+  tree.BuildUnit(unitFiles, std::string(mf->GetHomeDirectory()) + "/");
 
   // figure out the compiler
   std::string compiler = this->GetCBCompilerId(mf);
@@ -332,7 +332,7 @@ void cmExtraCodeBlocksGenerator
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
           if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     (*lg)->GetBinaryDirectory())==0)
+                     makefile->GetHomeOutputDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
                                make.c_str(), *lg, compiler.c_str());
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 763673e..1884da1 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -69,11 +69,11 @@ void cmExtraCodeLiteGenerator::Generate()
     this->ConfigName = GetConfigurationName( mf );
 
     if (strcmp(mf->GetCurrentBinaryDirectory(),
-               it->second[0]->GetBinaryDirectory()) == 0)
+               mf->GetHomeOutputDirectory()) == 0)
       {
       workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
-      workspaceSourcePath  = it->second[0]->GetSourceDirectory();
+      workspaceSourcePath  = mf->GetHomeDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
       this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 214e89f..659a9ae 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -79,8 +79,8 @@ void cmExtraEclipseCDT4Generator
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::Generate()
 {
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  const cmMakefile* mf = lg->GetMakefile();
+  const cmMakefile* mf
+    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
 
   std::string eclipseVersion = mf->GetSafeDefinition("CMAKE_ECLIPSE_VERSION");
   cmsys::RegularExpression regex(".*([0-9]+\\.[0-9]+).*");
@@ -106,8 +106,8 @@ void cmExtraEclipseCDT4Generator::Generate()
     }
 
   // TODO: Decide if these are local or member variables
-  this->HomeDirectory       = lg->GetSourceDirectory();
-  this->HomeOutputDirectory = lg->GetBinaryDirectory();
+  this->HomeDirectory       = mf->GetHomeDirectory();
+  this->HomeOutputDirectory = mf->GetHomeOutputDirectory();
 
   this->GenerateLinkedResources = mf->IsOn(
                                     "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
@@ -226,7 +226,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
     mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                            cacheEntryName.c_str(), cmState::STRING,
                            true);
-    mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
+    mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
     }
   else if (envVarValue==0 && cacheValue!=0)
     {
@@ -247,7 +247,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
       mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                              cacheEntryName.c_str(), cmState::STRING,
                              true);
-      mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
+      mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
       }
     }
 
@@ -1089,7 +1089,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           virtDir += prefix;
           virtDir += ti->first;
           std::string buildArgs = "-C \"";
-          buildArgs += (*it)->GetBinaryDirectory();
+          buildArgs += makefile->GetHomeOutputDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f14a1cc..104372c 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -50,7 +50,7 @@ void cmExtraKateGenerator::Generate()
   const cmMakefile* mf = lg->GetMakefile();
   this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
-                          this->GetPathBasename(lg->GetBinaryDirectory()));
+                          this->GetPathBasename(mf->GetHomeOutputDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
   this->CreateKateProjectFile(lg);
@@ -61,7 +61,8 @@ void cmExtraKateGenerator::Generate()
 void cmExtraKateGenerator::CreateKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  std::string filename = lg->GetBinaryDirectory();
+  const cmMakefile* mf = lg->GetMakefile();
+  std::string filename = mf->GetHomeOutputDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
   if (!fout)
@@ -72,9 +73,9 @@ void cmExtraKateGenerator::CreateKateProjectFile(
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"
-    "\t\"directory\": \"" << lg->GetSourceDirectory() << "\",\n"
-    "\t\"files\": [ { " << this->GenerateFilesString(lg) << "} ],\n";
-  this->WriteTargets(lg, fout);
+    "\t\"directory\": \"" << mf->GetHomeDirectory() << "\",\n"
+    "\t\"files\": [ { " << this->GenerateFilesString(mf) << "} ],\n";
+  this->WriteTargets(mf, fout);
   fout << "}\n";
 }
 
@@ -83,15 +84,15 @@ void
 cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
                                    cmGeneratedFileStream& fout) const
 {
-  cmMakefile const* mf = lg->GetMakefile();
+  cmMakefile* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
-  const char* homeOutputDir = lg->GetBinaryDirectory();
+  const char* homeOutputDir = mf->GetHomeOutputDirectory();
 
   fout <<
   "\t\"build\": {\n"
-  "\t\t\"directory\": \"" << lg->GetBinaryDirectory() << "\",\n"
+  "\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
   "\t\t\"default_target\": \"all\",\n"
   "\t\t\"clean_target\": \"clean\",\n";
 
@@ -122,7 +123,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
     std::string currentDir = makefile->GetCurrentBinaryDirectory();
-    bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
+    bool topLevel = (currentDir == makefile->GetHomeOutputDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
       {
@@ -236,7 +237,8 @@ void
 cmExtraKateGenerator::CreateDummyKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  std::string filename = lg->GetBinaryDirectory();
+  cmMakefile* mf = lg->GetMakefile();
+  std::string filename = mf->GetHomeOutputDirectory();
   filename += "/";
   filename += this->ProjectName;
   filename += ".kateproject";
@@ -254,21 +256,22 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(
 std::string
 cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
 {
-  std::string s = lg->GetSourceDirectory();
+  cmMakefile* mf = lg->GetMakefile();
+  std::string s = mf->GetHomeDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"git\": 1 ");
   }
 
-  s = lg->GetSourceDirectory();
+  s = mf->GetHomeDirectory();
   s += "/.svn";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"svn\": 1 ");
   }
 
-  s = lg->GetSourceDirectory();
+  s = mf->GetHomeDirectory();
   s += "/";
 
   std::set<std::string> files;
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 21587d6..363ab2f 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -99,8 +99,8 @@ void cmExtraSublimeTextGenerator
     }
 
   const std::string &sourceRootRelativeToOutput = cmSystemTools::RelativePath(
-                     lgs[0]->GetBinaryDirectory(),
-                     lgs[0]->GetSourceDirectory());
+                     mf->GetHomeOutputDirectory(),
+                     mf->GetHomeDirectory());
   // Write the folder entries to the project file
   fout << "{\n";
   fout << "\t\"folders\":\n\t[\n\t";
@@ -108,8 +108,8 @@ void cmExtraSublimeTextGenerator
     {
       fout << "\t{\n\t\t\t\"path\": \"" << sourceRootRelativeToOutput << "\"";
       const std::string &outputRelativeToSourceRoot =
-        cmSystemTools::RelativePath(lgs[0]->GetSourceDirectory(),
-                                    lgs[0]->GetBinaryDirectory());
+        cmSystemTools::RelativePath(mf->GetHomeDirectory(),
+                                    mf->GetHomeOutputDirectory());
       if ((!outputRelativeToSourceRoot.empty()) &&
         ((outputRelativeToSourceRoot.length() < 3) ||
           (outputRelativeToSourceRoot.substr(0, 3) != "../")))
@@ -173,8 +173,8 @@ void cmExtraSublimeTextGenerator::
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
-                     (*lg)->GetBinaryDirectory())==0)
+          if (strcmp(makefile->GetCurrentBinaryDirectory(),
+                     makefile->GetHomeOutputDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 4a362d8..cae5c2f 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -68,9 +68,7 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 std::string
 cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
 {
-  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
-      ->GetGeneratorTarget(target);
-  return gt->GetLocalGenerator()->GetBinaryDirectory();
+  return target->GetMakefile()->GetHomeOutputDirectory();
 }
 
 std::string
@@ -451,7 +449,7 @@ void cmGhsMultiTargetGenerator::WriteSources(
     cmSystemTools::ConvertToUnixSlashes(sgPath);
     cmGlobalGhsMultiGenerator::AddFilesUpToPath(
       this->GetFolderBuildStreams(), &this->FolderBuildStreams,
-      this->LocalGenerator->GetBinaryDirectory(), sgPath,
+      this->Makefile->GetHomeOutputDirectory(), sgPath,
       GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath);
 
     std::string fullSourcePath((*si)->GetFullPath());
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 57a8741..05f1029 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -399,7 +399,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
   bool fatalError = false;
 
   mf->AddDefinition("RUN_CONFIGURE", true);
-  std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory();
+  std::string rootBin = mf->GetHomeOutputDirectory();
   rootBin += cmake::GetCMakeFilesDirectory();
 
   // If the configuration files path has been set,
@@ -2879,8 +2879,10 @@ void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::WriteSummary()
 {
+  cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
+
   // Record all target directories in a central location.
-  std::string fname = this->CMakeInstance->GetHomeOutputDirectory();
+  std::string fname = mf->GetHomeOutputDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f82fcb3..6290907 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -51,7 +51,7 @@ void cmGlobalKdevelopGenerator::Generate()
     {
     cmMakefile* mf = it->second[0]->GetMakefile();
     std::string outputDir=mf->GetCurrentBinaryDirectory();
-    std::string projectDir=it->second[0]->GetSourceDirectory();
+    std::string projectDir=mf->GetHomeDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 32e6077..9d8193b 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1198,15 +1198,16 @@ void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
 void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
 {
   cmLocalGenerator *lg = this->LocalGenerators[0];
+  cmMakefile* mfRoot = lg->GetMakefile();
 
   std::ostringstream cmd;
   cmd << lg->ConvertToOutputFormat(cmSystemTools::GetCMakeCommand(),
                                    cmLocalGenerator::SHELL)
       << " -H"
-      << lg->ConvertToOutputFormat(lg->GetSourceDirectory(),
+      << lg->ConvertToOutputFormat(mfRoot->GetHomeDirectory(),
                                    cmLocalGenerator::SHELL)
       << " -B"
-      << lg->ConvertToOutputFormat(lg->GetBinaryDirectory(),
+      << lg->ConvertToOutputFormat(mfRoot->GetHomeOutputDirectory(),
                                    cmLocalGenerator::SHELL);
   WriteRule(*this->RulesFileStream,
             "RERUN_CMAKE",
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 2fdc18f..73bcd2b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -785,7 +785,7 @@ cmGlobalUnixMakefileGenerator3
       depends.clear();
 
       cmLocalUnixMakefileGenerator3::EchoProgress progress;
-      progress.Dir = lg->GetBinaryDirectory();
+      progress.Dir = lg->GetMakefile()->GetHomeOutputDirectory();
       progress.Dir += cmake::GetCMakeFilesDirectory();
       {
       std::ostringstream progressArg;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 0a6844e..86a8f87 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -312,10 +312,10 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
   std::string argH = "-H";
-  argH += lg->GetSourceDirectory();
+  argH += mf->GetHomeDirectory();
   commandLine.push_back(argH);
   std::string argB = "-B";
-  argB += lg->GetBinaryDirectory();
+  argB += mf->GetHomeOutputDirectory();
   commandLine.push_back(argB);
   commandLine.push_back("--check-stamp-list");
   commandLine.push_back(stampList.c_str());
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index b40d5b7..840e89f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -588,7 +588,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = root->GetBinaryDirectory();
+  std::string checkCache = mf->GetHomeOutputDirectory();
   checkCache += "/";
   checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
   checkCache += "cmake.check_cache";
@@ -602,9 +602,9 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   makefileStream << "\n\t" <<
     this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
                  << " -H" << this->ConvertToRelativeForMake(
-                   root->GetSourceDirectory())
+                   mf->GetHomeDirectory())
                  << " -B" << this->ConvertToRelativeForMake(
-                   root->GetBinaryDirectory()) << "\n";
+                   mf->GetHomeOutputDirectory()) << "\n";
 }
 
 //----------------------------------------------------------------------------
@@ -3746,7 +3746,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
   // Since this call may have created new cache entries, save the cache:
   //
   root->GetMakefile()->GetCMakeInstance()->SaveCache(
-    root->GetBinaryDirectory());
+    root->GetMakefile()->GetHomeOutputDirectory());
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6c442f4..b7833cd 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2868,16 +2868,6 @@ cmake* cmLocalGenerator::GetCMakeInstance() const
   return this->GlobalGenerator->GetCMakeInstance();
 }
 
-const char* cmLocalGenerator::GetSourceDirectory() const
-{
-  return this->GetCMakeInstance()->GetHomeDirectory();
-}
-
-const char* cmLocalGenerator::GetBinaryDirectory() const
-{
-  return this->GetCMakeInstance()->GetHomeOutputDirectory();
-}
-
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2123f1e..b3bf8cd 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -255,9 +255,6 @@ public:
 
   cmake* GetCMakeInstance() const;
 
-  const char* GetSourceDirectory() const;
-  const char* GetBinaryDirectory() const;
-
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index bf5afc1..b131a63 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -399,7 +399,7 @@ cmLocalUnixMakefileGenerator3
       );
     }
   this->CreateCDCommand(commands,
-                        this->GetBinaryDirectory(),
+                        this->Makefile->GetHomeOutputDirectory(),
                         cmLocalGenerator::START_OUTPUT);
 
   // Write the rule to the makefile.
@@ -449,7 +449,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefile2.c_str(),localName));
       this->CreateCDCommand(commands,
-                            this->GetBinaryDirectory(),
+                            this->Makefile->GetHomeOutputDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
                           localName, depends, commands, true);
@@ -478,7 +478,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefileName.c_str(), makeTargetName));
       this->CreateCDCommand(commands,
-                            this->GetBinaryDirectory(),
+                            this->Makefile->GetHomeOutputDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "fast build rule for target.",
                           localName, depends, commands, true);
@@ -496,7 +496,7 @@ void cmLocalUnixMakefileGenerator3
         commands.push_back(this->GetRecursiveMakeCall
                            (makefile2.c_str(), makeTargetName));
         this->CreateCDCommand(commands,
-                              this->GetBinaryDirectory(),
+                              this->Makefile->GetHomeOutputDirectory(),
                               cmLocalGenerator::START_OUTPUT);
         this->WriteMakeRule(ruleFileStream,
                             "Manual pre-install relink rule for target.",
@@ -750,13 +750,13 @@ cmLocalUnixMakefileGenerator3
   makefileStream
     << "# The top-level source directory on which CMake was run.\n"
     << "CMAKE_SOURCE_DIR = "
-    << this->Convert(this->GetSourceDirectory(), FULL, SHELL)
+    << this->Convert(this->Makefile->GetHomeDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
   makefileStream
     << "# The top-level build directory on which CMake was run.\n"
     << "CMAKE_BINARY_DIR = "
-    << this->Convert(this->GetBinaryDirectory(), FULL, SHELL)
+    << this->Convert(this->Makefile->GetHomeOutputDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
 }
@@ -889,7 +889,7 @@ void cmLocalUnixMakefileGenerator3
   if(!this->GetMakefile()->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
-                          this->GetBinaryDirectory(),
+                          this->Makefile->GetHomeOutputDirectory(),
                           cmLocalGenerator::START_OUTPUT);
     }
   this->WriteMakeRule(makefileStream,
@@ -1838,7 +1838,7 @@ void cmLocalUnixMakefileGenerator3
 
   depends.push_back("cmake_check_build_system");
 
-  std::string progressDir = this->GetBinaryDirectory();
+  std::string progressDir = this->Makefile->GetHomeOutputDirectory();
   progressDir += cmake::GetCMakeFilesDirectory();
     {
     std::ostringstream progCmd;
@@ -1862,7 +1862,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->GetBinaryDirectory(),
+                        this->Makefile->GetHomeOutputDirectory(),
                         cmLocalGenerator::START_OUTPUT);
     {
     std::ostringstream progCmd;
@@ -1884,7 +1884,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                                this->GetBinaryDirectory(),
+                                this->Makefile->GetHomeOutputDirectory(),
                                 cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "The main clean target", "clean",
                       depends, commands, true);
@@ -1914,7 +1914,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back
     (this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->GetBinaryDirectory(),
+                        this->Makefile->GetHomeOutputDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "Prepare targets for installation.",
                       "preinstall", depends, commands, true);
@@ -1935,7 +1935,7 @@ void cmLocalUnixMakefileGenerator3
   runRule += " 1";
   commands.push_back(runRule);
   this->CreateCDCommand(commands,
-                        this->GetBinaryDirectory(),
+                        this->Makefile->GetHomeOutputDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "clear depends",
                       "depend",
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 66b3dd3..cc94cd4 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -112,7 +112,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->GetSourceDirectory()) != 0)
+            this->Makefile->GetHomeDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -226,10 +226,10 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->GetSourceDirectory();
+  args += this->Makefile->GetHomeDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->GetBinaryDirectory();
+  args += this->Makefile->GetHomeOutputDirectory();
   commandLine.push_back(args);
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 9c25651..a4bce8a 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -161,7 +161,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->GetSourceDirectory()) != 0)
+            this->Makefile->GetHomeDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -290,10 +290,10 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->GetSourceDirectory();
+  args += this->Makefile->GetHomeDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->GetBinaryDirectory();
+  args += this->Makefile->GetHomeOutputDirectory();
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
   std::string stampFilename = this->Convert(stampName.c_str(), FULL,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 8c700a1..b278087 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1095,7 +1095,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // translation table for the dependency scanning process.
   depCmd << "cd "
          << (this->LocalGenerator->Convert(
-               this->LocalGenerator->GetBinaryDirectory(),
+               this->Makefile->GetHomeOutputDirectory(),
                cmLocalGenerator::FULL, cmLocalGenerator::SHELL))
          << " && ";
 #endif
@@ -1110,13 +1110,13 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // the state of our local generator sufficiently for its needs.
   depCmd << "$(CMAKE_COMMAND) -E cmake_depends \""
          << this->GlobalGenerator->GetName() << "\" "
-         << this->Convert(this->LocalGenerator->GetSourceDirectory(),
+         << this->Convert(this->Makefile->GetHomeDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
+         << this->Convert(this->Makefile->GetHomeOutputDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
@@ -1242,7 +1242,7 @@ void
 cmMakefileTargetGenerator
 ::MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress& progress) const
 {
-  progress.Dir = this->LocalGenerator->GetBinaryDirectory();
+  progress.Dir = this->Makefile->GetHomeOutputDirectory();
   progress.Dir += cmake::GetCMakeFilesDirectory();
   std::ostringstream progressArg;
   progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index fb598e8..84c19a3 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -666,8 +666,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   if (!preLinkCmdLines.empty())
     {
     const std::string homeOutDir = localGen.ConvertToOutputFormat(
-                                            localGen.GetBinaryDirectory(),
-                                            cmLocalGenerator::SHELL);
+                                              mf->GetHomeOutputDirectory(),
+                                              cmLocalGenerator::SHELL);
     preLinkCmdLines.push_back("cd " + homeOutDir);
     }
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index d792ba7..6e6dc60 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -47,7 +47,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // in every directory, which we don't need.
         cmMakefile *mf = target->Target->GetMakefile();
         if (strcmp(mf->GetCurrentSourceDirectory(),
-                   target->GetLocalGenerator()->GetSourceDirectory()) == 0)
+                   mf->GetHomeDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
       }
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 3e36589..58b901a 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -103,13 +103,13 @@ void cmNinjaUtilityTargetGenerator::Generate()
       command,
       "$(CMAKE_SOURCE_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetLocalGenerator()->GetSourceDirectory(),
+        this->GetTarget()->GetMakefile()->GetHomeDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(
       command,
       "$(CMAKE_BINARY_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetLocalGenerator()->GetBinaryDirectory(),
+        this->GetTarget()->GetMakefile()->GetHomeOutputDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(command, "$(ARGS)", "");
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf2a0a5aea5fd218de25f07450a7a69e3f3adcd7
commit bf2a0a5aea5fd218de25f07450a7a69e3f3adcd7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 22:01:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 22:01:00 2015 +0200

    Revert "cmLocalGenerator: Add current binary directory accessor."
    
    This reverts commit f1de916fda8bb37780f8c7ceb01517400ca718e6.

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 80f560f..856dcd4 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -160,7 +160,7 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
   if (mod_dir.empty())
     {
     mod_dir =
-      this->LocalGenerator->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
     }
 
   // Actually write dependencies to the streams.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index cb46f8c..883b287 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -76,7 +76,8 @@ void cmExtraCodeBlocksGenerator::Generate()
 void cmExtraCodeBlocksGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
+  const cmMakefile* mf=lgs[0]->GetMakefile();
+  std::string outputDir=mf->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
@@ -330,7 +331,7 @@ void cmExtraCodeBlocksGenerator
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
+          if (strcmp(makefile->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
@@ -521,10 +522,11 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
                                         cmLocalGenerator* lg,
                                         cmTarget* target) const
 {
+  cmMakefile *mf = lg->GetMakefile();
   // this file doesn't seem to be used by C::B in custom makefile mode,
   // but we generate a unique file for each OBJECT library so in case
   // C::B uses it in some way, the targets don't interfere with each other.
-  std::string filename = lg->GetCurrentBinaryDirectory();
+  std::string filename = mf->GetCurrentBinaryDirectory();
   filename += "/";
   filename += lg->GetTargetDirectory(*target);
   filename += "/";
@@ -551,14 +553,14 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
                                               const char* compiler)
 {
   cmMakefile const* makefile = lg->GetMakefile();
-  std::string makefileName = lg->GetCurrentBinaryDirectory();
+  std::string makefileName = makefile->GetCurrentBinaryDirectory();
   makefileName += "/Makefile";
 
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
     int cbTargetType = this->GetCBTargetType(target);
-    std::string workingDir = lg->GetCurrentBinaryDirectory();
+    std::string workingDir = makefile->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmTarget::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
@@ -655,7 +657,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   else // e.g. all and the GLOBAL and UTILITY targets
     {
     fout<<"         <Option working_dir=\""
-        << lg->GetCurrentBinaryDirectory() << "\" />\n"
+        << makefile->GetCurrentBinaryDirectory() << "\" />\n"
         <<"         <Option type=\"" << 4 << "\" />\n";
     }
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index b4b5c89..763673e 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -68,15 +68,15 @@ void cmExtraCodeLiteGenerator::Generate()
     const cmMakefile* mf =it->second[0]->GetMakefile();
     this->ConfigName = GetConfigurationName( mf );
 
-    if (strcmp(it->second[0]->GetCurrentBinaryDirectory(),
+    if (strcmp(mf->GetCurrentBinaryDirectory(),
                it->second[0]->GetBinaryDirectory()) == 0)
       {
-      workspaceOutputDir   = it->second[0]->GetCurrentBinaryDirectory();
+      workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
       workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
-      this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();;
+      this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
 
       fout.Open(workspaceFileName.c_str(), false, false);
       fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -91,7 +91,8 @@ void cmExtraCodeLiteGenerator::Generate()
        ++it)
     {
     // retrive project information
-    std::string outputDir   = it->second[0]->GetCurrentBinaryDirectory();
+    const cmMakefile* mf    = it->second[0]->GetMakefile();
+    std::string outputDir   = mf->GetCurrentBinaryDirectory();
     std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
@@ -120,7 +121,8 @@ void cmExtraCodeLiteGenerator::Generate()
 void cmExtraCodeLiteGenerator::CreateProjectFile(
   const std::vector<cmLocalGenerator*>& lgs)
 {
-  std::string outputDir   = lgs[0]->GetCurrentBinaryDirectory();
+  const cmMakefile* mf    = lgs[0]->GetMakefile();
+  std::string outputDir   = mf->GetCurrentBinaryDirectory();
   std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 8687dad..214e89f 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -208,7 +208,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 
   std::string cacheEntryName = "CMAKE_ECLIPSE_ENVVAR_";
   cacheEntryName += envVar;
-  const char* cacheValue = lg->GetState()->GetInitializedCacheValue(
+  const char* cacheValue = mf->GetState()->GetInitializedCacheValue(
                                                        cacheEntryName);
 
   // now we have both, decide which one to use
@@ -1034,7 +1034,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        ++it)
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
+    cmMakefile* makefile=(*it)->GetMakefile();
+    std::string subdir = (*it)->Convert(makefile->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
       {
@@ -1095,7 +1096,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
                              ti->first.c_str());
 
           std::string cleanArgs = "-E chdir \"";
-          cleanArgs += (*it)->GetCurrentBinaryDirectory();
+          cleanArgs += makefile->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 0c009c3..f14a1cc 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -47,7 +47,7 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 void cmExtraKateGenerator::Generate()
 {
   cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  cmMakefile* mf = lg->GetMakefile();
+  const cmMakefile* mf = lg->GetMakefile();
   this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                           this->GetPathBasename(lg->GetBinaryDirectory()));
@@ -121,7 +121,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
-    std::string currentDir = (*it)->GetCurrentBinaryDirectory();
+    std::string currentDir = makefile->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 133626e..21587d6 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -77,7 +77,8 @@ void cmExtraSublimeTextGenerator::Generate()
 void cmExtraSublimeTextGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
+  const cmMakefile* mf=lgs[0]->GetMakefile();
+  std::string outputDir=mf->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index ab24f94..f82fcb3 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -49,7 +49,8 @@ void cmGlobalKdevelopGenerator::Generate()
       it!= this->GlobalGenerator->GetProjectMap().end();
       ++it)
     {
-    std::string outputDir=it->second[0]->GetCurrentBinaryDirectory();
+    cmMakefile* mf = it->second[0]->GetMakefile();
+    std::string outputDir=mf->GetCurrentBinaryDirectory();
     std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 3dd9e37..2fdc18f 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -163,7 +163,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
     {
     cmLocalUnixMakefileGenerator3 *lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    std::string markFileName = lg->GetCurrentBinaryDirectory();
+    std::string markFileName = lg->GetMakefile()->GetCurrentBinaryDirectory();
     markFileName += "/";
     markFileName += cmake::GetCMakeFilesDirectory();
     markFileName += "/progress.marks";
@@ -395,7 +395,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
     {
     lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    tmpStr = lg->GetCurrentBinaryDirectory();
+    tmpStr = lg->GetMakefile()->GetCurrentBinaryDirectory();
     tmpStr += cmake::GetCMakeFilesDirectory();
     tmpStr += "/CMakeDirectoryInformation.cmake";
     cmakefileStream << "  \"" <<
@@ -454,7 +454,7 @@ cmGlobalUnixMakefileGenerator3
                       bool check_relink)
 {
   // Get the relative path to the subdirectory from the top.
-  std::string makeTarget = lg->GetCurrentBinaryDirectory();
+  std::string makeTarget = lg->GetMakefile()->GetCurrentBinaryDirectory();
   makeTarget += "/";
   makeTarget += pass;
 
@@ -534,7 +534,7 @@ cmGlobalUnixMakefileGenerator3
     }
 
   // Begin the directory-level rules section.
-  std::string dir = lg->GetCurrentBinaryDirectory();
+  std::string dir = lg->GetMakefile()->GetCurrentBinaryDirectory();
   dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT,
                     cmLocalGenerator::MAKERULE);
   lg->WriteDivider(ruleFileStream);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 1ca3bd7..73a952b 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -363,7 +363,7 @@ void cmGlobalVisualStudio7Generator
     return;
     }
   this->CurrentProject = root->GetProjectName();
-  std::string fname = root->GetCurrentBinaryDirectory();
+  std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += root->GetProjectName();
   fname += ".sln";
@@ -468,7 +468,8 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        std::string dir = root->GetCurrentBinaryDirectory();
+        cmMakefile* tmf = target->GetMakefile();
+        std::string dir = tmf->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
         if(dir == ".")
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index af32563..b40d5b7 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -414,11 +414,11 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
+  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentBinaryDirectory(),
                            this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
-    root->GetCurrentBinaryDirectory();
+    root->GetMakefile()->GetCurrentBinaryDirectory();
   this->CurrentXCodeHackMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentXCodeHackMakefile.c_str());
   this->CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
@@ -466,7 +466,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   allbuild->AddSourceCMP0049(listfile.c_str());
 
   // Add XCODE depend helper
-  std::string dir = root->GetCurrentBinaryDirectory();
+  std::string dir = mf->GetCurrentBinaryDirectory();
   cmCustomCommandLine makeHelper;
   if(this->XcodeVersion < 50)
     {
@@ -580,7 +580,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   std::vector<std::string>::iterator new_end =
     std::unique(lfiles.begin(), lfiles.end());
   lfiles.erase(new_end, lfiles.end());
-  this->CurrentReRunCMakeMakefile = root->GetCurrentBinaryDirectory();
+  this->CurrentReRunCMakeMakefile = mf->GetCurrentBinaryDirectory();
   this->CurrentReRunCMakeMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str());
   this->CurrentReRunCMakeMakefile += "/ReRunCMake.make";
@@ -1031,7 +1031,7 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen)
   this->CurrentLocalGenerator = gen;
   this->CurrentMakefile = gen->GetMakefile();
   std::string outdir =
-    cmSystemTools::CollapseFullPath(this->CurrentLocalGenerator->
+    cmSystemTools::CollapseFullPath(this->CurrentMakefile->
                                     GetCurrentBinaryDirectory());
   cmSystemTools::SplitPath(outdir.c_str(),
                            this->CurrentOutputDirectoryComponents);
@@ -1387,7 +1387,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // linker language.  This should convince Xcode to choose the proper
   // language.
   cmMakefile* mf = cmtarget.GetMakefile();
-  std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
+  std::string fname = mf->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
   fname += cmtarget.GetName();
@@ -1616,7 +1616,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 const & commands,
                                                 const char* name)
 {
-  std::string dir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
+  std::string dir = this->CurrentMakefile->GetCurrentBinaryDirectory();
   dir += "/CMakeScripts";
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
@@ -1637,7 +1637,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                     currentConfig->c_str());
     }
 
-  std::string cdir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
+  std::string cdir = this->CurrentMakefile->GetCurrentBinaryDirectory();
   cdir = this->ConvertToRelativeForXCode(cdir.c_str());
   std::string makecmd = "make -C ";
   makecmd += cdir;
@@ -1965,7 +1965,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Set attributes to specify the proper name for the target.
-  std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
+  std::string pndir = this->CurrentMakefile->GetCurrentBinaryDirectory();
   if(target.GetType() == cmTarget::STATIC_LIBRARY ||
      target.GetType() == cmTarget::SHARED_LIBRARY ||
      target.GetType() == cmTarget::MODULE_LIBRARY ||
@@ -3481,7 +3481,7 @@ bool cmGlobalXCodeGenerator
     }
   }
 
-  std::string symroot = root->GetCurrentBinaryDirectory();
+  std::string symroot = root->GetMakefile()->GetCurrentBinaryDirectory();
   symroot += "/build";
   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
 
@@ -3724,7 +3724,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     {
     return;
     }
-  std::string xcodeDir = root->GetCurrentBinaryDirectory();
+  std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
   xcodeDir += "/";
   xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index f7c9cc2..97b9405 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -64,7 +64,7 @@ void cmInstallExportGenerator::ComputeTempDir()
   // Choose a temporary directory in which to generate the import
   // files to be installed.
   this->TempDir =
-      this->LocalGenerator->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
   this->TempDir += cmake::GetCMakeFilesDirectory();
   this->TempDir += "/Export";
   if(this->Destination.empty())
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8096bd7..6c442f4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2878,11 +2878,6 @@ const char* cmLocalGenerator::GetBinaryDirectory() const
   return this->GetCMakeInstance()->GetHomeOutputDirectory();
 }
 
-const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
-{
-  return this->StateSnapshot.GetDirectory().GetCurrentBinary();
-}
-
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7ca587e..2123f1e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -258,8 +258,6 @@ public:
   const char* GetSourceDirectory() const;
   const char* GetBinaryDirectory() const;
 
-  const char* GetCurrentBinaryDirectory() const;
-
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 6319f0e..b1e1d3f 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -363,7 +363,7 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(
   if (ccg.GetNumberOfCommands() > 0) {
     std::string wd = ccg.GetWorkingDirectory();
     if (wd.empty())
-      wd = this->GetCurrentBinaryDirectory();
+      wd = this->GetMakefile()->GetCurrentBinaryDirectory();
 
     std::ostringstream cdCmd;
 #ifdef _WIN32
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3a163f0..66b3dd3 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -111,14 +111,14 @@ void cmLocalVisualStudio6Generator::Generate()
 void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->GetCurrentBinaryDirectory(),
+  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->GetCurrentBinaryDirectory()))
+       (this->Makefile->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->GetCurrentBinaryDirectory());
+                           this->Makefile->GetCurrentBinaryDirectory());
       }
     }
 
@@ -163,7 +163,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       std::string::size_type pos = l->first.rfind('/');
       if(pos != std::string::npos)
         {
-        std::string dir = this->GetCurrentBinaryDirectory();
+        std::string dir = this->Makefile->GetCurrentBinaryDirectory();
         dir += "/";
         dir += l->first.substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
@@ -189,7 +189,7 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 
   // create the dsp.cmake file
   std::string fname;
-  fname = this->GetCurrentBinaryDirectory();
+  fname = this->Makefile->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
@@ -577,9 +577,9 @@ cmLocalVisualStudio6Generator
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
-  char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
+  char* output = new char[(strlen(this->Makefile->GetCurrentBinaryDirectory())
                            + target.GetName().size() + 30)];
-  sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
+  sprintf(output,"%s/%s_force_%i", this->Makefile->GetCurrentBinaryDirectory(),
           target.GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
@@ -1962,7 +1962,7 @@ cmLocalVisualStudio6Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->GetCurrentBinaryDirectory();
+  dir_max += this->Makefile->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5a68ab3..9c25651 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -138,7 +138,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       cmCustomCommandLines force_commands;
       force_commands.push_back(force_command);
       std::string no_main_dependency = "";
-      std::string force = this->GetCurrentBinaryDirectory();
+      std::string force = this->Makefile->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
       force += tgt.GetName();
@@ -160,14 +160,14 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
 void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->GetCurrentBinaryDirectory(),
+  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->GetCurrentBinaryDirectory()))
+       (this->Makefile->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->GetCurrentBinaryDirectory());
+                           this->Makefile->GetCurrentBinaryDirectory());
       }
     }
 
@@ -196,7 +196,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 {
   // Touch a timestamp file used to determine when the project file is
   // out of date.
-  std::string stampName = this->GetCurrentBinaryDirectory();
+  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
   stampName += cmake::GetCMakeFilesDirectory();
   cmSystemTools::MakeDirectory(stampName.c_str());
   stampName += "/";
@@ -243,7 +243,7 @@ void cmLocalVisualStudio7Generator
   target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
-  fname = this->GetCurrentBinaryDirectory();
+  fname = this->Makefile->GetCurrentBinaryDirectory();
   fname += "/";
   fname += lname;
   if(this->FortranProject)
@@ -272,7 +272,7 @@ void cmLocalVisualStudio7Generator
 //----------------------------------------------------------------------------
 cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
-  std::string stampName = this->GetCurrentBinaryDirectory();
+  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
   stampName += "/";
   stampName += cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
@@ -1719,7 +1719,7 @@ cmLocalVisualStudio7Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->GetCurrentBinaryDirectory();
+  dir_max += this->Makefile->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0b89d1d..8c700a1 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -419,7 +419,7 @@ void cmMakefileTargetGenerator
   this->WriteObjectBuildFile(obj, lang, source, depends);
 
   // The object file should be checked for dependency integrity.
-  std::string objFullPath = this->LocalGenerator->GetCurrentBinaryDirectory();
+  std::string objFullPath = this->Makefile->GetCurrentBinaryDirectory();
   objFullPath += "/";
   objFullPath += obj;
   objFullPath =
@@ -642,7 +642,7 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->LocalGenerator->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->Makefile->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";
@@ -698,7 +698,7 @@ cmMakefileTargetGenerator
   // Change the command working directory to the local build tree.
   this->LocalGenerator->CreateCDCommand
     (compileCommands,
-     this->LocalGenerator->GetCurrentBinaryDirectory(),
+     this->Makefile->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
   commands.insert(commands.end(),
                   compileCommands.begin(), compileCommands.end());
@@ -771,7 +771,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (preprocessCommands,
-           this->LocalGenerator->GetCurrentBinaryDirectory(),
+           this->Makefile->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         preprocessCommands.begin(),
@@ -828,7 +828,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (assemblyCommands,
-           this->LocalGenerator->GetCurrentBinaryDirectory(),
+           this->Makefile->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         assemblyCommands.begin(),
@@ -929,7 +929,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
                                            *this->Target);
   this->LocalGenerator->CreateCDCommand
     (commands,
-     this->LocalGenerator->GetCurrentBinaryDirectory(),
+     this->Makefile->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
 
   // Write the rule.
@@ -1119,7 +1119,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->LocalGenerator->GetCurrentBinaryDirectory(),
+         << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->InfoFileNameFull,
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 8cefd7c..2395ce7 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -195,7 +195,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->BuildFileStream = 0;
   this->IsMissingFiles = false;
   this->DefaultArtifactDir =
-    this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") +
+    this->Makefile->GetCurrentBinaryDirectory() + std::string("/") +
     this->LocalGenerator->GetTargetDirectory(*this->Target);
 }
 
@@ -297,7 +297,8 @@ void cmVisualStudio10TargetGenerator::Generate()
       return;
       }
     }
-  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
+  cmMakefile* mf = this->Target->GetMakefile();
+  std::string path =  mf->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj";
@@ -950,7 +951,7 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path,
 {
   return forceRelative
     ? cmSystemTools::RelativePath(
-      this->LocalGenerator->GetCurrentBinaryDirectory(), path.c_str())
+      this->Makefile->GetCurrentBinaryDirectory(), path.c_str())
     : path.c_str();
 }
 
@@ -989,7 +990,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   this->AddMissingSourceGroups(groupsUsed, sourceGroups);
 
   // Write out group file
-  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
+  std::string path =  this->Makefile->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj.filters";
@@ -1447,7 +1448,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
     std::string sourceRel = this->ConvertPath(sf->GetFullPath(), true);
     size_t const maxLen = 250;
     if(sf->GetCustomCommand() ||
-       ((strlen(this->LocalGenerator->GetCurrentBinaryDirectory()) + 1 +
+       ((strlen(this->Makefile->GetCurrentBinaryDirectory()) + 1 +
          sourceRel.length()) <= maxLen))
       {
       forceRelative = true;
@@ -3312,8 +3313,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
   // For WP80, the manifest needs to be in the same folder as the project
   // this can cause an overwrite problem if projects aren't organized in
   // folders
-  std::string manifestFile =
-      this->LocalGenerator->GetCurrentBinaryDirectory() +
+  std::string manifestFile = this->Makefile->GetCurrentBinaryDirectory() +
                              std::string("/WMAppManifest.xml");
   std::string artifactDir =
     this->LocalGenerator->GetTargetDirectory(*this->Target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb68b0e5da527904d72b81e693624e7d9c697dd5
commit eb68b0e5da527904d72b81e693624e7d9c697dd5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 22:00:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 22:00:49 2015 +0200

    Revert "cmLocalGenerator: Add current source directory accessor."
    
    This reverts commit 8029773fbd01c8dafe1a6f7e0136ae9b7a5339e1.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index efd5b58..8687dad 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -497,7 +497,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
     std::string sourceLinkedResourceName = "[Source directory]";
     std::string linkSourceDirectory = this->GetEclipsePath(
-                                             lg->GetCurrentSourceDirectory());
+                                             mf->GetCurrentSourceDirectory());
     // .project dir can't be subdir of a linked resource dir
     if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
                                          linkSourceDirectory))
@@ -636,7 +636,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
        ++it)
     {
     std::string linkSourceDirectory = this->GetEclipsePath(
-                   it->second[0]->GetCurrentSourceDirectory());
+                   it->second[0]->GetMakefile()->GetCurrentSourceDirectory());
     // a linked resource must not point to a parent directory of .project or
     // .project itself
     if ((baseDir != linkSourceDirectory) &&
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 45250d3..57a8741 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2105,7 +2105,7 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
   for(std::vector<cmLocalGenerator*>::const_iterator it =
       this->LocalGenerators.begin(); it != this->LocalGenerators.end(); ++it)
     {
-    std::string sd = (*it)->GetCurrentSourceDirectory();
+    std::string sd = (*it)->GetMakefile()->GetCurrentSourceDirectory();
     if (sd == start_dir)
       {
       return *it;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 201b02c..af32563 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -412,12 +412,10 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
   this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
-  cmSystemTools::SplitPath(
-        this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
-        this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(
-        this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
-        this->ProjectOutputDirectoryComponents);
+  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
+                           this->ProjectSourceDirectoryComponents);
+  cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
+                           this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
     root->GetCurrentBinaryDirectory();
@@ -462,7 +460,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
-  std::string listfile = root->GetCurrentSourceDirectory();
+  std::string listfile = mf->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
   allbuild->AddSourceCMP0049(listfile.c_str());
@@ -556,7 +554,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
         }
 
       // Refer to the build configuration file for easy editing.
-      listfile = lg->GetCurrentSourceDirectory();
+      listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
       target.AddSourceCMP0049(listfile.c_str());
@@ -3371,7 +3369,7 @@ bool cmGlobalXCodeGenerator
   // Point Xcode at the top of the source tree.
   {
   std::string pdir =
-    this->RelativeToBinary(root->GetCurrentSourceDirectory());
+    this->RelativeToBinary(root->GetMakefile()->GetCurrentSourceDirectory());
   this->RootObject->AddAttribute("projectDirPath",
                                  this->CreateString(pdir.c_str()));
   this->RootObject->AddAttribute("projectRoot", this->CreateString(""));
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c0c50c4..8096bd7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2883,11 +2883,6 @@ const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
-const char* cmLocalGenerator::GetCurrentSourceDirectory() const
-{
-  return this->StateSnapshot.GetDirectory().GetCurrentSource();
-}
-
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 8070667..7ca587e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -259,7 +259,6 @@ public:
   const char* GetBinaryDirectory() const;
 
   const char* GetCurrentBinaryDirectory() const;
-  const char* GetCurrentSourceDirectory() const;
 
   /**
    * Generate a Mac OS X application bundle Info.plist file.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index b84cbc5..3a163f0 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -215,7 +215,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->GetCurrentSourceDirectory();
+  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   if(!cmSystemTools::FileExists(makefileIn.c_str()))
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 90c17c6..5a68ab3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -278,7 +278,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   stampName += "generate.stamp";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->GetCurrentSourceDirectory();
+  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   makefileIn = cmSystemTools::CollapseFullPath(makefileIn.c_str());
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b7ca26b..0b89d1d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1113,7 +1113,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->LocalGenerator->GetCurrentSourceDirectory(),
+         << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 133d2ff..d792ba7 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -45,7 +45,8 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
-        if (strcmp(target->GetLocalGenerator()->GetCurrentSourceDirectory(),
+        cmMakefile *mf = target->Target->GetMakefile();
+        if (strcmp(mf->GetCurrentSourceDirectory(),
                    target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 92b7a57..8cefd7c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2243,7 +2243,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 {
   // Look through the sources for AndroidManifest.xml and use
   // its location as the root source directory.
-  std::string rootDir = this->LocalGenerator->GetCurrentSourceDirectory();
+  std::string rootDir = this->Makefile->GetCurrentSourceDirectory();
   {
   std::vector<cmSourceFile const*> extraSources;
   this->GeneratorTarget->GetExtraSources(extraSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd6692825f5e4b9787746e2811a8a53e33886138
commit fd6692825f5e4b9787746e2811a8a53e33886138
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:42:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 22:00:23 2015 +0200

    Remove some needless GetMakefile() calls.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f3b651..4b6bd50 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -101,7 +101,7 @@ cmCustomCommandGenerator
       }
     else
       {
-      cmOutputConverter converter(this->LG->GetMakefile()->GetStateSnapshot());
+      cmOutputConverter converter(this->LG->GetStateSnapshot());
       cmd += converter.EscapeForShell(arg, this->MakeVars);
       }
     }
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index e4d9f10..8ac5cbc 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -139,7 +139,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator *lg)
       {
       std::ostringstream e;
       e << "Evaluation file \"" << this->Input << "\" cannot be read.";
-      lg->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
+      lg->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 775ad2b..3dd9e37 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -495,7 +495,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the directory-level
   // rules of the subdirectories.
   std::vector<cmState::Snapshot> children
-      = lg->GetMakefile()->GetStateSnapshot().GetChildren();
+      = lg->GetStateSnapshot().GetChildren();
   for(std::vector<cmState::Snapshot>::const_iterator
         ci = children.begin(); ci != children.end(); ++ci)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8029773fbd01c8dafe1a6f7e0136ae9b7a5339e1
commit 8029773fbd01c8dafe1a6f7e0136ae9b7a5339e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:25:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 22:00:23 2015 +0200

    cmLocalGenerator: Add current source directory accessor.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 8687dad..efd5b58 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -497,7 +497,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
     std::string sourceLinkedResourceName = "[Source directory]";
     std::string linkSourceDirectory = this->GetEclipsePath(
-                                             mf->GetCurrentSourceDirectory());
+                                             lg->GetCurrentSourceDirectory());
     // .project dir can't be subdir of a linked resource dir
     if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
                                          linkSourceDirectory))
@@ -636,7 +636,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
        ++it)
     {
     std::string linkSourceDirectory = this->GetEclipsePath(
-                   it->second[0]->GetMakefile()->GetCurrentSourceDirectory());
+                   it->second[0]->GetCurrentSourceDirectory());
     // a linked resource must not point to a parent directory of .project or
     // .project itself
     if ((baseDir != linkSourceDirectory) &&
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 57a8741..45250d3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2105,7 +2105,7 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
   for(std::vector<cmLocalGenerator*>::const_iterator it =
       this->LocalGenerators.begin(); it != this->LocalGenerators.end(); ++it)
     {
-    std::string sd = (*it)->GetMakefile()->GetCurrentSourceDirectory();
+    std::string sd = (*it)->GetCurrentSourceDirectory();
     if (sd == start_dir)
       {
       return *it;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index af32563..201b02c 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -412,10 +412,12 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
   this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
-                           this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
-                           this->ProjectOutputDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
+        this->ProjectSourceDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
+        this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
     root->GetCurrentBinaryDirectory();
@@ -460,7 +462,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
-  std::string listfile = mf->GetCurrentSourceDirectory();
+  std::string listfile = root->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
   allbuild->AddSourceCMP0049(listfile.c_str());
@@ -554,7 +556,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
         }
 
       // Refer to the build configuration file for easy editing.
-      listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
+      listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
       target.AddSourceCMP0049(listfile.c_str());
@@ -3369,7 +3371,7 @@ bool cmGlobalXCodeGenerator
   // Point Xcode at the top of the source tree.
   {
   std::string pdir =
-    this->RelativeToBinary(root->GetMakefile()->GetCurrentSourceDirectory());
+    this->RelativeToBinary(root->GetCurrentSourceDirectory());
   this->RootObject->AddAttribute("projectDirPath",
                                  this->CreateString(pdir.c_str()));
   this->RootObject->AddAttribute("projectRoot", this->CreateString(""));
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8096bd7..c0c50c4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2883,6 +2883,11 @@ const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
+const char* cmLocalGenerator::GetCurrentSourceDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentSource();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7ca587e..8070667 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -259,6 +259,7 @@ public:
   const char* GetBinaryDirectory() const;
 
   const char* GetCurrentBinaryDirectory() const;
+  const char* GetCurrentSourceDirectory() const;
 
   /**
    * Generate a Mac OS X application bundle Info.plist file.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3a163f0..b84cbc5 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -215,7 +215,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   if(!cmSystemTools::FileExists(makefileIn.c_str()))
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5a68ab3..90c17c6 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -278,7 +278,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   stampName += "generate.stamp";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   makefileIn = cmSystemTools::CollapseFullPath(makefileIn.c_str());
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0b89d1d..b7ca26b 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1113,7 +1113,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index d792ba7..133d2ff 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -45,8 +45,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
-        cmMakefile *mf = target->Target->GetMakefile();
-        if (strcmp(mf->GetCurrentSourceDirectory(),
+        if (strcmp(target->GetLocalGenerator()->GetCurrentSourceDirectory(),
                    target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 8cefd7c..92b7a57 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2243,7 +2243,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 {
   // Look through the sources for AndroidManifest.xml and use
   // its location as the root source directory.
-  std::string rootDir = this->Makefile->GetCurrentSourceDirectory();
+  std::string rootDir = this->LocalGenerator->GetCurrentSourceDirectory();
   {
   std::vector<cmSourceFile const*> extraSources;
   this->GeneratorTarget->GetExtraSources(extraSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1de916fda8bb37780f8c7ceb01517400ca718e6
commit f1de916fda8bb37780f8c7ceb01517400ca718e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 25 00:13:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 21:59:59 2015 +0200

    cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 856dcd4..80f560f 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -160,7 +160,7 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
   if (mod_dir.empty())
     {
     mod_dir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
     }
 
   // Actually write dependencies to the streams.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 883b287..cb46f8c 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -76,8 +76,7 @@ void cmExtraCodeBlocksGenerator::Generate()
 void cmExtraCodeBlocksGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
@@ -331,7 +330,7 @@ void cmExtraCodeBlocksGenerator
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
@@ -522,11 +521,10 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
                                         cmLocalGenerator* lg,
                                         cmTarget* target) const
 {
-  cmMakefile *mf = lg->GetMakefile();
   // this file doesn't seem to be used by C::B in custom makefile mode,
   // but we generate a unique file for each OBJECT library so in case
   // C::B uses it in some way, the targets don't interfere with each other.
-  std::string filename = mf->GetCurrentBinaryDirectory();
+  std::string filename = lg->GetCurrentBinaryDirectory();
   filename += "/";
   filename += lg->GetTargetDirectory(*target);
   filename += "/";
@@ -553,14 +551,14 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
                                               const char* compiler)
 {
   cmMakefile const* makefile = lg->GetMakefile();
-  std::string makefileName = makefile->GetCurrentBinaryDirectory();
+  std::string makefileName = lg->GetCurrentBinaryDirectory();
   makefileName += "/Makefile";
 
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
     int cbTargetType = this->GetCBTargetType(target);
-    std::string workingDir = makefile->GetCurrentBinaryDirectory();
+    std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmTarget::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
@@ -657,7 +655,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   else // e.g. all and the GLOBAL and UTILITY targets
     {
     fout<<"         <Option working_dir=\""
-        << makefile->GetCurrentBinaryDirectory() << "\" />\n"
+        << lg->GetCurrentBinaryDirectory() << "\" />\n"
         <<"         <Option type=\"" << 4 << "\" />\n";
     }
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 763673e..b4b5c89 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -68,15 +68,15 @@ void cmExtraCodeLiteGenerator::Generate()
     const cmMakefile* mf =it->second[0]->GetMakefile();
     this->ConfigName = GetConfigurationName( mf );
 
-    if (strcmp(mf->GetCurrentBinaryDirectory(),
+    if (strcmp(it->second[0]->GetCurrentBinaryDirectory(),
                it->second[0]->GetBinaryDirectory()) == 0)
       {
-      workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
+      workspaceOutputDir   = it->second[0]->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
       workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
-      this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
+      this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();;
 
       fout.Open(workspaceFileName.c_str(), false, false);
       fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -91,8 +91,7 @@ void cmExtraCodeLiteGenerator::Generate()
        ++it)
     {
     // retrive project information
-    const cmMakefile* mf    = it->second[0]->GetMakefile();
-    std::string outputDir   = mf->GetCurrentBinaryDirectory();
+    std::string outputDir   = it->second[0]->GetCurrentBinaryDirectory();
     std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
@@ -121,8 +120,7 @@ void cmExtraCodeLiteGenerator::Generate()
 void cmExtraCodeLiteGenerator::CreateProjectFile(
   const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf    = lgs[0]->GetMakefile();
-  std::string outputDir   = mf->GetCurrentBinaryDirectory();
+  std::string outputDir   = lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 214e89f..8687dad 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -208,7 +208,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 
   std::string cacheEntryName = "CMAKE_ECLIPSE_ENVVAR_";
   cacheEntryName += envVar;
-  const char* cacheValue = mf->GetState()->GetInitializedCacheValue(
+  const char* cacheValue = lg->GetState()->GetInitializedCacheValue(
                                                        cacheEntryName);
 
   // now we have both, decide which one to use
@@ -1034,8 +1034,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        ++it)
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
-    std::string subdir = (*it)->Convert(makefile->GetCurrentBinaryDirectory(),
+    std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
       {
@@ -1096,7 +1095,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
                              ti->first.c_str());
 
           std::string cleanArgs = "-E chdir \"";
-          cleanArgs += makefile->GetCurrentBinaryDirectory();
+          cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f14a1cc..0c009c3 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -47,7 +47,7 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 void cmExtraKateGenerator::Generate()
 {
   cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  const cmMakefile* mf = lg->GetMakefile();
+  cmMakefile* mf = lg->GetMakefile();
   this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                           this->GetPathBasename(lg->GetBinaryDirectory()));
@@ -121,7 +121,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
-    std::string currentDir = makefile->GetCurrentBinaryDirectory();
+    std::string currentDir = (*it)->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 21587d6..133626e 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -77,8 +77,7 @@ void cmExtraSublimeTextGenerator::Generate()
 void cmExtraSublimeTextGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f82fcb3..ab24f94 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -49,8 +49,7 @@ void cmGlobalKdevelopGenerator::Generate()
       it!= this->GlobalGenerator->GetProjectMap().end();
       ++it)
     {
-    cmMakefile* mf = it->second[0]->GetMakefile();
-    std::string outputDir=mf->GetCurrentBinaryDirectory();
+    std::string outputDir=it->second[0]->GetCurrentBinaryDirectory();
     std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 59633d9..775ad2b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -163,7 +163,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
     {
     cmLocalUnixMakefileGenerator3 *lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    std::string markFileName = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    std::string markFileName = lg->GetCurrentBinaryDirectory();
     markFileName += "/";
     markFileName += cmake::GetCMakeFilesDirectory();
     markFileName += "/progress.marks";
@@ -395,7 +395,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
     {
     lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    tmpStr = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    tmpStr = lg->GetCurrentBinaryDirectory();
     tmpStr += cmake::GetCMakeFilesDirectory();
     tmpStr += "/CMakeDirectoryInformation.cmake";
     cmakefileStream << "  \"" <<
@@ -454,7 +454,7 @@ cmGlobalUnixMakefileGenerator3
                       bool check_relink)
 {
   // Get the relative path to the subdirectory from the top.
-  std::string makeTarget = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string makeTarget = lg->GetCurrentBinaryDirectory();
   makeTarget += "/";
   makeTarget += pass;
 
@@ -534,7 +534,7 @@ cmGlobalUnixMakefileGenerator3
     }
 
   // Begin the directory-level rules section.
-  std::string dir = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string dir = lg->GetCurrentBinaryDirectory();
   dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT,
                     cmLocalGenerator::MAKERULE);
   lg->WriteDivider(ruleFileStream);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 73a952b..1ca3bd7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -363,7 +363,7 @@ void cmGlobalVisualStudio7Generator
     return;
     }
   this->CurrentProject = root->GetProjectName();
-  std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = root->GetCurrentBinaryDirectory();
   fname += "/";
   fname += root->GetProjectName();
   fname += ".sln";
@@ -468,8 +468,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmMakefile* tmf = target->GetMakefile();
-        std::string dir = tmf->GetCurrentBinaryDirectory();
+        std::string dir = root->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
         if(dir == ".")
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index b40d5b7..af32563 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -414,11 +414,11 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentBinaryDirectory(),
+  cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
                            this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
-    root->GetMakefile()->GetCurrentBinaryDirectory();
+    root->GetCurrentBinaryDirectory();
   this->CurrentXCodeHackMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentXCodeHackMakefile.c_str());
   this->CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
@@ -466,7 +466,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   allbuild->AddSourceCMP0049(listfile.c_str());
 
   // Add XCODE depend helper
-  std::string dir = mf->GetCurrentBinaryDirectory();
+  std::string dir = root->GetCurrentBinaryDirectory();
   cmCustomCommandLine makeHelper;
   if(this->XcodeVersion < 50)
     {
@@ -580,7 +580,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   std::vector<std::string>::iterator new_end =
     std::unique(lfiles.begin(), lfiles.end());
   lfiles.erase(new_end, lfiles.end());
-  this->CurrentReRunCMakeMakefile = mf->GetCurrentBinaryDirectory();
+  this->CurrentReRunCMakeMakefile = root->GetCurrentBinaryDirectory();
   this->CurrentReRunCMakeMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str());
   this->CurrentReRunCMakeMakefile += "/ReRunCMake.make";
@@ -1031,7 +1031,7 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen)
   this->CurrentLocalGenerator = gen;
   this->CurrentMakefile = gen->GetMakefile();
   std::string outdir =
-    cmSystemTools::CollapseFullPath(this->CurrentMakefile->
+    cmSystemTools::CollapseFullPath(this->CurrentLocalGenerator->
                                     GetCurrentBinaryDirectory());
   cmSystemTools::SplitPath(outdir.c_str(),
                            this->CurrentOutputDirectoryComponents);
@@ -1387,7 +1387,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // linker language.  This should convince Xcode to choose the proper
   // language.
   cmMakefile* mf = cmtarget.GetMakefile();
-  std::string fname = mf->GetCurrentBinaryDirectory();
+  std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
   fname += cmtarget.GetName();
@@ -1616,7 +1616,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 const & commands,
                                                 const char* name)
 {
-  std::string dir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string dir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   dir += "/CMakeScripts";
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
@@ -1637,7 +1637,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                     currentConfig->c_str());
     }
 
-  std::string cdir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string cdir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   cdir = this->ConvertToRelativeForXCode(cdir.c_str());
   std::string makecmd = "make -C ";
   makecmd += cdir;
@@ -1965,7 +1965,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Set attributes to specify the proper name for the target.
-  std::string pndir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   if(target.GetType() == cmTarget::STATIC_LIBRARY ||
      target.GetType() == cmTarget::SHARED_LIBRARY ||
      target.GetType() == cmTarget::MODULE_LIBRARY ||
@@ -3481,7 +3481,7 @@ bool cmGlobalXCodeGenerator
     }
   }
 
-  std::string symroot = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string symroot = root->GetCurrentBinaryDirectory();
   symroot += "/build";
   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
 
@@ -3724,7 +3724,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     {
     return;
     }
-  std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string xcodeDir = root->GetCurrentBinaryDirectory();
   xcodeDir += "/";
   xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 97b9405..f7c9cc2 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -64,7 +64,7 @@ void cmInstallExportGenerator::ComputeTempDir()
   // Choose a temporary directory in which to generate the import
   // files to be installed.
   this->TempDir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
   this->TempDir += cmake::GetCMakeFilesDirectory();
   this->TempDir += "/Export";
   if(this->Destination.empty())
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6c442f4..8096bd7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2878,6 +2878,11 @@ const char* cmLocalGenerator::GetBinaryDirectory() const
   return this->GetCMakeInstance()->GetHomeOutputDirectory();
 }
 
+const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentBinary();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2123f1e..7ca587e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -258,6 +258,8 @@ public:
   const char* GetSourceDirectory() const;
   const char* GetBinaryDirectory() const;
 
+  const char* GetCurrentBinaryDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index b1e1d3f..6319f0e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -363,7 +363,7 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(
   if (ccg.GetNumberOfCommands() > 0) {
     std::string wd = ccg.GetWorkingDirectory();
     if (wd.empty())
-      wd = this->GetMakefile()->GetCurrentBinaryDirectory();
+      wd = this->GetCurrentBinaryDirectory();
 
     std::ostringstream cdCmd;
 #ifdef _WIN32
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 66b3dd3..3a163f0 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -111,14 +111,14 @@ void cmLocalVisualStudio6Generator::Generate()
 void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -163,7 +163,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       std::string::size_type pos = l->first.rfind('/');
       if(pos != std::string::npos)
         {
-        std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+        std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
         dir += l->first.substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
@@ -189,7 +189,7 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
@@ -577,9 +577,9 @@ cmLocalVisualStudio6Generator
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
-  char* output = new char[(strlen(this->Makefile->GetCurrentBinaryDirectory())
+  char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
                            + target.GetName().size() + 30)];
-  sprintf(output,"%s/%s_force_%i", this->Makefile->GetCurrentBinaryDirectory(),
+  sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
           target.GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
@@ -1962,7 +1962,7 @@ cmLocalVisualStudio6Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 9c25651..5a68ab3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -138,7 +138,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       cmCustomCommandLines force_commands;
       force_commands.push_back(force_command);
       std::string no_main_dependency = "";
-      std::string force = this->Makefile->GetCurrentBinaryDirectory();
+      std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
       force += tgt.GetName();
@@ -160,14 +160,14 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
 void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -196,7 +196,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 {
   // Touch a timestamp file used to determine when the project file is
   // out of date.
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += cmake::GetCMakeFilesDirectory();
   cmSystemTools::MakeDirectory(stampName.c_str());
   stampName += "/";
@@ -243,7 +243,7 @@ void cmLocalVisualStudio7Generator
   target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += lname;
   if(this->FortranProject)
@@ -272,7 +272,7 @@ void cmLocalVisualStudio7Generator
 //----------------------------------------------------------------------------
 cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += "/";
   stampName += cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
@@ -1719,7 +1719,7 @@ cmLocalVisualStudio7Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 8c700a1..0b89d1d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -419,7 +419,7 @@ void cmMakefileTargetGenerator
   this->WriteObjectBuildFile(obj, lang, source, depends);
 
   // The object file should be checked for dependency integrity.
-  std::string objFullPath = this->Makefile->GetCurrentBinaryDirectory();
+  std::string objFullPath = this->LocalGenerator->GetCurrentBinaryDirectory();
   objFullPath += "/";
   objFullPath += obj;
   objFullPath =
@@ -642,7 +642,7 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->Makefile->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->LocalGenerator->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";
@@ -698,7 +698,7 @@ cmMakefileTargetGenerator
   // Change the command working directory to the local build tree.
   this->LocalGenerator->CreateCDCommand
     (compileCommands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
   commands.insert(commands.end(),
                   compileCommands.begin(), compileCommands.end());
@@ -771,7 +771,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (preprocessCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         preprocessCommands.begin(),
@@ -828,7 +828,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (assemblyCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         assemblyCommands.begin(),
@@ -929,7 +929,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
                                            *this->Target);
   this->LocalGenerator->CreateCDCommand
     (commands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
 
   // Write the rule.
@@ -1119,7 +1119,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->InfoFileNameFull,
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..8cefd7c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -195,7 +195,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->BuildFileStream = 0;
   this->IsMissingFiles = false;
   this->DefaultArtifactDir =
-    this->Makefile->GetCurrentBinaryDirectory() + std::string("/") +
+    this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") +
     this->LocalGenerator->GetTargetDirectory(*this->Target);
 }
 
@@ -297,8 +297,7 @@ void cmVisualStudio10TargetGenerator::Generate()
       return;
       }
     }
-  cmMakefile* mf = this->Target->GetMakefile();
-  std::string path =  mf->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj";
@@ -951,7 +950,7 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path,
 {
   return forceRelative
     ? cmSystemTools::RelativePath(
-      this->Makefile->GetCurrentBinaryDirectory(), path.c_str())
+      this->LocalGenerator->GetCurrentBinaryDirectory(), path.c_str())
     : path.c_str();
 }
 
@@ -990,7 +989,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   this->AddMissingSourceGroups(groupsUsed, sourceGroups);
 
   // Write out group file
-  std::string path =  this->Makefile->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj.filters";
@@ -1448,7 +1447,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
     std::string sourceRel = this->ConvertPath(sf->GetFullPath(), true);
     size_t const maxLen = 250;
     if(sf->GetCustomCommand() ||
-       ((strlen(this->Makefile->GetCurrentBinaryDirectory()) + 1 +
+       ((strlen(this->LocalGenerator->GetCurrentBinaryDirectory()) + 1 +
          sourceRel.length()) <= maxLen))
       {
       forceRelative = true;
@@ -3313,7 +3312,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
   // For WP80, the manifest needs to be in the same folder as the project
   // this can cause an overwrite problem if projects aren't organized in
   // folders
-  std::string manifestFile = this->Makefile->GetCurrentBinaryDirectory() +
+  std::string manifestFile =
+      this->LocalGenerator->GetCurrentBinaryDirectory() +
                              std::string("/WMAppManifest.xml");
   std::string artifactDir =
     this->LocalGenerator->GetTargetDirectory(*this->Target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ce9220ececf0f71f9c2f14ed1b02e67ffefb56e
commit 5ce9220ececf0f71f9c2f14ed1b02e67ffefb56e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 01:17:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 21:59:58 2015 +0200

    cmLocalGenerator: Add Home directory accessors.
    
    Reduce reasons for cmLocalGenerator to have a cmMakefile.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d35b566..e97069f 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1975,8 +1975,9 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
       else if(use_link_rpath)
         {
         // Do not add any path inside the source or build tree.
-        const char* topSourceDir = this->Makefile->GetHomeDirectory();
-        const char* topBinaryDir = this->Makefile->GetHomeOutputDirectory();
+        const char* topSourceDir = this->CMakeInstance->GetHomeDirectory();
+        const char* topBinaryDir =
+            this->CMakeInstance->GetHomeOutputDirectory();
         if(!cmSystemTools::ComparePath(*ri, topSourceDir) &&
            !cmSystemTools::ComparePath(*ri, topBinaryDir) &&
            !cmSystemTools::IsSubDirectory(*ri, topSourceDir) &&
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 2a9b72c..c9b6100 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -245,8 +245,10 @@ static bool checkInterfaceDirs(const std::string &prepro,
 {
   const char* installDir =
             target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir = target->Makefile->GetHomeDirectory();
-  const char* topBinaryDir = target->Makefile->GetHomeOutputDirectory();
+  const char* topSourceDir =
+      target->GetLocalGenerator()->GetSourceDirectory();
+  const char* topBinaryDir =
+      target->GetLocalGenerator()->GetBinaryDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 408daab..883b287 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -273,7 +273,7 @@ void cmExtraCodeBlocksGenerator
         }
 
       const std::string &relative = cmSystemTools::RelativePath(
-                         it->second[0]->GetMakefile()->GetHomeDirectory(),
+                         it->second[0]->GetSourceDirectory(),
                          jt->c_str());
       std::vector<std::string> splitted;
       cmSystemTools::SplitPath(relative, splitted, false);
@@ -297,7 +297,7 @@ void cmExtraCodeBlocksGenerator
   tree.BuildVirtualFolder(virtualFolders);
   // And one for <Unit>
   std::string unitFiles;
-  tree.BuildUnit(unitFiles, std::string(mf->GetHomeDirectory()) + "/");
+  tree.BuildUnit(unitFiles, std::string(lgs[0]->GetSourceDirectory()) + "/");
 
   // figure out the compiler
   std::string compiler = this->GetCBCompilerId(mf);
@@ -332,7 +332,7 @@ void cmExtraCodeBlocksGenerator
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
           if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
                                make.c_str(), *lg, compiler.c_str());
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 1884da1..763673e 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -69,11 +69,11 @@ void cmExtraCodeLiteGenerator::Generate()
     this->ConfigName = GetConfigurationName( mf );
 
     if (strcmp(mf->GetCurrentBinaryDirectory(),
-               mf->GetHomeOutputDirectory()) == 0)
+               it->second[0]->GetBinaryDirectory()) == 0)
       {
       workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
-      workspaceSourcePath  = mf->GetHomeDirectory();
+      workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
       this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 659a9ae..214e89f 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -79,8 +79,8 @@ void cmExtraEclipseCDT4Generator
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::Generate()
 {
-  const cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
 
   std::string eclipseVersion = mf->GetSafeDefinition("CMAKE_ECLIPSE_VERSION");
   cmsys::RegularExpression regex(".*([0-9]+\\.[0-9]+).*");
@@ -106,8 +106,8 @@ void cmExtraEclipseCDT4Generator::Generate()
     }
 
   // TODO: Decide if these are local or member variables
-  this->HomeDirectory       = mf->GetHomeDirectory();
-  this->HomeOutputDirectory = mf->GetHomeOutputDirectory();
+  this->HomeDirectory       = lg->GetSourceDirectory();
+  this->HomeOutputDirectory = lg->GetBinaryDirectory();
 
   this->GenerateLinkedResources = mf->IsOn(
                                     "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
@@ -226,7 +226,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
     mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                            cacheEntryName.c_str(), cmState::STRING,
                            true);
-    mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+    mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
     }
   else if (envVarValue==0 && cacheValue!=0)
     {
@@ -247,7 +247,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
       mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                              cacheEntryName.c_str(), cmState::STRING,
                              true);
-      mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+      mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
       }
     }
 
@@ -1089,7 +1089,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           virtDir += prefix;
           virtDir += ti->first;
           std::string buildArgs = "-C \"";
-          buildArgs += makefile->GetHomeOutputDirectory();
+          buildArgs += (*it)->GetBinaryDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 104372c..f14a1cc 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -50,7 +50,7 @@ void cmExtraKateGenerator::Generate()
   const cmMakefile* mf = lg->GetMakefile();
   this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
-                          this->GetPathBasename(mf->GetHomeOutputDirectory()));
+                          this->GetPathBasename(lg->GetBinaryDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
   this->CreateKateProjectFile(lg);
@@ -61,8 +61,7 @@ void cmExtraKateGenerator::Generate()
 void cmExtraKateGenerator::CreateKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  const cmMakefile* mf = lg->GetMakefile();
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
   if (!fout)
@@ -73,9 +72,9 @@ void cmExtraKateGenerator::CreateKateProjectFile(
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"
-    "\t\"directory\": \"" << mf->GetHomeDirectory() << "\",\n"
-    "\t\"files\": [ { " << this->GenerateFilesString(mf) << "} ],\n";
-  this->WriteTargets(mf, fout);
+    "\t\"directory\": \"" << lg->GetSourceDirectory() << "\",\n"
+    "\t\"files\": [ { " << this->GenerateFilesString(lg) << "} ],\n";
+  this->WriteTargets(lg, fout);
   fout << "}\n";
 }
 
@@ -84,15 +83,15 @@ void
 cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
                                    cmGeneratedFileStream& fout) const
 {
-  cmMakefile* mf = lg->GetMakefile();
+  cmMakefile const* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
-  const char* homeOutputDir = mf->GetHomeOutputDirectory();
+  const char* homeOutputDir = lg->GetBinaryDirectory();
 
   fout <<
   "\t\"build\": {\n"
-  "\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
+  "\t\t\"directory\": \"" << lg->GetBinaryDirectory() << "\",\n"
   "\t\t\"default_target\": \"all\",\n"
   "\t\t\"clean_target\": \"clean\",\n";
 
@@ -123,7 +122,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
     std::string currentDir = makefile->GetCurrentBinaryDirectory();
-    bool topLevel = (currentDir == makefile->GetHomeOutputDirectory());
+    bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
       {
@@ -237,8 +236,7 @@ void
 cmExtraKateGenerator::CreateDummyKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  cmMakefile* mf = lg->GetMakefile();
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/";
   filename += this->ProjectName;
   filename += ".kateproject";
@@ -256,22 +254,21 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(
 std::string
 cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
 {
-  cmMakefile* mf = lg->GetMakefile();
-  std::string s = mf->GetHomeDirectory();
+  std::string s = lg->GetSourceDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"git\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/.svn";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"svn\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/";
 
   std::set<std::string> files;
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 363ab2f..21587d6 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -99,8 +99,8 @@ void cmExtraSublimeTextGenerator
     }
 
   const std::string &sourceRootRelativeToOutput = cmSystemTools::RelativePath(
-                     mf->GetHomeOutputDirectory(),
-                     mf->GetHomeDirectory());
+                     lgs[0]->GetBinaryDirectory(),
+                     lgs[0]->GetSourceDirectory());
   // Write the folder entries to the project file
   fout << "{\n";
   fout << "\t\"folders\":\n\t[\n\t";
@@ -108,8 +108,8 @@ void cmExtraSublimeTextGenerator
     {
       fout << "\t{\n\t\t\t\"path\": \"" << sourceRootRelativeToOutput << "\"";
       const std::string &outputRelativeToSourceRoot =
-        cmSystemTools::RelativePath(mf->GetHomeDirectory(),
-                                    mf->GetHomeOutputDirectory());
+        cmSystemTools::RelativePath(lgs[0]->GetSourceDirectory(),
+                                    lgs[0]->GetBinaryDirectory());
       if ((!outputRelativeToSourceRoot.empty()) &&
         ((outputRelativeToSourceRoot.length() < 3) ||
           (outputRelativeToSourceRoot.substr(0, 3) != "../")))
@@ -173,8 +173,8 @@ void cmExtraSublimeTextGenerator::
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index cae5c2f..4a362d8 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -68,7 +68,9 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 std::string
 cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
 {
-  return target->GetMakefile()->GetHomeOutputDirectory();
+  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
+      ->GetGeneratorTarget(target);
+  return gt->GetLocalGenerator()->GetBinaryDirectory();
 }
 
 std::string
@@ -449,7 +451,7 @@ void cmGhsMultiTargetGenerator::WriteSources(
     cmSystemTools::ConvertToUnixSlashes(sgPath);
     cmGlobalGhsMultiGenerator::AddFilesUpToPath(
       this->GetFolderBuildStreams(), &this->FolderBuildStreams,
-      this->Makefile->GetHomeOutputDirectory(), sgPath,
+      this->LocalGenerator->GetBinaryDirectory(), sgPath,
       GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath);
 
     std::string fullSourcePath((*si)->GetFullPath());
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 05f1029..57a8741 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -399,7 +399,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
   bool fatalError = false;
 
   mf->AddDefinition("RUN_CONFIGURE", true);
-  std::string rootBin = mf->GetHomeOutputDirectory();
+  std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory();
   rootBin += cmake::GetCMakeFilesDirectory();
 
   // If the configuration files path has been set,
@@ -2879,10 +2879,8 @@ void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::WriteSummary()
 {
-  cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
-
   // Record all target directories in a central location.
-  std::string fname = mf->GetHomeOutputDirectory();
+  std::string fname = this->CMakeInstance->GetHomeOutputDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 6290907..f82fcb3 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -51,7 +51,7 @@ void cmGlobalKdevelopGenerator::Generate()
     {
     cmMakefile* mf = it->second[0]->GetMakefile();
     std::string outputDir=mf->GetCurrentBinaryDirectory();
-    std::string projectDir=mf->GetHomeDirectory();
+    std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9d8193b..32e6077 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1198,16 +1198,15 @@ void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
 void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
 {
   cmLocalGenerator *lg = this->LocalGenerators[0];
-  cmMakefile* mfRoot = lg->GetMakefile();
 
   std::ostringstream cmd;
   cmd << lg->ConvertToOutputFormat(cmSystemTools::GetCMakeCommand(),
                                    cmLocalGenerator::SHELL)
       << " -H"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetSourceDirectory(),
                                    cmLocalGenerator::SHELL)
       << " -B"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeOutputDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetBinaryDirectory(),
                                    cmLocalGenerator::SHELL);
   WriteRule(*this->RulesFileStream,
             "RERUN_CMAKE",
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 0064713..59633d9 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -785,7 +785,7 @@ cmGlobalUnixMakefileGenerator3
       depends.clear();
 
       cmLocalUnixMakefileGenerator3::EchoProgress progress;
-      progress.Dir = lg->GetMakefile()->GetHomeOutputDirectory();
+      progress.Dir = lg->GetBinaryDirectory();
       progress.Dir += cmake::GetCMakeFilesDirectory();
       {
       std::ostringstream progressArg;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 86a8f87..0a6844e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -312,10 +312,10 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
   std::string argH = "-H";
-  argH += mf->GetHomeDirectory();
+  argH += lg->GetSourceDirectory();
   commandLine.push_back(argH);
   std::string argB = "-B";
-  argB += mf->GetHomeOutputDirectory();
+  argB += lg->GetBinaryDirectory();
   commandLine.push_back(argB);
   commandLine.push_back("--check-stamp-list");
   commandLine.push_back(stampList.c_str());
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 840e89f..b40d5b7 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -588,7 +588,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = mf->GetHomeOutputDirectory();
+  std::string checkCache = root->GetBinaryDirectory();
   checkCache += "/";
   checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
   checkCache += "cmake.check_cache";
@@ -602,9 +602,9 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   makefileStream << "\n\t" <<
     this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
                  << " -H" << this->ConvertToRelativeForMake(
-                   mf->GetHomeDirectory())
+                   root->GetSourceDirectory())
                  << " -B" << this->ConvertToRelativeForMake(
-                   mf->GetHomeOutputDirectory()) << "\n";
+                   root->GetBinaryDirectory()) << "\n";
 }
 
 //----------------------------------------------------------------------------
@@ -3746,7 +3746,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
   // Since this call may have created new cache entries, save the cache:
   //
   root->GetMakefile()->GetCMakeInstance()->SaveCache(
-    root->GetMakefile()->GetHomeOutputDirectory());
+    root->GetBinaryDirectory());
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b7833cd..6c442f4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2868,6 +2868,16 @@ cmake* cmLocalGenerator::GetCMakeInstance() const
   return this->GlobalGenerator->GetCMakeInstance();
 }
 
+const char* cmLocalGenerator::GetSourceDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeDirectory();
+}
+
+const char* cmLocalGenerator::GetBinaryDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeOutputDirectory();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index b3bf8cd..2123f1e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -255,6 +255,9 @@ public:
 
   cmake* GetCMakeInstance() const;
 
+  const char* GetSourceDirectory() const;
+  const char* GetBinaryDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index b131a63..bf5afc1 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -399,7 +399,7 @@ cmLocalUnixMakefileGenerator3
       );
     }
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
 
   // Write the rule to the makefile.
@@ -449,7 +449,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefile2.c_str(),localName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
                           localName, depends, commands, true);
@@ -478,7 +478,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefileName.c_str(), makeTargetName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "fast build rule for target.",
                           localName, depends, commands, true);
@@ -496,7 +496,7 @@ void cmLocalUnixMakefileGenerator3
         commands.push_back(this->GetRecursiveMakeCall
                            (makefile2.c_str(), makeTargetName));
         this->CreateCDCommand(commands,
-                              this->Makefile->GetHomeOutputDirectory(),
+                              this->GetBinaryDirectory(),
                               cmLocalGenerator::START_OUTPUT);
         this->WriteMakeRule(ruleFileStream,
                             "Manual pre-install relink rule for target.",
@@ -750,13 +750,13 @@ cmLocalUnixMakefileGenerator3
   makefileStream
     << "# The top-level source directory on which CMake was run.\n"
     << "CMAKE_SOURCE_DIR = "
-    << this->Convert(this->Makefile->GetHomeDirectory(), FULL, SHELL)
+    << this->Convert(this->GetSourceDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
   makefileStream
     << "# The top-level build directory on which CMake was run.\n"
     << "CMAKE_BINARY_DIR = "
-    << this->Convert(this->Makefile->GetHomeOutputDirectory(), FULL, SHELL)
+    << this->Convert(this->GetBinaryDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
 }
@@ -889,7 +889,7 @@ void cmLocalUnixMakefileGenerator3
   if(!this->GetMakefile()->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
-                          this->Makefile->GetHomeOutputDirectory(),
+                          this->GetBinaryDirectory(),
                           cmLocalGenerator::START_OUTPUT);
     }
   this->WriteMakeRule(makefileStream,
@@ -1838,7 +1838,7 @@ void cmLocalUnixMakefileGenerator3
 
   depends.push_back("cmake_check_build_system");
 
-  std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+  std::string progressDir = this->GetBinaryDirectory();
   progressDir += cmake::GetCMakeFilesDirectory();
     {
     std::ostringstream progCmd;
@@ -1862,7 +1862,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
     {
     std::ostringstream progCmd;
@@ -1884,7 +1884,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                                this->Makefile->GetHomeOutputDirectory(),
+                                this->GetBinaryDirectory(),
                                 cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "The main clean target", "clean",
                       depends, commands, true);
@@ -1914,7 +1914,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back
     (this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "Prepare targets for installation.",
                       "preinstall", depends, commands, true);
@@ -1935,7 +1935,7 @@ void cmLocalUnixMakefileGenerator3
   runRule += " 1";
   commands.push_back(runRule);
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "clear depends",
                       "depend",
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index cc94cd4..66b3dd3 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -112,7 +112,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -226,10 +226,10 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a4bce8a..9c25651 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -161,7 +161,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -290,10 +290,10 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
   std::string stampFilename = this->Convert(stampName.c_str(), FULL,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b278087..8c700a1 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1095,7 +1095,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // translation table for the dependency scanning process.
   depCmd << "cd "
          << (this->LocalGenerator->Convert(
-               this->Makefile->GetHomeOutputDirectory(),
+               this->LocalGenerator->GetBinaryDirectory(),
                cmLocalGenerator::FULL, cmLocalGenerator::SHELL))
          << " && ";
 #endif
@@ -1110,13 +1110,13 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // the state of our local generator sufficiently for its needs.
   depCmd << "$(CMAKE_COMMAND) -E cmake_depends \""
          << this->GlobalGenerator->GetName() << "\" "
-         << this->Convert(this->Makefile->GetHomeDirectory(),
+         << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetHomeOutputDirectory(),
+         << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
@@ -1242,7 +1242,7 @@ void
 cmMakefileTargetGenerator
 ::MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress& progress) const
 {
-  progress.Dir = this->Makefile->GetHomeOutputDirectory();
+  progress.Dir = this->LocalGenerator->GetBinaryDirectory();
   progress.Dir += cmake::GetCMakeFilesDirectory();
   std::ostringstream progressArg;
   progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 84c19a3..fb598e8 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -666,8 +666,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   if (!preLinkCmdLines.empty())
     {
     const std::string homeOutDir = localGen.ConvertToOutputFormat(
-                                              mf->GetHomeOutputDirectory(),
-                                              cmLocalGenerator::SHELL);
+                                            localGen.GetBinaryDirectory(),
+                                            cmLocalGenerator::SHELL);
     preLinkCmdLines.push_back("cd " + homeOutDir);
     }
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 6e6dc60..d792ba7 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -47,7 +47,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // in every directory, which we don't need.
         cmMakefile *mf = target->Target->GetMakefile();
         if (strcmp(mf->GetCurrentSourceDirectory(),
-                   mf->GetHomeDirectory()) == 0)
+                   target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
       }
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 58b901a..3e36589 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -103,13 +103,13 @@ void cmNinjaUtilityTargetGenerator::Generate()
       command,
       "$(CMAKE_SOURCE_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeDirectory(),
+        this->GetLocalGenerator()->GetSourceDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(
       command,
       "$(CMAKE_BINARY_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeOutputDirectory(),
+        this->GetLocalGenerator()->GetBinaryDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(command, "$(ARGS)", "");
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 16:06:05 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 16:06:05 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-182-ga8e25da
Message-ID: <20151007200605.6FAE0BFE32@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a8e25daac7e967cb8ca9c7c71710b424c28041f3 (commit)
       via  0e013bb7ee45f8ba31582005885b855f7a2407ef (commit)
      from  f6043d59e60d6aa4eb12cb091d4b906e01c4b607 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8e25daac7e967cb8ca9c7c71710b424c28041f3
commit a8e25daac7e967cb8ca9c7c71710b424c28041f3
Merge: f6043d5 0e013bb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 16:06:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 16:06:04 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    0e013bb7 Revert "Remove some needless GetMakefile() calls."


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e013bb7ee45f8ba31582005885b855f7a2407ef
commit 0e013bb7ee45f8ba31582005885b855f7a2407ef
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 22:05:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 22:05:47 2015 +0200

    Revert "Remove some needless GetMakefile() calls."
    
    This reverts commit fd6692825f5e4b9787746e2811a8a53e33886138.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 4b6bd50..7f3b651 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -101,7 +101,7 @@ cmCustomCommandGenerator
       }
     else
       {
-      cmOutputConverter converter(this->LG->GetStateSnapshot());
+      cmOutputConverter converter(this->LG->GetMakefile()->GetStateSnapshot());
       cmd += converter.EscapeForShell(arg, this->MakeVars);
       }
     }
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 8ac5cbc..e4d9f10 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -139,7 +139,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator *lg)
       {
       std::ostringstream e;
       e << "Evaluation file \"" << this->Input << "\" cannot be read.";
-      lg->IssueMessage(cmake::FATAL_ERROR, e.str());
+      lg->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 73bcd2b..0064713 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -495,7 +495,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the directory-level
   // rules of the subdirectories.
   std::vector<cmState::Snapshot> children
-      = lg->GetStateSnapshot().GetChildren();
+      = lg->GetMakefile()->GetStateSnapshot().GetChildren();
   for(std::vector<cmState::Snapshot>::const_iterator
         ci = children.begin(); ci != children.end(); ++ci)
     {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCustomCommandGenerator.cxx            |    2 +-
 Source/cmGeneratorExpressionEvaluationFile.cxx |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 17:07:53 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 17:07:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-185-ge6bfc5e
Message-ID: <20151007210753.B8176BFCB4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e6bfc5ee5271cb6ff29152a1684452f432e5dff6 (commit)
       via  3a3af1790faa93f90d5d2b728ab67c2cebd26248 (commit)
       via  b2ee4cb71be4fc8960b17303e19d0512362bab9f (commit)
      from  a8e25daac7e967cb8ca9c7c71710b424c28041f3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6bfc5ee5271cb6ff29152a1684452f432e5dff6
commit e6bfc5ee5271cb6ff29152a1684452f432e5dff6
Merge: a8e25da 3a3af17
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 17:07:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 17:07:52 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    3a3af179 Revert topic.
    b2ee4cb7 cmMakefile: Inline initialization of project name.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a3af1790faa93f90d5d2b728ab67c2cebd26248
commit 3a3af1790faa93f90d5d2b728ab67c2cebd26248
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 23:07:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 23:07:30 2015 +0200

    Revert topic.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index e3efcdd..7da334e 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -116,7 +116,7 @@ const char* CCONV cmGetProjectName(void *arg)
 {
   cmMakefile *mf = static_cast<cmMakefile *>(arg);
   static std::string name;
-  name = mf->GetStateSnapshot().GetProjectName();
+  name = mf->GetProjectName();
   return name.c_str();
 }
 
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 2a9b72c..881acee 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -241,12 +241,12 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmGeneratorTarget *target, const std::string& prop)
+                      cmTarget *target, const std::string& prop)
 {
   const char* installDir =
-            target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir = target->Makefile->GetHomeDirectory();
-  const char* topBinaryDir = target->Makefile->GetHomeOutputDirectory();
+            target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
+  const char* topSourceDir = target->GetMakefile()->GetHomeDirectory();
+  const char* topBinaryDir = target->GetMakefile()->GetHomeOutputDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
@@ -269,7 +269,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch (target->Target->GetPolicyStatusCMP0041())
+        switch (target->GetPolicyStatusCMP0041())
           {
           case cmPolicies::WARN:
             messageType = cmake::WARNING;
@@ -298,7 +298,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains relative path:\n"
            "  \"" << *li << "\"";
-      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
+      target->GetMakefile()->IssueMessage(messageType, e.str());
       }
     bool inBinary = isSubDirectory(li->c_str(), topBinaryDir);
     bool inSource = isSubDirectory(li->c_str(), topSourceDir);
@@ -316,7 +316,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         {
         if (!shouldContinue)
           {
-          switch(target->Target->GetPolicyStatusCMP0052())
+          switch(target->GetPolicyStatusCMP0052())
             {
             case cmPolicies::WARN:
               {
@@ -329,7 +329,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
                 "a subdirectory of the " << (inBinary ? "build" : "source")
                 << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
                 << "\"" << std::endl;
-              target->GetLocalGenerator()->IssueMessage(cmake::AUTHOR_WARNING,
+              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
                                                   s.str());
               }
             case cmPolicies::OLD:
@@ -352,7 +352,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
-      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
+      target->GetMakefile()->IssueMessage(messageType, e.str());
       }
     if (!inSourceBuild)
       {
@@ -361,7 +361,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         e << "Target \"" << target->GetName() << "\" " << prop <<
             " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
-        target->GetLocalGenerator()->IssueMessage(messageType, e.str());
+        target->GetMakefile()->IssueMessage(messageType, e.str());
         }
       }
     }
@@ -421,9 +421,7 @@ void cmExportFileGenerator::PopulateSourcesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    cmGeneratorTarget* gt = target->GetMakefile()
-        ->GetGlobalGenerator()->GetGeneratorTarget(target);
-    if (!checkInterfaceDirs(prepro, gt, propName))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }
@@ -493,7 +491,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    if (!checkInterfaceDirs(prepro, target->Target, propName))
       {
       return;
       }
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 408daab..dfd51c7 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -78,7 +78,7 @@ void cmExtraCodeBlocksGenerator::CreateProjectFile(
 {
   const cmMakefile* mf=lgs[0]->GetMakefile();
   std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=lgs[0]->GetProjectName();
+  std::string projectName=mf->GetProjectName();
 
   std::string filename=outputDir+"/";
   filename+=projectName+".cbp";
@@ -307,7 +307,7 @@ void cmExtraCodeBlocksGenerator
         "<CodeBlocks_project_file>\n"
         "   <FileVersion major=\"1\" minor=\"6\" />\n"
         "   <Project>\n"
-        "      <Option title=\"" << lgs[0]->GetProjectName()<<"\" />\n"
+        "      <Option title=\"" << mf->GetProjectName()<<"\" />\n"
         "      <Option makefile_is_custom=\"1\" />\n"
         "      <Option compiler=\"" << compiler << "\" />\n"
         "      "<<virtualFolders<<"\n"
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 1884da1..c2cff14 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -72,7 +72,7 @@ void cmExtraCodeLiteGenerator::Generate()
                mf->GetHomeOutputDirectory()) == 0)
       {
       workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
-      workspaceProjectName = it->second[0]->GetProjectName();
+      workspaceProjectName = mf->GetProjectName();
       workspaceSourcePath  = mf->GetHomeDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
@@ -93,7 +93,7 @@ void cmExtraCodeLiteGenerator::Generate()
     // retrive project information
     const cmMakefile* mf    = it->second[0]->GetMakefile();
     std::string outputDir   = mf->GetCurrentBinaryDirectory();
-    std::string projectName = it->second[0]->GetProjectName();
+    std::string projectName = mf->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
     // Make the project file relative to the workspace
@@ -123,7 +123,7 @@ void cmExtraCodeLiteGenerator::CreateProjectFile(
 {
   const cmMakefile* mf    = lgs[0]->GetMakefile();
   std::string outputDir   = mf->GetCurrentBinaryDirectory();
-  std::string projectName = lgs[0]->GetProjectName();
+  std::string projectName = mf->GetProjectName();
   std::string filename    = outputDir + "/";
 
   filename += projectName + ".project";
@@ -143,7 +143,7 @@ void cmExtraCodeLiteGenerator
 
   ////////////////////////////////////
   fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-       "<CodeLite_Project Name=\"" << lgs[0]->GetProjectName()
+       "<CodeLite_Project Name=\"" << mf->GetProjectName()
        << "\" InternalType=\"\">\n";
 
   // Collect all used source files in the project
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 659a9ae..44bf586 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -157,8 +157,9 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
   assert(this->HomeDirectory != this->HomeOutputDirectory);
 
   // set up the project name: <project>-Source@<baseSourcePathName>
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  std::string name = this->GenerateProjectName(lg->GetProjectName(), "Source",
+  const cmMakefile* mf
+     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  std::string name = this->GenerateProjectName(mf->GetProjectName(), "Source",
                                    this->GetPathBasename(this->HomeDirectory));
 
   const std::string filename = this->HomeDirectory + "/.project";
@@ -196,11 +197,8 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
 
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
-                                            const char* envVar,
-                                            cmLocalGenerator* lg)
+                                            const char* envVar, cmMakefile* mf)
 {
-  cmMakefile* mf = lg->GetMakefile();
-
   // get the variables from the environment and from the cache and then
   // figure out which one to use:
 
@@ -261,8 +259,8 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::CreateProjectFile()
 {
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  cmMakefile* mf = lg->GetMakefile();
+  cmMakefile* mf
+    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.project";
 
@@ -282,7 +280,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
     "<projectDescription>\n"
     "\t<name>" <<
-    this->GenerateProjectName(lg->GetProjectName(),
+    this->GenerateProjectName(mf->GetProjectName(),
                               mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                               this->GetPathBasename(this->HomeOutputDirectory))
     << "</name>\n"
@@ -363,17 +361,17 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
   //   but not necessarily when eclipse is open
   if (compilerId == "MSVC")
     {
-    AddEnvVar(fout, "PATH", lg);
-    AddEnvVar(fout, "INCLUDE", lg);
-    AddEnvVar(fout, "LIB", lg);
-    AddEnvVar(fout, "LIBPATH", lg);
+    AddEnvVar(fout, "PATH", mf);
+    AddEnvVar(fout, "INCLUDE", mf);
+    AddEnvVar(fout, "LIB", mf);
+    AddEnvVar(fout, "LIBPATH", mf);
     }
   else if (compilerId == "Intel")
     {
     // if the env.var is set, use this one and put it in the cache
     // if the env.var is not set, but the value is in the cache,
     // use it from the cache:
-    AddEnvVar(fout, "INTEL_LICENSE_FILE", lg);
+    AddEnvVar(fout, "INTEL_LICENSE_FILE", mf);
     }
   fout <<
     "</value>\n"
@@ -696,8 +694,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 {
   std::set<std::string> emmited;
 
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  const cmMakefile* mf = lg->GetMakefile();
+  const cmMakefile* mf
+    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.cproject";
 
@@ -1151,8 +1149,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   fout << "</cconfiguration>\n"
           "</storageModule>\n"
           "<storageModule moduleId=\"cdtBuildSystem\" version=\"4.0.0\">\n"
-          "<project id=\"" << this->EscapeForXML(lg->GetProjectName())
-       << ".null.1\" name=\"" << this->EscapeForXML(lg->GetProjectName())
+          "<project id=\"" << this->EscapeForXML(mf->GetProjectName())
+       << ".null.1\" name=\"" << this->EscapeForXML(mf->GetProjectName())
        << "\"/>\n"
           "</storageModule>\n"
           "</cproject>\n"
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index 16675f2..ef99760 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -100,7 +100,7 @@ private:
                                    std::set<std::string>& emittedDirs);
 
   static void AddEnvVar(cmGeneratedFileStream& fout, const char* envVar,
-                        cmLocalGenerator* lg);
+                        cmMakefile* mf);
 
   void CreateLinksToSubprojects(cmGeneratedFileStream& fout,
                                 const std::string& baseDir);
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 104372c..f83b5cf 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -46,22 +46,20 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 
 void cmExtraKateGenerator::Generate()
 {
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  const cmMakefile* mf = lg->GetMakefile();
-  this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
+  const cmMakefile* mf
+     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  this->ProjectName = this->GenerateProjectName(mf->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                           this->GetPathBasename(mf->GetHomeOutputDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
-  this->CreateKateProjectFile(lg);
-  this->CreateDummyKateProjectFile(lg);
+  this->CreateKateProjectFile(mf);
+  this->CreateDummyKateProjectFile(mf);
 }
 
 
-void cmExtraKateGenerator::CreateKateProjectFile(
-    const cmLocalGenerator* lg) const
+void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
 {
-  const cmMakefile* mf = lg->GetMakefile();
   std::string filename = mf->GetHomeOutputDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
@@ -70,6 +68,9 @@ void cmExtraKateGenerator::CreateKateProjectFile(
     return;
     }
 
+  std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
+  std::string args = mf->GetSafeDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
+
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"
@@ -81,10 +82,9 @@ void cmExtraKateGenerator::CreateKateProjectFile(
 
 
 void
-cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
+cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
                                    cmGeneratedFileStream& fout) const
 {
-  cmMakefile* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
@@ -234,10 +234,8 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& fout,
 
 
 void
-cmExtraKateGenerator::CreateDummyKateProjectFile(
-    const cmLocalGenerator* lg) const
+cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
 {
-  cmMakefile* mf = lg->GetMakefile();
   std::string filename = mf->GetHomeOutputDirectory();
   filename += "/";
   filename += this->ProjectName;
@@ -254,9 +252,8 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(
 
 
 std::string
-cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
+cmExtraKateGenerator::GenerateFilesString(const cmMakefile* mf) const
 {
-  cmMakefile* mf = lg->GetMakefile();
   std::string s = mf->GetHomeDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index b20d0a7..f800feb 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -39,10 +39,9 @@ public:
 
   virtual void Generate();
 private:
-  void CreateKateProjectFile(const cmLocalGenerator* lg) const;
-  void CreateDummyKateProjectFile(const cmLocalGenerator* lg) const;
-  void WriteTargets(const cmLocalGenerator* lg,
-                    cmGeneratedFileStream& fout) const;
+  void CreateKateProjectFile(const cmMakefile* mf) const;
+  void CreateDummyKateProjectFile(const cmMakefile* mf) const;
+  void WriteTargets(const cmMakefile* mf, cmGeneratedFileStream& fout) const;
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string&     target,
                     const std::string&     make,
@@ -50,7 +49,7 @@ private:
                     const std::string&     path,
                     const char*            homeOutputDir) const;
 
-  std::string GenerateFilesString(const cmLocalGenerator* lg) const;
+  std::string GenerateFilesString(const cmMakefile* mf) const;
   std::string GetPathBasename(const std::string& path) const;
   std::string GenerateProjectName(const std::string& name,
                                   const std::string& type,
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 363ab2f..163a75b 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -79,7 +79,7 @@ void cmExtraSublimeTextGenerator::CreateProjectFile(
 {
   const cmMakefile* mf=lgs[0]->GetMakefile();
   std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=lgs[0]->GetProjectName();
+  std::string projectName=mf->GetProjectName();
 
   const std::string filename =
                      outputDir + "/" + projectName + ".sublime-project";
@@ -302,7 +302,7 @@ void cmExtraSublimeTextGenerator::
     {
     fout << ",\n\t";
     }
-  fout << "\t{\n\t\t\t\"name\": \"" << lg->GetProjectName() << " - " <<
+  fout << "\t{\n\t\t\t\"name\": \"" << makefile->GetProjectName() << " - " <<
           targetName << "\",\n";
   fout << "\t\t\t\"cmd\": [" <<
           this->BuildMakeCommand(make, makefileName.c_str(), targetName) <<
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 6290907..138ddbb 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -52,7 +52,7 @@ void cmGlobalKdevelopGenerator::Generate()
     cmMakefile* mf = it->second[0]->GetMakefile();
     std::string outputDir=mf->GetCurrentBinaryDirectory();
     std::string projectDir=mf->GetHomeDirectory();
-    std::string projectName=it->second[0]->GetProjectName();
+    std::string projectName=mf->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
     const std::vector<cmLocalGenerator*>& lgs= it->second;
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index d5e9417..14de698 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -260,7 +260,7 @@ void cmGlobalVisualStudio6Generator
     }
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetProjectName();
+  fname += root->GetMakefile()->GetProjectName();
   fname += ".dsw";
   cmsys::ofstream fout(fname.c_str());
   if(!fout)
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 73a952b..05da022 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -362,10 +362,10 @@ void cmGlobalVisualStudio7Generator
     {
     return;
     }
-  this->CurrentProject = root->GetProjectName();
+  this->CurrentProject = root->GetMakefile()->GetProjectName();
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetProjectName();
+  fname += root->GetMakefile()->GetProjectName();
   fname += ".sln";
   cmGeneratedFileStream fout(fname.c_str());
   fout.SetCopyIfDifferent(true);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 6a25ed0..d45aa27 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -250,7 +250,7 @@ cmGlobalVisualStudioGenerator
         {
         topLevelSlnName = mf->GetCurrentBinaryDirectory();
         topLevelSlnName += "/";
-        topLevelSlnName += this->LocalGenerators[0]->GetProjectName();
+        topLevelSlnName += mf->GetProjectName();
         topLevelSlnName += ".sln";
         }
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 840e89f..746e1a7 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -410,7 +410,7 @@ void cmGlobalXCodeGenerator::Generate()
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
-  this->CurrentProject = root->GetProjectName();
+  this->CurrentProject = root->GetMakefile()->GetProjectName();
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
@@ -3339,7 +3339,7 @@ bool cmGlobalXCodeGenerator
   this->RootObject->SetComment("Project object");
 
   std::string project_id = "PROJECT_";
-  project_id += root->GetProjectName();
+  project_id += root->GetMakefile()->GetProjectName();
   this->RootObject->SetId(this->GetOrCreateId(
     project_id.c_str(), this->RootObject->GetId()).c_str());
 
@@ -3726,7 +3726,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     }
   std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
   xcodeDir += "/";
-  xcodeDir += root->GetProjectName();
+  xcodeDir += root->GetMakefile()->GetProjectName();
   xcodeDir += ".xcode";
   if(this->XcodeVersion > 20)
     {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b7833cd..b26151c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2431,11 +2431,6 @@ const char* cmLocalGenerator::GetFeature(const std::string& feature,
   return 0;
 }
 
-std::string cmLocalGenerator::GetProjectName() const
-{
-  return this->StateSnapshot.GetProjectName();
-}
-
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::ConstructComment(cmCustomCommandGenerator const& ccg,
@@ -2863,11 +2858,6 @@ cmLocalGenerator
   return source.GetLanguage();
 }
 
-cmake* cmLocalGenerator::GetCMakeInstance() const
-{
-  return this->GlobalGenerator->GetCMakeInstance();
-}
-
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index b3bf8cd..33fede1 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -182,8 +182,6 @@ public:
                              const std::string& config,
                              const std::string& lang);
 
-  std::string GetProjectName() const;
-
   /** Compute the language used to compile the given source file.  */
   std::string GetSourceFileLanguage(const cmSourceFile& source);
 
@@ -253,8 +251,6 @@ public:
    */
   bool NeedBackwardsCompatibility_2_4();
 
-  cmake* GetCMakeInstance() const;
-
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index b1e1d3f..c46adc1 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -183,7 +183,7 @@ void cmLocalNinjaGenerator::WriteProjectHeader(std::ostream& os)
 {
   cmGlobalNinjaGenerator::WriteDivider(os);
   os
-    << "# Project: " << this->GetProjectName() << std::endl
+    << "# Project: " << this->GetMakefile()->GetProjectName() << std::endl
     << "# Configuration: " << this->ConfigName << std::endl
     ;
   cmGlobalNinjaGenerator::WriteDivider(os);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 5caa272..077470d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1517,7 +1517,7 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
                     parent->GetProperty("LINK_DIRECTORIES"));
 
   // the initial project name
-  this->StateSnapshot.SetProjectName(parent->StateSnapshot.GetProjectName());
+  this->SetProjectName(parent->GetProjectName());
 
   // Copy include regular expressions.
   this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;
@@ -2033,6 +2033,11 @@ void cmMakefile::SetProjectName(std::string const& p)
   this->StateSnapshot.SetProjectName(p);
 }
 
+std::string cmMakefile::GetProjectName() const
+{
+  return this->StateSnapshot.GetProjectName();
+}
+
 void cmMakefile::AddGlobalLinkInformation(const std::string& name,
                                           cmTarget& target)
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 7057157..8724c6e 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -274,6 +274,11 @@ public:
    */
   void SetProjectName(std::string const& name);
 
+  /**
+   * Get the name of the project for this build.
+   */
+  std::string GetProjectName() const;
+
   /** Get the configurations to be generated.  */
   std::string GetConfigurations(std::vector<std::string>& configs,
                                 bool single = true) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2ee4cb71be4fc8960b17303e19d0512362bab9f
commit b2ee4cb71be4fc8960b17303e19d0512362bab9f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:17:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 23:07:19 2015 +0200

    cmMakefile: Inline initialization of project name.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 7da334e..e3efcdd 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -116,7 +116,7 @@ const char* CCONV cmGetProjectName(void *arg)
 {
   cmMakefile *mf = static_cast<cmMakefile *>(arg);
   static std::string name;
-  name = mf->GetProjectName();
+  name = mf->GetStateSnapshot().GetProjectName();
   return name.c_str();
 }
 
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 881acee..2a9b72c 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -241,12 +241,12 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target, const std::string& prop)
+                      cmGeneratorTarget *target, const std::string& prop)
 {
   const char* installDir =
-            target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir = target->GetMakefile()->GetHomeDirectory();
-  const char* topBinaryDir = target->GetMakefile()->GetHomeOutputDirectory();
+            target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
+  const char* topSourceDir = target->Makefile->GetHomeDirectory();
+  const char* topBinaryDir = target->Makefile->GetHomeOutputDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
@@ -269,7 +269,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch (target->GetPolicyStatusCMP0041())
+        switch (target->Target->GetPolicyStatusCMP0041())
           {
           case cmPolicies::WARN:
             messageType = cmake::WARNING;
@@ -298,7 +298,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains relative path:\n"
            "  \"" << *li << "\"";
-      target->GetMakefile()->IssueMessage(messageType, e.str());
+      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
       }
     bool inBinary = isSubDirectory(li->c_str(), topBinaryDir);
     bool inSource = isSubDirectory(li->c_str(), topSourceDir);
@@ -316,7 +316,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         {
         if (!shouldContinue)
           {
-          switch(target->GetPolicyStatusCMP0052())
+          switch(target->Target->GetPolicyStatusCMP0052())
             {
             case cmPolicies::WARN:
               {
@@ -329,7 +329,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
                 "a subdirectory of the " << (inBinary ? "build" : "source")
                 << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
                 << "\"" << std::endl;
-              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+              target->GetLocalGenerator()->IssueMessage(cmake::AUTHOR_WARNING,
                                                   s.str());
               }
             case cmPolicies::OLD:
@@ -352,7 +352,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
-      target->GetMakefile()->IssueMessage(messageType, e.str());
+      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
       }
     if (!inSourceBuild)
       {
@@ -361,7 +361,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         e << "Target \"" << target->GetName() << "\" " << prop <<
             " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
-        target->GetMakefile()->IssueMessage(messageType, e.str());
+        target->GetLocalGenerator()->IssueMessage(messageType, e.str());
         }
       }
     }
@@ -421,7 +421,9 @@ void cmExportFileGenerator::PopulateSourcesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    cmGeneratorTarget* gt = target->GetMakefile()
+        ->GetGlobalGenerator()->GetGeneratorTarget(target);
+    if (!checkInterfaceDirs(prepro, gt, propName))
       {
       return;
       }
@@ -491,7 +493,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target->Target, propName))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index dfd51c7..408daab 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -78,7 +78,7 @@ void cmExtraCodeBlocksGenerator::CreateProjectFile(
 {
   const cmMakefile* mf=lgs[0]->GetMakefile();
   std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=mf->GetProjectName();
+  std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
   filename+=projectName+".cbp";
@@ -307,7 +307,7 @@ void cmExtraCodeBlocksGenerator
         "<CodeBlocks_project_file>\n"
         "   <FileVersion major=\"1\" minor=\"6\" />\n"
         "   <Project>\n"
-        "      <Option title=\"" << mf->GetProjectName()<<"\" />\n"
+        "      <Option title=\"" << lgs[0]->GetProjectName()<<"\" />\n"
         "      <Option makefile_is_custom=\"1\" />\n"
         "      <Option compiler=\"" << compiler << "\" />\n"
         "      "<<virtualFolders<<"\n"
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index c2cff14..1884da1 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -72,7 +72,7 @@ void cmExtraCodeLiteGenerator::Generate()
                mf->GetHomeOutputDirectory()) == 0)
       {
       workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
-      workspaceProjectName = mf->GetProjectName();
+      workspaceProjectName = it->second[0]->GetProjectName();
       workspaceSourcePath  = mf->GetHomeDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
@@ -93,7 +93,7 @@ void cmExtraCodeLiteGenerator::Generate()
     // retrive project information
     const cmMakefile* mf    = it->second[0]->GetMakefile();
     std::string outputDir   = mf->GetCurrentBinaryDirectory();
-    std::string projectName = mf->GetProjectName();
+    std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
     // Make the project file relative to the workspace
@@ -123,7 +123,7 @@ void cmExtraCodeLiteGenerator::CreateProjectFile(
 {
   const cmMakefile* mf    = lgs[0]->GetMakefile();
   std::string outputDir   = mf->GetCurrentBinaryDirectory();
-  std::string projectName = mf->GetProjectName();
+  std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
   filename += projectName + ".project";
@@ -143,7 +143,7 @@ void cmExtraCodeLiteGenerator
 
   ////////////////////////////////////
   fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-       "<CodeLite_Project Name=\"" << mf->GetProjectName()
+       "<CodeLite_Project Name=\"" << lgs[0]->GetProjectName()
        << "\" InternalType=\"\">\n";
 
   // Collect all used source files in the project
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 44bf586..659a9ae 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -157,9 +157,8 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
   assert(this->HomeDirectory != this->HomeOutputDirectory);
 
   // set up the project name: <project>-Source@<baseSourcePathName>
-  const cmMakefile* mf
-     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
-  std::string name = this->GenerateProjectName(mf->GetProjectName(), "Source",
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  std::string name = this->GenerateProjectName(lg->GetProjectName(), "Source",
                                    this->GetPathBasename(this->HomeDirectory));
 
   const std::string filename = this->HomeDirectory + "/.project";
@@ -197,8 +196,11 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
 
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
-                                            const char* envVar, cmMakefile* mf)
+                                            const char* envVar,
+                                            cmLocalGenerator* lg)
 {
+  cmMakefile* mf = lg->GetMakefile();
+
   // get the variables from the environment and from the cache and then
   // figure out which one to use:
 
@@ -259,8 +261,8 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::CreateProjectFile()
 {
-  cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  cmMakefile* mf = lg->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.project";
 
@@ -280,7 +282,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
     "<projectDescription>\n"
     "\t<name>" <<
-    this->GenerateProjectName(mf->GetProjectName(),
+    this->GenerateProjectName(lg->GetProjectName(),
                               mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                               this->GetPathBasename(this->HomeOutputDirectory))
     << "</name>\n"
@@ -361,17 +363,17 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
   //   but not necessarily when eclipse is open
   if (compilerId == "MSVC")
     {
-    AddEnvVar(fout, "PATH", mf);
-    AddEnvVar(fout, "INCLUDE", mf);
-    AddEnvVar(fout, "LIB", mf);
-    AddEnvVar(fout, "LIBPATH", mf);
+    AddEnvVar(fout, "PATH", lg);
+    AddEnvVar(fout, "INCLUDE", lg);
+    AddEnvVar(fout, "LIB", lg);
+    AddEnvVar(fout, "LIBPATH", lg);
     }
   else if (compilerId == "Intel")
     {
     // if the env.var is set, use this one and put it in the cache
     // if the env.var is not set, but the value is in the cache,
     // use it from the cache:
-    AddEnvVar(fout, "INTEL_LICENSE_FILE", mf);
+    AddEnvVar(fout, "INTEL_LICENSE_FILE", lg);
     }
   fout <<
     "</value>\n"
@@ -694,8 +696,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 {
   std::set<std::string> emmited;
 
-  const cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.cproject";
 
@@ -1149,8 +1151,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   fout << "</cconfiguration>\n"
           "</storageModule>\n"
           "<storageModule moduleId=\"cdtBuildSystem\" version=\"4.0.0\">\n"
-          "<project id=\"" << this->EscapeForXML(mf->GetProjectName())
-       << ".null.1\" name=\"" << this->EscapeForXML(mf->GetProjectName())
+          "<project id=\"" << this->EscapeForXML(lg->GetProjectName())
+       << ".null.1\" name=\"" << this->EscapeForXML(lg->GetProjectName())
        << "\"/>\n"
           "</storageModule>\n"
           "</cproject>\n"
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index ef99760..16675f2 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -100,7 +100,7 @@ private:
                                    std::set<std::string>& emittedDirs);
 
   static void AddEnvVar(cmGeneratedFileStream& fout, const char* envVar,
-                        cmMakefile* mf);
+                        cmLocalGenerator* lg);
 
   void CreateLinksToSubprojects(cmGeneratedFileStream& fout,
                                 const std::string& baseDir);
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f83b5cf..104372c 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -46,20 +46,22 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 
 void cmExtraKateGenerator::Generate()
 {
-  const cmMakefile* mf
-     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
-  this->ProjectName = this->GenerateProjectName(mf->GetProjectName(),
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
+  this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                           this->GetPathBasename(mf->GetHomeOutputDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
-  this->CreateKateProjectFile(mf);
-  this->CreateDummyKateProjectFile(mf);
+  this->CreateKateProjectFile(lg);
+  this->CreateDummyKateProjectFile(lg);
 }
 
 
-void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
+void cmExtraKateGenerator::CreateKateProjectFile(
+    const cmLocalGenerator* lg) const
 {
+  const cmMakefile* mf = lg->GetMakefile();
   std::string filename = mf->GetHomeOutputDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
@@ -68,9 +70,6 @@ void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
     return;
     }
 
-  std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
-  std::string args = mf->GetSafeDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
-
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"
@@ -82,9 +81,10 @@ void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
 
 
 void
-cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
+cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
                                    cmGeneratedFileStream& fout) const
 {
+  cmMakefile* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
@@ -234,8 +234,10 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& fout,
 
 
 void
-cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
+cmExtraKateGenerator::CreateDummyKateProjectFile(
+    const cmLocalGenerator* lg) const
 {
+  cmMakefile* mf = lg->GetMakefile();
   std::string filename = mf->GetHomeOutputDirectory();
   filename += "/";
   filename += this->ProjectName;
@@ -252,8 +254,9 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
 
 
 std::string
-cmExtraKateGenerator::GenerateFilesString(const cmMakefile* mf) const
+cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
 {
+  cmMakefile* mf = lg->GetMakefile();
   std::string s = mf->GetHomeDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index f800feb..b20d0a7 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -39,9 +39,10 @@ public:
 
   virtual void Generate();
 private:
-  void CreateKateProjectFile(const cmMakefile* mf) const;
-  void CreateDummyKateProjectFile(const cmMakefile* mf) const;
-  void WriteTargets(const cmMakefile* mf, cmGeneratedFileStream& fout) const;
+  void CreateKateProjectFile(const cmLocalGenerator* lg) const;
+  void CreateDummyKateProjectFile(const cmLocalGenerator* lg) const;
+  void WriteTargets(const cmLocalGenerator* lg,
+                    cmGeneratedFileStream& fout) const;
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string&     target,
                     const std::string&     make,
@@ -49,7 +50,7 @@ private:
                     const std::string&     path,
                     const char*            homeOutputDir) const;
 
-  std::string GenerateFilesString(const cmMakefile* mf) const;
+  std::string GenerateFilesString(const cmLocalGenerator* lg) const;
   std::string GetPathBasename(const std::string& path) const;
   std::string GenerateProjectName(const std::string& name,
                                   const std::string& type,
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 163a75b..363ab2f 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -79,7 +79,7 @@ void cmExtraSublimeTextGenerator::CreateProjectFile(
 {
   const cmMakefile* mf=lgs[0]->GetMakefile();
   std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=mf->GetProjectName();
+  std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
                      outputDir + "/" + projectName + ".sublime-project";
@@ -302,7 +302,7 @@ void cmExtraSublimeTextGenerator::
     {
     fout << ",\n\t";
     }
-  fout << "\t{\n\t\t\t\"name\": \"" << makefile->GetProjectName() << " - " <<
+  fout << "\t{\n\t\t\t\"name\": \"" << lg->GetProjectName() << " - " <<
           targetName << "\",\n";
   fout << "\t\t\t\"cmd\": [" <<
           this->BuildMakeCommand(make, makefileName.c_str(), targetName) <<
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 138ddbb..6290907 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -52,7 +52,7 @@ void cmGlobalKdevelopGenerator::Generate()
     cmMakefile* mf = it->second[0]->GetMakefile();
     std::string outputDir=mf->GetCurrentBinaryDirectory();
     std::string projectDir=mf->GetHomeDirectory();
-    std::string projectName=mf->GetProjectName();
+    std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
     const std::vector<cmLocalGenerator*>& lgs= it->second;
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 14de698..d5e9417 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -260,7 +260,7 @@ void cmGlobalVisualStudio6Generator
     }
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetMakefile()->GetProjectName();
+  fname += root->GetProjectName();
   fname += ".dsw";
   cmsys::ofstream fout(fname.c_str());
   if(!fout)
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 05da022..73a952b 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -362,10 +362,10 @@ void cmGlobalVisualStudio7Generator
     {
     return;
     }
-  this->CurrentProject = root->GetMakefile()->GetProjectName();
+  this->CurrentProject = root->GetProjectName();
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetMakefile()->GetProjectName();
+  fname += root->GetProjectName();
   fname += ".sln";
   cmGeneratedFileStream fout(fname.c_str());
   fout.SetCopyIfDifferent(true);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d45aa27..6a25ed0 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -250,7 +250,7 @@ cmGlobalVisualStudioGenerator
         {
         topLevelSlnName = mf->GetCurrentBinaryDirectory();
         topLevelSlnName += "/";
-        topLevelSlnName += mf->GetProjectName();
+        topLevelSlnName += this->LocalGenerators[0]->GetProjectName();
         topLevelSlnName += ".sln";
         }
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 746e1a7..840e89f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -410,7 +410,7 @@ void cmGlobalXCodeGenerator::Generate()
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
-  this->CurrentProject = root->GetMakefile()->GetProjectName();
+  this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
@@ -3339,7 +3339,7 @@ bool cmGlobalXCodeGenerator
   this->RootObject->SetComment("Project object");
 
   std::string project_id = "PROJECT_";
-  project_id += root->GetMakefile()->GetProjectName();
+  project_id += root->GetProjectName();
   this->RootObject->SetId(this->GetOrCreateId(
     project_id.c_str(), this->RootObject->GetId()).c_str());
 
@@ -3726,7 +3726,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     }
   std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
   xcodeDir += "/";
-  xcodeDir += root->GetMakefile()->GetProjectName();
+  xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
   if(this->XcodeVersion > 20)
     {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b26151c..b7833cd 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2431,6 +2431,11 @@ const char* cmLocalGenerator::GetFeature(const std::string& feature,
   return 0;
 }
 
+std::string cmLocalGenerator::GetProjectName() const
+{
+  return this->StateSnapshot.GetProjectName();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::ConstructComment(cmCustomCommandGenerator const& ccg,
@@ -2858,6 +2863,11 @@ cmLocalGenerator
   return source.GetLanguage();
 }
 
+cmake* cmLocalGenerator::GetCMakeInstance() const
+{
+  return this->GlobalGenerator->GetCMakeInstance();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 33fede1..b3bf8cd 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -182,6 +182,8 @@ public:
                              const std::string& config,
                              const std::string& lang);
 
+  std::string GetProjectName() const;
+
   /** Compute the language used to compile the given source file.  */
   std::string GetSourceFileLanguage(const cmSourceFile& source);
 
@@ -251,6 +253,8 @@ public:
    */
   bool NeedBackwardsCompatibility_2_4();
 
+  cmake* GetCMakeInstance() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index c46adc1..b1e1d3f 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -183,7 +183,7 @@ void cmLocalNinjaGenerator::WriteProjectHeader(std::ostream& os)
 {
   cmGlobalNinjaGenerator::WriteDivider(os);
   os
-    << "# Project: " << this->GetMakefile()->GetProjectName() << std::endl
+    << "# Project: " << this->GetProjectName() << std::endl
     << "# Configuration: " << this->ConfigName << std::endl
     ;
   cmGlobalNinjaGenerator::WriteDivider(os);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 077470d..5caa272 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1517,7 +1517,7 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
                     parent->GetProperty("LINK_DIRECTORIES"));
 
   // the initial project name
-  this->SetProjectName(parent->GetProjectName());
+  this->StateSnapshot.SetProjectName(parent->StateSnapshot.GetProjectName());
 
   // Copy include regular expressions.
   this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;
@@ -2033,11 +2033,6 @@ void cmMakefile::SetProjectName(std::string const& p)
   this->StateSnapshot.SetProjectName(p);
 }
 
-std::string cmMakefile::GetProjectName() const
-{
-  return this->StateSnapshot.GetProjectName();
-}
-
 void cmMakefile::AddGlobalLinkInformation(const std::string& name,
                                           cmTarget& target)
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8724c6e..7057157 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -274,11 +274,6 @@ public:
    */
   void SetProjectName(std::string const& name);
 
-  /**
-   * Get the name of the project for this build.
-   */
-  std::string GetProjectName() const;
-
   /** Get the configurations to be generated.  */
   std::string GetConfigurations(std::vector<std::string>& configs,
                                 bool single = true) const;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 17:42:37 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 17:42:37 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-187-gd95810b
Message-ID: <20151007214237.78AE8BD49D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d95810be461200491f7671e3cbe42573aa05c7a1 (commit)
       via  850c5282f04c99632fbf876b0c73bdb94d0722de (commit)
      from  e6bfc5ee5271cb6ff29152a1684452f432e5dff6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d95810be461200491f7671e3cbe42573aa05c7a1
commit d95810be461200491f7671e3cbe42573aa05c7a1
Merge: e6bfc5e 850c528
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 17:42:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 17:42:36 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    850c5282 cmLocalGenerator changes.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=850c5282f04c99632fbf876b0c73bdb94d0722de
commit 850c5282f04c99632fbf876b0c73bdb94d0722de
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 23:38:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 23:40:49 2015 +0200

    cmLocalGenerator changes.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 7da334e..e3efcdd 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -116,7 +116,7 @@ const char* CCONV cmGetProjectName(void *arg)
 {
   cmMakefile *mf = static_cast<cmMakefile *>(arg);
   static std::string name;
-  name = mf->GetProjectName();
+  name = mf->GetStateSnapshot().GetProjectName();
   return name.c_str();
 }
 
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d35b566..e97069f 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1975,8 +1975,9 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
       else if(use_link_rpath)
         {
         // Do not add any path inside the source or build tree.
-        const char* topSourceDir = this->Makefile->GetHomeDirectory();
-        const char* topBinaryDir = this->Makefile->GetHomeOutputDirectory();
+        const char* topSourceDir = this->CMakeInstance->GetHomeDirectory();
+        const char* topBinaryDir =
+            this->CMakeInstance->GetHomeOutputDirectory();
         if(!cmSystemTools::ComparePath(*ri, topSourceDir) &&
            !cmSystemTools::ComparePath(*ri, topBinaryDir) &&
            !cmSystemTools::IsSubDirectory(*ri, topSourceDir) &&
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 856dcd4..80f560f 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -160,7 +160,7 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
   if (mod_dir.empty())
     {
     mod_dir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
     }
 
   // Actually write dependencies to the streams.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 881acee..c9b6100 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -241,12 +241,14 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target, const std::string& prop)
+                      cmGeneratorTarget *target, const std::string& prop)
 {
   const char* installDir =
-            target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir = target->GetMakefile()->GetHomeDirectory();
-  const char* topBinaryDir = target->GetMakefile()->GetHomeOutputDirectory();
+            target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
+  const char* topSourceDir =
+      target->GetLocalGenerator()->GetSourceDirectory();
+  const char* topBinaryDir =
+      target->GetLocalGenerator()->GetBinaryDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
@@ -269,7 +271,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch (target->GetPolicyStatusCMP0041())
+        switch (target->Target->GetPolicyStatusCMP0041())
           {
           case cmPolicies::WARN:
             messageType = cmake::WARNING;
@@ -298,7 +300,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains relative path:\n"
            "  \"" << *li << "\"";
-      target->GetMakefile()->IssueMessage(messageType, e.str());
+      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
       }
     bool inBinary = isSubDirectory(li->c_str(), topBinaryDir);
     bool inSource = isSubDirectory(li->c_str(), topSourceDir);
@@ -316,7 +318,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         {
         if (!shouldContinue)
           {
-          switch(target->GetPolicyStatusCMP0052())
+          switch(target->Target->GetPolicyStatusCMP0052())
             {
             case cmPolicies::WARN:
               {
@@ -329,7 +331,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
                 "a subdirectory of the " << (inBinary ? "build" : "source")
                 << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
                 << "\"" << std::endl;
-              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+              target->GetLocalGenerator()->IssueMessage(cmake::AUTHOR_WARNING,
                                                   s.str());
               }
             case cmPolicies::OLD:
@@ -352,7 +354,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
-      target->GetMakefile()->IssueMessage(messageType, e.str());
+      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
       }
     if (!inSourceBuild)
       {
@@ -361,7 +363,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         e << "Target \"" << target->GetName() << "\" " << prop <<
             " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
-        target->GetMakefile()->IssueMessage(messageType, e.str());
+        target->GetLocalGenerator()->IssueMessage(messageType, e.str());
         }
       }
     }
@@ -421,7 +423,9 @@ void cmExportFileGenerator::PopulateSourcesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    cmGeneratorTarget* gt = target->GetMakefile()
+        ->GetGlobalGenerator()->GetGeneratorTarget(target);
+    if (!checkInterfaceDirs(prepro, gt, propName))
       {
       return;
       }
@@ -491,7 +495,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target->Target, propName))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index dfd51c7..cb46f8c 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -76,9 +76,8 @@ void cmExtraCodeBlocksGenerator::Generate()
 void cmExtraCodeBlocksGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=mf->GetProjectName();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
+  std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
   filename+=projectName+".cbp";
@@ -273,7 +272,7 @@ void cmExtraCodeBlocksGenerator
         }
 
       const std::string &relative = cmSystemTools::RelativePath(
-                         it->second[0]->GetMakefile()->GetHomeDirectory(),
+                         it->second[0]->GetSourceDirectory(),
                          jt->c_str());
       std::vector<std::string> splitted;
       cmSystemTools::SplitPath(relative, splitted, false);
@@ -297,7 +296,7 @@ void cmExtraCodeBlocksGenerator
   tree.BuildVirtualFolder(virtualFolders);
   // And one for <Unit>
   std::string unitFiles;
-  tree.BuildUnit(unitFiles, std::string(mf->GetHomeDirectory()) + "/");
+  tree.BuildUnit(unitFiles, std::string(lgs[0]->GetSourceDirectory()) + "/");
 
   // figure out the compiler
   std::string compiler = this->GetCBCompilerId(mf);
@@ -307,7 +306,7 @@ void cmExtraCodeBlocksGenerator
         "<CodeBlocks_project_file>\n"
         "   <FileVersion major=\"1\" minor=\"6\" />\n"
         "   <Project>\n"
-        "      <Option title=\"" << mf->GetProjectName()<<"\" />\n"
+        "      <Option title=\"" << lgs[0]->GetProjectName()<<"\" />\n"
         "      <Option makefile_is_custom=\"1\" />\n"
         "      <Option compiler=\"" << compiler << "\" />\n"
         "      "<<virtualFolders<<"\n"
@@ -331,8 +330,8 @@ void cmExtraCodeBlocksGenerator
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
                                make.c_str(), *lg, compiler.c_str());
@@ -522,11 +521,10 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
                                         cmLocalGenerator* lg,
                                         cmTarget* target) const
 {
-  cmMakefile *mf = lg->GetMakefile();
   // this file doesn't seem to be used by C::B in custom makefile mode,
   // but we generate a unique file for each OBJECT library so in case
   // C::B uses it in some way, the targets don't interfere with each other.
-  std::string filename = mf->GetCurrentBinaryDirectory();
+  std::string filename = lg->GetCurrentBinaryDirectory();
   filename += "/";
   filename += lg->GetTargetDirectory(*target);
   filename += "/";
@@ -553,14 +551,14 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
                                               const char* compiler)
 {
   cmMakefile const* makefile = lg->GetMakefile();
-  std::string makefileName = makefile->GetCurrentBinaryDirectory();
+  std::string makefileName = lg->GetCurrentBinaryDirectory();
   makefileName += "/Makefile";
 
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
     int cbTargetType = this->GetCBTargetType(target);
-    std::string workingDir = makefile->GetCurrentBinaryDirectory();
+    std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmTarget::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
@@ -657,7 +655,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   else // e.g. all and the GLOBAL and UTILITY targets
     {
     fout<<"         <Option working_dir=\""
-        << makefile->GetCurrentBinaryDirectory() << "\" />\n"
+        << lg->GetCurrentBinaryDirectory() << "\" />\n"
         <<"         <Option type=\"" << 4 << "\" />\n";
     }
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index c2cff14..b4b5c89 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -68,15 +68,15 @@ void cmExtraCodeLiteGenerator::Generate()
     const cmMakefile* mf =it->second[0]->GetMakefile();
     this->ConfigName = GetConfigurationName( mf );
 
-    if (strcmp(mf->GetCurrentBinaryDirectory(),
-               mf->GetHomeOutputDirectory()) == 0)
+    if (strcmp(it->second[0]->GetCurrentBinaryDirectory(),
+               it->second[0]->GetBinaryDirectory()) == 0)
       {
-      workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
-      workspaceProjectName = mf->GetProjectName();
-      workspaceSourcePath  = mf->GetHomeDirectory();
+      workspaceOutputDir   = it->second[0]->GetCurrentBinaryDirectory();
+      workspaceProjectName = it->second[0]->GetProjectName();
+      workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
-      this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
+      this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();;
 
       fout.Open(workspaceFileName.c_str(), false, false);
       fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -91,9 +91,8 @@ void cmExtraCodeLiteGenerator::Generate()
        ++it)
     {
     // retrive project information
-    const cmMakefile* mf    = it->second[0]->GetMakefile();
-    std::string outputDir   = mf->GetCurrentBinaryDirectory();
-    std::string projectName = mf->GetProjectName();
+    std::string outputDir   = it->second[0]->GetCurrentBinaryDirectory();
+    std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
     // Make the project file relative to the workspace
@@ -121,9 +120,8 @@ void cmExtraCodeLiteGenerator::Generate()
 void cmExtraCodeLiteGenerator::CreateProjectFile(
   const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf    = lgs[0]->GetMakefile();
-  std::string outputDir   = mf->GetCurrentBinaryDirectory();
-  std::string projectName = mf->GetProjectName();
+  std::string outputDir   = lgs[0]->GetCurrentBinaryDirectory();
+  std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
   filename += projectName + ".project";
@@ -143,7 +141,7 @@ void cmExtraCodeLiteGenerator
 
   ////////////////////////////////////
   fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-       "<CodeLite_Project Name=\"" << mf->GetProjectName()
+       "<CodeLite_Project Name=\"" << lgs[0]->GetProjectName()
        << "\" InternalType=\"\">\n";
 
   // Collect all used source files in the project
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 44bf586..efd5b58 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -79,8 +79,8 @@ void cmExtraEclipseCDT4Generator
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::Generate()
 {
-  const cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
 
   std::string eclipseVersion = mf->GetSafeDefinition("CMAKE_ECLIPSE_VERSION");
   cmsys::RegularExpression regex(".*([0-9]+\\.[0-9]+).*");
@@ -106,8 +106,8 @@ void cmExtraEclipseCDT4Generator::Generate()
     }
 
   // TODO: Decide if these are local or member variables
-  this->HomeDirectory       = mf->GetHomeDirectory();
-  this->HomeOutputDirectory = mf->GetHomeOutputDirectory();
+  this->HomeDirectory       = lg->GetSourceDirectory();
+  this->HomeOutputDirectory = lg->GetBinaryDirectory();
 
   this->GenerateLinkedResources = mf->IsOn(
                                     "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
@@ -157,9 +157,8 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
   assert(this->HomeDirectory != this->HomeOutputDirectory);
 
   // set up the project name: <project>-Source@<baseSourcePathName>
-  const cmMakefile* mf
-     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
-  std::string name = this->GenerateProjectName(mf->GetProjectName(), "Source",
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  std::string name = this->GenerateProjectName(lg->GetProjectName(), "Source",
                                    this->GetPathBasename(this->HomeDirectory));
 
   const std::string filename = this->HomeDirectory + "/.project";
@@ -197,8 +196,11 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
 
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
-                                            const char* envVar, cmMakefile* mf)
+                                            const char* envVar,
+                                            cmLocalGenerator* lg)
 {
+  cmMakefile* mf = lg->GetMakefile();
+
   // get the variables from the environment and from the cache and then
   // figure out which one to use:
 
@@ -206,7 +208,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 
   std::string cacheEntryName = "CMAKE_ECLIPSE_ENVVAR_";
   cacheEntryName += envVar;
-  const char* cacheValue = mf->GetState()->GetInitializedCacheValue(
+  const char* cacheValue = lg->GetState()->GetInitializedCacheValue(
                                                        cacheEntryName);
 
   // now we have both, decide which one to use
@@ -224,7 +226,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
     mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                            cacheEntryName.c_str(), cmState::STRING,
                            true);
-    mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+    mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
     }
   else if (envVarValue==0 && cacheValue!=0)
     {
@@ -245,7 +247,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
       mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                              cacheEntryName.c_str(), cmState::STRING,
                              true);
-      mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+      mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
       }
     }
 
@@ -259,8 +261,8 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::CreateProjectFile()
 {
-  cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  cmMakefile* mf = lg->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.project";
 
@@ -280,7 +282,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
     "<projectDescription>\n"
     "\t<name>" <<
-    this->GenerateProjectName(mf->GetProjectName(),
+    this->GenerateProjectName(lg->GetProjectName(),
                               mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                               this->GetPathBasename(this->HomeOutputDirectory))
     << "</name>\n"
@@ -361,17 +363,17 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
   //   but not necessarily when eclipse is open
   if (compilerId == "MSVC")
     {
-    AddEnvVar(fout, "PATH", mf);
-    AddEnvVar(fout, "INCLUDE", mf);
-    AddEnvVar(fout, "LIB", mf);
-    AddEnvVar(fout, "LIBPATH", mf);
+    AddEnvVar(fout, "PATH", lg);
+    AddEnvVar(fout, "INCLUDE", lg);
+    AddEnvVar(fout, "LIB", lg);
+    AddEnvVar(fout, "LIBPATH", lg);
     }
   else if (compilerId == "Intel")
     {
     // if the env.var is set, use this one and put it in the cache
     // if the env.var is not set, but the value is in the cache,
     // use it from the cache:
-    AddEnvVar(fout, "INTEL_LICENSE_FILE", mf);
+    AddEnvVar(fout, "INTEL_LICENSE_FILE", lg);
     }
   fout <<
     "</value>\n"
@@ -495,7 +497,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
     std::string sourceLinkedResourceName = "[Source directory]";
     std::string linkSourceDirectory = this->GetEclipsePath(
-                                             mf->GetCurrentSourceDirectory());
+                                             lg->GetCurrentSourceDirectory());
     // .project dir can't be subdir of a linked resource dir
     if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
                                          linkSourceDirectory))
@@ -634,7 +636,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
        ++it)
     {
     std::string linkSourceDirectory = this->GetEclipsePath(
-                   it->second[0]->GetMakefile()->GetCurrentSourceDirectory());
+                   it->second[0]->GetCurrentSourceDirectory());
     // a linked resource must not point to a parent directory of .project or
     // .project itself
     if ((baseDir != linkSourceDirectory) &&
@@ -694,8 +696,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 {
   std::set<std::string> emmited;
 
-  const cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.cproject";
 
@@ -1032,8 +1034,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        ++it)
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
-    std::string subdir = (*it)->Convert(makefile->GetCurrentBinaryDirectory(),
+    std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
       {
@@ -1087,14 +1088,14 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           virtDir += prefix;
           virtDir += ti->first;
           std::string buildArgs = "-C \"";
-          buildArgs += makefile->GetHomeOutputDirectory();
+          buildArgs += (*it)->GetBinaryDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
                              ti->first.c_str());
 
           std::string cleanArgs = "-E chdir \"";
-          cleanArgs += makefile->GetCurrentBinaryDirectory();
+          cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
@@ -1149,8 +1150,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   fout << "</cconfiguration>\n"
           "</storageModule>\n"
           "<storageModule moduleId=\"cdtBuildSystem\" version=\"4.0.0\">\n"
-          "<project id=\"" << this->EscapeForXML(mf->GetProjectName())
-       << ".null.1\" name=\"" << this->EscapeForXML(mf->GetProjectName())
+          "<project id=\"" << this->EscapeForXML(lg->GetProjectName())
+       << ".null.1\" name=\"" << this->EscapeForXML(lg->GetProjectName())
        << "\"/>\n"
           "</storageModule>\n"
           "</cproject>\n"
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index ef99760..16675f2 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -100,7 +100,7 @@ private:
                                    std::set<std::string>& emittedDirs);
 
   static void AddEnvVar(cmGeneratedFileStream& fout, const char* envVar,
-                        cmMakefile* mf);
+                        cmLocalGenerator* lg);
 
   void CreateLinksToSubprojects(cmGeneratedFileStream& fout,
                                 const std::string& baseDir);
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f83b5cf..0c009c3 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -46,21 +46,22 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 
 void cmExtraKateGenerator::Generate()
 {
-  const cmMakefile* mf
-     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
-  this->ProjectName = this->GenerateProjectName(mf->GetProjectName(),
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  cmMakefile* mf = lg->GetMakefile();
+  this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
-                          this->GetPathBasename(mf->GetHomeOutputDirectory()));
+                          this->GetPathBasename(lg->GetBinaryDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
-  this->CreateKateProjectFile(mf);
-  this->CreateDummyKateProjectFile(mf);
+  this->CreateKateProjectFile(lg);
+  this->CreateDummyKateProjectFile(lg);
 }
 
 
-void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
+void cmExtraKateGenerator::CreateKateProjectFile(
+    const cmLocalGenerator* lg) const
 {
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
   if (!fout)
@@ -68,31 +69,29 @@ void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
     return;
     }
 
-  std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
-  std::string args = mf->GetSafeDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
-
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"
-    "\t\"directory\": \"" << mf->GetHomeDirectory() << "\",\n"
-    "\t\"files\": [ { " << this->GenerateFilesString(mf) << "} ],\n";
-  this->WriteTargets(mf, fout);
+    "\t\"directory\": \"" << lg->GetSourceDirectory() << "\",\n"
+    "\t\"files\": [ { " << this->GenerateFilesString(lg) << "} ],\n";
+  this->WriteTargets(lg, fout);
   fout << "}\n";
 }
 
 
 void
-cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
+cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
                                    cmGeneratedFileStream& fout) const
 {
+  cmMakefile const* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
-  const char* homeOutputDir = mf->GetHomeOutputDirectory();
+  const char* homeOutputDir = lg->GetBinaryDirectory();
 
   fout <<
   "\t\"build\": {\n"
-  "\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
+  "\t\t\"directory\": \"" << lg->GetBinaryDirectory() << "\",\n"
   "\t\t\"default_target\": \"all\",\n"
   "\t\t\"clean_target\": \"clean\",\n";
 
@@ -122,8 +121,8 @@ cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
-    std::string currentDir = makefile->GetCurrentBinaryDirectory();
-    bool topLevel = (currentDir == makefile->GetHomeOutputDirectory());
+    std::string currentDir = (*it)->GetCurrentBinaryDirectory();
+    bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
       {
@@ -234,9 +233,10 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& fout,
 
 
 void
-cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
+cmExtraKateGenerator::CreateDummyKateProjectFile(
+    const cmLocalGenerator* lg) const
 {
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/";
   filename += this->ProjectName;
   filename += ".kateproject";
@@ -252,23 +252,23 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
 
 
 std::string
-cmExtraKateGenerator::GenerateFilesString(const cmMakefile* mf) const
+cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
 {
-  std::string s = mf->GetHomeDirectory();
+  std::string s = lg->GetSourceDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"git\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/.svn";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"svn\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/";
 
   std::set<std::string> files;
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index f800feb..b20d0a7 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -39,9 +39,10 @@ public:
 
   virtual void Generate();
 private:
-  void CreateKateProjectFile(const cmMakefile* mf) const;
-  void CreateDummyKateProjectFile(const cmMakefile* mf) const;
-  void WriteTargets(const cmMakefile* mf, cmGeneratedFileStream& fout) const;
+  void CreateKateProjectFile(const cmLocalGenerator* lg) const;
+  void CreateDummyKateProjectFile(const cmLocalGenerator* lg) const;
+  void WriteTargets(const cmLocalGenerator* lg,
+                    cmGeneratedFileStream& fout) const;
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string&     target,
                     const std::string&     make,
@@ -49,7 +50,7 @@ private:
                     const std::string&     path,
                     const char*            homeOutputDir) const;
 
-  std::string GenerateFilesString(const cmMakefile* mf) const;
+  std::string GenerateFilesString(const cmLocalGenerator* lg) const;
   std::string GetPathBasename(const std::string& path) const;
   std::string GenerateProjectName(const std::string& name,
                                   const std::string& type,
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 163a75b..133626e 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -77,9 +77,8 @@ void cmExtraSublimeTextGenerator::Generate()
 void cmExtraSublimeTextGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=mf->GetProjectName();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
+  std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
                      outputDir + "/" + projectName + ".sublime-project";
@@ -99,8 +98,8 @@ void cmExtraSublimeTextGenerator
     }
 
   const std::string &sourceRootRelativeToOutput = cmSystemTools::RelativePath(
-                     mf->GetHomeOutputDirectory(),
-                     mf->GetHomeDirectory());
+                     lgs[0]->GetBinaryDirectory(),
+                     lgs[0]->GetSourceDirectory());
   // Write the folder entries to the project file
   fout << "{\n";
   fout << "\t\"folders\":\n\t[\n\t";
@@ -108,8 +107,8 @@ void cmExtraSublimeTextGenerator
     {
       fout << "\t{\n\t\t\t\"path\": \"" << sourceRootRelativeToOutput << "\"";
       const std::string &outputRelativeToSourceRoot =
-        cmSystemTools::RelativePath(mf->GetHomeDirectory(),
-                                    mf->GetHomeOutputDirectory());
+        cmSystemTools::RelativePath(lgs[0]->GetSourceDirectory(),
+                                    lgs[0]->GetBinaryDirectory());
       if ((!outputRelativeToSourceRoot.empty()) &&
         ((outputRelativeToSourceRoot.length() < 3) ||
           (outputRelativeToSourceRoot.substr(0, 3) != "../")))
@@ -173,8 +172,8 @@ void cmExtraSublimeTextGenerator::
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
@@ -302,7 +301,7 @@ void cmExtraSublimeTextGenerator::
     {
     fout << ",\n\t";
     }
-  fout << "\t{\n\t\t\t\"name\": \"" << makefile->GetProjectName() << " - " <<
+  fout << "\t{\n\t\t\t\"name\": \"" << lg->GetProjectName() << " - " <<
           targetName << "\",\n";
   fout << "\t\t\t\"cmd\": [" <<
           this->BuildMakeCommand(make, makefileName.c_str(), targetName) <<
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index cae5c2f..4a362d8 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -68,7 +68,9 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 std::string
 cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
 {
-  return target->GetMakefile()->GetHomeOutputDirectory();
+  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
+      ->GetGeneratorTarget(target);
+  return gt->GetLocalGenerator()->GetBinaryDirectory();
 }
 
 std::string
@@ -449,7 +451,7 @@ void cmGhsMultiTargetGenerator::WriteSources(
     cmSystemTools::ConvertToUnixSlashes(sgPath);
     cmGlobalGhsMultiGenerator::AddFilesUpToPath(
       this->GetFolderBuildStreams(), &this->FolderBuildStreams,
-      this->Makefile->GetHomeOutputDirectory(), sgPath,
+      this->LocalGenerator->GetBinaryDirectory(), sgPath,
       GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath);
 
     std::string fullSourcePath((*si)->GetFullPath());
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 05f1029..45250d3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -399,7 +399,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
   bool fatalError = false;
 
   mf->AddDefinition("RUN_CONFIGURE", true);
-  std::string rootBin = mf->GetHomeOutputDirectory();
+  std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory();
   rootBin += cmake::GetCMakeFilesDirectory();
 
   // If the configuration files path has been set,
@@ -2105,7 +2105,7 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
   for(std::vector<cmLocalGenerator*>::const_iterator it =
       this->LocalGenerators.begin(); it != this->LocalGenerators.end(); ++it)
     {
-    std::string sd = (*it)->GetMakefile()->GetCurrentSourceDirectory();
+    std::string sd = (*it)->GetCurrentSourceDirectory();
     if (sd == start_dir)
       {
       return *it;
@@ -2879,10 +2879,8 @@ void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::WriteSummary()
 {
-  cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
-
   // Record all target directories in a central location.
-  std::string fname = mf->GetHomeOutputDirectory();
+  std::string fname = this->CMakeInstance->GetHomeOutputDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 138ddbb..ab24f94 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -49,10 +49,9 @@ void cmGlobalKdevelopGenerator::Generate()
       it!= this->GlobalGenerator->GetProjectMap().end();
       ++it)
     {
-    cmMakefile* mf = it->second[0]->GetMakefile();
-    std::string outputDir=mf->GetCurrentBinaryDirectory();
-    std::string projectDir=mf->GetHomeDirectory();
-    std::string projectName=mf->GetProjectName();
+    std::string outputDir=it->second[0]->GetCurrentBinaryDirectory();
+    std::string projectDir=it->second[0]->GetSourceDirectory();
+    std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
     const std::vector<cmLocalGenerator*>& lgs= it->second;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9d8193b..32e6077 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1198,16 +1198,15 @@ void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
 void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
 {
   cmLocalGenerator *lg = this->LocalGenerators[0];
-  cmMakefile* mfRoot = lg->GetMakefile();
 
   std::ostringstream cmd;
   cmd << lg->ConvertToOutputFormat(cmSystemTools::GetCMakeCommand(),
                                    cmLocalGenerator::SHELL)
       << " -H"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetSourceDirectory(),
                                    cmLocalGenerator::SHELL)
       << " -B"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeOutputDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetBinaryDirectory(),
                                    cmLocalGenerator::SHELL);
   WriteRule(*this->RulesFileStream,
             "RERUN_CMAKE",
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 0064713..775ad2b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -163,7 +163,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
     {
     cmLocalUnixMakefileGenerator3 *lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    std::string markFileName = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    std::string markFileName = lg->GetCurrentBinaryDirectory();
     markFileName += "/";
     markFileName += cmake::GetCMakeFilesDirectory();
     markFileName += "/progress.marks";
@@ -395,7 +395,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
     {
     lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    tmpStr = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    tmpStr = lg->GetCurrentBinaryDirectory();
     tmpStr += cmake::GetCMakeFilesDirectory();
     tmpStr += "/CMakeDirectoryInformation.cmake";
     cmakefileStream << "  \"" <<
@@ -454,7 +454,7 @@ cmGlobalUnixMakefileGenerator3
                       bool check_relink)
 {
   // Get the relative path to the subdirectory from the top.
-  std::string makeTarget = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string makeTarget = lg->GetCurrentBinaryDirectory();
   makeTarget += "/";
   makeTarget += pass;
 
@@ -534,7 +534,7 @@ cmGlobalUnixMakefileGenerator3
     }
 
   // Begin the directory-level rules section.
-  std::string dir = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string dir = lg->GetCurrentBinaryDirectory();
   dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT,
                     cmLocalGenerator::MAKERULE);
   lg->WriteDivider(ruleFileStream);
@@ -785,7 +785,7 @@ cmGlobalUnixMakefileGenerator3
       depends.clear();
 
       cmLocalUnixMakefileGenerator3::EchoProgress progress;
-      progress.Dir = lg->GetMakefile()->GetHomeOutputDirectory();
+      progress.Dir = lg->GetBinaryDirectory();
       progress.Dir += cmake::GetCMakeFilesDirectory();
       {
       std::ostringstream progressArg;
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 14de698..d5e9417 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -260,7 +260,7 @@ void cmGlobalVisualStudio6Generator
     }
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetMakefile()->GetProjectName();
+  fname += root->GetProjectName();
   fname += ".dsw";
   cmsys::ofstream fout(fname.c_str());
   if(!fout)
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 05da022..1ca3bd7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -362,10 +362,10 @@ void cmGlobalVisualStudio7Generator
     {
     return;
     }
-  this->CurrentProject = root->GetMakefile()->GetProjectName();
-  std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
+  this->CurrentProject = root->GetProjectName();
+  std::string fname = root->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetMakefile()->GetProjectName();
+  fname += root->GetProjectName();
   fname += ".sln";
   cmGeneratedFileStream fout(fname.c_str());
   fout.SetCopyIfDifferent(true);
@@ -468,8 +468,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmMakefile* tmf = target->GetMakefile();
-        std::string dir = tmf->GetCurrentBinaryDirectory();
+        std::string dir = root->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
         if(dir == ".")
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 86a8f87..0a6844e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -312,10 +312,10 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
   std::string argH = "-H";
-  argH += mf->GetHomeDirectory();
+  argH += lg->GetSourceDirectory();
   commandLine.push_back(argH);
   std::string argB = "-B";
-  argB += mf->GetHomeOutputDirectory();
+  argB += lg->GetBinaryDirectory();
   commandLine.push_back(argB);
   commandLine.push_back("--check-stamp-list");
   commandLine.push_back(stampList.c_str());
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d45aa27..6a25ed0 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -250,7 +250,7 @@ cmGlobalVisualStudioGenerator
         {
         topLevelSlnName = mf->GetCurrentBinaryDirectory();
         topLevelSlnName += "/";
-        topLevelSlnName += mf->GetProjectName();
+        topLevelSlnName += this->LocalGenerators[0]->GetProjectName();
         topLevelSlnName += ".sln";
         }
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 746e1a7..201b02c 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -410,15 +410,17 @@ void cmGlobalXCodeGenerator::Generate()
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
-  this->CurrentProject = root->GetMakefile()->GetProjectName();
+  this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
-                           this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentBinaryDirectory(),
-                           this->ProjectOutputDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
+        this->ProjectSourceDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
+        this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
-    root->GetMakefile()->GetCurrentBinaryDirectory();
+    root->GetCurrentBinaryDirectory();
   this->CurrentXCodeHackMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentXCodeHackMakefile.c_str());
   this->CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
@@ -460,13 +462,13 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
-  std::string listfile = mf->GetCurrentSourceDirectory();
+  std::string listfile = root->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
   allbuild->AddSourceCMP0049(listfile.c_str());
 
   // Add XCODE depend helper
-  std::string dir = mf->GetCurrentBinaryDirectory();
+  std::string dir = root->GetCurrentBinaryDirectory();
   cmCustomCommandLine makeHelper;
   if(this->XcodeVersion < 50)
     {
@@ -554,7 +556,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
         }
 
       // Refer to the build configuration file for easy editing.
-      listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
+      listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
       target.AddSourceCMP0049(listfile.c_str());
@@ -580,7 +582,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   std::vector<std::string>::iterator new_end =
     std::unique(lfiles.begin(), lfiles.end());
   lfiles.erase(new_end, lfiles.end());
-  this->CurrentReRunCMakeMakefile = mf->GetCurrentBinaryDirectory();
+  this->CurrentReRunCMakeMakefile = root->GetCurrentBinaryDirectory();
   this->CurrentReRunCMakeMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str());
   this->CurrentReRunCMakeMakefile += "/ReRunCMake.make";
@@ -588,7 +590,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = mf->GetHomeOutputDirectory();
+  std::string checkCache = root->GetBinaryDirectory();
   checkCache += "/";
   checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
   checkCache += "cmake.check_cache";
@@ -602,9 +604,9 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   makefileStream << "\n\t" <<
     this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
                  << " -H" << this->ConvertToRelativeForMake(
-                   mf->GetHomeDirectory())
+                   root->GetSourceDirectory())
                  << " -B" << this->ConvertToRelativeForMake(
-                   mf->GetHomeOutputDirectory()) << "\n";
+                   root->GetBinaryDirectory()) << "\n";
 }
 
 //----------------------------------------------------------------------------
@@ -1031,7 +1033,7 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen)
   this->CurrentLocalGenerator = gen;
   this->CurrentMakefile = gen->GetMakefile();
   std::string outdir =
-    cmSystemTools::CollapseFullPath(this->CurrentMakefile->
+    cmSystemTools::CollapseFullPath(this->CurrentLocalGenerator->
                                     GetCurrentBinaryDirectory());
   cmSystemTools::SplitPath(outdir.c_str(),
                            this->CurrentOutputDirectoryComponents);
@@ -1387,7 +1389,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // linker language.  This should convince Xcode to choose the proper
   // language.
   cmMakefile* mf = cmtarget.GetMakefile();
-  std::string fname = mf->GetCurrentBinaryDirectory();
+  std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
   fname += cmtarget.GetName();
@@ -1616,7 +1618,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 const & commands,
                                                 const char* name)
 {
-  std::string dir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string dir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   dir += "/CMakeScripts";
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
@@ -1637,7 +1639,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                     currentConfig->c_str());
     }
 
-  std::string cdir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string cdir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   cdir = this->ConvertToRelativeForXCode(cdir.c_str());
   std::string makecmd = "make -C ";
   makecmd += cdir;
@@ -1965,7 +1967,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Set attributes to specify the proper name for the target.
-  std::string pndir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   if(target.GetType() == cmTarget::STATIC_LIBRARY ||
      target.GetType() == cmTarget::SHARED_LIBRARY ||
      target.GetType() == cmTarget::MODULE_LIBRARY ||
@@ -3339,7 +3341,7 @@ bool cmGlobalXCodeGenerator
   this->RootObject->SetComment("Project object");
 
   std::string project_id = "PROJECT_";
-  project_id += root->GetMakefile()->GetProjectName();
+  project_id += root->GetProjectName();
   this->RootObject->SetId(this->GetOrCreateId(
     project_id.c_str(), this->RootObject->GetId()).c_str());
 
@@ -3369,7 +3371,7 @@ bool cmGlobalXCodeGenerator
   // Point Xcode at the top of the source tree.
   {
   std::string pdir =
-    this->RelativeToBinary(root->GetMakefile()->GetCurrentSourceDirectory());
+    this->RelativeToBinary(root->GetCurrentSourceDirectory());
   this->RootObject->AddAttribute("projectDirPath",
                                  this->CreateString(pdir.c_str()));
   this->RootObject->AddAttribute("projectRoot", this->CreateString(""));
@@ -3481,7 +3483,7 @@ bool cmGlobalXCodeGenerator
     }
   }
 
-  std::string symroot = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string symroot = root->GetCurrentBinaryDirectory();
   symroot += "/build";
   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
 
@@ -3724,9 +3726,9 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     {
     return;
     }
-  std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string xcodeDir = root->GetCurrentBinaryDirectory();
   xcodeDir += "/";
-  xcodeDir += root->GetMakefile()->GetProjectName();
+  xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
   if(this->XcodeVersion > 20)
     {
@@ -3746,7 +3748,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
   // Since this call may have created new cache entries, save the cache:
   //
   root->GetMakefile()->GetCMakeInstance()->SaveCache(
-    root->GetMakefile()->GetHomeOutputDirectory());
+    root->GetBinaryDirectory());
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 97b9405..f7c9cc2 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -64,7 +64,7 @@ void cmInstallExportGenerator::ComputeTempDir()
   // Choose a temporary directory in which to generate the import
   // files to be installed.
   this->TempDir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
   this->TempDir += cmake::GetCMakeFilesDirectory();
   this->TempDir += "/Export";
   if(this->Destination.empty())
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b26151c..c0c50c4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2431,6 +2431,11 @@ const char* cmLocalGenerator::GetFeature(const std::string& feature,
   return 0;
 }
 
+std::string cmLocalGenerator::GetProjectName() const
+{
+  return this->StateSnapshot.GetProjectName();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::ConstructComment(cmCustomCommandGenerator const& ccg,
@@ -2858,6 +2863,31 @@ cmLocalGenerator
   return source.GetLanguage();
 }
 
+cmake* cmLocalGenerator::GetCMakeInstance() const
+{
+  return this->GlobalGenerator->GetCMakeInstance();
+}
+
+const char* cmLocalGenerator::GetSourceDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeDirectory();
+}
+
+const char* cmLocalGenerator::GetBinaryDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeOutputDirectory();
+}
+
+const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentBinary();
+}
+
+const char* cmLocalGenerator::GetCurrentSourceDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentSource();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 33fede1..8070667 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -182,6 +182,8 @@ public:
                              const std::string& config,
                              const std::string& lang);
 
+  std::string GetProjectName() const;
+
   /** Compute the language used to compile the given source file.  */
   std::string GetSourceFileLanguage(const cmSourceFile& source);
 
@@ -251,6 +253,14 @@ public:
    */
   bool NeedBackwardsCompatibility_2_4();
 
+  cmake* GetCMakeInstance() const;
+
+  const char* GetSourceDirectory() const;
+  const char* GetBinaryDirectory() const;
+
+  const char* GetCurrentBinaryDirectory() const;
+  const char* GetCurrentSourceDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index c46adc1..6319f0e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -183,7 +183,7 @@ void cmLocalNinjaGenerator::WriteProjectHeader(std::ostream& os)
 {
   cmGlobalNinjaGenerator::WriteDivider(os);
   os
-    << "# Project: " << this->GetMakefile()->GetProjectName() << std::endl
+    << "# Project: " << this->GetProjectName() << std::endl
     << "# Configuration: " << this->ConfigName << std::endl
     ;
   cmGlobalNinjaGenerator::WriteDivider(os);
@@ -363,7 +363,7 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(
   if (ccg.GetNumberOfCommands() > 0) {
     std::string wd = ccg.GetWorkingDirectory();
     if (wd.empty())
-      wd = this->GetMakefile()->GetCurrentBinaryDirectory();
+      wd = this->GetCurrentBinaryDirectory();
 
     std::ostringstream cdCmd;
 #ifdef _WIN32
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index b131a63..bf5afc1 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -399,7 +399,7 @@ cmLocalUnixMakefileGenerator3
       );
     }
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
 
   // Write the rule to the makefile.
@@ -449,7 +449,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefile2.c_str(),localName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
                           localName, depends, commands, true);
@@ -478,7 +478,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefileName.c_str(), makeTargetName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "fast build rule for target.",
                           localName, depends, commands, true);
@@ -496,7 +496,7 @@ void cmLocalUnixMakefileGenerator3
         commands.push_back(this->GetRecursiveMakeCall
                            (makefile2.c_str(), makeTargetName));
         this->CreateCDCommand(commands,
-                              this->Makefile->GetHomeOutputDirectory(),
+                              this->GetBinaryDirectory(),
                               cmLocalGenerator::START_OUTPUT);
         this->WriteMakeRule(ruleFileStream,
                             "Manual pre-install relink rule for target.",
@@ -750,13 +750,13 @@ cmLocalUnixMakefileGenerator3
   makefileStream
     << "# The top-level source directory on which CMake was run.\n"
     << "CMAKE_SOURCE_DIR = "
-    << this->Convert(this->Makefile->GetHomeDirectory(), FULL, SHELL)
+    << this->Convert(this->GetSourceDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
   makefileStream
     << "# The top-level build directory on which CMake was run.\n"
     << "CMAKE_BINARY_DIR = "
-    << this->Convert(this->Makefile->GetHomeOutputDirectory(), FULL, SHELL)
+    << this->Convert(this->GetBinaryDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
 }
@@ -889,7 +889,7 @@ void cmLocalUnixMakefileGenerator3
   if(!this->GetMakefile()->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
-                          this->Makefile->GetHomeOutputDirectory(),
+                          this->GetBinaryDirectory(),
                           cmLocalGenerator::START_OUTPUT);
     }
   this->WriteMakeRule(makefileStream,
@@ -1838,7 +1838,7 @@ void cmLocalUnixMakefileGenerator3
 
   depends.push_back("cmake_check_build_system");
 
-  std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+  std::string progressDir = this->GetBinaryDirectory();
   progressDir += cmake::GetCMakeFilesDirectory();
     {
     std::ostringstream progCmd;
@@ -1862,7 +1862,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
     {
     std::ostringstream progCmd;
@@ -1884,7 +1884,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                                this->Makefile->GetHomeOutputDirectory(),
+                                this->GetBinaryDirectory(),
                                 cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "The main clean target", "clean",
                       depends, commands, true);
@@ -1914,7 +1914,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back
     (this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "Prepare targets for installation.",
                       "preinstall", depends, commands, true);
@@ -1935,7 +1935,7 @@ void cmLocalUnixMakefileGenerator3
   runRule += " 1";
   commands.push_back(runRule);
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "clear depends",
                       "depend",
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index cc94cd4..b84cbc5 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -111,14 +111,14 @@ void cmLocalVisualStudio6Generator::Generate()
 void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+  if(strcmp(this->GetCurrentBinaryDirectory(),
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -163,7 +163,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       std::string::size_type pos = l->first.rfind('/');
       if(pos != std::string::npos)
         {
-        std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+        std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
         dir += l->first.substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
@@ -189,7 +189,7 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
@@ -215,7 +215,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   if(!cmSystemTools::FileExists(makefileIn.c_str()))
@@ -226,10 +226,10 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
@@ -577,9 +577,9 @@ cmLocalVisualStudio6Generator
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
-  char* output = new char[(strlen(this->Makefile->GetCurrentBinaryDirectory())
+  char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
                            + target.GetName().size() + 30)];
-  sprintf(output,"%s/%s_force_%i", this->Makefile->GetCurrentBinaryDirectory(),
+  sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
           target.GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
@@ -1962,7 +1962,7 @@ cmLocalVisualStudio6Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a4bce8a..90c17c6 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -138,7 +138,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       cmCustomCommandLines force_commands;
       force_commands.push_back(force_command);
       std::string no_main_dependency = "";
-      std::string force = this->Makefile->GetCurrentBinaryDirectory();
+      std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
       force += tgt.GetName();
@@ -160,14 +160,14 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
 void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+  if(strcmp(this->GetCurrentBinaryDirectory(),
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -196,7 +196,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 {
   // Touch a timestamp file used to determine when the project file is
   // out of date.
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += cmake::GetCMakeFilesDirectory();
   cmSystemTools::MakeDirectory(stampName.c_str());
   stampName += "/";
@@ -243,7 +243,7 @@ void cmLocalVisualStudio7Generator
   target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += lname;
   if(this->FortranProject)
@@ -272,13 +272,13 @@ void cmLocalVisualStudio7Generator
 //----------------------------------------------------------------------------
 cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += "/";
   stampName += cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   makefileIn = cmSystemTools::CollapseFullPath(makefileIn.c_str());
@@ -290,10 +290,10 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
   std::string stampFilename = this->Convert(stampName.c_str(), FULL,
@@ -1719,7 +1719,7 @@ cmLocalVisualStudio7Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 077470d..5caa272 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1517,7 +1517,7 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
                     parent->GetProperty("LINK_DIRECTORIES"));
 
   // the initial project name
-  this->SetProjectName(parent->GetProjectName());
+  this->StateSnapshot.SetProjectName(parent->StateSnapshot.GetProjectName());
 
   // Copy include regular expressions.
   this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;
@@ -2033,11 +2033,6 @@ void cmMakefile::SetProjectName(std::string const& p)
   this->StateSnapshot.SetProjectName(p);
 }
 
-std::string cmMakefile::GetProjectName() const
-{
-  return this->StateSnapshot.GetProjectName();
-}
-
 void cmMakefile::AddGlobalLinkInformation(const std::string& name,
                                           cmTarget& target)
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8724c6e..7057157 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -274,11 +274,6 @@ public:
    */
   void SetProjectName(std::string const& name);
 
-  /**
-   * Get the name of the project for this build.
-   */
-  std::string GetProjectName() const;
-
   /** Get the configurations to be generated.  */
   std::string GetConfigurations(std::vector<std::string>& configs,
                                 bool single = true) const;
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b278087..b7ca26b 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -419,7 +419,7 @@ void cmMakefileTargetGenerator
   this->WriteObjectBuildFile(obj, lang, source, depends);
 
   // The object file should be checked for dependency integrity.
-  std::string objFullPath = this->Makefile->GetCurrentBinaryDirectory();
+  std::string objFullPath = this->LocalGenerator->GetCurrentBinaryDirectory();
   objFullPath += "/";
   objFullPath += obj;
   objFullPath =
@@ -642,7 +642,7 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->Makefile->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->LocalGenerator->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";
@@ -698,7 +698,7 @@ cmMakefileTargetGenerator
   // Change the command working directory to the local build tree.
   this->LocalGenerator->CreateCDCommand
     (compileCommands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
   commands.insert(commands.end(),
                   compileCommands.begin(), compileCommands.end());
@@ -771,7 +771,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (preprocessCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         preprocessCommands.begin(),
@@ -828,7 +828,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (assemblyCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         assemblyCommands.begin(),
@@ -929,7 +929,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
                                            *this->Target);
   this->LocalGenerator->CreateCDCommand
     (commands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
 
   // Write the rule.
@@ -1095,7 +1095,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // translation table for the dependency scanning process.
   depCmd << "cd "
          << (this->LocalGenerator->Convert(
-               this->Makefile->GetHomeOutputDirectory(),
+               this->LocalGenerator->GetBinaryDirectory(),
                cmLocalGenerator::FULL, cmLocalGenerator::SHELL))
          << " && ";
 #endif
@@ -1110,16 +1110,16 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // the state of our local generator sufficiently for its needs.
   depCmd << "$(CMAKE_COMMAND) -E cmake_depends \""
          << this->GlobalGenerator->GetName() << "\" "
-         << this->Convert(this->Makefile->GetHomeDirectory(),
+         << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetHomeOutputDirectory(),
+         << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->InfoFileNameFull,
@@ -1242,7 +1242,7 @@ void
 cmMakefileTargetGenerator
 ::MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress& progress) const
 {
-  progress.Dir = this->Makefile->GetHomeOutputDirectory();
+  progress.Dir = this->LocalGenerator->GetBinaryDirectory();
   progress.Dir += cmake::GetCMakeFilesDirectory();
   std::ostringstream progressArg;
   progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 84c19a3..fb598e8 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -666,8 +666,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   if (!preLinkCmdLines.empty())
     {
     const std::string homeOutDir = localGen.ConvertToOutputFormat(
-                                              mf->GetHomeOutputDirectory(),
-                                              cmLocalGenerator::SHELL);
+                                            localGen.GetBinaryDirectory(),
+                                            cmLocalGenerator::SHELL);
     preLinkCmdLines.push_back("cd " + homeOutDir);
     }
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 6e6dc60..133d2ff 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -45,9 +45,8 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
-        cmMakefile *mf = target->Target->GetMakefile();
-        if (strcmp(mf->GetCurrentSourceDirectory(),
-                   mf->GetHomeDirectory()) == 0)
+        if (strcmp(target->GetLocalGenerator()->GetCurrentSourceDirectory(),
+                   target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
       }
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 58b901a..3e36589 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -103,13 +103,13 @@ void cmNinjaUtilityTargetGenerator::Generate()
       command,
       "$(CMAKE_SOURCE_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeDirectory(),
+        this->GetLocalGenerator()->GetSourceDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(
       command,
       "$(CMAKE_BINARY_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeOutputDirectory(),
+        this->GetLocalGenerator()->GetBinaryDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(command, "$(ARGS)", "");
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..92b7a57 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -195,7 +195,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->BuildFileStream = 0;
   this->IsMissingFiles = false;
   this->DefaultArtifactDir =
-    this->Makefile->GetCurrentBinaryDirectory() + std::string("/") +
+    this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") +
     this->LocalGenerator->GetTargetDirectory(*this->Target);
 }
 
@@ -297,8 +297,7 @@ void cmVisualStudio10TargetGenerator::Generate()
       return;
       }
     }
-  cmMakefile* mf = this->Target->GetMakefile();
-  std::string path =  mf->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj";
@@ -951,7 +950,7 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path,
 {
   return forceRelative
     ? cmSystemTools::RelativePath(
-      this->Makefile->GetCurrentBinaryDirectory(), path.c_str())
+      this->LocalGenerator->GetCurrentBinaryDirectory(), path.c_str())
     : path.c_str();
 }
 
@@ -990,7 +989,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   this->AddMissingSourceGroups(groupsUsed, sourceGroups);
 
   // Write out group file
-  std::string path =  this->Makefile->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj.filters";
@@ -1448,7 +1447,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
     std::string sourceRel = this->ConvertPath(sf->GetFullPath(), true);
     size_t const maxLen = 250;
     if(sf->GetCustomCommand() ||
-       ((strlen(this->Makefile->GetCurrentBinaryDirectory()) + 1 +
+       ((strlen(this->LocalGenerator->GetCurrentBinaryDirectory()) + 1 +
          sourceRel.length()) <= maxLen))
       {
       forceRelative = true;
@@ -2244,7 +2243,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 {
   // Look through the sources for AndroidManifest.xml and use
   // its location as the root source directory.
-  std::string rootDir = this->Makefile->GetCurrentSourceDirectory();
+  std::string rootDir = this->LocalGenerator->GetCurrentSourceDirectory();
   {
   std::vector<cmSourceFile const*> extraSources;
   this->GeneratorTarget->GetExtraSources(extraSources, "");
@@ -3313,7 +3312,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
   // For WP80, the manifest needs to be in the same folder as the project
   // this can cause an overwrite problem if projects aren't organized in
   // folders
-  std::string manifestFile = this->Makefile->GetCurrentBinaryDirectory() +
+  std::string manifestFile =
+      this->LocalGenerator->GetCurrentBinaryDirectory() +
                              std::string("/WMAppManifest.xml");
   std::string artifactDir =
     this->LocalGenerator->GetTargetDirectory(*this->Target);

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct  7 17:42:54 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed,  7 Oct 2015 17:42:54 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-189-g5f678ee
Message-ID: <20151007214254.6A565BD49D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5f678ee258419a1f50bc5d88e04ca14a4a2b7d91 (commit)
       via  f05c9294d30a5def61bcc014a71582310ceb010a (commit)
      from  d95810be461200491f7671e3cbe42573aa05c7a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f678ee258419a1f50bc5d88e04ca14a4a2b7d91
commit 5f678ee258419a1f50bc5d88e04ca14a4a2b7d91
Merge: d95810b f05c929
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 17:42:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 17:42:52 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    f05c9294 Revert "cmLocalGenerator changes."

diff --cc Source/cmGlobalXCodeGenerator.cxx
index 4ddd2fe,746e1a7..3d52e3a
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@@ -462,13 -460,13 +460,13 @@@ cmGlobalXCodeGenerator::AddExtraTargets
    mf->AddGeneratorTarget(allbuild, allBuildGt);
  
    // Refer to the main build configuration file for easy editing.
-   std::string listfile = root->GetCurrentSourceDirectory();
+   std::string listfile = mf->GetCurrentSourceDirectory();
    listfile += "/";
    listfile += "CMakeLists.txt";
 -  allbuild->AddSourceCMP0049(listfile.c_str());
 +  allBuildGt->AddSource(listfile.c_str());
  
    // Add XCODE depend helper
-   std::string dir = root->GetCurrentBinaryDirectory();
+   std::string dir = mf->GetCurrentBinaryDirectory();
    cmCustomCommandLine makeHelper;
    if(this->XcodeVersion < 50)
      {
@@@ -555,13 -553,11 +553,13 @@@
          allbuild->AddUtility(target.GetName());
          }
  
 +      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
 +
        // Refer to the build configuration file for easy editing.
-       listfile = lg->GetCurrentSourceDirectory();
+       listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
        listfile += "/";
        listfile += "CMakeLists.txt";
 -      target.AddSourceCMP0049(listfile.c_str());
 +      targetGT->AddSource(listfile.c_str());
        }
      }
  }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f05c9294d30a5def61bcc014a71582310ceb010a
commit f05c9294d30a5def61bcc014a71582310ceb010a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 23:42:39 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 23:42:39 2015 +0200

    Revert "cmLocalGenerator changes."
    
    This reverts commit 850c5282f04c99632fbf876b0c73bdb94d0722de.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index e3efcdd..7da334e 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -116,7 +116,7 @@ const char* CCONV cmGetProjectName(void *arg)
 {
   cmMakefile *mf = static_cast<cmMakefile *>(arg);
   static std::string name;
-  name = mf->GetStateSnapshot().GetProjectName();
+  name = mf->GetProjectName();
   return name.c_str();
 }
 
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index e97069f..d35b566 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1975,9 +1975,8 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
       else if(use_link_rpath)
         {
         // Do not add any path inside the source or build tree.
-        const char* topSourceDir = this->CMakeInstance->GetHomeDirectory();
-        const char* topBinaryDir =
-            this->CMakeInstance->GetHomeOutputDirectory();
+        const char* topSourceDir = this->Makefile->GetHomeDirectory();
+        const char* topBinaryDir = this->Makefile->GetHomeOutputDirectory();
         if(!cmSystemTools::ComparePath(*ri, topSourceDir) &&
            !cmSystemTools::ComparePath(*ri, topBinaryDir) &&
            !cmSystemTools::IsSubDirectory(*ri, topSourceDir) &&
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 80f560f..856dcd4 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -160,7 +160,7 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
   if (mod_dir.empty())
     {
     mod_dir =
-      this->LocalGenerator->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
     }
 
   // Actually write dependencies to the streams.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index c9b6100..881acee 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -241,14 +241,12 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmGeneratorTarget *target, const std::string& prop)
+                      cmTarget *target, const std::string& prop)
 {
   const char* installDir =
-            target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir =
-      target->GetLocalGenerator()->GetSourceDirectory();
-  const char* topBinaryDir =
-      target->GetLocalGenerator()->GetBinaryDirectory();
+            target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
+  const char* topSourceDir = target->GetMakefile()->GetHomeDirectory();
+  const char* topBinaryDir = target->GetMakefile()->GetHomeOutputDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
@@ -271,7 +269,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch (target->Target->GetPolicyStatusCMP0041())
+        switch (target->GetPolicyStatusCMP0041())
           {
           case cmPolicies::WARN:
             messageType = cmake::WARNING;
@@ -300,7 +298,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains relative path:\n"
            "  \"" << *li << "\"";
-      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
+      target->GetMakefile()->IssueMessage(messageType, e.str());
       }
     bool inBinary = isSubDirectory(li->c_str(), topBinaryDir);
     bool inSource = isSubDirectory(li->c_str(), topSourceDir);
@@ -318,7 +316,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         {
         if (!shouldContinue)
           {
-          switch(target->Target->GetPolicyStatusCMP0052())
+          switch(target->GetPolicyStatusCMP0052())
             {
             case cmPolicies::WARN:
               {
@@ -331,7 +329,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
                 "a subdirectory of the " << (inBinary ? "build" : "source")
                 << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
                 << "\"" << std::endl;
-              target->GetLocalGenerator()->IssueMessage(cmake::AUTHOR_WARNING,
+              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
                                                   s.str());
               }
             case cmPolicies::OLD:
@@ -354,7 +352,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
-      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
+      target->GetMakefile()->IssueMessage(messageType, e.str());
       }
     if (!inSourceBuild)
       {
@@ -363,7 +361,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         e << "Target \"" << target->GetName() << "\" " << prop <<
             " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
-        target->GetLocalGenerator()->IssueMessage(messageType, e.str());
+        target->GetMakefile()->IssueMessage(messageType, e.str());
         }
       }
     }
@@ -423,9 +421,7 @@ void cmExportFileGenerator::PopulateSourcesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    cmGeneratorTarget* gt = target->GetMakefile()
-        ->GetGlobalGenerator()->GetGeneratorTarget(target);
-    if (!checkInterfaceDirs(prepro, gt, propName))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }
@@ -495,7 +491,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    if (!checkInterfaceDirs(prepro, target->Target, propName))
       {
       return;
       }
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index cb46f8c..dfd51c7 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -76,8 +76,9 @@ void cmExtraCodeBlocksGenerator::Generate()
 void cmExtraCodeBlocksGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
-  std::string projectName=lgs[0]->GetProjectName();
+  const cmMakefile* mf=lgs[0]->GetMakefile();
+  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string projectName=mf->GetProjectName();
 
   std::string filename=outputDir+"/";
   filename+=projectName+".cbp";
@@ -272,7 +273,7 @@ void cmExtraCodeBlocksGenerator
         }
 
       const std::string &relative = cmSystemTools::RelativePath(
-                         it->second[0]->GetSourceDirectory(),
+                         it->second[0]->GetMakefile()->GetHomeDirectory(),
                          jt->c_str());
       std::vector<std::string> splitted;
       cmSystemTools::SplitPath(relative, splitted, false);
@@ -296,7 +297,7 @@ void cmExtraCodeBlocksGenerator
   tree.BuildVirtualFolder(virtualFolders);
   // And one for <Unit>
   std::string unitFiles;
-  tree.BuildUnit(unitFiles, std::string(lgs[0]->GetSourceDirectory()) + "/");
+  tree.BuildUnit(unitFiles, std::string(mf->GetHomeDirectory()) + "/");
 
   // figure out the compiler
   std::string compiler = this->GetCBCompilerId(mf);
@@ -306,7 +307,7 @@ void cmExtraCodeBlocksGenerator
         "<CodeBlocks_project_file>\n"
         "   <FileVersion major=\"1\" minor=\"6\" />\n"
         "   <Project>\n"
-        "      <Option title=\"" << lgs[0]->GetProjectName()<<"\" />\n"
+        "      <Option title=\"" << mf->GetProjectName()<<"\" />\n"
         "      <Option makefile_is_custom=\"1\" />\n"
         "      <Option compiler=\"" << compiler << "\" />\n"
         "      "<<virtualFolders<<"\n"
@@ -330,8 +331,8 @@ void cmExtraCodeBlocksGenerator
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
-                     (*lg)->GetBinaryDirectory())==0)
+          if (strcmp(makefile->GetCurrentBinaryDirectory(),
+                     makefile->GetHomeOutputDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
                                make.c_str(), *lg, compiler.c_str());
@@ -521,10 +522,11 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
                                         cmLocalGenerator* lg,
                                         cmTarget* target) const
 {
+  cmMakefile *mf = lg->GetMakefile();
   // this file doesn't seem to be used by C::B in custom makefile mode,
   // but we generate a unique file for each OBJECT library so in case
   // C::B uses it in some way, the targets don't interfere with each other.
-  std::string filename = lg->GetCurrentBinaryDirectory();
+  std::string filename = mf->GetCurrentBinaryDirectory();
   filename += "/";
   filename += lg->GetTargetDirectory(*target);
   filename += "/";
@@ -551,14 +553,14 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
                                               const char* compiler)
 {
   cmMakefile const* makefile = lg->GetMakefile();
-  std::string makefileName = lg->GetCurrentBinaryDirectory();
+  std::string makefileName = makefile->GetCurrentBinaryDirectory();
   makefileName += "/Makefile";
 
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
     int cbTargetType = this->GetCBTargetType(target);
-    std::string workingDir = lg->GetCurrentBinaryDirectory();
+    std::string workingDir = makefile->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmTarget::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
@@ -655,7 +657,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   else // e.g. all and the GLOBAL and UTILITY targets
     {
     fout<<"         <Option working_dir=\""
-        << lg->GetCurrentBinaryDirectory() << "\" />\n"
+        << makefile->GetCurrentBinaryDirectory() << "\" />\n"
         <<"         <Option type=\"" << 4 << "\" />\n";
     }
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index b4b5c89..c2cff14 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -68,15 +68,15 @@ void cmExtraCodeLiteGenerator::Generate()
     const cmMakefile* mf =it->second[0]->GetMakefile();
     this->ConfigName = GetConfigurationName( mf );
 
-    if (strcmp(it->second[0]->GetCurrentBinaryDirectory(),
-               it->second[0]->GetBinaryDirectory()) == 0)
+    if (strcmp(mf->GetCurrentBinaryDirectory(),
+               mf->GetHomeOutputDirectory()) == 0)
       {
-      workspaceOutputDir   = it->second[0]->GetCurrentBinaryDirectory();
-      workspaceProjectName = it->second[0]->GetProjectName();
-      workspaceSourcePath  = it->second[0]->GetSourceDirectory();
+      workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
+      workspaceProjectName = mf->GetProjectName();
+      workspaceSourcePath  = mf->GetHomeDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
-      this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();;
+      this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
 
       fout.Open(workspaceFileName.c_str(), false, false);
       fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -91,8 +91,9 @@ void cmExtraCodeLiteGenerator::Generate()
        ++it)
     {
     // retrive project information
-    std::string outputDir   = it->second[0]->GetCurrentBinaryDirectory();
-    std::string projectName = it->second[0]->GetProjectName();
+    const cmMakefile* mf    = it->second[0]->GetMakefile();
+    std::string outputDir   = mf->GetCurrentBinaryDirectory();
+    std::string projectName = mf->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
     // Make the project file relative to the workspace
@@ -120,8 +121,9 @@ void cmExtraCodeLiteGenerator::Generate()
 void cmExtraCodeLiteGenerator::CreateProjectFile(
   const std::vector<cmLocalGenerator*>& lgs)
 {
-  std::string outputDir   = lgs[0]->GetCurrentBinaryDirectory();
-  std::string projectName = lgs[0]->GetProjectName();
+  const cmMakefile* mf    = lgs[0]->GetMakefile();
+  std::string outputDir   = mf->GetCurrentBinaryDirectory();
+  std::string projectName = mf->GetProjectName();
   std::string filename    = outputDir + "/";
 
   filename += projectName + ".project";
@@ -141,7 +143,7 @@ void cmExtraCodeLiteGenerator
 
   ////////////////////////////////////
   fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-       "<CodeLite_Project Name=\"" << lgs[0]->GetProjectName()
+       "<CodeLite_Project Name=\"" << mf->GetProjectName()
        << "\" InternalType=\"\">\n";
 
   // Collect all used source files in the project
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index efd5b58..44bf586 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -79,8 +79,8 @@ void cmExtraEclipseCDT4Generator
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::Generate()
 {
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  const cmMakefile* mf = lg->GetMakefile();
+  const cmMakefile* mf
+    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
 
   std::string eclipseVersion = mf->GetSafeDefinition("CMAKE_ECLIPSE_VERSION");
   cmsys::RegularExpression regex(".*([0-9]+\\.[0-9]+).*");
@@ -106,8 +106,8 @@ void cmExtraEclipseCDT4Generator::Generate()
     }
 
   // TODO: Decide if these are local or member variables
-  this->HomeDirectory       = lg->GetSourceDirectory();
-  this->HomeOutputDirectory = lg->GetBinaryDirectory();
+  this->HomeDirectory       = mf->GetHomeDirectory();
+  this->HomeOutputDirectory = mf->GetHomeOutputDirectory();
 
   this->GenerateLinkedResources = mf->IsOn(
                                     "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
@@ -157,8 +157,9 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
   assert(this->HomeDirectory != this->HomeOutputDirectory);
 
   // set up the project name: <project>-Source@<baseSourcePathName>
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  std::string name = this->GenerateProjectName(lg->GetProjectName(), "Source",
+  const cmMakefile* mf
+     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  std::string name = this->GenerateProjectName(mf->GetProjectName(), "Source",
                                    this->GetPathBasename(this->HomeDirectory));
 
   const std::string filename = this->HomeDirectory + "/.project";
@@ -196,11 +197,8 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
 
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
-                                            const char* envVar,
-                                            cmLocalGenerator* lg)
+                                            const char* envVar, cmMakefile* mf)
 {
-  cmMakefile* mf = lg->GetMakefile();
-
   // get the variables from the environment and from the cache and then
   // figure out which one to use:
 
@@ -208,7 +206,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 
   std::string cacheEntryName = "CMAKE_ECLIPSE_ENVVAR_";
   cacheEntryName += envVar;
-  const char* cacheValue = lg->GetState()->GetInitializedCacheValue(
+  const char* cacheValue = mf->GetState()->GetInitializedCacheValue(
                                                        cacheEntryName);
 
   // now we have both, decide which one to use
@@ -226,7 +224,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
     mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                            cacheEntryName.c_str(), cmState::STRING,
                            true);
-    mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
+    mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
     }
   else if (envVarValue==0 && cacheValue!=0)
     {
@@ -247,7 +245,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
       mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                              cacheEntryName.c_str(), cmState::STRING,
                              true);
-      mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
+      mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
       }
     }
 
@@ -261,8 +259,8 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::CreateProjectFile()
 {
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  cmMakefile* mf = lg->GetMakefile();
+  cmMakefile* mf
+    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.project";
 
@@ -282,7 +280,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
     "<projectDescription>\n"
     "\t<name>" <<
-    this->GenerateProjectName(lg->GetProjectName(),
+    this->GenerateProjectName(mf->GetProjectName(),
                               mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                               this->GetPathBasename(this->HomeOutputDirectory))
     << "</name>\n"
@@ -363,17 +361,17 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
   //   but not necessarily when eclipse is open
   if (compilerId == "MSVC")
     {
-    AddEnvVar(fout, "PATH", lg);
-    AddEnvVar(fout, "INCLUDE", lg);
-    AddEnvVar(fout, "LIB", lg);
-    AddEnvVar(fout, "LIBPATH", lg);
+    AddEnvVar(fout, "PATH", mf);
+    AddEnvVar(fout, "INCLUDE", mf);
+    AddEnvVar(fout, "LIB", mf);
+    AddEnvVar(fout, "LIBPATH", mf);
     }
   else if (compilerId == "Intel")
     {
     // if the env.var is set, use this one and put it in the cache
     // if the env.var is not set, but the value is in the cache,
     // use it from the cache:
-    AddEnvVar(fout, "INTEL_LICENSE_FILE", lg);
+    AddEnvVar(fout, "INTEL_LICENSE_FILE", mf);
     }
   fout <<
     "</value>\n"
@@ -497,7 +495,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
     std::string sourceLinkedResourceName = "[Source directory]";
     std::string linkSourceDirectory = this->GetEclipsePath(
-                                             lg->GetCurrentSourceDirectory());
+                                             mf->GetCurrentSourceDirectory());
     // .project dir can't be subdir of a linked resource dir
     if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
                                          linkSourceDirectory))
@@ -636,7 +634,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
        ++it)
     {
     std::string linkSourceDirectory = this->GetEclipsePath(
-                   it->second[0]->GetCurrentSourceDirectory());
+                   it->second[0]->GetMakefile()->GetCurrentSourceDirectory());
     // a linked resource must not point to a parent directory of .project or
     // .project itself
     if ((baseDir != linkSourceDirectory) &&
@@ -696,8 +694,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 {
   std::set<std::string> emmited;
 
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  const cmMakefile* mf = lg->GetMakefile();
+  const cmMakefile* mf
+    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.cproject";
 
@@ -1034,7 +1032,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        ++it)
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
+    cmMakefile* makefile=(*it)->GetMakefile();
+    std::string subdir = (*it)->Convert(makefile->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
       {
@@ -1088,14 +1087,14 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           virtDir += prefix;
           virtDir += ti->first;
           std::string buildArgs = "-C \"";
-          buildArgs += (*it)->GetBinaryDirectory();
+          buildArgs += makefile->GetHomeOutputDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
                              ti->first.c_str());
 
           std::string cleanArgs = "-E chdir \"";
-          cleanArgs += (*it)->GetCurrentBinaryDirectory();
+          cleanArgs += makefile->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
@@ -1150,8 +1149,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   fout << "</cconfiguration>\n"
           "</storageModule>\n"
           "<storageModule moduleId=\"cdtBuildSystem\" version=\"4.0.0\">\n"
-          "<project id=\"" << this->EscapeForXML(lg->GetProjectName())
-       << ".null.1\" name=\"" << this->EscapeForXML(lg->GetProjectName())
+          "<project id=\"" << this->EscapeForXML(mf->GetProjectName())
+       << ".null.1\" name=\"" << this->EscapeForXML(mf->GetProjectName())
        << "\"/>\n"
           "</storageModule>\n"
           "</cproject>\n"
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index 16675f2..ef99760 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -100,7 +100,7 @@ private:
                                    std::set<std::string>& emittedDirs);
 
   static void AddEnvVar(cmGeneratedFileStream& fout, const char* envVar,
-                        cmLocalGenerator* lg);
+                        cmMakefile* mf);
 
   void CreateLinksToSubprojects(cmGeneratedFileStream& fout,
                                 const std::string& baseDir);
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 0c009c3..f83b5cf 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -46,22 +46,21 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 
 void cmExtraKateGenerator::Generate()
 {
-  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
-  cmMakefile* mf = lg->GetMakefile();
-  this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
+  const cmMakefile* mf
+     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  this->ProjectName = this->GenerateProjectName(mf->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
-                          this->GetPathBasename(lg->GetBinaryDirectory()));
+                          this->GetPathBasename(mf->GetHomeOutputDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
-  this->CreateKateProjectFile(lg);
-  this->CreateDummyKateProjectFile(lg);
+  this->CreateKateProjectFile(mf);
+  this->CreateDummyKateProjectFile(mf);
 }
 
 
-void cmExtraKateGenerator::CreateKateProjectFile(
-    const cmLocalGenerator* lg) const
+void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
 {
-  std::string filename = lg->GetBinaryDirectory();
+  std::string filename = mf->GetHomeOutputDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
   if (!fout)
@@ -69,29 +68,31 @@ void cmExtraKateGenerator::CreateKateProjectFile(
     return;
     }
 
+  std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
+  std::string args = mf->GetSafeDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
+
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"
-    "\t\"directory\": \"" << lg->GetSourceDirectory() << "\",\n"
-    "\t\"files\": [ { " << this->GenerateFilesString(lg) << "} ],\n";
-  this->WriteTargets(lg, fout);
+    "\t\"directory\": \"" << mf->GetHomeDirectory() << "\",\n"
+    "\t\"files\": [ { " << this->GenerateFilesString(mf) << "} ],\n";
+  this->WriteTargets(mf, fout);
   fout << "}\n";
 }
 
 
 void
-cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
+cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
                                    cmGeneratedFileStream& fout) const
 {
-  cmMakefile const* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
-  const char* homeOutputDir = lg->GetBinaryDirectory();
+  const char* homeOutputDir = mf->GetHomeOutputDirectory();
 
   fout <<
   "\t\"build\": {\n"
-  "\t\t\"directory\": \"" << lg->GetBinaryDirectory() << "\",\n"
+  "\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
   "\t\t\"default_target\": \"all\",\n"
   "\t\t\"clean_target\": \"clean\",\n";
 
@@ -121,8 +122,8 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
-    std::string currentDir = (*it)->GetCurrentBinaryDirectory();
-    bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
+    std::string currentDir = makefile->GetCurrentBinaryDirectory();
+    bool topLevel = (currentDir == makefile->GetHomeOutputDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
       {
@@ -233,10 +234,9 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& fout,
 
 
 void
-cmExtraKateGenerator::CreateDummyKateProjectFile(
-    const cmLocalGenerator* lg) const
+cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
 {
-  std::string filename = lg->GetBinaryDirectory();
+  std::string filename = mf->GetHomeOutputDirectory();
   filename += "/";
   filename += this->ProjectName;
   filename += ".kateproject";
@@ -252,23 +252,23 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(
 
 
 std::string
-cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
+cmExtraKateGenerator::GenerateFilesString(const cmMakefile* mf) const
 {
-  std::string s = lg->GetSourceDirectory();
+  std::string s = mf->GetHomeDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"git\": 1 ");
   }
 
-  s = lg->GetSourceDirectory();
+  s = mf->GetHomeDirectory();
   s += "/.svn";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"svn\": 1 ");
   }
 
-  s = lg->GetSourceDirectory();
+  s = mf->GetHomeDirectory();
   s += "/";
 
   std::set<std::string> files;
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index b20d0a7..f800feb 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -39,10 +39,9 @@ public:
 
   virtual void Generate();
 private:
-  void CreateKateProjectFile(const cmLocalGenerator* lg) const;
-  void CreateDummyKateProjectFile(const cmLocalGenerator* lg) const;
-  void WriteTargets(const cmLocalGenerator* lg,
-                    cmGeneratedFileStream& fout) const;
+  void CreateKateProjectFile(const cmMakefile* mf) const;
+  void CreateDummyKateProjectFile(const cmMakefile* mf) const;
+  void WriteTargets(const cmMakefile* mf, cmGeneratedFileStream& fout) const;
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string&     target,
                     const std::string&     make,
@@ -50,7 +49,7 @@ private:
                     const std::string&     path,
                     const char*            homeOutputDir) const;
 
-  std::string GenerateFilesString(const cmLocalGenerator* lg) const;
+  std::string GenerateFilesString(const cmMakefile* mf) const;
   std::string GetPathBasename(const std::string& path) const;
   std::string GenerateProjectName(const std::string& name,
                                   const std::string& type,
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 133626e..163a75b 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -77,8 +77,9 @@ void cmExtraSublimeTextGenerator::Generate()
 void cmExtraSublimeTextGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
-  std::string projectName=lgs[0]->GetProjectName();
+  const cmMakefile* mf=lgs[0]->GetMakefile();
+  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string projectName=mf->GetProjectName();
 
   const std::string filename =
                      outputDir + "/" + projectName + ".sublime-project";
@@ -98,8 +99,8 @@ void cmExtraSublimeTextGenerator
     }
 
   const std::string &sourceRootRelativeToOutput = cmSystemTools::RelativePath(
-                     lgs[0]->GetBinaryDirectory(),
-                     lgs[0]->GetSourceDirectory());
+                     mf->GetHomeOutputDirectory(),
+                     mf->GetHomeDirectory());
   // Write the folder entries to the project file
   fout << "{\n";
   fout << "\t\"folders\":\n\t[\n\t";
@@ -107,8 +108,8 @@ void cmExtraSublimeTextGenerator
     {
       fout << "\t{\n\t\t\t\"path\": \"" << sourceRootRelativeToOutput << "\"";
       const std::string &outputRelativeToSourceRoot =
-        cmSystemTools::RelativePath(lgs[0]->GetSourceDirectory(),
-                                    lgs[0]->GetBinaryDirectory());
+        cmSystemTools::RelativePath(mf->GetHomeDirectory(),
+                                    mf->GetHomeOutputDirectory());
       if ((!outputRelativeToSourceRoot.empty()) &&
         ((outputRelativeToSourceRoot.length() < 3) ||
           (outputRelativeToSourceRoot.substr(0, 3) != "../")))
@@ -172,8 +173,8 @@ void cmExtraSublimeTextGenerator::
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
-                     (*lg)->GetBinaryDirectory())==0)
+          if (strcmp(makefile->GetCurrentBinaryDirectory(),
+                     makefile->GetHomeOutputDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
@@ -301,7 +302,7 @@ void cmExtraSublimeTextGenerator::
     {
     fout << ",\n\t";
     }
-  fout << "\t{\n\t\t\t\"name\": \"" << lg->GetProjectName() << " - " <<
+  fout << "\t{\n\t\t\t\"name\": \"" << makefile->GetProjectName() << " - " <<
           targetName << "\",\n";
   fout << "\t\t\t\"cmd\": [" <<
           this->BuildMakeCommand(make, makefileName.c_str(), targetName) <<
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 4a362d8..cae5c2f 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -68,9 +68,7 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 std::string
 cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
 {
-  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
-      ->GetGeneratorTarget(target);
-  return gt->GetLocalGenerator()->GetBinaryDirectory();
+  return target->GetMakefile()->GetHomeOutputDirectory();
 }
 
 std::string
@@ -451,7 +449,7 @@ void cmGhsMultiTargetGenerator::WriteSources(
     cmSystemTools::ConvertToUnixSlashes(sgPath);
     cmGlobalGhsMultiGenerator::AddFilesUpToPath(
       this->GetFolderBuildStreams(), &this->FolderBuildStreams,
-      this->LocalGenerator->GetBinaryDirectory(), sgPath,
+      this->Makefile->GetHomeOutputDirectory(), sgPath,
       GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath);
 
     std::string fullSourcePath((*si)->GetFullPath());
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 45250d3..05f1029 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -399,7 +399,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
   bool fatalError = false;
 
   mf->AddDefinition("RUN_CONFIGURE", true);
-  std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory();
+  std::string rootBin = mf->GetHomeOutputDirectory();
   rootBin += cmake::GetCMakeFilesDirectory();
 
   // If the configuration files path has been set,
@@ -2105,7 +2105,7 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
   for(std::vector<cmLocalGenerator*>::const_iterator it =
       this->LocalGenerators.begin(); it != this->LocalGenerators.end(); ++it)
     {
-    std::string sd = (*it)->GetCurrentSourceDirectory();
+    std::string sd = (*it)->GetMakefile()->GetCurrentSourceDirectory();
     if (sd == start_dir)
       {
       return *it;
@@ -2879,8 +2879,10 @@ void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::WriteSummary()
 {
+  cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
+
   // Record all target directories in a central location.
-  std::string fname = this->CMakeInstance->GetHomeOutputDirectory();
+  std::string fname = mf->GetHomeOutputDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index ab24f94..138ddbb 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -49,9 +49,10 @@ void cmGlobalKdevelopGenerator::Generate()
       it!= this->GlobalGenerator->GetProjectMap().end();
       ++it)
     {
-    std::string outputDir=it->second[0]->GetCurrentBinaryDirectory();
-    std::string projectDir=it->second[0]->GetSourceDirectory();
-    std::string projectName=it->second[0]->GetProjectName();
+    cmMakefile* mf = it->second[0]->GetMakefile();
+    std::string outputDir=mf->GetCurrentBinaryDirectory();
+    std::string projectDir=mf->GetHomeDirectory();
+    std::string projectName=mf->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
     const std::vector<cmLocalGenerator*>& lgs= it->second;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 32e6077..9d8193b 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1198,15 +1198,16 @@ void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
 void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
 {
   cmLocalGenerator *lg = this->LocalGenerators[0];
+  cmMakefile* mfRoot = lg->GetMakefile();
 
   std::ostringstream cmd;
   cmd << lg->ConvertToOutputFormat(cmSystemTools::GetCMakeCommand(),
                                    cmLocalGenerator::SHELL)
       << " -H"
-      << lg->ConvertToOutputFormat(lg->GetSourceDirectory(),
+      << lg->ConvertToOutputFormat(mfRoot->GetHomeDirectory(),
                                    cmLocalGenerator::SHELL)
       << " -B"
-      << lg->ConvertToOutputFormat(lg->GetBinaryDirectory(),
+      << lg->ConvertToOutputFormat(mfRoot->GetHomeOutputDirectory(),
                                    cmLocalGenerator::SHELL);
   WriteRule(*this->RulesFileStream,
             "RERUN_CMAKE",
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 775ad2b..0064713 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -163,7 +163,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
     {
     cmLocalUnixMakefileGenerator3 *lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    std::string markFileName = lg->GetCurrentBinaryDirectory();
+    std::string markFileName = lg->GetMakefile()->GetCurrentBinaryDirectory();
     markFileName += "/";
     markFileName += cmake::GetCMakeFilesDirectory();
     markFileName += "/progress.marks";
@@ -395,7 +395,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
     {
     lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    tmpStr = lg->GetCurrentBinaryDirectory();
+    tmpStr = lg->GetMakefile()->GetCurrentBinaryDirectory();
     tmpStr += cmake::GetCMakeFilesDirectory();
     tmpStr += "/CMakeDirectoryInformation.cmake";
     cmakefileStream << "  \"" <<
@@ -454,7 +454,7 @@ cmGlobalUnixMakefileGenerator3
                       bool check_relink)
 {
   // Get the relative path to the subdirectory from the top.
-  std::string makeTarget = lg->GetCurrentBinaryDirectory();
+  std::string makeTarget = lg->GetMakefile()->GetCurrentBinaryDirectory();
   makeTarget += "/";
   makeTarget += pass;
 
@@ -534,7 +534,7 @@ cmGlobalUnixMakefileGenerator3
     }
 
   // Begin the directory-level rules section.
-  std::string dir = lg->GetCurrentBinaryDirectory();
+  std::string dir = lg->GetMakefile()->GetCurrentBinaryDirectory();
   dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT,
                     cmLocalGenerator::MAKERULE);
   lg->WriteDivider(ruleFileStream);
@@ -785,7 +785,7 @@ cmGlobalUnixMakefileGenerator3
       depends.clear();
 
       cmLocalUnixMakefileGenerator3::EchoProgress progress;
-      progress.Dir = lg->GetBinaryDirectory();
+      progress.Dir = lg->GetMakefile()->GetHomeOutputDirectory();
       progress.Dir += cmake::GetCMakeFilesDirectory();
       {
       std::ostringstream progressArg;
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index d5e9417..14de698 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -260,7 +260,7 @@ void cmGlobalVisualStudio6Generator
     }
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetProjectName();
+  fname += root->GetMakefile()->GetProjectName();
   fname += ".dsw";
   cmsys::ofstream fout(fname.c_str());
   if(!fout)
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 1ca3bd7..05da022 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -362,10 +362,10 @@ void cmGlobalVisualStudio7Generator
     {
     return;
     }
-  this->CurrentProject = root->GetProjectName();
-  std::string fname = root->GetCurrentBinaryDirectory();
+  this->CurrentProject = root->GetMakefile()->GetProjectName();
+  std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetProjectName();
+  fname += root->GetMakefile()->GetProjectName();
   fname += ".sln";
   cmGeneratedFileStream fout(fname.c_str());
   fout.SetCopyIfDifferent(true);
@@ -468,7 +468,8 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        std::string dir = root->GetCurrentBinaryDirectory();
+        cmMakefile* tmf = target->GetMakefile();
+        std::string dir = tmf->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
         if(dir == ".")
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 0a6844e..86a8f87 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -312,10 +312,10 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
   std::string argH = "-H";
-  argH += lg->GetSourceDirectory();
+  argH += mf->GetHomeDirectory();
   commandLine.push_back(argH);
   std::string argB = "-B";
-  argB += lg->GetBinaryDirectory();
+  argB += mf->GetHomeOutputDirectory();
   commandLine.push_back(argB);
   commandLine.push_back("--check-stamp-list");
   commandLine.push_back(stampList.c_str());
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 6a25ed0..d45aa27 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -250,7 +250,7 @@ cmGlobalVisualStudioGenerator
         {
         topLevelSlnName = mf->GetCurrentBinaryDirectory();
         topLevelSlnName += "/";
-        topLevelSlnName += this->LocalGenerators[0]->GetProjectName();
+        topLevelSlnName += mf->GetProjectName();
         topLevelSlnName += ".sln";
         }
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 201b02c..746e1a7 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -410,17 +410,15 @@ void cmGlobalXCodeGenerator::Generate()
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
-  this->CurrentProject = root->GetProjectName();
+  this->CurrentProject = root->GetMakefile()->GetProjectName();
   this->SetCurrentLocalGenerator(root);
-  cmSystemTools::SplitPath(
-        this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
-        this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(
-        this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
-        this->ProjectOutputDirectoryComponents);
+  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
+                           this->ProjectSourceDirectoryComponents);
+  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentBinaryDirectory(),
+                           this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
-    root->GetCurrentBinaryDirectory();
+    root->GetMakefile()->GetCurrentBinaryDirectory();
   this->CurrentXCodeHackMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentXCodeHackMakefile.c_str());
   this->CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
@@ -462,13 +460,13 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
-  std::string listfile = root->GetCurrentSourceDirectory();
+  std::string listfile = mf->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
   allbuild->AddSourceCMP0049(listfile.c_str());
 
   // Add XCODE depend helper
-  std::string dir = root->GetCurrentBinaryDirectory();
+  std::string dir = mf->GetCurrentBinaryDirectory();
   cmCustomCommandLine makeHelper;
   if(this->XcodeVersion < 50)
     {
@@ -556,7 +554,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
         }
 
       // Refer to the build configuration file for easy editing.
-      listfile = lg->GetCurrentSourceDirectory();
+      listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
       target.AddSourceCMP0049(listfile.c_str());
@@ -582,7 +580,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   std::vector<std::string>::iterator new_end =
     std::unique(lfiles.begin(), lfiles.end());
   lfiles.erase(new_end, lfiles.end());
-  this->CurrentReRunCMakeMakefile = root->GetCurrentBinaryDirectory();
+  this->CurrentReRunCMakeMakefile = mf->GetCurrentBinaryDirectory();
   this->CurrentReRunCMakeMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str());
   this->CurrentReRunCMakeMakefile += "/ReRunCMake.make";
@@ -590,7 +588,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = root->GetBinaryDirectory();
+  std::string checkCache = mf->GetHomeOutputDirectory();
   checkCache += "/";
   checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
   checkCache += "cmake.check_cache";
@@ -604,9 +602,9 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   makefileStream << "\n\t" <<
     this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
                  << " -H" << this->ConvertToRelativeForMake(
-                   root->GetSourceDirectory())
+                   mf->GetHomeDirectory())
                  << " -B" << this->ConvertToRelativeForMake(
-                   root->GetBinaryDirectory()) << "\n";
+                   mf->GetHomeOutputDirectory()) << "\n";
 }
 
 //----------------------------------------------------------------------------
@@ -1033,7 +1031,7 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen)
   this->CurrentLocalGenerator = gen;
   this->CurrentMakefile = gen->GetMakefile();
   std::string outdir =
-    cmSystemTools::CollapseFullPath(this->CurrentLocalGenerator->
+    cmSystemTools::CollapseFullPath(this->CurrentMakefile->
                                     GetCurrentBinaryDirectory());
   cmSystemTools::SplitPath(outdir.c_str(),
                            this->CurrentOutputDirectoryComponents);
@@ -1389,7 +1387,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // linker language.  This should convince Xcode to choose the proper
   // language.
   cmMakefile* mf = cmtarget.GetMakefile();
-  std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
+  std::string fname = mf->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
   fname += cmtarget.GetName();
@@ -1618,7 +1616,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 const & commands,
                                                 const char* name)
 {
-  std::string dir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
+  std::string dir = this->CurrentMakefile->GetCurrentBinaryDirectory();
   dir += "/CMakeScripts";
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
@@ -1639,7 +1637,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                     currentConfig->c_str());
     }
 
-  std::string cdir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
+  std::string cdir = this->CurrentMakefile->GetCurrentBinaryDirectory();
   cdir = this->ConvertToRelativeForXCode(cdir.c_str());
   std::string makecmd = "make -C ";
   makecmd += cdir;
@@ -1967,7 +1965,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Set attributes to specify the proper name for the target.
-  std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
+  std::string pndir = this->CurrentMakefile->GetCurrentBinaryDirectory();
   if(target.GetType() == cmTarget::STATIC_LIBRARY ||
      target.GetType() == cmTarget::SHARED_LIBRARY ||
      target.GetType() == cmTarget::MODULE_LIBRARY ||
@@ -3341,7 +3339,7 @@ bool cmGlobalXCodeGenerator
   this->RootObject->SetComment("Project object");
 
   std::string project_id = "PROJECT_";
-  project_id += root->GetProjectName();
+  project_id += root->GetMakefile()->GetProjectName();
   this->RootObject->SetId(this->GetOrCreateId(
     project_id.c_str(), this->RootObject->GetId()).c_str());
 
@@ -3371,7 +3369,7 @@ bool cmGlobalXCodeGenerator
   // Point Xcode at the top of the source tree.
   {
   std::string pdir =
-    this->RelativeToBinary(root->GetCurrentSourceDirectory());
+    this->RelativeToBinary(root->GetMakefile()->GetCurrentSourceDirectory());
   this->RootObject->AddAttribute("projectDirPath",
                                  this->CreateString(pdir.c_str()));
   this->RootObject->AddAttribute("projectRoot", this->CreateString(""));
@@ -3483,7 +3481,7 @@ bool cmGlobalXCodeGenerator
     }
   }
 
-  std::string symroot = root->GetCurrentBinaryDirectory();
+  std::string symroot = root->GetMakefile()->GetCurrentBinaryDirectory();
   symroot += "/build";
   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
 
@@ -3726,9 +3724,9 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     {
     return;
     }
-  std::string xcodeDir = root->GetCurrentBinaryDirectory();
+  std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
   xcodeDir += "/";
-  xcodeDir += root->GetProjectName();
+  xcodeDir += root->GetMakefile()->GetProjectName();
   xcodeDir += ".xcode";
   if(this->XcodeVersion > 20)
     {
@@ -3748,7 +3746,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
   // Since this call may have created new cache entries, save the cache:
   //
   root->GetMakefile()->GetCMakeInstance()->SaveCache(
-    root->GetBinaryDirectory());
+    root->GetMakefile()->GetHomeOutputDirectory());
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index f7c9cc2..97b9405 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -64,7 +64,7 @@ void cmInstallExportGenerator::ComputeTempDir()
   // Choose a temporary directory in which to generate the import
   // files to be installed.
   this->TempDir =
-      this->LocalGenerator->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
   this->TempDir += cmake::GetCMakeFilesDirectory();
   this->TempDir += "/Export";
   if(this->Destination.empty())
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c0c50c4..b26151c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2431,11 +2431,6 @@ const char* cmLocalGenerator::GetFeature(const std::string& feature,
   return 0;
 }
 
-std::string cmLocalGenerator::GetProjectName() const
-{
-  return this->StateSnapshot.GetProjectName();
-}
-
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::ConstructComment(cmCustomCommandGenerator const& ccg,
@@ -2863,31 +2858,6 @@ cmLocalGenerator
   return source.GetLanguage();
 }
 
-cmake* cmLocalGenerator::GetCMakeInstance() const
-{
-  return this->GlobalGenerator->GetCMakeInstance();
-}
-
-const char* cmLocalGenerator::GetSourceDirectory() const
-{
-  return this->GetCMakeInstance()->GetHomeDirectory();
-}
-
-const char* cmLocalGenerator::GetBinaryDirectory() const
-{
-  return this->GetCMakeInstance()->GetHomeOutputDirectory();
-}
-
-const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
-{
-  return this->StateSnapshot.GetDirectory().GetCurrentBinary();
-}
-
-const char* cmLocalGenerator::GetCurrentSourceDirectory() const
-{
-  return this->StateSnapshot.GetDirectory().GetCurrentSource();
-}
-
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 8070667..33fede1 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -182,8 +182,6 @@ public:
                              const std::string& config,
                              const std::string& lang);
 
-  std::string GetProjectName() const;
-
   /** Compute the language used to compile the given source file.  */
   std::string GetSourceFileLanguage(const cmSourceFile& source);
 
@@ -253,14 +251,6 @@ public:
    */
   bool NeedBackwardsCompatibility_2_4();
 
-  cmake* GetCMakeInstance() const;
-
-  const char* GetSourceDirectory() const;
-  const char* GetBinaryDirectory() const;
-
-  const char* GetCurrentBinaryDirectory() const;
-  const char* GetCurrentSourceDirectory() const;
-
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 6319f0e..c46adc1 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -183,7 +183,7 @@ void cmLocalNinjaGenerator::WriteProjectHeader(std::ostream& os)
 {
   cmGlobalNinjaGenerator::WriteDivider(os);
   os
-    << "# Project: " << this->GetProjectName() << std::endl
+    << "# Project: " << this->GetMakefile()->GetProjectName() << std::endl
     << "# Configuration: " << this->ConfigName << std::endl
     ;
   cmGlobalNinjaGenerator::WriteDivider(os);
@@ -363,7 +363,7 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(
   if (ccg.GetNumberOfCommands() > 0) {
     std::string wd = ccg.GetWorkingDirectory();
     if (wd.empty())
-      wd = this->GetCurrentBinaryDirectory();
+      wd = this->GetMakefile()->GetCurrentBinaryDirectory();
 
     std::ostringstream cdCmd;
 #ifdef _WIN32
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index bf5afc1..b131a63 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -399,7 +399,7 @@ cmLocalUnixMakefileGenerator3
       );
     }
   this->CreateCDCommand(commands,
-                        this->GetBinaryDirectory(),
+                        this->Makefile->GetHomeOutputDirectory(),
                         cmLocalGenerator::START_OUTPUT);
 
   // Write the rule to the makefile.
@@ -449,7 +449,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefile2.c_str(),localName));
       this->CreateCDCommand(commands,
-                            this->GetBinaryDirectory(),
+                            this->Makefile->GetHomeOutputDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
                           localName, depends, commands, true);
@@ -478,7 +478,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefileName.c_str(), makeTargetName));
       this->CreateCDCommand(commands,
-                            this->GetBinaryDirectory(),
+                            this->Makefile->GetHomeOutputDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "fast build rule for target.",
                           localName, depends, commands, true);
@@ -496,7 +496,7 @@ void cmLocalUnixMakefileGenerator3
         commands.push_back(this->GetRecursiveMakeCall
                            (makefile2.c_str(), makeTargetName));
         this->CreateCDCommand(commands,
-                              this->GetBinaryDirectory(),
+                              this->Makefile->GetHomeOutputDirectory(),
                               cmLocalGenerator::START_OUTPUT);
         this->WriteMakeRule(ruleFileStream,
                             "Manual pre-install relink rule for target.",
@@ -750,13 +750,13 @@ cmLocalUnixMakefileGenerator3
   makefileStream
     << "# The top-level source directory on which CMake was run.\n"
     << "CMAKE_SOURCE_DIR = "
-    << this->Convert(this->GetSourceDirectory(), FULL, SHELL)
+    << this->Convert(this->Makefile->GetHomeDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
   makefileStream
     << "# The top-level build directory on which CMake was run.\n"
     << "CMAKE_BINARY_DIR = "
-    << this->Convert(this->GetBinaryDirectory(), FULL, SHELL)
+    << this->Convert(this->Makefile->GetHomeOutputDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
 }
@@ -889,7 +889,7 @@ void cmLocalUnixMakefileGenerator3
   if(!this->GetMakefile()->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
-                          this->GetBinaryDirectory(),
+                          this->Makefile->GetHomeOutputDirectory(),
                           cmLocalGenerator::START_OUTPUT);
     }
   this->WriteMakeRule(makefileStream,
@@ -1838,7 +1838,7 @@ void cmLocalUnixMakefileGenerator3
 
   depends.push_back("cmake_check_build_system");
 
-  std::string progressDir = this->GetBinaryDirectory();
+  std::string progressDir = this->Makefile->GetHomeOutputDirectory();
   progressDir += cmake::GetCMakeFilesDirectory();
     {
     std::ostringstream progCmd;
@@ -1862,7 +1862,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->GetBinaryDirectory(),
+                        this->Makefile->GetHomeOutputDirectory(),
                         cmLocalGenerator::START_OUTPUT);
     {
     std::ostringstream progCmd;
@@ -1884,7 +1884,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                                this->GetBinaryDirectory(),
+                                this->Makefile->GetHomeOutputDirectory(),
                                 cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "The main clean target", "clean",
                       depends, commands, true);
@@ -1914,7 +1914,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back
     (this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->GetBinaryDirectory(),
+                        this->Makefile->GetHomeOutputDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "Prepare targets for installation.",
                       "preinstall", depends, commands, true);
@@ -1935,7 +1935,7 @@ void cmLocalUnixMakefileGenerator3
   runRule += " 1";
   commands.push_back(runRule);
   this->CreateCDCommand(commands,
-                        this->GetBinaryDirectory(),
+                        this->Makefile->GetHomeOutputDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "clear depends",
                       "depend",
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index b84cbc5..cc94cd4 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -111,14 +111,14 @@ void cmLocalVisualStudio6Generator::Generate()
 void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->GetCurrentBinaryDirectory(),
-            this->GetSourceDirectory()) != 0)
+  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+            this->Makefile->GetHomeDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->GetCurrentBinaryDirectory()))
+       (this->Makefile->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->GetCurrentBinaryDirectory());
+                           this->Makefile->GetCurrentBinaryDirectory());
       }
     }
 
@@ -163,7 +163,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       std::string::size_type pos = l->first.rfind('/');
       if(pos != std::string::npos)
         {
-        std::string dir = this->GetCurrentBinaryDirectory();
+        std::string dir = this->Makefile->GetCurrentBinaryDirectory();
         dir += "/";
         dir += l->first.substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
@@ -189,7 +189,7 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 
   // create the dsp.cmake file
   std::string fname;
-  fname = this->GetCurrentBinaryDirectory();
+  fname = this->Makefile->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
@@ -215,7 +215,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->GetCurrentSourceDirectory();
+  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   if(!cmSystemTools::FileExists(makefileIn.c_str()))
@@ -226,10 +226,10 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->GetSourceDirectory();
+  args += this->Makefile->GetHomeDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->GetBinaryDirectory();
+  args += this->Makefile->GetHomeOutputDirectory();
   commandLine.push_back(args);
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
@@ -577,9 +577,9 @@ cmLocalVisualStudio6Generator
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
-  char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
+  char* output = new char[(strlen(this->Makefile->GetCurrentBinaryDirectory())
                            + target.GetName().size() + 30)];
-  sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
+  sprintf(output,"%s/%s_force_%i", this->Makefile->GetCurrentBinaryDirectory(),
           target.GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
@@ -1962,7 +1962,7 @@ cmLocalVisualStudio6Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->GetCurrentBinaryDirectory();
+  dir_max += this->Makefile->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 90c17c6..a4bce8a 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -138,7 +138,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       cmCustomCommandLines force_commands;
       force_commands.push_back(force_command);
       std::string no_main_dependency = "";
-      std::string force = this->GetCurrentBinaryDirectory();
+      std::string force = this->Makefile->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
       force += tgt.GetName();
@@ -160,14 +160,14 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
 void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->GetCurrentBinaryDirectory(),
-            this->GetSourceDirectory()) != 0)
+  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+            this->Makefile->GetHomeDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->GetCurrentBinaryDirectory()))
+       (this->Makefile->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->GetCurrentBinaryDirectory());
+                           this->Makefile->GetCurrentBinaryDirectory());
       }
     }
 
@@ -196,7 +196,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 {
   // Touch a timestamp file used to determine when the project file is
   // out of date.
-  std::string stampName = this->GetCurrentBinaryDirectory();
+  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
   stampName += cmake::GetCMakeFilesDirectory();
   cmSystemTools::MakeDirectory(stampName.c_str());
   stampName += "/";
@@ -243,7 +243,7 @@ void cmLocalVisualStudio7Generator
   target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
-  fname = this->GetCurrentBinaryDirectory();
+  fname = this->Makefile->GetCurrentBinaryDirectory();
   fname += "/";
   fname += lname;
   if(this->FortranProject)
@@ -272,13 +272,13 @@ void cmLocalVisualStudio7Generator
 //----------------------------------------------------------------------------
 cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
-  std::string stampName = this->GetCurrentBinaryDirectory();
+  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
   stampName += "/";
   stampName += cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->GetCurrentSourceDirectory();
+  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   makefileIn = cmSystemTools::CollapseFullPath(makefileIn.c_str());
@@ -290,10 +290,10 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->GetSourceDirectory();
+  args += this->Makefile->GetHomeDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->GetBinaryDirectory();
+  args += this->Makefile->GetHomeOutputDirectory();
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
   std::string stampFilename = this->Convert(stampName.c_str(), FULL,
@@ -1719,7 +1719,7 @@ cmLocalVisualStudio7Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->GetCurrentBinaryDirectory();
+  dir_max += this->Makefile->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 5caa272..077470d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1517,7 +1517,7 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
                     parent->GetProperty("LINK_DIRECTORIES"));
 
   // the initial project name
-  this->StateSnapshot.SetProjectName(parent->StateSnapshot.GetProjectName());
+  this->SetProjectName(parent->GetProjectName());
 
   // Copy include regular expressions.
   this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;
@@ -2033,6 +2033,11 @@ void cmMakefile::SetProjectName(std::string const& p)
   this->StateSnapshot.SetProjectName(p);
 }
 
+std::string cmMakefile::GetProjectName() const
+{
+  return this->StateSnapshot.GetProjectName();
+}
+
 void cmMakefile::AddGlobalLinkInformation(const std::string& name,
                                           cmTarget& target)
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 7057157..8724c6e 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -274,6 +274,11 @@ public:
    */
   void SetProjectName(std::string const& name);
 
+  /**
+   * Get the name of the project for this build.
+   */
+  std::string GetProjectName() const;
+
   /** Get the configurations to be generated.  */
   std::string GetConfigurations(std::vector<std::string>& configs,
                                 bool single = true) const;
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b7ca26b..b278087 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -419,7 +419,7 @@ void cmMakefileTargetGenerator
   this->WriteObjectBuildFile(obj, lang, source, depends);
 
   // The object file should be checked for dependency integrity.
-  std::string objFullPath = this->LocalGenerator->GetCurrentBinaryDirectory();
+  std::string objFullPath = this->Makefile->GetCurrentBinaryDirectory();
   objFullPath += "/";
   objFullPath += obj;
   objFullPath =
@@ -642,7 +642,7 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->LocalGenerator->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->Makefile->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";
@@ -698,7 +698,7 @@ cmMakefileTargetGenerator
   // Change the command working directory to the local build tree.
   this->LocalGenerator->CreateCDCommand
     (compileCommands,
-     this->LocalGenerator->GetCurrentBinaryDirectory(),
+     this->Makefile->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
   commands.insert(commands.end(),
                   compileCommands.begin(), compileCommands.end());
@@ -771,7 +771,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (preprocessCommands,
-           this->LocalGenerator->GetCurrentBinaryDirectory(),
+           this->Makefile->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         preprocessCommands.begin(),
@@ -828,7 +828,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (assemblyCommands,
-           this->LocalGenerator->GetCurrentBinaryDirectory(),
+           this->Makefile->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         assemblyCommands.begin(),
@@ -929,7 +929,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
                                            *this->Target);
   this->LocalGenerator->CreateCDCommand
     (commands,
-     this->LocalGenerator->GetCurrentBinaryDirectory(),
+     this->Makefile->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
 
   // Write the rule.
@@ -1095,7 +1095,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // translation table for the dependency scanning process.
   depCmd << "cd "
          << (this->LocalGenerator->Convert(
-               this->LocalGenerator->GetBinaryDirectory(),
+               this->Makefile->GetHomeOutputDirectory(),
                cmLocalGenerator::FULL, cmLocalGenerator::SHELL))
          << " && ";
 #endif
@@ -1110,16 +1110,16 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // the state of our local generator sufficiently for its needs.
   depCmd << "$(CMAKE_COMMAND) -E cmake_depends \""
          << this->GlobalGenerator->GetName() << "\" "
-         << this->Convert(this->LocalGenerator->GetSourceDirectory(),
+         << this->Convert(this->Makefile->GetHomeDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->LocalGenerator->GetCurrentSourceDirectory(),
+         << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
+         << this->Convert(this->Makefile->GetHomeOutputDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->LocalGenerator->GetCurrentBinaryDirectory(),
+         << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->InfoFileNameFull,
@@ -1242,7 +1242,7 @@ void
 cmMakefileTargetGenerator
 ::MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress& progress) const
 {
-  progress.Dir = this->LocalGenerator->GetBinaryDirectory();
+  progress.Dir = this->Makefile->GetHomeOutputDirectory();
   progress.Dir += cmake::GetCMakeFilesDirectory();
   std::ostringstream progressArg;
   progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index fb598e8..84c19a3 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -666,8 +666,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   if (!preLinkCmdLines.empty())
     {
     const std::string homeOutDir = localGen.ConvertToOutputFormat(
-                                            localGen.GetBinaryDirectory(),
-                                            cmLocalGenerator::SHELL);
+                                              mf->GetHomeOutputDirectory(),
+                                              cmLocalGenerator::SHELL);
     preLinkCmdLines.push_back("cd " + homeOutDir);
     }
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 133d2ff..6e6dc60 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -45,8 +45,9 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
-        if (strcmp(target->GetLocalGenerator()->GetCurrentSourceDirectory(),
-                   target->GetLocalGenerator()->GetSourceDirectory()) == 0)
+        cmMakefile *mf = target->Target->GetMakefile();
+        if (strcmp(mf->GetCurrentSourceDirectory(),
+                   mf->GetHomeDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
       }
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 3e36589..58b901a 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -103,13 +103,13 @@ void cmNinjaUtilityTargetGenerator::Generate()
       command,
       "$(CMAKE_SOURCE_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetLocalGenerator()->GetSourceDirectory(),
+        this->GetTarget()->GetMakefile()->GetHomeDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(
       command,
       "$(CMAKE_BINARY_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetLocalGenerator()->GetBinaryDirectory(),
+        this->GetTarget()->GetMakefile()->GetHomeOutputDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(command, "$(ARGS)", "");
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 92b7a57..2395ce7 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -195,7 +195,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->BuildFileStream = 0;
   this->IsMissingFiles = false;
   this->DefaultArtifactDir =
-    this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") +
+    this->Makefile->GetCurrentBinaryDirectory() + std::string("/") +
     this->LocalGenerator->GetTargetDirectory(*this->Target);
 }
 
@@ -297,7 +297,8 @@ void cmVisualStudio10TargetGenerator::Generate()
       return;
       }
     }
-  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
+  cmMakefile* mf = this->Target->GetMakefile();
+  std::string path =  mf->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj";
@@ -950,7 +951,7 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path,
 {
   return forceRelative
     ? cmSystemTools::RelativePath(
-      this->LocalGenerator->GetCurrentBinaryDirectory(), path.c_str())
+      this->Makefile->GetCurrentBinaryDirectory(), path.c_str())
     : path.c_str();
 }
 
@@ -989,7 +990,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   this->AddMissingSourceGroups(groupsUsed, sourceGroups);
 
   // Write out group file
-  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
+  std::string path =  this->Makefile->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj.filters";
@@ -1447,7 +1448,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
     std::string sourceRel = this->ConvertPath(sf->GetFullPath(), true);
     size_t const maxLen = 250;
     if(sf->GetCustomCommand() ||
-       ((strlen(this->LocalGenerator->GetCurrentBinaryDirectory()) + 1 +
+       ((strlen(this->Makefile->GetCurrentBinaryDirectory()) + 1 +
          sourceRel.length()) <= maxLen))
       {
       forceRelative = true;
@@ -2243,7 +2244,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 {
   // Look through the sources for AndroidManifest.xml and use
   // its location as the root source directory.
-  std::string rootDir = this->LocalGenerator->GetCurrentSourceDirectory();
+  std::string rootDir = this->Makefile->GetCurrentSourceDirectory();
   {
   std::vector<cmSourceFile const*> extraSources;
   this->GeneratorTarget->GetExtraSources(extraSources, "");
@@ -3312,8 +3313,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
   // For WP80, the manifest needs to be in the same folder as the project
   // this can cause an overwrite problem if projects aren't organized in
   // folders
-  std::string manifestFile =
-      this->LocalGenerator->GetCurrentBinaryDirectory() +
+  std::string manifestFile = this->Makefile->GetCurrentBinaryDirectory() +
                              std::string("/WMAppManifest.xml");
   std::string artifactDir =
     this->LocalGenerator->GetTargetDirectory(*this->Target);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCPluginAPI.cxx                    |    2 +-
 Source/cmComputeLinkInformation.cxx        |    5 +--
 Source/cmDependsFortran.cxx                |    2 +-
 Source/cmExportFileGenerator.cxx           |   28 ++++++-------
 Source/cmExtraCodeBlocksGenerator.cxx      |   24 +++++------
 Source/cmExtraCodeLiteGenerator.cxx        |   24 +++++------
 Source/cmExtraEclipseCDT4Generator.cxx     |   59 ++++++++++++++--------------
 Source/cmExtraEclipseCDT4Generator.h       |    2 +-
 Source/cmExtraKateGenerator.cxx            |   50 +++++++++++------------
 Source/cmExtraKateGenerator.h              |    9 ++---
 Source/cmExtraSublimeTextGenerator.cxx     |   19 ++++-----
 Source/cmGhsMultiTargetGenerator.cxx       |    6 +--
 Source/cmGlobalGenerator.cxx               |    8 ++--
 Source/cmGlobalKdevelopGenerator.cxx       |    7 ++--
 Source/cmGlobalNinjaGenerator.cxx          |    5 ++-
 Source/cmGlobalUnixMakefileGenerator3.cxx  |   10 ++---
 Source/cmGlobalVisualStudio6Generator.cxx  |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx  |    9 +++--
 Source/cmGlobalVisualStudio8Generator.cxx  |    4 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |    2 +-
 Source/cmGlobalXCodeGenerator.cxx          |   50 +++++++++++------------
 Source/cmInstallExportGenerator.cxx        |    2 +-
 Source/cmLocalGenerator.cxx                |   30 --------------
 Source/cmLocalGenerator.h                  |   10 -----
 Source/cmLocalNinjaGenerator.cxx           |    4 +-
 Source/cmLocalUnixMakefileGenerator3.cxx   |   24 +++++------
 Source/cmLocalVisualStudio6Generator.cxx   |   24 +++++------
 Source/cmLocalVisualStudio7Generator.cxx   |   24 +++++------
 Source/cmMakefile.cxx                      |    7 +++-
 Source/cmMakefile.h                        |    5 +++
 Source/cmMakefileTargetGenerator.cxx       |   24 +++++------
 Source/cmNinjaNormalTargetGenerator.cxx    |    4 +-
 Source/cmNinjaTargetGenerator.cxx          |    5 ++-
 Source/cmNinjaUtilityTargetGenerator.cxx   |    4 +-
 Source/cmVisualStudio10TargetGenerator.cxx |   16 ++++----
 35 files changed, 240 insertions(+), 270 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Oct  8 00:01:07 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu,  8 Oct 2015 00:01:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-40-g24c9752
Message-ID: <20151008040107.27C78BF890@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  24c97529ca98649576e2f98e56dc6830d8a5b3d8 (commit)
      from  2c4f9023360103ca7489ef821038c3b64a5415fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24c97529ca98649576e2f98e56dc6830d8a5b3d8
commit 24c97529ca98649576e2f98e56dc6830d8a5b3d8
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Oct 8 00:01:05 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 8 00:01:05 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a4b06d4..852d360 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151007)
+set(CMake_VERSION_PATCH 20151008)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From daniele.domenichelli at gmail.com  Thu Oct  8 10:20:28 2015
From: daniele.domenichelli at gmail.com (Daniele E. Domenichelli)
Date: Thu,  8 Oct 2015 10:20:28 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-191-g6d0145d
Message-ID: <20151008142028.E6649BF5B2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6d0145dbeace6b7be1073796cf95154764378114 (commit)
       via  8036c7f0d40a45614937f386636d0a227d9de7dd (commit)
      from  5f678ee258419a1f50bc5d88e04ca14a4a2b7d91 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d0145dbeace6b7be1073796cf95154764378114
commit 6d0145dbeace6b7be1073796cf95154764378114
Merge: 5f678ee 8036c7f
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Thu Oct 8 10:20:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:20:28 2015 -0400

    Merge topic 'FindGTK2_sigc++_c++11' into next
    
    8036c7f0 FindGTK2: Do not perform sigc++ version check if config file was not found


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8036c7f0d40a45614937f386636d0a227d9de7dd
commit 8036c7f0d40a45614937f386636d0a227d9de7dd
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Oct 8 16:19:58 2015 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Oct 8 16:19:58 2015 +0200

    FindGTK2: Do not perform sigc++ version check if config file was not found

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 501055b..ab4ef3e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -772,23 +772,25 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
         _GTK2_FIND_LIBRARY    (SIGC++ sigc true true)
         _GTK2_ADD_TARGET      (SIGC++)
         # Since sigc++ 2.5.1 c++11 support is required
-        _GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
-                                 GTK2_SIGC++_VERSION_MINOR
-                                 GTK2_SIGC++_VERSION_MICRO
-                                 ${GTK2_SIGC++CONFIG_INCLUDE_DIR}/sigc++config.h)
-        if(NOT ${GTK2_SIGC++_VERSION_MAJOR}.${GTK2_SIGC++_VERSION_MINOR}.${GTK2_SIGC++_VERSION_MICRO} VERSION_LESS 2.5.1)
-            # These are the features needed by clients in order to include the
-            # project headers:
-            set_property(TARGET GTK2::sigc++
-                         PROPERTY INTERFACE_COMPILE_FEATURES cxx_alias_templates
-                                                             cxx_auto_type
-                                                             cxx_decltype
-                                                             cxx_deleted_functions
-                                                             cxx_noexcept
-                                                             cxx_nullptr
-                                                             cxx_right_angle_brackets
-                                                             cxx_rvalue_references
-                                                             cxx_variadic_templates)
+        if(GTK2_SIGC++CONFIG_INCLUDE_DIR)
+            _GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
+                                     GTK2_SIGC++_VERSION_MINOR
+                                     GTK2_SIGC++_VERSION_MICRO
+                                     ${GTK2_SIGC++CONFIG_INCLUDE_DIR}/sigc++config.h)
+            if(NOT ${GTK2_SIGC++_VERSION_MAJOR}.${GTK2_SIGC++_VERSION_MINOR}.${GTK2_SIGC++_VERSION_MICRO} VERSION_LESS 2.5.1)
+                # These are the features needed by clients in order to include the
+                # project headers:
+                set_property(TARGET GTK2::sigc++
+                             PROPERTY INTERFACE_COMPILE_FEATURES cxx_alias_templates
+                                                                 cxx_auto_type
+                                                                 cxx_decltype
+                                                                 cxx_deleted_functions
+                                                                 cxx_noexcept
+                                                                 cxx_nullptr
+                                                                 cxx_right_angle_brackets
+                                                                 cxx_rvalue_references
+                                                                 cxx_variadic_templates)
+            endif()
         endif()
 
         _GTK2_FIND_INCLUDE_DIR(GLIBMM glibmm.h)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGTK2.cmake |   36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 10:31:39 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 10:31:39 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-44-gfab711a
Message-ID: <20151008143139.74E02BFCAB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  fab711a87aee06306a681af6d843a14c62031553 (commit)
       via  992c43d2ed0bdede5d9d0389c51b8e28bb22cd96 (commit)
       via  45fa326b6ccceae1858ef3f30c11341c8b397d73 (commit)
       via  9cbab63ee143662a94fa050b95d02e9f14342907 (commit)
      from  24c97529ca98649576e2f98e56dc6830d8a5b3d8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fab711a87aee06306a681af6d843a14c62031553
commit fab711a87aee06306a681af6d843a14c62031553
Merge: 24c9752 992c43d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 10:31:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:31:38 2015 -0400

    Merge topic 'release-no-old-osx'
    
    992c43d2 Tests: Rename OS X nightly release binary test
    45fa326b Utilities/Release: Drop OS X ppc/i386 binary
    9cbab63e Tests: Drop nightly OS X ppc/i386 binary


-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt                         |    4 +---
 Utilities/Release/create-cmake-release.cmake |    3 +--
 Utilities/Release/dashmacmini2_release.cmake |   25 -------------------------
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 Utilities/Release/dashmacmini2_release.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 10:31:41 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 10:31:41 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-46-g2b9a155
Message-ID: <20151008143141.655F4BFCB5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  2b9a155dcdb733df5cc83851c4429915987974f3 (commit)
       via  fab35c95cbf47e583cbf86b1db1ac3e77ce7035e (commit)
      from  fab711a87aee06306a681af6d843a14c62031553 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b9a155dcdb733df5cc83851c4429915987974f3
commit 2b9a155dcdb733df5cc83851c4429915987974f3
Merge: fab711a fab35c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 10:31:40 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:31:40 2015 -0400

    Merge topic 'release-cygwin-subdir'
    
    fab35c95 Utilities/Release: Move cygwin packages to a subdirectory


-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/dash2win64_cygwin.cmake |    2 ++
 Utilities/Release/release_cmake.cmake     |   19 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 10:31:43 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 10:31:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-49-gc91b14e
Message-ID: <20151008143143.6171DBFCBC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  c91b14ec861fc351070c9968acadd335a4772975 (commit)
       via  b520b1ca4ec3d51a031d44a25080931c5bb73b83 (commit)
       via  26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc (commit)
      from  2b9a155dcdb733df5cc83851c4429915987974f3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c91b14ec861fc351070c9968acadd335a4772975
commit c91b14ec861fc351070c9968acadd335a4772975
Merge: 2b9a155 b520b1c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 10:31:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:31:42 2015 -0400

    Merge topic 'release-nightly-linux64'
    
    b520b1ca Tests: Add a nightly Linux 64-bit binary
    26a0b52d Tests: Rename Linux nightly release binary test to Linux32


-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 10:31:45 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 10:31:45 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-52-gfc7a191
Message-ID: <20151008143145.6D5C4BFCAF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  fc7a191c53da12c4293e82f2dbfc07a08440369c (commit)
       via  062473842f3c926944cbc2a32c7703bc1204890d (commit)
       via  b6702d40dd9ab512a8cd56dd202ebe8cdbdb03d9 (commit)
      from  c91b14ec861fc351070c9968acadd335a4772975 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc7a191c53da12c4293e82f2dbfc07a08440369c
commit fc7a191c53da12c4293e82f2dbfc07a08440369c
Merge: c91b14e 0624738
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 10:31:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:31:44 2015 -0400

    Merge topic 'fix-spelling-typos'
    
    06247384 bootstrap: Fix spelling of "succeeded"
    b6702d40 Modules: Fix spelling of "succeeded" in check messages


-----------------------------------------------------------------------

Summary of changes:
 Modules/CheckCSourceCompiles.cmake       |    2 +-
 Modules/CheckCSourceRuns.cmake           |    2 +-
 Modules/CheckCXXSourceCompiles.cmake     |    2 +-
 Modules/CheckCXXSourceRuns.cmake         |    2 +-
 Modules/CheckFortranSourceCompiles.cmake |    2 +-
 bootstrap                                |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 10:31:47 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 10:31:47 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-55-g3cf7172
Message-ID: <20151008143147.80D09BFCC1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  3cf71728a17899673f7a07dea9d0242e7d7bff1f (commit)
       via  d0c3bf65d560659303e6d3e96da4e6c2c749d3b8 (commit)
       via  bca73252130b7f60fc12b7bcbbc95a3153047bd3 (commit)
      from  fc7a191c53da12c4293e82f2dbfc07a08440369c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cf71728a17899673f7a07dea9d0242e7d7bff1f
commit 3cf71728a17899673f7a07dea9d0242e7d7bff1f
Merge: fc7a191 d0c3bf6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 10:31:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:31:46 2015 -0400

    Merge topic 'update-kwsys'
    
    d0c3bf65 Merge branch 'upstream-kwsys' into update-kwsys
    bca73252 KWSys 2015-10-06 (d79801bb)


-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/EncodingCXX.cxx    |    1 +
 Source/kwsys/SystemTools.hxx.in |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 10:31:49 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 10:31:49 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-57-gc997595
Message-ID: <20151008143149.C3692BFCCF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  c997595ea36b60803068fafdbe0f7041b3cc9da0 (commit)
       via  3758af12fab8bc3c6279400621be94c4aa540a70 (commit)
      from  3cf71728a17899673f7a07dea9d0242e7d7bff1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c997595ea36b60803068fafdbe0f7041b3cc9da0
commit c997595ea36b60803068fafdbe0f7041b3cc9da0
Merge: 3cf7172 3758af1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 10:31:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:31:48 2015 -0400

    Merge topic 'cpack-nsis-bitmap'
    
    3758af12 CPackNSIS: Add options to set the bitmap for NSIS installer left side


-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/cpack-nsis-bitmap.rst |    6 ++++++
 Modules/CPackNSIS.cmake                |    8 ++++++++
 Modules/NSIS.template.in               |    2 ++
 Source/CPack/cmCPackNSISGenerator.cxx  |   22 ++++++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 Help/release/dev/cpack-nsis-bitmap.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 10:31:51 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 10:31:51 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-59-g45e9f48
Message-ID: <20151008143151.EE03CBFCD0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  45e9f48f9ca51f2bd32a8dd09ce58cf2ec4197e5 (commit)
       via  8bb908b1084b5db1a6f8197a4d26b67984587ee4 (commit)
      from  c997595ea36b60803068fafdbe0f7041b3cc9da0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45e9f48f9ca51f2bd32a8dd09ce58cf2ec4197e5
commit 45e9f48f9ca51f2bd32a8dd09ce58cf2ec4197e5
Merge: c997595 8bb908b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 10:31:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:31:50 2015 -0400

    Merge topic 'cmake-script-mode-directory-vars'
    
    8bb908b1 Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode


-----------------------------------------------------------------------

Summary of changes:
 Help/variable/CMAKE_BINARY_DIR.rst             |    5 +++++
 Help/variable/CMAKE_CURRENT_BINARY_DIR.rst     |    5 +++++
 Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst     |    5 +++++
 Help/variable/CMAKE_SOURCE_DIR.rst             |    5 +++++
 Tests/RunCMake/CommandLine/P_working-dir.cmake |   14 ++++++++++++++
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake  |    1 +
 6 files changed, 35 insertions(+)
 create mode 100644 Tests/RunCMake/CommandLine/P_working-dir.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 10:59:24 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 10:59:24 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-193-g2f9ff12
Message-ID: <20151008145924.B8B54BFCC2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2f9ff1252a2308e034b2ab6add40bd569256a4e1 (commit)
       via  1b700612691e300540dc2418e5a71329f2da40cf (commit)
      from  6d0145dbeace6b7be1073796cf95154764378114 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f9ff1252a2308e034b2ab6add40bd569256a4e1
commit 2f9ff1252a2308e034b2ab6add40bd569256a4e1
Merge: 6d0145d 1b70061
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 10:59:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:59:23 2015 -0400

    Merge topic 'ctest-submit-content-type' into next
    
    1b700612 CTest: Set Content-Type header for http file upload (#15774)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b700612691e300540dc2418e5a71329f2da40cf
commit 1b700612691e300540dc2418e5a71329f2da40cf
Author:     Derek Bruening <bruening at google.com>
AuthorDate: Wed Oct 7 17:51:26 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 10:57:29 2015 -0400

    CTest: Set Content-Type header for http file upload (#15774)
    
    Sets the Content-Type header for http file uploads to avoid running afoul
    of ModSecurity rules on the server.

diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index b4c0137..7401ff7 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -166,6 +166,9 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
                      curlWriteMemoryCallback);
   ::curl_easy_setopt(this->Curl, CURLOPT_DEBUGFUNCTION,
                      curlDebugCallback);
+  // Be sure to set Content-Type to satisfy fussy modsecurity rules
+  struct curl_slist *headers = ::curl_slist_append(NULL, "Content-Type: text/xml");
+  ::curl_easy_setopt(this->Curl, CURLOPT_HTTPHEADER, headers);
   std::vector<char> responseData;
   std::vector<char> debugData;
   ::curl_easy_setopt(this->Curl, CURLOPT_FILE, (void *)&responseData);
@@ -174,6 +177,8 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
   // Now run off and do what you've been told!
   ::curl_easy_perform(this->Curl);
   ::fclose(ftpfile);
+  ::curl_easy_setopt(this->Curl, CURLOPT_HTTPHEADER, NULL);
+  ::curl_slist_free_all(headers);
 
   if ( responseData.size() > 0 )
     {
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 1e12f15..cb00dce 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -338,6 +338,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
   CURLcode res;
   FILE* ftpfile;
   char error_buffer[1024];
+  struct curl_slist *headers = ::curl_slist_append(NULL, "Content-Type: text/xml");
 
   /* In windows, this will init the winsock stuff */
   ::curl_global_init(CURL_GLOBAL_ALL);
@@ -420,6 +421,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
       ::curl_easy_setopt(curl, CURLOPT_PUT, 1);
       ::curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
 
+      // Be sure to set Content-Type to satisfy fussy modsecurity rules
+      ::curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
+
       std::string local_file = *file;
       if ( !cmSystemTools::FileExists(local_file.c_str()) )
         {
@@ -477,6 +481,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
         cmCTestLog(this->CTest, ERROR_MESSAGE, "   Cannot find file: "
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
+        ::curl_slist_free_all(headers);
         ::curl_global_cleanup();
         return false;
         }
@@ -621,6 +626,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
                      << std::endl);
           }
         ::curl_easy_cleanup(curl);
+        ::curl_slist_free_all(headers);
         ::curl_global_cleanup();
         return false;
         }
@@ -630,6 +636,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
         "   Uploaded: " + local_file << std::endl, this->Quiet);
       }
     }
+  ::curl_slist_free_all(headers);
   ::curl_global_cleanup();
   return true;
 }

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestCurl.cxx          |    5 +++++
 Source/CTest/cmCTestSubmitHandler.cxx |    7 +++++++
 2 files changed, 12 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 11:51:51 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 11:51:51 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-202-gc97e586
Message-ID: <20151008155151.DE118BFA2D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c97e586c8c3d97a9d448c3bc46f4aad3a4257914 (commit)
       via  45e9f48f9ca51f2bd32a8dd09ce58cf2ec4197e5 (commit)
       via  c997595ea36b60803068fafdbe0f7041b3cc9da0 (commit)
       via  3cf71728a17899673f7a07dea9d0242e7d7bff1f (commit)
       via  fc7a191c53da12c4293e82f2dbfc07a08440369c (commit)
       via  c91b14ec861fc351070c9968acadd335a4772975 (commit)
       via  2b9a155dcdb733df5cc83851c4429915987974f3 (commit)
       via  fab711a87aee06306a681af6d843a14c62031553 (commit)
       via  24c97529ca98649576e2f98e56dc6830d8a5b3d8 (commit)
      from  2f9ff1252a2308e034b2ab6add40bd569256a4e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c97e586c8c3d97a9d448c3bc46f4aad3a4257914
commit c97e586c8c3d97a9d448c3bc46f4aad3a4257914
Merge: 2f9ff12 45e9f48
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 11:51:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 11:51:36 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 13:08:31 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 13:08:31 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-64-gdb266aa
Message-ID: <20151008170831.67788BFE56@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  db266aaade6ac6e7a37be11338b0f8336976ead2 (commit)
       via  28749903b67d71b35f6ff74dab7c6db1a648a1c8 (commit)
       via  6c02f62f75735f6e60549ef53b06bd87e843bc35 (commit)
       via  360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7 (commit)
       via  f716460ed82134bd1ca09f49bfa507cb2645d96c (commit)
      from  45e9f48f9ca51f2bd32a8dd09ce58cf2ec4197e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db266aaade6ac6e7a37be11338b0f8336976ead2
commit db266aaade6ac6e7a37be11338b0f8336976ead2
Merge: 45e9f48 2874990
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:08:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 13:08:30 2015 -0400

    Merge topic 'refactor-current-dir-initialization'
    
    28749903 cmState: Internalize the initialization of a snapshot from its parent.
    6c02f62f Remove now-unused directory setters.
    360e4e1d Set the current dirs on the snapshot before creating the cmMakefile.
    f716460e cmMakefile: Move invokation to initialize snapshot.


-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestScriptHandler.cxx     |    9 ++---
 Source/cmGlobalGenerator.cxx              |   12 +++---
 Source/cmGlobalUnixMakefileGenerator3.cxx |    7 ++--
 Source/cmMakefile.cxx                     |   59 ++++++++++++++---------------
 Source/cmMakefile.h                       |    2 -
 Source/cmQtAutoGenerators.cxx             |    5 ++-
 Source/cmState.cxx                        |    2 +
 Source/cmState.h                          |    5 ++-
 Source/cmake.cxx                          |   14 +++----
 Source/cmcmd.cxx                          |    6 ++-
 10 files changed, 59 insertions(+), 62 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 13:08:33 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 13:08:33 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-80-g750391a
Message-ID: <20151008170833.B2A69BFDA3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  750391afc19577be693dbe6dfe760903d2e70fc8 (commit)
       via  af71c7b47947860d06c659647c6ff33ab3676284 (commit)
       via  dce6581b7b58c346796c8d3045f4ce70d9672755 (commit)
       via  7b6dc0fe45c7064ad741461bfaf19028e8539c78 (commit)
       via  33f87bb1f503c09a6b8018edf97b615f0e7f713d (commit)
       via  da1b0449d96d4044bc4633a40ac87b6d4a19912d (commit)
       via  fe113f0fd40696e50ac9aac48297466e3b649ad5 (commit)
       via  776ff8eb0b8d790c63f8ad6bb6689620e6e04cb4 (commit)
       via  64f73150b8e5e5cad216444c0468e8e59434d973 (commit)
       via  c38e30f68c7beffdc65af0f3799ae82ce60aaf67 (commit)
       via  5d3776a7ebb718ae6ed4724e0a8961cda68b6316 (commit)
       via  7ce0991a7a29e244aee3f61e9e8b1879e59d156c (commit)
       via  156bd2c983b439478dff5fe84629b5a93e780a92 (commit)
       via  01e666c70e9c83ebd8c200d121b706868f69e617 (commit)
       via  bf28b7874b999224782fac72c5a74020bd6c47d3 (commit)
       via  9d653f9c1cc129be4fdce7f0e93c282760c7603e (commit)
      from  db266aaade6ac6e7a37be11338b0f8336976ead2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=750391afc19577be693dbe6dfe760903d2e70fc8
commit 750391afc19577be693dbe6dfe760903d2e70fc8
Merge: db266aa af71c7b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:08:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 13:08:32 2015 -0400

    Merge topic 'cmGeneratorTarget-sources'
    
    af71c7b4 cmTarget: Remove Compute method.
    dce6581b cmGeneratorTarget: Move computed sources from cmTarget.
    7b6dc0fe cmGeneratorTarget: Inline GetSourceFiles from cmTarget.
    33f87bb1 cmGeneratorTarget: Move AddInterfaceEntries method.
    da1b0449 cmTarget: Remove a conditional for generate-time source addition.
    fe113f0f cmTarget: Split storage of sources from genexes.
    776ff8eb cmTarget: Add Compute API for sources.
    64f73150 cmTarget: Add API for generate-time source addition.
    c38e30f6 cmGeneratorTarget: Add methods for generate-time source addition.
    5d3776a7 Access sources through cmGeneratorTarget.
    7ce0991a GHS: Port API to cmGeneratorTarget.
    156bd2c9 Xcode: Port away from unnecessary CMP0049 compatibility.
    01e666c7 cmTarget: Join strings conditionally.
    bf28b787 cmGeneratorTarget: Rename internal member.
    9d653f9c cmFLTKWrapUI: Remove CMake 2.2 compat code.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx     |    4 +-
 Source/cmExtraCodeLiteGenerator.cxx       |    4 +-
 Source/cmExtraEclipseCDT4Generator.cxx    |    4 +-
 Source/cmExtraSublimeTextGenerator.cxx    |    2 +-
 Source/cmFLTKWrapUICommand.cxx            |   39 ---
 Source/cmGeneratorTarget.cxx              |  333 ++++++++++++++++++++++---
 Source/cmGeneratorTarget.h                |   15 +-
 Source/cmGhsMultiTargetGenerator.cxx      |   14 +-
 Source/cmGhsMultiTargetGenerator.h        |    4 +-
 Source/cmGlobalGenerator.cxx              |    4 +-
 Source/cmGlobalGhsMultiGenerator.cxx      |    6 +-
 Source/cmGlobalKdevelopGenerator.cxx      |    4 +-
 Source/cmGlobalVisualStudio8Generator.cxx |    2 +-
 Source/cmGlobalXCodeGenerator.cxx         |   13 +-
 Source/cmLocalVisualStudio6Generator.cxx  |    6 +-
 Source/cmLocalVisualStudio7Generator.cxx  |    8 +-
 Source/cmMakefileTargetGenerator.cxx      |    2 +-
 Source/cmNinjaNormalTargetGenerator.cxx   |    2 +-
 Source/cmNinjaUtilityTargetGenerator.cxx  |    2 +-
 Source/cmQtAutoGeneratorInitializer.cxx   |    4 +-
 Source/cmTarget.cxx                       |  375 +++--------------------------
 Source/cmTarget.h                         |   13 +-
 22 files changed, 401 insertions(+), 459 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 13:09:06 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 13:09:06 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-205-gb222a4c
Message-ID: <20151008170906.0C0332520@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b222a4ca6f7d84378164e67ce9f81a5e0865eda1 (commit)
       via  750391afc19577be693dbe6dfe760903d2e70fc8 (commit)
       via  db266aaade6ac6e7a37be11338b0f8336976ead2 (commit)
      from  c97e586c8c3d97a9d448c3bc46f4aad3a4257914 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b222a4ca6f7d84378164e67ce9f81a5e0865eda1
commit b222a4ca6f7d84378164e67ce9f81a5e0865eda1
Merge: c97e586 750391a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:08:48 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 13:08:48 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From johnstonj.public at codenest.com  Thu Oct  8 13:17:29 2015
From: johnstonj.public at codenest.com (James Johnston)
Date: Thu,  8 Oct 2015 13:17:29 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-207-gecaf4ac
Message-ID: <20151008171729.29E42BF386@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ecaf4ac91fefb0c8a063ff8823137b5685b0a9b1 (commit)
       via  81e01f92df657516456d036fd0a99f69410fd07e (commit)
      from  b222a4ca6f7d84378164e67ce9f81a5e0865eda1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecaf4ac91fefb0c8a063ff8823137b5685b0a9b1
commit ecaf4ac91fefb0c8a063ff8823137b5685b0a9b1
Merge: b222a4c 81e01f9
Author:     James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Oct 8 13:17:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 13:17:28 2015 -0400

    Merge topic 'doc-clarify-shared-lib' into next
    
    81e01f92 Help:  Clarify that build system requires SHARED libraries to export symbols.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81e01f92df657516456d036fd0a99f69410fd07e
commit 81e01f92df657516456d036fd0a99f69410fd07e
Author:     James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Oct 8 17:14:12 2015 +0000
Commit:     James Johnston <johnstonj.public at codenest.com>
CommitDate: Thu Oct 8 17:14:12 2015 +0000

    Help:  Clarify that build system requires SHARED libraries to export symbols.
    
    CMake assumes that a SHARED library compiled on Windows will export a LIB file.
    This is not actually the case on Visual C++ if the library does not export any
    symbols, and causes incremental builds to break if the user specifies SHARED
    anyway.  (Users should use MODULE libraries instead.)

diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst
index fe7735c..7a67d61 100644
--- a/Help/command/add_library.rst
+++ b/Help/command/add_library.rst
@@ -36,6 +36,11 @@ property is set to ``ON`` automatically.
 A ``SHARED`` library may be marked with the :prop_tgt:`FRAMEWORK`
 target property to create an OS X Framework.
 
+If a library does not export any symbols, it must not be declared as a
+``SHARED`` library to avoid breaking incremental builds on some generators
+and compilers.  For example, a Win32 resource DLL or a managed C++/CLI DLL
+that exports no unmanaged symbols would need to be a ``MODULE`` library.
+
 By default the library file will be created in the build tree directory
 corresponding to the source tree directory in which the command was
 invoked.  See documentation of the :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 357aae9..154b05b 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -80,6 +80,10 @@ regardless of the library type.  The ``MODULE`` library type is
 dissimilar in that it is generally not linked to -- it is not used in
 the right-hand-side of the :command:`target_link_libraries` command.
 It is a type which is loaded as a plugin using runtime techniques.
+If the library does not export any unmanaged symbols (e.g. Win32
+resource DLL, C++/CLI DLL), it is required that the library not be a
+``SHARED`` library.  Some generators and compilers assume that
+``SHARED`` libraries export at least one symbol.
 
 .. code-block:: cmake
 
@@ -781,7 +785,8 @@ An *archive* output artifact of a buildsystem target may be:
 
 * On DLL platforms: the import library file (e.g. ``.lib``) of a shared
   library target created by the :command:`add_library` command
-  with the ``SHARED`` option.
+  with the ``SHARED`` option.  This file is only guaranteed to exist if
+  the library exports at least one unmanaged symbol.
 
 * On DLL platforms: the import library file (e.g. ``.lib``) of an
   executable target created by the :command:`add_executable` command

-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_library.rst        |    5 +++++
 Help/manual/cmake-buildsystem.7.rst |    7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 13:22:06 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 13:22:06 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-209-ga1fc051
Message-ID: <20151008172207.27A3EBF728@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a1fc051fa7eabeca93163887cbe0039dc2b78310 (commit)
       via  340d0897fa9dfc568782d72c221ea6186bf533a6 (commit)
      from  ecaf4ac91fefb0c8a063ff8823137b5685b0a9b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1fc051fa7eabeca93163887cbe0039dc2b78310
commit a1fc051fa7eabeca93163887cbe0039dc2b78310
Merge: ecaf4ac 340d089
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:22:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 13:22:06 2015 -0400

    Merge topic 'revert-compiler-features-solaris' into next
    
    340d0897 Revert topic 'compiler-features-solaris'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=340d0897fa9dfc568782d72c221ea6186bf533a6
commit 340d0897fa9dfc568782d72c221ea6186bf533a6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:16:18 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 13:18:39 2015 -0400

    Revert topic 'compiler-features-solaris'
    
    Revert commit v3.4.0-rc1~10^2~2 (Features: Disable support for Oracle
    SolarisStudio on non-Linux, 2015-09-29) and two follow-up commits.
    The support of compile features and language standards on Orcale
    SolarisStudio needs more investigation so for CMake 3.4 we should
    just act as 3.3 did.

diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst
index 2dc67bc..caf5bac 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -308,4 +308,4 @@ versions specified for each:
 * ``Clang``: Clang compiler versions 2.9 through 3.4.
 * ``GNU``: GNU compiler versions 4.4 through 5.0.
 * ``MSVC``: Microsoft Visual Studio versions 2010 through 2015.
-* ``SunPro``: Oracle SolarisStudio version 12.4 on a Linux host.
+* ``SunPro``: Oracle SolarisStudio version 12.4.
diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake
index 0e936ca..50d68ee 100644
--- a/Modules/Compiler/SunPro-CXX.cmake
+++ b/Modules/Compiler/SunPro-CXX.cmake
@@ -31,21 +31,17 @@ set(CMAKE_CXX_CREATE_STATIC_LIBRARY
   "<CMAKE_CXX_COMPILER> -xar -o <TARGET> <OBJECTS> "
   "<CMAKE_RANLIB> <TARGET> ")
 
-if (CMAKE_SYSTEM_NAME STREQUAL Linux)
-  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
-    set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++03")
-    set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=c++03")
-    set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
-    set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
-  endif()
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+  set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
+  set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
+endif()
 
-  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
-    if (NOT CMAKE_CXX_COMPILER_FORCED)
-      if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT)
-        message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version ${CMAKE_CXX_COMPILER_VERSION}")
-      endif()
-      set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT})
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+  if (NOT CMAKE_CXX_COMPILER_FORCED)
+    if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT)
+      message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version ${CMAKE_CXX_COMPILER_VERSION}")
     endif()
+    set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT})
   endif()
 endif()
 
@@ -55,12 +51,10 @@ macro(cmake_record_cxx_compile_features)
   endmacro()
 
   set(_result 0)
-  if (CMAKE_SYSTEM_NAME STREQUAL Linux)
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
-      _get_solaris_studio_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
-      if (_result EQUAL 0)
-        _get_solaris_studio_features("" CMAKE_CXX98_COMPILE_FEATURES)
-      endif()
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+    _get_solaris_studio_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
+    if (_result EQUAL 0)
+      _get_solaris_studio_features("" CMAKE_CXX98_COMPILE_FEATURES)
     endif()
   endif()
 endmacro()
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index ffee035..c538280 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -25,8 +25,7 @@ if (NOT CMAKE_CXX_COMPILE_FEATURES AND NOT CMAKE_C_COMPILE_FEATURES)
   )
   add_executable(WriteCompilerDetectionHeader "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
 
-  if((UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+  if(UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     include(CheckCXXSourceCompiles)
     check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h\"\nint main() { return 0; }\n"
       file_include_works

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-compile-features.7.rst           |    2 +-
 Modules/Compiler/SunPro-CXX.cmake                  |   32 ++++++++------------
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |    3 +-
 3 files changed, 15 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 13:35:57 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 13:35:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-214-g2aa7685
Message-ID: <20151008173557.554DABFD71@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2aa7685256dfa5063641eb125a56b557d9621369 (commit)
       via  0faccb839a75ab94f1ab39681a1ebe567647be6b (commit)
       via  265fb0cdc72fc46347ae0b8964078ca6d0a978e1 (commit)
       via  8083285d1bd5ecc31afa5fa689a9a4ca13ca8bb9 (commit)
       via  13c22d280e3b4d4f73e607617d18a3d55b509099 (commit)
      from  a1fc051fa7eabeca93163887cbe0039dc2b78310 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2aa7685256dfa5063641eb125a56b557d9621369
commit 2aa7685256dfa5063641eb125a56b557d9621369
Merge: a1fc051 0faccb8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:35:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 13:35:56 2015 -0400

    Merge topic 'update-kwsys' into next
    
    0faccb83 bootstrap: Drop unnecessary KWSys platform check
    265fb0cd cmFileTimeComparison: Update for lack of cmsys_STAT_HAS_ST_MTIM
    8083285d Merge branch 'upstream-kwsys' into update-kwsys
    13c22d28 KWSys 2015-10-06 (ed82989c)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0faccb839a75ab94f1ab39681a1ebe567647be6b
commit 0faccb839a75ab94f1ab39681a1ebe567647be6b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:27:07 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 13:27:07 2015 -0400

    bootstrap: Drop unnecessary KWSys platform check
    
    The KWSys Configure.hxx header no longer needs KWSYS_STAT_HAS_ST_MTIM.
    Our bootstrap-built CMake does not need to handle nanosecond precision
    file times anyway.

diff --git a/bootstrap b/bootstrap
index ca4fd5e..ca86528 100755
--- a/bootstrap
+++ b/bootstrap
@@ -493,7 +493,7 @@ cmake_kwsys_config_replace_string ()
                 s/@KWSYS_LFS_REQUESTED@/${KWSYS_LFS_REQUESTED}/g;
                 s/@KWSYS_NAME_IS_KWSYS@/${KWSYS_NAME_IS_KWSYS}/g;
                 s/@KWSYS_STL_HAS_WSTRING@/${KWSYS_STL_HAS_WSTRING}/g;
-                s/@KWSYS_STAT_HAS_ST_MTIM@/${KWSYS_STAT_HAS_ST_MTIM}/g;}" >> "${OUTFILE}${_tmp}"
+               }" >> "${OUTFILE}${_tmp}"
     if [ -f "${OUTFILE}${_tmp}" ]; then
       if "${_diff}" "${OUTFILE}" "${OUTFILE}${_tmp}" > /dev/null 2> /dev/null ; then
         #echo "Files are the same"
@@ -1173,7 +1173,6 @@ KWSYS_NAME_IS_KWSYS=0
 KWSYS_BUILD_SHARED=0
 KWSYS_LFS_AVAILABLE=0
 KWSYS_LFS_REQUESTED=0
-KWSYS_STAT_HAS_ST_MTIM=0
 KWSYS_STL_HAS_WSTRING=0
 KWSYS_CXX_HAS_SETENV=0
 KWSYS_CXX_HAS_UNSETENV=0
@@ -1217,15 +1216,6 @@ else
   echo "${cmake_cxx_compiler} does not have stl wstring"
 fi
 
-if cmake_try_run "${cmake_cxx_compiler}" \
-  "${cmake_cxx_flags} -DTEST_KWSYS_STAT_HAS_ST_MTIM" \
-  "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then
-  KWSYS_STAT_HAS_ST_MTIM=1
-  echo "${cmake_cxx_compiler} has struct stat with st_mtim member"
-else
-  echo "${cmake_cxx_compiler} does not have struct stat with st_mtim member"
-fi
-
 # Just to be safe, let us store compiler and flags to the header file
 
 cmake_bootstrap_version='$Revision$'

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=265fb0cdc72fc46347ae0b8964078ca6d0a978e1
commit 265fb0cdc72fc46347ae0b8964078ca6d0a978e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:26:44 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 13:26:44 2015 -0400

    cmFileTimeComparison: Update for lack of cmsys_STAT_HAS_ST_MTIM
    
    The KWSys Configure.hxx header no longer exposes this value.
    Take the value from the KWSys try compile result variable instead.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index ae5b03f..28a3fd1 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -548,6 +548,18 @@ foreach(v CURL_CA_BUNDLE CURL_CA_PATH)
   endif()
 endforeach()
 
+foreach(check
+    STAT_HAS_ST_MTIM
+    )
+  if(KWSYS_CXX_${check}_COMPILED) # abuse KWSys check cache entry
+    set(CMake_${check} 1)
+  else()
+    set(CMake_${check} 0)
+  endif()
+  set_property(SOURCE cmFileTimeComparison.cxx APPEND PROPERTY
+    COMPILE_DEFINITIONS CMake_${check}=${CMake_${check}})
+endforeach()
+
 # create a library used by the command line and the GUI
 add_library(CMakeLib ${SRCS})
 target_link_libraries(CMakeLib cmsys
diff --git a/Source/cmFileTimeComparison.cxx b/Source/cmFileTimeComparison.cxx
index 13e2a66..8d5e08d 100644
--- a/Source/cmFileTimeComparison.cxx
+++ b/Source/cmFileTimeComparison.cxx
@@ -148,7 +148,7 @@ int cmFileTimeComparisonInternal::Compare(cmFileTimeComparison_Type* s1,
                                           cmFileTimeComparison_Type* s2)
 {
 #if !defined(_WIN32) || defined(__CYGWIN__)
-# if cmsys_STAT_HAS_ST_MTIM
+# if CMake_STAT_HAS_ST_MTIM
   // Compare using nanosecond resolution.
   if(s1->st_mtim.tv_sec < s2->st_mtim.tv_sec)
     {
@@ -190,7 +190,7 @@ bool cmFileTimeComparisonInternal::TimesDiffer(cmFileTimeComparison_Type* s1,
                                                cmFileTimeComparison_Type* s2)
 {
 #if !defined(_WIN32) || defined(__CYGWIN__)
-# if cmsys_STAT_HAS_ST_MTIM
+# if CMake_STAT_HAS_ST_MTIM
   // Times are integers in units of 1ns.
   long long bil = 1000000000;
   long long t1 = s1->st_mtim.tv_sec * bil + s1->st_mtim.tv_nsec;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8083285d1bd5ecc31afa5fa689a9a4ca13ca8bb9
commit 8083285d1bd5ecc31afa5fa689a9a4ca13ca8bb9
Merge: 750391a 13c22d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:26:08 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 13:26:08 2015 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13c22d280e3b4d4f73e607617d18a3d55b509099
commit 13c22d280e3b4d4f73e607617d18a3d55b509099
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Tue Oct 6 10:29:47 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 13:26:04 2015 -0400

    KWSys 2015-10-06 (ed82989c)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ ed82989c | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' d79801bb..ed82989c
    Brad King (3):
          9baab632 SystemTools: Keep stat st_mtim field existence private
          39475e20 SystemTools: Refactor utimes invocation
          ed82989c SystemTools: Implement nanosecond file times on OS X

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84010d8..ce7f563 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -342,11 +342,6 @@ ENDIF()
 # capabilities and parent project's request.  Enforce 0/1 as only
 # possible values for configuration into Configure.hxx.
 
-IF(UNIX)
-  KWSYS_PLATFORM_CXX_TEST(KWSYS_STAT_HAS_ST_MTIM
-    "Checking whether struct stat has st_mtim member" DIRECT)
-ENDIF()
-
 # Check existence and uniqueness of long long and __int64.
 KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_LONG_LONG
   "Checking whether C++ compiler has 'long long'" DIRECT)
@@ -511,12 +506,18 @@ IF(KWSYS_USE_SystemTools)
     "Checking whether CXX compiler has utimes" DIRECT)
   KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_UTIMENSAT
     "Checking whether CXX compiler has utimensat" DIRECT)
+  KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_STAT_HAS_ST_MTIM
+    "Checking whether CXX compiler struct stat has st_mtim member" DIRECT)
+  KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_STAT_HAS_ST_MTIMESPEC
+    "Checking whether CXX compiler struct stat has st_mtimespec member" DIRECT)
   SET_PROPERTY(SOURCE SystemTools.cxx APPEND PROPERTY COMPILE_DEFINITIONS
     KWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV}
     KWSYS_CXX_HAS_UNSETENV=${KWSYS_CXX_HAS_UNSETENV}
     KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H=${KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H}
     KWSYS_CXX_HAS_UTIMES=${KWSYS_CXX_HAS_UTIMES}
     KWSYS_CXX_HAS_UTIMENSAT=${KWSYS_CXX_HAS_UTIMENSAT}
+    KWSYS_CXX_STAT_HAS_ST_MTIM=${KWSYS_CXX_STAT_HAS_ST_MTIM}
+    KWSYS_CXX_STAT_HAS_ST_MTIMESPEC=${KWSYS_CXX_STAT_HAS_ST_MTIMESPEC}
     )
 ENDIF()
 
diff --git a/Configure.hxx.in b/Configure.hxx.in
index 3faf862..ff8e49d 100644
--- a/Configure.hxx.in
+++ b/Configure.hxx.in
@@ -18,9 +18,6 @@
 /* Whether wstring is available.  */
 #define @KWSYS_NAMESPACE at _STL_HAS_WSTRING @KWSYS_STL_HAS_WSTRING@
 
-/* Whether struct stat has the st_mtim member for high resolution times.  */
-#define @KWSYS_NAMESPACE at _STAT_HAS_ST_MTIM @KWSYS_STAT_HAS_ST_MTIM@
-
 /* If building a C++ file in kwsys itself, give the source file
    access to the macros without a configured namespace.  */
 #if defined(KWSYS_NAMESPACE)
@@ -28,7 +25,6 @@
 #  define kwsys     @KWSYS_NAMESPACE@
 # endif
 # define KWSYS_NAME_IS_KWSYS            @KWSYS_NAMESPACE at _NAME_IS_KWSYS
-# define KWSYS_STAT_HAS_ST_MTIM         @KWSYS_NAMESPACE at _STAT_HAS_ST_MTIM
 # define KWSYS_STL_HAS_WSTRING          @KWSYS_NAMESPACE at _STL_HAS_WSTRING
 #endif
 
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 262af27..da34eb9 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -1366,15 +1366,18 @@ bool SystemTools::Touch(const std::string& filename, bool create)
   struct timeval mtime;
   gettimeofday(&mtime, 0);
 # if KWSYS_CXX_HAS_UTIMES
-  struct timeval times[2] =
-    {
-#  if KWSYS_STAT_HAS_ST_MTIM
-      {st.st_atim.tv_sec, st.st_atim.tv_nsec/1000}, /* tv_sec, tv_usec */
+  struct timeval atime;
+#  if KWSYS_CXX_STAT_HAS_ST_MTIM
+  atime.tv_sec = st.st_atim.tv_sec;
+  atime.tv_usec = st.st_atim.tv_nsec/1000;
+#  elif KWSYS_CXX_STAT_HAS_ST_MTIMESPEC
+  atime.tv_sec = st.st_atimespec.tv_sec;
+  atime.tv_usec = st.st_atimespec.tv_nsec/1000;
 #  else
-      {st.st_atime, 0},
+  atime.tv_sec = st.st_atime;
+  atime.tv_usec = 0;
 #  endif
-      mtime
-    };
+  struct timeval times[2] = { atime, mtime };
   if(utimes(filename.c_str(), times) < 0)
     {
     return false;
@@ -1408,7 +1411,7 @@ bool SystemTools::FileTimeCompare(const std::string& f1,
     {
     return false;
     }
-# if KWSYS_STAT_HAS_ST_MTIM
+# if KWSYS_CXX_STAT_HAS_ST_MTIM
   // Compare using nanosecond resolution.
   if(s1.st_mtim.tv_sec < s2.st_mtim.tv_sec)
     {
@@ -1426,6 +1429,24 @@ bool SystemTools::FileTimeCompare(const std::string& f1,
     {
     *result = 1;
     }
+# elif KWSYS_CXX_STAT_HAS_ST_MTIMESPEC
+  // Compare using nanosecond resolution.
+  if(s1.st_mtimespec.tv_sec < s2.st_mtimespec.tv_sec)
+    {
+    *result = -1;
+    }
+  else if(s1.st_mtimespec.tv_sec > s2.st_mtimespec.tv_sec)
+    {
+    *result = 1;
+    }
+  else if(s1.st_mtimespec.tv_nsec < s2.st_mtimespec.tv_nsec)
+    {
+    *result = -1;
+    }
+  else if(s1.st_mtimespec.tv_nsec > s2.st_mtimespec.tv_nsec)
+    {
+    *result = 1;
+    }
 # else
   // Compare using 1 second resolution.
   if(s1.st_mtime < s2.st_mtime)
diff --git a/kwsysPlatformTestsCXX.cxx b/kwsysPlatformTestsCXX.cxx
index 94579b3..9626937 100644
--- a/kwsysPlatformTestsCXX.cxx
+++ b/kwsysPlatformTestsCXX.cxx
@@ -32,7 +32,7 @@ int main()
 }
 #endif
 
-#ifdef TEST_KWSYS_STAT_HAS_ST_MTIM
+#ifdef TEST_KWSYS_CXX_STAT_HAS_ST_MTIM
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -45,6 +45,19 @@ int main()
 }
 #endif
 
+#ifdef TEST_KWSYS_CXX_STAT_HAS_ST_MTIMESPEC
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+int main()
+{
+  struct stat stat1;
+  (void)stat1.st_mtimespec.tv_sec;
+  (void)stat1.st_mtimespec.tv_nsec;
+  return 0;
+}
+#endif
+
 #ifdef TEST_KWSYS_CXX_SAME_LONG_AND___INT64
 void function(long**) {}
 int main()

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeLists.txt                  |   12 +++++++++++
 Source/cmFileTimeComparison.cxx        |    4 ++--
 Source/kwsys/CMakeLists.txt            |   11 +++++-----
 Source/kwsys/Configure.hxx.in          |    4 ----
 Source/kwsys/SystemTools.cxx           |   37 +++++++++++++++++++++++++-------
 Source/kwsys/kwsysPlatformTestsCXX.cxx |   15 ++++++++++++-
 bootstrap                              |   12 +----------
 7 files changed, 64 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 13:57:29 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 13:57:29 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-216-g0f9e43f
Message-ID: <20151008175729.A4CC9BFB9B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0f9e43f8a46d62ae64243e4db09c90bdfb661525 (commit)
       via  80004259f2b9be6ae4aa5deeecc70e86a4f0a846 (commit)
      from  2aa7685256dfa5063641eb125a56b557d9621369 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f9e43f8a46d62ae64243e4db09c90bdfb661525
commit 0f9e43f8a46d62ae64243e4db09c90bdfb661525
Merge: 2aa7685 8000425
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:57:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 13:57:29 2015 -0400

    Merge topic 'doc-clarify-shared-lib' into next
    
    80004259 Revise topic 'doc-clarify-shared-lib'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80004259f2b9be6ae4aa5deeecc70e86a4f0a846
commit 80004259f2b9be6ae4aa5deeecc70e86a4f0a846
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:56:48 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 13:56:48 2015 -0400

    Revise topic 'doc-clarify-shared-lib'

diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst
index 7a67d61..5033e18 100644
--- a/Help/command/add_library.rst
+++ b/Help/command/add_library.rst
@@ -37,9 +37,10 @@ A ``SHARED`` library may be marked with the :prop_tgt:`FRAMEWORK`
 target property to create an OS X Framework.
 
 If a library does not export any symbols, it must not be declared as a
-``SHARED`` library to avoid breaking incremental builds on some generators
-and compilers.  For example, a Win32 resource DLL or a managed C++/CLI DLL
-that exports no unmanaged symbols would need to be a ``MODULE`` library.
+``SHARED`` library.  For example, a Windows resource DLL or a managed C++/CLI
+DLL that exports no unmanaged symbols would need to be a ``MODULE`` library.
+This is because CMake expects a ``SHARED`` library to always have an
+associated import library on Windows.
 
 By default the library file will be created in the build tree directory
 corresponding to the source tree directory in which the command was
diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 154b05b..bc633e6 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -80,10 +80,10 @@ regardless of the library type.  The ``MODULE`` library type is
 dissimilar in that it is generally not linked to -- it is not used in
 the right-hand-side of the :command:`target_link_libraries` command.
 It is a type which is loaded as a plugin using runtime techniques.
-If the library does not export any unmanaged symbols (e.g. Win32
+If the library does not export any unmanaged symbols (e.g. Windows
 resource DLL, C++/CLI DLL), it is required that the library not be a
-``SHARED`` library.  Some generators and compilers assume that
-``SHARED`` libraries export at least one symbol.
+``SHARED`` library because CMake expects ``SHARED`` libraries to export
+at least one symbol.
 
 .. code-block:: cmake
 

-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_library.rst        |    7 ++++---
 Help/manual/cmake-buildsystem.7.rst |    6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 13:57:38 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 13:57:38 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-218-gbecbfbb
Message-ID: <20151008175738.85574BFB9B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  becbfbb1988e1cd8805cf063fda8e9eebc3c34ac (commit)
       via  6556481eb8495a3c4f6870efc1b41b461f477bae (commit)
      from  0f9e43f8a46d62ae64243e4db09c90bdfb661525 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=becbfbb1988e1cd8805cf063fda8e9eebc3c34ac
commit becbfbb1988e1cd8805cf063fda8e9eebc3c34ac
Merge: 0f9e43f 6556481
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:57:37 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 13:57:37 2015 -0400

    Merge topic 'doc-clarify-shared-lib' into next
    
    6556481e Help: Document that SHARED libraries must export a symbol (#15775)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6556481eb8495a3c4f6870efc1b41b461f477bae
commit 6556481eb8495a3c4f6870efc1b41b461f477bae
Author:     James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Oct 8 17:14:12 2015 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 13:53:51 2015 -0400

    Help: Document that SHARED libraries must export a symbol (#15775)
    
    CMake assumes that a SHARED library compiled on Windows will export a LIB file.
    This is not actually the case on Visual C++ if the library does not export any
    symbols, and causes incremental builds to break if the user specifies SHARED
    anyway.  (Users should use MODULE libraries instead.)

diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst
index fe7735c..5033e18 100644
--- a/Help/command/add_library.rst
+++ b/Help/command/add_library.rst
@@ -36,6 +36,12 @@ property is set to ``ON`` automatically.
 A ``SHARED`` library may be marked with the :prop_tgt:`FRAMEWORK`
 target property to create an OS X Framework.
 
+If a library does not export any symbols, it must not be declared as a
+``SHARED`` library.  For example, a Windows resource DLL or a managed C++/CLI
+DLL that exports no unmanaged symbols would need to be a ``MODULE`` library.
+This is because CMake expects a ``SHARED`` library to always have an
+associated import library on Windows.
+
 By default the library file will be created in the build tree directory
 corresponding to the source tree directory in which the command was
 invoked.  See documentation of the :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 357aae9..bc633e6 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -80,6 +80,10 @@ regardless of the library type.  The ``MODULE`` library type is
 dissimilar in that it is generally not linked to -- it is not used in
 the right-hand-side of the :command:`target_link_libraries` command.
 It is a type which is loaded as a plugin using runtime techniques.
+If the library does not export any unmanaged symbols (e.g. Windows
+resource DLL, C++/CLI DLL), it is required that the library not be a
+``SHARED`` library because CMake expects ``SHARED`` libraries to export
+at least one symbol.
 
 .. code-block:: cmake
 
@@ -781,7 +785,8 @@ An *archive* output artifact of a buildsystem target may be:
 
 * On DLL platforms: the import library file (e.g. ``.lib``) of a shared
   library target created by the :command:`add_library` command
-  with the ``SHARED`` option.
+  with the ``SHARED`` option.  This file is only guaranteed to exist if
+  the library exports at least one unmanaged symbol.
 
 * On DLL platforms: the import library file (e.g. ``.lib``) of an
   executable target created by the :command:`add_executable` command

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 14:00:53 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 14:00:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-220-gb184adf
Message-ID: <20151008180053.07852BFC5E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b184adfa4101a0f4636bbfbf82e6c0c147d791e5 (commit)
       via  8d27b407787549a90d47d273a753bb0000e5e73e (commit)
      from  becbfbb1988e1cd8805cf063fda8e9eebc3c34ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b184adfa4101a0f4636bbfbf82e6c0c147d791e5
commit b184adfa4101a0f4636bbfbf82e6c0c147d791e5
Merge: becbfbb 8d27b40
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 14:00:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 14:00:52 2015 -0400

    Merge topic 'osx-file-times-ns-precision' into next
    
    8d27b407 cmFileTimeComparison: Port to OS X nanosecond times (#15769)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d27b407787549a90d47d273a753bb0000e5e73e
commit 8d27b407787549a90d47d273a753bb0000e5e73e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 13:37:37 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 13:37:37 2015 -0400

    cmFileTimeComparison: Port to OS X nanosecond times (#15769)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 28a3fd1..ee690e6 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -550,6 +550,7 @@ endforeach()
 
 foreach(check
     STAT_HAS_ST_MTIM
+    STAT_HAS_ST_MTIMESPEC
     )
   if(KWSYS_CXX_${check}_COMPILED) # abuse KWSys check cache entry
     set(CMake_${check} 1)
diff --git a/Source/cmFileTimeComparison.cxx b/Source/cmFileTimeComparison.cxx
index 8d5e08d..279b61d 100644
--- a/Source/cmFileTimeComparison.cxx
+++ b/Source/cmFileTimeComparison.cxx
@@ -166,6 +166,24 @@ int cmFileTimeComparisonInternal::Compare(cmFileTimeComparison_Type* s1,
     {
     return 1;
     }
+# elif CMake_STAT_HAS_ST_MTIMESPEC
+  // Compare using nanosecond resolution.
+  if(s1->st_mtimespec.tv_sec < s2->st_mtimespec.tv_sec)
+    {
+    return -1;
+    }
+  else if(s1->st_mtimespec.tv_sec > s2->st_mtimespec.tv_sec)
+    {
+    return 1;
+    }
+  else if(s1->st_mtimespec.tv_nsec < s2->st_mtimespec.tv_nsec)
+    {
+    return -1;
+    }
+  else if(s1->st_mtimespec.tv_nsec > s2->st_mtimespec.tv_nsec)
+    {
+    return 1;
+    }
 # else
   // Compare using 1 second resolution.
   if(s1->st_mtime < s2->st_mtime)
@@ -207,6 +225,23 @@ bool cmFileTimeComparisonInternal::TimesDiffer(cmFileTimeComparison_Type* s1,
     {
     return false;
     }
+# elif CMake_STAT_HAS_ST_MTIMESPEC
+  // Times are integers in units of 1ns.
+  long long bil = 1000000000;
+  long long t1 = s1->st_mtimespec.tv_sec * bil + s1->st_mtimespec.tv_nsec;
+  long long t2 = s2->st_mtimespec.tv_sec * bil + s2->st_mtimespec.tv_nsec;
+  if(t1 < t2)
+    {
+    return (t2 - t1) >= bil;
+    }
+  else if(t2 < t1)
+    {
+    return (t1 - t2) >= bil;
+    }
+  else
+    {
+    return false;
+    }
 # else
   // Times are integers in units of 1s.
   if(s1->st_mtime < s2->st_mtime)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeLists.txt           |    1 +
 Source/cmFileTimeComparison.cxx |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 14:10:58 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 14:10:58 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-83-g29a2d9f
Message-ID: <20151008181058.7F85BBCEB0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  29a2d9fe69a8561ff72f800b5f96bc896cd9d449 (commit)
       via  1bf66fed674bc1b7c463bd230f7c66df8aa86e79 (commit)
       via  6b575dec8d393c4a38c587ee97afa068eeb4b432 (commit)
      from  750391afc19577be693dbe6dfe760903d2e70fc8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29a2d9fe69a8561ff72f800b5f96bc896cd9d449
commit 29a2d9fe69a8561ff72f800b5f96bc896cd9d449
Merge: 750391a 1bf66fe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 14:10:57 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 14:10:57 2015 -0400

    Merge topic 'FindOpenSSL-mingw'
    
    1bf66fed FindOpenSSL: Search for unix-named libraries first on MinGW (#15765)
    6b575dec FindOpenSSL: Tolerate tabs in header while parsing version (#15765)


-----------------------------------------------------------------------

Summary of changes:
 Modules/FindOpenSSL.cmake |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 14:11:33 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 14:11:33 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-222-g90bde57
Message-ID: <20151008181133.E7081BD214@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  90bde57cdb2e8fbb7690af011b888c8ac12ef74e (commit)
       via  29a2d9fe69a8561ff72f800b5f96bc896cd9d449 (commit)
      from  b184adfa4101a0f4636bbfbf82e6c0c147d791e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90bde57cdb2e8fbb7690af011b888c8ac12ef74e
commit 90bde57cdb2e8fbb7690af011b888c8ac12ef74e
Merge: b184adf 29a2d9f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 14:11:20 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 14:11:20 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 14:23:11 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 14:23:11 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-224-g7336ce6
Message-ID: <20151008182311.EA1BDBF76E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7336ce66bf26816ca7469120bb958cdb5e01f50f (commit)
       via  a935745d0730cf1cd6c1a880d71e36a39ad86f8c (commit)
      from  90bde57cdb2e8fbb7690af011b888c8ac12ef74e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7336ce66bf26816ca7469120bb958cdb5e01f50f
commit 7336ce66bf26816ca7469120bb958cdb5e01f50f
Merge: 90bde57 a935745
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 14:23:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 14:23:11 2015 -0400

    Merge topic 'emacs-mode-fix-accidental-indentation' into next
    
    a935745d cmake-mode.el: treat keywords as symbols


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a935745d0730cf1cd6c1a880d71e36a39ad86f8c
commit a935745d0730cf1cd6c1a880d71e36a39ad86f8c
Author:     Kevin Burge <kevin.burge at systemware.com>
AuthorDate: Thu Oct 8 12:49:00 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 14:21:20 2015 -0400

    cmake-mode.el: treat keywords as symbols
    
    Symbols such as "CHECK_FUNCTION_EXISTS" should not trigger an open block
    (due to containing the "word" FUNCTION).  Fix this regression caused by
    commit v3.4.0-rc1~292^2~3 (cmake-mode.el: Use `rx' for regexps,
    2015-07-23).

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 11e33b3..e50ae7b 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -70,11 +70,11 @@ set the path with these commands:
 (defconst cmake-regex-indented
   (rx-to-string `(and bol (* (group (or (regexp ,cmake-regex-token) (any space ?\n)))))))
 (defconst cmake-regex-block-open
-  (rx-to-string `(and bow (or ,@(append cmake-keywords-block-open
-                                        (mapcar 'downcase cmake-keywords-block-open))) eow)))
+  (rx-to-string `(and symbol-start (or ,@(append cmake-keywords-block-open
+                                        (mapcar 'downcase cmake-keywords-block-open))) symbol-end)))
 (defconst cmake-regex-block-close
-  (rx-to-string `(and bow (or ,@(append cmake-keywords-block-close
-                                        (mapcar 'downcase cmake-keywords-block-close))) eow)))
+  (rx-to-string `(and symbol-start (or ,@(append cmake-keywords-block-close
+                                        (mapcar 'downcase cmake-keywords-block-close))) symbol-end)))
 (defconst cmake-regex-close
   (rx-to-string `(and bol (* space) (regexp ,cmake-regex-block-close)
                       (* space) (regexp ,cmake-regex-paren-left))))

-----------------------------------------------------------------------

Summary of changes:
 Auxiliary/cmake-mode.el |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 14:43:15 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 14:43:15 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-226-g6143d7b
Message-ID: <20151008184315.2F210BEA04@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6143d7b19761653a13e96b03705392eeb2a78dd5 (commit)
       via  fb9ec2430be48aeb56984625a4e106b82a160653 (commit)
      from  7336ce66bf26816ca7469120bb958cdb5e01f50f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6143d7b19761653a13e96b03705392eeb2a78dd5
commit 6143d7b19761653a13e96b03705392eeb2a78dd5
Merge: 7336ce6 fb9ec24
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 14:43:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 14:43:14 2015 -0400

    Merge topic 'cpack-wix-typos' into next
    
    fb9ec243 CPackWIX: fix typos in documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb9ec2430be48aeb56984625a4e106b82a160653
commit fb9ec2430be48aeb56984625a4e106b82a160653
Author:     Kevin Wojniak <kainjow at kainjow.com>
AuthorDate: Thu Oct 8 11:39:07 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 14:42:52 2015 -0400

    CPackWIX: fix typos in documentation

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 5fe51a6..bef8e16 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -16,7 +16,7 @@
 #
 #  Will be automatically generated unless explicitly provided.
 #
-#  It should be explicitly set to a constant generated gloabally unique
+#  It should be explicitly set to a constant generated globally unique
 #  identifier (GUID) to allow your installers to replace existing
 #  installations that use the same GUID.
 #
@@ -226,7 +226,7 @@
 #  This variable can be used to provide a value for
 #  the Windows Installer property ``<PROPERTY>``
 #
-#  The follwing list contains some example properties that can be used to
+#  The following list contains some example properties that can be used to
 #  customize information under
 #  "Programs and Features" (also known as "Add or Remove Programs")
 #

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackWIX.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct  8 15:05:15 2015
From: brad.king at kitware.com (Brad King)
Date: Thu,  8 Oct 2015 15:05:15 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-228-gfe32129
Message-ID: <20151008190515.6AFBFBFCF2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fe32129dabe409b66d09e03c489d18b7a35b383a (commit)
       via  47f4b3b662da7f49fd0353b978eaf781608e9282 (commit)
      from  6143d7b19761653a13e96b03705392eeb2a78dd5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe32129dabe409b66d09e03c489d18b7a35b383a
commit fe32129dabe409b66d09e03c489d18b7a35b383a
Merge: 6143d7b 47f4b3b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 15:05:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 15:05:14 2015 -0400

    Merge topic 'emacs-mode-unscreamify-more' into next
    
    47f4b3b6 cmake-mode.el: unscreamify symbols instead of words


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47f4b3b662da7f49fd0353b978eaf781608e9282
commit 47f4b3b662da7f49fd0353b978eaf781608e9282
Author:     Kevin Burge <kevin.burge at systemware.com>
AuthorDate: Thu Oct 8 13:27:54 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 15:03:11 2015 -0400

    cmake-mode.el: unscreamify symbols instead of words
    
    cmake-unscreamify-buffer should unscream more than just
    words. For example:
    
    CHECK_FUNCTION_EXISTS (...)

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index e50ae7b..08ac490 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -177,7 +177,7 @@ the indentation.  Otherwise it retains the same position on the line"
   (interactive)
   (save-excursion
     (goto-char (point-min))
-    (while (re-search-forward "^\\([ \t]*\\)\\(\\w+\\)\\([ \t]*(\\)" nil t)
+    (while (re-search-forward "^\\([ \t]*\\)\\_<\\(\\(?:\\w\\|\\s_\\)+\\)\\_>\\([ \t]*(\\)" nil t)
       (replace-match
        (concat
         (match-string 1)

-----------------------------------------------------------------------

Summary of changes:
 Auxiliary/cmake-mode.el |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct  8 17:53:23 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  8 Oct 2015 17:53:23 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-244-gec658cb
Message-ID: <20151008215323.19B1EBF96A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ec658cbeb4356219dfbcf1b34b8488eb2fe187cb (commit)
       via  d5e347476ec94b035a98d0948bc46ffa7f30cc86 (commit)
       via  6def43706f9adb61ed0397e685e2585008d7ba32 (commit)
       via  2d6a2675bdc7c6c4ba12efc75ff23afcf6b5f25d (commit)
       via  d3d8f3d2afdc15fbcf1c8e9f6b794467e08a24fb (commit)
       via  5ebbd4fe9156d58a5863172fe80c7fe80d1b7219 (commit)
       via  06f076e26eeba6fa589285da1fa1b004aca2ac72 (commit)
       via  e4d314808ea90e7bb5facdc40fcbd579e197b41f (commit)
       via  bb03982fc6abea876fbfb6078608e85571c5f8a5 (commit)
       via  ddfc20d3a967f98c47d2bd169b881d0b88f966d7 (commit)
       via  0dbd2ccd93a9f3817ccc9c1bee843915c8cc079c (commit)
       via  e0261a1e20f14cc2ca593bb978479b52954397d8 (commit)
       via  df42dbb3558a6ba604ab584b21dfe7f8722eb025 (commit)
       via  a8429a402da4aeb717f4af234c8d14d1c4e10ed7 (commit)
       via  370bb92c10cd8fec7770267c93515623e4168012 (commit)
       via  27916f2cd10904deda1a44bf221fbdef7ba1af66 (commit)
      from  fe32129dabe409b66d09e03c489d18b7a35b383a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec658cbeb4356219dfbcf1b34b8488eb2fe187cb
commit ec658cbeb4356219dfbcf1b34b8488eb2fe187cb
Merge: fe32129 d5e347476
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 17:53:21 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 17:53:21 2015 -0400

    Merge topic 'use-generator-target' into next
    
    d5e34747 cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.
    6def4370 cmGeneratorTarget: Move GetOutputTargetType from cmTarget.
    2d6a2675 cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
    d3d8f3d2 cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.
    5ebbd4fe cmGeneratorTarget: Move ComputePDBOutputDir from cmTarget.
    06f076e2 cmGeneratorTarget: Move IsNullImpliedByLinkLibraries from cmTarget.
    e4d31480 cmGeneratorTarget: Move output info from cmTarget.
    bb03982f cmGeneratorTarget: Move UsesDefaultOutputDir from cmTarget.
    ddfc20d3 cmGeneratorTarget: Move GetPDBDirectory from cmTarget.
    0dbd2ccd cmGeneratorTarget: Move GetDirectory from cmTarget.
    e0261a1e cmTarget: Make OutputInfo definition public.
    df42dbb3 cmGeneratorTarget: Move link implementation from cmTarget.
    a8429a40 cmTarget: Split storage of link implementation from backtraces.
    370bb92c cmGeneratorTarget: Issue messages through the local generator.
    27916f2c cmLocalGenerator: Add cmake instance accessor.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5e347476ec94b035a98d0948bc46ffa7f30cc86
commit d5e347476ec94b035a98d0948bc46ffa7f30cc86
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:19:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:53:01 2015 +0200

    cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index b8e2284..9371546 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1101,9 +1101,10 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
     this->SharedLibrariesLinked.insert(target);
     }
 
+  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Handle case of an imported shared library with no soname.
   if(this->NoSONameUsesPath &&
-     target->IsImportedSharedLibWithoutSOName(this->Config))
+     gtgt->IsImportedSharedLibWithoutSOName(this->Config))
     {
     this->AddSharedLibNoSOName(item);
     return;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a588bb6..c4a083d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1338,6 +1338,19 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
   return false;
 }
 
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName(
+                                          const std::string& config) const
+{
+  if(this->IsImported() && this->GetType() == cmTarget::SHARED_LIBRARY)
+    {
+    if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
+      {
+      return info->NoSOName;
+      }
+    }
+  return false;
+}
 
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 0e41661..49de632 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -415,6 +415,10 @@ public:
   /** Whether this library defaults to \@rpath.  */
   bool MacOSXRpathInstallNameDirDefault() const;
 
+  /** Test for special case of a third-party shared library that has
+      no soname at all.  */
+  bool IsImportedSharedLibWithoutSOName(const std::string& config) const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 88bda67..3de7efe 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2178,20 +2178,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsImportedSharedLibWithoutSOName(
-                                          const std::string& config) const
-{
-  if(this->IsImported() && this->GetType() == cmTarget::SHARED_LIBRARY)
-    {
-    if(cmTarget::ImportInfo const* info = this->GetImportInfo(config))
-      {
-      return info->NoSOName;
-      }
-    }
-  return false;
-}
-
-//----------------------------------------------------------------------------
 std::string
 cmTarget::GetFullNameImported(const std::string& config, bool implib) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 6ba9772..16d0121 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -244,10 +244,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Test for special case of a third-party shared library that has
-      no soname at all.  */
-  bool IsImportedSharedLibWithoutSOName(const std::string& config) const;
-
   /** Does this target have a GNU implib to convert to MS format?  */
   bool HasImplibGNUtoMS() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6def43706f9adb61ed0397e685e2585008d7ba32
commit 6def43706f9adb61ed0397e685e2585008d7ba32
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:11:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:53:01 2015 +0200

    cmGeneratorTarget: Move GetOutputTargetType from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 841f818..a588bb6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -340,6 +340,62 @@ const char *cmGeneratorTarget::GetProperty(const std::string& prop) const
 }
 
 //----------------------------------------------------------------------------
+const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
+{
+  switch(this->GetType())
+    {
+    case cmTarget::SHARED_LIBRARY:
+      if(this->Target->IsDLLPlatform())
+        {
+        if(implib)
+          {
+          // A DLL import library is treated as an archive target.
+          return "ARCHIVE";
+          }
+        else
+          {
+          // A DLL shared library is treated as a runtime target.
+          return "RUNTIME";
+          }
+        }
+      else
+        {
+        // For non-DLL platforms shared libraries are treated as
+        // library targets.
+        return "LIBRARY";
+        }
+    case cmTarget::STATIC_LIBRARY:
+      // Static libraries are always treated as archive targets.
+      return "ARCHIVE";
+    case cmTarget::MODULE_LIBRARY:
+      if(implib)
+        {
+        // Module libraries are always treated as library targets.
+        return "ARCHIVE";
+        }
+      else
+        {
+        // Module import libraries are treated as archive targets.
+        return "LIBRARY";
+        }
+    case cmTarget::EXECUTABLE:
+      if(implib)
+        {
+        // Executable import libraries are treated as archive targets.
+        return "ARCHIVE";
+        }
+      else
+        {
+        // Executables are always treated as runtime targets.
+        return "RUNTIME";
+        }
+    default:
+      break;
+    }
+  return "";
+}
+
+//----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetOutputName(const std::string& config,
                                              bool implib) const
 {
@@ -355,7 +411,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 
     // Compute output name.
     std::vector<std::string> props;
-    std::string type = this->Target->GetOutputTargetType(implib);
+    std::string type = this->GetOutputTargetType(implib);
     std::string configUpper = cmSystemTools::UpperCase(config);
     if(!type.empty() && !configUpper.empty())
       {
@@ -4661,7 +4717,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
 
   // Look for a target property defining the target output directory
   // based on the target type.
-  std::string targetTypeName = this->Target->GetOutputTargetType(implib);
+  std::string targetTypeName = this->GetOutputTargetType(implib);
   const char* propertyName = 0;
   std::string propertyNameStr = targetTypeName;
   if(!propertyNameStr.empty())
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index fd4ee56..0e41661 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -439,6 +439,9 @@ private:
   typedef std::map<std::string, LinkClosure> LinkClosureMapType;
   mutable LinkClosureMapType LinkClosureMap;
 
+  // Returns ARCHIVE, LIBRARY, or RUNTIME based on platform and type.
+  const char* GetOutputTargetType(bool implib) const;
+
   struct CompatibleInterfacesBase
   {
     std::set<std::string> PropsBool;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0b2d9fc..88bda67 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2272,62 +2272,6 @@ void cmTarget::SetPropertyDefault(const std::string& property,
 }
 
 //----------------------------------------------------------------------------
-const char* cmTarget::GetOutputTargetType(bool implib) const
-{
-  switch(this->GetType())
-    {
-    case cmTarget::SHARED_LIBRARY:
-      if(this->DLLPlatform)
-        {
-        if(implib)
-          {
-          // A DLL import library is treated as an archive target.
-          return "ARCHIVE";
-          }
-        else
-          {
-          // A DLL shared library is treated as a runtime target.
-          return "RUNTIME";
-          }
-        }
-      else
-        {
-        // For non-DLL platforms shared libraries are treated as
-        // library targets.
-        return "LIBRARY";
-        }
-    case cmTarget::STATIC_LIBRARY:
-      // Static libraries are always treated as archive targets.
-      return "ARCHIVE";
-    case cmTarget::MODULE_LIBRARY:
-      if(implib)
-        {
-        // Module libraries are always treated as library targets.
-        return "ARCHIVE";
-        }
-      else
-        {
-        // Module import libraries are treated as archive targets.
-        return "LIBRARY";
-        }
-    case cmTarget::EXECUTABLE:
-      if(implib)
-        {
-        // Executable import libraries are treated as archive targets.
-        return "ARCHIVE";
-        }
-      else
-        {
-        // Executables are always treated as runtime targets.
-        return "RUNTIME";
-        }
-    default:
-      break;
-    }
-  return "";
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetFrameworkVersion() const
 {
   assert(this->GetType() != INTERFACE_LIBRARY);
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3cbee76..6ba9772 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -415,9 +415,6 @@ private:
   void SetPropertyDefault(const std::string& property,
                           const char* default_value);
 
-  // Returns ARCHIVE, LIBRARY, or RUNTIME based on platform and type.
-  const char* GetOutputTargetType(bool implib) const;
-
   std::string GetFullNameImported(const std::string& config,
                                   bool implib) const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d6a2675bdc7c6c4ba12efc75ff23afcf6b5f25d
commit 2d6a2675bdc7c6c4ba12efc75ff23afcf6b5f25d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:07:03 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:53:01 2015 +0200

    cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d907dd0..b8e2284 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1783,12 +1783,13 @@ void
 cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
                                                 cmTarget const* target)
 {
+  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Ignore targets on Apple where install_name is not @rpath.
   // The dependenty library can be found with other means such as
   // @loader_path or full paths.
   if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
     {
-    if(!target->HasMacOSXRpathInstallNameDir(this->Config))
+    if(!gtgt->HasMacOSXRpathInstallNameDir(this->Config))
       {
       return;
       }
@@ -1810,7 +1811,6 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
 
   // Try to get the soname of the library.  Only files with this name
   // could possibly conflict.
-  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   std::string soName = gtgt->GetSOName(this->Config);
   const char* soname = soName.empty()? 0 : soName.c_str();
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6ad6c69..841f818 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1284,6 +1284,119 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
 
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
+    const std::string& config) const
+{
+  bool install_name_is_rpath = false;
+  bool macosx_rpath = false;
+
+  if(!this->IsImported())
+    {
+    if(this->GetType() != cmTarget::SHARED_LIBRARY)
+      {
+      return false;
+      }
+    const char* install_name = this->GetProperty("INSTALL_NAME_DIR");
+    bool use_install_name =
+      this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH");
+    if(install_name && use_install_name &&
+       std::string(install_name) == "@rpath")
+      {
+      install_name_is_rpath = true;
+      }
+    else if(install_name && use_install_name)
+      {
+      return false;
+      }
+    if(!install_name_is_rpath)
+      {
+      macosx_rpath = this->MacOSXRpathInstallNameDirDefault();
+      }
+    }
+  else
+    {
+    // Lookup the imported soname.
+    if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
+      {
+      if(!info->NoSOName && !info->SOName.empty())
+        {
+        if(info->SOName.find("@rpath/") == 0)
+          {
+          install_name_is_rpath = true;
+          }
+        }
+      else
+        {
+        std::string install_name;
+        cmSystemTools::GuessLibraryInstallName(info->Location, install_name);
+        if(install_name.find("@rpath") != std::string::npos)
+          {
+          install_name_is_rpath = true;
+          }
+        }
+      }
+    }
+
+  if(!install_name_is_rpath && !macosx_rpath)
+    {
+    return false;
+    }
+
+  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
+    {
+    std::ostringstream w;
+    w << "Attempting to use";
+    if(macosx_rpath)
+      {
+      w << " MACOSX_RPATH";
+      }
+    else
+      {
+      w << " @rpath";
+      }
+    w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.";
+    w << "  This could be because you are using a Mac OS X version";
+    w << " less than 10.5 or because CMake's platform configuration is";
+    w << " corrupt.";
+    cmake* cm = this->Makefile->GetCMakeInstance();
+    cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->Target->GetBacktrace());
+    }
+
+  return true;
+}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const
+{
+  // we can't do rpaths when unsupported
+  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
+    {
+    return false;
+    }
+
+  const char* macosx_rpath_str = this->GetProperty("MACOSX_RPATH");
+  if(macosx_rpath_str)
+    {
+    return this->GetPropertyAsBool("MACOSX_RPATH");
+    }
+
+  cmPolicies::PolicyStatus cmp0042 = this->Target->GetPolicyStatusCMP0042();
+
+  if(cmp0042 == cmPolicies::WARN)
+    {
+    this->Makefile->GetGlobalGenerator()->
+      AddCMP0042WarnTarget(this->GetName());
+    }
+
+  if(cmp0042 == cmPolicies::NEW)
+    {
+    return true;
+    }
+
+  return false;
+}
+
+//----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetSOName(const std::string& config) const
 {
   if(this->Target->IsImported())
@@ -1428,7 +1541,7 @@ cmGeneratorTarget::GetInstallNameDirForBuildTree(
      !this->GetPropertyAsBool("SKIP_BUILD_RPATH"))
     {
     std::string dir;
-    if(this->Target->MacOSXRpathInstallNameDirDefault())
+    if(this->MacOSXRpathInstallNameDirDefault())
       {
       dir = "@rpath";
       }
@@ -1464,7 +1577,7 @@ std::string cmGeneratorTarget::GetInstallNameDirForInstallTree() const
       }
     if(!install_name_dir)
       {
-      if(this->Target->MacOSXRpathInstallNameDirDefault())
+      if(this->MacOSXRpathInstallNameDirDefault())
         {
         dir = "@rpath/";
         }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f068cae..fd4ee56 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -409,6 +409,12 @@ public:
 
   bool HaveInstallTreeRPATH() const;
 
+  /** Whether this library has \@rpath and platform supports it.  */
+  bool HasMacOSXRpathInstallNameDir(const std::string& config) const;
+
+  /** Whether this library defaults to \@rpath.  */
+  bool MacOSXRpathInstallNameDirDefault() const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index dd1d405..0b2d9fc 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2178,118 +2178,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HasMacOSXRpathInstallNameDir(const std::string& config) const
-{
-  bool install_name_is_rpath = false;
-  bool macosx_rpath = false;
-
-  if(!this->IsImportedTarget)
-    {
-    if(this->GetType() != cmTarget::SHARED_LIBRARY)
-      {
-      return false;
-      }
-    const char* install_name = this->GetProperty("INSTALL_NAME_DIR");
-    bool use_install_name =
-      this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH");
-    if(install_name && use_install_name &&
-       std::string(install_name) == "@rpath")
-      {
-      install_name_is_rpath = true;
-      }
-    else if(install_name && use_install_name)
-      {
-      return false;
-      }
-    if(!install_name_is_rpath)
-      {
-      macosx_rpath = this->MacOSXRpathInstallNameDirDefault();
-      }
-    }
-  else
-    {
-    // Lookup the imported soname.
-    if(cmTarget::ImportInfo const* info = this->GetImportInfo(config))
-      {
-      if(!info->NoSOName && !info->SOName.empty())
-        {
-        if(info->SOName.find("@rpath/") == 0)
-          {
-          install_name_is_rpath = true;
-          }
-        }
-      else
-        {
-        std::string install_name;
-        cmSystemTools::GuessLibraryInstallName(info->Location, install_name);
-        if(install_name.find("@rpath") != std::string::npos)
-          {
-          install_name_is_rpath = true;
-          }
-        }
-      }
-    }
-
-  if(!install_name_is_rpath && !macosx_rpath)
-    {
-    return false;
-    }
-
-  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
-    {
-    std::ostringstream w;
-    w << "Attempting to use";
-    if(macosx_rpath)
-      {
-      w << " MACOSX_RPATH";
-      }
-    else
-      {
-      w << " @rpath";
-      }
-    w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.";
-    w << "  This could be because you are using a Mac OS X version";
-    w << " less than 10.5 or because CMake's platform configuration is";
-    w << " corrupt.";
-    cmake* cm = this->Makefile->GetCMakeInstance();
-    cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->GetBacktrace());
-    }
-
-  return true;
-}
-
-//----------------------------------------------------------------------------
-bool cmTarget::MacOSXRpathInstallNameDirDefault() const
-{
-  // we can't do rpaths when unsupported
-  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
-    {
-    return false;
-    }
-
-  const char* macosx_rpath_str = this->GetProperty("MACOSX_RPATH");
-  if(macosx_rpath_str)
-    {
-    return this->GetPropertyAsBool("MACOSX_RPATH");
-    }
-
-  cmPolicies::PolicyStatus cmp0042 = this->GetPolicyStatusCMP0042();
-
-  if(cmp0042 == cmPolicies::WARN)
-    {
-    this->Makefile->GetGlobalGenerator()->
-      AddCMP0042WarnTarget(this->GetName());
-    }
-
-  if(cmp0042 == cmPolicies::NEW)
-    {
-    return true;
-    }
-
-  return false;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::IsImportedSharedLibWithoutSOName(
                                           const std::string& config) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 4b369d3..3cbee76 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -244,12 +244,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Whether this library has \@rpath and platform supports it.  */
-  bool HasMacOSXRpathInstallNameDir(const std::string& config) const;
-
-  /** Whether this library defaults to \@rpath.  */
-  bool MacOSXRpathInstallNameDirDefault() const;
-
   /** Test for special case of a third-party shared library that has
       no soname at all.  */
   bool IsImportedSharedLibWithoutSOName(const std::string& config) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3d8f3d2afdc15fbcf1c8e9f6b794467e08a24fb
commit d3d8f3d2afdc15fbcf1c8e9f6b794467e08a24fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:02:45 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:53:01 2015 +0200

    cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d35b566..d907dd0 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1920,7 +1920,7 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
     (for_install ||
      this->Target->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
   bool use_install_rpath =
-    (outputRuntime && this->Target->Target->HaveInstallTreeRPATH() &&
+    (outputRuntime && this->Target->HaveInstallTreeRPATH() &&
      linking_for_install);
   bool use_build_rpath =
     (outputRuntime && this->Target->HaveBuildTreeRPATH(this->Config) &&
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3a67d2c..6ad6c69 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1212,7 +1212,7 @@ cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const
   // will likely change between the build tree and install tree and
   // this target must be relinked.
   return this->HaveBuildTreeRPATH(config)
-      || this->Target->HaveInstallTreeRPATH();
+      || this->HaveInstallTreeRPATH();
 }
 
 //----------------------------------------------------------------------------
@@ -4695,6 +4695,14 @@ bool cmGeneratorTarget::ComputePDBOutputDir(const std::string& kind,
 }
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::HaveInstallTreeRPATH() const
+{
+  const char* install_rpath = this->GetProperty("INSTALL_RPATH");
+  return (install_rpath && *install_rpath) &&
+          !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH");
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   const std::string& config,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 4ca0447..f068cae 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -407,6 +407,8 @@ public:
 
   class TargetPropertyEntry;
 
+  bool HaveInstallTreeRPATH() const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 40f93a3..dd1d405 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2384,14 +2384,6 @@ void cmTarget::SetPropertyDefault(const std::string& property,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HaveInstallTreeRPATH() const
-{
-  const char* install_rpath = this->GetProperty("INSTALL_RPATH");
-  return (install_rpath && *install_rpath) &&
-          !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH");
-}
-
-//----------------------------------------------------------------------------
 const char* cmTarget::GetOutputTargetType(bool implib) const
 {
   switch(this->GetType())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index d37f934..4b369d3 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -262,8 +262,6 @@ public:
   bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
                         const char* newExt = 0) const;
 
-  bool HaveInstallTreeRPATH() const;
-
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ebbd4fe9156d58a5863172fe80c7fe80d1b7219
commit 5ebbd4fe9156d58a5863172fe80c7fe80d1b7219
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:01:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:53:01 2015 +0200

    cmGeneratorTarget: Move ComputePDBOutputDir from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3651da6..3a67d2c 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1780,8 +1780,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
   if(i == this->CompileInfoMap.end())
     {
     CompileInfo info;
-    this->Target
-        ->ComputePDBOutputDir("COMPILE_PDB", config, info.CompilePdbDir);
+    this->ComputePDBOutputDir("COMPILE_PDB", config, info.CompilePdbDir);
     CompileInfoMapType::value_type entry(config_upper, info);
     i = this->CompileInfoMap.insert(entry).first;
     }
@@ -4519,7 +4518,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     // Compute output directories.
     this->ComputeOutputDir(config, false, info.OutDir);
     this->ComputeOutputDir(config, true, info.ImpDir);
-    if(!this->Target->ComputePDBOutputDir("PDB", config, info.PdbDir))
+    if(!this->ComputePDBOutputDir("PDB", config, info.PdbDir))
       {
       info.PdbDir = info.OutDir;
       }
@@ -4635,6 +4634,67 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::ComputePDBOutputDir(const std::string& kind,
+                                   const std::string& config,
+                                   std::string& out) const
+{
+  // Look for a target property defining the target output directory
+  // based on the target type.
+  const char* propertyName = 0;
+  std::string propertyNameStr = kind;
+  if(!propertyNameStr.empty())
+    {
+    propertyNameStr += "_OUTPUT_DIRECTORY";
+    propertyName = propertyNameStr.c_str();
+    }
+  std::string conf = config;
+
+  // Check for a per-configuration output directory target property.
+  std::string configUpper = cmSystemTools::UpperCase(conf);
+  const char* configProp = 0;
+  std::string configPropStr = kind;
+  if(!configPropStr.empty())
+    {
+    configPropStr += "_OUTPUT_DIRECTORY_";
+    configPropStr += configUpper;
+    configProp = configPropStr.c_str();
+    }
+
+  // Select an output directory.
+  if(const char* config_outdir = this->GetProperty(configProp))
+    {
+    // Use the user-specified per-configuration output directory.
+    out = config_outdir;
+
+    // Skip per-configuration subdirectory.
+    conf = "";
+    }
+  else if(const char* outdir = this->GetProperty(propertyName))
+    {
+    // Use the user-specified output directory.
+    out = outdir;
+    }
+  if(out.empty())
+    {
+    return false;
+    }
+
+  // Convert the output path to a full path in case it is
+  // specified as a relative path.  Treat a relative path as
+  // relative to the current output directory for this makefile.
+  out = (cmSystemTools::CollapseFullPath
+         (out, this->Makefile->GetCurrentBinaryDirectory()));
+
+  // The generator may add the configuration's subdirectory.
+  if(!conf.empty())
+    {
+    this->LocalGenerator->GetGlobalGenerator()->
+      AppendDirectoryForConfig("/", conf, "", out);
+    }
+  return true;
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   const std::string& config,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f0f6d41..4ca0447 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -528,6 +528,9 @@ private:
   mutable bool DebugSourcesDone;
   mutable bool LinkImplementationLanguageIsContextDependent;
 
+  bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
+                           std::string& out) const;
+
 public:
   std::vector<cmTarget const*> const&
     GetLinkImplementationClosure(const std::string& config) const;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index af7fe2e..40f93a3 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2448,67 +2448,6 @@ const char* cmTarget::GetOutputTargetType(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::ComputePDBOutputDir(const std::string& kind,
-                                   const std::string& config,
-                                   std::string& out) const
-{
-  // Look for a target property defining the target output directory
-  // based on the target type.
-  const char* propertyName = 0;
-  std::string propertyNameStr = kind;
-  if(!propertyNameStr.empty())
-    {
-    propertyNameStr += "_OUTPUT_DIRECTORY";
-    propertyName = propertyNameStr.c_str();
-    }
-  std::string conf = config;
-
-  // Check for a per-configuration output directory target property.
-  std::string configUpper = cmSystemTools::UpperCase(conf);
-  const char* configProp = 0;
-  std::string configPropStr = kind;
-  if(!configPropStr.empty())
-    {
-    configPropStr += "_OUTPUT_DIRECTORY_";
-    configPropStr += configUpper;
-    configProp = configPropStr.c_str();
-    }
-
-  // Select an output directory.
-  if(const char* config_outdir = this->GetProperty(configProp))
-    {
-    // Use the user-specified per-configuration output directory.
-    out = config_outdir;
-
-    // Skip per-configuration subdirectory.
-    conf = "";
-    }
-  else if(const char* outdir = this->GetProperty(propertyName))
-    {
-    // Use the user-specified output directory.
-    out = outdir;
-    }
-  if(out.empty())
-    {
-    return false;
-    }
-
-  // Convert the output path to a full path in case it is
-  // specified as a relative path.  Treat a relative path as
-  // relative to the current output directory for this makefile.
-  out = (cmSystemTools::CollapseFullPath
-         (out, this->Makefile->GetCurrentBinaryDirectory()));
-
-  // The generator may add the configuration's subdirectory.
-  if(!conf.empty())
-    {
-    this->Makefile->GetGlobalGenerator()->
-      AppendDirectoryForConfig("/", conf, "", out);
-    }
-  return true;
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetFrameworkVersion() const
 {
   assert(this->GetType() != INTERFACE_LIBRARY);
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index a3a8063..d37f934 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -467,9 +467,6 @@ private:
   bool LinkLibrariesForVS6Analyzed;
 #endif
 
-  bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
-                           std::string& out) const;
-
   // Cache import information from properties for each configuration.
   struct ImportInfo
   {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06f076e26eeba6fa589285da1fa1b004aca2ac72
commit 06f076e26eeba6fa589285da1fa1b004aca2ac72
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:41:53 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:53:01 2015 +0200

    cmGeneratorTarget: Move IsNullImpliedByLinkLibraries from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2f2fb3b..3651da6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3928,7 +3928,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                   .find(p)
                                   != tgt->Target->GetProperties().end();
   const bool impliedByUse =
-          tgt->Target->IsNullImpliedByLinkLibraries(p);
+          tgt->IsNullImpliedByLinkLibraries(p);
   assert((impliedByUse ^ explicitlySet)
       || (!impliedByUse && !explicitlySet));
 
@@ -5046,6 +5046,14 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
 }
 
 //----------------------------------------------------------------------------
+bool
+cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
+{
+  return this->LinkImplicitNullProperties.find(p)
+      != this->LinkImplicitNullProperties.end();
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::ComputeLinkImplementationLibraries(
   const std::string& config,
   cmOptionalLinkImplementation& impl,
@@ -5130,7 +5138,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
       {
       if (!this->GetProperty(*it))
         {
-        this->Target->LinkImplicitNullProperties.insert(*it);
+        this->LinkImplicitNullProperties.insert(*it);
         }
       }
     cge->GetMaxLanguageStandard(this->Target,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 77d3b99..f0f6d41 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -317,6 +317,8 @@ public:
   typedef std::map<std::string, CompileInfo> CompileInfoMapType;
   mutable CompileInfoMapType CompileInfoMap;
 
+  bool IsNullImpliedByLinkLibraries(const std::string &p) const;
+
   /** Get the name of the compiler pdb file for the target.  */
   std::string GetCompilePDBName(const std::string& config="") const;
 
@@ -486,6 +488,7 @@ private:
   std::vector<TargetPropertyEntry*> CompileFeaturesEntries;
   std::vector<TargetPropertyEntry*> CompileDefinitionsEntries;
   std::vector<TargetPropertyEntry*> SourceEntries;
+  mutable std::set<std::string> LinkImplicitNullProperties;
 
   void ExpandLinkItems(std::string const& prop, std::string const& value,
                        std::string const& config, cmTarget const* headTarget,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c20ce83..af7fe2e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2554,13 +2554,6 @@ const char* cmTarget::GetExportMacro() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
-{
-  return this->LinkImplicitNullProperties.find(p)
-      != this->LinkImplicitNullProperties.end();
-}
-
-//----------------------------------------------------------------------------
 void
 cmTarget::GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index dda5384..a3a8063 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -326,8 +326,6 @@ public:
 
   void AppendBuildInterfaceIncludes();
 
-  bool IsNullImpliedByLinkLibraries(const std::string &p) const;
-
   std::string GetDebugGeneratorExpressions(const std::string &value,
                                   cmTarget::LinkLibraryType llt) const;
 
@@ -439,7 +437,6 @@ private:
   std::set<std::string> SystemIncludeDirectories;
   std::set<std::string> LinkDirectoriesEmmitted;
   std::set<std::string> Utilities;
-  mutable std::set<std::string> LinkImplicitNullProperties;
   std::map<std::string, cmListFileBacktrace> UtilityBacktraces;
   cmPolicies::PolicyMap PolicyMap;
   std::string Name;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4d314808ea90e7bb5facdc40fcbd579e197b41f
commit e4d314808ea90e7bb5facdc40fcbd579e197b41f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:55:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:53:00 2015 +0200

    cmGeneratorTarget: Move output info from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9f46909..2f2fb3b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4464,8 +4464,7 @@ std::string cmGeneratorTarget::GetDirectory(const std::string& config,
       cmSystemTools::GetFilenamePath(
       this->Target->ImportedGetFullPath(config, implib));
     }
-  else if(cmTarget::OutputInfo const* info =
-      this->Target->GetOutputInfo(config))
+  else if(OutputInfo const* info = this->GetOutputInfo(config))
     {
     // Return the directory in which the target will be built.
     return implib? info->ImpDir : info->OutDir;
@@ -4478,7 +4477,161 @@ bool cmGeneratorTarget::UsesDefaultOutputDir(const std::string& config,
                                     bool implib) const
 {
   std::string dir;
-  return this->Target->ComputeOutputDir(config, implib, dir);
+  return this->ComputeOutputDir(config, implib, dir);
+}
+
+//----------------------------------------------------------------------------
+cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
+    const std::string& config) const
+{
+  // There is no output information for imported targets.
+  if(this->IsImported())
+    {
+    return 0;
+    }
+
+  // Only libraries and executables have well-defined output files.
+  if(!this->Target->HaveWellDefinedOutputFiles())
+    {
+    std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
+    msg += this->GetName();
+    msg += " which has type ";
+    msg += cmTarget::GetTargetTypeName(cmTarget::TargetType(this->GetType()));
+    this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
+    return 0;
+    }
+
+  // Lookup/compute/cache the output information for this configuration.
+  std::string config_upper;
+  if(!config.empty())
+    {
+    config_upper = cmSystemTools::UpperCase(config);
+    }
+  OutputInfoMapType::iterator i =
+    this->OutputInfoMap.find(config_upper);
+  if(i == this->OutputInfoMap.end())
+    {
+    // Add empty info in map to detect potential recursion.
+    OutputInfo info;
+    OutputInfoMapType::value_type entry(config_upper, info);
+    i = this->OutputInfoMap.insert(entry).first;
+
+    // Compute output directories.
+    this->ComputeOutputDir(config, false, info.OutDir);
+    this->ComputeOutputDir(config, true, info.ImpDir);
+    if(!this->Target->ComputePDBOutputDir("PDB", config, info.PdbDir))
+      {
+      info.PdbDir = info.OutDir;
+      }
+
+    // Now update the previously-prepared map entry.
+    i->second = info;
+    }
+  else if(i->second.empty())
+    {
+    // An empty map entry indicates we have been called recursively
+    // from the above block.
+    this->LocalGenerator->GetCMakeInstance()->IssueMessage(
+      cmake::FATAL_ERROR,
+      "Target '" + this->GetName() + "' OUTPUT_DIRECTORY depends on itself.",
+      this->Target->GetBacktrace());
+    return 0;
+    }
+  return &i->second;
+}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
+                                bool implib, std::string& out) const
+{
+  bool usesDefaultOutputDir = false;
+  std::string conf = config;
+
+  // Look for a target property defining the target output directory
+  // based on the target type.
+  std::string targetTypeName = this->Target->GetOutputTargetType(implib);
+  const char* propertyName = 0;
+  std::string propertyNameStr = targetTypeName;
+  if(!propertyNameStr.empty())
+    {
+    propertyNameStr += "_OUTPUT_DIRECTORY";
+    propertyName = propertyNameStr.c_str();
+    }
+
+  // Check for a per-configuration output directory target property.
+  std::string configUpper = cmSystemTools::UpperCase(conf);
+  const char* configProp = 0;
+  std::string configPropStr = targetTypeName;
+  if(!configPropStr.empty())
+    {
+    configPropStr += "_OUTPUT_DIRECTORY_";
+    configPropStr += configUpper;
+    configProp = configPropStr.c_str();
+    }
+
+  // Select an output directory.
+  if(const char* config_outdir = this->GetProperty(configProp))
+    {
+    // Use the user-specified per-configuration output directory.
+    cmGeneratorExpression ge;
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
+      ge.Parse(config_outdir);
+    out = cge->Evaluate(this->Makefile, config);
+
+    // Skip per-configuration subdirectory.
+    conf = "";
+    }
+  else if(const char* outdir = this->Target->GetProperty(propertyName))
+    {
+    // Use the user-specified output directory.
+    cmGeneratorExpression ge;
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
+      ge.Parse(outdir);
+    out = cge->Evaluate(this->Makefile, config);
+
+    // Skip per-configuration subdirectory if the value contained a
+    // generator expression.
+    if (out != outdir)
+      {
+      conf = "";
+      }
+    }
+  else if(this->GetType() == cmTarget::EXECUTABLE)
+    {
+    // Lookup the output path for executables.
+    out = this->Makefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
+    }
+  else if(this->GetType() == cmTarget::STATIC_LIBRARY ||
+          this->GetType() == cmTarget::SHARED_LIBRARY ||
+          this->GetType() == cmTarget::MODULE_LIBRARY)
+    {
+    // Lookup the output path for libraries.
+    out = this->Makefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
+    }
+  if(out.empty())
+    {
+    // Default to the current output directory.
+    usesDefaultOutputDir = true;
+    out = ".";
+    }
+
+  // Convert the output path to a full path in case it is
+  // specified as a relative path.  Treat a relative path as
+  // relative to the current output directory for this makefile.
+  out = (cmSystemTools::CollapseFullPath
+         (out, this->Makefile->GetCurrentBinaryDirectory()));
+
+  // The generator may add the configuration's subdirectory.
+  if(!conf.empty())
+    {
+    bool iosPlatform = this->Makefile->PlatformIsAppleIos();
+    std::string suffix =
+      usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+    this->LocalGenerator->GetGlobalGenerator()->
+      AppendDirectoryForConfig("/", conf, suffix, out);
+    }
+
+  return usesDefaultOutputDir;
 }
 
 //----------------------------------------------------------------------------
@@ -5008,7 +5161,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
 std::string
 cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 {
-  if(cmTarget::OutputInfo const* info = this->Target->GetOutputInfo(config))
+  if(OutputInfo const* info = this->GetOutputInfo(config))
     {
     // Return the directory in which the target will be built.
     return info->PdbDir;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index a1ad477..77d3b99 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -289,6 +289,18 @@ public:
       directory.  */
   bool UsesDefaultOutputDir(const std::string& config, bool implib) const;
 
+  // Cache target output paths for each configuration.
+  struct OutputInfo
+  {
+    std::string OutDir;
+    std::string ImpDir;
+    std::string PdbDir;
+    bool empty() const
+      { return OutDir.empty() && ImpDir.empty() && PdbDir.empty(); }
+  };
+
+  OutputInfo const* GetOutputInfo(const std::string& config) const;
+
   /** Get the name of the pdb file for the target.  */
   std::string GetPDBName(const std::string& config="") const;
 
@@ -495,6 +507,12 @@ private:
   cmLinkImplementationLibraries const*
     GetLinkImplementationLibrariesInternal(const std::string& config,
                                            cmTarget const* head) const;
+  bool
+  ComputeOutputDir(const std::string& config,
+                   bool implib, std::string& out) const;
+
+  typedef std::map<std::string, OutputInfo> OutputInfoMapType;
+  mutable OutputInfoMapType OutputInfoMap;
 
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index bf8b8a9..c20ce83 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -79,9 +79,6 @@ public:
   // The backtrace when the target was created.
   cmListFileBacktrace Backtrace;
 
-  typedef std::map<std::string, cmTarget::OutputInfo> OutputInfoMapType;
-  OutputInfoMapType OutputInfoMap;
-
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
@@ -1710,67 +1707,6 @@ bool cmTarget::HaveWellDefinedOutputFiles() const
 }
 
 //----------------------------------------------------------------------------
-cmTarget::OutputInfo const* cmTarget::GetOutputInfo(
-    const std::string& config) const
-{
-  // There is no output information for imported targets.
-  if(this->IsImported())
-    {
-    return 0;
-    }
-
-  // Only libraries and executables have well-defined output files.
-  if(!this->HaveWellDefinedOutputFiles())
-    {
-    std::string msg = "cmTarget::GetOutputInfo called for ";
-    msg += this->GetName();
-    msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(this->GetType());
-    this->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR, msg);
-    return 0;
-    }
-
-  // Lookup/compute/cache the output information for this configuration.
-  std::string config_upper;
-  if(!config.empty())
-    {
-    config_upper = cmSystemTools::UpperCase(config);
-    }
-  typedef cmTargetInternals::OutputInfoMapType OutputInfoMapType;
-  OutputInfoMapType::iterator i =
-    this->Internal->OutputInfoMap.find(config_upper);
-  if(i == this->Internal->OutputInfoMap.end())
-    {
-    // Add empty info in map to detect potential recursion.
-    OutputInfo info;
-    OutputInfoMapType::value_type entry(config_upper, info);
-    i = this->Internal->OutputInfoMap.insert(entry).first;
-
-    // Compute output directories.
-    this->ComputeOutputDir(config, false, info.OutDir);
-    this->ComputeOutputDir(config, true, info.ImpDir);
-    if(!this->ComputePDBOutputDir("PDB", config, info.PdbDir))
-      {
-      info.PdbDir = info.OutDir;
-      }
-
-    // Now update the previously-prepared map entry.
-    i->second = info;
-    }
-  else if(i->second.empty())
-    {
-    // An empty map entry indicates we have been called recursively
-    // from the above block.
-    this->Makefile->GetCMakeInstance()->IssueMessage(
-      cmake::FATAL_ERROR,
-      "Target '" + this->GetName() + "' OUTPUT_DIRECTORY depends on itself.",
-      this->GetBacktrace());
-    return 0;
-    }
-  return &i->second;
-}
-
-//----------------------------------------------------------------------------
 const char* cmTarget::ImportedGetLocation(const std::string& config) const
 {
   static std::string location;
@@ -2512,100 +2448,6 @@ const char* cmTarget::GetOutputTargetType(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::ComputeOutputDir(const std::string& config,
-                                bool implib, std::string& out) const
-{
-  bool usesDefaultOutputDir = false;
-  std::string conf = config;
-
-  // Look for a target property defining the target output directory
-  // based on the target type.
-  std::string targetTypeName = this->GetOutputTargetType(implib);
-  const char* propertyName = 0;
-  std::string propertyNameStr = targetTypeName;
-  if(!propertyNameStr.empty())
-    {
-    propertyNameStr += "_OUTPUT_DIRECTORY";
-    propertyName = propertyNameStr.c_str();
-    }
-
-  // Check for a per-configuration output directory target property.
-  std::string configUpper = cmSystemTools::UpperCase(conf);
-  const char* configProp = 0;
-  std::string configPropStr = targetTypeName;
-  if(!configPropStr.empty())
-    {
-    configPropStr += "_OUTPUT_DIRECTORY_";
-    configPropStr += configUpper;
-    configProp = configPropStr.c_str();
-    }
-
-  // Select an output directory.
-  if(const char* config_outdir = this->GetProperty(configProp))
-    {
-    // Use the user-specified per-configuration output directory.
-    cmGeneratorExpression ge;
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
-      ge.Parse(config_outdir);
-    out = cge->Evaluate(this->Makefile, config);
-
-    // Skip per-configuration subdirectory.
-    conf = "";
-    }
-  else if(const char* outdir = this->GetProperty(propertyName))
-    {
-    // Use the user-specified output directory.
-    cmGeneratorExpression ge;
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
-      ge.Parse(outdir);
-    out = cge->Evaluate(this->Makefile, config);
-
-    // Skip per-configuration subdirectory if the value contained a
-    // generator expression.
-    if (out != outdir)
-      {
-      conf = "";
-      }
-    }
-  else if(this->GetType() == cmTarget::EXECUTABLE)
-    {
-    // Lookup the output path for executables.
-    out = this->Makefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
-    }
-  else if(this->GetType() == cmTarget::STATIC_LIBRARY ||
-          this->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GetType() == cmTarget::MODULE_LIBRARY)
-    {
-    // Lookup the output path for libraries.
-    out = this->Makefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
-    }
-  if(out.empty())
-    {
-    // Default to the current output directory.
-    usesDefaultOutputDir = true;
-    out = ".";
-    }
-
-  // Convert the output path to a full path in case it is
-  // specified as a relative path.  Treat a relative path as
-  // relative to the current output directory for this makefile.
-  out = (cmSystemTools::CollapseFullPath
-         (out, this->Makefile->GetCurrentBinaryDirectory()));
-
-  // The generator may add the configuration's subdirectory.
-  if(!conf.empty())
-    {
-    bool iosPlatform = this->Makefile->PlatformIsAppleIos();
-    std::string suffix =
-      usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
-    this->Makefile->GetGlobalGenerator()->
-      AppendDirectoryForConfig("/", conf, suffix, out);
-    }
-
-  return usesDefaultOutputDir;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::ComputePDBOutputDir(const std::string& kind,
                                    const std::string& config,
                                    std::string& out) const
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3130660..dda5384 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -470,20 +470,6 @@ private:
   bool LinkLibrariesForVS6Analyzed;
 #endif
 
-  // Cache target output paths for each configuration.
-  struct OutputInfo
-  {
-    std::string OutDir;
-    std::string ImpDir;
-    std::string PdbDir;
-    bool empty() const
-     { return OutDir.empty() && ImpDir.empty() && PdbDir.empty(); }
-  };
-
-  OutputInfo const* GetOutputInfo(const std::string& config) const;
-  bool
-  ComputeOutputDir(const std::string& config,
-                   bool implib, std::string& out) const;
   bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
                            std::string& out) const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb03982fc6abea876fbfb6078608e85571c5f8a5
commit bb03982fc6abea876fbfb6078608e85571c5f8a5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:47:35 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:53:00 2015 +0200

    cmGeneratorTarget: Move UsesDefaultOutputDir from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a2423cc..9f46909 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4474,6 +4474,14 @@ std::string cmGeneratorTarget::GetDirectory(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::UsesDefaultOutputDir(const std::string& config,
+                                    bool implib) const
+{
+  std::string dir;
+  return this->Target->ComputeOutputDir(config, implib, dir);
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   const std::string& config,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index b39ba9f..a1ad477 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -285,6 +285,10 @@ public:
   std::vector<cmSourceFile*> const*
   GetSourceDepends(cmSourceFile const* sf) const;
 
+  /** Return whether this target uses the default value for its output
+      directory.  */
+  bool UsesDefaultOutputDir(const std::string& config, bool implib) const;
+
   /** Get the name of the pdb file for the target.  */
   std::string GetPDBName(const std::string& config="") const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 3d52e3a..9f71cc5 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1975,7 +1975,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     if(this->XcodeVersion >= 21)
       {
-      if(!target.UsesDefaultOutputDir(configName, false))
+      if(!gtgt->UsesDefaultOutputDir(configName, false))
         {
         std::string pncdir = target.GetDirectory(configName);
         buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0fc0423..bf8b8a9 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2667,14 +2667,6 @@ bool cmTarget::ComputePDBOutputDir(const std::string& kind,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::UsesDefaultOutputDir(const std::string& config,
-                                    bool implib) const
-{
-  std::string dir;
-  return this->ComputeOutputDir(config, implib, dir);
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetFrameworkVersion() const
 {
   assert(this->GetType() != INTERFACE_LIBRARY);
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2f9a94b..3130660 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -312,10 +312,6 @@ public:
   /** Get a build-tree directory in which to place target support files.  */
   std::string GetSupportDirectory() const;
 
-  /** Return whether this target uses the default value for its output
-      directory.  */
-  bool UsesDefaultOutputDir(const std::string& config, bool implib) const;
-
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddfc20d3a967f98c47d2bd169b881d0b88f966d7
commit ddfc20d3a967f98c47d2bd169b881d0b88f966d7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:39:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:53:00 2015 +0200

    cmGeneratorTarget: Move GetPDBDirectory from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 961705f..fdacc82 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1631,7 +1631,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
       return std::string();
       }
 
-    std::string result = target->Target->GetPDBDirectory(context->Config);
+    std::string result = target->GetPDBDirectory(context->Config);
     result += "/";
     result += target->GetPDBName(context->Config);
     return result;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b8a87a2..a2423cc 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1130,7 +1130,7 @@ cmGeneratorTarget::GetCompilePDBPath(const std::string& config) const
   std::string name = this->GetCompilePDBName(config);
   if(dir.empty() && !name.empty())
     {
-    dir = this->Target->GetPDBDirectory(config);
+    dir = this->GetPDBDirectory(config);
     }
   if(!dir.empty())
     {
@@ -4995,3 +4995,15 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
       }
     }
 }
+
+//----------------------------------------------------------------------------
+std::string
+cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
+{
+  if(cmTarget::OutputInfo const* info = this->Target->GetOutputInfo(config))
+    {
+    // Return the directory in which the target will be built.
+    return info->PdbDir;
+    }
+  return "";
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 43b7922..b39ba9f 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -359,6 +359,12 @@ public:
   /** Return true if builtin chrpath will work for this target */
   bool IsChrpathUsed(const std::string& config) const;
 
+  /** Get the directory in which this targets .pdb files will be placed.
+      If the configuration name is given then the generator will add its
+      subdirectory for that configuration.  Otherwise just the canonical
+      pdb output directory is given.  */
+  std::string GetPDBDirectory(const std::string& config) const;
+
   ///! Return the preferred linker language for this target
   std::string GetLinkerLanguage(const std::string& config = "") const;
 
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index eebee83..f6b907e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -133,7 +133,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     this->GeneratorTarget->GetCompilePDBDirectory(this->ConfigName);
   cmSystemTools::MakeDirectory(compilePdbOutputPath.c_str());
 
-  std::string pdbOutputPath = this->Target->GetPDBDirectory(this->ConfigName);
+  std::string pdbOutputPath =
+      this->GeneratorTarget->GetPDBDirectory(this->ConfigName);
   cmSystemTools::MakeDirectory(pdbOutputPath.c_str());
   pdbOutputPath += "/";
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index d12142a..3b3f63e 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -314,7 +314,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     this->GeneratorTarget->GetCompilePDBDirectory(this->ConfigName);
   cmSystemTools::MakeDirectory(compilePdbOutputPath.c_str());
 
-  std::string pdbOutputPath = this->Target->GetPDBDirectory(this->ConfigName);
+  std::string pdbOutputPath =
+      this->GeneratorTarget->GetPDBDirectory(this->ConfigName);
   cmSystemTools::MakeDirectory(pdbOutputPath.c_str());
   pdbOutputPath += "/";
 
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index cd499f6..6eafeae 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -546,7 +546,8 @@ cmMakefileTargetGenerator
     {
     targetFullPathReal =
       this->GeneratorTarget->GetFullPath(this->ConfigName, false, true);
-    targetFullPathPDB = this->Target->GetPDBDirectory(this->ConfigName);
+    targetFullPathPDB =
+        this->GeneratorTarget->GetPDBDirectory(this->ConfigName);
     targetFullPathPDB += "/";
     targetFullPathPDB += this->GeneratorTarget->GetPDBName(this->ConfigName);
     }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 33e08a3..c2daa63 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -289,7 +289,7 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
        this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
        this->Target->GetType() == cmTarget::MODULE_LIBRARY)
       {
-      pdbPath = this->Target->GetPDBDirectory(this->GetConfigName());
+      pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName());
       pdbPath += "/";
       pdbPath += this->GeneratorTarget->GetPDBName(this->GetConfigName());
       }
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0f8b3b0..0fc0423 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1771,17 +1771,6 @@ cmTarget::OutputInfo const* cmTarget::GetOutputInfo(
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetPDBDirectory(const std::string& config) const
-{
-  if(OutputInfo const* info = this->GetOutputInfo(config))
-    {
-    // Return the directory in which the target will be built.
-    return info->PdbDir;
-    }
-  return "";
-}
-
-//----------------------------------------------------------------------------
 const char* cmTarget::ImportedGetLocation(const std::string& config) const
 {
   static std::string location;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 507ea7d..2f9a94b 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -231,12 +231,6 @@ public:
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;
 
-  /** Get the directory in which this targets .pdb files will be placed.
-      If the configuration name is given then the generator will add its
-      subdirectory for that configuration.  Otherwise just the canonical
-      pdb output directory is given.  */
-  std::string GetPDBDirectory(const std::string& config) const;
-
   const char* ImportedGetLocation(const std::string& config) const;
 
   /** Get the target major and minor version numbers interpreted from

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dbd2ccd93a9f3817ccc9c1bee843915c8cc079c
commit 0dbd2ccd93a9f3817ccc9c1bee843915c8cc079c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 20 20:31:47 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:52:57 2015 +0200

    cmGeneratorTarget: Move GetDirectory from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index b61e26f..961705f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1586,7 +1586,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactSonameTag>
                     "SHARED libraries.");
       return std::string();
       }
-    std::string result = target->Target->GetDirectory(context->Config);
+    std::string result = target->GetDirectory(context->Config);
     result += "/";
     result += target->GetSOName(context->Config);
     return result;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 278194e..b8a87a2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -748,7 +748,7 @@ const char* cmGeneratorTarget::GetLocationForBuild() const
     }
 
   // Now handle the deprecated build-time configuration location.
-  location = this->Target->GetDirectory();
+  location = this->GetDirectory();
   const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
   if(cfgid && strcmp(cfgid, ".") != 0)
     {
@@ -1434,7 +1434,7 @@ cmGeneratorTarget::GetInstallNameDirForBuildTree(
       }
     else
       {
-      dir = this->Target->GetDirectory(config);
+      dir = this->GetDirectory(config);
       }
     dir += "/";
     return dir;
@@ -1735,7 +1735,7 @@ cmGeneratorTarget::GetMacContentDirectory(const std::string& config,
                                           bool implib) const
 {
   // Start with the output directory for the target.
-  std::string fpath = this->Target->GetDirectory(config, implib);
+  std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
   bool contentOnly = true;
   if(this->Target->IsFrameworkOnApple())
@@ -2860,7 +2860,7 @@ void cmGeneratorTarget::ComputeTargetManifest(
     }
 
   // Get the directory.
-  std::string dir = this->Target->GetDirectory(config, false);
+  std::string dir = this->GetDirectory(config, false);
 
   // Add each name.
   std::string f;
@@ -2894,7 +2894,7 @@ void cmGeneratorTarget::ComputeTargetManifest(
     }
   if(!impName.empty())
     {
-    f = this->Target->GetDirectory(config, true);
+    f = this->GetDirectory(config, true);
     f += "/";
     f += impName;
     gg->AddToManifest(f);
@@ -2919,7 +2919,7 @@ std::string cmGeneratorTarget::NormalGetFullPath(const std::string& config,
                                                  bool implib,
                                                  bool realname) const
 {
-  std::string fpath = this->Target->GetDirectory(config, implib);
+  std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
   if(this->Target->IsAppBundleOnApple())
     {
@@ -4454,6 +4454,26 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetDirectory(const std::string& config,
+                                   bool implib) const
+{
+  if (this->Target->IsImported())
+    {
+    // Return the directory from which the target is imported.
+    return
+      cmSystemTools::GetFilenamePath(
+      this->Target->ImportedGetFullPath(config, implib));
+    }
+  else if(cmTarget::OutputInfo const* info =
+      this->Target->GetOutputInfo(config))
+    {
+    // Return the directory in which the target will be built.
+    return implib? info->ImpDir : info->OutDir;
+    }
+  return "";
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   const std::string& config,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f5805f1..43b7922 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -268,6 +268,13 @@ public:
    */
   void TraceDependencies();
 
+  /** Get the directory in which this target will be built.  If the
+      configuration name is given then the generator will add its
+      subdirectory for that configuration.  Otherwise just the canonical
+      output directory is given.  */
+  std::string GetDirectory(const std::string& config = "",
+                           bool implib = false) const;
+
   /** Get the directory in which to place the target compiler .pdb file.
       If the configuration name is given then the generator will add its
       subdirectory for that configuration.  Otherwise just the canonical
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 30cf175..383ee00 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -83,7 +83,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   else
     {
     fromDirConfig =
-        this->Target->Target->GetDirectory(config, this->ImportLibrary);
+        this->Target->GetDirectory(config, this->ImportLibrary);
     fromDirConfig += "/";
     }
   std::string toDir =
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 90f679e..eebee83 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -99,7 +99,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
      this->ConfigName);
 
   // Construct the full path version of the names.
-  std::string outpath = this->Target->GetDirectory(this->ConfigName);
+  std::string outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
   if(this->Target->IsAppBundleOnApple())
     {
     this->OSXBundleGenerator->CreateAppBundle(targetName, outpath);
@@ -123,7 +123,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     cmSystemTools::MakeDirectory(outpath.c_str());
     if(!targetNameImport.empty())
       {
-      outpathImp = this->Target->GetDirectory(this->ConfigName, true);
+      outpathImp = this->GeneratorTarget->GetDirectory(this->ConfigName, true);
       cmSystemTools::MakeDirectory(outpathImp.c_str());
       outpathImp += "/";
       }
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index cd387a0..d12142a 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -275,13 +275,13 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::string outpathImp;
   if(this->Target->IsFrameworkOnApple())
     {
-    outpath = this->Target->GetDirectory(this->ConfigName);
+    outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
     outpath += "/";
     }
   else if(this->Target->IsCFBundleOnApple())
     {
-    outpath = this->Target->GetDirectory(this->ConfigName);
+    outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateCFBundle(targetName, outpath);
     outpath += "/";
     }
@@ -299,12 +299,12 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     }
   else
     {
-    outpath = this->Target->GetDirectory(this->ConfigName);
+    outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     cmSystemTools::MakeDirectory(outpath.c_str());
     outpath += "/";
     if(!targetNameImport.empty())
       {
-      outpathImp = this->Target->GetDirectory(this->ConfigName, true);
+      outpathImp = this->GeneratorTarget->GetDirectory(this->ConfigName, true);
       cmSystemTools::MakeDirectory(outpathImp.c_str());
       outpathImp += "/";
       }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 24fcaf4..f8743d9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -59,7 +59,7 @@ cmNinjaNormalTargetGenerator(cmGeneratorTarget* target)
     {
     // on Windows the output dir is already needed at compile time
     // ensure the directory exists (OutDir test)
-    EnsureDirectoryExists(target->Target->GetDirectory(this->GetConfigName()));
+    EnsureDirectoryExists(target->GetDirectory(this->GetConfigName()));
     }
 
   this->OSXBundleGenerator = new cmOSXBundleGenerator(target,
@@ -413,7 +413,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   if (target.IsAppBundleOnApple())
     {
     // Create the app bundle
-    std::string outpath = target.GetDirectory(cfgName);
+    std::string outpath = gt.GetDirectory(cfgName);
     this->OSXBundleGenerator->CreateAppBundle(this->TargetNameOut, outpath);
 
     // Calculate the output path
@@ -430,13 +430,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     // Create the library framework.
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
-                                              target.GetDirectory(cfgName));
+                                              gt.GetDirectory(cfgName));
     }
   else if(target.IsCFBundleOnApple())
     {
     // Create the core foundation bundle.
     this->OSXBundleGenerator->CreateCFBundle(this->TargetNameOut,
-                                             target.GetDirectory(cfgName));
+                                             gt.GetDirectory(cfgName));
     }
 
   // Write comments.
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 6e6dc60..33e08a3 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -254,7 +254,7 @@ cmNinjaTargetGenerator
 
 std::string cmNinjaTargetGenerator::GetTargetOutputDir() const
 {
-  std::string dir = this->Target->GetDirectory(this->GetConfigName());
+  std::string dir = this->GeneratorTarget->GetDirectory(this->GetConfigName());
   return ConvertToNinjaPath(dir);
 }
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 825f3eb..0f8b3b0 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1771,25 +1771,6 @@ cmTarget::OutputInfo const* cmTarget::GetOutputInfo(
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetDirectory(const std::string& config,
-                                   bool implib) const
-{
-  if (this->IsImported())
-    {
-    // Return the directory from which the target is imported.
-    return
-      cmSystemTools::GetFilenamePath(
-      this->ImportedGetFullPath(config, implib));
-    }
-  else if(OutputInfo const* info = this->GetOutputInfo(config))
-    {
-    // Return the directory in which the target will be built.
-    return implib? info->ImpDir : info->OutDir;
-    }
-  return "";
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetPDBDirectory(const std::string& config) const
 {
   if(OutputInfo const* info = this->GetOutputInfo(config))
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 96cdb5e..507ea7d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -231,13 +231,6 @@ public:
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;
 
-  /** Get the directory in which this target will be built.  If the
-      configuration name is given then the generator will add its
-      subdirectory for that configuration.  Otherwise just the canonical
-      output directory is given.  */
-  std::string GetDirectory(const std::string& config = "",
-                           bool implib = false) const;
-
   /** Get the directory in which this targets .pdb files will be placed.
       If the configuration name is given then the generator will add its
       subdirectory for that configuration.  Otherwise just the canonical

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0261a1e20f14cc2ca593bb978479b52954397d8
commit e0261a1e20f14cc2ca593bb978479b52954397d8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 23:00:30 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:41:30 2015 +0200

    cmTarget: Make OutputInfo definition public.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e1642cc..825f3eb 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -61,16 +61,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 }
 
 //----------------------------------------------------------------------------
-struct cmTarget::OutputInfo
-{
-  std::string OutDir;
-  std::string ImpDir;
-  std::string PdbDir;
-  bool empty() const
-    { return OutDir.empty() && ImpDir.empty() && PdbDir.empty(); }
-};
-
-//----------------------------------------------------------------------------
 class cmTargetInternals
 {
 public:
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index aab9582..96cdb5e 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -488,7 +488,15 @@ private:
 #endif
 
   // Cache target output paths for each configuration.
-  struct OutputInfo;
+  struct OutputInfo
+  {
+    std::string OutDir;
+    std::string ImpDir;
+    std::string PdbDir;
+    bool empty() const
+     { return OutDir.empty() && ImpDir.empty() && PdbDir.empty(); }
+  };
+
   OutputInfo const* GetOutputInfo(const std::string& config) const;
   bool
   ComputeOutputDir(const std::string& config,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df42dbb3558a6ba604ab584b21dfe7f8722eb025
commit df42dbb3558a6ba604ab584b21dfe7f8722eb025
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:17:55 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:41:29 2015 +0200

    cmGeneratorTarget: Move link implementation from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 1c350ab..b61e26f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1122,7 +1122,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     else if(!interfacePropertyName.empty())
       {
       if(cmLinkImplementationLibraries const* impl =
-         target->GetLinkImplementationLibraries(context->Config))
+         gtgt->GetLinkImplementationLibraries(context->Config))
         {
         linkedTargetsContent =
           getLinkedTargetsContent(impl->Libraries, target,
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1a0bbe8..278194e 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -847,7 +847,7 @@ static void AddInterfaceEntries(
   std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries)
 {
   if(cmLinkImplementationLibraries const* impl =
-     thisTarget->Target->GetLinkImplementationLibraries(config))
+     thisTarget->GetLinkImplementationLibraries(config))
     {
     for (std::vector<cmLinkImplItem>::const_iterator
            it = impl->Libraries.begin(), end = impl->Libraries.end();
@@ -1901,7 +1901,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
     std::set<cmTarget const*> emitted;
 
     cmLinkImplementationLibraries const* impl
-      = this->Target->GetLinkImplementationLibraries(config);
+      = this->GetLinkImplementationLibraries(config);
 
     for(std::vector<cmLinkImplItem>::const_iterator
           it = impl->Libraries.begin();
@@ -2501,7 +2501,7 @@ cmGeneratorTarget::GetIncludeDirectories(const std::string& config,
   if(this->Makefile->IsOn("APPLE"))
     {
     cmLinkImplementationLibraries const* impl =
-        this->Target->GetLinkImplementationLibraries(config);
+        this->GetLinkImplementationLibraries(config);
     for(std::vector<cmLinkImplItem>::const_iterator
         it = impl->Libraries.begin();
         it != impl->Libraries.end(); ++it)
@@ -4363,8 +4363,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
     {
     // The link implementation is the default link interface.
     cmLinkImplementationLibraries const*
-      impl = this->Target->GetLinkImplementationLibrariesInternal(config,
-                                                                headTarget);
+      impl = this->GetLinkImplementationLibrariesInternal(config, headTarget);
     iface.ImplementationIsInterface = true;
     iface.WrongConfigLibraries = impl->WrongConfigLibraries;
     }
@@ -4558,8 +4557,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     {
     // The link implementation is the default link interface.
     cmLinkImplementationLibraries const* impl =
-      this->Target->GetLinkImplementationLibrariesInternal(config,
-                                                           headTarget);
+      this->GetLinkImplementationLibrariesInternal(config, headTarget);
     iface.Libraries.insert(iface.Libraries.end(),
                            impl->Libraries.begin(), impl->Libraries.end());
     if(this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
@@ -4674,12 +4672,12 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const
     return 0;
     }
 
-  cmOptionalLinkImplementation& impl = this->Target->GetLinkImplMap(config);
+  std::string CONFIG = cmSystemTools::UpperCase(config);
+  cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this->Target];
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
-    this->Target->ComputeLinkImplementationLibraries(config, impl,
-                                                     this->Target);
+    this->ComputeLinkImplementationLibraries(config, impl, this->Target);
     }
   if(!impl.LanguagesDone)
     {
@@ -4819,9 +4817,161 @@ bool cmGeneratorTarget::HaveBuildTreeRPATH(const std::string& config) const
     return false;
     }
   if(cmLinkImplementationLibraries const* impl =
-     this->Target->GetLinkImplementationLibraries(config))
+     this->GetLinkImplementationLibraries(config))
     {
     return !impl->Libraries.empty();
     }
   return false;
 }
+
+//----------------------------------------------------------------------------
+cmLinkImplementationLibraries const*
+cmGeneratorTarget::GetLinkImplementationLibraries(
+    const std::string& config) const
+{
+  return this->GetLinkImplementationLibrariesInternal(config, this->Target);
+}
+
+//----------------------------------------------------------------------------
+cmLinkImplementationLibraries const*
+cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
+    const std::string& config, cmTarget const* head) const
+{
+  // There is no link implementation for imported targets.
+  if(this->IsImported())
+    {
+    return 0;
+    }
+
+  // Populate the link implementation libraries for this configuration.
+  std::string CONFIG = cmSystemTools::UpperCase(config);
+  HeadToLinkImplementationMap& hm =
+    this->LinkImplMap[CONFIG];
+
+  // If the link implementation does not depend on the head target
+  // then return the one we computed first.
+  if(!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition)
+    {
+    return &hm.begin()->second;
+    }
+
+  cmOptionalLinkImplementation& impl = hm[head];
+  if(!impl.LibrariesDone)
+    {
+    impl.LibrariesDone = true;
+    this->ComputeLinkImplementationLibraries(config, impl, head);
+    }
+  return &impl;
+}
+
+//----------------------------------------------------------------------------
+void cmGeneratorTarget::ComputeLinkImplementationLibraries(
+  const std::string& config,
+  cmOptionalLinkImplementation& impl,
+  cmTarget const* head) const
+{
+  cmStringRange entryRange =
+      this->Target->GetLinkImplementationEntries();
+  cmBacktraceRange btRange =
+      this->Target->GetLinkImplementationBacktraces();
+  cmBacktraceRange::const_iterator btIt = btRange.begin();
+  // Collect libraries directly linked in this configuration.
+  for (cmStringRange::const_iterator le = entryRange.begin(),
+      end = entryRange.end(); le != end; ++le, ++btIt)
+    {
+    std::vector<std::string> llibs;
+    cmGeneratorExpressionDAGChecker dagChecker(
+                                        this->GetName(),
+                                        "LINK_LIBRARIES", 0, 0);
+    cmGeneratorExpression ge(*btIt);
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
+      ge.Parse(*le);
+    std::string const evaluated =
+      cge->Evaluate(this->Makefile, config, false, head, &dagChecker);
+    cmSystemTools::ExpandListArgument(evaluated, llibs);
+    if(cge->GetHadHeadSensitiveCondition())
+      {
+      impl.HadHeadSensitiveCondition = true;
+      }
+
+    for(std::vector<std::string>::const_iterator li = llibs.begin();
+        li != llibs.end(); ++li)
+      {
+      // Skip entries that resolve to the target itself or are empty.
+      std::string name = this->Target->CheckCMP0004(*li);
+      if(name == this->GetName() || name.empty())
+        {
+        if(name == this->GetName())
+          {
+          bool noMessage = false;
+          cmake::MessageType messageType = cmake::FATAL_ERROR;
+          std::ostringstream e;
+          switch(this->Target->GetPolicyStatusCMP0038())
+            {
+            case cmPolicies::WARN:
+              {
+              e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0038) << "\n";
+              messageType = cmake::AUTHOR_WARNING;
+              }
+              break;
+            case cmPolicies::OLD:
+              noMessage = true;
+            case cmPolicies::REQUIRED_IF_USED:
+            case cmPolicies::REQUIRED_ALWAYS:
+            case cmPolicies::NEW:
+              // Issue the fatal message.
+              break;
+            }
+
+          if(!noMessage)
+            {
+            e << "Target \"" << this->GetName() << "\" links to itself.";
+            this->LocalGenerator->GetCMakeInstance()->IssueMessage(
+              messageType, e.str(), this->Target->GetBacktrace());
+            if (messageType == cmake::FATAL_ERROR)
+              {
+              return;
+              }
+            }
+          }
+        continue;
+        }
+
+      // The entry is meant for this configuration.
+      impl.Libraries.push_back(
+        cmLinkImplItem(name, this->Target->FindTargetToLink(name),
+                       *btIt, evaluated != *le));
+      }
+
+    std::set<std::string> const& seenProps = cge->GetSeenTargetProperties();
+    for (std::set<std::string>::const_iterator it = seenProps.begin();
+        it != seenProps.end(); ++it)
+      {
+      if (!this->GetProperty(*it))
+        {
+        this->Target->LinkImplicitNullProperties.insert(*it);
+        }
+      }
+    cge->GetMaxLanguageStandard(this->Target,
+                                this->MaxLanguageStandards);
+    }
+
+  cmTarget::LinkLibraryType linkType = this->Target->ComputeLinkType(config);
+  cmTarget::LinkLibraryVectorType const& oldllibs =
+    this->Target->GetOriginalLinkLibraries();
+  for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
+      li != oldllibs.end(); ++li)
+    {
+    if(li->second != cmTarget::GENERAL && li->second != linkType)
+      {
+      std::string name = this->Target->CheckCMP0004(li->first);
+      if(name == this->GetName() || name.empty())
+        {
+        continue;
+        }
+      // Support OLD behavior for CMP0003.
+      impl.WrongConfigLibraries.push_back(
+        cmLinkItem(name, this->Target->FindTargetToLink(name)));
+      }
+    }
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e8c5e04..f5805f1 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -207,6 +207,13 @@ public:
                                           cmOptionalLinkImplementation& impl
                                           ) const;
 
+  cmLinkImplementationLibraries const*
+    GetLinkImplementationLibraries(const std::string& config) const;
+
+  void ComputeLinkImplementationLibraries(const std::string& config,
+                                          cmOptionalLinkImplementation& impl,
+                                          cmTarget const* head) const;
+
   // Compute the set of languages compiled by the target.  This is
   // computed every time it is called because the languages can change
   // when source file properties are changed and we do not have enough
@@ -462,6 +469,16 @@ private:
   void GetSourceFiles(std::vector<std::string>& files,
                       const std::string& config) const;
 
+  struct HeadToLinkImplementationMap:
+    public std::map<cmTarget const*, cmOptionalLinkImplementation> {};
+  typedef std::map<std::string,
+                   HeadToLinkImplementationMap> LinkImplMapType;
+  mutable LinkImplMapType LinkImplMap;
+
+  cmLinkImplementationLibraries const*
+    GetLinkImplementationLibrariesInternal(const std::string& config,
+                                           cmTarget const* head) const;
+
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
@@ -477,6 +494,12 @@ public:
   std::vector<cmTarget const*> const&
     GetLinkImplementationClosure(const std::string& config) const;
 
+  mutable std::map<std::string, std::string> MaxLanguageStandards;
+  std::map<std::string, std::string> const&
+  GetMaxLanguageStandards() const
+  {
+    return this->MaxLanguageStandards;
+  }
 };
 
 struct cmStrictTargetComparison {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6647894..06eb004 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1152,8 +1152,8 @@ void cmLocalGenerator::AddCompileOptions(
     }
 
   for(std::map<std::string, std::string>::const_iterator it
-      = target->GetMaxLanguageStandards().begin();
-      it != target->GetMaxLanguageStandards().end(); ++it)
+      = gtgt->GetMaxLanguageStandards().begin();
+      it != gtgt->GetMaxLanguageStandards().end(); ++it)
     {
     const char* standard = target->GetProperty(it->first + "_STANDARD");
     if(!standard)
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 63c7740..e1642cc 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -95,12 +95,6 @@ public:
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
-  struct HeadToLinkImplementationMap:
-    public std::map<cmTarget const*, cmOptionalLinkImplementation> {};
-  typedef std::map<std::string,
-                   HeadToLinkImplementationMap> LinkImplMapType;
-  LinkImplMapType LinkImplMap;
-
   std::set<cmLinkItem> UtilityItems;
   bool UtilityItemsDone;
 
@@ -405,7 +399,6 @@ void cmTarget::FinishConfigure()
   // on-demand during the configuration.  This ensures that build
   // system generation uses up-to-date information even if other cache
   // invalidation code in this source file is buggy.
-  this->ClearLinkMaps();
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
   // Do old-style link dependency analysis only for CM_USE_OLD_VS6.
@@ -417,12 +410,6 @@ void cmTarget::FinishConfigure()
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::ClearLinkMaps()
-{
-  this->Internal->LinkImplMap.clear();
-}
-
-//----------------------------------------------------------------------------
 cmListFileBacktrace const& cmTarget::GetBacktrace() const
 {
   return this->Internal->Backtrace;
@@ -884,7 +871,6 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
   this->LinkLibrariesForVS6.push_back( tmp );
 #endif
   this->OriginalLinkLibraries.push_back(tmp);
-  this->ClearLinkMaps();
 
   // Add the explicit dependency information for this target. This is
   // simply a set of libraries separated by ";". There should always
@@ -983,6 +969,16 @@ cmBacktraceRange cmTarget::GetSourceBacktraces() const
   return cmMakeRange(this->Internal->SourceBacktraces);
 }
 
+cmStringRange cmTarget::GetLinkImplementationEntries() const
+{
+  return cmMakeRange(this->Internal->LinkImplementationPropertyEntries);
+}
+
+cmBacktraceRange cmTarget::GetLinkImplementationBacktraces() const
+{
+  return cmMakeRange(this->Internal->LinkImplementationPropertyBacktraces);
+}
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
 //----------------------------------------------------------------------------
 void
@@ -1611,10 +1607,6 @@ void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
     {
     this->Internal->ImportInfoMap.clear();
     }
-  if(!this->IsImported() && cmHasLiteralPrefix(prop, "LINK_INTERFACE_"))
-    {
-    this->ClearLinkMaps();
-    }
 }
 
 //----------------------------------------------------------------------------
@@ -3162,163 +3154,6 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 }
 
-cmOptionalLinkImplementation&
-cmTarget::GetLinkImplMap(std::string const& config) const
-{
-  // Populate the link implementation for this configuration.
-  std::string CONFIG = cmSystemTools::UpperCase(config);
-  return Internal->LinkImplMap[CONFIG][this];
-}
-
-//----------------------------------------------------------------------------
-cmLinkImplementationLibraries const*
-cmTarget::GetLinkImplementationLibraries(const std::string& config) const
-{
-  return this->GetLinkImplementationLibrariesInternal(config, this);
-}
-
-//----------------------------------------------------------------------------
-cmLinkImplementationLibraries const*
-cmTarget::GetLinkImplementationLibrariesInternal(const std::string& config,
-                                                 cmTarget const* head) const
-{
-  // There is no link implementation for imported targets.
-  if(this->IsImported())
-    {
-    return 0;
-    }
-
-  // Populate the link implementation libraries for this configuration.
-  std::string CONFIG = cmSystemTools::UpperCase(config);
-  cmTargetInternals::HeadToLinkImplementationMap& hm =
-    this->Internal->LinkImplMap[CONFIG];
-
-  // If the link implementation does not depend on the head target
-  // then return the one we computed first.
-  if(!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition)
-    {
-    return &hm.begin()->second;
-    }
-
-  cmOptionalLinkImplementation& impl = hm[head];
-  if(!impl.LibrariesDone)
-    {
-    impl.LibrariesDone = true;
-    this->ComputeLinkImplementationLibraries(config, impl, head);
-    }
-  return &impl;
-}
-
-//----------------------------------------------------------------------------
-void cmTarget::ComputeLinkImplementationLibraries(
-  const std::string& config,
-  cmOptionalLinkImplementation& impl,
-  cmTarget const* head) const
-{
-  std::vector<cmListFileBacktrace>::const_iterator btIt =
-      this->Internal->LinkImplementationPropertyBacktraces.begin();
-  // Collect libraries directly linked in this configuration.
-  for (std::vector<std::string>::const_iterator
-      le = this->Internal->LinkImplementationPropertyEntries.begin(),
-      end = this->Internal->LinkImplementationPropertyEntries.end();
-      le != end; ++le, ++btIt)
-    {
-    std::vector<std::string> llibs;
-    cmGeneratorExpressionDAGChecker dagChecker(
-                                        this->GetName(),
-                                        "LINK_LIBRARIES", 0, 0);
-    cmGeneratorExpression ge(*btIt);
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
-      ge.Parse(*le);
-    std::string const evaluated =
-      cge->Evaluate(this->Makefile, config, false, head, &dagChecker);
-    cmSystemTools::ExpandListArgument(evaluated, llibs);
-    if(cge->GetHadHeadSensitiveCondition())
-      {
-      impl.HadHeadSensitiveCondition = true;
-      }
-
-    for(std::vector<std::string>::const_iterator li = llibs.begin();
-        li != llibs.end(); ++li)
-      {
-      // Skip entries that resolve to the target itself or are empty.
-      std::string name = this->CheckCMP0004(*li);
-      if(name == this->GetName() || name.empty())
-        {
-        if(name == this->GetName())
-          {
-          bool noMessage = false;
-          cmake::MessageType messageType = cmake::FATAL_ERROR;
-          std::ostringstream e;
-          switch(this->GetPolicyStatusCMP0038())
-            {
-            case cmPolicies::WARN:
-              {
-              e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0038) << "\n";
-              messageType = cmake::AUTHOR_WARNING;
-              }
-              break;
-            case cmPolicies::OLD:
-              noMessage = true;
-            case cmPolicies::REQUIRED_IF_USED:
-            case cmPolicies::REQUIRED_ALWAYS:
-            case cmPolicies::NEW:
-              // Issue the fatal message.
-              break;
-            }
-
-          if(!noMessage)
-            {
-            e << "Target \"" << this->GetName() << "\" links to itself.";
-            this->Makefile->GetCMakeInstance()->IssueMessage(
-              messageType, e.str(), this->GetBacktrace());
-            if (messageType == cmake::FATAL_ERROR)
-              {
-              return;
-              }
-            }
-          }
-        continue;
-        }
-
-      // The entry is meant for this configuration.
-      impl.Libraries.push_back(
-        cmLinkImplItem(name, this->FindTargetToLink(name),
-                       *btIt, evaluated != *le));
-      }
-
-    std::set<std::string> const& seenProps = cge->GetSeenTargetProperties();
-    for (std::set<std::string>::const_iterator it = seenProps.begin();
-        it != seenProps.end(); ++it)
-      {
-      if (!this->GetProperty(*it))
-        {
-        this->LinkImplicitNullProperties.insert(*it);
-        }
-      }
-    cge->GetMaxLanguageStandard(this, this->MaxLanguageStandards);
-    }
-
-  cmTarget::LinkLibraryType linkType = this->ComputeLinkType(config);
-  cmTarget::LinkLibraryVectorType const& oldllibs =
-    this->GetOriginalLinkLibraries();
-  for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
-      li != oldllibs.end(); ++li)
-    {
-    if(li->second != cmTarget::GENERAL && li->second != linkType)
-      {
-      std::string name = this->CheckCMP0004(li->first);
-      if(name == this->GetName() || name.empty())
-        {
-        continue;
-        }
-      // Support OLD behavior for CMP0003.
-      impl.WrongConfigLibraries.push_back(
-        cmLinkItem(name, this->FindTargetToLink(name)));
-      }
-    }
-}
-
 //----------------------------------------------------------------------------
 cmTarget const* cmTarget::FindTargetToLink(std::string const& name) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 354eda2..aab9582 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -225,16 +225,6 @@ public:
 
   void GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const;
 
-  cmLinkImplementationLibraries const*
-    GetLinkImplementationLibraries(const std::string& config) const;
-
-  void ComputeLinkImplementationLibraries(const std::string& config,
-                                          cmOptionalLinkImplementation& impl,
-                                          cmTarget const* head) const;
-
-  cmOptionalLinkImplementation&
-  GetLinkImplMap(std::string const& config) const;
-
   cmTarget const* FindTargetToLink(std::string const& name) const;
 
   /** Strip off leading and trailing whitespace from an item named in
@@ -365,12 +355,6 @@ public:
   bool LinkLanguagePropagatesToDependents() const
   { return this->TargetTypeValue == STATIC_LIBRARY; }
 
-  std::map<std::string, std::string> const&
-  GetMaxLanguageStandards() const
-  {
-    return this->MaxLanguageStandards;
-  }
-
   cmStringRange GetIncludeDirectoriesEntries() const;
   cmBacktraceRange GetIncludeDirectoriesBacktraces() const;
 
@@ -385,6 +369,9 @@ public:
 
   cmStringRange GetSourceEntries() const;
   cmBacktraceRange GetSourceBacktraces() const;
+  cmStringRange GetLinkImplementationEntries() const;
+  cmBacktraceRange GetLinkImplementationBacktraces() const;
+
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
   const LinkLibraryVectorType &GetLinkLibrariesForVS6() const {
@@ -471,7 +458,6 @@ private:
   std::set<std::string> Utilities;
   mutable std::set<std::string> LinkImplicitNullProperties;
   std::map<std::string, cmListFileBacktrace> UtilityBacktraces;
-  mutable std::map<std::string, std::string> MaxLanguageStandards;
   cmPolicies::PolicyMap PolicyMap;
   std::string Name;
   std::string InstallPath;
@@ -529,14 +515,8 @@ private:
   void ComputeImportInfo(std::string const& desired_config,
                          ImportInfo& info) const;
 
-  cmLinkImplementationLibraries const*
-    GetLinkImplementationLibrariesInternal(const std::string& config,
-                                           cmTarget const* head) const;
-
   std::string ProcessSourceItemCMP0049(const std::string& s);
 
-  void ClearLinkMaps();
-
   void MaybeInvalidatePropertyCache(const std::string& prop);
 
   // Internal representation details.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8429a402da4aeb717f4af234c8d14d1c4e10ed7
commit a8429a402da4aeb717f4af234c8d14d1c4e10ed7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 17:37:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:41:29 2015 +0200

    cmTarget: Split storage of link implementation from backtraces.

diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h
index 0afd7f5..5f1a310 100644
--- a/Source/cmListFileCache.h
+++ b/Source/cmListFileCache.h
@@ -111,13 +111,4 @@ struct cmListFile
   std::vector<cmListFileFunction> Functions;
 };
 
-struct cmValueWithOrigin {
-  cmValueWithOrigin(const std::string &value,
-                          const cmListFileBacktrace &bt)
-    : Value(value), Backtrace(bt)
-  {}
-  std::string Value;
-  cmListFileBacktrace Backtrace;
-};
-
 #endif
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index abfc40b..63c7740 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -114,7 +114,8 @@ public:
   std::vector<cmListFileBacktrace> CompileDefinitionsBacktraces;
   std::vector<std::string> SourceEntries;
   std::vector<cmListFileBacktrace> SourceBacktraces;
-  std::vector<cmValueWithOrigin> LinkImplementationPropertyEntries;
+  std::vector<std::string> LinkImplementationPropertyEntries;
+  std::vector<cmListFileBacktrace> LinkImplementationPropertyBacktraces;
 };
 
 //----------------------------------------------------------------------------
@@ -1380,11 +1381,12 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
   else if (prop == "LINK_LIBRARIES")
     {
     this->Internal->LinkImplementationPropertyEntries.clear();
+    this->Internal->LinkImplementationPropertyBacktraces.clear();
     if (value)
       {
       cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-      cmValueWithOrigin entry(value, lfbt);
-      this->Internal->LinkImplementationPropertyEntries.push_back(entry);
+      this->Internal->LinkImplementationPropertyEntries.push_back(value);
+      this->Internal->LinkImplementationPropertyBacktraces.push_back(lfbt);
       }
     }
   else if (prop == "SOURCES")
@@ -1482,8 +1484,8 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
     if (value && *value)
       {
       cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-      cmValueWithOrigin entry(value, lfbt);
-      this->Internal->LinkImplementationPropertyEntries.push_back(entry);
+      this->Internal->LinkImplementationPropertyEntries.push_back(value);
+      this->Internal->LinkImplementationPropertyBacktraces.push_back(lfbt);
       }
     }
   else if (prop == "SOURCES")
@@ -2048,17 +2050,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         }
 
       static std::string output;
-      output = "";
-      std::string sep;
-      for (std::vector<cmValueWithOrigin>::const_iterator
-          it = this->Internal->LinkImplementationPropertyEntries.begin(),
-          end = this->Internal->LinkImplementationPropertyEntries.end();
-          it != end; ++it)
-        {
-        output += sep;
-        output += it->Value;
-        sep = ";";
-        }
+      output = cmJoin(this->Internal->LinkImplementationPropertyEntries, ";");
       return output.c_str();
       }
     // the type property returns what type the target is
@@ -3223,19 +3215,21 @@ void cmTarget::ComputeLinkImplementationLibraries(
   cmOptionalLinkImplementation& impl,
   cmTarget const* head) const
 {
+  std::vector<cmListFileBacktrace>::const_iterator btIt =
+      this->Internal->LinkImplementationPropertyBacktraces.begin();
   // Collect libraries directly linked in this configuration.
-  for (std::vector<cmValueWithOrigin>::const_iterator
+  for (std::vector<std::string>::const_iterator
       le = this->Internal->LinkImplementationPropertyEntries.begin(),
       end = this->Internal->LinkImplementationPropertyEntries.end();
-      le != end; ++le)
+      le != end; ++le, ++btIt)
     {
     std::vector<std::string> llibs;
     cmGeneratorExpressionDAGChecker dagChecker(
                                         this->GetName(),
                                         "LINK_LIBRARIES", 0, 0);
-    cmGeneratorExpression ge(le->Backtrace);
+    cmGeneratorExpression ge(*btIt);
     cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
-      ge.Parse(le->Value);
+      ge.Parse(*le);
     std::string const evaluated =
       cge->Evaluate(this->Makefile, config, false, head, &dagChecker);
     cmSystemTools::ExpandListArgument(evaluated, llibs);
@@ -3290,7 +3284,7 @@ void cmTarget::ComputeLinkImplementationLibraries(
       // The entry is meant for this configuration.
       impl.Libraries.push_back(
         cmLinkImplItem(name, this->FindTargetToLink(name),
-                       le->Backtrace, evaluated != le->Value));
+                       *btIt, evaluated != *le));
       }
 
     std::set<std::string> const& seenProps = cge->GetSeenTargetProperties();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=370bb92c10cd8fec7770267c93515623e4168012
commit 370bb92c10cd8fec7770267c93515623e4168012
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 23:28:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:41:27 2015 +0200

    cmGeneratorTarget: Issue messages through the local generator.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3fb0dc7..1a0bbe8 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -402,7 +402,8 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
     {
     // An empty map entry indicates we have been called recursively
     // from the above block.
-    this->Makefile->GetCMakeInstance()->IssueMessage(
+    this->LocalGenerator->GetCMakeInstance()
+          ->IssueMessage(
       cmake::FATAL_ERROR,
       "Target '" + this->GetName() + "' OUTPUT_NAME depends on itself.",
       this->Target->GetBacktrace());
@@ -951,7 +952,7 @@ static bool processSources(cmGeneratorTarget const* tgt,
       }
     if (!usedSources.empty())
       {
-      mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
+      tgt->GetLocalGenerator()->GetCMakeInstance()->IssueMessage(cmake::LOG,
                             std::string("Used sources for target ")
                             + tgt->GetName() + ":\n"
                             + usedSources, (*it)->ge->GetBacktrace());
@@ -1521,7 +1522,7 @@ public:
             << "\" but the target was not found.  Perhaps a find_package() "
             "call is missing for an IMPORTED target, or an ALIAS target is "
             "missing?";
-          this->Makefile->GetCMakeInstance()->IssueMessage(
+          this->Target->GetLocalGenerator()->GetCMakeInstance()->IssueMessage(
             messageType, e.str(), this->Target->Target->GetBacktrace());
           }
         }
@@ -2444,7 +2445,7 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
       }
     if (!usedIncludes.empty())
       {
-      mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
+      tgt->GetLocalGenerator()->GetCMakeInstance()->IssueMessage(cmake::LOG,
                             std::string("Used includes for target ")
                             + tgt->GetName() + ":\n"
                             + usedIncludes, (*it)->ge->GetBacktrace());
@@ -2577,7 +2578,7 @@ static void processCompileOptionsInternal(cmGeneratorTarget const* tgt,
       }
     if (!usedOptions.empty())
       {
-      mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
+      tgt->GetLocalGenerator()->GetCMakeInstance()->IssueMessage(cmake::LOG,
                             std::string("Used compile ") + logName
                             + std::string(" for target ")
                             + tgt->GetName() + ":\n"
@@ -4212,7 +4213,7 @@ cmGeneratorTarget::ReportPropertyOrigin(const std::string &p,
   areport += result;
   areport += "\"):\n" + report;
 
-  this->Makefile->GetCMakeInstance()->IssueMessage(cmake::LOG, areport);
+  this->LocalGenerator->GetCMakeInstance()->IssueMessage(cmake::LOG, areport);
 }
 
 //----------------------------------------------------------------------------

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27916f2cd10904deda1a44bf221fbdef7ba1af66
commit 27916f2cd10904deda1a44bf221fbdef7ba1af66
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:37:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 8 23:25:11 2015 +0200

    cmLocalGenerator: Add cmake instance accessor.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b26151c..6647894 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2858,6 +2858,11 @@ cmLocalGenerator
   return source.GetLanguage();
 }
 
+cmake* cmLocalGenerator::GetCMakeInstance() const
+{
+  return this->GlobalGenerator->GetCMakeInstance();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 33fede1..d9623cb 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -251,6 +251,8 @@ public:
    */
   bool NeedBackwardsCompatibility_2_4();
 
+  cmake* GetCMakeInstance() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkInformation.cxx            |    9 +-
 Source/cmGeneratorExpressionNode.cxx           |    6 +-
 Source/cmGeneratorTarget.cxx                   |  664 +++++++++++++++++++++--
 Source/cmGeneratorTarget.h                     |   79 +++
 Source/cmGlobalXCodeGenerator.cxx              |    2 +-
 Source/cmInstallTargetGenerator.cxx            |    2 +-
 Source/cmListFileCache.h                       |    9 -
 Source/cmLocalGenerator.cxx                    |    9 +-
 Source/cmLocalGenerator.h                      |    2 +
 Source/cmMakefileExecutableTargetGenerator.cxx |    7 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |   11 +-
 Source/cmMakefileTargetGenerator.cxx           |    3 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    8 +-
 Source/cmNinjaTargetGenerator.cxx              |    4 +-
 Source/cmTarget.cxx                            |  671 +-----------------------
 Source/cmTarget.h                              |   70 +--
 16 files changed, 770 insertions(+), 786 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct  8 18:00:53 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  8 Oct 2015 18:00:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-257-g3e0c78f
Message-ID: <20151008220053.EB7BBBFC53@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3e0c78f42556752c3257e63722c479439720fa85 (commit)
       via  67dcb22d11ae4ae62d8fe47ef2de32d9b9737710 (commit)
       via  40d9455bcc8b98d209c70bc3ec600a22ae10b187 (commit)
       via  6ab3f91c9e7f8b0d2a10d4acf9f1477fa12440f6 (commit)
       via  12cb3bdce4b40c39b8697bbf89ea8aace6aeae8b (commit)
       via  72efa15dc26b5f63a477ec537edfdffb54ecb691 (commit)
       via  f2a641d68bcb4d001ed4f27e41298066e75ade5b (commit)
       via  10cf42f5ae660c460d5d5f60936250866b33dc94 (commit)
       via  e46ef270ed7c96586ed755322174791374241574 (commit)
       via  53d3a1c95a4b03b327149e628f6937d68af938e6 (commit)
       via  4ab2750c54adb09d147839687858aabe3cd988a7 (commit)
       via  c8187f414bcc4668940c2e0fe40d361389efdbe5 (commit)
       via  8c6e6dd3cef0befcd9a7f4c410a49a5afddd8afb (commit)
      from  ec658cbeb4356219dfbcf1b34b8488eb2fe187cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e0c78f42556752c3257e63722c479439720fa85
commit 3e0c78f42556752c3257e63722c479439720fa85
Merge: ec658cb 67dcb22
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 18:00:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 18:00:51 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    67dcb22d Remove some needless GetMakefile() calls.
    40d9455b cmLocalGenerator: Add current source directory accessor.
    6ab3f91c cmLocalGenerator: Add current binary directory accessor.
    12cb3bdc cmLocalGenerator: Add Home directory accessors.
    72efa15d Eclipse: Port API to cmLocalGenerator.
    f2a641d6 Kate: Remove unused variables.
    10cf42f5 Kate: Port API to cmLocalGenerator.
    e46ef270 export: Port internal method to cmGeneratorTarget.
    53d3a1c9 cmMakefile: Remove unused GetProjectName calls.
    4ab2750c cmLocalGenerator: Add GetProjectName method.
    c8187f41 cmCPluginAPI: Inline code to get project name.
    8c6e6dd3 cmMakefile: Inline initialization of project name.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67dcb22d11ae4ae62d8fe47ef2de32d9b9737710
commit 67dcb22d11ae4ae62d8fe47ef2de32d9b9737710
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:42:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:20 2015 +0200

    Remove some needless GetMakefile() calls.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f3b651..4b6bd50 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -101,7 +101,7 @@ cmCustomCommandGenerator
       }
     else
       {
-      cmOutputConverter converter(this->LG->GetMakefile()->GetStateSnapshot());
+      cmOutputConverter converter(this->LG->GetStateSnapshot());
       cmd += converter.EscapeForShell(arg, this->MakeVars);
       }
     }
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index e4d9f10..8ac5cbc 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -139,7 +139,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator *lg)
       {
       std::ostringstream e;
       e << "Evaluation file \"" << this->Input << "\" cannot be read.";
-      lg->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
+      lg->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index a8cef0e..bfb58f2 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -495,7 +495,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the directory-level
   // rules of the subdirectories.
   std::vector<cmState::Snapshot> children
-      = lg->GetMakefile()->GetStateSnapshot().GetChildren();
+      = lg->GetStateSnapshot().GetChildren();
   for(std::vector<cmState::Snapshot>::const_iterator
         ci = children.begin(); ci != children.end(); ++ci)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40d9455bcc8b98d209c70bc3ec600a22ae10b187
commit 40d9455bcc8b98d209c70bc3ec600a22ae10b187
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:25:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:19 2015 +0200

    cmLocalGenerator: Add current source directory accessor.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index cca3858..fdfa35e 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -497,7 +497,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
     std::string sourceLinkedResourceName = "[Source directory]";
     std::string linkSourceDirectory = this->GetEclipsePath(
-                                             mf->GetCurrentSourceDirectory());
+                                             lg->GetCurrentSourceDirectory());
     // .project dir can't be subdir of a linked resource dir
     if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
                                          linkSourceDirectory))
@@ -638,7 +638,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
        ++it)
     {
     std::string linkSourceDirectory = this->GetEclipsePath(
-                   it->second[0]->GetMakefile()->GetCurrentSourceDirectory());
+                   it->second[0]->GetCurrentSourceDirectory());
     // a linked resource must not point to a parent directory of .project or
     // .project itself
     if ((baseDir != linkSourceDirectory) &&
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c7e09b9..8693785 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2105,7 +2105,7 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
   for(std::vector<cmLocalGenerator*>::const_iterator it =
       this->LocalGenerators.begin(); it != this->LocalGenerators.end(); ++it)
     {
-    std::string sd = (*it)->GetMakefile()->GetCurrentSourceDirectory();
+    std::string sd = (*it)->GetCurrentSourceDirectory();
     if (sd == start_dir)
       {
       return *it;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 7d6ad6d..4ddd2fe 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -412,8 +412,9 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
   this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
-                           this->ProjectSourceDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
+        this->ProjectSourceDirectoryComponents);
   cmSystemTools::SplitPath(
         this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
         this->ProjectOutputDirectoryComponents);
@@ -461,7 +462,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
-  std::string listfile = mf->GetCurrentSourceDirectory();
+  std::string listfile = root->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
   allBuildGt->AddSource(listfile.c_str());
@@ -557,7 +558,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
 
       // Refer to the build configuration file for easy editing.
-      listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
+      listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
       targetGT->AddSource(listfile.c_str());
@@ -3373,7 +3374,7 @@ bool cmGlobalXCodeGenerator
   // Point Xcode at the top of the source tree.
   {
   std::string pdir =
-    this->RelativeToBinary(root->GetMakefile()->GetCurrentSourceDirectory());
+    this->RelativeToBinary(root->GetCurrentSourceDirectory());
   this->RootObject->AddAttribute("projectDirPath",
                                  this->CreateString(pdir.c_str()));
   this->RootObject->AddAttribute("projectRoot", this->CreateString(""));
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8096bd7..c0c50c4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2883,6 +2883,11 @@ const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
+const char* cmLocalGenerator::GetCurrentSourceDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentSource();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7ca587e..8070667 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -259,6 +259,7 @@ public:
   const char* GetBinaryDirectory() const;
 
   const char* GetCurrentBinaryDirectory() const;
+  const char* GetCurrentSourceDirectory() const;
 
   /**
    * Generate a Mac OS X application bundle Info.plist file.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index c226b46..4d024e1 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -215,7 +215,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   if(!cmSystemTools::FileExists(makefileIn.c_str()))
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a94113a..082b7c3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -282,7 +282,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   stampName += "generate.stamp";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   makefileIn = cmSystemTools::CollapseFullPath(makefileIn.c_str());
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index c3ceb65..0e7aa45 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1113,7 +1113,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index d792ba7..133d2ff 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -45,8 +45,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
-        cmMakefile *mf = target->Target->GetMakefile();
-        if (strcmp(mf->GetCurrentSourceDirectory(),
+        if (strcmp(target->GetLocalGenerator()->GetCurrentSourceDirectory(),
                    target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 8cefd7c..92b7a57 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2243,7 +2243,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 {
   // Look through the sources for AndroidManifest.xml and use
   // its location as the root source directory.
-  std::string rootDir = this->Makefile->GetCurrentSourceDirectory();
+  std::string rootDir = this->LocalGenerator->GetCurrentSourceDirectory();
   {
   std::vector<cmSourceFile const*> extraSources;
   this->GeneratorTarget->GetExtraSources(extraSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ab3f91c9e7f8b0d2a10d4acf9f1477fa12440f6
commit 6ab3f91c9e7f8b0d2a10d4acf9f1477fa12440f6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 25 00:13:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:19 2015 +0200

    cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 856dcd4..80f560f 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -160,7 +160,7 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
   if (mod_dir.empty())
     {
     mod_dir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
     }
 
   // Actually write dependencies to the streams.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index b7ada2f..c9d0ce2 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -76,8 +76,7 @@ void cmExtraCodeBlocksGenerator::Generate()
 void cmExtraCodeBlocksGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
@@ -331,7 +330,7 @@ void cmExtraCodeBlocksGenerator
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
@@ -524,11 +523,10 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
                                         cmLocalGenerator* lg,
                                         cmTarget* target) const
 {
-  cmMakefile *mf = lg->GetMakefile();
   // this file doesn't seem to be used by C::B in custom makefile mode,
   // but we generate a unique file for each OBJECT library so in case
   // C::B uses it in some way, the targets don't interfere with each other.
-  std::string filename = mf->GetCurrentBinaryDirectory();
+  std::string filename = lg->GetCurrentBinaryDirectory();
   filename += "/";
   filename += lg->GetTargetDirectory(*target);
   filename += "/";
@@ -555,14 +553,14 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
                                               const char* compiler)
 {
   cmMakefile const* makefile = lg->GetMakefile();
-  std::string makefileName = makefile->GetCurrentBinaryDirectory();
+  std::string makefileName = lg->GetCurrentBinaryDirectory();
   makefileName += "/Makefile";
 
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
     int cbTargetType = this->GetCBTargetType(target);
-    std::string workingDir = makefile->GetCurrentBinaryDirectory();
+    std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmTarget::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
@@ -659,7 +657,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   else // e.g. all and the GLOBAL and UTILITY targets
     {
     fout<<"         <Option working_dir=\""
-        << makefile->GetCurrentBinaryDirectory() << "\" />\n"
+        << lg->GetCurrentBinaryDirectory() << "\" />\n"
         <<"         <Option type=\"" << 4 << "\" />\n";
     }
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index c22b786..31dbf3d 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -68,15 +68,15 @@ void cmExtraCodeLiteGenerator::Generate()
     const cmMakefile* mf =it->second[0]->GetMakefile();
     this->ConfigName = GetConfigurationName( mf );
 
-    if (strcmp(mf->GetCurrentBinaryDirectory(),
+    if (strcmp(it->second[0]->GetCurrentBinaryDirectory(),
                it->second[0]->GetBinaryDirectory()) == 0)
       {
-      workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
+      workspaceOutputDir   = it->second[0]->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
       workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
-      this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
+      this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();;
 
       fout.Open(workspaceFileName.c_str(), false, false);
       fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -91,8 +91,7 @@ void cmExtraCodeLiteGenerator::Generate()
        ++it)
     {
     // retrive project information
-    const cmMakefile* mf    = it->second[0]->GetMakefile();
-    std::string outputDir   = mf->GetCurrentBinaryDirectory();
+    std::string outputDir   = it->second[0]->GetCurrentBinaryDirectory();
     std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
@@ -121,8 +120,7 @@ void cmExtraCodeLiteGenerator::Generate()
 void cmExtraCodeLiteGenerator::CreateProjectFile(
   const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf    = lgs[0]->GetMakefile();
-  std::string outputDir   = mf->GetCurrentBinaryDirectory();
+  std::string outputDir   = lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 47e2566..cca3858 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -208,7 +208,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 
   std::string cacheEntryName = "CMAKE_ECLIPSE_ENVVAR_";
   cacheEntryName += envVar;
-  const char* cacheValue = mf->GetState()->GetInitializedCacheValue(
+  const char* cacheValue = lg->GetState()->GetInitializedCacheValue(
                                                        cacheEntryName);
 
   // now we have both, decide which one to use
@@ -1036,8 +1036,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        ++it)
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
-    std::string subdir = (*it)->Convert(makefile->GetCurrentBinaryDirectory(),
+    std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
       {
@@ -1098,7 +1097,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
                              ti->first.c_str());
 
           std::string cleanArgs = "-E chdir \"";
-          cleanArgs += makefile->GetCurrentBinaryDirectory();
+          cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f14a1cc..fe77026 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -121,7 +121,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
-    std::string currentDir = makefile->GetCurrentBinaryDirectory();
+    std::string currentDir = (*it)->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 7413a2d..6306360 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -77,8 +77,7 @@ void cmExtraSublimeTextGenerator::Generate()
 void cmExtraSublimeTextGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 6284c6d..f955ef7 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -49,8 +49,7 @@ void cmGlobalKdevelopGenerator::Generate()
       it!= this->GlobalGenerator->GetProjectMap().end();
       ++it)
     {
-    cmMakefile* mf = it->second[0]->GetMakefile();
-    std::string outputDir=mf->GetCurrentBinaryDirectory();
+    std::string outputDir=it->second[0]->GetCurrentBinaryDirectory();
     std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index be35e27..a8cef0e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -163,7 +163,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
     {
     cmLocalUnixMakefileGenerator3 *lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    std::string markFileName = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    std::string markFileName = lg->GetCurrentBinaryDirectory();
     markFileName += "/";
     markFileName += cmake::GetCMakeFilesDirectory();
     markFileName += "/progress.marks";
@@ -395,7 +395,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
     {
     lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    tmpStr = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    tmpStr = lg->GetCurrentBinaryDirectory();
     tmpStr += cmake::GetCMakeFilesDirectory();
     tmpStr += "/CMakeDirectoryInformation.cmake";
     cmakefileStream << "  \"" <<
@@ -454,7 +454,7 @@ cmGlobalUnixMakefileGenerator3
                       bool check_relink)
 {
   // Get the relative path to the subdirectory from the top.
-  std::string makeTarget = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string makeTarget = lg->GetCurrentBinaryDirectory();
   makeTarget += "/";
   makeTarget += pass;
 
@@ -534,7 +534,7 @@ cmGlobalUnixMakefileGenerator3
     }
 
   // Begin the directory-level rules section.
-  std::string dir = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string dir = lg->GetCurrentBinaryDirectory();
   dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT,
                     cmLocalGenerator::MAKERULE);
   lg->WriteDivider(ruleFileStream);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 73a952b..f4166b9 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -363,7 +363,7 @@ void cmGlobalVisualStudio7Generator
     return;
     }
   this->CurrentProject = root->GetProjectName();
-  std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = root->GetCurrentBinaryDirectory();
   fname += "/";
   fname += root->GetProjectName();
   fname += ".sln";
@@ -468,8 +468,10 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmMakefile* tmf = target->GetMakefile();
-        std::string dir = tmf->GetCurrentBinaryDirectory();
+        cmLocalGenerator* lg =
+            root->GetGlobalGenerator()->GetGeneratorTarget(target)
+            ->GetLocalGenerator();
+        std::string dir = lg->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
         if(dir == ".")
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 146fa39..7d6ad6d 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -414,11 +414,12 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentBinaryDirectory(),
-                           this->ProjectOutputDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
+        this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
-    root->GetMakefile()->GetCurrentBinaryDirectory();
+    root->GetCurrentBinaryDirectory();
   this->CurrentXCodeHackMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentXCodeHackMakefile.c_str());
   this->CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
@@ -466,7 +467,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   allBuildGt->AddSource(listfile.c_str());
 
   // Add XCODE depend helper
-  std::string dir = mf->GetCurrentBinaryDirectory();
+  std::string dir = root->GetCurrentBinaryDirectory();
   cmCustomCommandLine makeHelper;
   if(this->XcodeVersion < 50)
     {
@@ -582,7 +583,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   std::vector<std::string>::iterator new_end =
     std::unique(lfiles.begin(), lfiles.end());
   lfiles.erase(new_end, lfiles.end());
-  this->CurrentReRunCMakeMakefile = mf->GetCurrentBinaryDirectory();
+  this->CurrentReRunCMakeMakefile = root->GetCurrentBinaryDirectory();
   this->CurrentReRunCMakeMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str());
   this->CurrentReRunCMakeMakefile += "/ReRunCMake.make";
@@ -1033,7 +1034,7 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen)
   this->CurrentLocalGenerator = gen;
   this->CurrentMakefile = gen->GetMakefile();
   std::string outdir =
-    cmSystemTools::CollapseFullPath(this->CurrentMakefile->
+    cmSystemTools::CollapseFullPath(this->CurrentLocalGenerator->
                                     GetCurrentBinaryDirectory());
   cmSystemTools::SplitPath(outdir.c_str(),
                            this->CurrentOutputDirectoryComponents);
@@ -1389,7 +1390,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // linker language.  This should convince Xcode to choose the proper
   // language.
   cmMakefile* mf = cmtarget.GetMakefile();
-  std::string fname = mf->GetCurrentBinaryDirectory();
+  std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
   fname += cmtarget.GetName();
@@ -1618,7 +1619,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 const & commands,
                                                 const char* name)
 {
-  std::string dir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string dir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   dir += "/CMakeScripts";
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
@@ -1639,7 +1640,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                     currentConfig->c_str());
     }
 
-  std::string cdir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string cdir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   cdir = this->ConvertToRelativeForXCode(cdir.c_str());
   std::string makecmd = "make -C ";
   makecmd += cdir;
@@ -1967,7 +1968,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Set attributes to specify the proper name for the target.
-  std::string pndir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   if(target.GetType() == cmTarget::STATIC_LIBRARY ||
      target.GetType() == cmTarget::SHARED_LIBRARY ||
      target.GetType() == cmTarget::MODULE_LIBRARY ||
@@ -3484,7 +3485,7 @@ bool cmGlobalXCodeGenerator
     }
   }
 
-  std::string symroot = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string symroot = root->GetCurrentBinaryDirectory();
   symroot += "/build";
   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
 
@@ -3727,7 +3728,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     {
     return;
     }
-  std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string xcodeDir = root->GetCurrentBinaryDirectory();
   xcodeDir += "/";
   xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 97b9405..f7c9cc2 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -64,7 +64,7 @@ void cmInstallExportGenerator::ComputeTempDir()
   // Choose a temporary directory in which to generate the import
   // files to be installed.
   this->TempDir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
   this->TempDir += cmake::GetCMakeFilesDirectory();
   this->TempDir += "/Export";
   if(this->Destination.empty())
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6c442f4..8096bd7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2878,6 +2878,11 @@ const char* cmLocalGenerator::GetBinaryDirectory() const
   return this->GetCMakeInstance()->GetHomeOutputDirectory();
 }
 
+const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentBinary();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2123f1e..7ca587e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -258,6 +258,8 @@ public:
   const char* GetSourceDirectory() const;
   const char* GetBinaryDirectory() const;
 
+  const char* GetCurrentBinaryDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index b1e1d3f..6319f0e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -363,7 +363,7 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(
   if (ccg.GetNumberOfCommands() > 0) {
     std::string wd = ccg.GetWorkingDirectory();
     if (wd.empty())
-      wd = this->GetMakefile()->GetCurrentBinaryDirectory();
+      wd = this->GetCurrentBinaryDirectory();
 
     std::ostringstream cdCmd;
 #ifdef _WIN32
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3f51569..c226b46 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -111,14 +111,14 @@ void cmLocalVisualStudio6Generator::Generate()
 void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -163,7 +163,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       std::string::size_type pos = l->first.rfind('/');
       if(pos != std::string::npos)
         {
-        std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+        std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
         dir += l->first.substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
@@ -189,7 +189,7 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
@@ -578,9 +578,9 @@ cmLocalVisualStudio6Generator
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
-  char* output = new char[(strlen(this->Makefile->GetCurrentBinaryDirectory())
+  char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
                            + target.GetName().size() + 30)];
-  sprintf(output,"%s/%s_force_%i", this->Makefile->GetCurrentBinaryDirectory(),
+  sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
           target.GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
@@ -1964,7 +1964,7 @@ cmLocalVisualStudio6Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 48a633e..a94113a 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -140,7 +140,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       cmCustomCommandLines force_commands;
       force_commands.push_back(force_command);
       std::string no_main_dependency = "";
-      std::string force = this->Makefile->GetCurrentBinaryDirectory();
+      std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
       force += tgt.GetName();
@@ -164,14 +164,14 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
 void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -200,7 +200,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 {
   // Touch a timestamp file used to determine when the project file is
   // out of date.
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += cmake::GetCMakeFilesDirectory();
   cmSystemTools::MakeDirectory(stampName.c_str());
   stampName += "/";
@@ -247,7 +247,7 @@ void cmLocalVisualStudio7Generator
   target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += lname;
   if(this->FortranProject)
@@ -276,7 +276,7 @@ void cmLocalVisualStudio7Generator
 //----------------------------------------------------------------------------
 cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += "/";
   stampName += cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
@@ -1723,7 +1723,7 @@ cmLocalVisualStudio7Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 3d7cc72..c3ceb65 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -419,7 +419,7 @@ void cmMakefileTargetGenerator
   this->WriteObjectBuildFile(obj, lang, source, depends);
 
   // The object file should be checked for dependency integrity.
-  std::string objFullPath = this->Makefile->GetCurrentBinaryDirectory();
+  std::string objFullPath = this->LocalGenerator->GetCurrentBinaryDirectory();
   objFullPath += "/";
   objFullPath += obj;
   objFullPath =
@@ -642,7 +642,7 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->Makefile->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->LocalGenerator->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";
@@ -698,7 +698,7 @@ cmMakefileTargetGenerator
   // Change the command working directory to the local build tree.
   this->LocalGenerator->CreateCDCommand
     (compileCommands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
   commands.insert(commands.end(),
                   compileCommands.begin(), compileCommands.end());
@@ -771,7 +771,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (preprocessCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         preprocessCommands.begin(),
@@ -828,7 +828,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (assemblyCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         assemblyCommands.begin(),
@@ -929,7 +929,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
                                            *this->Target);
   this->LocalGenerator->CreateCDCommand
     (commands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
 
   // Write the rule.
@@ -1119,7 +1119,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->InfoFileNameFull,
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..8cefd7c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -195,7 +195,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->BuildFileStream = 0;
   this->IsMissingFiles = false;
   this->DefaultArtifactDir =
-    this->Makefile->GetCurrentBinaryDirectory() + std::string("/") +
+    this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") +
     this->LocalGenerator->GetTargetDirectory(*this->Target);
 }
 
@@ -297,8 +297,7 @@ void cmVisualStudio10TargetGenerator::Generate()
       return;
       }
     }
-  cmMakefile* mf = this->Target->GetMakefile();
-  std::string path =  mf->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj";
@@ -951,7 +950,7 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path,
 {
   return forceRelative
     ? cmSystemTools::RelativePath(
-      this->Makefile->GetCurrentBinaryDirectory(), path.c_str())
+      this->LocalGenerator->GetCurrentBinaryDirectory(), path.c_str())
     : path.c_str();
 }
 
@@ -990,7 +989,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   this->AddMissingSourceGroups(groupsUsed, sourceGroups);
 
   // Write out group file
-  std::string path =  this->Makefile->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj.filters";
@@ -1448,7 +1447,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
     std::string sourceRel = this->ConvertPath(sf->GetFullPath(), true);
     size_t const maxLen = 250;
     if(sf->GetCustomCommand() ||
-       ((strlen(this->Makefile->GetCurrentBinaryDirectory()) + 1 +
+       ((strlen(this->LocalGenerator->GetCurrentBinaryDirectory()) + 1 +
          sourceRel.length()) <= maxLen))
       {
       forceRelative = true;
@@ -3313,7 +3312,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
   // For WP80, the manifest needs to be in the same folder as the project
   // this can cause an overwrite problem if projects aren't organized in
   // folders
-  std::string manifestFile = this->Makefile->GetCurrentBinaryDirectory() +
+  std::string manifestFile =
+      this->LocalGenerator->GetCurrentBinaryDirectory() +
                              std::string("/WMAppManifest.xml");
   std::string artifactDir =
     this->LocalGenerator->GetTargetDirectory(*this->Target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12cb3bdce4b40c39b8697bbf89ea8aace6aeae8b
commit 12cb3bdce4b40c39b8697bbf89ea8aace6aeae8b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 01:17:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:19 2015 +0200

    cmLocalGenerator: Add Home directory accessors.
    
    Reduce reasons for cmLocalGenerator to have a cmMakefile.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d35b566..e97069f 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1975,8 +1975,9 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
       else if(use_link_rpath)
         {
         // Do not add any path inside the source or build tree.
-        const char* topSourceDir = this->Makefile->GetHomeDirectory();
-        const char* topBinaryDir = this->Makefile->GetHomeOutputDirectory();
+        const char* topSourceDir = this->CMakeInstance->GetHomeDirectory();
+        const char* topBinaryDir =
+            this->CMakeInstance->GetHomeOutputDirectory();
         if(!cmSystemTools::ComparePath(*ri, topSourceDir) &&
            !cmSystemTools::ComparePath(*ri, topBinaryDir) &&
            !cmSystemTools::IsSubDirectory(*ri, topSourceDir) &&
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 2a9b72c..c9b6100 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -245,8 +245,10 @@ static bool checkInterfaceDirs(const std::string &prepro,
 {
   const char* installDir =
             target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir = target->Makefile->GetHomeDirectory();
-  const char* topBinaryDir = target->Makefile->GetHomeOutputDirectory();
+  const char* topSourceDir =
+      target->GetLocalGenerator()->GetSourceDirectory();
+  const char* topBinaryDir =
+      target->GetLocalGenerator()->GetBinaryDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 103c16a..b7ada2f 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -273,7 +273,7 @@ void cmExtraCodeBlocksGenerator
         }
 
       const std::string &relative = cmSystemTools::RelativePath(
-                         it->second[0]->GetMakefile()->GetHomeDirectory(),
+                         it->second[0]->GetSourceDirectory(),
                          jt->c_str());
       std::vector<std::string> splitted;
       cmSystemTools::SplitPath(relative, splitted, false);
@@ -297,7 +297,7 @@ void cmExtraCodeBlocksGenerator
   tree.BuildVirtualFolder(virtualFolders);
   // And one for <Unit>
   std::string unitFiles;
-  tree.BuildUnit(unitFiles, std::string(mf->GetHomeDirectory()) + "/");
+  tree.BuildUnit(unitFiles, std::string(lgs[0]->GetSourceDirectory()) + "/");
 
   // figure out the compiler
   std::string compiler = this->GetCBCompilerId(mf);
@@ -332,7 +332,7 @@ void cmExtraCodeBlocksGenerator
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
           if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
                                make.c_str(), *lg, compiler.c_str());
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 8fb4dce..c22b786 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -69,11 +69,11 @@ void cmExtraCodeLiteGenerator::Generate()
     this->ConfigName = GetConfigurationName( mf );
 
     if (strcmp(mf->GetCurrentBinaryDirectory(),
-               mf->GetHomeOutputDirectory()) == 0)
+               it->second[0]->GetBinaryDirectory()) == 0)
       {
       workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
-      workspaceSourcePath  = mf->GetHomeDirectory();
+      workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
       this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index a98eef1..47e2566 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -79,8 +79,8 @@ void cmExtraEclipseCDT4Generator
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::Generate()
 {
-  const cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
 
   std::string eclipseVersion = mf->GetSafeDefinition("CMAKE_ECLIPSE_VERSION");
   cmsys::RegularExpression regex(".*([0-9]+\\.[0-9]+).*");
@@ -106,8 +106,8 @@ void cmExtraEclipseCDT4Generator::Generate()
     }
 
   // TODO: Decide if these are local or member variables
-  this->HomeDirectory       = mf->GetHomeDirectory();
-  this->HomeOutputDirectory = mf->GetHomeOutputDirectory();
+  this->HomeDirectory       = lg->GetSourceDirectory();
+  this->HomeOutputDirectory = lg->GetBinaryDirectory();
 
   this->GenerateLinkedResources = mf->IsOn(
                                     "CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
@@ -226,7 +226,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
     mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                            cacheEntryName.c_str(), cmState::STRING,
                            true);
-    mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+    mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
     }
   else if (envVarValue==0 && cacheValue!=0)
     {
@@ -247,7 +247,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
       mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
                              cacheEntryName.c_str(), cmState::STRING,
                              true);
-      mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
+      mf->GetCMakeInstance()->SaveCache(lg->GetBinaryDirectory());
       }
     }
 
@@ -1091,7 +1091,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           virtDir += prefix;
           virtDir += ti->first;
           std::string buildArgs = "-C \"";
-          buildArgs += makefile->GetHomeOutputDirectory();
+          buildArgs += (*it)->GetBinaryDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 104372c..f14a1cc 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -50,7 +50,7 @@ void cmExtraKateGenerator::Generate()
   const cmMakefile* mf = lg->GetMakefile();
   this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
-                          this->GetPathBasename(mf->GetHomeOutputDirectory()));
+                          this->GetPathBasename(lg->GetBinaryDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
   this->CreateKateProjectFile(lg);
@@ -61,8 +61,7 @@ void cmExtraKateGenerator::Generate()
 void cmExtraKateGenerator::CreateKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  const cmMakefile* mf = lg->GetMakefile();
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
   if (!fout)
@@ -73,9 +72,9 @@ void cmExtraKateGenerator::CreateKateProjectFile(
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"
-    "\t\"directory\": \"" << mf->GetHomeDirectory() << "\",\n"
-    "\t\"files\": [ { " << this->GenerateFilesString(mf) << "} ],\n";
-  this->WriteTargets(mf, fout);
+    "\t\"directory\": \"" << lg->GetSourceDirectory() << "\",\n"
+    "\t\"files\": [ { " << this->GenerateFilesString(lg) << "} ],\n";
+  this->WriteTargets(lg, fout);
   fout << "}\n";
 }
 
@@ -84,15 +83,15 @@ void
 cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
                                    cmGeneratedFileStream& fout) const
 {
-  cmMakefile* mf = lg->GetMakefile();
+  cmMakefile const* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
-  const char* homeOutputDir = mf->GetHomeOutputDirectory();
+  const char* homeOutputDir = lg->GetBinaryDirectory();
 
   fout <<
   "\t\"build\": {\n"
-  "\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
+  "\t\t\"directory\": \"" << lg->GetBinaryDirectory() << "\",\n"
   "\t\t\"default_target\": \"all\",\n"
   "\t\t\"clean_target\": \"clean\",\n";
 
@@ -123,7 +122,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
     std::string currentDir = makefile->GetCurrentBinaryDirectory();
-    bool topLevel = (currentDir == makefile->GetHomeOutputDirectory());
+    bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
       {
@@ -237,8 +236,7 @@ void
 cmExtraKateGenerator::CreateDummyKateProjectFile(
     const cmLocalGenerator* lg) const
 {
-  cmMakefile* mf = lg->GetMakefile();
-  std::string filename = mf->GetHomeOutputDirectory();
+  std::string filename = lg->GetBinaryDirectory();
   filename += "/";
   filename += this->ProjectName;
   filename += ".kateproject";
@@ -256,22 +254,21 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(
 std::string
 cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
 {
-  cmMakefile* mf = lg->GetMakefile();
-  std::string s = mf->GetHomeDirectory();
+  std::string s = lg->GetSourceDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"git\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/.svn";
   if(cmSystemTools::FileExists(s.c_str()))
   {
     return std::string("\"svn\": 1 ");
   }
 
-  s = mf->GetHomeDirectory();
+  s = lg->GetSourceDirectory();
   s += "/";
 
   std::set<std::string> files;
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index db8c470..7413a2d 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -99,8 +99,8 @@ void cmExtraSublimeTextGenerator
     }
 
   const std::string &sourceRootRelativeToOutput = cmSystemTools::RelativePath(
-                     mf->GetHomeOutputDirectory(),
-                     mf->GetHomeDirectory());
+                     lgs[0]->GetBinaryDirectory(),
+                     lgs[0]->GetSourceDirectory());
   // Write the folder entries to the project file
   fout << "{\n";
   fout << "\t\"folders\":\n\t[\n\t";
@@ -108,8 +108,8 @@ void cmExtraSublimeTextGenerator
     {
       fout << "\t{\n\t\t\t\"path\": \"" << sourceRootRelativeToOutput << "\"";
       const std::string &outputRelativeToSourceRoot =
-        cmSystemTools::RelativePath(mf->GetHomeDirectory(),
-                                    mf->GetHomeOutputDirectory());
+        cmSystemTools::RelativePath(lgs[0]->GetSourceDirectory(),
+                                    lgs[0]->GetBinaryDirectory());
       if ((!outputRelativeToSourceRoot.empty()) &&
         ((outputRelativeToSourceRoot.length() < 3) ||
           (outputRelativeToSourceRoot.substr(0, 3) != "../")))
@@ -173,8 +173,8 @@ void cmExtraSublimeTextGenerator::
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
-                     makefile->GetHomeOutputDirectory())==0)
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
+                     (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index bfcef43..79e3a4c 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -68,7 +68,9 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 std::string
 cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
 {
-  return target->GetMakefile()->GetHomeOutputDirectory();
+  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
+      ->GetGeneratorTarget(target);
+  return gt->GetLocalGenerator()->GetBinaryDirectory();
 }
 
 std::string
@@ -450,7 +452,7 @@ void cmGhsMultiTargetGenerator::WriteSources(
     cmSystemTools::ConvertToUnixSlashes(sgPath);
     cmGlobalGhsMultiGenerator::AddFilesUpToPath(
       this->GetFolderBuildStreams(), &this->FolderBuildStreams,
-      this->Makefile->GetHomeOutputDirectory(), sgPath,
+      this->LocalGenerator->GetBinaryDirectory(), sgPath,
       GhsMultiGpj::SUBPROJECT, this->RelBuildFilePath);
 
     std::string fullSourcePath((*si)->GetFullPath());
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index eb4dfee..c7e09b9 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -399,7 +399,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
   bool fatalError = false;
 
   mf->AddDefinition("RUN_CONFIGURE", true);
-  std::string rootBin = mf->GetHomeOutputDirectory();
+  std::string rootBin = this->CMakeInstance->GetHomeOutputDirectory();
   rootBin += cmake::GetCMakeFilesDirectory();
 
   // If the configuration files path has been set,
@@ -2879,10 +2879,8 @@ void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::WriteSummary()
 {
-  cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
-
   // Record all target directories in a central location.
-  std::string fname = mf->GetHomeOutputDirectory();
+  std::string fname = this->CMakeInstance->GetHomeOutputDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 0c95be0..6284c6d 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -51,7 +51,7 @@ void cmGlobalKdevelopGenerator::Generate()
     {
     cmMakefile* mf = it->second[0]->GetMakefile();
     std::string outputDir=mf->GetCurrentBinaryDirectory();
-    std::string projectDir=mf->GetHomeDirectory();
+    std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9d8193b..32e6077 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1198,16 +1198,15 @@ void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
 void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
 {
   cmLocalGenerator *lg = this->LocalGenerators[0];
-  cmMakefile* mfRoot = lg->GetMakefile();
 
   std::ostringstream cmd;
   cmd << lg->ConvertToOutputFormat(cmSystemTools::GetCMakeCommand(),
                                    cmLocalGenerator::SHELL)
       << " -H"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetSourceDirectory(),
                                    cmLocalGenerator::SHELL)
       << " -B"
-      << lg->ConvertToOutputFormat(mfRoot->GetHomeOutputDirectory(),
+      << lg->ConvertToOutputFormat(lg->GetBinaryDirectory(),
                                    cmLocalGenerator::SHELL);
   WriteRule(*this->RulesFileStream,
             "RERUN_CMAKE",
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index cb13fcf..be35e27 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -784,7 +784,7 @@ cmGlobalUnixMakefileGenerator3
       depends.clear();
 
       cmLocalUnixMakefileGenerator3::EchoProgress progress;
-      progress.Dir = lg->GetMakefile()->GetHomeOutputDirectory();
+      progress.Dir = lg->GetBinaryDirectory();
       progress.Dir += cmake::GetCMakeFilesDirectory();
       {
       std::ostringstream progressArg;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index ab9d7e7..0bdb008 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -312,10 +312,10 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
   std::string argH = "-H";
-  argH += mf->GetHomeDirectory();
+  argH += lg->GetSourceDirectory();
   commandLine.push_back(argH);
   std::string argB = "-B";
-  argB += mf->GetHomeOutputDirectory();
+  argB += lg->GetBinaryDirectory();
   commandLine.push_back(argB);
   commandLine.push_back("--check-stamp-list");
   commandLine.push_back(stampList.c_str());
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 4d017ab..146fa39 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -590,7 +590,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = mf->GetHomeOutputDirectory();
+  std::string checkCache = root->GetBinaryDirectory();
   checkCache += "/";
   checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
   checkCache += "cmake.check_cache";
@@ -604,9 +604,9 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   makefileStream << "\n\t" <<
     this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
                  << " -H" << this->ConvertToRelativeForMake(
-                   mf->GetHomeDirectory())
+                   root->GetSourceDirectory())
                  << " -B" << this->ConvertToRelativeForMake(
-                   mf->GetHomeOutputDirectory()) << "\n";
+                   root->GetBinaryDirectory()) << "\n";
 }
 
 //----------------------------------------------------------------------------
@@ -3749,7 +3749,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
   // Since this call may have created new cache entries, save the cache:
   //
   root->GetMakefile()->GetCMakeInstance()->SaveCache(
-    root->GetMakefile()->GetHomeOutputDirectory());
+    root->GetBinaryDirectory());
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b7833cd..6c442f4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2868,6 +2868,16 @@ cmake* cmLocalGenerator::GetCMakeInstance() const
   return this->GlobalGenerator->GetCMakeInstance();
 }
 
+const char* cmLocalGenerator::GetSourceDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeDirectory();
+}
+
+const char* cmLocalGenerator::GetBinaryDirectory() const
+{
+  return this->GetCMakeInstance()->GetHomeOutputDirectory();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index b3bf8cd..2123f1e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -255,6 +255,9 @@ public:
 
   cmake* GetCMakeInstance() const;
 
+  const char* GetSourceDirectory() const;
+  const char* GetBinaryDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index b131a63..bf5afc1 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -399,7 +399,7 @@ cmLocalUnixMakefileGenerator3
       );
     }
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
 
   // Write the rule to the makefile.
@@ -449,7 +449,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefile2.c_str(),localName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
                           localName, depends, commands, true);
@@ -478,7 +478,7 @@ void cmLocalUnixMakefileGenerator3
       commands.push_back(this->GetRecursiveMakeCall
                          (makefileName.c_str(), makeTargetName));
       this->CreateCDCommand(commands,
-                            this->Makefile->GetHomeOutputDirectory(),
+                            this->GetBinaryDirectory(),
                             cmLocalGenerator::START_OUTPUT);
       this->WriteMakeRule(ruleFileStream, "fast build rule for target.",
                           localName, depends, commands, true);
@@ -496,7 +496,7 @@ void cmLocalUnixMakefileGenerator3
         commands.push_back(this->GetRecursiveMakeCall
                            (makefile2.c_str(), makeTargetName));
         this->CreateCDCommand(commands,
-                              this->Makefile->GetHomeOutputDirectory(),
+                              this->GetBinaryDirectory(),
                               cmLocalGenerator::START_OUTPUT);
         this->WriteMakeRule(ruleFileStream,
                             "Manual pre-install relink rule for target.",
@@ -750,13 +750,13 @@ cmLocalUnixMakefileGenerator3
   makefileStream
     << "# The top-level source directory on which CMake was run.\n"
     << "CMAKE_SOURCE_DIR = "
-    << this->Convert(this->Makefile->GetHomeDirectory(), FULL, SHELL)
+    << this->Convert(this->GetSourceDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
   makefileStream
     << "# The top-level build directory on which CMake was run.\n"
     << "CMAKE_BINARY_DIR = "
-    << this->Convert(this->Makefile->GetHomeOutputDirectory(), FULL, SHELL)
+    << this->Convert(this->GetBinaryDirectory(), FULL, SHELL)
     << "\n"
     << "\n";
 }
@@ -889,7 +889,7 @@ void cmLocalUnixMakefileGenerator3
   if(!this->GetMakefile()->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
-                          this->Makefile->GetHomeOutputDirectory(),
+                          this->GetBinaryDirectory(),
                           cmLocalGenerator::START_OUTPUT);
     }
   this->WriteMakeRule(makefileStream,
@@ -1838,7 +1838,7 @@ void cmLocalUnixMakefileGenerator3
 
   depends.push_back("cmake_check_build_system");
 
-  std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+  std::string progressDir = this->GetBinaryDirectory();
   progressDir += cmake::GetCMakeFilesDirectory();
     {
     std::ostringstream progCmd;
@@ -1862,7 +1862,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
     {
     std::ostringstream progCmd;
@@ -1884,7 +1884,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
                                                 recursiveTarget));
   this->CreateCDCommand(commands,
-                                this->Makefile->GetHomeOutputDirectory(),
+                                this->GetBinaryDirectory(),
                                 cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "The main clean target", "clean",
                       depends, commands, true);
@@ -1914,7 +1914,7 @@ void cmLocalUnixMakefileGenerator3
   commands.push_back
     (this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget));
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "Prepare targets for installation.",
                       "preinstall", depends, commands, true);
@@ -1935,7 +1935,7 @@ void cmLocalUnixMakefileGenerator3
   runRule += " 1";
   commands.push_back(runRule);
   this->CreateCDCommand(commands,
-                        this->Makefile->GetHomeOutputDirectory(),
+                        this->GetBinaryDirectory(),
                         cmLocalGenerator::START_OUTPUT);
   this->WriteMakeRule(ruleFileStream, "clear depends",
                       "depend",
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index ab215d1..3f51569 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -112,7 +112,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -226,10 +226,10 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 8924564..48a633e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -165,7 +165,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
   if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
-            this->Makefile->GetHomeDirectory()) != 0)
+            this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
        (this->Makefile->GetCurrentBinaryDirectory()))
@@ -294,10 +294,10 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   comment += makefileIn;
   std::string args;
   args = "-H";
-  args += this->Makefile->GetHomeDirectory();
+  args += this->GetSourceDirectory();
   commandLine.push_back(args);
   args = "-B";
-  args += this->Makefile->GetHomeOutputDirectory();
+  args += this->GetBinaryDirectory();
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
   std::string stampFilename = this->Convert(stampName.c_str(), FULL,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index cd499f6..3d7cc72 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1095,7 +1095,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // translation table for the dependency scanning process.
   depCmd << "cd "
          << (this->LocalGenerator->Convert(
-               this->Makefile->GetHomeOutputDirectory(),
+               this->LocalGenerator->GetBinaryDirectory(),
                cmLocalGenerator::FULL, cmLocalGenerator::SHELL))
          << " && ";
 #endif
@@ -1110,13 +1110,13 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
   // the state of our local generator sufficiently for its needs.
   depCmd << "$(CMAKE_COMMAND) -E cmake_depends \""
          << this->GlobalGenerator->GetName() << "\" "
-         << this->Convert(this->Makefile->GetHomeDirectory(),
+         << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetHomeOutputDirectory(),
+         << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
@@ -1242,7 +1242,7 @@ void
 cmMakefileTargetGenerator
 ::MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress& progress) const
 {
-  progress.Dir = this->Makefile->GetHomeOutputDirectory();
+  progress.Dir = this->LocalGenerator->GetBinaryDirectory();
   progress.Dir += cmake::GetCMakeFilesDirectory();
   std::ostringstream progressArg;
   progressArg << "$(CMAKE_PROGRESS_" << this->NumberOfProgressActions << ")";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 24fcaf4..6706287 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -666,8 +666,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   if (!preLinkCmdLines.empty())
     {
     const std::string homeOutDir = localGen.ConvertToOutputFormat(
-                                              mf->GetHomeOutputDirectory(),
-                                              cmLocalGenerator::SHELL);
+                                            localGen.GetBinaryDirectory(),
+                                            cmLocalGenerator::SHELL);
     preLinkCmdLines.push_back("cd " + homeOutDir);
     }
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 6e6dc60..d792ba7 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -47,7 +47,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // in every directory, which we don't need.
         cmMakefile *mf = target->Target->GetMakefile();
         if (strcmp(mf->GetCurrentSourceDirectory(),
-                   mf->GetHomeDirectory()) == 0)
+                   target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
       }
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index df43c61..9feb7ac 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -103,13 +103,13 @@ void cmNinjaUtilityTargetGenerator::Generate()
       command,
       "$(CMAKE_SOURCE_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeDirectory(),
+        this->GetLocalGenerator()->GetSourceDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(
       command,
       "$(CMAKE_BINARY_DIR)",
       this->GetLocalGenerator()->ConvertToOutputFormat(
-        this->GetTarget()->GetMakefile()->GetHomeOutputDirectory(),
+        this->GetLocalGenerator()->GetBinaryDirectory(),
         cmLocalGenerator::SHELL).c_str());
     cmSystemTools::ReplaceString(command, "$(ARGS)", "");
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72efa15dc26b5f63a477ec537edfdffb54ecb691
commit 72efa15dc26b5f63a477ec537edfdffb54ecb691
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:58:45 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:19 2015 +0200

    Eclipse: Port API to cmLocalGenerator.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 464d0d9..a98eef1 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -196,8 +196,11 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
 
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
-                                            const char* envVar, cmMakefile* mf)
+                                            const char* envVar,
+                                            cmLocalGenerator* lg)
 {
+  cmMakefile* mf = lg->GetMakefile();
+
   // get the variables from the environment and from the cache and then
   // figure out which one to use:
 
@@ -360,17 +363,17 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
   //   but not necessarily when eclipse is open
   if (compilerId == "MSVC")
     {
-    AddEnvVar(fout, "PATH", mf);
-    AddEnvVar(fout, "INCLUDE", mf);
-    AddEnvVar(fout, "LIB", mf);
-    AddEnvVar(fout, "LIBPATH", mf);
+    AddEnvVar(fout, "PATH", lg);
+    AddEnvVar(fout, "INCLUDE", lg);
+    AddEnvVar(fout, "LIB", lg);
+    AddEnvVar(fout, "LIBPATH", lg);
     }
   else if (compilerId == "Intel")
     {
     // if the env.var is set, use this one and put it in the cache
     // if the env.var is not set, but the value is in the cache,
     // use it from the cache:
-    AddEnvVar(fout, "INTEL_LICENSE_FILE", mf);
+    AddEnvVar(fout, "INTEL_LICENSE_FILE", lg);
     }
   fout <<
     "</value>\n"
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index ef99760..16675f2 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -100,7 +100,7 @@ private:
                                    std::set<std::string>& emittedDirs);
 
   static void AddEnvVar(cmGeneratedFileStream& fout, const char* envVar,
-                        cmMakefile* mf);
+                        cmLocalGenerator* lg);
 
   void CreateLinksToSubprojects(cmGeneratedFileStream& fout,
                                 const std::string& baseDir);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2a641d68bcb4d001ed4f27e41298066e75ade5b
commit f2a641d68bcb4d001ed4f27e41298066e75ade5b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:48:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:19 2015 +0200

    Kate: Remove unused variables.

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 1305ce2..104372c 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -70,9 +70,6 @@ void cmExtraKateGenerator::CreateKateProjectFile(
     return;
     }
 
-  std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
-  std::string args = mf->GetSafeDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
-
   fout <<
     "{\n"
     "\t\"name\": \"" << this->ProjectName << "\",\n"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10cf42f5ae660c460d5d5f60936250866b33dc94
commit 10cf42f5ae660c460d5d5f60936250866b33dc94
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:49:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:19 2015 +0200

    Kate: Port API to cmLocalGenerator.

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 126e3e1..1305ce2 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -53,13 +53,15 @@ void cmExtraKateGenerator::Generate()
                           this->GetPathBasename(mf->GetHomeOutputDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
 
-  this->CreateKateProjectFile(mf);
-  this->CreateDummyKateProjectFile(mf);
+  this->CreateKateProjectFile(lg);
+  this->CreateDummyKateProjectFile(lg);
 }
 
 
-void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
+void cmExtraKateGenerator::CreateKateProjectFile(
+    const cmLocalGenerator* lg) const
 {
+  const cmMakefile* mf = lg->GetMakefile();
   std::string filename = mf->GetHomeOutputDirectory();
   filename += "/.kateproject";
   cmGeneratedFileStream fout(filename.c_str());
@@ -82,9 +84,10 @@ void cmExtraKateGenerator::CreateKateProjectFile(const cmMakefile* mf) const
 
 
 void
-cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
+cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
                                    cmGeneratedFileStream& fout) const
 {
+  cmMakefile* mf = lg->GetMakefile();
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
     "CMAKE_KATE_MAKE_ARGUMENTS");
@@ -234,8 +237,10 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& fout,
 
 
 void
-cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
+cmExtraKateGenerator::CreateDummyKateProjectFile(
+    const cmLocalGenerator* lg) const
 {
+  cmMakefile* mf = lg->GetMakefile();
   std::string filename = mf->GetHomeOutputDirectory();
   filename += "/";
   filename += this->ProjectName;
@@ -252,8 +257,9 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(const cmMakefile* mf) const
 
 
 std::string
-cmExtraKateGenerator::GenerateFilesString(const cmMakefile* mf) const
+cmExtraKateGenerator::GenerateFilesString(const cmLocalGenerator* lg) const
 {
+  cmMakefile* mf = lg->GetMakefile();
   std::string s = mf->GetHomeDirectory();
   s += "/.git";
   if(cmSystemTools::FileExists(s.c_str()))
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index f800feb..b20d0a7 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -39,9 +39,10 @@ public:
 
   virtual void Generate();
 private:
-  void CreateKateProjectFile(const cmMakefile* mf) const;
-  void CreateDummyKateProjectFile(const cmMakefile* mf) const;
-  void WriteTargets(const cmMakefile* mf, cmGeneratedFileStream& fout) const;
+  void CreateKateProjectFile(const cmLocalGenerator* lg) const;
+  void CreateDummyKateProjectFile(const cmLocalGenerator* lg) const;
+  void WriteTargets(const cmLocalGenerator* lg,
+                    cmGeneratedFileStream& fout) const;
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string&     target,
                     const std::string&     make,
@@ -49,7 +50,7 @@ private:
                     const std::string&     path,
                     const char*            homeOutputDir) const;
 
-  std::string GenerateFilesString(const cmMakefile* mf) const;
+  std::string GenerateFilesString(const cmLocalGenerator* lg) const;
   std::string GetPathBasename(const std::string& path) const;
   std::string GenerateProjectName(const std::string& name,
                                   const std::string& type,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e46ef270ed7c96586ed755322174791374241574
commit e46ef270ed7c96586ed755322174791374241574
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:44:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:18 2015 +0200

    export: Port internal method to cmGeneratorTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 881acee..2a9b72c 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -241,12 +241,12 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target, const std::string& prop)
+                      cmGeneratorTarget *target, const std::string& prop)
 {
   const char* installDir =
-            target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
-  const char* topSourceDir = target->GetMakefile()->GetHomeDirectory();
-  const char* topBinaryDir = target->GetMakefile()->GetHomeOutputDirectory();
+            target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
+  const char* topSourceDir = target->Makefile->GetHomeDirectory();
+  const char* topBinaryDir = target->Makefile->GetHomeOutputDirectory();
 
   std::vector<std::string> parts;
   cmGeneratorExpression::Split(prepro, parts);
@@ -269,7 +269,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch (target->GetPolicyStatusCMP0041())
+        switch (target->Target->GetPolicyStatusCMP0041())
           {
           case cmPolicies::WARN:
             messageType = cmake::WARNING;
@@ -298,7 +298,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains relative path:\n"
            "  \"" << *li << "\"";
-      target->GetMakefile()->IssueMessage(messageType, e.str());
+      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
       }
     bool inBinary = isSubDirectory(li->c_str(), topBinaryDir);
     bool inSource = isSubDirectory(li->c_str(), topSourceDir);
@@ -316,7 +316,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         {
         if (!shouldContinue)
           {
-          switch(target->GetPolicyStatusCMP0052())
+          switch(target->Target->GetPolicyStatusCMP0052())
             {
             case cmPolicies::WARN:
               {
@@ -329,7 +329,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
                 "a subdirectory of the " << (inBinary ? "build" : "source")
                 << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
                 << "\"" << std::endl;
-              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+              target->GetLocalGenerator()->IssueMessage(cmake::AUTHOR_WARNING,
                                                   s.str());
               }
             case cmPolicies::OLD:
@@ -352,7 +352,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       e << "Target \"" << target->GetName() << "\" " << prop <<
            " property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
-      target->GetMakefile()->IssueMessage(messageType, e.str());
+      target->GetLocalGenerator()->IssueMessage(messageType, e.str());
       }
     if (!inSourceBuild)
       {
@@ -361,7 +361,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         e << "Target \"" << target->GetName() << "\" " << prop <<
             " property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
-        target->GetMakefile()->IssueMessage(messageType, e.str());
+        target->GetLocalGenerator()->IssueMessage(messageType, e.str());
         }
       }
     }
@@ -421,7 +421,9 @@ void cmExportFileGenerator::PopulateSourcesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    cmGeneratorTarget* gt = target->GetMakefile()
+        ->GetGlobalGenerator()->GetGeneratorTarget(target);
+    if (!checkInterfaceDirs(prepro, gt, propName))
       {
       return;
       }
@@ -491,7 +493,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target->Target, propName))
+    if (!checkInterfaceDirs(prepro, target, propName))
       {
       return;
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53d3a1c95a4b03b327149e628f6937d68af938e6
commit 53d3a1c95a4b03b327149e628f6937d68af938e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:45:55 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:18 2015 +0200

    cmMakefile: Remove unused GetProjectName calls.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 16c0c9a..02b93ee 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2030,11 +2030,6 @@ void cmMakefile::SetProjectName(std::string const& p)
   this->StateSnapshot.SetProjectName(p);
 }
 
-std::string cmMakefile::GetProjectName() const
-{
-  return this->StateSnapshot.GetProjectName();
-}
-
 void cmMakefile::AddGlobalLinkInformation(const std::string& name,
                                           cmTarget& target)
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 459d34c..0a8dcd5 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -274,11 +274,6 @@ public:
    */
   void SetProjectName(std::string const& name);
 
-  /**
-   * Get the name of the project for this build.
-   */
-  std::string GetProjectName() const;
-
   /** Get the configurations to be generated.  */
   std::string GetConfigurations(std::vector<std::string>& configs,
                                 bool single = true) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ab2750c54adb09d147839687858aabe3cd988a7
commit 4ab2750c54adb09d147839687858aabe3cd988a7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:29:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:18 2015 +0200

    cmLocalGenerator: Add GetProjectName method.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 7915a6e..103c16a 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -78,7 +78,7 @@ void cmExtraCodeBlocksGenerator::CreateProjectFile(
 {
   const cmMakefile* mf=lgs[0]->GetMakefile();
   std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=mf->GetProjectName();
+  std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
   filename+=projectName+".cbp";
@@ -307,7 +307,7 @@ void cmExtraCodeBlocksGenerator
         "<CodeBlocks_project_file>\n"
         "   <FileVersion major=\"1\" minor=\"6\" />\n"
         "   <Project>\n"
-        "      <Option title=\"" << mf->GetProjectName()<<"\" />\n"
+        "      <Option title=\"" << lgs[0]->GetProjectName()<<"\" />\n"
         "      <Option makefile_is_custom=\"1\" />\n"
         "      <Option compiler=\"" << compiler << "\" />\n"
         "      "<<virtualFolders<<"\n"
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 496c1a8..8fb4dce 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -72,7 +72,7 @@ void cmExtraCodeLiteGenerator::Generate()
                mf->GetHomeOutputDirectory()) == 0)
       {
       workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
-      workspaceProjectName = mf->GetProjectName();
+      workspaceProjectName = it->second[0]->GetProjectName();
       workspaceSourcePath  = mf->GetHomeDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
@@ -93,7 +93,7 @@ void cmExtraCodeLiteGenerator::Generate()
     // retrive project information
     const cmMakefile* mf    = it->second[0]->GetMakefile();
     std::string outputDir   = mf->GetCurrentBinaryDirectory();
-    std::string projectName = mf->GetProjectName();
+    std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
     // Make the project file relative to the workspace
@@ -123,7 +123,7 @@ void cmExtraCodeLiteGenerator::CreateProjectFile(
 {
   const cmMakefile* mf    = lgs[0]->GetMakefile();
   std::string outputDir   = mf->GetCurrentBinaryDirectory();
-  std::string projectName = mf->GetProjectName();
+  std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
   filename += projectName + ".project";
@@ -143,7 +143,7 @@ void cmExtraCodeLiteGenerator
 
   ////////////////////////////////////
   fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-       "<CodeLite_Project Name=\"" << mf->GetProjectName()
+       "<CodeLite_Project Name=\"" << lgs[0]->GetProjectName()
        << "\" InternalType=\"\">\n";
 
   // Collect all used source files in the project
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 6dc18c2..464d0d9 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -157,9 +157,8 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
   assert(this->HomeDirectory != this->HomeOutputDirectory);
 
   // set up the project name: <project>-Source@<baseSourcePathName>
-  const cmMakefile* mf
-     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
-  std::string name = this->GenerateProjectName(mf->GetProjectName(), "Source",
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  std::string name = this->GenerateProjectName(lg->GetProjectName(), "Source",
                                    this->GetPathBasename(this->HomeDirectory));
 
   const std::string filename = this->HomeDirectory + "/.project";
@@ -259,8 +258,8 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::CreateProjectFile()
 {
-  cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  cmMakefile* mf = lg->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.project";
 
@@ -280,7 +279,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
     "<projectDescription>\n"
     "\t<name>" <<
-    this->GenerateProjectName(mf->GetProjectName(),
+    this->GenerateProjectName(lg->GetProjectName(),
                               mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                               this->GetPathBasename(this->HomeOutputDirectory))
     << "</name>\n"
@@ -696,8 +695,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 {
   std::set<std::string> emmited;
 
-  const cmMakefile* mf
-    = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
 
   const std::string filename = this->HomeOutputDirectory + "/.cproject";
 
@@ -1151,8 +1150,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   fout << "</cconfiguration>\n"
           "</storageModule>\n"
           "<storageModule moduleId=\"cdtBuildSystem\" version=\"4.0.0\">\n"
-          "<project id=\"" << this->EscapeForXML(mf->GetProjectName())
-       << ".null.1\" name=\"" << this->EscapeForXML(mf->GetProjectName())
+          "<project id=\"" << this->EscapeForXML(lg->GetProjectName())
+       << ".null.1\" name=\"" << this->EscapeForXML(lg->GetProjectName())
        << "\"/>\n"
           "</storageModule>\n"
           "</cproject>\n"
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f83b5cf..126e3e1 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -46,9 +46,9 @@ cmExtraKateGenerator::cmExtraKateGenerator()
 
 void cmExtraKateGenerator::Generate()
 {
-  const cmMakefile* mf
-     = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
-  this->ProjectName = this->GenerateProjectName(mf->GetProjectName(),
+  cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0];
+  const cmMakefile* mf = lg->GetMakefile();
+  this->ProjectName = this->GenerateProjectName(lg->GetProjectName(),
                           mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                           this->GetPathBasename(mf->GetHomeOutputDirectory()));
   this->UseNinja = (this->GlobalGenerator->GetName() == "Ninja");
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 11410a7..db8c470 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -79,7 +79,7 @@ void cmExtraSublimeTextGenerator::CreateProjectFile(
 {
   const cmMakefile* mf=lgs[0]->GetMakefile();
   std::string outputDir=mf->GetCurrentBinaryDirectory();
-  std::string projectName=mf->GetProjectName();
+  std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
                      outputDir + "/" + projectName + ".sublime-project";
@@ -302,7 +302,7 @@ void cmExtraSublimeTextGenerator::
     {
     fout << ",\n\t";
     }
-  fout << "\t{\n\t\t\t\"name\": \"" << makefile->GetProjectName() << " - " <<
+  fout << "\t{\n\t\t\t\"name\": \"" << lg->GetProjectName() << " - " <<
           targetName << "\",\n";
   fout << "\t\t\t\"cmd\": [" <<
           this->BuildMakeCommand(make, makefileName.c_str(), targetName) <<
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index c40f846..0c95be0 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -52,7 +52,7 @@ void cmGlobalKdevelopGenerator::Generate()
     cmMakefile* mf = it->second[0]->GetMakefile();
     std::string outputDir=mf->GetCurrentBinaryDirectory();
     std::string projectDir=mf->GetHomeDirectory();
-    std::string projectName=mf->GetProjectName();
+    std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
     std::string fileToOpen;
     const std::vector<cmLocalGenerator*>& lgs= it->second;
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 14de698..d5e9417 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -260,7 +260,7 @@ void cmGlobalVisualStudio6Generator
     }
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetMakefile()->GetProjectName();
+  fname += root->GetProjectName();
   fname += ".dsw";
   cmsys::ofstream fout(fname.c_str());
   if(!fout)
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 05da022..73a952b 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -362,10 +362,10 @@ void cmGlobalVisualStudio7Generator
     {
     return;
     }
-  this->CurrentProject = root->GetMakefile()->GetProjectName();
+  this->CurrentProject = root->GetProjectName();
   std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
-  fname += root->GetMakefile()->GetProjectName();
+  fname += root->GetProjectName();
   fname += ".sln";
   cmGeneratedFileStream fout(fname.c_str());
   fout.SetCopyIfDifferent(true);
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d45aa27..6a25ed0 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -250,7 +250,7 @@ cmGlobalVisualStudioGenerator
         {
         topLevelSlnName = mf->GetCurrentBinaryDirectory();
         topLevelSlnName += "/";
-        topLevelSlnName += mf->GetProjectName();
+        topLevelSlnName += this->LocalGenerators[0]->GetProjectName();
         topLevelSlnName += ".sln";
         }
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 3d52e3a..4d017ab 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -410,7 +410,7 @@ void cmGlobalXCodeGenerator::Generate()
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
-  this->CurrentProject = root->GetMakefile()->GetProjectName();
+  this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
@@ -3342,7 +3342,7 @@ bool cmGlobalXCodeGenerator
   this->RootObject->SetComment("Project object");
 
   std::string project_id = "PROJECT_";
-  project_id += root->GetMakefile()->GetProjectName();
+  project_id += root->GetProjectName();
   this->RootObject->SetId(this->GetOrCreateId(
     project_id.c_str(), this->RootObject->GetId()).c_str());
 
@@ -3729,7 +3729,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     }
   std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
   xcodeDir += "/";
-  xcodeDir += root->GetMakefile()->GetProjectName();
+  xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
   if(this->XcodeVersion > 20)
     {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6647894..b7833cd 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2431,6 +2431,11 @@ const char* cmLocalGenerator::GetFeature(const std::string& feature,
   return 0;
 }
 
+std::string cmLocalGenerator::GetProjectName() const
+{
+  return this->StateSnapshot.GetProjectName();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::ConstructComment(cmCustomCommandGenerator const& ccg,
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index d9623cb..b3bf8cd 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -182,6 +182,8 @@ public:
                              const std::string& config,
                              const std::string& lang);
 
+  std::string GetProjectName() const;
+
   /** Compute the language used to compile the given source file.  */
   std::string GetSourceFileLanguage(const cmSourceFile& source);
 
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index c46adc1..b1e1d3f 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -183,7 +183,7 @@ void cmLocalNinjaGenerator::WriteProjectHeader(std::ostream& os)
 {
   cmGlobalNinjaGenerator::WriteDivider(os);
   os
-    << "# Project: " << this->GetMakefile()->GetProjectName() << std::endl
+    << "# Project: " << this->GetProjectName() << std::endl
     << "# Configuration: " << this->ConfigName << std::endl
     ;
   cmGlobalNinjaGenerator::WriteDivider(os);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8187f414bcc4668940c2e0fe40d361389efdbe5
commit c8187f414bcc4668940c2e0fe40d361389efdbe5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:19:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:18 2015 +0200

    cmCPluginAPI: Inline code to get project name.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 7da334e..e3efcdd 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -116,7 +116,7 @@ const char* CCONV cmGetProjectName(void *arg)
 {
   cmMakefile *mf = static_cast<cmMakefile *>(arg);
   static std::string name;
-  name = mf->GetProjectName();
+  name = mf->GetStateSnapshot().GetProjectName();
   return name.c_str();
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c6e6dd3cef0befcd9a7f4c410a49a5afddd8afb
commit 8c6e6dd3cef0befcd9a7f4c410a49a5afddd8afb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:17:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:00:18 2015 +0200

    cmMakefile: Inline initialization of project name.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c060505..16c0c9a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1529,7 +1529,7 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
                     parent->GetProperty("LINK_DIRECTORIES"));
 
   // the initial project name
-  this->SetProjectName(parent->GetProjectName());
+  this->StateSnapshot.SetProjectName(parent->StateSnapshot.GetProjectName());
 
   // Copy include regular expressions.
   this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCPluginAPI.cxx                        |    2 +-
 Source/cmComputeLinkInformation.cxx            |    5 +-
 Source/cmCustomCommandGenerator.cxx            |    2 +-
 Source/cmDependsFortran.cxx                    |    2 +-
 Source/cmExportFileGenerator.cxx               |   28 ++++++-----
 Source/cmExtraCodeBlocksGenerator.cxx          |   24 +++++-----
 Source/cmExtraCodeLiteGenerator.cxx            |   24 +++++-----
 Source/cmExtraEclipseCDT4Generator.cxx         |   59 ++++++++++++------------
 Source/cmExtraEclipseCDT4Generator.h           |    2 +-
 Source/cmExtraKateGenerator.cxx                |   50 ++++++++++----------
 Source/cmExtraKateGenerator.h                  |    9 ++--
 Source/cmExtraSublimeTextGenerator.cxx         |   19 ++++----
 Source/cmGeneratorExpressionEvaluationFile.cxx |    2 +-
 Source/cmGhsMultiTargetGenerator.cxx           |    6 ++-
 Source/cmGlobalGenerator.cxx                   |    8 ++--
 Source/cmGlobalKdevelopGenerator.cxx           |    7 ++-
 Source/cmGlobalNinjaGenerator.cxx              |    5 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |   12 ++---
 Source/cmGlobalVisualStudio6Generator.cxx      |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx      |   12 +++--
 Source/cmGlobalVisualStudio8Generator.cxx      |    4 +-
 Source/cmGlobalVisualStudioGenerator.cxx       |    2 +-
 Source/cmGlobalXCodeGenerator.cxx              |   50 ++++++++++----------
 Source/cmInstallExportGenerator.cxx            |    2 +-
 Source/cmLocalGenerator.cxx                    |   25 ++++++++++
 Source/cmLocalGenerator.h                      |    8 ++++
 Source/cmLocalNinjaGenerator.cxx               |    4 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |   24 +++++-----
 Source/cmLocalVisualStudio6Generator.cxx       |   24 +++++-----
 Source/cmLocalVisualStudio7Generator.cxx       |   24 +++++-----
 Source/cmMakefile.cxx                          |    7 +--
 Source/cmMakefile.h                            |    5 --
 Source/cmMakefileTargetGenerator.cxx           |   24 +++++-----
 Source/cmNinjaNormalTargetGenerator.cxx        |    4 +-
 Source/cmNinjaTargetGenerator.cxx              |    5 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |    4 +-
 Source/cmVisualStudio10TargetGenerator.cxx     |   16 +++----
 37 files changed, 269 insertions(+), 243 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct  8 18:12:44 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  8 Oct 2015 18:12:44 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-262-g4eb9a03
Message-ID: <20151008221244.DD44EBE957@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4eb9a039a920ea1849555e7f8d2948d086838341 (commit)
       via  ee44be22cb26627698d5548171a4d102988a3452 (commit)
       via  4f767afe1d67bf10f749b0bc5ee5f2cb77ce9b40 (commit)
       via  c72d276a5a07fe850a534f092ace98a3a56afc4f (commit)
       via  c99b6cefbe0da8758f00638a9e18234f562a266c (commit)
      from  3e0c78f42556752c3257e63722c479439720fa85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4eb9a039a920ea1849555e7f8d2948d086838341
commit 4eb9a039a920ea1849555e7f8d2948d086838341
Merge: 3e0c78f ee44be2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 18:12:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 18:12:43 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    ee44be22 cmGeneratorTarget: Use local GetProperty method.
    4f767afe cmMakefile: Remove unneeded container clears.
    c72d276a C::B: Remove unused variables.
    c99b6cef cmLocalGenerator: Devirtualize method.

diff --cc Source/cmComputeLinkInformation.cxx
index 291a7eb,2064ad7..6afbeee
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@@ -1919,9 -1918,9 +1919,9 @@@ void cmComputeLinkInformation::GetRPath
    // build tree.
    bool linking_for_install =
      (for_install ||
-      this->Target->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
+      this->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
    bool use_install_rpath =
 -    (outputRuntime && this->Target->Target->HaveInstallTreeRPATH() &&
 +    (outputRuntime && this->Target->HaveInstallTreeRPATH() &&
       linking_for_install);
    bool use_build_rpath =
      (outputRuntime && this->Target->HaveBuildTreeRPATH(this->Config) &&

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee44be22cb26627698d5548171a4d102988a3452
commit ee44be22cb26627698d5548171a4d102988a3452
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 21:50:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:07:55 2015 +0200

    cmGeneratorTarget: Use local GetProperty method.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d35b566..2064ad7 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -284,7 +284,7 @@ cmComputeLinkInformation
 
   // Check whether we should skip dependencies on shared library files.
   this->LinkDependsNoShared =
-    this->Target->Target->GetPropertyAsBool("LINK_DEPENDS_NO_SHARED");
+    this->Target->GetPropertyAsBool("LINK_DEPENDS_NO_SHARED");
 
   // On platforms without import libraries there may be a special flag
   // to use when creating a plugin (module) that obtains symbols from
@@ -521,7 +521,7 @@ bool cmComputeLinkInformation::Compute()
   // Restore the target link type so the correct system runtime
   // libraries are found.
   const char* lss =
-      this->Target->Target->GetProperty("LINK_SEARCH_END_STATIC");
+      this->Target->GetProperty("LINK_SEARCH_END_STATIC");
   if(cmSystemTools::IsOn(lss))
     {
     this->SetCurrentLinkType(LinkStatic);
@@ -860,7 +860,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
 
   // Lookup the starting link type from the target (linked statically?).
   const char* lss =
-      this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC");
+      this->Target->GetProperty("LINK_SEARCH_START_STATIC");
   this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared;
   this->CurrentLinkType = this->StartLinkType;
 }
@@ -1918,7 +1918,7 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
   // build tree.
   bool linking_for_install =
     (for_install ||
-     this->Target->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
+     this->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
   bool use_install_rpath =
     (outputRuntime && this->Target->Target->HaveInstallTreeRPATH() &&
      linking_for_install);
@@ -1928,14 +1928,14 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
   bool use_link_rpath =
     outputRuntime && linking_for_install &&
     !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH") &&
-    this->Target->Target->GetPropertyAsBool("INSTALL_RPATH_USE_LINK_PATH");
+    this->Target->GetPropertyAsBool("INSTALL_RPATH_USE_LINK_PATH");
 
   // Construct the RPATH.
   std::set<std::string> emitted;
   if(use_install_rpath)
     {
     const char* install_rpath =
-        this->Target->Target->GetProperty("INSTALL_RPATH");
+        this->Target->GetProperty("INSTALL_RPATH");
     cmCLI_ExpandListUnique(install_rpath, runtimeDirs, emitted);
     }
   if(use_build_rpath || use_link_rpath)
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3fb0dc7..d633a17 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -381,7 +381,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
     for(std::vector<std::string>::const_iterator it = props.begin();
         it != props.end(); ++it)
       {
-      if (const char* outNameProp = this->Target->GetProperty(*it))
+      if (const char* outNameProp = this->GetProperty(*it))
         {
         outName = outNameProp;
         break;
@@ -555,12 +555,12 @@ const char* cmGeneratorTarget::GetFeature(const std::string& feature,
     std::string featureConfig = feature;
     featureConfig += "_";
     featureConfig += cmSystemTools::UpperCase(config);
-    if(const char* value = this->Target->GetProperty(featureConfig))
+    if(const char* value = this->GetProperty(featureConfig))
       {
       return value;
       }
     }
-  if(const char* value = this->Target->GetProperty(feature))
+  if(const char* value = this->GetProperty(feature))
     {
     return value;
     }
@@ -793,7 +793,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
                                         "SYSTEM_INCLUDE_DIRECTORIES", 0, 0);
 
     bool excludeImported
-                = this->Target->GetPropertyAsBool("NO_SYSTEM_FROM_IMPORTED");
+                = this->GetPropertyAsBool("NO_SYSTEM_FROM_IMPORTED");
 
     std::vector<std::string> result;
     for (std::set<std::string>::const_iterator
@@ -1106,13 +1106,13 @@ cmGeneratorTarget::GetCompilePDBName(const std::string& config) const
   std::string configUpper = cmSystemTools::UpperCase(config);
   std::string configProp = "COMPILE_PDB_NAME_";
   configProp += configUpper;
-  const char* config_name = this->Target->GetProperty(configProp);
+  const char* config_name = this->GetProperty(configProp);
   if(config_name && *config_name)
     {
     return prefix + config_name + ".pdb";
     }
 
-  const char* name = this->Target->GetProperty("COMPILE_PDB_NAME");
+  const char* name = this->GetProperty("COMPILE_PDB_NAME");
   if(name && *name)
     {
     return prefix + name + ".pdb";
@@ -1357,7 +1357,7 @@ std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config,
   std::string fpath;
   fpath += this->GetOutputName(config, false);
   fpath += ".";
-  const char *ext = this->Target->GetProperty("BUNDLE_EXTENSION");
+  const char *ext = this->GetProperty("BUNDLE_EXTENSION");
   if (!ext)
     {
     if (this->Target->IsXCTestOnApple())
@@ -2278,11 +2278,11 @@ void cmGeneratorTarget::GetAppleArchs(const std::string& config,
     {
     std::string defVarName = "OSX_ARCHITECTURES_";
     defVarName += cmSystemTools::UpperCase(config);
-    archs = this->Target->GetProperty(defVarName);
+    archs = this->GetProperty(defVarName);
     }
   if(!archs)
     {
-    archs = this->Target->GetProperty("OSX_ARCHITECTURES");
+    archs = this->GetProperty("OSX_ARCHITECTURES");
     }
   if(archs)
     {
@@ -2785,7 +2785,7 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list,
     {
     std::string configPropName = "COMPILE_DEFINITIONS_"
                                         + cmSystemTools::UpperCase(config);
-    const char *configProp = this->Target->GetProperty(configPropName);
+    const char *configProp = this->GetProperty(configPropName);
     if (configProp)
       {
       switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0043))
@@ -3369,7 +3369,7 @@ void cmGeneratorTarget::ConstructSourceFileFlags() const
   this->SourceFileFlagsConstructed = true;
 
   // Process public headers to mark the source files.
-  if(const char* files = this->Target->GetProperty("PUBLIC_HEADER"))
+  if(const char* files = this->GetProperty("PUBLIC_HEADER"))
     {
     std::vector<std::string> relFiles;
     cmSystemTools::ExpandListArgument(files, relFiles);
@@ -3387,7 +3387,7 @@ void cmGeneratorTarget::ConstructSourceFileFlags() const
 
   // Process private headers after public headers so that they take
   // precedence if a file is listed in both.
-  if(const char* files = this->Target->GetProperty("PRIVATE_HEADER"))
+  if(const char* files = this->GetProperty("PRIVATE_HEADER"))
     {
     std::vector<std::string> relFiles;
     cmSystemTools::ExpandListArgument(files, relFiles);
@@ -3404,7 +3404,7 @@ void cmGeneratorTarget::ConstructSourceFileFlags() const
     }
 
   // Mark sources listed as resources.
-  if(const char* files = this->Target->GetProperty("RESOURCE"))
+  if(const char* files = this->GetProperty("RESOURCE"))
     {
     std::vector<std::string> relFiles;
     cmSystemTools::ExpandListArgument(files, relFiles);
@@ -4813,7 +4813,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLanguages(
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HaveBuildTreeRPATH(const std::string& config) const
 {
-  if (this->Target->GetPropertyAsBool("SKIP_BUILD_RPATH"))
+  if (this->GetPropertyAsBool("SKIP_BUILD_RPATH"))
     {
     return false;
     }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index eb4dfee..be69b2b 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2033,7 +2033,7 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
                                    cmGeneratorTarget* target) const
 {
   if(target->GetType() == cmTarget::INTERFACE_LIBRARY
-      || target->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
+      || target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
     {
     // This target is excluded from its directory.
     return true;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index cb13fcf..4b78601 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -937,7 +937,7 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
       cmLocalGenerator* tlg = gt->GetLocalGenerator();
 
       if(gt->GetType() == cmTarget::INTERFACE_LIBRARY
-          || gt->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
+          || gt->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
         continue;
         }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 30cf175..4130366 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -823,7 +823,7 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
 
   // Don't handle OSX Bundles.
   if(this->Target->Target->GetMakefile()->IsOn("APPLE") &&
-     this->Target->Target->GetPropertyAsBool("MACOSX_BUNDLE"))
+     this->Target->GetPropertyAsBool("MACOSX_BUNDLE"))
     {
     return;
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f767afe1d67bf10f749b0bc5ee5f2cb77ce9b40
commit 4f767afe1d67bf10f749b0bc5ee5f2cb77ce9b40
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 22:17:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:05:14 2015 +0200

    cmMakefile: Remove unneeded container clears.
    
    No need to do that in a destructor.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c060505..13baa12 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -161,9 +161,6 @@ cmMakefile::~cmMakefile()
   cmDeleteAll(this->FinalPassCommands);
   cmDeleteAll(this->FunctionBlockers);
   cmDeleteAll(this->EvaluationFiles);
-  this->EvaluationFiles.clear();
-
-  this->FunctionBlockers.clear();
 }
 
 //----------------------------------------------------------------------------

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c72d276a5a07fe850a534f092ace98a3a56afc4f
commit c72d276a5a07fe850a534f092ace98a3a56afc4f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:25:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:04:50 2015 +0200

    C::B: Remove unused variables.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 7915a6e..609764c 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -693,8 +693,6 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
     compilerIdVar = "CMAKE_C_COMPILER_ID";
     }
 
-  std::string hostSystemName = mf->GetSafeDefinition("CMAKE_HOST_SYSTEM_NAME");
-  std::string systemName = mf->GetSafeDefinition("CMAKE_SYSTEM_NAME");
   std::string compilerId = mf->GetSafeDefinition(compilerIdVar);
   std::string compiler = "gcc";  // default to gcc
   if (compilerId == "MSVC")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c99b6cefbe0da8758f00638a9e18234f562a266c
commit c99b6cefbe0da8758f00638a9e18234f562a266c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 00:37:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:03:40 2015 +0200

    cmLocalGenerator: Devirtualize method.

diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 33fede1..e8b501f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -187,7 +187,7 @@ public:
 
   // Fill the vector with the target names for the object files,
   // preprocessed files and assembly files.
-  virtual void GetIndividualFileTargets(std::vector<std::string>&) {}
+  void GetIndividualFileTargets(std::vector<std::string>&) {}
 
   // Create a struct to hold the varibles passed into
   // ExpandRuleVariables

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkInformation.cxx       |   12 ++++++------
 Source/cmExtraCodeBlocksGenerator.cxx     |    2 --
 Source/cmGeneratorTarget.cxx              |   28 ++++++++++++++--------------
 Source/cmGlobalGenerator.cxx              |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx |    2 +-
 Source/cmInstallTargetGenerator.cxx       |    2 +-
 Source/cmLocalGenerator.h                 |    2 +-
 Source/cmMakefile.cxx                     |    3 ---
 8 files changed, 24 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct  8 18:30:53 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  8 Oct 2015 18:30:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-264-g053a8bd
Message-ID: <20151008223053.2D7B8BFCE7@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  053a8bd3160f5b5a0867ca8bc42fe8314b50189b (commit)
       via  f118abb78dd201ac5d0f600d13cd500b83e42217 (commit)
      from  4eb9a039a920ea1849555e7f8d2948d086838341 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=053a8bd3160f5b5a0867ca8bc42fe8314b50189b
commit 053a8bd3160f5b5a0867ca8bc42fe8314b50189b
Merge: 4eb9a03 f118abb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 18:30:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 18:30:52 2015 -0400

    Merge topic 'use-generator-target' into next
    
    f118abb7 Windows fixups.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f118abb78dd201ac5d0f600d13cd500b83e42217
commit f118abb78dd201ac5d0f600d13cd500b83e42217
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 00:30:27 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:30:27 2015 +0200

    Windows fixups.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index ab215d1..862ab2d 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -805,7 +805,11 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
   // VS6 forgets to create the output directory for archives if it
   // differs from the intermediate directory.
   if(target.GetType() != cmTarget::STATIC_LIBRARY) { return pcc; }
-  std::string outDir = target.GetDirectory(config, false);
+
+  cmGeneratorTarget* gt =
+    this->GlobalGenerator->GetGeneratorTarget(&target);
+
+  std::string outDir = gt->GetDirectory(config, false);
 
   // Add a pre-link event to create the directory.
   cmCustomCommandLine command;
@@ -1363,20 +1367,20 @@ void cmLocalVisualStudio6Generator
 #ifdef CM_USE_OLD_VS6
     outputDirOld =
       removeQuotes(this->ConvertToOutputFormat
-                   (target.GetDirectory().c_str(), SHELL));
+                   (gt->GetDirectory().c_str(), SHELL));
 #endif
     outputDirDebug =
         removeQuotes(this->ConvertToOutputFormat(
-                       target.GetDirectory("Debug").c_str(), SHELL));
+                       gt->GetDirectory("Debug").c_str(), SHELL));
     outputDirRelease =
         removeQuotes(this->ConvertToOutputFormat(
-                 target.GetDirectory("Release").c_str(), SHELL));
+                 gt->GetDirectory("Release").c_str(), SHELL));
     outputDirMinSizeRel =
         removeQuotes(this->ConvertToOutputFormat(
-                 target.GetDirectory("MinSizeRel").c_str(), SHELL));
+                 gt->GetDirectory("MinSizeRel").c_str(), SHELL));
     outputDirRelWithDebInfo =
         removeQuotes(this->ConvertToOutputFormat(
-                 target.GetDirectory("RelWithDebInfo").c_str(), SHELL));
+                 gt->GetDirectory("RelWithDebInfo").c_str(), SHELL));
     }
   else if(target.GetType() == cmTarget::OBJECT_LIBRARY)
     {
@@ -1424,12 +1428,12 @@ void cmLocalVisualStudio6Generator
      target.GetType() == cmTarget::MODULE_LIBRARY ||
      target.GetType() == cmTarget::EXECUTABLE)
     {
-    std::string fullPathImpDebug = target.GetDirectory("Debug", true);
-    std::string fullPathImpRelease = target.GetDirectory("Release", true);
+    std::string fullPathImpDebug = gt->GetDirectory("Debug", true);
+    std::string fullPathImpRelease = gt->GetDirectory("Release", true);
     std::string fullPathImpMinSizeRel =
-      target.GetDirectory("MinSizeRel", true);
+      gt->GetDirectory("MinSizeRel", true);
     std::string fullPathImpRelWithDebInfo =
-      target.GetDirectory("RelWithDebInfo", true);
+      gt->GetDirectory("RelWithDebInfo", true);
     fullPathImpDebug += "/";
     fullPathImpRelease += "/";
     fullPathImpMinSizeRel += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 8924564..e3c28ee 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -792,7 +792,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     {
     std::string const& outDir =
       target.GetType() == cmTarget::OBJECT_LIBRARY?
-      intermediateDir : target.GetDirectory(configName);
+      intermediateDir : gt->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
     }
@@ -1004,7 +1004,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
     // Check if we need the FAT32 workaround.
     // Check the filesystem type where the target will be written.
-    if (cmLVS6G_IsFAT(target.GetDirectory(configName).c_str()))
+    if (cmLVS6G_IsFAT(gt->GetDirectory(configName).c_str()))
       {
       // Add a flag telling the manifest tool to use a workaround
       // for FAT32 file systems, which can cause an empty manifest
@@ -1130,7 +1130,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     case cmTarget::STATIC_LIBRARY:
     {
     std::string targetNameFull = gt->GetFullName(configName);
-    std::string libpath = target.GetDirectory(configName);
+    std::string libpath = gt->GetDirectory(configName);
     libpath += "/";
     libpath += targetNameFull;
     const char* tool = "VCLibrarianTool";
@@ -1210,7 +1210,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = target.GetDirectory(configName);
+    temp = gt->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
@@ -1220,7 +1220,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
-    temp = target.GetPDBDirectory(configName);
+    temp = gt->GetPDBDirectory(configName);
     temp += "/";
     temp += targetNamePDB;
     fout << "\t\t\t\tProgramDatabaseFile=\"" <<
@@ -1248,7 +1248,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal  << "\"\n";
       }
-    temp = target.GetDirectory(configName, true);
+    temp = gt->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1309,7 +1309,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = target.GetDirectory(configName);
+    temp = gt->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
@@ -1320,7 +1320,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
     std::string path = this->ConvertToXMLOutputPathSingle(
-      target.GetPDBDirectory(configName).c_str());
+      gt->GetPDBDirectory(configName).c_str());
     fout << "\t\t\t\tProgramDatabaseFile=\""
          << path << "/" << targetNamePDB
          << "\"\n";
@@ -1367,7 +1367,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal << "\"";
       }
-    temp = target.GetDirectory(configName, true);
+    temp = gt->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index c0072de..c830a82 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -92,8 +92,10 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
   if(target.GetType() != cmTarget::EXECUTABLE &&
      !(isFortran && target.GetType() == cmTarget::SHARED_LIBRARY))
     { return pcc; }
-  std::string outDir = target.GetDirectory(config, false);
-  std::string impDir = target.GetDirectory(config, true);
+  cmGeneratorTarget* gt =
+      this->GetGlobalGenerator()->GetGeneratorTarget(&target);
+  std::string outDir = gt->GetDirectory(config, false);
+  std::string impDir = gt->GetDirectory(config, true);
   if(impDir == outDir) { return pcc; }
 
   // Add a pre-build event to create the directory.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..a4b0bc3 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1780,7 +1780,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
         }
       else
         {
-        outDir = this->Target->GetDirectory(config->c_str()) + "/";
+        outDir = this->GeneratorTarget->GetDirectory(config->c_str()) + "/";
         targetNameFull = this->GeneratorTarget->GetFullName(config->c_str());
         }
       this->ConvertToWindowsSlash(intermediateDir);
@@ -2581,10 +2581,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       {
       linkOptions.AddFlag("GenerateDebugInformation", "false");
       }
-    std::string pdb = this->Target->GetPDBDirectory(config.c_str());
+    std::string pdb = this->GeneratorTarget->GetPDBDirectory(config.c_str());
     pdb += "/";
     pdb += targetNamePDB;
-    std::string imLib = this->Target->GetDirectory(config.c_str(), true);
+    std::string imLib =
+        this->GeneratorTarget->GetDirectory(config.c_str(), true);
     imLib += "/";
     imLib += targetNameImport;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx   |   24 ++++++++++++++----------
 Source/cmLocalVisualStudio7Generator.cxx   |   18 +++++++++---------
 Source/cmLocalVisualStudioGenerator.cxx    |    6 ++++--
 Source/cmVisualStudio10TargetGenerator.cxx |    7 ++++---
 4 files changed, 31 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct  8 18:54:53 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  8 Oct 2015 18:54:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-266-g0514163
Message-ID: <20151008225453.7C1D0BFC4D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  05141639287767e46a89e4f68b6d91f6fffd5e06 (commit)
       via  34db99de453188fa908dbd2793fbeb8b9472817d (commit)
      from  053a8bd3160f5b5a0867ca8bc42fe8314b50189b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05141639287767e46a89e4f68b6d91f6fffd5e06
commit 05141639287767e46a89e4f68b6d91f6fffd5e06
Merge: 053a8bd 34db99d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 18:54:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 18:54:52 2015 -0400

    Merge topic 'use-generator-target' into next
    
    34db99de Mac fixups.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34db99de453188fa908dbd2793fbeb8b9472817d
commit 34db99de453188fa908dbd2793fbeb8b9472817d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 00:54:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:54:27 2015 +0200

    Mac fixups.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9f71cc5..0370d74 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1977,7 +1977,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       if(!gtgt->UsesDefaultOutputDir(configName, false))
         {
-        std::string pncdir = target.GetDirectory(configName);
+        std::string pncdir = gtgt->GetDirectory(configName);
         buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
                                     this->CreateString(pncdir.c_str()));
         }
@@ -1986,7 +1986,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       buildSettings->AddAttribute("OBJROOT",
                                   this->CreateString(pndir.c_str()));
-      pndir = target.GetDirectory(configName);
+      pndir = gtgt->GetDirectory(configName);
       }
 
     if(target.IsFrameworkOnApple() || target.IsCFBundleOnApple())

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct  8 19:01:48 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  8 Oct 2015 19:01:48 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-268-g3ac7f94
Message-ID: <20151008230148.4873EBFE28@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3ac7f941aecd14571dd4f2100407b4136ef8c676 (commit)
       via  d9e8923e6028730754720cd3234c989757707e83 (commit)
      from  05141639287767e46a89e4f68b6d91f6fffd5e06 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ac7f941aecd14571dd4f2100407b4136ef8c676
commit 3ac7f941aecd14571dd4f2100407b4136ef8c676
Merge: 0514163 d9e8923
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 19:01:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 19:01:47 2015 -0400

    Merge topic 'use-generator-target' into next
    
    d9e8923e fixup! cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9e8923e6028730754720cd3234c989757707e83
commit d9e8923e6028730754720cd3234c989757707e83
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 01:01:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:01:05 2015 +0200

    fixup! cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index b19112d..70997bf 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -56,7 +56,8 @@ void cmLocalXCodeGenerator::Generate()
       iter != targets.end(); ++iter)
     {
     cmTarget* t = &iter->second;
-    t->HasMacOSXRpathInstallNameDir("");
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
     }
 }
 
@@ -70,7 +71,8 @@ void cmLocalXCodeGenerator::GenerateInstallRules()
       iter != targets.end(); ++iter)
     {
     cmTarget* t = &iter->second;
-    t->HasMacOSXRpathInstallNameDir("");
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
     }
 }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalXCodeGenerator.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct  8 19:05:27 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  8 Oct 2015 19:05:27 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-279-gb43dac4
Message-ID: <20151008230527.D6B4FBFEA3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b43dac4dc04eb2eadb457a82c1cf1ac9d61be8a2 (commit)
       via  656975894b67e721a11b0446d5933a41edb6204d (commit)
       via  7be66db4582e5163abec632e5a021dd9d9475278 (commit)
       via  22f0a1583103ba74f52c4563a04463001417a3ab (commit)
       via  c5718217ad242ca0fc6e6b15f4ee670e4a332c93 (commit)
       via  bf5eb4a3f394051d9245a7f0c3a18b4a1d2c948a (commit)
       via  49017cddab23702d8228a195f64934e61ab7667e (commit)
       via  0bae4a416f9f1b9090499d26f8508660f4f3fc95 (commit)
       via  1abc20d81df3ee9845904b356960870526fe3276 (commit)
       via  50dc9b44404f4f31aa24cf17247f10539c3807b2 (commit)
       via  8b0168863ed121c7d9f05e3282e2f59490ff6c42 (commit)
      from  3ac7f941aecd14571dd4f2100407b4136ef8c676 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b43dac4dc04eb2eadb457a82c1cf1ac9d61be8a2
commit b43dac4dc04eb2eadb457a82c1cf1ac9d61be8a2
Merge: 3ac7f94 6569758
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 19:05:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 19:05:25 2015 -0400

    Merge topic 'use-generator-target' into next
    
    65697589 cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.
    7be66db4 cmGeneratorTarget: Move GetOutputTargetType from cmTarget.
    22f0a158 cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
    c5718217 cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.
    bf5eb4a3 cmGeneratorTarget: Move ComputePDBOutputDir from cmTarget.
    49017cdd cmGeneratorTarget: Move IsNullImpliedByLinkLibraries from cmTarget.
    0bae4a41 cmGeneratorTarget: Move output info from cmTarget.
    1abc20d8 cmGeneratorTarget: Move UsesDefaultOutputDir from cmTarget.
    50dc9b44 cmGeneratorTarget: Move GetPDBDirectory from cmTarget.
    8b016886 cmGeneratorTarget: Move GetDirectory from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=656975894b67e721a11b0446d5933a41edb6204d
commit 656975894b67e721a11b0446d5933a41edb6204d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:19:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:39 2015 +0200

    cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index b8e2284..9371546 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1101,9 +1101,10 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
     this->SharedLibrariesLinked.insert(target);
     }
 
+  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Handle case of an imported shared library with no soname.
   if(this->NoSONameUsesPath &&
-     target->IsImportedSharedLibWithoutSOName(this->Config))
+     gtgt->IsImportedSharedLibWithoutSOName(this->Config))
     {
     this->AddSharedLibNoSOName(item);
     return;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a588bb6..c4a083d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1338,6 +1338,19 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
   return false;
 }
 
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName(
+                                          const std::string& config) const
+{
+  if(this->IsImported() && this->GetType() == cmTarget::SHARED_LIBRARY)
+    {
+    if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
+      {
+      return info->NoSOName;
+      }
+    }
+  return false;
+}
 
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 0e41661..49de632 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -415,6 +415,10 @@ public:
   /** Whether this library defaults to \@rpath.  */
   bool MacOSXRpathInstallNameDirDefault() const;
 
+  /** Test for special case of a third-party shared library that has
+      no soname at all.  */
+  bool IsImportedSharedLibWithoutSOName(const std::string& config) const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 88bda67..3de7efe 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2178,20 +2178,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsImportedSharedLibWithoutSOName(
-                                          const std::string& config) const
-{
-  if(this->IsImported() && this->GetType() == cmTarget::SHARED_LIBRARY)
-    {
-    if(cmTarget::ImportInfo const* info = this->GetImportInfo(config))
-      {
-      return info->NoSOName;
-      }
-    }
-  return false;
-}
-
-//----------------------------------------------------------------------------
 std::string
 cmTarget::GetFullNameImported(const std::string& config, bool implib) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 6ba9772..16d0121 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -244,10 +244,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Test for special case of a third-party shared library that has
-      no soname at all.  */
-  bool IsImportedSharedLibWithoutSOName(const std::string& config) const;
-
   /** Does this target have a GNU implib to convert to MS format?  */
   bool HasImplibGNUtoMS() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7be66db4582e5163abec632e5a021dd9d9475278
commit 7be66db4582e5163abec632e5a021dd9d9475278
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:11:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:39 2015 +0200

    cmGeneratorTarget: Move GetOutputTargetType from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 841f818..a588bb6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -340,6 +340,62 @@ const char *cmGeneratorTarget::GetProperty(const std::string& prop) const
 }
 
 //----------------------------------------------------------------------------
+const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
+{
+  switch(this->GetType())
+    {
+    case cmTarget::SHARED_LIBRARY:
+      if(this->Target->IsDLLPlatform())
+        {
+        if(implib)
+          {
+          // A DLL import library is treated as an archive target.
+          return "ARCHIVE";
+          }
+        else
+          {
+          // A DLL shared library is treated as a runtime target.
+          return "RUNTIME";
+          }
+        }
+      else
+        {
+        // For non-DLL platforms shared libraries are treated as
+        // library targets.
+        return "LIBRARY";
+        }
+    case cmTarget::STATIC_LIBRARY:
+      // Static libraries are always treated as archive targets.
+      return "ARCHIVE";
+    case cmTarget::MODULE_LIBRARY:
+      if(implib)
+        {
+        // Module libraries are always treated as library targets.
+        return "ARCHIVE";
+        }
+      else
+        {
+        // Module import libraries are treated as archive targets.
+        return "LIBRARY";
+        }
+    case cmTarget::EXECUTABLE:
+      if(implib)
+        {
+        // Executable import libraries are treated as archive targets.
+        return "ARCHIVE";
+        }
+      else
+        {
+        // Executables are always treated as runtime targets.
+        return "RUNTIME";
+        }
+    default:
+      break;
+    }
+  return "";
+}
+
+//----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetOutputName(const std::string& config,
                                              bool implib) const
 {
@@ -355,7 +411,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 
     // Compute output name.
     std::vector<std::string> props;
-    std::string type = this->Target->GetOutputTargetType(implib);
+    std::string type = this->GetOutputTargetType(implib);
     std::string configUpper = cmSystemTools::UpperCase(config);
     if(!type.empty() && !configUpper.empty())
       {
@@ -4661,7 +4717,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
 
   // Look for a target property defining the target output directory
   // based on the target type.
-  std::string targetTypeName = this->Target->GetOutputTargetType(implib);
+  std::string targetTypeName = this->GetOutputTargetType(implib);
   const char* propertyName = 0;
   std::string propertyNameStr = targetTypeName;
   if(!propertyNameStr.empty())
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index fd4ee56..0e41661 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -439,6 +439,9 @@ private:
   typedef std::map<std::string, LinkClosure> LinkClosureMapType;
   mutable LinkClosureMapType LinkClosureMap;
 
+  // Returns ARCHIVE, LIBRARY, or RUNTIME based on platform and type.
+  const char* GetOutputTargetType(bool implib) const;
+
   struct CompatibleInterfacesBase
   {
     std::set<std::string> PropsBool;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0b2d9fc..88bda67 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2272,62 +2272,6 @@ void cmTarget::SetPropertyDefault(const std::string& property,
 }
 
 //----------------------------------------------------------------------------
-const char* cmTarget::GetOutputTargetType(bool implib) const
-{
-  switch(this->GetType())
-    {
-    case cmTarget::SHARED_LIBRARY:
-      if(this->DLLPlatform)
-        {
-        if(implib)
-          {
-          // A DLL import library is treated as an archive target.
-          return "ARCHIVE";
-          }
-        else
-          {
-          // A DLL shared library is treated as a runtime target.
-          return "RUNTIME";
-          }
-        }
-      else
-        {
-        // For non-DLL platforms shared libraries are treated as
-        // library targets.
-        return "LIBRARY";
-        }
-    case cmTarget::STATIC_LIBRARY:
-      // Static libraries are always treated as archive targets.
-      return "ARCHIVE";
-    case cmTarget::MODULE_LIBRARY:
-      if(implib)
-        {
-        // Module libraries are always treated as library targets.
-        return "ARCHIVE";
-        }
-      else
-        {
-        // Module import libraries are treated as archive targets.
-        return "LIBRARY";
-        }
-    case cmTarget::EXECUTABLE:
-      if(implib)
-        {
-        // Executable import libraries are treated as archive targets.
-        return "ARCHIVE";
-        }
-      else
-        {
-        // Executables are always treated as runtime targets.
-        return "RUNTIME";
-        }
-    default:
-      break;
-    }
-  return "";
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetFrameworkVersion() const
 {
   assert(this->GetType() != INTERFACE_LIBRARY);
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3cbee76..6ba9772 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -415,9 +415,6 @@ private:
   void SetPropertyDefault(const std::string& property,
                           const char* default_value);
 
-  // Returns ARCHIVE, LIBRARY, or RUNTIME based on platform and type.
-  const char* GetOutputTargetType(bool implib) const;
-
   std::string GetFullNameImported(const std::string& config,
                                   bool implib) const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22f0a1583103ba74f52c4563a04463001417a3ab
commit 22f0a1583103ba74f52c4563a04463001417a3ab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:07:03 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:38 2015 +0200

    cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d907dd0..b8e2284 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1783,12 +1783,13 @@ void
 cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
                                                 cmTarget const* target)
 {
+  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Ignore targets on Apple where install_name is not @rpath.
   // The dependenty library can be found with other means such as
   // @loader_path or full paths.
   if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
     {
-    if(!target->HasMacOSXRpathInstallNameDir(this->Config))
+    if(!gtgt->HasMacOSXRpathInstallNameDir(this->Config))
       {
       return;
       }
@@ -1810,7 +1811,6 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
 
   // Try to get the soname of the library.  Only files with this name
   // could possibly conflict.
-  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   std::string soName = gtgt->GetSOName(this->Config);
   const char* soname = soName.empty()? 0 : soName.c_str();
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6ad6c69..841f818 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1284,6 +1284,119 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
 
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
+    const std::string& config) const
+{
+  bool install_name_is_rpath = false;
+  bool macosx_rpath = false;
+
+  if(!this->IsImported())
+    {
+    if(this->GetType() != cmTarget::SHARED_LIBRARY)
+      {
+      return false;
+      }
+    const char* install_name = this->GetProperty("INSTALL_NAME_DIR");
+    bool use_install_name =
+      this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH");
+    if(install_name && use_install_name &&
+       std::string(install_name) == "@rpath")
+      {
+      install_name_is_rpath = true;
+      }
+    else if(install_name && use_install_name)
+      {
+      return false;
+      }
+    if(!install_name_is_rpath)
+      {
+      macosx_rpath = this->MacOSXRpathInstallNameDirDefault();
+      }
+    }
+  else
+    {
+    // Lookup the imported soname.
+    if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
+      {
+      if(!info->NoSOName && !info->SOName.empty())
+        {
+        if(info->SOName.find("@rpath/") == 0)
+          {
+          install_name_is_rpath = true;
+          }
+        }
+      else
+        {
+        std::string install_name;
+        cmSystemTools::GuessLibraryInstallName(info->Location, install_name);
+        if(install_name.find("@rpath") != std::string::npos)
+          {
+          install_name_is_rpath = true;
+          }
+        }
+      }
+    }
+
+  if(!install_name_is_rpath && !macosx_rpath)
+    {
+    return false;
+    }
+
+  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
+    {
+    std::ostringstream w;
+    w << "Attempting to use";
+    if(macosx_rpath)
+      {
+      w << " MACOSX_RPATH";
+      }
+    else
+      {
+      w << " @rpath";
+      }
+    w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.";
+    w << "  This could be because you are using a Mac OS X version";
+    w << " less than 10.5 or because CMake's platform configuration is";
+    w << " corrupt.";
+    cmake* cm = this->Makefile->GetCMakeInstance();
+    cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->Target->GetBacktrace());
+    }
+
+  return true;
+}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const
+{
+  // we can't do rpaths when unsupported
+  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
+    {
+    return false;
+    }
+
+  const char* macosx_rpath_str = this->GetProperty("MACOSX_RPATH");
+  if(macosx_rpath_str)
+    {
+    return this->GetPropertyAsBool("MACOSX_RPATH");
+    }
+
+  cmPolicies::PolicyStatus cmp0042 = this->Target->GetPolicyStatusCMP0042();
+
+  if(cmp0042 == cmPolicies::WARN)
+    {
+    this->Makefile->GetGlobalGenerator()->
+      AddCMP0042WarnTarget(this->GetName());
+    }
+
+  if(cmp0042 == cmPolicies::NEW)
+    {
+    return true;
+    }
+
+  return false;
+}
+
+//----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetSOName(const std::string& config) const
 {
   if(this->Target->IsImported())
@@ -1428,7 +1541,7 @@ cmGeneratorTarget::GetInstallNameDirForBuildTree(
      !this->GetPropertyAsBool("SKIP_BUILD_RPATH"))
     {
     std::string dir;
-    if(this->Target->MacOSXRpathInstallNameDirDefault())
+    if(this->MacOSXRpathInstallNameDirDefault())
       {
       dir = "@rpath";
       }
@@ -1464,7 +1577,7 @@ std::string cmGeneratorTarget::GetInstallNameDirForInstallTree() const
       }
     if(!install_name_dir)
       {
-      if(this->Target->MacOSXRpathInstallNameDirDefault())
+      if(this->MacOSXRpathInstallNameDirDefault())
         {
         dir = "@rpath/";
         }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f068cae..fd4ee56 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -409,6 +409,12 @@ public:
 
   bool HaveInstallTreeRPATH() const;
 
+  /** Whether this library has \@rpath and platform supports it.  */
+  bool HasMacOSXRpathInstallNameDir(const std::string& config) const;
+
+  /** Whether this library defaults to \@rpath.  */
+  bool MacOSXRpathInstallNameDirDefault() const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index b19112d..70997bf 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -56,7 +56,8 @@ void cmLocalXCodeGenerator::Generate()
       iter != targets.end(); ++iter)
     {
     cmTarget* t = &iter->second;
-    t->HasMacOSXRpathInstallNameDir("");
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
     }
 }
 
@@ -70,7 +71,8 @@ void cmLocalXCodeGenerator::GenerateInstallRules()
       iter != targets.end(); ++iter)
     {
     cmTarget* t = &iter->second;
-    t->HasMacOSXRpathInstallNameDir("");
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
     }
 }
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index dd1d405..0b2d9fc 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2178,118 +2178,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HasMacOSXRpathInstallNameDir(const std::string& config) const
-{
-  bool install_name_is_rpath = false;
-  bool macosx_rpath = false;
-
-  if(!this->IsImportedTarget)
-    {
-    if(this->GetType() != cmTarget::SHARED_LIBRARY)
-      {
-      return false;
-      }
-    const char* install_name = this->GetProperty("INSTALL_NAME_DIR");
-    bool use_install_name =
-      this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH");
-    if(install_name && use_install_name &&
-       std::string(install_name) == "@rpath")
-      {
-      install_name_is_rpath = true;
-      }
-    else if(install_name && use_install_name)
-      {
-      return false;
-      }
-    if(!install_name_is_rpath)
-      {
-      macosx_rpath = this->MacOSXRpathInstallNameDirDefault();
-      }
-    }
-  else
-    {
-    // Lookup the imported soname.
-    if(cmTarget::ImportInfo const* info = this->GetImportInfo(config))
-      {
-      if(!info->NoSOName && !info->SOName.empty())
-        {
-        if(info->SOName.find("@rpath/") == 0)
-          {
-          install_name_is_rpath = true;
-          }
-        }
-      else
-        {
-        std::string install_name;
-        cmSystemTools::GuessLibraryInstallName(info->Location, install_name);
-        if(install_name.find("@rpath") != std::string::npos)
-          {
-          install_name_is_rpath = true;
-          }
-        }
-      }
-    }
-
-  if(!install_name_is_rpath && !macosx_rpath)
-    {
-    return false;
-    }
-
-  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
-    {
-    std::ostringstream w;
-    w << "Attempting to use";
-    if(macosx_rpath)
-      {
-      w << " MACOSX_RPATH";
-      }
-    else
-      {
-      w << " @rpath";
-      }
-    w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.";
-    w << "  This could be because you are using a Mac OS X version";
-    w << " less than 10.5 or because CMake's platform configuration is";
-    w << " corrupt.";
-    cmake* cm = this->Makefile->GetCMakeInstance();
-    cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->GetBacktrace());
-    }
-
-  return true;
-}
-
-//----------------------------------------------------------------------------
-bool cmTarget::MacOSXRpathInstallNameDirDefault() const
-{
-  // we can't do rpaths when unsupported
-  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
-    {
-    return false;
-    }
-
-  const char* macosx_rpath_str = this->GetProperty("MACOSX_RPATH");
-  if(macosx_rpath_str)
-    {
-    return this->GetPropertyAsBool("MACOSX_RPATH");
-    }
-
-  cmPolicies::PolicyStatus cmp0042 = this->GetPolicyStatusCMP0042();
-
-  if(cmp0042 == cmPolicies::WARN)
-    {
-    this->Makefile->GetGlobalGenerator()->
-      AddCMP0042WarnTarget(this->GetName());
-    }
-
-  if(cmp0042 == cmPolicies::NEW)
-    {
-    return true;
-    }
-
-  return false;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::IsImportedSharedLibWithoutSOName(
                                           const std::string& config) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 4b369d3..3cbee76 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -244,12 +244,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Whether this library has \@rpath and platform supports it.  */
-  bool HasMacOSXRpathInstallNameDir(const std::string& config) const;
-
-  /** Whether this library defaults to \@rpath.  */
-  bool MacOSXRpathInstallNameDirDefault() const;
-
   /** Test for special case of a third-party shared library that has
       no soname at all.  */
   bool IsImportedSharedLibWithoutSOName(const std::string& config) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5718217ad242ca0fc6e6b15f4ee670e4a332c93
commit c5718217ad242ca0fc6e6b15f4ee670e4a332c93
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:02:45 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:38 2015 +0200

    cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d35b566..d907dd0 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1920,7 +1920,7 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
     (for_install ||
      this->Target->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
   bool use_install_rpath =
-    (outputRuntime && this->Target->Target->HaveInstallTreeRPATH() &&
+    (outputRuntime && this->Target->HaveInstallTreeRPATH() &&
      linking_for_install);
   bool use_build_rpath =
     (outputRuntime && this->Target->HaveBuildTreeRPATH(this->Config) &&
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3a67d2c..6ad6c69 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1212,7 +1212,7 @@ cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const
   // will likely change between the build tree and install tree and
   // this target must be relinked.
   return this->HaveBuildTreeRPATH(config)
-      || this->Target->HaveInstallTreeRPATH();
+      || this->HaveInstallTreeRPATH();
 }
 
 //----------------------------------------------------------------------------
@@ -4695,6 +4695,14 @@ bool cmGeneratorTarget::ComputePDBOutputDir(const std::string& kind,
 }
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::HaveInstallTreeRPATH() const
+{
+  const char* install_rpath = this->GetProperty("INSTALL_RPATH");
+  return (install_rpath && *install_rpath) &&
+          !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH");
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   const std::string& config,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 4ca0447..f068cae 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -407,6 +407,8 @@ public:
 
   class TargetPropertyEntry;
 
+  bool HaveInstallTreeRPATH() const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 40f93a3..dd1d405 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2384,14 +2384,6 @@ void cmTarget::SetPropertyDefault(const std::string& property,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HaveInstallTreeRPATH() const
-{
-  const char* install_rpath = this->GetProperty("INSTALL_RPATH");
-  return (install_rpath && *install_rpath) &&
-          !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH");
-}
-
-//----------------------------------------------------------------------------
 const char* cmTarget::GetOutputTargetType(bool implib) const
 {
   switch(this->GetType())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index d37f934..4b369d3 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -262,8 +262,6 @@ public:
   bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
                         const char* newExt = 0) const;
 
-  bool HaveInstallTreeRPATH() const;
-
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf5eb4a3f394051d9245a7f0c3a18b4a1d2c948a
commit bf5eb4a3f394051d9245a7f0c3a18b4a1d2c948a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:01:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:38 2015 +0200

    cmGeneratorTarget: Move ComputePDBOutputDir from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3651da6..3a67d2c 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1780,8 +1780,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
   if(i == this->CompileInfoMap.end())
     {
     CompileInfo info;
-    this->Target
-        ->ComputePDBOutputDir("COMPILE_PDB", config, info.CompilePdbDir);
+    this->ComputePDBOutputDir("COMPILE_PDB", config, info.CompilePdbDir);
     CompileInfoMapType::value_type entry(config_upper, info);
     i = this->CompileInfoMap.insert(entry).first;
     }
@@ -4519,7 +4518,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     // Compute output directories.
     this->ComputeOutputDir(config, false, info.OutDir);
     this->ComputeOutputDir(config, true, info.ImpDir);
-    if(!this->Target->ComputePDBOutputDir("PDB", config, info.PdbDir))
+    if(!this->ComputePDBOutputDir("PDB", config, info.PdbDir))
       {
       info.PdbDir = info.OutDir;
       }
@@ -4635,6 +4634,67 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::ComputePDBOutputDir(const std::string& kind,
+                                   const std::string& config,
+                                   std::string& out) const
+{
+  // Look for a target property defining the target output directory
+  // based on the target type.
+  const char* propertyName = 0;
+  std::string propertyNameStr = kind;
+  if(!propertyNameStr.empty())
+    {
+    propertyNameStr += "_OUTPUT_DIRECTORY";
+    propertyName = propertyNameStr.c_str();
+    }
+  std::string conf = config;
+
+  // Check for a per-configuration output directory target property.
+  std::string configUpper = cmSystemTools::UpperCase(conf);
+  const char* configProp = 0;
+  std::string configPropStr = kind;
+  if(!configPropStr.empty())
+    {
+    configPropStr += "_OUTPUT_DIRECTORY_";
+    configPropStr += configUpper;
+    configProp = configPropStr.c_str();
+    }
+
+  // Select an output directory.
+  if(const char* config_outdir = this->GetProperty(configProp))
+    {
+    // Use the user-specified per-configuration output directory.
+    out = config_outdir;
+
+    // Skip per-configuration subdirectory.
+    conf = "";
+    }
+  else if(const char* outdir = this->GetProperty(propertyName))
+    {
+    // Use the user-specified output directory.
+    out = outdir;
+    }
+  if(out.empty())
+    {
+    return false;
+    }
+
+  // Convert the output path to a full path in case it is
+  // specified as a relative path.  Treat a relative path as
+  // relative to the current output directory for this makefile.
+  out = (cmSystemTools::CollapseFullPath
+         (out, this->Makefile->GetCurrentBinaryDirectory()));
+
+  // The generator may add the configuration's subdirectory.
+  if(!conf.empty())
+    {
+    this->LocalGenerator->GetGlobalGenerator()->
+      AppendDirectoryForConfig("/", conf, "", out);
+    }
+  return true;
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   const std::string& config,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f0f6d41..4ca0447 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -528,6 +528,9 @@ private:
   mutable bool DebugSourcesDone;
   mutable bool LinkImplementationLanguageIsContextDependent;
 
+  bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
+                           std::string& out) const;
+
 public:
   std::vector<cmTarget const*> const&
     GetLinkImplementationClosure(const std::string& config) const;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index af7fe2e..40f93a3 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2448,67 +2448,6 @@ const char* cmTarget::GetOutputTargetType(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::ComputePDBOutputDir(const std::string& kind,
-                                   const std::string& config,
-                                   std::string& out) const
-{
-  // Look for a target property defining the target output directory
-  // based on the target type.
-  const char* propertyName = 0;
-  std::string propertyNameStr = kind;
-  if(!propertyNameStr.empty())
-    {
-    propertyNameStr += "_OUTPUT_DIRECTORY";
-    propertyName = propertyNameStr.c_str();
-    }
-  std::string conf = config;
-
-  // Check for a per-configuration output directory target property.
-  std::string configUpper = cmSystemTools::UpperCase(conf);
-  const char* configProp = 0;
-  std::string configPropStr = kind;
-  if(!configPropStr.empty())
-    {
-    configPropStr += "_OUTPUT_DIRECTORY_";
-    configPropStr += configUpper;
-    configProp = configPropStr.c_str();
-    }
-
-  // Select an output directory.
-  if(const char* config_outdir = this->GetProperty(configProp))
-    {
-    // Use the user-specified per-configuration output directory.
-    out = config_outdir;
-
-    // Skip per-configuration subdirectory.
-    conf = "";
-    }
-  else if(const char* outdir = this->GetProperty(propertyName))
-    {
-    // Use the user-specified output directory.
-    out = outdir;
-    }
-  if(out.empty())
-    {
-    return false;
-    }
-
-  // Convert the output path to a full path in case it is
-  // specified as a relative path.  Treat a relative path as
-  // relative to the current output directory for this makefile.
-  out = (cmSystemTools::CollapseFullPath
-         (out, this->Makefile->GetCurrentBinaryDirectory()));
-
-  // The generator may add the configuration's subdirectory.
-  if(!conf.empty())
-    {
-    this->Makefile->GetGlobalGenerator()->
-      AppendDirectoryForConfig("/", conf, "", out);
-    }
-  return true;
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetFrameworkVersion() const
 {
   assert(this->GetType() != INTERFACE_LIBRARY);
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index a3a8063..d37f934 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -467,9 +467,6 @@ private:
   bool LinkLibrariesForVS6Analyzed;
 #endif
 
-  bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
-                           std::string& out) const;
-
   // Cache import information from properties for each configuration.
   struct ImportInfo
   {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49017cddab23702d8228a195f64934e61ab7667e
commit 49017cddab23702d8228a195f64934e61ab7667e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:41:53 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:38 2015 +0200

    cmGeneratorTarget: Move IsNullImpliedByLinkLibraries from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2f2fb3b..3651da6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3928,7 +3928,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                   .find(p)
                                   != tgt->Target->GetProperties().end();
   const bool impliedByUse =
-          tgt->Target->IsNullImpliedByLinkLibraries(p);
+          tgt->IsNullImpliedByLinkLibraries(p);
   assert((impliedByUse ^ explicitlySet)
       || (!impliedByUse && !explicitlySet));
 
@@ -5046,6 +5046,14 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
 }
 
 //----------------------------------------------------------------------------
+bool
+cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
+{
+  return this->LinkImplicitNullProperties.find(p)
+      != this->LinkImplicitNullProperties.end();
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::ComputeLinkImplementationLibraries(
   const std::string& config,
   cmOptionalLinkImplementation& impl,
@@ -5130,7 +5138,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
       {
       if (!this->GetProperty(*it))
         {
-        this->Target->LinkImplicitNullProperties.insert(*it);
+        this->LinkImplicitNullProperties.insert(*it);
         }
       }
     cge->GetMaxLanguageStandard(this->Target,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 77d3b99..f0f6d41 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -317,6 +317,8 @@ public:
   typedef std::map<std::string, CompileInfo> CompileInfoMapType;
   mutable CompileInfoMapType CompileInfoMap;
 
+  bool IsNullImpliedByLinkLibraries(const std::string &p) const;
+
   /** Get the name of the compiler pdb file for the target.  */
   std::string GetCompilePDBName(const std::string& config="") const;
 
@@ -486,6 +488,7 @@ private:
   std::vector<TargetPropertyEntry*> CompileFeaturesEntries;
   std::vector<TargetPropertyEntry*> CompileDefinitionsEntries;
   std::vector<TargetPropertyEntry*> SourceEntries;
+  mutable std::set<std::string> LinkImplicitNullProperties;
 
   void ExpandLinkItems(std::string const& prop, std::string const& value,
                        std::string const& config, cmTarget const* headTarget,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c20ce83..af7fe2e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2554,13 +2554,6 @@ const char* cmTarget::GetExportMacro() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
-{
-  return this->LinkImplicitNullProperties.find(p)
-      != this->LinkImplicitNullProperties.end();
-}
-
-//----------------------------------------------------------------------------
 void
 cmTarget::GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index dda5384..a3a8063 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -326,8 +326,6 @@ public:
 
   void AppendBuildInterfaceIncludes();
 
-  bool IsNullImpliedByLinkLibraries(const std::string &p) const;
-
   std::string GetDebugGeneratorExpressions(const std::string &value,
                                   cmTarget::LinkLibraryType llt) const;
 
@@ -439,7 +437,6 @@ private:
   std::set<std::string> SystemIncludeDirectories;
   std::set<std::string> LinkDirectoriesEmmitted;
   std::set<std::string> Utilities;
-  mutable std::set<std::string> LinkImplicitNullProperties;
   std::map<std::string, cmListFileBacktrace> UtilityBacktraces;
   cmPolicies::PolicyMap PolicyMap;
   std::string Name;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bae4a416f9f1b9090499d26f8508660f4f3fc95
commit 0bae4a416f9f1b9090499d26f8508660f4f3fc95
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:55:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:38 2015 +0200

    cmGeneratorTarget: Move output info from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9f46909..2f2fb3b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4464,8 +4464,7 @@ std::string cmGeneratorTarget::GetDirectory(const std::string& config,
       cmSystemTools::GetFilenamePath(
       this->Target->ImportedGetFullPath(config, implib));
     }
-  else if(cmTarget::OutputInfo const* info =
-      this->Target->GetOutputInfo(config))
+  else if(OutputInfo const* info = this->GetOutputInfo(config))
     {
     // Return the directory in which the target will be built.
     return implib? info->ImpDir : info->OutDir;
@@ -4478,7 +4477,161 @@ bool cmGeneratorTarget::UsesDefaultOutputDir(const std::string& config,
                                     bool implib) const
 {
   std::string dir;
-  return this->Target->ComputeOutputDir(config, implib, dir);
+  return this->ComputeOutputDir(config, implib, dir);
+}
+
+//----------------------------------------------------------------------------
+cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
+    const std::string& config) const
+{
+  // There is no output information for imported targets.
+  if(this->IsImported())
+    {
+    return 0;
+    }
+
+  // Only libraries and executables have well-defined output files.
+  if(!this->Target->HaveWellDefinedOutputFiles())
+    {
+    std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
+    msg += this->GetName();
+    msg += " which has type ";
+    msg += cmTarget::GetTargetTypeName(cmTarget::TargetType(this->GetType()));
+    this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
+    return 0;
+    }
+
+  // Lookup/compute/cache the output information for this configuration.
+  std::string config_upper;
+  if(!config.empty())
+    {
+    config_upper = cmSystemTools::UpperCase(config);
+    }
+  OutputInfoMapType::iterator i =
+    this->OutputInfoMap.find(config_upper);
+  if(i == this->OutputInfoMap.end())
+    {
+    // Add empty info in map to detect potential recursion.
+    OutputInfo info;
+    OutputInfoMapType::value_type entry(config_upper, info);
+    i = this->OutputInfoMap.insert(entry).first;
+
+    // Compute output directories.
+    this->ComputeOutputDir(config, false, info.OutDir);
+    this->ComputeOutputDir(config, true, info.ImpDir);
+    if(!this->Target->ComputePDBOutputDir("PDB", config, info.PdbDir))
+      {
+      info.PdbDir = info.OutDir;
+      }
+
+    // Now update the previously-prepared map entry.
+    i->second = info;
+    }
+  else if(i->second.empty())
+    {
+    // An empty map entry indicates we have been called recursively
+    // from the above block.
+    this->LocalGenerator->GetCMakeInstance()->IssueMessage(
+      cmake::FATAL_ERROR,
+      "Target '" + this->GetName() + "' OUTPUT_DIRECTORY depends on itself.",
+      this->Target->GetBacktrace());
+    return 0;
+    }
+  return &i->second;
+}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
+                                bool implib, std::string& out) const
+{
+  bool usesDefaultOutputDir = false;
+  std::string conf = config;
+
+  // Look for a target property defining the target output directory
+  // based on the target type.
+  std::string targetTypeName = this->Target->GetOutputTargetType(implib);
+  const char* propertyName = 0;
+  std::string propertyNameStr = targetTypeName;
+  if(!propertyNameStr.empty())
+    {
+    propertyNameStr += "_OUTPUT_DIRECTORY";
+    propertyName = propertyNameStr.c_str();
+    }
+
+  // Check for a per-configuration output directory target property.
+  std::string configUpper = cmSystemTools::UpperCase(conf);
+  const char* configProp = 0;
+  std::string configPropStr = targetTypeName;
+  if(!configPropStr.empty())
+    {
+    configPropStr += "_OUTPUT_DIRECTORY_";
+    configPropStr += configUpper;
+    configProp = configPropStr.c_str();
+    }
+
+  // Select an output directory.
+  if(const char* config_outdir = this->GetProperty(configProp))
+    {
+    // Use the user-specified per-configuration output directory.
+    cmGeneratorExpression ge;
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
+      ge.Parse(config_outdir);
+    out = cge->Evaluate(this->Makefile, config);
+
+    // Skip per-configuration subdirectory.
+    conf = "";
+    }
+  else if(const char* outdir = this->Target->GetProperty(propertyName))
+    {
+    // Use the user-specified output directory.
+    cmGeneratorExpression ge;
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
+      ge.Parse(outdir);
+    out = cge->Evaluate(this->Makefile, config);
+
+    // Skip per-configuration subdirectory if the value contained a
+    // generator expression.
+    if (out != outdir)
+      {
+      conf = "";
+      }
+    }
+  else if(this->GetType() == cmTarget::EXECUTABLE)
+    {
+    // Lookup the output path for executables.
+    out = this->Makefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
+    }
+  else if(this->GetType() == cmTarget::STATIC_LIBRARY ||
+          this->GetType() == cmTarget::SHARED_LIBRARY ||
+          this->GetType() == cmTarget::MODULE_LIBRARY)
+    {
+    // Lookup the output path for libraries.
+    out = this->Makefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
+    }
+  if(out.empty())
+    {
+    // Default to the current output directory.
+    usesDefaultOutputDir = true;
+    out = ".";
+    }
+
+  // Convert the output path to a full path in case it is
+  // specified as a relative path.  Treat a relative path as
+  // relative to the current output directory for this makefile.
+  out = (cmSystemTools::CollapseFullPath
+         (out, this->Makefile->GetCurrentBinaryDirectory()));
+
+  // The generator may add the configuration's subdirectory.
+  if(!conf.empty())
+    {
+    bool iosPlatform = this->Makefile->PlatformIsAppleIos();
+    std::string suffix =
+      usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+    this->LocalGenerator->GetGlobalGenerator()->
+      AppendDirectoryForConfig("/", conf, suffix, out);
+    }
+
+  return usesDefaultOutputDir;
 }
 
 //----------------------------------------------------------------------------
@@ -5008,7 +5161,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
 std::string
 cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 {
-  if(cmTarget::OutputInfo const* info = this->Target->GetOutputInfo(config))
+  if(OutputInfo const* info = this->GetOutputInfo(config))
     {
     // Return the directory in which the target will be built.
     return info->PdbDir;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index a1ad477..77d3b99 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -289,6 +289,18 @@ public:
       directory.  */
   bool UsesDefaultOutputDir(const std::string& config, bool implib) const;
 
+  // Cache target output paths for each configuration.
+  struct OutputInfo
+  {
+    std::string OutDir;
+    std::string ImpDir;
+    std::string PdbDir;
+    bool empty() const
+      { return OutDir.empty() && ImpDir.empty() && PdbDir.empty(); }
+  };
+
+  OutputInfo const* GetOutputInfo(const std::string& config) const;
+
   /** Get the name of the pdb file for the target.  */
   std::string GetPDBName(const std::string& config="") const;
 
@@ -495,6 +507,12 @@ private:
   cmLinkImplementationLibraries const*
     GetLinkImplementationLibrariesInternal(const std::string& config,
                                            cmTarget const* head) const;
+  bool
+  ComputeOutputDir(const std::string& config,
+                   bool implib, std::string& out) const;
+
+  typedef std::map<std::string, OutputInfo> OutputInfoMapType;
+  mutable OutputInfoMapType OutputInfoMap;
 
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index bf8b8a9..c20ce83 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -79,9 +79,6 @@ public:
   // The backtrace when the target was created.
   cmListFileBacktrace Backtrace;
 
-  typedef std::map<std::string, cmTarget::OutputInfo> OutputInfoMapType;
-  OutputInfoMapType OutputInfoMap;
-
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
@@ -1710,67 +1707,6 @@ bool cmTarget::HaveWellDefinedOutputFiles() const
 }
 
 //----------------------------------------------------------------------------
-cmTarget::OutputInfo const* cmTarget::GetOutputInfo(
-    const std::string& config) const
-{
-  // There is no output information for imported targets.
-  if(this->IsImported())
-    {
-    return 0;
-    }
-
-  // Only libraries and executables have well-defined output files.
-  if(!this->HaveWellDefinedOutputFiles())
-    {
-    std::string msg = "cmTarget::GetOutputInfo called for ";
-    msg += this->GetName();
-    msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(this->GetType());
-    this->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR, msg);
-    return 0;
-    }
-
-  // Lookup/compute/cache the output information for this configuration.
-  std::string config_upper;
-  if(!config.empty())
-    {
-    config_upper = cmSystemTools::UpperCase(config);
-    }
-  typedef cmTargetInternals::OutputInfoMapType OutputInfoMapType;
-  OutputInfoMapType::iterator i =
-    this->Internal->OutputInfoMap.find(config_upper);
-  if(i == this->Internal->OutputInfoMap.end())
-    {
-    // Add empty info in map to detect potential recursion.
-    OutputInfo info;
-    OutputInfoMapType::value_type entry(config_upper, info);
-    i = this->Internal->OutputInfoMap.insert(entry).first;
-
-    // Compute output directories.
-    this->ComputeOutputDir(config, false, info.OutDir);
-    this->ComputeOutputDir(config, true, info.ImpDir);
-    if(!this->ComputePDBOutputDir("PDB", config, info.PdbDir))
-      {
-      info.PdbDir = info.OutDir;
-      }
-
-    // Now update the previously-prepared map entry.
-    i->second = info;
-    }
-  else if(i->second.empty())
-    {
-    // An empty map entry indicates we have been called recursively
-    // from the above block.
-    this->Makefile->GetCMakeInstance()->IssueMessage(
-      cmake::FATAL_ERROR,
-      "Target '" + this->GetName() + "' OUTPUT_DIRECTORY depends on itself.",
-      this->GetBacktrace());
-    return 0;
-    }
-  return &i->second;
-}
-
-//----------------------------------------------------------------------------
 const char* cmTarget::ImportedGetLocation(const std::string& config) const
 {
   static std::string location;
@@ -2512,100 +2448,6 @@ const char* cmTarget::GetOutputTargetType(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::ComputeOutputDir(const std::string& config,
-                                bool implib, std::string& out) const
-{
-  bool usesDefaultOutputDir = false;
-  std::string conf = config;
-
-  // Look for a target property defining the target output directory
-  // based on the target type.
-  std::string targetTypeName = this->GetOutputTargetType(implib);
-  const char* propertyName = 0;
-  std::string propertyNameStr = targetTypeName;
-  if(!propertyNameStr.empty())
-    {
-    propertyNameStr += "_OUTPUT_DIRECTORY";
-    propertyName = propertyNameStr.c_str();
-    }
-
-  // Check for a per-configuration output directory target property.
-  std::string configUpper = cmSystemTools::UpperCase(conf);
-  const char* configProp = 0;
-  std::string configPropStr = targetTypeName;
-  if(!configPropStr.empty())
-    {
-    configPropStr += "_OUTPUT_DIRECTORY_";
-    configPropStr += configUpper;
-    configProp = configPropStr.c_str();
-    }
-
-  // Select an output directory.
-  if(const char* config_outdir = this->GetProperty(configProp))
-    {
-    // Use the user-specified per-configuration output directory.
-    cmGeneratorExpression ge;
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
-      ge.Parse(config_outdir);
-    out = cge->Evaluate(this->Makefile, config);
-
-    // Skip per-configuration subdirectory.
-    conf = "";
-    }
-  else if(const char* outdir = this->GetProperty(propertyName))
-    {
-    // Use the user-specified output directory.
-    cmGeneratorExpression ge;
-    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
-      ge.Parse(outdir);
-    out = cge->Evaluate(this->Makefile, config);
-
-    // Skip per-configuration subdirectory if the value contained a
-    // generator expression.
-    if (out != outdir)
-      {
-      conf = "";
-      }
-    }
-  else if(this->GetType() == cmTarget::EXECUTABLE)
-    {
-    // Lookup the output path for executables.
-    out = this->Makefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
-    }
-  else if(this->GetType() == cmTarget::STATIC_LIBRARY ||
-          this->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GetType() == cmTarget::MODULE_LIBRARY)
-    {
-    // Lookup the output path for libraries.
-    out = this->Makefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
-    }
-  if(out.empty())
-    {
-    // Default to the current output directory.
-    usesDefaultOutputDir = true;
-    out = ".";
-    }
-
-  // Convert the output path to a full path in case it is
-  // specified as a relative path.  Treat a relative path as
-  // relative to the current output directory for this makefile.
-  out = (cmSystemTools::CollapseFullPath
-         (out, this->Makefile->GetCurrentBinaryDirectory()));
-
-  // The generator may add the configuration's subdirectory.
-  if(!conf.empty())
-    {
-    bool iosPlatform = this->Makefile->PlatformIsAppleIos();
-    std::string suffix =
-      usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
-    this->Makefile->GetGlobalGenerator()->
-      AppendDirectoryForConfig("/", conf, suffix, out);
-    }
-
-  return usesDefaultOutputDir;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::ComputePDBOutputDir(const std::string& kind,
                                    const std::string& config,
                                    std::string& out) const
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3130660..dda5384 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -470,20 +470,6 @@ private:
   bool LinkLibrariesForVS6Analyzed;
 #endif
 
-  // Cache target output paths for each configuration.
-  struct OutputInfo
-  {
-    std::string OutDir;
-    std::string ImpDir;
-    std::string PdbDir;
-    bool empty() const
-     { return OutDir.empty() && ImpDir.empty() && PdbDir.empty(); }
-  };
-
-  OutputInfo const* GetOutputInfo(const std::string& config) const;
-  bool
-  ComputeOutputDir(const std::string& config,
-                   bool implib, std::string& out) const;
   bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
                            std::string& out) const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1abc20d81df3ee9845904b356960870526fe3276
commit 1abc20d81df3ee9845904b356960870526fe3276
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:47:35 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:38 2015 +0200

    cmGeneratorTarget: Move UsesDefaultOutputDir from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a2423cc..9f46909 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4474,6 +4474,14 @@ std::string cmGeneratorTarget::GetDirectory(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::UsesDefaultOutputDir(const std::string& config,
+                                    bool implib) const
+{
+  std::string dir;
+  return this->Target->ComputeOutputDir(config, implib, dir);
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   const std::string& config,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index b39ba9f..a1ad477 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -285,6 +285,10 @@ public:
   std::vector<cmSourceFile*> const*
   GetSourceDepends(cmSourceFile const* sf) const;
 
+  /** Return whether this target uses the default value for its output
+      directory.  */
+  bool UsesDefaultOutputDir(const std::string& config, bool implib) const;
+
   /** Get the name of the pdb file for the target.  */
   std::string GetPDBName(const std::string& config="") const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 4144020..0370d74 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1975,7 +1975,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     if(this->XcodeVersion >= 21)
       {
-      if(!target.UsesDefaultOutputDir(configName, false))
+      if(!gtgt->UsesDefaultOutputDir(configName, false))
         {
         std::string pncdir = gtgt->GetDirectory(configName);
         buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0fc0423..bf8b8a9 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2667,14 +2667,6 @@ bool cmTarget::ComputePDBOutputDir(const std::string& kind,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::UsesDefaultOutputDir(const std::string& config,
-                                    bool implib) const
-{
-  std::string dir;
-  return this->ComputeOutputDir(config, implib, dir);
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetFrameworkVersion() const
 {
   assert(this->GetType() != INTERFACE_LIBRARY);
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2f9a94b..3130660 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -312,10 +312,6 @@ public:
   /** Get a build-tree directory in which to place target support files.  */
   std::string GetSupportDirectory() const;
 
-  /** Return whether this target uses the default value for its output
-      directory.  */
-  bool UsesDefaultOutputDir(const std::string& config, bool implib) const;
-
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50dc9b44404f4f31aa24cf17247f10539c3807b2
commit 50dc9b44404f4f31aa24cf17247f10539c3807b2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:39:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:37 2015 +0200

    cmGeneratorTarget: Move GetPDBDirectory from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 961705f..fdacc82 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1631,7 +1631,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
       return std::string();
       }
 
-    std::string result = target->Target->GetPDBDirectory(context->Config);
+    std::string result = target->GetPDBDirectory(context->Config);
     result += "/";
     result += target->GetPDBName(context->Config);
     return result;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b8a87a2..a2423cc 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1130,7 +1130,7 @@ cmGeneratorTarget::GetCompilePDBPath(const std::string& config) const
   std::string name = this->GetCompilePDBName(config);
   if(dir.empty() && !name.empty())
     {
-    dir = this->Target->GetPDBDirectory(config);
+    dir = this->GetPDBDirectory(config);
     }
   if(!dir.empty())
     {
@@ -4995,3 +4995,15 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
       }
     }
 }
+
+//----------------------------------------------------------------------------
+std::string
+cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
+{
+  if(cmTarget::OutputInfo const* info = this->Target->GetOutputInfo(config))
+    {
+    // Return the directory in which the target will be built.
+    return info->PdbDir;
+    }
+  return "";
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 43b7922..b39ba9f 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -359,6 +359,12 @@ public:
   /** Return true if builtin chrpath will work for this target */
   bool IsChrpathUsed(const std::string& config) const;
 
+  /** Get the directory in which this targets .pdb files will be placed.
+      If the configuration name is given then the generator will add its
+      subdirectory for that configuration.  Otherwise just the canonical
+      pdb output directory is given.  */
+  std::string GetPDBDirectory(const std::string& config) const;
+
   ///! Return the preferred linker language for this target
   std::string GetLinkerLanguage(const std::string& config = "") const;
 
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index e7fe61e..e3c28ee 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1220,7 +1220,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
-    temp = target.GetPDBDirectory(configName);
+    temp = gt->GetPDBDirectory(configName);
     temp += "/";
     temp += targetNamePDB;
     fout << "\t\t\t\tProgramDatabaseFile=\"" <<
@@ -1320,7 +1320,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
     std::string path = this->ConvertToXMLOutputPathSingle(
-      target.GetPDBDirectory(configName).c_str());
+      gt->GetPDBDirectory(configName).c_str());
     fout << "\t\t\t\tProgramDatabaseFile=\""
          << path << "/" << targetNamePDB
          << "\"\n";
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index eebee83..f6b907e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -133,7 +133,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     this->GeneratorTarget->GetCompilePDBDirectory(this->ConfigName);
   cmSystemTools::MakeDirectory(compilePdbOutputPath.c_str());
 
-  std::string pdbOutputPath = this->Target->GetPDBDirectory(this->ConfigName);
+  std::string pdbOutputPath =
+      this->GeneratorTarget->GetPDBDirectory(this->ConfigName);
   cmSystemTools::MakeDirectory(pdbOutputPath.c_str());
   pdbOutputPath += "/";
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index d12142a..3b3f63e 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -314,7 +314,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     this->GeneratorTarget->GetCompilePDBDirectory(this->ConfigName);
   cmSystemTools::MakeDirectory(compilePdbOutputPath.c_str());
 
-  std::string pdbOutputPath = this->Target->GetPDBDirectory(this->ConfigName);
+  std::string pdbOutputPath =
+      this->GeneratorTarget->GetPDBDirectory(this->ConfigName);
   cmSystemTools::MakeDirectory(pdbOutputPath.c_str());
   pdbOutputPath += "/";
 
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index cd499f6..6eafeae 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -546,7 +546,8 @@ cmMakefileTargetGenerator
     {
     targetFullPathReal =
       this->GeneratorTarget->GetFullPath(this->ConfigName, false, true);
-    targetFullPathPDB = this->Target->GetPDBDirectory(this->ConfigName);
+    targetFullPathPDB =
+        this->GeneratorTarget->GetPDBDirectory(this->ConfigName);
     targetFullPathPDB += "/";
     targetFullPathPDB += this->GeneratorTarget->GetPDBName(this->ConfigName);
     }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 33e08a3..c2daa63 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -289,7 +289,7 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
        this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
        this->Target->GetType() == cmTarget::MODULE_LIBRARY)
       {
-      pdbPath = this->Target->GetPDBDirectory(this->GetConfigName());
+      pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName());
       pdbPath += "/";
       pdbPath += this->GeneratorTarget->GetPDBName(this->GetConfigName());
       }
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0f8b3b0..0fc0423 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1771,17 +1771,6 @@ cmTarget::OutputInfo const* cmTarget::GetOutputInfo(
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetPDBDirectory(const std::string& config) const
-{
-  if(OutputInfo const* info = this->GetOutputInfo(config))
-    {
-    // Return the directory in which the target will be built.
-    return info->PdbDir;
-    }
-  return "";
-}
-
-//----------------------------------------------------------------------------
 const char* cmTarget::ImportedGetLocation(const std::string& config) const
 {
   static std::string location;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 507ea7d..2f9a94b 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -231,12 +231,6 @@ public:
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;
 
-  /** Get the directory in which this targets .pdb files will be placed.
-      If the configuration name is given then the generator will add its
-      subdirectory for that configuration.  Otherwise just the canonical
-      pdb output directory is given.  */
-  std::string GetPDBDirectory(const std::string& config) const;
-
   const char* ImportedGetLocation(const std::string& config) const;
 
   /** Get the target major and minor version numbers interpreted from
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 4c9b82b..a4b0bc3 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2581,7 +2581,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       {
       linkOptions.AddFlag("GenerateDebugInformation", "false");
       }
-    std::string pdb = this->Target->GetPDBDirectory(config.c_str());
+    std::string pdb = this->GeneratorTarget->GetPDBDirectory(config.c_str());
     pdb += "/";
     pdb += targetNamePDB;
     std::string imLib =

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b0168863ed121c7d9f05e3282e2f59490ff6c42
commit 8b0168863ed121c7d9f05e3282e2f59490ff6c42
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 20 20:31:47 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:04:37 2015 +0200

    cmGeneratorTarget: Move GetDirectory from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index b61e26f..961705f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1586,7 +1586,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactSonameTag>
                     "SHARED libraries.");
       return std::string();
       }
-    std::string result = target->Target->GetDirectory(context->Config);
+    std::string result = target->GetDirectory(context->Config);
     result += "/";
     result += target->GetSOName(context->Config);
     return result;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 278194e..b8a87a2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -748,7 +748,7 @@ const char* cmGeneratorTarget::GetLocationForBuild() const
     }
 
   // Now handle the deprecated build-time configuration location.
-  location = this->Target->GetDirectory();
+  location = this->GetDirectory();
   const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
   if(cfgid && strcmp(cfgid, ".") != 0)
     {
@@ -1434,7 +1434,7 @@ cmGeneratorTarget::GetInstallNameDirForBuildTree(
       }
     else
       {
-      dir = this->Target->GetDirectory(config);
+      dir = this->GetDirectory(config);
       }
     dir += "/";
     return dir;
@@ -1735,7 +1735,7 @@ cmGeneratorTarget::GetMacContentDirectory(const std::string& config,
                                           bool implib) const
 {
   // Start with the output directory for the target.
-  std::string fpath = this->Target->GetDirectory(config, implib);
+  std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
   bool contentOnly = true;
   if(this->Target->IsFrameworkOnApple())
@@ -2860,7 +2860,7 @@ void cmGeneratorTarget::ComputeTargetManifest(
     }
 
   // Get the directory.
-  std::string dir = this->Target->GetDirectory(config, false);
+  std::string dir = this->GetDirectory(config, false);
 
   // Add each name.
   std::string f;
@@ -2894,7 +2894,7 @@ void cmGeneratorTarget::ComputeTargetManifest(
     }
   if(!impName.empty())
     {
-    f = this->Target->GetDirectory(config, true);
+    f = this->GetDirectory(config, true);
     f += "/";
     f += impName;
     gg->AddToManifest(f);
@@ -2919,7 +2919,7 @@ std::string cmGeneratorTarget::NormalGetFullPath(const std::string& config,
                                                  bool implib,
                                                  bool realname) const
 {
-  std::string fpath = this->Target->GetDirectory(config, implib);
+  std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
   if(this->Target->IsAppBundleOnApple())
     {
@@ -4454,6 +4454,26 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetDirectory(const std::string& config,
+                                   bool implib) const
+{
+  if (this->Target->IsImported())
+    {
+    // Return the directory from which the target is imported.
+    return
+      cmSystemTools::GetFilenamePath(
+      this->Target->ImportedGetFullPath(config, implib));
+    }
+  else if(cmTarget::OutputInfo const* info =
+      this->Target->GetOutputInfo(config))
+    {
+    // Return the directory in which the target will be built.
+    return implib? info->ImpDir : info->OutDir;
+    }
+  return "";
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   const std::string& config,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f5805f1..43b7922 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -268,6 +268,13 @@ public:
    */
   void TraceDependencies();
 
+  /** Get the directory in which this target will be built.  If the
+      configuration name is given then the generator will add its
+      subdirectory for that configuration.  Otherwise just the canonical
+      output directory is given.  */
+  std::string GetDirectory(const std::string& config = "",
+                           bool implib = false) const;
+
   /** Get the directory in which to place the target compiler .pdb file.
       If the configuration name is given then the generator will add its
       subdirectory for that configuration.  Otherwise just the canonical
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 3d52e3a..4144020 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1977,7 +1977,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       if(!target.UsesDefaultOutputDir(configName, false))
         {
-        std::string pncdir = target.GetDirectory(configName);
+        std::string pncdir = gtgt->GetDirectory(configName);
         buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
                                     this->CreateString(pncdir.c_str()));
         }
@@ -1986,7 +1986,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       buildSettings->AddAttribute("OBJROOT",
                                   this->CreateString(pndir.c_str()));
-      pndir = target.GetDirectory(configName);
+      pndir = gtgt->GetDirectory(configName);
       }
 
     if(target.IsFrameworkOnApple() || target.IsCFBundleOnApple())
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 30cf175..383ee00 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -83,7 +83,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   else
     {
     fromDirConfig =
-        this->Target->Target->GetDirectory(config, this->ImportLibrary);
+        this->Target->GetDirectory(config, this->ImportLibrary);
     fromDirConfig += "/";
     }
   std::string toDir =
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index ab215d1..862ab2d 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -805,7 +805,11 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
   // VS6 forgets to create the output directory for archives if it
   // differs from the intermediate directory.
   if(target.GetType() != cmTarget::STATIC_LIBRARY) { return pcc; }
-  std::string outDir = target.GetDirectory(config, false);
+
+  cmGeneratorTarget* gt =
+    this->GlobalGenerator->GetGeneratorTarget(&target);
+
+  std::string outDir = gt->GetDirectory(config, false);
 
   // Add a pre-link event to create the directory.
   cmCustomCommandLine command;
@@ -1363,20 +1367,20 @@ void cmLocalVisualStudio6Generator
 #ifdef CM_USE_OLD_VS6
     outputDirOld =
       removeQuotes(this->ConvertToOutputFormat
-                   (target.GetDirectory().c_str(), SHELL));
+                   (gt->GetDirectory().c_str(), SHELL));
 #endif
     outputDirDebug =
         removeQuotes(this->ConvertToOutputFormat(
-                       target.GetDirectory("Debug").c_str(), SHELL));
+                       gt->GetDirectory("Debug").c_str(), SHELL));
     outputDirRelease =
         removeQuotes(this->ConvertToOutputFormat(
-                 target.GetDirectory("Release").c_str(), SHELL));
+                 gt->GetDirectory("Release").c_str(), SHELL));
     outputDirMinSizeRel =
         removeQuotes(this->ConvertToOutputFormat(
-                 target.GetDirectory("MinSizeRel").c_str(), SHELL));
+                 gt->GetDirectory("MinSizeRel").c_str(), SHELL));
     outputDirRelWithDebInfo =
         removeQuotes(this->ConvertToOutputFormat(
-                 target.GetDirectory("RelWithDebInfo").c_str(), SHELL));
+                 gt->GetDirectory("RelWithDebInfo").c_str(), SHELL));
     }
   else if(target.GetType() == cmTarget::OBJECT_LIBRARY)
     {
@@ -1424,12 +1428,12 @@ void cmLocalVisualStudio6Generator
      target.GetType() == cmTarget::MODULE_LIBRARY ||
      target.GetType() == cmTarget::EXECUTABLE)
     {
-    std::string fullPathImpDebug = target.GetDirectory("Debug", true);
-    std::string fullPathImpRelease = target.GetDirectory("Release", true);
+    std::string fullPathImpDebug = gt->GetDirectory("Debug", true);
+    std::string fullPathImpRelease = gt->GetDirectory("Release", true);
     std::string fullPathImpMinSizeRel =
-      target.GetDirectory("MinSizeRel", true);
+      gt->GetDirectory("MinSizeRel", true);
     std::string fullPathImpRelWithDebInfo =
-      target.GetDirectory("RelWithDebInfo", true);
+      gt->GetDirectory("RelWithDebInfo", true);
     fullPathImpDebug += "/";
     fullPathImpRelease += "/";
     fullPathImpMinSizeRel += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 8924564..e7fe61e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -792,7 +792,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     {
     std::string const& outDir =
       target.GetType() == cmTarget::OBJECT_LIBRARY?
-      intermediateDir : target.GetDirectory(configName);
+      intermediateDir : gt->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
     }
@@ -1004,7 +1004,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
     // Check if we need the FAT32 workaround.
     // Check the filesystem type where the target will be written.
-    if (cmLVS6G_IsFAT(target.GetDirectory(configName).c_str()))
+    if (cmLVS6G_IsFAT(gt->GetDirectory(configName).c_str()))
       {
       // Add a flag telling the manifest tool to use a workaround
       // for FAT32 file systems, which can cause an empty manifest
@@ -1130,7 +1130,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     case cmTarget::STATIC_LIBRARY:
     {
     std::string targetNameFull = gt->GetFullName(configName);
-    std::string libpath = target.GetDirectory(configName);
+    std::string libpath = gt->GetDirectory(configName);
     libpath += "/";
     libpath += targetNameFull;
     const char* tool = "VCLibrarianTool";
@@ -1210,7 +1210,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = target.GetDirectory(configName);
+    temp = gt->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
@@ -1248,7 +1248,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal  << "\"\n";
       }
-    temp = target.GetDirectory(configName, true);
+    temp = gt->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1309,7 +1309,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = target.GetDirectory(configName);
+    temp = gt->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
@@ -1367,7 +1367,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal << "\"";
       }
-    temp = target.GetDirectory(configName, true);
+    temp = gt->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index c0072de..c830a82 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -92,8 +92,10 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
   if(target.GetType() != cmTarget::EXECUTABLE &&
      !(isFortran && target.GetType() == cmTarget::SHARED_LIBRARY))
     { return pcc; }
-  std::string outDir = target.GetDirectory(config, false);
-  std::string impDir = target.GetDirectory(config, true);
+  cmGeneratorTarget* gt =
+      this->GetGlobalGenerator()->GetGeneratorTarget(&target);
+  std::string outDir = gt->GetDirectory(config, false);
+  std::string impDir = gt->GetDirectory(config, true);
   if(impDir == outDir) { return pcc; }
 
   // Add a pre-build event to create the directory.
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 90f679e..eebee83 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -99,7 +99,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
      this->ConfigName);
 
   // Construct the full path version of the names.
-  std::string outpath = this->Target->GetDirectory(this->ConfigName);
+  std::string outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
   if(this->Target->IsAppBundleOnApple())
     {
     this->OSXBundleGenerator->CreateAppBundle(targetName, outpath);
@@ -123,7 +123,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     cmSystemTools::MakeDirectory(outpath.c_str());
     if(!targetNameImport.empty())
       {
-      outpathImp = this->Target->GetDirectory(this->ConfigName, true);
+      outpathImp = this->GeneratorTarget->GetDirectory(this->ConfigName, true);
       cmSystemTools::MakeDirectory(outpathImp.c_str());
       outpathImp += "/";
       }
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index cd387a0..d12142a 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -275,13 +275,13 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::string outpathImp;
   if(this->Target->IsFrameworkOnApple())
     {
-    outpath = this->Target->GetDirectory(this->ConfigName);
+    outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
     outpath += "/";
     }
   else if(this->Target->IsCFBundleOnApple())
     {
-    outpath = this->Target->GetDirectory(this->ConfigName);
+    outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateCFBundle(targetName, outpath);
     outpath += "/";
     }
@@ -299,12 +299,12 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     }
   else
     {
-    outpath = this->Target->GetDirectory(this->ConfigName);
+    outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     cmSystemTools::MakeDirectory(outpath.c_str());
     outpath += "/";
     if(!targetNameImport.empty())
       {
-      outpathImp = this->Target->GetDirectory(this->ConfigName, true);
+      outpathImp = this->GeneratorTarget->GetDirectory(this->ConfigName, true);
       cmSystemTools::MakeDirectory(outpathImp.c_str());
       outpathImp += "/";
       }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 24fcaf4..f8743d9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -59,7 +59,7 @@ cmNinjaNormalTargetGenerator(cmGeneratorTarget* target)
     {
     // on Windows the output dir is already needed at compile time
     // ensure the directory exists (OutDir test)
-    EnsureDirectoryExists(target->Target->GetDirectory(this->GetConfigName()));
+    EnsureDirectoryExists(target->GetDirectory(this->GetConfigName()));
     }
 
   this->OSXBundleGenerator = new cmOSXBundleGenerator(target,
@@ -413,7 +413,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   if (target.IsAppBundleOnApple())
     {
     // Create the app bundle
-    std::string outpath = target.GetDirectory(cfgName);
+    std::string outpath = gt.GetDirectory(cfgName);
     this->OSXBundleGenerator->CreateAppBundle(this->TargetNameOut, outpath);
 
     // Calculate the output path
@@ -430,13 +430,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     // Create the library framework.
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
-                                              target.GetDirectory(cfgName));
+                                              gt.GetDirectory(cfgName));
     }
   else if(target.IsCFBundleOnApple())
     {
     // Create the core foundation bundle.
     this->OSXBundleGenerator->CreateCFBundle(this->TargetNameOut,
-                                             target.GetDirectory(cfgName));
+                                             gt.GetDirectory(cfgName));
     }
 
   // Write comments.
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 6e6dc60..33e08a3 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -254,7 +254,7 @@ cmNinjaTargetGenerator
 
 std::string cmNinjaTargetGenerator::GetTargetOutputDir() const
 {
-  std::string dir = this->Target->GetDirectory(this->GetConfigName());
+  std::string dir = this->GeneratorTarget->GetDirectory(this->GetConfigName());
   return ConvertToNinjaPath(dir);
 }
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 825f3eb..0f8b3b0 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1771,25 +1771,6 @@ cmTarget::OutputInfo const* cmTarget::GetOutputInfo(
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetDirectory(const std::string& config,
-                                   bool implib) const
-{
-  if (this->IsImported())
-    {
-    // Return the directory from which the target is imported.
-    return
-      cmSystemTools::GetFilenamePath(
-      this->ImportedGetFullPath(config, implib));
-    }
-  else if(OutputInfo const* info = this->GetOutputInfo(config))
-    {
-    // Return the directory in which the target will be built.
-    return implib? info->ImpDir : info->OutDir;
-    }
-  return "";
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetPDBDirectory(const std::string& config) const
 {
   if(OutputInfo const* info = this->GetOutputInfo(config))
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 96cdb5e..507ea7d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -231,13 +231,6 @@ public:
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;
 
-  /** Get the directory in which this target will be built.  If the
-      configuration name is given then the generator will add its
-      subdirectory for that configuration.  Otherwise just the canonical
-      output directory is given.  */
-  std::string GetDirectory(const std::string& config = "",
-                           bool implib = false) const;
-
   /** Get the directory in which this targets .pdb files will be placed.
       If the configuration name is given then the generator will add its
       subdirectory for that configuration.  Otherwise just the canonical
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..4c9b82b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1780,7 +1780,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
         }
       else
         {
-        outDir = this->Target->GetDirectory(config->c_str()) + "/";
+        outDir = this->GeneratorTarget->GetDirectory(config->c_str()) + "/";
         targetNameFull = this->GeneratorTarget->GetFullName(config->c_str());
         }
       this->ConvertToWindowsSlash(intermediateDir);
@@ -2584,7 +2584,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     std::string pdb = this->Target->GetPDBDirectory(config.c_str());
     pdb += "/";
     pdb += targetNamePDB;
-    std::string imLib = this->Target->GetDirectory(config.c_str(), true);
+    std::string imLib =
+        this->GeneratorTarget->GetDirectory(config.c_str(), true);
     imLib += "/";
     imLib += targetNameImport;
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct  8 19:10:05 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu,  8 Oct 2015 19:10:05 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-281-g4dcd97c
Message-ID: <20151008231005.E8E2EBC96A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4dcd97c26c639e3fb73faf60664f00df493ff85a (commit)
       via  096f0988496d49c6c1f56f32863965dc65a077ab (commit)
      from  b43dac4dc04eb2eadb457a82c1cf1ac9d61be8a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dcd97c26c639e3fb73faf60664f00df493ff85a
commit 4dcd97c26c639e3fb73faf60664f00df493ff85a
Merge: b43dac4 096f098
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 19:10:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 19:10:04 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    096f0988 cmComputeLinkDepends: Remove unused typedef.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=096f0988496d49c6c1f56f32863965dc65a077ab
commit 096f0988496d49c6c1f56f32863965dc65a077ab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:23:28 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:08:31 2015 +0200

    cmComputeLinkDepends: Remove unused typedef.

diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 2cbb430..b3c648b 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -66,8 +66,6 @@ private:
   std::string Config;
   EntryVector FinalLinkEntries;
 
-  typedef cmTarget::LinkLibraryVectorType LinkLibraryVectorType;
-
   std::map<std::string, int>::iterator
   AllocateLinkEntry(std::string const& item);
   int AddLinkEntry(cmLinkItem const& item);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkDepends.h |    2 --
 1 file changed, 2 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Oct  9 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri,  9 Oct 2015 00:01:11 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-84-g9f6638c
Message-ID: <20151009040111.C5B97BF830@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  9f6638c8a714c69a6039210267c4175813263d4f (commit)
      from  29a2d9fe69a8561ff72f800b5f96bc896cd9d449 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f6638c8a714c69a6039210267c4175813263d4f
commit 9f6638c8a714c69a6039210267c4175813263d4f
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Oct 9 00:01:08 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 9 00:01:08 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 852d360..a71db6b 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151008)
+set(CMake_VERSION_PATCH 20151009)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Oct  9 14:32:20 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri,  9 Oct 2015 14:32:20 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-283-g7eb3cd5
Message-ID: <20151009183220.445BAC0206@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7eb3cd504945c5ae0e3aa4b1df343efdab8b3fef (commit)
       via  38d18c054f21306bd8af249d350d692ab4630c3c (commit)
      from  4dcd97c26c639e3fb73faf60664f00df493ff85a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eb3cd504945c5ae0e3aa4b1df343efdab8b3fef
commit 7eb3cd504945c5ae0e3aa4b1df343efdab8b3fef
Merge: 4dcd97c 38d18c0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 14:32:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 9 14:32:19 2015 -0400

    Merge topic 'use-generator-target' into next
    
    38d18c05 fixup! cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38d18c054f21306bd8af249d350d692ab4630c3c
commit 38d18c054f21306bd8af249d350d692ab4630c3c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 20:29:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 20:29:56 2015 +0200

    fixup! cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c4a083d..8ff78e0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1428,7 +1428,8 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
     w << " less than 10.5 or because CMake's platform configuration is";
     w << " corrupt.";
     cmake* cm = this->Makefile->GetCMakeInstance();
-    cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->Target->GetBacktrace());
+    cm->IssueMessage(cmake::FATAL_ERROR, w.str(),
+                     this->Target->GetBacktrace());
     }
 
   return true;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorTarget.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Oct  9 14:32:44 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri,  9 Oct 2015 14:32:44 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-285-g10a7ea1
Message-ID: <20151009183244.3898EC021D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  10a7ea170dc799c4fadcea88c1b06ad2fbb3e7ab (commit)
       via  612ece829a24c3331154d759b1f8f82821457507 (commit)
      from  7eb3cd504945c5ae0e3aa4b1df343efdab8b3fef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10a7ea170dc799c4fadcea88c1b06ad2fbb3e7ab
commit 10a7ea170dc799c4fadcea88c1b06ad2fbb3e7ab
Merge: 7eb3cd5 612ece8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 14:32:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 9 14:32:43 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    612ece82 fixup! cmLocalGenerator: Add current binary directory accessor.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=612ece829a24c3331154d759b1f8f82821457507
commit 612ece829a24c3331154d759b1f8f82821457507
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 20:25:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 20:25:13 2015 +0200

    fixup! cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0e7aa45..7bee268 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -642,7 +642,8 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->LocalGenerator->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->LocalGenerator->GetCurrentBinaryDirectory(),
+                                    cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefileTargetGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Oct  9 14:34:07 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri,  9 Oct 2015 14:34:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-287-g36337d0
Message-ID: <20151009183407.ABE96C025F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  36337d07ecfcaa04321cfac40398ebac54accb18 (commit)
       via  d4838ace89946d4bdea9bbe6b2a4e5d5f20ad4c5 (commit)
      from  10a7ea170dc799c4fadcea88c1b06ad2fbb3e7ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36337d07ecfcaa04321cfac40398ebac54accb18
commit 36337d07ecfcaa04321cfac40398ebac54accb18
Merge: 10a7ea1 d4838ac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 14:34:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 9 14:34:06 2015 -0400

    Merge topic 'ctest-submit-content-type' into next
    
    d4838ace fixup! CTest: Set Content-Type header for http file upload (#15774)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4838ace89946d4bdea9bbe6b2a4e5d5f20ad4c5
commit d4838ace89946d4bdea9bbe6b2a4e5d5f20ad4c5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 20:33:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 20:33:48 2015 +0200

    fixup! CTest: Set Content-Type header for http file upload (#15774)

diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index 7401ff7..fb6cc00 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -167,7 +167,8 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
   ::curl_easy_setopt(this->Curl, CURLOPT_DEBUGFUNCTION,
                      curlDebugCallback);
   // Be sure to set Content-Type to satisfy fussy modsecurity rules
-  struct curl_slist *headers = ::curl_slist_append(NULL, "Content-Type: text/xml");
+  struct curl_slist *headers = ::curl_slist_append(NULL,
+                                                   "Content-Type: text/xml");
   ::curl_easy_setopt(this->Curl, CURLOPT_HTTPHEADER, headers);
   std::vector<char> responseData;
   std::vector<char> debugData;
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index cb00dce..833cad6 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -338,7 +338,8 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
   CURLcode res;
   FILE* ftpfile;
   char error_buffer[1024];
-  struct curl_slist *headers = ::curl_slist_append(NULL, "Content-Type: text/xml");
+  struct curl_slist *headers = ::curl_slist_append(NULL,
+                                                   "Content-Type: text/xml");
 
   /* In windows, this will init the winsock stuff */
   ::curl_global_init(CURL_GLOBAL_ALL);

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestCurl.cxx          |    3 ++-
 Source/CTest/cmCTestSubmitHandler.cxx |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Oct  9 14:35:54 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri,  9 Oct 2015 14:35:54 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-289-g5d28a72
Message-ID: <20151009183554.B475CC02B3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5d28a728727caa1eb95e12e3cd99a203e07bcdac (commit)
       via  a333ec20fffea2c7ae9f5a4d0968efa625a9e8c4 (commit)
      from  36337d07ecfcaa04321cfac40398ebac54accb18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d28a728727caa1eb95e12e3cd99a203e07bcdac
commit 5d28a728727caa1eb95e12e3cd99a203e07bcdac
Merge: 36337d0 a333ec2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 14:35:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 9 14:35:54 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    a333ec20 fixup! cmLocalGenerator: Add current binary directory accessor.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a333ec20fffea2c7ae9f5a4d0968efa625a9e8c4
commit a333ec20fffea2c7ae9f5a4d0968efa625a9e8c4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 20:35:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 20:35:33 2015 +0200

    fixup! cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 4ddd2fe..04441eb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -570,7 +570,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   cmLocalGenerator* root, std::vector<cmLocalGenerator*> const& gens)
 {
-  cmMakefile* mf = root->GetMakefile();
   std::vector<std::string> lfiles;
   for(std::vector<cmLocalGenerator*>::const_iterator gi = gens.begin();
       gi != gens.end(); ++gi)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Oct 10 00:01:09 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 10 Oct 2015 00:01:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-85-g3fe240a
Message-ID: <20151010040109.56A3DBFEFF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  3fe240a79a53d8069ab51c4a44c4e1f5062983f1 (commit)
      from  9f6638c8a714c69a6039210267c4175813263d4f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fe240a79a53d8069ab51c4a44c4e1f5062983f1
commit 3fe240a79a53d8069ab51c4a44c4e1f5062983f1
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Oct 10 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Oct 10 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a71db6b..95b9456 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151009)
+set(CMake_VERSION_PATCH 20151010)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 05:08:55 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 05:08:55 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-293-g8260b30
Message-ID: <20151010090855.125D1BFE7C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8260b306665b1c86841c6a20dae3556b58ecbdee (commit)
       via  3e428fdcb4640411f8cbc4adc42c30b9c8b8032e (commit)
       via  110fd2fba1cbd6c3d89f5460d3f58a94d52d4546 (commit)
       via  e73916992c6893572f24ee4fa631b33445d6cdf6 (commit)
      from  5d28a728727caa1eb95e12e3cd99a203e07bcdac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8260b306665b1c86841c6a20dae3556b58ecbdee
commit 8260b306665b1c86841c6a20dae3556b58ecbdee
Merge: 5d28a72 3e428fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 05:08:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 05:08:53 2015 -0400

    Merge topic 'use-generator-target' into next
    
    3e428fdc cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.
    110fd2fb cmGeneratorTarget: Move GetOutputTargetType from cmTarget.
    e7391699 cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e428fdcb4640411f8cbc4adc42c30b9c8b8032e
commit 3e428fdcb4640411f8cbc4adc42c30b9c8b8032e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:19:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:03:48 2015 +0200

    cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index b8e2284..9371546 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1101,9 +1101,10 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
     this->SharedLibrariesLinked.insert(target);
     }
 
+  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Handle case of an imported shared library with no soname.
   if(this->NoSONameUsesPath &&
-     target->IsImportedSharedLibWithoutSOName(this->Config))
+     gtgt->IsImportedSharedLibWithoutSOName(this->Config))
     {
     this->AddSharedLibNoSOName(item);
     return;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8663593..8ff78e0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1338,6 +1338,19 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
   return false;
 }
 
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName(
+                                          const std::string& config) const
+{
+  if(this->IsImported() && this->GetType() == cmTarget::SHARED_LIBRARY)
+    {
+    if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
+      {
+      return info->NoSOName;
+      }
+    }
+  return false;
+}
 
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 0e41661..49de632 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -415,6 +415,10 @@ public:
   /** Whether this library defaults to \@rpath.  */
   bool MacOSXRpathInstallNameDirDefault() const;
 
+  /** Test for special case of a third-party shared library that has
+      no soname at all.  */
+  bool IsImportedSharedLibWithoutSOName(const std::string& config) const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 88bda67..3de7efe 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2178,20 +2178,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsImportedSharedLibWithoutSOName(
-                                          const std::string& config) const
-{
-  if(this->IsImported() && this->GetType() == cmTarget::SHARED_LIBRARY)
-    {
-    if(cmTarget::ImportInfo const* info = this->GetImportInfo(config))
-      {
-      return info->NoSOName;
-      }
-    }
-  return false;
-}
-
-//----------------------------------------------------------------------------
 std::string
 cmTarget::GetFullNameImported(const std::string& config, bool implib) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 6ba9772..16d0121 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -244,10 +244,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Test for special case of a third-party shared library that has
-      no soname at all.  */
-  bool IsImportedSharedLibWithoutSOName(const std::string& config) const;
-
   /** Does this target have a GNU implib to convert to MS format?  */
   bool HasImplibGNUtoMS() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=110fd2fba1cbd6c3d89f5460d3f58a94d52d4546
commit 110fd2fba1cbd6c3d89f5460d3f58a94d52d4546
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:11:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:03:48 2015 +0200

    cmGeneratorTarget: Move GetOutputTargetType from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b253836..8663593 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -340,6 +340,62 @@ const char *cmGeneratorTarget::GetProperty(const std::string& prop) const
 }
 
 //----------------------------------------------------------------------------
+const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
+{
+  switch(this->GetType())
+    {
+    case cmTarget::SHARED_LIBRARY:
+      if(this->Target->IsDLLPlatform())
+        {
+        if(implib)
+          {
+          // A DLL import library is treated as an archive target.
+          return "ARCHIVE";
+          }
+        else
+          {
+          // A DLL shared library is treated as a runtime target.
+          return "RUNTIME";
+          }
+        }
+      else
+        {
+        // For non-DLL platforms shared libraries are treated as
+        // library targets.
+        return "LIBRARY";
+        }
+    case cmTarget::STATIC_LIBRARY:
+      // Static libraries are always treated as archive targets.
+      return "ARCHIVE";
+    case cmTarget::MODULE_LIBRARY:
+      if(implib)
+        {
+        // Module libraries are always treated as library targets.
+        return "ARCHIVE";
+        }
+      else
+        {
+        // Module import libraries are treated as archive targets.
+        return "LIBRARY";
+        }
+    case cmTarget::EXECUTABLE:
+      if(implib)
+        {
+        // Executable import libraries are treated as archive targets.
+        return "ARCHIVE";
+        }
+      else
+        {
+        // Executables are always treated as runtime targets.
+        return "RUNTIME";
+        }
+    default:
+      break;
+    }
+  return "";
+}
+
+//----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetOutputName(const std::string& config,
                                              bool implib) const
 {
@@ -355,7 +411,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
 
     // Compute output name.
     std::vector<std::string> props;
-    std::string type = this->Target->GetOutputTargetType(implib);
+    std::string type = this->GetOutputTargetType(implib);
     std::string configUpper = cmSystemTools::UpperCase(config);
     if(!type.empty() && !configUpper.empty())
       {
@@ -4662,7 +4718,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
 
   // Look for a target property defining the target output directory
   // based on the target type.
-  std::string targetTypeName = this->Target->GetOutputTargetType(implib);
+  std::string targetTypeName = this->GetOutputTargetType(implib);
   const char* propertyName = 0;
   std::string propertyNameStr = targetTypeName;
   if(!propertyNameStr.empty())
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index fd4ee56..0e41661 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -439,6 +439,9 @@ private:
   typedef std::map<std::string, LinkClosure> LinkClosureMapType;
   mutable LinkClosureMapType LinkClosureMap;
 
+  // Returns ARCHIVE, LIBRARY, or RUNTIME based on platform and type.
+  const char* GetOutputTargetType(bool implib) const;
+
   struct CompatibleInterfacesBase
   {
     std::set<std::string> PropsBool;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0b2d9fc..88bda67 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2272,62 +2272,6 @@ void cmTarget::SetPropertyDefault(const std::string& property,
 }
 
 //----------------------------------------------------------------------------
-const char* cmTarget::GetOutputTargetType(bool implib) const
-{
-  switch(this->GetType())
-    {
-    case cmTarget::SHARED_LIBRARY:
-      if(this->DLLPlatform)
-        {
-        if(implib)
-          {
-          // A DLL import library is treated as an archive target.
-          return "ARCHIVE";
-          }
-        else
-          {
-          // A DLL shared library is treated as a runtime target.
-          return "RUNTIME";
-          }
-        }
-      else
-        {
-        // For non-DLL platforms shared libraries are treated as
-        // library targets.
-        return "LIBRARY";
-        }
-    case cmTarget::STATIC_LIBRARY:
-      // Static libraries are always treated as archive targets.
-      return "ARCHIVE";
-    case cmTarget::MODULE_LIBRARY:
-      if(implib)
-        {
-        // Module libraries are always treated as library targets.
-        return "ARCHIVE";
-        }
-      else
-        {
-        // Module import libraries are treated as archive targets.
-        return "LIBRARY";
-        }
-    case cmTarget::EXECUTABLE:
-      if(implib)
-        {
-        // Executable import libraries are treated as archive targets.
-        return "ARCHIVE";
-        }
-      else
-        {
-        // Executables are always treated as runtime targets.
-        return "RUNTIME";
-        }
-    default:
-      break;
-    }
-  return "";
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetFrameworkVersion() const
 {
   assert(this->GetType() != INTERFACE_LIBRARY);
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3cbee76..6ba9772 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -415,9 +415,6 @@ private:
   void SetPropertyDefault(const std::string& property,
                           const char* default_value);
 
-  // Returns ARCHIVE, LIBRARY, or RUNTIME based on platform and type.
-  const char* GetOutputTargetType(bool implib) const;
-
   std::string GetFullNameImported(const std::string& config,
                                   bool implib) const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e73916992c6893572f24ee4fa631b33445d6cdf6
commit e73916992c6893572f24ee4fa631b33445d6cdf6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 19:07:03 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:03:48 2015 +0200

    cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d907dd0..b8e2284 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1783,12 +1783,13 @@ void
 cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
                                                 cmTarget const* target)
 {
+  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Ignore targets on Apple where install_name is not @rpath.
   // The dependenty library can be found with other means such as
   // @loader_path or full paths.
   if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
     {
-    if(!target->HasMacOSXRpathInstallNameDir(this->Config))
+    if(!gtgt->HasMacOSXRpathInstallNameDir(this->Config))
       {
       return;
       }
@@ -1810,7 +1811,6 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
 
   // Try to get the soname of the library.  Only files with this name
   // could possibly conflict.
-  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   std::string soName = gtgt->GetSOName(this->Config);
   const char* soname = soName.empty()? 0 : soName.c_str();
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6ad6c69..b253836 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1284,6 +1284,120 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
 
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
+    const std::string& config) const
+{
+  bool install_name_is_rpath = false;
+  bool macosx_rpath = false;
+
+  if(!this->IsImported())
+    {
+    if(this->GetType() != cmTarget::SHARED_LIBRARY)
+      {
+      return false;
+      }
+    const char* install_name = this->GetProperty("INSTALL_NAME_DIR");
+    bool use_install_name =
+      this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH");
+    if(install_name && use_install_name &&
+       std::string(install_name) == "@rpath")
+      {
+      install_name_is_rpath = true;
+      }
+    else if(install_name && use_install_name)
+      {
+      return false;
+      }
+    if(!install_name_is_rpath)
+      {
+      macosx_rpath = this->MacOSXRpathInstallNameDirDefault();
+      }
+    }
+  else
+    {
+    // Lookup the imported soname.
+    if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
+      {
+      if(!info->NoSOName && !info->SOName.empty())
+        {
+        if(info->SOName.find("@rpath/") == 0)
+          {
+          install_name_is_rpath = true;
+          }
+        }
+      else
+        {
+        std::string install_name;
+        cmSystemTools::GuessLibraryInstallName(info->Location, install_name);
+        if(install_name.find("@rpath") != std::string::npos)
+          {
+          install_name_is_rpath = true;
+          }
+        }
+      }
+    }
+
+  if(!install_name_is_rpath && !macosx_rpath)
+    {
+    return false;
+    }
+
+  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
+    {
+    std::ostringstream w;
+    w << "Attempting to use";
+    if(macosx_rpath)
+      {
+      w << " MACOSX_RPATH";
+      }
+    else
+      {
+      w << " @rpath";
+      }
+    w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.";
+    w << "  This could be because you are using a Mac OS X version";
+    w << " less than 10.5 or because CMake's platform configuration is";
+    w << " corrupt.";
+    cmake* cm = this->Makefile->GetCMakeInstance();
+    cm->IssueMessage(cmake::FATAL_ERROR, w.str(),
+                     this->Target->GetBacktrace());
+    }
+
+  return true;
+}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const
+{
+  // we can't do rpaths when unsupported
+  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
+    {
+    return false;
+    }
+
+  const char* macosx_rpath_str = this->GetProperty("MACOSX_RPATH");
+  if(macosx_rpath_str)
+    {
+    return this->GetPropertyAsBool("MACOSX_RPATH");
+    }
+
+  cmPolicies::PolicyStatus cmp0042 = this->Target->GetPolicyStatusCMP0042();
+
+  if(cmp0042 == cmPolicies::WARN)
+    {
+    this->Makefile->GetGlobalGenerator()->
+      AddCMP0042WarnTarget(this->GetName());
+    }
+
+  if(cmp0042 == cmPolicies::NEW)
+    {
+    return true;
+    }
+
+  return false;
+}
+
+//----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetSOName(const std::string& config) const
 {
   if(this->Target->IsImported())
@@ -1428,7 +1542,7 @@ cmGeneratorTarget::GetInstallNameDirForBuildTree(
      !this->GetPropertyAsBool("SKIP_BUILD_RPATH"))
     {
     std::string dir;
-    if(this->Target->MacOSXRpathInstallNameDirDefault())
+    if(this->MacOSXRpathInstallNameDirDefault())
       {
       dir = "@rpath";
       }
@@ -1464,7 +1578,7 @@ std::string cmGeneratorTarget::GetInstallNameDirForInstallTree() const
       }
     if(!install_name_dir)
       {
-      if(this->Target->MacOSXRpathInstallNameDirDefault())
+      if(this->MacOSXRpathInstallNameDirDefault())
         {
         dir = "@rpath/";
         }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f068cae..fd4ee56 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -409,6 +409,12 @@ public:
 
   bool HaveInstallTreeRPATH() const;
 
+  /** Whether this library has \@rpath and platform supports it.  */
+  bool HasMacOSXRpathInstallNameDir(const std::string& config) const;
+
+  /** Whether this library defaults to \@rpath.  */
+  bool MacOSXRpathInstallNameDirDefault() const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index b19112d..70997bf 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -56,7 +56,8 @@ void cmLocalXCodeGenerator::Generate()
       iter != targets.end(); ++iter)
     {
     cmTarget* t = &iter->second;
-    t->HasMacOSXRpathInstallNameDir("");
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
     }
 }
 
@@ -70,7 +71,8 @@ void cmLocalXCodeGenerator::GenerateInstallRules()
       iter != targets.end(); ++iter)
     {
     cmTarget* t = &iter->second;
-    t->HasMacOSXRpathInstallNameDir("");
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
     }
 }
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index dd1d405..0b2d9fc 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2178,118 +2178,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HasMacOSXRpathInstallNameDir(const std::string& config) const
-{
-  bool install_name_is_rpath = false;
-  bool macosx_rpath = false;
-
-  if(!this->IsImportedTarget)
-    {
-    if(this->GetType() != cmTarget::SHARED_LIBRARY)
-      {
-      return false;
-      }
-    const char* install_name = this->GetProperty("INSTALL_NAME_DIR");
-    bool use_install_name =
-      this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH");
-    if(install_name && use_install_name &&
-       std::string(install_name) == "@rpath")
-      {
-      install_name_is_rpath = true;
-      }
-    else if(install_name && use_install_name)
-      {
-      return false;
-      }
-    if(!install_name_is_rpath)
-      {
-      macosx_rpath = this->MacOSXRpathInstallNameDirDefault();
-      }
-    }
-  else
-    {
-    // Lookup the imported soname.
-    if(cmTarget::ImportInfo const* info = this->GetImportInfo(config))
-      {
-      if(!info->NoSOName && !info->SOName.empty())
-        {
-        if(info->SOName.find("@rpath/") == 0)
-          {
-          install_name_is_rpath = true;
-          }
-        }
-      else
-        {
-        std::string install_name;
-        cmSystemTools::GuessLibraryInstallName(info->Location, install_name);
-        if(install_name.find("@rpath") != std::string::npos)
-          {
-          install_name_is_rpath = true;
-          }
-        }
-      }
-    }
-
-  if(!install_name_is_rpath && !macosx_rpath)
-    {
-    return false;
-    }
-
-  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
-    {
-    std::ostringstream w;
-    w << "Attempting to use";
-    if(macosx_rpath)
-      {
-      w << " MACOSX_RPATH";
-      }
-    else
-      {
-      w << " @rpath";
-      }
-    w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.";
-    w << "  This could be because you are using a Mac OS X version";
-    w << " less than 10.5 or because CMake's platform configuration is";
-    w << " corrupt.";
-    cmake* cm = this->Makefile->GetCMakeInstance();
-    cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->GetBacktrace());
-    }
-
-  return true;
-}
-
-//----------------------------------------------------------------------------
-bool cmTarget::MacOSXRpathInstallNameDirDefault() const
-{
-  // we can't do rpaths when unsupported
-  if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG"))
-    {
-    return false;
-    }
-
-  const char* macosx_rpath_str = this->GetProperty("MACOSX_RPATH");
-  if(macosx_rpath_str)
-    {
-    return this->GetPropertyAsBool("MACOSX_RPATH");
-    }
-
-  cmPolicies::PolicyStatus cmp0042 = this->GetPolicyStatusCMP0042();
-
-  if(cmp0042 == cmPolicies::WARN)
-    {
-    this->Makefile->GetGlobalGenerator()->
-      AddCMP0042WarnTarget(this->GetName());
-    }
-
-  if(cmp0042 == cmPolicies::NEW)
-    {
-    return true;
-    }
-
-  return false;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::IsImportedSharedLibWithoutSOName(
                                           const std::string& config) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 4b369d3..3cbee76 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -244,12 +244,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Whether this library has \@rpath and platform supports it.  */
-  bool HasMacOSXRpathInstallNameDir(const std::string& config) const;
-
-  /** Whether this library defaults to \@rpath.  */
-  bool MacOSXRpathInstallNameDirDefault() const;
-
   /** Test for special case of a third-party shared library that has
       no soname at all.  */
   bool IsImportedSharedLibWithoutSOName(const std::string& config) const;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 05:09:17 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 05:09:17 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-297-g1722706
Message-ID: <20151010090917.59013BD038@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  172270644be5784f54a4c83785ec2000d0855710 (commit)
       via  223d0efe55ff66f6ceb25ecdfbd1d915c76af548 (commit)
       via  a367416cec8297c5a567825217b933f4539a44e4 (commit)
       via  bbef3c2da83b7a69d1f99b21dc92d5506d98fb35 (commit)
      from  8260b306665b1c86841c6a20dae3556b58ecbdee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=172270644be5784f54a4c83785ec2000d0855710
commit 172270644be5784f54a4c83785ec2000d0855710
Merge: 8260b30 223d0ef
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 05:09:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 05:09:16 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    223d0efe Remove some needless GetMakefile() calls.
    a367416c cmLocalGenerator: Add current source directory accessor.
    bbef3c2d cmLocalGenerator: Add current binary directory accessor.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=223d0efe55ff66f6ceb25ecdfbd1d915c76af548
commit 223d0efe55ff66f6ceb25ecdfbd1d915c76af548
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:42:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:04:39 2015 +0200

    Remove some needless GetMakefile() calls.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f3b651..4b6bd50 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -101,7 +101,7 @@ cmCustomCommandGenerator
       }
     else
       {
-      cmOutputConverter converter(this->LG->GetMakefile()->GetStateSnapshot());
+      cmOutputConverter converter(this->LG->GetStateSnapshot());
       cmd += converter.EscapeForShell(arg, this->MakeVars);
       }
     }
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index e4d9f10..8ac5cbc 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -139,7 +139,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator *lg)
       {
       std::ostringstream e;
       e << "Evaluation file \"" << this->Input << "\" cannot be read.";
-      lg->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
+      lg->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
 
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index a8cef0e..bfb58f2 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -495,7 +495,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the directory-level
   // rules of the subdirectories.
   std::vector<cmState::Snapshot> children
-      = lg->GetMakefile()->GetStateSnapshot().GetChildren();
+      = lg->GetStateSnapshot().GetChildren();
   for(std::vector<cmState::Snapshot>::const_iterator
         ci = children.begin(); ci != children.end(); ++ci)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a367416cec8297c5a567825217b933f4539a44e4
commit a367416cec8297c5a567825217b933f4539a44e4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 19:25:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:04:39 2015 +0200

    cmLocalGenerator: Add current source directory accessor.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index cca3858..fdfa35e 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -497,7 +497,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
     std::string sourceLinkedResourceName = "[Source directory]";
     std::string linkSourceDirectory = this->GetEclipsePath(
-                                             mf->GetCurrentSourceDirectory());
+                                             lg->GetCurrentSourceDirectory());
     // .project dir can't be subdir of a linked resource dir
     if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory,
                                          linkSourceDirectory))
@@ -638,7 +638,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
        ++it)
     {
     std::string linkSourceDirectory = this->GetEclipsePath(
-                   it->second[0]->GetMakefile()->GetCurrentSourceDirectory());
+                   it->second[0]->GetCurrentSourceDirectory());
     // a linked resource must not point to a parent directory of .project or
     // .project itself
     if ((baseDir != linkSourceDirectory) &&
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c7e09b9..8693785 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2105,7 +2105,7 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
   for(std::vector<cmLocalGenerator*>::const_iterator it =
       this->LocalGenerators.begin(); it != this->LocalGenerators.end(); ++it)
     {
-    std::string sd = (*it)->GetMakefile()->GetCurrentSourceDirectory();
+    std::string sd = (*it)->GetCurrentSourceDirectory();
     if (sd == start_dir)
       {
       return *it;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index b2d8f4a..04441eb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -412,8 +412,9 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
 {
   this->CurrentProject = root->GetProjectName();
   this->SetCurrentLocalGenerator(root);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
-                           this->ProjectSourceDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
+        this->ProjectSourceDirectoryComponents);
   cmSystemTools::SplitPath(
         this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
         this->ProjectOutputDirectoryComponents);
@@ -461,7 +462,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   mf->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
-  std::string listfile = mf->GetCurrentSourceDirectory();
+  std::string listfile = root->GetCurrentSourceDirectory();
   listfile += "/";
   listfile += "CMakeLists.txt";
   allBuildGt->AddSource(listfile.c_str());
@@ -557,7 +558,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
 
       // Refer to the build configuration file for easy editing.
-      listfile = lg->GetMakefile()->GetCurrentSourceDirectory();
+      listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
       targetGT->AddSource(listfile.c_str());
@@ -3372,7 +3373,7 @@ bool cmGlobalXCodeGenerator
   // Point Xcode at the top of the source tree.
   {
   std::string pdir =
-    this->RelativeToBinary(root->GetMakefile()->GetCurrentSourceDirectory());
+    this->RelativeToBinary(root->GetCurrentSourceDirectory());
   this->RootObject->AddAttribute("projectDirPath",
                                  this->CreateString(pdir.c_str()));
   this->RootObject->AddAttribute("projectRoot", this->CreateString(""));
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8096bd7..c0c50c4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2883,6 +2883,11 @@ const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
+const char* cmLocalGenerator::GetCurrentSourceDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentSource();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7ca587e..8070667 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -259,6 +259,7 @@ public:
   const char* GetBinaryDirectory() const;
 
   const char* GetCurrentBinaryDirectory() const;
+  const char* GetCurrentSourceDirectory() const;
 
   /**
    * Generate a Mac OS X application bundle Info.plist file.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index c226b46..4d024e1 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -215,7 +215,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   if(!cmSystemTools::FileExists(makefileIn.c_str()))
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a94113a..082b7c3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -282,7 +282,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   stampName += "generate.stamp";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
-  std::string makefileIn = this->Makefile->GetCurrentSourceDirectory();
+  std::string makefileIn = this->GetCurrentSourceDirectory();
   makefileIn += "/";
   makefileIn += "CMakeLists.txt";
   makefileIn = cmSystemTools::CollapseFullPath(makefileIn.c_str());
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 9c71a10..7bee268 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1114,7 +1114,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentSourceDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentSourceDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index d792ba7..133d2ff 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -45,8 +45,7 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
-        cmMakefile *mf = target->Target->GetMakefile();
-        if (strcmp(mf->GetCurrentSourceDirectory(),
+        if (strcmp(target->GetLocalGenerator()->GetCurrentSourceDirectory(),
                    target->GetLocalGenerator()->GetSourceDirectory()) == 0)
           return new cmNinjaUtilityTargetGenerator(target);
         // else fallthrough
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 8cefd7c..92b7a57 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2243,7 +2243,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 {
   // Look through the sources for AndroidManifest.xml and use
   // its location as the root source directory.
-  std::string rootDir = this->Makefile->GetCurrentSourceDirectory();
+  std::string rootDir = this->LocalGenerator->GetCurrentSourceDirectory();
   {
   std::vector<cmSourceFile const*> extraSources;
   this->GeneratorTarget->GetExtraSources(extraSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbef3c2da83b7a69d1f99b21dc92d5506d98fb35
commit bbef3c2da83b7a69d1f99b21dc92d5506d98fb35
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 25 00:13:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:04:39 2015 +0200

    cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 856dcd4..80f560f 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -160,7 +160,7 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends,
   if (mod_dir.empty())
     {
     mod_dir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
     }
 
   // Actually write dependencies to the streams.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index b7ada2f..c9d0ce2 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -76,8 +76,7 @@ void cmExtraCodeBlocksGenerator::Generate()
 void cmExtraCodeBlocksGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   std::string filename=outputDir+"/";
@@ -331,7 +330,7 @@ void cmExtraCodeBlocksGenerator
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
-          if (strcmp(makefile->GetCurrentBinaryDirectory(),
+          if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
             this->AppendTarget(fout, ti->first, 0,
@@ -524,11 +523,10 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
                                         cmLocalGenerator* lg,
                                         cmTarget* target) const
 {
-  cmMakefile *mf = lg->GetMakefile();
   // this file doesn't seem to be used by C::B in custom makefile mode,
   // but we generate a unique file for each OBJECT library so in case
   // C::B uses it in some way, the targets don't interfere with each other.
-  std::string filename = mf->GetCurrentBinaryDirectory();
+  std::string filename = lg->GetCurrentBinaryDirectory();
   filename += "/";
   filename += lg->GetTargetDirectory(*target);
   filename += "/";
@@ -555,14 +553,14 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
                                               const char* compiler)
 {
   cmMakefile const* makefile = lg->GetMakefile();
-  std::string makefileName = makefile->GetCurrentBinaryDirectory();
+  std::string makefileName = lg->GetCurrentBinaryDirectory();
   makefileName += "/Makefile";
 
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
     int cbTargetType = this->GetCBTargetType(target);
-    std::string workingDir = makefile->GetCurrentBinaryDirectory();
+    std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmTarget::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
@@ -659,7 +657,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   else // e.g. all and the GLOBAL and UTILITY targets
     {
     fout<<"         <Option working_dir=\""
-        << makefile->GetCurrentBinaryDirectory() << "\" />\n"
+        << lg->GetCurrentBinaryDirectory() << "\" />\n"
         <<"         <Option type=\"" << 4 << "\" />\n";
     }
 
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index c22b786..31dbf3d 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -68,15 +68,15 @@ void cmExtraCodeLiteGenerator::Generate()
     const cmMakefile* mf =it->second[0]->GetMakefile();
     this->ConfigName = GetConfigurationName( mf );
 
-    if (strcmp(mf->GetCurrentBinaryDirectory(),
+    if (strcmp(it->second[0]->GetCurrentBinaryDirectory(),
                it->second[0]->GetBinaryDirectory()) == 0)
       {
-      workspaceOutputDir   = mf->GetCurrentBinaryDirectory();
+      workspaceOutputDir   = it->second[0]->GetCurrentBinaryDirectory();
       workspaceProjectName = it->second[0]->GetProjectName();
       workspaceSourcePath  = it->second[0]->GetSourceDirectory();
       workspaceFileName    = workspaceOutputDir+"/";
       workspaceFileName   += workspaceProjectName + ".workspace";
-      this->WorkspacePath = mf->GetCurrentBinaryDirectory();;
+      this->WorkspacePath = it->second[0]->GetCurrentBinaryDirectory();;
 
       fout.Open(workspaceFileName.c_str(), false, false);
       fout << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -91,8 +91,7 @@ void cmExtraCodeLiteGenerator::Generate()
        ++it)
     {
     // retrive project information
-    const cmMakefile* mf    = it->second[0]->GetMakefile();
-    std::string outputDir   = mf->GetCurrentBinaryDirectory();
+    std::string outputDir   = it->second[0]->GetCurrentBinaryDirectory();
     std::string projectName = it->second[0]->GetProjectName();
     std::string filename    = outputDir + "/" + projectName + ".project";
 
@@ -121,8 +120,7 @@ void cmExtraCodeLiteGenerator::Generate()
 void cmExtraCodeLiteGenerator::CreateProjectFile(
   const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf    = lgs[0]->GetMakefile();
-  std::string outputDir   = mf->GetCurrentBinaryDirectory();
+  std::string outputDir   = lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName = lgs[0]->GetProjectName();
   std::string filename    = outputDir + "/";
 
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 47e2566..cca3858 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -208,7 +208,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
 
   std::string cacheEntryName = "CMAKE_ECLIPSE_ENVVAR_";
   cacheEntryName += envVar;
-  const char* cacheValue = mf->GetState()->GetInitializedCacheValue(
+  const char* cacheValue = lg->GetState()->GetInitializedCacheValue(
                                                        cacheEntryName);
 
   // now we have both, decide which one to use
@@ -1036,8 +1036,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        ++it)
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
-    std::string subdir = (*it)->Convert(makefile->GetCurrentBinaryDirectory(),
+    std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
       {
@@ -1098,7 +1097,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
                              ti->first.c_str());
 
           std::string cleanArgs = "-E chdir \"";
-          cleanArgs += makefile->GetCurrentBinaryDirectory();
+          cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index f14a1cc..fe77026 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -121,7 +121,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
     {
     const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
     cmMakefile* makefile=(*it)->GetMakefile();
-    std::string currentDir = makefile->GetCurrentBinaryDirectory();
+    std::string currentDir = (*it)->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
     for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 7413a2d..6306360 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -77,8 +77,7 @@ void cmExtraSublimeTextGenerator::Generate()
 void cmExtraSublimeTextGenerator::CreateProjectFile(
                                      const std::vector<cmLocalGenerator*>& lgs)
 {
-  const cmMakefile* mf=lgs[0]->GetMakefile();
-  std::string outputDir=mf->GetCurrentBinaryDirectory();
+  std::string outputDir=lgs[0]->GetCurrentBinaryDirectory();
   std::string projectName=lgs[0]->GetProjectName();
 
   const std::string filename =
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 6284c6d..f955ef7 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -49,8 +49,7 @@ void cmGlobalKdevelopGenerator::Generate()
       it!= this->GlobalGenerator->GetProjectMap().end();
       ++it)
     {
-    cmMakefile* mf = it->second[0]->GetMakefile();
-    std::string outputDir=mf->GetCurrentBinaryDirectory();
+    std::string outputDir=it->second[0]->GetCurrentBinaryDirectory();
     std::string projectDir=it->second[0]->GetSourceDirectory();
     std::string projectName=it->second[0]->GetProjectName();
     std::string cmakeFilePattern("CMakeLists.txt;*.cmake;");
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index be35e27..a8cef0e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -163,7 +163,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
     {
     cmLocalUnixMakefileGenerator3 *lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    std::string markFileName = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    std::string markFileName = lg->GetCurrentBinaryDirectory();
     markFileName += "/";
     markFileName += cmake::GetCMakeFilesDirectory();
     markFileName += "/progress.marks";
@@ -395,7 +395,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
     {
     lg =
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
-    tmpStr = lg->GetMakefile()->GetCurrentBinaryDirectory();
+    tmpStr = lg->GetCurrentBinaryDirectory();
     tmpStr += cmake::GetCMakeFilesDirectory();
     tmpStr += "/CMakeDirectoryInformation.cmake";
     cmakefileStream << "  \"" <<
@@ -454,7 +454,7 @@ cmGlobalUnixMakefileGenerator3
                       bool check_relink)
 {
   // Get the relative path to the subdirectory from the top.
-  std::string makeTarget = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string makeTarget = lg->GetCurrentBinaryDirectory();
   makeTarget += "/";
   makeTarget += pass;
 
@@ -534,7 +534,7 @@ cmGlobalUnixMakefileGenerator3
     }
 
   // Begin the directory-level rules section.
-  std::string dir = lg->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string dir = lg->GetCurrentBinaryDirectory();
   dir = lg->Convert(dir, cmLocalGenerator::HOME_OUTPUT,
                     cmLocalGenerator::MAKERULE);
   lg->WriteDivider(ruleFileStream);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 73a952b..f4166b9 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -363,7 +363,7 @@ void cmGlobalVisualStudio7Generator
     return;
     }
   this->CurrentProject = root->GetProjectName();
-  std::string fname = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = root->GetCurrentBinaryDirectory();
   fname += "/";
   fname += root->GetProjectName();
   fname += ".sln";
@@ -468,8 +468,10 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmMakefile* tmf = target->GetMakefile();
-        std::string dir = tmf->GetCurrentBinaryDirectory();
+        cmLocalGenerator* lg =
+            root->GetGlobalGenerator()->GetGeneratorTarget(target)
+            ->GetLocalGenerator();
+        std::string dir = lg->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
         if(dir == ".")
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 146fa39..b2d8f4a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -414,11 +414,12 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
   this->SetCurrentLocalGenerator(root);
   cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
                            this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentBinaryDirectory(),
-                           this->ProjectOutputDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
+        this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
-    root->GetMakefile()->GetCurrentBinaryDirectory();
+    root->GetCurrentBinaryDirectory();
   this->CurrentXCodeHackMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentXCodeHackMakefile.c_str());
   this->CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
@@ -466,7 +467,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   allBuildGt->AddSource(listfile.c_str());
 
   // Add XCODE depend helper
-  std::string dir = mf->GetCurrentBinaryDirectory();
+  std::string dir = root->GetCurrentBinaryDirectory();
   cmCustomCommandLine makeHelper;
   if(this->XcodeVersion < 50)
     {
@@ -568,7 +569,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   cmLocalGenerator* root, std::vector<cmLocalGenerator*> const& gens)
 {
-  cmMakefile* mf = root->GetMakefile();
   std::vector<std::string> lfiles;
   for(std::vector<cmLocalGenerator*>::const_iterator gi = gens.begin();
       gi != gens.end(); ++gi)
@@ -582,7 +582,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   std::vector<std::string>::iterator new_end =
     std::unique(lfiles.begin(), lfiles.end());
   lfiles.erase(new_end, lfiles.end());
-  this->CurrentReRunCMakeMakefile = mf->GetCurrentBinaryDirectory();
+  this->CurrentReRunCMakeMakefile = root->GetCurrentBinaryDirectory();
   this->CurrentReRunCMakeMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str());
   this->CurrentReRunCMakeMakefile += "/ReRunCMake.make";
@@ -1033,7 +1033,7 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen)
   this->CurrentLocalGenerator = gen;
   this->CurrentMakefile = gen->GetMakefile();
   std::string outdir =
-    cmSystemTools::CollapseFullPath(this->CurrentMakefile->
+    cmSystemTools::CollapseFullPath(this->CurrentLocalGenerator->
                                     GetCurrentBinaryDirectory());
   cmSystemTools::SplitPath(outdir.c_str(),
                            this->CurrentOutputDirectoryComponents);
@@ -1389,7 +1389,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // linker language.  This should convince Xcode to choose the proper
   // language.
   cmMakefile* mf = cmtarget.GetMakefile();
-  std::string fname = mf->GetCurrentBinaryDirectory();
+  std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
   fname += cmtarget.GetName();
@@ -1618,7 +1618,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 const & commands,
                                                 const char* name)
 {
-  std::string dir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string dir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   dir += "/CMakeScripts";
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
@@ -1639,7 +1639,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                     currentConfig->c_str());
     }
 
-  std::string cdir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string cdir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   cdir = this->ConvertToRelativeForXCode(cdir.c_str());
   std::string makecmd = "make -C ";
   makecmd += cdir;
@@ -1967,7 +1967,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Set attributes to specify the proper name for the target.
-  std::string pndir = this->CurrentMakefile->GetCurrentBinaryDirectory();
+  std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
   if(target.GetType() == cmTarget::STATIC_LIBRARY ||
      target.GetType() == cmTarget::SHARED_LIBRARY ||
      target.GetType() == cmTarget::MODULE_LIBRARY ||
@@ -3484,7 +3484,7 @@ bool cmGlobalXCodeGenerator
     }
   }
 
-  std::string symroot = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string symroot = root->GetCurrentBinaryDirectory();
   symroot += "/build";
   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
 
@@ -3727,7 +3727,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
     {
     return;
     }
-  std::string xcodeDir = root->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string xcodeDir = root->GetCurrentBinaryDirectory();
   xcodeDir += "/";
   xcodeDir += root->GetProjectName();
   xcodeDir += ".xcode";
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 97b9405..f7c9cc2 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -64,7 +64,7 @@ void cmInstallExportGenerator::ComputeTempDir()
   // Choose a temporary directory in which to generate the import
   // files to be installed.
   this->TempDir =
-      this->LocalGenerator->GetMakefile()->GetCurrentBinaryDirectory();
+      this->LocalGenerator->GetCurrentBinaryDirectory();
   this->TempDir += cmake::GetCMakeFilesDirectory();
   this->TempDir += "/Export";
   if(this->Destination.empty())
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6c442f4..8096bd7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2878,6 +2878,11 @@ const char* cmLocalGenerator::GetBinaryDirectory() const
   return this->GetCMakeInstance()->GetHomeOutputDirectory();
 }
 
+const char* cmLocalGenerator::GetCurrentBinaryDirectory() const
+{
+  return this->StateSnapshot.GetDirectory().GetCurrentBinary();
+}
+
 //----------------------------------------------------------------------------
 std::string
 cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2123f1e..7ca587e 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -258,6 +258,8 @@ public:
   const char* GetSourceDirectory() const;
   const char* GetBinaryDirectory() const;
 
+  const char* GetCurrentBinaryDirectory() const;
+
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index b1e1d3f..6319f0e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -363,7 +363,7 @@ void cmLocalNinjaGenerator::AppendCustomCommandLines(
   if (ccg.GetNumberOfCommands() > 0) {
     std::string wd = ccg.GetWorkingDirectory();
     if (wd.empty())
-      wd = this->GetMakefile()->GetCurrentBinaryDirectory();
+      wd = this->GetCurrentBinaryDirectory();
 
     std::ostringstream cdCmd;
 #ifdef _WIN32
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3f51569..c226b46 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -111,14 +111,14 @@ void cmLocalVisualStudio6Generator::Generate()
 void cmLocalVisualStudio6Generator::OutputDSPFile()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -163,7 +163,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       std::string::size_type pos = l->first.rfind('/');
       if(pos != std::string::npos)
         {
-        std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+        std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
         dir += l->first.substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
@@ -189,7 +189,7 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
@@ -578,9 +578,9 @@ cmLocalVisualStudio6Generator
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
-  char* output = new char[(strlen(this->Makefile->GetCurrentBinaryDirectory())
+  char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
                            + target.GetName().size() + 30)];
-  sprintf(output,"%s/%s_force_%i", this->Makefile->GetCurrentBinaryDirectory(),
+  sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
           target.GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
@@ -1964,7 +1964,7 @@ cmLocalVisualStudio6Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 48a633e..a94113a 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -140,7 +140,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       cmCustomCommandLines force_commands;
       force_commands.push_back(force_command);
       std::string no_main_dependency = "";
-      std::string force = this->Makefile->GetCurrentBinaryDirectory();
+      std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
       force += tgt.GetName();
@@ -164,14 +164,14 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
 void cmLocalVisualStudio7Generator::WriteProjectFiles()
 {
   // If not an in source build, then create the output directory
-  if(strcmp(this->Makefile->GetCurrentBinaryDirectory(),
+  if(strcmp(this->GetCurrentBinaryDirectory(),
             this->GetSourceDirectory()) != 0)
     {
     if(!cmSystemTools::MakeDirectory
-       (this->Makefile->GetCurrentBinaryDirectory()))
+       (this->GetCurrentBinaryDirectory()))
       {
       cmSystemTools::Error("Error creating directory ",
-                           this->Makefile->GetCurrentBinaryDirectory());
+                           this->GetCurrentBinaryDirectory());
       }
     }
 
@@ -200,7 +200,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 {
   // Touch a timestamp file used to determine when the project file is
   // out of date.
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += cmake::GetCMakeFilesDirectory();
   cmSystemTools::MakeDirectory(stampName.c_str());
   stampName += "/";
@@ -247,7 +247,7 @@ void cmLocalVisualStudio7Generator
   target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
-  fname = this->Makefile->GetCurrentBinaryDirectory();
+  fname = this->GetCurrentBinaryDirectory();
   fname += "/";
   fname += lname;
   if(this->FortranProject)
@@ -276,7 +276,7 @@ void cmLocalVisualStudio7Generator
 //----------------------------------------------------------------------------
 cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 {
-  std::string stampName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string stampName = this->GetCurrentBinaryDirectory();
   stampName += "/";
   stampName += cmake::GetCMakeFilesDirectoryPostSlash();
   stampName += "generate.stamp";
@@ -1723,7 +1723,7 @@ cmLocalVisualStudio7Generator
   // files directory for any configuration.  This is used to construct
   // object file names that do not produce paths that are too long.
   std::string dir_max;
-  dir_max += this->Makefile->GetCurrentBinaryDirectory();
+  dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
   dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 3d7cc72..9c71a10 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -419,7 +419,7 @@ void cmMakefileTargetGenerator
   this->WriteObjectBuildFile(obj, lang, source, depends);
 
   // The object file should be checked for dependency integrity.
-  std::string objFullPath = this->Makefile->GetCurrentBinaryDirectory();
+  std::string objFullPath = this->LocalGenerator->GetCurrentBinaryDirectory();
   objFullPath += "/";
   objFullPath += obj;
   objFullPath =
@@ -642,7 +642,8 @@ cmMakefileTargetGenerator
     this->LocalGenerator->ExpandRuleVariables(compileCommand, vars);
     std::string workingDirectory =
       this->LocalGenerator->Convert(
-        this->Makefile->GetCurrentBinaryDirectory(), cmLocalGenerator::FULL);
+        this->LocalGenerator->GetCurrentBinaryDirectory(),
+                                    cmLocalGenerator::FULL);
     compileCommand.replace(compileCommand.find(langFlags),
                            langFlags.size(), this->GetFlags(lang));
     std::string langDefines = std::string("$(") + lang + "_DEFINES)";
@@ -698,7 +699,7 @@ cmMakefileTargetGenerator
   // Change the command working directory to the local build tree.
   this->LocalGenerator->CreateCDCommand
     (compileCommands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
   commands.insert(commands.end(),
                   compileCommands.begin(), compileCommands.end());
@@ -771,7 +772,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (preprocessCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         preprocessCommands.begin(),
@@ -828,7 +829,7 @@ cmMakefileTargetGenerator
 
         this->LocalGenerator->CreateCDCommand
           (assemblyCommands,
-           this->Makefile->GetCurrentBinaryDirectory(),
+           this->LocalGenerator->GetCurrentBinaryDirectory(),
            cmLocalGenerator::HOME_OUTPUT);
         commands.insert(commands.end(),
                         assemblyCommands.begin(),
@@ -929,7 +930,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
                                            *this->Target);
   this->LocalGenerator->CreateCDCommand
     (commands,
-     this->Makefile->GetCurrentBinaryDirectory(),
+     this->LocalGenerator->GetCurrentBinaryDirectory(),
      cmLocalGenerator::HOME_OUTPUT);
 
   // Write the rule.
@@ -1119,7 +1120,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
          << this->Convert(this->LocalGenerator->GetBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
-         << this->Convert(this->Makefile->GetCurrentBinaryDirectory(),
+         << this->Convert(this->LocalGenerator->GetCurrentBinaryDirectory(),
                           cmLocalGenerator::FULL, cmLocalGenerator::SHELL)
          << " "
          << this->Convert(this->InfoFileNameFull,
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..8cefd7c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -195,7 +195,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->BuildFileStream = 0;
   this->IsMissingFiles = false;
   this->DefaultArtifactDir =
-    this->Makefile->GetCurrentBinaryDirectory() + std::string("/") +
+    this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") +
     this->LocalGenerator->GetTargetDirectory(*this->Target);
 }
 
@@ -297,8 +297,7 @@ void cmVisualStudio10TargetGenerator::Generate()
       return;
       }
     }
-  cmMakefile* mf = this->Target->GetMakefile();
-  std::string path =  mf->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj";
@@ -951,7 +950,7 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path,
 {
   return forceRelative
     ? cmSystemTools::RelativePath(
-      this->Makefile->GetCurrentBinaryDirectory(), path.c_str())
+      this->LocalGenerator->GetCurrentBinaryDirectory(), path.c_str())
     : path.c_str();
 }
 
@@ -990,7 +989,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
   this->AddMissingSourceGroups(groupsUsed, sourceGroups);
 
   // Write out group file
-  std::string path =  this->Makefile->GetCurrentBinaryDirectory();
+  std::string path =  this->LocalGenerator->GetCurrentBinaryDirectory();
   path += "/";
   path += this->Name;
   path += ".vcxproj.filters";
@@ -1448,7 +1447,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
     std::string sourceRel = this->ConvertPath(sf->GetFullPath(), true);
     size_t const maxLen = 250;
     if(sf->GetCustomCommand() ||
-       ((strlen(this->Makefile->GetCurrentBinaryDirectory()) + 1 +
+       ((strlen(this->LocalGenerator->GetCurrentBinaryDirectory()) + 1 +
          sourceRel.length()) <= maxLen))
       {
       forceRelative = true;
@@ -3313,7 +3312,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
   // For WP80, the manifest needs to be in the same folder as the project
   // this can cause an overwrite problem if projects aren't organized in
   // folders
-  std::string manifestFile = this->Makefile->GetCurrentBinaryDirectory() +
+  std::string manifestFile =
+      this->LocalGenerator->GetCurrentBinaryDirectory() +
                              std::string("/WMAppManifest.xml");
   std::string artifactDir =
     this->LocalGenerator->GetTargetDirectory(*this->Target);

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 05:25:05 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 05:25:05 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-310-g447886f
Message-ID: <20151010092505.F0137BFCC3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  447886f9173e168eaacd9aacc01c8fc82a763cb3 (commit)
       via  8f6f6504dbffbc40785fd98f5668789d558fea77 (commit)
       via  c66084f5d7df57c991d0f498de04a5f00ae0fcc1 (commit)
       via  83c29e3903f947f9d4b5ed79a535f850b3b946e2 (commit)
       via  1988255448d7e0f92f4d2f12cc8fc17b1429c328 (commit)
       via  c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc (commit)
       via  a6e1f05c154d123b01bfe75c13d3e016c9074f72 (commit)
       via  654002feb88a9a219e2d6b6011c7dccc791627b1 (commit)
       via  922c89014f372ca38303b4258345c23027046616 (commit)
       via  eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6 (commit)
       via  f539da126b55933fae6f40feea35e820cb632877 (commit)
       via  1c5d70f9c2b9b7e2aeaf1515ef72a6e9282ecde0 (commit)
       via  064c2488119269e88422ea444f87bdd44c4f6589 (commit)
      from  172270644be5784f54a4c83785ec2000d0855710 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=447886f9173e168eaacd9aacc01c8fc82a763cb3
commit 447886f9173e168eaacd9aacc01c8fc82a763cb3
Merge: 1722706 8f6f650
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 05:25:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 05:25:03 2015 -0400

    Merge topic 'use-generator-target' into next
    
    8f6f6504 cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.
    c66084f5 cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget.
    83c29e39 cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.
    19882554 cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget.
    c1f687b1 cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal.
    a6e1f05c cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.
    654002fe cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget.
    922c8901 cmGeneratorTarget: Port GetLinkInterface away from cmTarget.
    eaa5b9cb cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget.
    f539da12 cmGeneratorTarget: Port GetLinkInterfaceLibraries away from cmTarget.
    1c5d70f9 cmGeneratorTarget: Port processILibs away from cmTarget.
    064c2488 cmComputeLinkDepends: Port some API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f6f6504dbffbc40785fd98f5668789d558fea77
commit 8f6f6504dbffbc40785fd98f5668789d558fea77
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:07:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:58 2015 +0200

    cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 26119c3..f39a67d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4418,7 +4418,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
 void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
                                std::string const& value,
                                std::string const& config,
-                               cmTarget const* headTarget,
+                               cmGeneratorTarget const* headTarget,
                                bool usage_requirements_only,
                                std::vector<cmLinkItem>& items,
                                bool& hadHeadSensitiveCondition) const
@@ -4437,7 +4437,7 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
                                       this->Makefile,
                                       config,
                                       false,
-                                      headTarget,
+                                      headTarget->Target,
                                       this->Target, &dagChecker), libs);
   this->LookupLinkItems(libs, items);
   hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition();
@@ -4977,7 +4977,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     // The interface libraries have been explicitly set.
     this->ExpandLinkItems(linkIfaceProp, explicitLibraries,
                                   config,
-                                headTarget->Target, usage_requirements_only,
+                                headTarget, usage_requirements_only,
                                 iface.Libraries,
                                 iface.HadHeadSensitiveCondition);
     }
@@ -5004,7 +5004,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
         {
         bool hadHeadSensitiveConditionDummy = false;
         this->ExpandLinkItems(newProp, newExplicitLibraries, config,
-                              headTarget->Target,
+                              headTarget,
                               usage_requirements_only,
                               ifaceLibs, hadHeadSensitiveConditionDummy);
         }
@@ -5070,7 +5070,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     cmSystemTools::ExpandListArgument(info->Languages, iface.Languages);
     this->ExpandLinkItems(info->LibrariesProp, info->Libraries,
                                   config,
-                          headTarget->Target, usage_requirements_only,
+                          headTarget, usage_requirements_only,
                           iface.Libraries,
                           iface.HadHeadSensitiveCondition);
     std::vector<std::string> deps;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 03548e2..799110c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -507,7 +507,8 @@ private:
   mutable std::set<std::string> LinkImplicitNullProperties;
 
   void ExpandLinkItems(std::string const& prop, std::string const& value,
-                       std::string const& config, cmTarget const* headTarget,
+                       std::string const& config,
+                       const cmGeneratorTarget* headTarget,
                        bool usage_requirements_only,
                        std::vector<cmLinkItem>& items,
                        bool& hadHeadSensitiveCondition) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c66084f5d7df57c991d0f498de04a5f00ae0fcc1
commit c66084f5d7df57c991d0f498de04a5f00ae0fcc1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:07:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:41 2015 +0200

    cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8a550bf..26119c3 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4451,7 +4451,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
   // Imported targets have their own link interface.
   if(this->IsImported())
     {
-    return this->GetImportLinkInterface(config, head->Target, false);
+    return this->GetImportLinkInterface(config, head, false);
     }
 
   // Link interfaces are not supported for executables that do not
@@ -4599,7 +4599,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
   // Imported targets have their own link interface.
   if(this->IsImported())
     {
-    return this->GetImportLinkInterface(config, head->Target,
+    return this->GetImportLinkInterface(config, head,
                                                 usage_requirements_only);
     }
 
@@ -5040,7 +5040,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
 //----------------------------------------------------------------------------
 const cmLinkInterface *
 cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
-                                 cmTarget const* headTarget,
+                                 cmGeneratorTarget const* headTarget,
                                  bool usage_requirements_only) const
 {
   cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config);
@@ -5062,7 +5062,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[headTarget];
+  cmOptionalLinkInterface& iface = hm[headTarget->Target];
   if(!iface.AllDone)
     {
     iface.AllDone = true;
@@ -5070,7 +5070,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     cmSystemTools::ExpandListArgument(info->Languages, iface.Languages);
     this->ExpandLinkItems(info->LibrariesProp, info->Libraries,
                                   config,
-                          headTarget, usage_requirements_only,
+                          headTarget->Target, usage_requirements_only,
                           iface.Libraries,
                           iface.HadHeadSensitiveCondition);
     std::vector<std::string> deps;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 15b1b80..03548e2 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -491,7 +491,8 @@ private:
       std::string const& config) const;
 
   cmLinkInterface const*
-    GetImportLinkInterface(const std::string& config, cmTarget const* head,
+    GetImportLinkInterface(const std::string& config,
+                           const cmGeneratorTarget* head,
                            bool usage_requirements_only) const;
 
   typedef std::map<std::string, std::vector<cmSourceFile*> >

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83c29e3903f947f9d4b5ed79a535f850b3b946e2
commit 83c29e3903f947f9d4b5ed79a535f850b3b946e2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:04:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:27 2015 +0200

    cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b20921f..8a550bf 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5111,7 +5111,7 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
-    this->ComputeLinkImplementationLibraries(config, impl, this->Target);
+    this->ComputeLinkImplementationLibraries(config, impl, this);
     }
   if(!impl.LanguagesDone)
     {
@@ -5293,7 +5293,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
-    this->ComputeLinkImplementationLibraries(config, impl, head->Target);
+    this->ComputeLinkImplementationLibraries(config, impl, head);
     }
   return &impl;
 }
@@ -5310,7 +5310,7 @@ cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
 void cmGeneratorTarget::ComputeLinkImplementationLibraries(
   const std::string& config,
   cmOptionalLinkImplementation& impl,
-  cmTarget const* head) const
+  cmGeneratorTarget const* head) const
 {
   cmStringRange entryRange =
       this->Target->GetLinkImplementationEntries();
@@ -5329,7 +5329,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
     cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
       ge.Parse(*le);
     std::string const evaluated =
-      cge->Evaluate(this->Makefile, config, false, head, &dagChecker);
+      cge->Evaluate(this->Makefile, config, false, head->Target, &dagChecker);
     cmSystemTools::ExpandListArgument(evaluated, llibs);
     if(cge->GetHadHeadSensitiveCondition())
       {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 7588a59..15b1b80 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -212,7 +212,7 @@ public:
 
   void ComputeLinkImplementationLibraries(const std::string& config,
                                           cmOptionalLinkImplementation& impl,
-                                          cmTarget const* head) const;
+                                          const cmGeneratorTarget* head) const;
 
   // Compute the set of languages compiled by the target.  This is
   // computed every time it is called because the languages can change

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1988255448d7e0f92f4d2f12cc8fc17b1429c328
commit 1988255448d7e0f92f4d2f12cc8fc17b1429c328
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:03:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:27 2015 +0200

    cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5734edf..b20921f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -511,7 +511,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
 
 static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
                                   const std::string& config,
-                                  cmTarget *headTarget,
+                                  cmGeneratorTarget const* headTarget,
                                   cmGeneratorExpressionDAGChecker *dagChecker,
                                   std::vector<std::string>& result,
                                   bool excludeImported)
@@ -522,7 +522,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
-                                      config, false, headTarget,
+                                      config, false, headTarget->Target,
                                       depTgt, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
@@ -536,7 +536,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
-                                      config, false, headTarget,
+                                      config, false, headTarget->Target,
                                       depTgt, dagChecker), result);
     }
 }
@@ -869,7 +869,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, *li, config, this->Target,
+      handleSystemIncludesDep(this->Makefile, *li, config, this,
                               &dagChecker, result, excludeImported);
       }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc
commit c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:56:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:22:20 2015 +0200

    cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e7399ed..5734edf 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4546,7 +4546,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
     // The link implementation is the default link interface.
     cmLinkImplementationLibraries const*
       impl = this->GetLinkImplementationLibrariesInternal(config,
-                                                          headTarget->Target);
+                                                          headTarget);
     iface.ImplementationIsInterface = true;
     iface.WrongConfigLibraries = impl->WrongConfigLibraries;
     }
@@ -4990,7 +4990,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     {
     // The link implementation is the default link interface.
     cmLinkImplementationLibraries const* impl =
-      this->GetLinkImplementationLibrariesInternal(config, headTarget->Target);
+      this->GetLinkImplementationLibrariesInternal(config, headTarget);
     iface.Libraries.insert(iface.Libraries.end(),
                            impl->Libraries.begin(), impl->Libraries.end());
     if(this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
@@ -5263,13 +5263,13 @@ cmLinkImplementationLibraries const*
 cmGeneratorTarget::GetLinkImplementationLibraries(
     const std::string& config) const
 {
-  return this->GetLinkImplementationLibrariesInternal(config, this->Target);
+  return this->GetLinkImplementationLibrariesInternal(config, this);
 }
 
 //----------------------------------------------------------------------------
 cmLinkImplementationLibraries const*
 cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
-    const std::string& config, cmTarget const* head) const
+    const std::string& config, cmGeneratorTarget const* head) const
 {
   // There is no link implementation for imported targets.
   if(this->IsImported())
@@ -5289,11 +5289,11 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkImplementation& impl = hm[head];
+  cmOptionalLinkImplementation& impl = hm[head->Target];
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
-    this->ComputeLinkImplementationLibraries(config, impl, head);
+    this->ComputeLinkImplementationLibraries(config, impl, head->Target);
     }
   return &impl;
 }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index b832eea..7588a59 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -524,7 +524,7 @@ private:
 
   cmLinkImplementationLibraries const*
     GetLinkImplementationLibrariesInternal(const std::string& config,
-                                           cmTarget const* head) const;
+                                          const cmGeneratorTarget* head) const;
   bool
   ComputeOutputDir(const std::string& config,
                    bool implib, std::string& out) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6e1f05c154d123b01bfe75c13d3e016c9074f72
commit a6e1f05c154d123b01bfe75c13d3e016c9074f72
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:55:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:21:11 2015 +0200

    cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a15d016..e7399ed 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4485,7 +4485,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
     iface.AllDone = true;
     if(iface.Exists)
       {
-      this->ComputeLinkInterface(config, iface, head->Target);
+      this->ComputeLinkInterface(config, iface, head);
       }
     }
 
@@ -4495,7 +4495,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
 //----------------------------------------------------------------------------
 void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
                                     cmOptionalLinkInterface &iface,
-                                    cmTarget const* headTarget) const
+                                    cmGeneratorTarget const* headTarget) const
 {
   if(iface.ExplicitLibraries)
     {
@@ -4545,7 +4545,8 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
     {
     // The link implementation is the default link interface.
     cmLinkImplementationLibraries const*
-      impl = this->GetLinkImplementationLibrariesInternal(config, headTarget);
+      impl = this->GetLinkImplementationLibrariesInternal(config,
+                                                          headTarget->Target);
     iface.ImplementationIsInterface = true;
     iface.WrongConfigLibraries = impl->WrongConfigLibraries;
     }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index bbd06a6..b832eea 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -112,7 +112,7 @@ public:
                                     const cmGeneratorTarget* headTarget) const;
   void ComputeLinkInterface(const std::string& config,
                             cmOptionalLinkInterface& iface,
-                            cmTarget const* head) const;
+                            const cmGeneratorTarget* head) const;
 
   cmLinkInterfaceLibraries const*
     GetLinkInterfaceLibraries(const std::string& config,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=654002feb88a9a219e2d6b6011c7dccc791627b1
commit 654002feb88a9a219e2d6b6011c7dccc791627b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:50:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:21:09 2015 +0200

    cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 67920af..a15d016 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4478,7 +4478,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
     {
     iface.LibrariesDone = true;
     this->ComputeLinkInterfaceLibraries(
-      config, iface, head->Target, false);
+      config, iface, head, false);
     }
   if(!iface.AllDone)
     {
@@ -4629,7 +4629,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
     {
     iface.LibrariesDone = true;
     this->ComputeLinkInterfaceLibraries(
-      config, iface, head->Target, usage_requirements_only);
+      config, iface, head, usage_requirements_only);
     }
 
   return iface.Exists? &iface : 0;
@@ -4890,7 +4890,7 @@ void
 cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   const std::string& config,
   cmOptionalLinkInterface& iface,
-  cmTarget const* headTarget,
+  cmGeneratorTarget const* headTarget,
   bool usage_requirements_only) const
 {
   // Construct the property name suffix for this configuration.
@@ -4976,7 +4976,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     // The interface libraries have been explicitly set.
     this->ExpandLinkItems(linkIfaceProp, explicitLibraries,
                                   config,
-                                headTarget, usage_requirements_only,
+                                headTarget->Target, usage_requirements_only,
                                 iface.Libraries,
                                 iface.HadHeadSensitiveCondition);
     }
@@ -4989,7 +4989,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     {
     // The link implementation is the default link interface.
     cmLinkImplementationLibraries const* impl =
-      this->GetLinkImplementationLibrariesInternal(config, headTarget);
+      this->GetLinkImplementationLibrariesInternal(config, headTarget->Target);
     iface.Libraries.insert(iface.Libraries.end(),
                            impl->Libraries.begin(), impl->Libraries.end());
     if(this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
@@ -5003,8 +5003,9 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
         {
         bool hadHeadSensitiveConditionDummy = false;
         this->ExpandLinkItems(newProp, newExplicitLibraries, config,
-                                    headTarget, usage_requirements_only,
-                                ifaceLibs, hadHeadSensitiveConditionDummy);
+                              headTarget->Target,
+                              usage_requirements_only,
+                              ifaceLibs, hadHeadSensitiveConditionDummy);
         }
       if (ifaceLibs != iface.Libraries)
         {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f3eaccd..bbd06a6 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -121,7 +121,7 @@ public:
 
   void ComputeLinkInterfaceLibraries(const std::string& config,
                                      cmOptionalLinkInterface &iface,
-                                     cmTarget const* head,
+                                     const cmGeneratorTarget* head,
                                      bool usage_requirements_only) const;
 
   /** Get the full path to the target according to the settings in its

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=922c89014f372ca38303b4258345c23027046616
commit 922c89014f372ca38303b4258345c23027046616
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:49:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:20:30 2015 +0200

    cmGeneratorTarget: Port GetLinkInterface away from cmTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index a9e8cfc..7d20827 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -365,7 +365,7 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe)
     {
     // Follow the target dependencies.
     if(cmLinkInterface const* iface =
-       entry.Target->GetLinkInterface(this->Config, this->Target->Target))
+       entry.Target->GetLinkInterface(this->Config, this->Target))
       {
       const bool isIface =
                       entry.Target->GetType() == cmTarget::INTERFACE_LIBRARY;
@@ -465,7 +465,7 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
   if(entry.Target)
     {
     if(cmLinkInterface const* iface =
-       entry.Target->GetLinkInterface(this->Config, this->Target->Target))
+       entry.Target->GetLinkInterface(this->Config, this->Target))
       {
       // Follow public and private dependencies transitively.
       this->FollowSharedDeps(index, iface, true);
@@ -937,7 +937,7 @@ int cmComputeLinkDepends::ComputeComponentCount(NodeList const& nl)
     if(cmGeneratorTarget const* target = this->EntryList[*ni].Target)
       {
       if(cmLinkInterface const* iface =
-         target->GetLinkInterface(this->Config, this->Target->Target))
+         target->GetLinkInterface(this->Config, this->Target))
         {
         if(iface->Multiplicity > count)
           {
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 9e37c35..18aad10 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -297,7 +297,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
   cmGeneratorTarget const* depender = this->Targets[depender_index];
   if(cmLinkInterface const* iface =
                                 dependee->GetLinkInterface(config,
-                                                           depender->Target))
+                                                           depender))
     {
     for(std::vector<cmLinkItem>::const_iterator
         lib = iface->Libraries.begin();
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 881acee..d6149b3 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -799,7 +799,7 @@ cmExportFileGenerator
 {
   // Add the transitive link dependencies for this configuration.
   cmLinkInterface const* iface = target->GetLinkInterface(config,
-                                                          target->Target);
+                                                          target);
   if (!iface)
     {
     return;
@@ -911,7 +911,7 @@ cmExportFileGenerator
 
   // Add the transitive link dependencies for this configuration.
   if(cmLinkInterface const* iface =
-                            target->GetLinkInterface(config, target->Target))
+                            target->GetLinkInterface(config, target))
     {
     this->SetImportLinkProperty(suffix, target,
                                 "IMPORTED_LINK_INTERFACE_LANGUAGES",
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 13ef2a0..67920af 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1719,7 +1719,7 @@ public:
         this->Target->GetLocalGenerator()->GetGlobalGenerator()
             ->GetGeneratorTarget(item.Target);
     cmLinkInterface const* iface =
-      gtgt->GetLinkInterface(this->Config, this->HeadTarget->Target);
+      gtgt->GetLinkInterface(this->Config, this->HeadTarget);
     if(!iface) { return; }
 
     for(std::vector<std::string>::const_iterator
@@ -4446,12 +4446,12 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
 //----------------------------------------------------------------------------
 cmLinkInterface const*
 cmGeneratorTarget::GetLinkInterface(const std::string& config,
-                                    cmTarget const* head) const
+                                    cmGeneratorTarget const* head) const
 {
   // Imported targets have their own link interface.
   if(this->IsImported())
     {
-    return this->GetImportLinkInterface(config, head, false);
+    return this->GetImportLinkInterface(config, head->Target, false);
     }
 
   // Link interfaces are not supported for executables that do not
@@ -4473,19 +4473,19 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head];
+  cmOptionalLinkInterface& iface = hm[head->Target];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
     this->ComputeLinkInterfaceLibraries(
-      config, iface, head, false);
+      config, iface, head->Target, false);
     }
   if(!iface.AllDone)
     {
     iface.AllDone = true;
     if(iface.Exists)
       {
-      this->ComputeLinkInterface(config, iface, head);
+      this->ComputeLinkInterface(config, iface, head->Target);
       }
     }
 
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index c36117d..f3eaccd 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -109,7 +109,7 @@ public:
                          const std::string& config) const;
 
   cmLinkInterface const* GetLinkInterface(const std::string& config,
-                                        cmTarget const* headTarget) const;
+                                    const cmGeneratorTarget* headTarget) const;
   void ComputeLinkInterface(const std::string& config,
                             cmOptionalLinkInterface& iface,
                             cmTarget const* head) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6
commit eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:46:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:14:32 2015 +0200

    cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 99d1013..13ef2a0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1667,7 +1667,7 @@ public:
   cmTargetCollectLinkLanguages(cmGeneratorTarget const* target,
                                const std::string& config,
                                UNORDERED_SET<std::string>& languages,
-                               cmTarget const* head):
+                               cmGeneratorTarget const* head):
     Config(config), Languages(languages), HeadTarget(head),
     Makefile(target->Target->GetMakefile()), Target(target)
   { this->Visited.insert(target->Target); }
@@ -1719,7 +1719,7 @@ public:
         this->Target->GetLocalGenerator()->GetGlobalGenerator()
             ->GetGeneratorTarget(item.Target);
     cmLinkInterface const* iface =
-      gtgt->GetLinkInterface(this->Config, this->HeadTarget);
+      gtgt->GetLinkInterface(this->Config, this->HeadTarget->Target);
     if(!iface) { return; }
 
     for(std::vector<std::string>::const_iterator
@@ -1737,7 +1737,7 @@ public:
 private:
   std::string Config;
   UNORDERED_SET<std::string>& Languages;
-  cmTarget const* HeadTarget;
+  cmGeneratorTarget const* HeadTarget;
   cmMakefile* Makefile;
   const cmGeneratorTarget* Target;
   std::set<cmTarget const*> Visited;
@@ -1830,7 +1830,7 @@ void cmGeneratorTarget::ComputeLinkClosure(const std::string& config,
     }
 
   // Add interface languages from linked targets.
-  cmTargetCollectLinkLanguages cll(this, config, languages, this->Target);
+  cmTargetCollectLinkLanguages cll(this, config, languages, this);
   for(std::vector<cmLinkImplItem>::const_iterator li = impl->Libraries.begin();
       li != impl->Libraries.end(); ++li)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f539da126b55933fae6f40feea35e820cb632877
commit f539da126b55933fae6f40feea35e820cb632877
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:45:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:14:31 2015 +0200

    cmGeneratorTarget: Port GetLinkInterfaceLibraries away from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index fdacc82..78a5b6f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1109,8 +1109,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
 
     if(isInterfaceProperty)
       {
+      cmGeneratorTarget* gHeadTarget =
+          context->Makefile->GetGlobalGenerator()
+          ->GetGeneratorTarget(headTarget);
       if(cmLinkInterfaceLibraries const* iface =
-         gtgt->GetLinkInterfaceLibraries(context->Config, headTarget, true))
+         gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
         {
         linkedTargetsContent =
           getLinkedTargetsContent(iface->Libraries, target,
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 71506d1..99d1013 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2058,7 +2058,7 @@ void processILibs(const std::string& config,
     tgts.push_back(item.Target);
     cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
-       gt->GetLinkInterfaceLibraries(config, headTarget->Target, true))
+       gt->GetLinkInterfaceLibraries(config, headTarget, true))
       {
       for(std::vector<cmLinkItem>::const_iterator
             it = iface->Libraries.begin();
@@ -4592,13 +4592,13 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
 //----------------------------------------------------------------------------
 const cmLinkInterfaceLibraries *
 cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
-                                    cmTarget const* head,
+                                    cmGeneratorTarget const* head,
                                     bool usage_requirements_only) const
 {
   // Imported targets have their own link interface.
   if(this->IsImported())
     {
-    return this->GetImportLinkInterface(config, head,
+    return this->GetImportLinkInterface(config, head->Target,
                                                 usage_requirements_only);
     }
 
@@ -4624,12 +4624,12 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head];
+  cmOptionalLinkInterface& iface = hm[head->Target];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
     this->ComputeLinkInterfaceLibraries(
-      config, iface, head, usage_requirements_only);
+      config, iface, head->Target, usage_requirements_only);
     }
 
   return iface.Exists? &iface : 0;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 49de632..c36117d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -116,7 +116,7 @@ public:
 
   cmLinkInterfaceLibraries const*
     GetLinkInterfaceLibraries(const std::string& config,
-                              cmTarget const* headTarget,
+                              const cmGeneratorTarget* headTarget,
                               bool usage_requirements_only) const;
 
   void ComputeLinkInterfaceLibraries(const std::string& config,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c5d70f9c2b9b7e2aeaf1515ef72a6e9282ecde0
commit 1c5d70f9c2b9b7e2aeaf1515ef72a6e9282ecde0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:40:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:14:31 2015 +0200

    cmGeneratorTarget: Port processILibs away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8ff78e0..71506d1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2047,7 +2047,7 @@ void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result,
 
 //----------------------------------------------------------------------------
 void processILibs(const std::string& config,
-                  cmTarget const* headTarget,
+                  cmGeneratorTarget const* headTarget,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
                   std::vector<cmTarget const*>& tgts,
@@ -2058,7 +2058,7 @@ void processILibs(const std::string& config,
     tgts.push_back(item.Target);
     cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
-       gt->GetLinkInterfaceLibraries(config, headTarget, true))
+       gt->GetLinkInterfaceLibraries(config, headTarget->Target, true))
       {
       for(std::vector<cmLinkItem>::const_iterator
             it = iface->Libraries.begin();
@@ -2089,7 +2089,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
           it = impl->Libraries.begin();
         it != impl->Libraries.end(); ++it)
       {
-      processILibs(config, this->Target, *it,
+      processILibs(config, this, *it,
                    this->LocalGenerator->GetGlobalGenerator(),
                    tgts , emitted);
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=064c2488119269e88422ea444f87bdd44c4f6589
commit 064c2488119269e88422ea444f87bdd44c4f6589
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:41:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:14:31 2015 +0200

    cmComputeLinkDepends: Port some API to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 1b5c9f4..a9e8cfc 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -268,7 +268,7 @@ cmComputeLinkDepends::Compute()
     {
     int i = *li;
     LinkEntry const& e = this->EntryList[i];
-    cmTarget const* t = e.Target;
+    cmGeneratorTarget const* t = e.Target;
     // Entries that we know the linker will re-use do not need to be repeated.
     bool uniquify = t && t->GetType() == cmTarget::SHARED_LIBRARY;
     if(!uniquify || emmitted.insert(i).second)
@@ -320,7 +320,8 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item)
   int index = lei->second;
   LinkEntry& entry = this->EntryList[index];
   entry.Item = item;
-  entry.Target = item.Target;
+  entry.Target =
+      item.Target ? this->GlobalGenerator->GetGeneratorTarget(item.Target) : 0;
   entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
                   item.substr(0, 10) != "-framework");
 
@@ -362,11 +363,9 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe)
   // Follow the item's dependencies.
   if(entry.Target)
     {
-    cmGeneratorTarget* gtgt =
-        this->GlobalGenerator->GetGeneratorTarget(entry.Target);
     // Follow the target dependencies.
     if(cmLinkInterface const* iface =
-       gtgt->GetLinkInterface(this->Config, this->Target->Target))
+       entry.Target->GetLinkInterface(this->Config, this->Target->Target))
       {
       const bool isIface =
                       entry.Target->GetType() == cmTarget::INTERFACE_LIBRARY;
@@ -444,7 +443,9 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
     // Initialize the item entry.
     LinkEntry& entry = this->EntryList[lei->second];
     entry.Item = dep.Item;
-    entry.Target = dep.Item.Target;
+    entry.Target =
+        dep.Item.Target ?
+          this->GlobalGenerator->GetGeneratorTarget(dep.Item.Target) : 0;
 
     // This item was added specifically because it is a dependent
     // shared library.  It may get special treatment
@@ -463,10 +464,8 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
   // Target items may have their own dependencies.
   if(entry.Target)
     {
-    cmGeneratorTarget* gtgt =
-        this->GlobalGenerator->GetGeneratorTarget(entry.Target);
     if(cmLinkInterface const* iface =
-       gtgt->GetLinkInterface(this->Config, this->Target->Target))
+       entry.Target->GetLinkInterface(this->Config, this->Target->Target))
       {
       // Follow public and private dependencies transitively.
       this->FollowSharedDeps(index, iface, true);
@@ -639,15 +638,16 @@ cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
                                                  const std::string& name)
 {
   // Look for a target in the scope of the depender.
-  cmTarget const* from = this->Target->Target;
+  cmGeneratorTarget const* from = this->Target;
   if(depender_index >= 0)
     {
-    if(cmTarget const* depender = this->EntryList[depender_index].Target)
+    if(cmGeneratorTarget const* depender =
+       this->EntryList[depender_index].Target)
       {
       from = depender;
       }
     }
-  return from->FindTargetToLink(name);
+  return from->Target->FindTargetToLink(name);
 }
 
 //----------------------------------------------------------------------------
@@ -934,12 +934,10 @@ int cmComputeLinkDepends::ComputeComponentCount(NodeList const& nl)
   int count = 2;
   for(NodeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni)
     {
-    if(cmTarget const* target = this->EntryList[*ni].Target)
+    if(cmGeneratorTarget const* target = this->EntryList[*ni].Target)
       {
-      cmGeneratorTarget* gtgt =
-          this->GlobalGenerator->GetGeneratorTarget(target);
       if(cmLinkInterface const* iface =
-         gtgt->GetLinkInterface(this->Config, this->Target->Target))
+         target->GetLinkInterface(this->Config, this->Target->Target))
         {
         if(iface->Multiplicity > count)
           {
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 2cbb430..5ad8714 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -23,7 +23,6 @@ class cmComputeComponentGraph;
 class cmGlobalGenerator;
 class cmMakefile;
 class cmGeneratorTarget;
-class cmTarget;
 class cmake;
 
 /** \class cmComputeLinkDepends
@@ -40,7 +39,7 @@ public:
   struct LinkEntry
   {
     std::string Item;
-    cmTarget const* Target;
+    cmGeneratorTarget const* Target;
     bool IsSharedDep;
     bool IsFlag;
     LinkEntry(): Item(), Target(0), IsSharedDep(false), IsFlag(false) {}
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 9371546..7e34611 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -632,11 +632,11 @@ void cmComputeLinkInformation::AddImplicitLinkInfo(std::string const& lang)
 
 //----------------------------------------------------------------------------
 void cmComputeLinkInformation::AddItem(std::string const& item,
-                                       cmTarget const* tgt)
+                                       cmGeneratorTarget const* tgt)
 {
   // Compute the proper name to use to link this library.
   const std::string& config = this->Config;
-  bool impexe = (tgt && tgt->IsExecutableWithExports());
+  bool impexe = (tgt && tgt->Target->IsExecutableWithExports());
   if(impexe && !this->UseImportLibrary && !this->LoaderFlag)
     {
     // Skip linking to executables on platforms with no import
@@ -644,9 +644,8 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
     return;
     }
 
-  if(tgt && tgt->IsLinkable())
+  if(tgt && tgt->Target->IsLinkable())
     {
-    cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
     // This is a CMake target.  Ask the target for its real name.
     if(impexe && this->LoaderFlag)
       {
@@ -656,10 +655,10 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       std::string linkItem;
       linkItem = this->LoaderFlag;
 
-      std::string exe = gtgt->GetFullPath(config, this->UseImportLibrary,
+      std::string exe = tgt->GetFullPath(config, this->UseImportLibrary,
                                          true);
       linkItem += exe;
-      this->Items.push_back(Item(linkItem, true, tgt));
+      this->Items.push_back(Item(linkItem, true, tgt->Target));
       this->Depends.push_back(exe);
       }
     else if(tgt->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -667,7 +666,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       // Add the interface library as an item so it can be considered as part
       // of COMPATIBLE_INTERFACE_ enforcement.  The generators will ignore
       // this for the actual link line.
-      this->Items.push_back(Item(std::string(), true, tgt));
+      this->Items.push_back(Item(std::string(), true, tgt->Target));
       }
     else
       {
@@ -677,15 +676,15 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
          (impexe || tgt->GetType() == cmTarget::SHARED_LIBRARY));
 
       // Pass the full path to the target file.
-      std::string lib = gtgt->GetFullPath(config, implib, true);
+      std::string lib = tgt->GetFullPath(config, implib, true);
       if(!this->LinkDependsNoShared ||
          tgt->GetType() != cmTarget::SHARED_LIBRARY)
         {
         this->Depends.push_back(lib);
         }
 
-      this->AddTargetItem(lib, tgt);
-      this->AddLibraryRuntimeInfo(lib, tgt);
+      this->AddTargetItem(lib, tgt->Target);
+      this->AddLibraryRuntimeInfo(lib, tgt->Target);
       }
     }
   else
@@ -716,7 +715,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
 
 //----------------------------------------------------------------------------
 void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
-                                                cmTarget const* tgt)
+                                                const cmGeneratorTarget* tgt)
 {
   // If dropping shared library dependencies, ignore them.
   if(this->SharedDependencyMode == SharedDepModeNone)
@@ -760,18 +759,14 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
     return;
     }
 
-  cmGeneratorTarget *gtgt = 0;
-
   // Get a full path to the dependent shared library.
   // Add it to the runtime path computation so that the target being
   // linked will be able to find it.
   std::string lib;
   if(tgt)
     {
-    gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
-
-    lib = gtgt->GetFullPath(this->Config, this->UseImportLibrary);
-    this->AddLibraryRuntimeInfo(lib, tgt);
+    lib = tgt->GetFullPath(this->Config, this->UseImportLibrary);
+    this->AddLibraryRuntimeInfo(lib, tgt->Target);
     }
   else
     {
@@ -795,9 +790,9 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
     }
   if(order)
     {
-    if(gtgt)
+    if(tgt)
       {
-      std::string soName = gtgt->GetSOName(this->Config);
+      std::string soName = tgt->GetSOName(this->Config);
       const char* soname = soName.empty()? 0 : soName.c_str();
       order->AddRuntimeLibrary(lib, soname);
       }
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 8b83574..b1e7e46 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -62,8 +62,8 @@ public:
   std::string const& GetRPathLinkFlag() const { return this->RPathLinkFlag; }
   std::string GetRPathLinkString();
 private:
-  void AddItem(std::string const& item, cmTarget const* tgt);
-  void AddSharedDepItem(std::string const& item, cmTarget const* tgt);
+  void AddItem(std::string const& item, const cmGeneratorTarget* tgt);
+  void AddSharedDepItem(std::string const& item, cmGeneratorTarget const* tgt);
 
   // Output information.
   ItemVector Items;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkDepends.cxx      |   30 ++++++++----------
 Source/cmComputeLinkDepends.h        |    3 +-
 Source/cmComputeLinkInformation.cxx  |   33 ++++++++-----------
 Source/cmComputeLinkInformation.h    |    4 +--
 Source/cmComputeTargetDepends.cxx    |    2 +-
 Source/cmExportFileGenerator.cxx     |    4 +--
 Source/cmGeneratorExpressionNode.cxx |    5 ++-
 Source/cmGeneratorTarget.cxx         |   58 ++++++++++++++++++----------------
 Source/cmGeneratorTarget.h           |   18 ++++++-----
 9 files changed, 78 insertions(+), 79 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 05:41:59 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 05:41:59 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-325-gc9c13c2
Message-ID: <20151010094159.56614BF283@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c9c13c26f36a68e0c9d6d7a35055bc156ef6aea9 (commit)
       via  504c6d2032789926536ee97dd545894f65f8b5e1 (commit)
       via  ee3121be4a4cfe438b9da84d4b3c00f770c0d581 (commit)
       via  ae2f757aaecc6deff840af565d720a3e11b6dc53 (commit)
       via  775da7a32ea2b57eaa6efaba736c3ba7ded23e67 (commit)
       via  a70de679ed964f97422f3ffb065c8b91726e2260 (commit)
       via  05fb83041999c351a10782d5030cbd95c20f5e65 (commit)
       via  e21544ecd34b08f9a181e61ff915571a50398d1b (commit)
       via  1c8375317e5aaab268c0aaca0f196a134698e090 (commit)
       via  c5549817d395f89efc1238b67b300b3f102b3a18 (commit)
       via  895d210831c0b70c5aa7d731940d87d3f5762beb (commit)
       via  e345d1bebac961f9942cb5f9a576b7fd8e3b56ff (commit)
       via  053dd97933e57a1107e606c19f92784d84691031 (commit)
       via  95a780becd6f20994c59b9dd8de7c6f91d8a638d (commit)
       via  1e769f360f22d0fdc09e049bcd3f3f6005534aa4 (commit)
      from  447886f9173e168eaacd9aacc01c8fc82a763cb3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9c13c26f36a68e0c9d6d7a35055bc156ef6aea9
commit c9c13c26f36a68e0c9d6d7a35055bc156ef6aea9
Merge: 447886f 504c6d2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 05:41:57 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 05:41:57 2015 -0400

    Merge topic 'use-generator-target' into next
    
    504c6d20 Sublime: Port some API to cmGeneratorTarget.
    ee3121be cmGeneratorTarget: Port processILibs to cmGeneratorTarget.
    ae2f757a cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.
    775da7a3 cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.
    a70de679 cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.
    05fb8304 cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.
    e21544ec cmComputeLinkDepends: Port implementation detail to cmGeneratorTarget.
    1c837531 cmLinkItem: Port to cmGeneratorTarget.
    c5549817 cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.
    895d2108 cmGeneratorTarget: Move GetUtilityItems from cmTarget.
    e345d1be cmComputeLinkDepends: Port result API to cmGeneratorTarget.
    053dd979 cmComputeLinkInformation: Port result API to cmGeneratorTarget.
    95a780be cmComputeLinkInformation: Port data interface to cmGeneratorTarget.
    1e769f36 cmComputeLinkInformation: Port some implementation to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=504c6d2032789926536ee97dd545894f65f8b5e1
commit 504c6d2032789926536ee97dd545894f65f8b5e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:04:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:41:04 2015 +0200

    Sublime: Port some API to cmGeneratorTarget.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 11410a7..21c71b0 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -255,9 +255,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, target, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, gtgt);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, target, gtgt);
+            this->ComputeDefines(*iter, lg, gtgt);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
@@ -365,7 +365,6 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
 std::string
 cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
                                                    cmLocalGenerator* lg,
-                                                   cmTarget *target,
                                                    cmGeneratorTarget* gtgt)
 {
   std::string flags;
@@ -390,7 +389,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   //   }
 
   // Add shared-library flags if needed.
-  lg->AddCMP0018Flags(flags, target, language, config);
+  lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
 
   // Add include directory flags.
   {
@@ -405,7 +404,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, target, language, config);
+  lg->AddCompileOptions(flags, gtgt->Target, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -419,8 +418,8 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
 // void cmMakefileTargetGenerator::WriteTargetLanguageFlags().
 std::string
 cmExtraSublimeTextGenerator::
-ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
-               cmGeneratorTarget*)
+ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
+               cmGeneratorTarget* target)
 
 {
   std::set<std::string> defines;
@@ -429,13 +428,13 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
   const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->GetExportMacro())
+  if(const char* exportMacro = target->Target->GetExportMacro())
     {
     lg->AppendDefines(defines, exportMacro);
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AddCompileDefinitions(defines, target, config, language);
+  lg->AddCompileDefinitions(defines, target->Target, config, language);
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 4173b7d..5dd1140 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -79,11 +79,10 @@ private:
    */
   std::string ComputeFlagsForObject(cmSourceFile *source,
                                     cmLocalGenerator* lg,
-                                    cmTarget *target,
                                     cmGeneratorTarget* gtgt);
 
   std::string ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
-                             cmTarget *target, cmGeneratorTarget* gtgt);
+                             cmGeneratorTarget* gtgt);
 };
 
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee3121be4a4cfe438b9da84d4b3c00f770c0d581
commit ee3121be4a4cfe438b9da84d4b3c00f770c0d581
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:47:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:41:04 2015 +0200

    cmGeneratorTarget: Port processILibs to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 45366e9..9eef514 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2067,9 +2067,9 @@ void processILibs(const std::string& config,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
                   std::vector<cmGeneratorTarget const*>& tgts,
-                  std::set<cmTarget const*>& emitted)
+                  std::set<cmGeneratorTarget const*>& emitted)
 {
-  if (item.Target && emitted.insert(item.Target->Target).second)
+  if (item.Target && emitted.insert(item.Target).second)
     {
     tgts.push_back(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
@@ -2095,7 +2095,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
   if(!tgts.Done)
     {
     tgts.Done = true;
-    std::set<cmTarget const*> emitted;
+    std::set<cmGeneratorTarget const*> emitted;
 
     cmLinkImplementationLibraries const* impl
       = this->GetLinkImplementationLibraries(config);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae2f757aaecc6deff840af565d720a3e11b6dc53
commit ae2f757aaecc6deff840af565d720a3e11b6dc53
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:47:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:41:04 2015 +0200

    cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 46eed61..45366e9 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3979,18 +3979,20 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
 
 //----------------------------------------------------------------------------
 template<typename PropertyType>
-PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
+PropertyType getTypedProperty(cmGeneratorTarget const* tgt,
+                              const std::string& prop);
 
 //----------------------------------------------------------------------------
 template<>
-bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
+bool getTypedProperty<bool>(cmGeneratorTarget const* tgt,
+                            const std::string& prop)
 {
   return tgt->GetPropertyAsBool(prop);
 }
 
 //----------------------------------------------------------------------------
 template<>
-const char *getTypedProperty<const char *>(cmTarget const* tgt,
+const char *getTypedProperty<const char *>(cmGeneratorTarget const* tgt,
                                            const std::string& prop)
 {
   return tgt->GetProperty(prop);
@@ -4120,7 +4122,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                           CompatibleType t,
                                           PropertyType *)
 {
-  PropertyType propContent = getTypedProperty<PropertyType>(tgt->Target, p);
+  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
   const bool explicitlySet = tgt->Target->GetProperties()
                                   .find(p)
                                   != tgt->Target->GetProperties().end();
@@ -4172,7 +4174,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                             .find(interfaceProperty)
                             != theTarget->Target->GetProperties().end();
     PropertyType ifacePropContent =
-                    getTypedProperty<PropertyType>(theTarget->Target,
+                    getTypedProperty<PropertyType>(theTarget,
                               interfaceProperty);
 
     std::string reportEntry;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=775da7a32ea2b57eaa6efaba736c3ba7ded23e67
commit 775da7a32ea2b57eaa6efaba736c3ba7ded23e67
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 11:40:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:40:50 2015 +0200

    cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 23b09ea..46eed61 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -510,7 +510,8 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
   return 0;
 }
 
-static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
+static void handleSystemIncludesDep(cmMakefile *mf,
+                                  cmGeneratorTarget const* depTgt,
                                   const std::string& config,
                                   cmGeneratorTarget const* headTarget,
                                   cmGeneratorExpressionDAGChecker *dagChecker,
@@ -524,7 +525,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt, dagChecker), result);
+                                      depTgt->Target, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
     {
@@ -538,7 +539,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt, dagChecker), result);
+                                      depTgt->Target, dagChecker), result);
     }
 }
 
@@ -887,7 +888,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, (*li)->Target, config, this,
+      handleSystemIncludesDep(this->Makefile, *li, config, this,
                               &dagChecker, result, excludeImported);
       }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a70de679ed964f97422f3ffb065c8b91726e2260
commit a70de679ed964f97422f3ffb065c8b91726e2260
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:45:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:39:14 2015 +0200

    cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 948b42b..23b09ea 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -882,12 +882,12 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
                                           &dagChecker), result);
       }
 
-    std::vector<cmTarget const*> const& deps =
+    std::vector<cmGeneratorTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmTarget const*>::const_iterator
+    for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, *li, config, this,
+      handleSystemIncludesDep(this->Makefile, (*li)->Target, config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -2065,12 +2065,12 @@ void processILibs(const std::string& config,
                   cmGeneratorTarget const* headTarget,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
-                  std::vector<cmTarget const*>& tgts,
+                  std::vector<cmGeneratorTarget const*>& tgts,
                   std::set<cmTarget const*>& emitted)
 {
   if (item.Target && emitted.insert(item.Target->Target).second)
     {
-    tgts.push_back(item.Target->Target);
+    tgts.push_back(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
        item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
       {
@@ -2085,7 +2085,7 @@ void processILibs(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
-const std::vector<const cmTarget*>&
+const std::vector<const cmGeneratorTarget*>&
 cmGeneratorTarget::GetLinkImplementationClosure(
     const std::string& config) const
 {
@@ -3629,10 +3629,10 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
     compat.Done = true;
     compat.PropsBool.insert("POSITION_INDEPENDENT_CODE");
     compat.PropsString.insert("AUTOUIC_OPTIONS");
-    std::vector<cmTarget const*> const& deps =
+    std::vector<cmGeneratorTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmTarget const*>::const_iterator li = deps.begin();
-        li != deps.end(); ++li)
+    for(std::vector<cmGeneratorTarget const*>::const_iterator li =
+        deps.begin(); li != deps.end(); ++li)
       {
 #define CM_READ_COMPATIBLE_INTERFACE(X, x) \
       if(const char* prop = (*li)->GetProperty("COMPATIBLE_INTERFACE_" #X)) \
@@ -4128,7 +4128,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
   assert((impliedByUse ^ explicitlySet)
       || (!impliedByUse && !explicitlySet));
 
-  std::vector<cmTarget const*> const& deps =
+  std::vector<cmGeneratorTarget const*> const& deps =
     tgt->GetLinkImplementationClosure(config);
 
   if(deps.empty())
@@ -4155,7 +4155,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     }
 
   std::string interfaceProperty = "INTERFACE_" + p;
-  for(std::vector<cmTarget const*>::const_iterator li =
+  for(std::vector<cmGeneratorTarget const*>::const_iterator li =
       deps.begin();
       li != deps.end(); ++li)
     {
@@ -4165,13 +4165,13 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     // target itself has a POSITION_INDEPENDENT_CODE which disagrees
     // with a dependency.
 
-    cmTarget const* theTarget = *li;
+    cmGeneratorTarget const* theTarget = *li;
 
-    const bool ifaceIsSet = theTarget->GetProperties()
+    const bool ifaceIsSet = theTarget->Target->GetProperties()
                             .find(interfaceProperty)
-                            != theTarget->GetProperties().end();
+                            != theTarget->Target->GetProperties().end();
     PropertyType ifacePropContent =
-                    getTypedProperty<PropertyType>(theTarget,
+                    getTypedProperty<PropertyType>(theTarget->Target,
                               interfaceProperty);
 
     std::string reportEntry;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 70612f2..a278b53 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -475,7 +475,7 @@ private:
   cmGeneratorTarget(cmGeneratorTarget const&);
   void operator=(cmGeneratorTarget const&);
 
-  struct LinkImplClosure: public std::vector<cmTarget const*>
+  struct LinkImplClosure: public std::vector<cmGeneratorTarget const*>
   {
     LinkImplClosure(): Done(false) {}
     bool Done;
@@ -553,8 +553,8 @@ private:
                            std::string& out) const;
 
 public:
-  std::vector<cmTarget const*> const&
-    GetLinkImplementationClosure(const std::string& config) const;
+  const std::vector<const cmGeneratorTarget*>&
+  GetLinkImplementationClosure(const std::string& config) const;
 
   mutable std::map<std::string, std::string> MaxLanguageStandards;
   std::map<std::string, std::string> const&

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05fb83041999c351a10782d5030cbd95c20f5e65
commit 05fb83041999c351a10782d5030cbd95c20f5e65
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:37:30 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:34:36 2015 +0200

    cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index b9ed345..f901414 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -383,7 +383,7 @@ std::vector<std::string>
 cmCommonTargetGenerator::GetLinkedTargetDirectories() const
 {
   std::vector<std::string> dirs;
-  std::set<cmTarget const*> emitted;
+  std::set<cmGeneratorTarget const*> emitted;
   if (cmComputeLinkInformation* cli =
       this->GeneratorTarget->GetLinkInformation(this->ConfigName))
     {
@@ -397,7 +397,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
                 // Target->GetLinkInformation already processed their
                 // link interface and they don't have any output themselves.
                 && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
-                && emitted.insert(linkee->Target).second)
+                && emitted.insert(linkee).second)
         {
         cmLocalGenerator* lg = linkee->GetLocalGenerator();
         cmMakefile* mf = linkee->Target->GetMakefile();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e21544ecd34b08f9a181e61ff915571a50398d1b
commit e21544ecd34b08f9a181e61ff915571a50398d1b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:21:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:34:36 2015 +0200

    cmComputeLinkDepends: Port implementation detail to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index f82cb41..66e4c4b 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -526,9 +526,8 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
           }
         }
 
-      cmGeneratorTarget* gtgt =
-          this->GlobalGenerator->GetGeneratorTarget(
-            this->FindTargetToLink(depender_index, *di));
+      const cmGeneratorTarget* gtgt =
+          this->FindTargetToLink(depender_index, *di);
       // If the library is meant for this link type then use it.
       if(llt == cmTarget::GENERAL || llt == this->LinkType)
         {
@@ -634,8 +633,9 @@ cmComputeLinkDepends::AddLinkEntries(
 }
 
 //----------------------------------------------------------------------------
-cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
-                                                 const std::string& name)
+cmGeneratorTarget const*
+cmComputeLinkDepends::FindTargetToLink(int depender_index,
+                                       const std::string& name)
 {
   // Look for a target in the scope of the depender.
   cmGeneratorTarget const* from = this->Target;
@@ -647,7 +647,9 @@ cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
       from = depender;
       }
     }
-  return from->Target->FindTargetToLink(name);
+
+  return this->GlobalGenerator->GetGeneratorTarget(
+        from->Target->FindTargetToLink(name));
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index dba3948..9d960c6 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -75,8 +75,8 @@ private:
   void AddDirectLinkEntries();
   template <typename T>
     void AddLinkEntries(int depender_index, std::vector<T> const& libs);
-  cmTarget const* FindTargetToLink(int depender_index,
-                                   const std::string& name);
+  cmGeneratorTarget const* FindTargetToLink(int depender_index,
+                                            const std::string& name);
 
   // One entry for each unique item.
   std::vector<LinkEntry> EntryList;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c8375317e5aaab268c0aaca0f196a134698e090
commit 1c8375317e5aaab268c0aaca0f196a134698e090
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:18:42 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:34:27 2015 +0200

    cmLinkItem: Port to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 4d7b01e..f82cb41 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -320,8 +320,7 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item)
   int index = lei->second;
   LinkEntry& entry = this->EntryList[index];
   entry.Item = item;
-  entry.Target =
-      item.Target ? this->GlobalGenerator->GetGeneratorTarget(item.Target) : 0;
+  entry.Target = item.Target;
   entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
                   item.substr(0, 10) != "-framework");
 
@@ -443,9 +442,7 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
     // Initialize the item entry.
     LinkEntry& entry = this->EntryList[lei->second];
     entry.Item = dep.Item;
-    entry.Target =
-        dep.Item.Target ?
-          this->GlobalGenerator->GetGeneratorTarget(dep.Item.Target) : 0;
+    entry.Target = dep.Item.Target;
 
     // This item was added specifically because it is a dependent
     // shared library.  It may get special treatment
@@ -529,15 +526,18 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
           }
         }
 
+      cmGeneratorTarget* gtgt =
+          this->GlobalGenerator->GetGeneratorTarget(
+            this->FindTargetToLink(depender_index, *di));
       // If the library is meant for this link type then use it.
       if(llt == cmTarget::GENERAL || llt == this->LinkType)
         {
-        cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
+        cmLinkItem item(*di, gtgt);
         actual_libs.push_back(item);
         }
       else if(this->OldLinkDirMode)
         {
-        cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
+        cmLinkItem item(*di, gtgt);
         this->CheckWrongConfigItem(item);
         }
 
@@ -982,7 +982,6 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
   // directories.
   if(item.Target && !item.Target->IsImported())
     {
-    this->OldWrongConfigItems.insert(
-            this->GlobalGenerator->GetGeneratorTarget(item.Target));
+    this->OldWrongConfigItems.insert(item.Target);
     }
 }
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index e53b7b9..8f3def2 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -319,22 +319,20 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
                                              std::set<std::string> &emitted)
 {
   cmGeneratorTarget const* depender = this->Targets[depender_index];
-  cmTarget const* dependee = dependee_name.Target;
+  cmGeneratorTarget const* dependee = dependee_name.Target;
   // Skip targets that will not really be linked.  This is probably a
   // name conflict between an external library and an executable
   // within the project.
   if(dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->IsExecutableWithExports())
+     !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(dependee);
-    this->AddInterfaceDepends(depender_index, gt, "", emitted);
+    this->AddInterfaceDepends(depender_index, dependee, "", emitted);
     std::vector<std::string> configs;
     depender->Makefile->GetConfigurations(configs);
     for (std::vector<std::string>::const_iterator it = configs.begin();
@@ -342,7 +340,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
       {
       // A target should not depend on itself.
       emitted.insert(depender->GetName());
-      this->AddInterfaceDepends(depender_index, gt, *it, emitted);
+      this->AddInterfaceDepends(depender_index, dependee, *it, emitted);
       }
     }
 }
@@ -356,7 +354,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   cmGeneratorTarget const* depender = this->Targets[depender_index];
 
   // Check the target's makefile first.
-  cmTarget const* dependee = dependee_name.Target;
+  cmGeneratorTarget const* dependee = dependee_name.Target;
 
   if(!dependee && !linking &&
     (depender->GetType() != cmTarget::GLOBAL_TARGET))
@@ -403,16 +401,14 @@ void cmComputeTargetDepends::AddTargetDepend(
   // within the project.
   if(linking && dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->IsExecutableWithExports())
+     !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(dependee);
-    this->AddTargetDepend(depender_index, gt, linking);
+    this->AddTargetDepend(depender_index, dependee, linking);
     }
 }
 
@@ -430,11 +426,9 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     for(std::set<cmLinkItem>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
-      if(cmTarget const* transitive_dependee = i->Target)
+      if(cmGeneratorTarget const* transitive_dependee = i->Target)
         {
-        cmGeneratorTarget* gt =
-            this->GlobalGenerator->GetGeneratorTarget(transitive_dependee);
-        this->AddTargetDepend(depender_index, gt, false);
+        this->AddTargetDepend(depender_index, transitive_dependee, false);
         }
       }
     }
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 78a5b6f..7e47261 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -846,7 +846,7 @@ getLinkedTargetsContent(
     // Broken code can have a target in its own link interface.
     // Don't follow such link interface entries so as not to create a
     // self-referencing loop.
-    if (it->Target && it->Target != target)
+    if (it->Target && it->Target->Target != target)
       {
       depString +=
         sep + "$<TARGET_PROPERTY:" +
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a5e35a1..948b42b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -773,8 +773,9 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
     for(std::set<std::string>::const_iterator i = utilities.begin();
         i != utilities.end(); ++i)
       {
-      this->UtilityItems.insert(
-        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
+      cmGeneratorTarget* gt = this->GlobalGenerator
+          ->GetGeneratorTarget(this->Makefile->FindTargetToUse(*i));
+      this->UtilityItems.insert(cmLinkItem(*i, gt));
       }
     }
   return this->UtilityItems;
@@ -1728,15 +1729,12 @@ public:
         }
       return;
       }
-    if(!this->Visited.insert(item.Target).second)
+    if(!this->Visited.insert(item.Target->Target).second)
       {
       return;
       }
-    cmGeneratorTarget* gtgt =
-        this->Target->GetLocalGenerator()->GetGlobalGenerator()
-            ->GetGeneratorTarget(item.Target);
     cmLinkInterface const* iface =
-      gtgt->GetLinkInterface(this->Config, this->HeadTarget);
+      item.Target->GetLinkInterface(this->Config, this->HeadTarget);
     if(!iface) { return; }
 
     for(std::vector<std::string>::const_iterator
@@ -2070,12 +2068,11 @@ void processILibs(const std::string& config,
                   std::vector<cmTarget const*>& tgts,
                   std::set<cmTarget const*>& emitted)
 {
-  if (item.Target && emitted.insert(item.Target).second)
+  if (item.Target && emitted.insert(item.Target->Target).second)
     {
-    tgts.push_back(item.Target);
-    cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
+    tgts.push_back(item.Target->Target);
     if(cmLinkInterfaceLibraries const* iface =
-       gt->GetLinkInterfaceLibraries(config, headTarget, true))
+       item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
       {
       for(std::vector<cmLinkItem>::const_iterator
             it = iface->Libraries.begin();
@@ -4427,7 +4424,9 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
       {
       continue;
       }
-    items.push_back(cmLinkItem(name, this->Target->FindTargetToLink(name)));
+    cmGeneratorTarget* gt = this->GlobalGenerator
+        ->GetGeneratorTarget(this->Target->FindTargetToLink(name));
+    items.push_back(cmLinkItem(name, gt));
     }
 }
 
@@ -5397,9 +5396,10 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         }
 
       // The entry is meant for this configuration.
+      cmTarget const* tgt = this->Target->FindTargetToLink(name);
+      cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(tgt);
       impl.Libraries.push_back(
-        cmLinkImplItem(name, this->Target->FindTargetToLink(name),
-                       *btIt, evaluated != *le));
+        cmLinkImplItem(name, gt, *btIt, evaluated != *le));
       }
 
     std::set<std::string> const& seenProps = cge->GetSeenTargetProperties();
@@ -5428,9 +5428,10 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         {
         continue;
         }
+      cmGeneratorTarget* gt = this->GlobalGenerator
+          ->GetGeneratorTarget(this->Target->FindTargetToLink(name));
       // Support OLD behavior for CMP0003.
-      impl.WrongConfigLibraries.push_back(
-        cmLinkItem(name, this->Target->FindTargetToLink(name)));
+      impl.WrongConfigLibraries.push_back(cmLinkItem(name, gt));
       }
     }
 }
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index 33780a7..b875cc0 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -16,7 +16,6 @@
 #include "cmListFileCache.h"
 
 class cmGeneratorTarget;
-class cmTarget;
 
 // Basic information about each link item.
 class cmLinkItem: public std::string
@@ -25,9 +24,9 @@ class cmLinkItem: public std::string
 public:
   cmLinkItem(): std_string(), Target(0) {}
   cmLinkItem(const std_string& n,
-             cmTarget const* t): std_string(n), Target(t) {}
+             cmGeneratorTarget const* t): std_string(n), Target(t) {}
   cmLinkItem(cmLinkItem const& r): std_string(r), Target(r.Target) {}
-  cmTarget const* Target;
+  cmGeneratorTarget const* Target;
 };
 
 class cmLinkImplItem: public cmLinkItem
@@ -35,7 +34,7 @@ class cmLinkImplItem: public cmLinkItem
 public:
   cmLinkImplItem(): cmLinkItem(), Backtrace(), FromGenex(false) {}
   cmLinkImplItem(std::string const& n,
-                 cmTarget const* t,
+                 cmGeneratorTarget const* t,
                  cmListFileBacktrace const& bt,
                  bool fromGenex):
     cmLinkItem(n, t), Backtrace(bt), FromGenex(fromGenex) {}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5549817d395f89efc1238b67b300b3f102b3a18
commit c5549817d395f89efc1238b67b300b3f102b3a18
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:05:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:26:13 2015 +0200

    cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c9fdb93..a5e35a1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4490,7 +4490,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head->Target];
+  cmOptionalLinkInterface& iface = hm[head];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -4642,7 +4642,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head->Target];
+  cmOptionalLinkInterface& iface = hm[head];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -5079,7 +5079,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[headTarget->Target];
+  cmOptionalLinkInterface& iface = hm[headTarget];
   if(!iface.AllDone)
     {
     iface.AllDone = true;
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index 10dd465..33780a7 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -15,6 +15,7 @@
 
 #include "cmListFileCache.h"
 
+class cmGeneratorTarget;
 class cmTarget;
 
 // Basic information about each link item.
@@ -97,7 +98,7 @@ struct cmOptionalLinkInterface: public cmLinkInterface
 };
 
 struct cmHeadToLinkInterfaceMap:
-    public std::map<cmTarget const*, cmOptionalLinkInterface>
+    public std::map<cmGeneratorTarget const*, cmOptionalLinkInterface>
 {
 };
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=895d210831c0b70c5aa7d731940d87d3f5762beb
commit 895d210831c0b70c5aa7d731940d87d3f5762beb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:01:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:26:07 2015 +0200

    cmGeneratorTarget: Move GetUtilityItems from cmTarget.

diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 8df6165..dba3948 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -14,6 +14,7 @@
 
 #include "cmStandardIncludes.h"
 #include "cmTarget.h"
+#include "cmLinkItem.h"
 
 #include "cmGraphAdjacencyList.h"
 
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 18aad10..e53b7b9 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -272,7 +272,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
 
   // Loop over all utility dependencies.
   {
-  std::set<cmLinkItem> const& tutils = depender->Target->GetUtilityItems();
+  std::set<cmLinkItem> const& tutils = depender->GetUtilityItems();
   std::set<std::string> emitted;
   // A target should not depend on itself.
   emitted.insert(depender->GetName());
@@ -426,7 +426,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     {
     // Skip IMPORTED and INTERFACE targets but follow their utility
     // dependencies.
-    std::set<cmLinkItem> const& utils = dependee->Target->GetUtilityItems();
+    std::set<cmLinkItem> const& utils = dependee->GetUtilityItems();
     for(std::set<cmLinkItem>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c4fc1dd..c9fdb93 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -271,7 +271,8 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
   DebugCompileFeaturesDone(false),
   DebugCompileDefinitionsDone(false),
   DebugSourcesDone(false),
-  LinkImplementationLanguageIsContextDependent(true)
+  LinkImplementationLanguageIsContextDependent(true),
+  UtilityItemsDone(false)
 {
   this->Makefile = this->Target->GetMakefile();
   this->LocalGenerator = lg;
@@ -760,7 +761,23 @@ cmGeneratorTarget::GetExpectedXamlSources(std::set<std::string>& srcs,
 {
   XamlData data;
   IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData)
-  srcs = data.ExpectedXamlSources;
+      srcs = data.ExpectedXamlSources;
+}
+
+std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
+{
+  if(!this->UtilityItemsDone)
+    {
+    this->UtilityItemsDone = true;
+    std::set<std::string> const& utilities = this->Target->GetUtilities();
+    for(std::set<std::string>::const_iterator i = utilities.begin();
+        i != utilities.end(); ++i)
+      {
+      this->UtilityItems.insert(
+        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
+      }
+    }
+  return this->UtilityItems;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 799110c..70612f2 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -82,6 +82,8 @@ public:
   void GetExpectedXamlSources(std::set<std::string>&,
                               const std::string& config) const;
 
+  std::set<cmLinkItem>const& GetUtilityItems() const;
+
   void ComputeObjectMapping();
 
   const char* GetFeature(const std::string& feature,
@@ -537,6 +539,7 @@ private:
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
+  mutable std::set<cmLinkItem> UtilityItems;
   mutable bool PolicyWarnedCMP0022;
   mutable bool DebugIncludesDone;
   mutable bool DebugCompileOptionsDone;
@@ -544,6 +547,7 @@ private:
   mutable bool DebugCompileDefinitionsDone;
   mutable bool DebugSourcesDone;
   mutable bool LinkImplementationLanguageIsContextDependent;
+  mutable bool UtilityItemsDone;
 
   bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
                            std::string& out) const;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3de7efe..31a9aa7 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -67,12 +67,10 @@ public:
   cmTargetInternals()
     : Backtrace()
     {
-    this->UtilityItemsDone = false;
     }
   cmTargetInternals(cmTargetInternals const&)
     : Backtrace()
     {
-    this->UtilityItemsDone = false;
     }
   ~cmTargetInternals();
 
@@ -82,9 +80,6 @@ public:
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
-  std::set<cmLinkItem> UtilityItems;
-  bool UtilityItemsDone;
-
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -364,22 +359,6 @@ cmListFileBacktrace const* cmTarget::GetUtilityBacktrace(
 }
 
 //----------------------------------------------------------------------------
-std::set<cmLinkItem> const& cmTarget::GetUtilityItems() const
-{
-  if(!this->Internal->UtilityItemsDone)
-    {
-    this->Internal->UtilityItemsDone = true;
-    for(std::set<std::string>::const_iterator i = this->Utilities.begin();
-        i != this->Utilities.end(); ++i)
-      {
-      this->Internal->UtilityItems.insert(
-        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
-      }
-    }
-  return this->Internal->UtilityItems;
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::FinishConfigure()
 {
   // Erase any cached link information that might have been comptued
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 16d0121..0c1bbd2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -16,7 +16,6 @@
 #include "cmPropertyMap.h"
 #include "cmPolicies.h"
 #include "cmListFileCache.h"
-#include "cmLinkItem.h"
 
 #include <cmsys/auto_ptr.hxx>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -206,7 +205,6 @@ public:
   void AddUtility(const std::string& u, cmMakefile *makefile = 0);
   ///! Get the utilities used by this target
   std::set<std::string>const& GetUtilities() const { return this->Utilities; }
-  std::set<cmLinkItem>const& GetUtilityItems() const;
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
   /** Finalize the target at the end of the Configure step.  */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e345d1bebac961f9942cb5f9a576b7fd8e3b56ff
commit e345d1bebac961f9942cb5f9a576b7fd8e3b56ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:54:18 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:25:58 2015 +0200

    cmComputeLinkDepends: Port result API to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 7d20827..4d7b01e 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -982,6 +982,7 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
   // directories.
   if(item.Target && !item.Target->IsImported())
     {
-    this->OldWrongConfigItems.insert(item.Target);
+    this->OldWrongConfigItems.insert(
+            this->GlobalGenerator->GetGeneratorTarget(item.Target));
     }
 }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 5ad8714..8df6165 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -52,7 +52,7 @@ public:
   EntryVector const& Compute();
 
   void SetOldLinkDirMode(bool b);
-  std::set<cmTarget const*> const& GetOldWrongConfigItems() const
+  std::set<cmGeneratorTarget const*> const& GetOldWrongConfigItems() const
     { return this->OldWrongConfigItems; }
 
 private:
@@ -152,7 +152,7 @@ private:
 
   // Record of the original link line.
   std::vector<int> OriginalEntries;
-  std::set<cmTarget const*> OldWrongConfigItems;
+  std::set<cmGeneratorTarget const*> OldWrongConfigItems;
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 74ceead..c6225f6 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -19,7 +19,6 @@
 #include "cmState.h"
 #include "cmOutputConverter.h"
 #include "cmMakefile.h"
-#include "cmTarget.h"
 #include "cmGeneratorTarget.h"
 #include "cmake.h"
 #include "cmAlgorithms.h"
@@ -537,16 +536,16 @@ bool cmComputeLinkInformation::Compute()
     // For CMake 2.4 bug-compatibility we need to consider the output
     // directories of targets linked in another configuration as link
     // directories.
-    std::set<cmTarget const*> const& wrongItems = cld.GetOldWrongConfigItems();
-    for(std::set<cmTarget const*>::const_iterator i = wrongItems.begin();
-        i != wrongItems.end(); ++i)
+    std::set<cmGeneratorTarget const*> const& wrongItems =
+        cld.GetOldWrongConfigItems();
+    for(std::set<cmGeneratorTarget const*>::const_iterator i =
+        wrongItems.begin(); i != wrongItems.end(); ++i)
       {
-      cmTarget const* tgt = *i;
-      cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
+      cmGeneratorTarget const* tgt = *i;
       bool implib =
         (this->UseImportLibrary &&
          (tgt->GetType() == cmTarget::SHARED_LIBRARY));
-      std::string lib = gtgt->GetFullPath(this->Config , implib, true);
+      std::string lib = tgt->GetFullPath(this->Config , implib, true);
       this->OldLinkDirItems.push_back(lib);
       }
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=053dd97933e57a1107e606c19f92784d84691031
commit 053dd97933e57a1107e606c19f92784d84691031
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:51:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:25:40 2015 +0200

    cmComputeLinkInformation: Port result API to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index c409b37..74ceead 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -471,7 +471,7 @@ std::vector<std::string> const& cmComputeLinkInformation::GetFrameworkPaths()
 }
 
 //----------------------------------------------------------------------------
-std::set<cmTarget const*> const&
+const std::set<const cmGeneratorTarget*>&
 cmComputeLinkInformation::GetSharedLibrariesLinked()
 {
   return this->SharedLibrariesLinked;
@@ -1093,7 +1093,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
   // Keep track of shared library targets linked.
   if(target->GetType() == cmTarget::SHARED_LIBRARY)
     {
-    this->SharedLibrariesLinked.insert(target->Target);
+    this->SharedLibrariesLinked.insert(target);
     }
 
   // Handle case of an imported shared library with no soname.
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 2aac1bc..5eecf7d 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -19,7 +19,6 @@
 class cmake;
 class cmGlobalGenerator;
 class cmMakefile;
-class cmTarget;
 class cmGeneratorTarget;
 class cmOrderDirectories;
 
@@ -57,7 +56,7 @@ public:
   void GetRPath(std::vector<std::string>& runtimeDirs, bool for_install);
   std::string GetRPathString(bool for_install);
   std::string GetChrpathString();
-  std::set<cmTarget const*> const& GetSharedLibrariesLinked();
+  std::set<cmGeneratorTarget const*> const& GetSharedLibrariesLinked();
 
   std::string const& GetRPathLinkFlag() const { return this->RPathLinkFlag; }
   std::string GetRPathLinkString();
@@ -71,7 +70,7 @@ private:
   std::vector<std::string> Depends;
   std::vector<std::string> FrameworkPaths;
   std::vector<std::string> RuntimeSearchPath;
-  std::set<cmTarget const*> SharedLibrariesLinked;
+  std::set<cmGeneratorTarget const*> SharedLibrariesLinked;
 
   // Context information.
   cmGeneratorTarget const* Target;
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 383ee00..8c50b36 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -563,12 +563,12 @@ cmInstallTargetGenerator
   std::map<std::string, std::string> install_name_remap;
   if(cmComputeLinkInformation* cli = this->Target->GetLinkInformation(config))
     {
-    std::set<cmTarget const*> const& sharedLibs
+    std::set<cmGeneratorTarget const*> const& sharedLibs
                                             = cli->GetSharedLibrariesLinked();
-    for(std::set<cmTarget const*>::const_iterator j = sharedLibs.begin();
+    for(std::set<cmGeneratorTarget const*>::const_iterator j = sharedLibs.begin();
         j != sharedLibs.end(); ++j)
       {
-      cmTarget const* tgt = *j;
+      cmGeneratorTarget const* tgt = *j;
 
       // The install_name of an imported target does not change.
       if(tgt->IsImported())
@@ -576,20 +576,17 @@ cmInstallTargetGenerator
         continue;
         }
 
-      cmGeneratorTarget *gtgt = tgt->GetMakefile()
-                                          ->GetGlobalGenerator()
-                                          ->GetGeneratorTarget(tgt);
       // If the build tree and install tree use different path
       // components of the install_name field then we need to create a
       // mapping to be applied after installation.
-      std::string for_build = gtgt->GetInstallNameDirForBuildTree(config);
-      std::string for_install = gtgt->GetInstallNameDirForInstallTree();
+      std::string for_build = tgt->GetInstallNameDirForBuildTree(config);
+      std::string for_install = tgt->GetInstallNameDirForInstallTree();
       if(for_build != for_install)
         {
         // The directory portions differ.  Append the filename to
         // create the mapping.
         std::string fname =
-          this->GetInstallFilename(tgt, config, NameSO);
+          this->GetInstallFilename(tgt->Target, config, NameSO);
 
         // Map from the build-tree install_name.
         for_build += fname;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95a780becd6f20994c59b9dd8de7c6f91d8a638d
commit 95a780becd6f20994c59b9dd8de7c6f91d8a638d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:49:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:25:38 2015 +0200

    cmComputeLinkInformation: Port data interface to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 252e231..b9ed345 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -391,21 +391,19 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
     for(cmComputeLinkInformation::ItemVector::const_iterator
           i = items.begin(); i != items.end(); ++i)
       {
-      cmTarget const* linkee = i->Target;
+      cmGeneratorTarget const* linkee = i->Target;
       if(linkee && !linkee->IsImported()
                 // We can ignore the INTERFACE_LIBRARY items because
                 // Target->GetLinkInformation already processed their
                 // link interface and they don't have any output themselves.
                 && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
-                && emitted.insert(linkee).second)
+                && emitted.insert(linkee->Target).second)
         {
-        cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(linkee);
-        cmLocalGenerator* lg = gt->GetLocalGenerator();
-        cmMakefile* mf = linkee->GetMakefile();
+        cmLocalGenerator* lg = linkee->GetLocalGenerator();
+        cmMakefile* mf = linkee->Target->GetMakefile();
         std::string di = mf->GetCurrentBinaryDirectory();
         di += "/";
-        di += lg->GetTargetDirectory(*linkee);
+        di += lg->GetTargetDirectory(*linkee->Target);
         dirs.push_back(di);
         }
       }
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 58557c7..c409b37 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -658,7 +658,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       std::string exe = tgt->GetFullPath(config, this->UseImportLibrary,
                                          true);
       linkItem += exe;
-      this->Items.push_back(Item(linkItem, true, tgt->Target));
+      this->Items.push_back(Item(linkItem, true, tgt));
       this->Depends.push_back(exe);
       }
     else if(tgt->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -666,7 +666,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       // Add the interface library as an item so it can be considered as part
       // of COMPATIBLE_INTERFACE_ enforcement.  The generators will ignore
       // this for the actual link line.
-      this->Items.push_back(Item(std::string(), true, tgt->Target));
+      this->Items.push_back(Item(std::string(), true, tgt));
       }
     else
       {
@@ -1120,7 +1120,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
     }
 
   // Now add the full path to the library.
-  this->Items.push_back(Item(item, true, target->Target));
+  this->Items.push_back(Item(item, true, target));
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 94c364d..2aac1bc 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -39,11 +39,11 @@ public:
     Item(): Value(), IsPath(true), Target(0) {}
     Item(Item const& item):
       Value(item.Value), IsPath(item.IsPath), Target(item.Target) {}
-    Item(std::string const& v, bool p, cmTarget const* target = 0):
+    Item(std::string const& v, bool p, cmGeneratorTarget const* target = 0):
       Value(v), IsPath(p), Target(target) {}
     std::string Value;
     bool IsPath;
-    cmTarget const* Target;
+    cmGeneratorTarget const* Target;
   };
   typedef std::vector<Item> ItemVector;
   ItemVector const& GetItems();
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d6149b3..6669919 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -513,8 +513,9 @@ void cmExportFileGenerator::PopulateInterfaceProperty(
 
 
 //----------------------------------------------------------------------------
-void getPropertyContents(cmTarget const* tgt, const std::string& prop,
-         std::set<std::string> &ifaceProperties)
+void getPropertyContents(cmGeneratorTarget const* tgt,
+                         const std::string& prop,
+                         std::set<std::string> &ifaceProperties)
 {
   const char *p = tgt->GetProperty(prop);
   if (!p)
@@ -585,11 +586,11 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
 
   std::set<std::string> ifaceProperties;
 
-  getPropertyContents(target, "COMPATIBLE_INTERFACE_BOOL", ifaceProperties);
-  getPropertyContents(target, "COMPATIBLE_INTERFACE_STRING", ifaceProperties);
-  getPropertyContents(target, "COMPATIBLE_INTERFACE_NUMBER_MIN",
+  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_BOOL", ifaceProperties);
+  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_STRING", ifaceProperties);
+  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MIN",
                       ifaceProperties);
-  getPropertyContents(target, "COMPATIBLE_INTERFACE_NUMBER_MAX",
+  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MAX",
                       ifaceProperties);
 
   if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f39a67d..c4fc1dd 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3735,7 +3735,7 @@ const char * getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
 //----------------------------------------------------------------------------
 template<typename PropertyType>
 void checkPropertyConsistency(cmGeneratorTarget const* depender,
-                              cmTarget const* dependee,
+                              cmGeneratorTarget const* dependee,
                               const std::string& propName,
                               std::set<std::string> &emitted,
                               const std::string& config,
@@ -3751,7 +3751,7 @@ void checkPropertyConsistency(cmGeneratorTarget const* depender,
   std::vector<std::string> props;
   cmSystemTools::ExpandListArgument(prop, props);
   std::string pdir =
-    dependee->GetMakefile()->GetRequiredDefinition("CMAKE_ROOT");
+    dependee->Target->GetMakefile()->GetRequiredDefinition("CMAKE_ROOT");
   pdir += "/Help/prop_tgt/";
 
   for(std::vector<std::string>::iterator pi = props.begin();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e769f360f22d0fdc09e049bcd3f3f6005534aa4
commit 1e769f360f22d0fdc09e049bcd3f3f6005534aa4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:45:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 11:25:16 2015 +0200

    cmComputeLinkInformation: Port some implementation to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 7e34611..58557c7 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -683,8 +683,8 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
         this->Depends.push_back(lib);
         }
 
-      this->AddTargetItem(lib, tgt->Target);
-      this->AddLibraryRuntimeInfo(lib, tgt->Target);
+      this->AddTargetItem(lib, tgt);
+      this->AddLibraryRuntimeInfo(lib, tgt);
       }
     }
   else
@@ -766,7 +766,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
   if(tgt)
     {
     lib = tgt->GetFullPath(this->Config, this->UseImportLibrary);
-    this->AddLibraryRuntimeInfo(lib, tgt->Target);
+    this->AddLibraryRuntimeInfo(lib, tgt);
     }
   else
     {
@@ -1077,7 +1077,7 @@ void cmComputeLinkInformation::SetCurrentLinkType(LinkType lt)
 
 //----------------------------------------------------------------------------
 void cmComputeLinkInformation::AddTargetItem(std::string const& item,
-                                             cmTarget const* target)
+                                             cmGeneratorTarget const* target)
 {
   // This is called to handle a link item that is a full path to a target.
   // If the target is not a static library make sure the link type is
@@ -1093,13 +1093,12 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
   // Keep track of shared library targets linked.
   if(target->GetType() == cmTarget::SHARED_LIBRARY)
     {
-    this->SharedLibrariesLinked.insert(target);
+    this->SharedLibrariesLinked.insert(target->Target);
     }
 
-  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Handle case of an imported shared library with no soname.
   if(this->NoSONameUsesPath &&
-     gtgt->IsImportedSharedLibWithoutSOName(this->Config))
+     target->IsImportedSharedLibWithoutSOName(this->Config))
     {
     this->AddSharedLibNoSOName(item);
     return;
@@ -1113,7 +1112,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
 
   // For compatibility with CMake 2.4 include the item's directory in
   // the linker search path.
-  if(this->OldLinkDirMode && !target->IsFrameworkOnApple() &&
+  if(this->OldLinkDirMode && !target->Target->IsFrameworkOnApple() &&
      this->OldLinkDirMask.find(cmSystemTools::GetFilenamePath(item)) ==
      this->OldLinkDirMask.end())
     {
@@ -1121,7 +1120,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
     }
 
   // Now add the full path to the library.
-  this->Items.push_back(Item(item, true, target));
+  this->Items.push_back(Item(item, true, target->Target));
 }
 
 //----------------------------------------------------------------------------
@@ -1777,15 +1776,14 @@ cmComputeLinkInformation::GetRuntimeSearchPath()
 //----------------------------------------------------------------------------
 void
 cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
-                                                cmTarget const* target)
+                                              cmGeneratorTarget const* target)
 {
-  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Ignore targets on Apple where install_name is not @rpath.
   // The dependenty library can be found with other means such as
   // @loader_path or full paths.
   if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
     {
-    if(!gtgt->HasMacOSXRpathInstallNameDir(this->Config))
+    if(!target->HasMacOSXRpathInstallNameDir(this->Config))
       {
       return;
       }
@@ -1807,7 +1805,7 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
 
   // Try to get the soname of the library.  Only files with this name
   // could possibly conflict.
-  std::string soName = gtgt->GetSOName(this->Config);
+  std::string soName = target->GetSOName(this->Config);
   const char* soname = soName.empty()? 0 : soName.c_str();
 
   // Include this library in the runtime path ordering.
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index b1e7e46..94c364d 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -129,7 +129,7 @@ private:
   std::string NoCaseExpression(const char* str);
 
   // Handling of link items.
-  void AddTargetItem(std::string const& item, cmTarget const* target);
+  void AddTargetItem(std::string const& item, const cmGeneratorTarget* target);
   void AddFullItem(std::string const& item);
   bool CheckImplicitDirItem(std::string const& item);
   void AddUserItem(std::string const& item, bool pathNotKnown);
@@ -183,7 +183,7 @@ private:
   bool CMP0060Warn;
 
   void AddLibraryRuntimeInfo(std::string const& fullPath,
-                             cmTarget const* target);
+                             const cmGeneratorTarget* target);
   void AddLibraryRuntimeInfo(std::string const& fullPath);
 
 };

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx     |   12 ++--
 Source/cmComputeLinkDepends.cxx        |   22 +++----
 Source/cmComputeLinkDepends.h          |    9 +--
 Source/cmComputeLinkInformation.cxx    |   39 ++++++------
 Source/cmComputeLinkInformation.h      |   13 ++--
 Source/cmComputeTargetDepends.cxx      |   28 ++++-----
 Source/cmExportFileGenerator.cxx       |   13 ++--
 Source/cmExtraSublimeTextGenerator.cxx |   17 +++---
 Source/cmExtraSublimeTextGenerator.h   |    3 +-
 Source/cmGeneratorExpressionNode.cxx   |    2 +-
 Source/cmGeneratorTarget.cxx           |  101 +++++++++++++++++++-------------
 Source/cmGeneratorTarget.h             |   10 +++-
 Source/cmInstallTargetGenerator.cxx    |   15 ++---
 Source/cmLinkItem.h                    |   10 ++--
 Source/cmTarget.cxx                    |   21 -------
 Source/cmTarget.h                      |    2 -
 16 files changed, 153 insertions(+), 164 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 06:12:36 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 06:12:36 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-330-gd4508aa
Message-ID: <20151010101236.B7625BF323@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d4508aa255bf74773774cf685f6b60b7c683df01 (commit)
       via  eb30ccd427e00974c561e5f3ecf8881368678609 (commit)
       via  ad54856827f8a11ffbf764ad9fa7ee92211a6eae (commit)
       via  265136cc0531171803b63c5c2868f30eed4cf71e (commit)
       via  9e7c41bf54e943bb370d32fd1a2065c570eb4149 (commit)
      from  c9c13c26f36a68e0c9d6d7a35055bc156ef6aea9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4508aa255bf74773774cf685f6b60b7c683df01
commit d4508aa255bf74773774cf685f6b60b7c683df01
Merge: c9c13c2 eb30ccd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 06:12:35 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 06:12:35 2015 -0400

    Merge topic 'use-generator-target' into next
    
    eb30ccd4 Genex: Port implementation detail to cmGeneratorTarget.
    ad548568 cmGeneratorTarget: Move GetSupportDirectory from cmTarget.
    265136cc cmGeneratorTarget: Move HasImportLibrary from cmTarget.
    9e7c41bf cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb30ccd427e00974c561e5f3ecf8881368678609
commit eb30ccd427e00974c561e5f3ecf8881368678609
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:12:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:10:53 2015 +0200

    Genex: Port implementation detail to cmGeneratorTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2d9025e..88d10aa 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -831,8 +831,8 @@ template <typename T>
 std::string
 getLinkedTargetsContent(
   std::vector<T> const &libraries,
-  cmTarget const* target,
-  cmTarget const* headTarget,
+  cmGeneratorTarget const* target,
+  cmGeneratorTarget const* headTarget,
   cmGeneratorExpressionContext *context,
   cmGeneratorExpressionDAGChecker *dagChecker,
   const std::string &interfacePropertyName)
@@ -846,7 +846,7 @@ getLinkedTargetsContent(
     // Broken code can have a target in its own link interface.
     // Don't follow such link interface entries so as not to create a
     // self-referencing loop.
-    if (it->Target && it->Target->Target != target)
+    if (it->Target && it->Target != target)
       {
       depString +=
         sep + "$<TARGET_PROPERTY:" +
@@ -858,8 +858,10 @@ getLinkedTargetsContent(
     {
     linkedTargetsContent =
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
-                                        target->GetMakefile(), context,
-                                        headTarget, target, dagChecker);
+                                        target->Target->GetMakefile(),
+                                        context,
+                                        headTarget->Target,
+                                        target->Target, dagChecker);
     }
   linkedTargetsContent =
     cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1116,8 +1118,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(iface->Libraries, target,
-                                  headTarget,
+          getLinkedTargetsContent(iface->Libraries, gtgt,
+                                  gHeadTarget,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1128,8 +1130,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkImplementationLibraries(context->Config))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(impl->Libraries, target,
-                                  target,
+          getLinkedTargetsContent(impl->Libraries, gtgt,
+                                  gtgt,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad54856827f8a11ffbf764ad9fa7ee92211a6eae
commit ad54856827f8a11ffbf764ad9fa7ee92211a6eae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 00:29:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:05:41 2015 +0200

    cmGeneratorTarget: Move GetSupportDirectory from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index cc79bb6..8b8ef0f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5479,3 +5479,18 @@ bool cmGeneratorTarget::HasImportLibrary() const
           (this->GetType() == cmTarget::SHARED_LIBRARY ||
            this->Target->IsExecutableWithExports()));
 }
+
+//----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetSupportDirectory() const
+{
+  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+  dir += cmake::GetCMakeFilesDirectory();
+  dir += "/";
+  dir += this->GetName();
+#if defined(__VMS)
+  dir += "_dir";
+#else
+  dir += ".dir";
+#endif
+  return dir;
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e26b246..23ec7b1 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -399,6 +399,9 @@ public:
   /** Return whether or not the target has a DLL import library.  */
   bool HasImportLibrary() const;
 
+  /** Get a build-tree directory in which to place target support files.  */
+  std::string GetSupportDirectory() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index eb4dfee..8f69acd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2895,13 +2895,14 @@ void cmGlobalGenerator::WriteSummary()
       {
       continue;
       }
-    this->WriteSummary(ti->second);
-    fout << ti->second->GetSupportDirectory() << "\n";
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
+    this->WriteSummary(gt);
+    fout << gt->GetSupportDirectory() << "\n";
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::WriteSummary(cmTarget* target)
+void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
 {
   // Place the labels file in a per-target support directory.
   std::string dir = target->GetSupportDirectory();
@@ -2944,17 +2945,15 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
     fout << "# Source files and their labels\n";
     std::vector<cmSourceFile*> sources;
     std::vector<std::string> configs;
-    target->GetMakefile()->GetConfigurations(configs);
+    target->Target->GetMakefile()->GetConfigurations(configs);
     if (configs.empty())
       {
       configs.push_back("");
       }
-    cmGeneratorTarget* gt =
-        this->GetGeneratorTarget(target);
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
-      gt->GetSourceFiles(sources, *ci);
+      target->GetSourceFiles(sources, *ci);
       }
     std::vector<cmSourceFile*>::const_iterator sourcesEnd
         = cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index b22c695..55e3766 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -458,7 +458,7 @@ private:
   void WriteRuleHashes(std::string const& pfile);
 
   void WriteSummary();
-  void WriteSummary(cmTarget* target);
+  void WriteSummary(cmGeneratorTarget* target);
   void FinalizeTargetCompileInfo();
 
   virtual void ForceLinkerLanguages();
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index de84f89..2d2de5f 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -361,7 +361,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2b019be..8b60a23 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -572,7 +572,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
-        this->Target->GetSupportDirectory();
+        this->GeneratorTarget->GetSupportDirectory();
       name_of_def_file += std::string("/") +
         this->Target->GetName();
       name_of_def_file += ".def";
@@ -643,7 +643,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 185c234..0ce13c3 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -557,7 +557,8 @@ cmMakefileTargetGenerator
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
     if(targetFullPathCompilePDB.empty())
       {
-      targetFullPathCompilePDB = this->Target->GetSupportDirectory() + "/";
+      targetFullPathCompilePDB =
+          this->GeneratorTarget->GetSupportDirectory() + "/";
       }
     }
 
@@ -594,7 +595,7 @@ cmMakefileTargetGenerator
                   cmLocalGenerator::NONE,
                   cmLocalGenerator::SHELL);
   vars.Object = shellObj.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 00c00a5..0dc53f3 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -492,9 +492,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
-      std::string dllname = targetOutput;
       std::string name_of_def_file
-        = target.GetSupportDirectory();
+        = gt.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
@@ -582,7 +581,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     vars["TARGET_PDB"] = base + suffix + dbg_suffix;
     }
 
-  const std::string objPath = GetTarget()->GetSupportDirectory();
+  const std::string objPath = GetGeneratorTarget()->GetSupportDirectory();
   vars["OBJECT_DIR"] =
     this->GetLocalGenerator()->ConvertToOutputFormat(
       this->ConvertToNinjaPath(objPath), cmLocalGenerator::SHELL);
@@ -634,7 +633,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
-        = target.GetSupportDirectory();
+        = gt.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index c2daa63..db7cd7d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -299,7 +299,7 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
       if(compilePdbPath.empty())
         {
-        compilePdbPath = this->Target->GetSupportDirectory() + "/";
+        compilePdbPath = this->GeneratorTarget->GetSupportDirectory() + "/";
         }
       }
 
@@ -568,7 +568,7 @@ cmNinjaTargetGenerator
   std::string const language = source->GetLanguage();
   std::string const sourceFileName =
     language=="RC" ? source->GetFullPath() : this->GetSourceFilePath(source);
-  std::string const objectDir = this->Target->GetSupportDirectory();
+  std::string const objectDir = this->GeneratorTarget->GetSupportDirectory();
   std::string const objectFileName = this->GetObjectFilePath(source);
   std::string const objectFileDir =
     cmSystemTools::GetFilenamePath(objectFileName);
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 378f132..6e3f65f 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -64,7 +64,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
         std::string basename = cmsys::SystemTools::
                                       GetFilenameWithoutLastExtension(absFile);
 
-        std::string rcc_output_dir = target->Target->GetSupportDirectory();
+        std::string rcc_output_dir = target->GetSupportDirectory();
         cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -833,7 +833,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           std::string basename = cmsys::SystemTools::
                                   GetFilenameWithoutLastExtension(absFile);
 
-          std::string rcc_output_dir = target->Target->GetSupportDirectory();
+          std::string rcc_output_dir = target->GetSupportDirectory();
           cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
           std::string rcc_output_file = rcc_output_dir;
           rcc_output_file += "/qrc_" + basename + ".cpp";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b063e84..56bf1e9 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -382,21 +382,6 @@ cmListFileBacktrace const& cmTarget::GetBacktrace() const
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetSupportDirectory() const
-{
-  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
-  dir += cmake::GetCMakeFilesDirectory();
-  dir += "/";
-  dir += this->Name;
-#if defined(__VMS)
-  dir += "_dir";
-#else
-  dir += ".dir";
-#endif
-  return dir;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::IsExecutableWithExports() const
 {
   return (this->GetType() == cmTarget::EXECUTABLE &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index c8904e6..c159cb2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -284,9 +284,6 @@ public:
   /** Get a backtrace from the creation of the target.  */
   cmListFileBacktrace const& GetBacktrace() const;
 
-  /** Get a build-tree directory in which to place target support files.  */
-  std::string GetSupportDirectory() const;
-
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=265136cc0531171803b63c5c2868f30eed4cf71e
commit 265136cc0531171803b63c5c2868f30eed4cf71e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:45:55 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:05:39 2015 +0200

    cmGeneratorTarget: Move HasImportLibrary from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7e47261..2d9025e 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1658,7 +1658,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
       return std::string();
       }
     return target->GetFullPath(context->Config,
-                               target->Target->HasImportLibrary());
+                               target->HasImportLibrary());
   }
 };
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5dabcbd..cc79bb6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5454,7 +5454,7 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasImplibGNUtoMS() const
 {
-  return this->Target->HasImportLibrary()
+  return this->HasImportLibrary()
       && this->GetPropertyAsBool("GNUtoMS");
 }
 
@@ -5471,3 +5471,11 @@ bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
     }
   return false;
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasImportLibrary() const
+{
+  return (this->Target->IsDLLPlatform() &&
+          (this->GetType() == cmTarget::SHARED_LIBRARY ||
+           this->Target->IsExecutableWithExports()));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 05cb91a..e26b246 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -396,6 +396,9 @@ public:
   bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
                         const char* newExt = 0) const;
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index f8743d9..00c00a5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -559,7 +559,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                               cmLocalGenerator::SHELL);
     vars["TARGET_IMPLIB"] = impLibPath;
     EnsureParentDirectoryExists(impLibPath);
-    if(target.HasImportLibrary())
+    if(genTarget.HasImportLibrary())
       {
       byproducts.push_back(targetOutputImplib);
       }
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 5f92b5b..c8904e6 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -264,9 +264,6 @@ public:
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 
-  /** Return whether or not the target has a DLL import library.  */
-  bool HasImportLibrary() const;
-
   /** Return whether this target is a shared library Framework on
       Apple.  */
   bool IsFrameworkOnApple() const;
@@ -465,6 +462,9 @@ private:
 
   void MaybeInvalidatePropertyCache(const std::string& prop);
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   // Internal representation details.
   friend class cmTargetInternals;
   friend class cmGeneratorTarget;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e7c41bf54e943bb370d32fd1a2065c570eb4149
commit 9e7c41bf54e943bb370d32fd1a2065c570eb4149
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:50:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:00:51 2015 +0200

    cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index fed0dbc..400fa17 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -217,7 +217,7 @@ cmExportBuildFileGenerator
     std::string prop = "IMPORTED_IMPLIB";
     prop += suffix;
     std::string value = target->GetFullPath(config, true);
-    target->Target->GetImplibGNUtoMS(value, value,
+    target->GetImplibGNUtoMS(value, value,
                              "${CMAKE_IMPORT_LIBRARY_SUFFIX}");
     properties[prop] = value;
     }
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9eef514..5dabcbd 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5450,3 +5450,24 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
     }
   return "";
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasImplibGNUtoMS() const
+{
+  return this->Target->HasImportLibrary()
+      && this->GetPropertyAsBool("GNUtoMS");
+}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
+                                std::string& out, const char* newExt) const
+{
+  if(this->HasImplibGNUtoMS() &&
+     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
+    {
+    out = gnuName.substr(0, gnuName.size()-6);
+    out += newExt? newExt : ".lib";
+    return true;
+    }
+  return false;
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index a278b53..05cb91a 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -388,6 +388,14 @@ public:
   ///! Return the preferred linker language for this target
   std::string GetLinkerLanguage(const std::string& config = "") const;
 
+  /** Does this target have a GNU implib to convert to MS format?  */
+  bool HasImplibGNUtoMS() const;
+
+  /** Convert the given GNU import library name (.dll.a) to a name with a new
+      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
+  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
+                        const char* newExt = 0) const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 8c50b36..7a0c06b 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -135,7 +135,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -199,7 +199,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -387,7 +387,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -416,7 +416,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index f6b907e..de84f89 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -259,7 +259,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                                           cmLocalGenerator::START_OUTPUT,
                                           cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       exeCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 3b3f63e..2b019be 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -410,7 +410,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         cmLocalGenerator::START_OUTPUT,
         cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       libCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 6eafeae..185c234 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1516,7 +1516,7 @@ std::string cmMakefileTargetGenerator::GetLinkRule(
                                               const std::string& linkRuleVar)
 {
   std::string linkRule = this->Makefile->GetRequiredDefinition(linkRuleVar);
-  if(this->Target->HasImplibGNUtoMS())
+  if(this->GeneratorTarget->HasImplibGNUtoMS())
     {
     std::string ruleVar = "CMAKE_";
     ruleVar += this->GeneratorTarget->GetLinkerLanguage(this->ConfigName);
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 31a9aa7..b063e84 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2199,26 +2199,6 @@ void cmTarget::ComputeVersionedName(std::string& vName,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HasImplibGNUtoMS() const
-{
-  return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS");
-}
-
-//----------------------------------------------------------------------------
-bool cmTarget::GetImplibGNUtoMS(std::string const& gnuName,
-                                std::string& out, const char* newExt) const
-{
-  if(this->HasImplibGNUtoMS() &&
-     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
-    {
-    out = gnuName.substr(0, gnuName.size()-6);
-    out += newExt? newExt : ".lib";
-    return true;
-    }
-  return false;
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::SetPropertyDefault(const std::string& property,
                                   const char* default_value)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 0c1bbd2..5f92b5b 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -242,14 +242,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Does this target have a GNU implib to convert to MS format?  */
-  bool HasImplibGNUtoMS() const;
-
-  /** Convert the given GNU import library name (.dll.a) to a name with a new
-      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
-  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
-                        const char* newExt = 0) const;
-
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportBuildFileGenerator.cxx          |    2 +-
 Source/cmGeneratorExpressionNode.cxx           |   22 ++++++------
 Source/cmGeneratorTarget.cxx                   |   44 ++++++++++++++++++++++++
 Source/cmGeneratorTarget.h                     |   14 ++++++++
 Source/cmGlobalGenerator.cxx                   |   13 ++++---
 Source/cmGlobalGenerator.h                     |    2 +-
 Source/cmInstallTargetGenerator.cxx            |    8 ++---
 Source/cmMakefileExecutableTargetGenerator.cxx |    4 +--
 Source/cmMakefileLibraryTargetGenerator.cxx    |    6 ++--
 Source/cmMakefileTargetGenerator.cxx           |    7 ++--
 Source/cmNinjaNormalTargetGenerator.cxx        |    9 +++--
 Source/cmNinjaTargetGenerator.cxx              |    4 +--
 Source/cmQtAutoGeneratorInitializer.cxx        |    4 +--
 Source/cmTarget.cxx                            |   35 -------------------
 Source/cmTarget.h                              |   17 ++-------
 15 files changed, 102 insertions(+), 89 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 06:37:38 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 06:37:38 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-332-g5206c7e
Message-ID: <20151010103741.2B3D9BFF68@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5206c7ef959e078473c01cc0ad8adb210f1bef66 (commit)
       via  db4b5fb5712037f60eeabaa13d5e6b0c152218e3 (commit)
      from  d4508aa255bf74773774cf685f6b60b7c683df01 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5206c7ef959e078473c01cc0ad8adb210f1bef66
commit 5206c7ef959e078473c01cc0ad8adb210f1bef66
Merge: d4508aa db4b5fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 06:37:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 06:37:32 2015 -0400

    Merge topic 'use-generator-target' into next
    
    db4b5fb5 Partial revert.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db4b5fb5712037f60eeabaa13d5e6b0c152218e3
commit db4b5fb5712037f60eeabaa13d5e6b0c152218e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 12:36:27 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:36:48 2015 +0200

    Partial revert.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index f901414..b9ed345 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -383,7 +383,7 @@ std::vector<std::string>
 cmCommonTargetGenerator::GetLinkedTargetDirectories() const
 {
   std::vector<std::string> dirs;
-  std::set<cmGeneratorTarget const*> emitted;
+  std::set<cmTarget const*> emitted;
   if (cmComputeLinkInformation* cli =
       this->GeneratorTarget->GetLinkInformation(this->ConfigName))
     {
@@ -397,7 +397,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
                 // Target->GetLinkInformation already processed their
                 // link interface and they don't have any output themselves.
                 && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
-                && emitted.insert(linkee).second)
+                && emitted.insert(linkee->Target).second)
         {
         cmLocalGenerator* lg = linkee->GetLocalGenerator();
         cmMakefile* mf = linkee->Target->GetMakefile();
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 66e4c4b..4d7b01e 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -320,7 +320,8 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item)
   int index = lei->second;
   LinkEntry& entry = this->EntryList[index];
   entry.Item = item;
-  entry.Target = item.Target;
+  entry.Target =
+      item.Target ? this->GlobalGenerator->GetGeneratorTarget(item.Target) : 0;
   entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
                   item.substr(0, 10) != "-framework");
 
@@ -442,7 +443,9 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
     // Initialize the item entry.
     LinkEntry& entry = this->EntryList[lei->second];
     entry.Item = dep.Item;
-    entry.Target = dep.Item.Target;
+    entry.Target =
+        dep.Item.Target ?
+          this->GlobalGenerator->GetGeneratorTarget(dep.Item.Target) : 0;
 
     // This item was added specifically because it is a dependent
     // shared library.  It may get special treatment
@@ -526,17 +529,15 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
           }
         }
 
-      const cmGeneratorTarget* gtgt =
-          this->FindTargetToLink(depender_index, *di);
       // If the library is meant for this link type then use it.
       if(llt == cmTarget::GENERAL || llt == this->LinkType)
         {
-        cmLinkItem item(*di, gtgt);
+        cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
         actual_libs.push_back(item);
         }
       else if(this->OldLinkDirMode)
         {
-        cmLinkItem item(*di, gtgt);
+        cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
         this->CheckWrongConfigItem(item);
         }
 
@@ -633,9 +634,8 @@ cmComputeLinkDepends::AddLinkEntries(
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget const*
-cmComputeLinkDepends::FindTargetToLink(int depender_index,
-                                       const std::string& name)
+cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
+                                                 const std::string& name)
 {
   // Look for a target in the scope of the depender.
   cmGeneratorTarget const* from = this->Target;
@@ -647,9 +647,7 @@ cmComputeLinkDepends::FindTargetToLink(int depender_index,
       from = depender;
       }
     }
-
-  return this->GlobalGenerator->GetGeneratorTarget(
-        from->Target->FindTargetToLink(name));
+  return from->Target->FindTargetToLink(name);
 }
 
 //----------------------------------------------------------------------------
@@ -984,6 +982,7 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
   // directories.
   if(item.Target && !item.Target->IsImported())
     {
-    this->OldWrongConfigItems.insert(item.Target);
+    this->OldWrongConfigItems.insert(
+            this->GlobalGenerator->GetGeneratorTarget(item.Target));
     }
 }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 9d960c6..dba3948 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -75,8 +75,8 @@ private:
   void AddDirectLinkEntries();
   template <typename T>
     void AddLinkEntries(int depender_index, std::vector<T> const& libs);
-  cmGeneratorTarget const* FindTargetToLink(int depender_index,
-                                            const std::string& name);
+  cmTarget const* FindTargetToLink(int depender_index,
+                                   const std::string& name);
 
   // One entry for each unique item.
   std::vector<LinkEntry> EntryList;
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 8f3def2..e53b7b9 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -319,20 +319,22 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
                                              std::set<std::string> &emitted)
 {
   cmGeneratorTarget const* depender = this->Targets[depender_index];
-  cmGeneratorTarget const* dependee = dependee_name.Target;
+  cmTarget const* dependee = dependee_name.Target;
   // Skip targets that will not really be linked.  This is probably a
   // name conflict between an external library and an executable
   // within the project.
   if(dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->Target->IsExecutableWithExports())
+     !dependee->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    this->AddInterfaceDepends(depender_index, dependee, "", emitted);
+    cmGeneratorTarget* gt =
+        this->GlobalGenerator->GetGeneratorTarget(dependee);
+    this->AddInterfaceDepends(depender_index, gt, "", emitted);
     std::vector<std::string> configs;
     depender->Makefile->GetConfigurations(configs);
     for (std::vector<std::string>::const_iterator it = configs.begin();
@@ -340,7 +342,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
       {
       // A target should not depend on itself.
       emitted.insert(depender->GetName());
-      this->AddInterfaceDepends(depender_index, dependee, *it, emitted);
+      this->AddInterfaceDepends(depender_index, gt, *it, emitted);
       }
     }
 }
@@ -354,7 +356,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   cmGeneratorTarget const* depender = this->Targets[depender_index];
 
   // Check the target's makefile first.
-  cmGeneratorTarget const* dependee = dependee_name.Target;
+  cmTarget const* dependee = dependee_name.Target;
 
   if(!dependee && !linking &&
     (depender->GetType() != cmTarget::GLOBAL_TARGET))
@@ -401,14 +403,16 @@ void cmComputeTargetDepends::AddTargetDepend(
   // within the project.
   if(linking && dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->Target->IsExecutableWithExports())
+     !dependee->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    this->AddTargetDepend(depender_index, dependee, linking);
+    cmGeneratorTarget* gt =
+        this->GlobalGenerator->GetGeneratorTarget(dependee);
+    this->AddTargetDepend(depender_index, gt, linking);
     }
 }
 
@@ -426,9 +430,11 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     for(std::set<cmLinkItem>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
-      if(cmGeneratorTarget const* transitive_dependee = i->Target)
+      if(cmTarget const* transitive_dependee = i->Target)
         {
-        this->AddTargetDepend(depender_index, transitive_dependee, false);
+        cmGeneratorTarget* gt =
+            this->GlobalGenerator->GetGeneratorTarget(transitive_dependee);
+        this->AddTargetDepend(depender_index, gt, false);
         }
       }
     }
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 400fa17..fed0dbc 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -217,7 +217,7 @@ cmExportBuildFileGenerator
     std::string prop = "IMPORTED_IMPLIB";
     prop += suffix;
     std::string value = target->GetFullPath(config, true);
-    target->GetImplibGNUtoMS(value, value,
+    target->Target->GetImplibGNUtoMS(value, value,
                              "${CMAKE_IMPORT_LIBRARY_SUFFIX}");
     properties[prop] = value;
     }
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 21c71b0..11410a7 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -255,9 +255,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, target, gtgt);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, gtgt);
+            this->ComputeDefines(*iter, lg, target, gtgt);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
@@ -365,6 +365,7 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
 std::string
 cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
                                                    cmLocalGenerator* lg,
+                                                   cmTarget *target,
                                                    cmGeneratorTarget* gtgt)
 {
   std::string flags;
@@ -389,7 +390,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   //   }
 
   // Add shared-library flags if needed.
-  lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
+  lg->AddCMP0018Flags(flags, target, language, config);
 
   // Add include directory flags.
   {
@@ -404,7 +405,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, gtgt->Target, language, config);
+  lg->AddCompileOptions(flags, target, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -418,8 +419,8 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
 // void cmMakefileTargetGenerator::WriteTargetLanguageFlags().
 std::string
 cmExtraSublimeTextGenerator::
-ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
-               cmGeneratorTarget* target)
+ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
+               cmGeneratorTarget*)
 
 {
   std::set<std::string> defines;
@@ -428,13 +429,13 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
   const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->Target->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     lg->AppendDefines(defines, exportMacro);
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AddCompileDefinitions(defines, target->Target, config, language);
+  lg->AddCompileDefinitions(defines, target, config, language);
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 5dd1140..4173b7d 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -79,10 +79,11 @@ private:
    */
   std::string ComputeFlagsForObject(cmSourceFile *source,
                                     cmLocalGenerator* lg,
+                                    cmTarget *target,
                                     cmGeneratorTarget* gtgt);
 
   std::string ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
-                             cmGeneratorTarget* gtgt);
+                             cmTarget *target, cmGeneratorTarget* gtgt);
 };
 
 #endif
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 88d10aa..78a5b6f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -831,8 +831,8 @@ template <typename T>
 std::string
 getLinkedTargetsContent(
   std::vector<T> const &libraries,
-  cmGeneratorTarget const* target,
-  cmGeneratorTarget const* headTarget,
+  cmTarget const* target,
+  cmTarget const* headTarget,
   cmGeneratorExpressionContext *context,
   cmGeneratorExpressionDAGChecker *dagChecker,
   const std::string &interfacePropertyName)
@@ -858,10 +858,8 @@ getLinkedTargetsContent(
     {
     linkedTargetsContent =
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
-                                        target->Target->GetMakefile(),
-                                        context,
-                                        headTarget->Target,
-                                        target->Target, dagChecker);
+                                        target->GetMakefile(), context,
+                                        headTarget, target, dagChecker);
     }
   linkedTargetsContent =
     cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1118,8 +1116,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(iface->Libraries, gtgt,
-                                  gHeadTarget,
+          getLinkedTargetsContent(iface->Libraries, target,
+                                  headTarget,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1130,8 +1128,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkImplementationLibraries(context->Config))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(impl->Libraries, gtgt,
-                                  gtgt,
+          getLinkedTargetsContent(impl->Libraries, target,
+                                  target,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1660,7 +1658,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
       return std::string();
       }
     return target->GetFullPath(context->Config,
-                               target->HasImportLibrary());
+                               target->Target->HasImportLibrary());
   }
 };
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8b8ef0f..a5e35a1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -510,8 +510,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
   return 0;
 }
 
-static void handleSystemIncludesDep(cmMakefile *mf,
-                                  cmGeneratorTarget const* depTgt,
+static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
                                   const std::string& config,
                                   cmGeneratorTarget const* headTarget,
                                   cmGeneratorExpressionDAGChecker *dagChecker,
@@ -525,7 +524,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      depTgt, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
     {
@@ -539,7 +538,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      depTgt, dagChecker), result);
     }
 }
 
@@ -774,9 +773,8 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
     for(std::set<std::string>::const_iterator i = utilities.begin();
         i != utilities.end(); ++i)
       {
-      cmGeneratorTarget* gt = this->GlobalGenerator
-          ->GetGeneratorTarget(this->Makefile->FindTargetToUse(*i));
-      this->UtilityItems.insert(cmLinkItem(*i, gt));
+      this->UtilityItems.insert(
+        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
       }
     }
   return this->UtilityItems;
@@ -883,9 +881,9 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
                                           &dagChecker), result);
       }
 
-    std::vector<cmGeneratorTarget const*> const& deps =
+    std::vector<cmTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmGeneratorTarget const*>::const_iterator
+    for(std::vector<cmTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
       handleSystemIncludesDep(this->Makefile, *li, config, this,
@@ -1730,12 +1728,15 @@ public:
         }
       return;
       }
-    if(!this->Visited.insert(item.Target->Target).second)
+    if(!this->Visited.insert(item.Target).second)
       {
       return;
       }
+    cmGeneratorTarget* gtgt =
+        this->Target->GetLocalGenerator()->GetGlobalGenerator()
+            ->GetGeneratorTarget(item.Target);
     cmLinkInterface const* iface =
-      item.Target->GetLinkInterface(this->Config, this->HeadTarget);
+      gtgt->GetLinkInterface(this->Config, this->HeadTarget);
     if(!iface) { return; }
 
     for(std::vector<std::string>::const_iterator
@@ -2066,14 +2067,15 @@ void processILibs(const std::string& config,
                   cmGeneratorTarget const* headTarget,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
-                  std::vector<cmGeneratorTarget const*>& tgts,
-                  std::set<cmGeneratorTarget const*>& emitted)
+                  std::vector<cmTarget const*>& tgts,
+                  std::set<cmTarget const*>& emitted)
 {
   if (item.Target && emitted.insert(item.Target).second)
     {
     tgts.push_back(item.Target);
+    cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
-       item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
+       gt->GetLinkInterfaceLibraries(config, headTarget, true))
       {
       for(std::vector<cmLinkItem>::const_iterator
             it = iface->Libraries.begin();
@@ -2086,7 +2088,7 @@ void processILibs(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
-const std::vector<const cmGeneratorTarget*>&
+const std::vector<const cmTarget*>&
 cmGeneratorTarget::GetLinkImplementationClosure(
     const std::string& config) const
 {
@@ -2095,7 +2097,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
   if(!tgts.Done)
     {
     tgts.Done = true;
-    std::set<cmGeneratorTarget const*> emitted;
+    std::set<cmTarget const*> emitted;
 
     cmLinkImplementationLibraries const* impl
       = this->GetLinkImplementationLibraries(config);
@@ -3630,10 +3632,10 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
     compat.Done = true;
     compat.PropsBool.insert("POSITION_INDEPENDENT_CODE");
     compat.PropsString.insert("AUTOUIC_OPTIONS");
-    std::vector<cmGeneratorTarget const*> const& deps =
+    std::vector<cmTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmGeneratorTarget const*>::const_iterator li =
-        deps.begin(); li != deps.end(); ++li)
+    for(std::vector<cmTarget const*>::const_iterator li = deps.begin();
+        li != deps.end(); ++li)
       {
 #define CM_READ_COMPATIBLE_INTERFACE(X, x) \
       if(const char* prop = (*li)->GetProperty("COMPATIBLE_INTERFACE_" #X)) \
@@ -3979,20 +3981,18 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
 
 //----------------------------------------------------------------------------
 template<typename PropertyType>
-PropertyType getTypedProperty(cmGeneratorTarget const* tgt,
-                              const std::string& prop);
+PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
 
 //----------------------------------------------------------------------------
 template<>
-bool getTypedProperty<bool>(cmGeneratorTarget const* tgt,
-                            const std::string& prop)
+bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
 {
   return tgt->GetPropertyAsBool(prop);
 }
 
 //----------------------------------------------------------------------------
 template<>
-const char *getTypedProperty<const char *>(cmGeneratorTarget const* tgt,
+const char *getTypedProperty<const char *>(cmTarget const* tgt,
                                            const std::string& prop)
 {
   return tgt->GetProperty(prop);
@@ -4122,7 +4122,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                           CompatibleType t,
                                           PropertyType *)
 {
-  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
+  PropertyType propContent = getTypedProperty<PropertyType>(tgt->Target, p);
   const bool explicitlySet = tgt->Target->GetProperties()
                                   .find(p)
                                   != tgt->Target->GetProperties().end();
@@ -4131,7 +4131,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
   assert((impliedByUse ^ explicitlySet)
       || (!impliedByUse && !explicitlySet));
 
-  std::vector<cmGeneratorTarget const*> const& deps =
+  std::vector<cmTarget const*> const& deps =
     tgt->GetLinkImplementationClosure(config);
 
   if(deps.empty())
@@ -4158,7 +4158,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     }
 
   std::string interfaceProperty = "INTERFACE_" + p;
-  for(std::vector<cmGeneratorTarget const*>::const_iterator li =
+  for(std::vector<cmTarget const*>::const_iterator li =
       deps.begin();
       li != deps.end(); ++li)
     {
@@ -4168,11 +4168,11 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     // target itself has a POSITION_INDEPENDENT_CODE which disagrees
     // with a dependency.
 
-    cmGeneratorTarget const* theTarget = *li;
+    cmTarget const* theTarget = *li;
 
-    const bool ifaceIsSet = theTarget->Target->GetProperties()
+    const bool ifaceIsSet = theTarget->GetProperties()
                             .find(interfaceProperty)
-                            != theTarget->Target->GetProperties().end();
+                            != theTarget->GetProperties().end();
     PropertyType ifacePropContent =
                     getTypedProperty<PropertyType>(theTarget,
                               interfaceProperty);
@@ -4427,9 +4427,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
       {
       continue;
       }
-    cmGeneratorTarget* gt = this->GlobalGenerator
-        ->GetGeneratorTarget(this->Target->FindTargetToLink(name));
-    items.push_back(cmLinkItem(name, gt));
+    items.push_back(cmLinkItem(name, this->Target->FindTargetToLink(name)));
     }
 }
 
@@ -5399,10 +5397,9 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         }
 
       // The entry is meant for this configuration.
-      cmTarget const* tgt = this->Target->FindTargetToLink(name);
-      cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(tgt);
       impl.Libraries.push_back(
-        cmLinkImplItem(name, gt, *btIt, evaluated != *le));
+        cmLinkImplItem(name, this->Target->FindTargetToLink(name),
+                       *btIt, evaluated != *le));
       }
 
     std::set<std::string> const& seenProps = cge->GetSeenTargetProperties();
@@ -5431,10 +5428,9 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         {
         continue;
         }
-      cmGeneratorTarget* gt = this->GlobalGenerator
-          ->GetGeneratorTarget(this->Target->FindTargetToLink(name));
       // Support OLD behavior for CMP0003.
-      impl.WrongConfigLibraries.push_back(cmLinkItem(name, gt));
+      impl.WrongConfigLibraries.push_back(
+        cmLinkItem(name, this->Target->FindTargetToLink(name)));
       }
     }
 }
@@ -5450,47 +5446,3 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
     }
   return "";
 }
-
-//----------------------------------------------------------------------------
-bool cmGeneratorTarget::HasImplibGNUtoMS() const
-{
-  return this->HasImportLibrary()
-      && this->GetPropertyAsBool("GNUtoMS");
-}
-
-//----------------------------------------------------------------------------
-bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
-                                std::string& out, const char* newExt) const
-{
-  if(this->HasImplibGNUtoMS() &&
-     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
-    {
-    out = gnuName.substr(0, gnuName.size()-6);
-    out += newExt? newExt : ".lib";
-    return true;
-    }
-  return false;
-}
-
-//----------------------------------------------------------------------------
-bool cmGeneratorTarget::HasImportLibrary() const
-{
-  return (this->Target->IsDLLPlatform() &&
-          (this->GetType() == cmTarget::SHARED_LIBRARY ||
-           this->Target->IsExecutableWithExports()));
-}
-
-//----------------------------------------------------------------------------
-std::string cmGeneratorTarget::GetSupportDirectory() const
-{
-  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
-  dir += cmake::GetCMakeFilesDirectory();
-  dir += "/";
-  dir += this->GetName();
-#if defined(__VMS)
-  dir += "_dir";
-#else
-  dir += ".dir";
-#endif
-  return dir;
-}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 23ec7b1..70612f2 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -388,20 +388,6 @@ public:
   ///! Return the preferred linker language for this target
   std::string GetLinkerLanguage(const std::string& config = "") const;
 
-  /** Does this target have a GNU implib to convert to MS format?  */
-  bool HasImplibGNUtoMS() const;
-
-  /** Convert the given GNU import library name (.dll.a) to a name with a new
-      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
-  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
-                        const char* newExt = 0) const;
-
-  /** Return whether or not the target has a DLL import library.  */
-  bool HasImportLibrary() const;
-
-  /** Get a build-tree directory in which to place target support files.  */
-  std::string GetSupportDirectory() const;
-
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
@@ -489,7 +475,7 @@ private:
   cmGeneratorTarget(cmGeneratorTarget const&);
   void operator=(cmGeneratorTarget const&);
 
-  struct LinkImplClosure: public std::vector<cmGeneratorTarget const*>
+  struct LinkImplClosure: public std::vector<cmTarget const*>
   {
     LinkImplClosure(): Done(false) {}
     bool Done;
@@ -567,8 +553,8 @@ private:
                            std::string& out) const;
 
 public:
-  const std::vector<const cmGeneratorTarget*>&
-  GetLinkImplementationClosure(const std::string& config) const;
+  std::vector<cmTarget const*> const&
+    GetLinkImplementationClosure(const std::string& config) const;
 
   mutable std::map<std::string, std::string> MaxLanguageStandards;
   std::map<std::string, std::string> const&
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8f69acd..eb4dfee 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2895,14 +2895,13 @@ void cmGlobalGenerator::WriteSummary()
       {
       continue;
       }
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
-    this->WriteSummary(gt);
-    fout << gt->GetSupportDirectory() << "\n";
+    this->WriteSummary(ti->second);
+    fout << ti->second->GetSupportDirectory() << "\n";
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
+void cmGlobalGenerator::WriteSummary(cmTarget* target)
 {
   // Place the labels file in a per-target support directory.
   std::string dir = target->GetSupportDirectory();
@@ -2945,15 +2944,17 @@ void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
     fout << "# Source files and their labels\n";
     std::vector<cmSourceFile*> sources;
     std::vector<std::string> configs;
-    target->Target->GetMakefile()->GetConfigurations(configs);
+    target->GetMakefile()->GetConfigurations(configs);
     if (configs.empty())
       {
       configs.push_back("");
       }
+    cmGeneratorTarget* gt =
+        this->GetGeneratorTarget(target);
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
-      target->GetSourceFiles(sources, *ci);
+      gt->GetSourceFiles(sources, *ci);
       }
     std::vector<cmSourceFile*>::const_iterator sourcesEnd
         = cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 55e3766..b22c695 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -458,7 +458,7 @@ private:
   void WriteRuleHashes(std::string const& pfile);
 
   void WriteSummary();
-  void WriteSummary(cmGeneratorTarget* target);
+  void WriteSummary(cmTarget* target);
   void FinalizeTargetCompileInfo();
 
   virtual void ForceLinkerLanguages();
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7a0c06b..8c50b36 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -135,7 +135,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -199,7 +199,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -387,7 +387,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -416,7 +416,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index b875cc0..33780a7 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -16,6 +16,7 @@
 #include "cmListFileCache.h"
 
 class cmGeneratorTarget;
+class cmTarget;
 
 // Basic information about each link item.
 class cmLinkItem: public std::string
@@ -24,9 +25,9 @@ class cmLinkItem: public std::string
 public:
   cmLinkItem(): std_string(), Target(0) {}
   cmLinkItem(const std_string& n,
-             cmGeneratorTarget const* t): std_string(n), Target(t) {}
+             cmTarget const* t): std_string(n), Target(t) {}
   cmLinkItem(cmLinkItem const& r): std_string(r), Target(r.Target) {}
-  cmGeneratorTarget const* Target;
+  cmTarget const* Target;
 };
 
 class cmLinkImplItem: public cmLinkItem
@@ -34,7 +35,7 @@ class cmLinkImplItem: public cmLinkItem
 public:
   cmLinkImplItem(): cmLinkItem(), Backtrace(), FromGenex(false) {}
   cmLinkImplItem(std::string const& n,
-                 cmGeneratorTarget const* t,
+                 cmTarget const* t,
                  cmListFileBacktrace const& bt,
                  bool fromGenex):
     cmLinkItem(n, t), Backtrace(bt), FromGenex(fromGenex) {}
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 2d2de5f..f6b907e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -259,7 +259,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                                           cmLocalGenerator::START_OUTPUT,
                                           cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       exeCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
@@ -361,7 +361,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 8b60a23..3b3f63e 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -410,7 +410,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         cmLocalGenerator::START_OUTPUT,
         cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       libCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
@@ -572,7 +572,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
-        this->GeneratorTarget->GetSupportDirectory();
+        this->Target->GetSupportDirectory();
       name_of_def_file += std::string("/") +
         this->Target->GetName();
       name_of_def_file += ".def";
@@ -643,7 +643,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0ce13c3..6eafeae 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -557,8 +557,7 @@ cmMakefileTargetGenerator
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
     if(targetFullPathCompilePDB.empty())
       {
-      targetFullPathCompilePDB =
-          this->GeneratorTarget->GetSupportDirectory() + "/";
+      targetFullPathCompilePDB = this->Target->GetSupportDirectory() + "/";
       }
     }
 
@@ -595,7 +594,7 @@ cmMakefileTargetGenerator
                   cmLocalGenerator::NONE,
                   cmLocalGenerator::SHELL);
   vars.Object = shellObj.c_str();
-  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
@@ -1517,7 +1516,7 @@ std::string cmMakefileTargetGenerator::GetLinkRule(
                                               const std::string& linkRuleVar)
 {
   std::string linkRule = this->Makefile->GetRequiredDefinition(linkRuleVar);
-  if(this->GeneratorTarget->HasImplibGNUtoMS())
+  if(this->Target->HasImplibGNUtoMS())
     {
     std::string ruleVar = "CMAKE_";
     ruleVar += this->GeneratorTarget->GetLinkerLanguage(this->ConfigName);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 0dc53f3..f8743d9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -492,8 +492,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
+      std::string dllname = targetOutput;
       std::string name_of_def_file
-        = gt.GetSupportDirectory();
+        = target.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
@@ -558,7 +559,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                               cmLocalGenerator::SHELL);
     vars["TARGET_IMPLIB"] = impLibPath;
     EnsureParentDirectoryExists(impLibPath);
-    if(genTarget.HasImportLibrary())
+    if(target.HasImportLibrary())
       {
       byproducts.push_back(targetOutputImplib);
       }
@@ -581,7 +582,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     vars["TARGET_PDB"] = base + suffix + dbg_suffix;
     }
 
-  const std::string objPath = GetGeneratorTarget()->GetSupportDirectory();
+  const std::string objPath = GetTarget()->GetSupportDirectory();
   vars["OBJECT_DIR"] =
     this->GetLocalGenerator()->ConvertToOutputFormat(
       this->ConvertToNinjaPath(objPath), cmLocalGenerator::SHELL);
@@ -633,7 +634,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
-        = gt.GetSupportDirectory();
+        = target.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index db7cd7d..c2daa63 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -299,7 +299,7 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
       if(compilePdbPath.empty())
         {
-        compilePdbPath = this->GeneratorTarget->GetSupportDirectory() + "/";
+        compilePdbPath = this->Target->GetSupportDirectory() + "/";
         }
       }
 
@@ -568,7 +568,7 @@ cmNinjaTargetGenerator
   std::string const language = source->GetLanguage();
   std::string const sourceFileName =
     language=="RC" ? source->GetFullPath() : this->GetSourceFilePath(source);
-  std::string const objectDir = this->GeneratorTarget->GetSupportDirectory();
+  std::string const objectDir = this->Target->GetSupportDirectory();
   std::string const objectFileName = this->GetObjectFilePath(source);
   std::string const objectFileDir =
     cmSystemTools::GetFilenamePath(objectFileName);
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6e3f65f..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -64,7 +64,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
         std::string basename = cmsys::SystemTools::
                                       GetFilenameWithoutLastExtension(absFile);
 
-        std::string rcc_output_dir = target->GetSupportDirectory();
+        std::string rcc_output_dir = target->Target->GetSupportDirectory();
         cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -833,7 +833,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           std::string basename = cmsys::SystemTools::
                                   GetFilenameWithoutLastExtension(absFile);
 
-          std::string rcc_output_dir = target->GetSupportDirectory();
+          std::string rcc_output_dir = target->Target->GetSupportDirectory();
           cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
           std::string rcc_output_file = rcc_output_dir;
           rcc_output_file += "/qrc_" + basename + ".cpp";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 56bf1e9..31a9aa7 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -382,6 +382,21 @@ cmListFileBacktrace const& cmTarget::GetBacktrace() const
 }
 
 //----------------------------------------------------------------------------
+std::string cmTarget::GetSupportDirectory() const
+{
+  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+  dir += cmake::GetCMakeFilesDirectory();
+  dir += "/";
+  dir += this->Name;
+#if defined(__VMS)
+  dir += "_dir";
+#else
+  dir += ".dir";
+#endif
+  return dir;
+}
+
+//----------------------------------------------------------------------------
 bool cmTarget::IsExecutableWithExports() const
 {
   return (this->GetType() == cmTarget::EXECUTABLE &&
@@ -2184,6 +2199,26 @@ void cmTarget::ComputeVersionedName(std::string& vName,
 }
 
 //----------------------------------------------------------------------------
+bool cmTarget::HasImplibGNUtoMS() const
+{
+  return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS");
+}
+
+//----------------------------------------------------------------------------
+bool cmTarget::GetImplibGNUtoMS(std::string const& gnuName,
+                                std::string& out, const char* newExt) const
+{
+  if(this->HasImplibGNUtoMS() &&
+     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
+    {
+    out = gnuName.substr(0, gnuName.size()-6);
+    out += newExt? newExt : ".lib";
+    return true;
+    }
+  return false;
+}
+
+//----------------------------------------------------------------------------
 void cmTarget::SetPropertyDefault(const std::string& property,
                                   const char* default_value)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index c159cb2..0c1bbd2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -242,6 +242,14 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
+  /** Does this target have a GNU implib to convert to MS format?  */
+  bool HasImplibGNUtoMS() const;
+
+  /** Convert the given GNU import library name (.dll.a) to a name with a new
+      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
+  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
+                        const char* newExt = 0) const;
+
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
 
@@ -264,6 +272,9 @@ public:
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   /** Return whether this target is a shared library Framework on
       Apple.  */
   bool IsFrameworkOnApple() const;
@@ -284,6 +295,9 @@ public:
   /** Get a backtrace from the creation of the target.  */
   cmListFileBacktrace const& GetBacktrace() const;
 
+  /** Get a build-tree directory in which to place target support files.  */
+  std::string GetSupportDirectory() const;
+
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 
@@ -459,9 +473,6 @@ private:
 
   void MaybeInvalidatePropertyCache(const std::string& prop);
 
-  /** Return whether or not the target has a DLL import library.  */
-  bool HasImportLibrary() const;
-
   // Internal representation details.
   friend class cmTargetInternals;
   friend class cmGeneratorTarget;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |    4 +-
 Source/cmComputeLinkDepends.cxx                |   25 +++--
 Source/cmComputeLinkDepends.h                  |    4 +-
 Source/cmComputeTargetDepends.cxx              |   24 +++--
 Source/cmExportBuildFileGenerator.cxx          |    2 +-
 Source/cmExtraSublimeTextGenerator.cxx         |   17 ++--
 Source/cmExtraSublimeTextGenerator.h           |    3 +-
 Source/cmGeneratorExpressionNode.cxx           |   20 ++--
 Source/cmGeneratorTarget.cxx                   |  118 +++++++-----------------
 Source/cmGeneratorTarget.h                     |   20 +---
 Source/cmGlobalGenerator.cxx                   |   13 +--
 Source/cmGlobalGenerator.h                     |    2 +-
 Source/cmInstallTargetGenerator.cxx            |    8 +-
 Source/cmLinkItem.h                            |    7 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    4 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |    6 +-
 Source/cmMakefileTargetGenerator.cxx           |    7 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    9 +-
 Source/cmNinjaTargetGenerator.cxx              |    4 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |    4 +-
 Source/cmTarget.cxx                            |   35 +++++++
 Source/cmTarget.h                              |   17 +++-
 22 files changed, 172 insertions(+), 181 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 06:38:36 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 06:38:36 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-334-gb4dd013
Message-ID: <20151010103840.1C255BFF81@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b4dd013d791d3b09e2bc64b84fe29b94cec86b19 (commit)
       via  a7e6f378567eb91079039cfdedcc4395bb03a5bc (commit)
      from  5206c7ef959e078473c01cc0ad8adb210f1bef66 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4dd013d791d3b09e2bc64b84fe29b94cec86b19
commit b4dd013d791d3b09e2bc64b84fe29b94cec86b19
Merge: 5206c7e a7e6f37
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 06:38:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 06:38:36 2015 -0400

    Merge topic 'use-generator-target' into next
    
    a7e6f378 cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7e6f378567eb91079039cfdedcc4395bb03a5bc
commit a7e6f378567eb91079039cfdedcc4395bb03a5bc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:05:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:38:23 2015 +0200

    cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c9fdb93..a5e35a1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4490,7 +4490,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head->Target];
+  cmOptionalLinkInterface& iface = hm[head];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -4642,7 +4642,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head->Target];
+  cmOptionalLinkInterface& iface = hm[head];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -5079,7 +5079,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[headTarget->Target];
+  cmOptionalLinkInterface& iface = hm[headTarget];
   if(!iface.AllDone)
     {
     iface.AllDone = true;
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index 10dd465..33780a7 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -15,6 +15,7 @@
 
 #include "cmListFileCache.h"
 
+class cmGeneratorTarget;
 class cmTarget;
 
 // Basic information about each link item.
@@ -97,7 +98,7 @@ struct cmOptionalLinkInterface: public cmLinkInterface
 };
 
 struct cmHeadToLinkInterfaceMap:
-    public std::map<cmTarget const*, cmOptionalLinkInterface>
+    public std::map<cmGeneratorTarget const*, cmOptionalLinkInterface>
 {
 };
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 06:57:26 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 06:57:26 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-347-gde7a02a
Message-ID: <20151010105737.20DD1BFFB3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  de7a02a918f46ae89148ccbb835d4c44e7b74048 (commit)
       via  8970d08a69f136ef3585fa02f7887dcc8dcab6f3 (commit)
       via  aa5c39d40fc00d24db90636e081f68e0597db0a3 (commit)
       via  d4aa358320ebf61a65f7c4db93d4ecba0734796b (commit)
       via  018f8f652b2fd87cadecbb7ccfba20432ea16abf (commit)
       via  835b14262fee6c29a352418bd540b58b48a1b77d (commit)
       via  27c1377178717a4d93ea679736f5c29bc8e0212e (commit)
       via  fc713cf71ba635acfbe4b48f96992524ece72743 (commit)
       via  29312d0a1b45f3bc77c9da38198c6b8e422d638a (commit)
       via  4119a278e5e5dc0309810dcf7112d84f3057ab67 (commit)
       via  c4981b3c34aa77e985535fb63f2efcc062971556 (commit)
       via  f6a7eda3c32192f72a601dbd8b8b3303ad617e6f (commit)
       via  3db365dad3a9046ef33984ba5bba9e67879e9dc6 (commit)
      from  b4dd013d791d3b09e2bc64b84fe29b94cec86b19 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de7a02a918f46ae89148ccbb835d4c44e7b74048
commit de7a02a918f46ae89148ccbb835d4c44e7b74048
Merge: b4dd013 8970d08
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 06:57:21 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 06:57:21 2015 -0400

    Merge topic 'use-generator-target' into next
    
    8970d08a Genex: Port implementation detail to cmGeneratorTarget.
    aa5c39d4 cmGeneratorTarget: Move GetSupportDirectory from cmTarget.
    d4aa3583 cmGeneratorTarget: Move HasImportLibrary from cmTarget.
    018f8f65 cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.
    835b1426 Sublime: Port some API to cmGeneratorTarget.
    27c13771 cmGeneratorTarget: Port processILibs to cmGeneratorTarget.
    fc713cf7 cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.
    29312d0a cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.
    4119a278 cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.
    c4981b3c cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.
    f6a7eda3 cmLinkItem: Port to cmGeneratorTarget.
    3db365da cmGeneratorTarget: Move FindTargetToLink from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8970d08a69f136ef3585fa02f7887dcc8dcab6f3
commit 8970d08a69f136ef3585fa02f7887dcc8dcab6f3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:12:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:17 2015 +0200

    Genex: Port implementation detail to cmGeneratorTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2d9025e..88d10aa 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -831,8 +831,8 @@ template <typename T>
 std::string
 getLinkedTargetsContent(
   std::vector<T> const &libraries,
-  cmTarget const* target,
-  cmTarget const* headTarget,
+  cmGeneratorTarget const* target,
+  cmGeneratorTarget const* headTarget,
   cmGeneratorExpressionContext *context,
   cmGeneratorExpressionDAGChecker *dagChecker,
   const std::string &interfacePropertyName)
@@ -846,7 +846,7 @@ getLinkedTargetsContent(
     // Broken code can have a target in its own link interface.
     // Don't follow such link interface entries so as not to create a
     // self-referencing loop.
-    if (it->Target && it->Target->Target != target)
+    if (it->Target && it->Target != target)
       {
       depString +=
         sep + "$<TARGET_PROPERTY:" +
@@ -858,8 +858,10 @@ getLinkedTargetsContent(
     {
     linkedTargetsContent =
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
-                                        target->GetMakefile(), context,
-                                        headTarget, target, dagChecker);
+                                        target->Target->GetMakefile(),
+                                        context,
+                                        headTarget->Target,
+                                        target->Target, dagChecker);
     }
   linkedTargetsContent =
     cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1116,8 +1118,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(iface->Libraries, target,
-                                  headTarget,
+          getLinkedTargetsContent(iface->Libraries, gtgt,
+                                  gHeadTarget,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1128,8 +1130,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkImplementationLibraries(context->Config))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(impl->Libraries, target,
-                                  target,
+          getLinkedTargetsContent(impl->Libraries, gtgt,
+                                  gtgt,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa5c39d40fc00d24db90636e081f68e0597db0a3
commit aa5c39d40fc00d24db90636e081f68e0597db0a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 00:29:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:17 2015 +0200

    cmGeneratorTarget: Move GetSupportDirectory from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 0f7fc68..f33a9e1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5512,3 +5512,18 @@ bool cmGeneratorTarget::HasImportLibrary() const
           (this->GetType() == cmTarget::SHARED_LIBRARY ||
            this->Target->IsExecutableWithExports()));
 }
+
+//----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetSupportDirectory() const
+{
+  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+  dir += cmake::GetCMakeFilesDirectory();
+  dir += "/";
+  dir += this->GetName();
+#if defined(__VMS)
+  dir += "_dir";
+#else
+  dir += ".dir";
+#endif
+  return dir;
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index c6e56bf..258c556 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -401,6 +401,9 @@ public:
   /** Return whether or not the target has a DLL import library.  */
   bool HasImportLibrary() const;
 
+  /** Get a build-tree directory in which to place target support files.  */
+  std::string GetSupportDirectory() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index eb4dfee..8f69acd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2895,13 +2895,14 @@ void cmGlobalGenerator::WriteSummary()
       {
       continue;
       }
-    this->WriteSummary(ti->second);
-    fout << ti->second->GetSupportDirectory() << "\n";
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
+    this->WriteSummary(gt);
+    fout << gt->GetSupportDirectory() << "\n";
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::WriteSummary(cmTarget* target)
+void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
 {
   // Place the labels file in a per-target support directory.
   std::string dir = target->GetSupportDirectory();
@@ -2944,17 +2945,15 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
     fout << "# Source files and their labels\n";
     std::vector<cmSourceFile*> sources;
     std::vector<std::string> configs;
-    target->GetMakefile()->GetConfigurations(configs);
+    target->Target->GetMakefile()->GetConfigurations(configs);
     if (configs.empty())
       {
       configs.push_back("");
       }
-    cmGeneratorTarget* gt =
-        this->GetGeneratorTarget(target);
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
-      gt->GetSourceFiles(sources, *ci);
+      target->GetSourceFiles(sources, *ci);
       }
     std::vector<cmSourceFile*>::const_iterator sourcesEnd
         = cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index b22c695..55e3766 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -458,7 +458,7 @@ private:
   void WriteRuleHashes(std::string const& pfile);
 
   void WriteSummary();
-  void WriteSummary(cmTarget* target);
+  void WriteSummary(cmGeneratorTarget* target);
   void FinalizeTargetCompileInfo();
 
   virtual void ForceLinkerLanguages();
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index de84f89..2d2de5f 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -361,7 +361,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2b019be..8b60a23 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -572,7 +572,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
-        this->Target->GetSupportDirectory();
+        this->GeneratorTarget->GetSupportDirectory();
       name_of_def_file += std::string("/") +
         this->Target->GetName();
       name_of_def_file += ".def";
@@ -643,7 +643,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 185c234..0ce13c3 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -557,7 +557,8 @@ cmMakefileTargetGenerator
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
     if(targetFullPathCompilePDB.empty())
       {
-      targetFullPathCompilePDB = this->Target->GetSupportDirectory() + "/";
+      targetFullPathCompilePDB =
+          this->GeneratorTarget->GetSupportDirectory() + "/";
       }
     }
 
@@ -594,7 +595,7 @@ cmMakefileTargetGenerator
                   cmLocalGenerator::NONE,
                   cmLocalGenerator::SHELL);
   vars.Object = shellObj.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 00c00a5..0dc53f3 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -492,9 +492,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
-      std::string dllname = targetOutput;
       std::string name_of_def_file
-        = target.GetSupportDirectory();
+        = gt.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
@@ -582,7 +581,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     vars["TARGET_PDB"] = base + suffix + dbg_suffix;
     }
 
-  const std::string objPath = GetTarget()->GetSupportDirectory();
+  const std::string objPath = GetGeneratorTarget()->GetSupportDirectory();
   vars["OBJECT_DIR"] =
     this->GetLocalGenerator()->ConvertToOutputFormat(
       this->ConvertToNinjaPath(objPath), cmLocalGenerator::SHELL);
@@ -634,7 +633,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
-        = target.GetSupportDirectory();
+        = gt.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index c2daa63..db7cd7d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -299,7 +299,7 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
       if(compilePdbPath.empty())
         {
-        compilePdbPath = this->Target->GetSupportDirectory() + "/";
+        compilePdbPath = this->GeneratorTarget->GetSupportDirectory() + "/";
         }
       }
 
@@ -568,7 +568,7 @@ cmNinjaTargetGenerator
   std::string const language = source->GetLanguage();
   std::string const sourceFileName =
     language=="RC" ? source->GetFullPath() : this->GetSourceFilePath(source);
-  std::string const objectDir = this->Target->GetSupportDirectory();
+  std::string const objectDir = this->GeneratorTarget->GetSupportDirectory();
   std::string const objectFileName = this->GetObjectFilePath(source);
   std::string const objectFileDir =
     cmSystemTools::GetFilenamePath(objectFileName);
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 378f132..6e3f65f 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -64,7 +64,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
         std::string basename = cmsys::SystemTools::
                                       GetFilenameWithoutLastExtension(absFile);
 
-        std::string rcc_output_dir = target->Target->GetSupportDirectory();
+        std::string rcc_output_dir = target->GetSupportDirectory();
         cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -833,7 +833,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           std::string basename = cmsys::SystemTools::
                                   GetFilenameWithoutLastExtension(absFile);
 
-          std::string rcc_output_dir = target->Target->GetSupportDirectory();
+          std::string rcc_output_dir = target->GetSupportDirectory();
           cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
           std::string rcc_output_file = rcc_output_dir;
           rcc_output_file += "/qrc_" + basename + ".cpp";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b16bc30..b8beb5c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -382,21 +382,6 @@ cmListFileBacktrace const& cmTarget::GetBacktrace() const
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetSupportDirectory() const
-{
-  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
-  dir += cmake::GetCMakeFilesDirectory();
-  dir += "/";
-  dir += this->Name;
-#if defined(__VMS)
-  dir += "_dir";
-#else
-  dir += ".dir";
-#endif
-  return dir;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::IsExecutableWithExports() const
 {
   return (this->GetType() == cmTarget::EXECUTABLE &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 291ef87..01261ed 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -282,9 +282,6 @@ public:
   /** Get a backtrace from the creation of the target.  */
   cmListFileBacktrace const& GetBacktrace() const;
 
-  /** Get a build-tree directory in which to place target support files.  */
-  std::string GetSupportDirectory() const;
-
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4aa358320ebf61a65f7c4db93d4ecba0734796b
commit d4aa358320ebf61a65f7c4db93d4ecba0734796b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:45:55 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:17 2015 +0200

    cmGeneratorTarget: Move HasImportLibrary from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7e47261..2d9025e 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1658,7 +1658,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
       return std::string();
       }
     return target->GetFullPath(context->Config,
-                               target->Target->HasImportLibrary());
+                               target->HasImportLibrary());
   }
 };
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5bf0d0b..0f7fc68 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5487,7 +5487,7 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasImplibGNUtoMS() const
 {
-  return this->Target->HasImportLibrary()
+  return this->HasImportLibrary()
       && this->GetPropertyAsBool("GNUtoMS");
 }
 
@@ -5504,3 +5504,11 @@ bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
     }
   return false;
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasImportLibrary() const
+{
+  return (this->Target->IsDLLPlatform() &&
+          (this->GetType() == cmTarget::SHARED_LIBRARY ||
+           this->Target->IsExecutableWithExports()));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e2be249..c6e56bf 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -398,6 +398,9 @@ public:
   bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
                         const char* newExt = 0) const;
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index f8743d9..00c00a5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -559,7 +559,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                               cmLocalGenerator::SHELL);
     vars["TARGET_IMPLIB"] = impLibPath;
     EnsureParentDirectoryExists(impLibPath);
-    if(target.HasImportLibrary())
+    if(genTarget.HasImportLibrary())
       {
       byproducts.push_back(targetOutputImplib);
       }
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 500b598..291ef87 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -262,9 +262,6 @@ public:
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 
-  /** Return whether or not the target has a DLL import library.  */
-  bool HasImportLibrary() const;
-
   /** Return whether this target is a shared library Framework on
       Apple.  */
   bool IsFrameworkOnApple() const;
@@ -463,6 +460,9 @@ private:
 
   void MaybeInvalidatePropertyCache(const std::string& prop);
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   // Internal representation details.
   friend class cmTargetInternals;
   friend class cmGeneratorTarget;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=018f8f652b2fd87cadecbb7ccfba20432ea16abf
commit 018f8f652b2fd87cadecbb7ccfba20432ea16abf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:50:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:17 2015 +0200

    cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index fed0dbc..400fa17 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -217,7 +217,7 @@ cmExportBuildFileGenerator
     std::string prop = "IMPORTED_IMPLIB";
     prop += suffix;
     std::string value = target->GetFullPath(config, true);
-    target->Target->GetImplibGNUtoMS(value, value,
+    target->GetImplibGNUtoMS(value, value,
                              "${CMAKE_IMPORT_LIBRARY_SUFFIX}");
     properties[prop] = value;
     }
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index d879c15..5bf0d0b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5483,3 +5483,24 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
     }
   return "";
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasImplibGNUtoMS() const
+{
+  return this->Target->HasImportLibrary()
+      && this->GetPropertyAsBool("GNUtoMS");
+}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
+                                std::string& out, const char* newExt) const
+{
+  if(this->HasImplibGNUtoMS() &&
+     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
+    {
+    out = gnuName.substr(0, gnuName.size()-6);
+    out += newExt? newExt : ".lib";
+    return true;
+    }
+  return false;
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index b3519de..e2be249 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -390,6 +390,14 @@ public:
   ///! Return the preferred linker language for this target
   std::string GetLinkerLanguage(const std::string& config = "") const;
 
+  /** Does this target have a GNU implib to convert to MS format?  */
+  bool HasImplibGNUtoMS() const;
+
+  /** Convert the given GNU import library name (.dll.a) to a name with a new
+      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
+  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
+                        const char* newExt = 0) const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 8c50b36..7a0c06b 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -135,7 +135,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -199,7 +199,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -387,7 +387,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -416,7 +416,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index f6b907e..de84f89 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -259,7 +259,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                                           cmLocalGenerator::START_OUTPUT,
                                           cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       exeCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 3b3f63e..2b019be 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -410,7 +410,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         cmLocalGenerator::START_OUTPUT,
         cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       libCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 6eafeae..185c234 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1516,7 +1516,7 @@ std::string cmMakefileTargetGenerator::GetLinkRule(
                                               const std::string& linkRuleVar)
 {
   std::string linkRule = this->Makefile->GetRequiredDefinition(linkRuleVar);
-  if(this->Target->HasImplibGNUtoMS())
+  if(this->GeneratorTarget->HasImplibGNUtoMS())
     {
     std::string ruleVar = "CMAKE_";
     ruleVar += this->GeneratorTarget->GetLinkerLanguage(this->ConfigName);
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index bebdd77..b16bc30 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2199,26 +2199,6 @@ void cmTarget::ComputeVersionedName(std::string& vName,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HasImplibGNUtoMS() const
-{
-  return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS");
-}
-
-//----------------------------------------------------------------------------
-bool cmTarget::GetImplibGNUtoMS(std::string const& gnuName,
-                                std::string& out, const char* newExt) const
-{
-  if(this->HasImplibGNUtoMS() &&
-     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
-    {
-    out = gnuName.substr(0, gnuName.size()-6);
-    out += newExt? newExt : ".lib";
-    return true;
-    }
-  return false;
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::SetPropertyDefault(const std::string& property,
                                   const char* default_value)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3bb1ccd..500b598 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -240,14 +240,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Does this target have a GNU implib to convert to MS format?  */
-  bool HasImplibGNUtoMS() const;
-
-  /** Convert the given GNU import library name (.dll.a) to a name with a new
-      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
-  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
-                        const char* newExt = 0) const;
-
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=835b14262fee6c29a352418bd540b58b48a1b77d
commit 835b14262fee6c29a352418bd540b58b48a1b77d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:04:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:16 2015 +0200

    Sublime: Port some API to cmGeneratorTarget.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 11410a7..21c71b0 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -255,9 +255,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, target, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, gtgt);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, target, gtgt);
+            this->ComputeDefines(*iter, lg, gtgt);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
@@ -365,7 +365,6 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
 std::string
 cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
                                                    cmLocalGenerator* lg,
-                                                   cmTarget *target,
                                                    cmGeneratorTarget* gtgt)
 {
   std::string flags;
@@ -390,7 +389,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   //   }
 
   // Add shared-library flags if needed.
-  lg->AddCMP0018Flags(flags, target, language, config);
+  lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
 
   // Add include directory flags.
   {
@@ -405,7 +404,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, target, language, config);
+  lg->AddCompileOptions(flags, gtgt->Target, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -419,8 +418,8 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
 // void cmMakefileTargetGenerator::WriteTargetLanguageFlags().
 std::string
 cmExtraSublimeTextGenerator::
-ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
-               cmGeneratorTarget*)
+ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
+               cmGeneratorTarget* target)
 
 {
   std::set<std::string> defines;
@@ -429,13 +428,13 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
   const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->GetExportMacro())
+  if(const char* exportMacro = target->Target->GetExportMacro())
     {
     lg->AppendDefines(defines, exportMacro);
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AddCompileDefinitions(defines, target, config, language);
+  lg->AddCompileDefinitions(defines, target->Target, config, language);
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 4173b7d..5dd1140 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -79,11 +79,10 @@ private:
    */
   std::string ComputeFlagsForObject(cmSourceFile *source,
                                     cmLocalGenerator* lg,
-                                    cmTarget *target,
                                     cmGeneratorTarget* gtgt);
 
   std::string ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
-                             cmTarget *target, cmGeneratorTarget* gtgt);
+                             cmGeneratorTarget* gtgt);
 };
 
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27c1377178717a4d93ea679736f5c29bc8e0212e
commit 27c1377178717a4d93ea679736f5c29bc8e0212e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:47:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:16 2015 +0200

    cmGeneratorTarget: Port processILibs to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c3dfed9..d879c15 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2068,9 +2068,9 @@ void processILibs(const std::string& config,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
                   std::vector<cmGeneratorTarget const*>& tgts,
-                  std::set<cmTarget const*>& emitted)
+                  std::set<cmGeneratorTarget const*>& emitted)
 {
-  if (item.Target && emitted.insert(item.Target->Target).second)
+  if (item.Target && emitted.insert(item.Target).second)
     {
     tgts.push_back(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
@@ -2096,7 +2096,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
   if(!tgts.Done)
     {
     tgts.Done = true;
-    std::set<cmTarget const*> emitted;
+    std::set<cmGeneratorTarget const*> emitted;
 
     cmLinkImplementationLibraries const* impl
       = this->GetLinkImplementationLibraries(config);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc713cf71ba635acfbe4b48f96992524ece72743
commit fc713cf71ba635acfbe4b48f96992524ece72743
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:47:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:16 2015 +0200

    cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 38364be..c3dfed9 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3980,18 +3980,20 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
 
 //----------------------------------------------------------------------------
 template<typename PropertyType>
-PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
+PropertyType getTypedProperty(cmGeneratorTarget const* tgt,
+                              const std::string& prop);
 
 //----------------------------------------------------------------------------
 template<>
-bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
+bool getTypedProperty<bool>(cmGeneratorTarget const* tgt,
+                            const std::string& prop)
 {
   return tgt->GetPropertyAsBool(prop);
 }
 
 //----------------------------------------------------------------------------
 template<>
-const char *getTypedProperty<const char *>(cmTarget const* tgt,
+const char *getTypedProperty<const char *>(cmGeneratorTarget const* tgt,
                                            const std::string& prop)
 {
   return tgt->GetProperty(prop);
@@ -4121,7 +4123,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                           CompatibleType t,
                                           PropertyType *)
 {
-  PropertyType propContent = getTypedProperty<PropertyType>(tgt->Target, p);
+  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
   const bool explicitlySet = tgt->Target->GetProperties()
                                   .find(p)
                                   != tgt->Target->GetProperties().end();
@@ -4173,7 +4175,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                             .find(interfaceProperty)
                             != theTarget->Target->GetProperties().end();
     PropertyType ifacePropContent =
-                    getTypedProperty<PropertyType>(theTarget->Target,
+                    getTypedProperty<PropertyType>(theTarget,
                               interfaceProperty);
 
     std::string reportEntry;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29312d0a1b45f3bc77c9da38198c6b8e422d638a
commit 29312d0a1b45f3bc77c9da38198c6b8e422d638a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 11:40:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:16 2015 +0200

    cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index caa76fd..38364be 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -510,7 +510,8 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
   return 0;
 }
 
-static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
+static void handleSystemIncludesDep(cmMakefile *mf,
+                                  cmGeneratorTarget const* depTgt,
                                   const std::string& config,
                                   cmGeneratorTarget const* headTarget,
                                   cmGeneratorExpressionDAGChecker *dagChecker,
@@ -524,7 +525,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt, dagChecker), result);
+                                      depTgt->Target, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
     {
@@ -538,7 +539,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt, dagChecker), result);
+                                      depTgt->Target, dagChecker), result);
     }
 }
 
@@ -888,7 +889,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, (*li)->Target, config, this,
+      handleSystemIncludesDep(this->Makefile, *li, config, this,
                               &dagChecker, result, excludeImported);
       }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4119a278e5e5dc0309810dcf7112d84f3057ab67
commit 4119a278e5e5dc0309810dcf7112d84f3057ab67
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:45:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:16 2015 +0200

    cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2f29fa6..caa76fd 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -883,12 +883,12 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
                                           &dagChecker), result);
       }
 
-    std::vector<cmTarget const*> const& deps =
+    std::vector<cmGeneratorTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmTarget const*>::const_iterator
+    for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, *li, config, this,
+      handleSystemIncludesDep(this->Makefile, (*li)->Target, config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -2066,12 +2066,12 @@ void processILibs(const std::string& config,
                   cmGeneratorTarget const* headTarget,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
-                  std::vector<cmTarget const*>& tgts,
+                  std::vector<cmGeneratorTarget const*>& tgts,
                   std::set<cmTarget const*>& emitted)
 {
   if (item.Target && emitted.insert(item.Target->Target).second)
     {
-    tgts.push_back(item.Target->Target);
+    tgts.push_back(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
        item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
       {
@@ -2086,7 +2086,7 @@ void processILibs(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
-const std::vector<const cmTarget*>&
+const std::vector<const cmGeneratorTarget*>&
 cmGeneratorTarget::GetLinkImplementationClosure(
     const std::string& config) const
 {
@@ -3630,10 +3630,10 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
     compat.Done = true;
     compat.PropsBool.insert("POSITION_INDEPENDENT_CODE");
     compat.PropsString.insert("AUTOUIC_OPTIONS");
-    std::vector<cmTarget const*> const& deps =
+    std::vector<cmGeneratorTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmTarget const*>::const_iterator li = deps.begin();
-        li != deps.end(); ++li)
+    for(std::vector<cmGeneratorTarget const*>::const_iterator li =
+        deps.begin(); li != deps.end(); ++li)
       {
 #define CM_READ_COMPATIBLE_INTERFACE(X, x) \
       if(const char* prop = (*li)->GetProperty("COMPATIBLE_INTERFACE_" #X)) \
@@ -4129,7 +4129,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
   assert((impliedByUse ^ explicitlySet)
       || (!impliedByUse && !explicitlySet));
 
-  std::vector<cmTarget const*> const& deps =
+  std::vector<cmGeneratorTarget const*> const& deps =
     tgt->GetLinkImplementationClosure(config);
 
   if(deps.empty())
@@ -4156,7 +4156,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     }
 
   std::string interfaceProperty = "INTERFACE_" + p;
-  for(std::vector<cmTarget const*>::const_iterator li =
+  for(std::vector<cmGeneratorTarget const*>::const_iterator li =
       deps.begin();
       li != deps.end(); ++li)
     {
@@ -4166,13 +4166,13 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     // target itself has a POSITION_INDEPENDENT_CODE which disagrees
     // with a dependency.
 
-    cmTarget const* theTarget = *li;
+    cmGeneratorTarget const* theTarget = *li;
 
-    const bool ifaceIsSet = theTarget->GetProperties()
+    const bool ifaceIsSet = theTarget->Target->GetProperties()
                             .find(interfaceProperty)
-                            != theTarget->GetProperties().end();
+                            != theTarget->Target->GetProperties().end();
     PropertyType ifacePropContent =
-                    getTypedProperty<PropertyType>(theTarget,
+                    getTypedProperty<PropertyType>(theTarget->Target,
                               interfaceProperty);
 
     std::string reportEntry;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index cd994c0..b3519de 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -477,7 +477,7 @@ private:
   cmGeneratorTarget(cmGeneratorTarget const&);
   void operator=(cmGeneratorTarget const&);
 
-  struct LinkImplClosure: public std::vector<cmTarget const*>
+  struct LinkImplClosure: public std::vector<cmGeneratorTarget const*>
   {
     LinkImplClosure(): Done(false) {}
     bool Done;
@@ -555,8 +555,8 @@ private:
                            std::string& out) const;
 
 public:
-  std::vector<cmTarget const*> const&
-    GetLinkImplementationClosure(const std::string& config) const;
+  const std::vector<const cmGeneratorTarget*>&
+  GetLinkImplementationClosure(const std::string& config) const;
 
   mutable std::map<std::string, std::string> MaxLanguageStandards;
   std::map<std::string, std::string> const&

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4981b3c34aa77e985535fb63f2efcc062971556
commit c4981b3c34aa77e985535fb63f2efcc062971556
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:37:30 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:16 2015 +0200

    cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index b9ed345..f901414 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -383,7 +383,7 @@ std::vector<std::string>
 cmCommonTargetGenerator::GetLinkedTargetDirectories() const
 {
   std::vector<std::string> dirs;
-  std::set<cmTarget const*> emitted;
+  std::set<cmGeneratorTarget const*> emitted;
   if (cmComputeLinkInformation* cli =
       this->GeneratorTarget->GetLinkInformation(this->ConfigName))
     {
@@ -397,7 +397,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
                 // Target->GetLinkInformation already processed their
                 // link interface and they don't have any output themselves.
                 && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
-                && emitted.insert(linkee->Target).second)
+                && emitted.insert(linkee).second)
         {
         cmLocalGenerator* lg = linkee->GetLocalGenerator();
         cmMakefile* mf = linkee->Target->GetMakefile();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6a7eda3c32192f72a601dbd8b8b3303ad617e6f
commit f6a7eda3c32192f72a601dbd8b8b3303ad617e6f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:18:42 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:54:14 2015 +0200

    cmLinkItem: Port to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 5604c53..22843f1 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -320,8 +320,7 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item)
   int index = lei->second;
   LinkEntry& entry = this->EntryList[index];
   entry.Item = item;
-  entry.Target =
-      item.Target ? this->GlobalGenerator->GetGeneratorTarget(item.Target) : 0;
+  entry.Target = item.Target;
   entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
                   item.substr(0, 10) != "-framework");
 
@@ -443,9 +442,7 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
     // Initialize the item entry.
     LinkEntry& entry = this->EntryList[lei->second];
     entry.Item = dep.Item;
-    entry.Target =
-        dep.Item.Target ?
-          this->GlobalGenerator->GetGeneratorTarget(dep.Item.Target) : 0;
+    entry.Target = dep.Item.Target;
 
     // This item was added specifically because it is a dependent
     // shared library.  It may get special treatment
@@ -983,7 +980,6 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
   // directories.
   if(item.Target && !item.Target->IsImported())
     {
-    this->OldWrongConfigItems.insert(
-            this->GlobalGenerator->GetGeneratorTarget(item.Target));
+    this->OldWrongConfigItems.insert(item.Target);
     }
 }
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index e53b7b9..8f3def2 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -319,22 +319,20 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
                                              std::set<std::string> &emitted)
 {
   cmGeneratorTarget const* depender = this->Targets[depender_index];
-  cmTarget const* dependee = dependee_name.Target;
+  cmGeneratorTarget const* dependee = dependee_name.Target;
   // Skip targets that will not really be linked.  This is probably a
   // name conflict between an external library and an executable
   // within the project.
   if(dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->IsExecutableWithExports())
+     !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(dependee);
-    this->AddInterfaceDepends(depender_index, gt, "", emitted);
+    this->AddInterfaceDepends(depender_index, dependee, "", emitted);
     std::vector<std::string> configs;
     depender->Makefile->GetConfigurations(configs);
     for (std::vector<std::string>::const_iterator it = configs.begin();
@@ -342,7 +340,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
       {
       // A target should not depend on itself.
       emitted.insert(depender->GetName());
-      this->AddInterfaceDepends(depender_index, gt, *it, emitted);
+      this->AddInterfaceDepends(depender_index, dependee, *it, emitted);
       }
     }
 }
@@ -356,7 +354,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   cmGeneratorTarget const* depender = this->Targets[depender_index];
 
   // Check the target's makefile first.
-  cmTarget const* dependee = dependee_name.Target;
+  cmGeneratorTarget const* dependee = dependee_name.Target;
 
   if(!dependee && !linking &&
     (depender->GetType() != cmTarget::GLOBAL_TARGET))
@@ -403,16 +401,14 @@ void cmComputeTargetDepends::AddTargetDepend(
   // within the project.
   if(linking && dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->IsExecutableWithExports())
+     !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(dependee);
-    this->AddTargetDepend(depender_index, gt, linking);
+    this->AddTargetDepend(depender_index, dependee, linking);
     }
 }
 
@@ -430,11 +426,9 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     for(std::set<cmLinkItem>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
-      if(cmTarget const* transitive_dependee = i->Target)
+      if(cmGeneratorTarget const* transitive_dependee = i->Target)
         {
-        cmGeneratorTarget* gt =
-            this->GlobalGenerator->GetGeneratorTarget(transitive_dependee);
-        this->AddTargetDepend(depender_index, gt, false);
+        this->AddTargetDepend(depender_index, transitive_dependee, false);
         }
       }
     }
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 78a5b6f..7e47261 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -846,7 +846,7 @@ getLinkedTargetsContent(
     // Broken code can have a target in its own link interface.
     // Don't follow such link interface entries so as not to create a
     // self-referencing loop.
-    if (it->Target && it->Target != target)
+    if (it->Target && it->Target->Target != target)
       {
       depString +=
         sep + "$<TARGET_PROPERTY:" +
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 37d7f16..2f29fa6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -773,8 +773,10 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
     for(std::set<std::string>::const_iterator i = utilities.begin();
         i != utilities.end(); ++i)
       {
-      this->UtilityItems.insert(
-        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
+      cmTarget* tgt = this->Makefile->FindTargetToUse(*i);
+      cmGeneratorTarget* gt = tgt ? this->GlobalGenerator
+          ->GetGeneratorTarget(tgt) : 0;
+      this->UtilityItems.insert(cmLinkItem(*i, gt));
       }
     }
   return this->UtilityItems;
@@ -1728,15 +1730,12 @@ public:
         }
       return;
       }
-    if(!this->Visited.insert(item.Target).second)
+    if(!this->Visited.insert(item.Target->Target).second)
       {
       return;
       }
-    cmGeneratorTarget* gtgt =
-        this->Target->GetLocalGenerator()->GetGlobalGenerator()
-            ->GetGeneratorTarget(item.Target);
     cmLinkInterface const* iface =
-      gtgt->GetLinkInterface(this->Config, this->HeadTarget);
+      item.Target->GetLinkInterface(this->Config, this->HeadTarget);
     if(!iface) { return; }
 
     for(std::vector<std::string>::const_iterator
@@ -2070,12 +2069,11 @@ void processILibs(const std::string& config,
                   std::vector<cmTarget const*>& tgts,
                   std::set<cmTarget const*>& emitted)
 {
-  if (item.Target && emitted.insert(item.Target).second)
+  if (item.Target && emitted.insert(item.Target->Target).second)
     {
-    tgts.push_back(item.Target);
-    cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
+    tgts.push_back(item.Target->Target);
     if(cmLinkInterfaceLibraries const* iface =
-       gt->GetLinkInterfaceLibraries(config, headTarget, true))
+       item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
       {
       for(std::vector<cmLinkItem>::const_iterator
             it = iface->Libraries.begin();
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index 33780a7..b875cc0 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -16,7 +16,6 @@
 #include "cmListFileCache.h"
 
 class cmGeneratorTarget;
-class cmTarget;
 
 // Basic information about each link item.
 class cmLinkItem: public std::string
@@ -25,9 +24,9 @@ class cmLinkItem: public std::string
 public:
   cmLinkItem(): std_string(), Target(0) {}
   cmLinkItem(const std_string& n,
-             cmTarget const* t): std_string(n), Target(t) {}
+             cmGeneratorTarget const* t): std_string(n), Target(t) {}
   cmLinkItem(cmLinkItem const& r): std_string(r), Target(r.Target) {}
-  cmTarget const* Target;
+  cmGeneratorTarget const* Target;
 };
 
 class cmLinkImplItem: public cmLinkItem
@@ -35,7 +34,7 @@ class cmLinkImplItem: public cmLinkItem
 public:
   cmLinkImplItem(): cmLinkItem(), Backtrace(), FromGenex(false) {}
   cmLinkImplItem(std::string const& n,
-                 cmTarget const* t,
+                 cmGeneratorTarget const* t,
                  cmListFileBacktrace const& bt,
                  bool fromGenex):
     cmLinkItem(n, t), Backtrace(bt), FromGenex(fromGenex) {}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3db365dad3a9046ef33984ba5bba9e67879e9dc6
commit 3db365dad3a9046ef33984ba5bba9e67879e9dc6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 12:23:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 12:53:56 2015 +0200

    cmGeneratorTarget: Move FindTargetToLink from cmTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 4d7b01e..5604c53 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -634,8 +634,9 @@ cmComputeLinkDepends::AddLinkEntries(
 }
 
 //----------------------------------------------------------------------------
-cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
-                                                 const std::string& name)
+cmGeneratorTarget const*
+cmComputeLinkDepends::FindTargetToLink(int depender_index,
+                                       const std::string& name)
 {
   // Look for a target in the scope of the depender.
   cmGeneratorTarget const* from = this->Target;
@@ -647,7 +648,7 @@ cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
       from = depender;
       }
     }
-  return from->Target->FindTargetToLink(name);
+  return from->FindTargetToLink(name);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index dba3948..9d960c6 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -75,8 +75,8 @@ private:
   void AddDirectLinkEntries();
   template <typename T>
     void AddLinkEntries(int depender_index, std::vector<T> const& libs);
-  cmTarget const* FindTargetToLink(int depender_index,
-                                   const std::string& name);
+  cmGeneratorTarget const* FindTargetToLink(int depender_index,
+                                            const std::string& name);
 
   // One entry for each unique item.
   std::vector<LinkEntry> EntryList;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a5e35a1..37d7f16 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4427,7 +4427,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
       {
       continue;
       }
-    items.push_back(cmLinkItem(name, this->Target->FindTargetToLink(name)));
+    items.push_back(cmLinkItem(name, this->FindTargetToLink(name)));
     }
 }
 
@@ -5398,7 +5398,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
 
       // The entry is meant for this configuration.
       impl.Libraries.push_back(
-        cmLinkImplItem(name, this->Target->FindTargetToLink(name),
+        cmLinkImplItem(name, this->FindTargetToLink(name),
                        *btIt, evaluated != *le));
       }
 
@@ -5430,12 +5430,48 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         }
       // Support OLD behavior for CMP0003.
       impl.WrongConfigLibraries.push_back(
-        cmLinkItem(name, this->Target->FindTargetToLink(name)));
+        cmLinkItem(name, this->FindTargetToLink(name)));
       }
     }
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmGeneratorTarget::FindTargetToLink(std::string const& name) const
+{
+  cmTarget const* tgt = this->Makefile->FindTargetToUse(name);
+
+  // Skip targets that will not really be linked.  This is probably a
+  // name conflict between an external library and an executable
+  // within the project.
+  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
+     !tgt->IsExecutableWithExports())
+    {
+    tgt = 0;
+    }
+
+  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
+    {
+    std::ostringstream e;
+    e << "Target \"" << this->GetName() << "\" links to "
+      "OBJECT library \"" << tgt->GetName() << "\" but this is not "
+      "allowed.  "
+      "One may link only to STATIC or SHARED libraries, or to executables "
+      "with the ENABLE_EXPORTS property set.";
+    cmake* cm = this->Makefile->GetCMakeInstance();
+    cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                     this->Target->GetBacktrace());
+    tgt = 0;
+    }
+
+  if (!tgt)
+    {
+    return 0;
+    }
+  return this->GlobalGenerator->GetGeneratorTarget(tgt);
+}
+
+//----------------------------------------------------------------------------
 std::string
 cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 70612f2..cd994c0 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -216,6 +216,8 @@ public:
                                           cmOptionalLinkImplementation& impl,
                                           const cmGeneratorTarget* head) const;
 
+  cmGeneratorTarget* FindTargetToLink(std::string const& name) const;
+
   // Compute the set of languages compiled by the target.  This is
   // computed every time it is called because the languages can change
   // when source file properties are changed and we do not have enough
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 31a9aa7..bebdd77 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2670,37 +2670,6 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
 }
 
 //----------------------------------------------------------------------------
-cmTarget const* cmTarget::FindTargetToLink(std::string const& name) const
-{
-  cmTarget const* tgt = this->Makefile->FindTargetToUse(name);
-
-  // Skip targets that will not really be linked.  This is probably a
-  // name conflict between an external library and an executable
-  // within the project.
-  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
-     !tgt->IsExecutableWithExports())
-    {
-    tgt = 0;
-    }
-
-  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
-    {
-    std::ostringstream e;
-    e << "Target \"" << this->GetName() << "\" links to "
-      "OBJECT library \"" << tgt->GetName() << "\" but this is not "
-      "allowed.  "
-      "One may link only to STATIC or SHARED libraries, or to executables "
-      "with the ENABLE_EXPORTS property set.";
-    cmake* cm = this->Makefile->GetCMakeInstance();
-    cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->GetBacktrace());
-    tgt = 0;
-    }
-
-  // Return the target found, if any.
-  return tgt;
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::CheckCMP0004(std::string const& item) const
 {
   // Strip whitespace off the library names because we used to do this
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 0c1bbd2..3bb1ccd 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -223,8 +223,6 @@ public:
 
   void GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const;
 
-  cmTarget const* FindTargetToLink(std::string const& name) const;
-
   /** Strip off leading and trailing whitespace from an item named in
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |    4 +-
 Source/cmComputeLinkDepends.cxx                |   17 ++-
 Source/cmComputeLinkDepends.h                  |    4 +-
 Source/cmComputeTargetDepends.cxx              |   24 ++--
 Source/cmExportBuildFileGenerator.cxx          |    2 +-
 Source/cmExtraSublimeTextGenerator.cxx         |   17 ++-
 Source/cmExtraSublimeTextGenerator.h           |    3 +-
 Source/cmGeneratorExpressionNode.cxx           |   20 ++--
 Source/cmGeneratorTarget.cxx                   |  147 ++++++++++++++++++------
 Source/cmGeneratorTarget.h                     |   22 +++-
 Source/cmGlobalGenerator.cxx                   |   13 +--
 Source/cmGlobalGenerator.h                     |    2 +-
 Source/cmInstallTargetGenerator.cxx            |    8 +-
 Source/cmLinkItem.h                            |    7 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    4 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |    6 +-
 Source/cmMakefileTargetGenerator.cxx           |    7 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    9 +-
 Source/cmNinjaTargetGenerator.cxx              |    4 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |    4 +-
 Source/cmTarget.cxx                            |   66 -----------
 Source/cmTarget.h                              |   19 +--
 22 files changed, 208 insertions(+), 201 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 07:15:01 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 07:15:01 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-349-ga3bf276
Message-ID: <20151010111503.00561BF5DA@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a3bf276785818646050d9e396072cd129bff668c (commit)
       via  a05e0b90295216ae5fd94501c4dcec19a3bf5678 (commit)
      from  de7a02a918f46ae89148ccbb835d4c44e7b74048 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3bf276785818646050d9e396072cd129bff668c
commit a3bf276785818646050d9e396072cd129bff668c
Merge: de7a02a a05e0b9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 07:14:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 07:14:59 2015 -0400

    Merge topic 'use-generator-target' into next
    
    a05e0b90 cmCommonTargetGenerator: Use GeneratorTarget more.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a05e0b90295216ae5fd94501c4dcec19a3bf5678
commit a05e0b90295216ae5fd94501c4dcec19a3bf5678
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:13:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 13:13:11 2015 +0200

    cmCommonTargetGenerator: Use GeneratorTarget more.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index f901414..24d0e61 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -109,7 +109,7 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const
 {
   std::string mod_dir;
   const char* target_mod_dir =
-    this->Target->GetProperty("Fortran_MODULE_DIRECTORY");
+    this->GeneratorTarget->GetProperty("Fortran_MODULE_DIRECTORY");
   const char* moddir_flag =
     this->Makefile->GetDefinition("CMAKE_Fortran_MODDIR_FLAG");
   if(target_mod_dir && moddir_flag)
@@ -214,7 +214,7 @@ cmCommonTargetGenerator
     this->LocalGenerator->GetFortranFormat(srcfmt);
   if(format == cmLocalGenerator::FortranFormatNone)
     {
-    const char* tgtfmt = this->Target->GetProperty("Fortran_FORMAT");
+    const char* tgtfmt = this->GeneratorTarget->GetProperty("Fortran_FORMAT");
     format = this->LocalGenerator->GetFortranFormat(tgtfmt);
     }
   const char* var = 0;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 2d2de5f..76ef8cc 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -168,7 +168,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->Target->GetName().c_str(), "\".");
+                         this->GeneratorTarget->GetName().c_str(), "\".");
     return;
     }
 
@@ -197,7 +197,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                            this->ConfigName);
 
 
-  if(this->Target->GetPropertyAsBool("WIN32_EXECUTABLE"))
+  if(this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE"))
     {
     this->LocalGenerator->AppendFlags
       (linkFlags, this->Makefile->GetDefinition("CMAKE_CREATE_WIN32_EXE"));
@@ -226,11 +226,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   // Add target-specific linker flags.
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->Target->GetProperty("LINK_FLAGS"));
+    (linkFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->Target->GetProperty(linkFlagsConfig));
+    (linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
 
   this->AddModuleDefinitionFlag(linkFlags);
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 8b60a23..5e5eeab 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -26,7 +26,7 @@ cmMakefileLibraryTargetGenerator
   cmMakefileTargetGenerator(target)
 {
   this->CustomCommandDriver = OnDepends;
-  if (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
     this->GeneratorTarget->GetLibraryNames(
       this->TargetNameOut, this->TargetNameSO, this->TargetNameReal,
@@ -62,7 +62,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
 
   // write the link rules
   // Write the rule for this target type.
-  switch(this->Target->GetType())
+  switch(this->GeneratorTarget->GetType())
     {
     case cmTarget::STATIC_LIBRARY:
       this->WriteStaticLibraryRules();
@@ -122,11 +122,11 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->Target->GetName(),
+                                      this->GeneratorTarget->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->Target->GetName(), false);
+  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
 }
 
 //----------------------------------------------------------------------------
@@ -166,11 +166,11 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty("LINK_FLAGS"));
+    (extraFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
 
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName);
@@ -190,11 +190,11 @@ void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                                    this->Target->GetProperty("LINK_FLAGS"));
+                           this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MODULE_LINKER_FLAGS", this->ConfigName);
   this->AddModuleDefinitionFlag(extraFlags);
@@ -213,11 +213,11 @@ void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                                    this->Target->GetProperty("LINK_FLAGS"));
+                             this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MACOSX_FRAMEWORK_LINKER_FLAGS", this->ConfigName);
 
@@ -244,7 +244,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->Target->GetName().c_str(), "\".");
+                         this->GeneratorTarget->GetName().c_str(), "\".");
     return;
     }
 
@@ -253,8 +253,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   this->LocalGenerator->AppendFlags(linkFlags, extraFlags);
 
   // Add OSX version flags, if any.
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "COMPATIBILITY", true);
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "CURRENT", false);
@@ -351,7 +351,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     // Add the link message.
     std::string buildEcho = "Linking ";
     buildEcho += linkLanguage;
-    switch(this->Target->GetType())
+    switch(this->GeneratorTarget->GetType())
       {
       case cmTarget::STATIC_LIBRARY:
         buildEcho += " static library ";
@@ -375,7 +375,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     }
 
   const char* forbiddenFlagVar = 0;
-  switch(this->Target->GetType())
+  switch(this->GeneratorTarget->GetType())
     {
     case cmTarget::SHARED_LIBRARY:
       forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS";
@@ -441,7 +441,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> commands1;
   // Add a command to remove any existing files for this library.
   // for static libs only
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
                                              *this->Target, "target");
@@ -497,7 +497,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> archiveAppendCommands;
   std::vector<std::string> archiveFinishCommands;
   std::string::size_type archiveCommandLimit = std::string::npos;
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     haveStaticLibraryRule =
       this->Makefile->GetDefinition(linkRuleVar)? true:false;
@@ -552,7 +552,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Collect up flags to link in needed libraries.
   std::string linkLibs;
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
     {
     this->CreateLinkLibs(linkLibs, relink, useResponseFileForLibs, depends,
                          useWatcomQuote);
@@ -566,15 +566,15 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
                           useWatcomQuote);
 
   // maybe create .def file from list of objects
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
         this->GeneratorTarget->GetSupportDirectory();
       name_of_def_file += std::string("/") +
-        this->Target->GetName();
+        this->GeneratorTarget->GetName();
       name_of_def_file += ".def";
       std::string cmd = cmSystemTools::GetCMakeCommand();
       cmd = this->Convert(cmd, cmLocalGenerator::NONE,
@@ -667,7 +667,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Compute the directory portion of the install_name setting.
   std::string install_name_dir;
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir =
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0ce13c3..8534986 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -245,7 +245,8 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
     // Write an empty dependency file.
     cmGeneratedFileStream depFileStream(dependFileNameFull.c_str());
     depFileStream
-      << "# Empty dependencies file for " << this->Target->GetName() << ".\n"
+      << "# Empty dependencies file for "
+      << this->GeneratorTarget->GetName() << ".\n"
       << "# This may be replaced when dependencies are built." << std::endl;
     }
 
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 303ca63..18594bb 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -42,7 +42,8 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
   this->CreateRuleFile();
 
   *this->BuildFileStream
-    << "# Utility rule file for " << this->Target->GetName() << ".\n\n";
+    << "# Utility rule file for "
+    << this->GeneratorTarget->GetName() << ".\n\n";
 
   if(!this->NoRuleMessages)
     {
@@ -101,11 +102,11 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->Target->GetName(),
+                                      this->GeneratorTarget->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->Target->GetName(), false);
+  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
 
   // Write clean target
   this->WriteTargetCleanRules();
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index db7cd7d..fd9a158 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -93,7 +93,7 @@ std::string cmNinjaTargetGenerator::LanguageCompilerRule(
   const std::string& lang) const
 {
   return lang + "_COMPILER__" +
-    cmGlobalNinjaGenerator::EncodeRuleName(this->Target->GetName());
+    cmGlobalNinjaGenerator::EncodeRuleName(this->GeneratorTarget->GetName());
 }
 
 std::string
@@ -190,8 +190,8 @@ ComputeDefines(cmSourceFile const* source, const std::string& language)
 cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
 {
   // Static libraries never depend on other targets for linking.
-  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-      this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+      this->GeneratorTarget->GetType() == cmTarget::OBJECT_LIBRARY)
     return cmNinjaDeps();
 
   cmComputeLinkInformation* cli =
@@ -219,7 +219,8 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
     }
 
   // Add user-specified dependencies.
-  if (const char* linkDepends = this->Target->GetProperty("LINK_DEPENDS"))
+  if (const char* linkDepends =
+      this->GeneratorTarget->GetProperty("LINK_DEPENDS"))
     {
     std::vector<std::string> linkDeps;
     cmSystemTools::ExpandListArgument(linkDepends, linkDeps);
@@ -272,7 +273,7 @@ cmNinjaTargetGenerator
 
 std::string cmNinjaTargetGenerator::GetTargetName() const
 {
-  return this->Target->GetName();
+  return this->GeneratorTarget->GetName();
 }
 
 
@@ -284,10 +285,10 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
     {
     std::string pdbPath;
     std::string compilePdbPath;
-    if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-       this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-       this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+    if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+       this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
       {
       pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName());
       pdbPath += "/";
@@ -411,7 +412,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const iwyu_prop = lang + "_INCLUDE_WHAT_YOU_USE";
-    const char *iwyu = this->Target->GetProperty(iwyu_prop);
+    const char *iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     if (iwyu && *iwyu)
       {
       std::string run_iwyu =
@@ -428,7 +429,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
-    const char *clauncher = this->Target->GetProperty(clauncher_prop);
+    const char *clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
     if (clauncher && *clauncher)
       {
       std::vector<std::string> launcher_cmd;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |    4 +--
 Source/cmMakefileExecutableTargetGenerator.cxx |    8 ++---
 Source/cmMakefileLibraryTargetGenerator.cxx    |   44 ++++++++++++------------
 Source/cmMakefileTargetGenerator.cxx           |    3 +-
 Source/cmMakefileUtilityTargetGenerator.cxx    |    7 ++--
 Source/cmNinjaTargetGenerator.cxx              |   23 +++++++------
 6 files changed, 46 insertions(+), 43 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 07:26:21 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 07:26:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-353-gc5eda76
Message-ID: <20151010112651.2C14ABFF02@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c5eda76a39c98711216a68805a2c716b542419b3 (commit)
       via  3fa1996761c86079d71581caead4ec69ab808739 (commit)
       via  9af81007b00417fe814602c1f3ab008191038929 (commit)
       via  2cf7dc74f549d7cd08e502aa3c5912410be96b98 (commit)
      from  a3bf276785818646050d9e396072cd129bff668c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5eda76a39c98711216a68805a2c716b542419b3
commit c5eda76a39c98711216a68805a2c716b542419b3
Merge: a3bf276 3fa1996
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 07:26:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 07:26:17 2015 -0400

    Merge topic 'use-generator-target' into next
    
    3fa19967 cmTarget: Move ImportInfoMap out of internal class.
    9af81007 cmTarget: Move backtrace member out of internal class.
    2cf7dc74 cmTarget: Remove unneeded constructors.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fa1996761c86079d71581caead4ec69ab808739
commit 3fa1996761c86079d71581caead4ec69ab808739
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:15:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 13:21:54 2015 +0200

    cmTarget: Move ImportInfoMap out of internal class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 369e497..847a5c1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
-  ImportInfoMapType ImportInfoMap;
-
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -1538,7 +1535,7 @@ void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
   // Wipe out maps caching information affected by this property.
   if(this->IsImported() && cmHasLiteralPrefix(prop, "IMPORTED"))
     {
-    this->Internal->ImportInfoMap.clear();
+    this->ImportInfoMap.clear();
     }
 }
 
@@ -2288,16 +2285,15 @@ cmTarget::GetImportInfo(const std::string& config) const
     {
     config_upper = "NOCONFIG";
     }
-  typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
 
   ImportInfoMapType::const_iterator i =
-    this->Internal->ImportInfoMap.find(config_upper);
-  if(i == this->Internal->ImportInfoMap.end())
+    this->ImportInfoMap.find(config_upper);
+  if(i == this->ImportInfoMap.end())
     {
     ImportInfo info;
     this->ComputeImportInfo(config_upper, info);
     ImportInfoMapType::value_type entry(config_upper, info);
-    i = this->Internal->ImportInfoMap.insert(entry).first;
+    i = this->ImportInfoMap.insert(entry).first;
     }
 
   if(this->GetType() == INTERFACE_LIBRARY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 03c4cbe..97515a7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -449,6 +449,9 @@ private:
     std::string SharedDeps;
   };
 
+  typedef std::map<std::string, ImportInfo> ImportInfoMapType;
+  mutable ImportInfoMapType ImportInfoMap;
+
   ImportInfo const* GetImportInfo(const std::string& config) const;
   void ComputeImportInfo(std::string const& desired_config,
                          ImportInfo& info) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9af81007b00417fe814602c1f3ab008191038929
commit 9af81007b00417fe814602c1f3ab008191038929
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:20:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 13:20:09 2015 +0200

    cmTarget: Move backtrace member out of internal class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fd8ea3e..369e497 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  // The backtrace when the target was created.
-  cmListFileBacktrace Backtrace;
-
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
@@ -240,7 +237,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 
   // Save the backtrace of target construction.
-  this->Internal->Backtrace = this->Makefile->GetBacktrace();
+  this->Backtrace = this->Makefile->GetBacktrace();
 
   if (!this->IsImported())
     {
@@ -363,7 +360,7 @@ void cmTarget::FinishConfigure()
 //----------------------------------------------------------------------------
 cmListFileBacktrace const& cmTarget::GetBacktrace() const
 {
-  return this->Internal->Backtrace;
+  return this->Backtrace;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 01261ed..03c4cbe 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -471,6 +471,8 @@ private:
                             std::string const& suffix,
                             std::string const& name,
                             const char* version) const;
+
+  cmListFileBacktrace Backtrace;
 };
 
 #ifdef CMAKE_BUILD_WITH_CMAKE

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cf7dc74f549d7cd08e502aa3c5912410be96b98
commit 2cf7dc74f549d7cd08e502aa3c5912410be96b98
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:11:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 13:17:56 2015 +0200

    cmTarget: Remove unneeded constructors.
    
    The compiler generated ones are fine here.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b8beb5c..fd8ea3e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,16 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  cmTargetInternals()
-    : Backtrace()
-    {
-    }
-  cmTargetInternals(cmTargetInternals const&)
-    : Backtrace()
-    {
-    }
-  ~cmTargetInternals();
-
   // The backtrace when the target was created.
   cmListFileBacktrace Backtrace;
 
@@ -95,11 +85,6 @@ public:
 };
 
 //----------------------------------------------------------------------------
-cmTargetInternals::~cmTargetInternals()
-{
-}
-
-//----------------------------------------------------------------------------
 cmTarget::cmTarget()
 {
   this->Makefile = 0;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTarget.cxx |   34 ++++++----------------------------
 Source/cmTarget.h   |    5 +++++
 2 files changed, 11 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 08:10:02 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 08:10:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-355-g387d6e9
Message-ID: <20151010121002.2ED7BBD381@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  387d6e90014384090c9fb7526ecb8af28f89c932 (commit)
       via  cbe57bcc2208225328780f05a871242b0a800c63 (commit)
      from  c5eda76a39c98711216a68805a2c716b542419b3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=387d6e90014384090c9fb7526ecb8af28f89c932
commit 387d6e90014384090c9fb7526ecb8af28f89c932
Merge: c5eda76 cbe57bc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 08:10:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 08:10:00 2015 -0400

    Merge topic 'use-generator-target' into next
    
    cbe57bcc fixup! cmComputeLinkInformation: Port result API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbe57bcc2208225328780f05a871242b0a800c63
commit cbe57bcc2208225328780f05a871242b0a800c63
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 14:09:04 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:09:04 2015 +0200

    fixup! cmComputeLinkInformation: Port result API to cmGeneratorTarget.

diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7a0c06b..e2112d7 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -565,8 +565,8 @@ cmInstallTargetGenerator
     {
     std::set<cmGeneratorTarget const*> const& sharedLibs
                                             = cli->GetSharedLibrariesLinked();
-    for(std::set<cmGeneratorTarget const*>::const_iterator j = sharedLibs.begin();
-        j != sharedLibs.end(); ++j)
+    for(std::set<cmGeneratorTarget const*>::const_iterator j
+        = sharedLibs.begin(); j != sharedLibs.end(); ++j)
       {
       cmGeneratorTarget const* tgt = *j;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmInstallTargetGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 08:11:17 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 08:11:17 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-376-g7a66c8b
Message-ID: <20151010121118.04C39BF2B4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7a66c8bad451998b51a51f0fb79c6d65d44013ec (commit)
       via  8d3710471c2d5fa067b0a52dc2e2ce8b066c1d58 (commit)
       via  4216992604629a2ac69500e266cf7f095007f454 (commit)
       via  20102a723f381356ae4753c94584f662a9c22b4d (commit)
       via  bf14b121bb55241990f223579f0ba3f89c57a475 (commit)
       via  5e63ed9be398dafbfb05e55f9b64a602327db0aa (commit)
       via  4b382f3ee3bf7d915718150924fd358a026a72bb (commit)
       via  df8cb6efec82efa5610915bbadbda474368e46e0 (commit)
       via  bbd9b70dbc2f3277ad3b01c8b80ec8b5646814b8 (commit)
       via  61a3053faf69309828c9555795b8b9e6ed91558d (commit)
       via  dc1f9735fae5fac3884559b8e7b9ec9a51092b4a (commit)
       via  36724922064aba82080ffb53eacaa964c5a61d37 (commit)
       via  533ab6137307a2355db96c8ea73e6594ec13e81b (commit)
       via  edd2c4805d27824dae35f58fafaf883ade022a5b (commit)
       via  a44fda077251b9241a6ffa782ada1ea78cce7bac (commit)
       via  2f8e39bac198cb04fe872fed0bf3b471bb7edb4e (commit)
       via  64694951477c4fd0f976eb90f4328886798790dd (commit)
       via  05bd28bf6b77c99146a3088e347dc9471502c777 (commit)
       via  4c742b92b4e8088f1663bc55a0f2862ca69123e9 (commit)
       via  d7d27d58401ca7249cd54991f6ffa97df6524acc (commit)
       via  5ddc5120c65adf066ff6f074515e9f57b4ee6b45 (commit)
      from  387d6e90014384090c9fb7526ecb8af28f89c932 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a66c8bad451998b51a51f0fb79c6d65d44013ec
commit 7a66c8bad451998b51a51f0fb79c6d65d44013ec
Merge: 387d6e9 8d37104
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 08:11:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 08:11:15 2015 -0400

    Merge topic 'use-generator-target' into next
    
    8d371047 cmTarget: Move ImportInfoMap out of internal class.
    42169926 cmTarget: Move backtrace member out of internal class.
    20102a72 cmTarget: Remove unneeded constructors.
    bf14b121 cmCommonTargetGenerator: Use GeneratorTarget more.
    5e63ed9b Genex: Port implementation detail to cmGeneratorTarget.
    4b382f3e cmGeneratorTarget: Move GetSupportDirectory from cmTarget.
    df8cb6ef cmGeneratorTarget: Move HasImportLibrary from cmTarget.
    bbd9b70d cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.
    61a3053f Sublime: Port some API to cmGeneratorTarget.
    dc1f9735 cmGeneratorTarget: Port processILibs to cmGeneratorTarget.
    36724922 cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.
    533ab613 cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.
    edd2c480 cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.
    a44fda07 cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.
    2f8e39ba cmLinkItem: Port to cmGeneratorTarget.
    64694951 cmGeneratorTarget: Move FindTargetToLink from cmTarget.
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d3710471c2d5fa067b0a52dc2e2ce8b066c1d58
commit 8d3710471c2d5fa067b0a52dc2e2ce8b066c1d58
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:15:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:50 2015 +0200

    cmTarget: Move ImportInfoMap out of internal class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 369e497..847a5c1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
-  ImportInfoMapType ImportInfoMap;
-
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -1538,7 +1535,7 @@ void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
   // Wipe out maps caching information affected by this property.
   if(this->IsImported() && cmHasLiteralPrefix(prop, "IMPORTED"))
     {
-    this->Internal->ImportInfoMap.clear();
+    this->ImportInfoMap.clear();
     }
 }
 
@@ -2288,16 +2285,15 @@ cmTarget::GetImportInfo(const std::string& config) const
     {
     config_upper = "NOCONFIG";
     }
-  typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
 
   ImportInfoMapType::const_iterator i =
-    this->Internal->ImportInfoMap.find(config_upper);
-  if(i == this->Internal->ImportInfoMap.end())
+    this->ImportInfoMap.find(config_upper);
+  if(i == this->ImportInfoMap.end())
     {
     ImportInfo info;
     this->ComputeImportInfo(config_upper, info);
     ImportInfoMapType::value_type entry(config_upper, info);
-    i = this->Internal->ImportInfoMap.insert(entry).first;
+    i = this->ImportInfoMap.insert(entry).first;
     }
 
   if(this->GetType() == INTERFACE_LIBRARY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 03c4cbe..97515a7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -449,6 +449,9 @@ private:
     std::string SharedDeps;
   };
 
+  typedef std::map<std::string, ImportInfo> ImportInfoMapType;
+  mutable ImportInfoMapType ImportInfoMap;
+
   ImportInfo const* GetImportInfo(const std::string& config) const;
   void ComputeImportInfo(std::string const& desired_config,
                          ImportInfo& info) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4216992604629a2ac69500e266cf7f095007f454
commit 4216992604629a2ac69500e266cf7f095007f454
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:20:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:50 2015 +0200

    cmTarget: Move backtrace member out of internal class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fd8ea3e..369e497 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  // The backtrace when the target was created.
-  cmListFileBacktrace Backtrace;
-
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
@@ -240,7 +237,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 
   // Save the backtrace of target construction.
-  this->Internal->Backtrace = this->Makefile->GetBacktrace();
+  this->Backtrace = this->Makefile->GetBacktrace();
 
   if (!this->IsImported())
     {
@@ -363,7 +360,7 @@ void cmTarget::FinishConfigure()
 //----------------------------------------------------------------------------
 cmListFileBacktrace const& cmTarget::GetBacktrace() const
 {
-  return this->Internal->Backtrace;
+  return this->Backtrace;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 01261ed..03c4cbe 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -471,6 +471,8 @@ private:
                             std::string const& suffix,
                             std::string const& name,
                             const char* version) const;
+
+  cmListFileBacktrace Backtrace;
 };
 
 #ifdef CMAKE_BUILD_WITH_CMAKE

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20102a723f381356ae4753c94584f662a9c22b4d
commit 20102a723f381356ae4753c94584f662a9c22b4d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:11:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:50 2015 +0200

    cmTarget: Remove unneeded constructors.
    
    The compiler generated ones are fine here.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b8beb5c..fd8ea3e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,16 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  cmTargetInternals()
-    : Backtrace()
-    {
-    }
-  cmTargetInternals(cmTargetInternals const&)
-    : Backtrace()
-    {
-    }
-  ~cmTargetInternals();
-
   // The backtrace when the target was created.
   cmListFileBacktrace Backtrace;
 
@@ -95,11 +85,6 @@ public:
 };
 
 //----------------------------------------------------------------------------
-cmTargetInternals::~cmTargetInternals()
-{
-}
-
-//----------------------------------------------------------------------------
 cmTarget::cmTarget()
 {
   this->Makefile = 0;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf14b121bb55241990f223579f0ba3f89c57a475
commit bf14b121bb55241990f223579f0ba3f89c57a475
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:13:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:50 2015 +0200

    cmCommonTargetGenerator: Use GeneratorTarget more.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index f901414..24d0e61 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -109,7 +109,7 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const
 {
   std::string mod_dir;
   const char* target_mod_dir =
-    this->Target->GetProperty("Fortran_MODULE_DIRECTORY");
+    this->GeneratorTarget->GetProperty("Fortran_MODULE_DIRECTORY");
   const char* moddir_flag =
     this->Makefile->GetDefinition("CMAKE_Fortran_MODDIR_FLAG");
   if(target_mod_dir && moddir_flag)
@@ -214,7 +214,7 @@ cmCommonTargetGenerator
     this->LocalGenerator->GetFortranFormat(srcfmt);
   if(format == cmLocalGenerator::FortranFormatNone)
     {
-    const char* tgtfmt = this->Target->GetProperty("Fortran_FORMAT");
+    const char* tgtfmt = this->GeneratorTarget->GetProperty("Fortran_FORMAT");
     format = this->LocalGenerator->GetFortranFormat(tgtfmt);
     }
   const char* var = 0;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 2d2de5f..76ef8cc 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -168,7 +168,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->Target->GetName().c_str(), "\".");
+                         this->GeneratorTarget->GetName().c_str(), "\".");
     return;
     }
 
@@ -197,7 +197,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                            this->ConfigName);
 
 
-  if(this->Target->GetPropertyAsBool("WIN32_EXECUTABLE"))
+  if(this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE"))
     {
     this->LocalGenerator->AppendFlags
       (linkFlags, this->Makefile->GetDefinition("CMAKE_CREATE_WIN32_EXE"));
@@ -226,11 +226,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   // Add target-specific linker flags.
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->Target->GetProperty("LINK_FLAGS"));
+    (linkFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->Target->GetProperty(linkFlagsConfig));
+    (linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
 
   this->AddModuleDefinitionFlag(linkFlags);
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 8b60a23..5e5eeab 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -26,7 +26,7 @@ cmMakefileLibraryTargetGenerator
   cmMakefileTargetGenerator(target)
 {
   this->CustomCommandDriver = OnDepends;
-  if (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
     this->GeneratorTarget->GetLibraryNames(
       this->TargetNameOut, this->TargetNameSO, this->TargetNameReal,
@@ -62,7 +62,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
 
   // write the link rules
   // Write the rule for this target type.
-  switch(this->Target->GetType())
+  switch(this->GeneratorTarget->GetType())
     {
     case cmTarget::STATIC_LIBRARY:
       this->WriteStaticLibraryRules();
@@ -122,11 +122,11 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->Target->GetName(),
+                                      this->GeneratorTarget->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->Target->GetName(), false);
+  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
 }
 
 //----------------------------------------------------------------------------
@@ -166,11 +166,11 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty("LINK_FLAGS"));
+    (extraFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
 
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName);
@@ -190,11 +190,11 @@ void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                                    this->Target->GetProperty("LINK_FLAGS"));
+                           this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MODULE_LINKER_FLAGS", this->ConfigName);
   this->AddModuleDefinitionFlag(extraFlags);
@@ -213,11 +213,11 @@ void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                                    this->Target->GetProperty("LINK_FLAGS"));
+                             this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MACOSX_FRAMEWORK_LINKER_FLAGS", this->ConfigName);
 
@@ -244,7 +244,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->Target->GetName().c_str(), "\".");
+                         this->GeneratorTarget->GetName().c_str(), "\".");
     return;
     }
 
@@ -253,8 +253,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   this->LocalGenerator->AppendFlags(linkFlags, extraFlags);
 
   // Add OSX version flags, if any.
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "COMPATIBILITY", true);
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "CURRENT", false);
@@ -351,7 +351,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     // Add the link message.
     std::string buildEcho = "Linking ";
     buildEcho += linkLanguage;
-    switch(this->Target->GetType())
+    switch(this->GeneratorTarget->GetType())
       {
       case cmTarget::STATIC_LIBRARY:
         buildEcho += " static library ";
@@ -375,7 +375,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     }
 
   const char* forbiddenFlagVar = 0;
-  switch(this->Target->GetType())
+  switch(this->GeneratorTarget->GetType())
     {
     case cmTarget::SHARED_LIBRARY:
       forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS";
@@ -441,7 +441,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> commands1;
   // Add a command to remove any existing files for this library.
   // for static libs only
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
                                              *this->Target, "target");
@@ -497,7 +497,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> archiveAppendCommands;
   std::vector<std::string> archiveFinishCommands;
   std::string::size_type archiveCommandLimit = std::string::npos;
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     haveStaticLibraryRule =
       this->Makefile->GetDefinition(linkRuleVar)? true:false;
@@ -552,7 +552,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Collect up flags to link in needed libraries.
   std::string linkLibs;
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
     {
     this->CreateLinkLibs(linkLibs, relink, useResponseFileForLibs, depends,
                          useWatcomQuote);
@@ -566,15 +566,15 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
                           useWatcomQuote);
 
   // maybe create .def file from list of objects
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
         this->GeneratorTarget->GetSupportDirectory();
       name_of_def_file += std::string("/") +
-        this->Target->GetName();
+        this->GeneratorTarget->GetName();
       name_of_def_file += ".def";
       std::string cmd = cmSystemTools::GetCMakeCommand();
       cmd = this->Convert(cmd, cmLocalGenerator::NONE,
@@ -667,7 +667,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Compute the directory portion of the install_name setting.
   std::string install_name_dir;
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir =
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 0ce13c3..8534986 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -245,7 +245,8 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
     // Write an empty dependency file.
     cmGeneratedFileStream depFileStream(dependFileNameFull.c_str());
     depFileStream
-      << "# Empty dependencies file for " << this->Target->GetName() << ".\n"
+      << "# Empty dependencies file for "
+      << this->GeneratorTarget->GetName() << ".\n"
       << "# This may be replaced when dependencies are built." << std::endl;
     }
 
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 303ca63..18594bb 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -42,7 +42,8 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
   this->CreateRuleFile();
 
   *this->BuildFileStream
-    << "# Utility rule file for " << this->Target->GetName() << ".\n\n";
+    << "# Utility rule file for "
+    << this->GeneratorTarget->GetName() << ".\n\n";
 
   if(!this->NoRuleMessages)
     {
@@ -101,11 +102,11 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->Target->GetName(),
+                                      this->GeneratorTarget->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->Target->GetName(), false);
+  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
 
   // Write clean target
   this->WriteTargetCleanRules();
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index db7cd7d..fd9a158 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -93,7 +93,7 @@ std::string cmNinjaTargetGenerator::LanguageCompilerRule(
   const std::string& lang) const
 {
   return lang + "_COMPILER__" +
-    cmGlobalNinjaGenerator::EncodeRuleName(this->Target->GetName());
+    cmGlobalNinjaGenerator::EncodeRuleName(this->GeneratorTarget->GetName());
 }
 
 std::string
@@ -190,8 +190,8 @@ ComputeDefines(cmSourceFile const* source, const std::string& language)
 cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
 {
   // Static libraries never depend on other targets for linking.
-  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-      this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+      this->GeneratorTarget->GetType() == cmTarget::OBJECT_LIBRARY)
     return cmNinjaDeps();
 
   cmComputeLinkInformation* cli =
@@ -219,7 +219,8 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
     }
 
   // Add user-specified dependencies.
-  if (const char* linkDepends = this->Target->GetProperty("LINK_DEPENDS"))
+  if (const char* linkDepends =
+      this->GeneratorTarget->GetProperty("LINK_DEPENDS"))
     {
     std::vector<std::string> linkDeps;
     cmSystemTools::ExpandListArgument(linkDepends, linkDeps);
@@ -272,7 +273,7 @@ cmNinjaTargetGenerator
 
 std::string cmNinjaTargetGenerator::GetTargetName() const
 {
-  return this->Target->GetName();
+  return this->GeneratorTarget->GetName();
 }
 
 
@@ -284,10 +285,10 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
     {
     std::string pdbPath;
     std::string compilePdbPath;
-    if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-       this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-       this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+    if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+       this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
       {
       pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName());
       pdbPath += "/";
@@ -411,7 +412,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const iwyu_prop = lang + "_INCLUDE_WHAT_YOU_USE";
-    const char *iwyu = this->Target->GetProperty(iwyu_prop);
+    const char *iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     if (iwyu && *iwyu)
       {
       std::string run_iwyu =
@@ -428,7 +429,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
-    const char *clauncher = this->Target->GetProperty(clauncher_prop);
+    const char *clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
     if (clauncher && *clauncher)
       {
       std::vector<std::string> launcher_cmd;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e63ed9be398dafbfb05e55f9b64a602327db0aa
commit 5e63ed9be398dafbfb05e55f9b64a602327db0aa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:12:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:50 2015 +0200

    Genex: Port implementation detail to cmGeneratorTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2d9025e..88d10aa 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -831,8 +831,8 @@ template <typename T>
 std::string
 getLinkedTargetsContent(
   std::vector<T> const &libraries,
-  cmTarget const* target,
-  cmTarget const* headTarget,
+  cmGeneratorTarget const* target,
+  cmGeneratorTarget const* headTarget,
   cmGeneratorExpressionContext *context,
   cmGeneratorExpressionDAGChecker *dagChecker,
   const std::string &interfacePropertyName)
@@ -846,7 +846,7 @@ getLinkedTargetsContent(
     // Broken code can have a target in its own link interface.
     // Don't follow such link interface entries so as not to create a
     // self-referencing loop.
-    if (it->Target && it->Target->Target != target)
+    if (it->Target && it->Target != target)
       {
       depString +=
         sep + "$<TARGET_PROPERTY:" +
@@ -858,8 +858,10 @@ getLinkedTargetsContent(
     {
     linkedTargetsContent =
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
-                                        target->GetMakefile(), context,
-                                        headTarget, target, dagChecker);
+                                        target->Target->GetMakefile(),
+                                        context,
+                                        headTarget->Target,
+                                        target->Target, dagChecker);
     }
   linkedTargetsContent =
     cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1116,8 +1118,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(iface->Libraries, target,
-                                  headTarget,
+          getLinkedTargetsContent(iface->Libraries, gtgt,
+                                  gHeadTarget,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1128,8 +1130,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkImplementationLibraries(context->Config))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(impl->Libraries, target,
-                                  target,
+          getLinkedTargetsContent(impl->Libraries, gtgt,
+                                  gtgt,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b382f3ee3bf7d915718150924fd358a026a72bb
commit 4b382f3ee3bf7d915718150924fd358a026a72bb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 00:29:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:49 2015 +0200

    cmGeneratorTarget: Move GetSupportDirectory from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 0f7fc68..f33a9e1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5512,3 +5512,18 @@ bool cmGeneratorTarget::HasImportLibrary() const
           (this->GetType() == cmTarget::SHARED_LIBRARY ||
            this->Target->IsExecutableWithExports()));
 }
+
+//----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetSupportDirectory() const
+{
+  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+  dir += cmake::GetCMakeFilesDirectory();
+  dir += "/";
+  dir += this->GetName();
+#if defined(__VMS)
+  dir += "_dir";
+#else
+  dir += ".dir";
+#endif
+  return dir;
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index c6e56bf..258c556 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -401,6 +401,9 @@ public:
   /** Return whether or not the target has a DLL import library.  */
   bool HasImportLibrary() const;
 
+  /** Get a build-tree directory in which to place target support files.  */
+  std::string GetSupportDirectory() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index eb4dfee..8f69acd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2895,13 +2895,14 @@ void cmGlobalGenerator::WriteSummary()
       {
       continue;
       }
-    this->WriteSummary(ti->second);
-    fout << ti->second->GetSupportDirectory() << "\n";
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
+    this->WriteSummary(gt);
+    fout << gt->GetSupportDirectory() << "\n";
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::WriteSummary(cmTarget* target)
+void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
 {
   // Place the labels file in a per-target support directory.
   std::string dir = target->GetSupportDirectory();
@@ -2944,17 +2945,15 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
     fout << "# Source files and their labels\n";
     std::vector<cmSourceFile*> sources;
     std::vector<std::string> configs;
-    target->GetMakefile()->GetConfigurations(configs);
+    target->Target->GetMakefile()->GetConfigurations(configs);
     if (configs.empty())
       {
       configs.push_back("");
       }
-    cmGeneratorTarget* gt =
-        this->GetGeneratorTarget(target);
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
-      gt->GetSourceFiles(sources, *ci);
+      target->GetSourceFiles(sources, *ci);
       }
     std::vector<cmSourceFile*>::const_iterator sourcesEnd
         = cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index b22c695..55e3766 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -458,7 +458,7 @@ private:
   void WriteRuleHashes(std::string const& pfile);
 
   void WriteSummary();
-  void WriteSummary(cmTarget* target);
+  void WriteSummary(cmGeneratorTarget* target);
   void FinalizeTargetCompileInfo();
 
   virtual void ForceLinkerLanguages();
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index de84f89..2d2de5f 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -361,7 +361,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2b019be..8b60a23 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -572,7 +572,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
-        this->Target->GetSupportDirectory();
+        this->GeneratorTarget->GetSupportDirectory();
       name_of_def_file += std::string("/") +
         this->Target->GetName();
       name_of_def_file += ".def";
@@ -643,7 +643,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 185c234..0ce13c3 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -557,7 +557,8 @@ cmMakefileTargetGenerator
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
     if(targetFullPathCompilePDB.empty())
       {
-      targetFullPathCompilePDB = this->Target->GetSupportDirectory() + "/";
+      targetFullPathCompilePDB =
+          this->GeneratorTarget->GetSupportDirectory() + "/";
       }
     }
 
@@ -594,7 +595,7 @@ cmMakefileTargetGenerator
                   cmLocalGenerator::NONE,
                   cmLocalGenerator::SHELL);
   vars.Object = shellObj.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 00c00a5..0dc53f3 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -492,9 +492,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
-      std::string dllname = targetOutput;
       std::string name_of_def_file
-        = target.GetSupportDirectory();
+        = gt.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
@@ -582,7 +581,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     vars["TARGET_PDB"] = base + suffix + dbg_suffix;
     }
 
-  const std::string objPath = GetTarget()->GetSupportDirectory();
+  const std::string objPath = GetGeneratorTarget()->GetSupportDirectory();
   vars["OBJECT_DIR"] =
     this->GetLocalGenerator()->ConvertToOutputFormat(
       this->ConvertToNinjaPath(objPath), cmLocalGenerator::SHELL);
@@ -634,7 +633,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
-        = target.GetSupportDirectory();
+        = gt.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index c2daa63..db7cd7d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -299,7 +299,7 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
       if(compilePdbPath.empty())
         {
-        compilePdbPath = this->Target->GetSupportDirectory() + "/";
+        compilePdbPath = this->GeneratorTarget->GetSupportDirectory() + "/";
         }
       }
 
@@ -568,7 +568,7 @@ cmNinjaTargetGenerator
   std::string const language = source->GetLanguage();
   std::string const sourceFileName =
     language=="RC" ? source->GetFullPath() : this->GetSourceFilePath(source);
-  std::string const objectDir = this->Target->GetSupportDirectory();
+  std::string const objectDir = this->GeneratorTarget->GetSupportDirectory();
   std::string const objectFileName = this->GetObjectFilePath(source);
   std::string const objectFileDir =
     cmSystemTools::GetFilenamePath(objectFileName);
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 378f132..6e3f65f 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -64,7 +64,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
         std::string basename = cmsys::SystemTools::
                                       GetFilenameWithoutLastExtension(absFile);
 
-        std::string rcc_output_dir = target->Target->GetSupportDirectory();
+        std::string rcc_output_dir = target->GetSupportDirectory();
         cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -833,7 +833,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           std::string basename = cmsys::SystemTools::
                                   GetFilenameWithoutLastExtension(absFile);
 
-          std::string rcc_output_dir = target->Target->GetSupportDirectory();
+          std::string rcc_output_dir = target->GetSupportDirectory();
           cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
           std::string rcc_output_file = rcc_output_dir;
           rcc_output_file += "/qrc_" + basename + ".cpp";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b16bc30..b8beb5c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -382,21 +382,6 @@ cmListFileBacktrace const& cmTarget::GetBacktrace() const
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetSupportDirectory() const
-{
-  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
-  dir += cmake::GetCMakeFilesDirectory();
-  dir += "/";
-  dir += this->Name;
-#if defined(__VMS)
-  dir += "_dir";
-#else
-  dir += ".dir";
-#endif
-  return dir;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::IsExecutableWithExports() const
 {
   return (this->GetType() == cmTarget::EXECUTABLE &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 291ef87..01261ed 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -282,9 +282,6 @@ public:
   /** Get a backtrace from the creation of the target.  */
   cmListFileBacktrace const& GetBacktrace() const;
 
-  /** Get a build-tree directory in which to place target support files.  */
-  std::string GetSupportDirectory() const;
-
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df8cb6efec82efa5610915bbadbda474368e46e0
commit df8cb6efec82efa5610915bbadbda474368e46e0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:45:55 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:49 2015 +0200

    cmGeneratorTarget: Move HasImportLibrary from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7e47261..2d9025e 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1658,7 +1658,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
       return std::string();
       }
     return target->GetFullPath(context->Config,
-                               target->Target->HasImportLibrary());
+                               target->HasImportLibrary());
   }
 };
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5bf0d0b..0f7fc68 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5487,7 +5487,7 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasImplibGNUtoMS() const
 {
-  return this->Target->HasImportLibrary()
+  return this->HasImportLibrary()
       && this->GetPropertyAsBool("GNUtoMS");
 }
 
@@ -5504,3 +5504,11 @@ bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
     }
   return false;
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasImportLibrary() const
+{
+  return (this->Target->IsDLLPlatform() &&
+          (this->GetType() == cmTarget::SHARED_LIBRARY ||
+           this->Target->IsExecutableWithExports()));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e2be249..c6e56bf 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -398,6 +398,9 @@ public:
   bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
                         const char* newExt = 0) const;
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index f8743d9..00c00a5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -559,7 +559,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                               cmLocalGenerator::SHELL);
     vars["TARGET_IMPLIB"] = impLibPath;
     EnsureParentDirectoryExists(impLibPath);
-    if(target.HasImportLibrary())
+    if(genTarget.HasImportLibrary())
       {
       byproducts.push_back(targetOutputImplib);
       }
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 500b598..291ef87 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -262,9 +262,6 @@ public:
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 
-  /** Return whether or not the target has a DLL import library.  */
-  bool HasImportLibrary() const;
-
   /** Return whether this target is a shared library Framework on
       Apple.  */
   bool IsFrameworkOnApple() const;
@@ -463,6 +460,9 @@ private:
 
   void MaybeInvalidatePropertyCache(const std::string& prop);
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   // Internal representation details.
   friend class cmTargetInternals;
   friend class cmGeneratorTarget;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbd9b70dbc2f3277ad3b01c8b80ec8b5646814b8
commit bbd9b70dbc2f3277ad3b01c8b80ec8b5646814b8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:50:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:49 2015 +0200

    cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index fed0dbc..400fa17 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -217,7 +217,7 @@ cmExportBuildFileGenerator
     std::string prop = "IMPORTED_IMPLIB";
     prop += suffix;
     std::string value = target->GetFullPath(config, true);
-    target->Target->GetImplibGNUtoMS(value, value,
+    target->GetImplibGNUtoMS(value, value,
                              "${CMAKE_IMPORT_LIBRARY_SUFFIX}");
     properties[prop] = value;
     }
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index d879c15..5bf0d0b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5483,3 +5483,24 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
     }
   return "";
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasImplibGNUtoMS() const
+{
+  return this->Target->HasImportLibrary()
+      && this->GetPropertyAsBool("GNUtoMS");
+}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
+                                std::string& out, const char* newExt) const
+{
+  if(this->HasImplibGNUtoMS() &&
+     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
+    {
+    out = gnuName.substr(0, gnuName.size()-6);
+    out += newExt? newExt : ".lib";
+    return true;
+    }
+  return false;
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index b3519de..e2be249 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -390,6 +390,14 @@ public:
   ///! Return the preferred linker language for this target
   std::string GetLinkerLanguage(const std::string& config = "") const;
 
+  /** Does this target have a GNU implib to convert to MS format?  */
+  bool HasImplibGNUtoMS() const;
+
+  /** Convert the given GNU import library name (.dll.a) to a name with a new
+      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
+  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
+                        const char* newExt = 0) const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 8c27b6e..e2112d7 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -135,7 +135,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -199,7 +199,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -387,7 +387,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -416,7 +416,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index f6b907e..de84f89 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -259,7 +259,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                                           cmLocalGenerator::START_OUTPUT,
                                           cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       exeCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 3b3f63e..2b019be 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -410,7 +410,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         cmLocalGenerator::START_OUTPUT,
         cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       libCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 6eafeae..185c234 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1516,7 +1516,7 @@ std::string cmMakefileTargetGenerator::GetLinkRule(
                                               const std::string& linkRuleVar)
 {
   std::string linkRule = this->Makefile->GetRequiredDefinition(linkRuleVar);
-  if(this->Target->HasImplibGNUtoMS())
+  if(this->GeneratorTarget->HasImplibGNUtoMS())
     {
     std::string ruleVar = "CMAKE_";
     ruleVar += this->GeneratorTarget->GetLinkerLanguage(this->ConfigName);
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index bebdd77..b16bc30 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2199,26 +2199,6 @@ void cmTarget::ComputeVersionedName(std::string& vName,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HasImplibGNUtoMS() const
-{
-  return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS");
-}
-
-//----------------------------------------------------------------------------
-bool cmTarget::GetImplibGNUtoMS(std::string const& gnuName,
-                                std::string& out, const char* newExt) const
-{
-  if(this->HasImplibGNUtoMS() &&
-     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
-    {
-    out = gnuName.substr(0, gnuName.size()-6);
-    out += newExt? newExt : ".lib";
-    return true;
-    }
-  return false;
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::SetPropertyDefault(const std::string& property,
                                   const char* default_value)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3bb1ccd..500b598 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -240,14 +240,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Does this target have a GNU implib to convert to MS format?  */
-  bool HasImplibGNUtoMS() const;
-
-  /** Convert the given GNU import library name (.dll.a) to a name with a new
-      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
-  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
-                        const char* newExt = 0) const;
-
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61a3053faf69309828c9555795b8b9e6ed91558d
commit 61a3053faf69309828c9555795b8b9e6ed91558d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:04:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:49 2015 +0200

    Sublime: Port some API to cmGeneratorTarget.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 11410a7..21c71b0 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -255,9 +255,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, target, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, gtgt);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, target, gtgt);
+            this->ComputeDefines(*iter, lg, gtgt);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
@@ -365,7 +365,6 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
 std::string
 cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
                                                    cmLocalGenerator* lg,
-                                                   cmTarget *target,
                                                    cmGeneratorTarget* gtgt)
 {
   std::string flags;
@@ -390,7 +389,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   //   }
 
   // Add shared-library flags if needed.
-  lg->AddCMP0018Flags(flags, target, language, config);
+  lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
 
   // Add include directory flags.
   {
@@ -405,7 +404,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, target, language, config);
+  lg->AddCompileOptions(flags, gtgt->Target, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -419,8 +418,8 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
 // void cmMakefileTargetGenerator::WriteTargetLanguageFlags().
 std::string
 cmExtraSublimeTextGenerator::
-ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
-               cmGeneratorTarget*)
+ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
+               cmGeneratorTarget* target)
 
 {
   std::set<std::string> defines;
@@ -429,13 +428,13 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
   const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->GetExportMacro())
+  if(const char* exportMacro = target->Target->GetExportMacro())
     {
     lg->AppendDefines(defines, exportMacro);
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AddCompileDefinitions(defines, target, config, language);
+  lg->AddCompileDefinitions(defines, target->Target, config, language);
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 4173b7d..5dd1140 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -79,11 +79,10 @@ private:
    */
   std::string ComputeFlagsForObject(cmSourceFile *source,
                                     cmLocalGenerator* lg,
-                                    cmTarget *target,
                                     cmGeneratorTarget* gtgt);
 
   std::string ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
-                             cmTarget *target, cmGeneratorTarget* gtgt);
+                             cmGeneratorTarget* gtgt);
 };
 
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc1f9735fae5fac3884559b8e7b9ec9a51092b4a
commit dc1f9735fae5fac3884559b8e7b9ec9a51092b4a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:47:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:49 2015 +0200

    cmGeneratorTarget: Port processILibs to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c3dfed9..d879c15 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2068,9 +2068,9 @@ void processILibs(const std::string& config,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
                   std::vector<cmGeneratorTarget const*>& tgts,
-                  std::set<cmTarget const*>& emitted)
+                  std::set<cmGeneratorTarget const*>& emitted)
 {
-  if (item.Target && emitted.insert(item.Target->Target).second)
+  if (item.Target && emitted.insert(item.Target).second)
     {
     tgts.push_back(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
@@ -2096,7 +2096,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
   if(!tgts.Done)
     {
     tgts.Done = true;
-    std::set<cmTarget const*> emitted;
+    std::set<cmGeneratorTarget const*> emitted;
 
     cmLinkImplementationLibraries const* impl
       = this->GetLinkImplementationLibraries(config);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36724922064aba82080ffb53eacaa964c5a61d37
commit 36724922064aba82080ffb53eacaa964c5a61d37
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:47:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:49 2015 +0200

    cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 38364be..c3dfed9 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3980,18 +3980,20 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
 
 //----------------------------------------------------------------------------
 template<typename PropertyType>
-PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
+PropertyType getTypedProperty(cmGeneratorTarget const* tgt,
+                              const std::string& prop);
 
 //----------------------------------------------------------------------------
 template<>
-bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
+bool getTypedProperty<bool>(cmGeneratorTarget const* tgt,
+                            const std::string& prop)
 {
   return tgt->GetPropertyAsBool(prop);
 }
 
 //----------------------------------------------------------------------------
 template<>
-const char *getTypedProperty<const char *>(cmTarget const* tgt,
+const char *getTypedProperty<const char *>(cmGeneratorTarget const* tgt,
                                            const std::string& prop)
 {
   return tgt->GetProperty(prop);
@@ -4121,7 +4123,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                           CompatibleType t,
                                           PropertyType *)
 {
-  PropertyType propContent = getTypedProperty<PropertyType>(tgt->Target, p);
+  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
   const bool explicitlySet = tgt->Target->GetProperties()
                                   .find(p)
                                   != tgt->Target->GetProperties().end();
@@ -4173,7 +4175,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                             .find(interfaceProperty)
                             != theTarget->Target->GetProperties().end();
     PropertyType ifacePropContent =
-                    getTypedProperty<PropertyType>(theTarget->Target,
+                    getTypedProperty<PropertyType>(theTarget,
                               interfaceProperty);
 
     std::string reportEntry;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=533ab6137307a2355db96c8ea73e6594ec13e81b
commit 533ab6137307a2355db96c8ea73e6594ec13e81b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 11:40:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:49 2015 +0200

    cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index caa76fd..38364be 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -510,7 +510,8 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
   return 0;
 }
 
-static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
+static void handleSystemIncludesDep(cmMakefile *mf,
+                                  cmGeneratorTarget const* depTgt,
                                   const std::string& config,
                                   cmGeneratorTarget const* headTarget,
                                   cmGeneratorExpressionDAGChecker *dagChecker,
@@ -524,7 +525,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt, dagChecker), result);
+                                      depTgt->Target, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
     {
@@ -538,7 +539,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt, dagChecker), result);
+                                      depTgt->Target, dagChecker), result);
     }
 }
 
@@ -888,7 +889,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, (*li)->Target, config, this,
+      handleSystemIncludesDep(this->Makefile, *li, config, this,
                               &dagChecker, result, excludeImported);
       }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edd2c4805d27824dae35f58fafaf883ade022a5b
commit edd2c4805d27824dae35f58fafaf883ade022a5b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:45:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:48 2015 +0200

    cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2f29fa6..caa76fd 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -883,12 +883,12 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
                                           &dagChecker), result);
       }
 
-    std::vector<cmTarget const*> const& deps =
+    std::vector<cmGeneratorTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmTarget const*>::const_iterator
+    for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, *li, config, this,
+      handleSystemIncludesDep(this->Makefile, (*li)->Target, config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -2066,12 +2066,12 @@ void processILibs(const std::string& config,
                   cmGeneratorTarget const* headTarget,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
-                  std::vector<cmTarget const*>& tgts,
+                  std::vector<cmGeneratorTarget const*>& tgts,
                   std::set<cmTarget const*>& emitted)
 {
   if (item.Target && emitted.insert(item.Target->Target).second)
     {
-    tgts.push_back(item.Target->Target);
+    tgts.push_back(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
        item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
       {
@@ -2086,7 +2086,7 @@ void processILibs(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
-const std::vector<const cmTarget*>&
+const std::vector<const cmGeneratorTarget*>&
 cmGeneratorTarget::GetLinkImplementationClosure(
     const std::string& config) const
 {
@@ -3630,10 +3630,10 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
     compat.Done = true;
     compat.PropsBool.insert("POSITION_INDEPENDENT_CODE");
     compat.PropsString.insert("AUTOUIC_OPTIONS");
-    std::vector<cmTarget const*> const& deps =
+    std::vector<cmGeneratorTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmTarget const*>::const_iterator li = deps.begin();
-        li != deps.end(); ++li)
+    for(std::vector<cmGeneratorTarget const*>::const_iterator li =
+        deps.begin(); li != deps.end(); ++li)
       {
 #define CM_READ_COMPATIBLE_INTERFACE(X, x) \
       if(const char* prop = (*li)->GetProperty("COMPATIBLE_INTERFACE_" #X)) \
@@ -4129,7 +4129,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
   assert((impliedByUse ^ explicitlySet)
       || (!impliedByUse && !explicitlySet));
 
-  std::vector<cmTarget const*> const& deps =
+  std::vector<cmGeneratorTarget const*> const& deps =
     tgt->GetLinkImplementationClosure(config);
 
   if(deps.empty())
@@ -4156,7 +4156,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     }
 
   std::string interfaceProperty = "INTERFACE_" + p;
-  for(std::vector<cmTarget const*>::const_iterator li =
+  for(std::vector<cmGeneratorTarget const*>::const_iterator li =
       deps.begin();
       li != deps.end(); ++li)
     {
@@ -4166,13 +4166,13 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     // target itself has a POSITION_INDEPENDENT_CODE which disagrees
     // with a dependency.
 
-    cmTarget const* theTarget = *li;
+    cmGeneratorTarget const* theTarget = *li;
 
-    const bool ifaceIsSet = theTarget->GetProperties()
+    const bool ifaceIsSet = theTarget->Target->GetProperties()
                             .find(interfaceProperty)
-                            != theTarget->GetProperties().end();
+                            != theTarget->Target->GetProperties().end();
     PropertyType ifacePropContent =
-                    getTypedProperty<PropertyType>(theTarget,
+                    getTypedProperty<PropertyType>(theTarget->Target,
                               interfaceProperty);
 
     std::string reportEntry;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index cd994c0..b3519de 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -477,7 +477,7 @@ private:
   cmGeneratorTarget(cmGeneratorTarget const&);
   void operator=(cmGeneratorTarget const&);
 
-  struct LinkImplClosure: public std::vector<cmTarget const*>
+  struct LinkImplClosure: public std::vector<cmGeneratorTarget const*>
   {
     LinkImplClosure(): Done(false) {}
     bool Done;
@@ -555,8 +555,8 @@ private:
                            std::string& out) const;
 
 public:
-  std::vector<cmTarget const*> const&
-    GetLinkImplementationClosure(const std::string& config) const;
+  const std::vector<const cmGeneratorTarget*>&
+  GetLinkImplementationClosure(const std::string& config) const;
 
   mutable std::map<std::string, std::string> MaxLanguageStandards;
   std::map<std::string, std::string> const&

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a44fda077251b9241a6ffa782ada1ea78cce7bac
commit a44fda077251b9241a6ffa782ada1ea78cce7bac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:37:30 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:48 2015 +0200

    cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index b9ed345..f901414 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -383,7 +383,7 @@ std::vector<std::string>
 cmCommonTargetGenerator::GetLinkedTargetDirectories() const
 {
   std::vector<std::string> dirs;
-  std::set<cmTarget const*> emitted;
+  std::set<cmGeneratorTarget const*> emitted;
   if (cmComputeLinkInformation* cli =
       this->GeneratorTarget->GetLinkInformation(this->ConfigName))
     {
@@ -397,7 +397,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
                 // Target->GetLinkInformation already processed their
                 // link interface and they don't have any output themselves.
                 && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
-                && emitted.insert(linkee->Target).second)
+                && emitted.insert(linkee).second)
         {
         cmLocalGenerator* lg = linkee->GetLocalGenerator();
         cmMakefile* mf = linkee->Target->GetMakefile();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f8e39bac198cb04fe872fed0bf3b471bb7edb4e
commit 2f8e39bac198cb04fe872fed0bf3b471bb7edb4e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:18:42 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:48 2015 +0200

    cmLinkItem: Port to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 5604c53..22843f1 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -320,8 +320,7 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item)
   int index = lei->second;
   LinkEntry& entry = this->EntryList[index];
   entry.Item = item;
-  entry.Target =
-      item.Target ? this->GlobalGenerator->GetGeneratorTarget(item.Target) : 0;
+  entry.Target = item.Target;
   entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
                   item.substr(0, 10) != "-framework");
 
@@ -443,9 +442,7 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
     // Initialize the item entry.
     LinkEntry& entry = this->EntryList[lei->second];
     entry.Item = dep.Item;
-    entry.Target =
-        dep.Item.Target ?
-          this->GlobalGenerator->GetGeneratorTarget(dep.Item.Target) : 0;
+    entry.Target = dep.Item.Target;
 
     // This item was added specifically because it is a dependent
     // shared library.  It may get special treatment
@@ -983,7 +980,6 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
   // directories.
   if(item.Target && !item.Target->IsImported())
     {
-    this->OldWrongConfigItems.insert(
-            this->GlobalGenerator->GetGeneratorTarget(item.Target));
+    this->OldWrongConfigItems.insert(item.Target);
     }
 }
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index e53b7b9..8f3def2 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -319,22 +319,20 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
                                              std::set<std::string> &emitted)
 {
   cmGeneratorTarget const* depender = this->Targets[depender_index];
-  cmTarget const* dependee = dependee_name.Target;
+  cmGeneratorTarget const* dependee = dependee_name.Target;
   // Skip targets that will not really be linked.  This is probably a
   // name conflict between an external library and an executable
   // within the project.
   if(dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->IsExecutableWithExports())
+     !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(dependee);
-    this->AddInterfaceDepends(depender_index, gt, "", emitted);
+    this->AddInterfaceDepends(depender_index, dependee, "", emitted);
     std::vector<std::string> configs;
     depender->Makefile->GetConfigurations(configs);
     for (std::vector<std::string>::const_iterator it = configs.begin();
@@ -342,7 +340,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
       {
       // A target should not depend on itself.
       emitted.insert(depender->GetName());
-      this->AddInterfaceDepends(depender_index, gt, *it, emitted);
+      this->AddInterfaceDepends(depender_index, dependee, *it, emitted);
       }
     }
 }
@@ -356,7 +354,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   cmGeneratorTarget const* depender = this->Targets[depender_index];
 
   // Check the target's makefile first.
-  cmTarget const* dependee = dependee_name.Target;
+  cmGeneratorTarget const* dependee = dependee_name.Target;
 
   if(!dependee && !linking &&
     (depender->GetType() != cmTarget::GLOBAL_TARGET))
@@ -403,16 +401,14 @@ void cmComputeTargetDepends::AddTargetDepend(
   // within the project.
   if(linking && dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->IsExecutableWithExports())
+     !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(dependee);
-    this->AddTargetDepend(depender_index, gt, linking);
+    this->AddTargetDepend(depender_index, dependee, linking);
     }
 }
 
@@ -430,11 +426,9 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     for(std::set<cmLinkItem>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
-      if(cmTarget const* transitive_dependee = i->Target)
+      if(cmGeneratorTarget const* transitive_dependee = i->Target)
         {
-        cmGeneratorTarget* gt =
-            this->GlobalGenerator->GetGeneratorTarget(transitive_dependee);
-        this->AddTargetDepend(depender_index, gt, false);
+        this->AddTargetDepend(depender_index, transitive_dependee, false);
         }
       }
     }
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 78a5b6f..7e47261 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -846,7 +846,7 @@ getLinkedTargetsContent(
     // Broken code can have a target in its own link interface.
     // Don't follow such link interface entries so as not to create a
     // self-referencing loop.
-    if (it->Target && it->Target != target)
+    if (it->Target && it->Target->Target != target)
       {
       depString +=
         sep + "$<TARGET_PROPERTY:" +
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 37d7f16..2f29fa6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -773,8 +773,10 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
     for(std::set<std::string>::const_iterator i = utilities.begin();
         i != utilities.end(); ++i)
       {
-      this->UtilityItems.insert(
-        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
+      cmTarget* tgt = this->Makefile->FindTargetToUse(*i);
+      cmGeneratorTarget* gt = tgt ? this->GlobalGenerator
+          ->GetGeneratorTarget(tgt) : 0;
+      this->UtilityItems.insert(cmLinkItem(*i, gt));
       }
     }
   return this->UtilityItems;
@@ -1728,15 +1730,12 @@ public:
         }
       return;
       }
-    if(!this->Visited.insert(item.Target).second)
+    if(!this->Visited.insert(item.Target->Target).second)
       {
       return;
       }
-    cmGeneratorTarget* gtgt =
-        this->Target->GetLocalGenerator()->GetGlobalGenerator()
-            ->GetGeneratorTarget(item.Target);
     cmLinkInterface const* iface =
-      gtgt->GetLinkInterface(this->Config, this->HeadTarget);
+      item.Target->GetLinkInterface(this->Config, this->HeadTarget);
     if(!iface) { return; }
 
     for(std::vector<std::string>::const_iterator
@@ -2070,12 +2069,11 @@ void processILibs(const std::string& config,
                   std::vector<cmTarget const*>& tgts,
                   std::set<cmTarget const*>& emitted)
 {
-  if (item.Target && emitted.insert(item.Target).second)
+  if (item.Target && emitted.insert(item.Target->Target).second)
     {
-    tgts.push_back(item.Target);
-    cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
+    tgts.push_back(item.Target->Target);
     if(cmLinkInterfaceLibraries const* iface =
-       gt->GetLinkInterfaceLibraries(config, headTarget, true))
+       item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
       {
       for(std::vector<cmLinkItem>::const_iterator
             it = iface->Libraries.begin();
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index 33780a7..b875cc0 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -16,7 +16,6 @@
 #include "cmListFileCache.h"
 
 class cmGeneratorTarget;
-class cmTarget;
 
 // Basic information about each link item.
 class cmLinkItem: public std::string
@@ -25,9 +24,9 @@ class cmLinkItem: public std::string
 public:
   cmLinkItem(): std_string(), Target(0) {}
   cmLinkItem(const std_string& n,
-             cmTarget const* t): std_string(n), Target(t) {}
+             cmGeneratorTarget const* t): std_string(n), Target(t) {}
   cmLinkItem(cmLinkItem const& r): std_string(r), Target(r.Target) {}
-  cmTarget const* Target;
+  cmGeneratorTarget const* Target;
 };
 
 class cmLinkImplItem: public cmLinkItem
@@ -35,7 +34,7 @@ class cmLinkImplItem: public cmLinkItem
 public:
   cmLinkImplItem(): cmLinkItem(), Backtrace(), FromGenex(false) {}
   cmLinkImplItem(std::string const& n,
-                 cmTarget const* t,
+                 cmGeneratorTarget const* t,
                  cmListFileBacktrace const& bt,
                  bool fromGenex):
     cmLinkItem(n, t), Backtrace(bt), FromGenex(fromGenex) {}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64694951477c4fd0f976eb90f4328886798790dd
commit 64694951477c4fd0f976eb90f4328886798790dd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 12:23:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:48 2015 +0200

    cmGeneratorTarget: Move FindTargetToLink from cmTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 4d7b01e..5604c53 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -634,8 +634,9 @@ cmComputeLinkDepends::AddLinkEntries(
 }
 
 //----------------------------------------------------------------------------
-cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
-                                                 const std::string& name)
+cmGeneratorTarget const*
+cmComputeLinkDepends::FindTargetToLink(int depender_index,
+                                       const std::string& name)
 {
   // Look for a target in the scope of the depender.
   cmGeneratorTarget const* from = this->Target;
@@ -647,7 +648,7 @@ cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
       from = depender;
       }
     }
-  return from->Target->FindTargetToLink(name);
+  return from->FindTargetToLink(name);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index dba3948..9d960c6 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -75,8 +75,8 @@ private:
   void AddDirectLinkEntries();
   template <typename T>
     void AddLinkEntries(int depender_index, std::vector<T> const& libs);
-  cmTarget const* FindTargetToLink(int depender_index,
-                                   const std::string& name);
+  cmGeneratorTarget const* FindTargetToLink(int depender_index,
+                                            const std::string& name);
 
   // One entry for each unique item.
   std::vector<LinkEntry> EntryList;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index a5e35a1..37d7f16 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4427,7 +4427,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
       {
       continue;
       }
-    items.push_back(cmLinkItem(name, this->Target->FindTargetToLink(name)));
+    items.push_back(cmLinkItem(name, this->FindTargetToLink(name)));
     }
 }
 
@@ -5398,7 +5398,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
 
       // The entry is meant for this configuration.
       impl.Libraries.push_back(
-        cmLinkImplItem(name, this->Target->FindTargetToLink(name),
+        cmLinkImplItem(name, this->FindTargetToLink(name),
                        *btIt, evaluated != *le));
       }
 
@@ -5430,12 +5430,48 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         }
       // Support OLD behavior for CMP0003.
       impl.WrongConfigLibraries.push_back(
-        cmLinkItem(name, this->Target->FindTargetToLink(name)));
+        cmLinkItem(name, this->FindTargetToLink(name)));
       }
     }
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmGeneratorTarget::FindTargetToLink(std::string const& name) const
+{
+  cmTarget const* tgt = this->Makefile->FindTargetToUse(name);
+
+  // Skip targets that will not really be linked.  This is probably a
+  // name conflict between an external library and an executable
+  // within the project.
+  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
+     !tgt->IsExecutableWithExports())
+    {
+    tgt = 0;
+    }
+
+  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
+    {
+    std::ostringstream e;
+    e << "Target \"" << this->GetName() << "\" links to "
+      "OBJECT library \"" << tgt->GetName() << "\" but this is not "
+      "allowed.  "
+      "One may link only to STATIC or SHARED libraries, or to executables "
+      "with the ENABLE_EXPORTS property set.";
+    cmake* cm = this->Makefile->GetCMakeInstance();
+    cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                     this->Target->GetBacktrace());
+    tgt = 0;
+    }
+
+  if (!tgt)
+    {
+    return 0;
+    }
+  return this->GlobalGenerator->GetGeneratorTarget(tgt);
+}
+
+//----------------------------------------------------------------------------
 std::string
 cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 70612f2..cd994c0 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -216,6 +216,8 @@ public:
                                           cmOptionalLinkImplementation& impl,
                                           const cmGeneratorTarget* head) const;
 
+  cmGeneratorTarget* FindTargetToLink(std::string const& name) const;
+
   // Compute the set of languages compiled by the target.  This is
   // computed every time it is called because the languages can change
   // when source file properties are changed and we do not have enough
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 31a9aa7..bebdd77 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2670,37 +2670,6 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
 }
 
 //----------------------------------------------------------------------------
-cmTarget const* cmTarget::FindTargetToLink(std::string const& name) const
-{
-  cmTarget const* tgt = this->Makefile->FindTargetToUse(name);
-
-  // Skip targets that will not really be linked.  This is probably a
-  // name conflict between an external library and an executable
-  // within the project.
-  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
-     !tgt->IsExecutableWithExports())
-    {
-    tgt = 0;
-    }
-
-  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
-    {
-    std::ostringstream e;
-    e << "Target \"" << this->GetName() << "\" links to "
-      "OBJECT library \"" << tgt->GetName() << "\" but this is not "
-      "allowed.  "
-      "One may link only to STATIC or SHARED libraries, or to executables "
-      "with the ENABLE_EXPORTS property set.";
-    cmake* cm = this->Makefile->GetCMakeInstance();
-    cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->GetBacktrace());
-    tgt = 0;
-    }
-
-  // Return the target found, if any.
-  return tgt;
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::CheckCMP0004(std::string const& item) const
 {
   // Strip whitespace off the library names because we used to do this
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 0c1bbd2..3bb1ccd 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -223,8 +223,6 @@ public:
 
   void GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const;
 
-  cmTarget const* FindTargetToLink(std::string const& name) const;
-
   /** Strip off leading and trailing whitespace from an item named in
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05bd28bf6b77c99146a3088e347dc9471502c777
commit 05bd28bf6b77c99146a3088e347dc9471502c777
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:05:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:48 2015 +0200

    cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c9fdb93..a5e35a1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4490,7 +4490,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head->Target];
+  cmOptionalLinkInterface& iface = hm[head];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -4642,7 +4642,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head->Target];
+  cmOptionalLinkInterface& iface = hm[head];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -5079,7 +5079,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[headTarget->Target];
+  cmOptionalLinkInterface& iface = hm[headTarget];
   if(!iface.AllDone)
     {
     iface.AllDone = true;
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index 10dd465..33780a7 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -15,6 +15,7 @@
 
 #include "cmListFileCache.h"
 
+class cmGeneratorTarget;
 class cmTarget;
 
 // Basic information about each link item.
@@ -97,7 +98,7 @@ struct cmOptionalLinkInterface: public cmLinkInterface
 };
 
 struct cmHeadToLinkInterfaceMap:
-    public std::map<cmTarget const*, cmOptionalLinkInterface>
+    public std::map<cmGeneratorTarget const*, cmOptionalLinkInterface>
 {
 };
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c742b92b4e8088f1663bc55a0f2862ca69123e9
commit 4c742b92b4e8088f1663bc55a0f2862ca69123e9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:01:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:48 2015 +0200

    cmGeneratorTarget: Move GetUtilityItems from cmTarget.

diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 8df6165..dba3948 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -14,6 +14,7 @@
 
 #include "cmStandardIncludes.h"
 #include "cmTarget.h"
+#include "cmLinkItem.h"
 
 #include "cmGraphAdjacencyList.h"
 
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 18aad10..e53b7b9 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -272,7 +272,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
 
   // Loop over all utility dependencies.
   {
-  std::set<cmLinkItem> const& tutils = depender->Target->GetUtilityItems();
+  std::set<cmLinkItem> const& tutils = depender->GetUtilityItems();
   std::set<std::string> emitted;
   // A target should not depend on itself.
   emitted.insert(depender->GetName());
@@ -426,7 +426,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     {
     // Skip IMPORTED and INTERFACE targets but follow their utility
     // dependencies.
-    std::set<cmLinkItem> const& utils = dependee->Target->GetUtilityItems();
+    std::set<cmLinkItem> const& utils = dependee->GetUtilityItems();
     for(std::set<cmLinkItem>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c4fc1dd..c9fdb93 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -271,7 +271,8 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
   DebugCompileFeaturesDone(false),
   DebugCompileDefinitionsDone(false),
   DebugSourcesDone(false),
-  LinkImplementationLanguageIsContextDependent(true)
+  LinkImplementationLanguageIsContextDependent(true),
+  UtilityItemsDone(false)
 {
   this->Makefile = this->Target->GetMakefile();
   this->LocalGenerator = lg;
@@ -760,7 +761,23 @@ cmGeneratorTarget::GetExpectedXamlSources(std::set<std::string>& srcs,
 {
   XamlData data;
   IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData)
-  srcs = data.ExpectedXamlSources;
+      srcs = data.ExpectedXamlSources;
+}
+
+std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
+{
+  if(!this->UtilityItemsDone)
+    {
+    this->UtilityItemsDone = true;
+    std::set<std::string> const& utilities = this->Target->GetUtilities();
+    for(std::set<std::string>::const_iterator i = utilities.begin();
+        i != utilities.end(); ++i)
+      {
+      this->UtilityItems.insert(
+        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
+      }
+    }
+  return this->UtilityItems;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 799110c..70612f2 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -82,6 +82,8 @@ public:
   void GetExpectedXamlSources(std::set<std::string>&,
                               const std::string& config) const;
 
+  std::set<cmLinkItem>const& GetUtilityItems() const;
+
   void ComputeObjectMapping();
 
   const char* GetFeature(const std::string& feature,
@@ -537,6 +539,7 @@ private:
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
+  mutable std::set<cmLinkItem> UtilityItems;
   mutable bool PolicyWarnedCMP0022;
   mutable bool DebugIncludesDone;
   mutable bool DebugCompileOptionsDone;
@@ -544,6 +547,7 @@ private:
   mutable bool DebugCompileDefinitionsDone;
   mutable bool DebugSourcesDone;
   mutable bool LinkImplementationLanguageIsContextDependent;
+  mutable bool UtilityItemsDone;
 
   bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
                            std::string& out) const;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3de7efe..31a9aa7 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -67,12 +67,10 @@ public:
   cmTargetInternals()
     : Backtrace()
     {
-    this->UtilityItemsDone = false;
     }
   cmTargetInternals(cmTargetInternals const&)
     : Backtrace()
     {
-    this->UtilityItemsDone = false;
     }
   ~cmTargetInternals();
 
@@ -82,9 +80,6 @@ public:
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
-  std::set<cmLinkItem> UtilityItems;
-  bool UtilityItemsDone;
-
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -364,22 +359,6 @@ cmListFileBacktrace const* cmTarget::GetUtilityBacktrace(
 }
 
 //----------------------------------------------------------------------------
-std::set<cmLinkItem> const& cmTarget::GetUtilityItems() const
-{
-  if(!this->Internal->UtilityItemsDone)
-    {
-    this->Internal->UtilityItemsDone = true;
-    for(std::set<std::string>::const_iterator i = this->Utilities.begin();
-        i != this->Utilities.end(); ++i)
-      {
-      this->Internal->UtilityItems.insert(
-        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
-      }
-    }
-  return this->Internal->UtilityItems;
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::FinishConfigure()
 {
   // Erase any cached link information that might have been comptued
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 16d0121..0c1bbd2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -16,7 +16,6 @@
 #include "cmPropertyMap.h"
 #include "cmPolicies.h"
 #include "cmListFileCache.h"
-#include "cmLinkItem.h"
 
 #include <cmsys/auto_ptr.hxx>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -206,7 +205,6 @@ public:
   void AddUtility(const std::string& u, cmMakefile *makefile = 0);
   ///! Get the utilities used by this target
   std::set<std::string>const& GetUtilities() const { return this->Utilities; }
-  std::set<cmLinkItem>const& GetUtilityItems() const;
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
   /** Finalize the target at the end of the Configure step.  */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7d27d58401ca7249cd54991f6ffa97df6524acc
commit d7d27d58401ca7249cd54991f6ffa97df6524acc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:54:18 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:48 2015 +0200

    cmComputeLinkDepends: Port result API to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 7d20827..4d7b01e 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -982,6 +982,7 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
   // directories.
   if(item.Target && !item.Target->IsImported())
     {
-    this->OldWrongConfigItems.insert(item.Target);
+    this->OldWrongConfigItems.insert(
+            this->GlobalGenerator->GetGeneratorTarget(item.Target));
     }
 }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 5ad8714..8df6165 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -52,7 +52,7 @@ public:
   EntryVector const& Compute();
 
   void SetOldLinkDirMode(bool b);
-  std::set<cmTarget const*> const& GetOldWrongConfigItems() const
+  std::set<cmGeneratorTarget const*> const& GetOldWrongConfigItems() const
     { return this->OldWrongConfigItems; }
 
 private:
@@ -152,7 +152,7 @@ private:
 
   // Record of the original link line.
   std::vector<int> OriginalEntries;
-  std::set<cmTarget const*> OldWrongConfigItems;
+  std::set<cmGeneratorTarget const*> OldWrongConfigItems;
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 74ceead..c6225f6 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -19,7 +19,6 @@
 #include "cmState.h"
 #include "cmOutputConverter.h"
 #include "cmMakefile.h"
-#include "cmTarget.h"
 #include "cmGeneratorTarget.h"
 #include "cmake.h"
 #include "cmAlgorithms.h"
@@ -537,16 +536,16 @@ bool cmComputeLinkInformation::Compute()
     // For CMake 2.4 bug-compatibility we need to consider the output
     // directories of targets linked in another configuration as link
     // directories.
-    std::set<cmTarget const*> const& wrongItems = cld.GetOldWrongConfigItems();
-    for(std::set<cmTarget const*>::const_iterator i = wrongItems.begin();
-        i != wrongItems.end(); ++i)
+    std::set<cmGeneratorTarget const*> const& wrongItems =
+        cld.GetOldWrongConfigItems();
+    for(std::set<cmGeneratorTarget const*>::const_iterator i =
+        wrongItems.begin(); i != wrongItems.end(); ++i)
       {
-      cmTarget const* tgt = *i;
-      cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
+      cmGeneratorTarget const* tgt = *i;
       bool implib =
         (this->UseImportLibrary &&
          (tgt->GetType() == cmTarget::SHARED_LIBRARY));
-      std::string lib = gtgt->GetFullPath(this->Config , implib, true);
+      std::string lib = tgt->GetFullPath(this->Config , implib, true);
       this->OldLinkDirItems.push_back(lib);
       }
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ddc5120c65adf066ff6f074515e9f57b4ee6b45
commit 5ddc5120c65adf066ff6f074515e9f57b4ee6b45
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:51:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:10:47 2015 +0200

    cmComputeLinkInformation: Port result API to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index c409b37..74ceead 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -471,7 +471,7 @@ std::vector<std::string> const& cmComputeLinkInformation::GetFrameworkPaths()
 }
 
 //----------------------------------------------------------------------------
-std::set<cmTarget const*> const&
+const std::set<const cmGeneratorTarget*>&
 cmComputeLinkInformation::GetSharedLibrariesLinked()
 {
   return this->SharedLibrariesLinked;
@@ -1093,7 +1093,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
   // Keep track of shared library targets linked.
   if(target->GetType() == cmTarget::SHARED_LIBRARY)
     {
-    this->SharedLibrariesLinked.insert(target->Target);
+    this->SharedLibrariesLinked.insert(target);
     }
 
   // Handle case of an imported shared library with no soname.
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 2aac1bc..5eecf7d 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -19,7 +19,6 @@
 class cmake;
 class cmGlobalGenerator;
 class cmMakefile;
-class cmTarget;
 class cmGeneratorTarget;
 class cmOrderDirectories;
 
@@ -57,7 +56,7 @@ public:
   void GetRPath(std::vector<std::string>& runtimeDirs, bool for_install);
   std::string GetRPathString(bool for_install);
   std::string GetChrpathString();
-  std::set<cmTarget const*> const& GetSharedLibrariesLinked();
+  std::set<cmGeneratorTarget const*> const& GetSharedLibrariesLinked();
 
   std::string const& GetRPathLinkFlag() const { return this->RPathLinkFlag; }
   std::string GetRPathLinkString();
@@ -71,7 +70,7 @@ private:
   std::vector<std::string> Depends;
   std::vector<std::string> FrameworkPaths;
   std::vector<std::string> RuntimeSearchPath;
-  std::set<cmTarget const*> SharedLibrariesLinked;
+  std::set<cmGeneratorTarget const*> SharedLibrariesLinked;
 
   // Context information.
   cmGeneratorTarget const* Target;
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 383ee00..8c27b6e 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -563,12 +563,12 @@ cmInstallTargetGenerator
   std::map<std::string, std::string> install_name_remap;
   if(cmComputeLinkInformation* cli = this->Target->GetLinkInformation(config))
     {
-    std::set<cmTarget const*> const& sharedLibs
+    std::set<cmGeneratorTarget const*> const& sharedLibs
                                             = cli->GetSharedLibrariesLinked();
-    for(std::set<cmTarget const*>::const_iterator j = sharedLibs.begin();
-        j != sharedLibs.end(); ++j)
+    for(std::set<cmGeneratorTarget const*>::const_iterator j
+        = sharedLibs.begin(); j != sharedLibs.end(); ++j)
       {
-      cmTarget const* tgt = *j;
+      cmGeneratorTarget const* tgt = *j;
 
       // The install_name of an imported target does not change.
       if(tgt->IsImported())
@@ -576,20 +576,17 @@ cmInstallTargetGenerator
         continue;
         }
 
-      cmGeneratorTarget *gtgt = tgt->GetMakefile()
-                                          ->GetGlobalGenerator()
-                                          ->GetGeneratorTarget(tgt);
       // If the build tree and install tree use different path
       // components of the install_name field then we need to create a
       // mapping to be applied after installation.
-      std::string for_build = gtgt->GetInstallNameDirForBuildTree(config);
-      std::string for_install = gtgt->GetInstallNameDirForInstallTree();
+      std::string for_build = tgt->GetInstallNameDirForBuildTree(config);
+      std::string for_install = tgt->GetInstallNameDirForInstallTree();
       if(for_build != for_install)
         {
         // The directory portions differ.  Append the filename to
         // create the mapping.
         std::string fname =
-          this->GetInstallFilename(tgt, config, NameSO);
+          this->GetInstallFilename(tgt->Target, config, NameSO);
 
         // Map from the build-tree install_name.
         for_build += fname;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 08:14:10 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 08:14:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-378-ge37626a
Message-ID: <20151010121411.6DEE3BFA98@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e37626a00ded5e9b36c6325d4b6f812b8c60be4f (commit)
       via  8bec5ff2099c4939a767254ab4897263cc8bd008 (commit)
      from  7a66c8bad451998b51a51f0fb79c6d65d44013ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e37626a00ded5e9b36c6325d4b6f812b8c60be4f
commit e37626a00ded5e9b36c6325d4b6f812b8c60be4f
Merge: 7a66c8b 8bec5ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 08:14:09 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 08:14:09 2015 -0400

    Merge topic 'use-generator-target' into next
    
    8bec5ff2 cmTarget: Move link type enum out.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bec5ff2099c4939a767254ab4897263cc8bd008
commit 8bec5ff2099c4939a767254ab4897263cc8bd008
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:56:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:13:19 2015 +0200

    cmTarget: Move link type enum out.
    
    Remove a reason for generate time code to depend on the cmTarget header/type.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 7da334e..b0d98e9 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -373,13 +373,13 @@ void CCONV cmAddLinkLibraryForTarget(void *arg, const char *tgt,
   switch (libtype)
     {
     case CM_LIBRARY_GENERAL:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::GENERAL);
+      mf->AddLinkLibraryForTarget(tgt,value, GENERAL_LibraryType);
       break;
     case CM_LIBRARY_DEBUG:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::DEBUG);
+      mf->AddLinkLibraryForTarget(tgt,value, DEBUG_LibraryType);
       break;
     case CM_LIBRARY_OPTIMIZED:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::OPTIMIZED);
+      mf->AddLinkLibraryForTarget(tgt,value, OPTIMIZED_LibraryType);
       break;
     }
 }
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 22843f1..742651a 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -482,24 +482,24 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
 
   // Look for entries meant for this configuration.
   std::vector<cmLinkItem> actual_libs;
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
   for(std::vector<std::string>::const_iterator di = deplist.begin();
       di != deplist.end(); ++di)
     {
     if(*di == "debug")
       {
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(*di == "optimized")
       {
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(*di == "general")
       {
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(!di->empty())
@@ -517,17 +517,17 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
           {
           if(strcmp(val, "debug") == 0)
             {
-            llt = cmTarget::DEBUG;
+            llt = DEBUG_LibraryType;
             }
           else if(strcmp(val, "optimized") == 0)
             {
-            llt = cmTarget::OPTIMIZED;
+            llt = OPTIMIZED_LibraryType;
             }
           }
         }
 
       // If the library is meant for this link type then use it.
-      if(llt == cmTarget::GENERAL || llt == this->LinkType)
+      if(llt == GENERAL_LibraryType || llt == this->LinkType)
         {
         cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
         actual_libs.push_back(item);
@@ -539,7 +539,7 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
         }
 
       // Reset the link type until another explicit type is given.
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = false;
       }
     }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 9d960c6..de1e24c 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -157,7 +157,7 @@ private:
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
-  cmTarget::LinkLibraryType LinkType;
+  cmTargetLinkLibraryType LinkType;
   bool HasConfig;
   bool DebugMode;
   bool OldLinkDirMode;
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index fde8fb1..0ef2ea5 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -120,15 +120,15 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
         std::string ltValue;
         switch(li->second)
           {
-          case cmTarget::GENERAL:
+          case GENERAL_LibraryType:
             valueNew += "general;";
             ltValue = "general";
             break;
-          case cmTarget::DEBUG:
+          case DEBUG_LibraryType:
             valueNew += "debug;";
             ltValue = "debug";
             break;
-          case cmTarget::OPTIMIZED:
+          case OPTIMIZED_LibraryType:
             valueNew += "optimized;";
             ltValue = "optimized";
             break;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f33a9e1..67ad9cf 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5416,13 +5416,13 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
                                 this->MaxLanguageStandards);
     }
 
-  cmTarget::LinkLibraryType linkType = this->Target->ComputeLinkType(config);
+  cmTargetLinkLibraryType linkType = this->Target->ComputeLinkType(config);
   cmTarget::LinkLibraryVectorType const& oldllibs =
     this->Target->GetOriginalLinkLibraries();
   for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
       li != oldllibs.end(); ++li)
     {
-    if(li->second != cmTarget::GENERAL && li->second != linkType)
+    if(li->second != GENERAL_LibraryType && li->second != linkType)
       {
       std::string name = this->Target->CheckCMP0004(li->first);
       if(name == this->GetName() || name.empty())
diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx
index 996b538..eb3bfce 100644
--- a/Source/cmLinkLibrariesCommand.cxx
+++ b/Source/cmLinkLibrariesCommand.cxx
@@ -34,7 +34,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::DEBUG);
+                                 DEBUG_LibraryType);
       }
     else if (*i == "optimized")
       {
@@ -46,7 +46,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::OPTIMIZED);
+                                 OPTIMIZED_LibraryType);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 862ab2d..319a658 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1145,7 +1145,7 @@ void cmLocalVisualStudio6Generator
       libDebug =
         this->ConvertToOutputFormat(libDebug.c_str(), SHELL);
 
-      if (j->second == cmTarget::GENERAL)
+      if (j->second == GENERAL_LibraryType)
         {
         libOptions += " ";
         libOptions += lib;
@@ -1156,7 +1156,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineOptionsForDebug +=  libDebug;
         libMultiLineOptionsForDebug += "\n";
         }
-      if (j->second == cmTarget::DEBUG)
+      if (j->second == DEBUG_LibraryType)
         {
         libDebugOptions += " ";
         libDebugOptions += lib;
@@ -1165,7 +1165,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineDebugOptions += libDebug;
         libMultiLineDebugOptions += "\n";
         }
-      if (j->second == cmTarget::OPTIMIZED)
+      if (j->second == OPTIMIZED_LibraryType)
         {
         libOptimizedOptions += " ";
         libOptimizedOptions += lib;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c060505..9c046d2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1415,7 +1415,7 @@ bool cmMakefile::ParseDefineFlag(std::string const& def, bool remove)
 }
 
 void cmMakefile::AddLinkLibrary(const std::string& lib,
-                                cmTarget::LinkLibraryType llt)
+                                cmTargetLinkLibraryType llt)
 {
   cmTarget::LibraryID tmp;
   tmp.first = lib;
@@ -1425,7 +1425,7 @@ void cmMakefile::AddLinkLibrary(const std::string& lib,
 
 void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
                                          const std::string& lib,
-                                         cmTarget::LinkLibraryType llt)
+                                         cmTargetLinkLibraryType llt)
 {
   cmTargets::iterator i = this->Targets.find(target);
   if ( i != this->Targets.end())
@@ -1486,7 +1486,7 @@ void cmMakefile::AddLinkDirectoryForTarget(const std::string& target,
 
 void cmMakefile::AddLinkLibrary(const std::string& lib)
 {
-  this->AddLinkLibrary(lib,cmTarget::GENERAL);
+  this->AddLinkLibrary(lib,GENERAL_LibraryType);
 }
 
 void cmMakefile::InitializeFromParent(cmMakefile* parent)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 459d34c..bc795b6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -219,9 +219,9 @@ public:
    * Add a link library to the build.
    */
   void AddLinkLibrary(const std::string&);
-  void AddLinkLibrary(const std::string&, cmTarget::LinkLibraryType type);
+  void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type);
   void AddLinkLibraryForTarget(const std::string& tgt, const std::string&,
-                               cmTarget::LinkLibraryType type);
+                               cmTargetLinkLibraryType type);
   void AddLinkDirectoryForTarget(const std::string& tgt, const std::string& d);
 
   /**
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 468a589..dd8fa9c 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -123,4 +123,10 @@ static thisClass* SafeDownCast(cmObject *c) \
 } \
 class cmTypeMacro_UseTrailingSemicolon
 
+enum cmTargetLinkLibraryType {
+  GENERAL_LibraryType,
+  DEBUG_LibraryType,
+  OPTIMIZED_LibraryType
+};
+
 #endif
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 847a5c1..eb54add 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -632,13 +632,13 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories() const
 }
 
 //----------------------------------------------------------------------------
-cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
+cmTargetLinkLibraryType cmTarget::ComputeLinkType(
                                       const std::string& config) const
 {
   // No configuration is always optimized.
   if(config.empty())
     {
-    return cmTarget::OPTIMIZED;
+    return OPTIMIZED_LibraryType;
     }
 
   // Get the list of configurations considered to be DEBUG.
@@ -650,10 +650,10 @@ cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
   if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
       debugConfigs.end())
     {
-    return cmTarget::DEBUG;
+    return DEBUG_LibraryType;
     }
   // The current configuration is not a debug configuration.
-  return cmTarget::OPTIMIZED;
+  return OPTIMIZED_LibraryType;
 }
 
 //----------------------------------------------------------------------------
@@ -693,9 +693,9 @@ bool cmTarget::NameResolvesToFramework(const std::string& libname) const
 
 //----------------------------------------------------------------------------
 std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const
+                                  cmTargetLinkLibraryType llt) const
 {
-  if (llt == GENERAL)
+  if (llt == GENERAL_LibraryType)
     {
     return value;
     }
@@ -716,7 +716,7 @@ std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
     configString = "$<OR:" + configString + ">";
     }
 
-  if (llt == OPTIMIZED)
+  if (llt == OPTIMIZED_LibraryType)
     {
     configString = "$<NOT:" + configString + ">";
     }
@@ -773,13 +773,13 @@ void cmTarget::GetTllSignatureTraces(std::ostringstream &s,
 void cmTarget::AddLinkLibrary(cmMakefile& mf,
                               const std::string& target,
                               const std::string& lib,
-                              LinkLibraryType llt)
+                              cmTargetLinkLibraryType llt)
 {
   cmTarget *tgt = this->Makefile->FindTargetToUse(lib);
   {
   const bool isNonImportedTarget = tgt && !tgt->IsImported();
 
-  const std::string libName = (isNonImportedTarget && llt != GENERAL)
+  const std::string libName = (isNonImportedTarget && llt != GENERAL_LibraryType)
                                                         ? targetNameGenex(lib)
                                                         : lib;
   this->AppendProperty("LINK_LIBRARIES",
@@ -822,13 +822,13 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
       }
     switch (llt)
       {
-      case cmTarget::GENERAL:
+      case GENERAL_LibraryType:
         dependencies += "general";
         break;
-      case cmTarget::DEBUG:
+      case DEBUG_LibraryType:
         dependencies += "debug";
         break;
-      case cmTarget::OPTIMIZED:
+      case OPTIMIZED_LibraryType:
         dependencies += "optimized";
         break;
       }
@@ -1162,7 +1162,7 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
 
     // Parse the dependency information, which is a set of
     // type, library pairs separated by ";". There is always a trailing ";".
-    cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+    cmTarget::LinkLibraryType llt = GENERAL_LibraryType;
     std::string depline = deps;
     std::string::size_type start = 0;
     std::string::size_type end;
@@ -1174,22 +1174,22 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
         {
         if (l == "debug")
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         else if (l == "optimized")
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         else if (l == "general")
           {
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         else
           {
           LibraryID lib2(l,llt);
           this->InsertDependencyForVS6( dep_map, lib, lib2);
           this->GatherDependenciesForVS6( mf, lib2, dep_map);
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         }
       start = end+1; // skip the ;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 97515a7..b0d5f4a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -140,17 +140,15 @@ public:
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
 
-  enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
-
   //* how we identify a library, by name and type
-  typedef std::pair<std::string, LinkLibraryType> LibraryID;
+  typedef std::pair<std::string, cmTargetLinkLibraryType> LibraryID;
 
   typedef std::vector<LibraryID > LinkLibraryVectorType;
   const LinkLibraryVectorType &GetOriginalLinkLibraries() const
     {return this->OriginalLinkLibraries;}
 
   /** Compute the link type to use for the given configuration.  */
-  LinkLibraryType ComputeLinkType(const std::string& config) const;
+  cmTargetLinkLibraryType ComputeLinkType(const std::string& config) const;
 
   /**
    * Clear the dependency information recorded for this target, if any.
@@ -161,7 +159,7 @@ public:
   bool NameResolvesToFramework(const std::string& libname) const;
   void AddLinkLibrary(cmMakefile& mf,
                       const std::string& target, const std::string& lib,
-                      LinkLibraryType llt);
+                      cmTargetLinkLibraryType llt);
   enum TLLSignature {
     KeywordTLLSignature,
     PlainTLLSignature
@@ -297,7 +295,7 @@ public:
   void AppendBuildInterfaceIncludes();
 
   std::string GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const;
+                                  cmTargetLinkLibraryType llt) const;
 
   void AddSystemIncludeDirectories(const std::set<std::string> &incs);
   std::set<std::string> const & GetSystemIncludeDirectories() const
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index b57b921..1a1cf39 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -136,7 +136,7 @@ bool cmTargetLinkLibrariesCommand
     }
 
   // Keep track of link configuration specifiers.
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
 
   // Start with primary linking and switch to link interface
@@ -242,27 +242,27 @@ bool cmTargetLinkLibrariesCommand
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::DEBUG);
+        this->LinkLibraryTypeSpecifierWarning(llt, DEBUG_LibraryType);
         }
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "optimized")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::OPTIMIZED);
+        this->LinkLibraryTypeSpecifierWarning(llt, OPTIMIZED_LibraryType);
         }
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "general")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::GENERAL);
+        this->LinkLibraryTypeSpecifierWarning(llt, GENERAL_LibraryType);
         }
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(haveLLT)
@@ -282,7 +282,7 @@ bool cmTargetLinkLibrariesCommand
       // specifed that a library is both debug and optimized.  (this check is
       // only there for backwards compatibility when mixing projects built
       // with old versions of CMake and new)
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       std::string linkType = args[0];
       linkType += "_LINK_TYPE";
       const char* linkTypeString =
@@ -291,11 +291,11 @@ bool cmTargetLinkLibrariesCommand
         {
         if(strcmp(linkTypeString, "debug") == 0)
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         if(strcmp(linkTypeString, "optimized") == 0)
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         }
       if (!this->HandleLibrary(args[i], llt))
@@ -350,7 +350,7 @@ cmTargetLinkLibrariesCommand
 //----------------------------------------------------------------------------
 bool
 cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
-                                            cmTarget::LinkLibraryType llt)
+                                            cmTargetLinkLibraryType llt)
 {
   if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
       && this->CurrentProcessingState != ProcessingKeywordLinkInterface)
@@ -469,7 +469,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
   std::string prop;
 
   // Include this library in the link interface for the target.
-  if(llt == cmTarget::DEBUG || llt == cmTarget::GENERAL)
+  if(llt == DEBUG_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the DEBUG configuration interfaces.
     for(std::vector<std::string>::const_iterator i = debugConfigs.begin();
@@ -480,7 +480,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
       this->Target->AppendProperty(prop, lib.c_str());
       }
     }
-  if(llt == cmTarget::OPTIMIZED || llt == cmTarget::GENERAL)
+  if(llt == OPTIMIZED_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the non-DEBUG configuration interfaces.
     this->Target->AppendProperty("LINK_INTERFACE_LIBRARIES", lib.c_str());
diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h
index 47dd8bd..f061e6d 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -62,7 +62,7 @@ private:
 
   ProcessingState CurrentProcessingState;
 
-  bool HandleLibrary(const std::string& lib, cmTarget::LinkLibraryType llt);
+  bool HandleLibrary(const std::string& lib, cmTargetLinkLibraryType llt);
 };
 
 
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index fececfd..2d5e724 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -477,7 +477,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
             ++libIt)
       {
       mf->AddLinkLibraryForTarget(targetName, *libIt,
-                                  cmTarget::GENERAL);
+                                  GENERAL_LibraryType);
       }
 
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCPluginAPI.cxx                       |    6 ++---
 Source/cmComputeLinkDepends.cxx               |   16 ++++++------
 Source/cmComputeLinkDepends.h                 |    2 +-
 Source/cmExportLibraryDependenciesCommand.cxx |    6 ++---
 Source/cmGeneratorTarget.cxx                  |    4 +--
 Source/cmLinkLibrariesCommand.cxx             |    4 +--
 Source/cmLocalVisualStudio6Generator.cxx      |    6 ++---
 Source/cmMakefile.cxx                         |    6 ++---
 Source/cmMakefile.h                           |    4 +--
 Source/cmStandardIncludes.h                   |    6 +++++
 Source/cmTarget.cxx                           |   34 ++++++++++++-------------
 Source/cmTarget.h                             |   10 +++-----
 Source/cmTargetLinkLibrariesCommand.cxx       |   26 +++++++++----------
 Source/cmTargetLinkLibrariesCommand.h         |    2 +-
 Source/cmake.cxx                              |    2 +-
 15 files changed, 69 insertions(+), 65 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 09:43:47 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 09:43:47 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-393-gb78c76d
Message-ID: <20151010134347.DD88FBFC07@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b78c76d7528b2e2c76b6f88c50cf571e33e5e42b (commit)
       via  79a309d786abefef1a4f354c2973a14cba882850 (commit)
       via  e2eecae20517daa2bb292f85e161d5cebbc1f216 (commit)
       via  b5212c68def0395642fc51dcfd499557eb9481d9 (commit)
       via  95b0d761a75fd2da041eacc9ee22b89043ae301f (commit)
       via  6f02034e668a307587c2eb1aa0e342fd17ca103e (commit)
       via  435a2f3ccb51acf119cfa1671f1c5b344a7d47a0 (commit)
       via  062ed22ec43809068526706d2600297095412911 (commit)
       via  a02e53eb947b61dd25ecd139a213d4062fbc5b62 (commit)
       via  bec3487fa94093e696be170c4d85567c3c934545 (commit)
       via  e0f740f1b1708ac4ec43a57b8f1cbc549afe5df3 (commit)
       via  2afadb0d5ad21fbbcff961562ec441eb4ac001ab (commit)
       via  3d8c299f3ea024a309b05e0f21c7f002f43a5742 (commit)
       via  3fe240a79a53d8069ab51c4a44c4e1f5062983f1 (commit)
       via  9f6638c8a714c69a6039210267c4175813263d4f (commit)
      from  e37626a00ded5e9b36c6325d4b6f812b8c60be4f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b78c76d7528b2e2c76b6f88c50cf571e33e5e42b
commit b78c76d7528b2e2c76b6f88c50cf571e33e5e42b
Merge: e37626a 79a309d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 09:43:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 09:43:45 2015 -0400

    Merge topic 'refactor-cache-manager' into next
    
    79a309d7 cmState: Port away from cmake instance.
    e2eecae2 cmState: Move ParseCacheEntry from cmCacheManager.
    b5212c68 cmState: Add API for cache version.
    95b0d761 cmState: Externalize logic to caller.
    6f02034e cmState: Make AddCacheEntry method private.
    435a2f3c cmCacheManager: Port away from cmake instance.
    062ed22e cmState: Add cache file manipulation wrappers.
    a02e53eb Inline unary LoadCache.
    bec3487f cmCacheManager: Remove cmMakefile dependency.
    e0f740f1 Always cache entries through the cmake instance.
    2afadb0d cmake: Port away from trivial cmCacheManager use.
    3d8c299f cmake: Use existing cache API wrapper.
    3fe240a7 CMake Nightly Date Stamp
    9f6638c8 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79a309d786abefef1a4f354c2973a14cba882850
commit 79a309d786abefef1a4f354c2973a14cba882850
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:42:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:42:02 2015 +0200

    cmState: Port away from cmake instance.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index c5bbf42..72c7330 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -82,9 +82,8 @@ struct cmState::BuildsystemDirectoryStateType
   std::vector<cmState::Snapshot> Children;
 };
 
-cmState::cmState(cmake* cm)
-  : CMakeInstance(cm),
-    IsInTryCompile(false),
+cmState::cmState()
+  : IsInTryCompile(false),
     WindowsShell(false),
     WindowsVSIDE(false),
     WatcomWMake(false),
@@ -92,10 +91,12 @@ cmState::cmState(cmake* cm)
     NMake(false),
     MSYSShell(false)
 {
+  this->CacheManager = new cmCacheManager;
 }
 
 cmState::~cmState()
 {
+  delete this->CacheManager;
   cmDeleteAll(this->Commands);
 }
 
@@ -151,26 +152,26 @@ bool cmState::LoadCache(const std::string& path, bool internal,
                         std::set<std::string>& excludes,
                         std::set<std::string>& includes)
 {
-  return this->CMakeInstance->GetCacheManager()->LoadCache(path, internal,
-                                                    excludes, includes);
+  return this->CacheManager->LoadCache(path, internal,
+                                       excludes, includes);
 }
 
 bool cmState::SaveCache(const std::string& path)
 {
-  return this->CMakeInstance->GetCacheManager()->SaveCache(path);
+  return this->CacheManager->SaveCache(path);
 }
 
 bool cmState::DeleteCache(const std::string& path)
 {
-  return this->CMakeInstance->GetCacheManager()->DeleteCache(path);
+  return this->CacheManager->DeleteCache(path);
 }
 
 std::vector<std::string> cmState::GetCacheEntryKeys() const
 {
   std::vector<std::string> definitions;
-  definitions.reserve(this->CMakeInstance->GetCacheManager()->GetSize());
+  definitions.reserve(this->CacheManager->GetSize());
   cmCacheManager::CacheIterator cit =
-    this->CMakeInstance->GetCacheManager()->GetCacheIterator();
+    this->CacheManager->GetCacheIterator();
   for ( cit.Begin(); !cit.IsAtEnd(); cit.Next() )
     {
     definitions.push_back(cit.GetName());
@@ -180,7 +181,7 @@ std::vector<std::string> cmState::GetCacheEntryKeys() const
 
 const char* cmState::GetCacheEntryValue(std::string const& key) const
 {
-  cmCacheManager::CacheEntry* e = this->CMakeInstance->GetCacheManager()
+  cmCacheManager::CacheEntry* e = this->CacheManager
              ->GetCacheEntry(key);
   if (!e)
     {
@@ -192,21 +193,21 @@ const char* cmState::GetCacheEntryValue(std::string const& key) const
 const char*
 cmState::GetInitializedCacheValue(std::string const& key) const
 {
-  return this->CMakeInstance->GetCacheManager()->GetInitializedCacheValue(key);
+  return this->CacheManager->GetInitializedCacheValue(key);
 }
 
 cmState::CacheEntryType
 cmState::GetCacheEntryType(std::string const& key) const
 {
   cmCacheManager::CacheIterator it =
-      this->CMakeInstance->GetCacheManager()->GetCacheIterator(key.c_str());
+      this->CacheManager->GetCacheIterator(key.c_str());
   return it.GetType();
 }
 
 void cmState::SetCacheEntryValue(std::string const& key,
                                          std::string const& value)
 {
-  this->CMakeInstance->GetCacheManager()->SetCacheEntryValue(key, value);
+  this->CacheManager->SetCacheEntryValue(key, value);
 }
 
 void cmState::SetCacheEntryProperty(std::string const& key,
@@ -214,7 +215,7 @@ void cmState::SetCacheEntryProperty(std::string const& key,
                             std::string const& value)
 {
   cmCacheManager::CacheIterator it =
-      this->CMakeInstance->GetCacheManager()->GetCacheIterator(key.c_str());
+      this->CacheManager->GetCacheIterator(key.c_str());
   it.SetProperty(propertyName, value.c_str());
 }
 
@@ -223,14 +224,14 @@ void cmState::SetCacheEntryBoolProperty(std::string const& key,
                             bool value)
 {
   cmCacheManager::CacheIterator it =
-      this->CMakeInstance->GetCacheManager()->GetCacheIterator(key.c_str());
+      this->CacheManager->GetCacheIterator(key.c_str());
   it.SetProperty(propertyName, value);
 }
 
 const char* cmState::GetCacheEntryProperty(std::string const& key,
                                               std::string const& propertyName)
 {
-  cmCacheManager::CacheIterator it = this->CMakeInstance->GetCacheManager()
+  cmCacheManager::CacheIterator it = this->CacheManager
              ->GetCacheIterator(key.c_str());
   if (!it.PropertyExists(propertyName))
     {
@@ -242,7 +243,7 @@ const char* cmState::GetCacheEntryProperty(std::string const& key,
 bool cmState::GetCacheEntryPropertyAsBool(std::string const& key,
                                               std::string const& propertyName)
 {
-  return this->CMakeInstance->GetCacheManager()
+  return this->CacheManager
              ->GetCacheIterator(key.c_str()).GetPropertyAsBool(propertyName);
 }
 
@@ -250,13 +251,13 @@ void cmState::AddCacheEntry(const std::string& key, const char* value,
                                     const char* helpString,
                                     cmState::CacheEntryType type)
 {
-  this->CMakeInstance->GetCacheManager()->AddCacheEntry(key, value,
+  this->CacheManager->AddCacheEntry(key, value,
                                                         helpString, type);
 }
 
 void cmState::RemoveCacheEntry(std::string const& key)
 {
-  this->CMakeInstance->GetCacheManager()->RemoveCacheEntry(key);
+  this->CacheManager->RemoveCacheEntry(key);
 }
 
 void cmState::AppendCacheEntryProperty(const std::string& key,
@@ -264,7 +265,7 @@ void cmState::AppendCacheEntryProperty(const std::string& key,
                                                const std::string& value,
                                                bool asString)
 {
-  this->CMakeInstance->GetCacheManager()
+  this->CacheManager
        ->GetCacheIterator(key.c_str()).AppendProperty(property,
                                                        value.c_str(),
                                                        asString);
@@ -273,7 +274,7 @@ void cmState::AppendCacheEntryProperty(const std::string& key,
 void cmState::RemoveCacheEntryProperty(std::string const& key,
                                               std::string const& propertyName)
 {
-  this->CMakeInstance->GetCacheManager()
+  this->CacheManager
        ->GetCacheIterator(key.c_str()).SetProperty(propertyName, (void*)0);
 }
 
@@ -679,12 +680,12 @@ bool cmState::UseMSYSShell() const
 
 unsigned int cmState::GetCacheMajorVersion() const
 {
-  return this->CMakeInstance->GetCacheManager()->GetCacheMajorVersion();
+  return this->CacheManager->GetCacheMajorVersion();
 }
 
 unsigned int cmState::GetCacheMinorVersion() const
 {
-  return this->CMakeInstance->GetCacheManager()->GetCacheMinorVersion();
+  return this->CacheManager->GetCacheMinorVersion();
 }
 
 const char* cmState::GetBinaryDirectory() const
diff --git a/Source/cmState.h b/Source/cmState.h
index fbc9275..2f66f7f 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -23,6 +23,7 @@ class cmake;
 class cmCommand;
 class cmDefinitions;
 class cmListFileBacktrace;
+class cmCacheManager;
 
 class cmState
 {
@@ -32,7 +33,7 @@ class cmState
   typedef cmLinkedTree<SnapshotDataType>::iterator PositionType;
   friend class Snapshot;
 public:
-  cmState(cmake* cm);
+  cmState();
   ~cmState();
 
   enum SnapshotType
@@ -320,7 +321,7 @@ private:
   std::vector<std::string> EnabledLanguages;
   std::map<std::string, cmCommand*> Commands;
   cmPropertyMap GlobalProperties;
-  cmake* CMakeInstance;
+  cmCacheManager* CacheManager;
 
   cmLinkedTree<BuildsystemDirectoryStateType> BuildsystemDirectory;
 
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index b1c2709..6846f1b 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmake.h"
-#include "cmCacheManager.h"
 #include "cmMakefile.h"
 #include "cmLocalGenerator.h"
 #include "cmExternalMakefileProjectGenerator.h"
@@ -135,7 +134,7 @@ cmake::cmake()
   this->ClearBuildSystem = false;
   this->FileComparison = new cmFileTimeComparison;
 
-  this->State = new cmState(this);
+  this->State = new cmState;
   this->CurrentSnapshot = this->State->CreateBaseSnapshot();
 
 #ifdef __APPLE__
@@ -151,7 +150,6 @@ cmake::cmake()
 #endif
 
   this->Verbose = false;
-  this->CacheManager = new cmCacheManager;
   this->GlobalGenerator = 0;
   this->ProgressCallback = 0;
   this->ProgressCallbackClientData = 0;
@@ -171,7 +169,6 @@ cmake::cmake()
 
 cmake::~cmake()
 {
-  delete this->CacheManager;
   delete this->State;
   if (this->GlobalGenerator)
     {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2eecae20517daa2bb292f85e161d5cebbc1f216
commit e2eecae20517daa2bb292f85e161d5cebbc1f216
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:08:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:36:59 2015 +0200

    cmState: Move ParseCacheEntry from cmCacheManager.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index bfa60b3..ce8af55 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -27,90 +27,6 @@ cmCacheManager::cmCacheManager()
   this->CacheMinorVersion = 0;
 }
 
-static bool ParseEntryWithoutType(const std::string& entry,
-                                  std::string& var,
-                                  std::string& value)
-{
-  // input line is:         key=value
-  static cmsys::RegularExpression reg(
-    "^([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
-  // input line is:         "key"=value
-  static cmsys::RegularExpression regQuoted(
-    "^\"([^\"]*)\"=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
-  bool flag = false;
-  if(regQuoted.find(entry))
-    {
-    var = regQuoted.match(1);
-    value = regQuoted.match(2);
-    flag = true;
-    }
-  else if (reg.find(entry))
-    {
-    var = reg.match(1);
-    value = reg.match(2);
-    flag = true;
-    }
-
-  // if value is enclosed in single quotes ('foo') then remove them
-  // it is used to enclose trailing space or tab
-  if (flag &&
-      value.size() >= 2 &&
-      value[0] == '\'' &&
-      value[value.size() - 1] == '\'')
-    {
-    value = value.substr(1,
-                         value.size() - 2);
-    }
-
-  return flag;
-}
-
-bool cmCacheManager::ParseEntry(const std::string& entry,
-                                std::string& var,
-                                std::string& value,
-                                cmState::CacheEntryType& type)
-{
-  // input line is:         key:type=value
-  static cmsys::RegularExpression reg(
-    "^([^=:]*):([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
-  // input line is:         "key":type=value
-  static cmsys::RegularExpression regQuoted(
-    "^\"([^\"]*)\":([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
-  bool flag = false;
-  if(regQuoted.find(entry))
-    {
-    var = regQuoted.match(1);
-    type = cmState::StringToCacheEntryType(regQuoted.match(2).c_str());
-    value = regQuoted.match(3);
-    flag = true;
-    }
-  else if (reg.find(entry))
-    {
-    var = reg.match(1);
-    type = cmState::StringToCacheEntryType(reg.match(2).c_str());
-    value = reg.match(3);
-    flag = true;
-    }
-
-  // if value is enclosed in single quotes ('foo') then remove them
-  // it is used to enclose trailing space or tab
-  if (flag &&
-      value.size() >= 2 &&
-      value[0] == '\'' &&
-      value[value.size() - 1] == '\'')
-    {
-    value = value.substr(1,
-                         value.size() - 2);
-    }
-
-  if (!flag)
-    {
-    return ParseEntryWithoutType(entry, var, value);
-    }
-
-  return flag;
-}
-
 void cmCacheManager::CleanCMakeFiles(const std::string& path)
 {
   std::string glob = path;
@@ -187,7 +103,7 @@ bool cmCacheManager::LoadCache(const std::string& path,
         }
       }
     e.SetProperty("HELPSTRING", helpString.c_str());
-    if(cmCacheManager::ParseEntry(realbuffer, entryKey, e.Value, e.Type))
+    if(cmState::ParseCacheEntry(realbuffer, entryKey, e.Value, e.Type))
       {
       if ( excludes.find(entryKey) == excludes.end() )
         {
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 2440066..6f063eb 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -121,12 +121,6 @@ public:
   int GetSize() {
     return static_cast<int>(this->Cache.size()); }
 
-  ///! Break up a line like VAR:type="value" into var, type and value
-  static bool ParseEntry(const std::string& entry,
-                         std::string& var,
-                         std::string& value,
-                         cmState::CacheEntryType& type);
-
   ///! Get a value from the cache given a key
   const char* GetInitializedCacheValue(const std::string& key) const;
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 3aad7f5..c5bbf42 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1769,3 +1769,87 @@ bool operator!=(const cmState::Snapshot& lhs, const cmState::Snapshot& rhs)
 {
   return lhs.Position != rhs.Position;
 }
+
+static bool ParseEntryWithoutType(const std::string& entry,
+                                  std::string& var,
+                                  std::string& value)
+{
+  // input line is:         key=value
+  static cmsys::RegularExpression reg(
+    "^([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
+  // input line is:         "key"=value
+  static cmsys::RegularExpression regQuoted(
+    "^\"([^\"]*)\"=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
+  bool flag = false;
+  if(regQuoted.find(entry))
+    {
+    var = regQuoted.match(1);
+    value = regQuoted.match(2);
+    flag = true;
+    }
+  else if (reg.find(entry))
+    {
+    var = reg.match(1);
+    value = reg.match(2);
+    flag = true;
+    }
+
+  // if value is enclosed in single quotes ('foo') then remove them
+  // it is used to enclose trailing space or tab
+  if (flag &&
+      value.size() >= 2 &&
+      value[0] == '\'' &&
+      value[value.size() - 1] == '\'')
+    {
+    value = value.substr(1,
+                         value.size() - 2);
+    }
+
+  return flag;
+}
+
+bool cmState::ParseCacheEntry(const std::string& entry,
+                                std::string& var,
+                                std::string& value,
+                                CacheEntryType& type)
+{
+  // input line is:         key:type=value
+  static cmsys::RegularExpression reg(
+    "^([^=:]*):([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
+  // input line is:         "key":type=value
+  static cmsys::RegularExpression regQuoted(
+    "^\"([^\"]*)\":([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
+  bool flag = false;
+  if(regQuoted.find(entry))
+    {
+    var = regQuoted.match(1);
+    type = cmState::StringToCacheEntryType(regQuoted.match(2).c_str());
+    value = regQuoted.match(3);
+    flag = true;
+    }
+  else if (reg.find(entry))
+    {
+    var = reg.match(1);
+    type = cmState::StringToCacheEntryType(reg.match(2).c_str());
+    value = reg.match(3);
+    flag = true;
+    }
+
+  // if value is enclosed in single quotes ('foo') then remove them
+  // it is used to enclose trailing space or tab
+  if (flag &&
+      value.size() >= 2 &&
+      value[0] == '\'' &&
+      value[value.size() - 1] == '\'')
+    {
+    value = value.substr(1,
+                         value.size() - 2);
+    }
+
+  if (!flag)
+    {
+    return ParseEntryWithoutType(entry, var, value);
+    }
+
+  return flag;
+}
diff --git a/Source/cmState.h b/Source/cmState.h
index 4c32831..fbc9275 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -242,6 +242,12 @@ public:
   void RemoveCacheEntryProperty(std::string const& key,
                                 std::string const& propertyName);
 
+  ///! Break up a line like VAR:type="value" into var, type and value
+  static bool ParseCacheEntry(const std::string& entry,
+                              std::string& var,
+                              std::string& value,
+                              CacheEntryType& type);
+
   Snapshot Reset();
   // Define a property
   void DefineProperty(const std::string& name, cmProperty::ScopeType scope,
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index b90ac69..b1c2709 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -216,7 +216,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
         }
       std::string var, value;
       cmState::CacheEntryType type = cmState::UNINITIALIZED;
-      if(cmCacheManager::ParseEntry(entry, var, value, type))
+      if(cmState::ParseCacheEntry(entry, var, value, type))
         {
         // The value is transformed if it is a filepath for example, so
         // we can't compare whether the value is already in the cache until
@@ -1722,7 +1722,7 @@ bool cmake::ParseCacheEntry(const std::string& entry,
                             std::string& value,
                             cmState::CacheEntryType& type)
 {
-  return cmCacheManager::ParseEntry(entry, var, value, type);
+  return cmState::ParseCacheEntry(entry, var, value, type);
 }
 
 int cmake::LoadCache()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5212c68def0395642fc51dcfd499557eb9481d9
commit b5212c68def0395642fc51dcfd499557eb9481d9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 14:34:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:36:58 2015 +0200

    cmState: Add API for cache version.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 7da334e..6fa4ebb 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -51,14 +51,14 @@ void CCONV cmSetError(void *info, const char *err)
 unsigned int CCONV  cmGetCacheMajorVersion(void *arg)
 {
   cmMakefile *mf = static_cast<cmMakefile *>(arg);
-  cmCacheManager *manager = mf->GetCMakeInstance()->GetCacheManager();
-  return manager->GetCacheMajorVersion();
+  cmState *state = mf->GetState();
+  return state->GetCacheMajorVersion();
 }
 unsigned int CCONV cmGetCacheMinorVersion(void *arg)
 {
   cmMakefile *mf = static_cast<cmMakefile *>(arg);
-  cmCacheManager *manager = mf->GetCMakeInstance()->GetCacheManager();
-  return manager->GetCacheMinorVersion();
+  cmState *state = mf->GetState();
+  return state->GetCacheMinorVersion();
 }
 
 unsigned int CCONV cmGetMajorVersion(void *)
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 9628265..3aad7f5 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -677,6 +677,16 @@ bool cmState::UseMSYSShell() const
   return this->MSYSShell;
 }
 
+unsigned int cmState::GetCacheMajorVersion() const
+{
+  return this->CMakeInstance->GetCacheManager()->GetCacheMajorVersion();
+}
+
+unsigned int cmState::GetCacheMinorVersion() const
+{
+  return this->CMakeInstance->GetCacheManager()->GetCacheMinorVersion();
+}
+
 const char* cmState::GetBinaryDirectory() const
 {
   return this->BinaryDirectory.c_str();
diff --git a/Source/cmState.h b/Source/cmState.h
index e71668f..4c32831 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -302,6 +302,9 @@ public:
   void SetMSYSShell(bool mSYSShell);
   bool UseMSYSShell() const;
 
+  unsigned int GetCacheMajorVersion() const;
+  unsigned int GetCacheMinorVersion() const;
+
 private:
   friend class cmake;
   void AddCacheEntry(const std::string& key, const char* value,
diff --git a/Source/cmUtilitySourceCommand.cxx b/Source/cmUtilitySourceCommand.cxx
index 486328f..3f1e333 100644
--- a/Source/cmUtilitySourceCommand.cxx
+++ b/Source/cmUtilitySourceCommand.cxx
@@ -11,8 +11,6 @@
 ============================================================================*/
 #include "cmUtilitySourceCommand.h"
 
-#include "cmCacheManager.h"
-
 // cmUtilitySourceCommand
 bool cmUtilitySourceCommand
 ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
@@ -54,13 +52,13 @@ bool cmUtilitySourceCommand
     }
   else
     {
-    cmCacheManager *manager =
-        this->Makefile->GetCMakeInstance()->GetCacheManager();
+    cmState *state =
+        this->Makefile->GetState();
     haveCacheValue = (cacheValue &&
      (strstr(cacheValue, "(IntDir)") == 0 ||
       (intDir && strcmp(intDir, "$(IntDir)") == 0)) &&
-     (manager->GetCacheMajorVersion() != 0 &&
-      manager->GetCacheMinorVersion() != 0 ));
+     (state->GetCacheMajorVersion() != 0 &&
+      state->GetCacheMinorVersion() != 0 ));
     }
 
   if(haveCacheValue)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95b0d761a75fd2da041eacc9ee22b89043ae301f
commit 95b0d761a75fd2da041eacc9ee22b89043ae301f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 14:31:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:36:58 2015 +0200

    cmState: Externalize logic to caller.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index a42d075..9628265 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -252,7 +252,6 @@ void cmState::AddCacheEntry(const std::string& key, const char* value,
 {
   this->CMakeInstance->GetCacheManager()->AddCacheEntry(key, value,
                                                         helpString, type);
-  this->CMakeInstance->UnwatchUnusedCli(key);
 }
 
 void cmState::RemoveCacheEntry(std::string const& key)
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 69a3f03..b90ac69 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1644,6 +1644,7 @@ void cmake::AddCacheEntry(const std::string& key, const char* value,
   this->State->AddCacheEntry(key, value,
                                     helpString,
                                     cmState::CacheEntryType(type));
+  this->UnwatchUnusedCli(key);
 }
 
 const char* cmake::GetCacheDefinition(const std::string& name) const

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f02034e668a307587c2eb1aa0e342fd17ca103e
commit 6f02034e668a307587c2eb1aa0e342fd17ca103e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:05:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:36:58 2015 +0200

    cmState: Make AddCacheEntry method private.

diff --git a/Source/cmState.h b/Source/cmState.h
index 3f0ac77..e71668f 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -223,8 +223,6 @@ public:
   void SetCacheEntryValue(std::string const& key, std::string const& value);
   void SetCacheValue(std::string const& key, std::string const& value);
 
-  void AddCacheEntry(const std::string& key, const char* value,
-                     const char* helpString, CacheEntryType type);
   void RemoveCacheEntry(std::string const& key);
 
   void SetCacheEntryProperty(std::string const& key,
@@ -305,6 +303,10 @@ public:
   bool UseMSYSShell() const;
 
 private:
+  friend class cmake;
+  void AddCacheEntry(const std::string& key, const char* value,
+                     const char* helpString, CacheEntryType type);
+
   std::map<cmProperty::ScopeType, cmPropertyDefinitionMap> PropertyDefinitions;
   std::vector<std::string> EnabledLanguages;
   std::map<std::string, cmCommand*> Commands;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=435a2f3ccb51acf119cfa1671f1c5b344a7d47a0
commit 435a2f3ccb51acf119cfa1671f1c5b344a7d47a0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 14:26:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:36:58 2015 +0200

    cmCacheManager: Port away from cmake instance.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 9dac27b..bfa60b3 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -21,11 +21,10 @@
 #include <cmsys/FStream.hxx>
 #include <cmsys/RegularExpression.hxx>
 
-cmCacheManager::cmCacheManager(cmake* cm)
+cmCacheManager::cmCacheManager()
 {
   this->CacheMajorVersion = 0;
   this->CacheMinorVersion = 0;
-  this->CMakeInstance = cm;
 }
 
 static bool ParseEntryWithoutType(const std::string& entry,
@@ -671,7 +670,6 @@ void cmCacheManager::AddCacheEntry(const std::string& key,
     }
   e.SetProperty("HELPSTRING", helpString? helpString :
                 "(This variable does not exist and should not be used)");
-  this->CMakeInstance->UnwatchUnusedCli(key);
 }
 
 bool cmCacheManager::CacheIterator::IsAtEnd() const
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 76533b5..2440066 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -17,7 +17,6 @@
 #include "cmState.h"
 
 class cmMarkAsAdvancedCommand;
-class cmake;
 
 /** \class cmCacheManager
  * \brief Control class for cmake's cache
@@ -28,7 +27,7 @@ class cmake;
 class cmCacheManager
 {
 public:
-  cmCacheManager(cmake* cm);
+  cmCacheManager();
   class CacheIterator;
   friend class cmCacheManager::CacheIterator;
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 9628265..a42d075 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -252,6 +252,7 @@ void cmState::AddCacheEntry(const std::string& key, const char* value,
 {
   this->CMakeInstance->GetCacheManager()->AddCacheEntry(key, value,
                                                         helpString, type);
+  this->CMakeInstance->UnwatchUnusedCli(key);
 }
 
 void cmState::RemoveCacheEntry(std::string const& key)
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 4fc48d5..69a3f03 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -151,7 +151,7 @@ cmake::cmake()
 #endif
 
   this->Verbose = false;
-  this->CacheManager = new cmCacheManager(this);
+  this->CacheManager = new cmCacheManager;
   this->GlobalGenerator = 0;
   this->ProgressCallback = 0;
   this->ProgressCallbackClientData = 0;
@@ -1760,12 +1760,30 @@ bool cmake::LoadCache(const std::string& path, bool internal,
                 std::set<std::string>& excludes,
                 std::set<std::string>& includes)
 {
-  return this->State->LoadCache(path, internal, excludes, includes);
+  bool result = this->State->LoadCache(path, internal, excludes, includes);
+  static const char* entries[] = {"CMAKE_CACHE_MAJOR_VERSION",
+                                  "CMAKE_CACHE_MINOR_VERSION"};
+  for (const char* const* nameIt = cmArrayBegin(entries);
+       nameIt != cmArrayEnd(entries); ++nameIt)
+    {
+    this->UnwatchUnusedCli(*nameIt);
+    }
+  return result;
 }
 
 bool cmake::SaveCache(const std::string& path)
 {
-  return this->State->SaveCache(path);
+  bool result = this->State->SaveCache(path);
+  static const char* entries[] = {"CMAKE_CACHE_MAJOR_VERSION",
+                                  "CMAKE_CACHE_MINOR_VERSION",
+                                  "CMAKE_CACHE_PATCH_VERSION",
+                                  "CMAKE_CACHEFILE_DIR"};
+  for (const char* const* nameIt = cmArrayBegin(entries);
+       nameIt != cmArrayEnd(entries); ++nameIt)
+    {
+    this->UnwatchUnusedCli(*nameIt);
+    }
+  return result;
 }
 
 bool cmake::DeleteCache(const std::string& path)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=062ed22ec43809068526706d2600297095412911
commit 062ed22ec43809068526706d2600297095412911
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:21:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:36:58 2015 +0200

    cmState: Add cache file manipulation wrappers.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index db7519b..9628265 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -147,6 +147,24 @@ bool cmState::IsCacheEntryType(std::string const& key)
   return false;
 }
 
+bool cmState::LoadCache(const std::string& path, bool internal,
+                        std::set<std::string>& excludes,
+                        std::set<std::string>& includes)
+{
+  return this->CMakeInstance->GetCacheManager()->LoadCache(path, internal,
+                                                    excludes, includes);
+}
+
+bool cmState::SaveCache(const std::string& path)
+{
+  return this->CMakeInstance->GetCacheManager()->SaveCache(path);
+}
+
+bool cmState::DeleteCache(const std::string& path)
+{
+  return this->CMakeInstance->GetCacheManager()->DeleteCache(path);
+}
+
 std::vector<std::string> cmState::GetCacheEntryKeys() const
 {
   std::vector<std::string> definitions;
diff --git a/Source/cmState.h b/Source/cmState.h
index 1ffc4bf..3f0ac77 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -208,6 +208,14 @@ public:
   static const char* CacheEntryTypeToString(CacheEntryType);
   static bool IsCacheEntryType(std::string const& key);
 
+  bool LoadCache(const std::string& path, bool internal,
+                 std::set<std::string>& excludes,
+                 std::set<std::string>& includes);
+
+  bool SaveCache(const std::string& path) ;
+
+  bool DeleteCache(const std::string& path);
+
   std::vector<std::string> GetCacheEntryKeys() const;
   const char* GetCacheEntryValue(std::string const& key) const;
   const char* GetInitializedCacheValue(std::string const& key) const;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index ad5f6b7..4fc48d5 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1760,17 +1760,17 @@ bool cmake::LoadCache(const std::string& path, bool internal,
                 std::set<std::string>& excludes,
                 std::set<std::string>& includes)
 {
-  return this->CacheManager->LoadCache(path, internal, excludes, includes);
+  return this->State->LoadCache(path, internal, excludes, includes);
 }
 
 bool cmake::SaveCache(const std::string& path)
 {
-  return this->CacheManager->SaveCache(path);
+  return this->State->SaveCache(path);
 }
 
 bool cmake::DeleteCache(const std::string& path)
 {
-  return this->CacheManager->DeleteCache(path);
+  return this->State->DeleteCache(path);
 }
 
 void cmake::SetProgressCallback(ProgressCallbackType f, void *cd)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a02e53eb947b61dd25ecd139a213d4062fbc5b62
commit a02e53eb947b61dd25ecd139a213d4062fbc5b62
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:13:08 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:36:57 2015 +0200

    Inline unary LoadCache.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index a7777d9..9dac27b 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -28,12 +28,6 @@ cmCacheManager::cmCacheManager(cmake* cm)
   this->CMakeInstance = cm;
 }
 
-bool cmCacheManager::LoadCache(const std::string& path)
-{
-  std::set<std::string> emptySet;
-  return this->LoadCache(path, true, emptySet, emptySet);
-}
-
 static bool ParseEntryWithoutType(const std::string& entry,
                                   std::string& var,
                                   std::string& value)
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index b779ba3..76533b5 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -99,7 +99,6 @@ public:
     }
 
   ///! Load a cache for given makefile.  Loads from path/CMakeCache.txt.
-  bool LoadCache(const std::string& path);
   bool LoadCache(const std::string& path, bool internal,
                  std::set<std::string>& excludes,
                  std::set<std::string>& includes);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 8016e41..ad5f6b7 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1752,7 +1752,8 @@ int cmake::LoadCache()
 
 bool cmake::LoadCache(const std::string& path)
 {
-  return this->CacheManager->LoadCache(path);
+  std::set<std::string> emptySet;
+  return this->LoadCache(path, true, emptySet, emptySet);
 }
 
 bool cmake::LoadCache(const std::string& path, bool internal,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bec3487fa94093e696be170c4d85567c3c934545
commit bec3487fa94093e696be170c4d85567c3c934545
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 14:23:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:36:57 2015 +0200

    cmCacheManager: Remove cmMakefile dependency.
    
    Update comment.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 54209c5..a7777d9 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -13,7 +13,6 @@
 #include "cmCacheManager.h"
 #include "cmSystemTools.h"
 #include "cmGeneratedFileStream.h"
-#include "cmMakefile.h"
 #include "cmake.h"
 #include "cmVersion.h"
 
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 8462259..b779ba3 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -16,7 +16,6 @@
 #include "cmPropertyMap.h"
 #include "cmState.h"
 
-class cmMakefile;
 class cmMarkAsAdvancedCommand;
 class cmake;
 
@@ -241,7 +240,7 @@ private:
   void WritePropertyEntries(std::ostream& os, CacheIterator const& i);
 
   CacheEntryMap Cache;
-  // Only cmake and cmMakefile should be able to add cache values
+  // Only cmake and cmState should be able to add cache values
   // the commands should never use the cmCacheManager directly
   friend class cmState; // allow access to add cache values
   friend class cmake; // allow access to add cache values

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0f740f1b1708ac4ec43a57b8f1cbc549afe5df3
commit e0f740f1b1708ac4ec43a57b8f1cbc549afe5df3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:03:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:36:57 2015 +0200

    Always cache entries through the cmake instance.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c060505..7866c6b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1908,13 +1908,13 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value,
         nvalue += files[cc];
         }
 
-      this->GetState()->AddCacheEntry(name, nvalue.c_str(), doc, type);
+      this->GetCMakeInstance()->AddCacheEntry(name, nvalue.c_str(), doc, type);
       val = this->GetState()->GetInitializedCacheValue(name);
       haveVal = true;
       }
 
     }
-  this->GetState()->AddCacheEntry(name, haveVal ? val.c_str() : 0,
+  this->GetCMakeInstance()->AddCacheEntry(name, haveVal ? val.c_str() : 0,
                                           doc, type);
   // if there was a definition then remove it
   this->StateSnapshot.RemoveDefinition(name);
diff --git a/Source/cmMarkAsAdvancedCommand.cxx b/Source/cmMarkAsAdvancedCommand.cxx
index 10d30f3..8d0e2b3 100644
--- a/Source/cmMarkAsAdvancedCommand.cxx
+++ b/Source/cmMarkAsAdvancedCommand.cxx
@@ -39,7 +39,8 @@ bool cmMarkAsAdvancedCommand
     cmState* state = this->Makefile->GetState();
     if (!state->GetCacheEntryValue(variable))
       {
-      state->AddCacheEntry(variable, 0, 0, cmState::UNINITIALIZED);
+      this->Makefile->GetCMakeInstance()->AddCacheEntry(
+              variable, 0, 0, cmState::UNINITIALIZED);
       overwrite = true;
       }
     if (!state->GetCacheEntryValue(variable))

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2afadb0d5ad21fbbcff961562ec441eb4ac001ab
commit 2afadb0d5ad21fbbcff961562ec441eb4ac001ab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 14:42:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:10:23 2015 +0200

    cmake: Port away from trivial cmCacheManager use.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 431ef0e..8016e41 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1086,10 +1086,10 @@ int cmake::DoPreConfigureChecks()
     }
 
   // do a sanity check on some values
-  if(this->CacheManager->GetInitializedCacheValue("CMAKE_HOME_DIRECTORY"))
+  if(this->State->GetInitializedCacheValue("CMAKE_HOME_DIRECTORY"))
     {
     std::string cacheStart =
-      this->CacheManager->GetInitializedCacheValue("CMAKE_HOME_DIRECTORY");
+      this->State->GetInitializedCacheValue("CMAKE_HOME_DIRECTORY");
     cacheStart += "/CMakeLists.txt";
     std::string currentStart = this->GetHomeDirectory();
     currentStart += "/CMakeLists.txt";
@@ -1146,12 +1146,12 @@ int cmake::HandleDeleteCacheVariables(const std::string& var)
     save.value = *i;
     warning << *i << "\n";
     const char* existingValue =
-        this->CacheManager->GetCacheEntryValue(save.key);
+        this->State->GetCacheEntryValue(save.key);
     if(existingValue)
       {
-      save.type = this->CacheManager->GetCacheEntryType(save.key);
+      save.type = this->State->GetCacheEntryType(save.key);
       if(const char* help =
-            this->CacheManager->GetCacheEntryProperty(save.key, "HELPSTRING"))
+            this->State->GetCacheEntryProperty(save.key, "HELPSTRING"))
         {
         save.help = help;
         }
@@ -1160,7 +1160,7 @@ int cmake::HandleDeleteCacheVariables(const std::string& var)
     }
 
   // remove the cache
-  this->CacheManager->DeleteCache(this->GetHomeOutputDirectory());
+  this->DeleteCache(this->GetHomeOutputDirectory());
   // load the empty cache
   this->LoadCache();
   // restore the changed compilers
@@ -1241,9 +1241,9 @@ int cmake::ActualConfigure()
   if(!this->GlobalGenerator)
     {
     const char* genName =
-      this->CacheManager->GetInitializedCacheValue("CMAKE_GENERATOR");
+      this->State->GetInitializedCacheValue("CMAKE_GENERATOR");
     const char* extraGenName =
-      this->CacheManager->GetInitializedCacheValue("CMAKE_EXTRA_GENERATOR");
+      this->State->GetInitializedCacheValue("CMAKE_EXTRA_GENERATOR");
     if(genName)
       {
       std::string fullName = cmExternalMakefileProjectGenerator::
@@ -1321,7 +1321,7 @@ int cmake::ActualConfigure()
       }
     }
 
-  const char* genName = this->CacheManager
+  const char* genName = this->State
                             ->GetInitializedCacheValue("CMAKE_GENERATOR");
   if(genName)
     {
@@ -1338,7 +1338,7 @@ int cmake::ActualConfigure()
       return -2;
       }
     }
-  if(!this->CacheManager->GetInitializedCacheValue("CMAKE_GENERATOR"))
+  if(!this->State->GetInitializedCacheValue("CMAKE_GENERATOR"))
     {
     this->AddCacheEntry("CMAKE_GENERATOR",
                                       this->GlobalGenerator->GetName().c_str(),
@@ -1351,7 +1351,7 @@ int cmake::ActualConfigure()
     }
 
   if(const char* platformName =
-     this->CacheManager->GetInitializedCacheValue("CMAKE_GENERATOR_PLATFORM"))
+     this->State->GetInitializedCacheValue("CMAKE_GENERATOR_PLATFORM"))
     {
     if(this->GeneratorPlatform.empty())
       {
@@ -1379,7 +1379,7 @@ int cmake::ActualConfigure()
     }
 
   if(const char* tsName =
-     this->CacheManager->GetInitializedCacheValue("CMAKE_GENERATOR_TOOLSET"))
+     this->State->GetInitializedCacheValue("CMAKE_GENERATOR_TOOLSET"))
     {
     if(this->GeneratorToolset.empty())
       {
@@ -1462,7 +1462,7 @@ int cmake::ActualConfigure()
   // only save the cache if there were no fatal errors
   if ( this->GetWorkingMode() == NORMAL_MODE )
     {
-    this->CacheManager->SaveCache(this->GetHomeOutputDirectory());
+    this->SaveCache(this->GetHomeOutputDirectory());
     }
   if(cmSystemTools::GetErrorOccuredFlag())
     {
@@ -1632,7 +1632,7 @@ int cmake::Generate()
   // for the Visual Studio and Xcode generators.)
   if ( this->GetWorkingMode() == NORMAL_MODE )
     {
-    this->CacheManager->SaveCache(this->GetHomeOutputDirectory());
+    this->SaveCache(this->GetHomeOutputDirectory());
     }
   return 0;
 }
@@ -1641,14 +1641,14 @@ void cmake::AddCacheEntry(const std::string& key, const char* value,
                           const char* helpString,
                           int type)
 {
-  this->CacheManager->AddCacheEntry(key, value,
+  this->State->AddCacheEntry(key, value,
                                     helpString,
                                     cmState::CacheEntryType(type));
 }
 
 const char* cmake::GetCacheDefinition(const std::string& name) const
 {
-  return this->CacheManager->GetInitializedCacheValue(name);
+  return this->State->GetInitializedCacheValue(name);
 }
 
 void cmake::AddDefaultCommands()
@@ -1834,7 +1834,7 @@ void cmake::UpdateConversionPathTable()
 {
   // Update the path conversion table with any specified file:
   const char* tablepath =
-    this->CacheManager
+    this->State
         ->GetInitializedCacheValue("CMAKE_PATH_TRANSLATION_FILE");
 
   if(tablepath)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d8c299f3ea024a309b05e0f21c7f002f43a5742
commit 3d8c299f3ea024a309b05e0f21c7f002f43a5742
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 14:53:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 14:56:44 2015 +0200

    cmake: Use existing cache API wrapper.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index fececfd..431ef0e 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -232,7 +232,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
             }
           }
 
-        this->State->AddCacheEntry(var, value.c_str(),
+        this->AddCacheEntry(var, value.c_str(),
           "No help, variable specified on the command line.", type);
 
         if(this->WarnUnusedCli)
@@ -848,14 +848,14 @@ void cmake::SetDirectoriesFromFile(const char* arg)
 int cmake::AddCMakePaths()
 {
   // Save the value in the cache
-  this->CacheManager->AddCacheEntry
+  this->AddCacheEntry
     ("CMAKE_COMMAND", cmSystemTools::GetCMakeCommand().c_str(),
      "Path to CMake executable.", cmState::INTERNAL);
 #ifdef CMAKE_BUILD_WITH_CMAKE
-  this->CacheManager->AddCacheEntry
+  this->AddCacheEntry
     ("CMAKE_CTEST_COMMAND", cmSystemTools::GetCTestCommand().c_str(),
      "Path to ctest program executable.", cmState::INTERNAL);
-  this->CacheManager->AddCacheEntry
+  this->AddCacheEntry
     ("CMAKE_CPACK_COMMAND", cmSystemTools::GetCPackCommand().c_str(),
      "Path to cpack program executable.", cmState::INTERNAL);
 #endif
@@ -869,7 +869,7 @@ int cmake::AddCMakePaths()
       cmSystemTools::GetCMakeRoot().c_str());
     return 0;
     }
-  this->CacheManager->AddCacheEntry
+  this->AddCacheEntry
     ("CMAKE_ROOT", cmSystemTools::GetCMakeRoot().c_str(),
      "Path to CMake installation.", cmState::INTERNAL);
 
@@ -1186,7 +1186,7 @@ int cmake::Configure()
     {
     if(this->SuppressDevWarnings)
       {
-      this->CacheManager->
+      this->
         AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "TRUE",
                       "Suppress Warnings that are meant for"
                       " the author of the CMakeLists.txt files.",
@@ -1194,7 +1194,7 @@ int cmake::Configure()
       }
     else
       {
-      this->CacheManager->
+      this->
         AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "FALSE",
                       "Suppress Warnings that are meant for"
                       " the author of the CMakeLists.txt files.",
@@ -1229,7 +1229,7 @@ int cmake::ActualConfigure()
     }
   if ( !res )
     {
-    this->CacheManager->AddCacheEntry
+    this->AddCacheEntry
       ("CMAKE_HOME_DIRECTORY",
        this->GetHomeDirectory(),
        "Source directory with the top level CMakeLists.txt file for this "
@@ -1340,11 +1340,11 @@ int cmake::ActualConfigure()
     }
   if(!this->CacheManager->GetInitializedCacheValue("CMAKE_GENERATOR"))
     {
-    this->CacheManager->AddCacheEntry("CMAKE_GENERATOR",
+    this->AddCacheEntry("CMAKE_GENERATOR",
                                       this->GlobalGenerator->GetName().c_str(),
                                       "Name of generator.",
                                       cmState::INTERNAL);
-    this->CacheManager->AddCacheEntry("CMAKE_EXTRA_GENERATOR",
+    this->AddCacheEntry("CMAKE_EXTRA_GENERATOR",
                         this->GlobalGenerator->GetExtraGeneratorName().c_str(),
                         "Name of external makefile project generator.",
                         cmState::INTERNAL);
@@ -1372,7 +1372,7 @@ int cmake::ActualConfigure()
     }
   else
     {
-    this->CacheManager->AddCacheEntry("CMAKE_GENERATOR_PLATFORM",
+    this->AddCacheEntry("CMAKE_GENERATOR_PLATFORM",
                                       this->GeneratorPlatform.c_str(),
                                       "Name of generator platform.",
                                       cmState::INTERNAL);
@@ -1400,7 +1400,7 @@ int cmake::ActualConfigure()
     }
   else
     {
-    this->CacheManager->AddCacheEntry("CMAKE_GENERATOR_TOOLSET",
+    this->AddCacheEntry("CMAKE_GENERATOR_TOOLSET",
                                       this->GeneratorToolset.c_str(),
                                       "Name of generator toolset.",
                                       cmState::INTERNAL);
@@ -1434,7 +1434,7 @@ int cmake::ActualConfigure()
     {
     if(!this->State->GetInitializedCacheValue("LIBRARY_OUTPUT_PATH"))
       {
-      this->State->AddCacheEntry
+      this->AddCacheEntry
         ("LIBRARY_OUTPUT_PATH", "",
          "Single output directory for building all libraries.",
          cmState::PATH);
@@ -1442,7 +1442,7 @@ int cmake::ActualConfigure()
     if(!this->State
             ->GetInitializedCacheValue("EXECUTABLE_OUTPUT_PATH"))
       {
-      this->State->AddCacheEntry
+      this->AddCacheEntry
         ("EXECUTABLE_OUTPUT_PATH", "",
          "Single output directory for building all executables.",
          cmState::PATH);

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake          |    2 +-
 Source/cmCPluginAPI.cxx            |    8 +-
 Source/cmCacheManager.cxx          |   97 +-----------------------
 Source/cmCacheManager.h            |   13 +---
 Source/cmMakefile.cxx              |    4 +-
 Source/cmMarkAsAdvancedCommand.cxx |    3 +-
 Source/cmState.cxx                 |  147 +++++++++++++++++++++++++++++++-----
 Source/cmState.h                   |   28 ++++++-
 Source/cmUtilitySourceCommand.cxx  |   10 +--
 Source/cmake.cxx                   |   99 ++++++++++++++----------
 10 files changed, 229 insertions(+), 182 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 09:45:47 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 09:45:47 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-395-g19c2c04
Message-ID: <20151010134547.798C7BFCD4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  19c2c041e4c0a6a0bdac1255588c19a97c66e886 (commit)
       via  4c913ae3eced731ed1815542b870b83ca192d695 (commit)
      from  b78c76d7528b2e2c76b6f88c50cf571e33e5e42b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19c2c041e4c0a6a0bdac1255588c19a97c66e886
commit 19c2c041e4c0a6a0bdac1255588c19a97c66e886
Merge: b78c76d 4c913ae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 09:45:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 09:45:46 2015 -0400

    Merge topic 'use-generator-target' into next
    
    4c913ae3 fixup! cmTarget: Move link type enum out.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c913ae3eced731ed1815542b870b83ca192d695
commit 4c913ae3eced731ed1815542b870b83ca192d695
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:45:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:45:25 2015 +0200

    fixup! cmTarget: Move link type enum out.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index eb54add..d639f1d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1162,7 +1162,7 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
 
     // Parse the dependency information, which is a set of
     // type, library pairs separated by ";". There is always a trailing ";".
-    cmTarget::LinkLibraryType llt = GENERAL_LibraryType;
+    cmTargetLinkLibraryType llt = GENERAL_LibraryType;
     std::string depline = deps;
     std::string::size_type start = 0;
     std::string::size_type end;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTarget.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 09:46:31 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 09:46:31 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-397-g1c17d2b
Message-ID: <20151010134631.D303CBFD2A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1c17d2b90a0bf80ba90d73c271887b4fee9fc0d0 (commit)
       via  b61351dbb2d9ab1586b477aa52a1fa6e18ab1c84 (commit)
      from  19c2c041e4c0a6a0bdac1255588c19a97c66e886 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c17d2b90a0bf80ba90d73c271887b4fee9fc0d0
commit 1c17d2b90a0bf80ba90d73c271887b4fee9fc0d0
Merge: 19c2c04 b61351d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 09:46:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 09:46:31 2015 -0400

    Merge topic 'use-generator-target' into next
    
    b61351db cmTarget: Move link type enum out.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b61351dbb2d9ab1586b477aa52a1fa6e18ab1c84
commit b61351dbb2d9ab1586b477aa52a1fa6e18ab1c84
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:56:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:46:20 2015 +0200

    cmTarget: Move link type enum out.
    
    Remove a reason for generate time code to depend on the cmTarget header/type.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 7da334e..b0d98e9 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -373,13 +373,13 @@ void CCONV cmAddLinkLibraryForTarget(void *arg, const char *tgt,
   switch (libtype)
     {
     case CM_LIBRARY_GENERAL:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::GENERAL);
+      mf->AddLinkLibraryForTarget(tgt,value, GENERAL_LibraryType);
       break;
     case CM_LIBRARY_DEBUG:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::DEBUG);
+      mf->AddLinkLibraryForTarget(tgt,value, DEBUG_LibraryType);
       break;
     case CM_LIBRARY_OPTIMIZED:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::OPTIMIZED);
+      mf->AddLinkLibraryForTarget(tgt,value, OPTIMIZED_LibraryType);
       break;
     }
 }
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 22843f1..742651a 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -482,24 +482,24 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
 
   // Look for entries meant for this configuration.
   std::vector<cmLinkItem> actual_libs;
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
   for(std::vector<std::string>::const_iterator di = deplist.begin();
       di != deplist.end(); ++di)
     {
     if(*di == "debug")
       {
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(*di == "optimized")
       {
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(*di == "general")
       {
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(!di->empty())
@@ -517,17 +517,17 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
           {
           if(strcmp(val, "debug") == 0)
             {
-            llt = cmTarget::DEBUG;
+            llt = DEBUG_LibraryType;
             }
           else if(strcmp(val, "optimized") == 0)
             {
-            llt = cmTarget::OPTIMIZED;
+            llt = OPTIMIZED_LibraryType;
             }
           }
         }
 
       // If the library is meant for this link type then use it.
-      if(llt == cmTarget::GENERAL || llt == this->LinkType)
+      if(llt == GENERAL_LibraryType || llt == this->LinkType)
         {
         cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
         actual_libs.push_back(item);
@@ -539,7 +539,7 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
         }
 
       // Reset the link type until another explicit type is given.
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = false;
       }
     }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 9d960c6..de1e24c 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -157,7 +157,7 @@ private:
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
-  cmTarget::LinkLibraryType LinkType;
+  cmTargetLinkLibraryType LinkType;
   bool HasConfig;
   bool DebugMode;
   bool OldLinkDirMode;
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index fde8fb1..0ef2ea5 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -120,15 +120,15 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
         std::string ltValue;
         switch(li->second)
           {
-          case cmTarget::GENERAL:
+          case GENERAL_LibraryType:
             valueNew += "general;";
             ltValue = "general";
             break;
-          case cmTarget::DEBUG:
+          case DEBUG_LibraryType:
             valueNew += "debug;";
             ltValue = "debug";
             break;
-          case cmTarget::OPTIMIZED:
+          case OPTIMIZED_LibraryType:
             valueNew += "optimized;";
             ltValue = "optimized";
             break;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f33a9e1..67ad9cf 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5416,13 +5416,13 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
                                 this->MaxLanguageStandards);
     }
 
-  cmTarget::LinkLibraryType linkType = this->Target->ComputeLinkType(config);
+  cmTargetLinkLibraryType linkType = this->Target->ComputeLinkType(config);
   cmTarget::LinkLibraryVectorType const& oldllibs =
     this->Target->GetOriginalLinkLibraries();
   for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
       li != oldllibs.end(); ++li)
     {
-    if(li->second != cmTarget::GENERAL && li->second != linkType)
+    if(li->second != GENERAL_LibraryType && li->second != linkType)
       {
       std::string name = this->Target->CheckCMP0004(li->first);
       if(name == this->GetName() || name.empty())
diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx
index 996b538..eb3bfce 100644
--- a/Source/cmLinkLibrariesCommand.cxx
+++ b/Source/cmLinkLibrariesCommand.cxx
@@ -34,7 +34,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::DEBUG);
+                                 DEBUG_LibraryType);
       }
     else if (*i == "optimized")
       {
@@ -46,7 +46,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::OPTIMIZED);
+                                 OPTIMIZED_LibraryType);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 862ab2d..319a658 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1145,7 +1145,7 @@ void cmLocalVisualStudio6Generator
       libDebug =
         this->ConvertToOutputFormat(libDebug.c_str(), SHELL);
 
-      if (j->second == cmTarget::GENERAL)
+      if (j->second == GENERAL_LibraryType)
         {
         libOptions += " ";
         libOptions += lib;
@@ -1156,7 +1156,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineOptionsForDebug +=  libDebug;
         libMultiLineOptionsForDebug += "\n";
         }
-      if (j->second == cmTarget::DEBUG)
+      if (j->second == DEBUG_LibraryType)
         {
         libDebugOptions += " ";
         libDebugOptions += lib;
@@ -1165,7 +1165,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineDebugOptions += libDebug;
         libMultiLineDebugOptions += "\n";
         }
-      if (j->second == cmTarget::OPTIMIZED)
+      if (j->second == OPTIMIZED_LibraryType)
         {
         libOptimizedOptions += " ";
         libOptimizedOptions += lib;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c060505..9c046d2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1415,7 +1415,7 @@ bool cmMakefile::ParseDefineFlag(std::string const& def, bool remove)
 }
 
 void cmMakefile::AddLinkLibrary(const std::string& lib,
-                                cmTarget::LinkLibraryType llt)
+                                cmTargetLinkLibraryType llt)
 {
   cmTarget::LibraryID tmp;
   tmp.first = lib;
@@ -1425,7 +1425,7 @@ void cmMakefile::AddLinkLibrary(const std::string& lib,
 
 void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
                                          const std::string& lib,
-                                         cmTarget::LinkLibraryType llt)
+                                         cmTargetLinkLibraryType llt)
 {
   cmTargets::iterator i = this->Targets.find(target);
   if ( i != this->Targets.end())
@@ -1486,7 +1486,7 @@ void cmMakefile::AddLinkDirectoryForTarget(const std::string& target,
 
 void cmMakefile::AddLinkLibrary(const std::string& lib)
 {
-  this->AddLinkLibrary(lib,cmTarget::GENERAL);
+  this->AddLinkLibrary(lib,GENERAL_LibraryType);
 }
 
 void cmMakefile::InitializeFromParent(cmMakefile* parent)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 459d34c..bc795b6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -219,9 +219,9 @@ public:
    * Add a link library to the build.
    */
   void AddLinkLibrary(const std::string&);
-  void AddLinkLibrary(const std::string&, cmTarget::LinkLibraryType type);
+  void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type);
   void AddLinkLibraryForTarget(const std::string& tgt, const std::string&,
-                               cmTarget::LinkLibraryType type);
+                               cmTargetLinkLibraryType type);
   void AddLinkDirectoryForTarget(const std::string& tgt, const std::string& d);
 
   /**
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 468a589..dd8fa9c 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -123,4 +123,10 @@ static thisClass* SafeDownCast(cmObject *c) \
 } \
 class cmTypeMacro_UseTrailingSemicolon
 
+enum cmTargetLinkLibraryType {
+  GENERAL_LibraryType,
+  DEBUG_LibraryType,
+  OPTIMIZED_LibraryType
+};
+
 #endif
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 847a5c1..d639f1d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -632,13 +632,13 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories() const
 }
 
 //----------------------------------------------------------------------------
-cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
+cmTargetLinkLibraryType cmTarget::ComputeLinkType(
                                       const std::string& config) const
 {
   // No configuration is always optimized.
   if(config.empty())
     {
-    return cmTarget::OPTIMIZED;
+    return OPTIMIZED_LibraryType;
     }
 
   // Get the list of configurations considered to be DEBUG.
@@ -650,10 +650,10 @@ cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
   if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
       debugConfigs.end())
     {
-    return cmTarget::DEBUG;
+    return DEBUG_LibraryType;
     }
   // The current configuration is not a debug configuration.
-  return cmTarget::OPTIMIZED;
+  return OPTIMIZED_LibraryType;
 }
 
 //----------------------------------------------------------------------------
@@ -693,9 +693,9 @@ bool cmTarget::NameResolvesToFramework(const std::string& libname) const
 
 //----------------------------------------------------------------------------
 std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const
+                                  cmTargetLinkLibraryType llt) const
 {
-  if (llt == GENERAL)
+  if (llt == GENERAL_LibraryType)
     {
     return value;
     }
@@ -716,7 +716,7 @@ std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
     configString = "$<OR:" + configString + ">";
     }
 
-  if (llt == OPTIMIZED)
+  if (llt == OPTIMIZED_LibraryType)
     {
     configString = "$<NOT:" + configString + ">";
     }
@@ -773,13 +773,13 @@ void cmTarget::GetTllSignatureTraces(std::ostringstream &s,
 void cmTarget::AddLinkLibrary(cmMakefile& mf,
                               const std::string& target,
                               const std::string& lib,
-                              LinkLibraryType llt)
+                              cmTargetLinkLibraryType llt)
 {
   cmTarget *tgt = this->Makefile->FindTargetToUse(lib);
   {
   const bool isNonImportedTarget = tgt && !tgt->IsImported();
 
-  const std::string libName = (isNonImportedTarget && llt != GENERAL)
+  const std::string libName = (isNonImportedTarget && llt != GENERAL_LibraryType)
                                                         ? targetNameGenex(lib)
                                                         : lib;
   this->AppendProperty("LINK_LIBRARIES",
@@ -822,13 +822,13 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
       }
     switch (llt)
       {
-      case cmTarget::GENERAL:
+      case GENERAL_LibraryType:
         dependencies += "general";
         break;
-      case cmTarget::DEBUG:
+      case DEBUG_LibraryType:
         dependencies += "debug";
         break;
-      case cmTarget::OPTIMIZED:
+      case OPTIMIZED_LibraryType:
         dependencies += "optimized";
         break;
       }
@@ -1162,7 +1162,7 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
 
     // Parse the dependency information, which is a set of
     // type, library pairs separated by ";". There is always a trailing ";".
-    cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+    cmTargetLinkLibraryType llt = GENERAL_LibraryType;
     std::string depline = deps;
     std::string::size_type start = 0;
     std::string::size_type end;
@@ -1174,22 +1174,22 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
         {
         if (l == "debug")
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         else if (l == "optimized")
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         else if (l == "general")
           {
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         else
           {
           LibraryID lib2(l,llt);
           this->InsertDependencyForVS6( dep_map, lib, lib2);
           this->GatherDependenciesForVS6( mf, lib2, dep_map);
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         }
       start = end+1; // skip the ;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 97515a7..b0d5f4a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -140,17 +140,15 @@ public:
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
 
-  enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
-
   //* how we identify a library, by name and type
-  typedef std::pair<std::string, LinkLibraryType> LibraryID;
+  typedef std::pair<std::string, cmTargetLinkLibraryType> LibraryID;
 
   typedef std::vector<LibraryID > LinkLibraryVectorType;
   const LinkLibraryVectorType &GetOriginalLinkLibraries() const
     {return this->OriginalLinkLibraries;}
 
   /** Compute the link type to use for the given configuration.  */
-  LinkLibraryType ComputeLinkType(const std::string& config) const;
+  cmTargetLinkLibraryType ComputeLinkType(const std::string& config) const;
 
   /**
    * Clear the dependency information recorded for this target, if any.
@@ -161,7 +159,7 @@ public:
   bool NameResolvesToFramework(const std::string& libname) const;
   void AddLinkLibrary(cmMakefile& mf,
                       const std::string& target, const std::string& lib,
-                      LinkLibraryType llt);
+                      cmTargetLinkLibraryType llt);
   enum TLLSignature {
     KeywordTLLSignature,
     PlainTLLSignature
@@ -297,7 +295,7 @@ public:
   void AppendBuildInterfaceIncludes();
 
   std::string GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const;
+                                  cmTargetLinkLibraryType llt) const;
 
   void AddSystemIncludeDirectories(const std::set<std::string> &incs);
   std::set<std::string> const & GetSystemIncludeDirectories() const
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index b57b921..1a1cf39 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -136,7 +136,7 @@ bool cmTargetLinkLibrariesCommand
     }
 
   // Keep track of link configuration specifiers.
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
 
   // Start with primary linking and switch to link interface
@@ -242,27 +242,27 @@ bool cmTargetLinkLibrariesCommand
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::DEBUG);
+        this->LinkLibraryTypeSpecifierWarning(llt, DEBUG_LibraryType);
         }
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "optimized")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::OPTIMIZED);
+        this->LinkLibraryTypeSpecifierWarning(llt, OPTIMIZED_LibraryType);
         }
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "general")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::GENERAL);
+        this->LinkLibraryTypeSpecifierWarning(llt, GENERAL_LibraryType);
         }
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(haveLLT)
@@ -282,7 +282,7 @@ bool cmTargetLinkLibrariesCommand
       // specifed that a library is both debug and optimized.  (this check is
       // only there for backwards compatibility when mixing projects built
       // with old versions of CMake and new)
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       std::string linkType = args[0];
       linkType += "_LINK_TYPE";
       const char* linkTypeString =
@@ -291,11 +291,11 @@ bool cmTargetLinkLibrariesCommand
         {
         if(strcmp(linkTypeString, "debug") == 0)
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         if(strcmp(linkTypeString, "optimized") == 0)
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         }
       if (!this->HandleLibrary(args[i], llt))
@@ -350,7 +350,7 @@ cmTargetLinkLibrariesCommand
 //----------------------------------------------------------------------------
 bool
 cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
-                                            cmTarget::LinkLibraryType llt)
+                                            cmTargetLinkLibraryType llt)
 {
   if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
       && this->CurrentProcessingState != ProcessingKeywordLinkInterface)
@@ -469,7 +469,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
   std::string prop;
 
   // Include this library in the link interface for the target.
-  if(llt == cmTarget::DEBUG || llt == cmTarget::GENERAL)
+  if(llt == DEBUG_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the DEBUG configuration interfaces.
     for(std::vector<std::string>::const_iterator i = debugConfigs.begin();
@@ -480,7 +480,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
       this->Target->AppendProperty(prop, lib.c_str());
       }
     }
-  if(llt == cmTarget::OPTIMIZED || llt == cmTarget::GENERAL)
+  if(llt == OPTIMIZED_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the non-DEBUG configuration interfaces.
     this->Target->AppendProperty("LINK_INTERFACE_LIBRARIES", lib.c_str());
diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h
index 47dd8bd..f061e6d 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -62,7 +62,7 @@ private:
 
   ProcessingState CurrentProcessingState;
 
-  bool HandleLibrary(const std::string& lib, cmTarget::LinkLibraryType llt);
+  bool HandleLibrary(const std::string& lib, cmTargetLinkLibraryType llt);
 };
 
 
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index fececfd..2d5e724 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -477,7 +477,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
             ++libIt)
       {
       mf->AddLinkLibraryForTarget(targetName, *libIt,
-                                  cmTarget::GENERAL);
+                                  GENERAL_LibraryType);
       }
 
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 09:56:50 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 09:56:50 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-401-ga67e081
Message-ID: <20151010135650.EEB7FC01BC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a67e081742ee32fecd773334e73bcc820e88db05 (commit)
       via  db45ca5adbc32969b72445a41c09026b30024740 (commit)
       via  ff08e9fd42ab83e87e302de189c1fbb372829e0d (commit)
       via  3e69ce0ae4a453517bbea020b546fdd5a7bc0bca (commit)
      from  1c17d2b90a0bf80ba90d73c271887b4fee9fc0d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a67e081742ee32fecd773334e73bcc820e88db05
commit a67e081742ee32fecd773334e73bcc820e88db05
Merge: 1c17d2b db45ca5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 09:56:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 09:56:50 2015 -0400

    Merge topic 'use-generator-target' into next
    
    db45ca5a VS10: Use GeneratorTarget instead of Target for name.
    ff08e9fd VS10: Use GeneratorTarget instead of Target for type checks.
    3e69ce0a VS10: Use GeneratorTarget instead of Target for property reads.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db45ca5adbc32969b72445a41c09026b30024740
commit db45ca5adbc32969b72445a41c09026b30024740
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:53:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:53:31 2015 +0200

    VS10: Use GeneratorTarget instead of Target for name.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index e63deea..72bcf79 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -178,7 +178,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
     this->GeneratorTarget->GetLocalGenerator();
-  this->Name = this->Target->GetName();
+  this->Name = this->GeneratorTarget->GetName();
   this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
   this->Platform = gg->GetPlatformName();
   this->NsightTegra = gg->IsNsightTegra();
@@ -1782,7 +1782,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
       if(ttype == cmTarget::OBJECT_LIBRARY)
         {
         outDir = intermediateDir;
-        targetNameFull = this->Target->GetName();
+        targetNameFull = this->GeneratorTarget->GetName();
         targetNameFull += ".lib";
         }
       else
@@ -3331,7 +3331,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3414,7 +3415,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP81()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3474,7 +3476,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3526,7 +3529,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3583,7 +3587,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff08e9fd42ab83e87e302de189c1fbb372829e0d
commit ff08e9fd42ab83e87e302de189c1fbb372829e0d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:52:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:52:23 2015 +0200

    VS10: Use GeneratorTarget instead of Target for type checks.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 68f8422..e63deea 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -269,7 +269,7 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
 void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
-  if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(this->GeneratorTarget->GetType() == cmTarget::INTERFACE_LIBRARY
       || this->GeneratorTarget->Getproperty("EXTERNAL_MSPROJECT"))
     {
     return;
@@ -278,7 +278,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
   this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
-  if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
     {
     if(!this->ComputeClOptions())
       {
@@ -361,7 +361,8 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ProjectGUID>", 2);
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
-  if(this->MSTools && this->Target->GetType() <= cmTarget::GLOBAL_TARGET)
+  if(this->MSTools
+     && this->GeneratorTarget->GetType() <= cmTarget::GLOBAL_TARGET)
     {
     this->WriteApplicationTypeSettings();
     this->VerifyNecessaryFiles();
@@ -671,7 +672,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
                                  i->c_str(),
                                  1, " Label=\"Configuration\"", "\n");
     std::string configType = "<ConfigurationType>";
-    switch(this->Target->GetType())
+    switch(this->GeneratorTarget->GetType())
       {
       case cmTarget::SHARED_LIBRARY:
       case cmTarget::MODULE_LIBRARY:
@@ -748,7 +749,7 @@ void cmVisualStudio10TargetGenerator
   mfcLine += useOfMfcValue + "</UseOfMfc>\n";
   this->WriteString(mfcLine.c_str(), 2);
 
-  if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY &&
+  if((this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
      this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
@@ -757,7 +758,7 @@ void cmVisualStudio10TargetGenerator
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
-  else if (this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
+  else if (this->GeneratorTarget->GetType() <= cmTarget::MODULE_LIBRARY &&
            this->ClOptions[config]->UsingSBCS())
     {
     this->WriteString("<CharacterSet>NotSet</CharacterSet>\n", 2);
@@ -1487,7 +1488,7 @@ void cmVisualStudio10TargetGenerator::WriteSources(
 
 void cmVisualStudio10TargetGenerator::WriteAllSources()
 {
-  if(this->Target->GetType() > cmTarget::UTILITY)
+  if(this->GeneratorTarget->GetType() > cmTarget::UTILITY)
     {
     return;
     }
@@ -1749,7 +1750,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmTarget::TargetType ttype = this->Target->GetType();
+  cmTarget::TargetType ttype = this->GeneratorTarget->GetType();
   if(ttype > cmTarget::GLOBAL_TARGET)
     {
     return;
@@ -1834,8 +1835,8 @@ OutputLinkIncremental(std::string const& configName)
     }
   // static libraries and things greater than modules do not need
   // to set this option
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -1973,8 +1974,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
-      if (this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->Target->GetType() == cmTarget::MODULE_LIBRARY )
+      if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+          this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY )
         {
         clOptions.AddDefine("_WINRT_DLL");
         }
@@ -2182,8 +2183,8 @@ WriteMasmOptions(std::string const& configName,
 void
 cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 {
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->Target->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY &&
+     this->GeneratorTarget->GetType() != cmTarget::OBJECT_LIBRARY)
     {
     return;
     }
@@ -2219,9 +2220,9 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 void cmVisualStudio10TargetGenerator::WriteManifestOptions(
   std::string const& config)
 {
-  if (this->Target->GetType() != cmTarget::EXECUTABLE &&
-      this->Target->GetType() != cmTarget::SHARED_LIBRARY &&
-      this->Target->GetType() != cmTarget::MODULE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE &&
+      this->GeneratorTarget->GetType() != cmTarget::SHARED_LIBRARY &&
+      this->GeneratorTarget->GetType() != cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2384,9 +2385,9 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 //----------------------------------------------------------------------------
 bool cmVisualStudio10TargetGenerator::ComputeLinkOptions()
 {
-  if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-     this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     for(std::vector<std::string>::const_iterator
           i = this->Configurations.begin();
@@ -2423,11 +2424,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string CONFIG = cmSystemTools::UpperCase(config);
 
   const char* linkType = "SHARED";
-  if(this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     linkType = "MODULE";
     }
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     linkType = "EXE";
     }
@@ -2512,7 +2513,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string targetNameFull;
   std::string targetNameImport;
   std::string targetNamePDB;
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     this->GeneratorTarget->GetExecutableNames(targetName, targetNameFull,
                                      targetNameImport, targetNamePDB,
@@ -2535,7 +2536,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2557,7 +2558,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2603,7 +2604,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
     if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") &&
-       this->Target->GetType() != cmTarget::EXECUTABLE)
+       this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2641,7 +2642,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
                            "%(IgnoreSpecificDefaultLibraries)");
     }
 
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2658,8 +2659,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 void
 cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 {
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2697,7 +2698,7 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
       libVec.push_back(path);
       }
     else if (!l->Target
-        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
       {
       libVec.push_back(l->Value);
       }
@@ -2769,7 +2770,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WritePlatformConfigTag("ItemDefinitionGroup", i->c_str(), 1);
     *this->BuildFileStream << "\n";
     //    output cl compile flags <ClCompile></ClCompile>
-    if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
       {
       this->WriteClOptions(*i, includes);
       //    output rc compile flags <ResourceCompile></ResourceCompile>
@@ -2787,7 +2788,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     //    output manifest flags  <Manifest></Manifest>
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
-       this->Target->GetType() == cmTarget::EXECUTABLE &&
+       this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE &&
        this->GeneratorTarget->GetpropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
@@ -2800,7 +2801,7 @@ void
 cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
 {
   bool addedPrelink = false;
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -3008,7 +3009,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
       this->GlobalGenerator->TargetsWindowsPhone())
-      && (cmTarget::EXECUTABLE == this->Target->GetType()))
+      && (cmTarget::EXECUTABLE == this->GeneratorTarget->GetType()))
     {
     std::string pfxFile;
     std::vector<cmSourceFile const*> certificates;
@@ -3137,7 +3138,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>14.0"
         "</MinimumVisualStudioVersion>\n", 2);
 
-      if(this->Target->GetType() < cmTarget::UTILITY)
+      if(this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3151,7 +3152,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (this->Target->GetType() < cmTarget::UTILITY)
+      if (this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3165,12 +3166,13 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>11.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (isWindowsStore && this->Target->GetType() < cmTarget::UTILITY)
+      if (isWindowsStore
+          && this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
       else if (isWindowsPhone &&
-               this->Target->GetType() == cmTarget::EXECUTABLE)
+               this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
         {
         this->WriteString("<XapOutputs>true</XapOutputs>\n", 2);
         this->WriteString("<XapFilename>", 2);
@@ -3228,7 +3230,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
 {
   // For Windows and Windows Phone executables, we will assume that if a
   // manifest is not present that we need to add all the necessary files
-  if (this->Target->GetType() == cmTarget::EXECUTABLE)
+  if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     std::vector<cmSourceFile const*> manifestSources;
     this->GeneratorTarget->GetAppManifest(manifestSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e69ce0ae4a453517bbea020b546fdd5a7bc0bca
commit 3e69ce0ae4a453517bbea020b546fdd5a7bc0bca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:51:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:51:21 2015 +0200

    VS10: Use GeneratorTarget instead of Target for property reads.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a4b0bc3..68f8422 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -270,7 +270,7 @@ void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
   if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
-      || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
+      || this->GeneratorTarget->Getproperty("EXTERNAL_MSPROJECT"))
     {
     return;
     }
@@ -368,7 +368,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsProjectTypes =
-    this->Target->GetProperty("VS_GLOBAL_PROJECT_TYPES");
+    this->GeneratorTarget->Getproperty("VS_GLOBAL_PROJECT_TYPES");
   if(vsProjectTypes)
     {
     this->WriteString("<ProjectTypes>", 2);
@@ -376,9 +376,12 @@ void cmVisualStudio10TargetGenerator::Generate()
       "</ProjectTypes>\n";
     }
 
-  const char* vsProjectName = this->Target->GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalPath = this->Target->GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = this->Target->GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectName =
+      this->GeneratorTarget->Getproperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalPath =
+      this->GeneratorTarget->Getproperty("VS_SCC_LOCALPATH");
+  const char* vsProvider =
+      this->GeneratorTarget->Getproperty("VS_SCC_PROVIDER");
 
   if( vsProjectName && vsLocalPath && vsProvider )
     {
@@ -392,7 +395,8 @@ void cmVisualStudio10TargetGenerator::Generate()
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
       "</SccProvider>\n";
 
-    const char* vsAuxPath = this->Target->GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath =
+        this->GeneratorTarget->Getproperty("VS_SCC_AUXPATH");
     if( vsAuxPath )
       {
       this->WriteString("<SccAuxPath>", 2);
@@ -401,13 +405,13 @@ void cmVisualStudio10TargetGenerator::Generate()
       }
     }
 
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+  if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT"))
     {
     this->WriteString("<WinMDAssembly>true</WinMDAssembly>\n", 2);
     }
 
   const char* vsGlobalKeyword =
-    this->Target->GetProperty("VS_GLOBAL_KEYWORD");
+    this->GeneratorTarget->Getproperty("VS_GLOBAL_KEYWORD");
   if(!vsGlobalKeyword)
     {
     this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
@@ -420,7 +424,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsGlobalRootNamespace =
-    this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
+    this->GeneratorTarget->Getproperty("VS_GLOBAL_ROOTNAMESPACE");
   if(vsGlobalRootNamespace)
     {
     this->WriteString("<RootNamespace>", 2);
@@ -431,14 +435,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(this->Platform)
                            << "</Platform>\n";
-  const char* projLabel = this->Target->GetProperty("PROJECT_LABEL");
+  const char* projLabel = this->GeneratorTarget->Getproperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = this->Name.c_str();
     }
   this->WriteString("<ProjectName>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(projLabel) << "</ProjectName>\n";
-  if(const char* targetFrameworkVersion = this->Target->GetProperty(
+  if(const char* targetFrameworkVersion = this->GeneratorTarget->Getproperty(
        "VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     this->WriteString("<TargetFrameworkVersion>", 2);
@@ -497,7 +501,7 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReferences()
 {
   std::vector<std::string> references;
   if(const char* vsDotNetReferences =
-     this->Target->GetProperty("VS_DOTNET_REFERENCES"))
+     this->GeneratorTarget->Getproperty("VS_DOTNET_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsDotNetReferences, references);
     }
@@ -543,7 +547,7 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
           i != this->Configurations.end(); ++i)
         {
         this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
-        if(this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
+        if(this->GeneratorTarget->Getproperty("VS_GLOBAL_ROOTNAMESPACE"))
           {
           (*this->BuildFileStream ) << "$(RootNamespace).";
           }
@@ -610,7 +614,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTReferences()
 {
   std::vector<std::string> references;
   if(const char* vsWinRTReferences =
-     this->Target->GetProperty("VS_WINRT_REFERENCES"))
+     this->GeneratorTarget->Getproperty("VS_WINRT_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsWinRTReferences, references);
     }
@@ -679,7 +683,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
         break;
       case cmTarget::EXECUTABLE:
         if(this->NsightTegra &&
-           !this->Target->GetPropertyAsBool("ANDROID_GUI"))
+           !this->GeneratorTarget->GetpropertyAsBool("ANDROID_GUI"))
           {
           // Android executables are .so too.
           configType += "DynamicLibrary";
@@ -746,10 +750,10 @@ void cmVisualStudio10TargetGenerator
 
   if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
-     this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
      this->GlobalGenerator->TargetsWindowsStore() ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+     this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
@@ -769,8 +773,8 @@ void cmVisualStudio10TargetGenerator
     pts += "</PlatformToolset>\n";
     this->WriteString(pts.c_str(), 2);
     }
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+  if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<WindowsAppContainer>true"
                       "</WindowsAppContainer>\n", 2);
@@ -788,27 +792,29 @@ void cmVisualStudio10TargetGenerator
   ntv += toolset? toolset : "Default";
   ntv += "</NdkToolchainVersion>\n";
   this->WriteString(ntv.c_str(), 2);
-  if(const char* minApi = this->Target->GetProperty("ANDROID_API_MIN"))
+  if(const char* minApi =
+     this->GeneratorTarget->Getproperty("ANDROID_API_MIN"))
     {
     this->WriteString("<AndroidMinAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(minApi) << "</AndroidMinAPI>\n";
     }
-  if(const char* api = this->Target->GetProperty("ANDROID_API"))
+  if(const char* api = this->GeneratorTarget->Getproperty("ANDROID_API"))
     {
     this->WriteString("<AndroidTargetAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(api) << "</AndroidTargetAPI>\n";
     }
 
-  if(const char* cpuArch = this->Target->GetProperty("ANDROID_ARCH"))
+  if(const char* cpuArch = this->GeneratorTarget->Getproperty("ANDROID_ARCH"))
     {
     this->WriteString("<AndroidArch>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(cpuArch) <<
       "</AndroidArch>\n";
     }
 
-  if(const char* stlType = this->Target->GetProperty("ANDROID_STL_TYPE"))
+  if(const char* stlType =
+     this->GeneratorTarget->Getproperty("ANDROID_STL_TYPE"))
     {
     this->WriteString("<AndroidStlType>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(stlType) <<
@@ -1963,7 +1969,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   if (this->MSTools)
     {
     // If we have the VS_WINRT_COMPONENT set then force Compile as WinRT.
-    if (this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+    if (this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT"))
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
@@ -2012,7 +2018,7 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   if(this->NsightTegra)
     {
     if(const char* processMax =
-        this->Target->GetProperty("ANDROID_PROCESS_MAX"))
+        this->GeneratorTarget->Getproperty("ANDROID_PROCESS_MAX"))
       {
       this->WriteString("<ProcessMax>", 3);
       *this->BuildFileStream << cmVS10EscapeXML(processMax) <<
@@ -2270,18 +2276,18 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmVS10EscapeXML(antBuildPath) << "</AntBuildPath>\n";
   }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
+  if (this->GeneratorTarget->GetpropertyAsBool("ANDROID_SKIP_ANT_STEP"))
     {
     this->WriteString("<SkipAntStep>true</SkipAntStep>\n", 3);
     }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_PROGUARD"))
+  if (this->GeneratorTarget->GetpropertyAsBool("ANDROID_PROGUARD"))
     {
     this->WriteString("<EnableProGuard>true</EnableProGuard>\n", 3);
     }
 
   if (const char* proGuardConfigLocation =
-      this->Target->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
+      this->GeneratorTarget->Getproperty("ANDROID_PROGUARD_CONFIG_PATH"))
     {
     this->WriteString("<ProGuardConfigLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(proGuardConfigLocation) <<
@@ -2289,7 +2295,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* securePropertiesLocation =
-      this->Target->GetProperty("ANDROID_SECURE_PROPS_PATH"))
+      this->GeneratorTarget->Getproperty("ANDROID_SECURE_PROPS_PATH"))
     {
     this->WriteString("<SecurePropertiesLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(securePropertiesLocation) <<
@@ -2297,7 +2303,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2309,7 +2315,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDependenciesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2321,7 +2327,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* javaSourceDir =
-      this->Target->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
+      this->GeneratorTarget->Getproperty("ANDROID_JAVA_SOURCE_DIR"))
     {
     this->WriteString("<JavaSourceDir>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(javaSourceDir) <<
@@ -2329,7 +2335,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_JAR_DIRECTORIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_JAR_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2341,7 +2347,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDeps =
-      this->Target->GetProperty("ANDROID_JAR_DEPENDENCIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_JAR_DEPENDENCIES"))
     {
     this->WriteString("<JarDependencies>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(jarDeps) <<
@@ -2349,7 +2355,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* assetsDirectories =
-      this->Target->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_ASSETS_DIRECTORIES"))
     {
     this->WriteString("<AssetsDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(assetsDirectories) <<
@@ -2365,7 +2371,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
   }
 
   if (const char* antAdditionalOptions =
-      this->Target->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
+      this->GeneratorTarget->Getproperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
     {
     this->WriteString("<AdditionalOptions>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(antAdditionalOptions) <<
@@ -2436,7 +2442,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   flags += " ";
   flags += this->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
-  const char* targetLinkFlags = this->Target->GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags =
+      this->GeneratorTarget->Getproperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     flags += " ";
@@ -2444,7 +2451,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     }
   std::string flagsProp = "LINK_FLAGS_";
   flagsProp += CONFIG;
-  if(const char* flagsConfig = this->Target->GetProperty(flagsProp.c_str()))
+  if(const char* flagsConfig =
+     this->GeneratorTarget->Getproperty(flagsProp.c_str()))
     {
     flags += " ";
     flags += flagsConfig;
@@ -2522,7 +2530,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     {
     linkOptions.AddFlag("Version", "");
 
-    if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
+    if ( this->GeneratorTarget->GetpropertyAsBool("WIN32_EXECUTABLE") )
       {
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
@@ -2594,7 +2602,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
+    if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") &&
        this->Target->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
@@ -2636,7 +2644,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)exportall.def");
       }
@@ -2780,7 +2788,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
        this->Target->GetType() == cmTarget::EXECUTABLE &&
-       this->Target->GetPropertyAsBool("ANDROID_GUI"))
+       this->GeneratorTarget->GetpropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
       }
@@ -2795,7 +2803,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
@@ -2908,14 +2916,14 @@ void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_DESKTOP_EXTENSIONS_VERSION");
     if (desktopExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsDesktop",
                                          desktopExtensionsVersion);
       }
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_MOBILE_EXTENSIONS_VERSION");
     if (mobileExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsMobile",
@@ -2955,11 +2963,11 @@ void cmVisualStudio10TargetGenerator::WriteSDKReferences()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_DESKTOP_EXTENSIONS_VERSION");
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_MOBILE_EXTENSIONS_VERSION");
     const char* iotExtensionsVersion =
-      this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_IOT_EXTENSIONS_VERSION");
 
     if(desktopExtensionsVersion || mobileExtensionsVersion ||
        iotExtensionsVersion)
@@ -3190,7 +3198,8 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       "</WindowsTargetPlatformVersion>\n";
     }
   const char* targetPlatformMinVersion =
-      this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+      this->GeneratorTarget
+      ->Getproperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
   if(targetPlatformMinVersion)
     {
     this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
@@ -3209,7 +3218,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     }
 
   // Added IoT Startup Task support
-  if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
+  if(this->GeneratorTarget->GetpropertyAsBool("VS_IOT_STARTUP_TASK"))
     {
     this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |  208 +++++++++++++++-------------
 1 file changed, 112 insertions(+), 96 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 10:16:20 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 10:16:20 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-403-g1e8f151
Message-ID: <20151010141621.54EB3BFEE9@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1e8f1510a0e5c0ae12beca221a427b0a896fca1f (commit)
       via  7215227102926fa2148e6e09a6c0cfebd35af8b5 (commit)
      from  a67e081742ee32fecd773334e73bcc820e88db05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e8f1510a0e5c0ae12beca221a427b0a896fca1f
commit 1e8f1510a0e5c0ae12beca221a427b0a896fca1f
Merge: a67e081 7215227
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 10:16:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 10:16:20 2015 -0400

    Merge topic 'use-generator-target' into next
    
    72152271 fixup! cmTarget: Move link type enum out.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7215227102926fa2148e6e09a6c0cfebd35af8b5
commit 7215227102926fa2148e6e09a6c0cfebd35af8b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 16:15:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:15:50 2015 +0200

    fixup! cmTarget: Move link type enum out.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index d639f1d..0128c78 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -779,9 +779,10 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
   {
   const bool isNonImportedTarget = tgt && !tgt->IsImported();
 
-  const std::string libName = (isNonImportedTarget && llt != GENERAL_LibraryType)
-                                                        ? targetNameGenex(lib)
-                                                        : lib;
+  const std::string libName =
+      (isNonImportedTarget && llt != GENERAL_LibraryType)
+      ? targetNameGenex(lib)
+      : lib;
   this->AppendProperty("LINK_LIBRARIES",
                        this->GetDebugGeneratorExpressions(libName,
                                                           llt).c_str());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTarget.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 10:17:20 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 10:17:20 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-408-g0f325d3
Message-ID: <20151010141720.9EECABFF3D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0f325d3427c1a12af88dbe7a149393dfafa1954a (commit)
       via  ca8c0a30492b37fb2e11e3aa68eaf0cae3d366f8 (commit)
       via  51acf2d5770dc6af1f7d75ceca6c7254e3529abf (commit)
       via  c9247dccdd01a9af71ddfdac7972cb9f8d00f4d1 (commit)
       via  bb3d49dd2b6f7c95682a28a87dbb1206cc02b70e (commit)
      from  1e8f1510a0e5c0ae12beca221a427b0a896fca1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f325d3427c1a12af88dbe7a149393dfafa1954a
commit 0f325d3427c1a12af88dbe7a149393dfafa1954a
Merge: 1e8f151 ca8c0a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 10:17:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 10:17:19 2015 -0400

    Merge topic 'use-generator-target' into next
    
    ca8c0a30 VS10: Use GeneratorTarget instead of Target for name.
    51acf2d5 VS10: Use GeneratorTarget instead of Target for type checks.
    c9247dcc VS10: Use GeneratorTarget instead of Target for property reads.
    bb3d49dd cmTarget: Move link type enum out.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca8c0a30492b37fb2e11e3aa68eaf0cae3d366f8
commit ca8c0a30492b37fb2e11e3aa68eaf0cae3d366f8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:53:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:17:10 2015 +0200

    VS10: Use GeneratorTarget instead of Target for name.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index e63deea..72bcf79 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -178,7 +178,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
     this->GeneratorTarget->GetLocalGenerator();
-  this->Name = this->Target->GetName();
+  this->Name = this->GeneratorTarget->GetName();
   this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
   this->Platform = gg->GetPlatformName();
   this->NsightTegra = gg->IsNsightTegra();
@@ -1782,7 +1782,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
       if(ttype == cmTarget::OBJECT_LIBRARY)
         {
         outDir = intermediateDir;
-        targetNameFull = this->Target->GetName();
+        targetNameFull = this->GeneratorTarget->GetName();
         targetNameFull += ".lib";
         }
       else
@@ -3331,7 +3331,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3414,7 +3415,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP81()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3474,7 +3476,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3526,7 +3529,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3583,7 +3587,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51acf2d5770dc6af1f7d75ceca6c7254e3529abf
commit 51acf2d5770dc6af1f7d75ceca6c7254e3529abf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:52:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:17:10 2015 +0200

    VS10: Use GeneratorTarget instead of Target for type checks.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 68f8422..e63deea 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -269,7 +269,7 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
 void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
-  if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(this->GeneratorTarget->GetType() == cmTarget::INTERFACE_LIBRARY
       || this->GeneratorTarget->Getproperty("EXTERNAL_MSPROJECT"))
     {
     return;
@@ -278,7 +278,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
   this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
-  if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
     {
     if(!this->ComputeClOptions())
       {
@@ -361,7 +361,8 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ProjectGUID>", 2);
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
-  if(this->MSTools && this->Target->GetType() <= cmTarget::GLOBAL_TARGET)
+  if(this->MSTools
+     && this->GeneratorTarget->GetType() <= cmTarget::GLOBAL_TARGET)
     {
     this->WriteApplicationTypeSettings();
     this->VerifyNecessaryFiles();
@@ -671,7 +672,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
                                  i->c_str(),
                                  1, " Label=\"Configuration\"", "\n");
     std::string configType = "<ConfigurationType>";
-    switch(this->Target->GetType())
+    switch(this->GeneratorTarget->GetType())
       {
       case cmTarget::SHARED_LIBRARY:
       case cmTarget::MODULE_LIBRARY:
@@ -748,7 +749,7 @@ void cmVisualStudio10TargetGenerator
   mfcLine += useOfMfcValue + "</UseOfMfc>\n";
   this->WriteString(mfcLine.c_str(), 2);
 
-  if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY &&
+  if((this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
      this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
@@ -757,7 +758,7 @@ void cmVisualStudio10TargetGenerator
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
-  else if (this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
+  else if (this->GeneratorTarget->GetType() <= cmTarget::MODULE_LIBRARY &&
            this->ClOptions[config]->UsingSBCS())
     {
     this->WriteString("<CharacterSet>NotSet</CharacterSet>\n", 2);
@@ -1487,7 +1488,7 @@ void cmVisualStudio10TargetGenerator::WriteSources(
 
 void cmVisualStudio10TargetGenerator::WriteAllSources()
 {
-  if(this->Target->GetType() > cmTarget::UTILITY)
+  if(this->GeneratorTarget->GetType() > cmTarget::UTILITY)
     {
     return;
     }
@@ -1749,7 +1750,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmTarget::TargetType ttype = this->Target->GetType();
+  cmTarget::TargetType ttype = this->GeneratorTarget->GetType();
   if(ttype > cmTarget::GLOBAL_TARGET)
     {
     return;
@@ -1834,8 +1835,8 @@ OutputLinkIncremental(std::string const& configName)
     }
   // static libraries and things greater than modules do not need
   // to set this option
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -1973,8 +1974,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
-      if (this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->Target->GetType() == cmTarget::MODULE_LIBRARY )
+      if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+          this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY )
         {
         clOptions.AddDefine("_WINRT_DLL");
         }
@@ -2182,8 +2183,8 @@ WriteMasmOptions(std::string const& configName,
 void
 cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 {
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->Target->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY &&
+     this->GeneratorTarget->GetType() != cmTarget::OBJECT_LIBRARY)
     {
     return;
     }
@@ -2219,9 +2220,9 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 void cmVisualStudio10TargetGenerator::WriteManifestOptions(
   std::string const& config)
 {
-  if (this->Target->GetType() != cmTarget::EXECUTABLE &&
-      this->Target->GetType() != cmTarget::SHARED_LIBRARY &&
-      this->Target->GetType() != cmTarget::MODULE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE &&
+      this->GeneratorTarget->GetType() != cmTarget::SHARED_LIBRARY &&
+      this->GeneratorTarget->GetType() != cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2384,9 +2385,9 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 //----------------------------------------------------------------------------
 bool cmVisualStudio10TargetGenerator::ComputeLinkOptions()
 {
-  if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-     this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     for(std::vector<std::string>::const_iterator
           i = this->Configurations.begin();
@@ -2423,11 +2424,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string CONFIG = cmSystemTools::UpperCase(config);
 
   const char* linkType = "SHARED";
-  if(this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     linkType = "MODULE";
     }
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     linkType = "EXE";
     }
@@ -2512,7 +2513,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string targetNameFull;
   std::string targetNameImport;
   std::string targetNamePDB;
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     this->GeneratorTarget->GetExecutableNames(targetName, targetNameFull,
                                      targetNameImport, targetNamePDB,
@@ -2535,7 +2536,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2557,7 +2558,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2603,7 +2604,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
     if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") &&
-       this->Target->GetType() != cmTarget::EXECUTABLE)
+       this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2641,7 +2642,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
                            "%(IgnoreSpecificDefaultLibraries)");
     }
 
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2658,8 +2659,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 void
 cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 {
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2697,7 +2698,7 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
       libVec.push_back(path);
       }
     else if (!l->Target
-        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
       {
       libVec.push_back(l->Value);
       }
@@ -2769,7 +2770,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WritePlatformConfigTag("ItemDefinitionGroup", i->c_str(), 1);
     *this->BuildFileStream << "\n";
     //    output cl compile flags <ClCompile></ClCompile>
-    if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
       {
       this->WriteClOptions(*i, includes);
       //    output rc compile flags <ResourceCompile></ResourceCompile>
@@ -2787,7 +2788,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     //    output manifest flags  <Manifest></Manifest>
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
-       this->Target->GetType() == cmTarget::EXECUTABLE &&
+       this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE &&
        this->GeneratorTarget->GetpropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
@@ -2800,7 +2801,7 @@ void
 cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
 {
   bool addedPrelink = false;
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -3008,7 +3009,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
       this->GlobalGenerator->TargetsWindowsPhone())
-      && (cmTarget::EXECUTABLE == this->Target->GetType()))
+      && (cmTarget::EXECUTABLE == this->GeneratorTarget->GetType()))
     {
     std::string pfxFile;
     std::vector<cmSourceFile const*> certificates;
@@ -3137,7 +3138,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>14.0"
         "</MinimumVisualStudioVersion>\n", 2);
 
-      if(this->Target->GetType() < cmTarget::UTILITY)
+      if(this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3151,7 +3152,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (this->Target->GetType() < cmTarget::UTILITY)
+      if (this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3165,12 +3166,13 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>11.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (isWindowsStore && this->Target->GetType() < cmTarget::UTILITY)
+      if (isWindowsStore
+          && this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
       else if (isWindowsPhone &&
-               this->Target->GetType() == cmTarget::EXECUTABLE)
+               this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
         {
         this->WriteString("<XapOutputs>true</XapOutputs>\n", 2);
         this->WriteString("<XapFilename>", 2);
@@ -3228,7 +3230,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
 {
   // For Windows and Windows Phone executables, we will assume that if a
   // manifest is not present that we need to add all the necessary files
-  if (this->Target->GetType() == cmTarget::EXECUTABLE)
+  if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     std::vector<cmSourceFile const*> manifestSources;
     this->GeneratorTarget->GetAppManifest(manifestSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9247dccdd01a9af71ddfdac7972cb9f8d00f4d1
commit c9247dccdd01a9af71ddfdac7972cb9f8d00f4d1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:51:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:17:10 2015 +0200

    VS10: Use GeneratorTarget instead of Target for property reads.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a4b0bc3..68f8422 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -270,7 +270,7 @@ void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
   if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
-      || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
+      || this->GeneratorTarget->Getproperty("EXTERNAL_MSPROJECT"))
     {
     return;
     }
@@ -368,7 +368,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsProjectTypes =
-    this->Target->GetProperty("VS_GLOBAL_PROJECT_TYPES");
+    this->GeneratorTarget->Getproperty("VS_GLOBAL_PROJECT_TYPES");
   if(vsProjectTypes)
     {
     this->WriteString("<ProjectTypes>", 2);
@@ -376,9 +376,12 @@ void cmVisualStudio10TargetGenerator::Generate()
       "</ProjectTypes>\n";
     }
 
-  const char* vsProjectName = this->Target->GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalPath = this->Target->GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = this->Target->GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectName =
+      this->GeneratorTarget->Getproperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalPath =
+      this->GeneratorTarget->Getproperty("VS_SCC_LOCALPATH");
+  const char* vsProvider =
+      this->GeneratorTarget->Getproperty("VS_SCC_PROVIDER");
 
   if( vsProjectName && vsLocalPath && vsProvider )
     {
@@ -392,7 +395,8 @@ void cmVisualStudio10TargetGenerator::Generate()
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
       "</SccProvider>\n";
 
-    const char* vsAuxPath = this->Target->GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath =
+        this->GeneratorTarget->Getproperty("VS_SCC_AUXPATH");
     if( vsAuxPath )
       {
       this->WriteString("<SccAuxPath>", 2);
@@ -401,13 +405,13 @@ void cmVisualStudio10TargetGenerator::Generate()
       }
     }
 
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+  if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT"))
     {
     this->WriteString("<WinMDAssembly>true</WinMDAssembly>\n", 2);
     }
 
   const char* vsGlobalKeyword =
-    this->Target->GetProperty("VS_GLOBAL_KEYWORD");
+    this->GeneratorTarget->Getproperty("VS_GLOBAL_KEYWORD");
   if(!vsGlobalKeyword)
     {
     this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
@@ -420,7 +424,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsGlobalRootNamespace =
-    this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
+    this->GeneratorTarget->Getproperty("VS_GLOBAL_ROOTNAMESPACE");
   if(vsGlobalRootNamespace)
     {
     this->WriteString("<RootNamespace>", 2);
@@ -431,14 +435,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(this->Platform)
                            << "</Platform>\n";
-  const char* projLabel = this->Target->GetProperty("PROJECT_LABEL");
+  const char* projLabel = this->GeneratorTarget->Getproperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = this->Name.c_str();
     }
   this->WriteString("<ProjectName>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(projLabel) << "</ProjectName>\n";
-  if(const char* targetFrameworkVersion = this->Target->GetProperty(
+  if(const char* targetFrameworkVersion = this->GeneratorTarget->Getproperty(
        "VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     this->WriteString("<TargetFrameworkVersion>", 2);
@@ -497,7 +501,7 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReferences()
 {
   std::vector<std::string> references;
   if(const char* vsDotNetReferences =
-     this->Target->GetProperty("VS_DOTNET_REFERENCES"))
+     this->GeneratorTarget->Getproperty("VS_DOTNET_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsDotNetReferences, references);
     }
@@ -543,7 +547,7 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
           i != this->Configurations.end(); ++i)
         {
         this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
-        if(this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
+        if(this->GeneratorTarget->Getproperty("VS_GLOBAL_ROOTNAMESPACE"))
           {
           (*this->BuildFileStream ) << "$(RootNamespace).";
           }
@@ -610,7 +614,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTReferences()
 {
   std::vector<std::string> references;
   if(const char* vsWinRTReferences =
-     this->Target->GetProperty("VS_WINRT_REFERENCES"))
+     this->GeneratorTarget->Getproperty("VS_WINRT_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsWinRTReferences, references);
     }
@@ -679,7 +683,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
         break;
       case cmTarget::EXECUTABLE:
         if(this->NsightTegra &&
-           !this->Target->GetPropertyAsBool("ANDROID_GUI"))
+           !this->GeneratorTarget->GetpropertyAsBool("ANDROID_GUI"))
           {
           // Android executables are .so too.
           configType += "DynamicLibrary";
@@ -746,10 +750,10 @@ void cmVisualStudio10TargetGenerator
 
   if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
-     this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
      this->GlobalGenerator->TargetsWindowsStore() ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+     this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
@@ -769,8 +773,8 @@ void cmVisualStudio10TargetGenerator
     pts += "</PlatformToolset>\n";
     this->WriteString(pts.c_str(), 2);
     }
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+  if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<WindowsAppContainer>true"
                       "</WindowsAppContainer>\n", 2);
@@ -788,27 +792,29 @@ void cmVisualStudio10TargetGenerator
   ntv += toolset? toolset : "Default";
   ntv += "</NdkToolchainVersion>\n";
   this->WriteString(ntv.c_str(), 2);
-  if(const char* minApi = this->Target->GetProperty("ANDROID_API_MIN"))
+  if(const char* minApi =
+     this->GeneratorTarget->Getproperty("ANDROID_API_MIN"))
     {
     this->WriteString("<AndroidMinAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(minApi) << "</AndroidMinAPI>\n";
     }
-  if(const char* api = this->Target->GetProperty("ANDROID_API"))
+  if(const char* api = this->GeneratorTarget->Getproperty("ANDROID_API"))
     {
     this->WriteString("<AndroidTargetAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(api) << "</AndroidTargetAPI>\n";
     }
 
-  if(const char* cpuArch = this->Target->GetProperty("ANDROID_ARCH"))
+  if(const char* cpuArch = this->GeneratorTarget->Getproperty("ANDROID_ARCH"))
     {
     this->WriteString("<AndroidArch>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(cpuArch) <<
       "</AndroidArch>\n";
     }
 
-  if(const char* stlType = this->Target->GetProperty("ANDROID_STL_TYPE"))
+  if(const char* stlType =
+     this->GeneratorTarget->Getproperty("ANDROID_STL_TYPE"))
     {
     this->WriteString("<AndroidStlType>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(stlType) <<
@@ -1963,7 +1969,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   if (this->MSTools)
     {
     // If we have the VS_WINRT_COMPONENT set then force Compile as WinRT.
-    if (this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+    if (this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT"))
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
@@ -2012,7 +2018,7 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   if(this->NsightTegra)
     {
     if(const char* processMax =
-        this->Target->GetProperty("ANDROID_PROCESS_MAX"))
+        this->GeneratorTarget->Getproperty("ANDROID_PROCESS_MAX"))
       {
       this->WriteString("<ProcessMax>", 3);
       *this->BuildFileStream << cmVS10EscapeXML(processMax) <<
@@ -2270,18 +2276,18 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmVS10EscapeXML(antBuildPath) << "</AntBuildPath>\n";
   }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
+  if (this->GeneratorTarget->GetpropertyAsBool("ANDROID_SKIP_ANT_STEP"))
     {
     this->WriteString("<SkipAntStep>true</SkipAntStep>\n", 3);
     }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_PROGUARD"))
+  if (this->GeneratorTarget->GetpropertyAsBool("ANDROID_PROGUARD"))
     {
     this->WriteString("<EnableProGuard>true</EnableProGuard>\n", 3);
     }
 
   if (const char* proGuardConfigLocation =
-      this->Target->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
+      this->GeneratorTarget->Getproperty("ANDROID_PROGUARD_CONFIG_PATH"))
     {
     this->WriteString("<ProGuardConfigLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(proGuardConfigLocation) <<
@@ -2289,7 +2295,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* securePropertiesLocation =
-      this->Target->GetProperty("ANDROID_SECURE_PROPS_PATH"))
+      this->GeneratorTarget->Getproperty("ANDROID_SECURE_PROPS_PATH"))
     {
     this->WriteString("<SecurePropertiesLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(securePropertiesLocation) <<
@@ -2297,7 +2303,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2309,7 +2315,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDependenciesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2321,7 +2327,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* javaSourceDir =
-      this->Target->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
+      this->GeneratorTarget->Getproperty("ANDROID_JAVA_SOURCE_DIR"))
     {
     this->WriteString("<JavaSourceDir>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(javaSourceDir) <<
@@ -2329,7 +2335,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_JAR_DIRECTORIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_JAR_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2341,7 +2347,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDeps =
-      this->Target->GetProperty("ANDROID_JAR_DEPENDENCIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_JAR_DEPENDENCIES"))
     {
     this->WriteString("<JarDependencies>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(jarDeps) <<
@@ -2349,7 +2355,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* assetsDirectories =
-      this->Target->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
+      this->GeneratorTarget->Getproperty("ANDROID_ASSETS_DIRECTORIES"))
     {
     this->WriteString("<AssetsDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(assetsDirectories) <<
@@ -2365,7 +2371,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
   }
 
   if (const char* antAdditionalOptions =
-      this->Target->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
+      this->GeneratorTarget->Getproperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
     {
     this->WriteString("<AdditionalOptions>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(antAdditionalOptions) <<
@@ -2436,7 +2442,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   flags += " ";
   flags += this->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
-  const char* targetLinkFlags = this->Target->GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags =
+      this->GeneratorTarget->Getproperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     flags += " ";
@@ -2444,7 +2451,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     }
   std::string flagsProp = "LINK_FLAGS_";
   flagsProp += CONFIG;
-  if(const char* flagsConfig = this->Target->GetProperty(flagsProp.c_str()))
+  if(const char* flagsConfig =
+     this->GeneratorTarget->Getproperty(flagsProp.c_str()))
     {
     flags += " ";
     flags += flagsConfig;
@@ -2522,7 +2530,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     {
     linkOptions.AddFlag("Version", "");
 
-    if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
+    if ( this->GeneratorTarget->GetpropertyAsBool("WIN32_EXECUTABLE") )
       {
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
@@ -2594,7 +2602,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
+    if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") &&
        this->Target->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
@@ -2636,7 +2644,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)exportall.def");
       }
@@ -2780,7 +2788,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
        this->Target->GetType() == cmTarget::EXECUTABLE &&
-       this->Target->GetPropertyAsBool("ANDROID_GUI"))
+       this->GeneratorTarget->GetpropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
       }
@@ -2795,7 +2803,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
@@ -2908,14 +2916,14 @@ void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_DESKTOP_EXTENSIONS_VERSION");
     if (desktopExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsDesktop",
                                          desktopExtensionsVersion);
       }
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_MOBILE_EXTENSIONS_VERSION");
     if (mobileExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsMobile",
@@ -2955,11 +2963,11 @@ void cmVisualStudio10TargetGenerator::WriteSDKReferences()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_DESKTOP_EXTENSIONS_VERSION");
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_MOBILE_EXTENSIONS_VERSION");
     const char* iotExtensionsVersion =
-      this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
+      this->GeneratorTarget->Getproperty("VS_IOT_EXTENSIONS_VERSION");
 
     if(desktopExtensionsVersion || mobileExtensionsVersion ||
        iotExtensionsVersion)
@@ -3190,7 +3198,8 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       "</WindowsTargetPlatformVersion>\n";
     }
   const char* targetPlatformMinVersion =
-      this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+      this->GeneratorTarget
+      ->Getproperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
   if(targetPlatformMinVersion)
     {
     this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
@@ -3209,7 +3218,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     }
 
   // Added IoT Startup Task support
-  if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
+  if(this->GeneratorTarget->GetpropertyAsBool("VS_IOT_STARTUP_TASK"))
     {
     this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb3d49dd2b6f7c95682a28a87dbb1206cc02b70e
commit bb3d49dd2b6f7c95682a28a87dbb1206cc02b70e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:56:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:17:10 2015 +0200

    cmTarget: Move link type enum out.
    
    Remove a reason for generate time code to depend on the cmTarget header/type.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 7da334e..b0d98e9 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -373,13 +373,13 @@ void CCONV cmAddLinkLibraryForTarget(void *arg, const char *tgt,
   switch (libtype)
     {
     case CM_LIBRARY_GENERAL:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::GENERAL);
+      mf->AddLinkLibraryForTarget(tgt,value, GENERAL_LibraryType);
       break;
     case CM_LIBRARY_DEBUG:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::DEBUG);
+      mf->AddLinkLibraryForTarget(tgt,value, DEBUG_LibraryType);
       break;
     case CM_LIBRARY_OPTIMIZED:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::OPTIMIZED);
+      mf->AddLinkLibraryForTarget(tgt,value, OPTIMIZED_LibraryType);
       break;
     }
 }
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 22843f1..742651a 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -482,24 +482,24 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
 
   // Look for entries meant for this configuration.
   std::vector<cmLinkItem> actual_libs;
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
   for(std::vector<std::string>::const_iterator di = deplist.begin();
       di != deplist.end(); ++di)
     {
     if(*di == "debug")
       {
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(*di == "optimized")
       {
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(*di == "general")
       {
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(!di->empty())
@@ -517,17 +517,17 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
           {
           if(strcmp(val, "debug") == 0)
             {
-            llt = cmTarget::DEBUG;
+            llt = DEBUG_LibraryType;
             }
           else if(strcmp(val, "optimized") == 0)
             {
-            llt = cmTarget::OPTIMIZED;
+            llt = OPTIMIZED_LibraryType;
             }
           }
         }
 
       // If the library is meant for this link type then use it.
-      if(llt == cmTarget::GENERAL || llt == this->LinkType)
+      if(llt == GENERAL_LibraryType || llt == this->LinkType)
         {
         cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
         actual_libs.push_back(item);
@@ -539,7 +539,7 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
         }
 
       // Reset the link type until another explicit type is given.
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = false;
       }
     }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 9d960c6..de1e24c 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -157,7 +157,7 @@ private:
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
-  cmTarget::LinkLibraryType LinkType;
+  cmTargetLinkLibraryType LinkType;
   bool HasConfig;
   bool DebugMode;
   bool OldLinkDirMode;
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index fde8fb1..0ef2ea5 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -120,15 +120,15 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
         std::string ltValue;
         switch(li->second)
           {
-          case cmTarget::GENERAL:
+          case GENERAL_LibraryType:
             valueNew += "general;";
             ltValue = "general";
             break;
-          case cmTarget::DEBUG:
+          case DEBUG_LibraryType:
             valueNew += "debug;";
             ltValue = "debug";
             break;
-          case cmTarget::OPTIMIZED:
+          case OPTIMIZED_LibraryType:
             valueNew += "optimized;";
             ltValue = "optimized";
             break;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f33a9e1..67ad9cf 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5416,13 +5416,13 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
                                 this->MaxLanguageStandards);
     }
 
-  cmTarget::LinkLibraryType linkType = this->Target->ComputeLinkType(config);
+  cmTargetLinkLibraryType linkType = this->Target->ComputeLinkType(config);
   cmTarget::LinkLibraryVectorType const& oldllibs =
     this->Target->GetOriginalLinkLibraries();
   for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
       li != oldllibs.end(); ++li)
     {
-    if(li->second != cmTarget::GENERAL && li->second != linkType)
+    if(li->second != GENERAL_LibraryType && li->second != linkType)
       {
       std::string name = this->Target->CheckCMP0004(li->first);
       if(name == this->GetName() || name.empty())
diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx
index 996b538..eb3bfce 100644
--- a/Source/cmLinkLibrariesCommand.cxx
+++ b/Source/cmLinkLibrariesCommand.cxx
@@ -34,7 +34,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::DEBUG);
+                                 DEBUG_LibraryType);
       }
     else if (*i == "optimized")
       {
@@ -46,7 +46,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::OPTIMIZED);
+                                 OPTIMIZED_LibraryType);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 862ab2d..319a658 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1145,7 +1145,7 @@ void cmLocalVisualStudio6Generator
       libDebug =
         this->ConvertToOutputFormat(libDebug.c_str(), SHELL);
 
-      if (j->second == cmTarget::GENERAL)
+      if (j->second == GENERAL_LibraryType)
         {
         libOptions += " ";
         libOptions += lib;
@@ -1156,7 +1156,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineOptionsForDebug +=  libDebug;
         libMultiLineOptionsForDebug += "\n";
         }
-      if (j->second == cmTarget::DEBUG)
+      if (j->second == DEBUG_LibraryType)
         {
         libDebugOptions += " ";
         libDebugOptions += lib;
@@ -1165,7 +1165,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineDebugOptions += libDebug;
         libMultiLineDebugOptions += "\n";
         }
-      if (j->second == cmTarget::OPTIMIZED)
+      if (j->second == OPTIMIZED_LibraryType)
         {
         libOptimizedOptions += " ";
         libOptimizedOptions += lib;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c060505..9c046d2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1415,7 +1415,7 @@ bool cmMakefile::ParseDefineFlag(std::string const& def, bool remove)
 }
 
 void cmMakefile::AddLinkLibrary(const std::string& lib,
-                                cmTarget::LinkLibraryType llt)
+                                cmTargetLinkLibraryType llt)
 {
   cmTarget::LibraryID tmp;
   tmp.first = lib;
@@ -1425,7 +1425,7 @@ void cmMakefile::AddLinkLibrary(const std::string& lib,
 
 void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
                                          const std::string& lib,
-                                         cmTarget::LinkLibraryType llt)
+                                         cmTargetLinkLibraryType llt)
 {
   cmTargets::iterator i = this->Targets.find(target);
   if ( i != this->Targets.end())
@@ -1486,7 +1486,7 @@ void cmMakefile::AddLinkDirectoryForTarget(const std::string& target,
 
 void cmMakefile::AddLinkLibrary(const std::string& lib)
 {
-  this->AddLinkLibrary(lib,cmTarget::GENERAL);
+  this->AddLinkLibrary(lib,GENERAL_LibraryType);
 }
 
 void cmMakefile::InitializeFromParent(cmMakefile* parent)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 459d34c..bc795b6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -219,9 +219,9 @@ public:
    * Add a link library to the build.
    */
   void AddLinkLibrary(const std::string&);
-  void AddLinkLibrary(const std::string&, cmTarget::LinkLibraryType type);
+  void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type);
   void AddLinkLibraryForTarget(const std::string& tgt, const std::string&,
-                               cmTarget::LinkLibraryType type);
+                               cmTargetLinkLibraryType type);
   void AddLinkDirectoryForTarget(const std::string& tgt, const std::string& d);
 
   /**
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 468a589..dd8fa9c 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -123,4 +123,10 @@ static thisClass* SafeDownCast(cmObject *c) \
 } \
 class cmTypeMacro_UseTrailingSemicolon
 
+enum cmTargetLinkLibraryType {
+  GENERAL_LibraryType,
+  DEBUG_LibraryType,
+  OPTIMIZED_LibraryType
+};
+
 #endif
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 847a5c1..0128c78 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -632,13 +632,13 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories() const
 }
 
 //----------------------------------------------------------------------------
-cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
+cmTargetLinkLibraryType cmTarget::ComputeLinkType(
                                       const std::string& config) const
 {
   // No configuration is always optimized.
   if(config.empty())
     {
-    return cmTarget::OPTIMIZED;
+    return OPTIMIZED_LibraryType;
     }
 
   // Get the list of configurations considered to be DEBUG.
@@ -650,10 +650,10 @@ cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
   if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
       debugConfigs.end())
     {
-    return cmTarget::DEBUG;
+    return DEBUG_LibraryType;
     }
   // The current configuration is not a debug configuration.
-  return cmTarget::OPTIMIZED;
+  return OPTIMIZED_LibraryType;
 }
 
 //----------------------------------------------------------------------------
@@ -693,9 +693,9 @@ bool cmTarget::NameResolvesToFramework(const std::string& libname) const
 
 //----------------------------------------------------------------------------
 std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const
+                                  cmTargetLinkLibraryType llt) const
 {
-  if (llt == GENERAL)
+  if (llt == GENERAL_LibraryType)
     {
     return value;
     }
@@ -716,7 +716,7 @@ std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
     configString = "$<OR:" + configString + ">";
     }
 
-  if (llt == OPTIMIZED)
+  if (llt == OPTIMIZED_LibraryType)
     {
     configString = "$<NOT:" + configString + ">";
     }
@@ -773,15 +773,16 @@ void cmTarget::GetTllSignatureTraces(std::ostringstream &s,
 void cmTarget::AddLinkLibrary(cmMakefile& mf,
                               const std::string& target,
                               const std::string& lib,
-                              LinkLibraryType llt)
+                              cmTargetLinkLibraryType llt)
 {
   cmTarget *tgt = this->Makefile->FindTargetToUse(lib);
   {
   const bool isNonImportedTarget = tgt && !tgt->IsImported();
 
-  const std::string libName = (isNonImportedTarget && llt != GENERAL)
-                                                        ? targetNameGenex(lib)
-                                                        : lib;
+  const std::string libName =
+      (isNonImportedTarget && llt != GENERAL_LibraryType)
+      ? targetNameGenex(lib)
+      : lib;
   this->AppendProperty("LINK_LIBRARIES",
                        this->GetDebugGeneratorExpressions(libName,
                                                           llt).c_str());
@@ -822,13 +823,13 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
       }
     switch (llt)
       {
-      case cmTarget::GENERAL:
+      case GENERAL_LibraryType:
         dependencies += "general";
         break;
-      case cmTarget::DEBUG:
+      case DEBUG_LibraryType:
         dependencies += "debug";
         break;
-      case cmTarget::OPTIMIZED:
+      case OPTIMIZED_LibraryType:
         dependencies += "optimized";
         break;
       }
@@ -1162,7 +1163,7 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
 
     // Parse the dependency information, which is a set of
     // type, library pairs separated by ";". There is always a trailing ";".
-    cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+    cmTargetLinkLibraryType llt = GENERAL_LibraryType;
     std::string depline = deps;
     std::string::size_type start = 0;
     std::string::size_type end;
@@ -1174,22 +1175,22 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
         {
         if (l == "debug")
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         else if (l == "optimized")
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         else if (l == "general")
           {
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         else
           {
           LibraryID lib2(l,llt);
           this->InsertDependencyForVS6( dep_map, lib, lib2);
           this->GatherDependenciesForVS6( mf, lib2, dep_map);
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         }
       start = end+1; // skip the ;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 97515a7..b0d5f4a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -140,17 +140,15 @@ public:
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
 
-  enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
-
   //* how we identify a library, by name and type
-  typedef std::pair<std::string, LinkLibraryType> LibraryID;
+  typedef std::pair<std::string, cmTargetLinkLibraryType> LibraryID;
 
   typedef std::vector<LibraryID > LinkLibraryVectorType;
   const LinkLibraryVectorType &GetOriginalLinkLibraries() const
     {return this->OriginalLinkLibraries;}
 
   /** Compute the link type to use for the given configuration.  */
-  LinkLibraryType ComputeLinkType(const std::string& config) const;
+  cmTargetLinkLibraryType ComputeLinkType(const std::string& config) const;
 
   /**
    * Clear the dependency information recorded for this target, if any.
@@ -161,7 +159,7 @@ public:
   bool NameResolvesToFramework(const std::string& libname) const;
   void AddLinkLibrary(cmMakefile& mf,
                       const std::string& target, const std::string& lib,
-                      LinkLibraryType llt);
+                      cmTargetLinkLibraryType llt);
   enum TLLSignature {
     KeywordTLLSignature,
     PlainTLLSignature
@@ -297,7 +295,7 @@ public:
   void AppendBuildInterfaceIncludes();
 
   std::string GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const;
+                                  cmTargetLinkLibraryType llt) const;
 
   void AddSystemIncludeDirectories(const std::set<std::string> &incs);
   std::set<std::string> const & GetSystemIncludeDirectories() const
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index b57b921..1a1cf39 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -136,7 +136,7 @@ bool cmTargetLinkLibrariesCommand
     }
 
   // Keep track of link configuration specifiers.
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
 
   // Start with primary linking and switch to link interface
@@ -242,27 +242,27 @@ bool cmTargetLinkLibrariesCommand
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::DEBUG);
+        this->LinkLibraryTypeSpecifierWarning(llt, DEBUG_LibraryType);
         }
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "optimized")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::OPTIMIZED);
+        this->LinkLibraryTypeSpecifierWarning(llt, OPTIMIZED_LibraryType);
         }
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "general")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::GENERAL);
+        this->LinkLibraryTypeSpecifierWarning(llt, GENERAL_LibraryType);
         }
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(haveLLT)
@@ -282,7 +282,7 @@ bool cmTargetLinkLibrariesCommand
       // specifed that a library is both debug and optimized.  (this check is
       // only there for backwards compatibility when mixing projects built
       // with old versions of CMake and new)
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       std::string linkType = args[0];
       linkType += "_LINK_TYPE";
       const char* linkTypeString =
@@ -291,11 +291,11 @@ bool cmTargetLinkLibrariesCommand
         {
         if(strcmp(linkTypeString, "debug") == 0)
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         if(strcmp(linkTypeString, "optimized") == 0)
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         }
       if (!this->HandleLibrary(args[i], llt))
@@ -350,7 +350,7 @@ cmTargetLinkLibrariesCommand
 //----------------------------------------------------------------------------
 bool
 cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
-                                            cmTarget::LinkLibraryType llt)
+                                            cmTargetLinkLibraryType llt)
 {
   if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
       && this->CurrentProcessingState != ProcessingKeywordLinkInterface)
@@ -469,7 +469,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
   std::string prop;
 
   // Include this library in the link interface for the target.
-  if(llt == cmTarget::DEBUG || llt == cmTarget::GENERAL)
+  if(llt == DEBUG_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the DEBUG configuration interfaces.
     for(std::vector<std::string>::const_iterator i = debugConfigs.begin();
@@ -480,7 +480,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
       this->Target->AppendProperty(prop, lib.c_str());
       }
     }
-  if(llt == cmTarget::OPTIMIZED || llt == cmTarget::GENERAL)
+  if(llt == OPTIMIZED_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the non-DEBUG configuration interfaces.
     this->Target->AppendProperty("LINK_INTERFACE_LIBRARIES", lib.c_str());
diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h
index 47dd8bd..f061e6d 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -62,7 +62,7 @@ private:
 
   ProcessingState CurrentProcessingState;
 
-  bool HandleLibrary(const std::string& lib, cmTarget::LinkLibraryType llt);
+  bool HandleLibrary(const std::string& lib, cmTargetLinkLibraryType llt);
 };
 
 
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index fececfd..2d5e724 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -477,7 +477,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
             ++libIt)
       {
       mf->AddLinkLibraryForTarget(targetName, *libIt,
-                                  cmTarget::GENERAL);
+                                  GENERAL_LibraryType);
       }
 
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 10:37:24 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 10:37:24 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-410-g7545431
Message-ID: <20151010143724.A3DEFC0660@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  754543150fa16f2b1526d37befff7ee15fd944af (commit)
       via  c9c053563891a851ccbb8d187ed3f7b2bb317d02 (commit)
      from  0f325d3427c1a12af88dbe7a149393dfafa1954a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=754543150fa16f2b1526d37befff7ee15fd944af
commit 754543150fa16f2b1526d37befff7ee15fd944af
Merge: 0f325d3 c9c0535
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 10:37:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 10:37:23 2015 -0400

    Merge topic 'use-generator-target' into next
    
    c9c05356 fixup! VS10: Use GeneratorTarget instead of Target for property reads.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9c053563891a851ccbb8d187ed3f7b2bb317d02
commit c9c053563891a851ccbb8d187ed3f7b2bb317d02
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 16:37:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:37:05 2015 +0200

    fixup! VS10: Use GeneratorTarget instead of Target for property reads.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 72bcf79..6bc7984 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -270,7 +270,7 @@ void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
   if(this->GeneratorTarget->GetType() == cmTarget::INTERFACE_LIBRARY
-      || this->GeneratorTarget->Getproperty("EXTERNAL_MSPROJECT"))
+      || this->GeneratorTarget->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
     }
@@ -369,7 +369,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsProjectTypes =
-    this->GeneratorTarget->Getproperty("VS_GLOBAL_PROJECT_TYPES");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_PROJECT_TYPES");
   if(vsProjectTypes)
     {
     this->WriteString("<ProjectTypes>", 2);
@@ -378,11 +378,11 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsProjectName =
-      this->GeneratorTarget->Getproperty("VS_SCC_PROJECTNAME");
+      this->GeneratorTarget->GetProperty("VS_SCC_PROJECTNAME");
   const char* vsLocalPath =
-      this->GeneratorTarget->Getproperty("VS_SCC_LOCALPATH");
+      this->GeneratorTarget->GetProperty("VS_SCC_LOCALPATH");
   const char* vsProvider =
-      this->GeneratorTarget->Getproperty("VS_SCC_PROVIDER");
+      this->GeneratorTarget->GetProperty("VS_SCC_PROVIDER");
 
   if( vsProjectName && vsLocalPath && vsProvider )
     {
@@ -397,7 +397,7 @@ void cmVisualStudio10TargetGenerator::Generate()
       "</SccProvider>\n";
 
     const char* vsAuxPath =
-        this->GeneratorTarget->Getproperty("VS_SCC_AUXPATH");
+        this->GeneratorTarget->GetProperty("VS_SCC_AUXPATH");
     if( vsAuxPath )
       {
       this->WriteString("<SccAuxPath>", 2);
@@ -406,13 +406,13 @@ void cmVisualStudio10TargetGenerator::Generate()
       }
     }
 
-  if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
     {
     this->WriteString("<WinMDAssembly>true</WinMDAssembly>\n", 2);
     }
 
   const char* vsGlobalKeyword =
-    this->GeneratorTarget->Getproperty("VS_GLOBAL_KEYWORD");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_KEYWORD");
   if(!vsGlobalKeyword)
     {
     this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
@@ -425,7 +425,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsGlobalRootNamespace =
-    this->GeneratorTarget->Getproperty("VS_GLOBAL_ROOTNAMESPACE");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
   if(vsGlobalRootNamespace)
     {
     this->WriteString("<RootNamespace>", 2);
@@ -436,14 +436,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(this->Platform)
                            << "</Platform>\n";
-  const char* projLabel = this->GeneratorTarget->Getproperty("PROJECT_LABEL");
+  const char* projLabel = this->GeneratorTarget->GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = this->Name.c_str();
     }
   this->WriteString("<ProjectName>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(projLabel) << "</ProjectName>\n";
-  if(const char* targetFrameworkVersion = this->GeneratorTarget->Getproperty(
+  if(const char* targetFrameworkVersion = this->GeneratorTarget->GetProperty(
        "VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     this->WriteString("<TargetFrameworkVersion>", 2);
@@ -502,7 +502,7 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReferences()
 {
   std::vector<std::string> references;
   if(const char* vsDotNetReferences =
-     this->GeneratorTarget->Getproperty("VS_DOTNET_REFERENCES"))
+     this->GeneratorTarget->GetProperty("VS_DOTNET_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsDotNetReferences, references);
     }
@@ -548,7 +548,7 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
           i != this->Configurations.end(); ++i)
         {
         this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
-        if(this->GeneratorTarget->Getproperty("VS_GLOBAL_ROOTNAMESPACE"))
+        if(this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
           {
           (*this->BuildFileStream ) << "$(RootNamespace).";
           }
@@ -615,7 +615,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTReferences()
 {
   std::vector<std::string> references;
   if(const char* vsWinRTReferences =
-     this->GeneratorTarget->Getproperty("VS_WINRT_REFERENCES"))
+     this->GeneratorTarget->GetProperty("VS_WINRT_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsWinRTReferences, references);
     }
@@ -684,7 +684,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
         break;
       case cmTarget::EXECUTABLE:
         if(this->NsightTegra &&
-           !this->GeneratorTarget->GetpropertyAsBool("ANDROID_GUI"))
+           !this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
           {
           // Android executables are .so too.
           configType += "DynamicLibrary";
@@ -751,10 +751,10 @@ void cmVisualStudio10TargetGenerator
 
   if((this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
-     this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
      this->GlobalGenerator->TargetsWindowsStore() ||
-     this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_EXTENSIONS"))
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
@@ -774,8 +774,8 @@ void cmVisualStudio10TargetGenerator
     pts += "</PlatformToolset>\n";
     this->WriteString(pts.c_str(), 2);
     }
-  if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") ||
-     this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_EXTENSIONS"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<WindowsAppContainer>true"
                       "</WindowsAppContainer>\n", 2);
@@ -794,20 +794,20 @@ void cmVisualStudio10TargetGenerator
   ntv += "</NdkToolchainVersion>\n";
   this->WriteString(ntv.c_str(), 2);
   if(const char* minApi =
-     this->GeneratorTarget->Getproperty("ANDROID_API_MIN"))
+     this->GeneratorTarget->GetProperty("ANDROID_API_MIN"))
     {
     this->WriteString("<AndroidMinAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(minApi) << "</AndroidMinAPI>\n";
     }
-  if(const char* api = this->GeneratorTarget->Getproperty("ANDROID_API"))
+  if(const char* api = this->GeneratorTarget->GetProperty("ANDROID_API"))
     {
     this->WriteString("<AndroidTargetAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(api) << "</AndroidTargetAPI>\n";
     }
 
-  if(const char* cpuArch = this->GeneratorTarget->Getproperty("ANDROID_ARCH"))
+  if(const char* cpuArch = this->GeneratorTarget->GetProperty("ANDROID_ARCH"))
     {
     this->WriteString("<AndroidArch>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(cpuArch) <<
@@ -815,7 +815,7 @@ void cmVisualStudio10TargetGenerator
     }
 
   if(const char* stlType =
-     this->GeneratorTarget->Getproperty("ANDROID_STL_TYPE"))
+     this->GeneratorTarget->GetProperty("ANDROID_STL_TYPE"))
     {
     this->WriteString("<AndroidStlType>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(stlType) <<
@@ -1970,7 +1970,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   if (this->MSTools)
     {
     // If we have the VS_WINRT_COMPONENT set then force Compile as WinRT.
-    if (this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT"))
+    if (this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
@@ -2019,7 +2019,7 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   if(this->NsightTegra)
     {
     if(const char* processMax =
-        this->GeneratorTarget->Getproperty("ANDROID_PROCESS_MAX"))
+        this->GeneratorTarget->GetProperty("ANDROID_PROCESS_MAX"))
       {
       this->WriteString("<ProcessMax>", 3);
       *this->BuildFileStream << cmVS10EscapeXML(processMax) <<
@@ -2277,18 +2277,18 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmVS10EscapeXML(antBuildPath) << "</AntBuildPath>\n";
   }
 
-  if (this->GeneratorTarget->GetpropertyAsBool("ANDROID_SKIP_ANT_STEP"))
+  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
     {
     this->WriteString("<SkipAntStep>true</SkipAntStep>\n", 3);
     }
 
-  if (this->GeneratorTarget->GetpropertyAsBool("ANDROID_PROGUARD"))
+  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_PROGUARD"))
     {
     this->WriteString("<EnableProGuard>true</EnableProGuard>\n", 3);
     }
 
   if (const char* proGuardConfigLocation =
-      this->GeneratorTarget->Getproperty("ANDROID_PROGUARD_CONFIG_PATH"))
+      this->GeneratorTarget->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
     {
     this->WriteString("<ProGuardConfigLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(proGuardConfigLocation) <<
@@ -2296,7 +2296,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* securePropertiesLocation =
-      this->GeneratorTarget->Getproperty("ANDROID_SECURE_PROPS_PATH"))
+      this->GeneratorTarget->GetProperty("ANDROID_SECURE_PROPS_PATH"))
     {
     this->WriteString("<SecurePropertiesLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(securePropertiesLocation) <<
@@ -2304,7 +2304,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDirectoriesExpression =
-      this->GeneratorTarget->Getproperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2316,7 +2316,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDependenciesExpression =
-      this->GeneratorTarget->Getproperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2328,7 +2328,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* javaSourceDir =
-      this->GeneratorTarget->Getproperty("ANDROID_JAVA_SOURCE_DIR"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
     {
     this->WriteString("<JavaSourceDir>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(javaSourceDir) <<
@@ -2336,7 +2336,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDirectoriesExpression =
-      this->GeneratorTarget->Getproperty("ANDROID_JAR_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAR_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2348,7 +2348,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDeps =
-      this->GeneratorTarget->Getproperty("ANDROID_JAR_DEPENDENCIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAR_DEPENDENCIES"))
     {
     this->WriteString("<JarDependencies>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(jarDeps) <<
@@ -2356,7 +2356,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* assetsDirectories =
-      this->GeneratorTarget->Getproperty("ANDROID_ASSETS_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
     {
     this->WriteString("<AssetsDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(assetsDirectories) <<
@@ -2372,7 +2372,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
   }
 
   if (const char* antAdditionalOptions =
-      this->GeneratorTarget->Getproperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
+      this->GeneratorTarget->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
     {
     this->WriteString("<AdditionalOptions>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(antAdditionalOptions) <<
@@ -2444,7 +2444,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   flags += this->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
   const char* targetLinkFlags =
-      this->GeneratorTarget->Getproperty("LINK_FLAGS");
+      this->GeneratorTarget->GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     flags += " ";
@@ -2453,7 +2453,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string flagsProp = "LINK_FLAGS_";
   flagsProp += CONFIG;
   if(const char* flagsConfig =
-     this->GeneratorTarget->Getproperty(flagsProp.c_str()))
+     this->GeneratorTarget->GetProperty(flagsProp.c_str()))
     {
     flags += " ";
     flags += flagsConfig;
@@ -2531,7 +2531,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     {
     linkOptions.AddFlag("Version", "");
 
-    if ( this->GeneratorTarget->GetpropertyAsBool("WIN32_EXECUTABLE") )
+    if ( this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE") )
       {
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
@@ -2603,7 +2603,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->GeneratorTarget->GetpropertyAsBool("VS_WINRT_COMPONENT") &&
+    if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
        this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
@@ -2645,7 +2645,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)exportall.def");
       }
@@ -2789,7 +2789,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
        this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE &&
-       this->GeneratorTarget->GetpropertyAsBool("ANDROID_GUI"))
+       this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
       }
@@ -2804,7 +2804,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->GeneratorTarget->GetpropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
@@ -2917,14 +2917,14 @@ void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->GeneratorTarget->Getproperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     if (desktopExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsDesktop",
                                          desktopExtensionsVersion);
       }
     const char* mobileExtensionsVersion =
-      this->GeneratorTarget->Getproperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     if (mobileExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsMobile",
@@ -2964,11 +2964,11 @@ void cmVisualStudio10TargetGenerator::WriteSDKReferences()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->GeneratorTarget->Getproperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     const char* mobileExtensionsVersion =
-      this->GeneratorTarget->Getproperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     const char* iotExtensionsVersion =
-      this->GeneratorTarget->Getproperty("VS_IOT_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_IOT_EXTENSIONS_VERSION");
 
     if(desktopExtensionsVersion || mobileExtensionsVersion ||
        iotExtensionsVersion)
@@ -3201,7 +3201,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     }
   const char* targetPlatformMinVersion =
       this->GeneratorTarget
-      ->Getproperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+      ->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
   if(targetPlatformMinVersion)
     {
     this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
@@ -3220,7 +3220,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     }
 
   // Added IoT Startup Task support
-  if(this->GeneratorTarget->GetpropertyAsBool("VS_IOT_STARTUP_TASK"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
     {
     this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |  100 ++++++++++++++--------------
 1 file changed, 50 insertions(+), 50 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 10:48:02 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 10:48:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-414-g28ce834
Message-ID: <20151010144802.5517EBFE3C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  28ce8348b5d55ce1b4c3006d103aef9a897ce190 (commit)
       via  56e63ea28a5d507644a5e330cd47f495c1df8011 (commit)
       via  793a7e20b49ed9c07d9d119ed0fd8659e94fef2e (commit)
       via  c2b6619b0d50b65668976530c7c30178165f66b5 (commit)
      from  754543150fa16f2b1526d37befff7ee15fd944af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28ce8348b5d55ce1b4c3006d103aef9a897ce190
commit 28ce8348b5d55ce1b4c3006d103aef9a897ce190
Merge: 7545431 56e63ea
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 10:48:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 10:48:01 2015 -0400

    Merge topic 'use-generator-target' into next
    
    56e63ea2 VS10: Use GeneratorTarget instead of Target for name.
    793a7e20 VS10: Use GeneratorTarget instead of Target for type checks.
    c2b6619b VS10: Use GeneratorTarget instead of Target for property reads.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56e63ea28a5d507644a5e330cd47f495c1df8011
commit 56e63ea28a5d507644a5e330cd47f495c1df8011
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:53:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:47:38 2015 +0200

    VS10: Use GeneratorTarget instead of Target for name.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 120fceb..6bc7984 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -178,7 +178,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
     this->GeneratorTarget->GetLocalGenerator();
-  this->Name = this->Target->GetName();
+  this->Name = this->GeneratorTarget->GetName();
   this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
   this->Platform = gg->GetPlatformName();
   this->NsightTegra = gg->IsNsightTegra();
@@ -1782,7 +1782,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
       if(ttype == cmTarget::OBJECT_LIBRARY)
         {
         outDir = intermediateDir;
-        targetNameFull = this->Target->GetName();
+        targetNameFull = this->GeneratorTarget->GetName();
         targetNameFull += ".lib";
         }
       else
@@ -3331,7 +3331,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3414,7 +3415,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP81()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3474,7 +3476,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3526,7 +3529,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3583,7 +3587,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=793a7e20b49ed9c07d9d119ed0fd8659e94fef2e
commit 793a7e20b49ed9c07d9d119ed0fd8659e94fef2e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:52:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:47:37 2015 +0200

    VS10: Use GeneratorTarget instead of Target for type checks.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 97579b2..120fceb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -269,7 +269,7 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
 void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
-  if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(this->GeneratorTarget->GetType() == cmTarget::INTERFACE_LIBRARY
       || this->GeneratorTarget->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
@@ -278,7 +278,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
   this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
-  if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
     {
     if(!this->ComputeClOptions())
       {
@@ -361,7 +361,8 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ProjectGUID>", 2);
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
-  if(this->MSTools && this->Target->GetType() <= cmTarget::GLOBAL_TARGET)
+  if(this->MSTools
+     && this->GeneratorTarget->GetType() <= cmTarget::GLOBAL_TARGET)
     {
     this->WriteApplicationTypeSettings();
     this->VerifyNecessaryFiles();
@@ -671,7 +672,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
                                  i->c_str(),
                                  1, " Label=\"Configuration\"", "\n");
     std::string configType = "<ConfigurationType>";
-    switch(this->Target->GetType())
+    switch(this->GeneratorTarget->GetType())
       {
       case cmTarget::SHARED_LIBRARY:
       case cmTarget::MODULE_LIBRARY:
@@ -748,7 +749,7 @@ void cmVisualStudio10TargetGenerator
   mfcLine += useOfMfcValue + "</UseOfMfc>\n";
   this->WriteString(mfcLine.c_str(), 2);
 
-  if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY &&
+  if((this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
      this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
@@ -757,7 +758,7 @@ void cmVisualStudio10TargetGenerator
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
-  else if (this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
+  else if (this->GeneratorTarget->GetType() <= cmTarget::MODULE_LIBRARY &&
            this->ClOptions[config]->UsingSBCS())
     {
     this->WriteString("<CharacterSet>NotSet</CharacterSet>\n", 2);
@@ -1487,7 +1488,7 @@ void cmVisualStudio10TargetGenerator::WriteSources(
 
 void cmVisualStudio10TargetGenerator::WriteAllSources()
 {
-  if(this->Target->GetType() > cmTarget::UTILITY)
+  if(this->GeneratorTarget->GetType() > cmTarget::UTILITY)
     {
     return;
     }
@@ -1749,7 +1750,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmTarget::TargetType ttype = this->Target->GetType();
+  cmTarget::TargetType ttype = this->GeneratorTarget->GetType();
   if(ttype > cmTarget::GLOBAL_TARGET)
     {
     return;
@@ -1834,8 +1835,8 @@ OutputLinkIncremental(std::string const& configName)
     }
   // static libraries and things greater than modules do not need
   // to set this option
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -1973,8 +1974,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
-      if (this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->Target->GetType() == cmTarget::MODULE_LIBRARY )
+      if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+          this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY )
         {
         clOptions.AddDefine("_WINRT_DLL");
         }
@@ -2182,8 +2183,8 @@ WriteMasmOptions(std::string const& configName,
 void
 cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 {
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->Target->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY &&
+     this->GeneratorTarget->GetType() != cmTarget::OBJECT_LIBRARY)
     {
     return;
     }
@@ -2219,9 +2220,9 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 void cmVisualStudio10TargetGenerator::WriteManifestOptions(
   std::string const& config)
 {
-  if (this->Target->GetType() != cmTarget::EXECUTABLE &&
-      this->Target->GetType() != cmTarget::SHARED_LIBRARY &&
-      this->Target->GetType() != cmTarget::MODULE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE &&
+      this->GeneratorTarget->GetType() != cmTarget::SHARED_LIBRARY &&
+      this->GeneratorTarget->GetType() != cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2384,9 +2385,9 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 //----------------------------------------------------------------------------
 bool cmVisualStudio10TargetGenerator::ComputeLinkOptions()
 {
-  if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-     this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     for(std::vector<std::string>::const_iterator
           i = this->Configurations.begin();
@@ -2423,11 +2424,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string CONFIG = cmSystemTools::UpperCase(config);
 
   const char* linkType = "SHARED";
-  if(this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     linkType = "MODULE";
     }
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     linkType = "EXE";
     }
@@ -2512,7 +2513,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string targetNameFull;
   std::string targetNameImport;
   std::string targetNamePDB;
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     this->GeneratorTarget->GetExecutableNames(targetName, targetNameFull,
                                      targetNameImport, targetNamePDB,
@@ -2535,7 +2536,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2557,7 +2558,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2603,7 +2604,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
     if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
-       this->Target->GetType() != cmTarget::EXECUTABLE)
+       this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2641,7 +2642,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
                            "%(IgnoreSpecificDefaultLibraries)");
     }
 
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2658,8 +2659,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 void
 cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 {
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2697,7 +2698,7 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
       libVec.push_back(path);
       }
     else if (!l->Target
-        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
       {
       libVec.push_back(l->Value);
       }
@@ -2769,7 +2770,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WritePlatformConfigTag("ItemDefinitionGroup", i->c_str(), 1);
     *this->BuildFileStream << "\n";
     //    output cl compile flags <ClCompile></ClCompile>
-    if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
       {
       this->WriteClOptions(*i, includes);
       //    output rc compile flags <ResourceCompile></ResourceCompile>
@@ -2787,7 +2788,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     //    output manifest flags  <Manifest></Manifest>
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
-       this->Target->GetType() == cmTarget::EXECUTABLE &&
+       this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE &&
        this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
@@ -2800,7 +2801,7 @@ void
 cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
 {
   bool addedPrelink = false;
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -3008,7 +3009,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
       this->GlobalGenerator->TargetsWindowsPhone())
-      && (cmTarget::EXECUTABLE == this->Target->GetType()))
+      && (cmTarget::EXECUTABLE == this->GeneratorTarget->GetType()))
     {
     std::string pfxFile;
     std::vector<cmSourceFile const*> certificates;
@@ -3137,7 +3138,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>14.0"
         "</MinimumVisualStudioVersion>\n", 2);
 
-      if(this->Target->GetType() < cmTarget::UTILITY)
+      if(this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3151,7 +3152,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (this->Target->GetType() < cmTarget::UTILITY)
+      if (this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3165,12 +3166,13 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>11.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (isWindowsStore && this->Target->GetType() < cmTarget::UTILITY)
+      if (isWindowsStore
+          && this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
       else if (isWindowsPhone &&
-               this->Target->GetType() == cmTarget::EXECUTABLE)
+               this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
         {
         this->WriteString("<XapOutputs>true</XapOutputs>\n", 2);
         this->WriteString("<XapFilename>", 2);
@@ -3228,7 +3230,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
 {
   // For Windows and Windows Phone executables, we will assume that if a
   // manifest is not present that we need to add all the necessary files
-  if (this->Target->GetType() == cmTarget::EXECUTABLE)
+  if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     std::vector<cmSourceFile const*> manifestSources;
     this->GeneratorTarget->GetAppManifest(manifestSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2b6619b0d50b65668976530c7c30178165f66b5
commit c2b6619b0d50b65668976530c7c30178165f66b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:51:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:47:25 2015 +0200

    VS10: Use GeneratorTarget instead of Target for property reads.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a4b0bc3..97579b2 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -270,7 +270,7 @@ void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
   if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
-      || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
+      || this->GeneratorTarget->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
     }
@@ -368,7 +368,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsProjectTypes =
-    this->Target->GetProperty("VS_GLOBAL_PROJECT_TYPES");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_PROJECT_TYPES");
   if(vsProjectTypes)
     {
     this->WriteString("<ProjectTypes>", 2);
@@ -376,9 +376,12 @@ void cmVisualStudio10TargetGenerator::Generate()
       "</ProjectTypes>\n";
     }
 
-  const char* vsProjectName = this->Target->GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalPath = this->Target->GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = this->Target->GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectName =
+      this->GeneratorTarget->GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalPath =
+      this->GeneratorTarget->GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider =
+      this->GeneratorTarget->GetProperty("VS_SCC_PROVIDER");
 
   if( vsProjectName && vsLocalPath && vsProvider )
     {
@@ -392,7 +395,8 @@ void cmVisualStudio10TargetGenerator::Generate()
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
       "</SccProvider>\n";
 
-    const char* vsAuxPath = this->Target->GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath =
+        this->GeneratorTarget->GetProperty("VS_SCC_AUXPATH");
     if( vsAuxPath )
       {
       this->WriteString("<SccAuxPath>", 2);
@@ -401,13 +405,13 @@ void cmVisualStudio10TargetGenerator::Generate()
       }
     }
 
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
     {
     this->WriteString("<WinMDAssembly>true</WinMDAssembly>\n", 2);
     }
 
   const char* vsGlobalKeyword =
-    this->Target->GetProperty("VS_GLOBAL_KEYWORD");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_KEYWORD");
   if(!vsGlobalKeyword)
     {
     this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
@@ -420,7 +424,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsGlobalRootNamespace =
-    this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
   if(vsGlobalRootNamespace)
     {
     this->WriteString("<RootNamespace>", 2);
@@ -431,14 +435,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(this->Platform)
                            << "</Platform>\n";
-  const char* projLabel = this->Target->GetProperty("PROJECT_LABEL");
+  const char* projLabel = this->GeneratorTarget->GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = this->Name.c_str();
     }
   this->WriteString("<ProjectName>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(projLabel) << "</ProjectName>\n";
-  if(const char* targetFrameworkVersion = this->Target->GetProperty(
+  if(const char* targetFrameworkVersion = this->GeneratorTarget->GetProperty(
        "VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     this->WriteString("<TargetFrameworkVersion>", 2);
@@ -497,7 +501,7 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReferences()
 {
   std::vector<std::string> references;
   if(const char* vsDotNetReferences =
-     this->Target->GetProperty("VS_DOTNET_REFERENCES"))
+     this->GeneratorTarget->GetProperty("VS_DOTNET_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsDotNetReferences, references);
     }
@@ -543,7 +547,7 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
           i != this->Configurations.end(); ++i)
         {
         this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
-        if(this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
+        if(this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
           {
           (*this->BuildFileStream ) << "$(RootNamespace).";
           }
@@ -610,7 +614,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTReferences()
 {
   std::vector<std::string> references;
   if(const char* vsWinRTReferences =
-     this->Target->GetProperty("VS_WINRT_REFERENCES"))
+     this->GeneratorTarget->GetProperty("VS_WINRT_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsWinRTReferences, references);
     }
@@ -679,7 +683,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
         break;
       case cmTarget::EXECUTABLE:
         if(this->NsightTegra &&
-           !this->Target->GetPropertyAsBool("ANDROID_GUI"))
+           !this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
           {
           // Android executables are .so too.
           configType += "DynamicLibrary";
@@ -746,10 +750,10 @@ void cmVisualStudio10TargetGenerator
 
   if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
-     this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
      this->GlobalGenerator->TargetsWindowsStore() ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
@@ -769,8 +773,8 @@ void cmVisualStudio10TargetGenerator
     pts += "</PlatformToolset>\n";
     this->WriteString(pts.c_str(), 2);
     }
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<WindowsAppContainer>true"
                       "</WindowsAppContainer>\n", 2);
@@ -788,27 +792,29 @@ void cmVisualStudio10TargetGenerator
   ntv += toolset? toolset : "Default";
   ntv += "</NdkToolchainVersion>\n";
   this->WriteString(ntv.c_str(), 2);
-  if(const char* minApi = this->Target->GetProperty("ANDROID_API_MIN"))
+  if(const char* minApi =
+     this->GeneratorTarget->GetProperty("ANDROID_API_MIN"))
     {
     this->WriteString("<AndroidMinAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(minApi) << "</AndroidMinAPI>\n";
     }
-  if(const char* api = this->Target->GetProperty("ANDROID_API"))
+  if(const char* api = this->GeneratorTarget->GetProperty("ANDROID_API"))
     {
     this->WriteString("<AndroidTargetAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(api) << "</AndroidTargetAPI>\n";
     }
 
-  if(const char* cpuArch = this->Target->GetProperty("ANDROID_ARCH"))
+  if(const char* cpuArch = this->GeneratorTarget->GetProperty("ANDROID_ARCH"))
     {
     this->WriteString("<AndroidArch>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(cpuArch) <<
       "</AndroidArch>\n";
     }
 
-  if(const char* stlType = this->Target->GetProperty("ANDROID_STL_TYPE"))
+  if(const char* stlType =
+     this->GeneratorTarget->GetProperty("ANDROID_STL_TYPE"))
     {
     this->WriteString("<AndroidStlType>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(stlType) <<
@@ -1963,7 +1969,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   if (this->MSTools)
     {
     // If we have the VS_WINRT_COMPONENT set then force Compile as WinRT.
-    if (this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+    if (this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
@@ -2012,7 +2018,7 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   if(this->NsightTegra)
     {
     if(const char* processMax =
-        this->Target->GetProperty("ANDROID_PROCESS_MAX"))
+        this->GeneratorTarget->GetProperty("ANDROID_PROCESS_MAX"))
       {
       this->WriteString("<ProcessMax>", 3);
       *this->BuildFileStream << cmVS10EscapeXML(processMax) <<
@@ -2270,18 +2276,18 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmVS10EscapeXML(antBuildPath) << "</AntBuildPath>\n";
   }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
+  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
     {
     this->WriteString("<SkipAntStep>true</SkipAntStep>\n", 3);
     }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_PROGUARD"))
+  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_PROGUARD"))
     {
     this->WriteString("<EnableProGuard>true</EnableProGuard>\n", 3);
     }
 
   if (const char* proGuardConfigLocation =
-      this->Target->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
+      this->GeneratorTarget->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
     {
     this->WriteString("<ProGuardConfigLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(proGuardConfigLocation) <<
@@ -2289,7 +2295,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* securePropertiesLocation =
-      this->Target->GetProperty("ANDROID_SECURE_PROPS_PATH"))
+      this->GeneratorTarget->GetProperty("ANDROID_SECURE_PROPS_PATH"))
     {
     this->WriteString("<SecurePropertiesLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(securePropertiesLocation) <<
@@ -2297,7 +2303,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2309,7 +2315,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDependenciesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2321,7 +2327,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* javaSourceDir =
-      this->Target->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
     {
     this->WriteString("<JavaSourceDir>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(javaSourceDir) <<
@@ -2329,7 +2335,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_JAR_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAR_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2341,7 +2347,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDeps =
-      this->Target->GetProperty("ANDROID_JAR_DEPENDENCIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAR_DEPENDENCIES"))
     {
     this->WriteString("<JarDependencies>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(jarDeps) <<
@@ -2349,7 +2355,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* assetsDirectories =
-      this->Target->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
     {
     this->WriteString("<AssetsDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(assetsDirectories) <<
@@ -2365,7 +2371,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
   }
 
   if (const char* antAdditionalOptions =
-      this->Target->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
+      this->GeneratorTarget->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
     {
     this->WriteString("<AdditionalOptions>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(antAdditionalOptions) <<
@@ -2436,7 +2442,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   flags += " ";
   flags += this->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
-  const char* targetLinkFlags = this->Target->GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags =
+      this->GeneratorTarget->GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     flags += " ";
@@ -2444,7 +2451,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     }
   std::string flagsProp = "LINK_FLAGS_";
   flagsProp += CONFIG;
-  if(const char* flagsConfig = this->Target->GetProperty(flagsProp.c_str()))
+  if(const char* flagsConfig =
+     this->GeneratorTarget->GetProperty(flagsProp.c_str()))
     {
     flags += " ";
     flags += flagsConfig;
@@ -2522,7 +2530,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     {
     linkOptions.AddFlag("Version", "");
 
-    if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
+    if ( this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE") )
       {
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
@@ -2594,7 +2602,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
+    if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
        this->Target->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
@@ -2636,7 +2644,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)exportall.def");
       }
@@ -2780,7 +2788,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
        this->Target->GetType() == cmTarget::EXECUTABLE &&
-       this->Target->GetPropertyAsBool("ANDROID_GUI"))
+       this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
       }
@@ -2795,7 +2803,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
@@ -2908,14 +2916,14 @@ void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     if (desktopExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsDesktop",
                                          desktopExtensionsVersion);
       }
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     if (mobileExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsMobile",
@@ -2955,11 +2963,11 @@ void cmVisualStudio10TargetGenerator::WriteSDKReferences()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     const char* iotExtensionsVersion =
-      this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_IOT_EXTENSIONS_VERSION");
 
     if(desktopExtensionsVersion || mobileExtensionsVersion ||
        iotExtensionsVersion)
@@ -3190,7 +3198,8 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       "</WindowsTargetPlatformVersion>\n";
     }
   const char* targetPlatformMinVersion =
-      this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+      this->GeneratorTarget
+      ->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
   if(targetPlatformMinVersion)
     {
     this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
@@ -3209,7 +3218,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     }
 
   // Added IoT Startup Task support
-  if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
     {
     this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
     }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 11:00:02 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 11:00:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-416-g6236da0
Message-ID: <20151010150002.D5DD3C0416@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6236da01157482f9fad74a27725bdbb5fd4f62a6 (commit)
       via  fbcff577124f997f0861f079eb790d1a421bad50 (commit)
      from  28ce8348b5d55ce1b4c3006d103aef9a897ce190 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6236da01157482f9fad74a27725bdbb5fd4f62a6
commit 6236da01157482f9fad74a27725bdbb5fd4f62a6
Merge: 28ce834 fbcff57
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 11:00:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 11:00:01 2015 -0400

    Merge topic 'use-generator-target' into next
    
    fbcff577 Revert commits.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbcff577124f997f0861f079eb790d1a421bad50
commit fbcff577124f997f0861f079eb790d1a421bad50
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 16:59:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 16:59:37 2015 +0200

    Revert commits.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index b0d98e9..7da334e 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -373,13 +373,13 @@ void CCONV cmAddLinkLibraryForTarget(void *arg, const char *tgt,
   switch (libtype)
     {
     case CM_LIBRARY_GENERAL:
-      mf->AddLinkLibraryForTarget(tgt,value, GENERAL_LibraryType);
+      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::GENERAL);
       break;
     case CM_LIBRARY_DEBUG:
-      mf->AddLinkLibraryForTarget(tgt,value, DEBUG_LibraryType);
+      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::DEBUG);
       break;
     case CM_LIBRARY_OPTIMIZED:
-      mf->AddLinkLibraryForTarget(tgt,value, OPTIMIZED_LibraryType);
+      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::OPTIMIZED);
       break;
     }
 }
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 742651a..22843f1 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -482,24 +482,24 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
 
   // Look for entries meant for this configuration.
   std::vector<cmLinkItem> actual_libs;
-  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
+  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
   bool haveLLT = false;
   for(std::vector<std::string>::const_iterator di = deplist.begin();
       di != deplist.end(); ++di)
     {
     if(*di == "debug")
       {
-      llt = DEBUG_LibraryType;
+      llt = cmTarget::DEBUG;
       haveLLT = true;
       }
     else if(*di == "optimized")
       {
-      llt = OPTIMIZED_LibraryType;
+      llt = cmTarget::OPTIMIZED;
       haveLLT = true;
       }
     else if(*di == "general")
       {
-      llt = GENERAL_LibraryType;
+      llt = cmTarget::GENERAL;
       haveLLT = true;
       }
     else if(!di->empty())
@@ -517,17 +517,17 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
           {
           if(strcmp(val, "debug") == 0)
             {
-            llt = DEBUG_LibraryType;
+            llt = cmTarget::DEBUG;
             }
           else if(strcmp(val, "optimized") == 0)
             {
-            llt = OPTIMIZED_LibraryType;
+            llt = cmTarget::OPTIMIZED;
             }
           }
         }
 
       // If the library is meant for this link type then use it.
-      if(llt == GENERAL_LibraryType || llt == this->LinkType)
+      if(llt == cmTarget::GENERAL || llt == this->LinkType)
         {
         cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
         actual_libs.push_back(item);
@@ -539,7 +539,7 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
         }
 
       // Reset the link type until another explicit type is given.
-      llt = GENERAL_LibraryType;
+      llt = cmTarget::GENERAL;
       haveLLT = false;
       }
     }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index de1e24c..9d960c6 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -157,7 +157,7 @@ private:
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
-  cmTargetLinkLibraryType LinkType;
+  cmTarget::LinkLibraryType LinkType;
   bool HasConfig;
   bool DebugMode;
   bool OldLinkDirMode;
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index 0ef2ea5..fde8fb1 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -120,15 +120,15 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
         std::string ltValue;
         switch(li->second)
           {
-          case GENERAL_LibraryType:
+          case cmTarget::GENERAL:
             valueNew += "general;";
             ltValue = "general";
             break;
-          case DEBUG_LibraryType:
+          case cmTarget::DEBUG:
             valueNew += "debug;";
             ltValue = "debug";
             break;
-          case OPTIMIZED_LibraryType:
+          case cmTarget::OPTIMIZED:
             valueNew += "optimized;";
             ltValue = "optimized";
             break;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 67ad9cf..f33a9e1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5416,13 +5416,13 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
                                 this->MaxLanguageStandards);
     }
 
-  cmTargetLinkLibraryType linkType = this->Target->ComputeLinkType(config);
+  cmTarget::LinkLibraryType linkType = this->Target->ComputeLinkType(config);
   cmTarget::LinkLibraryVectorType const& oldllibs =
     this->Target->GetOriginalLinkLibraries();
   for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
       li != oldllibs.end(); ++li)
     {
-    if(li->second != GENERAL_LibraryType && li->second != linkType)
+    if(li->second != cmTarget::GENERAL && li->second != linkType)
       {
       std::string name = this->Target->CheckCMP0004(li->first);
       if(name == this->GetName() || name.empty())
diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx
index eb3bfce..996b538 100644
--- a/Source/cmLinkLibrariesCommand.cxx
+++ b/Source/cmLinkLibrariesCommand.cxx
@@ -34,7 +34,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 DEBUG_LibraryType);
+                                 cmTarget::DEBUG);
       }
     else if (*i == "optimized")
       {
@@ -46,7 +46,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 OPTIMIZED_LibraryType);
+                                 cmTarget::OPTIMIZED);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 319a658..862ab2d 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1145,7 +1145,7 @@ void cmLocalVisualStudio6Generator
       libDebug =
         this->ConvertToOutputFormat(libDebug.c_str(), SHELL);
 
-      if (j->second == GENERAL_LibraryType)
+      if (j->second == cmTarget::GENERAL)
         {
         libOptions += " ";
         libOptions += lib;
@@ -1156,7 +1156,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineOptionsForDebug +=  libDebug;
         libMultiLineOptionsForDebug += "\n";
         }
-      if (j->second == DEBUG_LibraryType)
+      if (j->second == cmTarget::DEBUG)
         {
         libDebugOptions += " ";
         libDebugOptions += lib;
@@ -1165,7 +1165,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineDebugOptions += libDebug;
         libMultiLineDebugOptions += "\n";
         }
-      if (j->second == OPTIMIZED_LibraryType)
+      if (j->second == cmTarget::OPTIMIZED)
         {
         libOptimizedOptions += " ";
         libOptimizedOptions += lib;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9c046d2..c060505 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1415,7 +1415,7 @@ bool cmMakefile::ParseDefineFlag(std::string const& def, bool remove)
 }
 
 void cmMakefile::AddLinkLibrary(const std::string& lib,
-                                cmTargetLinkLibraryType llt)
+                                cmTarget::LinkLibraryType llt)
 {
   cmTarget::LibraryID tmp;
   tmp.first = lib;
@@ -1425,7 +1425,7 @@ void cmMakefile::AddLinkLibrary(const std::string& lib,
 
 void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
                                          const std::string& lib,
-                                         cmTargetLinkLibraryType llt)
+                                         cmTarget::LinkLibraryType llt)
 {
   cmTargets::iterator i = this->Targets.find(target);
   if ( i != this->Targets.end())
@@ -1486,7 +1486,7 @@ void cmMakefile::AddLinkDirectoryForTarget(const std::string& target,
 
 void cmMakefile::AddLinkLibrary(const std::string& lib)
 {
-  this->AddLinkLibrary(lib,GENERAL_LibraryType);
+  this->AddLinkLibrary(lib,cmTarget::GENERAL);
 }
 
 void cmMakefile::InitializeFromParent(cmMakefile* parent)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index bc795b6..459d34c 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -219,9 +219,9 @@ public:
    * Add a link library to the build.
    */
   void AddLinkLibrary(const std::string&);
-  void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type);
+  void AddLinkLibrary(const std::string&, cmTarget::LinkLibraryType type);
   void AddLinkLibraryForTarget(const std::string& tgt, const std::string&,
-                               cmTargetLinkLibraryType type);
+                               cmTarget::LinkLibraryType type);
   void AddLinkDirectoryForTarget(const std::string& tgt, const std::string& d);
 
   /**
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index dd8fa9c..468a589 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -123,10 +123,4 @@ static thisClass* SafeDownCast(cmObject *c) \
 } \
 class cmTypeMacro_UseTrailingSemicolon
 
-enum cmTargetLinkLibraryType {
-  GENERAL_LibraryType,
-  DEBUG_LibraryType,
-  OPTIMIZED_LibraryType
-};
-
 #endif
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0128c78..847a5c1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -632,13 +632,13 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories() const
 }
 
 //----------------------------------------------------------------------------
-cmTargetLinkLibraryType cmTarget::ComputeLinkType(
+cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
                                       const std::string& config) const
 {
   // No configuration is always optimized.
   if(config.empty())
     {
-    return OPTIMIZED_LibraryType;
+    return cmTarget::OPTIMIZED;
     }
 
   // Get the list of configurations considered to be DEBUG.
@@ -650,10 +650,10 @@ cmTargetLinkLibraryType cmTarget::ComputeLinkType(
   if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
       debugConfigs.end())
     {
-    return DEBUG_LibraryType;
+    return cmTarget::DEBUG;
     }
   // The current configuration is not a debug configuration.
-  return OPTIMIZED_LibraryType;
+  return cmTarget::OPTIMIZED;
 }
 
 //----------------------------------------------------------------------------
@@ -693,9 +693,9 @@ bool cmTarget::NameResolvesToFramework(const std::string& libname) const
 
 //----------------------------------------------------------------------------
 std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTargetLinkLibraryType llt) const
+                                  cmTarget::LinkLibraryType llt) const
 {
-  if (llt == GENERAL_LibraryType)
+  if (llt == GENERAL)
     {
     return value;
     }
@@ -716,7 +716,7 @@ std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
     configString = "$<OR:" + configString + ">";
     }
 
-  if (llt == OPTIMIZED_LibraryType)
+  if (llt == OPTIMIZED)
     {
     configString = "$<NOT:" + configString + ">";
     }
@@ -773,16 +773,15 @@ void cmTarget::GetTllSignatureTraces(std::ostringstream &s,
 void cmTarget::AddLinkLibrary(cmMakefile& mf,
                               const std::string& target,
                               const std::string& lib,
-                              cmTargetLinkLibraryType llt)
+                              LinkLibraryType llt)
 {
   cmTarget *tgt = this->Makefile->FindTargetToUse(lib);
   {
   const bool isNonImportedTarget = tgt && !tgt->IsImported();
 
-  const std::string libName =
-      (isNonImportedTarget && llt != GENERAL_LibraryType)
-      ? targetNameGenex(lib)
-      : lib;
+  const std::string libName = (isNonImportedTarget && llt != GENERAL)
+                                                        ? targetNameGenex(lib)
+                                                        : lib;
   this->AppendProperty("LINK_LIBRARIES",
                        this->GetDebugGeneratorExpressions(libName,
                                                           llt).c_str());
@@ -823,13 +822,13 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
       }
     switch (llt)
       {
-      case GENERAL_LibraryType:
+      case cmTarget::GENERAL:
         dependencies += "general";
         break;
-      case DEBUG_LibraryType:
+      case cmTarget::DEBUG:
         dependencies += "debug";
         break;
-      case OPTIMIZED_LibraryType:
+      case cmTarget::OPTIMIZED:
         dependencies += "optimized";
         break;
       }
@@ -1163,7 +1162,7 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
 
     // Parse the dependency information, which is a set of
     // type, library pairs separated by ";". There is always a trailing ";".
-    cmTargetLinkLibraryType llt = GENERAL_LibraryType;
+    cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
     std::string depline = deps;
     std::string::size_type start = 0;
     std::string::size_type end;
@@ -1175,22 +1174,22 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
         {
         if (l == "debug")
           {
-          llt = DEBUG_LibraryType;
+          llt = cmTarget::DEBUG;
           }
         else if (l == "optimized")
           {
-          llt = OPTIMIZED_LibraryType;
+          llt = cmTarget::OPTIMIZED;
           }
         else if (l == "general")
           {
-          llt = GENERAL_LibraryType;
+          llt = cmTarget::GENERAL;
           }
         else
           {
           LibraryID lib2(l,llt);
           this->InsertDependencyForVS6( dep_map, lib, lib2);
           this->GatherDependenciesForVS6( mf, lib2, dep_map);
-          llt = GENERAL_LibraryType;
+          llt = cmTarget::GENERAL;
           }
         }
       start = end+1; // skip the ;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index b0d5f4a..97515a7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -140,15 +140,17 @@ public:
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
 
+  enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
+
   //* how we identify a library, by name and type
-  typedef std::pair<std::string, cmTargetLinkLibraryType> LibraryID;
+  typedef std::pair<std::string, LinkLibraryType> LibraryID;
 
   typedef std::vector<LibraryID > LinkLibraryVectorType;
   const LinkLibraryVectorType &GetOriginalLinkLibraries() const
     {return this->OriginalLinkLibraries;}
 
   /** Compute the link type to use for the given configuration.  */
-  cmTargetLinkLibraryType ComputeLinkType(const std::string& config) const;
+  LinkLibraryType ComputeLinkType(const std::string& config) const;
 
   /**
    * Clear the dependency information recorded for this target, if any.
@@ -159,7 +161,7 @@ public:
   bool NameResolvesToFramework(const std::string& libname) const;
   void AddLinkLibrary(cmMakefile& mf,
                       const std::string& target, const std::string& lib,
-                      cmTargetLinkLibraryType llt);
+                      LinkLibraryType llt);
   enum TLLSignature {
     KeywordTLLSignature,
     PlainTLLSignature
@@ -295,7 +297,7 @@ public:
   void AppendBuildInterfaceIncludes();
 
   std::string GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTargetLinkLibraryType llt) const;
+                                  cmTarget::LinkLibraryType llt) const;
 
   void AddSystemIncludeDirectories(const std::set<std::string> &incs);
   std::set<std::string> const & GetSystemIncludeDirectories() const
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 1a1cf39..b57b921 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -136,7 +136,7 @@ bool cmTargetLinkLibrariesCommand
     }
 
   // Keep track of link configuration specifiers.
-  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
+  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
   bool haveLLT = false;
 
   // Start with primary linking and switch to link interface
@@ -242,27 +242,27 @@ bool cmTargetLinkLibrariesCommand
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, DEBUG_LibraryType);
+        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::DEBUG);
         }
-      llt = DEBUG_LibraryType;
+      llt = cmTarget::DEBUG;
       haveLLT = true;
       }
     else if(args[i] == "optimized")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, OPTIMIZED_LibraryType);
+        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::OPTIMIZED);
         }
-      llt = OPTIMIZED_LibraryType;
+      llt = cmTarget::OPTIMIZED;
       haveLLT = true;
       }
     else if(args[i] == "general")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, GENERAL_LibraryType);
+        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::GENERAL);
         }
-      llt = GENERAL_LibraryType;
+      llt = cmTarget::GENERAL;
       haveLLT = true;
       }
     else if(haveLLT)
@@ -282,7 +282,7 @@ bool cmTargetLinkLibrariesCommand
       // specifed that a library is both debug and optimized.  (this check is
       // only there for backwards compatibility when mixing projects built
       // with old versions of CMake and new)
-      llt = GENERAL_LibraryType;
+      llt = cmTarget::GENERAL;
       std::string linkType = args[0];
       linkType += "_LINK_TYPE";
       const char* linkTypeString =
@@ -291,11 +291,11 @@ bool cmTargetLinkLibrariesCommand
         {
         if(strcmp(linkTypeString, "debug") == 0)
           {
-          llt = DEBUG_LibraryType;
+          llt = cmTarget::DEBUG;
           }
         if(strcmp(linkTypeString, "optimized") == 0)
           {
-          llt = OPTIMIZED_LibraryType;
+          llt = cmTarget::OPTIMIZED;
           }
         }
       if (!this->HandleLibrary(args[i], llt))
@@ -350,7 +350,7 @@ cmTargetLinkLibrariesCommand
 //----------------------------------------------------------------------------
 bool
 cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
-                                            cmTargetLinkLibraryType llt)
+                                            cmTarget::LinkLibraryType llt)
 {
   if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
       && this->CurrentProcessingState != ProcessingKeywordLinkInterface)
@@ -469,7 +469,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
   std::string prop;
 
   // Include this library in the link interface for the target.
-  if(llt == DEBUG_LibraryType || llt == GENERAL_LibraryType)
+  if(llt == cmTarget::DEBUG || llt == cmTarget::GENERAL)
     {
     // Put in the DEBUG configuration interfaces.
     for(std::vector<std::string>::const_iterator i = debugConfigs.begin();
@@ -480,7 +480,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
       this->Target->AppendProperty(prop, lib.c_str());
       }
     }
-  if(llt == OPTIMIZED_LibraryType || llt == GENERAL_LibraryType)
+  if(llt == cmTarget::OPTIMIZED || llt == cmTarget::GENERAL)
     {
     // Put in the non-DEBUG configuration interfaces.
     this->Target->AppendProperty("LINK_INTERFACE_LIBRARIES", lib.c_str());
diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h
index f061e6d..47dd8bd 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -62,7 +62,7 @@ private:
 
   ProcessingState CurrentProcessingState;
 
-  bool HandleLibrary(const std::string& lib, cmTargetLinkLibraryType llt);
+  bool HandleLibrary(const std::string& lib, cmTarget::LinkLibraryType llt);
 };
 
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6bc7984..a4b0bc3 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -178,7 +178,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
     this->GeneratorTarget->GetLocalGenerator();
-  this->Name = this->GeneratorTarget->GetName();
+  this->Name = this->Target->GetName();
   this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
   this->Platform = gg->GetPlatformName();
   this->NsightTegra = gg->IsNsightTegra();
@@ -269,8 +269,8 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
 void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
-  if(this->GeneratorTarget->GetType() == cmTarget::INTERFACE_LIBRARY
-      || this->GeneratorTarget->GetProperty("EXTERNAL_MSPROJECT"))
+  if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+      || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
     }
@@ -278,7 +278,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
   this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
-  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
     {
     if(!this->ComputeClOptions())
       {
@@ -361,15 +361,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ProjectGUID>", 2);
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
-  if(this->MSTools
-     && this->GeneratorTarget->GetType() <= cmTarget::GLOBAL_TARGET)
+  if(this->MSTools && this->Target->GetType() <= cmTarget::GLOBAL_TARGET)
     {
     this->WriteApplicationTypeSettings();
     this->VerifyNecessaryFiles();
     }
 
   const char* vsProjectTypes =
-    this->GeneratorTarget->GetProperty("VS_GLOBAL_PROJECT_TYPES");
+    this->Target->GetProperty("VS_GLOBAL_PROJECT_TYPES");
   if(vsProjectTypes)
     {
     this->WriteString("<ProjectTypes>", 2);
@@ -377,12 +376,9 @@ void cmVisualStudio10TargetGenerator::Generate()
       "</ProjectTypes>\n";
     }
 
-  const char* vsProjectName =
-      this->GeneratorTarget->GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalPath =
-      this->GeneratorTarget->GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider =
-      this->GeneratorTarget->GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectName = this->Target->GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalPath = this->Target->GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider = this->Target->GetProperty("VS_SCC_PROVIDER");
 
   if( vsProjectName && vsLocalPath && vsProvider )
     {
@@ -396,8 +392,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
       "</SccProvider>\n";
 
-    const char* vsAuxPath =
-        this->GeneratorTarget->GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath = this->Target->GetProperty("VS_SCC_AUXPATH");
     if( vsAuxPath )
       {
       this->WriteString("<SccAuxPath>", 2);
@@ -406,13 +401,13 @@ void cmVisualStudio10TargetGenerator::Generate()
       }
     }
 
-  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
     {
     this->WriteString("<WinMDAssembly>true</WinMDAssembly>\n", 2);
     }
 
   const char* vsGlobalKeyword =
-    this->GeneratorTarget->GetProperty("VS_GLOBAL_KEYWORD");
+    this->Target->GetProperty("VS_GLOBAL_KEYWORD");
   if(!vsGlobalKeyword)
     {
     this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
@@ -425,7 +420,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsGlobalRootNamespace =
-    this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
+    this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
   if(vsGlobalRootNamespace)
     {
     this->WriteString("<RootNamespace>", 2);
@@ -436,14 +431,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(this->Platform)
                            << "</Platform>\n";
-  const char* projLabel = this->GeneratorTarget->GetProperty("PROJECT_LABEL");
+  const char* projLabel = this->Target->GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = this->Name.c_str();
     }
   this->WriteString("<ProjectName>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(projLabel) << "</ProjectName>\n";
-  if(const char* targetFrameworkVersion = this->GeneratorTarget->GetProperty(
+  if(const char* targetFrameworkVersion = this->Target->GetProperty(
        "VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     this->WriteString("<TargetFrameworkVersion>", 2);
@@ -502,7 +497,7 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReferences()
 {
   std::vector<std::string> references;
   if(const char* vsDotNetReferences =
-     this->GeneratorTarget->GetProperty("VS_DOTNET_REFERENCES"))
+     this->Target->GetProperty("VS_DOTNET_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsDotNetReferences, references);
     }
@@ -548,7 +543,7 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
           i != this->Configurations.end(); ++i)
         {
         this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
-        if(this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
+        if(this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
           {
           (*this->BuildFileStream ) << "$(RootNamespace).";
           }
@@ -615,7 +610,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTReferences()
 {
   std::vector<std::string> references;
   if(const char* vsWinRTReferences =
-     this->GeneratorTarget->GetProperty("VS_WINRT_REFERENCES"))
+     this->Target->GetProperty("VS_WINRT_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsWinRTReferences, references);
     }
@@ -672,7 +667,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
                                  i->c_str(),
                                  1, " Label=\"Configuration\"", "\n");
     std::string configType = "<ConfigurationType>";
-    switch(this->GeneratorTarget->GetType())
+    switch(this->Target->GetType())
       {
       case cmTarget::SHARED_LIBRARY:
       case cmTarget::MODULE_LIBRARY:
@@ -684,7 +679,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
         break;
       case cmTarget::EXECUTABLE:
         if(this->NsightTegra &&
-           !this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
+           !this->Target->GetPropertyAsBool("ANDROID_GUI"))
           {
           // Android executables are .so too.
           configType += "DynamicLibrary";
@@ -749,16 +744,16 @@ void cmVisualStudio10TargetGenerator
   mfcLine += useOfMfcValue + "</UseOfMfc>\n";
   this->WriteString(mfcLine.c_str(), 2);
 
-  if((this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY &&
+  if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
-     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
      this->GlobalGenerator->TargetsWindowsStore() ||
-     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
-  else if (this->GeneratorTarget->GetType() <= cmTarget::MODULE_LIBRARY &&
+  else if (this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
            this->ClOptions[config]->UsingSBCS())
     {
     this->WriteString("<CharacterSet>NotSet</CharacterSet>\n", 2);
@@ -774,8 +769,8 @@ void cmVisualStudio10TargetGenerator
     pts += "</PlatformToolset>\n";
     this->WriteString(pts.c_str(), 2);
     }
-  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
-     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<WindowsAppContainer>true"
                       "</WindowsAppContainer>\n", 2);
@@ -793,29 +788,27 @@ void cmVisualStudio10TargetGenerator
   ntv += toolset? toolset : "Default";
   ntv += "</NdkToolchainVersion>\n";
   this->WriteString(ntv.c_str(), 2);
-  if(const char* minApi =
-     this->GeneratorTarget->GetProperty("ANDROID_API_MIN"))
+  if(const char* minApi = this->Target->GetProperty("ANDROID_API_MIN"))
     {
     this->WriteString("<AndroidMinAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(minApi) << "</AndroidMinAPI>\n";
     }
-  if(const char* api = this->GeneratorTarget->GetProperty("ANDROID_API"))
+  if(const char* api = this->Target->GetProperty("ANDROID_API"))
     {
     this->WriteString("<AndroidTargetAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(api) << "</AndroidTargetAPI>\n";
     }
 
-  if(const char* cpuArch = this->GeneratorTarget->GetProperty("ANDROID_ARCH"))
+  if(const char* cpuArch = this->Target->GetProperty("ANDROID_ARCH"))
     {
     this->WriteString("<AndroidArch>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(cpuArch) <<
       "</AndroidArch>\n";
     }
 
-  if(const char* stlType =
-     this->GeneratorTarget->GetProperty("ANDROID_STL_TYPE"))
+  if(const char* stlType = this->Target->GetProperty("ANDROID_STL_TYPE"))
     {
     this->WriteString("<AndroidStlType>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(stlType) <<
@@ -1488,7 +1481,7 @@ void cmVisualStudio10TargetGenerator::WriteSources(
 
 void cmVisualStudio10TargetGenerator::WriteAllSources()
 {
-  if(this->GeneratorTarget->GetType() > cmTarget::UTILITY)
+  if(this->Target->GetType() > cmTarget::UTILITY)
     {
     return;
     }
@@ -1750,7 +1743,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmTarget::TargetType ttype = this->GeneratorTarget->GetType();
+  cmTarget::TargetType ttype = this->Target->GetType();
   if(ttype > cmTarget::GLOBAL_TARGET)
     {
     return;
@@ -1782,7 +1775,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
       if(ttype == cmTarget::OBJECT_LIBRARY)
         {
         outDir = intermediateDir;
-        targetNameFull = this->GeneratorTarget->GetName();
+        targetNameFull = this->Target->GetName();
         targetNameFull += ".lib";
         }
       else
@@ -1835,8 +1828,8 @@ OutputLinkIncremental(std::string const& configName)
     }
   // static libraries and things greater than modules do not need
   // to set this option
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
-     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
+     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -1970,12 +1963,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   if (this->MSTools)
     {
     // If we have the VS_WINRT_COMPONENT set then force Compile as WinRT.
-    if (this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+    if (this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
-      if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY )
+      if (this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
+          this->Target->GetType() == cmTarget::MODULE_LIBRARY )
         {
         clOptions.AddDefine("_WINRT_DLL");
         }
@@ -2019,7 +2012,7 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   if(this->NsightTegra)
     {
     if(const char* processMax =
-        this->GeneratorTarget->GetProperty("ANDROID_PROCESS_MAX"))
+        this->Target->GetProperty("ANDROID_PROCESS_MAX"))
       {
       this->WriteString("<ProcessMax>", 3);
       *this->BuildFileStream << cmVS10EscapeXML(processMax) <<
@@ -2183,8 +2176,8 @@ WriteMasmOptions(std::string const& configName,
 void
 cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 {
-  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->GeneratorTarget->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY &&
+     this->Target->GetType() != cmTarget::OBJECT_LIBRARY)
     {
     return;
     }
@@ -2220,9 +2213,9 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 void cmVisualStudio10TargetGenerator::WriteManifestOptions(
   std::string const& config)
 {
-  if (this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE &&
-      this->GeneratorTarget->GetType() != cmTarget::SHARED_LIBRARY &&
-      this->GeneratorTarget->GetType() != cmTarget::MODULE_LIBRARY)
+  if (this->Target->GetType() != cmTarget::EXECUTABLE &&
+      this->Target->GetType() != cmTarget::SHARED_LIBRARY &&
+      this->Target->GetType() != cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2277,18 +2270,18 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmVS10EscapeXML(antBuildPath) << "</AntBuildPath>\n";
   }
 
-  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
+  if (this->Target->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
     {
     this->WriteString("<SkipAntStep>true</SkipAntStep>\n", 3);
     }
 
-  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_PROGUARD"))
+  if (this->Target->GetPropertyAsBool("ANDROID_PROGUARD"))
     {
     this->WriteString("<EnableProGuard>true</EnableProGuard>\n", 3);
     }
 
   if (const char* proGuardConfigLocation =
-      this->GeneratorTarget->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
+      this->Target->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
     {
     this->WriteString("<ProGuardConfigLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(proGuardConfigLocation) <<
@@ -2296,7 +2289,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* securePropertiesLocation =
-      this->GeneratorTarget->GetProperty("ANDROID_SECURE_PROPS_PATH"))
+      this->Target->GetProperty("ANDROID_SECURE_PROPS_PATH"))
     {
     this->WriteString("<SecurePropertiesLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(securePropertiesLocation) <<
@@ -2304,7 +2297,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDirectoriesExpression =
-      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
+      this->Target->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2316,7 +2309,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDependenciesExpression =
-      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
+      this->Target->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2328,7 +2321,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* javaSourceDir =
-      this->GeneratorTarget->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
+      this->Target->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
     {
     this->WriteString("<JavaSourceDir>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(javaSourceDir) <<
@@ -2336,7 +2329,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDirectoriesExpression =
-      this->GeneratorTarget->GetProperty("ANDROID_JAR_DIRECTORIES"))
+      this->Target->GetProperty("ANDROID_JAR_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2348,7 +2341,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDeps =
-      this->GeneratorTarget->GetProperty("ANDROID_JAR_DEPENDENCIES"))
+      this->Target->GetProperty("ANDROID_JAR_DEPENDENCIES"))
     {
     this->WriteString("<JarDependencies>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(jarDeps) <<
@@ -2356,7 +2349,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* assetsDirectories =
-      this->GeneratorTarget->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
+      this->Target->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
     {
     this->WriteString("<AssetsDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(assetsDirectories) <<
@@ -2372,7 +2365,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
   }
 
   if (const char* antAdditionalOptions =
-      this->GeneratorTarget->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
+      this->Target->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
     {
     this->WriteString("<AdditionalOptions>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(antAdditionalOptions) <<
@@ -2385,9 +2378,9 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 //----------------------------------------------------------------------------
 bool cmVisualStudio10TargetGenerator::ComputeLinkOptions()
 {
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
-     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->Target->GetType() == cmTarget::EXECUTABLE ||
+     this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
     {
     for(std::vector<std::string>::const_iterator
           i = this->Configurations.begin();
@@ -2424,11 +2417,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string CONFIG = cmSystemTools::UpperCase(config);
 
   const char* linkType = "SHARED";
-  if(this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->Target->GetType() == cmTarget::MODULE_LIBRARY)
     {
     linkType = "MODULE";
     }
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  if(this->Target->GetType() == cmTarget::EXECUTABLE)
     {
     linkType = "EXE";
     }
@@ -2443,8 +2436,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   flags += " ";
   flags += this->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
-  const char* targetLinkFlags =
-      this->GeneratorTarget->GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags = this->Target->GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     flags += " ";
@@ -2452,8 +2444,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     }
   std::string flagsProp = "LINK_FLAGS_";
   flagsProp += CONFIG;
-  if(const char* flagsConfig =
-     this->GeneratorTarget->GetProperty(flagsProp.c_str()))
+  if(const char* flagsConfig = this->Target->GetProperty(flagsProp.c_str()))
     {
     flags += " ";
     flags += flagsConfig;
@@ -2513,7 +2504,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string targetNameFull;
   std::string targetNameImport;
   std::string targetNamePDB;
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  if(this->Target->GetType() == cmTarget::EXECUTABLE)
     {
     this->GeneratorTarget->GetExecutableNames(targetName, targetNameFull,
                                      targetNameImport, targetNamePDB,
@@ -2531,12 +2522,12 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     {
     linkOptions.AddFlag("Version", "");
 
-    if ( this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE") )
+    if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
       {
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+        if (this->Target->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2558,7 +2549,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+        if (this->Target->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2603,8 +2594,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
-       this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE)
+    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
+       this->Target->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2642,10 +2633,10 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
                            "%(IgnoreSpecificDefaultLibraries)");
     }
 
-  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)exportall.def");
       }
@@ -2659,8 +2650,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 void
 cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 {
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
-     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
+     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2698,7 +2689,7 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
       libVec.push_back(path);
       }
     else if (!l->Target
-        || l->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
       {
       libVec.push_back(l->Value);
       }
@@ -2770,7 +2761,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WritePlatformConfigTag("ItemDefinitionGroup", i->c_str(), 1);
     *this->BuildFileStream << "\n";
     //    output cl compile flags <ClCompile></ClCompile>
-    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
       {
       this->WriteClOptions(*i, includes);
       //    output rc compile flags <ResourceCompile></ResourceCompile>
@@ -2788,8 +2779,8 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     //    output manifest flags  <Manifest></Manifest>
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
-       this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE &&
-       this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
+       this->Target->GetType() == cmTarget::EXECUTABLE &&
+       this->Target->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
       }
@@ -2801,10 +2792,10 @@ void
 cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
 {
   bool addedPrelink = false;
-  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
@@ -2917,14 +2908,14 @@ void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     if (desktopExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsDesktop",
                                          desktopExtensionsVersion);
       }
     const char* mobileExtensionsVersion =
-      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     if (mobileExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsMobile",
@@ -2964,11 +2955,11 @@ void cmVisualStudio10TargetGenerator::WriteSDKReferences()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     const char* mobileExtensionsVersion =
-      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     const char* iotExtensionsVersion =
-      this->GeneratorTarget->GetProperty("VS_IOT_EXTENSIONS_VERSION");
+      this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
 
     if(desktopExtensionsVersion || mobileExtensionsVersion ||
        iotExtensionsVersion)
@@ -3009,7 +3000,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
       this->GlobalGenerator->TargetsWindowsPhone())
-      && (cmTarget::EXECUTABLE == this->GeneratorTarget->GetType()))
+      && (cmTarget::EXECUTABLE == this->Target->GetType()))
     {
     std::string pfxFile;
     std::vector<cmSourceFile const*> certificates;
@@ -3138,7 +3129,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>14.0"
         "</MinimumVisualStudioVersion>\n", 2);
 
-      if(this->GeneratorTarget->GetType() < cmTarget::UTILITY)
+      if(this->Target->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3152,7 +3143,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (this->GeneratorTarget->GetType() < cmTarget::UTILITY)
+      if (this->Target->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3166,13 +3157,12 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>11.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (isWindowsStore
-          && this->GeneratorTarget->GetType() < cmTarget::UTILITY)
+      if (isWindowsStore && this->Target->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
       else if (isWindowsPhone &&
-               this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+               this->Target->GetType() == cmTarget::EXECUTABLE)
         {
         this->WriteString("<XapOutputs>true</XapOutputs>\n", 2);
         this->WriteString("<XapFilename>", 2);
@@ -3200,8 +3190,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       "</WindowsTargetPlatformVersion>\n";
     }
   const char* targetPlatformMinVersion =
-      this->GeneratorTarget
-      ->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+      this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
   if(targetPlatformMinVersion)
     {
     this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
@@ -3220,7 +3209,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     }
 
   // Added IoT Startup Task support
-  if(this->GeneratorTarget->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
+  if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
     {
     this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
     }
@@ -3230,7 +3219,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
 {
   // For Windows and Windows Phone executables, we will assume that if a
   // manifest is not present that we need to add all the necessary files
-  if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  if (this->Target->GetType() == cmTarget::EXECUTABLE)
     {
     std::vector<cmSourceFile const*> manifestSources;
     this->GeneratorTarget->GetAppManifest(manifestSources, "");
@@ -3331,8 +3320,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML =
-      cmVS10EscapeXML(this->GeneratorTarget->GetName());
+  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3415,8 +3403,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP81()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML =
-      cmVS10EscapeXML(this->GeneratorTarget->GetName());
+  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3476,8 +3463,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML =
-      cmVS10EscapeXML(this->GeneratorTarget->GetName());
+  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3529,8 +3515,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML =
-      cmVS10EscapeXML(this->GeneratorTarget->GetName());
+  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3587,8 +3572,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
     this->LocalGenerator->GetTargetDirectory(*this->Target);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML =
-      cmVS10EscapeXML(this->GeneratorTarget->GetName());
+  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2d5e724..fececfd 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -477,7 +477,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
             ++libIt)
       {
       mf->AddLinkLibraryForTarget(targetName, *libIt,
-                                  GENERAL_LibraryType);
+                                  cmTarget::GENERAL);
       }
 
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCPluginAPI.cxx                       |    6 +-
 Source/cmComputeLinkDepends.cxx               |   16 +-
 Source/cmComputeLinkDepends.h                 |    2 +-
 Source/cmExportLibraryDependenciesCommand.cxx |    6 +-
 Source/cmGeneratorTarget.cxx                  |    4 +-
 Source/cmLinkLibrariesCommand.cxx             |    4 +-
 Source/cmLocalVisualStudio6Generator.cxx      |    6 +-
 Source/cmMakefile.cxx                         |    6 +-
 Source/cmMakefile.h                           |    4 +-
 Source/cmStandardIncludes.h                   |    6 -
 Source/cmTarget.cxx                           |   39 +++--
 Source/cmTarget.h                             |   10 +-
 Source/cmTargetLinkLibrariesCommand.cxx       |   26 ++--
 Source/cmTargetLinkLibrariesCommand.h         |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx    |  208 ++++++++++++-------------
 Source/cmake.cxx                              |    2 +-
 16 files changed, 163 insertions(+), 184 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 11:00:32 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 11:00:32 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-418-gcbeae3b
Message-ID: <20151010150032.3F129C045F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  cbeae3b62d1db399875314fd307b7e1581793b71 (commit)
       via  1c4bc19a68fab7e3c2ccebc78a99379af4538a61 (commit)
      from  6236da01157482f9fad74a27725bdbb5fd4f62a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbeae3b62d1db399875314fd307b7e1581793b71
commit cbeae3b62d1db399875314fd307b7e1581793b71
Merge: 6236da0 1c4bc19
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 11:00:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 11:00:31 2015 -0400

    Merge topic 'use-generator-target' into next
    
    1c4bc19a cmTarget: Move ImportInfoMap out of internal class.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c4bc19a68fab7e3c2ccebc78a99379af4538a61
commit 1c4bc19a68fab7e3c2ccebc78a99379af4538a61
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:15:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 17:00:21 2015 +0200

    cmTarget: Move ImportInfoMap out of internal class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 369e497..847a5c1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
-  ImportInfoMapType ImportInfoMap;
-
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -1538,7 +1535,7 @@ void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
   // Wipe out maps caching information affected by this property.
   if(this->IsImported() && cmHasLiteralPrefix(prop, "IMPORTED"))
     {
-    this->Internal->ImportInfoMap.clear();
+    this->ImportInfoMap.clear();
     }
 }
 
@@ -2288,16 +2285,15 @@ cmTarget::GetImportInfo(const std::string& config) const
     {
     config_upper = "NOCONFIG";
     }
-  typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
 
   ImportInfoMapType::const_iterator i =
-    this->Internal->ImportInfoMap.find(config_upper);
-  if(i == this->Internal->ImportInfoMap.end())
+    this->ImportInfoMap.find(config_upper);
+  if(i == this->ImportInfoMap.end())
     {
     ImportInfo info;
     this->ComputeImportInfo(config_upper, info);
     ImportInfoMapType::value_type entry(config_upper, info);
-    i = this->Internal->ImportInfoMap.insert(entry).first;
+    i = this->ImportInfoMap.insert(entry).first;
     }
 
   if(this->GetType() == INTERFACE_LIBRARY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 03c4cbe..97515a7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -449,6 +449,9 @@ private:
     std::string SharedDeps;
   };
 
+  typedef std::map<std::string, ImportInfo> ImportInfoMapType;
+  mutable ImportInfoMapType ImportInfoMap;
+
   ImportInfo const* GetImportInfo(const std::string& config) const;
   void ComputeImportInfo(std::string const& desired_config,
                          ImportInfo& info) const;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 11:06:26 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 11:06:26 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-420-gf8024bd
Message-ID: <20151010150626.03D1AC0697@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f8024bd6b69b84e5cd63ddf2e81be016c9f251b7 (commit)
       via  0f404e51f17f29ba1d525d5bcfdeb303608e0ee0 (commit)
      from  cbeae3b62d1db399875314fd307b7e1581793b71 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8024bd6b69b84e5cd63ddf2e81be016c9f251b7
commit f8024bd6b69b84e5cd63ddf2e81be016c9f251b7
Merge: cbeae3b 0f404e5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 11:06:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 11:06:24 2015 -0400

    Merge topic 'use-generator-target' into next
    
    0f404e51 Revert commits.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f404e51f17f29ba1d525d5bcfdeb303608e0ee0
commit 0f404e51f17f29ba1d525d5bcfdeb303608e0ee0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 17:05:27 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 17:05:44 2015 +0200

    Revert commits.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 24d0e61..252e231 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -109,7 +109,7 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const
 {
   std::string mod_dir;
   const char* target_mod_dir =
-    this->GeneratorTarget->GetProperty("Fortran_MODULE_DIRECTORY");
+    this->Target->GetProperty("Fortran_MODULE_DIRECTORY");
   const char* moddir_flag =
     this->Makefile->GetDefinition("CMAKE_Fortran_MODDIR_FLAG");
   if(target_mod_dir && moddir_flag)
@@ -214,7 +214,7 @@ cmCommonTargetGenerator
     this->LocalGenerator->GetFortranFormat(srcfmt);
   if(format == cmLocalGenerator::FortranFormatNone)
     {
-    const char* tgtfmt = this->GeneratorTarget->GetProperty("Fortran_FORMAT");
+    const char* tgtfmt = this->Target->GetProperty("Fortran_FORMAT");
     format = this->LocalGenerator->GetFortranFormat(tgtfmt);
     }
   const char* var = 0;
@@ -383,7 +383,7 @@ std::vector<std::string>
 cmCommonTargetGenerator::GetLinkedTargetDirectories() const
 {
   std::vector<std::string> dirs;
-  std::set<cmGeneratorTarget const*> emitted;
+  std::set<cmTarget const*> emitted;
   if (cmComputeLinkInformation* cli =
       this->GeneratorTarget->GetLinkInformation(this->ConfigName))
     {
@@ -391,7 +391,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
     for(cmComputeLinkInformation::ItemVector::const_iterator
           i = items.begin(); i != items.end(); ++i)
       {
-      cmGeneratorTarget const* linkee = i->Target;
+      cmTarget const* linkee = i->Target;
       if(linkee && !linkee->IsImported()
                 // We can ignore the INTERFACE_LIBRARY items because
                 // Target->GetLinkInformation already processed their
@@ -399,11 +399,13 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
                 && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
                 && emitted.insert(linkee).second)
         {
-        cmLocalGenerator* lg = linkee->GetLocalGenerator();
-        cmMakefile* mf = linkee->Target->GetMakefile();
+        cmGeneratorTarget* gt =
+          this->GlobalGenerator->GetGeneratorTarget(linkee);
+        cmLocalGenerator* lg = gt->GetLocalGenerator();
+        cmMakefile* mf = linkee->GetMakefile();
         std::string di = mf->GetCurrentBinaryDirectory();
         di += "/";
-        di += lg->GetTargetDirectory(*linkee->Target);
+        di += lg->GetTargetDirectory(*linkee);
         dirs.push_back(di);
         }
       }
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 22843f1..7d20827 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -320,7 +320,8 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item)
   int index = lei->second;
   LinkEntry& entry = this->EntryList[index];
   entry.Item = item;
-  entry.Target = item.Target;
+  entry.Target =
+      item.Target ? this->GlobalGenerator->GetGeneratorTarget(item.Target) : 0;
   entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
                   item.substr(0, 10) != "-framework");
 
@@ -442,7 +443,9 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
     // Initialize the item entry.
     LinkEntry& entry = this->EntryList[lei->second];
     entry.Item = dep.Item;
-    entry.Target = dep.Item.Target;
+    entry.Target =
+        dep.Item.Target ?
+          this->GlobalGenerator->GetGeneratorTarget(dep.Item.Target) : 0;
 
     // This item was added specifically because it is a dependent
     // shared library.  It may get special treatment
@@ -631,9 +634,8 @@ cmComputeLinkDepends::AddLinkEntries(
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget const*
-cmComputeLinkDepends::FindTargetToLink(int depender_index,
-                                       const std::string& name)
+cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
+                                                 const std::string& name)
 {
   // Look for a target in the scope of the depender.
   cmGeneratorTarget const* from = this->Target;
@@ -645,7 +647,7 @@ cmComputeLinkDepends::FindTargetToLink(int depender_index,
       from = depender;
       }
     }
-  return from->FindTargetToLink(name);
+  return from->Target->FindTargetToLink(name);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 9d960c6..5ad8714 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -14,7 +14,6 @@
 
 #include "cmStandardIncludes.h"
 #include "cmTarget.h"
-#include "cmLinkItem.h"
 
 #include "cmGraphAdjacencyList.h"
 
@@ -53,7 +52,7 @@ public:
   EntryVector const& Compute();
 
   void SetOldLinkDirMode(bool b);
-  std::set<cmGeneratorTarget const*> const& GetOldWrongConfigItems() const
+  std::set<cmTarget const*> const& GetOldWrongConfigItems() const
     { return this->OldWrongConfigItems; }
 
 private:
@@ -75,8 +74,8 @@ private:
   void AddDirectLinkEntries();
   template <typename T>
     void AddLinkEntries(int depender_index, std::vector<T> const& libs);
-  cmGeneratorTarget const* FindTargetToLink(int depender_index,
-                                            const std::string& name);
+  cmTarget const* FindTargetToLink(int depender_index,
+                                   const std::string& name);
 
   // One entry for each unique item.
   std::vector<LinkEntry> EntryList;
@@ -153,7 +152,7 @@ private:
 
   // Record of the original link line.
   std::vector<int> OriginalEntries;
-  std::set<cmGeneratorTarget const*> OldWrongConfigItems;
+  std::set<cmTarget const*> OldWrongConfigItems;
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index c6225f6..7e34611 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -19,6 +19,7 @@
 #include "cmState.h"
 #include "cmOutputConverter.h"
 #include "cmMakefile.h"
+#include "cmTarget.h"
 #include "cmGeneratorTarget.h"
 #include "cmake.h"
 #include "cmAlgorithms.h"
@@ -470,7 +471,7 @@ std::vector<std::string> const& cmComputeLinkInformation::GetFrameworkPaths()
 }
 
 //----------------------------------------------------------------------------
-const std::set<const cmGeneratorTarget*>&
+std::set<cmTarget const*> const&
 cmComputeLinkInformation::GetSharedLibrariesLinked()
 {
   return this->SharedLibrariesLinked;
@@ -536,16 +537,16 @@ bool cmComputeLinkInformation::Compute()
     // For CMake 2.4 bug-compatibility we need to consider the output
     // directories of targets linked in another configuration as link
     // directories.
-    std::set<cmGeneratorTarget const*> const& wrongItems =
-        cld.GetOldWrongConfigItems();
-    for(std::set<cmGeneratorTarget const*>::const_iterator i =
-        wrongItems.begin(); i != wrongItems.end(); ++i)
+    std::set<cmTarget const*> const& wrongItems = cld.GetOldWrongConfigItems();
+    for(std::set<cmTarget const*>::const_iterator i = wrongItems.begin();
+        i != wrongItems.end(); ++i)
       {
-      cmGeneratorTarget const* tgt = *i;
+      cmTarget const* tgt = *i;
+      cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
       bool implib =
         (this->UseImportLibrary &&
          (tgt->GetType() == cmTarget::SHARED_LIBRARY));
-      std::string lib = tgt->GetFullPath(this->Config , implib, true);
+      std::string lib = gtgt->GetFullPath(this->Config , implib, true);
       this->OldLinkDirItems.push_back(lib);
       }
     }
@@ -657,7 +658,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       std::string exe = tgt->GetFullPath(config, this->UseImportLibrary,
                                          true);
       linkItem += exe;
-      this->Items.push_back(Item(linkItem, true, tgt));
+      this->Items.push_back(Item(linkItem, true, tgt->Target));
       this->Depends.push_back(exe);
       }
     else if(tgt->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -665,7 +666,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       // Add the interface library as an item so it can be considered as part
       // of COMPATIBLE_INTERFACE_ enforcement.  The generators will ignore
       // this for the actual link line.
-      this->Items.push_back(Item(std::string(), true, tgt));
+      this->Items.push_back(Item(std::string(), true, tgt->Target));
       }
     else
       {
@@ -682,8 +683,8 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
         this->Depends.push_back(lib);
         }
 
-      this->AddTargetItem(lib, tgt);
-      this->AddLibraryRuntimeInfo(lib, tgt);
+      this->AddTargetItem(lib, tgt->Target);
+      this->AddLibraryRuntimeInfo(lib, tgt->Target);
       }
     }
   else
@@ -765,7 +766,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
   if(tgt)
     {
     lib = tgt->GetFullPath(this->Config, this->UseImportLibrary);
-    this->AddLibraryRuntimeInfo(lib, tgt);
+    this->AddLibraryRuntimeInfo(lib, tgt->Target);
     }
   else
     {
@@ -1076,7 +1077,7 @@ void cmComputeLinkInformation::SetCurrentLinkType(LinkType lt)
 
 //----------------------------------------------------------------------------
 void cmComputeLinkInformation::AddTargetItem(std::string const& item,
-                                             cmGeneratorTarget const* target)
+                                             cmTarget const* target)
 {
   // This is called to handle a link item that is a full path to a target.
   // If the target is not a static library make sure the link type is
@@ -1095,9 +1096,10 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
     this->SharedLibrariesLinked.insert(target);
     }
 
+  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Handle case of an imported shared library with no soname.
   if(this->NoSONameUsesPath &&
-     target->IsImportedSharedLibWithoutSOName(this->Config))
+     gtgt->IsImportedSharedLibWithoutSOName(this->Config))
     {
     this->AddSharedLibNoSOName(item);
     return;
@@ -1111,7 +1113,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
 
   // For compatibility with CMake 2.4 include the item's directory in
   // the linker search path.
-  if(this->OldLinkDirMode && !target->Target->IsFrameworkOnApple() &&
+  if(this->OldLinkDirMode && !target->IsFrameworkOnApple() &&
      this->OldLinkDirMask.find(cmSystemTools::GetFilenamePath(item)) ==
      this->OldLinkDirMask.end())
     {
@@ -1775,14 +1777,15 @@ cmComputeLinkInformation::GetRuntimeSearchPath()
 //----------------------------------------------------------------------------
 void
 cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
-                                              cmGeneratorTarget const* target)
+                                                cmTarget const* target)
 {
+  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Ignore targets on Apple where install_name is not @rpath.
   // The dependenty library can be found with other means such as
   // @loader_path or full paths.
   if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
     {
-    if(!target->HasMacOSXRpathInstallNameDir(this->Config))
+    if(!gtgt->HasMacOSXRpathInstallNameDir(this->Config))
       {
       return;
       }
@@ -1804,7 +1807,7 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
 
   // Try to get the soname of the library.  Only files with this name
   // could possibly conflict.
-  std::string soName = target->GetSOName(this->Config);
+  std::string soName = gtgt->GetSOName(this->Config);
   const char* soname = soName.empty()? 0 : soName.c_str();
 
   // Include this library in the runtime path ordering.
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 5eecf7d..b1e7e46 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -19,6 +19,7 @@
 class cmake;
 class cmGlobalGenerator;
 class cmMakefile;
+class cmTarget;
 class cmGeneratorTarget;
 class cmOrderDirectories;
 
@@ -38,11 +39,11 @@ public:
     Item(): Value(), IsPath(true), Target(0) {}
     Item(Item const& item):
       Value(item.Value), IsPath(item.IsPath), Target(item.Target) {}
-    Item(std::string const& v, bool p, cmGeneratorTarget const* target = 0):
+    Item(std::string const& v, bool p, cmTarget const* target = 0):
       Value(v), IsPath(p), Target(target) {}
     std::string Value;
     bool IsPath;
-    cmGeneratorTarget const* Target;
+    cmTarget const* Target;
   };
   typedef std::vector<Item> ItemVector;
   ItemVector const& GetItems();
@@ -56,7 +57,7 @@ public:
   void GetRPath(std::vector<std::string>& runtimeDirs, bool for_install);
   std::string GetRPathString(bool for_install);
   std::string GetChrpathString();
-  std::set<cmGeneratorTarget const*> const& GetSharedLibrariesLinked();
+  std::set<cmTarget const*> const& GetSharedLibrariesLinked();
 
   std::string const& GetRPathLinkFlag() const { return this->RPathLinkFlag; }
   std::string GetRPathLinkString();
@@ -70,7 +71,7 @@ private:
   std::vector<std::string> Depends;
   std::vector<std::string> FrameworkPaths;
   std::vector<std::string> RuntimeSearchPath;
-  std::set<cmGeneratorTarget const*> SharedLibrariesLinked;
+  std::set<cmTarget const*> SharedLibrariesLinked;
 
   // Context information.
   cmGeneratorTarget const* Target;
@@ -128,7 +129,7 @@ private:
   std::string NoCaseExpression(const char* str);
 
   // Handling of link items.
-  void AddTargetItem(std::string const& item, const cmGeneratorTarget* target);
+  void AddTargetItem(std::string const& item, cmTarget const* target);
   void AddFullItem(std::string const& item);
   bool CheckImplicitDirItem(std::string const& item);
   void AddUserItem(std::string const& item, bool pathNotKnown);
@@ -182,7 +183,7 @@ private:
   bool CMP0060Warn;
 
   void AddLibraryRuntimeInfo(std::string const& fullPath,
-                             const cmGeneratorTarget* target);
+                             cmTarget const* target);
   void AddLibraryRuntimeInfo(std::string const& fullPath);
 
 };
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 8f3def2..18aad10 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -272,7 +272,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
 
   // Loop over all utility dependencies.
   {
-  std::set<cmLinkItem> const& tutils = depender->GetUtilityItems();
+  std::set<cmLinkItem> const& tutils = depender->Target->GetUtilityItems();
   std::set<std::string> emitted;
   // A target should not depend on itself.
   emitted.insert(depender->GetName());
@@ -319,20 +319,22 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
                                              std::set<std::string> &emitted)
 {
   cmGeneratorTarget const* depender = this->Targets[depender_index];
-  cmGeneratorTarget const* dependee = dependee_name.Target;
+  cmTarget const* dependee = dependee_name.Target;
   // Skip targets that will not really be linked.  This is probably a
   // name conflict between an external library and an executable
   // within the project.
   if(dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->Target->IsExecutableWithExports())
+     !dependee->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    this->AddInterfaceDepends(depender_index, dependee, "", emitted);
+    cmGeneratorTarget* gt =
+        this->GlobalGenerator->GetGeneratorTarget(dependee);
+    this->AddInterfaceDepends(depender_index, gt, "", emitted);
     std::vector<std::string> configs;
     depender->Makefile->GetConfigurations(configs);
     for (std::vector<std::string>::const_iterator it = configs.begin();
@@ -340,7 +342,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
       {
       // A target should not depend on itself.
       emitted.insert(depender->GetName());
-      this->AddInterfaceDepends(depender_index, dependee, *it, emitted);
+      this->AddInterfaceDepends(depender_index, gt, *it, emitted);
       }
     }
 }
@@ -354,7 +356,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   cmGeneratorTarget const* depender = this->Targets[depender_index];
 
   // Check the target's makefile first.
-  cmGeneratorTarget const* dependee = dependee_name.Target;
+  cmTarget const* dependee = dependee_name.Target;
 
   if(!dependee && !linking &&
     (depender->GetType() != cmTarget::GLOBAL_TARGET))
@@ -401,14 +403,16 @@ void cmComputeTargetDepends::AddTargetDepend(
   // within the project.
   if(linking && dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->Target->IsExecutableWithExports())
+     !dependee->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    this->AddTargetDepend(depender_index, dependee, linking);
+    cmGeneratorTarget* gt =
+        this->GlobalGenerator->GetGeneratorTarget(dependee);
+    this->AddTargetDepend(depender_index, gt, linking);
     }
 }
 
@@ -422,13 +426,15 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     {
     // Skip IMPORTED and INTERFACE targets but follow their utility
     // dependencies.
-    std::set<cmLinkItem> const& utils = dependee->GetUtilityItems();
+    std::set<cmLinkItem> const& utils = dependee->Target->GetUtilityItems();
     for(std::set<cmLinkItem>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
-      if(cmGeneratorTarget const* transitive_dependee = i->Target)
+      if(cmTarget const* transitive_dependee = i->Target)
         {
-        this->AddTargetDepend(depender_index, transitive_dependee, false);
+        cmGeneratorTarget* gt =
+            this->GlobalGenerator->GetGeneratorTarget(transitive_dependee);
+        this->AddTargetDepend(depender_index, gt, false);
         }
       }
     }
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 400fa17..fed0dbc 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -217,7 +217,7 @@ cmExportBuildFileGenerator
     std::string prop = "IMPORTED_IMPLIB";
     prop += suffix;
     std::string value = target->GetFullPath(config, true);
-    target->GetImplibGNUtoMS(value, value,
+    target->Target->GetImplibGNUtoMS(value, value,
                              "${CMAKE_IMPORT_LIBRARY_SUFFIX}");
     properties[prop] = value;
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 6669919..d6149b3 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -513,9 +513,8 @@ void cmExportFileGenerator::PopulateInterfaceProperty(
 
 
 //----------------------------------------------------------------------------
-void getPropertyContents(cmGeneratorTarget const* tgt,
-                         const std::string& prop,
-                         std::set<std::string> &ifaceProperties)
+void getPropertyContents(cmTarget const* tgt, const std::string& prop,
+         std::set<std::string> &ifaceProperties)
 {
   const char *p = tgt->GetProperty(prop);
   if (!p)
@@ -586,11 +585,11 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
 
   std::set<std::string> ifaceProperties;
 
-  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_BOOL", ifaceProperties);
-  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_STRING", ifaceProperties);
-  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MIN",
+  getPropertyContents(target, "COMPATIBLE_INTERFACE_BOOL", ifaceProperties);
+  getPropertyContents(target, "COMPATIBLE_INTERFACE_STRING", ifaceProperties);
+  getPropertyContents(target, "COMPATIBLE_INTERFACE_NUMBER_MIN",
                       ifaceProperties);
-  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MAX",
+  getPropertyContents(target, "COMPATIBLE_INTERFACE_NUMBER_MAX",
                       ifaceProperties);
 
   if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 21c71b0..11410a7 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -255,9 +255,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, target, gtgt);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, gtgt);
+            this->ComputeDefines(*iter, lg, target, gtgt);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
@@ -365,6 +365,7 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
 std::string
 cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
                                                    cmLocalGenerator* lg,
+                                                   cmTarget *target,
                                                    cmGeneratorTarget* gtgt)
 {
   std::string flags;
@@ -389,7 +390,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   //   }
 
   // Add shared-library flags if needed.
-  lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
+  lg->AddCMP0018Flags(flags, target, language, config);
 
   // Add include directory flags.
   {
@@ -404,7 +405,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, gtgt->Target, language, config);
+  lg->AddCompileOptions(flags, target, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -418,8 +419,8 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
 // void cmMakefileTargetGenerator::WriteTargetLanguageFlags().
 std::string
 cmExtraSublimeTextGenerator::
-ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
-               cmGeneratorTarget* target)
+ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
+               cmGeneratorTarget*)
 
 {
   std::set<std::string> defines;
@@ -428,13 +429,13 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
   const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->Target->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     lg->AppendDefines(defines, exportMacro);
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AddCompileDefinitions(defines, target->Target, config, language);
+  lg->AddCompileDefinitions(defines, target, config, language);
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 5dd1140..4173b7d 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -79,10 +79,11 @@ private:
    */
   std::string ComputeFlagsForObject(cmSourceFile *source,
                                     cmLocalGenerator* lg,
+                                    cmTarget *target,
                                     cmGeneratorTarget* gtgt);
 
   std::string ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
-                             cmGeneratorTarget* gtgt);
+                             cmTarget *target, cmGeneratorTarget* gtgt);
 };
 
 #endif
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 88d10aa..78a5b6f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -831,8 +831,8 @@ template <typename T>
 std::string
 getLinkedTargetsContent(
   std::vector<T> const &libraries,
-  cmGeneratorTarget const* target,
-  cmGeneratorTarget const* headTarget,
+  cmTarget const* target,
+  cmTarget const* headTarget,
   cmGeneratorExpressionContext *context,
   cmGeneratorExpressionDAGChecker *dagChecker,
   const std::string &interfacePropertyName)
@@ -858,10 +858,8 @@ getLinkedTargetsContent(
     {
     linkedTargetsContent =
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
-                                        target->Target->GetMakefile(),
-                                        context,
-                                        headTarget->Target,
-                                        target->Target, dagChecker);
+                                        target->GetMakefile(), context,
+                                        headTarget, target, dagChecker);
     }
   linkedTargetsContent =
     cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1118,8 +1116,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(iface->Libraries, gtgt,
-                                  gHeadTarget,
+          getLinkedTargetsContent(iface->Libraries, target,
+                                  headTarget,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1130,8 +1128,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkImplementationLibraries(context->Config))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(impl->Libraries, gtgt,
-                                  gtgt,
+          getLinkedTargetsContent(impl->Libraries, target,
+                                  target,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1660,7 +1658,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
       return std::string();
       }
     return target->GetFullPath(context->Config,
-                               target->HasImportLibrary());
+                               target->Target->HasImportLibrary());
   }
 };
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f33a9e1..f39a67d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -271,8 +271,7 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
   DebugCompileFeaturesDone(false),
   DebugCompileDefinitionsDone(false),
   DebugSourcesDone(false),
-  LinkImplementationLanguageIsContextDependent(true),
-  UtilityItemsDone(false)
+  LinkImplementationLanguageIsContextDependent(true)
 {
   this->Makefile = this->Target->GetMakefile();
   this->LocalGenerator = lg;
@@ -510,8 +509,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
   return 0;
 }
 
-static void handleSystemIncludesDep(cmMakefile *mf,
-                                  cmGeneratorTarget const* depTgt,
+static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
                                   const std::string& config,
                                   cmGeneratorTarget const* headTarget,
                                   cmGeneratorExpressionDAGChecker *dagChecker,
@@ -525,7 +523,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      depTgt, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
     {
@@ -539,7 +537,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      depTgt, dagChecker), result);
     }
 }
 
@@ -762,25 +760,7 @@ cmGeneratorTarget::GetExpectedXamlSources(std::set<std::string>& srcs,
 {
   XamlData data;
   IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData)
-      srcs = data.ExpectedXamlSources;
-}
-
-std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
-{
-  if(!this->UtilityItemsDone)
-    {
-    this->UtilityItemsDone = true;
-    std::set<std::string> const& utilities = this->Target->GetUtilities();
-    for(std::set<std::string>::const_iterator i = utilities.begin();
-        i != utilities.end(); ++i)
-      {
-      cmTarget* tgt = this->Makefile->FindTargetToUse(*i);
-      cmGeneratorTarget* gt = tgt ? this->GlobalGenerator
-          ->GetGeneratorTarget(tgt) : 0;
-      this->UtilityItems.insert(cmLinkItem(*i, gt));
-      }
-    }
-  return this->UtilityItems;
+  srcs = data.ExpectedXamlSources;
 }
 
 //----------------------------------------------------------------------------
@@ -884,9 +864,9 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
                                           &dagChecker), result);
       }
 
-    std::vector<cmGeneratorTarget const*> const& deps =
+    std::vector<cmTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmGeneratorTarget const*>::const_iterator
+    for(std::vector<cmTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
       handleSystemIncludesDep(this->Makefile, *li, config, this,
@@ -1731,12 +1711,15 @@ public:
         }
       return;
       }
-    if(!this->Visited.insert(item.Target->Target).second)
+    if(!this->Visited.insert(item.Target).second)
       {
       return;
       }
+    cmGeneratorTarget* gtgt =
+        this->Target->GetLocalGenerator()->GetGlobalGenerator()
+            ->GetGeneratorTarget(item.Target);
     cmLinkInterface const* iface =
-      item.Target->GetLinkInterface(this->Config, this->HeadTarget);
+      gtgt->GetLinkInterface(this->Config, this->HeadTarget);
     if(!iface) { return; }
 
     for(std::vector<std::string>::const_iterator
@@ -2067,14 +2050,15 @@ void processILibs(const std::string& config,
                   cmGeneratorTarget const* headTarget,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
-                  std::vector<cmGeneratorTarget const*>& tgts,
-                  std::set<cmGeneratorTarget const*>& emitted)
+                  std::vector<cmTarget const*>& tgts,
+                  std::set<cmTarget const*>& emitted)
 {
   if (item.Target && emitted.insert(item.Target).second)
     {
     tgts.push_back(item.Target);
+    cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
-       item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
+       gt->GetLinkInterfaceLibraries(config, headTarget, true))
       {
       for(std::vector<cmLinkItem>::const_iterator
             it = iface->Libraries.begin();
@@ -2087,7 +2071,7 @@ void processILibs(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
-const std::vector<const cmGeneratorTarget*>&
+const std::vector<const cmTarget*>&
 cmGeneratorTarget::GetLinkImplementationClosure(
     const std::string& config) const
 {
@@ -2096,7 +2080,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
   if(!tgts.Done)
     {
     tgts.Done = true;
-    std::set<cmGeneratorTarget const*> emitted;
+    std::set<cmTarget const*> emitted;
 
     cmLinkImplementationLibraries const* impl
       = this->GetLinkImplementationLibraries(config);
@@ -3631,10 +3615,10 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
     compat.Done = true;
     compat.PropsBool.insert("POSITION_INDEPENDENT_CODE");
     compat.PropsString.insert("AUTOUIC_OPTIONS");
-    std::vector<cmGeneratorTarget const*> const& deps =
+    std::vector<cmTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmGeneratorTarget const*>::const_iterator li =
-        deps.begin(); li != deps.end(); ++li)
+    for(std::vector<cmTarget const*>::const_iterator li = deps.begin();
+        li != deps.end(); ++li)
       {
 #define CM_READ_COMPATIBLE_INTERFACE(X, x) \
       if(const char* prop = (*li)->GetProperty("COMPATIBLE_INTERFACE_" #X)) \
@@ -3751,7 +3735,7 @@ const char * getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
 //----------------------------------------------------------------------------
 template<typename PropertyType>
 void checkPropertyConsistency(cmGeneratorTarget const* depender,
-                              cmGeneratorTarget const* dependee,
+                              cmTarget const* dependee,
                               const std::string& propName,
                               std::set<std::string> &emitted,
                               const std::string& config,
@@ -3767,7 +3751,7 @@ void checkPropertyConsistency(cmGeneratorTarget const* depender,
   std::vector<std::string> props;
   cmSystemTools::ExpandListArgument(prop, props);
   std::string pdir =
-    dependee->Target->GetMakefile()->GetRequiredDefinition("CMAKE_ROOT");
+    dependee->GetMakefile()->GetRequiredDefinition("CMAKE_ROOT");
   pdir += "/Help/prop_tgt/";
 
   for(std::vector<std::string>::iterator pi = props.begin();
@@ -3980,20 +3964,18 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
 
 //----------------------------------------------------------------------------
 template<typename PropertyType>
-PropertyType getTypedProperty(cmGeneratorTarget const* tgt,
-                              const std::string& prop);
+PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
 
 //----------------------------------------------------------------------------
 template<>
-bool getTypedProperty<bool>(cmGeneratorTarget const* tgt,
-                            const std::string& prop)
+bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
 {
   return tgt->GetPropertyAsBool(prop);
 }
 
 //----------------------------------------------------------------------------
 template<>
-const char *getTypedProperty<const char *>(cmGeneratorTarget const* tgt,
+const char *getTypedProperty<const char *>(cmTarget const* tgt,
                                            const std::string& prop)
 {
   return tgt->GetProperty(prop);
@@ -4123,7 +4105,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                           CompatibleType t,
                                           PropertyType *)
 {
-  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
+  PropertyType propContent = getTypedProperty<PropertyType>(tgt->Target, p);
   const bool explicitlySet = tgt->Target->GetProperties()
                                   .find(p)
                                   != tgt->Target->GetProperties().end();
@@ -4132,7 +4114,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
   assert((impliedByUse ^ explicitlySet)
       || (!impliedByUse && !explicitlySet));
 
-  std::vector<cmGeneratorTarget const*> const& deps =
+  std::vector<cmTarget const*> const& deps =
     tgt->GetLinkImplementationClosure(config);
 
   if(deps.empty())
@@ -4159,7 +4141,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     }
 
   std::string interfaceProperty = "INTERFACE_" + p;
-  for(std::vector<cmGeneratorTarget const*>::const_iterator li =
+  for(std::vector<cmTarget const*>::const_iterator li =
       deps.begin();
       li != deps.end(); ++li)
     {
@@ -4169,11 +4151,11 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     // target itself has a POSITION_INDEPENDENT_CODE which disagrees
     // with a dependency.
 
-    cmGeneratorTarget const* theTarget = *li;
+    cmTarget const* theTarget = *li;
 
-    const bool ifaceIsSet = theTarget->Target->GetProperties()
+    const bool ifaceIsSet = theTarget->GetProperties()
                             .find(interfaceProperty)
-                            != theTarget->Target->GetProperties().end();
+                            != theTarget->GetProperties().end();
     PropertyType ifacePropContent =
                     getTypedProperty<PropertyType>(theTarget,
                               interfaceProperty);
@@ -4428,7 +4410,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
       {
       continue;
       }
-    items.push_back(cmLinkItem(name, this->FindTargetToLink(name)));
+    items.push_back(cmLinkItem(name, this->Target->FindTargetToLink(name)));
     }
 }
 
@@ -4491,7 +4473,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head];
+  cmOptionalLinkInterface& iface = hm[head->Target];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -4643,7 +4625,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head];
+  cmOptionalLinkInterface& iface = hm[head->Target];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -5080,7 +5062,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[headTarget];
+  cmOptionalLinkInterface& iface = hm[headTarget->Target];
   if(!iface.AllDone)
     {
     iface.AllDone = true;
@@ -5399,7 +5381,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
 
       // The entry is meant for this configuration.
       impl.Libraries.push_back(
-        cmLinkImplItem(name, this->FindTargetToLink(name),
+        cmLinkImplItem(name, this->Target->FindTargetToLink(name),
                        *btIt, evaluated != *le));
       }
 
@@ -5431,48 +5413,12 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         }
       // Support OLD behavior for CMP0003.
       impl.WrongConfigLibraries.push_back(
-        cmLinkItem(name, this->FindTargetToLink(name)));
+        cmLinkItem(name, this->Target->FindTargetToLink(name)));
       }
     }
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmGeneratorTarget::FindTargetToLink(std::string const& name) const
-{
-  cmTarget const* tgt = this->Makefile->FindTargetToUse(name);
-
-  // Skip targets that will not really be linked.  This is probably a
-  // name conflict between an external library and an executable
-  // within the project.
-  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
-     !tgt->IsExecutableWithExports())
-    {
-    tgt = 0;
-    }
-
-  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
-    {
-    std::ostringstream e;
-    e << "Target \"" << this->GetName() << "\" links to "
-      "OBJECT library \"" << tgt->GetName() << "\" but this is not "
-      "allowed.  "
-      "One may link only to STATIC or SHARED libraries, or to executables "
-      "with the ENABLE_EXPORTS property set.";
-    cmake* cm = this->Makefile->GetCMakeInstance();
-    cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
-                     this->Target->GetBacktrace());
-    tgt = 0;
-    }
-
-  if (!tgt)
-    {
-    return 0;
-    }
-  return this->GlobalGenerator->GetGeneratorTarget(tgt);
-}
-
-//----------------------------------------------------------------------------
 std::string
 cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 {
@@ -5483,47 +5429,3 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
     }
   return "";
 }
-
-//----------------------------------------------------------------------------
-bool cmGeneratorTarget::HasImplibGNUtoMS() const
-{
-  return this->HasImportLibrary()
-      && this->GetPropertyAsBool("GNUtoMS");
-}
-
-//----------------------------------------------------------------------------
-bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
-                                std::string& out, const char* newExt) const
-{
-  if(this->HasImplibGNUtoMS() &&
-     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
-    {
-    out = gnuName.substr(0, gnuName.size()-6);
-    out += newExt? newExt : ".lib";
-    return true;
-    }
-  return false;
-}
-
-//----------------------------------------------------------------------------
-bool cmGeneratorTarget::HasImportLibrary() const
-{
-  return (this->Target->IsDLLPlatform() &&
-          (this->GetType() == cmTarget::SHARED_LIBRARY ||
-           this->Target->IsExecutableWithExports()));
-}
-
-//----------------------------------------------------------------------------
-std::string cmGeneratorTarget::GetSupportDirectory() const
-{
-  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
-  dir += cmake::GetCMakeFilesDirectory();
-  dir += "/";
-  dir += this->GetName();
-#if defined(__VMS)
-  dir += "_dir";
-#else
-  dir += ".dir";
-#endif
-  return dir;
-}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 258c556..799110c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -82,8 +82,6 @@ public:
   void GetExpectedXamlSources(std::set<std::string>&,
                               const std::string& config) const;
 
-  std::set<cmLinkItem>const& GetUtilityItems() const;
-
   void ComputeObjectMapping();
 
   const char* GetFeature(const std::string& feature,
@@ -216,8 +214,6 @@ public:
                                           cmOptionalLinkImplementation& impl,
                                           const cmGeneratorTarget* head) const;
 
-  cmGeneratorTarget* FindTargetToLink(std::string const& name) const;
-
   // Compute the set of languages compiled by the target.  This is
   // computed every time it is called because the languages can change
   // when source file properties are changed and we do not have enough
@@ -390,20 +386,6 @@ public:
   ///! Return the preferred linker language for this target
   std::string GetLinkerLanguage(const std::string& config = "") const;
 
-  /** Does this target have a GNU implib to convert to MS format?  */
-  bool HasImplibGNUtoMS() const;
-
-  /** Convert the given GNU import library name (.dll.a) to a name with a new
-      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
-  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
-                        const char* newExt = 0) const;
-
-  /** Return whether or not the target has a DLL import library.  */
-  bool HasImportLibrary() const;
-
-  /** Get a build-tree directory in which to place target support files.  */
-  std::string GetSupportDirectory() const;
-
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
@@ -491,7 +473,7 @@ private:
   cmGeneratorTarget(cmGeneratorTarget const&);
   void operator=(cmGeneratorTarget const&);
 
-  struct LinkImplClosure: public std::vector<cmGeneratorTarget const*>
+  struct LinkImplClosure: public std::vector<cmTarget const*>
   {
     LinkImplClosure(): Done(false) {}
     bool Done;
@@ -555,7 +537,6 @@ private:
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
-  mutable std::set<cmLinkItem> UtilityItems;
   mutable bool PolicyWarnedCMP0022;
   mutable bool DebugIncludesDone;
   mutable bool DebugCompileOptionsDone;
@@ -563,14 +544,13 @@ private:
   mutable bool DebugCompileDefinitionsDone;
   mutable bool DebugSourcesDone;
   mutable bool LinkImplementationLanguageIsContextDependent;
-  mutable bool UtilityItemsDone;
 
   bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
                            std::string& out) const;
 
 public:
-  const std::vector<const cmGeneratorTarget*>&
-  GetLinkImplementationClosure(const std::string& config) const;
+  std::vector<cmTarget const*> const&
+    GetLinkImplementationClosure(const std::string& config) const;
 
   mutable std::map<std::string, std::string> MaxLanguageStandards;
   std::map<std::string, std::string> const&
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8f69acd..eb4dfee 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2895,14 +2895,13 @@ void cmGlobalGenerator::WriteSummary()
       {
       continue;
       }
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
-    this->WriteSummary(gt);
-    fout << gt->GetSupportDirectory() << "\n";
+    this->WriteSummary(ti->second);
+    fout << ti->second->GetSupportDirectory() << "\n";
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
+void cmGlobalGenerator::WriteSummary(cmTarget* target)
 {
   // Place the labels file in a per-target support directory.
   std::string dir = target->GetSupportDirectory();
@@ -2945,15 +2944,17 @@ void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
     fout << "# Source files and their labels\n";
     std::vector<cmSourceFile*> sources;
     std::vector<std::string> configs;
-    target->Target->GetMakefile()->GetConfigurations(configs);
+    target->GetMakefile()->GetConfigurations(configs);
     if (configs.empty())
       {
       configs.push_back("");
       }
+    cmGeneratorTarget* gt =
+        this->GetGeneratorTarget(target);
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
-      target->GetSourceFiles(sources, *ci);
+      gt->GetSourceFiles(sources, *ci);
       }
     std::vector<cmSourceFile*>::const_iterator sourcesEnd
         = cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 55e3766..b22c695 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -458,7 +458,7 @@ private:
   void WriteRuleHashes(std::string const& pfile);
 
   void WriteSummary();
-  void WriteSummary(cmGeneratorTarget* target);
+  void WriteSummary(cmTarget* target);
   void FinalizeTargetCompileInfo();
 
   virtual void ForceLinkerLanguages();
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index e2112d7..383ee00 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -135,7 +135,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -199,7 +199,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -387,7 +387,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -416,7 +416,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -563,12 +563,12 @@ cmInstallTargetGenerator
   std::map<std::string, std::string> install_name_remap;
   if(cmComputeLinkInformation* cli = this->Target->GetLinkInformation(config))
     {
-    std::set<cmGeneratorTarget const*> const& sharedLibs
+    std::set<cmTarget const*> const& sharedLibs
                                             = cli->GetSharedLibrariesLinked();
-    for(std::set<cmGeneratorTarget const*>::const_iterator j
-        = sharedLibs.begin(); j != sharedLibs.end(); ++j)
+    for(std::set<cmTarget const*>::const_iterator j = sharedLibs.begin();
+        j != sharedLibs.end(); ++j)
       {
-      cmGeneratorTarget const* tgt = *j;
+      cmTarget const* tgt = *j;
 
       // The install_name of an imported target does not change.
       if(tgt->IsImported())
@@ -576,17 +576,20 @@ cmInstallTargetGenerator
         continue;
         }
 
+      cmGeneratorTarget *gtgt = tgt->GetMakefile()
+                                          ->GetGlobalGenerator()
+                                          ->GetGeneratorTarget(tgt);
       // If the build tree and install tree use different path
       // components of the install_name field then we need to create a
       // mapping to be applied after installation.
-      std::string for_build = tgt->GetInstallNameDirForBuildTree(config);
-      std::string for_install = tgt->GetInstallNameDirForInstallTree();
+      std::string for_build = gtgt->GetInstallNameDirForBuildTree(config);
+      std::string for_install = gtgt->GetInstallNameDirForInstallTree();
       if(for_build != for_install)
         {
         // The directory portions differ.  Append the filename to
         // create the mapping.
         std::string fname =
-          this->GetInstallFilename(tgt->Target, config, NameSO);
+          this->GetInstallFilename(tgt, config, NameSO);
 
         // Map from the build-tree install_name.
         for_build += fname;
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index b875cc0..10dd465 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -15,7 +15,7 @@
 
 #include "cmListFileCache.h"
 
-class cmGeneratorTarget;
+class cmTarget;
 
 // Basic information about each link item.
 class cmLinkItem: public std::string
@@ -24,9 +24,9 @@ class cmLinkItem: public std::string
 public:
   cmLinkItem(): std_string(), Target(0) {}
   cmLinkItem(const std_string& n,
-             cmGeneratorTarget const* t): std_string(n), Target(t) {}
+             cmTarget const* t): std_string(n), Target(t) {}
   cmLinkItem(cmLinkItem const& r): std_string(r), Target(r.Target) {}
-  cmGeneratorTarget const* Target;
+  cmTarget const* Target;
 };
 
 class cmLinkImplItem: public cmLinkItem
@@ -34,7 +34,7 @@ class cmLinkImplItem: public cmLinkItem
 public:
   cmLinkImplItem(): cmLinkItem(), Backtrace(), FromGenex(false) {}
   cmLinkImplItem(std::string const& n,
-                 cmGeneratorTarget const* t,
+                 cmTarget const* t,
                  cmListFileBacktrace const& bt,
                  bool fromGenex):
     cmLinkItem(n, t), Backtrace(bt), FromGenex(fromGenex) {}
@@ -97,7 +97,7 @@ struct cmOptionalLinkInterface: public cmLinkInterface
 };
 
 struct cmHeadToLinkInterfaceMap:
-    public std::map<cmGeneratorTarget const*, cmOptionalLinkInterface>
+    public std::map<cmTarget const*, cmOptionalLinkInterface>
 {
 };
 
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 76ef8cc..f6b907e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -168,7 +168,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->GeneratorTarget->GetName().c_str(), "\".");
+                         this->Target->GetName().c_str(), "\".");
     return;
     }
 
@@ -197,7 +197,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                            this->ConfigName);
 
 
-  if(this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE"))
+  if(this->Target->GetPropertyAsBool("WIN32_EXECUTABLE"))
     {
     this->LocalGenerator->AppendFlags
       (linkFlags, this->Makefile->GetDefinition("CMAKE_CREATE_WIN32_EXE"));
@@ -226,11 +226,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   // Add target-specific linker flags.
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
+    (linkFlags, this->Target->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
+    (linkFlags, this->Target->GetProperty(linkFlagsConfig));
 
   this->AddModuleDefinitionFlag(linkFlags);
 
@@ -259,7 +259,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                                           cmLocalGenerator::START_OUTPUT,
                                           cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       exeCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
@@ -361,7 +361,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 5e5eeab..3b3f63e 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -26,7 +26,7 @@ cmMakefileLibraryTargetGenerator
   cmMakefileTargetGenerator(target)
 {
   this->CustomCommandDriver = OnDepends;
-  if (this->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
     this->GeneratorTarget->GetLibraryNames(
       this->TargetNameOut, this->TargetNameSO, this->TargetNameReal,
@@ -62,7 +62,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
 
   // write the link rules
   // Write the rule for this target type.
-  switch(this->GeneratorTarget->GetType())
+  switch(this->Target->GetType())
     {
     case cmTarget::STATIC_LIBRARY:
       this->WriteStaticLibraryRules();
@@ -122,11 +122,11 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->GeneratorTarget->GetName(),
+                                      this->Target->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
+  this->WriteTargetDriverRule(this->Target->GetName(), false);
 }
 
 //----------------------------------------------------------------------------
@@ -166,11 +166,11 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
+    (extraFlags, this->Target->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
+    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
 
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName);
@@ -190,11 +190,11 @@ void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                           this->GeneratorTarget->GetProperty("LINK_FLAGS"));
+                                    this->Target->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
+    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MODULE_LINKER_FLAGS", this->ConfigName);
   this->AddModuleDefinitionFlag(extraFlags);
@@ -213,11 +213,11 @@ void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                             this->GeneratorTarget->GetProperty("LINK_FLAGS"));
+                                    this->Target->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
+    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MACOSX_FRAMEWORK_LINKER_FLAGS", this->ConfigName);
 
@@ -244,7 +244,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->GeneratorTarget->GetName().c_str(), "\".");
+                         this->Target->GetName().c_str(), "\".");
     return;
     }
 
@@ -253,8 +253,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   this->LocalGenerator->AppendFlags(linkFlags, extraFlags);
 
   // Add OSX version flags, if any.
-  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
     {
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "COMPATIBILITY", true);
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "CURRENT", false);
@@ -351,7 +351,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     // Add the link message.
     std::string buildEcho = "Linking ";
     buildEcho += linkLanguage;
-    switch(this->GeneratorTarget->GetType())
+    switch(this->Target->GetType())
       {
       case cmTarget::STATIC_LIBRARY:
         buildEcho += " static library ";
@@ -375,7 +375,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     }
 
   const char* forbiddenFlagVar = 0;
-  switch(this->GeneratorTarget->GetType())
+  switch(this->Target->GetType())
     {
     case cmTarget::SHARED_LIBRARY:
       forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS";
@@ -410,7 +410,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         cmLocalGenerator::START_OUTPUT,
         cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       libCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
@@ -441,7 +441,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> commands1;
   // Add a command to remove any existing files for this library.
   // for static libs only
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
     {
     this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
                                              *this->Target, "target");
@@ -497,7 +497,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> archiveAppendCommands;
   std::vector<std::string> archiveFinishCommands;
   std::string::size_type archiveCommandLimit = std::string::npos;
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
     {
     haveStaticLibraryRule =
       this->Makefile->GetDefinition(linkRuleVar)? true:false;
@@ -552,7 +552,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Collect up flags to link in needed libraries.
   std::string linkLibs;
-  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
     {
     this->CreateLinkLibs(linkLibs, relink, useResponseFileForLibs, depends,
                          useWatcomQuote);
@@ -566,15 +566,15 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
                           useWatcomQuote);
 
   // maybe create .def file from list of objects
-  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if(this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
-        this->GeneratorTarget->GetSupportDirectory();
+        this->Target->GetSupportDirectory();
       name_of_def_file += std::string("/") +
-        this->GeneratorTarget->GetName();
+        this->Target->GetName();
       name_of_def_file += ".def";
       std::string cmd = cmSystemTools::GetCMakeCommand();
       cmd = this->Convert(cmd, cmLocalGenerator::NONE,
@@ -643,7 +643,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
@@ -667,7 +667,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Compute the directory portion of the install_name setting.
   std::string install_name_dir;
-  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir =
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 8534986..6eafeae 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -245,8 +245,7 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
     // Write an empty dependency file.
     cmGeneratedFileStream depFileStream(dependFileNameFull.c_str());
     depFileStream
-      << "# Empty dependencies file for "
-      << this->GeneratorTarget->GetName() << ".\n"
+      << "# Empty dependencies file for " << this->Target->GetName() << ".\n"
       << "# This may be replaced when dependencies are built." << std::endl;
     }
 
@@ -558,8 +557,7 @@ cmMakefileTargetGenerator
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
     if(targetFullPathCompilePDB.empty())
       {
-      targetFullPathCompilePDB =
-          this->GeneratorTarget->GetSupportDirectory() + "/";
+      targetFullPathCompilePDB = this->Target->GetSupportDirectory() + "/";
       }
     }
 
@@ -596,7 +594,7 @@ cmMakefileTargetGenerator
                   cmLocalGenerator::NONE,
                   cmLocalGenerator::SHELL);
   vars.Object = shellObj.c_str();
-  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
@@ -1518,7 +1516,7 @@ std::string cmMakefileTargetGenerator::GetLinkRule(
                                               const std::string& linkRuleVar)
 {
   std::string linkRule = this->Makefile->GetRequiredDefinition(linkRuleVar);
-  if(this->GeneratorTarget->HasImplibGNUtoMS())
+  if(this->Target->HasImplibGNUtoMS())
     {
     std::string ruleVar = "CMAKE_";
     ruleVar += this->GeneratorTarget->GetLinkerLanguage(this->ConfigName);
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 18594bb..303ca63 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -42,8 +42,7 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
   this->CreateRuleFile();
 
   *this->BuildFileStream
-    << "# Utility rule file for "
-    << this->GeneratorTarget->GetName() << ".\n\n";
+    << "# Utility rule file for " << this->Target->GetName() << ".\n\n";
 
   if(!this->NoRuleMessages)
     {
@@ -102,11 +101,11 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->GeneratorTarget->GetName(),
+                                      this->Target->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
+  this->WriteTargetDriverRule(this->Target->GetName(), false);
 
   // Write clean target
   this->WriteTargetCleanRules();
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 0dc53f3..f8743d9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -492,8 +492,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
+      std::string dllname = targetOutput;
       std::string name_of_def_file
-        = gt.GetSupportDirectory();
+        = target.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
@@ -558,7 +559,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                               cmLocalGenerator::SHELL);
     vars["TARGET_IMPLIB"] = impLibPath;
     EnsureParentDirectoryExists(impLibPath);
-    if(genTarget.HasImportLibrary())
+    if(target.HasImportLibrary())
       {
       byproducts.push_back(targetOutputImplib);
       }
@@ -581,7 +582,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     vars["TARGET_PDB"] = base + suffix + dbg_suffix;
     }
 
-  const std::string objPath = GetGeneratorTarget()->GetSupportDirectory();
+  const std::string objPath = GetTarget()->GetSupportDirectory();
   vars["OBJECT_DIR"] =
     this->GetLocalGenerator()->ConvertToOutputFormat(
       this->ConvertToNinjaPath(objPath), cmLocalGenerator::SHELL);
@@ -633,7 +634,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
-        = gt.GetSupportDirectory();
+        = target.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index fd9a158..c2daa63 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -93,7 +93,7 @@ std::string cmNinjaTargetGenerator::LanguageCompilerRule(
   const std::string& lang) const
 {
   return lang + "_COMPILER__" +
-    cmGlobalNinjaGenerator::EncodeRuleName(this->GeneratorTarget->GetName());
+    cmGlobalNinjaGenerator::EncodeRuleName(this->Target->GetName());
 }
 
 std::string
@@ -190,8 +190,8 @@ ComputeDefines(cmSourceFile const* source, const std::string& language)
 cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
 {
   // Static libraries never depend on other targets for linking.
-  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
-      this->GeneratorTarget->GetType() == cmTarget::OBJECT_LIBRARY)
+  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
+      this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
     return cmNinjaDeps();
 
   cmComputeLinkInformation* cli =
@@ -219,8 +219,7 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
     }
 
   // Add user-specified dependencies.
-  if (const char* linkDepends =
-      this->GeneratorTarget->GetProperty("LINK_DEPENDS"))
+  if (const char* linkDepends = this->Target->GetProperty("LINK_DEPENDS"))
     {
     std::vector<std::string> linkDeps;
     cmSystemTools::ExpandListArgument(linkDepends, linkDeps);
@@ -273,7 +272,7 @@ cmNinjaTargetGenerator
 
 std::string cmNinjaTargetGenerator::GetTargetName() const
 {
-  return this->GeneratorTarget->GetName();
+  return this->Target->GetName();
 }
 
 
@@ -285,10 +284,10 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
     {
     std::string pdbPath;
     std::string compilePdbPath;
-    if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
-       this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
-       this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+    if(this->Target->GetType() == cmTarget::EXECUTABLE ||
+       this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
+       this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
+       this->Target->GetType() == cmTarget::MODULE_LIBRARY)
       {
       pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName());
       pdbPath += "/";
@@ -300,7 +299,7 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
       if(compilePdbPath.empty())
         {
-        compilePdbPath = this->GeneratorTarget->GetSupportDirectory() + "/";
+        compilePdbPath = this->Target->GetSupportDirectory() + "/";
         }
       }
 
@@ -412,7 +411,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const iwyu_prop = lang + "_INCLUDE_WHAT_YOU_USE";
-    const char *iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
+    const char *iwyu = this->Target->GetProperty(iwyu_prop);
     if (iwyu && *iwyu)
       {
       std::string run_iwyu =
@@ -429,7 +428,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
-    const char *clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
+    const char *clauncher = this->Target->GetProperty(clauncher_prop);
     if (clauncher && *clauncher)
       {
       std::vector<std::string> launcher_cmd;
@@ -569,7 +568,7 @@ cmNinjaTargetGenerator
   std::string const language = source->GetLanguage();
   std::string const sourceFileName =
     language=="RC" ? source->GetFullPath() : this->GetSourceFilePath(source);
-  std::string const objectDir = this->GeneratorTarget->GetSupportDirectory();
+  std::string const objectDir = this->Target->GetSupportDirectory();
   std::string const objectFileName = this->GetObjectFilePath(source);
   std::string const objectFileDir =
     cmSystemTools::GetFilenamePath(objectFileName);
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6e3f65f..378f132 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -64,7 +64,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
         std::string basename = cmsys::SystemTools::
                                       GetFilenameWithoutLastExtension(absFile);
 
-        std::string rcc_output_dir = target->GetSupportDirectory();
+        std::string rcc_output_dir = target->Target->GetSupportDirectory();
         cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -833,7 +833,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           std::string basename = cmsys::SystemTools::
                                   GetFilenameWithoutLastExtension(absFile);
 
-          std::string rcc_output_dir = target->GetSupportDirectory();
+          std::string rcc_output_dir = target->Target->GetSupportDirectory();
           cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
           std::string rcc_output_file = rcc_output_dir;
           rcc_output_file += "/qrc_" + basename + ".cpp";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 847a5c1..3de7efe 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,6 +64,27 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
+  cmTargetInternals()
+    : Backtrace()
+    {
+    this->UtilityItemsDone = false;
+    }
+  cmTargetInternals(cmTargetInternals const&)
+    : Backtrace()
+    {
+    this->UtilityItemsDone = false;
+    }
+  ~cmTargetInternals();
+
+  // The backtrace when the target was created.
+  cmListFileBacktrace Backtrace;
+
+  typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
+  ImportInfoMapType ImportInfoMap;
+
+  std::set<cmLinkItem> UtilityItems;
+  bool UtilityItemsDone;
+
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -79,6 +100,11 @@ public:
 };
 
 //----------------------------------------------------------------------------
+cmTargetInternals::~cmTargetInternals()
+{
+}
+
+//----------------------------------------------------------------------------
 cmTarget::cmTarget()
 {
   this->Makefile = 0;
@@ -234,7 +260,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 
   // Save the backtrace of target construction.
-  this->Backtrace = this->Makefile->GetBacktrace();
+  this->Internal->Backtrace = this->Makefile->GetBacktrace();
 
   if (!this->IsImported())
     {
@@ -338,6 +364,22 @@ cmListFileBacktrace const* cmTarget::GetUtilityBacktrace(
 }
 
 //----------------------------------------------------------------------------
+std::set<cmLinkItem> const& cmTarget::GetUtilityItems() const
+{
+  if(!this->Internal->UtilityItemsDone)
+    {
+    this->Internal->UtilityItemsDone = true;
+    for(std::set<std::string>::const_iterator i = this->Utilities.begin();
+        i != this->Utilities.end(); ++i)
+      {
+      this->Internal->UtilityItems.insert(
+        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
+      }
+    }
+  return this->Internal->UtilityItems;
+}
+
+//----------------------------------------------------------------------------
 void cmTarget::FinishConfigure()
 {
   // Erase any cached link information that might have been comptued
@@ -357,7 +399,22 @@ void cmTarget::FinishConfigure()
 //----------------------------------------------------------------------------
 cmListFileBacktrace const& cmTarget::GetBacktrace() const
 {
-  return this->Backtrace;
+  return this->Internal->Backtrace;
+}
+
+//----------------------------------------------------------------------------
+std::string cmTarget::GetSupportDirectory() const
+{
+  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+  dir += cmake::GetCMakeFilesDirectory();
+  dir += "/";
+  dir += this->Name;
+#if defined(__VMS)
+  dir += "_dir";
+#else
+  dir += ".dir";
+#endif
+  return dir;
 }
 
 //----------------------------------------------------------------------------
@@ -1535,7 +1592,7 @@ void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
   // Wipe out maps caching information affected by this property.
   if(this->IsImported() && cmHasLiteralPrefix(prop, "IMPORTED"))
     {
-    this->ImportInfoMap.clear();
+    this->Internal->ImportInfoMap.clear();
     }
 }
 
@@ -2163,6 +2220,26 @@ void cmTarget::ComputeVersionedName(std::string& vName,
 }
 
 //----------------------------------------------------------------------------
+bool cmTarget::HasImplibGNUtoMS() const
+{
+  return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS");
+}
+
+//----------------------------------------------------------------------------
+bool cmTarget::GetImplibGNUtoMS(std::string const& gnuName,
+                                std::string& out, const char* newExt) const
+{
+  if(this->HasImplibGNUtoMS() &&
+     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
+    {
+    out = gnuName.substr(0, gnuName.size()-6);
+    out += newExt? newExt : ".lib";
+    return true;
+    }
+  return false;
+}
+
+//----------------------------------------------------------------------------
 void cmTarget::SetPropertyDefault(const std::string& property,
                                   const char* default_value)
 {
@@ -2285,15 +2362,16 @@ cmTarget::GetImportInfo(const std::string& config) const
     {
     config_upper = "NOCONFIG";
     }
+  typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
 
   ImportInfoMapType::const_iterator i =
-    this->ImportInfoMap.find(config_upper);
-  if(i == this->ImportInfoMap.end())
+    this->Internal->ImportInfoMap.find(config_upper);
+  if(i == this->Internal->ImportInfoMap.end())
     {
     ImportInfo info;
     this->ComputeImportInfo(config_upper, info);
     ImportInfoMapType::value_type entry(config_upper, info);
-    i = this->ImportInfoMap.insert(entry).first;
+    i = this->Internal->ImportInfoMap.insert(entry).first;
     }
 
   if(this->GetType() == INTERFACE_LIBRARY)
@@ -2613,6 +2691,37 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
 }
 
 //----------------------------------------------------------------------------
+cmTarget const* cmTarget::FindTargetToLink(std::string const& name) const
+{
+  cmTarget const* tgt = this->Makefile->FindTargetToUse(name);
+
+  // Skip targets that will not really be linked.  This is probably a
+  // name conflict between an external library and an executable
+  // within the project.
+  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
+     !tgt->IsExecutableWithExports())
+    {
+    tgt = 0;
+    }
+
+  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
+    {
+    std::ostringstream e;
+    e << "Target \"" << this->GetName() << "\" links to "
+      "OBJECT library \"" << tgt->GetName() << "\" but this is not "
+      "allowed.  "
+      "One may link only to STATIC or SHARED libraries, or to executables "
+      "with the ENABLE_EXPORTS property set.";
+    cmake* cm = this->Makefile->GetCMakeInstance();
+    cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->GetBacktrace());
+    tgt = 0;
+    }
+
+  // Return the target found, if any.
+  return tgt;
+}
+
+//----------------------------------------------------------------------------
 std::string cmTarget::CheckCMP0004(std::string const& item) const
 {
   // Strip whitespace off the library names because we used to do this
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 97515a7..16d0121 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -16,6 +16,7 @@
 #include "cmPropertyMap.h"
 #include "cmPolicies.h"
 #include "cmListFileCache.h"
+#include "cmLinkItem.h"
 
 #include <cmsys/auto_ptr.hxx>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -205,6 +206,7 @@ public:
   void AddUtility(const std::string& u, cmMakefile *makefile = 0);
   ///! Get the utilities used by this target
   std::set<std::string>const& GetUtilities() const { return this->Utilities; }
+  std::set<cmLinkItem>const& GetUtilityItems() const;
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
   /** Finalize the target at the end of the Configure step.  */
@@ -223,6 +225,8 @@ public:
 
   void GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const;
 
+  cmTarget const* FindTargetToLink(std::string const& name) const;
+
   /** Strip off leading and trailing whitespace from an item named in
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;
@@ -240,6 +244,14 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
+  /** Does this target have a GNU implib to convert to MS format?  */
+  bool HasImplibGNUtoMS() const;
+
+  /** Convert the given GNU import library name (.dll.a) to a name with a new
+      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
+  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
+                        const char* newExt = 0) const;
+
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
 
@@ -262,6 +274,9 @@ public:
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   /** Return whether this target is a shared library Framework on
       Apple.  */
   bool IsFrameworkOnApple() const;
@@ -282,6 +297,9 @@ public:
   /** Get a backtrace from the creation of the target.  */
   cmListFileBacktrace const& GetBacktrace() const;
 
+  /** Get a build-tree directory in which to place target support files.  */
+  std::string GetSupportDirectory() const;
+
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 
@@ -449,9 +467,6 @@ private:
     std::string SharedDeps;
   };
 
-  typedef std::map<std::string, ImportInfo> ImportInfoMapType;
-  mutable ImportInfoMapType ImportInfoMap;
-
   ImportInfo const* GetImportInfo(const std::string& config) const;
   void ComputeImportInfo(std::string const& desired_config,
                          ImportInfo& info) const;
@@ -460,9 +475,6 @@ private:
 
   void MaybeInvalidatePropertyCache(const std::string& prop);
 
-  /** Return whether or not the target has a DLL import library.  */
-  bool HasImportLibrary() const;
-
   // Internal representation details.
   friend class cmTargetInternals;
   friend class cmGeneratorTarget;
@@ -474,8 +486,6 @@ private:
                             std::string const& suffix,
                             std::string const& name,
                             const char* version) const;
-
-  cmListFileBacktrace Backtrace;
 };
 
 #ifdef CMAKE_BUILD_WITH_CMAKE

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |   16 ++-
 Source/cmComputeLinkDepends.cxx                |   14 +-
 Source/cmComputeLinkDepends.h                  |    9 +-
 Source/cmComputeLinkInformation.cxx            |   39 +++---
 Source/cmComputeLinkInformation.h              |   13 +-
 Source/cmComputeTargetDepends.cxx              |   28 ++--
 Source/cmExportBuildFileGenerator.cxx          |    2 +-
 Source/cmExportFileGenerator.cxx               |   13 +-
 Source/cmExtraSublimeTextGenerator.cxx         |   17 +--
 Source/cmExtraSublimeTextGenerator.h           |    3 +-
 Source/cmGeneratorExpressionNode.cxx           |   20 ++-
 Source/cmGeneratorTarget.cxx                   |  174 ++++++------------------
 Source/cmGeneratorTarget.h                     |   26 +---
 Source/cmGlobalGenerator.cxx                   |   13 +-
 Source/cmGlobalGenerator.h                     |    2 +-
 Source/cmInstallTargetGenerator.cxx            |   25 ++--
 Source/cmLinkItem.h                            |   10 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |   12 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |   50 +++----
 Source/cmMakefileTargetGenerator.cxx           |   10 +-
 Source/cmMakefileUtilityTargetGenerator.cxx    |    7 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    9 +-
 Source/cmNinjaTargetGenerator.cxx              |   27 ++--
 Source/cmQtAutoGeneratorInitializer.cxx        |    4 +-
 Source/cmTarget.cxx                            |  121 +++++++++++++++-
 Source/cmTarget.h                              |   26 ++--
 26 files changed, 352 insertions(+), 338 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 10 11:07:04 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 10 Oct 2015 11:07:04 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-422-gf4172dc
Message-ID: <20151010150704.D58BDC06AF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f4172dce1680f567b6b853377ce4d8dbb1093c05 (commit)
       via  1c1c2a1201682d17491026cb392c31ae5e63e1a5 (commit)
      from  f8024bd6b69b84e5cd63ddf2e81be016c9f251b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4172dce1680f567b6b853377ce4d8dbb1093c05
commit f4172dce1680f567b6b853377ce4d8dbb1093c05
Merge: f8024bd 1c1c2a1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 11:07:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 11:07:04 2015 -0400

    Merge topic 'use-generator-target' into next
    
    1c1c2a12 cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c1c2a1201682d17491026cb392c31ae5e63e1a5
commit 1c1c2a1201682d17491026cb392c31ae5e63e1a5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:07:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 17:06:56 2015 +0200

    cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 26119c3..f39a67d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4418,7 +4418,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
 void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
                                std::string const& value,
                                std::string const& config,
-                               cmTarget const* headTarget,
+                               cmGeneratorTarget const* headTarget,
                                bool usage_requirements_only,
                                std::vector<cmLinkItem>& items,
                                bool& hadHeadSensitiveCondition) const
@@ -4437,7 +4437,7 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
                                       this->Makefile,
                                       config,
                                       false,
-                                      headTarget,
+                                      headTarget->Target,
                                       this->Target, &dagChecker), libs);
   this->LookupLinkItems(libs, items);
   hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition();
@@ -4977,7 +4977,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     // The interface libraries have been explicitly set.
     this->ExpandLinkItems(linkIfaceProp, explicitLibraries,
                                   config,
-                                headTarget->Target, usage_requirements_only,
+                                headTarget, usage_requirements_only,
                                 iface.Libraries,
                                 iface.HadHeadSensitiveCondition);
     }
@@ -5004,7 +5004,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
         {
         bool hadHeadSensitiveConditionDummy = false;
         this->ExpandLinkItems(newProp, newExplicitLibraries, config,
-                              headTarget->Target,
+                              headTarget,
                               usage_requirements_only,
                               ifaceLibs, hadHeadSensitiveConditionDummy);
         }
@@ -5070,7 +5070,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     cmSystemTools::ExpandListArgument(info->Languages, iface.Languages);
     this->ExpandLinkItems(info->LibrariesProp, info->Libraries,
                                   config,
-                          headTarget->Target, usage_requirements_only,
+                          headTarget, usage_requirements_only,
                           iface.Libraries,
                           iface.HadHeadSensitiveCondition);
     std::vector<std::string> deps;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 03548e2..799110c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -507,7 +507,8 @@ private:
   mutable std::set<std::string> LinkImplicitNullProperties;
 
   void ExpandLinkItems(std::string const& prop, std::string const& value,
-                       std::string const& config, cmTarget const* headTarget,
+                       std::string const& config,
+                       const cmGeneratorTarget* headTarget,
                        bool usage_requirements_only,
                        std::vector<cmLinkItem>& items,
                        bool& hadHeadSensitiveCondition) const;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Oct 11 00:01:14 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun, 11 Oct 2015 00:01:14 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-86-gb46b88e
Message-ID: <20151011040114.3B2F2C0159@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  b46b88e07519b28e59c1750b5f63c35365fa0c0b (commit)
      from  3fe240a79a53d8069ab51c4a44c4e1f5062983f1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b46b88e07519b28e59c1750b5f63c35365fa0c0b
commit b46b88e07519b28e59c1750b5f63c35365fa0c0b
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Oct 11 00:01:06 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Oct 11 00:01:06 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 95b9456..2cf281a 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151010)
+set(CMake_VERSION_PATCH 20151011)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Oct 12 00:01:07 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon, 12 Oct 2015 00:01:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-87-g70764ea
Message-ID: <20151012040107.960F1BFFBB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  70764ead1a3462409401288b99eda3ff50812ed8 (commit)
      from  b46b88e07519b28e59c1750b5f63c35365fa0c0b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70764ead1a3462409401288b99eda3ff50812ed8
commit 70764ead1a3462409401288b99eda3ff50812ed8
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Oct 12 00:01:05 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 12 00:01:05 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 2cf281a..8095229 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151011)
+set(CMake_VERSION_PATCH 20151012)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:07:23 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:07:23 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-424-gf5a6fb9
Message-ID: <20151012140723.5181AC0770@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f5a6fb97d6638e485b017bc2a86d36d521dcc742 (commit)
       via  3d9e3d7b794bbe92d694e2558eb07b018a4af0ba (commit)
      from  f4172dce1680f567b6b853377ce4d8dbb1093c05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5a6fb97d6638e485b017bc2a86d36d521dcc742
commit f5a6fb97d6638e485b017bc2a86d36d521dcc742
Merge: f4172dc 3d9e3d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:07:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:07:22 2015 -0400

    Merge topic 'FindGTK2_sigc++_c++11' into next
    
    3d9e3d7b FindGTK2: Enable c++11 for sigc++ 2.5.1 or later


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d9e3d7b794bbe92d694e2558eb07b018a4af0ba
commit 3d9e3d7b794bbe92d694e2558eb07b018a4af0ba
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Oct 6 13:33:08 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 12 10:06:55 2015 -0400

    FindGTK2: Enable c++11 for sigc++ 2.5.1 or later
    
    Starting with sigc++ 2.5.1, c++11 must be enabled in order to use
    sigc++. The GTK2::sigc++ imported target will automatically enable the
    required build flags in order to build with the version found on the
    system.

diff --git a/Help/release/dev/FindGTK2_sigc++_c++11.rst b/Help/release/dev/FindGTK2_sigc++_c++11.rst
new file mode 100644
index 0000000..2ba1459
--- /dev/null
+++ b/Help/release/dev/FindGTK2_sigc++_c++11.rst
@@ -0,0 +1,7 @@
+FindGTK2_sigc++_c++11
+---------------------
+
+* Starting with sigc++ 2.5.1, c++11 must be enabled in order to use
+  sigc++. The GTK2::sigc++ imported target will automatically enable the
+  required build flags in order to build with the version found on the
+  system.
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 72bb8eb..ab4ef3e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -202,6 +202,43 @@ function(_GTK2_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr)
     endif()
 endfunction()
 
+
+#=============================================================
+# _GTK2_SIGCXX_GET_VERSION
+# Internal function to parse the version number in
+# sigc++config.h
+#   _OUT_major = Major version number
+#   _OUT_minor = Minor version number
+#   _OUT_micro = Micro version number
+#   _sigcxxversion_hdr = Header file to parse
+#=============================================================
+
+function(_GTK2_SIGCXX_GET_VERSION _OUT_major _OUT_minor _OUT_micro _sigcxxversion_hdr)
+    file(STRINGS ${_sigcxxversion_hdr} _contents REGEX "#define SIGCXX_M[A-Z]+_VERSION[ \t]+")
+    if(_contents)
+        string(REGEX REPLACE ".*#define SIGCXX_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" ${_OUT_major} "${_contents}")
+        string(REGEX REPLACE ".*#define SIGCXX_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" ${_OUT_minor} "${_contents}")
+        string(REGEX REPLACE ".*#define SIGCXX_MICRO_VERSION[ \t]+([0-9]+).*" "\\1" ${_OUT_micro} "${_contents}")
+
+        if(NOT ${_OUT_major} MATCHES "[0-9]+")
+            message(FATAL_ERROR "Version parsing failed for SIGCXX_MAJOR_VERSION!")
+        endif()
+        if(NOT ${_OUT_minor} MATCHES "[0-9]+")
+            message(FATAL_ERROR "Version parsing failed for SIGCXX_MINOR_VERSION!")
+        endif()
+        if(NOT ${_OUT_micro} MATCHES "[0-9]+")
+            message(FATAL_ERROR "Version parsing failed for SIGCXX_MICRO_VERSION!")
+        endif()
+
+        set(${_OUT_major} ${${_OUT_major}} PARENT_SCOPE)
+        set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE)
+        set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE)
+    else()
+        message(FATAL_ERROR "Include file ${_gtkversion_hdr} does not exist")
+    endif()
+endfunction()
+
+
 #=============================================================
 # _GTK2_FIND_INCLUDE_DIR
 # Internal function to find the GTK include directories
@@ -734,6 +771,27 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
         _GTK2_FIND_INCLUDE_DIR(SIGC++CONFIG sigc++config.h)
         _GTK2_FIND_LIBRARY    (SIGC++ sigc true true)
         _GTK2_ADD_TARGET      (SIGC++)
+        # Since sigc++ 2.5.1 c++11 support is required
+        if(GTK2_SIGC++CONFIG_INCLUDE_DIR)
+            _GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
+                                     GTK2_SIGC++_VERSION_MINOR
+                                     GTK2_SIGC++_VERSION_MICRO
+                                     ${GTK2_SIGC++CONFIG_INCLUDE_DIR}/sigc++config.h)
+            if(NOT ${GTK2_SIGC++_VERSION_MAJOR}.${GTK2_SIGC++_VERSION_MINOR}.${GTK2_SIGC++_VERSION_MICRO} VERSION_LESS 2.5.1)
+                # These are the features needed by clients in order to include the
+                # project headers:
+                set_property(TARGET GTK2::sigc++
+                             PROPERTY INTERFACE_COMPILE_FEATURES cxx_alias_templates
+                                                                 cxx_auto_type
+                                                                 cxx_decltype
+                                                                 cxx_deleted_functions
+                                                                 cxx_noexcept
+                                                                 cxx_nullptr
+                                                                 cxx_right_angle_brackets
+                                                                 cxx_rvalue_references
+                                                                 cxx_variadic_templates)
+            endif()
+        endif()
 
         _GTK2_FIND_INCLUDE_DIR(GLIBMM glibmm.h)
         _GTK2_FIND_INCLUDE_DIR(GLIBMMCONFIG glibmmconfig.h)

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:17:51 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:17:51 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-426-g19896d0
Message-ID: <20151012141751.DD2F0BFD4D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  19896d0f262325f783aabb01b44022e52b863149 (commit)
       via  2a6e0b611b5b76faf6c97cbfaf4ea3481732bbe9 (commit)
      from  f5a6fb97d6638e485b017bc2a86d36d521dcc742 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19896d0f262325f783aabb01b44022e52b863149
commit 19896d0f262325f783aabb01b44022e52b863149
Merge: f5a6fb9 2a6e0b6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:17:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:17:51 2015 -0400

    Merge topic 'ctest-submit-content-type' into next
    
    2a6e0b61 CTest: Set Content-Type header for http file upload (#15774)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a6e0b611b5b76faf6c97cbfaf4ea3481732bbe9
commit 2a6e0b611b5b76faf6c97cbfaf4ea3481732bbe9
Author:     Derek Bruening <bruening at google.com>
AuthorDate: Wed Oct 7 17:51:26 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 12 10:17:04 2015 -0400

    CTest: Set Content-Type header for http file upload (#15774)
    
    Sets the Content-Type header for http file uploads to avoid running afoul
    of ModSecurity rules on the server.

diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index b4c0137..fb6cc00 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -166,6 +166,10 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
                      curlWriteMemoryCallback);
   ::curl_easy_setopt(this->Curl, CURLOPT_DEBUGFUNCTION,
                      curlDebugCallback);
+  // Be sure to set Content-Type to satisfy fussy modsecurity rules
+  struct curl_slist *headers = ::curl_slist_append(NULL,
+                                                   "Content-Type: text/xml");
+  ::curl_easy_setopt(this->Curl, CURLOPT_HTTPHEADER, headers);
   std::vector<char> responseData;
   std::vector<char> debugData;
   ::curl_easy_setopt(this->Curl, CURLOPT_FILE, (void *)&responseData);
@@ -174,6 +178,8 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
   // Now run off and do what you've been told!
   ::curl_easy_perform(this->Curl);
   ::fclose(ftpfile);
+  ::curl_easy_setopt(this->Curl, CURLOPT_HTTPHEADER, NULL);
+  ::curl_slist_free_all(headers);
 
   if ( responseData.size() > 0 )
     {
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 1e12f15..833cad6 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -338,6 +338,8 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
   CURLcode res;
   FILE* ftpfile;
   char error_buffer[1024];
+  struct curl_slist *headers = ::curl_slist_append(NULL,
+                                                   "Content-Type: text/xml");
 
   /* In windows, this will init the winsock stuff */
   ::curl_global_init(CURL_GLOBAL_ALL);
@@ -420,6 +422,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
       ::curl_easy_setopt(curl, CURLOPT_PUT, 1);
       ::curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
 
+      // Be sure to set Content-Type to satisfy fussy modsecurity rules
+      ::curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
+
       std::string local_file = *file;
       if ( !cmSystemTools::FileExists(local_file.c_str()) )
         {
@@ -477,6 +482,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
         cmCTestLog(this->CTest, ERROR_MESSAGE, "   Cannot find file: "
           << local_file << std::endl);
         ::curl_easy_cleanup(curl);
+        ::curl_slist_free_all(headers);
         ::curl_global_cleanup();
         return false;
         }
@@ -621,6 +627,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
                      << std::endl);
           }
         ::curl_easy_cleanup(curl);
+        ::curl_slist_free_all(headers);
         ::curl_global_cleanup();
         return false;
         }
@@ -630,6 +637,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
         "   Uploaded: " + local_file << std::endl, this->Quiet);
       }
     }
+  ::curl_slist_free_all(headers);
   ::curl_global_cleanup();
   return true;
 }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:25:58 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:25:58 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-89-g887b4c8
Message-ID: <20151012142558.79990C01B0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  887b4c88011517b2ce2eef3d936493c11819df94 (commit)
       via  3d9e3d7b794bbe92d694e2558eb07b018a4af0ba (commit)
      from  70764ead1a3462409401288b99eda3ff50812ed8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=887b4c88011517b2ce2eef3d936493c11819df94
commit 887b4c88011517b2ce2eef3d936493c11819df94
Merge: 70764ea 3d9e3d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:25:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:25:56 2015 -0400

    Merge topic 'FindGTK2_sigc++_c++11'
    
    3d9e3d7b FindGTK2: Enable c++11 for sigc++ 2.5.1 or later


-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindGTK2_sigc++_c++11.rst |    7 ++++
 Modules/FindGTK2.cmake                     |   58 ++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 Help/release/dev/FindGTK2_sigc++_c++11.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:00 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:00 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-91-g9b05b14
Message-ID: <20151012142600.ADC94C01AF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  9b05b14fef4b318ad8a8a37277ec8a270d124eba (commit)
       via  340d0897fa9dfc568782d72c221ea6186bf533a6 (commit)
      from  887b4c88011517b2ce2eef3d936493c11819df94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b05b14fef4b318ad8a8a37277ec8a270d124eba
commit 9b05b14fef4b318ad8a8a37277ec8a270d124eba
Merge: 887b4c8 340d089
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:25:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:25:59 2015 -0400

    Merge topic 'revert-compiler-features-solaris'
    
    340d0897 Revert topic 'compiler-features-solaris'


-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-compile-features.7.rst           |    2 +-
 Modules/Compiler/SunPro-CXX.cmake                  |   32 ++++++++------------
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |    3 +-
 3 files changed, 15 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:02 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-96-g859bd8d
Message-ID: <20151012142602.DE4C6C01B9@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  859bd8d0c64a6e65ee17351489f0bf56e5b67375 (commit)
       via  0faccb839a75ab94f1ab39681a1ebe567647be6b (commit)
       via  265fb0cdc72fc46347ae0b8964078ca6d0a978e1 (commit)
       via  8083285d1bd5ecc31afa5fa689a9a4ca13ca8bb9 (commit)
       via  13c22d280e3b4d4f73e607617d18a3d55b509099 (commit)
      from  9b05b14fef4b318ad8a8a37277ec8a270d124eba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=859bd8d0c64a6e65ee17351489f0bf56e5b67375
commit 859bd8d0c64a6e65ee17351489f0bf56e5b67375
Merge: 9b05b14 0faccb8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:01 2015 -0400

    Merge topic 'update-kwsys'
    
    0faccb83 bootstrap: Drop unnecessary KWSys platform check
    265fb0cd cmFileTimeComparison: Update for lack of cmsys_STAT_HAS_ST_MTIM
    8083285d Merge branch 'upstream-kwsys' into update-kwsys
    13c22d28 KWSys 2015-10-06 (ed82989c)


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeLists.txt                  |   12 +++++++++++
 Source/cmFileTimeComparison.cxx        |    4 ++--
 Source/kwsys/CMakeLists.txt            |   11 +++++-----
 Source/kwsys/Configure.hxx.in          |    4 ----
 Source/kwsys/SystemTools.cxx           |   37 +++++++++++++++++++++++++-------
 Source/kwsys/kwsysPlatformTestsCXX.cxx |   15 ++++++++++++-
 bootstrap                              |   12 +----------
 7 files changed, 64 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:04 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:04 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-98-g1a0da7d
Message-ID: <20151012142604.EC42EC01BB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  1a0da7d32051783fcec12e85ee56c3adc447b1b1 (commit)
       via  8d27b407787549a90d47d273a753bb0000e5e73e (commit)
      from  859bd8d0c64a6e65ee17351489f0bf56e5b67375 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a0da7d32051783fcec12e85ee56c3adc447b1b1
commit 1a0da7d32051783fcec12e85ee56c3adc447b1b1
Merge: 859bd8d 8d27b40
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:03 2015 -0400

    Merge topic 'osx-file-times-ns-precision'
    
    8d27b407 cmFileTimeComparison: Port to OS X nanosecond times (#15769)


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeLists.txt           |    1 +
 Source/cmFileTimeComparison.cxx |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:07 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-100-gb6dcf68
Message-ID: <20151012142607.04199C01BF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  b6dcf6815b712f755c450c3837fd29c42910cc05 (commit)
       via  6556481eb8495a3c4f6870efc1b41b461f477bae (commit)
      from  1a0da7d32051783fcec12e85ee56c3adc447b1b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6dcf6815b712f755c450c3837fd29c42910cc05
commit b6dcf6815b712f755c450c3837fd29c42910cc05
Merge: 1a0da7d 6556481
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:05 2015 -0400

    Merge topic 'doc-clarify-shared-lib'
    
    6556481e Help: Document that SHARED libraries must export a symbol (#15775)


-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_library.rst        |    6 ++++++
 Help/manual/cmake-buildsystem.7.rst |    7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:09 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-102-g2f2baf0
Message-ID: <20151012142609.06A2AC01B2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  2f2baf09fda85164f4666135e5664914ea5dc4dd (commit)
       via  fb9ec2430be48aeb56984625a4e106b82a160653 (commit)
      from  b6dcf6815b712f755c450c3837fd29c42910cc05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f2baf09fda85164f4666135e5664914ea5dc4dd
commit 2f2baf09fda85164f4666135e5664914ea5dc4dd
Merge: b6dcf68 fb9ec24
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:07 2015 -0400

    Merge topic 'cpack-wix-typos'
    
    fb9ec243 CPackWIX: fix typos in documentation


-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackWIX.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:11 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:11 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-104-g3f7f4e1
Message-ID: <20151012142611.10964C01B2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  3f7f4e1d2ea9f9ed658d44343676fe61b2199489 (commit)
       via  a935745d0730cf1cd6c1a880d71e36a39ad86f8c (commit)
      from  2f2baf09fda85164f4666135e5664914ea5dc4dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f7f4e1d2ea9f9ed658d44343676fe61b2199489
commit 3f7f4e1d2ea9f9ed658d44343676fe61b2199489
Merge: 2f2baf0 a935745
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:09 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:09 2015 -0400

    Merge topic 'emacs-mode-fix-accidental-indentation'
    
    a935745d cmake-mode.el: treat keywords as symbols


-----------------------------------------------------------------------

Summary of changes:
 Auxiliary/cmake-mode.el |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:13 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:13 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-106-g5dba212
Message-ID: <20151012142613.2038BC01B4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  5dba212f3adf8ffac297c283fff748691678887e (commit)
       via  47f4b3b662da7f49fd0353b978eaf781608e9282 (commit)
      from  3f7f4e1d2ea9f9ed658d44343676fe61b2199489 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dba212f3adf8ffac297c283fff748691678887e
commit 5dba212f3adf8ffac297c283fff748691678887e
Merge: 3f7f4e1 47f4b3b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:11 2015 -0400

    Merge topic 'emacs-mode-unscreamify-more'
    
    47f4b3b6 cmake-mode.el: unscreamify symbols instead of words


-----------------------------------------------------------------------

Summary of changes:
 Auxiliary/cmake-mode.el |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:15 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:15 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-112-gf3fa7c6
Message-ID: <20151012142615.3E5E5C01C0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  f3fa7c6bc364a523ba7a437402603fd84c6c9e4b (commit)
       via  096f0988496d49c6c1f56f32863965dc65a077ab (commit)
       via  ee44be22cb26627698d5548171a4d102988a3452 (commit)
       via  4f767afe1d67bf10f749b0bc5ee5f2cb77ce9b40 (commit)
       via  c72d276a5a07fe850a534f092ace98a3a56afc4f (commit)
       via  c99b6cefbe0da8758f00638a9e18234f562a266c (commit)
      from  5dba212f3adf8ffac297c283fff748691678887e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3fa7c6bc364a523ba7a437402603fd84c6c9e4b
commit f3fa7c6bc364a523ba7a437402603fd84c6c9e4b
Merge: 5dba212 096f098
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:13 2015 -0400

    Merge topic 'minor-cleanups'
    
    096f0988 cmComputeLinkDepends: Remove unused typedef.
    ee44be22 cmGeneratorTarget: Use local GetProperty method.
    4f767afe cmMakefile: Remove unneeded container clears.
    c72d276a C::B: Remove unused variables.
    c99b6cef cmLocalGenerator: Devirtualize method.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkDepends.h             |    2 --
 Source/cmComputeLinkInformation.cxx       |   12 ++++++------
 Source/cmExtraCodeBlocksGenerator.cxx     |    2 --
 Source/cmGeneratorTarget.cxx              |   28 ++++++++++++++--------------
 Source/cmGlobalGenerator.cxx              |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx |    2 +-
 Source/cmInstallTargetGenerator.cxx       |    2 +-
 Source/cmLocalGenerator.h                 |    2 +-
 Source/cmMakefile.cxx                     |    3 ---
 9 files changed, 24 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:17 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:17 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-126-g762108f
Message-ID: <20151012142617.81DE9C01C2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  762108f3ec60ca717cdba369dffc84459a7e3282 (commit)
       via  223d0efe55ff66f6ceb25ecdfbd1d915c76af548 (commit)
       via  a367416cec8297c5a567825217b933f4539a44e4 (commit)
       via  bbef3c2da83b7a69d1f99b21dc92d5506d98fb35 (commit)
       via  12cb3bdce4b40c39b8697bbf89ea8aace6aeae8b (commit)
       via  72efa15dc26b5f63a477ec537edfdffb54ecb691 (commit)
       via  f2a641d68bcb4d001ed4f27e41298066e75ade5b (commit)
       via  10cf42f5ae660c460d5d5f60936250866b33dc94 (commit)
       via  e46ef270ed7c96586ed755322174791374241574 (commit)
       via  53d3a1c95a4b03b327149e628f6937d68af938e6 (commit)
       via  4ab2750c54adb09d147839687858aabe3cd988a7 (commit)
       via  c8187f414bcc4668940c2e0fe40d361389efdbe5 (commit)
       via  8c6e6dd3cef0befcd9a7f4c410a49a5afddd8afb (commit)
       via  27916f2cd10904deda1a44bf221fbdef7ba1af66 (commit)
      from  f3fa7c6bc364a523ba7a437402603fd84c6c9e4b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=762108f3ec60ca717cdba369dffc84459a7e3282
commit 762108f3ec60ca717cdba369dffc84459a7e3282
Merge: f3fa7c6 223d0ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:15 2015 -0400

    Merge topic 'add-cmLocalGenerator-API'
    
    223d0efe Remove some needless GetMakefile() calls.
    a367416c cmLocalGenerator: Add current source directory accessor.
    bbef3c2d cmLocalGenerator: Add current binary directory accessor.
    12cb3bdc cmLocalGenerator: Add Home directory accessors.
    72efa15d Eclipse: Port API to cmLocalGenerator.
    f2a641d6 Kate: Remove unused variables.
    10cf42f5 Kate: Port API to cmLocalGenerator.
    e46ef270 export: Port internal method to cmGeneratorTarget.
    53d3a1c9 cmMakefile: Remove unused GetProjectName calls.
    4ab2750c cmLocalGenerator: Add GetProjectName method.
    c8187f41 cmCPluginAPI: Inline code to get project name.
    8c6e6dd3 cmMakefile: Inline initialization of project name.
    27916f2c cmLocalGenerator: Add cmake instance accessor.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmCPluginAPI.cxx                        |    2 +-
 Source/cmComputeLinkInformation.cxx            |    5 +-
 Source/cmCustomCommandGenerator.cxx            |    2 +-
 Source/cmDependsFortran.cxx                    |    2 +-
 Source/cmExportFileGenerator.cxx               |   28 ++++++-----
 Source/cmExtraCodeBlocksGenerator.cxx          |   24 +++++-----
 Source/cmExtraCodeLiteGenerator.cxx            |   24 +++++-----
 Source/cmExtraEclipseCDT4Generator.cxx         |   59 ++++++++++++------------
 Source/cmExtraEclipseCDT4Generator.h           |    2 +-
 Source/cmExtraKateGenerator.cxx                |   50 ++++++++++----------
 Source/cmExtraKateGenerator.h                  |    9 ++--
 Source/cmExtraSublimeTextGenerator.cxx         |   19 ++++----
 Source/cmGeneratorExpressionEvaluationFile.cxx |    2 +-
 Source/cmGhsMultiTargetGenerator.cxx           |    6 ++-
 Source/cmGlobalGenerator.cxx                   |    8 ++--
 Source/cmGlobalKdevelopGenerator.cxx           |    7 ++-
 Source/cmGlobalNinjaGenerator.cxx              |    5 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |   12 ++---
 Source/cmGlobalVisualStudio6Generator.cxx      |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx      |   12 +++--
 Source/cmGlobalVisualStudio8Generator.cxx      |    4 +-
 Source/cmGlobalVisualStudioGenerator.cxx       |    2 +-
 Source/cmGlobalXCodeGenerator.cxx              |   51 ++++++++++----------
 Source/cmInstallExportGenerator.cxx            |    2 +-
 Source/cmLocalGenerator.cxx                    |   30 ++++++++++++
 Source/cmLocalGenerator.h                      |   10 ++++
 Source/cmLocalNinjaGenerator.cxx               |    4 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |   24 +++++-----
 Source/cmLocalVisualStudio6Generator.cxx       |   24 +++++-----
 Source/cmLocalVisualStudio7Generator.cxx       |   24 +++++-----
 Source/cmMakefile.cxx                          |    7 +--
 Source/cmMakefile.h                            |    5 --
 Source/cmMakefileTargetGenerator.cxx           |   25 +++++-----
 Source/cmNinjaNormalTargetGenerator.cxx        |    4 +-
 Source/cmNinjaTargetGenerator.cxx              |    5 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |    4 +-
 Source/cmVisualStudio10TargetGenerator.cxx     |   16 +++----
 37 files changed, 277 insertions(+), 244 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:19 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:19 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-139-g83d2b6f
Message-ID: <20151012142619.BD80CC01C2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  83d2b6f378ddb462a105c2754f0b061f31709655 (commit)
       via  79a309d786abefef1a4f354c2973a14cba882850 (commit)
       via  e2eecae20517daa2bb292f85e161d5cebbc1f216 (commit)
       via  b5212c68def0395642fc51dcfd499557eb9481d9 (commit)
       via  95b0d761a75fd2da041eacc9ee22b89043ae301f (commit)
       via  6f02034e668a307587c2eb1aa0e342fd17ca103e (commit)
       via  435a2f3ccb51acf119cfa1671f1c5b344a7d47a0 (commit)
       via  062ed22ec43809068526706d2600297095412911 (commit)
       via  a02e53eb947b61dd25ecd139a213d4062fbc5b62 (commit)
       via  bec3487fa94093e696be170c4d85567c3c934545 (commit)
       via  e0f740f1b1708ac4ec43a57b8f1cbc549afe5df3 (commit)
       via  2afadb0d5ad21fbbcff961562ec441eb4ac001ab (commit)
       via  3d8c299f3ea024a309b05e0f21c7f002f43a5742 (commit)
      from  762108f3ec60ca717cdba369dffc84459a7e3282 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83d2b6f378ddb462a105c2754f0b061f31709655
commit 83d2b6f378ddb462a105c2754f0b061f31709655
Merge: 762108f 79a309d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:18 2015 -0400

    Merge topic 'refactor-cache-manager'
    
    79a309d7 cmState: Port away from cmake instance.
    e2eecae2 cmState: Move ParseCacheEntry from cmCacheManager.
    b5212c68 cmState: Add API for cache version.
    95b0d761 cmState: Externalize logic to caller.
    6f02034e cmState: Make AddCacheEntry method private.
    435a2f3c cmCacheManager: Port away from cmake instance.
    062ed22e cmState: Add cache file manipulation wrappers.
    a02e53eb Inline unary LoadCache.
    bec3487f cmCacheManager: Remove cmMakefile dependency.
    e0f740f1 Always cache entries through the cmake instance.
    2afadb0d cmake: Port away from trivial cmCacheManager use.
    3d8c299f cmake: Use existing cache API wrapper.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmCPluginAPI.cxx            |    8 +-
 Source/cmCacheManager.cxx          |   97 +-----------------------
 Source/cmCacheManager.h            |   13 +---
 Source/cmMakefile.cxx              |    4 +-
 Source/cmMarkAsAdvancedCommand.cxx |    3 +-
 Source/cmState.cxx                 |  147 +++++++++++++++++++++++++++++++-----
 Source/cmState.h                   |   28 ++++++-
 Source/cmUtilitySourceCommand.cxx  |   10 +--
 Source/cmake.cxx                   |   99 ++++++++++++++----------
 9 files changed, 228 insertions(+), 181 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:26:22 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:26:22 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-166-gaad0e62
Message-ID: <20151012142622.83DA7C01F4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  aad0e62060783539ef8ec4d09ad12ed9dacb5e7c (commit)
       via  1c1c2a1201682d17491026cb392c31ae5e63e1a5 (commit)
       via  c66084f5d7df57c991d0f498de04a5f00ae0fcc1 (commit)
       via  83c29e3903f947f9d4b5ed79a535f850b3b946e2 (commit)
       via  1988255448d7e0f92f4d2f12cc8fc17b1429c328 (commit)
       via  c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc (commit)
       via  a6e1f05c154d123b01bfe75c13d3e016c9074f72 (commit)
       via  654002feb88a9a219e2d6b6011c7dccc791627b1 (commit)
       via  922c89014f372ca38303b4258345c23027046616 (commit)
       via  eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6 (commit)
       via  f539da126b55933fae6f40feea35e820cb632877 (commit)
       via  1c5d70f9c2b9b7e2aeaf1515ef72a6e9282ecde0 (commit)
       via  064c2488119269e88422ea444f87bdd44c4f6589 (commit)
       via  3e428fdcb4640411f8cbc4adc42c30b9c8b8032e (commit)
       via  110fd2fba1cbd6c3d89f5460d3f58a94d52d4546 (commit)
       via  e73916992c6893572f24ee4fa631b33445d6cdf6 (commit)
       via  c5718217ad242ca0fc6e6b15f4ee670e4a332c93 (commit)
       via  bf5eb4a3f394051d9245a7f0c3a18b4a1d2c948a (commit)
       via  49017cddab23702d8228a195f64934e61ab7667e (commit)
       via  0bae4a416f9f1b9090499d26f8508660f4f3fc95 (commit)
       via  1abc20d81df3ee9845904b356960870526fe3276 (commit)
       via  50dc9b44404f4f31aa24cf17247f10539c3807b2 (commit)
       via  8b0168863ed121c7d9f05e3282e2f59490ff6c42 (commit)
       via  e0261a1e20f14cc2ca593bb978479b52954397d8 (commit)
       via  df42dbb3558a6ba604ab584b21dfe7f8722eb025 (commit)
       via  a8429a402da4aeb717f4af234c8d14d1c4e10ed7 (commit)
       via  370bb92c10cd8fec7770267c93515623e4168012 (commit)
      from  83d2b6f378ddb462a105c2754f0b061f31709655 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aad0e62060783539ef8ec4d09ad12ed9dacb5e7c
commit aad0e62060783539ef8ec4d09ad12ed9dacb5e7c
Merge: 83d2b6f 1c1c2a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:26:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:26:20 2015 -0400

    Merge topic 'use-generator-target'
    
    1c1c2a12 cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.
    c66084f5 cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget.
    83c29e39 cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.
    19882554 cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget.
    c1f687b1 cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal.
    a6e1f05c cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.
    654002fe cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget.
    922c8901 cmGeneratorTarget: Port GetLinkInterface away from cmTarget.
    eaa5b9cb cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget.
    f539da12 cmGeneratorTarget: Port GetLinkInterfaceLibraries away from cmTarget.
    1c5d70f9 cmGeneratorTarget: Port processILibs away from cmTarget.
    064c2488 cmComputeLinkDepends: Port some API to cmGeneratorTarget.
    3e428fdc cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.
    110fd2fb cmGeneratorTarget: Move GetOutputTargetType from cmTarget.
    e7391699 cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
    c5718217 cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.
    ...

diff --cc Source/cmComputeLinkInformation.cxx
index ff3d1ee,7e34611..c76cb7a
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@@ -1918,9 -1914,9 +1914,9 @@@ void cmComputeLinkInformation::GetRPath
    // build tree.
    bool linking_for_install =
      (for_install ||
 -     this->Target->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
 +     this->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
    bool use_install_rpath =
-     (outputRuntime && this->Target->Target->HaveInstallTreeRPATH() &&
+     (outputRuntime && this->Target->HaveInstallTreeRPATH() &&
       linking_for_install);
    bool use_build_rpath =
      (outputRuntime && this->Target->HaveBuildTreeRPATH(this->Config) &&

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkDepends.cxx                |   30 +-
 Source/cmComputeLinkDepends.h                  |    3 +-
 Source/cmComputeLinkInformation.cxx            |   42 +-
 Source/cmComputeLinkInformation.h              |    4 +-
 Source/cmComputeTargetDepends.cxx              |    2 +-
 Source/cmExportFileGenerator.cxx               |    4 +-
 Source/cmGeneratorExpressionNode.cxx           |   11 +-
 Source/cmGeneratorTarget.cxx                   |  709 ++++++++++++++++++++++--
 Source/cmGeneratorTarget.h                     |   93 +++-
 Source/cmGlobalXCodeGenerator.cxx              |    6 +-
 Source/cmInstallTargetGenerator.cxx            |    2 +-
 Source/cmListFileCache.h                       |    9 -
 Source/cmLocalGenerator.cxx                    |    4 +-
 Source/cmLocalVisualStudio6Generator.cxx       |   24 +-
 Source/cmLocalVisualStudio7Generator.cxx       |   18 +-
 Source/cmLocalVisualStudioGenerator.cxx        |    6 +-
 Source/cmLocalXCodeGenerator.cxx               |    6 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    7 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |   11 +-
 Source/cmMakefileTargetGenerator.cxx           |    3 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    8 +-
 Source/cmNinjaTargetGenerator.cxx              |    4 +-
 Source/cmTarget.cxx                            |  671 +---------------------
 Source/cmTarget.h                              |   70 +--
 Source/cmVisualStudio10TargetGenerator.cxx     |    7 +-
 25 files changed, 870 insertions(+), 884 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:28:38 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:28:38 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-441-g77b0908
Message-ID: <20151012142838.3E381C02B4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  77b09083b32c39943f1cc5e8e52ff2dd7ca61405 (commit)
       via  aad0e62060783539ef8ec4d09ad12ed9dacb5e7c (commit)
       via  83d2b6f378ddb462a105c2754f0b061f31709655 (commit)
       via  762108f3ec60ca717cdba369dffc84459a7e3282 (commit)
       via  f3fa7c6bc364a523ba7a437402603fd84c6c9e4b (commit)
       via  5dba212f3adf8ffac297c283fff748691678887e (commit)
       via  3f7f4e1d2ea9f9ed658d44343676fe61b2199489 (commit)
       via  2f2baf09fda85164f4666135e5664914ea5dc4dd (commit)
       via  b6dcf6815b712f755c450c3837fd29c42910cc05 (commit)
       via  1a0da7d32051783fcec12e85ee56c3adc447b1b1 (commit)
       via  859bd8d0c64a6e65ee17351489f0bf56e5b67375 (commit)
       via  9b05b14fef4b318ad8a8a37277ec8a270d124eba (commit)
       via  887b4c88011517b2ce2eef3d936493c11819df94 (commit)
       via  70764ead1a3462409401288b99eda3ff50812ed8 (commit)
       via  b46b88e07519b28e59c1750b5f63c35365fa0c0b (commit)
      from  19896d0f262325f783aabb01b44022e52b863149 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77b09083b32c39943f1cc5e8e52ff2dd7ca61405
commit 77b09083b32c39943f1cc5e8e52ff2dd7ca61405
Merge: 19896d0 aad0e62
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:28:22 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 12 10:28:22 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:31:02 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:31:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-168-ge6b35ab
Message-ID: <20151012143102.49CD8C033D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  e6b35abf5bdc335d58882a56d525c221d4397349 (commit)
       via  2a6e0b611b5b76faf6c97cbfaf4ea3481732bbe9 (commit)
      from  aad0e62060783539ef8ec4d09ad12ed9dacb5e7c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6b35abf5bdc335d58882a56d525c221d4397349
commit e6b35abf5bdc335d58882a56d525c221d4397349
Merge: aad0e62 2a6e0b6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:31:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:31:00 2015 -0400

    Merge topic 'ctest-submit-content-type'
    
    2a6e0b61 CTest: Set Content-Type header for http file upload (#15774)


-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestCurl.cxx          |    6 ++++++
 Source/CTest/cmCTestSubmitHandler.cxx |    8 ++++++++
 2 files changed, 14 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:32:10 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:32:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-174-ge5fb30f
Message-ID: <20151012143210.87B0FC0398@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  e5fb30fb5bdff2913cc9382649984da89e882b25 (commit)
       via  8f3ea27055982f92e11fb71743732b71cf9ae3ba (commit)
       via  1ee948d41890b320a26bddb5659aa74aaa892d3d (commit)
       via  e33fe7910fdf56816b3252e1933643d870f8f073 (commit)
       via  4df5c3d13163eaaadd1062f1fc45a3177972b21b (commit)
       via  889d90de4421d721877d48e44de303db56562af4 (commit)
      from  e6b35abf5bdc335d58882a56d525c221d4397349 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:32:10 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:32:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-449-g248c10f
Message-ID: <20151012143210.A4A4CC0399@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  248c10f6987ad3ae672ba1b2c8b060283ae520be (commit)
       via  e5fb30fb5bdff2913cc9382649984da89e882b25 (commit)
       via  e6b35abf5bdc335d58882a56d525c221d4397349 (commit)
       via  8f3ea27055982f92e11fb71743732b71cf9ae3ba (commit)
       via  1ee948d41890b320a26bddb5659aa74aaa892d3d (commit)
       via  e33fe7910fdf56816b3252e1933643d870f8f073 (commit)
       via  4df5c3d13163eaaadd1062f1fc45a3177972b21b (commit)
       via  889d90de4421d721877d48e44de303db56562af4 (commit)
      from  77b09083b32c39943f1cc5e8e52ff2dd7ca61405 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=248c10f6987ad3ae672ba1b2c8b060283ae520be
commit 248c10f6987ad3ae672ba1b2c8b060283ae520be
Merge: 77b0908 e5fb30f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:31:51 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 12 10:31:51 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:32:10 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:32:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.4.0-rc1-10-g8f3ea27
Message-ID: <20151012143210.C3E5EC039A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, release has been updated
       via  8f3ea27055982f92e11fb71743732b71cf9ae3ba (commit)
       via  1ee948d41890b320a26bddb5659aa74aaa892d3d (commit)
       via  e33fe7910fdf56816b3252e1933643d870f8f073 (commit)
       via  4df5c3d13163eaaadd1062f1fc45a3177972b21b (commit)
       via  889d90de4421d721877d48e44de303db56562af4 (commit)
       via  2a6e0b611b5b76faf6c97cbfaf4ea3481732bbe9 (commit)
       via  fb9ec2430be48aeb56984625a4e106b82a160653 (commit)
       via  a935745d0730cf1cd6c1a880d71e36a39ad86f8c (commit)
       via  6556481eb8495a3c4f6870efc1b41b461f477bae (commit)
       via  340d0897fa9dfc568782d72c221ea6186bf533a6 (commit)
      from  679a5d2185b15dcd0ff73f7c1c2d7d527c53de53 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Auxiliary/cmake-mode.el                            |    8 ++---
 Help/command/add_library.rst                       |    6 ++++
 Help/manual/cmake-buildsystem.7.rst                |    7 ++++-
 Help/manual/cmake-compile-features.7.rst           |    2 +-
 Modules/CPackWIX.cmake                             |    4 +--
 Modules/Compiler/SunPro-CXX.cmake                  |   32 ++++++++------------
 Source/CTest/cmCTestCurl.cxx                       |    6 ++++
 Source/CTest/cmCTestSubmitHandler.cxx              |    8 +++++
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |    3 +-
 9 files changed, 47 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 10:44:31 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 10:44:31 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-451-g4abdfa3
Message-ID: <20151012144431.6245CBFC34@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4abdfa32f1f2fd6691f6770e581ef4e57c91d0a0 (commit)
       via  5225e0048c2b734eba7b03e396f89e74214daa66 (commit)
      from  248c10f6987ad3ae672ba1b2c8b060283ae520be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4abdfa32f1f2fd6691f6770e581ef4e57c91d0a0
commit 4abdfa32f1f2fd6691f6770e581ef4e57c91d0a0
Merge: 248c10f 5225e00
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 10:44:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 10:44:30 2015 -0400

    Merge topic 'FindPostgreSQL-v9.5' into next
    
    5225e004 FindPostgreSQL: Search for version 9.5


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5225e0048c2b734eba7b03e396f89e74214daa66
commit 5225e0048c2b734eba7b03e396f89e74214daa66
Author:     Tamar Kranenburg <info at takar.nl>
AuthorDate: Sat Oct 10 21:25:55 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 12 10:43:52 2015 -0400

    FindPostgreSQL: Search for version 9.5

diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 3ce2c73..d05d3da 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -81,7 +81,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
 
 
 set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
-    "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+    "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
 
 # Define additional search paths for root directories.
 set( PostgreSQL_ROOT_DIRECTORIES

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindPostgreSQL.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 12 12:45:01 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 12 Oct 2015 12:45:01 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-470-g711ee92
Message-ID: <20151012164501.BF9E9BF9AB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  711ee928a6531f5f8323d9cbded47c78c8a9619e (commit)
       via  1fdccff5894914d4408e64c0b55e52c376e64ad4 (commit)
       via  ce75c86ec30e736a738a4143d4abad73117e06c6 (commit)
       via  526cc7dc52673f1eeb1055ce381e0551f763daea (commit)
       via  8d2e3e53b903b1ee38292b6bcdf3e4eeb5399a05 (commit)
       via  a143d4ac60da28e12f8b81db39a11226bac8a516 (commit)
       via  993aace78a12fba1a70f193a1e6ac0cbc6925bd6 (commit)
       via  43ade9957770a95ef6a589e34ab0bb93def0489b (commit)
       via  5fd2f43f646d6fa3755d83d6b6f2592a54425071 (commit)
       via  f7acd7421521b3a961480a37077c3814dc684d30 (commit)
       via  763f7b19fcf8a287a0ce20a955ec9c2f7b1a051f (commit)
       via  ceb35b63a796235bb76284b3fb4046208365e23f (commit)
       via  bf2d061ad37088be9ea6f135a980d14c4e76064b (commit)
       via  61c02decce0c1b5aa78acd58d987a5d260079ca4 (commit)
       via  9ca4cae51e8fb67e628fe7b41eea3f459f148237 (commit)
       via  d6b394edcb58752cfa3d2a34a81f558676781304 (commit)
       via  7c8236efa710372b6e54ba12934b075f718e0e15 (commit)
       via  c7645fca12870cef732f26730588cda3be072852 (commit)
       via  ce8894aaf07871dbc58039e0ff0f22efaee7c014 (commit)
      from  4abdfa32f1f2fd6691f6770e581ef4e57c91d0a0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=711ee928a6531f5f8323d9cbded47c78c8a9619e
commit 711ee928a6531f5f8323d9cbded47c78c8a9619e
Merge: 4abdfa3 1fdccff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 12:44:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 12:44:59 2015 -0400

    Merge topic 'use-generator-target' into next
    
    1fdccff5 Genex: Port implementation detail to cmGeneratorTarget.
    ce75c86e cmGeneratorTarget: Move GetSupportDirectory from cmTarget.
    526cc7dc cmGeneratorTarget: Move HasImportLibrary from cmTarget.
    8d2e3e53 cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.
    a143d4ac Sublime: Port some API to cmGeneratorTarget.
    993aace7 cmGeneratorTarget: Port processILibs to cmGeneratorTarget.
    43ade995 cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.
    5fd2f43f cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.
    f7acd742 cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.
    763f7b19 cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.
    ceb35b63 cmLinkItem: Port to cmGeneratorTarget.
    bf2d061a cmGeneratorTarget: Move FindTargetToLink from cmTarget.
    61c02dec cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.
    9ca4cae5 cmGeneratorTarget: Move GetUtilityItems from cmTarget.
    d6b394ed cmComputeLinkDepends: Port result API to cmGeneratorTarget.
    7c8236ef cmComputeLinkInformation: Port result API to cmGeneratorTarget.
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fdccff5894914d4408e64c0b55e52c376e64ad4
commit 1fdccff5894914d4408e64c0b55e52c376e64ad4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:12:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:59 2015 +0200

    Genex: Port implementation detail to cmGeneratorTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2d9025e..88d10aa 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -831,8 +831,8 @@ template <typename T>
 std::string
 getLinkedTargetsContent(
   std::vector<T> const &libraries,
-  cmTarget const* target,
-  cmTarget const* headTarget,
+  cmGeneratorTarget const* target,
+  cmGeneratorTarget const* headTarget,
   cmGeneratorExpressionContext *context,
   cmGeneratorExpressionDAGChecker *dagChecker,
   const std::string &interfacePropertyName)
@@ -846,7 +846,7 @@ getLinkedTargetsContent(
     // Broken code can have a target in its own link interface.
     // Don't follow such link interface entries so as not to create a
     // self-referencing loop.
-    if (it->Target && it->Target->Target != target)
+    if (it->Target && it->Target != target)
       {
       depString +=
         sep + "$<TARGET_PROPERTY:" +
@@ -858,8 +858,10 @@ getLinkedTargetsContent(
     {
     linkedTargetsContent =
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
-                                        target->GetMakefile(), context,
-                                        headTarget, target, dagChecker);
+                                        target->Target->GetMakefile(),
+                                        context,
+                                        headTarget->Target,
+                                        target->Target, dagChecker);
     }
   linkedTargetsContent =
     cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1116,8 +1118,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(iface->Libraries, target,
-                                  headTarget,
+          getLinkedTargetsContent(iface->Libraries, gtgt,
+                                  gHeadTarget,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1128,8 +1130,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
          gtgt->GetLinkImplementationLibraries(context->Config))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(impl->Libraries, target,
-                                  target,
+          getLinkedTargetsContent(impl->Libraries, gtgt,
+                                  gtgt,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce75c86ec30e736a738a4143d4abad73117e06c6
commit ce75c86ec30e736a738a4143d4abad73117e06c6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 00:29:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:59 2015 +0200

    cmGeneratorTarget: Move GetSupportDirectory from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 582282b..1699362 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5512,3 +5512,18 @@ bool cmGeneratorTarget::HasImportLibrary() const
           (this->GetType() == cmTarget::SHARED_LIBRARY ||
            this->Target->IsExecutableWithExports()));
 }
+
+//----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetSupportDirectory() const
+{
+  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+  dir += cmake::GetCMakeFilesDirectory();
+  dir += "/";
+  dir += this->GetName();
+#if defined(__VMS)
+  dir += "_dir";
+#else
+  dir += ".dir";
+#endif
+  return dir;
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index c6e56bf..258c556 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -401,6 +401,9 @@ public:
   /** Return whether or not the target has a DLL import library.  */
   bool HasImportLibrary() const;
 
+  /** Get a build-tree directory in which to place target support files.  */
+  std::string GetSupportDirectory() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 765a538..6750611 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2893,13 +2893,14 @@ void cmGlobalGenerator::WriteSummary()
       {
       continue;
       }
-    this->WriteSummary(ti->second);
-    fout << ti->second->GetSupportDirectory() << "\n";
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
+    this->WriteSummary(gt);
+    fout << gt->GetSupportDirectory() << "\n";
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::WriteSummary(cmTarget* target)
+void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target)
 {
   // Place the labels file in a per-target support directory.
   std::string dir = target->GetSupportDirectory();
@@ -2942,17 +2943,15 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
     fout << "# Source files and their labels\n";
     std::vector<cmSourceFile*> sources;
     std::vector<std::string> configs;
-    target->GetMakefile()->GetConfigurations(configs);
+    target->Target->GetMakefile()->GetConfigurations(configs);
     if (configs.empty())
       {
       configs.push_back("");
       }
-    cmGeneratorTarget* gt =
-        this->GetGeneratorTarget(target);
     for(std::vector<std::string>::const_iterator ci = configs.begin();
         ci != configs.end(); ++ci)
       {
-      gt->GetSourceFiles(sources, *ci);
+      target->GetSourceFiles(sources, *ci);
       }
     std::vector<cmSourceFile*>::const_iterator sourcesEnd
         = cmRemoveDuplicates(sources);
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index b22c695..55e3766 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -458,7 +458,7 @@ private:
   void WriteRuleHashes(std::string const& pfile);
 
   void WriteSummary();
-  void WriteSummary(cmTarget* target);
+  void WriteSummary(cmGeneratorTarget* target);
   void FinalizeTargetCompileInfo();
 
   virtual void ForceLinkerLanguages();
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index de84f89..2d2de5f 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -361,7 +361,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2b019be..8b60a23 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -572,7 +572,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
-        this->Target->GetSupportDirectory();
+        this->GeneratorTarget->GetSupportDirectory();
       name_of_def_file += std::string("/") +
         this->Target->GetName();
       name_of_def_file += ".def";
@@ -643,7 +643,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 5f9367d..4ddcac6 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -557,7 +557,8 @@ cmMakefileTargetGenerator
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
     if(targetFullPathCompilePDB.empty())
       {
-      targetFullPathCompilePDB = this->Target->GetSupportDirectory() + "/";
+      targetFullPathCompilePDB =
+          this->GeneratorTarget->GetSupportDirectory() + "/";
       }
     }
 
@@ -594,7 +595,7 @@ cmMakefileTargetGenerator
                   cmLocalGenerator::NONE,
                   cmLocalGenerator::SHELL);
   vars.Object = shellObj.c_str();
-  std::string objectDir = this->Target->GetSupportDirectory();
+  std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
   objectDir = this->Convert(objectDir,
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 874a120..c64fe50 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -492,9 +492,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
-      std::string dllname = targetOutput;
       std::string name_of_def_file
-        = target.GetSupportDirectory();
+        = gt.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
@@ -582,7 +581,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     vars["TARGET_PDB"] = base + suffix + dbg_suffix;
     }
 
-  const std::string objPath = GetTarget()->GetSupportDirectory();
+  const std::string objPath = GetGeneratorTarget()->GetSupportDirectory();
   vars["OBJECT_DIR"] =
     this->GetLocalGenerator()->ConvertToOutputFormat(
       this->ConvertToNinjaPath(objPath), cmLocalGenerator::SHELL);
@@ -634,7 +633,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
-        = target.GetSupportDirectory();
+        = gt.GetSupportDirectory();
       name_of_def_file += "/" + target.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index dcd7bd8..4080d90 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -298,7 +298,7 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
       if(compilePdbPath.empty())
         {
-        compilePdbPath = this->Target->GetSupportDirectory() + "/";
+        compilePdbPath = this->GeneratorTarget->GetSupportDirectory() + "/";
         }
       }
 
@@ -567,7 +567,7 @@ cmNinjaTargetGenerator
   std::string const language = source->GetLanguage();
   std::string const sourceFileName =
     language=="RC" ? source->GetFullPath() : this->GetSourceFilePath(source);
-  std::string const objectDir = this->Target->GetSupportDirectory();
+  std::string const objectDir = this->GeneratorTarget->GetSupportDirectory();
   std::string const objectFileName = this->GetObjectFilePath(source);
   std::string const objectFileDir =
     cmSystemTools::GetFilenamePath(objectFileName);
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 378f132..6e3f65f 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -64,7 +64,7 @@ static void SetupSourceFiles(cmGeneratorTarget const* target,
         std::string basename = cmsys::SystemTools::
                                       GetFilenameWithoutLastExtension(absFile);
 
-        std::string rcc_output_dir = target->Target->GetSupportDirectory();
+        std::string rcc_output_dir = target->GetSupportDirectory();
         cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
@@ -833,7 +833,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
           std::string basename = cmsys::SystemTools::
                                   GetFilenameWithoutLastExtension(absFile);
 
-          std::string rcc_output_dir = target->Target->GetSupportDirectory();
+          std::string rcc_output_dir = target->GetSupportDirectory();
           cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
           std::string rcc_output_file = rcc_output_dir;
           rcc_output_file += "/qrc_" + basename + ".cpp";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b16bc30..b8beb5c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -382,21 +382,6 @@ cmListFileBacktrace const& cmTarget::GetBacktrace() const
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetSupportDirectory() const
-{
-  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
-  dir += cmake::GetCMakeFilesDirectory();
-  dir += "/";
-  dir += this->Name;
-#if defined(__VMS)
-  dir += "_dir";
-#else
-  dir += ".dir";
-#endif
-  return dir;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::IsExecutableWithExports() const
 {
   return (this->GetType() == cmTarget::EXECUTABLE &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 291ef87..01261ed 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -282,9 +282,6 @@ public:
   /** Get a backtrace from the creation of the target.  */
   cmListFileBacktrace const& GetBacktrace() const;
 
-  /** Get a build-tree directory in which to place target support files.  */
-  std::string GetSupportDirectory() const;
-
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=526cc7dc52673f1eeb1055ce381e0551f763daea
commit 526cc7dc52673f1eeb1055ce381e0551f763daea
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:45:55 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:59 2015 +0200

    cmGeneratorTarget: Move HasImportLibrary from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7e47261..2d9025e 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1658,7 +1658,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
       return std::string();
       }
     return target->GetFullPath(context->Config,
-                               target->Target->HasImportLibrary());
+                               target->HasImportLibrary());
   }
 };
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 90acca6..582282b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5487,7 +5487,7 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasImplibGNUtoMS() const
 {
-  return this->Target->HasImportLibrary()
+  return this->HasImportLibrary()
       && this->GetPropertyAsBool("GNUtoMS");
 }
 
@@ -5504,3 +5504,11 @@ bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
     }
   return false;
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasImportLibrary() const
+{
+  return (this->Target->IsDLLPlatform() &&
+          (this->GetType() == cmTarget::SHARED_LIBRARY ||
+           this->Target->IsExecutableWithExports()));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e2be249..c6e56bf 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -398,6 +398,9 @@ public:
   bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
                         const char* newExt = 0) const;
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 2a6c414..874a120 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -559,7 +559,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                               cmLocalGenerator::SHELL);
     vars["TARGET_IMPLIB"] = impLibPath;
     EnsureParentDirectoryExists(impLibPath);
-    if(target.HasImportLibrary())
+    if(genTarget.HasImportLibrary())
       {
       byproducts.push_back(targetOutputImplib);
       }
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 500b598..291ef87 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -262,9 +262,6 @@ public:
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 
-  /** Return whether or not the target has a DLL import library.  */
-  bool HasImportLibrary() const;
-
   /** Return whether this target is a shared library Framework on
       Apple.  */
   bool IsFrameworkOnApple() const;
@@ -463,6 +460,9 @@ private:
 
   void MaybeInvalidatePropertyCache(const std::string& prop);
 
+  /** Return whether or not the target has a DLL import library.  */
+  bool HasImportLibrary() const;
+
   // Internal representation details.
   friend class cmTargetInternals;
   friend class cmGeneratorTarget;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d2e3e53b903b1ee38292b6bcdf3e4eeb5399a05
commit 8d2e3e53b903b1ee38292b6bcdf3e4eeb5399a05
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:50:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:59 2015 +0200

    cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index fed0dbc..400fa17 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -217,7 +217,7 @@ cmExportBuildFileGenerator
     std::string prop = "IMPORTED_IMPLIB";
     prop += suffix;
     std::string value = target->GetFullPath(config, true);
-    target->Target->GetImplibGNUtoMS(value, value,
+    target->GetImplibGNUtoMS(value, value,
                              "${CMAKE_IMPORT_LIBRARY_SUFFIX}");
     properties[prop] = value;
     }
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c24126f..90acca6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5483,3 +5483,24 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
     }
   return "";
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::HasImplibGNUtoMS() const
+{
+  return this->Target->HasImportLibrary()
+      && this->GetPropertyAsBool("GNUtoMS");
+}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
+                                std::string& out, const char* newExt) const
+{
+  if(this->HasImplibGNUtoMS() &&
+     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
+    {
+    out = gnuName.substr(0, gnuName.size()-6);
+    out += newExt? newExt : ".lib";
+    return true;
+    }
+  return false;
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index b3519de..e2be249 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -390,6 +390,14 @@ public:
   ///! Return the preferred linker language for this target
   std::string GetLinkerLanguage(const std::string& config = "") const;
 
+  /** Does this target have a GNU implib to convert to MS format?  */
+  bool HasImplibGNUtoMS() const;
+
+  /** Convert the given GNU import library name (.dll.a) to a name with a new
+      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
+  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
+                        const char* newExt = 0) const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index b3bc95a..c2a18af 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -135,7 +135,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -199,7 +199,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       std::string targetNameImportLib;
-      if(this->Target->Target->GetImplibGNUtoMS(targetNameImport,
+      if(this->Target->GetImplibGNUtoMS(targetNameImport,
                                         targetNameImportLib))
         {
         filesFrom.push_back(fromDirConfig + targetNameImportLib);
@@ -387,7 +387,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -416,7 +416,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index f6b907e..de84f89 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -259,7 +259,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                                           cmLocalGenerator::START_OUTPUT,
                                           cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       exeCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 3b3f63e..2b019be 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -410,7 +410,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         cmLocalGenerator::START_OUTPUT,
         cmLocalGenerator::UNCHANGED));
     std::string implib;
-    if(this->Target->GetImplibGNUtoMS(targetFullPathImport, implib))
+    if(this->GeneratorTarget->GetImplibGNUtoMS(targetFullPathImport, implib))
       {
       libCleanFiles.push_back(this->Convert(implib,
                                             cmLocalGenerator::START_OUTPUT,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index f17f66d..5f9367d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1517,7 +1517,7 @@ std::string cmMakefileTargetGenerator::GetLinkRule(
                                               const std::string& linkRuleVar)
 {
   std::string linkRule = this->Makefile->GetRequiredDefinition(linkRuleVar);
-  if(this->Target->HasImplibGNUtoMS())
+  if(this->GeneratorTarget->HasImplibGNUtoMS())
     {
     std::string ruleVar = "CMAKE_";
     ruleVar += this->GeneratorTarget->GetLinkerLanguage(this->ConfigName);
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index bebdd77..b16bc30 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2199,26 +2199,6 @@ void cmTarget::ComputeVersionedName(std::string& vName,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HasImplibGNUtoMS() const
-{
-  return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS");
-}
-
-//----------------------------------------------------------------------------
-bool cmTarget::GetImplibGNUtoMS(std::string const& gnuName,
-                                std::string& out, const char* newExt) const
-{
-  if(this->HasImplibGNUtoMS() &&
-     gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a")
-    {
-    out = gnuName.substr(0, gnuName.size()-6);
-    out += newExt? newExt : ".lib";
-    return true;
-    }
-  return false;
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::SetPropertyDefault(const std::string& property,
                                   const char* default_value)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3bb1ccd..500b598 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -240,14 +240,6 @@ public:
   void
   GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
 
-  /** Does this target have a GNU implib to convert to MS format?  */
-  bool HasImplibGNUtoMS() const;
-
-  /** Convert the given GNU import library name (.dll.a) to a name with a new
-      extension (.lib or ${CMAKE_IMPORT_LIBRARY_SUFFIX}).  */
-  bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
-                        const char* newExt = 0) const;
-
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a143d4ac60da28e12f8b81db39a11226bac8a516
commit a143d4ac60da28e12f8b81db39a11226bac8a516
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:04:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:59 2015 +0200

    Sublime: Port some API to cmGeneratorTarget.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 6306360..b8ec0f9 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -254,9 +254,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, target, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, gtgt);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, target, gtgt);
+            this->ComputeDefines(*iter, lg, gtgt);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
@@ -364,7 +364,6 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
 std::string
 cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
                                                    cmLocalGenerator* lg,
-                                                   cmTarget *target,
                                                    cmGeneratorTarget* gtgt)
 {
   std::string flags;
@@ -389,7 +388,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   //   }
 
   // Add shared-library flags if needed.
-  lg->AddCMP0018Flags(flags, target, language, config);
+  lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
 
   // Add include directory flags.
   {
@@ -404,7 +403,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, target, language, config);
+  lg->AddCompileOptions(flags, gtgt->Target, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -418,8 +417,8 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
 // void cmMakefileTargetGenerator::WriteTargetLanguageFlags().
 std::string
 cmExtraSublimeTextGenerator::
-ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
-               cmGeneratorTarget*)
+ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
+               cmGeneratorTarget* target)
 
 {
   std::set<std::string> defines;
@@ -428,13 +427,13 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
   const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->GetExportMacro())
+  if(const char* exportMacro = target->Target->GetExportMacro())
     {
     lg->AppendDefines(defines, exportMacro);
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AddCompileDefinitions(defines, target, config, language);
+  lg->AddCompileDefinitions(defines, target->Target, config, language);
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 4173b7d..5dd1140 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -79,11 +79,10 @@ private:
    */
   std::string ComputeFlagsForObject(cmSourceFile *source,
                                     cmLocalGenerator* lg,
-                                    cmTarget *target,
                                     cmGeneratorTarget* gtgt);
 
   std::string ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
-                             cmTarget *target, cmGeneratorTarget* gtgt);
+                             cmGeneratorTarget* gtgt);
 };
 
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=993aace78a12fba1a70f193a1e6ac0cbc6925bd6
commit 993aace78a12fba1a70f193a1e6ac0cbc6925bd6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:47:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmGeneratorTarget: Port processILibs to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7c700a0..c24126f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2068,9 +2068,9 @@ void processILibs(const std::string& config,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
                   std::vector<cmGeneratorTarget const*>& tgts,
-                  std::set<cmTarget const*>& emitted)
+                  std::set<cmGeneratorTarget const*>& emitted)
 {
-  if (item.Target && emitted.insert(item.Target->Target).second)
+  if (item.Target && emitted.insert(item.Target).second)
     {
     tgts.push_back(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
@@ -2096,7 +2096,7 @@ cmGeneratorTarget::GetLinkImplementationClosure(
   if(!tgts.Done)
     {
     tgts.Done = true;
-    std::set<cmTarget const*> emitted;
+    std::set<cmGeneratorTarget const*> emitted;
 
     cmLinkImplementationLibraries const* impl
       = this->GetLinkImplementationLibraries(config);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43ade9957770a95ef6a589e34ab0bb93def0489b
commit 43ade9957770a95ef6a589e34ab0bb93def0489b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:47:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ace069f..7c700a0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3980,18 +3980,20 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
 
 //----------------------------------------------------------------------------
 template<typename PropertyType>
-PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
+PropertyType getTypedProperty(cmGeneratorTarget const* tgt,
+                              const std::string& prop);
 
 //----------------------------------------------------------------------------
 template<>
-bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
+bool getTypedProperty<bool>(cmGeneratorTarget const* tgt,
+                            const std::string& prop)
 {
   return tgt->GetPropertyAsBool(prop);
 }
 
 //----------------------------------------------------------------------------
 template<>
-const char *getTypedProperty<const char *>(cmTarget const* tgt,
+const char *getTypedProperty<const char *>(cmGeneratorTarget const* tgt,
                                            const std::string& prop)
 {
   return tgt->GetProperty(prop);
@@ -4121,7 +4123,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                           CompatibleType t,
                                           PropertyType *)
 {
-  PropertyType propContent = getTypedProperty<PropertyType>(tgt->Target, p);
+  PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
   const bool explicitlySet = tgt->Target->GetProperties()
                                   .find(p)
                                   != tgt->Target->GetProperties().end();
@@ -4173,7 +4175,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                             .find(interfaceProperty)
                             != theTarget->Target->GetProperties().end();
     PropertyType ifacePropContent =
-                    getTypedProperty<PropertyType>(theTarget->Target,
+                    getTypedProperty<PropertyType>(theTarget,
                               interfaceProperty);
 
     std::string reportEntry;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fd2f43f646d6fa3755d83d6b6f2592a54425071
commit 5fd2f43f646d6fa3755d83d6b6f2592a54425071
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 11:40:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7ec25f3..ace069f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -510,7 +510,8 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
   return 0;
 }
 
-static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
+static void handleSystemIncludesDep(cmMakefile *mf,
+                                  cmGeneratorTarget const* depTgt,
                                   const std::string& config,
                                   cmGeneratorTarget const* headTarget,
                                   cmGeneratorExpressionDAGChecker *dagChecker,
@@ -524,7 +525,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt, dagChecker), result);
+                                      depTgt->Target, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
     {
@@ -538,7 +539,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(mf,
                                       config, false, headTarget->Target,
-                                      depTgt, dagChecker), result);
+                                      depTgt->Target, dagChecker), result);
     }
 }
 
@@ -888,7 +889,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, (*li)->Target, config, this,
+      handleSystemIncludesDep(this->Makefile, *li, config, this,
                               &dagChecker, result, excludeImported);
       }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7acd7421521b3a961480a37077c3814dc684d30
commit f7acd7421521b3a961480a37077c3814dc684d30
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:45:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f4ffd42..7ec25f3 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -883,12 +883,12 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
                                           &dagChecker), result);
       }
 
-    std::vector<cmTarget const*> const& deps =
+    std::vector<cmGeneratorTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmTarget const*>::const_iterator
+    for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, *li, config, this,
+      handleSystemIncludesDep(this->Makefile, (*li)->Target, config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -2066,12 +2066,12 @@ void processILibs(const std::string& config,
                   cmGeneratorTarget const* headTarget,
                   cmLinkItem const& item,
                   cmGlobalGenerator* gg,
-                  std::vector<cmTarget const*>& tgts,
+                  std::vector<cmGeneratorTarget const*>& tgts,
                   std::set<cmTarget const*>& emitted)
 {
   if (item.Target && emitted.insert(item.Target->Target).second)
     {
-    tgts.push_back(item.Target->Target);
+    tgts.push_back(item.Target);
     if(cmLinkInterfaceLibraries const* iface =
        item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
       {
@@ -2086,7 +2086,7 @@ void processILibs(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
-const std::vector<const cmTarget*>&
+const std::vector<const cmGeneratorTarget*>&
 cmGeneratorTarget::GetLinkImplementationClosure(
     const std::string& config) const
 {
@@ -3630,10 +3630,10 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
     compat.Done = true;
     compat.PropsBool.insert("POSITION_INDEPENDENT_CODE");
     compat.PropsString.insert("AUTOUIC_OPTIONS");
-    std::vector<cmTarget const*> const& deps =
+    std::vector<cmGeneratorTarget const*> const& deps =
       this->GetLinkImplementationClosure(config);
-    for(std::vector<cmTarget const*>::const_iterator li = deps.begin();
-        li != deps.end(); ++li)
+    for(std::vector<cmGeneratorTarget const*>::const_iterator li =
+        deps.begin(); li != deps.end(); ++li)
       {
 #define CM_READ_COMPATIBLE_INTERFACE(X, x) \
       if(const char* prop = (*li)->GetProperty("COMPATIBLE_INTERFACE_" #X)) \
@@ -4129,7 +4129,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
   assert((impliedByUse ^ explicitlySet)
       || (!impliedByUse && !explicitlySet));
 
-  std::vector<cmTarget const*> const& deps =
+  std::vector<cmGeneratorTarget const*> const& deps =
     tgt->GetLinkImplementationClosure(config);
 
   if(deps.empty())
@@ -4156,7 +4156,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     }
 
   std::string interfaceProperty = "INTERFACE_" + p;
-  for(std::vector<cmTarget const*>::const_iterator li =
+  for(std::vector<cmGeneratorTarget const*>::const_iterator li =
       deps.begin();
       li != deps.end(); ++li)
     {
@@ -4166,13 +4166,13 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
     // target itself has a POSITION_INDEPENDENT_CODE which disagrees
     // with a dependency.
 
-    cmTarget const* theTarget = *li;
+    cmGeneratorTarget const* theTarget = *li;
 
-    const bool ifaceIsSet = theTarget->GetProperties()
+    const bool ifaceIsSet = theTarget->Target->GetProperties()
                             .find(interfaceProperty)
-                            != theTarget->GetProperties().end();
+                            != theTarget->Target->GetProperties().end();
     PropertyType ifacePropContent =
-                    getTypedProperty<PropertyType>(theTarget,
+                    getTypedProperty<PropertyType>(theTarget->Target,
                               interfaceProperty);
 
     std::string reportEntry;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index cd994c0..b3519de 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -477,7 +477,7 @@ private:
   cmGeneratorTarget(cmGeneratorTarget const&);
   void operator=(cmGeneratorTarget const&);
 
-  struct LinkImplClosure: public std::vector<cmTarget const*>
+  struct LinkImplClosure: public std::vector<cmGeneratorTarget const*>
   {
     LinkImplClosure(): Done(false) {}
     bool Done;
@@ -555,8 +555,8 @@ private:
                            std::string& out) const;
 
 public:
-  std::vector<cmTarget const*> const&
-    GetLinkImplementationClosure(const std::string& config) const;
+  const std::vector<const cmGeneratorTarget*>&
+  GetLinkImplementationClosure(const std::string& config) const;
 
   mutable std::map<std::string, std::string> MaxLanguageStandards;
   std::map<std::string, std::string> const&

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=763f7b19fcf8a287a0ce20a955ec9c2f7b1a051f
commit 763f7b19fcf8a287a0ce20a955ec9c2f7b1a051f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:37:30 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index b9ed345..f901414 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -383,7 +383,7 @@ std::vector<std::string>
 cmCommonTargetGenerator::GetLinkedTargetDirectories() const
 {
   std::vector<std::string> dirs;
-  std::set<cmTarget const*> emitted;
+  std::set<cmGeneratorTarget const*> emitted;
   if (cmComputeLinkInformation* cli =
       this->GeneratorTarget->GetLinkInformation(this->ConfigName))
     {
@@ -397,7 +397,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
                 // Target->GetLinkInformation already processed their
                 // link interface and they don't have any output themselves.
                 && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
-                && emitted.insert(linkee->Target).second)
+                && emitted.insert(linkee).second)
         {
         cmLocalGenerator* lg = linkee->GetLocalGenerator();
         cmMakefile* mf = linkee->Target->GetMakefile();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ceb35b63a796235bb76284b3fb4046208365e23f
commit ceb35b63a796235bb76284b3fb4046208365e23f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:18:42 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmLinkItem: Port to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 5604c53..22843f1 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -320,8 +320,7 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item)
   int index = lei->second;
   LinkEntry& entry = this->EntryList[index];
   entry.Item = item;
-  entry.Target =
-      item.Target ? this->GlobalGenerator->GetGeneratorTarget(item.Target) : 0;
+  entry.Target = item.Target;
   entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
                   item.substr(0, 10) != "-framework");
 
@@ -443,9 +442,7 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
     // Initialize the item entry.
     LinkEntry& entry = this->EntryList[lei->second];
     entry.Item = dep.Item;
-    entry.Target =
-        dep.Item.Target ?
-          this->GlobalGenerator->GetGeneratorTarget(dep.Item.Target) : 0;
+    entry.Target = dep.Item.Target;
 
     // This item was added specifically because it is a dependent
     // shared library.  It may get special treatment
@@ -983,7 +980,6 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
   // directories.
   if(item.Target && !item.Target->IsImported())
     {
-    this->OldWrongConfigItems.insert(
-            this->GlobalGenerator->GetGeneratorTarget(item.Target));
+    this->OldWrongConfigItems.insert(item.Target);
     }
 }
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index e53b7b9..8f3def2 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -319,22 +319,20 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
                                              std::set<std::string> &emitted)
 {
   cmGeneratorTarget const* depender = this->Targets[depender_index];
-  cmTarget const* dependee = dependee_name.Target;
+  cmGeneratorTarget const* dependee = dependee_name.Target;
   // Skip targets that will not really be linked.  This is probably a
   // name conflict between an external library and an executable
   // within the project.
   if(dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->IsExecutableWithExports())
+     !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(dependee);
-    this->AddInterfaceDepends(depender_index, gt, "", emitted);
+    this->AddInterfaceDepends(depender_index, dependee, "", emitted);
     std::vector<std::string> configs;
     depender->Makefile->GetConfigurations(configs);
     for (std::vector<std::string>::const_iterator it = configs.begin();
@@ -342,7 +340,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
       {
       // A target should not depend on itself.
       emitted.insert(depender->GetName());
-      this->AddInterfaceDepends(depender_index, gt, *it, emitted);
+      this->AddInterfaceDepends(depender_index, dependee, *it, emitted);
       }
     }
 }
@@ -356,7 +354,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   cmGeneratorTarget const* depender = this->Targets[depender_index];
 
   // Check the target's makefile first.
-  cmTarget const* dependee = dependee_name.Target;
+  cmGeneratorTarget const* dependee = dependee_name.Target;
 
   if(!dependee && !linking &&
     (depender->GetType() != cmTarget::GLOBAL_TARGET))
@@ -403,16 +401,14 @@ void cmComputeTargetDepends::AddTargetDepend(
   // within the project.
   if(linking && dependee &&
      dependee->GetType() == cmTarget::EXECUTABLE &&
-     !dependee->IsExecutableWithExports())
+     !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
     }
 
   if(dependee)
     {
-    cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(dependee);
-    this->AddTargetDepend(depender_index, gt, linking);
+    this->AddTargetDepend(depender_index, dependee, linking);
     }
 }
 
@@ -430,11 +426,9 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     for(std::set<cmLinkItem>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
-      if(cmTarget const* transitive_dependee = i->Target)
+      if(cmGeneratorTarget const* transitive_dependee = i->Target)
         {
-        cmGeneratorTarget* gt =
-            this->GlobalGenerator->GetGeneratorTarget(transitive_dependee);
-        this->AddTargetDepend(depender_index, gt, false);
+        this->AddTargetDepend(depender_index, transitive_dependee, false);
         }
       }
     }
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 78a5b6f..7e47261 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -846,7 +846,7 @@ getLinkedTargetsContent(
     // Broken code can have a target in its own link interface.
     // Don't follow such link interface entries so as not to create a
     // self-referencing loop.
-    if (it->Target && it->Target != target)
+    if (it->Target && it->Target->Target != target)
       {
       depString +=
         sep + "$<TARGET_PROPERTY:" +
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index d472c6c..f4ffd42 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -773,8 +773,10 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
     for(std::set<std::string>::const_iterator i = utilities.begin();
         i != utilities.end(); ++i)
       {
-      this->UtilityItems.insert(
-        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
+      cmTarget* tgt = this->Makefile->FindTargetToUse(*i);
+      cmGeneratorTarget* gt = tgt ? this->GlobalGenerator
+          ->GetGeneratorTarget(tgt) : 0;
+      this->UtilityItems.insert(cmLinkItem(*i, gt));
       }
     }
   return this->UtilityItems;
@@ -1728,15 +1730,12 @@ public:
         }
       return;
       }
-    if(!this->Visited.insert(item.Target).second)
+    if(!this->Visited.insert(item.Target->Target).second)
       {
       return;
       }
-    cmGeneratorTarget* gtgt =
-        this->Target->GetLocalGenerator()->GetGlobalGenerator()
-            ->GetGeneratorTarget(item.Target);
     cmLinkInterface const* iface =
-      gtgt->GetLinkInterface(this->Config, this->HeadTarget);
+      item.Target->GetLinkInterface(this->Config, this->HeadTarget);
     if(!iface) { return; }
 
     for(std::vector<std::string>::const_iterator
@@ -2070,12 +2069,11 @@ void processILibs(const std::string& config,
                   std::vector<cmTarget const*>& tgts,
                   std::set<cmTarget const*>& emitted)
 {
-  if (item.Target && emitted.insert(item.Target).second)
+  if (item.Target && emitted.insert(item.Target->Target).second)
     {
-    tgts.push_back(item.Target);
-    cmGeneratorTarget* gt = gg->GetGeneratorTarget(item.Target);
+    tgts.push_back(item.Target->Target);
     if(cmLinkInterfaceLibraries const* iface =
-       gt->GetLinkInterfaceLibraries(config, headTarget, true))
+       item.Target->GetLinkInterfaceLibraries(config, headTarget, true))
       {
       for(std::vector<cmLinkItem>::const_iterator
             it = iface->Libraries.begin();
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index 33780a7..b875cc0 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -16,7 +16,6 @@
 #include "cmListFileCache.h"
 
 class cmGeneratorTarget;
-class cmTarget;
 
 // Basic information about each link item.
 class cmLinkItem: public std::string
@@ -25,9 +24,9 @@ class cmLinkItem: public std::string
 public:
   cmLinkItem(): std_string(), Target(0) {}
   cmLinkItem(const std_string& n,
-             cmTarget const* t): std_string(n), Target(t) {}
+             cmGeneratorTarget const* t): std_string(n), Target(t) {}
   cmLinkItem(cmLinkItem const& r): std_string(r), Target(r.Target) {}
-  cmTarget const* Target;
+  cmGeneratorTarget const* Target;
 };
 
 class cmLinkImplItem: public cmLinkItem
@@ -35,7 +34,7 @@ class cmLinkImplItem: public cmLinkItem
 public:
   cmLinkImplItem(): cmLinkItem(), Backtrace(), FromGenex(false) {}
   cmLinkImplItem(std::string const& n,
-                 cmTarget const* t,
+                 cmGeneratorTarget const* t,
                  cmListFileBacktrace const& bt,
                  bool fromGenex):
     cmLinkItem(n, t), Backtrace(bt), FromGenex(fromGenex) {}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf2d061ad37088be9ea6f135a980d14c4e76064b
commit bf2d061ad37088be9ea6f135a980d14c4e76064b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 12:23:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmGeneratorTarget: Move FindTargetToLink from cmTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 4d7b01e..5604c53 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -634,8 +634,9 @@ cmComputeLinkDepends::AddLinkEntries(
 }
 
 //----------------------------------------------------------------------------
-cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
-                                                 const std::string& name)
+cmGeneratorTarget const*
+cmComputeLinkDepends::FindTargetToLink(int depender_index,
+                                       const std::string& name)
 {
   // Look for a target in the scope of the depender.
   cmGeneratorTarget const* from = this->Target;
@@ -647,7 +648,7 @@ cmTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index,
       from = depender;
       }
     }
-  return from->Target->FindTargetToLink(name);
+  return from->FindTargetToLink(name);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 33ba0b8..d9760aa 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -73,8 +73,8 @@ private:
   void AddDirectLinkEntries();
   template <typename T>
     void AddLinkEntries(int depender_index, std::vector<T> const& libs);
-  cmTarget const* FindTargetToLink(int depender_index,
-                                   const std::string& name);
+  cmGeneratorTarget const* FindTargetToLink(int depender_index,
+                                            const std::string& name);
 
   // One entry for each unique item.
   std::vector<LinkEntry> EntryList;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ef79d74..d472c6c 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4427,7 +4427,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
       {
       continue;
       }
-    items.push_back(cmLinkItem(name, this->Target->FindTargetToLink(name)));
+    items.push_back(cmLinkItem(name, this->FindTargetToLink(name)));
     }
 }
 
@@ -5398,7 +5398,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
 
       // The entry is meant for this configuration.
       impl.Libraries.push_back(
-        cmLinkImplItem(name, this->Target->FindTargetToLink(name),
+        cmLinkImplItem(name, this->FindTargetToLink(name),
                        *btIt, evaluated != *le));
       }
 
@@ -5430,12 +5430,48 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         }
       // Support OLD behavior for CMP0003.
       impl.WrongConfigLibraries.push_back(
-        cmLinkItem(name, this->Target->FindTargetToLink(name)));
+        cmLinkItem(name, this->FindTargetToLink(name)));
       }
     }
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmGeneratorTarget::FindTargetToLink(std::string const& name) const
+{
+  cmTarget const* tgt = this->Makefile->FindTargetToUse(name);
+
+  // Skip targets that will not really be linked.  This is probably a
+  // name conflict between an external library and an executable
+  // within the project.
+  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
+     !tgt->IsExecutableWithExports())
+    {
+    tgt = 0;
+    }
+
+  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
+    {
+    std::ostringstream e;
+    e << "Target \"" << this->GetName() << "\" links to "
+      "OBJECT library \"" << tgt->GetName() << "\" but this is not "
+      "allowed.  "
+      "One may link only to STATIC or SHARED libraries, or to executables "
+      "with the ENABLE_EXPORTS property set.";
+    cmake* cm = this->Makefile->GetCMakeInstance();
+    cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                     this->Target->GetBacktrace());
+    tgt = 0;
+    }
+
+  if (!tgt)
+    {
+    return 0;
+    }
+  return this->GlobalGenerator->GetGeneratorTarget(tgt);
+}
+
+//----------------------------------------------------------------------------
 std::string
 cmGeneratorTarget::GetPDBDirectory(const std::string& config) const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 70612f2..cd994c0 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -216,6 +216,8 @@ public:
                                           cmOptionalLinkImplementation& impl,
                                           const cmGeneratorTarget* head) const;
 
+  cmGeneratorTarget* FindTargetToLink(std::string const& name) const;
+
   // Compute the set of languages compiled by the target.  This is
   // computed every time it is called because the languages can change
   // when source file properties are changed and we do not have enough
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 31a9aa7..bebdd77 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2670,37 +2670,6 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
 }
 
 //----------------------------------------------------------------------------
-cmTarget const* cmTarget::FindTargetToLink(std::string const& name) const
-{
-  cmTarget const* tgt = this->Makefile->FindTargetToUse(name);
-
-  // Skip targets that will not really be linked.  This is probably a
-  // name conflict between an external library and an executable
-  // within the project.
-  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
-     !tgt->IsExecutableWithExports())
-    {
-    tgt = 0;
-    }
-
-  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
-    {
-    std::ostringstream e;
-    e << "Target \"" << this->GetName() << "\" links to "
-      "OBJECT library \"" << tgt->GetName() << "\" but this is not "
-      "allowed.  "
-      "One may link only to STATIC or SHARED libraries, or to executables "
-      "with the ENABLE_EXPORTS property set.";
-    cmake* cm = this->Makefile->GetCMakeInstance();
-    cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->GetBacktrace());
-    tgt = 0;
-    }
-
-  // Return the target found, if any.
-  return tgt;
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::CheckCMP0004(std::string const& item) const
 {
   // Strip whitespace off the library names because we used to do this
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 0c1bbd2..3bb1ccd 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -223,8 +223,6 @@ public:
 
   void GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const;
 
-  cmTarget const* FindTargetToLink(std::string const& name) const;
-
   /** Strip off leading and trailing whitespace from an item named in
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61c02decce0c1b5aa78acd58d987a5d260079ca4
commit 61c02decce0c1b5aa78acd58d987a5d260079ca4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:05:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index d56559a..ef79d74 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4490,7 +4490,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head->Target];
+  cmOptionalLinkInterface& iface = hm[head];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -4642,7 +4642,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[head->Target];
+  cmOptionalLinkInterface& iface = hm[head];
   if(!iface.LibrariesDone)
     {
     iface.LibrariesDone = true;
@@ -5079,7 +5079,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkInterface& iface = hm[headTarget->Target];
+  cmOptionalLinkInterface& iface = hm[headTarget];
   if(!iface.AllDone)
     {
     iface.AllDone = true;
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index 10dd465..33780a7 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -15,6 +15,7 @@
 
 #include "cmListFileCache.h"
 
+class cmGeneratorTarget;
 class cmTarget;
 
 // Basic information about each link item.
@@ -97,7 +98,7 @@ struct cmOptionalLinkInterface: public cmLinkInterface
 };
 
 struct cmHeadToLinkInterfaceMap:
-    public std::map<cmTarget const*, cmOptionalLinkInterface>
+    public std::map<cmGeneratorTarget const*, cmOptionalLinkInterface>
 {
 };
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ca4cae51e8fb67e628fe7b41eea3f459f148237
commit 9ca4cae51e8fb67e628fe7b41eea3f459f148237
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 01:01:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmGeneratorTarget: Move GetUtilityItems from cmTarget.

diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index cd067f5..33ba0b8 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -14,6 +14,7 @@
 
 #include "cmStandardIncludes.h"
 #include "cmTarget.h"
+#include "cmLinkItem.h"
 
 #include "cmGraphAdjacencyList.h"
 
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 18aad10..e53b7b9 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -272,7 +272,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
 
   // Loop over all utility dependencies.
   {
-  std::set<cmLinkItem> const& tutils = depender->Target->GetUtilityItems();
+  std::set<cmLinkItem> const& tutils = depender->GetUtilityItems();
   std::set<std::string> emitted;
   // A target should not depend on itself.
   emitted.insert(depender->GetName());
@@ -426,7 +426,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
     {
     // Skip IMPORTED and INTERFACE targets but follow their utility
     // dependencies.
-    std::set<cmLinkItem> const& utils = dependee->Target->GetUtilityItems();
+    std::set<cmLinkItem> const& utils = dependee->GetUtilityItems();
     for(std::set<cmLinkItem>::const_iterator i = utils.begin();
         i != utils.end(); ++i)
       {
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 96bacdf..d56559a 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -271,7 +271,8 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
   DebugCompileFeaturesDone(false),
   DebugCompileDefinitionsDone(false),
   DebugSourcesDone(false),
-  LinkImplementationLanguageIsContextDependent(true)
+  LinkImplementationLanguageIsContextDependent(true),
+  UtilityItemsDone(false)
 {
   this->Makefile = this->Target->GetMakefile();
   this->LocalGenerator = lg;
@@ -760,7 +761,23 @@ cmGeneratorTarget::GetExpectedXamlSources(std::set<std::string>& srcs,
 {
   XamlData data;
   IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData)
-  srcs = data.ExpectedXamlSources;
+      srcs = data.ExpectedXamlSources;
+}
+
+std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
+{
+  if(!this->UtilityItemsDone)
+    {
+    this->UtilityItemsDone = true;
+    std::set<std::string> const& utilities = this->Target->GetUtilities();
+    for(std::set<std::string>::const_iterator i = utilities.begin();
+        i != utilities.end(); ++i)
+      {
+      this->UtilityItems.insert(
+        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
+      }
+    }
+  return this->UtilityItems;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 799110c..70612f2 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -82,6 +82,8 @@ public:
   void GetExpectedXamlSources(std::set<std::string>&,
                               const std::string& config) const;
 
+  std::set<cmLinkItem>const& GetUtilityItems() const;
+
   void ComputeObjectMapping();
 
   const char* GetFeature(const std::string& feature,
@@ -537,6 +539,7 @@ private:
   typedef std::pair<std::string, bool> OutputNameKey;
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
+  mutable std::set<cmLinkItem> UtilityItems;
   mutable bool PolicyWarnedCMP0022;
   mutable bool DebugIncludesDone;
   mutable bool DebugCompileOptionsDone;
@@ -544,6 +547,7 @@ private:
   mutable bool DebugCompileDefinitionsDone;
   mutable bool DebugSourcesDone;
   mutable bool LinkImplementationLanguageIsContextDependent;
+  mutable bool UtilityItemsDone;
 
   bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
                            std::string& out) const;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3de7efe..31a9aa7 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -67,12 +67,10 @@ public:
   cmTargetInternals()
     : Backtrace()
     {
-    this->UtilityItemsDone = false;
     }
   cmTargetInternals(cmTargetInternals const&)
     : Backtrace()
     {
-    this->UtilityItemsDone = false;
     }
   ~cmTargetInternals();
 
@@ -82,9 +80,6 @@ public:
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
-  std::set<cmLinkItem> UtilityItems;
-  bool UtilityItemsDone;
-
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -364,22 +359,6 @@ cmListFileBacktrace const* cmTarget::GetUtilityBacktrace(
 }
 
 //----------------------------------------------------------------------------
-std::set<cmLinkItem> const& cmTarget::GetUtilityItems() const
-{
-  if(!this->Internal->UtilityItemsDone)
-    {
-    this->Internal->UtilityItemsDone = true;
-    for(std::set<std::string>::const_iterator i = this->Utilities.begin();
-        i != this->Utilities.end(); ++i)
-      {
-      this->Internal->UtilityItems.insert(
-        cmLinkItem(*i, this->Makefile->FindTargetToUse(*i)));
-      }
-    }
-  return this->Internal->UtilityItems;
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::FinishConfigure()
 {
   // Erase any cached link information that might have been comptued
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 16d0121..0c1bbd2 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -16,7 +16,6 @@
 #include "cmPropertyMap.h"
 #include "cmPolicies.h"
 #include "cmListFileCache.h"
-#include "cmLinkItem.h"
 
 #include <cmsys/auto_ptr.hxx>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -206,7 +205,6 @@ public:
   void AddUtility(const std::string& u, cmMakefile *makefile = 0);
   ///! Get the utilities used by this target
   std::set<std::string>const& GetUtilities() const { return this->Utilities; }
-  std::set<cmLinkItem>const& GetUtilityItems() const;
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
   /** Finalize the target at the end of the Configure step.  */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6b394edcb58752cfa3d2a34a81f558676781304
commit d6b394edcb58752cfa3d2a34a81f558676781304
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:54:18 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmComputeLinkDepends: Port result API to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 7d20827..4d7b01e 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -982,6 +982,7 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
   // directories.
   if(item.Target && !item.Target->IsImported())
     {
-    this->OldWrongConfigItems.insert(item.Target);
+    this->OldWrongConfigItems.insert(
+            this->GlobalGenerator->GetGeneratorTarget(item.Target));
     }
 }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index fc484de..cd067f5 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -52,7 +52,7 @@ public:
   EntryVector const& Compute();
 
   void SetOldLinkDirMode(bool b);
-  std::set<cmTarget const*> const& GetOldWrongConfigItems() const
+  std::set<cmGeneratorTarget const*> const& GetOldWrongConfigItems() const
     { return this->OldWrongConfigItems; }
 
 private:
@@ -150,7 +150,7 @@ private:
 
   // Record of the original link line.
   std::vector<int> OriginalEntries;
-  std::set<cmTarget const*> OldWrongConfigItems;
+  std::set<cmGeneratorTarget const*> OldWrongConfigItems;
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 988e35a..bfa8c64 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -19,7 +19,6 @@
 #include "cmState.h"
 #include "cmOutputConverter.h"
 #include "cmMakefile.h"
-#include "cmTarget.h"
 #include "cmGeneratorTarget.h"
 #include "cmake.h"
 #include "cmAlgorithms.h"
@@ -537,16 +536,16 @@ bool cmComputeLinkInformation::Compute()
     // For CMake 2.4 bug-compatibility we need to consider the output
     // directories of targets linked in another configuration as link
     // directories.
-    std::set<cmTarget const*> const& wrongItems = cld.GetOldWrongConfigItems();
-    for(std::set<cmTarget const*>::const_iterator i = wrongItems.begin();
-        i != wrongItems.end(); ++i)
+    std::set<cmGeneratorTarget const*> const& wrongItems =
+        cld.GetOldWrongConfigItems();
+    for(std::set<cmGeneratorTarget const*>::const_iterator i =
+        wrongItems.begin(); i != wrongItems.end(); ++i)
       {
-      cmTarget const* tgt = *i;
-      cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
+      cmGeneratorTarget const* tgt = *i;
       bool implib =
         (this->UseImportLibrary &&
          (tgt->GetType() == cmTarget::SHARED_LIBRARY));
-      std::string lib = gtgt->GetFullPath(this->Config , implib, true);
+      std::string lib = tgt->GetFullPath(this->Config , implib, true);
       this->OldLinkDirItems.push_back(lib);
       }
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c8236efa710372b6e54ba12934b075f718e0e15
commit 7c8236efa710372b6e54ba12934b075f718e0e15
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:51:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmComputeLinkInformation: Port result API to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index f7409f5..988e35a 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -471,7 +471,7 @@ std::vector<std::string> const& cmComputeLinkInformation::GetFrameworkPaths()
 }
 
 //----------------------------------------------------------------------------
-std::set<cmTarget const*> const&
+const std::set<const cmGeneratorTarget*>&
 cmComputeLinkInformation::GetSharedLibrariesLinked()
 {
   return this->SharedLibrariesLinked;
@@ -1093,7 +1093,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
   // Keep track of shared library targets linked.
   if(target->GetType() == cmTarget::SHARED_LIBRARY)
     {
-    this->SharedLibrariesLinked.insert(target->Target);
+    this->SharedLibrariesLinked.insert(target);
     }
 
   // Handle case of an imported shared library with no soname.
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 2aac1bc..5eecf7d 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -19,7 +19,6 @@
 class cmake;
 class cmGlobalGenerator;
 class cmMakefile;
-class cmTarget;
 class cmGeneratorTarget;
 class cmOrderDirectories;
 
@@ -57,7 +56,7 @@ public:
   void GetRPath(std::vector<std::string>& runtimeDirs, bool for_install);
   std::string GetRPathString(bool for_install);
   std::string GetChrpathString();
-  std::set<cmTarget const*> const& GetSharedLibrariesLinked();
+  std::set<cmGeneratorTarget const*> const& GetSharedLibrariesLinked();
 
   std::string const& GetRPathLinkFlag() const { return this->RPathLinkFlag; }
   std::string GetRPathLinkString();
@@ -71,7 +70,7 @@ private:
   std::vector<std::string> Depends;
   std::vector<std::string> FrameworkPaths;
   std::vector<std::string> RuntimeSearchPath;
-  std::set<cmTarget const*> SharedLibrariesLinked;
+  std::set<cmGeneratorTarget const*> SharedLibrariesLinked;
 
   // Context information.
   cmGeneratorTarget const* Target;
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 2ea36fb..b3bc95a 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -563,12 +563,12 @@ cmInstallTargetGenerator
   std::map<std::string, std::string> install_name_remap;
   if(cmComputeLinkInformation* cli = this->Target->GetLinkInformation(config))
     {
-    std::set<cmTarget const*> const& sharedLibs
+    std::set<cmGeneratorTarget const*> const& sharedLibs
                                             = cli->GetSharedLibrariesLinked();
-    for(std::set<cmTarget const*>::const_iterator j = sharedLibs.begin();
-        j != sharedLibs.end(); ++j)
+    for(std::set<cmGeneratorTarget const*>::const_iterator j
+        = sharedLibs.begin(); j != sharedLibs.end(); ++j)
       {
-      cmTarget const* tgt = *j;
+      cmGeneratorTarget const* tgt = *j;
 
       // The install_name of an imported target does not change.
       if(tgt->IsImported())
@@ -576,20 +576,17 @@ cmInstallTargetGenerator
         continue;
         }
 
-      cmGeneratorTarget *gtgt = tgt->GetMakefile()
-                                          ->GetGlobalGenerator()
-                                          ->GetGeneratorTarget(tgt);
       // If the build tree and install tree use different path
       // components of the install_name field then we need to create a
       // mapping to be applied after installation.
-      std::string for_build = gtgt->GetInstallNameDirForBuildTree(config);
-      std::string for_install = gtgt->GetInstallNameDirForInstallTree();
+      std::string for_build = tgt->GetInstallNameDirForBuildTree(config);
+      std::string for_install = tgt->GetInstallNameDirForInstallTree();
       if(for_build != for_install)
         {
         // The directory portions differ.  Append the filename to
         // create the mapping.
         std::string fname =
-          this->GetInstallFilename(tgt, config, NameSO);
+          this->GetInstallFilename(tgt->Target, config, NameSO);
 
         // Map from the build-tree install_name.
         for_build += fname;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7645fca12870cef732f26730588cda3be072852
commit c7645fca12870cef732f26730588cda3be072852
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:49:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmComputeLinkInformation: Port data interface to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 252e231..b9ed345 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -391,21 +391,19 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
     for(cmComputeLinkInformation::ItemVector::const_iterator
           i = items.begin(); i != items.end(); ++i)
       {
-      cmTarget const* linkee = i->Target;
+      cmGeneratorTarget const* linkee = i->Target;
       if(linkee && !linkee->IsImported()
                 // We can ignore the INTERFACE_LIBRARY items because
                 // Target->GetLinkInformation already processed their
                 // link interface and they don't have any output themselves.
                 && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
-                && emitted.insert(linkee).second)
+                && emitted.insert(linkee->Target).second)
         {
-        cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(linkee);
-        cmLocalGenerator* lg = gt->GetLocalGenerator();
-        cmMakefile* mf = linkee->GetMakefile();
+        cmLocalGenerator* lg = linkee->GetLocalGenerator();
+        cmMakefile* mf = linkee->Target->GetMakefile();
         std::string di = mf->GetCurrentBinaryDirectory();
         di += "/";
-        di += lg->GetTargetDirectory(*linkee);
+        di += lg->GetTargetDirectory(*linkee->Target);
         dirs.push_back(di);
         }
       }
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 577e327..f7409f5 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -658,7 +658,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       std::string exe = tgt->GetFullPath(config, this->UseImportLibrary,
                                          true);
       linkItem += exe;
-      this->Items.push_back(Item(linkItem, true, tgt->Target));
+      this->Items.push_back(Item(linkItem, true, tgt));
       this->Depends.push_back(exe);
       }
     else if(tgt->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -666,7 +666,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       // Add the interface library as an item so it can be considered as part
       // of COMPATIBLE_INTERFACE_ enforcement.  The generators will ignore
       // this for the actual link line.
-      this->Items.push_back(Item(std::string(), true, tgt->Target));
+      this->Items.push_back(Item(std::string(), true, tgt));
       }
     else
       {
@@ -1120,7 +1120,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
     }
 
   // Now add the full path to the library.
-  this->Items.push_back(Item(item, true, target->Target));
+  this->Items.push_back(Item(item, true, target));
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 94c364d..2aac1bc 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -39,11 +39,11 @@ public:
     Item(): Value(), IsPath(true), Target(0) {}
     Item(Item const& item):
       Value(item.Value), IsPath(item.IsPath), Target(item.Target) {}
-    Item(std::string const& v, bool p, cmTarget const* target = 0):
+    Item(std::string const& v, bool p, cmGeneratorTarget const* target = 0):
       Value(v), IsPath(p), Target(target) {}
     std::string Value;
     bool IsPath;
-    cmTarget const* Target;
+    cmGeneratorTarget const* Target;
   };
   typedef std::vector<Item> ItemVector;
   ItemVector const& GetItems();
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 5d530a0..b29429e 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -517,8 +517,9 @@ void cmExportFileGenerator::PopulateInterfaceProperty(
 
 
 //----------------------------------------------------------------------------
-void getPropertyContents(cmTarget const* tgt, const std::string& prop,
-         std::set<std::string> &ifaceProperties)
+void getPropertyContents(cmGeneratorTarget const* tgt,
+                         const std::string& prop,
+                         std::set<std::string> &ifaceProperties)
 {
   const char *p = tgt->GetProperty(prop);
   if (!p)
@@ -589,11 +590,11 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
 
   std::set<std::string> ifaceProperties;
 
-  getPropertyContents(target, "COMPATIBLE_INTERFACE_BOOL", ifaceProperties);
-  getPropertyContents(target, "COMPATIBLE_INTERFACE_STRING", ifaceProperties);
-  getPropertyContents(target, "COMPATIBLE_INTERFACE_NUMBER_MIN",
+  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_BOOL", ifaceProperties);
+  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_STRING", ifaceProperties);
+  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MIN",
                       ifaceProperties);
-  getPropertyContents(target, "COMPATIBLE_INTERFACE_NUMBER_MAX",
+  getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MAX",
                       ifaceProperties);
 
   if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f3d34e3..96bacdf 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3735,7 +3735,7 @@ const char * getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
 //----------------------------------------------------------------------------
 template<typename PropertyType>
 void checkPropertyConsistency(cmGeneratorTarget const* depender,
-                              cmTarget const* dependee,
+                              cmGeneratorTarget const* dependee,
                               const std::string& propName,
                               std::set<std::string> &emitted,
                               const std::string& config,
@@ -3751,7 +3751,7 @@ void checkPropertyConsistency(cmGeneratorTarget const* depender,
   std::vector<std::string> props;
   cmSystemTools::ExpandListArgument(prop, props);
   std::string pdir =
-    dependee->GetMakefile()->GetRequiredDefinition("CMAKE_ROOT");
+    dependee->Target->GetMakefile()->GetRequiredDefinition("CMAKE_ROOT");
   pdir += "/Help/prop_tgt/";
 
   for(std::vector<std::string>::iterator pi = props.begin();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce8894aaf07871dbc58039e0ff0f22efaee7c014
commit ce8894aaf07871dbc58039e0ff0f22efaee7c014
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:45:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 18:39:58 2015 +0200

    cmComputeLinkInformation: Port some implementation to cmGeneratorTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index c76cb7a..577e327 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -683,8 +683,8 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
         this->Depends.push_back(lib);
         }
 
-      this->AddTargetItem(lib, tgt->Target);
-      this->AddLibraryRuntimeInfo(lib, tgt->Target);
+      this->AddTargetItem(lib, tgt);
+      this->AddLibraryRuntimeInfo(lib, tgt);
       }
     }
   else
@@ -766,7 +766,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
   if(tgt)
     {
     lib = tgt->GetFullPath(this->Config, this->UseImportLibrary);
-    this->AddLibraryRuntimeInfo(lib, tgt->Target);
+    this->AddLibraryRuntimeInfo(lib, tgt);
     }
   else
     {
@@ -1077,7 +1077,7 @@ void cmComputeLinkInformation::SetCurrentLinkType(LinkType lt)
 
 //----------------------------------------------------------------------------
 void cmComputeLinkInformation::AddTargetItem(std::string const& item,
-                                             cmTarget const* target)
+                                             cmGeneratorTarget const* target)
 {
   // This is called to handle a link item that is a full path to a target.
   // If the target is not a static library make sure the link type is
@@ -1093,13 +1093,12 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
   // Keep track of shared library targets linked.
   if(target->GetType() == cmTarget::SHARED_LIBRARY)
     {
-    this->SharedLibrariesLinked.insert(target);
+    this->SharedLibrariesLinked.insert(target->Target);
     }
 
-  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Handle case of an imported shared library with no soname.
   if(this->NoSONameUsesPath &&
-     gtgt->IsImportedSharedLibWithoutSOName(this->Config))
+     target->IsImportedSharedLibWithoutSOName(this->Config))
     {
     this->AddSharedLibNoSOName(item);
     return;
@@ -1113,7 +1112,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
 
   // For compatibility with CMake 2.4 include the item's directory in
   // the linker search path.
-  if(this->OldLinkDirMode && !target->IsFrameworkOnApple() &&
+  if(this->OldLinkDirMode && !target->Target->IsFrameworkOnApple() &&
      this->OldLinkDirMask.find(cmSystemTools::GetFilenamePath(item)) ==
      this->OldLinkDirMask.end())
     {
@@ -1121,7 +1120,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
     }
 
   // Now add the full path to the library.
-  this->Items.push_back(Item(item, true, target));
+  this->Items.push_back(Item(item, true, target->Target));
 }
 
 //----------------------------------------------------------------------------
@@ -1777,15 +1776,14 @@ cmComputeLinkInformation::GetRuntimeSearchPath()
 //----------------------------------------------------------------------------
 void
 cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
-                                                cmTarget const* target)
+                                              cmGeneratorTarget const* target)
 {
-  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
   // Ignore targets on Apple where install_name is not @rpath.
   // The dependenty library can be found with other means such as
   // @loader_path or full paths.
   if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
     {
-    if(!gtgt->HasMacOSXRpathInstallNameDir(this->Config))
+    if(!target->HasMacOSXRpathInstallNameDir(this->Config))
       {
       return;
       }
@@ -1807,7 +1805,7 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
 
   // Try to get the soname of the library.  Only files with this name
   // could possibly conflict.
-  std::string soName = gtgt->GetSOName(this->Config);
+  std::string soName = target->GetSOName(this->Config);
   const char* soname = soName.empty()? 0 : soName.c_str();
 
   // Include this library in the runtime path ordering.
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index b1e7e46..94c364d 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -129,7 +129,7 @@ private:
   std::string NoCaseExpression(const char* str);
 
   // Handling of link items.
-  void AddTargetItem(std::string const& item, cmTarget const* target);
+  void AddTargetItem(std::string const& item, const cmGeneratorTarget* target);
   void AddFullItem(std::string const& item);
   bool CheckImplicitDirItem(std::string const& item);
   void AddUserItem(std::string const& item, bool pathNotKnown);
@@ -183,7 +183,7 @@ private:
   bool CMP0060Warn;
 
   void AddLibraryRuntimeInfo(std::string const& fullPath,
-                             cmTarget const* target);
+                             const cmGeneratorTarget* target);
   void AddLibraryRuntimeInfo(std::string const& fullPath);
 
 };

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |   12 +-
 Source/cmComputeLinkDepends.cxx                |   14 +-
 Source/cmComputeLinkDepends.h                  |    9 +-
 Source/cmComputeLinkInformation.cxx            |   39 +++---
 Source/cmComputeLinkInformation.h              |   13 +-
 Source/cmComputeTargetDepends.cxx              |   28 ++--
 Source/cmExportBuildFileGenerator.cxx          |    2 +-
 Source/cmExportFileGenerator.cxx               |   13 +-
 Source/cmExtraSublimeTextGenerator.cxx         |   17 ++-
 Source/cmExtraSublimeTextGenerator.h           |    3 +-
 Source/cmGeneratorExpressionNode.cxx           |   20 +--
 Source/cmGeneratorTarget.cxx                   |  174 ++++++++++++++++++------
 Source/cmGeneratorTarget.h                     |   26 +++-
 Source/cmGlobalGenerator.cxx                   |   13 +-
 Source/cmGlobalGenerator.h                     |    2 +-
 Source/cmInstallTargetGenerator.cxx            |   25 ++--
 Source/cmLinkItem.h                            |   10 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    4 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |    6 +-
 Source/cmMakefileTargetGenerator.cxx           |    7 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    9 +-
 Source/cmNinjaTargetGenerator.cxx              |    4 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |    4 +-
 Source/cmTarget.cxx                            |   87 ------------
 Source/cmTarget.h                              |   21 +--
 25 files changed, 281 insertions(+), 281 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 12 13:37:52 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 12 Oct 2015 13:37:52 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-472-g49a71ea
Message-ID: <20151012173752.E94F5C045B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  49a71eaca1bbc813bee09ccf674e6022fa8116b6 (commit)
       via  7dac31b2292b0eac32929649cad1f32e6f0a6114 (commit)
      from  711ee928a6531f5f8323d9cbded47c78c8a9619e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49a71eaca1bbc813bee09ccf674e6022fa8116b6
commit 49a71eaca1bbc813bee09ccf674e6022fa8116b6
Merge: 711ee92 7dac31b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 13:37:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 13:37:51 2015 -0400

    Merge topic 'init-state-for-subdirs' into next
    
    7dac31b2 Subdirs: Initialize from parent before configuring.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dac31b2292b0eac32929649cad1f32e6f0a6114
commit 7dac31b2292b0eac32929649cad1f32e6f0a6114
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 19:34:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 19:37:18 2015 +0200

    Subdirs: Initialize from parent before configuring.
    
    Add new API for the subdirs command to cmState.
    
    This fixes a regression introduced in commit f716460e (cmMakefile: Move
    invokation to initialize snapshot., 2015-10-06).

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 73d3522..3b8c188 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1682,6 +1682,7 @@ void cmMakefile::Configure()
   std::vector<cmMakefile*>::iterator sdi = subdirs.begin();
   for (; sdi != subdirs.end(); ++sdi)
     {
+    (*sdi)->StateSnapshot.InitializeFromParent_ForSubdirsCommand();
     this->ConfigureSubDirectory(*sdi);
     }
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 72c7330..eb0145e 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1366,6 +1366,11 @@ std::string cmState::Snapshot::GetProjectName() const
   return this->Position->BuildSystemDirectory->ProjectName;
 }
 
+void cmState::Snapshot::InitializeFromParent_ForSubdirsCommand()
+{
+  this->InitializeFromParent();
+}
+
 cmState::Directory::Directory(
     cmLinkedTree<BuildsystemDirectoryStateType>::iterator iter,
     const cmState::Snapshot& snapshot)
diff --git a/Source/cmState.h b/Source/cmState.h
index 2f66f7f..4f714a6 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -90,6 +90,8 @@ public:
     void SetProjectName(std::string const& name);
     std::string GetProjectName() const;
 
+    void InitializeFromParent_ForSubdirsCommand();
+
     struct StrictWeakOrder
     {
       bool operator()(const cmState::Snapshot& lhs,
diff --git a/Tests/SubDir/CMakeLists.txt b/Tests/SubDir/CMakeLists.txt
index 6822e6b..32aa93f 100644
--- a/Tests/SubDir/CMakeLists.txt
+++ b/Tests/SubDir/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required (VERSION 2.6)
 project(SUBDIR)
+
 subdirs(Executable EXCLUDE_FROM_ALL Examples)
+
+set(DEFINED_AFTER_SUBDIRS_COMMAND 42)
+
 write_file(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.")
 #WATCOM WMAKE does not support + in the name of a file!
 if(WATCOM)
diff --git a/Tests/SubDir/Executable/CMakeLists.txt b/Tests/SubDir/Executable/CMakeLists.txt
index 77e6751..e1e5ef3 100644
--- a/Tests/SubDir/Executable/CMakeLists.txt
+++ b/Tests/SubDir/Executable/CMakeLists.txt
@@ -1 +1,5 @@
 add_executable(test test.cxx)
+
+if (NOT DEFINED_AFTER_SUBDIRS_COMMAND)
+  message(FATAL_ERROR "DEFINED_AFTER_SUBDIRS_COMMAND should be defined.")
+endif()

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx                  |    1 +
 Source/cmState.cxx                     |    5 +++++
 Source/cmState.h                       |    2 ++
 Tests/SubDir/CMakeLists.txt            |    4 ++++
 Tests/SubDir/Executable/CMakeLists.txt |    4 ++++
 5 files changed, 16 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 15:24:35 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 15:24:35 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-474-g55d42cf
Message-ID: <20151012192435.42E33B160C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  55d42cf319cdfff989b67f14d560a6c571c0eb55 (commit)
       via  57f701a7f045fc13807933860bad22fa405c6621 (commit)
      from  49a71eaca1bbc813bee09ccf674e6022fa8116b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55d42cf319cdfff989b67f14d560a6c571c0eb55
commit 55d42cf319cdfff989b67f14d560a6c571c0eb55
Merge: 49a71ea 57f701a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 15:24:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:24:34 2015 -0400

    Merge topic 'FindGit-Atlassian-SourceTree' into next
    
    57f701a7 FindGit: Search in 'Atlassian SourceTree' user directory (#15758)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57f701a7f045fc13807933860bad22fa405c6621
commit 57f701a7f045fc13807933860bad22fa405c6621
Author:     Kevin Wojniak <kainjow at kainjow.com>
AuthorDate: Mon Oct 12 12:06:26 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 12 15:22:38 2015 -0400

    FindGit: Search in 'Atlassian SourceTree' user directory (#15758)

diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake
index b4f7b4b..2c3e5fd 100644
--- a/Modules/FindGit.cmake
+++ b/Modules/FindGit.cmake
@@ -48,17 +48,21 @@ if(WIN32)
     # GitHub search path for Windows
     set(github_path "$ENV{LOCALAPPDATA}/Github/PortableGit*/bin")
     file(GLOB github_path "${github_path}")
+    # SourceTree search path for Windows
+    set(_git_sourcetree_path "$ENV{LOCALAPPDATA}/Atlassian/SourceTree/git_local/bin")
   endif()
 endif()
 
 find_program(GIT_EXECUTABLE
   NAMES ${git_names}
-  PATHS ${github_path}
+  PATHS ${github_path} ${_git_sourcetree_path}
   PATH_SUFFIXES Git/cmd Git/bin
   DOC "git command line client"
   )
 mark_as_advanced(GIT_EXECUTABLE)
 
+unset(_git_sourcetree_path)
+
 if(GIT_EXECUTABLE)
   execute_process(COMMAND ${GIT_EXECUTABLE} --version
                   OUTPUT_VARIABLE git_version

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGit.cmake |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 12 15:35:09 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 12 Oct 2015 15:35:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-479-g051c84f
Message-ID: <20151012193509.50554C0622@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  051c84ff36515a494787acbd8f8c8197c9326413 (commit)
       via  c9212c81bb136aabe28e8bd9918208d830721a4e (commit)
       via  6c56c67ce562df1ff796a53a4af14e3cb5c39e06 (commit)
       via  1797356e02b361d44f572e7bdd4e68343016408d (commit)
       via  2e181996e78fed27b0a9af87867497227c787cac (commit)
      from  55d42cf319cdfff989b67f14d560a6c571c0eb55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=051c84ff36515a494787acbd8f8c8197c9326413
commit 051c84ff36515a494787acbd8f8c8197c9326413
Merge: 55d42cf c9212c8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 15:35:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:35:07 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    c9212c81 cmLocalGenerator: Store cmGeneratorTargets.
    6c56c67c cmMakefile: Store container of cmExportBuildFileGenerators.
    1797356e cmGeneratorExpression: Port interface to cmGeneratorTarget.
    2e181996 cmGeneratorExpression: Port to cmLocalGenerator.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9212c81bb136aabe28e8bd9918208d830721a4e
commit c9212c81bb136aabe28e8bd9918208d830721a4e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:21:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:34:44 2015 +0200

    cmLocalGenerator: Store cmGeneratorTargets.
    
    Relieve cmMakefile of this responsibility.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f02afe..618f09f 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -43,7 +43,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
 {
   std::string const& argv0 = this->CC.GetCommandLines()[c][0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(argv0);
+      this->LG->FindGeneratorTargetToUse(argv0);
   if(target && target->GetType() == cmTarget::EXECUTABLE &&
      (target->Target->IsImported()
       || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 560cfc5..6c3cccd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -42,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->LG->GetMakefile()
+    cmGeneratorTarget *te = this->LG
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index fdfa35e..b7aeb02 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,8 +965,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmGeneratorTargetsType targets = (*it)->GetMakefile()
-                                        ->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
     for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2797d10..fe83b08 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1275,7 +1275,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
 
     std::string tgtName = parameters.front();
     cmGeneratorTarget* gt =
-                context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
+                context->LG->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
       std::ostringstream e;
@@ -1739,7 +1739,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       return std::string();
       }
     cmGeneratorTarget* target =
-        context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
+        context->LG->FindGeneratorTargetToUse(name);
     if(!target)
       {
       ::reportError(context, content->GetOriginalExpression(),
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6033efe..6bebc2b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2305,7 +2305,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
 
   // Check for a target with this name.
   if(cmGeneratorTarget* t
-                    = this->Makefile->FindGeneratorTargetToUse(util))
+                    = this->GeneratorTarget->
+                    GetLocalGenerator()->FindGeneratorTargetToUse(util))
     {
     // If we find the target and the dep was given as a full path,
     // then make sure it was not a full path to something else, and
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a61515a..8f5e84a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1568,7 +1568,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     this->GeneratorTargets[*j] = gt;
     generatorTargets[*j] = gt;
     }
-  mf->SetGeneratorTargets(generatorTargets);
+  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 87cf58f..45a1509 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -287,7 +287,7 @@ void cmGlobalGhsMultiGenerator::Generate()
       {
       cmLocalGhsMultiGenerator *lg =
         static_cast<cmLocalGhsMultiGenerator *>(this->LocalGenerators[i]);
-      cmGeneratorTargetsType tgts = lg->GetMakefile()->GetGeneratorTargets();
+      cmGeneratorTargetsType tgts = lg->GetGeneratorTargets();
       this->UpdateBuildFiles(&tgts);
       }
     }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f955ef7..ed36634 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,8 +68,7 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      cmMakefile* makefile=(*lg)->GetMakefile();
-      cmGeneratorTargetsType const& targets = makefile->GetGeneratorTargets();
+      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
       for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
            ti != targets.end(); ti++)
         {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 218e702..f9740e5 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -461,7 +461,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
@@ -627,7 +627,7 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
     for(cmGeneratorTargetsType::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
@@ -728,7 +728,7 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 6a25ed0..cb30c4e 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -108,7 +108,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
           i != gen.end(); ++i)
         {
         cmGeneratorTargetsType targets =
-            (*i)->GetMakefile()->GetGeneratorTargets();
+            (*i)->GetGeneratorTargets();
         for(cmGeneratorTargetsType::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f19d551..3691b41 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,7 +132,7 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -448,6 +448,13 @@ void cmLocalGenerator::GenerateInstallRules()
     }
 }
 
+
+void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+{
+  this->GeneratorTargets[t] = gt;
+  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
+}
+
 //----------------------------------------------------------------------------
 void cmLocalGenerator::ComputeTargetManifest()
 {
@@ -460,7 +467,7 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -1767,6 +1774,17 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
+{
+  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+    {
+    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    }
+  return 0;
+}
+
+//----------------------------------------------------------------------------
 bool cmLocalGenerator::GetRealDependency(const std::string& inName,
                                          const std::string& config,
                                          std::string& dep)
@@ -1792,7 +1810,7 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
 
   // Look for a CMake target with the given name.
   if(cmGeneratorTarget* target =
-     this->Makefile->FindGeneratorTargetToUse(name))
+     this->FindGeneratorTargetToUse(name))
     {
     // make sure it is not just a coincidence that the target name
     // found is part of the inName
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 758709a..97e3f88 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -112,6 +112,19 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
+  const cmGeneratorTargetsType &GetGeneratorTargets() const
+    {
+      return this->GeneratorTargets;
+    }
+
+  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
+    {
+      this->GeneratorTargets = targets;
+    }
+  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
+
+  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
+
   /**
    * Encode a list of preprocessor definitions for the compiler
    * command line.
@@ -354,6 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmTarget const*> WarnCMP0063;
+  cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index bac989f..721f239 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,7 +26,7 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  cmGeneratorTargetsType tgts = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
 
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 6319f0e..8d71469 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,7 +73,7 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  cmGeneratorTargetsType targets = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index bf5afc1..91c7acd 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,7 +113,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
   for(cmGeneratorTargetsType::iterator t = targets.begin();
@@ -175,7 +175,7 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
@@ -418,7 +418,7 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   std::string localName;
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7d49661..61832ba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1800,12 +1800,6 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
-void cmMakefile::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-{
-  this->GeneratorTargets[t] = gt;
-  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
-}
-
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
@@ -4309,17 +4303,6 @@ bool cmMakefile::IsAlias(const std::string& name) const
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmMakefile::FindGeneratorTargetToUse(const std::string& name) const
-{
-  if (cmTarget *t = this->FindTargetToUse(name))
-    {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
-    }
-  return 0;
-}
-
-//----------------------------------------------------------------------------
 bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
                                    bool isCustom) const
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index c55ee39..8f865a0 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -17,7 +17,6 @@
 #include "cmSystemTools.h"
 #include "cmTarget.h"
 #include "cmNewLineStyle.h"
-#include "cmGeneratorTarget.h"
 #include "cmExpandedCommandArgument.h"
 #include "cmake.h"
 #include "cmState.h"
@@ -393,17 +392,6 @@ public:
       return this->ImportedTargetsOwned;
     }
 
-  const cmGeneratorTargetsType &GetGeneratorTargets() const
-    {
-      return this->GeneratorTargets;
-    }
-
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-    {
-      this->GeneratorTargets = targets;
-    }
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
-
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
@@ -412,7 +400,6 @@ public:
   cmTarget* FindTargetToUse(const std::string& name,
                             bool excludeAliases = false) const;
   bool IsAlias(const std::string& name) const;
-  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
   /**
    * Mark include directories as system directories.
@@ -815,7 +802,6 @@ protected:
   typedef std::map<std::string, cmTarget*> TargetMap;
 #endif
   TargetMap AliasTargets;
-  cmGeneratorTargetsType GeneratorTargets;
   std::vector<cmSourceFile*> SourceFiles;
 
   // Tests
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6e3f65f..f9875b3 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -886,7 +886,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    makefile->AddGeneratorTarget(autogenTarget, gt);
+    lg->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 7dec50b..85fb405 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -89,7 +89,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   // be translated.
   std::string exe = command[0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(exe);
+      this->LG->FindGeneratorTargetToUse(exe);
   if(target && target->GetType() == cmTarget::EXECUTABLE)
     {
     // Use the target file on disk.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c56c67ce562df1ff796a53a4af14e3cb5c39e06
commit 6c56c67ce562df1ff796a53a4af14e3cb5c39e06
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 22:08:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:28:47 2015 +0200

    cmMakefile: Store container of cmExportBuildFileGenerators.
    
    Set a cmLocalGenerator on each instance at compute time.  That will
    soon be needed to access cmGeneratorTarget instances.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 400fa17..560cfc5 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -18,13 +18,18 @@
 
 //----------------------------------------------------------------------------
 cmExportBuildFileGenerator::cmExportBuildFileGenerator()
-  : Backtrace()
 {
-  this->Makefile = 0;
+  this->LG = 0;
   this->ExportSet = 0;
 }
 
 //----------------------------------------------------------------------------
+void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
+{
+  this->LG = lg;
+}
+
+//----------------------------------------------------------------------------
 bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
 {
   std::vector<cmGeneratorTarget*> allTargets;
@@ -37,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->Makefile
+    cmGeneratorTarget *te = this->LG->GetMakefile()
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
@@ -49,8 +54,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       {
       std::ostringstream e;
       e << "given target \"" << te->GetName() << "\" more than once.";
-      this->Makefile->GetCMakeInstance()
-          ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+      this->LG->GetGlobalGenerator()->GetCMakeInstance()
+          ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                         this->LG->GetMakefile()->GetBacktrace());
       return false;
       }
     if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -328,8 +334,9 @@ cmExportBuildFileGenerator
   e << "If the required target is not easy to reference in this call, "
     << "consider using the APPEND option with multiple separate calls.";
 
-  this->Makefile->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+  this->LG->GetGlobalGenerator()->GetCMakeInstance()
+      ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                     this->LG->GetMakefile()->GetBacktrace());
 }
 
 std::string
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index ff3d2e1..16695f1 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -43,10 +43,7 @@ public:
   /** Set whether to append generated code to the output file.  */
   void SetAppendMode(bool append) { this->AppendMode = append; }
 
-  void SetMakefile(cmMakefile *mf) {
-    this->Makefile = mf;
-    this->Backtrace = this->Makefile->GetBacktrace();
-  }
+  void Compute(cmLocalGenerator* lg);
 
 protected:
   // Implement virtual methods from the superclass.
@@ -80,8 +77,7 @@ protected:
   std::vector<std::string> Targets;
   cmExportSet *ExportSet;
   std::vector<cmGeneratorTarget*> Exports;
-  cmMakefile* Makefile;
-  cmListFileBacktrace Backtrace;
+  cmLocalGenerator* LG;
 };
 
 #endif
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 6a1d7f3..c2d9cc4 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -221,7 +221,7 @@ bool cmExportCommand
     {
     ebfg->SetTargets(targets);
     }
-  ebfg->SetMakefile(this->Makefile);
+  this->Makefile->AddExportBuildFileGenerator(ebfg);
   ebfg->SetExportOld(this->ExportOld.IsEnabled());
 
   // Compute the set of configurations exported.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6750611..a61515a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1226,6 +1226,20 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
   return false;
 }
 
+void cmGlobalGenerator::ComputeBuildFileGenerators()
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmExportBuildFileGenerator*> gens =
+        this->Makefiles[i]->GetExportBuildFileGenerators();
+    for (std::vector<cmExportBuildFileGenerator*>::const_iterator it =
+         gens.begin(); it != gens.end(); ++it)
+      {
+      (*it)->Compute(this->LocalGenerators[i]);
+      }
+    }
+}
+
 bool cmGlobalGenerator::Compute()
 {
   // Some generators track files replaced during the Generate.
@@ -1255,6 +1269,8 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
+  this->ComputeBuildFileGenerators();
+
   unsigned int i;
 
   // Add generator specific helper commands
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 55e3766..294fca9 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -364,6 +364,8 @@ public:
 
   bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
 
+  void ComputeBuildFileGenerators();
+
   std::string MakeSilentFlag;
 protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 8890e2b..97d4d56 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -126,6 +126,7 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
+    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 73d3522..7d49661 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -702,6 +702,17 @@ cmMakefile::GetEvaluationFiles() const
   return this->EvaluationFiles;
 }
 
+std::vector<cmExportBuildFileGenerator*>
+cmMakefile::GetExportBuildFileGenerators() const
+{
+  return this->ExportBuildFileGenerators;
+}
+
+void cmMakefile::AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen)
+{
+  this->ExportBuildFileGenerators.push_back(gen);
+}
+
 namespace
 {
   struct file_not_persistent
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0a8dcd5..c55ee39 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -51,6 +51,7 @@ class cmake;
 class cmMakefileCall;
 class cmCMakePolicyCommand;
 class cmGeneratorExpressionEvaluationFile;
+class cmExportBuildFileGenerator;
 
 /** \class cmMakefile
  * \brief Process the input CMakeLists.txt file.
@@ -789,6 +790,10 @@ public:
                   bool inputIsContent);
   std::vector<cmGeneratorExpressionEvaluationFile*> GetEvaluationFiles() const;
 
+  std::vector<cmExportBuildFileGenerator*>
+  GetExportBuildFileGenerators() const;
+  void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
+
 protected:
   // add link libraries and directories to the target
   void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
@@ -882,6 +887,7 @@ private:
   mutable cmsys::RegularExpression cmNamedCurly;
 
   std::vector<cmMakefile*> UnConfiguredDirectories;
+  std::vector<cmExportBuildFileGenerator*> ExportBuildFileGenerators;
 
   std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1797356e02b361d44f572e7bdd4e68343016408d
commit 1797356e02b361d44f572e7bdd4e68343016408d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:38:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:28:42 2015 +0200

    cmGeneratorExpression: Port interface to cmGeneratorTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 4a7a760..d6440ac 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -457,7 +457,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
   this->ReplaceInstallPrefix(dirs);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(dirs);
   std::string exportDirs = cge->Evaluate(target->GetLocalGenerator(), "",
-                                         false, target->Target);
+                                         false, target);
 
   if (cge->GetHadContextSensitiveCondition())
     {
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 3d302d0..f8dbe31 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -78,10 +78,11 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
 
   cmGeneratorTarget* gtgt =
       tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+  cmGeneratorTarget gDummyHead(&dummyHead, gtgt->GetLocalGenerator());
 
   std::string result = cge->Evaluate(gtgt->GetLocalGenerator(), this->Config,
-                                     false, &dummyHead,
-                                     gtgt->Target, &dagChecker);
+                                     false, &gDummyHead,
+                                     gtgt, &dagChecker);
 
   const std::set<cmTarget const*> &allTargets = cge->GetAllTargetsSeen();
   for(std::set<cmTarget const*>::const_iterator li = allTargets.begin();
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index ef1679f..d9f67f2 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -50,7 +50,7 @@ cmGeneratorExpression::~cmGeneratorExpression()
 //----------------------------------------------------------------------------
 const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
   const std::string& config, bool quiet,
-  cmTarget const* headTarget,
+  const cmGeneratorTarget* headTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
                        std::string const& language) const
 {
@@ -66,8 +66,8 @@ const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
 //----------------------------------------------------------------------------
 const char *cmCompiledGeneratorExpression::Evaluate(
   cmLocalGenerator* lg, const std::string& config, bool quiet,
-  cmTarget const* headTarget,
-  cmTarget const* currentTarget,
+  const cmGeneratorTarget* headTarget,
+  const cmGeneratorTarget* currentTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
   std::string const& language) const
 {
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index 8843e0a..d64d6ba 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -20,6 +20,7 @@
 #include <cmsys/auto_ptr.hxx>
 
 class cmTarget;
+class cmGeneratorTarget;
 class cmLocalGenerator;
 class cmListFileBacktrace;
 
@@ -80,13 +81,13 @@ class cmCompiledGeneratorExpression
 public:
   const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet = false,
-                       cmTarget const* headTarget = 0,
-                       cmTarget const* currentTarget = 0,
+                       cmGeneratorTarget const* headTarget = 0,
+                       cmGeneratorTarget const* currentTarget = 0,
                        cmGeneratorExpressionDAGChecker *dagChecker = 0,
                        std::string const& language = std::string()) const;
   const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet,
-                       cmTarget const* headTarget,
+                       cmGeneratorTarget const* headTarget,
                        cmGeneratorExpressionDAGChecker *dagChecker,
                        std::string const& language = std::string()) const;
 
diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index cd056a0..4daf4e9 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -11,11 +11,12 @@
 ============================================================================*/
 
 #include "cmGeneratorExpressionContext.h"
+#include "cmGeneratorTarget.h"
 
 cmGeneratorExpressionContext::cmGeneratorExpressionContext(
       cmLocalGenerator* lg, std::string const& config,
-      bool quiet, cmTarget const* headTarget,
-      cmTarget const* currentTarget,
+      bool quiet, cmGeneratorTarget const* headTarget,
+      const cmGeneratorTarget* currentTarget,
       bool evaluateForBuildsystem,
       cmListFileBacktrace const& backtrace,
       std::string const& language)
@@ -23,8 +24,8 @@ cmGeneratorExpressionContext::cmGeneratorExpressionContext(
     LG(lg),
     Config(config),
     Language(language),
-    HeadTarget(headTarget),
-    CurrentTarget(currentTarget),
+    HeadTarget(headTarget ? headTarget->Target : 0),
+    CurrentTarget(currentTarget ? currentTarget->Target : 0),
     Quiet(quiet),
     HadError(false),
     HadContextSensitiveCondition(false),
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index 5b6507d..bbf0fcf 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -19,14 +19,15 @@
 #include <string>
 
 class cmTarget;
+class cmGeneratorTarget;
 class cmLocalGenerator;
 
 //----------------------------------------------------------------------------
 struct cmGeneratorExpressionContext
 {
   cmGeneratorExpressionContext(cmLocalGenerator* lg, std::string const& config,
-                               bool quiet, cmTarget const* headTarget,
-                               cmTarget const* currentTarget,
+                               bool quiet, const cmGeneratorTarget* headTarget,
+                               cmGeneratorTarget const* currentTarget,
                                bool evaluateForBuildsystem,
                                cmListFileBacktrace const& backtrace,
                                std::string const& language);
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 61852ab..2797d10 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -19,7 +19,8 @@
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
     std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
-    cmTarget const* headTarget, cmTarget const* currentTarget,
+    cmGeneratorTarget const* headTarget,
+    cmGeneratorTarget const* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker)
 {
   cmGeneratorExpression ge(context->Backtrace);
@@ -862,8 +863,8 @@ getLinkedTargetsContent(
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
                                         target->GetLocalGenerator(),
                                         context,
-                                        headTarget->Target,
-                                        target->Target, dagChecker);
+                                        headTarget,
+                                        target, dagChecker);
     }
   linkedTargetsContent =
     cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1215,9 +1216,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     if(!interfacePropertyName.empty())
       {
+      cmGeneratorTarget* gHeadTarget =
+          context->LG->GetGlobalGenerator()->GetGeneratorTarget(headTarget);
       std::string result = this->EvaluateDependentExpression(prop,
                                         context->LG, context,
-                                        headTarget, target, &dagChecker);
+                                        gHeadTarget, gtgt, &dagChecker);
       if (!linkedTargetsContent.empty())
         {
         result += (result.empty() ? "" : ";") + linkedTargetsContent;
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index 22b6585..9fc7336 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -56,7 +56,7 @@ struct cmGeneratorExpressionNode
   static std::string EvaluateDependentExpression(
     std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
-    cmTarget const* headTarget, cmTarget const* currentTarget,
+    const cmGeneratorTarget* headTarget, const cmGeneratorTarget* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker);
 
   static const cmGeneratorExpressionNode* GetNode(
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8038c91..6033efe 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -524,8 +524,8 @@ static void handleSystemIncludesDep(cmLocalGenerator *lg,
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(lg,
-                                      config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      config, false, headTarget,
+                                      depTgt, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
     {
@@ -538,8 +538,8 @@ static void handleSystemIncludesDep(cmLocalGenerator *lg,
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(lg,
-                                      config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      config, false, headTarget,
+                                      depTgt, dagChecker), result);
     }
 }
 
@@ -880,7 +880,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
       cmGeneratorExpression ge;
       cmSystemTools::ExpandListArgument(ge.Parse(*it)
                                           ->Evaluate(this->LocalGenerator,
-                                          config, false, this->Target,
+                                          config, false, this,
                                           &dagChecker), result);
       }
 
@@ -889,8 +889,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->LocalGenerator, *li,
-                              config, this,
+      handleSystemIncludesDep(this->LocalGenerator, *li, config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -966,8 +965,8 @@ static bool processSources(cmGeneratorTarget const* tgt,
                                               tgt->GetLocalGenerator(),
                                               config,
                                               false,
-                                              tgt->Target,
-                                              tgt->Target,
+                                              tgt,
+                                              tgt,
                                               dagChecker),
                                     entrySources);
 
@@ -2059,7 +2058,7 @@ void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result,
                                       ->Evaluate(this->LocalGenerator,
                                                 config,
                                                 false,
-                                                this->Target,
+                                                this,
                                                 &dagChecker),
                                   result);
 }
@@ -2544,7 +2543,7 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
                                         tgt->GetLocalGenerator(),
                                               config,
                                               false,
-                                              tgt->Target,
+                                              tgt,
                                               dagChecker, language),
                                     entryIncludes);
 
@@ -2755,7 +2754,7 @@ static void processCompileOptionsInternal(cmGeneratorTarget const* tgt,
                                         tgt->GetLocalGenerator(),
                                               config,
                                               false,
-                                              tgt->Target,
+                                              tgt,
                                               dagChecker,
                                               language),
                                     entryOptions);
@@ -4455,8 +4454,8 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
                                       this->LocalGenerator,
                                       config,
                                       false,
-                                      headTarget->Target,
-                                      this->Target, &dagChecker), libs);
+                                      headTarget,
+                                      this, &dagChecker), libs);
   this->LookupLinkItems(libs, items);
   hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition();
 }
@@ -5347,7 +5346,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
     cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
       ge.Parse(*le);
     std::string const evaluated =
-      cge->Evaluate(this->LocalGenerator, config, false, head->Target, &dagChecker);
+      cge->Evaluate(this->LocalGenerator, config, false, head, &dagChecker);
     cmSystemTools::ExpandListArgument(evaluated, llibs);
     if(cge->GetHadHeadSensitiveCondition())
       {
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b896659..abcda21 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -149,7 +149,9 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
 
     cmSystemTools::ExpandListArgument(cge->Evaluate(this->LocalGenerator,
                                                     config,
-                                                  false, this->Target, 0, 0),
+                                                    false,
+                                                    this->GeneratorTarget,
+                                                    0, 0),
                                       this->CleanFiles);
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e181996e78fed27b0a9af87867497227c787cac
commit 2e181996e78fed27b0a9af87867497227c787cac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 25 16:56:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:23:46 2015 +0200

    cmGeneratorExpression: Port to cmLocalGenerator.

diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx
index cbcdd81..35b3d59 100644
--- a/Source/cmCPackPropertiesGenerator.cxx
+++ b/Source/cmCPackPropertiesGenerator.cxx
@@ -18,7 +18,7 @@ void cmCPackPropertiesGenerator::GenerateScriptForConfig(std::ostream& os,
   const std::string& config, Indent const& indent)
 {
   std::string const& expandedFileName =
-      this->InstalledFile.GetNameExpression().Evaluate(this->LG->GetMakefile(),
+      this->InstalledFile.GetNameExpression().Evaluate(this->LG,
                                                        config);
 
   cmInstalledFile::PropertyMapType const& properties =
@@ -38,7 +38,7 @@ void cmCPackPropertiesGenerator::GenerateScriptForConfig(std::ostream& os,
       j = property.ValueExpressions.begin();
       j != property.ValueExpressions.end(); ++j)
       {
-      std::string value = (*j)->Evaluate(LG->GetMakefile(), config);
+      std::string value = (*j)->Evaluate(this->LG, config);
       os << " " << cmOutputConverter::EscapeForCMake(value);
       }
 
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 4b6bd50..7f02afe 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -50,8 +50,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
     {
     return target->GetLocation(this->Config);
     }
-  return this->GE->Parse(argv0)->Evaluate(this->LG->GetMakefile(),
-                                          this->Config);
+  return this->GE->Parse(argv0)->Evaluate(this->LG, this->Config);
 }
 
 //----------------------------------------------------------------------------
@@ -92,7 +91,7 @@ cmCustomCommandGenerator
   for(unsigned int j=1;j < commandLine.size(); ++j)
     {
     std::string arg =
-        this->GE->Parse(commandLine[j])->Evaluate(this->LG->GetMakefile(),
+        this->GE->Parse(commandLine[j])->Evaluate(this->LG,
                                                   this->Config);
     cmd += " ";
     if(this->OldStyle)
@@ -146,7 +145,7 @@ std::vector<std::string> const& cmCustomCommandGenerator::GetDepends() const
                                               = this->GE->Parse(*i);
       std::vector<std::string> result;
       cmSystemTools::ExpandListArgument(
-            cge->Evaluate(this->LG->GetMakefile(), this->Config), result);
+            cge->Evaluate(this->LG, this->Config), result);
       for (std::vector<std::string>::iterator it = result.begin();
           it != result.end(); ++it)
         {
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b29429e..4a7a760 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -456,7 +456,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                             true);
   this->ReplaceInstallPrefix(dirs);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(dirs);
-  std::string exportDirs = cge->Evaluate(target->Target->GetMakefile(), "",
+  std::string exportDirs = cge->Evaluate(target->GetLocalGenerator(), "",
                                          false, target->Target);
 
   if (cge->GetHadContextSensitiveCondition())
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 026584c..3d302d0 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -79,7 +79,7 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
   cmGeneratorTarget* gtgt =
       tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
 
-  std::string result = cge->Evaluate(gtgt->Target->GetMakefile(), this->Config,
+  std::string result = cge->Evaluate(gtgt->GetLocalGenerator(), this->Config,
                                      false, &dummyHead,
                                      gtgt->Target, &dagChecker);
 
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 80a4f81..ef1679f 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -48,13 +48,13 @@ cmGeneratorExpression::~cmGeneratorExpression()
 }
 
 //----------------------------------------------------------------------------
-const char *cmCompiledGeneratorExpression::Evaluate(
-  cmMakefile* mf, const std::string& config, bool quiet,
+const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
+  const std::string& config, bool quiet,
   cmTarget const* headTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
                        std::string const& language) const
 {
-  return this->Evaluate(mf,
+  return this->Evaluate(lg,
                         config,
                         quiet,
                         headTarget,
@@ -65,13 +65,13 @@ const char *cmCompiledGeneratorExpression::Evaluate(
 
 //----------------------------------------------------------------------------
 const char *cmCompiledGeneratorExpression::Evaluate(
-  cmMakefile* mf, const std::string& config, bool quiet,
+  cmLocalGenerator* lg, const std::string& config, bool quiet,
   cmTarget const* headTarget,
   cmTarget const* currentTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
   std::string const& language) const
 {
-  cmGeneratorExpressionContext context(mf, config, quiet, headTarget,
+  cmGeneratorExpressionContext context(lg, config, quiet, headTarget,
                                   currentTarget ? currentTarget : headTarget,
                                   this->EvaluateForBuildsystem,
                                   this->Backtrace, language);
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index cd19bc0..8843e0a 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -20,7 +20,7 @@
 #include <cmsys/auto_ptr.hxx>
 
 class cmTarget;
-class cmMakefile;
+class cmLocalGenerator;
 class cmListFileBacktrace;
 
 struct cmGeneratorExpressionEvaluator;
@@ -78,13 +78,13 @@ private:
 class cmCompiledGeneratorExpression
 {
 public:
-  const char* Evaluate(cmMakefile* mf, const std::string& config,
+  const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet = false,
                        cmTarget const* headTarget = 0,
                        cmTarget const* currentTarget = 0,
                        cmGeneratorExpressionDAGChecker *dagChecker = 0,
                        std::string const& language = std::string()) const;
-  const char* Evaluate(cmMakefile* mf, const std::string& config,
+  const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet,
                        cmTarget const* headTarget,
                        cmGeneratorExpressionDAGChecker *dagChecker,
diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index 947015e..cd056a0 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -13,14 +13,14 @@
 #include "cmGeneratorExpressionContext.h"
 
 cmGeneratorExpressionContext::cmGeneratorExpressionContext(
-      cmMakefile* mf, std::string const& config,
+      cmLocalGenerator* lg, std::string const& config,
       bool quiet, cmTarget const* headTarget,
       cmTarget const* currentTarget,
       bool evaluateForBuildsystem,
       cmListFileBacktrace const& backtrace,
       std::string const& language)
   : Backtrace(backtrace),
-    Makefile(mf),
+    LG(lg),
     Config(config),
     Language(language),
     HeadTarget(headTarget),
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index ed83509..5b6507d 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -19,11 +19,12 @@
 #include <string>
 
 class cmTarget;
+class cmLocalGenerator;
 
 //----------------------------------------------------------------------------
 struct cmGeneratorExpressionContext
 {
-  cmGeneratorExpressionContext(cmMakefile* mf, std::string const& config,
+  cmGeneratorExpressionContext(cmLocalGenerator* lg, std::string const& config,
                                bool quiet, cmTarget const* headTarget,
                                cmTarget const* currentTarget,
                                bool evaluateForBuildsystem,
@@ -38,7 +39,7 @@ struct cmGeneratorExpressionContext
   std::set<cmTarget const*> SourceSensitiveTargets;
   std::map<cmTarget const*, std::map<std::string, std::string> >
                                                           MaxLanguageStandard;
-  cmMakefile *Makefile;
+  cmLocalGenerator *LG;
   std::string Config;
   std::string Language;
   cmTarget const* HeadTarget; // The target whose property is being evaluated.
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 851aacd..5eed89d 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -13,6 +13,7 @@
 #include "cmGeneratorExpressionDAGChecker.h"
 
 #include "cmMakefile.h"
+#include "cmLocalGenerator.h"
 #include "cmAlgorithms.h"
 
 //----------------------------------------------------------------------------
@@ -110,7 +111,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
       << "  " << expr << "\n"
       << "Self reference on target \""
       << context->HeadTarget->GetName() << "\".\n";
-    context->Makefile->GetCMakeInstance()
+    context->LG->GetCMakeInstance()
       ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                       parent->Backtrace);
     return;
@@ -121,7 +122,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
   e << "Error evaluating generator expression:\n"
     << "  " << expr << "\n"
     << "Dependency loop found.";
-  context->Makefile->GetCMakeInstance()
+  context->LG->GetCMakeInstance()
     ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                     context->Backtrace);
   }
@@ -134,7 +135,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
       << "  "
       << (parent->Content ? parent->Content->GetOriginalExpression() : expr)
       << "\n";
-    context->Makefile->GetCMakeInstance()
+    context->LG->GetCMakeInstance()
       ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                       parent->Backtrace);
     parent = parent->Parent;
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 8ac5cbc..4ac2a0d 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -44,7 +44,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator* lg,
   std::string rawCondition = this->Condition->GetInput();
   if (!rawCondition.empty())
     {
-    std::string condResult = this->Condition->Evaluate(lg->GetMakefile(),
+    std::string condResult = this->Condition->Evaluate(lg,
                                                        config,
                                                        false, 0, 0, 0, lang);
     if (condResult == "0")
@@ -62,10 +62,10 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator* lg,
     }
 
   const std::string outputFileName
-                    = this->OutputFileExpr->Evaluate(lg->GetMakefile(), config,
+                    = this->OutputFileExpr->Evaluate(lg, config,
                                                      false, 0, 0, 0, lang);
   const std::string outputContent
-                          = inputExpression->Evaluate(lg->GetMakefile(),
+                          = inputExpression->Evaluate(lg,
                                                       config,
                                                       false, 0, 0, 0, lang);
 
@@ -110,7 +110,7 @@ void cmGeneratorExpressionEvaluationFile::CreateOutputFile(
   for(std::vector<std::string>::const_iterator le = enabledLanguages.begin();
       le != enabledLanguages.end(); ++le)
     {
-    std::string name = this->OutputFileExpr->Evaluate(lg->GetMakefile(),
+    std::string name = this->OutputFileExpr->Evaluate(lg,
                                                       config,
                                                       false, 0, 0, 0, *le);
     cmSourceFile* sf = lg->GetMakefile()->GetOrCreateSource(name);
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 88d10aa..61852ab 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -17,7 +17,7 @@
 
 //----------------------------------------------------------------------------
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
-    std::string const& prop, cmMakefile *makefile,
+    std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
     cmTarget const* headTarget, cmTarget const* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker)
@@ -25,7 +25,7 @@ std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
   cmGeneratorExpression ge(context->Backtrace);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(prop);
   cge->SetEvaluateForBuildsystem(context->EvaluateForBuildsystem);
-  std::string result = cge->Evaluate(makefile,
+  std::string result = cge->Evaluate(lg,
                         context->Config,
                         context->Quiet,
                         headTarget,
@@ -367,7 +367,8 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
                        const std::string &lang) const
   {
     const char *compilerId =
-      context->Makefile->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID");
+      context->LG->GetMakefile()
+        ->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID");
     if (parameters.empty())
       {
       return compilerId ? compilerId : "";
@@ -391,13 +392,13 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
 
     if (cmsysString_strcasecmp(parameters.begin()->c_str(), compilerId) == 0)
       {
-      switch(context->Makefile->GetPolicyStatus(cmPolicies::CMP0044))
+      switch(context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0044))
         {
         case cmPolicies::WARN:
           {
           std::ostringstream e;
           e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0044);
-          context->Makefile->GetCMakeInstance()
+          context->LG->GetCMakeInstance()
                  ->IssueMessage(cmake::AUTHOR_WARNING,
                                 e.str(), context->Backtrace);
           }
@@ -470,8 +471,9 @@ struct CompilerVersionNode : public cmGeneratorExpressionNode
                        cmGeneratorExpressionDAGChecker *,
                        const std::string &lang) const
   {
-    const char *compilerVersion = context->Makefile->GetSafeDefinition(
-        "CMAKE_" + lang + "_COMPILER_VERSION");
+    const char *compilerVersion =
+        context->LG->GetMakefile()->GetSafeDefinition(
+          "CMAKE_" + lang + "_COMPILER_VERSION");
     if (parameters.empty())
       {
       return compilerVersion ? compilerVersion : "";
@@ -553,7 +555,7 @@ struct PlatformIdNode : public cmGeneratorExpressionNode
                        cmGeneratorExpressionDAGChecker *) const
   {
     const char *platformId =
-      context->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME");
+      context->LG->GetMakefile()->GetSafeDefinition("CMAKE_SYSTEM_NAME");
     if (parameters.empty())
       {
       return platformId ? platformId : "";
@@ -768,7 +770,7 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
       }
 
     std::vector<std::string> enabledLanguages;
-    cmGlobalGenerator* gg = context->Makefile->GetGlobalGenerator();
+    cmGlobalGenerator* gg = context->LG->GetGlobalGenerator();
     gg->GetEnabledLanguages(enabledLanguages);
     if (!parameters.empty() &&
           std::find(enabledLanguages.begin(), enabledLanguages.end(),
@@ -858,7 +860,7 @@ getLinkedTargetsContent(
     {
     linkedTargetsContent =
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
-                                        target->Target->GetMakefile(),
+                                        target->GetLocalGenerator(),
                                         context,
                                         headTarget->Target,
                                         target->Target, dagChecker);
@@ -940,16 +942,17 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         }
       if(propertyName == "ALIASED_TARGET")
         {
-        if(context->Makefile->IsAlias(targetName))
+        if(context->LG->GetMakefile()->IsAlias(targetName))
           {
-          if(cmTarget* tgt = context->Makefile->FindTargetToUse(targetName))
+          if(cmTarget* tgt =
+             context->LG->GetMakefile()->FindTargetToUse(targetName))
             {
             return tgt->GetName();
             }
           }
         return "";
         }
-      target = context->Makefile->FindTargetToUse(targetName);
+      target = context->LG->GetMakefile()->FindTargetToUse(targetName);
 
       if (!target)
         {
@@ -994,7 +997,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     assert(target);
 
     cmGeneratorTarget* gtgt =
-        context->Makefile->GetGlobalGenerator()->GetGeneratorTarget(target);
+        context->LG->GetGlobalGenerator()->GetGeneratorTarget(target);
 
     if (propertyName == "LINKER_LANGUAGE")
       {
@@ -1099,7 +1102,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
                            "COMPILE_DEFINITIONS_"))
       {
       cmPolicies::PolicyStatus polSt =
-                      context->Makefile->GetPolicyStatus(cmPolicies::CMP0043);
+          context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0043);
       if (polSt == cmPolicies::WARN || polSt == cmPolicies::OLD)
         {
         interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";
@@ -1112,7 +1115,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if(isInterfaceProperty)
       {
       cmGeneratorTarget* gHeadTarget =
-          context->Makefile->GetGlobalGenerator()
+          context->LG->GetGlobalGenerator()
           ->GetGeneratorTarget(headTarget);
       if(cmLinkInterfaceLibraries const* iface =
          gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
@@ -1213,7 +1216,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if(!interfacePropertyName.empty())
       {
       std::string result = this->EvaluateDependentExpression(prop,
-                                        context->Makefile, context,
+                                        context->LG, context,
                                         headTarget, target, &dagChecker);
       if (!linkedTargetsContent.empty())
         {
@@ -1269,7 +1272,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
 
     std::string tgtName = parameters.front();
     cmGeneratorTarget* gt =
-                context->Makefile->FindGeneratorTargetToUse(tgtName);
+                context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
       std::ostringstream e;
@@ -1312,7 +1315,8 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
       assert(!map_it->second.empty());
       result += sep;
       std::string objFile = obj_dir + map_it->second;
-      cmSourceFile* sf = context->Makefile->GetOrCreateSource(objFile, true);
+      cmSourceFile* sf =
+          context->LG->GetMakefile()->GetOrCreateSource(objFile, true);
       sf->SetObjectLibrary(tgtName);
       sf->SetProperty("EXTERNAL_OBJECT", "1");
       result += objFile;
@@ -1354,7 +1358,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       {
       std::string error;
       std::string lang;
-      if (!context->Makefile->CompileFeatureKnown(context->HeadTarget,
+      if (!context->LG->GetMakefile()->CompileFeatureKnown(context->HeadTarget,
                                                   *it, lang, &error))
         {
         reportError(context, content->GetOriginalExpression(), error);
@@ -1365,7 +1369,8 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       if (availableFeatures.find(lang) == availableFeatures.end())
         {
         const char* featuresKnown
-                  = context->Makefile->CompileFeaturesAvailable(lang, &error);
+            = context->LG->GetMakefile()->CompileFeaturesAvailable(lang,
+                                                                   &error);
         if (!featuresKnown)
           {
           reportError(context, content->GetOriginalExpression(), error);
@@ -1383,7 +1388,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       {
       std::vector<std::string> const& langAvailable
                                               = availableFeatures[lit->first];
-      const char* standardDefault = context->Makefile
+      const char* standardDefault = context->LG->GetMakefile()
         ->GetDefinition("CMAKE_" + lit->first + "_STANDARD_DEFAULT");
       for (std::vector<std::string>::const_iterator it = lit->second.begin();
           it != lit->second.end(); ++it)
@@ -1399,7 +1404,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
           // All features known for the language are always available.
           continue;
           }
-        if (!context->Makefile->HaveStandardAvailable(target,
+        if (!context->LG->GetMakefile()->HaveStandardAvailable(target,
                                                       lit->first, *it))
           {
           if (evalLL)
@@ -1617,7 +1622,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
 
     std::string pdbSupportVar = "CMAKE_" + language + "_LINKER_SUPPORTS_PDB";
 
-    if(!context->Makefile->IsOn(pdbSupportVar))
+    if(!context->LG->GetMakefile()->IsOn(pdbSupportVar))
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_PDB_FILE is not supported by the target linker.");
@@ -1731,7 +1736,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       return std::string();
       }
     cmGeneratorTarget* target =
-        context->Makefile->FindGeneratorTargetToUse(name);
+        context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
     if(!target)
       {
       ::reportError(context, content->GetOriginalExpression(),
@@ -1813,7 +1818,7 @@ static const struct ShellPathNode : public cmGeneratorExpressionNode
                   "\"" + parameters.front() + "\" is not an absolute path.");
       return std::string();
       }
-    cmOutputConverter converter(context->Makefile->GetStateSnapshot());
+    cmOutputConverter converter(context->LG->GetStateSnapshot());
     return converter.ConvertDirectorySeparatorsForShell(parameters.front());
   }
 } shellPathNode;
@@ -1897,7 +1902,7 @@ void reportError(cmGeneratorExpressionContext *context,
   e << "Error evaluating generator expression:\n"
     << "  " << expr << "\n"
     << result;
-  context->Makefile->GetCMakeInstance()
+  context->LG->GetCMakeInstance()
     ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                     context->Backtrace);
 }
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index 847a00a..22b6585 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -54,7 +54,7 @@ struct cmGeneratorExpressionNode
                               ) const = 0;
 
   static std::string EvaluateDependentExpression(
-    std::string const& prop, cmMakefile *makefile,
+    std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
     cmTarget const* headTarget, cmTarget const* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1699362..8038c91 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -453,7 +453,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
     // Now evaluate genex and update the previously-prepared map entry.
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(outName);
-    i->second = cge->Evaluate(this->Makefile, config);
+    i->second = cge->Evaluate(this->LocalGenerator, config);
     }
   else if(i->second.empty())
     {
@@ -510,7 +510,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
   return 0;
 }
 
-static void handleSystemIncludesDep(cmMakefile *mf,
+static void handleSystemIncludesDep(cmLocalGenerator *lg,
                                   cmGeneratorTarget const* depTgt,
                                   const std::string& config,
                                   cmGeneratorTarget const* headTarget,
@@ -523,7 +523,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     {
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
-                                      ->Evaluate(mf,
+                                      ->Evaluate(lg,
                                       config, false, headTarget->Target,
                                       depTgt->Target, dagChecker), result);
     }
@@ -537,7 +537,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     {
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
-                                      ->Evaluate(mf,
+                                      ->Evaluate(lg,
                                       config, false, headTarget->Target,
                                       depTgt->Target, dagChecker), result);
     }
@@ -879,7 +879,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
       {
       cmGeneratorExpression ge;
       cmSystemTools::ExpandListArgument(ge.Parse(*it)
-                                          ->Evaluate(this->Makefile,
+                                          ->Evaluate(this->LocalGenerator,
                                           config, false, this->Target,
                                           &dagChecker), result);
       }
@@ -889,7 +889,8 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, *li, config, this,
+      handleSystemIncludesDep(this->LocalGenerator, *li,
+                              config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -961,7 +962,8 @@ static bool processSources(cmGeneratorTarget const* tgt,
     cmLinkImplItem const& item = (*it)->LinkImplItem;
     std::string const& targetName = item;
     std::vector<std::string> entrySources;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(
+                                              tgt->GetLocalGenerator(),
                                               config,
                                               false,
                                               tgt->Target,
@@ -2054,7 +2056,7 @@ void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result,
                                       this->GetName(),
                                       "AUTOUIC_OPTIONS", 0, 0);
   cmSystemTools::ExpandListArgument(ge.Parse(prop)
-                                      ->Evaluate(this->Makefile,
+                                      ->Evaluate(this->LocalGenerator,
                                                 config,
                                                 false,
                                                 this->Target,
@@ -2376,7 +2378,7 @@ cmTargetTraceDependencies
       {
       const cmsys::auto_ptr<cmCompiledGeneratorExpression> cge
                                                               = ge.Parse(*cli);
-      cge->Evaluate(this->Makefile, "", true);
+      cge->Evaluate(this->GeneratorTarget->GetLocalGenerator(), "", true);
       std::set<cmTarget*> geTargets = cge->GetTargets();
       targets.insert(geTargets.begin(), geTargets.end());
       }
@@ -2530,8 +2532,6 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
       const std::string& config, bool debugIncludes,
       const std::string& language)
 {
-  cmMakefile *mf = tgt->Target->GetMakefile();
-
   for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator
       it = entries.begin(), end = entries.end(); it != end; ++it)
     {
@@ -2540,7 +2540,8 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
     bool const fromImported = item.Target && item.Target->IsImported();
     bool const checkCMP0027 = item.FromGenex;
     std::vector<std::string> entryIncludes;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(
+                                        tgt->GetLocalGenerator(),
                                               config,
                                               false,
                                               tgt->Target,
@@ -2746,13 +2747,12 @@ static void processCompileOptionsInternal(cmGeneratorTarget const* tgt,
       const std::string& config, bool debugOptions, const char *logName,
       std::string const& language)
 {
-  cmMakefile *mf = tgt->Target->GetMakefile();
-
   for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator
       it = entries.begin(), end = entries.end(); it != end; ++it)
     {
     std::vector<std::string> entryOptions;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(
+                                        tgt->GetLocalGenerator(),
                                               config,
                                               false,
                                               tgt->Target,
@@ -4452,7 +4452,7 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
   std::vector<std::string> libs;
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
   cmSystemTools::ExpandListArgument(cge->Evaluate(
-                                      this->Makefile,
+                                      this->LocalGenerator,
                                       config,
                                       false,
                                       headTarget->Target,
@@ -4777,7 +4777,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
       ge.Parse(config_outdir);
-    out = cge->Evaluate(this->Makefile, config);
+    out = cge->Evaluate(this->LocalGenerator, config);
 
     // Skip per-configuration subdirectory.
     conf = "";
@@ -4788,7 +4788,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
       ge.Parse(outdir);
-    out = cge->Evaluate(this->Makefile, config);
+    out = cge->Evaluate(this->LocalGenerator, config);
 
     // Skip per-configuration subdirectory if the value contained a
     // generator expression.
@@ -5347,7 +5347,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
     cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
       ge.Parse(*le);
     std::string const evaluated =
-      cge->Evaluate(this->Makefile, config, false, head->Target, &dagChecker);
+      cge->Evaluate(this->LocalGenerator, config, false, head->Target, &dagChecker);
     cmSystemTools::ExpandListArgument(evaluated, llibs);
     if(cge->GetHadHeadSensitiveCondition())
       {
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index 78cb5f0..edd6a0e 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -97,5 +97,5 @@ cmInstallDirectoryGenerator::GetDestination(std::string const& config) const
 {
   cmGeneratorExpression ge;
   return ge.Parse(this->Destination)
-    ->Evaluate(this->LocalGenerator->GetMakefile(), config);
+    ->Evaluate(this->LocalGenerator, config);
 }
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index e2c16c8..383031b 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -68,7 +68,7 @@ cmInstallFilesGenerator::GetDestination(std::string const& config) const
 {
   cmGeneratorExpression ge;
   return ge.Parse(this->Destination)
-    ->Evaluate(this->LocalGenerator->GetMakefile(), config);
+    ->Evaluate(this->LocalGenerator, config);
 }
 
 //----------------------------------------------------------------------------
@@ -117,7 +117,7 @@ void cmInstallFilesGenerator::GenerateScriptForConfig(std::ostream& os,
     {
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*i);
     cmSystemTools::ExpandListArgument(cge->Evaluate(
-        this->LocalGenerator->GetMakefile(), config), files);
+        this->LocalGenerator, config), files);
     }
   this->AddFilesInstallRule(os, config, indent, files);
 }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index c2a18af..a3d2927 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -351,7 +351,7 @@ cmInstallTargetGenerator::GetDestination(std::string const& config) const
 {
   cmGeneratorExpression ge;
   return ge.Parse(this->Destination)
-    ->Evaluate(this->Target->Target->GetMakefile(), config);
+    ->Evaluate(this->Target->GetLocalGenerator(), config);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 4ddcac6..b896659 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -147,7 +147,8 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
                                             ge.Parse(additional_clean_files);
 
-    cmSystemTools::ExpandListArgument(cge->Evaluate(this->Makefile, config,
+    cmSystemTools::ExpandListArgument(cge->Evaluate(this->LocalGenerator,
+                                                    config,
                                                   false, this->Target, 0, 0),
                                       this->CleanFiles);
     }
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 9d85f5a..7dec50b 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -117,7 +117,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   else
     {
     // Use the command name given.
-    exe = ge.Parse(exe.c_str())->Evaluate(this->LG->GetMakefile(), config);
+    exe = ge.Parse(exe.c_str())->Evaluate(this->LG, config);
     cmSystemTools::ConvertToUnixSlashes(exe);
     }
 
@@ -128,7 +128,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
     {
     os << " " << cmOutputConverter::EscapeForCMake(
                                          ge.Parse(*ci)->Evaluate(
-                                            this->LG->GetMakefile(), config));
+                                            this->LG, config));
     }
 
   // Finish the test command.
@@ -145,7 +145,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
       {
       os << " " << i->first
          << " " << cmOutputConverter::EscapeForCMake(
-           ge.Parse(i->second.GetValue())->Evaluate(this->LG->GetMakefile(),
+           ge.Parse(i->second.GetValue())->Evaluate(this->LG,
                                                     config));
       }
     os << ")" << std::endl;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCPackPropertiesGenerator.cxx          |    4 +-
 Source/cmCustomCommandGenerator.cxx            |    9 ++-
 Source/cmExportBuildFileGenerator.cxx          |   21 ++++---
 Source/cmExportBuildFileGenerator.h            |    8 +--
 Source/cmExportCommand.cxx                     |    2 +-
 Source/cmExportFileGenerator.cxx               |    4 +-
 Source/cmExportTryCompileFileGenerator.cxx     |    7 ++-
 Source/cmExtraEclipseCDT4Generator.cxx         |    3 +-
 Source/cmGeneratorExpression.cxx               |   16 +++---
 Source/cmGeneratorExpression.h                 |   13 +++--
 Source/cmGeneratorExpressionContext.cxx        |   13 +++--
 Source/cmGeneratorExpressionContext.h          |   10 ++--
 Source/cmGeneratorExpressionDAGChecker.cxx     |    7 ++-
 Source/cmGeneratorExpressionEvaluationFile.cxx |    8 +--
 Source/cmGeneratorExpressionNode.cxx           |   70 +++++++++++++-----------
 Source/cmGeneratorExpressionNode.h             |    4 +-
 Source/cmGeneratorTarget.cxx                   |   64 +++++++++++-----------
 Source/cmGlobalGenerator.cxx                   |   18 +++++-
 Source/cmGlobalGenerator.h                     |    2 +
 Source/cmGlobalGhsMultiGenerator.cxx           |    2 +-
 Source/cmGlobalKdevelopGenerator.cxx           |    3 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |    6 +-
 Source/cmGlobalVisualStudioGenerator.cxx       |    2 +-
 Source/cmIncludeCommand.cxx                    |    1 +
 Source/cmInstallDirectoryGenerator.cxx         |    2 +-
 Source/cmInstallFilesGenerator.cxx             |    4 +-
 Source/cmInstallTargetGenerator.cxx            |    2 +-
 Source/cmLocalGenerator.cxx                    |   24 +++++++-
 Source/cmLocalGenerator.h                      |   14 +++++
 Source/cmLocalGhsMultiGenerator.cxx            |    2 +-
 Source/cmLocalNinjaGenerator.cxx               |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |    6 +-
 Source/cmMakefile.cxx                          |   28 ++++------
 Source/cmMakefile.h                            |   20 ++-----
 Source/cmMakefileTargetGenerator.cxx           |    7 ++-
 Source/cmQtAutoGeneratorInitializer.cxx        |    2 +-
 Source/cmTestGenerator.cxx                     |    8 +--
 37 files changed, 236 insertions(+), 182 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 12 15:44:29 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 12 Oct 2015 15:44:29 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-481-g1bb21a3
Message-ID: <20151012194429.DC619BFBDB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1bb21a3db2a9f21519af13ce8f80c045334bae63 (commit)
       via  02f6ee3a5534016a16089e0572efedbb179f1e08 (commit)
      from  051c84ff36515a494787acbd8f8c8197c9326413 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bb21a3db2a9f21519af13ce8f80c045334bae63
commit 1bb21a3db2a9f21519af13ce8f80c045334bae63
Merge: 051c84f 02f6ee3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 15:44:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:44:29 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    02f6ee3a fix style


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02f6ee3a5534016a16089e0572efedbb179f1e08
commit 02f6ee3a5534016a16089e0572efedbb179f1e08
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 21:44:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:44:06 2015 +0200

    fix style

diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index 9fc7336..db65db1 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -56,7 +56,8 @@ struct cmGeneratorExpressionNode
   static std::string EvaluateDependentExpression(
     std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
-    const cmGeneratorTarget* headTarget, const cmGeneratorTarget* currentTarget,
+    const cmGeneratorTarget* headTarget,
+    const cmGeneratorTarget* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker);
 
   static const cmGeneratorExpressionNode* GetNode(

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorExpressionNode.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 12 15:46:17 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 12 Oct 2015 15:46:17 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-486-g4d977ac
Message-ID: <20151012194617.CCC0ABFD06@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4d977ac509c73b78cd999f92952e2c8c322b2199 (commit)
       via  f9e09afe1d38874b652526b3f65662c6e64e43b4 (commit)
       via  754d920daa2e2e1f81b46560b39bb92935bc3944 (commit)
       via  3f11b0d74e94a6587e2b4664defb6d1b93ce4b1f (commit)
       via  ce09d3f70c8ed86cf3afa911b06038ca31767b88 (commit)
      from  1bb21a3db2a9f21519af13ce8f80c045334bae63 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d977ac509c73b78cd999f92952e2c8c322b2199
commit 4d977ac509c73b78cd999f92952e2c8c322b2199
Merge: 1bb21a3 f9e09af
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 15:46:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:46:16 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    f9e09afe cmLocalGenerator: Store cmGeneratorTargets.
    754d920d cmMakefile: Store container of cmExportBuildFileGenerators.
    3f11b0d7 cmGeneratorExpression: Port interface to cmGeneratorTarget.
    ce09d3f7 cmGeneratorExpression: Port to cmLocalGenerator.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9e09afe1d38874b652526b3f65662c6e64e43b4
commit f9e09afe1d38874b652526b3f65662c6e64e43b4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:21:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:45:35 2015 +0200

    cmLocalGenerator: Store cmGeneratorTargets.
    
    Relieve cmMakefile of this responsibility.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f02afe..618f09f 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -43,7 +43,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
 {
   std::string const& argv0 = this->CC.GetCommandLines()[c][0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(argv0);
+      this->LG->FindGeneratorTargetToUse(argv0);
   if(target && target->GetType() == cmTarget::EXECUTABLE &&
      (target->Target->IsImported()
       || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 560cfc5..6c3cccd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -42,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->LG->GetMakefile()
+    cmGeneratorTarget *te = this->LG
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index fdfa35e..b7aeb02 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,8 +965,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmGeneratorTargetsType targets = (*it)->GetMakefile()
-                                        ->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
     for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2797d10..fe83b08 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1275,7 +1275,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
 
     std::string tgtName = parameters.front();
     cmGeneratorTarget* gt =
-                context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
+                context->LG->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
       std::ostringstream e;
@@ -1739,7 +1739,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       return std::string();
       }
     cmGeneratorTarget* target =
-        context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
+        context->LG->FindGeneratorTargetToUse(name);
     if(!target)
       {
       ::reportError(context, content->GetOriginalExpression(),
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6033efe..6bebc2b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2305,7 +2305,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
 
   // Check for a target with this name.
   if(cmGeneratorTarget* t
-                    = this->Makefile->FindGeneratorTargetToUse(util))
+                    = this->GeneratorTarget->
+                    GetLocalGenerator()->FindGeneratorTargetToUse(util))
     {
     // If we find the target and the dep was given as a full path,
     // then make sure it was not a full path to something else, and
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a61515a..8f5e84a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1568,7 +1568,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     this->GeneratorTargets[*j] = gt;
     generatorTargets[*j] = gt;
     }
-  mf->SetGeneratorTargets(generatorTargets);
+  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 87cf58f..45a1509 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -287,7 +287,7 @@ void cmGlobalGhsMultiGenerator::Generate()
       {
       cmLocalGhsMultiGenerator *lg =
         static_cast<cmLocalGhsMultiGenerator *>(this->LocalGenerators[i]);
-      cmGeneratorTargetsType tgts = lg->GetMakefile()->GetGeneratorTargets();
+      cmGeneratorTargetsType tgts = lg->GetGeneratorTargets();
       this->UpdateBuildFiles(&tgts);
       }
     }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f955ef7..ed36634 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,8 +68,7 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      cmMakefile* makefile=(*lg)->GetMakefile();
-      cmGeneratorTargetsType const& targets = makefile->GetGeneratorTargets();
+      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
       for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
            ti != targets.end(); ti++)
         {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 218e702..f9740e5 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -461,7 +461,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
@@ -627,7 +627,7 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
     for(cmGeneratorTargetsType::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
@@ -728,7 +728,7 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 6a25ed0..cb30c4e 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -108,7 +108,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
           i != gen.end(); ++i)
         {
         cmGeneratorTargetsType targets =
-            (*i)->GetMakefile()->GetGeneratorTargets();
+            (*i)->GetGeneratorTargets();
         for(cmGeneratorTargetsType::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f19d551..3691b41 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,7 +132,7 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -448,6 +448,13 @@ void cmLocalGenerator::GenerateInstallRules()
     }
 }
 
+
+void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+{
+  this->GeneratorTargets[t] = gt;
+  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
+}
+
 //----------------------------------------------------------------------------
 void cmLocalGenerator::ComputeTargetManifest()
 {
@@ -460,7 +467,7 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -1767,6 +1774,17 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
+{
+  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+    {
+    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    }
+  return 0;
+}
+
+//----------------------------------------------------------------------------
 bool cmLocalGenerator::GetRealDependency(const std::string& inName,
                                          const std::string& config,
                                          std::string& dep)
@@ -1792,7 +1810,7 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
 
   // Look for a CMake target with the given name.
   if(cmGeneratorTarget* target =
-     this->Makefile->FindGeneratorTargetToUse(name))
+     this->FindGeneratorTargetToUse(name))
     {
     // make sure it is not just a coincidence that the target name
     // found is part of the inName
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 758709a..97e3f88 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -112,6 +112,19 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
+  const cmGeneratorTargetsType &GetGeneratorTargets() const
+    {
+      return this->GeneratorTargets;
+    }
+
+  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
+    {
+      this->GeneratorTargets = targets;
+    }
+  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
+
+  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
+
   /**
    * Encode a list of preprocessor definitions for the compiler
    * command line.
@@ -354,6 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmTarget const*> WarnCMP0063;
+  cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index bac989f..721f239 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,7 +26,7 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  cmGeneratorTargetsType tgts = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
 
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 6319f0e..8d71469 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,7 +73,7 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  cmGeneratorTargetsType targets = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index bf5afc1..91c7acd 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,7 +113,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
   for(cmGeneratorTargetsType::iterator t = targets.begin();
@@ -175,7 +175,7 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
@@ -418,7 +418,7 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   std::string localName;
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7d49661..61832ba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1800,12 +1800,6 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
-void cmMakefile::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-{
-  this->GeneratorTargets[t] = gt;
-  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
-}
-
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
@@ -4309,17 +4303,6 @@ bool cmMakefile::IsAlias(const std::string& name) const
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmMakefile::FindGeneratorTargetToUse(const std::string& name) const
-{
-  if (cmTarget *t = this->FindTargetToUse(name))
-    {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
-    }
-  return 0;
-}
-
-//----------------------------------------------------------------------------
 bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
                                    bool isCustom) const
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index c55ee39..8f865a0 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -17,7 +17,6 @@
 #include "cmSystemTools.h"
 #include "cmTarget.h"
 #include "cmNewLineStyle.h"
-#include "cmGeneratorTarget.h"
 #include "cmExpandedCommandArgument.h"
 #include "cmake.h"
 #include "cmState.h"
@@ -393,17 +392,6 @@ public:
       return this->ImportedTargetsOwned;
     }
 
-  const cmGeneratorTargetsType &GetGeneratorTargets() const
-    {
-      return this->GeneratorTargets;
-    }
-
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-    {
-      this->GeneratorTargets = targets;
-    }
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
-
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
@@ -412,7 +400,6 @@ public:
   cmTarget* FindTargetToUse(const std::string& name,
                             bool excludeAliases = false) const;
   bool IsAlias(const std::string& name) const;
-  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
   /**
    * Mark include directories as system directories.
@@ -815,7 +802,6 @@ protected:
   typedef std::map<std::string, cmTarget*> TargetMap;
 #endif
   TargetMap AliasTargets;
-  cmGeneratorTargetsType GeneratorTargets;
   std::vector<cmSourceFile*> SourceFiles;
 
   // Tests
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6e3f65f..f9875b3 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -886,7 +886,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    makefile->AddGeneratorTarget(autogenTarget, gt);
+    lg->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 7dec50b..85fb405 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -89,7 +89,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   // be translated.
   std::string exe = command[0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(exe);
+      this->LG->FindGeneratorTargetToUse(exe);
   if(target && target->GetType() == cmTarget::EXECUTABLE)
     {
     // Use the target file on disk.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=754d920daa2e2e1f81b46560b39bb92935bc3944
commit 754d920daa2e2e1f81b46560b39bb92935bc3944
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 22:08:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:45:35 2015 +0200

    cmMakefile: Store container of cmExportBuildFileGenerators.
    
    Set a cmLocalGenerator on each instance at compute time.  That will
    soon be needed to access cmGeneratorTarget instances.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 400fa17..560cfc5 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -18,13 +18,18 @@
 
 //----------------------------------------------------------------------------
 cmExportBuildFileGenerator::cmExportBuildFileGenerator()
-  : Backtrace()
 {
-  this->Makefile = 0;
+  this->LG = 0;
   this->ExportSet = 0;
 }
 
 //----------------------------------------------------------------------------
+void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
+{
+  this->LG = lg;
+}
+
+//----------------------------------------------------------------------------
 bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
 {
   std::vector<cmGeneratorTarget*> allTargets;
@@ -37,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->Makefile
+    cmGeneratorTarget *te = this->LG->GetMakefile()
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
@@ -49,8 +54,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       {
       std::ostringstream e;
       e << "given target \"" << te->GetName() << "\" more than once.";
-      this->Makefile->GetCMakeInstance()
-          ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+      this->LG->GetGlobalGenerator()->GetCMakeInstance()
+          ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                         this->LG->GetMakefile()->GetBacktrace());
       return false;
       }
     if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -328,8 +334,9 @@ cmExportBuildFileGenerator
   e << "If the required target is not easy to reference in this call, "
     << "consider using the APPEND option with multiple separate calls.";
 
-  this->Makefile->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+  this->LG->GetGlobalGenerator()->GetCMakeInstance()
+      ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                     this->LG->GetMakefile()->GetBacktrace());
 }
 
 std::string
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index ff3d2e1..16695f1 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -43,10 +43,7 @@ public:
   /** Set whether to append generated code to the output file.  */
   void SetAppendMode(bool append) { this->AppendMode = append; }
 
-  void SetMakefile(cmMakefile *mf) {
-    this->Makefile = mf;
-    this->Backtrace = this->Makefile->GetBacktrace();
-  }
+  void Compute(cmLocalGenerator* lg);
 
 protected:
   // Implement virtual methods from the superclass.
@@ -80,8 +77,7 @@ protected:
   std::vector<std::string> Targets;
   cmExportSet *ExportSet;
   std::vector<cmGeneratorTarget*> Exports;
-  cmMakefile* Makefile;
-  cmListFileBacktrace Backtrace;
+  cmLocalGenerator* LG;
 };
 
 #endif
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 6a1d7f3..c2d9cc4 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -221,7 +221,7 @@ bool cmExportCommand
     {
     ebfg->SetTargets(targets);
     }
-  ebfg->SetMakefile(this->Makefile);
+  this->Makefile->AddExportBuildFileGenerator(ebfg);
   ebfg->SetExportOld(this->ExportOld.IsEnabled());
 
   // Compute the set of configurations exported.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6750611..a61515a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1226,6 +1226,20 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
   return false;
 }
 
+void cmGlobalGenerator::ComputeBuildFileGenerators()
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmExportBuildFileGenerator*> gens =
+        this->Makefiles[i]->GetExportBuildFileGenerators();
+    for (std::vector<cmExportBuildFileGenerator*>::const_iterator it =
+         gens.begin(); it != gens.end(); ++it)
+      {
+      (*it)->Compute(this->LocalGenerators[i]);
+      }
+    }
+}
+
 bool cmGlobalGenerator::Compute()
 {
   // Some generators track files replaced during the Generate.
@@ -1255,6 +1269,8 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
+  this->ComputeBuildFileGenerators();
+
   unsigned int i;
 
   // Add generator specific helper commands
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 55e3766..294fca9 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -364,6 +364,8 @@ public:
 
   bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
 
+  void ComputeBuildFileGenerators();
+
   std::string MakeSilentFlag;
 protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 8890e2b..97d4d56 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -126,6 +126,7 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
+    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 73d3522..7d49661 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -702,6 +702,17 @@ cmMakefile::GetEvaluationFiles() const
   return this->EvaluationFiles;
 }
 
+std::vector<cmExportBuildFileGenerator*>
+cmMakefile::GetExportBuildFileGenerators() const
+{
+  return this->ExportBuildFileGenerators;
+}
+
+void cmMakefile::AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen)
+{
+  this->ExportBuildFileGenerators.push_back(gen);
+}
+
 namespace
 {
   struct file_not_persistent
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0a8dcd5..c55ee39 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -51,6 +51,7 @@ class cmake;
 class cmMakefileCall;
 class cmCMakePolicyCommand;
 class cmGeneratorExpressionEvaluationFile;
+class cmExportBuildFileGenerator;
 
 /** \class cmMakefile
  * \brief Process the input CMakeLists.txt file.
@@ -789,6 +790,10 @@ public:
                   bool inputIsContent);
   std::vector<cmGeneratorExpressionEvaluationFile*> GetEvaluationFiles() const;
 
+  std::vector<cmExportBuildFileGenerator*>
+  GetExportBuildFileGenerators() const;
+  void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
+
 protected:
   // add link libraries and directories to the target
   void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
@@ -882,6 +887,7 @@ private:
   mutable cmsys::RegularExpression cmNamedCurly;
 
   std::vector<cmMakefile*> UnConfiguredDirectories;
+  std::vector<cmExportBuildFileGenerator*> ExportBuildFileGenerators;
 
   std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f11b0d74e94a6587e2b4664defb6d1b93ce4b1f
commit 3f11b0d74e94a6587e2b4664defb6d1b93ce4b1f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:38:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:45:34 2015 +0200

    cmGeneratorExpression: Port interface to cmGeneratorTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 4a7a760..d6440ac 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -457,7 +457,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
   this->ReplaceInstallPrefix(dirs);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(dirs);
   std::string exportDirs = cge->Evaluate(target->GetLocalGenerator(), "",
-                                         false, target->Target);
+                                         false, target);
 
   if (cge->GetHadContextSensitiveCondition())
     {
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 3d302d0..f8dbe31 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -78,10 +78,11 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
 
   cmGeneratorTarget* gtgt =
       tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+  cmGeneratorTarget gDummyHead(&dummyHead, gtgt->GetLocalGenerator());
 
   std::string result = cge->Evaluate(gtgt->GetLocalGenerator(), this->Config,
-                                     false, &dummyHead,
-                                     gtgt->Target, &dagChecker);
+                                     false, &gDummyHead,
+                                     gtgt, &dagChecker);
 
   const std::set<cmTarget const*> &allTargets = cge->GetAllTargetsSeen();
   for(std::set<cmTarget const*>::const_iterator li = allTargets.begin();
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index ef1679f..d9f67f2 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -50,7 +50,7 @@ cmGeneratorExpression::~cmGeneratorExpression()
 //----------------------------------------------------------------------------
 const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
   const std::string& config, bool quiet,
-  cmTarget const* headTarget,
+  const cmGeneratorTarget* headTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
                        std::string const& language) const
 {
@@ -66,8 +66,8 @@ const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
 //----------------------------------------------------------------------------
 const char *cmCompiledGeneratorExpression::Evaluate(
   cmLocalGenerator* lg, const std::string& config, bool quiet,
-  cmTarget const* headTarget,
-  cmTarget const* currentTarget,
+  const cmGeneratorTarget* headTarget,
+  const cmGeneratorTarget* currentTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
   std::string const& language) const
 {
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index 8843e0a..d64d6ba 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -20,6 +20,7 @@
 #include <cmsys/auto_ptr.hxx>
 
 class cmTarget;
+class cmGeneratorTarget;
 class cmLocalGenerator;
 class cmListFileBacktrace;
 
@@ -80,13 +81,13 @@ class cmCompiledGeneratorExpression
 public:
   const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet = false,
-                       cmTarget const* headTarget = 0,
-                       cmTarget const* currentTarget = 0,
+                       cmGeneratorTarget const* headTarget = 0,
+                       cmGeneratorTarget const* currentTarget = 0,
                        cmGeneratorExpressionDAGChecker *dagChecker = 0,
                        std::string const& language = std::string()) const;
   const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet,
-                       cmTarget const* headTarget,
+                       cmGeneratorTarget const* headTarget,
                        cmGeneratorExpressionDAGChecker *dagChecker,
                        std::string const& language = std::string()) const;
 
diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index cd056a0..4daf4e9 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -11,11 +11,12 @@
 ============================================================================*/
 
 #include "cmGeneratorExpressionContext.h"
+#include "cmGeneratorTarget.h"
 
 cmGeneratorExpressionContext::cmGeneratorExpressionContext(
       cmLocalGenerator* lg, std::string const& config,
-      bool quiet, cmTarget const* headTarget,
-      cmTarget const* currentTarget,
+      bool quiet, cmGeneratorTarget const* headTarget,
+      const cmGeneratorTarget* currentTarget,
       bool evaluateForBuildsystem,
       cmListFileBacktrace const& backtrace,
       std::string const& language)
@@ -23,8 +24,8 @@ cmGeneratorExpressionContext::cmGeneratorExpressionContext(
     LG(lg),
     Config(config),
     Language(language),
-    HeadTarget(headTarget),
-    CurrentTarget(currentTarget),
+    HeadTarget(headTarget ? headTarget->Target : 0),
+    CurrentTarget(currentTarget ? currentTarget->Target : 0),
     Quiet(quiet),
     HadError(false),
     HadContextSensitiveCondition(false),
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index 5b6507d..bbf0fcf 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -19,14 +19,15 @@
 #include <string>
 
 class cmTarget;
+class cmGeneratorTarget;
 class cmLocalGenerator;
 
 //----------------------------------------------------------------------------
 struct cmGeneratorExpressionContext
 {
   cmGeneratorExpressionContext(cmLocalGenerator* lg, std::string const& config,
-                               bool quiet, cmTarget const* headTarget,
-                               cmTarget const* currentTarget,
+                               bool quiet, const cmGeneratorTarget* headTarget,
+                               cmGeneratorTarget const* currentTarget,
                                bool evaluateForBuildsystem,
                                cmListFileBacktrace const& backtrace,
                                std::string const& language);
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 61852ab..2797d10 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -19,7 +19,8 @@
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
     std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
-    cmTarget const* headTarget, cmTarget const* currentTarget,
+    cmGeneratorTarget const* headTarget,
+    cmGeneratorTarget const* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker)
 {
   cmGeneratorExpression ge(context->Backtrace);
@@ -862,8 +863,8 @@ getLinkedTargetsContent(
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
                                         target->GetLocalGenerator(),
                                         context,
-                                        headTarget->Target,
-                                        target->Target, dagChecker);
+                                        headTarget,
+                                        target, dagChecker);
     }
   linkedTargetsContent =
     cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1215,9 +1216,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     if(!interfacePropertyName.empty())
       {
+      cmGeneratorTarget* gHeadTarget =
+          context->LG->GetGlobalGenerator()->GetGeneratorTarget(headTarget);
       std::string result = this->EvaluateDependentExpression(prop,
                                         context->LG, context,
-                                        headTarget, target, &dagChecker);
+                                        gHeadTarget, gtgt, &dagChecker);
       if (!linkedTargetsContent.empty())
         {
         result += (result.empty() ? "" : ";") + linkedTargetsContent;
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index 22b6585..db65db1 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -56,7 +56,8 @@ struct cmGeneratorExpressionNode
   static std::string EvaluateDependentExpression(
     std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
-    cmTarget const* headTarget, cmTarget const* currentTarget,
+    const cmGeneratorTarget* headTarget,
+    const cmGeneratorTarget* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker);
 
   static const cmGeneratorExpressionNode* GetNode(
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 04b0d1f..6033efe 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -524,8 +524,8 @@ static void handleSystemIncludesDep(cmLocalGenerator *lg,
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(lg,
-                                      config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      config, false, headTarget,
+                                      depTgt, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
     {
@@ -538,8 +538,8 @@ static void handleSystemIncludesDep(cmLocalGenerator *lg,
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(lg,
-                                      config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      config, false, headTarget,
+                                      depTgt, dagChecker), result);
     }
 }
 
@@ -880,7 +880,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
       cmGeneratorExpression ge;
       cmSystemTools::ExpandListArgument(ge.Parse(*it)
                                           ->Evaluate(this->LocalGenerator,
-                                          config, false, this->Target,
+                                          config, false, this,
                                           &dagChecker), result);
       }
 
@@ -889,8 +889,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->LocalGenerator, *li,
-                              config, this,
+      handleSystemIncludesDep(this->LocalGenerator, *li, config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -966,8 +965,8 @@ static bool processSources(cmGeneratorTarget const* tgt,
                                               tgt->GetLocalGenerator(),
                                               config,
                                               false,
-                                              tgt->Target,
-                                              tgt->Target,
+                                              tgt,
+                                              tgt,
                                               dagChecker),
                                     entrySources);
 
@@ -2059,7 +2058,7 @@ void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result,
                                       ->Evaluate(this->LocalGenerator,
                                                 config,
                                                 false,
-                                                this->Target,
+                                                this,
                                                 &dagChecker),
                                   result);
 }
@@ -2544,7 +2543,7 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
                                         tgt->GetLocalGenerator(),
                                               config,
                                               false,
-                                              tgt->Target,
+                                              tgt,
                                               dagChecker, language),
                                     entryIncludes);
 
@@ -2755,7 +2754,7 @@ static void processCompileOptionsInternal(cmGeneratorTarget const* tgt,
                                         tgt->GetLocalGenerator(),
                                               config,
                                               false,
-                                              tgt->Target,
+                                              tgt,
                                               dagChecker,
                                               language),
                                     entryOptions);
@@ -4455,8 +4454,8 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
                                       this->LocalGenerator,
                                       config,
                                       false,
-                                      headTarget->Target,
-                                      this->Target, &dagChecker), libs);
+                                      headTarget,
+                                      this, &dagChecker), libs);
   this->LookupLinkItems(libs, items);
   hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition();
 }
@@ -5347,8 +5346,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
     cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
       ge.Parse(*le);
     std::string const evaluated =
-      cge->Evaluate(this->LocalGenerator, config, false,
-                    head->Target, &dagChecker);
+      cge->Evaluate(this->LocalGenerator, config, false, head, &dagChecker);
     cmSystemTools::ExpandListArgument(evaluated, llibs);
     if(cge->GetHadHeadSensitiveCondition())
       {
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b896659..abcda21 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -149,7 +149,9 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
 
     cmSystemTools::ExpandListArgument(cge->Evaluate(this->LocalGenerator,
                                                     config,
-                                                  false, this->Target, 0, 0),
+                                                    false,
+                                                    this->GeneratorTarget,
+                                                    0, 0),
                                       this->CleanFiles);
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce09d3f70c8ed86cf3afa911b06038ca31767b88
commit ce09d3f70c8ed86cf3afa911b06038ca31767b88
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 25 16:56:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:45:16 2015 +0200

    cmGeneratorExpression: Port to cmLocalGenerator.

diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx
index cbcdd81..35b3d59 100644
--- a/Source/cmCPackPropertiesGenerator.cxx
+++ b/Source/cmCPackPropertiesGenerator.cxx
@@ -18,7 +18,7 @@ void cmCPackPropertiesGenerator::GenerateScriptForConfig(std::ostream& os,
   const std::string& config, Indent const& indent)
 {
   std::string const& expandedFileName =
-      this->InstalledFile.GetNameExpression().Evaluate(this->LG->GetMakefile(),
+      this->InstalledFile.GetNameExpression().Evaluate(this->LG,
                                                        config);
 
   cmInstalledFile::PropertyMapType const& properties =
@@ -38,7 +38,7 @@ void cmCPackPropertiesGenerator::GenerateScriptForConfig(std::ostream& os,
       j = property.ValueExpressions.begin();
       j != property.ValueExpressions.end(); ++j)
       {
-      std::string value = (*j)->Evaluate(LG->GetMakefile(), config);
+      std::string value = (*j)->Evaluate(this->LG, config);
       os << " " << cmOutputConverter::EscapeForCMake(value);
       }
 
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 4b6bd50..7f02afe 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -50,8 +50,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
     {
     return target->GetLocation(this->Config);
     }
-  return this->GE->Parse(argv0)->Evaluate(this->LG->GetMakefile(),
-                                          this->Config);
+  return this->GE->Parse(argv0)->Evaluate(this->LG, this->Config);
 }
 
 //----------------------------------------------------------------------------
@@ -92,7 +91,7 @@ cmCustomCommandGenerator
   for(unsigned int j=1;j < commandLine.size(); ++j)
     {
     std::string arg =
-        this->GE->Parse(commandLine[j])->Evaluate(this->LG->GetMakefile(),
+        this->GE->Parse(commandLine[j])->Evaluate(this->LG,
                                                   this->Config);
     cmd += " ";
     if(this->OldStyle)
@@ -146,7 +145,7 @@ std::vector<std::string> const& cmCustomCommandGenerator::GetDepends() const
                                               = this->GE->Parse(*i);
       std::vector<std::string> result;
       cmSystemTools::ExpandListArgument(
-            cge->Evaluate(this->LG->GetMakefile(), this->Config), result);
+            cge->Evaluate(this->LG, this->Config), result);
       for (std::vector<std::string>::iterator it = result.begin();
           it != result.end(); ++it)
         {
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b29429e..4a7a760 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -456,7 +456,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                             true);
   this->ReplaceInstallPrefix(dirs);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(dirs);
-  std::string exportDirs = cge->Evaluate(target->Target->GetMakefile(), "",
+  std::string exportDirs = cge->Evaluate(target->GetLocalGenerator(), "",
                                          false, target->Target);
 
   if (cge->GetHadContextSensitiveCondition())
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 026584c..3d302d0 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -79,7 +79,7 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
   cmGeneratorTarget* gtgt =
       tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
 
-  std::string result = cge->Evaluate(gtgt->Target->GetMakefile(), this->Config,
+  std::string result = cge->Evaluate(gtgt->GetLocalGenerator(), this->Config,
                                      false, &dummyHead,
                                      gtgt->Target, &dagChecker);
 
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 80a4f81..ef1679f 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -48,13 +48,13 @@ cmGeneratorExpression::~cmGeneratorExpression()
 }
 
 //----------------------------------------------------------------------------
-const char *cmCompiledGeneratorExpression::Evaluate(
-  cmMakefile* mf, const std::string& config, bool quiet,
+const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
+  const std::string& config, bool quiet,
   cmTarget const* headTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
                        std::string const& language) const
 {
-  return this->Evaluate(mf,
+  return this->Evaluate(lg,
                         config,
                         quiet,
                         headTarget,
@@ -65,13 +65,13 @@ const char *cmCompiledGeneratorExpression::Evaluate(
 
 //----------------------------------------------------------------------------
 const char *cmCompiledGeneratorExpression::Evaluate(
-  cmMakefile* mf, const std::string& config, bool quiet,
+  cmLocalGenerator* lg, const std::string& config, bool quiet,
   cmTarget const* headTarget,
   cmTarget const* currentTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
   std::string const& language) const
 {
-  cmGeneratorExpressionContext context(mf, config, quiet, headTarget,
+  cmGeneratorExpressionContext context(lg, config, quiet, headTarget,
                                   currentTarget ? currentTarget : headTarget,
                                   this->EvaluateForBuildsystem,
                                   this->Backtrace, language);
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index cd19bc0..8843e0a 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -20,7 +20,7 @@
 #include <cmsys/auto_ptr.hxx>
 
 class cmTarget;
-class cmMakefile;
+class cmLocalGenerator;
 class cmListFileBacktrace;
 
 struct cmGeneratorExpressionEvaluator;
@@ -78,13 +78,13 @@ private:
 class cmCompiledGeneratorExpression
 {
 public:
-  const char* Evaluate(cmMakefile* mf, const std::string& config,
+  const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet = false,
                        cmTarget const* headTarget = 0,
                        cmTarget const* currentTarget = 0,
                        cmGeneratorExpressionDAGChecker *dagChecker = 0,
                        std::string const& language = std::string()) const;
-  const char* Evaluate(cmMakefile* mf, const std::string& config,
+  const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet,
                        cmTarget const* headTarget,
                        cmGeneratorExpressionDAGChecker *dagChecker,
diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index 947015e..cd056a0 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -13,14 +13,14 @@
 #include "cmGeneratorExpressionContext.h"
 
 cmGeneratorExpressionContext::cmGeneratorExpressionContext(
-      cmMakefile* mf, std::string const& config,
+      cmLocalGenerator* lg, std::string const& config,
       bool quiet, cmTarget const* headTarget,
       cmTarget const* currentTarget,
       bool evaluateForBuildsystem,
       cmListFileBacktrace const& backtrace,
       std::string const& language)
   : Backtrace(backtrace),
-    Makefile(mf),
+    LG(lg),
     Config(config),
     Language(language),
     HeadTarget(headTarget),
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index ed83509..5b6507d 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -19,11 +19,12 @@
 #include <string>
 
 class cmTarget;
+class cmLocalGenerator;
 
 //----------------------------------------------------------------------------
 struct cmGeneratorExpressionContext
 {
-  cmGeneratorExpressionContext(cmMakefile* mf, std::string const& config,
+  cmGeneratorExpressionContext(cmLocalGenerator* lg, std::string const& config,
                                bool quiet, cmTarget const* headTarget,
                                cmTarget const* currentTarget,
                                bool evaluateForBuildsystem,
@@ -38,7 +39,7 @@ struct cmGeneratorExpressionContext
   std::set<cmTarget const*> SourceSensitiveTargets;
   std::map<cmTarget const*, std::map<std::string, std::string> >
                                                           MaxLanguageStandard;
-  cmMakefile *Makefile;
+  cmLocalGenerator *LG;
   std::string Config;
   std::string Language;
   cmTarget const* HeadTarget; // The target whose property is being evaluated.
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 851aacd..5eed89d 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -13,6 +13,7 @@
 #include "cmGeneratorExpressionDAGChecker.h"
 
 #include "cmMakefile.h"
+#include "cmLocalGenerator.h"
 #include "cmAlgorithms.h"
 
 //----------------------------------------------------------------------------
@@ -110,7 +111,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
       << "  " << expr << "\n"
       << "Self reference on target \""
       << context->HeadTarget->GetName() << "\".\n";
-    context->Makefile->GetCMakeInstance()
+    context->LG->GetCMakeInstance()
       ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                       parent->Backtrace);
     return;
@@ -121,7 +122,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
   e << "Error evaluating generator expression:\n"
     << "  " << expr << "\n"
     << "Dependency loop found.";
-  context->Makefile->GetCMakeInstance()
+  context->LG->GetCMakeInstance()
     ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                     context->Backtrace);
   }
@@ -134,7 +135,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
       << "  "
       << (parent->Content ? parent->Content->GetOriginalExpression() : expr)
       << "\n";
-    context->Makefile->GetCMakeInstance()
+    context->LG->GetCMakeInstance()
       ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                       parent->Backtrace);
     parent = parent->Parent;
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 8ac5cbc..4ac2a0d 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -44,7 +44,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator* lg,
   std::string rawCondition = this->Condition->GetInput();
   if (!rawCondition.empty())
     {
-    std::string condResult = this->Condition->Evaluate(lg->GetMakefile(),
+    std::string condResult = this->Condition->Evaluate(lg,
                                                        config,
                                                        false, 0, 0, 0, lang);
     if (condResult == "0")
@@ -62,10 +62,10 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator* lg,
     }
 
   const std::string outputFileName
-                    = this->OutputFileExpr->Evaluate(lg->GetMakefile(), config,
+                    = this->OutputFileExpr->Evaluate(lg, config,
                                                      false, 0, 0, 0, lang);
   const std::string outputContent
-                          = inputExpression->Evaluate(lg->GetMakefile(),
+                          = inputExpression->Evaluate(lg,
                                                       config,
                                                       false, 0, 0, 0, lang);
 
@@ -110,7 +110,7 @@ void cmGeneratorExpressionEvaluationFile::CreateOutputFile(
   for(std::vector<std::string>::const_iterator le = enabledLanguages.begin();
       le != enabledLanguages.end(); ++le)
     {
-    std::string name = this->OutputFileExpr->Evaluate(lg->GetMakefile(),
+    std::string name = this->OutputFileExpr->Evaluate(lg,
                                                       config,
                                                       false, 0, 0, 0, *le);
     cmSourceFile* sf = lg->GetMakefile()->GetOrCreateSource(name);
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 88d10aa..61852ab 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -17,7 +17,7 @@
 
 //----------------------------------------------------------------------------
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
-    std::string const& prop, cmMakefile *makefile,
+    std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
     cmTarget const* headTarget, cmTarget const* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker)
@@ -25,7 +25,7 @@ std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
   cmGeneratorExpression ge(context->Backtrace);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(prop);
   cge->SetEvaluateForBuildsystem(context->EvaluateForBuildsystem);
-  std::string result = cge->Evaluate(makefile,
+  std::string result = cge->Evaluate(lg,
                         context->Config,
                         context->Quiet,
                         headTarget,
@@ -367,7 +367,8 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
                        const std::string &lang) const
   {
     const char *compilerId =
-      context->Makefile->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID");
+      context->LG->GetMakefile()
+        ->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID");
     if (parameters.empty())
       {
       return compilerId ? compilerId : "";
@@ -391,13 +392,13 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
 
     if (cmsysString_strcasecmp(parameters.begin()->c_str(), compilerId) == 0)
       {
-      switch(context->Makefile->GetPolicyStatus(cmPolicies::CMP0044))
+      switch(context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0044))
         {
         case cmPolicies::WARN:
           {
           std::ostringstream e;
           e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0044);
-          context->Makefile->GetCMakeInstance()
+          context->LG->GetCMakeInstance()
                  ->IssueMessage(cmake::AUTHOR_WARNING,
                                 e.str(), context->Backtrace);
           }
@@ -470,8 +471,9 @@ struct CompilerVersionNode : public cmGeneratorExpressionNode
                        cmGeneratorExpressionDAGChecker *,
                        const std::string &lang) const
   {
-    const char *compilerVersion = context->Makefile->GetSafeDefinition(
-        "CMAKE_" + lang + "_COMPILER_VERSION");
+    const char *compilerVersion =
+        context->LG->GetMakefile()->GetSafeDefinition(
+          "CMAKE_" + lang + "_COMPILER_VERSION");
     if (parameters.empty())
       {
       return compilerVersion ? compilerVersion : "";
@@ -553,7 +555,7 @@ struct PlatformIdNode : public cmGeneratorExpressionNode
                        cmGeneratorExpressionDAGChecker *) const
   {
     const char *platformId =
-      context->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME");
+      context->LG->GetMakefile()->GetSafeDefinition("CMAKE_SYSTEM_NAME");
     if (parameters.empty())
       {
       return platformId ? platformId : "";
@@ -768,7 +770,7 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
       }
 
     std::vector<std::string> enabledLanguages;
-    cmGlobalGenerator* gg = context->Makefile->GetGlobalGenerator();
+    cmGlobalGenerator* gg = context->LG->GetGlobalGenerator();
     gg->GetEnabledLanguages(enabledLanguages);
     if (!parameters.empty() &&
           std::find(enabledLanguages.begin(), enabledLanguages.end(),
@@ -858,7 +860,7 @@ getLinkedTargetsContent(
     {
     linkedTargetsContent =
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
-                                        target->Target->GetMakefile(),
+                                        target->GetLocalGenerator(),
                                         context,
                                         headTarget->Target,
                                         target->Target, dagChecker);
@@ -940,16 +942,17 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         }
       if(propertyName == "ALIASED_TARGET")
         {
-        if(context->Makefile->IsAlias(targetName))
+        if(context->LG->GetMakefile()->IsAlias(targetName))
           {
-          if(cmTarget* tgt = context->Makefile->FindTargetToUse(targetName))
+          if(cmTarget* tgt =
+             context->LG->GetMakefile()->FindTargetToUse(targetName))
             {
             return tgt->GetName();
             }
           }
         return "";
         }
-      target = context->Makefile->FindTargetToUse(targetName);
+      target = context->LG->GetMakefile()->FindTargetToUse(targetName);
 
       if (!target)
         {
@@ -994,7 +997,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     assert(target);
 
     cmGeneratorTarget* gtgt =
-        context->Makefile->GetGlobalGenerator()->GetGeneratorTarget(target);
+        context->LG->GetGlobalGenerator()->GetGeneratorTarget(target);
 
     if (propertyName == "LINKER_LANGUAGE")
       {
@@ -1099,7 +1102,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
                            "COMPILE_DEFINITIONS_"))
       {
       cmPolicies::PolicyStatus polSt =
-                      context->Makefile->GetPolicyStatus(cmPolicies::CMP0043);
+          context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0043);
       if (polSt == cmPolicies::WARN || polSt == cmPolicies::OLD)
         {
         interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";
@@ -1112,7 +1115,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if(isInterfaceProperty)
       {
       cmGeneratorTarget* gHeadTarget =
-          context->Makefile->GetGlobalGenerator()
+          context->LG->GetGlobalGenerator()
           ->GetGeneratorTarget(headTarget);
       if(cmLinkInterfaceLibraries const* iface =
          gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
@@ -1213,7 +1216,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if(!interfacePropertyName.empty())
       {
       std::string result = this->EvaluateDependentExpression(prop,
-                                        context->Makefile, context,
+                                        context->LG, context,
                                         headTarget, target, &dagChecker);
       if (!linkedTargetsContent.empty())
         {
@@ -1269,7 +1272,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
 
     std::string tgtName = parameters.front();
     cmGeneratorTarget* gt =
-                context->Makefile->FindGeneratorTargetToUse(tgtName);
+                context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
       std::ostringstream e;
@@ -1312,7 +1315,8 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
       assert(!map_it->second.empty());
       result += sep;
       std::string objFile = obj_dir + map_it->second;
-      cmSourceFile* sf = context->Makefile->GetOrCreateSource(objFile, true);
+      cmSourceFile* sf =
+          context->LG->GetMakefile()->GetOrCreateSource(objFile, true);
       sf->SetObjectLibrary(tgtName);
       sf->SetProperty("EXTERNAL_OBJECT", "1");
       result += objFile;
@@ -1354,7 +1358,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       {
       std::string error;
       std::string lang;
-      if (!context->Makefile->CompileFeatureKnown(context->HeadTarget,
+      if (!context->LG->GetMakefile()->CompileFeatureKnown(context->HeadTarget,
                                                   *it, lang, &error))
         {
         reportError(context, content->GetOriginalExpression(), error);
@@ -1365,7 +1369,8 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       if (availableFeatures.find(lang) == availableFeatures.end())
         {
         const char* featuresKnown
-                  = context->Makefile->CompileFeaturesAvailable(lang, &error);
+            = context->LG->GetMakefile()->CompileFeaturesAvailable(lang,
+                                                                   &error);
         if (!featuresKnown)
           {
           reportError(context, content->GetOriginalExpression(), error);
@@ -1383,7 +1388,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       {
       std::vector<std::string> const& langAvailable
                                               = availableFeatures[lit->first];
-      const char* standardDefault = context->Makefile
+      const char* standardDefault = context->LG->GetMakefile()
         ->GetDefinition("CMAKE_" + lit->first + "_STANDARD_DEFAULT");
       for (std::vector<std::string>::const_iterator it = lit->second.begin();
           it != lit->second.end(); ++it)
@@ -1399,7 +1404,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
           // All features known for the language are always available.
           continue;
           }
-        if (!context->Makefile->HaveStandardAvailable(target,
+        if (!context->LG->GetMakefile()->HaveStandardAvailable(target,
                                                       lit->first, *it))
           {
           if (evalLL)
@@ -1617,7 +1622,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
 
     std::string pdbSupportVar = "CMAKE_" + language + "_LINKER_SUPPORTS_PDB";
 
-    if(!context->Makefile->IsOn(pdbSupportVar))
+    if(!context->LG->GetMakefile()->IsOn(pdbSupportVar))
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_PDB_FILE is not supported by the target linker.");
@@ -1731,7 +1736,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       return std::string();
       }
     cmGeneratorTarget* target =
-        context->Makefile->FindGeneratorTargetToUse(name);
+        context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
     if(!target)
       {
       ::reportError(context, content->GetOriginalExpression(),
@@ -1813,7 +1818,7 @@ static const struct ShellPathNode : public cmGeneratorExpressionNode
                   "\"" + parameters.front() + "\" is not an absolute path.");
       return std::string();
       }
-    cmOutputConverter converter(context->Makefile->GetStateSnapshot());
+    cmOutputConverter converter(context->LG->GetStateSnapshot());
     return converter.ConvertDirectorySeparatorsForShell(parameters.front());
   }
 } shellPathNode;
@@ -1897,7 +1902,7 @@ void reportError(cmGeneratorExpressionContext *context,
   e << "Error evaluating generator expression:\n"
     << "  " << expr << "\n"
     << result;
-  context->Makefile->GetCMakeInstance()
+  context->LG->GetCMakeInstance()
     ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                     context->Backtrace);
 }
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index 847a00a..22b6585 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -54,7 +54,7 @@ struct cmGeneratorExpressionNode
                               ) const = 0;
 
   static std::string EvaluateDependentExpression(
-    std::string const& prop, cmMakefile *makefile,
+    std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
     cmTarget const* headTarget, cmTarget const* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1699362..04b0d1f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -453,7 +453,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
     // Now evaluate genex and update the previously-prepared map entry.
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(outName);
-    i->second = cge->Evaluate(this->Makefile, config);
+    i->second = cge->Evaluate(this->LocalGenerator, config);
     }
   else if(i->second.empty())
     {
@@ -510,7 +510,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
   return 0;
 }
 
-static void handleSystemIncludesDep(cmMakefile *mf,
+static void handleSystemIncludesDep(cmLocalGenerator *lg,
                                   cmGeneratorTarget const* depTgt,
                                   const std::string& config,
                                   cmGeneratorTarget const* headTarget,
@@ -523,7 +523,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     {
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
-                                      ->Evaluate(mf,
+                                      ->Evaluate(lg,
                                       config, false, headTarget->Target,
                                       depTgt->Target, dagChecker), result);
     }
@@ -537,7 +537,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     {
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
-                                      ->Evaluate(mf,
+                                      ->Evaluate(lg,
                                       config, false, headTarget->Target,
                                       depTgt->Target, dagChecker), result);
     }
@@ -879,7 +879,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
       {
       cmGeneratorExpression ge;
       cmSystemTools::ExpandListArgument(ge.Parse(*it)
-                                          ->Evaluate(this->Makefile,
+                                          ->Evaluate(this->LocalGenerator,
                                           config, false, this->Target,
                                           &dagChecker), result);
       }
@@ -889,7 +889,8 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, *li, config, this,
+      handleSystemIncludesDep(this->LocalGenerator, *li,
+                              config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -961,7 +962,8 @@ static bool processSources(cmGeneratorTarget const* tgt,
     cmLinkImplItem const& item = (*it)->LinkImplItem;
     std::string const& targetName = item;
     std::vector<std::string> entrySources;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(
+                                              tgt->GetLocalGenerator(),
                                               config,
                                               false,
                                               tgt->Target,
@@ -2054,7 +2056,7 @@ void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result,
                                       this->GetName(),
                                       "AUTOUIC_OPTIONS", 0, 0);
   cmSystemTools::ExpandListArgument(ge.Parse(prop)
-                                      ->Evaluate(this->Makefile,
+                                      ->Evaluate(this->LocalGenerator,
                                                 config,
                                                 false,
                                                 this->Target,
@@ -2376,7 +2378,7 @@ cmTargetTraceDependencies
       {
       const cmsys::auto_ptr<cmCompiledGeneratorExpression> cge
                                                               = ge.Parse(*cli);
-      cge->Evaluate(this->Makefile, "", true);
+      cge->Evaluate(this->GeneratorTarget->GetLocalGenerator(), "", true);
       std::set<cmTarget*> geTargets = cge->GetTargets();
       targets.insert(geTargets.begin(), geTargets.end());
       }
@@ -2530,8 +2532,6 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
       const std::string& config, bool debugIncludes,
       const std::string& language)
 {
-  cmMakefile *mf = tgt->Target->GetMakefile();
-
   for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator
       it = entries.begin(), end = entries.end(); it != end; ++it)
     {
@@ -2540,7 +2540,8 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
     bool const fromImported = item.Target && item.Target->IsImported();
     bool const checkCMP0027 = item.FromGenex;
     std::vector<std::string> entryIncludes;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(
+                                        tgt->GetLocalGenerator(),
                                               config,
                                               false,
                                               tgt->Target,
@@ -2746,13 +2747,12 @@ static void processCompileOptionsInternal(cmGeneratorTarget const* tgt,
       const std::string& config, bool debugOptions, const char *logName,
       std::string const& language)
 {
-  cmMakefile *mf = tgt->Target->GetMakefile();
-
   for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator
       it = entries.begin(), end = entries.end(); it != end; ++it)
     {
     std::vector<std::string> entryOptions;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(
+                                        tgt->GetLocalGenerator(),
                                               config,
                                               false,
                                               tgt->Target,
@@ -4452,7 +4452,7 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
   std::vector<std::string> libs;
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
   cmSystemTools::ExpandListArgument(cge->Evaluate(
-                                      this->Makefile,
+                                      this->LocalGenerator,
                                       config,
                                       false,
                                       headTarget->Target,
@@ -4777,7 +4777,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
       ge.Parse(config_outdir);
-    out = cge->Evaluate(this->Makefile, config);
+    out = cge->Evaluate(this->LocalGenerator, config);
 
     // Skip per-configuration subdirectory.
     conf = "";
@@ -4788,7 +4788,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
       ge.Parse(outdir);
-    out = cge->Evaluate(this->Makefile, config);
+    out = cge->Evaluate(this->LocalGenerator, config);
 
     // Skip per-configuration subdirectory if the value contained a
     // generator expression.
@@ -5347,7 +5347,8 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
     cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
       ge.Parse(*le);
     std::string const evaluated =
-      cge->Evaluate(this->Makefile, config, false, head->Target, &dagChecker);
+      cge->Evaluate(this->LocalGenerator, config, false,
+                    head->Target, &dagChecker);
     cmSystemTools::ExpandListArgument(evaluated, llibs);
     if(cge->GetHadHeadSensitiveCondition())
       {
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index 78cb5f0..edd6a0e 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -97,5 +97,5 @@ cmInstallDirectoryGenerator::GetDestination(std::string const& config) const
 {
   cmGeneratorExpression ge;
   return ge.Parse(this->Destination)
-    ->Evaluate(this->LocalGenerator->GetMakefile(), config);
+    ->Evaluate(this->LocalGenerator, config);
 }
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index e2c16c8..383031b 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -68,7 +68,7 @@ cmInstallFilesGenerator::GetDestination(std::string const& config) const
 {
   cmGeneratorExpression ge;
   return ge.Parse(this->Destination)
-    ->Evaluate(this->LocalGenerator->GetMakefile(), config);
+    ->Evaluate(this->LocalGenerator, config);
 }
 
 //----------------------------------------------------------------------------
@@ -117,7 +117,7 @@ void cmInstallFilesGenerator::GenerateScriptForConfig(std::ostream& os,
     {
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*i);
     cmSystemTools::ExpandListArgument(cge->Evaluate(
-        this->LocalGenerator->GetMakefile(), config), files);
+        this->LocalGenerator, config), files);
     }
   this->AddFilesInstallRule(os, config, indent, files);
 }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index c2a18af..a3d2927 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -351,7 +351,7 @@ cmInstallTargetGenerator::GetDestination(std::string const& config) const
 {
   cmGeneratorExpression ge;
   return ge.Parse(this->Destination)
-    ->Evaluate(this->Target->Target->GetMakefile(), config);
+    ->Evaluate(this->Target->GetLocalGenerator(), config);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 4ddcac6..b896659 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -147,7 +147,8 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
                                             ge.Parse(additional_clean_files);
 
-    cmSystemTools::ExpandListArgument(cge->Evaluate(this->Makefile, config,
+    cmSystemTools::ExpandListArgument(cge->Evaluate(this->LocalGenerator,
+                                                    config,
                                                   false, this->Target, 0, 0),
                                       this->CleanFiles);
     }
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 9d85f5a..7dec50b 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -117,7 +117,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   else
     {
     // Use the command name given.
-    exe = ge.Parse(exe.c_str())->Evaluate(this->LG->GetMakefile(), config);
+    exe = ge.Parse(exe.c_str())->Evaluate(this->LG, config);
     cmSystemTools::ConvertToUnixSlashes(exe);
     }
 
@@ -128,7 +128,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
     {
     os << " " << cmOutputConverter::EscapeForCMake(
                                          ge.Parse(*ci)->Evaluate(
-                                            this->LG->GetMakefile(), config));
+                                            this->LG, config));
     }
 
   // Finish the test command.
@@ -145,7 +145,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
       {
       os << " " << i->first
          << " " << cmOutputConverter::EscapeForCMake(
-           ge.Parse(i->second.GetValue())->Evaluate(this->LG->GetMakefile(),
+           ge.Parse(i->second.GetValue())->Evaluate(this->LG,
                                                     config));
       }
     os << ")" << std::endl;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 12 15:49:02 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 12 Oct 2015 15:49:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-488-g903a1bc
Message-ID: <20151012194902.96ED9BFE1C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  903a1bcdac07460526f3e175af3e66c32e1f23a6 (commit)
       via  8ed591d59edbd7b2c088105de9ee07a501558d35 (commit)
      from  4d977ac509c73b78cd999f92952e2c8c322b2199 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=903a1bcdac07460526f3e175af3e66c32e1f23a6
commit 903a1bcdac07460526f3e175af3e66c32e1f23a6
Merge: 4d977ac 8ed591d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 15:49:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:49:01 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    8ed591d5 fixup! cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ed591d59edbd7b2c088105de9ee07a501558d35
commit 8ed591d59edbd7b2c088105de9ee07a501558d35
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 21:48:35 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:48:35 2015 +0200

    fixup! cmMakefile: Store container of cmExportBuildFileGenerators.

diff --git a/bootstrap b/bootstrap
index ca86528..54f7ca6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -261,6 +261,7 @@ CMAKE_CXX_SOURCES="\
   cmPropertyDefinitionMap \
   cmMakeDepend \
   cmMakefile \
+  cmExportBuildFileGenerator \
   cmExportFileGenerator \
   cmExportInstallFileGenerator \
   cmExportTryCompileFileGenerator \

-----------------------------------------------------------------------

Summary of changes:
 bootstrap |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 12 15:49:04 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 12 Oct 2015 15:49:04 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-490-gc75a21e
Message-ID: <20151012194904.77F80BFE35@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c75a21e18747dd824d0d5303b0e8c75ad09dd631 (commit)
       via  24aafbde115647b7e599d112d0bcc4f03c3e9b88 (commit)
      from  903a1bcdac07460526f3e175af3e66c32e1f23a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c75a21e18747dd824d0d5303b0e8c75ad09dd631
commit c75a21e18747dd824d0d5303b0e8c75ad09dd631
Merge: 903a1bc 24aafbd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 15:49:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:49:03 2015 -0400

    Merge topic 'xcode-adjust-deployment-to-host-version' into next
    
    24aafbde Xcode: Adjust deployment target SDK version to host version


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24aafbde115647b7e599d112d0bcc4f03c3e9b88
commit 24aafbde115647b7e599d112d0bcc4f03c3e9b88
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Oct 11 12:07:25 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 12 15:31:10 2015 -0400

    Xcode: Adjust deployment target SDK version to host version
    
    If the automatically selected SDK is newer than the host OS version
    and no deployment version has been set then adjust the deployment
    version to the host OS version. Otherwise the user won't be able to
    launch the executables on the build host.
    
    This is for example a problem on a MacOSX 10.10 host with Xcode 7
    which only provides a MacOSX10.11 SDK.

diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
index 62fb985..a08411b 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -100,6 +100,10 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
         "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"."
         )
     endif()
+    if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET)
+      set(CMAKE_OSX_DEPLOYMENT_TARGET ${_CURRENT_OSX_VERSION} CACHE STRING
+        "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value." FORCE)
+    endif()
   else()
     # Assume developer files are in root (such as Xcode 4.5 command-line tools).
     set(_CMAKE_OSX_SYSROOT_DEFAULT "")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 12 15:49:43 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 12 Oct 2015 15:49:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-493-gc8b072e
Message-ID: <20151012194943.6F35EBFE48@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c8b072eff94c5cc168996a318d329fd9129476d7 (commit)
       via  05e3076bf14fde75c27324d6979cde3dfb7f792c (commit)
       via  04f953f3f96def0a62979668c1e7e61f9be22be4 (commit)
      from  c75a21e18747dd824d0d5303b0e8c75ad09dd631 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8b072eff94c5cc168996a318d329fd9129476d7
commit c8b072eff94c5cc168996a318d329fd9129476d7
Merge: c75a21e 05e3076
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 15:49:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:49:42 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    05e3076b cmLocalGenerator: Store cmGeneratorTargets.
    04f953f3 cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05e3076bf14fde75c27324d6979cde3dfb7f792c
commit 05e3076bf14fde75c27324d6979cde3dfb7f792c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:21:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:49:24 2015 +0200

    cmLocalGenerator: Store cmGeneratorTargets.
    
    Relieve cmMakefile of this responsibility.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f02afe..618f09f 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -43,7 +43,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
 {
   std::string const& argv0 = this->CC.GetCommandLines()[c][0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(argv0);
+      this->LG->FindGeneratorTargetToUse(argv0);
   if(target && target->GetType() == cmTarget::EXECUTABLE &&
      (target->Target->IsImported()
       || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 560cfc5..6c3cccd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -42,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->LG->GetMakefile()
+    cmGeneratorTarget *te = this->LG
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index fdfa35e..b7aeb02 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,8 +965,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmGeneratorTargetsType targets = (*it)->GetMakefile()
-                                        ->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
     for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2797d10..fe83b08 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1275,7 +1275,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
 
     std::string tgtName = parameters.front();
     cmGeneratorTarget* gt =
-                context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
+                context->LG->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
       std::ostringstream e;
@@ -1739,7 +1739,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       return std::string();
       }
     cmGeneratorTarget* target =
-        context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
+        context->LG->FindGeneratorTargetToUse(name);
     if(!target)
       {
       ::reportError(context, content->GetOriginalExpression(),
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6033efe..6bebc2b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2305,7 +2305,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
 
   // Check for a target with this name.
   if(cmGeneratorTarget* t
-                    = this->Makefile->FindGeneratorTargetToUse(util))
+                    = this->GeneratorTarget->
+                    GetLocalGenerator()->FindGeneratorTargetToUse(util))
     {
     // If we find the target and the dep was given as a full path,
     // then make sure it was not a full path to something else, and
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a61515a..8f5e84a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1568,7 +1568,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     this->GeneratorTargets[*j] = gt;
     generatorTargets[*j] = gt;
     }
-  mf->SetGeneratorTargets(generatorTargets);
+  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 87cf58f..45a1509 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -287,7 +287,7 @@ void cmGlobalGhsMultiGenerator::Generate()
       {
       cmLocalGhsMultiGenerator *lg =
         static_cast<cmLocalGhsMultiGenerator *>(this->LocalGenerators[i]);
-      cmGeneratorTargetsType tgts = lg->GetMakefile()->GetGeneratorTargets();
+      cmGeneratorTargetsType tgts = lg->GetGeneratorTargets();
       this->UpdateBuildFiles(&tgts);
       }
     }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f955ef7..ed36634 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,8 +68,7 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      cmMakefile* makefile=(*lg)->GetMakefile();
-      cmGeneratorTargetsType const& targets = makefile->GetGeneratorTargets();
+      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
       for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
            ti != targets.end(); ti++)
         {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 218e702..f9740e5 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -461,7 +461,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
@@ -627,7 +627,7 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
     for(cmGeneratorTargetsType::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
@@ -728,7 +728,7 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 6a25ed0..cb30c4e 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -108,7 +108,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
           i != gen.end(); ++i)
         {
         cmGeneratorTargetsType targets =
-            (*i)->GetMakefile()->GetGeneratorTargets();
+            (*i)->GetGeneratorTargets();
         for(cmGeneratorTargetsType::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f19d551..3691b41 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,7 +132,7 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -448,6 +448,13 @@ void cmLocalGenerator::GenerateInstallRules()
     }
 }
 
+
+void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+{
+  this->GeneratorTargets[t] = gt;
+  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
+}
+
 //----------------------------------------------------------------------------
 void cmLocalGenerator::ComputeTargetManifest()
 {
@@ -460,7 +467,7 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -1767,6 +1774,17 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
+{
+  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+    {
+    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    }
+  return 0;
+}
+
+//----------------------------------------------------------------------------
 bool cmLocalGenerator::GetRealDependency(const std::string& inName,
                                          const std::string& config,
                                          std::string& dep)
@@ -1792,7 +1810,7 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
 
   // Look for a CMake target with the given name.
   if(cmGeneratorTarget* target =
-     this->Makefile->FindGeneratorTargetToUse(name))
+     this->FindGeneratorTargetToUse(name))
     {
     // make sure it is not just a coincidence that the target name
     // found is part of the inName
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 758709a..97e3f88 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -112,6 +112,19 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
+  const cmGeneratorTargetsType &GetGeneratorTargets() const
+    {
+      return this->GeneratorTargets;
+    }
+
+  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
+    {
+      this->GeneratorTargets = targets;
+    }
+  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
+
+  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
+
   /**
    * Encode a list of preprocessor definitions for the compiler
    * command line.
@@ -354,6 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmTarget const*> WarnCMP0063;
+  cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index bac989f..721f239 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,7 +26,7 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  cmGeneratorTargetsType tgts = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
 
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 6319f0e..8d71469 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,7 +73,7 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  cmGeneratorTargetsType targets = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index bf5afc1..91c7acd 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,7 +113,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
   for(cmGeneratorTargetsType::iterator t = targets.begin();
@@ -175,7 +175,7 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
@@ -418,7 +418,7 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   std::string localName;
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7d49661..61832ba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1800,12 +1800,6 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
-void cmMakefile::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-{
-  this->GeneratorTargets[t] = gt;
-  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
-}
-
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
@@ -4309,17 +4303,6 @@ bool cmMakefile::IsAlias(const std::string& name) const
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmMakefile::FindGeneratorTargetToUse(const std::string& name) const
-{
-  if (cmTarget *t = this->FindTargetToUse(name))
-    {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
-    }
-  return 0;
-}
-
-//----------------------------------------------------------------------------
 bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
                                    bool isCustom) const
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index c55ee39..8f865a0 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -17,7 +17,6 @@
 #include "cmSystemTools.h"
 #include "cmTarget.h"
 #include "cmNewLineStyle.h"
-#include "cmGeneratorTarget.h"
 #include "cmExpandedCommandArgument.h"
 #include "cmake.h"
 #include "cmState.h"
@@ -393,17 +392,6 @@ public:
       return this->ImportedTargetsOwned;
     }
 
-  const cmGeneratorTargetsType &GetGeneratorTargets() const
-    {
-      return this->GeneratorTargets;
-    }
-
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-    {
-      this->GeneratorTargets = targets;
-    }
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
-
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
@@ -412,7 +400,6 @@ public:
   cmTarget* FindTargetToUse(const std::string& name,
                             bool excludeAliases = false) const;
   bool IsAlias(const std::string& name) const;
-  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
   /**
    * Mark include directories as system directories.
@@ -815,7 +802,6 @@ protected:
   typedef std::map<std::string, cmTarget*> TargetMap;
 #endif
   TargetMap AliasTargets;
-  cmGeneratorTargetsType GeneratorTargets;
   std::vector<cmSourceFile*> SourceFiles;
 
   // Tests
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6e3f65f..f9875b3 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -886,7 +886,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    makefile->AddGeneratorTarget(autogenTarget, gt);
+    lg->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 7dec50b..85fb405 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -89,7 +89,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   // be translated.
   std::string exe = command[0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(exe);
+      this->LG->FindGeneratorTargetToUse(exe);
   if(target && target->GetType() == cmTarget::EXECUTABLE)
     {
     // Use the target file on disk.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04f953f3f96def0a62979668c1e7e61f9be22be4
commit 04f953f3f96def0a62979668c1e7e61f9be22be4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 22:08:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 21:49:24 2015 +0200

    cmMakefile: Store container of cmExportBuildFileGenerators.
    
    Set a cmLocalGenerator on each instance at compute time.  That will
    soon be needed to access cmGeneratorTarget instances.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 400fa17..560cfc5 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -18,13 +18,18 @@
 
 //----------------------------------------------------------------------------
 cmExportBuildFileGenerator::cmExportBuildFileGenerator()
-  : Backtrace()
 {
-  this->Makefile = 0;
+  this->LG = 0;
   this->ExportSet = 0;
 }
 
 //----------------------------------------------------------------------------
+void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
+{
+  this->LG = lg;
+}
+
+//----------------------------------------------------------------------------
 bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
 {
   std::vector<cmGeneratorTarget*> allTargets;
@@ -37,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->Makefile
+    cmGeneratorTarget *te = this->LG->GetMakefile()
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
@@ -49,8 +54,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       {
       std::ostringstream e;
       e << "given target \"" << te->GetName() << "\" more than once.";
-      this->Makefile->GetCMakeInstance()
-          ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+      this->LG->GetGlobalGenerator()->GetCMakeInstance()
+          ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                         this->LG->GetMakefile()->GetBacktrace());
       return false;
       }
     if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -328,8 +334,9 @@ cmExportBuildFileGenerator
   e << "If the required target is not easy to reference in this call, "
     << "consider using the APPEND option with multiple separate calls.";
 
-  this->Makefile->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+  this->LG->GetGlobalGenerator()->GetCMakeInstance()
+      ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                     this->LG->GetMakefile()->GetBacktrace());
 }
 
 std::string
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index ff3d2e1..16695f1 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -43,10 +43,7 @@ public:
   /** Set whether to append generated code to the output file.  */
   void SetAppendMode(bool append) { this->AppendMode = append; }
 
-  void SetMakefile(cmMakefile *mf) {
-    this->Makefile = mf;
-    this->Backtrace = this->Makefile->GetBacktrace();
-  }
+  void Compute(cmLocalGenerator* lg);
 
 protected:
   // Implement virtual methods from the superclass.
@@ -80,8 +77,7 @@ protected:
   std::vector<std::string> Targets;
   cmExportSet *ExportSet;
   std::vector<cmGeneratorTarget*> Exports;
-  cmMakefile* Makefile;
-  cmListFileBacktrace Backtrace;
+  cmLocalGenerator* LG;
 };
 
 #endif
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 6a1d7f3..c2d9cc4 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -221,7 +221,7 @@ bool cmExportCommand
     {
     ebfg->SetTargets(targets);
     }
-  ebfg->SetMakefile(this->Makefile);
+  this->Makefile->AddExportBuildFileGenerator(ebfg);
   ebfg->SetExportOld(this->ExportOld.IsEnabled());
 
   // Compute the set of configurations exported.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6750611..a61515a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1226,6 +1226,20 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
   return false;
 }
 
+void cmGlobalGenerator::ComputeBuildFileGenerators()
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmExportBuildFileGenerator*> gens =
+        this->Makefiles[i]->GetExportBuildFileGenerators();
+    for (std::vector<cmExportBuildFileGenerator*>::const_iterator it =
+         gens.begin(); it != gens.end(); ++it)
+      {
+      (*it)->Compute(this->LocalGenerators[i]);
+      }
+    }
+}
+
 bool cmGlobalGenerator::Compute()
 {
   // Some generators track files replaced during the Generate.
@@ -1255,6 +1269,8 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
+  this->ComputeBuildFileGenerators();
+
   unsigned int i;
 
   // Add generator specific helper commands
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 55e3766..294fca9 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -364,6 +364,8 @@ public:
 
   bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
 
+  void ComputeBuildFileGenerators();
+
   std::string MakeSilentFlag;
 protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 8890e2b..97d4d56 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -126,6 +126,7 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
+    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 73d3522..7d49661 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -702,6 +702,17 @@ cmMakefile::GetEvaluationFiles() const
   return this->EvaluationFiles;
 }
 
+std::vector<cmExportBuildFileGenerator*>
+cmMakefile::GetExportBuildFileGenerators() const
+{
+  return this->ExportBuildFileGenerators;
+}
+
+void cmMakefile::AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen)
+{
+  this->ExportBuildFileGenerators.push_back(gen);
+}
+
 namespace
 {
   struct file_not_persistent
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0a8dcd5..c55ee39 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -51,6 +51,7 @@ class cmake;
 class cmMakefileCall;
 class cmCMakePolicyCommand;
 class cmGeneratorExpressionEvaluationFile;
+class cmExportBuildFileGenerator;
 
 /** \class cmMakefile
  * \brief Process the input CMakeLists.txt file.
@@ -789,6 +790,10 @@ public:
                   bool inputIsContent);
   std::vector<cmGeneratorExpressionEvaluationFile*> GetEvaluationFiles() const;
 
+  std::vector<cmExportBuildFileGenerator*>
+  GetExportBuildFileGenerators() const;
+  void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
+
 protected:
   // add link libraries and directories to the target
   void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
@@ -882,6 +887,7 @@ private:
   mutable cmsys::RegularExpression cmNamedCurly;
 
   std::vector<cmMakefile*> UnConfiguredDirectories;
+  std::vector<cmExportBuildFileGenerator*> ExportBuildFileGenerators;
 
   std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
 
diff --git a/bootstrap b/bootstrap
index ca86528..54f7ca6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -261,6 +261,7 @@ CMAKE_CXX_SOURCES="\
   cmPropertyDefinitionMap \
   cmMakeDepend \
   cmMakefile \
+  cmExportBuildFileGenerator \
   cmExportFileGenerator \
   cmExportInstallFileGenerator \
   cmExportTryCompileFileGenerator \

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 12 17:07:32 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 12 Oct 2015 17:07:32 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-496-g1193027
Message-ID: <20151012210732.4DD72C02BA@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1193027b65833ae2492cc6e962032cfc3b6d3a1c (commit)
       via  ad506955b1fdf275e7babe74c4c7f3b58389cee0 (commit)
       via  e31d48a0a451e1f197fe61dbbd9e9a7d9b3d945e (commit)
      from  c8b072eff94c5cc168996a318d329fd9129476d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1193027b65833ae2492cc6e962032cfc3b6d3a1c
commit 1193027b65833ae2492cc6e962032cfc3b6d3a1c
Merge: c8b072e ad50695
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 17:07:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 17:07:31 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    ad506955 fixup! cmGeneratorExpression: Port to cmLocalGenerator.
    e31d48a0 fixup! cmLocalGenerator: Store cmGeneratorTargets.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad506955b1fdf275e7babe74c4c7f3b58389cee0
commit ad506955b1fdf275e7babe74c4c7f3b58389cee0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 23:07:08 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 23:07:08 2015 +0200

    fixup! cmGeneratorExpression: Port to cmLocalGenerator.

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index f4166b9..8651e2f 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -1016,7 +1016,8 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
         cmGeneratorExpression ge;
         cmsys::auto_ptr<cmCompiledGeneratorExpression>
           cge = ge.Parse(propertyValue);
-        if(cmSystemTools::IsOn(cge->Evaluate(target->GetMakefile(), *i)))
+        cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
+        if(cmSystemTools::IsOn(cge->Evaluate(gt->GetLocalGenerator(), *i)))
           {
           activeConfigs.insert(*i);
           }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9ee860e..6291796 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2486,7 +2486,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
         {
         cmGeneratorExpression ge;
         std::string processed = ge.Parse(i->second.GetValue())
-          ->Evaluate(this->CurrentMakefile, configName);
+          ->Evaluate(this->CurrentLocalGenerator, configName);
         buildSettings->AddAttribute(attribute.c_str(),
                                     this->CreateString(processed));
         }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index e1b9223..a2aada6 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1370,7 +1370,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
         }
       for(size_t i = 0; i != this->Configurations.size(); ++i)
         {
-        if(0 == strcmp(cge->Evaluate(this->Makefile,
+        if(0 == strcmp(cge->Evaluate(this->LocalGenerator,
                                      this->Configurations[i]), "1"))
           {
           this->WriteString("<DeploymentContent Condition=\""
@@ -2301,7 +2301,8 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
         ge.Parse(nativeLibDirectoriesExpression);
-    std::string nativeLibDirs = cge->Evaluate(this->Makefile, configName);
+    std::string nativeLibDirs = cge->Evaluate(this->LocalGenerator,
+                                              configName);
     this->WriteString("<NativeLibDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(nativeLibDirs) <<
       "</NativeLibDirectories>\n";
@@ -2313,7 +2314,8 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
         ge.Parse(nativeLibDependenciesExpression);
-    std::string nativeLibDeps = cge->Evaluate(this->Makefile, configName);
+    std::string nativeLibDeps = cge->Evaluate(this->LocalGenerator,
+                                              configName);
     this->WriteString("<NativeLibDependencies>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(nativeLibDeps) <<
       "</NativeLibDependencies>\n";
@@ -2333,7 +2335,8 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
       ge.Parse(jarDirectoriesExpression);
-    std::string jarDirectories = cge->Evaluate(this->Makefile, configName);
+    std::string jarDirectories = cge->Evaluate(this->LocalGenerator,
+                                               configName);
     this->WriteString("<JarDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(jarDirectories) <<
       "</JarDirectories>\n";

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e31d48a0a451e1f197fe61dbbd9e9a7d9b3d945e
commit e31d48a0a451e1f197fe61dbbd9e9a7d9b3d945e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 23:03:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 23:03:25 2015 +0200

    fixup! cmLocalGenerator: Store cmGeneratorTargets.

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 0bdb008..8cb7d24 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -256,7 +256,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
                           noCommandLines);
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
-  mf->AddGeneratorTarget(tgt, gt);
+  lg->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index cb30c4e..fa9c606 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -87,7 +87,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           "Build all projects");
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
-      allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
+      gen[0]->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 2d9a14b..9ee860e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -459,7 +459,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         "echo", "Build all projects");
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
-  mf->AddGeneratorTarget(allbuild, allBuildGt);
+  root->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -494,7 +494,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           "make", "-f", file.c_str());
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
-    mf->AddGeneratorTarget(check, checkGt);
+    root->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio7Generator.cxx  |    3 ++-
 Source/cmGlobalVisualStudio8Generator.cxx  |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |    2 +-
 Source/cmGlobalXCodeGenerator.cxx          |    6 +++---
 Source/cmVisualStudio10TargetGenerator.cxx |   11 +++++++----
 5 files changed, 14 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 12 17:08:04 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 12 Oct 2015 17:08:04 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-501-gbe129b8
Message-ID: <20151012210804.4BA6DC02FB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  be129b862a878c9154d601603dc20e7d3cc24bf6 (commit)
       via  904a3cfb099a68de66f21e148c2000ebf6ea51cc (commit)
       via  5925f99caa1590eedf7c81f62449782f7babb218 (commit)
       via  1583440509a148d216d6691cdaeede1aa24af95c (commit)
       via  11165525ba663b4cd7a188c6b698822b8480aafb (commit)
      from  1193027b65833ae2492cc6e962032cfc3b6d3a1c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be129b862a878c9154d601603dc20e7d3cc24bf6
commit be129b862a878c9154d601603dc20e7d3cc24bf6
Merge: 1193027 904a3cf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 17:08:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 17:08:02 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    904a3cfb cmLocalGenerator: Store cmGeneratorTargets.
    5925f99c cmMakefile: Store container of cmExportBuildFileGenerators.
    15834405 cmGeneratorExpression: Port interface to cmGeneratorTarget.
    11165525 cmGeneratorExpression: Port to cmLocalGenerator.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=904a3cfb099a68de66f21e148c2000ebf6ea51cc
commit 904a3cfb099a68de66f21e148c2000ebf6ea51cc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:21:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 23:07:46 2015 +0200

    cmLocalGenerator: Store cmGeneratorTargets.
    
    Relieve cmMakefile of this responsibility.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f02afe..618f09f 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -43,7 +43,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
 {
   std::string const& argv0 = this->CC.GetCommandLines()[c][0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(argv0);
+      this->LG->FindGeneratorTargetToUse(argv0);
   if(target && target->GetType() == cmTarget::EXECUTABLE &&
      (target->Target->IsImported()
       || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 560cfc5..6c3cccd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -42,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->LG->GetMakefile()
+    cmGeneratorTarget *te = this->LG
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index fdfa35e..b7aeb02 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,8 +965,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmGeneratorTargetsType targets = (*it)->GetMakefile()
-                                        ->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
     for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2797d10..fe83b08 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1275,7 +1275,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
 
     std::string tgtName = parameters.front();
     cmGeneratorTarget* gt =
-                context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
+                context->LG->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
       std::ostringstream e;
@@ -1739,7 +1739,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       return std::string();
       }
     cmGeneratorTarget* target =
-        context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
+        context->LG->FindGeneratorTargetToUse(name);
     if(!target)
       {
       ::reportError(context, content->GetOriginalExpression(),
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6033efe..6bebc2b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2305,7 +2305,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
 
   // Check for a target with this name.
   if(cmGeneratorTarget* t
-                    = this->Makefile->FindGeneratorTargetToUse(util))
+                    = this->GeneratorTarget->
+                    GetLocalGenerator()->FindGeneratorTargetToUse(util))
     {
     // If we find the target and the dep was given as a full path,
     // then make sure it was not a full path to something else, and
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a61515a..8f5e84a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1568,7 +1568,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     this->GeneratorTargets[*j] = gt;
     generatorTargets[*j] = gt;
     }
-  mf->SetGeneratorTargets(generatorTargets);
+  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 87cf58f..45a1509 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -287,7 +287,7 @@ void cmGlobalGhsMultiGenerator::Generate()
       {
       cmLocalGhsMultiGenerator *lg =
         static_cast<cmLocalGhsMultiGenerator *>(this->LocalGenerators[i]);
-      cmGeneratorTargetsType tgts = lg->GetMakefile()->GetGeneratorTargets();
+      cmGeneratorTargetsType tgts = lg->GetGeneratorTargets();
       this->UpdateBuildFiles(&tgts);
       }
     }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f955ef7..ed36634 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,8 +68,7 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      cmMakefile* makefile=(*lg)->GetMakefile();
-      cmGeneratorTargetsType const& targets = makefile->GetGeneratorTargets();
+      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
       for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
            ti != targets.end(); ti++)
         {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 218e702..f9740e5 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -461,7 +461,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
@@ -627,7 +627,7 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
     for(cmGeneratorTargetsType::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
@@ -728,7 +728,7 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 0bdb008..8cb7d24 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -256,7 +256,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
                           noCommandLines);
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
-  mf->AddGeneratorTarget(tgt, gt);
+  lg->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 6a25ed0..fa9c606 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -87,7 +87,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           "Build all projects");
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
-      allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
+      gen[0]->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
@@ -108,7 +108,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
           i != gen.end(); ++i)
         {
         cmGeneratorTargetsType targets =
-            (*i)->GetMakefile()->GetGeneratorTargets();
+            (*i)->GetGeneratorTargets();
         for(cmGeneratorTargetsType::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bc67833..6291796 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -459,7 +459,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         "echo", "Build all projects");
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
-  mf->AddGeneratorTarget(allbuild, allBuildGt);
+  root->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -494,7 +494,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           "make", "-f", file.c_str());
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
-    mf->AddGeneratorTarget(check, checkGt);
+    root->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f19d551..3691b41 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,7 +132,7 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -448,6 +448,13 @@ void cmLocalGenerator::GenerateInstallRules()
     }
 }
 
+
+void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+{
+  this->GeneratorTargets[t] = gt;
+  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
+}
+
 //----------------------------------------------------------------------------
 void cmLocalGenerator::ComputeTargetManifest()
 {
@@ -460,7 +467,7 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -1767,6 +1774,17 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
+{
+  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+    {
+    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    }
+  return 0;
+}
+
+//----------------------------------------------------------------------------
 bool cmLocalGenerator::GetRealDependency(const std::string& inName,
                                          const std::string& config,
                                          std::string& dep)
@@ -1792,7 +1810,7 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
 
   // Look for a CMake target with the given name.
   if(cmGeneratorTarget* target =
-     this->Makefile->FindGeneratorTargetToUse(name))
+     this->FindGeneratorTargetToUse(name))
     {
     // make sure it is not just a coincidence that the target name
     // found is part of the inName
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 758709a..97e3f88 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -112,6 +112,19 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
+  const cmGeneratorTargetsType &GetGeneratorTargets() const
+    {
+      return this->GeneratorTargets;
+    }
+
+  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
+    {
+      this->GeneratorTargets = targets;
+    }
+  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
+
+  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
+
   /**
    * Encode a list of preprocessor definitions for the compiler
    * command line.
@@ -354,6 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmTarget const*> WarnCMP0063;
+  cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index bac989f..721f239 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,7 +26,7 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  cmGeneratorTargetsType tgts = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
 
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 6319f0e..8d71469 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,7 +73,7 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  cmGeneratorTargetsType targets = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index bf5afc1..91c7acd 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,7 +113,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
   for(cmGeneratorTargetsType::iterator t = targets.begin();
@@ -175,7 +175,7 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
@@ -418,7 +418,7 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   std::string localName;
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7d49661..61832ba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1800,12 +1800,6 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
-void cmMakefile::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-{
-  this->GeneratorTargets[t] = gt;
-  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
-}
-
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
@@ -4309,17 +4303,6 @@ bool cmMakefile::IsAlias(const std::string& name) const
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmMakefile::FindGeneratorTargetToUse(const std::string& name) const
-{
-  if (cmTarget *t = this->FindTargetToUse(name))
-    {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
-    }
-  return 0;
-}
-
-//----------------------------------------------------------------------------
 bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
                                    bool isCustom) const
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index c55ee39..8f865a0 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -17,7 +17,6 @@
 #include "cmSystemTools.h"
 #include "cmTarget.h"
 #include "cmNewLineStyle.h"
-#include "cmGeneratorTarget.h"
 #include "cmExpandedCommandArgument.h"
 #include "cmake.h"
 #include "cmState.h"
@@ -393,17 +392,6 @@ public:
       return this->ImportedTargetsOwned;
     }
 
-  const cmGeneratorTargetsType &GetGeneratorTargets() const
-    {
-      return this->GeneratorTargets;
-    }
-
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-    {
-      this->GeneratorTargets = targets;
-    }
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
-
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
@@ -412,7 +400,6 @@ public:
   cmTarget* FindTargetToUse(const std::string& name,
                             bool excludeAliases = false) const;
   bool IsAlias(const std::string& name) const;
-  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
   /**
    * Mark include directories as system directories.
@@ -815,7 +802,6 @@ protected:
   typedef std::map<std::string, cmTarget*> TargetMap;
 #endif
   TargetMap AliasTargets;
-  cmGeneratorTargetsType GeneratorTargets;
   std::vector<cmSourceFile*> SourceFiles;
 
   // Tests
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6e3f65f..f9875b3 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -886,7 +886,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    makefile->AddGeneratorTarget(autogenTarget, gt);
+    lg->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 7dec50b..85fb405 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -89,7 +89,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   // be translated.
   std::string exe = command[0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(exe);
+      this->LG->FindGeneratorTargetToUse(exe);
   if(target && target->GetType() == cmTarget::EXECUTABLE)
     {
     // Use the target file on disk.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5925f99caa1590eedf7c81f62449782f7babb218
commit 5925f99caa1590eedf7c81f62449782f7babb218
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 22:08:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 23:07:46 2015 +0200

    cmMakefile: Store container of cmExportBuildFileGenerators.
    
    Set a cmLocalGenerator on each instance at compute time.  That will
    soon be needed to access cmGeneratorTarget instances.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 400fa17..560cfc5 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -18,13 +18,18 @@
 
 //----------------------------------------------------------------------------
 cmExportBuildFileGenerator::cmExportBuildFileGenerator()
-  : Backtrace()
 {
-  this->Makefile = 0;
+  this->LG = 0;
   this->ExportSet = 0;
 }
 
 //----------------------------------------------------------------------------
+void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
+{
+  this->LG = lg;
+}
+
+//----------------------------------------------------------------------------
 bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
 {
   std::vector<cmGeneratorTarget*> allTargets;
@@ -37,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->Makefile
+    cmGeneratorTarget *te = this->LG->GetMakefile()
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
@@ -49,8 +54,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       {
       std::ostringstream e;
       e << "given target \"" << te->GetName() << "\" more than once.";
-      this->Makefile->GetCMakeInstance()
-          ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+      this->LG->GetGlobalGenerator()->GetCMakeInstance()
+          ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                         this->LG->GetMakefile()->GetBacktrace());
       return false;
       }
     if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -328,8 +334,9 @@ cmExportBuildFileGenerator
   e << "If the required target is not easy to reference in this call, "
     << "consider using the APPEND option with multiple separate calls.";
 
-  this->Makefile->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+  this->LG->GetGlobalGenerator()->GetCMakeInstance()
+      ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                     this->LG->GetMakefile()->GetBacktrace());
 }
 
 std::string
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index ff3d2e1..16695f1 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -43,10 +43,7 @@ public:
   /** Set whether to append generated code to the output file.  */
   void SetAppendMode(bool append) { this->AppendMode = append; }
 
-  void SetMakefile(cmMakefile *mf) {
-    this->Makefile = mf;
-    this->Backtrace = this->Makefile->GetBacktrace();
-  }
+  void Compute(cmLocalGenerator* lg);
 
 protected:
   // Implement virtual methods from the superclass.
@@ -80,8 +77,7 @@ protected:
   std::vector<std::string> Targets;
   cmExportSet *ExportSet;
   std::vector<cmGeneratorTarget*> Exports;
-  cmMakefile* Makefile;
-  cmListFileBacktrace Backtrace;
+  cmLocalGenerator* LG;
 };
 
 #endif
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 6a1d7f3..c2d9cc4 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -221,7 +221,7 @@ bool cmExportCommand
     {
     ebfg->SetTargets(targets);
     }
-  ebfg->SetMakefile(this->Makefile);
+  this->Makefile->AddExportBuildFileGenerator(ebfg);
   ebfg->SetExportOld(this->ExportOld.IsEnabled());
 
   // Compute the set of configurations exported.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6750611..a61515a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1226,6 +1226,20 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
   return false;
 }
 
+void cmGlobalGenerator::ComputeBuildFileGenerators()
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmExportBuildFileGenerator*> gens =
+        this->Makefiles[i]->GetExportBuildFileGenerators();
+    for (std::vector<cmExportBuildFileGenerator*>::const_iterator it =
+         gens.begin(); it != gens.end(); ++it)
+      {
+      (*it)->Compute(this->LocalGenerators[i]);
+      }
+    }
+}
+
 bool cmGlobalGenerator::Compute()
 {
   // Some generators track files replaced during the Generate.
@@ -1255,6 +1269,8 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
+  this->ComputeBuildFileGenerators();
+
   unsigned int i;
 
   // Add generator specific helper commands
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 55e3766..294fca9 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -364,6 +364,8 @@ public:
 
   bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
 
+  void ComputeBuildFileGenerators();
+
   std::string MakeSilentFlag;
 protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 8890e2b..97d4d56 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -126,6 +126,7 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
+    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 73d3522..7d49661 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -702,6 +702,17 @@ cmMakefile::GetEvaluationFiles() const
   return this->EvaluationFiles;
 }
 
+std::vector<cmExportBuildFileGenerator*>
+cmMakefile::GetExportBuildFileGenerators() const
+{
+  return this->ExportBuildFileGenerators;
+}
+
+void cmMakefile::AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen)
+{
+  this->ExportBuildFileGenerators.push_back(gen);
+}
+
 namespace
 {
   struct file_not_persistent
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0a8dcd5..c55ee39 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -51,6 +51,7 @@ class cmake;
 class cmMakefileCall;
 class cmCMakePolicyCommand;
 class cmGeneratorExpressionEvaluationFile;
+class cmExportBuildFileGenerator;
 
 /** \class cmMakefile
  * \brief Process the input CMakeLists.txt file.
@@ -789,6 +790,10 @@ public:
                   bool inputIsContent);
   std::vector<cmGeneratorExpressionEvaluationFile*> GetEvaluationFiles() const;
 
+  std::vector<cmExportBuildFileGenerator*>
+  GetExportBuildFileGenerators() const;
+  void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
+
 protected:
   // add link libraries and directories to the target
   void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
@@ -882,6 +887,7 @@ private:
   mutable cmsys::RegularExpression cmNamedCurly;
 
   std::vector<cmMakefile*> UnConfiguredDirectories;
+  std::vector<cmExportBuildFileGenerator*> ExportBuildFileGenerators;
 
   std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
 
diff --git a/bootstrap b/bootstrap
index ca86528..54f7ca6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -261,6 +261,7 @@ CMAKE_CXX_SOURCES="\
   cmPropertyDefinitionMap \
   cmMakeDepend \
   cmMakefile \
+  cmExportBuildFileGenerator \
   cmExportFileGenerator \
   cmExportInstallFileGenerator \
   cmExportTryCompileFileGenerator \

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1583440509a148d216d6691cdaeede1aa24af95c
commit 1583440509a148d216d6691cdaeede1aa24af95c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 04:38:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 23:07:46 2015 +0200

    cmGeneratorExpression: Port interface to cmGeneratorTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 4a7a760..d6440ac 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -457,7 +457,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
   this->ReplaceInstallPrefix(dirs);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(dirs);
   std::string exportDirs = cge->Evaluate(target->GetLocalGenerator(), "",
-                                         false, target->Target);
+                                         false, target);
 
   if (cge->GetHadContextSensitiveCondition())
     {
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 3d302d0..f8dbe31 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -78,10 +78,11 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
 
   cmGeneratorTarget* gtgt =
       tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+  cmGeneratorTarget gDummyHead(&dummyHead, gtgt->GetLocalGenerator());
 
   std::string result = cge->Evaluate(gtgt->GetLocalGenerator(), this->Config,
-                                     false, &dummyHead,
-                                     gtgt->Target, &dagChecker);
+                                     false, &gDummyHead,
+                                     gtgt, &dagChecker);
 
   const std::set<cmTarget const*> &allTargets = cge->GetAllTargetsSeen();
   for(std::set<cmTarget const*>::const_iterator li = allTargets.begin();
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index ef1679f..d9f67f2 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -50,7 +50,7 @@ cmGeneratorExpression::~cmGeneratorExpression()
 //----------------------------------------------------------------------------
 const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
   const std::string& config, bool quiet,
-  cmTarget const* headTarget,
+  const cmGeneratorTarget* headTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
                        std::string const& language) const
 {
@@ -66,8 +66,8 @@ const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
 //----------------------------------------------------------------------------
 const char *cmCompiledGeneratorExpression::Evaluate(
   cmLocalGenerator* lg, const std::string& config, bool quiet,
-  cmTarget const* headTarget,
-  cmTarget const* currentTarget,
+  const cmGeneratorTarget* headTarget,
+  const cmGeneratorTarget* currentTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
   std::string const& language) const
 {
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index 8843e0a..d64d6ba 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -20,6 +20,7 @@
 #include <cmsys/auto_ptr.hxx>
 
 class cmTarget;
+class cmGeneratorTarget;
 class cmLocalGenerator;
 class cmListFileBacktrace;
 
@@ -80,13 +81,13 @@ class cmCompiledGeneratorExpression
 public:
   const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet = false,
-                       cmTarget const* headTarget = 0,
-                       cmTarget const* currentTarget = 0,
+                       cmGeneratorTarget const* headTarget = 0,
+                       cmGeneratorTarget const* currentTarget = 0,
                        cmGeneratorExpressionDAGChecker *dagChecker = 0,
                        std::string const& language = std::string()) const;
   const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet,
-                       cmTarget const* headTarget,
+                       cmGeneratorTarget const* headTarget,
                        cmGeneratorExpressionDAGChecker *dagChecker,
                        std::string const& language = std::string()) const;
 
diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index cd056a0..4daf4e9 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -11,11 +11,12 @@
 ============================================================================*/
 
 #include "cmGeneratorExpressionContext.h"
+#include "cmGeneratorTarget.h"
 
 cmGeneratorExpressionContext::cmGeneratorExpressionContext(
       cmLocalGenerator* lg, std::string const& config,
-      bool quiet, cmTarget const* headTarget,
-      cmTarget const* currentTarget,
+      bool quiet, cmGeneratorTarget const* headTarget,
+      const cmGeneratorTarget* currentTarget,
       bool evaluateForBuildsystem,
       cmListFileBacktrace const& backtrace,
       std::string const& language)
@@ -23,8 +24,8 @@ cmGeneratorExpressionContext::cmGeneratorExpressionContext(
     LG(lg),
     Config(config),
     Language(language),
-    HeadTarget(headTarget),
-    CurrentTarget(currentTarget),
+    HeadTarget(headTarget ? headTarget->Target : 0),
+    CurrentTarget(currentTarget ? currentTarget->Target : 0),
     Quiet(quiet),
     HadError(false),
     HadContextSensitiveCondition(false),
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index 5b6507d..bbf0fcf 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -19,14 +19,15 @@
 #include <string>
 
 class cmTarget;
+class cmGeneratorTarget;
 class cmLocalGenerator;
 
 //----------------------------------------------------------------------------
 struct cmGeneratorExpressionContext
 {
   cmGeneratorExpressionContext(cmLocalGenerator* lg, std::string const& config,
-                               bool quiet, cmTarget const* headTarget,
-                               cmTarget const* currentTarget,
+                               bool quiet, const cmGeneratorTarget* headTarget,
+                               cmGeneratorTarget const* currentTarget,
                                bool evaluateForBuildsystem,
                                cmListFileBacktrace const& backtrace,
                                std::string const& language);
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 61852ab..2797d10 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -19,7 +19,8 @@
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
     std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
-    cmTarget const* headTarget, cmTarget const* currentTarget,
+    cmGeneratorTarget const* headTarget,
+    cmGeneratorTarget const* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker)
 {
   cmGeneratorExpression ge(context->Backtrace);
@@ -862,8 +863,8 @@ getLinkedTargetsContent(
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
                                         target->GetLocalGenerator(),
                                         context,
-                                        headTarget->Target,
-                                        target->Target, dagChecker);
+                                        headTarget,
+                                        target, dagChecker);
     }
   linkedTargetsContent =
     cmGeneratorExpression::StripEmptyListElements(linkedTargetsContent);
@@ -1215,9 +1216,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     if(!interfacePropertyName.empty())
       {
+      cmGeneratorTarget* gHeadTarget =
+          context->LG->GetGlobalGenerator()->GetGeneratorTarget(headTarget);
       std::string result = this->EvaluateDependentExpression(prop,
                                         context->LG, context,
-                                        headTarget, target, &dagChecker);
+                                        gHeadTarget, gtgt, &dagChecker);
       if (!linkedTargetsContent.empty())
         {
         result += (result.empty() ? "" : ";") + linkedTargetsContent;
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index 22b6585..db65db1 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -56,7 +56,8 @@ struct cmGeneratorExpressionNode
   static std::string EvaluateDependentExpression(
     std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
-    cmTarget const* headTarget, cmTarget const* currentTarget,
+    const cmGeneratorTarget* headTarget,
+    const cmGeneratorTarget* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker);
 
   static const cmGeneratorExpressionNode* GetNode(
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 04b0d1f..6033efe 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -524,8 +524,8 @@ static void handleSystemIncludesDep(cmLocalGenerator *lg,
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(lg,
-                                      config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      config, false, headTarget,
+                                      depTgt, dagChecker), result);
     }
   if (!depTgt->IsImported() || excludeImported)
     {
@@ -538,8 +538,8 @@ static void handleSystemIncludesDep(cmLocalGenerator *lg,
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
                                       ->Evaluate(lg,
-                                      config, false, headTarget->Target,
-                                      depTgt->Target, dagChecker), result);
+                                      config, false, headTarget,
+                                      depTgt, dagChecker), result);
     }
 }
 
@@ -880,7 +880,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
       cmGeneratorExpression ge;
       cmSystemTools::ExpandListArgument(ge.Parse(*it)
                                           ->Evaluate(this->LocalGenerator,
-                                          config, false, this->Target,
+                                          config, false, this,
                                           &dagChecker), result);
       }
 
@@ -889,8 +889,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->LocalGenerator, *li,
-                              config, this,
+      handleSystemIncludesDep(this->LocalGenerator, *li, config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -966,8 +965,8 @@ static bool processSources(cmGeneratorTarget const* tgt,
                                               tgt->GetLocalGenerator(),
                                               config,
                                               false,
-                                              tgt->Target,
-                                              tgt->Target,
+                                              tgt,
+                                              tgt,
                                               dagChecker),
                                     entrySources);
 
@@ -2059,7 +2058,7 @@ void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result,
                                       ->Evaluate(this->LocalGenerator,
                                                 config,
                                                 false,
-                                                this->Target,
+                                                this,
                                                 &dagChecker),
                                   result);
 }
@@ -2544,7 +2543,7 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
                                         tgt->GetLocalGenerator(),
                                               config,
                                               false,
-                                              tgt->Target,
+                                              tgt,
                                               dagChecker, language),
                                     entryIncludes);
 
@@ -2755,7 +2754,7 @@ static void processCompileOptionsInternal(cmGeneratorTarget const* tgt,
                                         tgt->GetLocalGenerator(),
                                               config,
                                               false,
-                                              tgt->Target,
+                                              tgt,
                                               dagChecker,
                                               language),
                                     entryOptions);
@@ -4455,8 +4454,8 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
                                       this->LocalGenerator,
                                       config,
                                       false,
-                                      headTarget->Target,
-                                      this->Target, &dagChecker), libs);
+                                      headTarget,
+                                      this, &dagChecker), libs);
   this->LookupLinkItems(libs, items);
   hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition();
 }
@@ -5347,8 +5346,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
     cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
       ge.Parse(*le);
     std::string const evaluated =
-      cge->Evaluate(this->LocalGenerator, config, false,
-                    head->Target, &dagChecker);
+      cge->Evaluate(this->LocalGenerator, config, false, head, &dagChecker);
     cmSystemTools::ExpandListArgument(evaluated, llibs);
     if(cge->GetHadHeadSensitiveCondition())
       {
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b896659..abcda21 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -149,7 +149,9 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
 
     cmSystemTools::ExpandListArgument(cge->Evaluate(this->LocalGenerator,
                                                     config,
-                                                  false, this->Target, 0, 0),
+                                                    false,
+                                                    this->GeneratorTarget,
+                                                    0, 0),
                                       this->CleanFiles);
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11165525ba663b4cd7a188c6b698822b8480aafb
commit 11165525ba663b4cd7a188c6b698822b8480aafb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 25 16:56:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 12 23:07:46 2015 +0200

    cmGeneratorExpression: Port to cmLocalGenerator.

diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx
index cbcdd81..35b3d59 100644
--- a/Source/cmCPackPropertiesGenerator.cxx
+++ b/Source/cmCPackPropertiesGenerator.cxx
@@ -18,7 +18,7 @@ void cmCPackPropertiesGenerator::GenerateScriptForConfig(std::ostream& os,
   const std::string& config, Indent const& indent)
 {
   std::string const& expandedFileName =
-      this->InstalledFile.GetNameExpression().Evaluate(this->LG->GetMakefile(),
+      this->InstalledFile.GetNameExpression().Evaluate(this->LG,
                                                        config);
 
   cmInstalledFile::PropertyMapType const& properties =
@@ -38,7 +38,7 @@ void cmCPackPropertiesGenerator::GenerateScriptForConfig(std::ostream& os,
       j = property.ValueExpressions.begin();
       j != property.ValueExpressions.end(); ++j)
       {
-      std::string value = (*j)->Evaluate(LG->GetMakefile(), config);
+      std::string value = (*j)->Evaluate(this->LG, config);
       os << " " << cmOutputConverter::EscapeForCMake(value);
       }
 
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 4b6bd50..7f02afe 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -50,8 +50,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
     {
     return target->GetLocation(this->Config);
     }
-  return this->GE->Parse(argv0)->Evaluate(this->LG->GetMakefile(),
-                                          this->Config);
+  return this->GE->Parse(argv0)->Evaluate(this->LG, this->Config);
 }
 
 //----------------------------------------------------------------------------
@@ -92,7 +91,7 @@ cmCustomCommandGenerator
   for(unsigned int j=1;j < commandLine.size(); ++j)
     {
     std::string arg =
-        this->GE->Parse(commandLine[j])->Evaluate(this->LG->GetMakefile(),
+        this->GE->Parse(commandLine[j])->Evaluate(this->LG,
                                                   this->Config);
     cmd += " ";
     if(this->OldStyle)
@@ -146,7 +145,7 @@ std::vector<std::string> const& cmCustomCommandGenerator::GetDepends() const
                                               = this->GE->Parse(*i);
       std::vector<std::string> result;
       cmSystemTools::ExpandListArgument(
-            cge->Evaluate(this->LG->GetMakefile(), this->Config), result);
+            cge->Evaluate(this->LG, this->Config), result);
       for (std::vector<std::string>::iterator it = result.begin();
           it != result.end(); ++it)
         {
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b29429e..4a7a760 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -456,7 +456,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                             true);
   this->ReplaceInstallPrefix(dirs);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(dirs);
-  std::string exportDirs = cge->Evaluate(target->Target->GetMakefile(), "",
+  std::string exportDirs = cge->Evaluate(target->GetLocalGenerator(), "",
                                          false, target->Target);
 
   if (cge->GetHadContextSensitiveCondition())
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 026584c..3d302d0 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -79,7 +79,7 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
   cmGeneratorTarget* gtgt =
       tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
 
-  std::string result = cge->Evaluate(gtgt->Target->GetMakefile(), this->Config,
+  std::string result = cge->Evaluate(gtgt->GetLocalGenerator(), this->Config,
                                      false, &dummyHead,
                                      gtgt->Target, &dagChecker);
 
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 80a4f81..ef1679f 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -48,13 +48,13 @@ cmGeneratorExpression::~cmGeneratorExpression()
 }
 
 //----------------------------------------------------------------------------
-const char *cmCompiledGeneratorExpression::Evaluate(
-  cmMakefile* mf, const std::string& config, bool quiet,
+const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg,
+  const std::string& config, bool quiet,
   cmTarget const* headTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
                        std::string const& language) const
 {
-  return this->Evaluate(mf,
+  return this->Evaluate(lg,
                         config,
                         quiet,
                         headTarget,
@@ -65,13 +65,13 @@ const char *cmCompiledGeneratorExpression::Evaluate(
 
 //----------------------------------------------------------------------------
 const char *cmCompiledGeneratorExpression::Evaluate(
-  cmMakefile* mf, const std::string& config, bool quiet,
+  cmLocalGenerator* lg, const std::string& config, bool quiet,
   cmTarget const* headTarget,
   cmTarget const* currentTarget,
   cmGeneratorExpressionDAGChecker *dagChecker,
   std::string const& language) const
 {
-  cmGeneratorExpressionContext context(mf, config, quiet, headTarget,
+  cmGeneratorExpressionContext context(lg, config, quiet, headTarget,
                                   currentTarget ? currentTarget : headTarget,
                                   this->EvaluateForBuildsystem,
                                   this->Backtrace, language);
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index cd19bc0..8843e0a 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -20,7 +20,7 @@
 #include <cmsys/auto_ptr.hxx>
 
 class cmTarget;
-class cmMakefile;
+class cmLocalGenerator;
 class cmListFileBacktrace;
 
 struct cmGeneratorExpressionEvaluator;
@@ -78,13 +78,13 @@ private:
 class cmCompiledGeneratorExpression
 {
 public:
-  const char* Evaluate(cmMakefile* mf, const std::string& config,
+  const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet = false,
                        cmTarget const* headTarget = 0,
                        cmTarget const* currentTarget = 0,
                        cmGeneratorExpressionDAGChecker *dagChecker = 0,
                        std::string const& language = std::string()) const;
-  const char* Evaluate(cmMakefile* mf, const std::string& config,
+  const char* Evaluate(cmLocalGenerator* lg, const std::string& config,
                        bool quiet,
                        cmTarget const* headTarget,
                        cmGeneratorExpressionDAGChecker *dagChecker,
diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index 947015e..cd056a0 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -13,14 +13,14 @@
 #include "cmGeneratorExpressionContext.h"
 
 cmGeneratorExpressionContext::cmGeneratorExpressionContext(
-      cmMakefile* mf, std::string const& config,
+      cmLocalGenerator* lg, std::string const& config,
       bool quiet, cmTarget const* headTarget,
       cmTarget const* currentTarget,
       bool evaluateForBuildsystem,
       cmListFileBacktrace const& backtrace,
       std::string const& language)
   : Backtrace(backtrace),
-    Makefile(mf),
+    LG(lg),
     Config(config),
     Language(language),
     HeadTarget(headTarget),
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index ed83509..5b6507d 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -19,11 +19,12 @@
 #include <string>
 
 class cmTarget;
+class cmLocalGenerator;
 
 //----------------------------------------------------------------------------
 struct cmGeneratorExpressionContext
 {
-  cmGeneratorExpressionContext(cmMakefile* mf, std::string const& config,
+  cmGeneratorExpressionContext(cmLocalGenerator* lg, std::string const& config,
                                bool quiet, cmTarget const* headTarget,
                                cmTarget const* currentTarget,
                                bool evaluateForBuildsystem,
@@ -38,7 +39,7 @@ struct cmGeneratorExpressionContext
   std::set<cmTarget const*> SourceSensitiveTargets;
   std::map<cmTarget const*, std::map<std::string, std::string> >
                                                           MaxLanguageStandard;
-  cmMakefile *Makefile;
+  cmLocalGenerator *LG;
   std::string Config;
   std::string Language;
   cmTarget const* HeadTarget; // The target whose property is being evaluated.
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 851aacd..5eed89d 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -13,6 +13,7 @@
 #include "cmGeneratorExpressionDAGChecker.h"
 
 #include "cmMakefile.h"
+#include "cmLocalGenerator.h"
 #include "cmAlgorithms.h"
 
 //----------------------------------------------------------------------------
@@ -110,7 +111,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
       << "  " << expr << "\n"
       << "Self reference on target \""
       << context->HeadTarget->GetName() << "\".\n";
-    context->Makefile->GetCMakeInstance()
+    context->LG->GetCMakeInstance()
       ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                       parent->Backtrace);
     return;
@@ -121,7 +122,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
   e << "Error evaluating generator expression:\n"
     << "  " << expr << "\n"
     << "Dependency loop found.";
-  context->Makefile->GetCMakeInstance()
+  context->LG->GetCMakeInstance()
     ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                     context->Backtrace);
   }
@@ -134,7 +135,7 @@ void cmGeneratorExpressionDAGChecker::ReportError(
       << "  "
       << (parent->Content ? parent->Content->GetOriginalExpression() : expr)
       << "\n";
-    context->Makefile->GetCMakeInstance()
+    context->LG->GetCMakeInstance()
       ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                       parent->Backtrace);
     parent = parent->Parent;
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 8ac5cbc..4ac2a0d 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -44,7 +44,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator* lg,
   std::string rawCondition = this->Condition->GetInput();
   if (!rawCondition.empty())
     {
-    std::string condResult = this->Condition->Evaluate(lg->GetMakefile(),
+    std::string condResult = this->Condition->Evaluate(lg,
                                                        config,
                                                        false, 0, 0, 0, lang);
     if (condResult == "0")
@@ -62,10 +62,10 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator* lg,
     }
 
   const std::string outputFileName
-                    = this->OutputFileExpr->Evaluate(lg->GetMakefile(), config,
+                    = this->OutputFileExpr->Evaluate(lg, config,
                                                      false, 0, 0, 0, lang);
   const std::string outputContent
-                          = inputExpression->Evaluate(lg->GetMakefile(),
+                          = inputExpression->Evaluate(lg,
                                                       config,
                                                       false, 0, 0, 0, lang);
 
@@ -110,7 +110,7 @@ void cmGeneratorExpressionEvaluationFile::CreateOutputFile(
   for(std::vector<std::string>::const_iterator le = enabledLanguages.begin();
       le != enabledLanguages.end(); ++le)
     {
-    std::string name = this->OutputFileExpr->Evaluate(lg->GetMakefile(),
+    std::string name = this->OutputFileExpr->Evaluate(lg,
                                                       config,
                                                       false, 0, 0, 0, *le);
     cmSourceFile* sf = lg->GetMakefile()->GetOrCreateSource(name);
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 88d10aa..61852ab 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -17,7 +17,7 @@
 
 //----------------------------------------------------------------------------
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
-    std::string const& prop, cmMakefile *makefile,
+    std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
     cmTarget const* headTarget, cmTarget const* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker)
@@ -25,7 +25,7 @@ std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
   cmGeneratorExpression ge(context->Backtrace);
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(prop);
   cge->SetEvaluateForBuildsystem(context->EvaluateForBuildsystem);
-  std::string result = cge->Evaluate(makefile,
+  std::string result = cge->Evaluate(lg,
                         context->Config,
                         context->Quiet,
                         headTarget,
@@ -367,7 +367,8 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
                        const std::string &lang) const
   {
     const char *compilerId =
-      context->Makefile->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID");
+      context->LG->GetMakefile()
+        ->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID");
     if (parameters.empty())
       {
       return compilerId ? compilerId : "";
@@ -391,13 +392,13 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
 
     if (cmsysString_strcasecmp(parameters.begin()->c_str(), compilerId) == 0)
       {
-      switch(context->Makefile->GetPolicyStatus(cmPolicies::CMP0044))
+      switch(context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0044))
         {
         case cmPolicies::WARN:
           {
           std::ostringstream e;
           e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0044);
-          context->Makefile->GetCMakeInstance()
+          context->LG->GetCMakeInstance()
                  ->IssueMessage(cmake::AUTHOR_WARNING,
                                 e.str(), context->Backtrace);
           }
@@ -470,8 +471,9 @@ struct CompilerVersionNode : public cmGeneratorExpressionNode
                        cmGeneratorExpressionDAGChecker *,
                        const std::string &lang) const
   {
-    const char *compilerVersion = context->Makefile->GetSafeDefinition(
-        "CMAKE_" + lang + "_COMPILER_VERSION");
+    const char *compilerVersion =
+        context->LG->GetMakefile()->GetSafeDefinition(
+          "CMAKE_" + lang + "_COMPILER_VERSION");
     if (parameters.empty())
       {
       return compilerVersion ? compilerVersion : "";
@@ -553,7 +555,7 @@ struct PlatformIdNode : public cmGeneratorExpressionNode
                        cmGeneratorExpressionDAGChecker *) const
   {
     const char *platformId =
-      context->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME");
+      context->LG->GetMakefile()->GetSafeDefinition("CMAKE_SYSTEM_NAME");
     if (parameters.empty())
       {
       return platformId ? platformId : "";
@@ -768,7 +770,7 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
       }
 
     std::vector<std::string> enabledLanguages;
-    cmGlobalGenerator* gg = context->Makefile->GetGlobalGenerator();
+    cmGlobalGenerator* gg = context->LG->GetGlobalGenerator();
     gg->GetEnabledLanguages(enabledLanguages);
     if (!parameters.empty() &&
           std::find(enabledLanguages.begin(), enabledLanguages.end(),
@@ -858,7 +860,7 @@ getLinkedTargetsContent(
     {
     linkedTargetsContent =
         cmGeneratorExpressionNode::EvaluateDependentExpression(depString,
-                                        target->Target->GetMakefile(),
+                                        target->GetLocalGenerator(),
                                         context,
                                         headTarget->Target,
                                         target->Target, dagChecker);
@@ -940,16 +942,17 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         }
       if(propertyName == "ALIASED_TARGET")
         {
-        if(context->Makefile->IsAlias(targetName))
+        if(context->LG->GetMakefile()->IsAlias(targetName))
           {
-          if(cmTarget* tgt = context->Makefile->FindTargetToUse(targetName))
+          if(cmTarget* tgt =
+             context->LG->GetMakefile()->FindTargetToUse(targetName))
             {
             return tgt->GetName();
             }
           }
         return "";
         }
-      target = context->Makefile->FindTargetToUse(targetName);
+      target = context->LG->GetMakefile()->FindTargetToUse(targetName);
 
       if (!target)
         {
@@ -994,7 +997,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     assert(target);
 
     cmGeneratorTarget* gtgt =
-        context->Makefile->GetGlobalGenerator()->GetGeneratorTarget(target);
+        context->LG->GetGlobalGenerator()->GetGeneratorTarget(target);
 
     if (propertyName == "LINKER_LANGUAGE")
       {
@@ -1099,7 +1102,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
                            "COMPILE_DEFINITIONS_"))
       {
       cmPolicies::PolicyStatus polSt =
-                      context->Makefile->GetPolicyStatus(cmPolicies::CMP0043);
+          context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0043);
       if (polSt == cmPolicies::WARN || polSt == cmPolicies::OLD)
         {
         interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";
@@ -1112,7 +1115,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if(isInterfaceProperty)
       {
       cmGeneratorTarget* gHeadTarget =
-          context->Makefile->GetGlobalGenerator()
+          context->LG->GetGlobalGenerator()
           ->GetGeneratorTarget(headTarget);
       if(cmLinkInterfaceLibraries const* iface =
          gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
@@ -1213,7 +1216,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if(!interfacePropertyName.empty())
       {
       std::string result = this->EvaluateDependentExpression(prop,
-                                        context->Makefile, context,
+                                        context->LG, context,
                                         headTarget, target, &dagChecker);
       if (!linkedTargetsContent.empty())
         {
@@ -1269,7 +1272,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
 
     std::string tgtName = parameters.front();
     cmGeneratorTarget* gt =
-                context->Makefile->FindGeneratorTargetToUse(tgtName);
+                context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
       std::ostringstream e;
@@ -1312,7 +1315,8 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
       assert(!map_it->second.empty());
       result += sep;
       std::string objFile = obj_dir + map_it->second;
-      cmSourceFile* sf = context->Makefile->GetOrCreateSource(objFile, true);
+      cmSourceFile* sf =
+          context->LG->GetMakefile()->GetOrCreateSource(objFile, true);
       sf->SetObjectLibrary(tgtName);
       sf->SetProperty("EXTERNAL_OBJECT", "1");
       result += objFile;
@@ -1354,7 +1358,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       {
       std::string error;
       std::string lang;
-      if (!context->Makefile->CompileFeatureKnown(context->HeadTarget,
+      if (!context->LG->GetMakefile()->CompileFeatureKnown(context->HeadTarget,
                                                   *it, lang, &error))
         {
         reportError(context, content->GetOriginalExpression(), error);
@@ -1365,7 +1369,8 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       if (availableFeatures.find(lang) == availableFeatures.end())
         {
         const char* featuresKnown
-                  = context->Makefile->CompileFeaturesAvailable(lang, &error);
+            = context->LG->GetMakefile()->CompileFeaturesAvailable(lang,
+                                                                   &error);
         if (!featuresKnown)
           {
           reportError(context, content->GetOriginalExpression(), error);
@@ -1383,7 +1388,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       {
       std::vector<std::string> const& langAvailable
                                               = availableFeatures[lit->first];
-      const char* standardDefault = context->Makefile
+      const char* standardDefault = context->LG->GetMakefile()
         ->GetDefinition("CMAKE_" + lit->first + "_STANDARD_DEFAULT");
       for (std::vector<std::string>::const_iterator it = lit->second.begin();
           it != lit->second.end(); ++it)
@@ -1399,7 +1404,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
           // All features known for the language are always available.
           continue;
           }
-        if (!context->Makefile->HaveStandardAvailable(target,
+        if (!context->LG->GetMakefile()->HaveStandardAvailable(target,
                                                       lit->first, *it))
           {
           if (evalLL)
@@ -1617,7 +1622,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
 
     std::string pdbSupportVar = "CMAKE_" + language + "_LINKER_SUPPORTS_PDB";
 
-    if(!context->Makefile->IsOn(pdbSupportVar))
+    if(!context->LG->GetMakefile()->IsOn(pdbSupportVar))
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_PDB_FILE is not supported by the target linker.");
@@ -1731,7 +1736,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       return std::string();
       }
     cmGeneratorTarget* target =
-        context->Makefile->FindGeneratorTargetToUse(name);
+        context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
     if(!target)
       {
       ::reportError(context, content->GetOriginalExpression(),
@@ -1813,7 +1818,7 @@ static const struct ShellPathNode : public cmGeneratorExpressionNode
                   "\"" + parameters.front() + "\" is not an absolute path.");
       return std::string();
       }
-    cmOutputConverter converter(context->Makefile->GetStateSnapshot());
+    cmOutputConverter converter(context->LG->GetStateSnapshot());
     return converter.ConvertDirectorySeparatorsForShell(parameters.front());
   }
 } shellPathNode;
@@ -1897,7 +1902,7 @@ void reportError(cmGeneratorExpressionContext *context,
   e << "Error evaluating generator expression:\n"
     << "  " << expr << "\n"
     << result;
-  context->Makefile->GetCMakeInstance()
+  context->LG->GetCMakeInstance()
     ->IssueMessage(cmake::FATAL_ERROR, e.str(),
                     context->Backtrace);
 }
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index 847a00a..22b6585 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -54,7 +54,7 @@ struct cmGeneratorExpressionNode
                               ) const = 0;
 
   static std::string EvaluateDependentExpression(
-    std::string const& prop, cmMakefile *makefile,
+    std::string const& prop, cmLocalGenerator *lg,
     cmGeneratorExpressionContext *context,
     cmTarget const* headTarget, cmTarget const* currentTarget,
     cmGeneratorExpressionDAGChecker *dagChecker);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1699362..04b0d1f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -453,7 +453,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
     // Now evaluate genex and update the previously-prepared map entry.
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(outName);
-    i->second = cge->Evaluate(this->Makefile, config);
+    i->second = cge->Evaluate(this->LocalGenerator, config);
     }
   else if(i->second.empty())
     {
@@ -510,7 +510,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
   return 0;
 }
 
-static void handleSystemIncludesDep(cmMakefile *mf,
+static void handleSystemIncludesDep(cmLocalGenerator *lg,
                                   cmGeneratorTarget const* depTgt,
                                   const std::string& config,
                                   cmGeneratorTarget const* headTarget,
@@ -523,7 +523,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     {
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
-                                      ->Evaluate(mf,
+                                      ->Evaluate(lg,
                                       config, false, headTarget->Target,
                                       depTgt->Target, dagChecker), result);
     }
@@ -537,7 +537,7 @@ static void handleSystemIncludesDep(cmMakefile *mf,
     {
     cmGeneratorExpression ge;
     cmSystemTools::ExpandListArgument(ge.Parse(dirs)
-                                      ->Evaluate(mf,
+                                      ->Evaluate(lg,
                                       config, false, headTarget->Target,
                                       depTgt->Target, dagChecker), result);
     }
@@ -879,7 +879,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
       {
       cmGeneratorExpression ge;
       cmSystemTools::ExpandListArgument(ge.Parse(*it)
-                                          ->Evaluate(this->Makefile,
+                                          ->Evaluate(this->LocalGenerator,
                                           config, false, this->Target,
                                           &dagChecker), result);
       }
@@ -889,7 +889,8 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     for(std::vector<cmGeneratorTarget const*>::const_iterator
           li = deps.begin(), le = deps.end(); li != le; ++li)
       {
-      handleSystemIncludesDep(this->Makefile, *li, config, this,
+      handleSystemIncludesDep(this->LocalGenerator, *li,
+                              config, this,
                               &dagChecker, result, excludeImported);
       }
 
@@ -961,7 +962,8 @@ static bool processSources(cmGeneratorTarget const* tgt,
     cmLinkImplItem const& item = (*it)->LinkImplItem;
     std::string const& targetName = item;
     std::vector<std::string> entrySources;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(
+                                              tgt->GetLocalGenerator(),
                                               config,
                                               false,
                                               tgt->Target,
@@ -2054,7 +2056,7 @@ void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result,
                                       this->GetName(),
                                       "AUTOUIC_OPTIONS", 0, 0);
   cmSystemTools::ExpandListArgument(ge.Parse(prop)
-                                      ->Evaluate(this->Makefile,
+                                      ->Evaluate(this->LocalGenerator,
                                                 config,
                                                 false,
                                                 this->Target,
@@ -2376,7 +2378,7 @@ cmTargetTraceDependencies
       {
       const cmsys::auto_ptr<cmCompiledGeneratorExpression> cge
                                                               = ge.Parse(*cli);
-      cge->Evaluate(this->Makefile, "", true);
+      cge->Evaluate(this->GeneratorTarget->GetLocalGenerator(), "", true);
       std::set<cmTarget*> geTargets = cge->GetTargets();
       targets.insert(geTargets.begin(), geTargets.end());
       }
@@ -2530,8 +2532,6 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
       const std::string& config, bool debugIncludes,
       const std::string& language)
 {
-  cmMakefile *mf = tgt->Target->GetMakefile();
-
   for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator
       it = entries.begin(), end = entries.end(); it != end; ++it)
     {
@@ -2540,7 +2540,8 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
     bool const fromImported = item.Target && item.Target->IsImported();
     bool const checkCMP0027 = item.FromGenex;
     std::vector<std::string> entryIncludes;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(
+                                        tgt->GetLocalGenerator(),
                                               config,
                                               false,
                                               tgt->Target,
@@ -2746,13 +2747,12 @@ static void processCompileOptionsInternal(cmGeneratorTarget const* tgt,
       const std::string& config, bool debugOptions, const char *logName,
       std::string const& language)
 {
-  cmMakefile *mf = tgt->Target->GetMakefile();
-
   for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator
       it = entries.begin(), end = entries.end(); it != end; ++it)
     {
     std::vector<std::string> entryOptions;
-    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
+    cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(
+                                        tgt->GetLocalGenerator(),
                                               config,
                                               false,
                                               tgt->Target,
@@ -4452,7 +4452,7 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
   std::vector<std::string> libs;
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
   cmSystemTools::ExpandListArgument(cge->Evaluate(
-                                      this->Makefile,
+                                      this->LocalGenerator,
                                       config,
                                       false,
                                       headTarget->Target,
@@ -4777,7 +4777,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
       ge.Parse(config_outdir);
-    out = cge->Evaluate(this->Makefile, config);
+    out = cge->Evaluate(this->LocalGenerator, config);
 
     // Skip per-configuration subdirectory.
     conf = "";
@@ -4788,7 +4788,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
       ge.Parse(outdir);
-    out = cge->Evaluate(this->Makefile, config);
+    out = cge->Evaluate(this->LocalGenerator, config);
 
     // Skip per-configuration subdirectory if the value contained a
     // generator expression.
@@ -5347,7 +5347,8 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
     cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge =
       ge.Parse(*le);
     std::string const evaluated =
-      cge->Evaluate(this->Makefile, config, false, head->Target, &dagChecker);
+      cge->Evaluate(this->LocalGenerator, config, false,
+                    head->Target, &dagChecker);
     cmSystemTools::ExpandListArgument(evaluated, llibs);
     if(cge->GetHadHeadSensitiveCondition())
       {
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index f4166b9..8651e2f 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -1016,7 +1016,8 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
         cmGeneratorExpression ge;
         cmsys::auto_ptr<cmCompiledGeneratorExpression>
           cge = ge.Parse(propertyValue);
-        if(cmSystemTools::IsOn(cge->Evaluate(target->GetMakefile(), *i)))
+        cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
+        if(cmSystemTools::IsOn(cge->Evaluate(gt->GetLocalGenerator(), *i)))
           {
           activeConfigs.insert(*i);
           }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 2d9a14b..bc67833 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2486,7 +2486,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
         {
         cmGeneratorExpression ge;
         std::string processed = ge.Parse(i->second.GetValue())
-          ->Evaluate(this->CurrentMakefile, configName);
+          ->Evaluate(this->CurrentLocalGenerator, configName);
         buildSettings->AddAttribute(attribute.c_str(),
                                     this->CreateString(processed));
         }
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index 78cb5f0..edd6a0e 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -97,5 +97,5 @@ cmInstallDirectoryGenerator::GetDestination(std::string const& config) const
 {
   cmGeneratorExpression ge;
   return ge.Parse(this->Destination)
-    ->Evaluate(this->LocalGenerator->GetMakefile(), config);
+    ->Evaluate(this->LocalGenerator, config);
 }
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index e2c16c8..383031b 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -68,7 +68,7 @@ cmInstallFilesGenerator::GetDestination(std::string const& config) const
 {
   cmGeneratorExpression ge;
   return ge.Parse(this->Destination)
-    ->Evaluate(this->LocalGenerator->GetMakefile(), config);
+    ->Evaluate(this->LocalGenerator, config);
 }
 
 //----------------------------------------------------------------------------
@@ -117,7 +117,7 @@ void cmInstallFilesGenerator::GenerateScriptForConfig(std::ostream& os,
     {
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*i);
     cmSystemTools::ExpandListArgument(cge->Evaluate(
-        this->LocalGenerator->GetMakefile(), config), files);
+        this->LocalGenerator, config), files);
     }
   this->AddFilesInstallRule(os, config, indent, files);
 }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index c2a18af..a3d2927 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -351,7 +351,7 @@ cmInstallTargetGenerator::GetDestination(std::string const& config) const
 {
   cmGeneratorExpression ge;
   return ge.Parse(this->Destination)
-    ->Evaluate(this->Target->Target->GetMakefile(), config);
+    ->Evaluate(this->Target->GetLocalGenerator(), config);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 4ddcac6..b896659 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -147,7 +147,8 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
                                             ge.Parse(additional_clean_files);
 
-    cmSystemTools::ExpandListArgument(cge->Evaluate(this->Makefile, config,
+    cmSystemTools::ExpandListArgument(cge->Evaluate(this->LocalGenerator,
+                                                    config,
                                                   false, this->Target, 0, 0),
                                       this->CleanFiles);
     }
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 9d85f5a..7dec50b 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -117,7 +117,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   else
     {
     // Use the command name given.
-    exe = ge.Parse(exe.c_str())->Evaluate(this->LG->GetMakefile(), config);
+    exe = ge.Parse(exe.c_str())->Evaluate(this->LG, config);
     cmSystemTools::ConvertToUnixSlashes(exe);
     }
 
@@ -128,7 +128,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
     {
     os << " " << cmOutputConverter::EscapeForCMake(
                                          ge.Parse(*ci)->Evaluate(
-                                            this->LG->GetMakefile(), config));
+                                            this->LG, config));
     }
 
   // Finish the test command.
@@ -145,7 +145,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
       {
       os << " " << i->first
          << " " << cmOutputConverter::EscapeForCMake(
-           ge.Parse(i->second.GetValue())->Evaluate(this->LG->GetMakefile(),
+           ge.Parse(i->second.GetValue())->Evaluate(this->LG,
                                                     config));
       }
     os << ")" << std::endl;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index e1b9223..a2aada6 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1370,7 +1370,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
         }
       for(size_t i = 0; i != this->Configurations.size(); ++i)
         {
-        if(0 == strcmp(cge->Evaluate(this->Makefile,
+        if(0 == strcmp(cge->Evaluate(this->LocalGenerator,
                                      this->Configurations[i]), "1"))
           {
           this->WriteString("<DeploymentContent Condition=\""
@@ -2301,7 +2301,8 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
         ge.Parse(nativeLibDirectoriesExpression);
-    std::string nativeLibDirs = cge->Evaluate(this->Makefile, configName);
+    std::string nativeLibDirs = cge->Evaluate(this->LocalGenerator,
+                                              configName);
     this->WriteString("<NativeLibDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(nativeLibDirs) <<
       "</NativeLibDirectories>\n";
@@ -2313,7 +2314,8 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
         ge.Parse(nativeLibDependenciesExpression);
-    std::string nativeLibDeps = cge->Evaluate(this->Makefile, configName);
+    std::string nativeLibDeps = cge->Evaluate(this->LocalGenerator,
+                                              configName);
     this->WriteString("<NativeLibDependencies>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(nativeLibDeps) <<
       "</NativeLibDependencies>\n";
@@ -2333,7 +2335,8 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
       ge.Parse(jarDirectoriesExpression);
-    std::string jarDirectories = cge->Evaluate(this->Makefile, configName);
+    std::string jarDirectories = cge->Evaluate(this->LocalGenerator,
+                                               configName);
     this->WriteString("<JarDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(jarDirectories) <<
       "</JarDirectories>\n";

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Oct 13 00:01:08 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 13 Oct 2015 00:01:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-175-g3d9cf05
Message-ID: <20151013040108.748F8C051D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  3d9cf05d2a1dc0ad191c15145ad7648cd77e18d6 (commit)
      from  e5fb30fb5bdff2913cc9382649984da89e882b25 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d9cf05d2a1dc0ad191c15145ad7648cd77e18d6
commit 3d9cf05d2a1dc0ad191c15145ad7648cd77e18d6
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Oct 13 00:01:06 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 13 00:01:06 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8095229..3ab2962 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151012)
+set(CMake_VERSION_PATCH 20151013)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From nilsgladitz at gmail.com  Tue Oct 13 10:27:25 2015
From: nilsgladitz at gmail.com (Nils Gladitz)
Date: Tue, 13 Oct 2015 10:27:25 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-503-g7db9307
Message-ID: <20151013142725.E6964C05D9@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7db9307dfdf5f2e6713f6a41d688d09a4dc8bd56 (commit)
       via  5a266095ee778fb700c067c55ff0b59777a72c50 (commit)
      from  be129b862a878c9154d601603dc20e7d3cc24bf6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7db9307dfdf5f2e6713f6a41d688d09a4dc8bd56
commit 7db9307dfdf5f2e6713f6a41d688d09a4dc8bd56
Merge: be129b8 5a26609
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Oct 13 10:27:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 10:27:24 2015 -0400

    Merge topic 'wix-text-node' into next
    
    5a266095 CPackWIX: Handle text nodes in XML patch content


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a266095ee778fb700c067c55ff0b59777a72c50
commit 5a266095ee778fb700c067c55ff0b59777a72c50
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Oct 12 21:53:08 2015 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Oct 12 21:53:08 2015 +0200

    CPackWIX: Handle text nodes in XML patch content

diff --git a/Source/CPack/WiX/cmWIXPatch.cxx b/Source/CPack/WiX/cmWIXPatch.cxx
index 5a8dc63..471c3a4 100644
--- a/Source/CPack/WiX/cmWIXPatch.cxx
+++ b/Source/CPack/WiX/cmWIXPatch.cxx
@@ -33,13 +33,30 @@ void cmWIXPatch::ApplyFragment(
   if(i == Fragments.end()) return;
 
   const cmWIXPatchElement& fragment = i->second;
+
+  this->ApplyElementChildren(fragment, writer);
+
+  Fragments.erase(i);
+}
+
+void cmWIXPatch::ApplyElementChildren(
+  const cmWIXPatchElement& element, cmWIXSourceWriter& writer)
+{
   for(cmWIXPatchElement::child_list_t::const_iterator
-    j = fragment.children.begin(); j != fragment.children.end(); ++j)
+    j = element.children.begin(); j != element.children.end(); ++j)
+  {
+  cmWIXPatchNode *node = *j;
+
+  switch(node->type())
     {
-    ApplyElement(**j, writer);
+    case cmWIXPatchNode::ELEMENT:
+      ApplyElement(dynamic_cast<const cmWIXPatchElement&>(*node), writer);
+      break;
+    case cmWIXPatchNode::TEXT:
+      writer.AddTextNode(dynamic_cast<const cmWIXPatchText&>(*node).text);
+      break;
     }
-
-  Fragments.erase(i);
+  }
 }
 
 void cmWIXPatch::ApplyElement(
@@ -53,16 +70,11 @@ void cmWIXPatch::ApplyElement(
     writer.AddAttribute(i->first, i->second);
     }
 
-  for(cmWIXPatchElement::child_list_t::const_iterator
-    i = element.children.begin(); i != element.children.end(); ++i)
-    {
-    ApplyElement(**i, writer);
-    }
+  this->ApplyElementChildren(element, writer);
 
   writer.EndElement(element.name);
 }
 
-
 bool cmWIXPatch::CheckForUnappliedFragments()
 {
   std::string fragmentList;
diff --git a/Source/CPack/WiX/cmWIXPatch.h b/Source/CPack/WiX/cmWIXPatch.h
index 7b7b2f1..d53fcb4 100644
--- a/Source/CPack/WiX/cmWIXPatch.h
+++ b/Source/CPack/WiX/cmWIXPatch.h
@@ -33,6 +33,9 @@ public:
   bool CheckForUnappliedFragments();
 
 private:
+  void ApplyElementChildren(const cmWIXPatchElement& element,
+    cmWIXSourceWriter& writer);
+
   void ApplyElement(const cmWIXPatchElement& element,
     cmWIXSourceWriter& writer);
 
diff --git a/Source/CPack/WiX/cmWIXPatchParser.cxx b/Source/CPack/WiX/cmWIXPatchParser.cxx
index e066c28..14c5413 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.cxx
+++ b/Source/CPack/WiX/cmWIXPatchParser.cxx
@@ -16,6 +16,21 @@
 
 #include <cm_expat.h>
 
+cmWIXPatchNode::Type cmWIXPatchText::type()
+{
+  return cmWIXPatchNode::TEXT;
+}
+
+cmWIXPatchNode::Type cmWIXPatchElement::type()
+{
+  return cmWIXPatchNode::ELEMENT;
+}
+
+cmWIXPatchNode::~cmWIXPatchNode()
+{
+
+}
+
 cmWIXPatchElement::~cmWIXPatchElement()
 {
   for(child_list_t::iterator i = children.begin(); i != children.end(); ++i)
@@ -63,20 +78,20 @@ void cmWIXPatchParser::StartElement(const std::string& name, const char **atts)
     {
       cmWIXPatchElement &parent = *ElementStack.back();
 
-      parent.children.resize(parent.children.size() + 1);
-      cmWIXPatchElement*& currentElement = parent.children.back();
-      currentElement = new cmWIXPatchElement;
-      currentElement->name = name;
+      cmWIXPatchElement *element = new cmWIXPatchElement;
+      parent.children.push_back(element);
+
+      element->name = name;
 
       for(size_t i = 0; atts[i]; i += 2)
         {
         std::string key = atts[i];
         std::string value = atts[i+1];
 
-        currentElement->attributes[key] = value;
+        element->attributes[key] = value;
         }
 
-      ElementStack.push_back(currentElement);
+      ElementStack.push_back(element);
     }
 }
 
@@ -117,11 +132,34 @@ void cmWIXPatchParser::EndElement(const std::string& name)
         }
       else
         {
-          ElementStack.pop_back();
+        ElementStack.pop_back();
         }
     }
 }
 
+void cmWIXPatchParser::CharacterDataHandler(const char* data, int length)
+{
+  const char* whitespace = "\x20\x09\x0d\x0a";
+
+  if(State == INSIDE_FRAGMENT)
+    {
+    cmWIXPatchElement &parent = *ElementStack.back();
+
+    std::string text(data, length);
+
+    std::string::size_type first = text.find_first_not_of(whitespace);
+    std::string::size_type last = text.find_last_not_of(whitespace);
+
+    if(first != std::string::npos && last != std::string::npos)
+      {
+      cmWIXPatchText *text_node = new cmWIXPatchText;
+      text_node->text = text.substr(first, last - first + 1);
+
+      parent.children.push_back(text_node);
+      }
+    }
+}
+
 void cmWIXPatchParser::ReportError(int line, int column, const char* msg)
 {
   cmCPackLogger(cmCPackLog::LOG_ERROR,
diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h
index acfb4c0..acaeae3 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.h
+++ b/Source/CPack/WiX/cmWIXPatchParser.h
@@ -20,11 +20,33 @@
 #include <map>
 #include <list>
 
-struct cmWIXPatchElement
+struct cmWIXPatchNode
 {
+  enum Type
+  {
+    TEXT,
+    ELEMENT
+  };
+
+  virtual ~cmWIXPatchNode();
+
+  virtual Type type() = 0;
+};
+
+struct cmWIXPatchText : public cmWIXPatchNode
+{
+  virtual Type type();
+
+  std::string text;
+};
+
+struct cmWIXPatchElement : cmWIXPatchNode
+{
+  virtual Type type();
+
   ~cmWIXPatchElement();
 
-  typedef std::list<cmWIXPatchElement*> child_list_t;
+  typedef std::list<cmWIXPatchNode*> child_list_t;
   typedef std::map<std::string, std::string> attributes_t;
 
   std::string name;
@@ -48,6 +70,9 @@ private:
   void StartFragment(const char **attributes);
 
   virtual void EndElement(const std::string& name);
+
+  virtual void CharacterDataHandler(const char* data, int length);
+
   virtual void ReportError(int line, int column, const char* msg);
 
   void ReportValidationError(std::string const& message);
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx
index 8d38e9b..63acb27 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx
@@ -102,6 +102,25 @@ void cmWIXSourceWriter::EndElement(std::string const& name)
   State = DEFAULT;
 }
 
+void cmWIXSourceWriter::AddTextNode(std::string const& text)
+{
+  if(State == BEGIN)
+    {
+    File << ">";
+    }
+
+  if(Elements.empty())
+    {
+    cmCPackLogger(cmCPackLog::LOG_ERROR,
+      "can not add text without open WiX element in '" <<
+      SourceFilename << "'" << std::endl);
+    return;
+    }
+
+  File << this->EscapeAttributeValue(text);
+  State = DEFAULT;
+}
+
 void cmWIXSourceWriter::AddProcessingInstruction(
   std::string const& target, std::string const& content)
 {
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h
index 3b9999c..9e303f0 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXSourceWriter.h
@@ -34,6 +34,8 @@ public:
 
   void EndElement(std::string const& name);
 
+  void AddTextNode(std::string const& text);
+
   void AddProcessingInstruction(
     std::string const& target, std::string const& content);
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/WiX/cmWIXPatch.cxx        |   32 ++++++++++++++------
 Source/CPack/WiX/cmWIXPatch.h          |    3 ++
 Source/CPack/WiX/cmWIXPatchParser.cxx  |   52 +++++++++++++++++++++++++++-----
 Source/CPack/WiX/cmWIXPatchParser.h    |   29 ++++++++++++++++--
 Source/CPack/WiX/cmWIXSourceWriter.cxx |   19 ++++++++++++
 Source/CPack/WiX/cmWIXSourceWriter.h   |    2 ++
 6 files changed, 118 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 13 11:49:02 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 13 Oct 2015 11:49:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-505-g12fcad5
Message-ID: <20151013154902.7696AC0284@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  12fcad5764d82276a98b5f1b22de34ac5ea77144 (commit)
       via  609a8921e7a830db01830ee572ed60d9f5574b14 (commit)
      from  7db9307dfdf5f2e6713f6a41d688d09a4dc8bd56 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12fcad5764d82276a98b5f1b22de34ac5ea77144
commit 12fcad5764d82276a98b5f1b22de34ac5ea77144
Merge: 7db9307 609a892
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 13 11:49:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 11:49:01 2015 -0400

    Merge topic 'doc-INCLUDES-relnote' into next
    
    609a8921 Help: Add release note about compile rule placeholder changes (#15787)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=609a8921e7a830db01830ee572ed60d9f5574b14
commit 609a8921e7a830db01830ee572ed60d9f5574b14
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 13 11:44:59 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 13 11:44:59 2015 -0400

    Help: Add release note about compile rule placeholder changes (#15787)
    
    The change made by commit v3.4.0-rc1~342^2 (Factor an <INCLUDES>
    placeholder out of <FLAGS> in rule variables, 2015-07-13) affects an
    internal interface.  Since it is commonly used by projects anyway, add a
    release note covering the change in placeholders.

diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst
index 495391a..89c5561 100644
--- a/Help/release/3.4.rst
+++ b/Help/release/3.4.rst
@@ -267,3 +267,7 @@ Other Changes
   created with the :command:`add_library` command.  ``MODULE``
   libraries are meant for explicit dynamic loading at runtime.
   They cannot be linked so ``SONAME`` is not useful.
+
+* The internal :variable:`CMAKE_<LANG>_COMPILE_OBJECT` rule variable now
+  substitutes compiler include flags in a separate ``<INCLUDES>`` placeholder
+  instead of the main ``<FLAGS>`` placeholder.

-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.4.rst |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 13 13:50:56 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 13 Oct 2015 13:50:56 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-177-g242d664
Message-ID: <20151013175056.3E2AAC04AD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  242d664f748baad810ae47aef91fc11475647f98 (commit)
       via  24aafbde115647b7e599d112d0bcc4f03c3e9b88 (commit)
      from  3d9cf05d2a1dc0ad191c15145ad7648cd77e18d6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=242d664f748baad810ae47aef91fc11475647f98
commit 242d664f748baad810ae47aef91fc11475647f98
Merge: 3d9cf05 24aafbd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 13 13:50:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 13:50:54 2015 -0400

    Merge topic 'xcode-adjust-deployment-to-host-version'
    
    24aafbde Xcode: Adjust deployment target SDK version to host version


-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 13 13:50:58 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 13 Oct 2015 13:50:58 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-179-gd75971b
Message-ID: <20151013175058.38A2EC04C2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  d75971b5af8b2e48a14bc1363826a555c77eed2d (commit)
       via  5225e0048c2b734eba7b03e396f89e74214daa66 (commit)
      from  242d664f748baad810ae47aef91fc11475647f98 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d75971b5af8b2e48a14bc1363826a555c77eed2d
commit d75971b5af8b2e48a14bc1363826a555c77eed2d
Merge: 242d664 5225e00
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 13 13:50:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 13:50:56 2015 -0400

    Merge topic 'FindPostgreSQL-v9.5'
    
    5225e004 FindPostgreSQL: Search for version 9.5


-----------------------------------------------------------------------

Summary of changes:
 Modules/FindPostgreSQL.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 13 13:51:00 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 13 Oct 2015 13:51:00 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-181-gfc04b8f
Message-ID: <20151013175100.2E06DC04CB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9 (commit)
       via  609a8921e7a830db01830ee572ed60d9f5574b14 (commit)
      from  d75971b5af8b2e48a14bc1363826a555c77eed2d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9
commit fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9
Merge: d75971b 609a892
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 13 13:50:58 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 13:50:58 2015 -0400

    Merge topic 'doc-INCLUDES-relnote'
    
    609a8921 Help: Add release note about compile rule placeholder changes (#15787)


-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.4.rst |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 13 13:51:02 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 13 Oct 2015 13:51:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-183-gd6af556
Message-ID: <20151013175102.2C0F4C04CE@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2 (commit)
       via  57f701a7f045fc13807933860bad22fa405c6621 (commit)
      from  fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2
commit d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2
Merge: fc04b8f 57f701a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 13 13:51:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 13:51:00 2015 -0400

    Merge topic 'FindGit-Atlassian-SourceTree'
    
    57f701a7 FindGit: Search in 'Atlassian SourceTree' user directory (#15758)


-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGit.cmake |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 13 13:51:36 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 13 Oct 2015 13:51:36 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-511-ga177b85
Message-ID: <20151013175136.889ACC04CB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a177b8586863744f774579f744afd400404993df (commit)
       via  d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2 (commit)
       via  fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9 (commit)
       via  d75971b5af8b2e48a14bc1363826a555c77eed2d (commit)
       via  242d664f748baad810ae47aef91fc11475647f98 (commit)
       via  3d9cf05d2a1dc0ad191c15145ad7648cd77e18d6 (commit)
      from  12fcad5764d82276a98b5f1b22de34ac5ea77144 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a177b8586863744f774579f744afd400404993df
commit a177b8586863744f774579f744afd400404993df
Merge: 12fcad5 d6af556
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 13 13:51:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 13 13:51:19 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 13 13:52:50 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 13 Oct 2015 13:52:50 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-187-gc4361a2
Message-ID: <20151013175250.B1151C0522@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  c4361a265b32acaa4a84c1ab14fecee1bfe49d33 (commit)
       via  be616c189d969f9f984356bd052e3b5f39290771 (commit)
       via  f13030cb5bdf6f91abf0e625fa0b4d2993ca4217 (commit)
       via  4f8d58f97ac82eec6bf0f2d63f4a25a6fa447716 (commit)
      from  d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 13 13:52:50 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 13 Oct 2015 13:52:50 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-516-g2ee565e
Message-ID: <20151013175250.CE970C0523@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2ee565e6f2795a90b7a4821cda7cbf23070efa5a (commit)
       via  c4361a265b32acaa4a84c1ab14fecee1bfe49d33 (commit)
       via  be616c189d969f9f984356bd052e3b5f39290771 (commit)
       via  f13030cb5bdf6f91abf0e625fa0b4d2993ca4217 (commit)
       via  4f8d58f97ac82eec6bf0f2d63f4a25a6fa447716 (commit)
      from  a177b8586863744f774579f744afd400404993df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ee565e6f2795a90b7a4821cda7cbf23070efa5a
commit 2ee565e6f2795a90b7a4821cda7cbf23070efa5a
Merge: a177b85 c4361a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 13 13:52:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 13 13:52:36 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 13 13:52:50 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 13 Oct 2015 13:52:50 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.4.0-rc1-16-gbe616c1
Message-ID: <20151013175250.E9F90C0524@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, release has been updated
       via  be616c189d969f9f984356bd052e3b5f39290771 (commit)
       via  609a8921e7a830db01830ee572ed60d9f5574b14 (commit)
       via  f13030cb5bdf6f91abf0e625fa0b4d2993ca4217 (commit)
       via  24aafbde115647b7e599d112d0bcc4f03c3e9b88 (commit)
       via  4f8d58f97ac82eec6bf0f2d63f4a25a6fa447716 (commit)
       via  5225e0048c2b734eba7b03e396f89e74214daa66 (commit)
      from  8f3ea27055982f92e11fb71743732b71cf9ae3ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.4.rst                     |    4 ++++
 Modules/FindPostgreSQL.cmake             |    2 +-
 Modules/Platform/Darwin-Initialize.cmake |    4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 13 14:58:13 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 13 Oct 2015 14:58:13 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-518-g0013c5c
Message-ID: <20151013185813.A9B01C089B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0013c5cad94e4e3c61a4f3eceafeb382bdc36969 (commit)
       via  10d662d477f63604e2370c84c5d47f565d519433 (commit)
      from  2ee565e6f2795a90b7a4821cda7cbf23070efa5a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0013c5cad94e4e3c61a4f3eceafeb382bdc36969
commit 0013c5cad94e4e3c61a4f3eceafeb382bdc36969
Merge: 2ee565e 10d662d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 14:58:12 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 14:58:12 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    10d662d4 fixup! cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10d662d477f63604e2370c84c5d47f565d519433
commit 10d662d477f63604e2370c84c5d47f565d519433
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 20:57:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 13 20:57:30 2015 +0200

    fixup! cmMakefile: Store container of cmExportBuildFileGenerators.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 8f5e84a..e8be2d6 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -73,7 +73,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   this->CurrentMakefile = 0;
   this->TryCompileOuterMakefile = 0;
 
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
 }
 
 cmGlobalGenerator::~cmGlobalGenerator()
@@ -234,6 +234,16 @@ bool cmGlobalGenerator::GenerateImportFile(const std::string &file)
   if (it != this->BuildExportSets.end())
     {
     bool result = it->second->GenerateImportFile();
+
+    if (!this->ConfigureDoneCMP0026AndCMP0024)
+      {
+      for (std::vector<cmMakefile*>::const_iterator mit =
+           this->Makefiles.begin(); mit != this->Makefiles.end(); ++mit)
+        {
+        (*mit)->RemoveExportBuildFileGeneratorCMP0024(it->second);
+        }
+      }
+
     delete it->second;
     it->second = 0;
     this->BuildExportSets.erase(it);
@@ -1122,11 +1132,11 @@ void cmGlobalGenerator::Configure()
       this->CMakeInstance->GetHomeOutputDirectory());
 
   // now do it
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
   dirMf->Configure();
   dirMf->EnforceDirectoryLevelRules();
 
-  this->ConfigureDoneCMP0026 = true;
+  this->ConfigureDoneCMP0026AndCMP0024 = true;
 
   // Put a copy of each global target in every directory.
   cmTargets globalTargets;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 294fca9..432b57c 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -362,7 +362,7 @@ public:
   cmFileLockPool& GetFileLockPool() { return FileLockPool; }
 #endif
 
-  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
+  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026AndCMP0024; }
 
   void ComputeBuildFileGenerators();
 
@@ -522,7 +522,7 @@ protected:
   bool ForceUnixPaths;
   bool ToolSupportsColor;
   bool InstallTargetEnabled;
-  bool ConfigureDoneCMP0026;
+  bool ConfigureDoneCMP0026AndCMP0024;
 };
 
 #endif
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 61832ba..8ac6358 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -708,6 +708,18 @@ cmMakefile::GetExportBuildFileGenerators() const
   return this->ExportBuildFileGenerators;
 }
 
+void cmMakefile::RemoveExportBuildFileGeneratorCMP0024(
+    cmExportBuildFileGenerator* gen)
+{
+  std::vector<cmExportBuildFileGenerator*>::iterator it =
+      std::find(this->ExportBuildFileGenerators.begin(),
+                this->ExportBuildFileGenerators.end(), gen);
+  if(it != this->ExportBuildFileGenerators.end())
+    {
+    this->ExportBuildFileGenerators.erase(it);
+    }
+}
+
 void cmMakefile::AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen)
 {
   this->ExportBuildFileGenerators.push_back(gen);
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8f865a0..8fe0bda 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -779,6 +779,7 @@ public:
 
   std::vector<cmExportBuildFileGenerator*>
   GetExportBuildFileGenerators() const;
+  void RemoveExportBuildFileGeneratorCMP0024(cmExportBuildFileGenerator* gen);
   void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
 
 protected:

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx |   16 +++++++++++++---
 Source/cmGlobalGenerator.h   |    4 ++--
 Source/cmMakefile.cxx        |   12 ++++++++++++
 Source/cmMakefile.h          |    1 +
 4 files changed, 28 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 13 15:00:20 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 13 Oct 2015 15:00:20 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-521-gda7ed9b
Message-ID: <20151013190020.440BFC0971@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  da7ed9b1e766d6cb8e657c1420c07eabd726a34a (commit)
       via  398edc10b5b2c73876bb4a409cff2ef43ecb8239 (commit)
       via  6219fc87aedb59e99f116b8c92f670f1ab3f60a4 (commit)
      from  0013c5cad94e4e3c61a4f3eceafeb382bdc36969 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da7ed9b1e766d6cb8e657c1420c07eabd726a34a
commit da7ed9b1e766d6cb8e657c1420c07eabd726a34a
Merge: 0013c5c 398edc1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 15:00:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 15:00:19 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    398edc10 cmLocalGenerator: Store cmGeneratorTargets.
    6219fc87 cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=398edc10b5b2c73876bb4a409cff2ef43ecb8239
commit 398edc10b5b2c73876bb4a409cff2ef43ecb8239
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:21:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 13 20:59:50 2015 +0200

    cmLocalGenerator: Store cmGeneratorTargets.
    
    Relieve cmMakefile of this responsibility.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f02afe..618f09f 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -43,7 +43,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
 {
   std::string const& argv0 = this->CC.GetCommandLines()[c][0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(argv0);
+      this->LG->FindGeneratorTargetToUse(argv0);
   if(target && target->GetType() == cmTarget::EXECUTABLE &&
      (target->Target->IsImported()
       || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 560cfc5..6c3cccd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -42,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->LG->GetMakefile()
+    cmGeneratorTarget *te = this->LG
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index fdfa35e..b7aeb02 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,8 +965,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmGeneratorTargetsType targets = (*it)->GetMakefile()
-                                        ->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
     for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2797d10..fe83b08 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1275,7 +1275,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
 
     std::string tgtName = parameters.front();
     cmGeneratorTarget* gt =
-                context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
+                context->LG->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
       std::ostringstream e;
@@ -1739,7 +1739,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       return std::string();
       }
     cmGeneratorTarget* target =
-        context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
+        context->LG->FindGeneratorTargetToUse(name);
     if(!target)
       {
       ::reportError(context, content->GetOriginalExpression(),
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6033efe..6bebc2b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2305,7 +2305,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
 
   // Check for a target with this name.
   if(cmGeneratorTarget* t
-                    = this->Makefile->FindGeneratorTargetToUse(util))
+                    = this->GeneratorTarget->
+                    GetLocalGenerator()->FindGeneratorTargetToUse(util))
     {
     // If we find the target and the dep was given as a full path,
     // then make sure it was not a full path to something else, and
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 9ac0019..e8be2d6 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1578,7 +1578,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     this->GeneratorTargets[*j] = gt;
     generatorTargets[*j] = gt;
     }
-  mf->SetGeneratorTargets(generatorTargets);
+  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 87cf58f..45a1509 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -287,7 +287,7 @@ void cmGlobalGhsMultiGenerator::Generate()
       {
       cmLocalGhsMultiGenerator *lg =
         static_cast<cmLocalGhsMultiGenerator *>(this->LocalGenerators[i]);
-      cmGeneratorTargetsType tgts = lg->GetMakefile()->GetGeneratorTargets();
+      cmGeneratorTargetsType tgts = lg->GetGeneratorTargets();
       this->UpdateBuildFiles(&tgts);
       }
     }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f955ef7..ed36634 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,8 +68,7 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      cmMakefile* makefile=(*lg)->GetMakefile();
-      cmGeneratorTargetsType const& targets = makefile->GetGeneratorTargets();
+      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
       for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
            ti != targets.end(); ti++)
         {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 218e702..f9740e5 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -461,7 +461,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
@@ -627,7 +627,7 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
     for(cmGeneratorTargetsType::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
@@ -728,7 +728,7 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 0bdb008..8cb7d24 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -256,7 +256,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
                           noCommandLines);
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
-  mf->AddGeneratorTarget(tgt, gt);
+  lg->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 6a25ed0..fa9c606 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -87,7 +87,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           "Build all projects");
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
-      allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
+      gen[0]->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
@@ -108,7 +108,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
           i != gen.end(); ++i)
         {
         cmGeneratorTargetsType targets =
-            (*i)->GetMakefile()->GetGeneratorTargets();
+            (*i)->GetGeneratorTargets();
         for(cmGeneratorTargetsType::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bc67833..6291796 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -459,7 +459,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         "echo", "Build all projects");
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
-  mf->AddGeneratorTarget(allbuild, allBuildGt);
+  root->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -494,7 +494,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           "make", "-f", file.c_str());
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
-    mf->AddGeneratorTarget(check, checkGt);
+    root->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f19d551..3691b41 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,7 +132,7 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -448,6 +448,13 @@ void cmLocalGenerator::GenerateInstallRules()
     }
 }
 
+
+void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+{
+  this->GeneratorTargets[t] = gt;
+  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
+}
+
 //----------------------------------------------------------------------------
 void cmLocalGenerator::ComputeTargetManifest()
 {
@@ -460,7 +467,7 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -1767,6 +1774,17 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
+{
+  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+    {
+    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    }
+  return 0;
+}
+
+//----------------------------------------------------------------------------
 bool cmLocalGenerator::GetRealDependency(const std::string& inName,
                                          const std::string& config,
                                          std::string& dep)
@@ -1792,7 +1810,7 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
 
   // Look for a CMake target with the given name.
   if(cmGeneratorTarget* target =
-     this->Makefile->FindGeneratorTargetToUse(name))
+     this->FindGeneratorTargetToUse(name))
     {
     // make sure it is not just a coincidence that the target name
     // found is part of the inName
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 758709a..97e3f88 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -112,6 +112,19 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
+  const cmGeneratorTargetsType &GetGeneratorTargets() const
+    {
+      return this->GeneratorTargets;
+    }
+
+  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
+    {
+      this->GeneratorTargets = targets;
+    }
+  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
+
+  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
+
   /**
    * Encode a list of preprocessor definitions for the compiler
    * command line.
@@ -354,6 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmTarget const*> WarnCMP0063;
+  cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index bac989f..721f239 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,7 +26,7 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  cmGeneratorTargetsType tgts = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
 
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 6319f0e..8d71469 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,7 +73,7 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  cmGeneratorTargetsType targets = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index bf5afc1..91c7acd 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,7 +113,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
   for(cmGeneratorTargetsType::iterator t = targets.begin();
@@ -175,7 +175,7 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
@@ -418,7 +418,7 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   std::string localName;
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f2f7ee7..8ac6358 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1812,12 +1812,6 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
-void cmMakefile::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-{
-  this->GeneratorTargets[t] = gt;
-  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
-}
-
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
@@ -4321,17 +4315,6 @@ bool cmMakefile::IsAlias(const std::string& name) const
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmMakefile::FindGeneratorTargetToUse(const std::string& name) const
-{
-  if (cmTarget *t = this->FindTargetToUse(name))
-    {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
-    }
-  return 0;
-}
-
-//----------------------------------------------------------------------------
 bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
                                    bool isCustom) const
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 46fdc94..8fe0bda 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -17,7 +17,6 @@
 #include "cmSystemTools.h"
 #include "cmTarget.h"
 #include "cmNewLineStyle.h"
-#include "cmGeneratorTarget.h"
 #include "cmExpandedCommandArgument.h"
 #include "cmake.h"
 #include "cmState.h"
@@ -393,17 +392,6 @@ public:
       return this->ImportedTargetsOwned;
     }
 
-  const cmGeneratorTargetsType &GetGeneratorTargets() const
-    {
-      return this->GeneratorTargets;
-    }
-
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-    {
-      this->GeneratorTargets = targets;
-    }
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
-
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
@@ -412,7 +400,6 @@ public:
   cmTarget* FindTargetToUse(const std::string& name,
                             bool excludeAliases = false) const;
   bool IsAlias(const std::string& name) const;
-  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
   /**
    * Mark include directories as system directories.
@@ -816,7 +803,6 @@ protected:
   typedef std::map<std::string, cmTarget*> TargetMap;
 #endif
   TargetMap AliasTargets;
-  cmGeneratorTargetsType GeneratorTargets;
   std::vector<cmSourceFile*> SourceFiles;
 
   // Tests
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6e3f65f..f9875b3 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -886,7 +886,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    makefile->AddGeneratorTarget(autogenTarget, gt);
+    lg->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 7dec50b..85fb405 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -89,7 +89,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   // be translated.
   std::string exe = command[0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(exe);
+      this->LG->FindGeneratorTargetToUse(exe);
   if(target && target->GetType() == cmTarget::EXECUTABLE)
     {
     // Use the target file on disk.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6219fc87aedb59e99f116b8c92f670f1ab3f60a4
commit 6219fc87aedb59e99f116b8c92f670f1ab3f60a4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 22:08:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 13 20:58:40 2015 +0200

    cmMakefile: Store container of cmExportBuildFileGenerators.
    
    Set a cmLocalGenerator on each instance at compute time.  That will
    soon be needed to access cmGeneratorTarget instances.
    
    If a cmExportBuildFileGenerator is processed early during configure time as a
    result of CMP0024 it must be removed from the list to process later at generate
    time.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 400fa17..560cfc5 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -18,13 +18,18 @@
 
 //----------------------------------------------------------------------------
 cmExportBuildFileGenerator::cmExportBuildFileGenerator()
-  : Backtrace()
 {
-  this->Makefile = 0;
+  this->LG = 0;
   this->ExportSet = 0;
 }
 
 //----------------------------------------------------------------------------
+void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
+{
+  this->LG = lg;
+}
+
+//----------------------------------------------------------------------------
 bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
 {
   std::vector<cmGeneratorTarget*> allTargets;
@@ -37,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->Makefile
+    cmGeneratorTarget *te = this->LG->GetMakefile()
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
@@ -49,8 +54,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       {
       std::ostringstream e;
       e << "given target \"" << te->GetName() << "\" more than once.";
-      this->Makefile->GetCMakeInstance()
-          ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+      this->LG->GetGlobalGenerator()->GetCMakeInstance()
+          ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                         this->LG->GetMakefile()->GetBacktrace());
       return false;
       }
     if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -328,8 +334,9 @@ cmExportBuildFileGenerator
   e << "If the required target is not easy to reference in this call, "
     << "consider using the APPEND option with multiple separate calls.";
 
-  this->Makefile->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+  this->LG->GetGlobalGenerator()->GetCMakeInstance()
+      ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                     this->LG->GetMakefile()->GetBacktrace());
 }
 
 std::string
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index ff3d2e1..16695f1 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -43,10 +43,7 @@ public:
   /** Set whether to append generated code to the output file.  */
   void SetAppendMode(bool append) { this->AppendMode = append; }
 
-  void SetMakefile(cmMakefile *mf) {
-    this->Makefile = mf;
-    this->Backtrace = this->Makefile->GetBacktrace();
-  }
+  void Compute(cmLocalGenerator* lg);
 
 protected:
   // Implement virtual methods from the superclass.
@@ -80,8 +77,7 @@ protected:
   std::vector<std::string> Targets;
   cmExportSet *ExportSet;
   std::vector<cmGeneratorTarget*> Exports;
-  cmMakefile* Makefile;
-  cmListFileBacktrace Backtrace;
+  cmLocalGenerator* LG;
 };
 
 #endif
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 6a1d7f3..c2d9cc4 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -221,7 +221,7 @@ bool cmExportCommand
     {
     ebfg->SetTargets(targets);
     }
-  ebfg->SetMakefile(this->Makefile);
+  this->Makefile->AddExportBuildFileGenerator(ebfg);
   ebfg->SetExportOld(this->ExportOld.IsEnabled());
 
   // Compute the set of configurations exported.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6750611..9ac0019 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -73,7 +73,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   this->CurrentMakefile = 0;
   this->TryCompileOuterMakefile = 0;
 
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
 }
 
 cmGlobalGenerator::~cmGlobalGenerator()
@@ -234,6 +234,16 @@ bool cmGlobalGenerator::GenerateImportFile(const std::string &file)
   if (it != this->BuildExportSets.end())
     {
     bool result = it->second->GenerateImportFile();
+
+    if (!this->ConfigureDoneCMP0026AndCMP0024)
+      {
+      for (std::vector<cmMakefile*>::const_iterator mit =
+           this->Makefiles.begin(); mit != this->Makefiles.end(); ++mit)
+        {
+        (*mit)->RemoveExportBuildFileGeneratorCMP0024(it->second);
+        }
+      }
+
     delete it->second;
     it->second = 0;
     this->BuildExportSets.erase(it);
@@ -1122,11 +1132,11 @@ void cmGlobalGenerator::Configure()
       this->CMakeInstance->GetHomeOutputDirectory());
 
   // now do it
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
   dirMf->Configure();
   dirMf->EnforceDirectoryLevelRules();
 
-  this->ConfigureDoneCMP0026 = true;
+  this->ConfigureDoneCMP0026AndCMP0024 = true;
 
   // Put a copy of each global target in every directory.
   cmTargets globalTargets;
@@ -1226,6 +1236,20 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
   return false;
 }
 
+void cmGlobalGenerator::ComputeBuildFileGenerators()
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmExportBuildFileGenerator*> gens =
+        this->Makefiles[i]->GetExportBuildFileGenerators();
+    for (std::vector<cmExportBuildFileGenerator*>::const_iterator it =
+         gens.begin(); it != gens.end(); ++it)
+      {
+      (*it)->Compute(this->LocalGenerators[i]);
+      }
+    }
+}
+
 bool cmGlobalGenerator::Compute()
 {
   // Some generators track files replaced during the Generate.
@@ -1255,6 +1279,8 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
+  this->ComputeBuildFileGenerators();
+
   unsigned int i;
 
   // Add generator specific helper commands
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 55e3766..432b57c 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -362,7 +362,9 @@ public:
   cmFileLockPool& GetFileLockPool() { return FileLockPool; }
 #endif
 
-  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
+  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026AndCMP0024; }
+
+  void ComputeBuildFileGenerators();
 
   std::string MakeSilentFlag;
 protected:
@@ -520,7 +522,7 @@ protected:
   bool ForceUnixPaths;
   bool ToolSupportsColor;
   bool InstallTargetEnabled;
-  bool ConfigureDoneCMP0026;
+  bool ConfigureDoneCMP0026AndCMP0024;
 };
 
 #endif
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 8890e2b..97d4d56 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -126,6 +126,7 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
+    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 73d3522..f2f7ee7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -702,6 +702,29 @@ cmMakefile::GetEvaluationFiles() const
   return this->EvaluationFiles;
 }
 
+std::vector<cmExportBuildFileGenerator*>
+cmMakefile::GetExportBuildFileGenerators() const
+{
+  return this->ExportBuildFileGenerators;
+}
+
+void cmMakefile::RemoveExportBuildFileGeneratorCMP0024(
+    cmExportBuildFileGenerator* gen)
+{
+  std::vector<cmExportBuildFileGenerator*>::iterator it =
+      std::find(this->ExportBuildFileGenerators.begin(),
+                this->ExportBuildFileGenerators.end(), gen);
+  if(it != this->ExportBuildFileGenerators.end())
+    {
+    this->ExportBuildFileGenerators.erase(it);
+    }
+}
+
+void cmMakefile::AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen)
+{
+  this->ExportBuildFileGenerators.push_back(gen);
+}
+
 namespace
 {
   struct file_not_persistent
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0a8dcd5..46fdc94 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -51,6 +51,7 @@ class cmake;
 class cmMakefileCall;
 class cmCMakePolicyCommand;
 class cmGeneratorExpressionEvaluationFile;
+class cmExportBuildFileGenerator;
 
 /** \class cmMakefile
  * \brief Process the input CMakeLists.txt file.
@@ -789,6 +790,11 @@ public:
                   bool inputIsContent);
   std::vector<cmGeneratorExpressionEvaluationFile*> GetEvaluationFiles() const;
 
+  std::vector<cmExportBuildFileGenerator*>
+  GetExportBuildFileGenerators() const;
+  void RemoveExportBuildFileGeneratorCMP0024(cmExportBuildFileGenerator* gen);
+  void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
+
 protected:
   // add link libraries and directories to the target
   void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
@@ -882,6 +888,7 @@ private:
   mutable cmsys::RegularExpression cmNamedCurly;
 
   std::vector<cmMakefile*> UnConfiguredDirectories;
+  std::vector<cmExportBuildFileGenerator*> ExportBuildFileGenerators;
 
   std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
 
diff --git a/bootstrap b/bootstrap
index ca86528..54f7ca6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -261,6 +261,7 @@ CMAKE_CXX_SOURCES="\
   cmPropertyDefinitionMap \
   cmMakeDepend \
   cmMakefile \
+  cmExportBuildFileGenerator \
   cmExportFileGenerator \
   cmExportInstallFileGenerator \
   cmExportTryCompileFileGenerator \

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 13 15:31:05 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 13 Oct 2015 15:31:05 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-523-g6638bfe
Message-ID: <20151013193105.D3B9FC0457@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6638bfeba68c732f5441e00fdcd807957d3b041a (commit)
       via  fd7dfcae57604216c18d60efffcd243b5506f5a6 (commit)
      from  da7ed9b1e766d6cb8e657c1420c07eabd726a34a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6638bfeba68c732f5441e00fdcd807957d3b041a
commit 6638bfeba68c732f5441e00fdcd807957d3b041a
Merge: da7ed9b fd7dfca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 15:31:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 15:31:05 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    fd7dfcae fixup! cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd7dfcae57604216c18d60efffcd243b5506f5a6
commit fd7dfcae57604216c18d60efffcd243b5506f5a6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 21:30:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 13 21:30:40 2015 +0200

    fixup! cmMakefile: Store container of cmExportBuildFileGenerators.

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 432b57c..fc81708 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -362,7 +362,8 @@ public:
   cmFileLockPool& GetFileLockPool() { return FileLockPool; }
 #endif
 
-  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026AndCMP0024; }
+  bool GetConfigureDoneCMP0026() const
+  { return this->ConfigureDoneCMP0026AndCMP0024; }
 
   void ComputeBuildFileGenerators();
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 13 18:37:18 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 13 Oct 2015 18:37:18 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-525-ge15afa2
Message-ID: <20151013223718.DD694C081B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e15afa23efdaa409f5f809444fa1ceb98f18210b (commit)
       via  1d4979a5cd69a115c91d04a343925d2860b92c1e (commit)
      from  6638bfeba68c732f5441e00fdcd807957d3b041a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e15afa23efdaa409f5f809444fa1ceb98f18210b
commit e15afa23efdaa409f5f809444fa1ceb98f18210b
Merge: 6638bfe 1d4979a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 18:37:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 18:37:17 2015 -0400

    Merge topic 'init-state-for-subdirs' into next
    
    1d4979a5 Revert "Subdirs: Initialize from parent before configuring."


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d4979a5cd69a115c91d04a343925d2860b92c1e
commit 1d4979a5cd69a115c91d04a343925d2860b92c1e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 00:36:34 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 00:36:34 2015 +0200

    Revert "Subdirs: Initialize from parent before configuring."
    
    This reverts commit 7dac31b2292b0eac32929649cad1f32e6f0a6114.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3b8c188..73d3522 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1682,7 +1682,6 @@ void cmMakefile::Configure()
   std::vector<cmMakefile*>::iterator sdi = subdirs.begin();
   for (; sdi != subdirs.end(); ++sdi)
     {
-    (*sdi)->StateSnapshot.InitializeFromParent_ForSubdirsCommand();
     this->ConfigureSubDirectory(*sdi);
     }
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index eb0145e..72c7330 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1366,11 +1366,6 @@ std::string cmState::Snapshot::GetProjectName() const
   return this->Position->BuildSystemDirectory->ProjectName;
 }
 
-void cmState::Snapshot::InitializeFromParent_ForSubdirsCommand()
-{
-  this->InitializeFromParent();
-}
-
 cmState::Directory::Directory(
     cmLinkedTree<BuildsystemDirectoryStateType>::iterator iter,
     const cmState::Snapshot& snapshot)
diff --git a/Source/cmState.h b/Source/cmState.h
index 4f714a6..2f66f7f 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -90,8 +90,6 @@ public:
     void SetProjectName(std::string const& name);
     std::string GetProjectName() const;
 
-    void InitializeFromParent_ForSubdirsCommand();
-
     struct StrictWeakOrder
     {
       bool operator()(const cmState::Snapshot& lhs,
diff --git a/Tests/SubDir/CMakeLists.txt b/Tests/SubDir/CMakeLists.txt
index 32aa93f..6822e6b 100644
--- a/Tests/SubDir/CMakeLists.txt
+++ b/Tests/SubDir/CMakeLists.txt
@@ -1,10 +1,6 @@
 cmake_minimum_required (VERSION 2.6)
 project(SUBDIR)
-
 subdirs(Executable EXCLUDE_FROM_ALL Examples)
-
-set(DEFINED_AFTER_SUBDIRS_COMMAND 42)
-
 write_file(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.")
 #WATCOM WMAKE does not support + in the name of a file!
 if(WATCOM)
diff --git a/Tests/SubDir/Executable/CMakeLists.txt b/Tests/SubDir/Executable/CMakeLists.txt
index e1e5ef3..77e6751 100644
--- a/Tests/SubDir/Executable/CMakeLists.txt
+++ b/Tests/SubDir/Executable/CMakeLists.txt
@@ -1,5 +1 @@
 add_executable(test test.cxx)
-
-if (NOT DEFINED_AFTER_SUBDIRS_COMMAND)
-  message(FATAL_ERROR "DEFINED_AFTER_SUBDIRS_COMMAND should be defined.")
-endif()

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx                  |    1 -
 Source/cmState.cxx                     |    5 -----
 Source/cmState.h                       |    2 --
 Tests/SubDir/CMakeLists.txt            |    4 ----
 Tests/SubDir/Executable/CMakeLists.txt |    4 ----
 5 files changed, 16 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 13 18:38:34 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 13 Oct 2015 18:38:34 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-533-gd2d09ae
Message-ID: <20151013223834.77FE1C0846@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d2d09aece23f023f3e81586811a31abac0e3292f (commit)
       via  2bf7de167f0b72b07c6246679c964d83cdc47d45 (commit)
       via  0aa34de5493732d219dd3f58634222677bd19e22 (commit)
       via  20b95ef8c83fbcb7705e72c85c9de18ff420562f (commit)
       via  841164cb36650574a1a7363c78e4cdf28d5d37fd (commit)
       via  2c219bafc045dfdf49529b8ad141fed3dbb4d8e9 (commit)
       via  84e0776e77e625ab43c1a5b2031a06a035ae0210 (commit)
       via  871ab98dad2ed9d504a081a0ffa62b438793cbe4 (commit)
      from  e15afa23efdaa409f5f809444fa1ceb98f18210b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2d09aece23f023f3e81586811a31abac0e3292f
commit d2d09aece23f023f3e81586811a31abac0e3292f
Merge: e15afa2 2bf7de1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 18:38:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 13 18:38:32 2015 -0400

    Merge topic 'refactor-state-initialization' into next
    
    2bf7de16 Subdirs: Initialize from parent before configuring.
    0aa34de5 cmState: Initialize properties immediately.
    20b95ef8 cmState: Initialize default definitions immediately.
    841164cb cmState: Initialize current directories immediately.
    2c219baf cmState: Initialize top level source directories immediately.
    84e0776e cmMakefile: Set default internal definitions directly.
    871ab98d cmMakefile: Set internal definitions directly.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bf7de167f0b72b07c6246679c964d83cdc47d45
commit 2bf7de167f0b72b07c6246679c964d83cdc47d45
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 12 19:34:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 00:34:11 2015 +0200

    Subdirs: Initialize from parent before configuring.
    
    Add new API for the subdirs command to cmState.
    
    This fixes a regression introduced in commit f716460e (cmMakefile: Move
    invokation to initialize snapshot., 2015-10-06).

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3f94125..ce95b2c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1647,6 +1647,7 @@ void cmMakefile::Configure()
   std::vector<cmMakefile*>::iterator sdi = subdirs.begin();
   for (; sdi != subdirs.end(); ++sdi)
     {
+    (*sdi)->StateSnapshot.InitializeFromParent_ForSubdirsCommand();
     this->ConfigureSubDirectory(*sdi);
     }
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 01fd4e2..825204c 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1447,6 +1447,20 @@ std::string cmState::Snapshot::GetProjectName() const
   return this->Position->BuildSystemDirectory->ProjectName;
 }
 
+void cmState::Snapshot::InitializeFromParent_ForSubdirsCommand()
+{
+  std::string currentSrcDir = this->GetDefinition("CMAKE_CURRENT_SOURCE_DIR");
+  std::string currentBinDir = this->GetDefinition("CMAKE_CURRENT_BINARY_DIR");
+  this->InitializeFromParent();
+  this->SetDefinition("CMAKE_SOURCE_DIR",
+                      this->State->GetSourceDirectory());
+  this->SetDefinition("CMAKE_BINARY_DIR",
+                      this->State->GetBinaryDirectory());
+
+  this->SetDefinition("CMAKE_CURRENT_SOURCE_DIR", currentSrcDir.c_str());
+  this->SetDefinition("CMAKE_CURRENT_BINARY_DIR", currentBinDir.c_str());
+}
+
 cmState::Directory::Directory(
     cmLinkedTree<BuildsystemDirectoryStateType>::iterator iter,
     const cmState::Snapshot& snapshot)
diff --git a/Source/cmState.h b/Source/cmState.h
index 3e8a465..f2c0c6f 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -90,6 +90,8 @@ public:
     void SetProjectName(std::string const& name);
     std::string GetProjectName() const;
 
+    void InitializeFromParent_ForSubdirsCommand();
+
     struct StrictWeakOrder
     {
       bool operator()(const cmState::Snapshot& lhs,
diff --git a/Tests/SubDir/CMakeLists.txt b/Tests/SubDir/CMakeLists.txt
index 6822e6b..32aa93f 100644
--- a/Tests/SubDir/CMakeLists.txt
+++ b/Tests/SubDir/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required (VERSION 2.6)
 project(SUBDIR)
+
 subdirs(Executable EXCLUDE_FROM_ALL Examples)
+
+set(DEFINED_AFTER_SUBDIRS_COMMAND 42)
+
 write_file(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.")
 #WATCOM WMAKE does not support + in the name of a file!
 if(WATCOM)
diff --git a/Tests/SubDir/Executable/CMakeLists.txt b/Tests/SubDir/Executable/CMakeLists.txt
index 77e6751..fbe338e 100644
--- a/Tests/SubDir/Executable/CMakeLists.txt
+++ b/Tests/SubDir/Executable/CMakeLists.txt
@@ -1 +1,13 @@
 add_executable(test test.cxx)
+
+if (NOT DEFINED_AFTER_SUBDIRS_COMMAND)
+  message(FATAL_ERROR "DEFINED_AFTER_SUBDIRS_COMMAND should be defined.")
+endif()
+
+string(FIND "${CMAKE_CURRENT_BINARY_DIR}" "SubDir/Executable" location)
+string(LENGTH "${CMAKE_CURRENT_BINARY_DIR}" dirLength)
+math(EXPR suffixLength "${dirLength} - ${location}")
+
+if (NOT suffixLength EQUAL 17)
+  message(FATAL_ERROR "CMAKE_CURRENT_BINARY_DIR does not end with \"SubDir/Executable\"")
+endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0aa34de5493732d219dd3f58634222677bd19e22
commit 0aa34de5493732d219dd3f58634222677bd19e22
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 22:34:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 00:16:21 2015 +0200

    cmState: Initialize properties immediately.
    
    Don't leave this as cmMakefile responsibility.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 22d24d7..3f94125 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -55,8 +55,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
 
   this->SuppressWatches = false;
 
-  // Setup the default include file regular expression (match everything).
-  this->SetProperty("INCLUDE_REGULAR_EXPRESSION", "^.*$");
   // Setup the default include complaint regular expression (match nothing).
   this->ComplainFileRegularExpression = "^$";
   // Source and header file extensions that we can handle
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 364b75e..01fd4e2 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1381,6 +1381,10 @@ void cmState::Snapshot::SetDefaultDefinitions()
 
     this->SetDefinition("CMAKE_FILES_DIRECTORY",
                         cmake::GetCMakeFilesDirectory());
+
+  // Setup the default include file regular expression (match everything).
+  this->Position->BuildSystemDirectory
+      ->Properties.SetProperty("INCLUDE_REGULAR_EXPRESSION", "^.*$");
 }
 
 void cmState::Snapshot::SetDirectoryDefinitions()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20b95ef8c83fbcb7705e72c85c9de18ff420562f
commit 20b95ef8c83fbcb7705e72c85c9de18ff420562f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 21:48:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 00:16:20 2015 +0200

    cmState: Initialize default definitions immediately.
    
    Don't leave this as cmMakefile responsibility.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 2f69c25..22d4bf0 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -717,6 +717,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
         cmake cm;
         cm.SetHomeDirectory("");
         cm.SetHomeOutputDirectory("");
+        cm.GetCurrentSnapshot().SetDefaultDefinitions();
         cm.AddCMakePaths();
         cm.SetProgressCallback(cmCPackGeneratorProgress, this);
         cmGlobalGenerator gg(&cm);
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index f6447ec..c08897f 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -199,6 +199,7 @@ int main (int argc, char const* const* argv)
   cmake cminst;
   cminst.SetHomeDirectory("");
   cminst.SetHomeOutputDirectory("");
+  cminst.GetCurrentSnapshot().SetDefaultDefinitions();
   cminst.GetState()->RemoveUnscriptableCommands();
   cmGlobalGenerator cmgg(&cminst);
   cmsys::auto_ptr<cmMakefile> globalMF(
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index ca5d05a..749a5be 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -736,6 +736,7 @@ void cmCTestLaunch::LoadConfig()
   cmake cm;
   cm.SetHomeDirectory("");
   cm.SetHomeOutputDirectory("");
+  cm.GetCurrentSnapshot().SetDefaultDefinitions();
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot()));
   std::string fname = this->LogDir;
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index b9016af..ee15271 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -314,6 +314,7 @@ void cmCTestScriptHandler::CreateCMake()
   this->CMake = new cmake;
   this->CMake->SetHomeDirectory("");
   this->CMake->SetHomeOutputDirectory("");
+  this->CMake->GetCurrentSnapshot().SetDefaultDefinitions();
   this->CMake->AddCMakePaths();
   this->GlobalGenerator = new cmGlobalGenerator(this->CMake);
 
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 968a307..fa3b416 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1590,6 +1590,7 @@ void cmCTestTestHandler::GetListOfTests()
   cmake cm;
   cm.SetHomeDirectory("");
   cm.SetHomeOutputDirectory("");
+  cm.GetCurrentSnapshot().SetDefaultDefinitions();
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot()));
   mf->AddDefinition("CTEST_CONFIGURATION_TYPE",
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 67eb042..f3e7121 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -517,6 +517,7 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command)
   cmake cm;
   cm.SetHomeDirectory("");
   cm.SetHomeOutputDirectory("");
+  cm.GetCurrentSnapshot().SetDefaultDefinitions();
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot()));
   if ( !this->ReadCustomConfigurationFileTree(this->BinaryDir.c_str(),
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 218e702..41df270 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -589,6 +589,7 @@ void cmGlobalUnixMakefileGenerator3
         (this->CMakeInstance->GetHomeDirectory());
       snapshot.GetDirectory().SetCurrentBinary
         (this->CMakeInstance->GetHomeOutputDirectory());
+      snapshot.SetDefaultDefinitions();
       mf = new cmMakefile(this, snapshot);
       }
 
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index 2023697..b3cf91e 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -67,6 +67,7 @@ void cmGraphVizWriter::ReadSettings(const char* settingsFileName,
   cmake cm;
   cm.SetHomeDirectory("");
   cm.SetHomeOutputDirectory("");
+  cm.GetCurrentSnapshot().SetDefaultDefinitions();
   cmGlobalGenerator ggi(&cm);
   cmsys::auto_ptr<cmMakefile> mf(
         new cmMakefile(&ggi, cm.GetCurrentSnapshot()));
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f804d06..22d24d7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -87,8 +87,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
 
   this->DefineFlags = " ";
 
-  this->AddDefaultDefinitions();
-
   this->cmDefineRegex.compile("#cmakedefine[ \t]+([A-Za-z_0-9]*)");
   this->cmDefine01Regex.compile("#cmakedefine01[ \t]+([A-Za-z_0-9]*)");
   this->cmAtVarRegex.compile("(@[A-Za-z_0-9/.+-]+@)");
@@ -3123,59 +3121,6 @@ void cmMakefile::RemoveVariablesInString(std::string& source,
     }
 }
 
-/**
- * Add the default definitions to the makefile.  These values must not
- * be dependent on anything that isn't known when this cmMakefile instance
- * is constructed.
- */
-void cmMakefile::AddDefaultDefinitions()
-{
-/* Up to CMake 2.4 here only WIN32, UNIX and APPLE were set.
-  With CMake must separate between target and host platform. In most cases
-  the tests for WIN32, UNIX and APPLE will be for the target system, so an
-  additional set of variables for the host system is required ->
-  CMAKE_HOST_WIN32, CMAKE_HOST_UNIX, CMAKE_HOST_APPLE.
-  WIN32, UNIX and APPLE are now set in the platform files in
-  Modules/Platforms/.
-  To keep cmake scripts (-P) and custom language and compiler modules
-  working, these variables are still also set here in this place, but they
-  will be reset in CMakeSystemSpecificInformation.cmake before the platform
-  files are executed. */
-#if defined(_WIN32)
-  this->StateSnapshot.SetDefinition("WIN32", "1");
-  this->StateSnapshot.SetDefinition("CMAKE_HOST_WIN32", "1");
-#else
-  this->StateSnapshot.SetDefinition("UNIX", "1");
-  this->StateSnapshot.SetDefinition("CMAKE_HOST_UNIX", "1");
-#endif
-#if defined(__CYGWIN__)
-  if(cmSystemTools::IsOn(cmSystemTools::GetEnv("CMAKE_LEGACY_CYGWIN_WIN32")))
-    {
-    this->StateSnapshot.SetDefinition("WIN32", "1");
-    this->StateSnapshot.SetDefinition("CMAKE_HOST_WIN32", "1");
-    }
-#endif
-#if defined(__APPLE__)
-  this->StateSnapshot.SetDefinition("APPLE", "1");
-  this->StateSnapshot.SetDefinition("CMAKE_HOST_APPLE", "1");
-#endif
-
-  char temp[1024];
-  sprintf(temp, "%d", cmVersion::GetMinorVersion());
-  this->StateSnapshot.SetDefinition("CMAKE_MINOR_VERSION", temp);
-  sprintf(temp, "%d", cmVersion::GetMajorVersion());
-  this->StateSnapshot.SetDefinition("CMAKE_MAJOR_VERSION", temp);
-  sprintf(temp, "%d", cmVersion::GetPatchVersion());
-  this->StateSnapshot.SetDefinition("CMAKE_PATCH_VERSION", temp);
-  sprintf(temp, "%d", cmVersion::GetTweakVersion());
-  this->StateSnapshot.SetDefinition("CMAKE_TWEAK_VERSION", temp);
-  this->StateSnapshot.SetDefinition("CMAKE_VERSION",
-                                    cmVersion::GetCMakeVersion());
-
-  this->StateSnapshot.SetDefinition("CMAKE_FILES_DIRECTORY",
-                      cmake::GetCMakeFilesDirectory());
-}
-
 //----------------------------------------------------------------------------
 std::string
 cmMakefile::GetConfigurations(std::vector<std::string>& configs,
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0a8dcd5..96d5849 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -867,7 +867,6 @@ private:
   friend class cmMakeDepend;    // make depend needs direct access
                                 // to the Sources array
 
-  void AddDefaultDefinitions();
   typedef std::vector<cmFunctionBlocker*> FunctionBlockersType;
   FunctionBlockersType FunctionBlockers;
   std::vector<FunctionBlockersType::size_type> FunctionBlockerBarriers;
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 36b1305..fc690f8 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -175,6 +175,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
   cmake cm;
   cm.SetHomeOutputDirectory(targetDirectory);
   cm.SetHomeDirectory(targetDirectory);
+  cm.GetCurrentSnapshot().SetDefaultDefinitions();
   cmGlobalGenerator gg(&cm);
 
   cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index e3f62b5..364b75e 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -12,6 +12,7 @@
 #include "cmState.h"
 
 #include "cmake.h"
+#include "cmVersion.h"
 #include "cmCacheManager.h"
 #include "cmCommand.h"
 #include "cmAlgorithms.h"
@@ -847,6 +848,7 @@ cmState::CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot,
 
   cmState::Snapshot snapshot = cmState::Snapshot(this, pos);
   originSnapshot.Position->BuildSystemDirectory->Children.push_back(snapshot);
+  snapshot.SetDefaultDefinitions();
   snapshot.InitializeFromParent();
   snapshot.SetDirectoryDefinitions();
   return snapshot;
@@ -1333,6 +1335,54 @@ void InitializeContentFromParent(T& parentContent,
   contentEndPosition = thisContent.size();
 }
 
+void cmState::Snapshot::SetDefaultDefinitions()
+{
+  /* Up to CMake 2.4 here only WIN32, UNIX and APPLE were set.
+    With CMake must separate between target and host platform. In most cases
+    the tests for WIN32, UNIX and APPLE will be for the target system, so an
+    additional set of variables for the host system is required ->
+    CMAKE_HOST_WIN32, CMAKE_HOST_UNIX, CMAKE_HOST_APPLE.
+    WIN32, UNIX and APPLE are now set in the platform files in
+    Modules/Platforms/.
+    To keep cmake scripts (-P) and custom language and compiler modules
+    working, these variables are still also set here in this place, but they
+    will be reset in CMakeSystemSpecificInformation.cmake before the platform
+    files are executed. */
+  #if defined(_WIN32)
+    this->SetDefinition("WIN32", "1");
+    this->SetDefinition("CMAKE_HOST_WIN32", "1");
+  #else
+    this->SetDefinition("UNIX", "1");
+    this->SetDefinition("CMAKE_HOST_UNIX", "1");
+  #endif
+  #if defined(__CYGWIN__)
+    if(cmSystemTools::IsOn(cmSystemTools::GetEnv("CMAKE_LEGACY_CYGWIN_WIN32")))
+      {
+      this->SetDefinition("WIN32", "1");
+      this->SetDefinition("CMAKE_HOST_WIN32", "1");
+      }
+  #endif
+  #if defined(__APPLE__)
+    this->SetDefinition("APPLE", "1");
+    this->SetDefinition("CMAKE_HOST_APPLE", "1");
+  #endif
+
+    char temp[1024];
+    sprintf(temp, "%d", cmVersion::GetMinorVersion());
+    this->SetDefinition("CMAKE_MINOR_VERSION", temp);
+    sprintf(temp, "%d", cmVersion::GetMajorVersion());
+    this->SetDefinition("CMAKE_MAJOR_VERSION", temp);
+    sprintf(temp, "%d", cmVersion::GetPatchVersion());
+    this->SetDefinition("CMAKE_PATCH_VERSION", temp);
+    sprintf(temp, "%d", cmVersion::GetTweakVersion());
+    this->SetDefinition("CMAKE_TWEAK_VERSION", temp);
+    this->SetDefinition("CMAKE_VERSION",
+                                      cmVersion::GetCMakeVersion());
+
+    this->SetDefinition("CMAKE_FILES_DIRECTORY",
+                        cmake::GetCMakeFilesDirectory());
+}
+
 void cmState::Snapshot::SetDirectoryDefinitions()
 {
   this->SetDefinition("CMAKE_SOURCE_DIR",
diff --git a/Source/cmState.h b/Source/cmState.h
index 528da3b..3e8a465 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -97,6 +97,7 @@ public:
     };
 
     void SetDirectoryDefinitions();
+    void SetDefaultDefinitions();
 
   private:
     friend bool operator==(const cmState::Snapshot& lhs,
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2ecd3d1..7d499de 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -186,6 +186,7 @@ void cmake::CleanupCommandsAndMacros()
 {
   this->CurrentSnapshot = this->State->Reset();
   this->State->RemoveUserDefinedCommands();
+  this->CurrentSnapshot.SetDefaultDefinitions();
 }
 
 // Parse the args
@@ -378,6 +379,7 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
       (cmSystemTools::GetCurrentWorkingDirectory());
     snapshot.GetDirectory().SetCurrentSource
       (cmSystemTools::GetCurrentWorkingDirectory());
+    snapshot.SetDefaultDefinitions();
     cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
     if (this->GetWorkingMode() != NORMAL_MODE)
       {
@@ -420,6 +422,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
   snapshot.GetDirectory().SetCurrentSource
     (cmSystemTools::GetCurrentWorkingDirectory());
   // read in the list file to fill the cache
+  snapshot.SetDefaultDefinitions();
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
   cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
 
@@ -1928,6 +1931,7 @@ int cmake::CheckBuildSystem()
   cmake cm;
   cm.SetHomeDirectory("");
   cm.SetHomeOutputDirectory("");
+  cm.GetCurrentSnapshot().SetDefaultDefinitions();
   cmGlobalGenerator gg(&cm);
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, cm.GetCurrentSnapshot()));
   if(!mf->ReadListFile(this->CheckBuildSystemArgument.c_str()) ||
@@ -1958,6 +1962,7 @@ int cmake::CheckBuildSystem()
       ggd(this->CreateGlobalGenerator(genName));
     if(ggd.get())
       {
+      cm.GetCurrentSnapshot().SetDefaultDefinitions();
       cmsys::auto_ptr<cmMakefile> mfd(new cmMakefile(ggd.get(),
                                                     cm.GetCurrentSnapshot()));
       cmsys::auto_ptr<cmLocalGenerator> lgd(
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index ca46111..be492ed 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -765,6 +765,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       startOutDir = cmSystemTools::CollapseFullPath(startOutDir);
       cm.SetHomeDirectory(homeDir);
       cm.SetHomeOutputDirectory(homeOutDir);
+      cm.GetCurrentSnapshot().SetDefaultDefinitions();
       if(cmGlobalGenerator* ggd = cm.CreateGlobalGenerator(gen))
         {
         cm.SetGlobalGenerator(ggd);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=841164cb36650574a1a7363c78e4cdf28d5d37fd
commit 841164cb36650574a1a7363c78e4cdf28d5d37fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 21:57:54 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 00:16:07 2015 +0200

    cmState: Initialize current directories immediately.
    
    Don't leave this as cmMakefile responsibility.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2c5501e..f804d06 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -118,32 +118,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
   this->AddSourceGroup("Resources", "\\.plist$");
   this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$");
 #endif
-
-  {
-  const char* dir = this->StateSnapshot.GetDirectory().GetCurrentSource();
-  if (dir)
-    {
-    this->StateSnapshot.SetDefinition("CMAKE_CURRENT_SOURCE_DIR", dir);
-    }
-  else
-    {
-    this->StateSnapshot.SetDefinition("CMAKE_CURRENT_SOURCE_DIR",
-                        this->GetCMakeInstance()->GetHomeDirectory());
-    }
-  }
-  {
-  const char* dir = this->StateSnapshot.GetDirectory().GetCurrentBinary();
-  if (dir)
-    {
-    cmSystemTools::MakeDirectory(dir);
-    this->StateSnapshot.SetDefinition("CMAKE_CURRENT_BINARY_DIR", dir);
-    }
-  else
-    {
-    this->StateSnapshot.SetDefinition("CMAKE_CURRENT_BINARY_DIR",
-                        this->GetCMakeInstance()->GetHomeOutputDirectory());
-    }
-  }
 }
 
 cmMakefile::~cmMakefile()
@@ -1756,6 +1730,8 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
   newSnapshot.GetDirectory().SetCurrentSource(srcPath);
   newSnapshot.GetDirectory().SetCurrentBinary(binPath);
 
+  cmSystemTools::MakeDirectory(binPath.c_str());
+
   cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot);
   this->GetGlobalGenerator()->AddMakefile(subMf);
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 9de58d8..e3f62b5 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1020,6 +1020,8 @@ void cmState::Directory::SetCurrentSource(std::string const& dir)
       loc,
       this->DirectoryState->CurrentSourceDirectoryComponents);
   this->ComputeRelativePathTopSource();
+
+  this->Snapshot_.SetDefinition("CMAKE_CURRENT_SOURCE_DIR", loc.c_str());
 }
 
 const char* cmState::Directory::GetCurrentBinary() const
@@ -1038,6 +1040,8 @@ void cmState::Directory::SetCurrentBinary(std::string const& dir)
       loc,
       this->DirectoryState->CurrentBinaryDirectoryComponents);
   this->ComputeRelativePathTopBinary();
+
+  this->Snapshot_.SetDefinition("CMAKE_CURRENT_BINARY_DIR", loc.c_str());
 }
 
 void cmState::Snapshot::SetListFile(const std::string& listfile)
@@ -1333,8 +1337,12 @@ void cmState::Snapshot::SetDirectoryDefinitions()
 {
   this->SetDefinition("CMAKE_SOURCE_DIR",
                       this->State->GetSourceDirectory());
+  this->SetDefinition("CMAKE_CURRENT_SOURCE_DIR",
+                      this->State->GetSourceDirectory());
   this->SetDefinition("CMAKE_BINARY_DIR",
                       this->State->GetBinaryDirectory());
+  this->SetDefinition("CMAKE_CURRENT_BINARY_DIR",
+                      this->State->GetBinaryDirectory());
 }
 
 void cmState::Snapshot::InitializeFromParent()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c219bafc045dfdf49529b8ad141fed3dbb4d8e9
commit 2c219bafc045dfdf49529b8ad141fed3dbb4d8e9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 21:52:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 00:16:07 2015 +0200

    cmState: Initialize top level source directories immediately.
    
    Don't leave this as cmMakefile responsibility.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index eea9d67..2c5501e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -119,10 +119,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
   this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$");
 #endif
 
-  this->StateSnapshot.SetDefinition("CMAKE_SOURCE_DIR",
-                      this->GetCMakeInstance()->GetHomeDirectory());
-  this->StateSnapshot.SetDefinition("CMAKE_BINARY_DIR",
-                      this->GetCMakeInstance()->GetHomeOutputDirectory());
   {
   const char* dir = this->StateSnapshot.GetDirectory().GetCurrentSource();
   if (dir)
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 72c7330..9de58d8 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -306,11 +306,21 @@ cmState::Snapshot cmState::Reset()
   pos->PolicyScope = this->PolicyStack.Root();
   assert(pos->Policies.IsValid());
   assert(pos->PolicyRoot.IsValid());
+
+  {
+  std::string srcDir =
+      cmDefinitions::Get("CMAKE_SOURCE_DIR", pos->Vars, pos->Root);
+  std::string binDir =
+      cmDefinitions::Get("CMAKE_BINARY_DIR", pos->Vars, pos->Root);
   this->VarTree.Clear();
   pos->Vars = this->VarTree.Extend(this->VarTree.Root());
   pos->Parent = this->VarTree.Root();
   pos->Root = this->VarTree.Root();
 
+  pos->Vars->Set("CMAKE_SOURCE_DIR", srcDir.c_str());
+  pos->Vars->Set("CMAKE_BINARY_DIR", binDir.c_str());
+  }
+
   this->DefineProperty
     ("RULE_LAUNCH_COMPILE", cmProperty::DIRECTORY,
      "", "", true);
@@ -838,6 +848,7 @@ cmState::CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot,
   cmState::Snapshot snapshot = cmState::Snapshot(this, pos);
   originSnapshot.Position->BuildSystemDirectory->Children.push_back(snapshot);
   snapshot.InitializeFromParent();
+  snapshot.SetDirectoryDefinitions();
   return snapshot;
 }
 
@@ -1318,6 +1329,14 @@ void InitializeContentFromParent(T& parentContent,
   contentEndPosition = thisContent.size();
 }
 
+void cmState::Snapshot::SetDirectoryDefinitions()
+{
+  this->SetDefinition("CMAKE_SOURCE_DIR",
+                      this->State->GetSourceDirectory());
+  this->SetDefinition("CMAKE_BINARY_DIR",
+                      this->State->GetBinaryDirectory());
+}
+
 void cmState::Snapshot::InitializeFromParent()
 {
   PositionType parent = this->Position->DirectoryParent;
diff --git a/Source/cmState.h b/Source/cmState.h
index 2f66f7f..528da3b 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -96,6 +96,8 @@ public:
                       const cmState::Snapshot& rhs) const;
     };
 
+    void SetDirectoryDefinitions();
+
   private:
     friend bool operator==(const cmState::Snapshot& lhs,
                            const cmState::Snapshot& rhs);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 6846f1b..2ecd3d1 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -980,6 +980,10 @@ cmGlobalGenerator* cmake::CreateGlobalGenerator(const std::string& gname)
 void cmake::SetHomeDirectory(const std::string& dir)
 {
   this->State->SetSourceDirectory(dir);
+  if (this->CurrentSnapshot.IsValid())
+    {
+    this->CurrentSnapshot.SetDefinition("CMAKE_SOURCE_DIR", dir);
+    }
 }
 
 const char* cmake::GetHomeDirectory() const
@@ -990,6 +994,10 @@ const char* cmake::GetHomeDirectory() const
 void cmake::SetHomeOutputDirectory(const std::string& dir)
 {
   this->State->SetBinaryDirectory(dir);
+  if (this->CurrentSnapshot.IsValid())
+    {
+    this->CurrentSnapshot.SetDefinition("CMAKE_BINARY_DIR", dir);
+    }
 }
 
 const char* cmake::GetHomeOutputDirectory() const

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84e0776e77e625ab43c1a5b2031a06a035ae0210
commit 84e0776e77e625ab43c1a5b2031a06a035ae0210
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 21:45:02 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 00:16:06 2015 +0200

    cmMakefile: Set default internal definitions directly.
    
    The usage tracking of cmMakefile::AddDefinition is not needed.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a258536..eea9d67 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -50,7 +50,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
 {
   this->IsSourceFileTryCompile = false;
 
-  // Initialize these first since AddDefaultDefinitions calls AddDefinition
   this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
   this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
 
@@ -3171,36 +3170,37 @@ void cmMakefile::AddDefaultDefinitions()
   will be reset in CMakeSystemSpecificInformation.cmake before the platform
   files are executed. */
 #if defined(_WIN32)
-  this->AddDefinition("WIN32", "1");
-  this->AddDefinition("CMAKE_HOST_WIN32", "1");
+  this->StateSnapshot.SetDefinition("WIN32", "1");
+  this->StateSnapshot.SetDefinition("CMAKE_HOST_WIN32", "1");
 #else
-  this->AddDefinition("UNIX", "1");
-  this->AddDefinition("CMAKE_HOST_UNIX", "1");
+  this->StateSnapshot.SetDefinition("UNIX", "1");
+  this->StateSnapshot.SetDefinition("CMAKE_HOST_UNIX", "1");
 #endif
 #if defined(__CYGWIN__)
   if(cmSystemTools::IsOn(cmSystemTools::GetEnv("CMAKE_LEGACY_CYGWIN_WIN32")))
     {
-    this->AddDefinition("WIN32", "1");
-    this->AddDefinition("CMAKE_HOST_WIN32", "1");
+    this->StateSnapshot.SetDefinition("WIN32", "1");
+    this->StateSnapshot.SetDefinition("CMAKE_HOST_WIN32", "1");
     }
 #endif
 #if defined(__APPLE__)
-  this->AddDefinition("APPLE", "1");
-  this->AddDefinition("CMAKE_HOST_APPLE", "1");
+  this->StateSnapshot.SetDefinition("APPLE", "1");
+  this->StateSnapshot.SetDefinition("CMAKE_HOST_APPLE", "1");
 #endif
 
   char temp[1024];
   sprintf(temp, "%d", cmVersion::GetMinorVersion());
-  this->AddDefinition("CMAKE_MINOR_VERSION", temp);
+  this->StateSnapshot.SetDefinition("CMAKE_MINOR_VERSION", temp);
   sprintf(temp, "%d", cmVersion::GetMajorVersion());
-  this->AddDefinition("CMAKE_MAJOR_VERSION", temp);
+  this->StateSnapshot.SetDefinition("CMAKE_MAJOR_VERSION", temp);
   sprintf(temp, "%d", cmVersion::GetPatchVersion());
-  this->AddDefinition("CMAKE_PATCH_VERSION", temp);
+  this->StateSnapshot.SetDefinition("CMAKE_PATCH_VERSION", temp);
   sprintf(temp, "%d", cmVersion::GetTweakVersion());
-  this->AddDefinition("CMAKE_TWEAK_VERSION", temp);
-  this->AddDefinition("CMAKE_VERSION", cmVersion::GetCMakeVersion());
+  this->StateSnapshot.SetDefinition("CMAKE_TWEAK_VERSION", temp);
+  this->StateSnapshot.SetDefinition("CMAKE_VERSION",
+                                    cmVersion::GetCMakeVersion());
 
-  this->AddDefinition("CMAKE_FILES_DIRECTORY",
+  this->StateSnapshot.SetDefinition("CMAKE_FILES_DIRECTORY",
                       cmake::GetCMakeFilesDirectory());
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=871ab98dad2ed9d504a081a0ffa62b438793cbe4
commit 871ab98dad2ed9d504a081a0ffa62b438793cbe4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 13 21:44:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 00:16:06 2015 +0200

    cmMakefile: Set internal definitions directly.
    
    The usage tracking of cmMakefile::AddDefinition is not needed.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 73d3522..a258536 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -120,19 +120,19 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
   this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$");
 #endif
 
-  this->AddDefinition("CMAKE_SOURCE_DIR",
+  this->StateSnapshot.SetDefinition("CMAKE_SOURCE_DIR",
                       this->GetCMakeInstance()->GetHomeDirectory());
-  this->AddDefinition("CMAKE_BINARY_DIR",
+  this->StateSnapshot.SetDefinition("CMAKE_BINARY_DIR",
                       this->GetCMakeInstance()->GetHomeOutputDirectory());
   {
   const char* dir = this->StateSnapshot.GetDirectory().GetCurrentSource();
   if (dir)
     {
-    this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", dir);
+    this->StateSnapshot.SetDefinition("CMAKE_CURRENT_SOURCE_DIR", dir);
     }
   else
     {
-    this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
+    this->StateSnapshot.SetDefinition("CMAKE_CURRENT_SOURCE_DIR",
                         this->GetCMakeInstance()->GetHomeDirectory());
     }
   }
@@ -141,11 +141,11 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
   if (dir)
     {
     cmSystemTools::MakeDirectory(dir);
-    this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", dir);
+    this->StateSnapshot.SetDefinition("CMAKE_CURRENT_BINARY_DIR", dir);
     }
   else
     {
-    this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
+    this->StateSnapshot.SetDefinition("CMAKE_CURRENT_BINARY_DIR",
                         this->GetCMakeInstance()->GetHomeOutputDirectory());
     }
   }

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx         |    1 +
 Source/CPack/cpack.cxx                    |    1 +
 Source/CTest/cmCTestLaunch.cxx            |    1 +
 Source/CTest/cmCTestScriptHandler.cxx     |    1 +
 Source/CTest/cmCTestTestHandler.cxx       |    1 +
 Source/cmCTest.cxx                        |    1 +
 Source/cmGlobalUnixMakefileGenerator3.cxx |    1 +
 Source/cmGraphVizWriter.cxx               |    1 +
 Source/cmMakefile.cxx                     |   90 +--------------------------
 Source/cmMakefile.h                       |    1 -
 Source/cmQtAutoGenerators.cxx             |    1 +
 Source/cmState.cxx                        |   95 +++++++++++++++++++++++++++++
 Source/cmState.h                          |    5 ++
 Source/cmake.cxx                          |   13 ++++
 Source/cmcmd.cxx                          |    1 +
 Tests/SubDir/CMakeLists.txt               |    4 ++
 Tests/SubDir/Executable/CMakeLists.txt    |   12 ++++
 17 files changed, 142 insertions(+), 88 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Oct 14 00:01:07 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed, 14 Oct 2015 00:01:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-188-g84c1d4f
Message-ID: <20151014040107.AA92BC09F3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  84c1d4f92056b847c804ced2b4a29f2c1eaba62b (commit)
      from  c4361a265b32acaa4a84c1ab14fecee1bfe49d33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84c1d4f92056b847c804ced2b4a29f2c1eaba62b
commit 84c1d4f92056b847c804ced2b4a29f2c1eaba62b
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Oct 14 00:01:05 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Oct 14 00:01:05 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3ab2962..c57720a 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151013)
+set(CMake_VERSION_PATCH 20151014)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 14 13:32:31 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 14 Oct 2015 13:32:31 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-536-gb824a0a
Message-ID: <20151014173232.01AE4C052A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b824a0a146246ec959b7a40f72a8557d163ab090 (commit)
       via  2293d43d00ddcff86c70f0b06014223f3b01e36c (commit)
       via  488723f5cd9bec3f7b35b26c89ce2d92ad7d4db4 (commit)
      from  d2d09aece23f023f3e81586811a31abac0e3292f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b824a0a146246ec959b7a40f72a8557d163ab090
commit b824a0a146246ec959b7a40f72a8557d163ab090
Merge: d2d09ae 2293d43
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 14 13:32:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 13:32:30 2015 -0400

    Merge topic 'genex-generator-objects' into next
    
    2293d43d cmLocalGenerator: Store cmGeneratorTargets.
    488723f5 cmMakefile: Store container of cmExportBuildFileGenerators.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2293d43d00ddcff86c70f0b06014223f3b01e36c
commit 2293d43d00ddcff86c70f0b06014223f3b01e36c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:21:07 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 14 13:32:09 2015 -0400

    cmLocalGenerator: Store cmGeneratorTargets.
    
    Relieve cmMakefile of this responsibility.

diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f02afe..618f09f 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -43,7 +43,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
 {
   std::string const& argv0 = this->CC.GetCommandLines()[c][0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(argv0);
+      this->LG->FindGeneratorTargetToUse(argv0);
   if(target && target->GetType() == cmTarget::EXECUTABLE &&
      (target->Target->IsImported()
       || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 560cfc5..6c3cccd 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -42,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->LG->GetMakefile()
+    cmGeneratorTarget *te = this->LG
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index fdfa35e..b7aeb02 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,8 +965,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmGeneratorTargetsType targets = (*it)->GetMakefile()
-                                        ->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
     for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 2797d10..fe83b08 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1275,7 +1275,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
 
     std::string tgtName = parameters.front();
     cmGeneratorTarget* gt =
-                context->LG->GetMakefile()->FindGeneratorTargetToUse(tgtName);
+                context->LG->FindGeneratorTargetToUse(tgtName);
     if (!gt)
       {
       std::ostringstream e;
@@ -1739,7 +1739,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       return std::string();
       }
     cmGeneratorTarget* target =
-        context->LG->GetMakefile()->FindGeneratorTargetToUse(name);
+        context->LG->FindGeneratorTargetToUse(name);
     if(!target)
       {
       ::reportError(context, content->GetOriginalExpression(),
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6033efe..6bebc2b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2305,7 +2305,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
 
   // Check for a target with this name.
   if(cmGeneratorTarget* t
-                    = this->Makefile->FindGeneratorTargetToUse(util))
+                    = this->GeneratorTarget->
+                    GetLocalGenerator()->FindGeneratorTargetToUse(util))
     {
     // If we find the target and the dep was given as a full path,
     // then make sure it was not a full path to something else, and
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 9ac0019..e8be2d6 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1578,7 +1578,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     this->GeneratorTargets[*j] = gt;
     generatorTargets[*j] = gt;
     }
-  mf->SetGeneratorTargets(generatorTargets);
+  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 87cf58f..45a1509 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -287,7 +287,7 @@ void cmGlobalGhsMultiGenerator::Generate()
       {
       cmLocalGhsMultiGenerator *lg =
         static_cast<cmLocalGhsMultiGenerator *>(this->LocalGenerators[i]);
-      cmGeneratorTargetsType tgts = lg->GetMakefile()->GetGeneratorTargets();
+      cmGeneratorTargetsType tgts = lg->GetGeneratorTargets();
       this->UpdateBuildFiles(&tgts);
       }
     }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index f955ef7..ed36634 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,8 +68,7 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      cmMakefile* makefile=(*lg)->GetMakefile();
-      cmGeneratorTargetsType const& targets = makefile->GetGeneratorTargets();
+      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
       for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
            ti != targets.end(); ti++)
         {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 218e702..f9740e5 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -461,7 +461,7 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
@@ -627,7 +627,7 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
     for(cmGeneratorTargetsType::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
@@ -728,7 +728,7 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  cmGeneratorTargetsType targets = lg->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 0bdb008..8cb7d24 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -256,7 +256,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
                           noCommandLines);
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
-  mf->AddGeneratorTarget(tgt, gt);
+  lg->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 6a25ed0..fa9c606 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -87,7 +87,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           "Build all projects");
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
-      allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt);
+      gen[0]->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
@@ -108,7 +108,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
           i != gen.end(); ++i)
         {
         cmGeneratorTargetsType targets =
-            (*i)->GetMakefile()->GetGeneratorTargets();
+            (*i)->GetGeneratorTargets();
         for(cmGeneratorTargetsType::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bc67833..6291796 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -459,7 +459,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         "echo", "Build all projects");
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
-  mf->AddGeneratorTarget(allbuild, allBuildGt);
+  root->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -494,7 +494,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           "make", "-f", file.c_str());
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
-    mf->AddGeneratorTarget(check, checkGt);
+    root->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f19d551..3691b41 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,7 +132,7 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -448,6 +448,13 @@ void cmLocalGenerator::GenerateInstallRules()
     }
 }
 
+
+void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+{
+  this->GeneratorTargets[t] = gt;
+  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
+}
+
 //----------------------------------------------------------------------------
 void cmLocalGenerator::ComputeTargetManifest()
 {
@@ -460,7 +467,7 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
@@ -1767,6 +1774,17 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
+{
+  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+    {
+    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    }
+  return 0;
+}
+
+//----------------------------------------------------------------------------
 bool cmLocalGenerator::GetRealDependency(const std::string& inName,
                                          const std::string& config,
                                          std::string& dep)
@@ -1792,7 +1810,7 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
 
   // Look for a CMake target with the given name.
   if(cmGeneratorTarget* target =
-     this->Makefile->FindGeneratorTargetToUse(name))
+     this->FindGeneratorTargetToUse(name))
     {
     // make sure it is not just a coincidence that the target name
     // found is part of the inName
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 758709a..97e3f88 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -112,6 +112,19 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
+  const cmGeneratorTargetsType &GetGeneratorTargets() const
+    {
+      return this->GeneratorTargets;
+    }
+
+  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
+    {
+      this->GeneratorTargets = targets;
+    }
+  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
+
+  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
+
   /**
    * Encode a list of preprocessor definitions for the compiler
    * command line.
@@ -354,6 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmTarget const*> WarnCMP0063;
+  cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index bac989f..721f239 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,7 +26,7 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  cmGeneratorTargetsType tgts = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
 
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 6319f0e..8d71469 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,7 +73,7 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  cmGeneratorTargetsType targets = this->GetMakefile()->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index bf5afc1..91c7acd 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,7 +113,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
   for(cmGeneratorTargetsType::iterator t = targets.begin();
@@ -175,7 +175,7 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   for(cmGeneratorTargetsType::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
@@ -418,7 +418,7 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   std::string localName;
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f2f7ee7..8ac6358 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1812,12 +1812,6 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
-void cmMakefile::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-{
-  this->GeneratorTargets[t] = gt;
-  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
-}
-
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
@@ -4321,17 +4315,6 @@ bool cmMakefile::IsAlias(const std::string& name) const
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmMakefile::FindGeneratorTargetToUse(const std::string& name) const
-{
-  if (cmTarget *t = this->FindTargetToUse(name))
-    {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
-    }
-  return 0;
-}
-
-//----------------------------------------------------------------------------
 bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
                                    bool isCustom) const
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 46fdc94..8fe0bda 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -17,7 +17,6 @@
 #include "cmSystemTools.h"
 #include "cmTarget.h"
 #include "cmNewLineStyle.h"
-#include "cmGeneratorTarget.h"
 #include "cmExpandedCommandArgument.h"
 #include "cmake.h"
 #include "cmState.h"
@@ -393,17 +392,6 @@ public:
       return this->ImportedTargetsOwned;
     }
 
-  const cmGeneratorTargetsType &GetGeneratorTargets() const
-    {
-      return this->GeneratorTargets;
-    }
-
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-    {
-      this->GeneratorTargets = targets;
-    }
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
-
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
@@ -412,7 +400,6 @@ public:
   cmTarget* FindTargetToUse(const std::string& name,
                             bool excludeAliases = false) const;
   bool IsAlias(const std::string& name) const;
-  cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
   /**
    * Mark include directories as system directories.
@@ -816,7 +803,6 @@ protected:
   typedef std::map<std::string, cmTarget*> TargetMap;
 #endif
   TargetMap AliasTargets;
-  cmGeneratorTargetsType GeneratorTargets;
   std::vector<cmSourceFile*> SourceFiles;
 
   // Tests
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 6e3f65f..f9875b3 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -886,7 +886,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    makefile->AddGeneratorTarget(autogenTarget, gt);
+    lg->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 7dec50b..85fb405 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -89,7 +89,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   // be translated.
   std::string exe = command[0];
   cmGeneratorTarget* target =
-      this->LG->GetMakefile()->FindGeneratorTargetToUse(exe);
+      this->LG->FindGeneratorTargetToUse(exe);
   if(target && target->GetType() == cmTarget::EXECUTABLE)
     {
     // Use the target file on disk.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=488723f5cd9bec3f7b35b26c89ce2d92ad7d4db4
commit 488723f5cd9bec3f7b35b26c89ce2d92ad7d4db4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 22:08:22 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 14 13:32:09 2015 -0400

    cmMakefile: Store container of cmExportBuildFileGenerators.
    
    Set a cmLocalGenerator on each instance at compute time.  That will
    soon be needed to access cmGeneratorTarget instances.
    
    If a cmExportBuildFileGenerator is processed early during configure time as a
    result of CMP0024 it must be removed from the list to process later at generate
    time.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 400fa17..560cfc5 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -18,13 +18,18 @@
 
 //----------------------------------------------------------------------------
 cmExportBuildFileGenerator::cmExportBuildFileGenerator()
-  : Backtrace()
 {
-  this->Makefile = 0;
+  this->LG = 0;
   this->ExportSet = 0;
 }
 
 //----------------------------------------------------------------------------
+void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
+{
+  this->LG = lg;
+}
+
+//----------------------------------------------------------------------------
 bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
 {
   std::vector<cmGeneratorTarget*> allTargets;
@@ -37,7 +42,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
         tei = targets.begin();
       tei != targets.end(); ++tei)
     {
-    cmGeneratorTarget *te = this->Makefile
+    cmGeneratorTarget *te = this->LG->GetMakefile()
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
@@ -49,8 +54,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       {
       std::ostringstream e;
       e << "given target \"" << te->GetName() << "\" more than once.";
-      this->Makefile->GetCMakeInstance()
-          ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+      this->LG->GetGlobalGenerator()->GetCMakeInstance()
+          ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                         this->LG->GetMakefile()->GetBacktrace());
       return false;
       }
     if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
@@ -328,8 +334,9 @@ cmExportBuildFileGenerator
   e << "If the required target is not easy to reference in this call, "
     << "consider using the APPEND option with multiple separate calls.";
 
-  this->Makefile->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Backtrace);
+  this->LG->GetGlobalGenerator()->GetCMakeInstance()
+      ->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                     this->LG->GetMakefile()->GetBacktrace());
 }
 
 std::string
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index ff3d2e1..16695f1 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -43,10 +43,7 @@ public:
   /** Set whether to append generated code to the output file.  */
   void SetAppendMode(bool append) { this->AppendMode = append; }
 
-  void SetMakefile(cmMakefile *mf) {
-    this->Makefile = mf;
-    this->Backtrace = this->Makefile->GetBacktrace();
-  }
+  void Compute(cmLocalGenerator* lg);
 
 protected:
   // Implement virtual methods from the superclass.
@@ -80,8 +77,7 @@ protected:
   std::vector<std::string> Targets;
   cmExportSet *ExportSet;
   std::vector<cmGeneratorTarget*> Exports;
-  cmMakefile* Makefile;
-  cmListFileBacktrace Backtrace;
+  cmLocalGenerator* LG;
 };
 
 #endif
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 6a1d7f3..c2d9cc4 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -221,7 +221,7 @@ bool cmExportCommand
     {
     ebfg->SetTargets(targets);
     }
-  ebfg->SetMakefile(this->Makefile);
+  this->Makefile->AddExportBuildFileGenerator(ebfg);
   ebfg->SetExportOld(this->ExportOld.IsEnabled());
 
   // Compute the set of configurations exported.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6750611..9ac0019 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -73,7 +73,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   this->CurrentMakefile = 0;
   this->TryCompileOuterMakefile = 0;
 
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
 }
 
 cmGlobalGenerator::~cmGlobalGenerator()
@@ -234,6 +234,16 @@ bool cmGlobalGenerator::GenerateImportFile(const std::string &file)
   if (it != this->BuildExportSets.end())
     {
     bool result = it->second->GenerateImportFile();
+
+    if (!this->ConfigureDoneCMP0026AndCMP0024)
+      {
+      for (std::vector<cmMakefile*>::const_iterator mit =
+           this->Makefiles.begin(); mit != this->Makefiles.end(); ++mit)
+        {
+        (*mit)->RemoveExportBuildFileGeneratorCMP0024(it->second);
+        }
+      }
+
     delete it->second;
     it->second = 0;
     this->BuildExportSets.erase(it);
@@ -1122,11 +1132,11 @@ void cmGlobalGenerator::Configure()
       this->CMakeInstance->GetHomeOutputDirectory());
 
   // now do it
-  this->ConfigureDoneCMP0026 = false;
+  this->ConfigureDoneCMP0026AndCMP0024 = false;
   dirMf->Configure();
   dirMf->EnforceDirectoryLevelRules();
 
-  this->ConfigureDoneCMP0026 = true;
+  this->ConfigureDoneCMP0026AndCMP0024 = true;
 
   // Put a copy of each global target in every directory.
   cmTargets globalTargets;
@@ -1226,6 +1236,20 @@ bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
   return false;
 }
 
+void cmGlobalGenerator::ComputeBuildFileGenerators()
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmExportBuildFileGenerator*> gens =
+        this->Makefiles[i]->GetExportBuildFileGenerators();
+    for (std::vector<cmExportBuildFileGenerator*>::const_iterator it =
+         gens.begin(); it != gens.end(); ++it)
+      {
+      (*it)->Compute(this->LocalGenerators[i]);
+      }
+    }
+}
+
 bool cmGlobalGenerator::Compute()
 {
   // Some generators track files replaced during the Generate.
@@ -1255,6 +1279,8 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
+  this->ComputeBuildFileGenerators();
+
   unsigned int i;
 
   // Add generator specific helper commands
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 55e3766..fc81708 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -362,7 +362,10 @@ public:
   cmFileLockPool& GetFileLockPool() { return FileLockPool; }
 #endif
 
-  bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; }
+  bool GetConfigureDoneCMP0026() const
+  { return this->ConfigureDoneCMP0026AndCMP0024; }
+
+  void ComputeBuildFileGenerators();
 
   std::string MakeSilentFlag;
 protected:
@@ -520,7 +523,7 @@ protected:
   bool ForceUnixPaths;
   bool ToolSupportsColor;
   bool InstallTargetEnabled;
-  bool ConfigureDoneCMP0026;
+  bool ConfigureDoneCMP0026AndCMP0024;
 };
 
 #endif
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 8890e2b..97d4d56 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -126,6 +126,7 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
+    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 73d3522..f2f7ee7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -702,6 +702,29 @@ cmMakefile::GetEvaluationFiles() const
   return this->EvaluationFiles;
 }
 
+std::vector<cmExportBuildFileGenerator*>
+cmMakefile::GetExportBuildFileGenerators() const
+{
+  return this->ExportBuildFileGenerators;
+}
+
+void cmMakefile::RemoveExportBuildFileGeneratorCMP0024(
+    cmExportBuildFileGenerator* gen)
+{
+  std::vector<cmExportBuildFileGenerator*>::iterator it =
+      std::find(this->ExportBuildFileGenerators.begin(),
+                this->ExportBuildFileGenerators.end(), gen);
+  if(it != this->ExportBuildFileGenerators.end())
+    {
+    this->ExportBuildFileGenerators.erase(it);
+    }
+}
+
+void cmMakefile::AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen)
+{
+  this->ExportBuildFileGenerators.push_back(gen);
+}
+
 namespace
 {
   struct file_not_persistent
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0a8dcd5..46fdc94 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -51,6 +51,7 @@ class cmake;
 class cmMakefileCall;
 class cmCMakePolicyCommand;
 class cmGeneratorExpressionEvaluationFile;
+class cmExportBuildFileGenerator;
 
 /** \class cmMakefile
  * \brief Process the input CMakeLists.txt file.
@@ -789,6 +790,11 @@ public:
                   bool inputIsContent);
   std::vector<cmGeneratorExpressionEvaluationFile*> GetEvaluationFiles() const;
 
+  std::vector<cmExportBuildFileGenerator*>
+  GetExportBuildFileGenerators() const;
+  void RemoveExportBuildFileGeneratorCMP0024(cmExportBuildFileGenerator* gen);
+  void AddExportBuildFileGenerator(cmExportBuildFileGenerator* gen);
+
 protected:
   // add link libraries and directories to the target
   void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
@@ -882,6 +888,7 @@ private:
   mutable cmsys::RegularExpression cmNamedCurly;
 
   std::vector<cmMakefile*> UnConfiguredDirectories;
+  std::vector<cmExportBuildFileGenerator*> ExportBuildFileGenerators;
 
   std::vector<cmGeneratorExpressionEvaluationFile*> EvaluationFiles;
 
diff --git a/bootstrap b/bootstrap
index ca86528..54f7ca6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -261,6 +261,7 @@ CMAKE_CXX_SOURCES="\
   cmPropertyDefinitionMap \
   cmMakeDepend \
   cmMakefile \
+  cmExportBuildFileGenerator \
   cmExportFileGenerator \
   cmExportInstallFileGenerator \
   cmExportTryCompileFileGenerator \

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 14 13:35:57 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 14 Oct 2015 13:35:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-196-g2380896
Message-ID: <20151014173557.6809DC080E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  2380896a056a29f22dd440369f4ab30137306ab9 (commit)
       via  2bf7de167f0b72b07c6246679c964d83cdc47d45 (commit)
       via  0aa34de5493732d219dd3f58634222677bd19e22 (commit)
       via  20b95ef8c83fbcb7705e72c85c9de18ff420562f (commit)
       via  841164cb36650574a1a7363c78e4cdf28d5d37fd (commit)
       via  2c219bafc045dfdf49529b8ad141fed3dbb4d8e9 (commit)
       via  84e0776e77e625ab43c1a5b2031a06a035ae0210 (commit)
       via  871ab98dad2ed9d504a081a0ffa62b438793cbe4 (commit)
      from  84c1d4f92056b847c804ced2b4a29f2c1eaba62b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2380896a056a29f22dd440369f4ab30137306ab9
commit 2380896a056a29f22dd440369f4ab30137306ab9
Merge: 84c1d4f 2bf7de1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 14 13:35:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 13:35:56 2015 -0400

    Merge topic 'refactor-state-initialization'
    
    2bf7de16 Subdirs: Initialize from parent before configuring.
    0aa34de5 cmState: Initialize properties immediately.
    20b95ef8 cmState: Initialize default definitions immediately.
    841164cb cmState: Initialize current directories immediately.
    2c219baf cmState: Initialize top level source directories immediately.
    84e0776e cmMakefile: Set default internal definitions directly.
    871ab98d cmMakefile: Set internal definitions directly.


-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx         |    1 +
 Source/CPack/cpack.cxx                    |    1 +
 Source/CTest/cmCTestLaunch.cxx            |    1 +
 Source/CTest/cmCTestScriptHandler.cxx     |    1 +
 Source/CTest/cmCTestTestHandler.cxx       |    1 +
 Source/cmCTest.cxx                        |    1 +
 Source/cmGlobalUnixMakefileGenerator3.cxx |    1 +
 Source/cmGraphVizWriter.cxx               |    1 +
 Source/cmMakefile.cxx                     |   90 +--------------------------
 Source/cmMakefile.h                       |    1 -
 Source/cmQtAutoGenerators.cxx             |    1 +
 Source/cmState.cxx                        |   95 +++++++++++++++++++++++++++++
 Source/cmState.h                          |    5 ++
 Source/cmake.cxx                          |   13 ++++
 Source/cmcmd.cxx                          |    1 +
 Tests/SubDir/CMakeLists.txt               |    4 ++
 Tests/SubDir/Executable/CMakeLists.txt    |   12 ++++
 17 files changed, 142 insertions(+), 88 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 14 13:35:59 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 14 Oct 2015 13:35:59 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-215-gff6ae3e
Message-ID: <20151014173559.609DFC0549@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba (commit)
       via  1fdccff5894914d4408e64c0b55e52c376e64ad4 (commit)
       via  ce75c86ec30e736a738a4143d4abad73117e06c6 (commit)
       via  526cc7dc52673f1eeb1055ce381e0551f763daea (commit)
       via  8d2e3e53b903b1ee38292b6bcdf3e4eeb5399a05 (commit)
       via  a143d4ac60da28e12f8b81db39a11226bac8a516 (commit)
       via  993aace78a12fba1a70f193a1e6ac0cbc6925bd6 (commit)
       via  43ade9957770a95ef6a589e34ab0bb93def0489b (commit)
       via  5fd2f43f646d6fa3755d83d6b6f2592a54425071 (commit)
       via  f7acd7421521b3a961480a37077c3814dc684d30 (commit)
       via  763f7b19fcf8a287a0ce20a955ec9c2f7b1a051f (commit)
       via  ceb35b63a796235bb76284b3fb4046208365e23f (commit)
       via  bf2d061ad37088be9ea6f135a980d14c4e76064b (commit)
       via  61c02decce0c1b5aa78acd58d987a5d260079ca4 (commit)
       via  9ca4cae51e8fb67e628fe7b41eea3f459f148237 (commit)
       via  d6b394edcb58752cfa3d2a34a81f558676781304 (commit)
       via  7c8236efa710372b6e54ba12934b075f718e0e15 (commit)
       via  c7645fca12870cef732f26730588cda3be072852 (commit)
       via  ce8894aaf07871dbc58039e0ff0f22efaee7c014 (commit)
      from  2380896a056a29f22dd440369f4ab30137306ab9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba
commit ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba
Merge: 2380896 1fdccff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 14 13:35:57 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 13:35:57 2015 -0400

    Merge topic 'use-generator-target'
    
    1fdccff5 Genex: Port implementation detail to cmGeneratorTarget.
    ce75c86e cmGeneratorTarget: Move GetSupportDirectory from cmTarget.
    526cc7dc cmGeneratorTarget: Move HasImportLibrary from cmTarget.
    8d2e3e53 cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.
    a143d4ac Sublime: Port some API to cmGeneratorTarget.
    993aace7 cmGeneratorTarget: Port processILibs to cmGeneratorTarget.
    43ade995 cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget.
    5fd2f43f cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.
    f7acd742 cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget.
    763f7b19 cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget.
    ceb35b63 cmLinkItem: Port to cmGeneratorTarget.
    bf2d061a cmGeneratorTarget: Move FindTargetToLink from cmTarget.
    61c02dec cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.
    9ca4cae5 cmGeneratorTarget: Move GetUtilityItems from cmTarget.
    d6b394ed cmComputeLinkDepends: Port result API to cmGeneratorTarget.
    7c8236ef cmComputeLinkInformation: Port result API to cmGeneratorTarget.
    ...


-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |   12 +-
 Source/cmComputeLinkDepends.cxx                |   14 +-
 Source/cmComputeLinkDepends.h                  |    9 +-
 Source/cmComputeLinkInformation.cxx            |   39 +++---
 Source/cmComputeLinkInformation.h              |   13 +-
 Source/cmComputeTargetDepends.cxx              |   28 ++--
 Source/cmExportBuildFileGenerator.cxx          |    2 +-
 Source/cmExportFileGenerator.cxx               |   13 +-
 Source/cmExtraSublimeTextGenerator.cxx         |   17 ++-
 Source/cmExtraSublimeTextGenerator.h           |    3 +-
 Source/cmGeneratorExpressionNode.cxx           |   20 +--
 Source/cmGeneratorTarget.cxx                   |  174 ++++++++++++++++++------
 Source/cmGeneratorTarget.h                     |   26 +++-
 Source/cmGlobalGenerator.cxx                   |   13 +-
 Source/cmGlobalGenerator.h                     |    2 +-
 Source/cmInstallTargetGenerator.cxx            |   25 ++--
 Source/cmLinkItem.h                            |   10 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    4 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |    6 +-
 Source/cmMakefileTargetGenerator.cxx           |    7 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    9 +-
 Source/cmNinjaTargetGenerator.cxx              |    4 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |    4 +-
 Source/cmTarget.cxx                            |   87 ------------
 Source/cmTarget.h                              |   21 +--
 25 files changed, 281 insertions(+), 281 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 14 13:36:01 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 14 Oct 2015 13:36:01 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-220-gad3ff60
Message-ID: <20151014173601.6F1CFC081F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  ad3ff60f4a026d94fba7530325278ecd93a7357d (commit)
       via  2293d43d00ddcff86c70f0b06014223f3b01e36c (commit)
       via  488723f5cd9bec3f7b35b26c89ce2d92ad7d4db4 (commit)
       via  1583440509a148d216d6691cdaeede1aa24af95c (commit)
       via  11165525ba663b4cd7a188c6b698822b8480aafb (commit)
      from  ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad3ff60f4a026d94fba7530325278ecd93a7357d
commit ad3ff60f4a026d94fba7530325278ecd93a7357d
Merge: ff6ae3e 2293d43
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 14 13:35:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 13:35:59 2015 -0400

    Merge topic 'genex-generator-objects'
    
    2293d43d cmLocalGenerator: Store cmGeneratorTargets.
    488723f5 cmMakefile: Store container of cmExportBuildFileGenerators.
    15834405 cmGeneratorExpression: Port interface to cmGeneratorTarget.
    11165525 cmGeneratorExpression: Port to cmLocalGenerator.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmCPackPropertiesGenerator.cxx          |    4 +-
 Source/cmCustomCommandGenerator.cxx            |    9 ++-
 Source/cmExportBuildFileGenerator.cxx          |   21 ++++---
 Source/cmExportBuildFileGenerator.h            |    8 +--
 Source/cmExportCommand.cxx                     |    2 +-
 Source/cmExportFileGenerator.cxx               |    4 +-
 Source/cmExportTryCompileFileGenerator.cxx     |    7 ++-
 Source/cmExtraEclipseCDT4Generator.cxx         |    3 +-
 Source/cmGeneratorExpression.cxx               |   16 +++---
 Source/cmGeneratorExpression.h                 |   13 +++--
 Source/cmGeneratorExpressionContext.cxx        |   13 +++--
 Source/cmGeneratorExpressionContext.h          |   10 ++--
 Source/cmGeneratorExpressionDAGChecker.cxx     |    7 ++-
 Source/cmGeneratorExpressionEvaluationFile.cxx |    8 +--
 Source/cmGeneratorExpressionNode.cxx           |   70 +++++++++++++-----------
 Source/cmGeneratorExpressionNode.h             |    5 +-
 Source/cmGeneratorTarget.cxx                   |   64 +++++++++++-----------
 Source/cmGlobalGenerator.cxx                   |   34 ++++++++++--
 Source/cmGlobalGenerator.h                     |    7 ++-
 Source/cmGlobalGhsMultiGenerator.cxx           |    2 +-
 Source/cmGlobalKdevelopGenerator.cxx           |    3 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |    6 +-
 Source/cmGlobalVisualStudio7Generator.cxx      |    3 +-
 Source/cmGlobalVisualStudio8Generator.cxx      |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx       |    4 +-
 Source/cmGlobalXCodeGenerator.cxx              |    6 +-
 Source/cmIncludeCommand.cxx                    |    1 +
 Source/cmInstallDirectoryGenerator.cxx         |    2 +-
 Source/cmInstallFilesGenerator.cxx             |    4 +-
 Source/cmInstallTargetGenerator.cxx            |    2 +-
 Source/cmLocalGenerator.cxx                    |   24 +++++++-
 Source/cmLocalGenerator.h                      |   14 +++++
 Source/cmLocalGhsMultiGenerator.cxx            |    2 +-
 Source/cmLocalNinjaGenerator.cxx               |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |    6 +-
 Source/cmMakefile.cxx                          |   40 ++++++++------
 Source/cmMakefile.h                            |   21 +++----
 Source/cmMakefileTargetGenerator.cxx           |    7 ++-
 Source/cmQtAutoGeneratorInitializer.cxx        |    2 +-
 Source/cmTestGenerator.cxx                     |    8 +--
 Source/cmVisualStudio10TargetGenerator.cxx     |   11 ++--
 bootstrap                                      |    1 +
 42 files changed, 281 insertions(+), 197 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 14 13:36:03 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 14 Oct 2015 13:36:03 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-222-g088fcbf
Message-ID: <20151014173603.51B21C081E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  088fcbf733a7d1968fc3586a7077f22cb41e1917 (commit)
       via  5a266095ee778fb700c067c55ff0b59777a72c50 (commit)
      from  ad3ff60f4a026d94fba7530325278ecd93a7357d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=088fcbf733a7d1968fc3586a7077f22cb41e1917
commit 088fcbf733a7d1968fc3586a7077f22cb41e1917
Merge: ad3ff60 5a26609
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 14 13:36:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 13:36:02 2015 -0400

    Merge topic 'wix-text-node'
    
    5a266095 CPackWIX: Handle text nodes in XML patch content


-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/WiX/cmWIXPatch.cxx        |   32 ++++++++++++++------
 Source/CPack/WiX/cmWIXPatch.h          |    3 ++
 Source/CPack/WiX/cmWIXPatchParser.cxx  |   52 +++++++++++++++++++++++++++-----
 Source/CPack/WiX/cmWIXPatchParser.h    |   29 ++++++++++++++++--
 Source/CPack/WiX/cmWIXSourceWriter.cxx |   19 ++++++++++++
 Source/CPack/WiX/cmWIXSourceWriter.h   |    2 ++
 6 files changed, 118 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 14 13:36:36 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 14 Oct 2015 13:36:36 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-542-gaf9ba74
Message-ID: <20151014173636.51CEAC0830@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  af9ba74bf9451f2c89601ad24f88e36e7808e148 (commit)
       via  088fcbf733a7d1968fc3586a7077f22cb41e1917 (commit)
       via  ad3ff60f4a026d94fba7530325278ecd93a7357d (commit)
       via  ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba (commit)
       via  2380896a056a29f22dd440369f4ab30137306ab9 (commit)
       via  84c1d4f92056b847c804ced2b4a29f2c1eaba62b (commit)
      from  b824a0a146246ec959b7a40f72a8557d163ab090 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af9ba74bf9451f2c89601ad24f88e36e7808e148
commit af9ba74bf9451f2c89601ad24f88e36e7808e148
Merge: b824a0a 088fcbf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 14 13:36:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 14 13:36:16 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 14 18:00:07 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 14 Oct 2015 18:00:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-552-g0a462a9
Message-ID: <20151014220007.E808AC051E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0a462a9684f3138b712dc7738f160b479ce08f84 (commit)
       via  462621e43b9b64aa1013348a48a63755bf066aab (commit)
       via  c934e2991a88af8b459075f093eb649607be029d (commit)
       via  64c5cef21853511f8c33a5a8fe49222b8cb88f58 (commit)
       via  9abf040d536b6adf1a06269cc1dbf90117b85c48 (commit)
       via  305beb6f88e699ccc5efdb198b45e6089afd038d (commit)
       via  664c328b02211a9e3273845cfd029203f1fe397f (commit)
       via  df52be7fd5704ac652b9795be41ac5107dc9819c (commit)
       via  4c266d709f232b336f8f06f1bb36a3fee45809d3 (commit)
       via  1304be33b367820dca449c753ac502afb059f611 (commit)
      from  af9ba74bf9451f2c89601ad24f88e36e7808e148 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a462a9684f3138b712dc7738f160b479ce08f84
commit 0a462a9684f3138b712dc7738f160b479ce08f84
Merge: af9ba74 462621e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 18:00:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 18:00:04 2015 -0400

    Merge topic 'clean-up-cmTarget' into next
    
    462621e4 cmState: Move GetTargetTypeName from cmTarget.
    c934e299 Remove now-obsolete casts.
    64c5cef2 cmGeneratorTarget: Use enum for GetType.
    9abf040d cmState: Move TargetType enum from cmTarget.
    305beb6f cmTarget: Move link type enum out.
    664c328b cmTarget: Move ImportInfoMap out of internal class.
    df52be7f cmTarget: Move backtrace member out of internal class.
    4c266d70 cmTarget: Remove unneeded constructors.
    1304be33 Generators: Use GetType from the cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=462621e43b9b64aa1013348a48a63755bf066aab
commit 462621e43b9b64aa1013348a48a63755bf066aab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:26:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 23:59:10 2015 +0200

    cmState: Move GetTargetTypeName from cmTarget.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 138e630..f6de2ab 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -554,8 +554,7 @@ cmComputeTargetDepends
 
     // Describe the depender.
     e << "  \"" << depender->GetName() << "\" of type "
-      << cmTarget::GetTargetTypeName(
-           depender->GetType()) << "\n";
+      << cmState::GetTargetTypeName(depender->GetType()) << "\n";
 
     // List its dependencies that are inside the component.
     EdgeList const& nl = this->InitialGraph[i];
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index de3f992..5bb0f99 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -107,7 +107,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
             this->Makefile->IssueMessage(cmake::FATAL_ERROR,
               "Only libraries may be used as try_compile or try_run IMPORTED "
               "LINK_LIBRARIES.  Got " + std::string(tgt->GetName()) + " of "
-              "type " + tgt->GetTargetTypeName(tgt->GetType()) + ".");
+              "type " + cmState::GetTargetTypeName(tgt->GetType()) + ".");
             return -1;
           }
         if (tgt->IsImported())
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f5c5191..ba42591 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1965,7 +1965,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
     std::string msg = "cmTarget::GetCompileInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(this->GetType());
+    msg += cmState::GetTargetTypeName(this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -4697,7 +4697,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(this->GetType());
+    msg += cmState::GetTargetTypeName(this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2a12f2b..5e0ea8b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -760,7 +760,7 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
       }
     if(variable == "TARGET_TYPE")
       {
-      return cmTarget::GetTargetTypeName(replaceValues.CMTarget->GetType());
+      return cmState::GetTargetTypeName(replaceValues.CMTarget->GetType());
       }
     }
   if(replaceValues.Output)
@@ -2134,7 +2134,7 @@ void cmLocalGenerator
     w <<
       cmPolicies::GetPolicyWarning(cmPolicies::CMP0063) << "\n"
       "Target \"" << target->GetName() << "\" of "
-      "type \"" << cmTarget::GetTargetTypeName(target->GetType()) << "\" "
+      "type \"" << cmState::GetTargetTypeName(target->GetType()) << "\" "
       "has the following visibility properties set for " << lang << ":\n" <<
       warnCMP0063 <<
       "For compatibility CMake is not honoring them for this target.";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 8f656b4..a1f143a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1426,7 +1426,7 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
         {
         std::ostringstream e;
         e << "Target \"" << lib << "\" of type "
-          << cmTarget::GetTargetTypeName(tgt->GetType())
+          << cmState::GetTargetTypeName(tgt->GetType())
           << " may not be linked into another target.  "
           << "One may link only to STATIC or SHARED libraries, or "
           << "to executables with the ENABLE_EXPORTS property set.";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index c5dfe2d..066c64e 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -103,7 +103,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
   cmGlobalNinjaGenerator::WriteDivider(this->GetRulesFileStream());
   this->GetRulesFileStream()
     << "# Rules for each languages for "
-    << cmTarget::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
+    << cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
@@ -156,8 +156,7 @@ cmNinjaNormalTargetGenerator
 {
   return this->TargetLinkLanguage
     + "_"
-    + cmTarget::GetTargetTypeName(
-        this->GetGeneratorTarget()->GetType())
+    + cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
     + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
     ;
@@ -446,7 +445,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   const cmState::TargetType targetType = target.GetType();
   this->GetBuildFileStream()
     << "# Link build statements for "
-    << cmTarget::GetTargetTypeName(targetType)
+    << cmState::GetTargetTypeName(targetType)
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 0d6afff..63c1490 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -480,8 +480,7 @@ cmNinjaTargetGenerator
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
   this->GetBuildFileStream()
     << "# Object build statements for "
-    << cmTarget::GetTargetTypeName(
-         this->GetGeneratorTarget()->GetType())
+    << cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 825204c..c491c7d 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -101,6 +101,33 @@ cmState::~cmState()
   cmDeleteAll(this->Commands);
 }
 
+const char* cmState::GetTargetTypeName(cmState::TargetType targetType)
+{
+  switch( targetType )
+    {
+      case cmState::STATIC_LIBRARY:
+        return "STATIC_LIBRARY";
+      case cmState::MODULE_LIBRARY:
+        return "MODULE_LIBRARY";
+      case cmState::SHARED_LIBRARY:
+        return "SHARED_LIBRARY";
+      case cmState::OBJECT_LIBRARY:
+        return "OBJECT_LIBRARY";
+      case cmState::EXECUTABLE:
+        return "EXECUTABLE";
+      case cmState::UTILITY:
+        return "UTILITY";
+      case cmState::GLOBAL_TARGET:
+        return "GLOBAL_TARGET";
+      case cmState::INTERFACE_LIBRARY:
+        return "INTERFACE_LIBRARY";
+      case cmState::UNKNOWN_LIBRARY:
+        return "UNKNOWN_LIBRARY";
+    }
+  assert(0 && "Unexpected target type");
+  return 0;
+}
+
 const char* cmCacheEntryTypes[] =
 { "BOOL",
   "PATH",
diff --git a/Source/cmState.h b/Source/cmState.h
index 0fe4812..7d1fc80 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -187,6 +187,8 @@ public:
                     INTERFACE_LIBRARY,
                     UNKNOWN_LIBRARY};
 
+  static const char* GetTargetTypeName(cmState::TargetType targetType);
+
   Snapshot CreateBaseSnapshot();
   Snapshot
   CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index eeced8d..fecdc45 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -33,33 +33,6 @@
 #define UNORDERED_SET std::set
 #endif
 
-const char* cmTarget::GetTargetTypeName(cmState::TargetType targetType)
-{
-  switch( targetType )
-    {
-      case cmState::STATIC_LIBRARY:
-        return "STATIC_LIBRARY";
-      case cmState::MODULE_LIBRARY:
-        return "MODULE_LIBRARY";
-      case cmState::SHARED_LIBRARY:
-        return "SHARED_LIBRARY";
-      case cmState::OBJECT_LIBRARY:
-        return "OBJECT_LIBRARY";
-      case cmState::EXECUTABLE:
-        return "EXECUTABLE";
-      case cmState::UTILITY:
-        return "UTILITY";
-      case cmState::GLOBAL_TARGET:
-        return "GLOBAL_TARGET";
-      case cmState::INTERFACE_LIBRARY:
-        return "INTERFACE_LIBRARY";
-      case cmState::UNKNOWN_LIBRARY:
-        return "UNKNOWN_LIBRARY";
-    }
-  assert(0 && "Unexpected target type");
-  return 0;
-}
-
 //----------------------------------------------------------------------------
 class cmTargetInternals
 {
@@ -1892,7 +1865,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
     // the type property returns what type the target is
     else if (prop == propTYPE)
       {
-      return cmTarget::GetTargetTypeName(this->GetType());
+      return cmState::GetTargetTypeName(this->GetType());
       }
     else if(prop == propINCLUDE_DIRECTORIES)
       {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index e5646f6..c0b9e09 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -77,7 +77,6 @@ class cmTarget
 {
 public:
   cmTarget();
-  static const char* GetTargetTypeName(cmState::TargetType targetType);
   enum CustomCommandType { PRE_BUILD, PRE_LINK, POST_BUILD };
 
   /**

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c934e2991a88af8b459075f093eb649607be029d
commit c934e2991a88af8b459075f093eb649607be029d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 23:44:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 23:58:51 2015 +0200

    Remove now-obsolete casts.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 05fc800..138e630 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -555,7 +555,7 @@ cmComputeTargetDepends
     // Describe the depender.
     e << "  \"" << depender->GetName() << "\" of type "
       << cmTarget::GetTargetTypeName(
-           (cmState::TargetType)depender->GetType()) << "\n";
+           depender->GetType()) << "\n";
 
     // List its dependencies that are inside the component.
     EdgeList const& nl = this->InitialGraph[i];
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index aa6f54b..e3253da 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1632,7 +1632,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
       return std::string();
       }
 
-    cmState::TargetType targetType = (cmState::TargetType)target->GetType();
+    cmState::TargetType targetType = target->GetType();
 
     if(targetType != cmState::SHARED_LIBRARY &&
        targetType != cmState::MODULE_LIBRARY &&
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dc02734..f5c5191 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1965,7 +1965,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
     std::string msg = "cmTarget::GetCompileInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName((cmState::TargetType)this->GetType());
+    msg += cmTarget::GetTargetTypeName(this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -4697,7 +4697,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(cmState::TargetType(this->GetType()));
+    msg += cmTarget::GetTargetTypeName(this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 66b6fc7..2f08165 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -94,8 +94,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   std::vector<std::string> filesFrom;
   std::vector<std::string> filesTo;
   std::string literal_args;
-  cmState::TargetType targetType =
-      static_cast<cmState::TargetType>(this->Target->GetType());
+  cmState::TargetType targetType = this->Target->GetType();
   cmInstallType type = cmInstallType();
   switch(targetType)
     {
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index b5648fe..c5dfe2d 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -157,7 +157,7 @@ cmNinjaNormalTargetGenerator
   return this->TargetLinkLanguage
     + "_"
     + cmTarget::GetTargetTypeName(
-        (cmState::TargetType)this->GetGeneratorTarget()->GetType())
+        this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
     + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
     ;
@@ -168,7 +168,7 @@ cmNinjaNormalTargetGenerator
 ::WriteLinkRule(bool useResponseFile)
 {
   cmState::TargetType targetType =
-      (cmState::TargetType)this->GetGeneratorTarget()->GetType();
+      this->GetGeneratorTarget()->GetType();
   std::string ruleName = this->LanguageLinkerRule();
 
   // Select whether to use a response file for objects.
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 1028196..0d6afff 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -481,7 +481,7 @@ cmNinjaTargetGenerator
   this->GetBuildFileStream()
     << "# Object build statements for "
     << cmTarget::GetTargetTypeName(
-         (cmState::TargetType)this->GetGeneratorTarget()->GetType())
+         this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 218756d..bbb0126 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1743,8 +1743,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmState::TargetType ttype =
-      (cmState::TargetType)this->GeneratorTarget->GetType();
+  cmState::TargetType ttype = this->GeneratorTarget->GetType();
   if(ttype > cmState::GLOBAL_TARGET)
     {
     return;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64c5cef21853511f8c33a5a8fe49222b8cb88f58
commit 64c5cef21853511f8c33a5a8fe49222b8cb88f58
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:23:34 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 23:56:01 2015 +0200

    cmGeneratorTarget: Use enum for GetType.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dce2091..dc02734 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -323,7 +323,7 @@ cmLocalGenerator* cmGeneratorTarget::GetLocalGenerator() const
 }
 
 //----------------------------------------------------------------------------
-int cmGeneratorTarget::GetType() const
+cmState::TargetType cmGeneratorTarget::GetType() const
 {
   return this->Target->GetType();
 }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 258c556..05a7d4d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -41,7 +41,7 @@ public:
   cmComputeLinkInformation*
     GetLinkInformation(const std::string& config) const;
 
-  int GetType() const;
+  cmState::TargetType GetType() const;
   std::string GetName() const;
   const char *GetProperty(const std::string& prop) const;
   bool GetPropertyAsBool(const std::string& prop) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9abf040d536b6adf1a06269cc1dbf90117b85c48
commit 9abf040d536b6adf1a06269cc1dbf90117b85c48
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:21:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 23:55:57 2015 +0200

    cmState: Move TargetType enum from cmTarget.
    
    Mostly automated:
    
     values=( "EXECUTABLE" "STATIC_LIBRARY" "SHARED_LIBRARY" "MODULE_LIBRARY" "OBJECT_LIBRARY" "UTILITY" "GLOBAL_TARGET" "INTERFACE_LIBRARY" "UNKNOWN_LIBRARY" "TargetType")
     for i in "${values[@]}"; do     git grep -l cmTarget::$i | xargs sed -i "s|cmTarget::$i|cmState::$i|g"; done

diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index d15fc1e..47f6592 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -174,8 +174,8 @@ bool cmAddExecutableCommand
       this->SetError(e.str());
       return false;
       }
-    cmTarget::TargetType type = aliasedTarget->GetType();
-    if(type != cmTarget::EXECUTABLE)
+    cmState::TargetType type = aliasedTarget->GetType();
+    if(type != cmState::EXECUTABLE)
       {
       std::ostringstream e;
       e << "cannot create ALIAS target \"" << exename
@@ -210,7 +210,7 @@ bool cmAddExecutableCommand
       }
 
     // Create the imported target.
-    this->Makefile->AddImportedTarget(exename, cmTarget::EXECUTABLE,
+    this->Makefile->AddImportedTarget(exename, cmState::EXECUTABLE,
                                       importGlobal);
     return true;
     }
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index a844cf1..e0adee3 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -25,10 +25,10 @@ bool cmAddLibraryCommand
     }
   // Library type defaults to value of BUILD_SHARED_LIBS, if it exists,
   // otherwise it defaults to static library.
-  cmTarget::TargetType type = cmTarget::SHARED_LIBRARY;
+  cmState::TargetType type = cmState::SHARED_LIBRARY;
   if (cmSystemTools::IsOff(this->Makefile->GetDefinition("BUILD_SHARED_LIBS")))
     {
-    type = cmTarget::STATIC_LIBRARY;
+    type = cmState::STATIC_LIBRARY;
     }
   bool excludeFromAll = false;
   bool importTarget = false;
@@ -50,7 +50,7 @@ bool cmAddLibraryCommand
     std::string libType = *s;
     if(libType == "STATIC")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting STATIC type.";
@@ -58,12 +58,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::STATIC_LIBRARY;
+      type = cmState::STATIC_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "SHARED")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting SHARED type.";
@@ -71,12 +71,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::SHARED_LIBRARY;
+      type = cmState::SHARED_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "MODULE")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting MODULE type.";
@@ -84,12 +84,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::MODULE_LIBRARY;
+      type = cmState::MODULE_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "OBJECT")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting OBJECT type.";
@@ -97,12 +97,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::OBJECT_LIBRARY;
+      type = cmState::OBJECT_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "UNKNOWN")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting UNKNOWN type.";
@@ -110,12 +110,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::UNKNOWN_LIBRARY;
+      type = cmState::UNKNOWN_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "ALIAS")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting ALIAS type.";
@@ -149,12 +149,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::INTERFACE_LIBRARY;
+      type = cmState::INTERFACE_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(*s == "EXCLUDE_FROM_ALL")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library may not be used with EXCLUDE_FROM_ALL.";
@@ -174,7 +174,7 @@ bool cmAddLibraryCommand
       ++s;
       importGlobal = true;
       }
-    else if(type == cmTarget::INTERFACE_LIBRARY && *s == "GLOBAL")
+    else if(type == cmState::INTERFACE_LIBRARY && *s == "GLOBAL")
       {
       std::ostringstream e;
       e << "GLOBAL option may only be used with IMPORTED libraries.";
@@ -187,7 +187,7 @@ bool cmAddLibraryCommand
       }
     }
 
-  if (type == cmTarget::INTERFACE_LIBRARY)
+  if (type == cmState::INTERFACE_LIBRARY)
     {
     if (s != args.end())
       {
@@ -220,7 +220,7 @@ bool cmAddLibraryCommand
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037))
       {
       case cmPolicies::WARN:
-        if(type != cmTarget::INTERFACE_LIBRARY)
+        if(type != cmState::INTERFACE_LIBRARY)
           {
           e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0037) << "\n";
           issueMessage = true;
@@ -293,12 +293,12 @@ bool cmAddLibraryCommand
       this->SetError(e.str());
       return false;
       }
-    cmTarget::TargetType aliasedType = aliasedTarget->GetType();
-    if(aliasedType != cmTarget::SHARED_LIBRARY
-        && aliasedType != cmTarget::STATIC_LIBRARY
-        && aliasedType != cmTarget::MODULE_LIBRARY
-        && aliasedType != cmTarget::OBJECT_LIBRARY
-        && aliasedType != cmTarget::INTERFACE_LIBRARY)
+    cmState::TargetType aliasedType = aliasedTarget->GetType();
+    if(aliasedType != cmState::SHARED_LIBRARY
+        && aliasedType != cmState::STATIC_LIBRARY
+        && aliasedType != cmState::MODULE_LIBRARY
+        && aliasedType != cmState::OBJECT_LIBRARY
+        && aliasedType != cmState::INTERFACE_LIBRARY)
       {
       std::ostringstream e;
       e << "cannot create ALIAS target \"" << libName
@@ -328,19 +328,19 @@ bool cmAddLibraryCommand
     CMAKE_${LANG}_CREATE_SHARED_LIBRARY is defined and if not default to
     STATIC. But at this point we know only the name of the target, but not
     yet its linker language. */
-  if ((type == cmTarget::SHARED_LIBRARY ||
-       type == cmTarget::MODULE_LIBRARY) &&
+  if ((type == cmState::SHARED_LIBRARY ||
+       type == cmState::MODULE_LIBRARY) &&
        (this->Makefile->GetState()->GetGlobalPropertyAsBool(
                                       "TARGET_SUPPORTS_SHARED_LIBS") == false))
     {
     std::ostringstream w;
     w <<
       "ADD_LIBRARY called with " <<
-      (type==cmTarget::SHARED_LIBRARY ? "SHARED" : "MODULE") <<
+      (type==cmState::SHARED_LIBRARY ? "SHARED" : "MODULE") <<
       " option but the target platform does not support dynamic linking. "
       "Building a STATIC library instead. This may lead to problems.";
     this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
-    type = cmTarget::STATIC_LIBRARY;
+    type = cmState::STATIC_LIBRARY;
     }
 
   // Handle imported target creation.
@@ -352,7 +352,7 @@ bool cmAddLibraryCommand
       this->SetError("called with IMPORTED argument but no library type.");
       return false;
       }
-    if(type == cmTarget::OBJECT_LIBRARY)
+    if(type == cmState::OBJECT_LIBRARY)
       {
       this->Makefile->IssueMessage(
         cmake::FATAL_ERROR,
@@ -360,7 +360,7 @@ bool cmAddLibraryCommand
         );
       return true;
       }
-    if(type == cmTarget::INTERFACE_LIBRARY)
+    if(type == cmState::INTERFACE_LIBRARY)
       {
       if (!cmGeneratorExpression::IsValidTargetName(libName))
         {
@@ -387,7 +387,7 @@ bool cmAddLibraryCommand
     }
 
   // A non-imported target may not have UNKNOWN type.
-  if(type == cmTarget::UNKNOWN_LIBRARY)
+  if(type == cmState::UNKNOWN_LIBRARY)
     {
     this->Makefile->IssueMessage(
       cmake::FATAL_ERROR,
@@ -408,7 +408,7 @@ bool cmAddLibraryCommand
 
   std::vector<std::string> srclists;
 
-  if(type == cmTarget::INTERFACE_LIBRARY)
+  if(type == cmState::INTERFACE_LIBRARY)
     {
     if (!cmGeneratorExpression::IsValidTargetName(libName)
         || libName.find("::") != std::string::npos)
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index e439182..fb78446 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -395,7 +395,7 @@ void CCONV cmAddLibrary(void *arg, const char *libname, int shared,
     srcs2.push_back(srcs[i]);
     }
   mf->AddLibrary(libname,
-                 (shared? cmTarget::SHARED_LIBRARY : cmTarget::STATIC_LIBRARY),
+                 (shared? cmState::SHARED_LIBRARY : cmState::STATIC_LIBRARY),
                   srcs2);
 }
 
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index f901414..fe7299e 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -396,7 +396,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
                 // We can ignore the INTERFACE_LIBRARY items because
                 // Target->GetLinkInformation already processed their
                 // link interface and they don't have any output themselves.
-                && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
+                && linkee->GetType() != cmState::INTERFACE_LIBRARY
                 && emitted.insert(linkee).second)
         {
         cmLocalGenerator* lg = linkee->GetLocalGenerator();
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 742651a..465db92 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -270,7 +270,7 @@ cmComputeLinkDepends::Compute()
     LinkEntry const& e = this->EntryList[i];
     cmGeneratorTarget const* t = e.Target;
     // Entries that we know the linker will re-use do not need to be repeated.
-    bool uniquify = t && t->GetType() == cmTarget::SHARED_LIBRARY;
+    bool uniquify = t && t->GetType() == cmState::SHARED_LIBRARY;
     if(!uniquify || emmitted.insert(i).second)
       {
       this->FinalLinkEntries.push_back(e);
@@ -367,7 +367,7 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe)
        entry.Target->GetLinkInterface(this->Config, this->Target))
       {
       const bool isIface =
-                      entry.Target->GetType() == cmTarget::INTERFACE_LIBRARY;
+                      entry.Target->GetType() == cmState::INTERFACE_LIBRARY;
       // This target provides its own link interface information.
       this->AddLinkEntries(depender_index, iface->Libraries);
 
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 5c252df..7bdc555 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -290,7 +290,7 @@ cmComputeLinkInformation
   // the program that will load it.
   this->LoaderFlag = 0;
   if(!this->UseImportLibrary &&
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+     this->Target->GetType() == cmState::MODULE_LIBRARY)
     {
     std::string loader_flag_var = "CMAKE_SHARED_MODULE_LOADER_";
     loader_flag_var += this->LinkLanguage;
@@ -308,10 +308,10 @@ cmComputeLinkInformation
 
   // Get options needed to specify RPATHs.
   this->RuntimeUseChrpath = false;
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->Target->GetType() != cmState::STATIC_LIBRARY)
     {
     const char* tType =
-      ((this->Target->GetType() == cmTarget::EXECUTABLE)?
+      ((this->Target->GetType() == cmState::EXECUTABLE)?
        "EXECUTABLE" : "SHARED_LIBRARY");
     std::string rtVar = "CMAKE_";
     rtVar += tType;
@@ -480,10 +480,10 @@ cmComputeLinkInformation::GetSharedLibrariesLinked()
 bool cmComputeLinkInformation::Compute()
 {
   // Skip targets that do not link.
-  if(!(this->Target->GetType() == cmTarget::EXECUTABLE ||
-       this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->Target->GetType() == cmTarget::MODULE_LIBRARY ||
-       this->Target->GetType() == cmTarget::STATIC_LIBRARY))
+  if(!(this->Target->GetType() == cmState::EXECUTABLE ||
+       this->Target->GetType() == cmState::SHARED_LIBRARY ||
+       this->Target->GetType() == cmState::MODULE_LIBRARY ||
+       this->Target->GetType() == cmState::STATIC_LIBRARY))
     {
     return false;
     }
@@ -544,7 +544,7 @@ bool cmComputeLinkInformation::Compute()
       cmGeneratorTarget const* tgt = *i;
       bool implib =
         (this->UseImportLibrary &&
-         (tgt->GetType() == cmTarget::SHARED_LIBRARY));
+         (tgt->GetType() == cmState::SHARED_LIBRARY));
       std::string lib = tgt->GetFullPath(this->Config , implib, true);
       this->OldLinkDirItems.push_back(lib);
       }
@@ -660,7 +660,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       this->Items.push_back(Item(linkItem, true, tgt));
       this->Depends.push_back(exe);
       }
-    else if(tgt->GetType() == cmTarget::INTERFACE_LIBRARY)
+    else if(tgt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       // Add the interface library as an item so it can be considered as part
       // of COMPATIBLE_INTERFACE_ enforcement.  The generators will ignore
@@ -672,12 +672,12 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       // Decide whether to use an import library.
       bool implib =
         (this->UseImportLibrary &&
-         (impexe || tgt->GetType() == cmTarget::SHARED_LIBRARY));
+         (impexe || tgt->GetType() == cmState::SHARED_LIBRARY));
 
       // Pass the full path to the target file.
       std::string lib = tgt->GetFullPath(config, implib, true);
       if(!this->LinkDependsNoShared ||
-         tgt->GetType() != cmTarget::SHARED_LIBRARY)
+         tgt->GetType() != cmState::SHARED_LIBRARY)
         {
         this->Depends.push_back(lib);
         }
@@ -728,7 +728,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
     {
     // The target will provide a full path.  Make sure it is a shared
     // library.
-    if(tgt->GetType() != cmTarget::SHARED_LIBRARY)
+    if(tgt->GetType() != cmState::SHARED_LIBRARY)
       {
       return;
       }
@@ -818,9 +818,9 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
   const char* target_type_str = 0;
   switch(this->Target->GetType())
     {
-    case cmTarget::EXECUTABLE:     target_type_str = "EXE"; break;
-    case cmTarget::SHARED_LIBRARY: target_type_str = "SHARED_LIBRARY"; break;
-    case cmTarget::MODULE_LIBRARY: target_type_str = "SHARED_MODULE"; break;
+    case cmState::EXECUTABLE:     target_type_str = "EXE"; break;
+    case cmState::SHARED_LIBRARY: target_type_str = "SHARED_LIBRARY"; break;
+    case cmState::MODULE_LIBRARY: target_type_str = "SHARED_MODULE"; break;
     default: break;
     }
   if(target_type_str)
@@ -1084,13 +1084,13 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
   // shared and static libraries but static-mode can handle only
   // static libraries.  If a previous user item changed the link type
   // to static we need to make sure it is back to shared.
-  if(target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     this->SetCurrentLinkType(LinkShared);
     }
 
   // Keep track of shared library targets linked.
-  if(target->GetType() == cmTarget::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     this->SharedLibrariesLinked.insert(target);
     }
@@ -1790,14 +1790,14 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
 
   // Libraries with unknown type must be handled using just the file
   // on disk.
-  if(target->GetType() == cmTarget::UNKNOWN_LIBRARY)
+  if(target->GetType() == cmState::UNKNOWN_LIBRARY)
     {
     this->AddLibraryRuntimeInfo(fullPath);
     return;
     }
 
   // Skip targets that are not shared libraries (modules cannot be linked).
-  if(target->GetType() != cmTarget::SHARED_LIBRARY)
+  if(target->GetType() != cmState::SHARED_LIBRARY)
     {
     return;
     }
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 4094bf0..05fc800 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -207,7 +207,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
 {
   // Get the depender.
   cmGeneratorTarget const* depender = this->Targets[depender_index];
-  if (depender->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (depender->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
@@ -236,10 +236,10 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
       std::string objLib = (*oi)->GetObjectLibrary();
       if (!objLib.empty() && emitted.insert(objLib).second)
         {
-        if(depender->GetType() != cmTarget::EXECUTABLE &&
-            depender->GetType() != cmTarget::STATIC_LIBRARY &&
-            depender->GetType() != cmTarget::SHARED_LIBRARY &&
-            depender->GetType() != cmTarget::MODULE_LIBRARY)
+        if(depender->GetType() != cmState::EXECUTABLE &&
+            depender->GetType() != cmState::STATIC_LIBRARY &&
+            depender->GetType() != cmState::SHARED_LIBRARY &&
+            depender->GetType() != cmState::MODULE_LIBRARY)
           {
           this->GlobalGenerator->GetCMakeInstance()
             ->IssueMessage(cmake::FATAL_ERROR,
@@ -324,7 +324,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
   // name conflict between an external library and an executable
   // within the project.
   if(dependee &&
-     dependee->GetType() == cmTarget::EXECUTABLE &&
+     dependee->GetType() == cmState::EXECUTABLE &&
      !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
@@ -357,7 +357,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   cmGeneratorTarget const* dependee = dependee_name.Target;
 
   if(!dependee && !linking &&
-    (depender->GetType() != cmTarget::GLOBAL_TARGET))
+    (depender->GetType() != cmState::GLOBAL_TARGET))
     {
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     bool issueMessage = false;
@@ -400,7 +400,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   // name conflict between an external library and an executable
   // within the project.
   if(linking && dependee &&
-     dependee->GetType() == cmTarget::EXECUTABLE &&
+     dependee->GetType() == cmState::EXECUTABLE &&
      !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
@@ -418,7 +418,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
                                              bool linking)
 {
   if(dependee->Target->IsImported() ||
-     dependee->GetType() == cmTarget::INTERFACE_LIBRARY)
+     dependee->GetType() == cmState::INTERFACE_LIBRARY)
     {
     // Skip IMPORTED and INTERFACE targets but follow their utility
     // dependencies.
@@ -523,7 +523,7 @@ cmComputeTargetDepends
     // Make sure the component is all STATIC_LIBRARY targets.
     for(NodeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni)
       {
-      if(this->Targets[*ni]->GetType() != cmTarget::STATIC_LIBRARY)
+      if(this->Targets[*ni]->GetType() != cmState::STATIC_LIBRARY)
         {
         this->ComplainAboutBadComponent(ccg, c);
         return false;
@@ -555,7 +555,7 @@ cmComputeTargetDepends
     // Describe the depender.
     e << "  \"" << depender->GetName() << "\" of type "
       << cmTarget::GetTargetTypeName(
-           (cmTarget::TargetType)depender->GetType()) << "\n";
+           (cmState::TargetType)depender->GetType()) << "\n";
 
     // List its dependencies that are inside the component.
     EdgeList const& nl = this->InitialGraph[i];
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 3d9c4bf..de3f992 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -93,12 +93,12 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         {
         switch(tgt->GetType())
           {
-          case cmTarget::SHARED_LIBRARY:
-          case cmTarget::STATIC_LIBRARY:
-          case cmTarget::INTERFACE_LIBRARY:
-          case cmTarget::UNKNOWN_LIBRARY:
+          case cmState::SHARED_LIBRARY:
+          case cmState::STATIC_LIBRARY:
+          case cmState::INTERFACE_LIBRARY:
+          case cmState::UNKNOWN_LIBRARY:
             break;
-          case cmTarget::EXECUTABLE:
+          case cmState::EXECUTABLE:
             if (tgt->IsExecutableWithExports())
               {
               break;
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 618f09f..8f7b480 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -44,7 +44,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
   std::string const& argv0 = this->CC.GetCommandLines()[c][0];
   cmGeneratorTarget* target =
       this->LG->FindGeneratorTargetToUse(argv0);
-  if(target && target->GetType() == cmTarget::EXECUTABLE &&
+  if(target && target->GetType() == cmState::EXECUTABLE &&
      (target->Target->IsImported()
       || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
     {
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 6c3cccd..2d74b97 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -59,7 +59,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
                          this->LG->GetMakefile()->GetBacktrace());
       return false;
       }
-    if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (te->GetType() == cmState::INTERFACE_LIBRARY)
       {
       this->GenerateRequiredCMakeVersion(os, "3.0.0");
       }
@@ -146,14 +146,14 @@ cmExportBuildFileGenerator
     cmGeneratorTarget* target = *tei;
     ImportPropertyMap properties;
 
-    if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
+    if (target->GetType() != cmState::INTERFACE_LIBRARY)
       {
       this->SetImportLocationProperty(config, suffix, target, properties);
       }
     if(!properties.empty())
       {
       // Get the rest of the target details.
-      if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
+      if (target->GetType() != cmState::INTERFACE_LIBRARY)
         {
         this->SetImportDetailProperties(config, suffix,
                                         target,
@@ -216,7 +216,7 @@ cmExportBuildFileGenerator
 
   // Add the import library for windows DLLs.
   if(dll_platform &&
-     (target->GetType() == cmTarget::SHARED_LIBRARY ||
+     (target->GetType() == cmState::SHARED_LIBRARY ||
       target->Target->IsExecutableWithExports()) &&
      mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX"))
     {
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index c2d9cc4..4eec66a 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -168,7 +168,7 @@ bool cmExportCommand
 
       if(cmTarget* target = gg->FindTarget(*currentTarget))
         {
-        if(target->GetType() == cmTarget::OBJECT_LIBRARY)
+        if(target->GetType() == cmState::OBJECT_LIBRARY)
           {
           std::ostringstream e;
           e << "given OBJECT library \"" << *currentTarget
@@ -176,7 +176,7 @@ bool cmExportCommand
           this->SetError(e.str());
           return false;
           }
-        if (target->GetType() == cmTarget::UTILITY)
+        if (target->GetType() == cmState::UTILITY)
           {
           this->SetError("given custom target \"" + *currentTarget
                          + "\" which may not be exported.");
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d6440ac..6127626 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -597,7 +597,7 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
   getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MAX",
                       ifaceProperties);
 
-  if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (target->GetType() != cmState::INTERFACE_LIBRARY)
     {
     getCompatibleInterfaceProperties(gtarget, ifaceProperties, "");
 
@@ -885,8 +885,8 @@ cmExportFileGenerator
   cmMakefile* mf = target->Makefile;
 
   // Add the soname for unix shared libraries.
-  if(target->GetType() == cmTarget::SHARED_LIBRARY ||
-     target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     // Check whether this is a DLL platform.
     bool dll_platform =
@@ -1059,22 +1059,22 @@ cmExportFileGenerator
   os << "# Create imported target " << targetName << "\n";
   switch(target->GetType())
     {
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       os << "add_executable(" << targetName << " IMPORTED)\n";
       break;
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       os << "add_library(" << targetName << " STATIC IMPORTED)\n";
       break;
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       os << "add_library(" << targetName << " SHARED IMPORTED)\n";
       break;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       os << "add_library(" << targetName << " MODULE IMPORTED)\n";
       break;
-    case cmTarget::UNKNOWN_LIBRARY:
+    case cmState::UNKNOWN_LIBRARY:
       os << "add_library(" << targetName << " UNKNOWN IMPORTED)\n";
       break;
-    case cmTarget::INTERFACE_LIBRARY:
+    case cmState::INTERFACE_LIBRARY:
       os << "add_library(" << targetName << " INTERFACE IMPORTED)\n";
       break;
     default:  // should never happen
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 7ffab0c..5a51442 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -134,7 +134,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     cmTarget* te = (*tei)->Target;
 
     requiresConfigFiles = requiresConfigFiles
-                              || te->GetType() != cmTarget::INTERFACE_LIBRARY;
+                              || te->GetType() != cmState::INTERFACE_LIBRARY;
 
     this->GenerateImportTargetCode(os, te);
 
@@ -180,7 +180,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         require2_8_12 = true;
         }
       }
-    if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (te->GetType() == cmState::INTERFACE_LIBRARY)
       {
       require3_0_0 = true;
       }
@@ -337,7 +337,7 @@ cmExportInstallFileGenerator
     {
     // Collect import properties for this target.
     cmTargetExport const* te = *tei;
-    if (te->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (te->Target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index 0ef2ea5..21d961f 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -96,8 +96,8 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
       cmTarget const& target = l->second;
 
       // Skip non-library targets.
-      if(target.GetType() < cmTarget::STATIC_LIBRARY
-         || target.GetType() > cmTarget::MODULE_LIBRARY)
+      if(target.GetType() < cmState::STATIC_LIBRARY
+         || target.GetType() > cmState::MODULE_LIBRARY)
         {
         continue;
         }
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index f8dbe31..70fca2e 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -73,7 +73,7 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(prop);
 
   cmTarget dummyHead;
-  dummyHead.SetType(cmTarget::EXECUTABLE, "try_compile_dummy_exe");
+  dummyHead.SetType(cmState::EXECUTABLE, "try_compile_dummy_exe");
   dummyHead.SetMakefile(tgt->GetMakefile());
 
   cmGeneratorTarget* gtgt =
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 0406644..5775602 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -326,7 +326,7 @@ void cmExtraCodeBlocksGenerator
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::GLOBAL_TARGET:
+        case cmState::GLOBAL_TARGET:
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
@@ -338,7 +338,7 @@ void cmExtraCodeBlocksGenerator
             }
           }
           break;
-        case cmTarget::UTILITY:
+        case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
           if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
@@ -352,11 +352,11 @@ void cmExtraCodeBlocksGenerator
           this->AppendTarget(fout, ti->first, 0,
                                  make.c_str(), *lg, compiler.c_str());
           break;
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
           {
           this->AppendTarget(fout, ti->first, &ti->second,
                              make.c_str(), *lg, compiler.c_str());
@@ -392,12 +392,12 @@ void cmExtraCodeBlocksGenerator
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
-        case cmTarget::UTILITY: // can have sources since 2.6.3
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
+        case cmState::UTILITY: // can have sources since 2.6.3
           {
           std::vector<cmSourceFile*> sources;
           cmGeneratorTarget* gt =
@@ -561,7 +561,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
     {
     int cbTargetType = this->GetCBTargetType(target);
     std::string workingDir = lg->GetCurrentBinaryDirectory();
-    if ( target->GetType()==cmTarget::EXECUTABLE)
+    if ( target->GetType()==cmState::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
       // set the working directory to this dir.
@@ -584,7 +584,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
 
     std::string buildType = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
     std::string location;
-    if ( target->GetType()==cmTarget::OBJECT_LIBRARY)
+    if ( target->GetType()==cmState::OBJECT_LIBRARY)
       {
       location = this->CreateDummyTargetFile(const_cast<cmLocalGenerator*>(lg),
                                              target);
@@ -724,7 +724,7 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
 // Translate the cmake target type into the CodeBlocks target type id
 int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
 {
-  if ( target->GetType()==cmTarget::EXECUTABLE)
+  if ( target->GetType()==cmState::EXECUTABLE)
     {
     if ((target->GetPropertyAsBool("WIN32_EXECUTABLE"))
         || (target->GetPropertyAsBool("MACOSX_BUNDLE")))
@@ -736,13 +736,13 @@ int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
       return 1;
       }
     }
-  else if (( target->GetType()==cmTarget::STATIC_LIBRARY)
-        || (target->GetType()==cmTarget::OBJECT_LIBRARY))
+  else if (( target->GetType()==cmState::STATIC_LIBRARY)
+        || (target->GetType()==cmState::OBJECT_LIBRARY))
     {
     return 2;
     }
-  else if ((target->GetType()==cmTarget::SHARED_LIBRARY)
-           || (target->GetType()==cmTarget::MODULE_LIBRARY))
+  else if ((target->GetType()==cmState::SHARED_LIBRARY)
+           || (target->GetType()==cmState::MODULE_LIBRARY))
     {
     return 3;
     }
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 31dbf3d..10f33be 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -162,22 +162,22 @@ void cmExtraCodeLiteGenerator
 
       switch(ti->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
+        case cmState::EXECUTABLE:
           {
           projectType = "Executable";
           }
         break;
-        case cmTarget::STATIC_LIBRARY:
+        case cmState::STATIC_LIBRARY:
           {
           projectType = "Static Library";
           }
         break;
-        case cmTarget::SHARED_LIBRARY:
+        case cmState::SHARED_LIBRARY:
           {
           projectType = "Dynamic Library";
           }
         break;
-        case cmTarget::MODULE_LIBRARY:
+        case cmState::MODULE_LIBRARY:
           {
           projectType = "Dynamic Library";
           }
@@ -188,10 +188,10 @@ void cmExtraCodeLiteGenerator
 
       switch(ti->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
           {
           std::vector<cmSourceFile*> sources;
           cmGeneratorTarget* gt =
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index b7aeb02..463e732 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -544,13 +544,13 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
       linkName2 += "/";
       switch(ti->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
           {
-          const char* prefix = (ti->second.GetType()==cmTarget::EXECUTABLE ?
+          const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
           linkName2 += prefix;
           linkName2 += ti->first;
@@ -1046,7 +1046,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::GLOBAL_TARGET:
+        case cmState::GLOBAL_TARGET:
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
@@ -1056,7 +1056,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
            }
          }
          break;
-       case cmTarget::UTILITY:
+       case cmState::UTILITY:
          // Add all utility targets, except the Nightly/Continuous/
          // Experimental-"sub"targets as e.g. NightlyStart
          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
@@ -1069,13 +1069,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 
          this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
          break;
-       case cmTarget::EXECUTABLE:
-       case cmTarget::STATIC_LIBRARY:
-       case cmTarget::SHARED_LIBRARY:
-       case cmTarget::MODULE_LIBRARY:
-       case cmTarget::OBJECT_LIBRARY:
+       case cmState::EXECUTABLE:
+       case cmState::STATIC_LIBRARY:
+       case cmState::SHARED_LIBRARY:
+       case cmState::MODULE_LIBRARY:
+       case cmState::OBJECT_LIBRARY:
          {
-         const char* prefix = (ti->second.GetType()==cmTarget::EXECUTABLE ?
+         const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
          this->AppendTarget(fout, ti->first, make, makeArgs, subdir, prefix);
          std::string fastTarget = ti->first;
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index fe77026..dc6421b 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -128,7 +128,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::GLOBAL_TARGET:
+        case cmState::GLOBAL_TARGET:
           {
           bool insertTarget = false;
           // Only add the global targets from CMAKE_BINARY_DIR,
@@ -159,7 +159,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             }
         }
         break;
-        case cmTarget::UTILITY:
+        case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
           if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
@@ -173,11 +173,11 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             this->AppendTarget(fout, ti->first, make, makeArgs,
                                currentDir, homeOutputDir);
           break;
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
         {
           this->AppendTarget(fout, ti->first, make, makeArgs,
                              currentDir, homeOutputDir);
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index b8ec0f9..d1599c4 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -168,7 +168,7 @@ void cmExtraSublimeTextGenerator::
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::GLOBAL_TARGET:
+        case cmState::GLOBAL_TARGET:
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
@@ -181,7 +181,7 @@ void cmExtraSublimeTextGenerator::
             }
           }
           break;
-        case cmTarget::UTILITY:
+        case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
           if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
@@ -196,11 +196,11 @@ void cmExtraSublimeTextGenerator::
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           break;
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
           {
           this->AppendTarget(fout, ti->first, *lg, &ti->second,
                              make.c_str(), makefile, compiler.c_str(),
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 9958672..aa6f54b 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1144,7 +1144,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if (!prop)
       {
       if (target->IsImported()
-          || target->GetType() == cmTarget::INTERFACE_LIBRARY)
+          || target->GetType() == cmState::INTERFACE_LIBRARY)
         {
         return linkedTargetsContent;
         }
@@ -1284,7 +1284,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
       reportError(context, content->GetOriginalExpression(), e.str());
       return std::string();
       }
-    if (gt->GetType() != cmTarget::OBJECT_LIBRARY)
+    if (gt->GetType() != cmState::OBJECT_LIBRARY)
       {
       std::ostringstream e;
       e << "Objects of target \"" << tgtName
@@ -1592,7 +1592,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactSonameTag>
                     "for DLL target platforms.");
       return std::string();
       }
-    if(target->GetType() != cmTarget::SHARED_LIBRARY)
+    if(target->GetType() != cmState::SHARED_LIBRARY)
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_SONAME_FILE is allowed only for "
@@ -1632,11 +1632,11 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
       return std::string();
       }
 
-    cmTarget::TargetType targetType = (cmTarget::TargetType)target->GetType();
+    cmState::TargetType targetType = (cmState::TargetType)target->GetType();
 
-    if(targetType != cmTarget::SHARED_LIBRARY &&
-       targetType != cmTarget::MODULE_LIBRARY &&
-       targetType != cmTarget::EXECUTABLE)
+    if(targetType != cmState::SHARED_LIBRARY &&
+       targetType != cmState::MODULE_LIBRARY &&
+       targetType != cmState::EXECUTABLE)
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_PDB_FILE is allowed only for "
@@ -1746,8 +1746,8 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
                     "No target \"" + name + "\"");
       return std::string();
       }
-    if(target->GetType() >= cmTarget::OBJECT_LIBRARY &&
-      target->GetType() != cmTarget::UNKNOWN_LIBRARY)
+    if(target->GetType() >= cmState::OBJECT_LIBRARY &&
+      target->GetType() != cmState::UNKNOWN_LIBRARY)
       {
       ::reportError(context, content->GetOriginalExpression(),
                   "Target \"" + name + "\" is not an executable or library.");
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8c9251b..dce2091 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -155,7 +155,7 @@ struct TagVisitor
     : Data(data), Target(target),
     GlobalGenerator(target->GetLocalGenerator()->GetGlobalGenerator()),
     Header(CM_HEADER_REGEX),
-    IsObjLib(target->GetType() == cmTarget::OBJECT_LIBRARY)
+    IsObjLib(target->GetType() == cmState::OBJECT_LIBRARY)
   {
   }
 
@@ -172,7 +172,7 @@ struct TagVisitor
       {
       DoAccept<IsSameTag<Tag, CustomCommandsTag>::Result>::Do(this->Data, sf);
       }
-    else if(this->Target->GetType() == cmTarget::UTILITY)
+    else if(this->Target->GetType() == cmState::UTILITY)
       {
       DoAccept<IsSameTag<Tag, ExtraSourcesTag>::Result>::Do(this->Data, sf);
       }
@@ -345,7 +345,7 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
 {
   switch(this->GetType())
     {
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       if(this->Target->IsDLLPlatform())
         {
         if(implib)
@@ -365,10 +365,10 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
         // library targets.
         return "LIBRARY";
         }
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       // Static libraries are always treated as archive targets.
       return "ARCHIVE";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       if(implib)
         {
         // Module libraries are always treated as library targets.
@@ -379,7 +379,7 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
         // Module import libraries are treated as archive targets.
         return "LIBRARY";
         }
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       if(implib)
         {
         // Executable import libraries are treated as archive targets.
@@ -852,7 +852,7 @@ const char* cmGeneratorTarget::GetLocationForBuild() const
 bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
                                               const std::string& config) const
 {
-  assert(this->GetType() != cmTarget::INTERFACE_LIBRARY);
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
   std::string config_upper;
   if(!config.empty())
     {
@@ -1042,7 +1042,7 @@ static bool processSources(cmGeneratorTarget const* tgt,
 void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files,
                               const std::string& config) const
 {
-  assert(this->GetType() != cmTarget::INTERFACE_LIBRARY);
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
 
   if (!this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
     {
@@ -1221,7 +1221,7 @@ bool cmGeneratorTarget::HasSOName(const std::string& config) const
 {
   // soname is supported only for shared libraries and modules,
   // and then only when the platform supports an soname flag.
-  return ((this->GetType() == cmTarget::SHARED_LIBRARY) &&
+  return ((this->GetType() == cmState::SHARED_LIBRARY) &&
           !this->GetPropertyAsBool("NO_SONAME") &&
           this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config)));
 }
@@ -1232,9 +1232,9 @@ cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const
 {
   // Only executables and shared libraries can have an rpath and may
   // need relinking.
-  if(this->GetType() != cmTarget::EXECUTABLE &&
-     this->GetType() != cmTarget::SHARED_LIBRARY &&
-     this->GetType() != cmTarget::MODULE_LIBRARY)
+  if(this->GetType() != cmState::EXECUTABLE &&
+     this->GetType() != cmState::SHARED_LIBRARY &&
+     this->GetType() != cmState::MODULE_LIBRARY)
     {
     return false;
     }
@@ -1296,9 +1296,9 @@ cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const
 bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
 {
   // Only certain target types have an rpath.
-  if(!(this->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->GetType() == cmTarget::MODULE_LIBRARY ||
-       this->GetType() == cmTarget::EXECUTABLE))
+  if(!(this->GetType() == cmState::SHARED_LIBRARY ||
+       this->GetType() == cmState::MODULE_LIBRARY ||
+       this->GetType() == cmState::EXECUTABLE))
     {
     return false;
     }
@@ -1363,7 +1363,7 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
 bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName(
                                           const std::string& config) const
 {
-  if(this->IsImported() && this->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->IsImported() && this->GetType() == cmState::SHARED_LIBRARY)
     {
     if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
       {
@@ -1382,7 +1382,7 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
 
   if(!this->IsImported())
     {
-    if(this->GetType() != cmTarget::SHARED_LIBRARY)
+    if(this->GetType() != cmState::SHARED_LIBRARY)
       {
       return false;
       }
@@ -1960,12 +1960,12 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
     return 0;
     }
 
-  if(this->GetType() > cmTarget::OBJECT_LIBRARY)
+  if(this->GetType() > cmState::OBJECT_LIBRARY)
     {
     std::string msg = "cmTarget::GetCompileInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName((cmTarget::TargetType)this->GetType());
+    msg += cmTarget::GetTargetTypeName((cmState::TargetType)this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -2155,7 +2155,7 @@ cmTargetTraceDependencies
   this->CurrentEntry = 0;
 
   // Queue all the source files already specified for the target.
-  if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (target->GetType() != cmState::INTERFACE_LIBRARY)
     {
     std::vector<std::string> configs;
     this->Makefile->GetConfigurations(configs);
@@ -2313,8 +2313,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
     // the fact that the name matched a target was just a coincidence.
     if(cmSystemTools::FileIsFullPath(dep.c_str()))
       {
-      if(t->GetType() >= cmTarget::EXECUTABLE &&
-         t->GetType() <= cmTarget::MODULE_LIBRARY)
+      if(t->GetType() >= cmState::EXECUTABLE &&
+         t->GetType() <= cmState::MODULE_LIBRARY)
         {
         // This is really only for compatibility so we do not need to
         // worry about configuration names and output names.
@@ -2362,7 +2362,7 @@ cmTargetTraceDependencies
     // Check for a target with this name.
     if(cmTarget* t = this->Makefile->FindTargetToUse(command))
       {
-      if(t->GetType() == cmTarget::EXECUTABLE)
+      if(t->GetType() == cmState::EXECUTABLE)
         {
         // The command refers to an executable target built in
         // this project.  Add the target-level dependency to make
@@ -2450,7 +2450,7 @@ void cmGeneratorTarget::TraceDependencies()
   // would find nothing anyway, but when building CMake itself the "install"
   // target command ends up referencing the "cmake" target but we do not
   // really want the dependency because "install" depend on "all" anyway.
-  if(this->GetType() == cmTarget::GLOBAL_TARGET)
+  if(this->GetType() == cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -2498,7 +2498,7 @@ cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang,
 {
   switch(this->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       {
       std::string var = "CMAKE_" + lang + "_CREATE_STATIC_LIBRARY";
       if(this->GetFeatureAsBool(
@@ -2512,11 +2512,11 @@ cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang,
         }
       return var;
       }
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return "CMAKE_" + lang + "_CREATE_SHARED_LIBRARY";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return "CMAKE_" + lang + "_CREATE_SHARED_MODULE";
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return "CMAKE_" + lang + "_LINK_EXECUTABLE";
     default:
       break;
@@ -3041,13 +3041,13 @@ void cmGeneratorTarget::ComputeTargetManifest(
   std::string realName;
   std::string impName;
   std::string pdbName;
-  if(this->GetType() == cmTarget::EXECUTABLE)
+  if(this->GetType() == cmState::EXECUTABLE)
     {
     this->GetExecutableNames(name, realName, impName, pdbName, config);
     }
-  else if(this->GetType() == cmTarget::STATIC_LIBRARY ||
-          this->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GetType() == cmTarget::MODULE_LIBRARY)
+  else if(this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY)
     {
     this->GetLibraryNames(name, soName, realName, impName, pdbName,
                                   config);
@@ -3155,7 +3155,7 @@ cmGeneratorTarget::NormalGetRealName(const std::string& config) const
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     }
 
-  if(this->GetType() == cmTarget::EXECUTABLE)
+  if(this->GetType() == cmState::EXECUTABLE)
     {
     // Compute the real name that will be built.
     std::string name;
@@ -3255,8 +3255,8 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   }
 
   // The import library name.
-  if(this->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GetType() == cmState::SHARED_LIBRARY ||
+     this->GetType() == cmState::MODULE_LIBRARY)
     {
     impName = this->GetFullNameInternal(config, true);
     }
@@ -3294,7 +3294,7 @@ void cmGeneratorTarget::GetExecutableNames(std::string& name,
 #else
   // Check for executable version properties.
   const char* version = this->GetProperty("VERSION");
-  if(this->GetType() != cmTarget::EXECUTABLE || this->Makefile->IsOn("XCODE"))
+  if(this->GetType() != cmState::EXECUTABLE || this->Makefile->IsOn("XCODE"))
     {
     version = 0;
     }
@@ -3350,10 +3350,10 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
                                             std::string& outSuffix) const
 {
   // Use just the target name for non-main target types.
-  if(this->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->GetType() != cmTarget::SHARED_LIBRARY &&
-     this->GetType() != cmTarget::MODULE_LIBRARY &&
-     this->GetType() != cmTarget::EXECUTABLE)
+  if(this->GetType() != cmState::STATIC_LIBRARY &&
+     this->GetType() != cmState::SHARED_LIBRARY &&
+     this->GetType() != cmState::MODULE_LIBRARY &&
+     this->GetType() != cmState::EXECUTABLE)
     {
     outPrefix = "";
     outBase = this->GetName();
@@ -3374,9 +3374,9 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
 
   // The implib option is only allowed for shared libraries, module
   // libraries, and executables.
-  if(this->GetType() != cmTarget::SHARED_LIBRARY &&
-     this->GetType() != cmTarget::MODULE_LIBRARY &&
-     this->GetType() != cmTarget::EXECUTABLE)
+  if(this->GetType() != cmState::SHARED_LIBRARY &&
+     this->GetType() != cmState::MODULE_LIBRARY &&
+     this->GetType() != cmState::EXECUTABLE)
     {
     implib = false;
     }
@@ -3462,7 +3462,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
   // Name shared libraries with their version number on some platforms.
   if(const char* soversion = this->GetProperty("SOVERSION"))
     {
-    if(this->GetType() == cmTarget::SHARED_LIBRARY && !implib &&
+    if(this->GetType() == cmState::SHARED_LIBRARY && !implib &&
        this->Makefile->IsOn("CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION"))
       {
       outBase += "-";
@@ -3657,8 +3657,8 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
 bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::OBJECT_LIBRARY
+      || this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3669,8 +3669,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::OBJECT_LIBRARY
+      || this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3681,8 +3681,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::OBJECT_LIBRARY
+      || this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3693,8 +3693,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMaxProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::OBJECT_LIBRARY
+      || this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -4474,7 +4474,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
 
   // Link interfaces are not supported for executables that do not
   // export symbols.
-  if(this->GetType() == cmTarget::EXECUTABLE &&
+  if(this->GetType() == cmState::EXECUTABLE &&
      !this->Target->IsExecutableWithExports())
     {
     return 0;
@@ -4517,9 +4517,9 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
 {
   if(iface.ExplicitLibraries)
     {
-    if(this->GetType() == cmTarget::SHARED_LIBRARY
-        || this->GetType() == cmTarget::STATIC_LIBRARY
-        || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(this->GetType() == cmState::SHARED_LIBRARY
+        || this->GetType() == cmState::STATIC_LIBRARY
+        || this->GetType() == cmState::INTERFACE_LIBRARY)
       {
       // Shared libraries may have runtime implementation dependencies
       // on other shared libraries that are not in the interface.
@@ -4529,7 +4529,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
         {
         emitted.insert(*li);
         }
-      if (this->GetType() != cmTarget::INTERFACE_LIBRARY)
+      if (this->GetType() != cmState::INTERFACE_LIBRARY)
         {
         cmLinkImplementation const* impl =
             this->GetLinkImplementation(config);
@@ -4541,7 +4541,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
             if(li->Target)
               {
               // This is a runtime dependency on another shared library.
-              if(li->Target->GetType() == cmTarget::SHARED_LIBRARY)
+              if(li->Target->GetType() == cmState::SHARED_LIBRARY)
                 {
                 iface.SharedDeps.push_back(*li);
                 }
@@ -4579,7 +4579,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
       }
     }
 
-  if(this->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GetType() == cmState::STATIC_LIBRARY)
     {
     // Construct the property name suffix for this configuration.
     std::string suffix = "_";
@@ -4623,7 +4623,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
 
   // Link interfaces are not supported for executables that do not
   // export symbols.
-  if(this->GetType() == cmTarget::EXECUTABLE &&
+  if(this->GetType() == cmState::EXECUTABLE &&
      !this->Target->IsExecutableWithExports())
     {
     return 0;
@@ -4697,7 +4697,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(cmTarget::TargetType(this->GetType()));
+    msg += cmTarget::GetTargetTypeName(cmState::TargetType(this->GetType()));
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -4797,14 +4797,14 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
       conf = "";
       }
     }
-  else if(this->GetType() == cmTarget::EXECUTABLE)
+  else if(this->GetType() == cmState::EXECUTABLE)
     {
     // Lookup the output path for executables.
     out = this->Makefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
     }
-  else if(this->GetType() == cmTarget::STATIC_LIBRARY ||
-          this->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GetType() == cmTarget::MODULE_LIBRARY)
+  else if(this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY)
     {
     // Lookup the output path for libraries.
     out = this->Makefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
@@ -4934,7 +4934,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     linkIfaceProp = "INTERFACE_LINK_LIBRARIES";
     explicitLibraries = this->GetProperty(linkIfaceProp);
     }
-  else if(this->GetType() == cmTarget::SHARED_LIBRARY ||
+  else if(this->GetType() == cmState::SHARED_LIBRARY ||
           this->Target->IsExecutableWithExports())
     {
     // CMP0022 OLD behavior is to use LINK_INTERFACE_LIBRARIES if set on a
@@ -4982,8 +4982,8 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   // There is no implicit link interface for executables or modules
   // so if none was explicitly set then there is no link interface.
   if(!explicitLibraries &&
-     (this->GetType() == cmTarget::EXECUTABLE ||
-      (this->GetType() == cmTarget::MODULE_LIBRARY)))
+     (this->GetType() == cmState::EXECUTABLE ||
+      (this->GetType() == cmState::MODULE_LIBRARY)))
     {
     return;
     }
@@ -5445,13 +5445,13 @@ cmGeneratorTarget::FindTargetToLink(std::string const& name) const
   // Skip targets that will not really be linked.  This is probably a
   // name conflict between an external library and an executable
   // within the project.
-  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
+  if(tgt && tgt->GetType() == cmState::EXECUTABLE &&
      !tgt->IsExecutableWithExports())
     {
     tgt = 0;
     }
 
-  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
+  if(tgt && tgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     std::ostringstream e;
     e << "Target \"" << this->GetName() << "\" links to "
@@ -5509,7 +5509,7 @@ bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
 bool cmGeneratorTarget::HasImportLibrary() const
 {
   return (this->Target->IsDLLPlatform() &&
-          (this->GetType() == cmTarget::SHARED_LIBRARY ||
+          (this->GetType() == cmState::SHARED_LIBRARY ||
            this->Target->IsExecutableWithExports()));
 }
 
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 6469294..d6cbf75 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -148,7 +148,7 @@ void cmGhsMultiTargetGenerator::Generate()
     this->WriteCompilerFlags(config, language);
     this->WriteCompilerDefinitions(config, language);
     this->WriteIncludes(config, language);
-    if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+    if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
       {
       this->WriteTargetLinkLibraries();
       }
@@ -191,7 +191,7 @@ GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(
     {
     output = GhsMultiGpj::INTERGRITY_APPLICATION;
     }
-  else if (target->GetType() == cmTarget::STATIC_LIBRARY)
+  else if (target->GetType() == cmState::STATIC_LIBRARY)
     {
     output = GhsMultiGpj::LIBRARY;
     }
@@ -215,13 +215,13 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
   std::string outputDir(this->GetOutputDirectory(config));
   std::string outputFilename(this->GetOutputFilename(config));
 
-  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
     {
     *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
                                    << outputDir << outputFilename << ".a\""
                                    << std::endl;
     }
-  else if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  else if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
     {
     if (notKernel && !this->IsTargetGroup())
       {
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e8be2d6..338f496 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1444,15 +1444,15 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
     for(cmTargets::iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      if (ti->second.GetType() == cmTarget::GLOBAL_TARGET)
+      if (ti->second.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(ti->second.GetType() != cmTarget::EXECUTABLE &&
-         ti->second.GetType() != cmTarget::STATIC_LIBRARY &&
-         ti->second.GetType() != cmTarget::SHARED_LIBRARY &&
-         ti->second.GetType() != cmTarget::MODULE_LIBRARY &&
-         ti->second.GetType() != cmTarget::OBJECT_LIBRARY)
+      if(ti->second.GetType() != cmState::EXECUTABLE &&
+         ti->second.GetType() != cmState::STATIC_LIBRARY &&
+         ti->second.GetType() != cmState::SHARED_LIBRARY &&
+         ti->second.GetType() != cmState::MODULE_LIBRARY &&
+         ti->second.GetType() != cmState::OBJECT_LIBRARY)
         {
         continue;
         }
@@ -1510,14 +1510,14 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
         ti != targets.end(); ++ti)
       {
       cmTarget* t = &ti->second;
-      if (t->GetType() == cmTarget::GLOBAL_TARGET)
+      if (t->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
       t->AppendBuildInterfaceIncludes();
 
-      if (t->GetType() == cmTarget::INTERFACE_LIBRARY)
+      if (t->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
@@ -1650,7 +1650,7 @@ void cmGlobalGenerator::CheckTargetProperties()
     for (cmTargets::iterator l = targets.begin();
          l != targets.end(); l++)
       {
-      if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+      if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
@@ -2058,7 +2058,7 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
 bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
                                    cmGeneratorTarget* target) const
 {
-  if(target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(target->GetType() == cmState::INTERFACE_LIBRARY
       || target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
     {
     // This target is excluded from its directory.
@@ -2519,7 +2519,7 @@ cmTarget cmGlobalGenerator::CreateGlobalTarget(
 {
   // Package
   cmTarget target;
-  target.SetType(cmTarget::GLOBAL_TARGET, name);
+  target.SetType(cmState::GLOBAL_TARGET, name);
   target.SetProperty("EXCLUDE_FROM_ALL","TRUE");
 
   std::vector<std::string> no_outputs;
@@ -2701,7 +2701,7 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
 //----------------------------------------------------------------------------
 bool cmGlobalGenerator::IsRootOnlyTarget(cmTarget* target) const
 {
-  return (target->GetType() == cmTarget::GLOBAL_TARGET ||
+  return (target->GetType() == cmState::GLOBAL_TARGET ||
           target->GetName() == this->GetAllTargetName());
 }
 
@@ -2915,7 +2915,7 @@ void cmGlobalGenerator::WriteSummary()
   for(TargetMap::const_iterator ti =
         this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
     {
-    if ((ti->second)->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if ((ti->second)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index ed36634..4eec3fb 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -72,7 +72,7 @@ void cmGlobalKdevelopGenerator::Generate()
       for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
            ti != targets.end(); ti++)
         {
-        if (ti->second->GetType()==cmTarget::EXECUTABLE)
+        if (ti->second->GetType()==cmState::EXECUTABLE)
           {
           executable = ti->second->GetLocation("");
           break;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 32e6077..064feae 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -926,18 +926,18 @@ cmGlobalNinjaGenerator
   bool realname = target->IsFrameworkOnApple();
 
   switch (target->GetType()) {
-  case cmTarget::EXECUTABLE:
-  case cmTarget::SHARED_LIBRARY:
-  case cmTarget::STATIC_LIBRARY:
-  case cmTarget::MODULE_LIBRARY:
+  case cmState::EXECUTABLE:
+  case cmState::SHARED_LIBRARY:
+  case cmState::STATIC_LIBRARY:
+  case cmState::MODULE_LIBRARY:
     {
     cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
     outputs.push_back(this->ConvertToNinjaPath(
       gtgt->GetFullPath(configName, false, realname)));
     break;
     }
-  case cmTarget::OBJECT_LIBRARY:
-  case cmTarget::UTILITY: {
+  case cmState::OBJECT_LIBRARY:
+  case cmState::UTILITY: {
     std::string path = this->ConvertToNinjaPath(
       target->GetMakefile()->GetCurrentBinaryDirectory());
     if (path.empty() || path == ".")
@@ -950,7 +950,7 @@ cmGlobalNinjaGenerator
     break;
   }
 
-  case cmTarget::GLOBAL_TARGET:
+  case cmState::GLOBAL_TARGET:
     // Always use the target in HOME instead of an unused duplicate in a
     // subdirectory.
     outputs.push_back(target->GetName());
@@ -965,7 +965,7 @@ void
 cmGlobalNinjaGenerator
 ::AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs)
 {
-  if (target->GetType() == cmTarget::GLOBAL_TARGET) {
+  if (target->GetType() == cmState::GLOBAL_TARGET) {
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
     std::set<std::string> const& utils = target->GetUtilities();
@@ -976,7 +976,7 @@ cmGlobalNinjaGenerator
     for (cmTargetDependSet::const_iterator i = targetDeps.begin();
          i != targetDeps.end(); ++i)
       {
-      if ((*i)->GetType() == cmTarget::INTERFACE_LIBRARY)
+      if ((*i)->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index d6f6490..4674fcd 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -428,12 +428,12 @@ void cmGlobalUnixMakefileGenerator3
     for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
          l != lg->GetMakefile()->GetTargets().end(); l++)
       {
-      if((l->second.GetType() == cmTarget::EXECUTABLE) ||
-         (l->second.GetType() == cmTarget::STATIC_LIBRARY) ||
-         (l->second.GetType() == cmTarget::SHARED_LIBRARY) ||
-         (l->second.GetType() == cmTarget::MODULE_LIBRARY) ||
-         (l->second.GetType() == cmTarget::OBJECT_LIBRARY) ||
-         (l->second.GetType() == cmTarget::UTILITY))
+      if((l->second.GetType() == cmState::EXECUTABLE) ||
+         (l->second.GetType() == cmState::STATIC_LIBRARY) ||
+         (l->second.GetType() == cmState::SHARED_LIBRARY) ||
+         (l->second.GetType() == cmState::MODULE_LIBRARY) ||
+         (l->second.GetType() == cmState::OBJECT_LIBRARY) ||
+         (l->second.GetType() == cmState::UTILITY))
         {
         std::string tname = lg->GetRelativeTargetDirectory(l->second);
         tname += "/DependInfo.cmake";
@@ -467,12 +467,12 @@ cmGlobalUnixMakefileGenerator3
     {
     cmGeneratorTarget* gtarget = l->second;
     int type = gtarget->GetType();
-    if((type == cmTarget::EXECUTABLE) ||
-       (type == cmTarget::STATIC_LIBRARY) ||
-       (type == cmTarget::SHARED_LIBRARY) ||
-       (type == cmTarget::MODULE_LIBRARY) ||
-       (type == cmTarget::OBJECT_LIBRARY) ||
-       (type == cmTarget::UTILITY))
+    if((type == cmState::EXECUTABLE) ||
+       (type == cmState::STATIC_LIBRARY) ||
+       (type == cmState::SHARED_LIBRARY) ||
+       (type == cmState::MODULE_LIBRARY) ||
+       (type == cmState::OBJECT_LIBRARY) ||
+       (type == cmState::UTILITY))
       {
       if(gtarget->Target->IsImported())
         {
@@ -645,12 +645,12 @@ cmGlobalUnixMakefileGenerator3
          emitted.insert(name).second &&
          // Handle user targets here.  Global targets are handled in
          // the local generator on a per-directory basis.
-         ((type == cmTarget::EXECUTABLE) ||
-          (type == cmTarget::STATIC_LIBRARY) ||
-          (type == cmTarget::SHARED_LIBRARY) ||
-          (type == cmTarget::MODULE_LIBRARY) ||
-          (type == cmTarget::OBJECT_LIBRARY) ||
-          (type == cmTarget::UTILITY)))
+         ((type == cmState::EXECUTABLE) ||
+          (type == cmState::STATIC_LIBRARY) ||
+          (type == cmState::SHARED_LIBRARY) ||
+          (type == cmState::MODULE_LIBRARY) ||
+          (type == cmState::OBJECT_LIBRARY) ||
+          (type == cmState::UTILITY)))
         {
         // Add a rule to build the target by name.
         lg->WriteDivider(ruleFileStream);
@@ -741,12 +741,12 @@ cmGlobalUnixMakefileGenerator3
     int type = gtarget->GetType();
     std::string name = gtarget->GetName();
     if (!name.empty()
-     && (  (type == cmTarget::EXECUTABLE)
-        || (type == cmTarget::STATIC_LIBRARY)
-        || (type == cmTarget::SHARED_LIBRARY)
-        || (type == cmTarget::MODULE_LIBRARY)
-        || (type == cmTarget::OBJECT_LIBRARY)
-        || (type == cmTarget::UTILITY)))
+     && (  (type == cmState::EXECUTABLE)
+        || (type == cmState::STATIC_LIBRARY)
+        || (type == cmState::SHARED_LIBRARY)
+        || (type == cmState::MODULE_LIBRARY)
+        || (type == cmState::OBJECT_LIBRARY)
+        || (type == cmState::UTILITY)))
       {
       std::string makefileName;
       // Add a rule to build the target by name.
@@ -937,7 +937,7 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
 
       cmLocalGenerator* tlg = gt->GetLocalGenerator();
 
-      if(gt->GetType() == cmTarget::INTERFACE_LIBRARY
+      if(gt->GetType() == cmState::INTERFACE_LIBRARY
           || gt->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
         continue;
@@ -984,7 +984,7 @@ cmGlobalUnixMakefileGenerator3
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
-      if ((*di)->GetType() == cmTarget::INTERFACE_LIBRARY)
+      if ((*di)->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
@@ -1060,7 +1060,7 @@ cmGlobalUnixMakefileGenerator3
     {
     // Create the target-level dependency.
     cmGeneratorTarget const* dep = *i;
-    if (dep->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (dep->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -1105,14 +1105,14 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
       for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
         {
         cmTarget const& target = t->second;
-        cmTarget::TargetType type = target.GetType();
-        if((type == cmTarget::EXECUTABLE) ||
-           (type == cmTarget::STATIC_LIBRARY) ||
-           (type == cmTarget::SHARED_LIBRARY) ||
-           (type == cmTarget::MODULE_LIBRARY) ||
-           (type == cmTarget::OBJECT_LIBRARY) ||
-           (type == cmTarget::GLOBAL_TARGET) ||
-           (type == cmTarget::UTILITY))
+        cmState::TargetType type = target.GetType();
+        if((type == cmState::EXECUTABLE) ||
+           (type == cmState::STATIC_LIBRARY) ||
+           (type == cmState::SHARED_LIBRARY) ||
+           (type == cmState::MODULE_LIBRARY) ||
+           (type == cmState::OBJECT_LIBRARY) ||
+           (type == cmState::GLOBAL_TARGET) ||
+           (type == cmState::UTILITY))
           {
           std::string name = target.GetName();
           if(emittedTargets.insert(name).second)
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index 419bf8a..b9b4fff 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -278,10 +278,10 @@ cmGlobalVisualStudio11Generator::GetInstalledWindowsCESDKs()
 
 //----------------------------------------------------------------------------
 bool
-cmGlobalVisualStudio11Generator::NeedsDeploy(cmTarget::TargetType type) const
+cmGlobalVisualStudio11Generator::NeedsDeploy(cmState::TargetType type) const
 {
-  if((type == cmTarget::EXECUTABLE ||
-      type == cmTarget::SHARED_LIBRARY) &&
+  if((type == cmState::EXECUTABLE ||
+      type == cmState::SHARED_LIBRARY) &&
      (this->SystemIsWindowsPhone ||
       this->SystemIsWindowsStore))
     {
diff --git a/Source/cmGlobalVisualStudio11Generator.h b/Source/cmGlobalVisualStudio11Generator.h
index 9499d80..f3f6b2b 100644
--- a/Source/cmGlobalVisualStudio11Generator.h
+++ b/Source/cmGlobalVisualStudio11Generator.h
@@ -48,7 +48,7 @@ protected:
   static std::set<std::string> GetInstalledWindowsCESDKs();
 
   /** Return true if the configuration needs to be deployed */
-  virtual bool NeedsDeploy(cmTarget::TargetType type) const;
+  virtual bool NeedsDeploy(cmState::TargetType type) const;
 private:
   class Factory;
   friend class Factory;
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index d5e9417..12eccf9 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -224,7 +224,7 @@ void cmGlobalVisualStudio6Generator
       tt != orderedProjectTargets.end(); ++tt)
     {
     cmTarget const* target = (*tt)->Target;
-    if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index b913afc..9bb37ce 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -272,7 +272,7 @@ void cmGlobalVisualStudio71Generator
 // executables to the libraries it uses are also done here
 void cmGlobalVisualStudio71Generator
 ::WriteProjectConfigurations(
-  std::ostream& fout, const std::string& name, cmTarget::TargetType,
+  std::ostream& fout, const std::string& name, cmState::TargetType,
   std::vector<std::string> const& configs,
   const std::set<std::string>& configsPartOfDefaultBuild,
   std::string const& platformMapping)
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index fbb9ecc..7f88e34 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -64,7 +64,7 @@ protected:
                            const std::string& name, const char* path,
                            cmTarget const& t);
   virtual void WriteProjectConfigurations(
-    std::ostream& fout, const std::string& name, cmTarget::TargetType type,
+    std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
     const std::set<std::string>& configsPartOfDefaultBuild,
     const std::string& platformMapping = "");
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 8651e2f..1909f21 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -402,7 +402,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
     cmTarget const* target = (*tt)->Target;
-    if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -442,7 +442,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
     cmTarget const* target = (*tt)->Target;
-    if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -536,7 +536,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends(
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
     cmTarget const* target = (*tt)->Target;
-    if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -762,7 +762,7 @@ cmGlobalVisualStudio7Generator
 // executables to the libraries it uses are also done here
 void cmGlobalVisualStudio7Generator
 ::WriteProjectConfigurations(
-  std::ostream& fout, const std::string& name, cmTarget::TargetType,
+  std::ostream& fout, const std::string& name, cmState::TargetType,
   std::vector<std::string> const& configs,
   const std::set<std::string>& configsPartOfDefaultBuild,
   const std::string& platformMapping)
@@ -1002,7 +1002,7 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
   // if it is a utilitiy target then only make it part of the
   // default build if another target depends on it
   int type = target->GetType();
-  if (type == cmTarget::GLOBAL_TARGET)
+  if (type == cmState::GLOBAL_TARGET)
     {
     // check if INSTALL target is part of default build
     if(target->GetName() == "INSTALL")
@@ -1025,7 +1025,7 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
       }
     return activeConfigs;
     }
-  if(type == cmTarget::UTILITY && !this->IsDependedOn(projectTargets, target))
+  if(type == cmState::UTILITY && !this->IsDependedOn(projectTargets, target))
     {
     return activeConfigs;
     }
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 35575d1..4ef0990 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -128,7 +128,7 @@ protected:
                            const std::string& name, const char* path,
                            cmTarget const&t);
   virtual void WriteProjectConfigurations(
-    std::ostream& fout, const std::string& name, cmTarget::TargetType type,
+    std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
     const std::set<std::string>& configsPartOfDefaultBuild,
     const std::string& platformMapping = "");
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 8cb7d24..0c41964 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -386,7 +386,7 @@ cmGlobalVisualStudio8Generator
 void
 cmGlobalVisualStudio8Generator
 ::WriteProjectConfigurations(
-  std::ostream& fout, const std::string& name, cmTarget::TargetType type,
+  std::ostream& fout, const std::string& name, cmState::TargetType type,
   std::vector<std::string> const& configs,
   const std::set<std::string>& configsPartOfDefaultBuild,
   std::string const& platformMapping)
@@ -423,10 +423,10 @@ cmGlobalVisualStudio8Generator
 
 //----------------------------------------------------------------------------
 bool
-cmGlobalVisualStudio8Generator::NeedsDeploy(cmTarget::TargetType type) const
+cmGlobalVisualStudio8Generator::NeedsDeploy(cmState::TargetType type) const
 {
-  bool needsDeploy = (type == cmTarget::EXECUTABLE ||
-                      type == cmTarget::SHARED_LIBRARY);
+  bool needsDeploy = (type == cmState::EXECUTABLE ||
+                      type == cmState::SHARED_LIBRARY);
   return this->TargetsWindowsCE() && needsDeploy;
 }
 
@@ -448,7 +448,7 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
   for(OrderedTargetDependSet::const_iterator i = depends.begin();
       i != depends.end(); ++i)
     {
-    if((*i)->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if((*i)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -468,7 +468,7 @@ bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
     {
     if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
       {
-      if(depTarget->GetType() != cmTarget::INTERFACE_LIBRARY
+      if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))
         {
         // This utility dependency names an external .vcproj target.
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index 9d6c64f..60c63d1 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -77,14 +77,14 @@ protected:
   bool AddCheckTarget();
 
   /** Return true if the configuration needs to be deployed */
-  virtual bool NeedsDeploy(cmTarget::TargetType type) const;
+  virtual bool NeedsDeploy(cmState::TargetType type) const;
 
   static cmIDEFlagTable const* GetExtraFlagTableVS8();
   virtual void WriteSLNHeader(std::ostream& fout);
   virtual void WriteSolutionConfigurations(
     std::ostream& fout, std::vector<std::string> const& configs);
   virtual void WriteProjectConfigurations(
-    std::ostream& fout, const std::string& name, cmTarget::TargetType type,
+    std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
     const std::set<std::string>& configsPartOfDefaultBuild,
     const std::string& platformMapping = "");
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index fa9c606..a57cef1 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -112,7 +112,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
         for(cmGeneratorTargetsType::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
-          if (t->second->GetType() == cmTarget::GLOBAL_TARGET
+          if (t->second->GetType() == cmState::GLOBAL_TARGET
               || t->first->IsImported())
             {
             continue;
@@ -337,12 +337,12 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
 void cmGlobalVisualStudioGenerator::FollowLinkDepends(
   cmTarget const* target, std::set<cmTarget const*>& linked)
 {
-  if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(target->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
   if(linked.insert(target).second &&
-     target->GetType() == cmTarget::STATIC_LIBRARY)
+     target->GetType() == cmState::STATIC_LIBRARY)
     {
     // Static library targets do not list their link dependencies so
     // we must follow them transitively now.
@@ -387,7 +387,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
 //----------------------------------------------------------------------------
 static bool VSLinkable(cmTarget const* t)
 {
-  return t->IsLinkable() || t->GetType() == cmTarget::OBJECT_LIBRARY;
+  return t->IsLinkable() || t->GetType() == cmState::OBJECT_LIBRARY;
 }
 
 //----------------------------------------------------------------------------
@@ -417,10 +417,10 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // leaving them out for the static library itself but following them
   // transitively for other targets.
 
-  bool allowLinkable = (target.GetType() != cmTarget::STATIC_LIBRARY &&
-                        target.GetType() != cmTarget::SHARED_LIBRARY &&
-                        target.GetType() != cmTarget::MODULE_LIBRARY &&
-                        target.GetType() != cmTarget::EXECUTABLE);
+  bool allowLinkable = (target.GetType() != cmState::STATIC_LIBRARY &&
+                        target.GetType() != cmState::SHARED_LIBRARY &&
+                        target.GetType() != cmState::MODULE_LIBRARY &&
+                        target.GetType() != cmState::EXECUTABLE);
 
   cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
   TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
@@ -429,7 +429,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
   std::set<cmTarget const*> linkDepends;
-  if(target.GetType() != cmTarget::STATIC_LIBRARY)
+  if(target.GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -457,7 +457,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // Collect all targets linked by this target so we can avoid
   // intermediate targets below.
   TargetSet linked;
-  if(target.GetType() != cmTarget::STATIC_LIBRARY)
+  if(target.GetType() != cmState::STATIC_LIBRARY)
     {
     linked = this->GetTargetLinkClosure(&target);
     }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6291796..bc05aea 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -513,7 +513,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       {
       cmTarget& target = l->second;
 
-      if (target.GetType() == cmTarget::GLOBAL_TARGET)
+      if (target.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
@@ -528,12 +528,12 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       // this will make sure that when the next target is built
       // things are up-to-date
       if(!makeHelper.empty() &&
-         (target.GetType() == cmTarget::EXECUTABLE ||
+         (target.GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//          target.GetType() == cmTarget::OBJECT_LIBRARY ||
-          target.GetType() == cmTarget::STATIC_LIBRARY ||
-          target.GetType() == cmTarget::SHARED_LIBRARY ||
-          target.GetType() == cmTarget::MODULE_LIBRARY))
+//          target.GetType() == cmState::OBJECT_LIBRARY ||
+          target.GetType() == cmState::STATIC_LIBRARY ||
+          target.GetType() == cmState::SHARED_LIBRARY ||
+          target.GetType() == cmState::MODULE_LIBRARY))
         {
         makeHelper[makeHelper.size()-1] = // fill placeholder
           this->PostBuildMakeTarget(target.GetName(), "$(CONFIGURATION)");
@@ -549,7 +549,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                                                     dir.c_str());
         }
 
-      if(target.GetType() != cmTarget::INTERFACE_LIBRARY
+      if(target.GetType() != cmState::INTERFACE_LIBRARY
           && !target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
         allbuild->AddUtility(target.GetName());
@@ -1100,13 +1100,13 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       continue;
       }
 
-    if(cmtarget.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
-    if(cmtarget.GetType() == cmTarget::UTILITY ||
-       cmtarget.GetType() == cmTarget::GLOBAL_TARGET)
+    if(cmtarget.GetType() == cmState::UTILITY ||
+       cmtarget.GetType() == cmState::GLOBAL_TARGET)
       {
       cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
       if (!t)
@@ -1366,9 +1366,9 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguages()
 void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
 {
   // This matters only for targets that link.
-  if(cmtarget.GetType() != cmTarget::EXECUTABLE &&
-     cmtarget.GetType() != cmTarget::SHARED_LIBRARY &&
-     cmtarget.GetType() != cmTarget::MODULE_LIBRARY)
+  if(cmtarget.GetType() != cmState::EXECUTABLE &&
+     cmtarget.GetType() != cmState::SHARED_LIBRARY &&
+     cmtarget.GetType() != cmState::MODULE_LIBRARY)
     {
     return;
     }
@@ -1467,7 +1467,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   std::vector<cmCustomCommand> postbuild
     = cmtarget.GetPostBuildCommands();
 
-  if(cmtarget.GetType() == cmTarget::SHARED_LIBRARY &&
+  if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
     !cmtarget.IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
@@ -1786,17 +1786,17 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  if(target.GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(target.GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   std::string defFlags;
-  bool shared = ((target.GetType() == cmTarget::SHARED_LIBRARY) ||
-                 (target.GetType() == cmTarget::MODULE_LIBRARY));
-  bool binary = ((target.GetType() == cmTarget::OBJECT_LIBRARY) ||
-                 (target.GetType() == cmTarget::STATIC_LIBRARY) ||
-                 (target.GetType() == cmTarget::EXECUTABLE) ||
+  bool shared = ((target.GetType() == cmState::SHARED_LIBRARY) ||
+                 (target.GetType() == cmState::MODULE_LIBRARY));
+  bool binary = ((target.GetType() == cmState::OBJECT_LIBRARY) ||
+                 (target.GetType() == cmState::STATIC_LIBRARY) ||
+                 (target.GetType() == cmState::EXECUTABLE) ||
                  shared);
 
   // Compute the compilation flags for each language.
@@ -1858,15 +1858,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   std::string extraLinkOptionsVar;
   std::string extraLinkOptions;
-  if(target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptionsVar = "CMAKE_EXE_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  else if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_SHARED_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmTarget::MODULE_LIBRARY)
+  else if(target.GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS";
     }
@@ -1878,8 +1878,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                configName);
     }
 
-  if(target.GetType() == cmTarget::OBJECT_LIBRARY ||
-     target.GetType() == cmTarget::STATIC_LIBRARY)
+  if(target.GetType() == cmState::OBJECT_LIBRARY ||
+     target.GetType() == cmState::STATIC_LIBRARY)
     {
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
@@ -1969,10 +1969,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Set attributes to specify the proper name for the target.
   std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
-  if(target.GetType() == cmTarget::STATIC_LIBRARY ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY ||
-     target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::STATIC_LIBRARY ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY ||
+     target.GetType() == cmState::EXECUTABLE)
     {
     if(this->XcodeVersion >= 21)
       {
@@ -2000,7 +2000,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     buildSettings->AddAttribute("EXECUTABLE_SUFFIX",
                                 this->CreateString(pnsuffix.c_str()));
     }
-  else if(target.GetType() == cmTarget::OBJECT_LIBRARY)
+  else if(target.GetType() == cmState::OBJECT_LIBRARY)
     {
     pnprefix = "lib";
     pnbase = target.GetName();
@@ -2031,15 +2031,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   // Handle settings for each target type.
   switch(target.GetType())
     {
-    case cmTarget::OBJECT_LIBRARY:
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
+    case cmState::STATIC_LIBRARY:
     {
     buildSettings->AddAttribute("LIBRARY_STYLE",
                                 this->CreateString("STATIC"));
     break;
     }
 
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
     {
     buildSettings->AddAttribute("LIBRARY_STYLE",
                                 this->CreateString("BUNDLE"));
@@ -2098,7 +2098,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
     break;
     }
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
     {
     if(target.GetPropertyAsBool("FRAMEWORK"))
       {
@@ -2135,7 +2135,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                 this->CreateString("DYNAMIC"));
     break;
     }
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
     {
     // Add the flags to create an executable.
     std::string createFlags =
@@ -2327,7 +2327,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Create the INSTALL_PATH attribute.
   std::string install_name_dir;
-  if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir = gtgt->GetInstallNameDirForBuildTree(configName);
@@ -2415,7 +2415,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Runtime version information.
-  if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     int major;
     int minor;
@@ -2550,7 +2550,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   this->XCodeObjectMap[&cmtarget] = target;
 
   // Add source files without build rules for editing convenience.
-  if(cmtarget.GetType() == cmTarget::UTILITY)
+  if(cmtarget.GetType() == cmState::UTILITY)
     {
     std::vector<cmSourceFile*> sources;
     cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
@@ -2627,8 +2627,8 @@ const char*
 cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
 {
   if(this->XcodeVersion >= 60 &&
-     (cmtarget.GetType() == cmTarget::STATIC_LIBRARY ||
-      cmtarget.GetType() == cmTarget::OBJECT_LIBRARY))
+     (cmtarget.GetType() == cmState::STATIC_LIBRARY ||
+      cmtarget.GetType() == cmState::OBJECT_LIBRARY))
     {
     return "OTHER_LIBTOOLFLAGS";
     }
@@ -2643,10 +2643,10 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
 {
   switch(cmtarget.GetType())
     {
-    case cmTarget::OBJECT_LIBRARY:
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "archive.ar";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       if (cmtarget.IsXCTestOnApple())
         return "wrapper.cfbundle";
       else if (cmtarget.IsCFBundleOnApple())
@@ -2654,10 +2654,10 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
       else
         return ((this->XcodeVersion >= 22)?
               "compiled.mach-o.executable" : "compiled.mach-o.dylib");
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
               "wrapper.framework" : "compiled.mach-o.dylib");
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return "compiled.mach-o.executable";
     default: break;
     }
@@ -2669,10 +2669,10 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(cmTarget& cmtarget)
 {
   switch(cmtarget.GetType())
     {
-    case cmTarget::OBJECT_LIBRARY:
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       if (cmtarget.IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
       else if (cmtarget.IsCFBundleOnApple())
@@ -2681,11 +2681,11 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(cmTarget& cmtarget)
         return ((this->XcodeVersion >= 22)?
                 "com.apple.product-type.tool" :
                 "com.apple.product-type.library.dynamic");
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
               "com.apple.product-type.framework" :
               "com.apple.product-type.library.dynamic");
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return (cmtarget.GetPropertyAsBool("MACOSX_BUNDLE")?
               "com.apple.product-type.application" :
               "com.apple.product-type.tool");
@@ -2699,7 +2699,7 @@ cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
                                           cmXCodeObject* buildPhases)
 {
-  if(cmtarget.GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
     }
@@ -2734,7 +2734,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
   std::string fullName;
-  if(cmtarget.GetType() == cmTarget::OBJECT_LIBRARY)
+  if(cmtarget.GetType() == cmState::OBJECT_LIBRARY)
     {
     fullName = "lib";
     fullName += cmtarget.GetName();
@@ -2909,7 +2909,7 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(cmtarget->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
@@ -2958,8 +2958,8 @@ void cmGlobalXCodeGenerator
       }
 
     // Skip link information for object libraries.
-    if(cmtarget->GetType() == cmTarget::OBJECT_LIBRARY ||
-       cmtarget->GetType() == cmTarget::STATIC_LIBRARY)
+    if(cmtarget->GetType() == cmState::OBJECT_LIBRARY ||
+       cmtarget->GetType() == cmState::STATIC_LIBRARY)
       {
       continue;
       }
@@ -3024,7 +3024,7 @@ void cmGlobalXCodeGenerator
         linkLibs += this->XCodeEscapePath(li->Value.c_str());
         }
       else if (!li->Target
-          || li->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+          || li->Target->GetType() != cmState::INTERFACE_LIBRARY)
         {
         linkLibs += li->Value;
         }
@@ -3063,11 +3063,11 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
       // groups:
       //
-      if(cmtarget.GetType() == cmTarget::GLOBAL_TARGET)
+      if(cmtarget.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(cmtarget.GetType() == cmTarget::INTERFACE_LIBRARY)
+      if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
@@ -3624,21 +3624,21 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
       cmTarget* t =target->GetTarget();
       cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
 
-      if(t->GetType() == cmTarget::EXECUTABLE ||
+      if(t->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//         t->GetType() == cmTarget::OBJECT_LIBRARY ||
-         t->GetType() == cmTarget::STATIC_LIBRARY ||
-         t->GetType() == cmTarget::SHARED_LIBRARY ||
-         t->GetType() == cmTarget::MODULE_LIBRARY)
+//         t->GetType() == cmState::OBJECT_LIBRARY ||
+         t->GetType() == cmState::STATIC_LIBRARY ||
+         t->GetType() == cmState::SHARED_LIBRARY ||
+         t->GetType() == cmState::MODULE_LIBRARY)
         {
         // Declare an entry point for the target post-build phase.
         makefileStream << this->PostBuildMakeTarget(t->GetName(), *ct)
                        << ":\n";
         }
 
-      if(t->GetType() == cmTarget::EXECUTABLE ||
-         t->GetType() == cmTarget::SHARED_LIBRARY ||
-         t->GetType() == cmTarget::MODULE_LIBRARY)
+      if(t->GetType() == cmState::EXECUTABLE ||
+         t->GetType() == cmState::SHARED_LIBRARY ||
+         t->GetType() == cmState::MODULE_LIBRARY)
         {
         std::string tfull = gt->GetFullPath(configName);
         std::string trel = this->ConvertToRelativeForMake(tfull.c_str());
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index b3cf91e..cc36c62 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -26,13 +26,13 @@ static const char* getShapeForTarget(const cmTarget* target)
 
   switch ( target->GetType() )
     {
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return "house";
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "diamond";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return "polygon";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return "octagon";
     default:
       break;
@@ -582,18 +582,18 @@ bool cmGraphVizWriter::IgnoreThisTarget(const std::string& name)
 }
 
 
-bool cmGraphVizWriter::GenerateForTargetType(cmTarget::TargetType targetType)
+bool cmGraphVizWriter::GenerateForTargetType(cmState::TargetType targetType)
                                                                           const
 {
   switch (targetType)
   {
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return this->GenerateForExecutables;
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return this->GenerateForStaticLibs;
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return this->GenerateForSharedLibs;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return this->GenerateForModuleLibs;
     default:
       break;
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 64de684..0a20e6e 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -62,7 +62,7 @@ protected:
 
   bool IgnoreThisTarget(const std::string& name);
 
-  bool GenerateForTargetType(cmTarget::TargetType targetType) const;
+  bool GenerateForTargetType(cmState::TargetType targetType) const;
 
   std::string GraphType;
   std::string GraphName;
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx
index 1e7258a..c64d128 100644
--- a/Source/cmIncludeExternalMSProjectCommand.cxx
+++ b/Source/cmIncludeExternalMSProjectCommand.cxx
@@ -77,7 +77,7 @@ bool cmIncludeExternalMSProjectCommand
       }
 
     // Create a target instance for this utility.
-    cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY,
+    cmTarget* target=this->Makefile->AddNewTarget(cmState::UTILITY,
                                                   utility_name.c_str());
 
     target->SetProperty("GENERATOR_FILE_NAME", utility_name.c_str());
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 333c2ff..c22edf3 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -383,12 +383,12 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
     if(cmTarget* target=this->Makefile->FindTarget(*targetIt))
       {
       // Found the target.  Check its type.
-      if(target->GetType() != cmTarget::EXECUTABLE &&
-         target->GetType() != cmTarget::STATIC_LIBRARY &&
-         target->GetType() != cmTarget::SHARED_LIBRARY &&
-         target->GetType() != cmTarget::MODULE_LIBRARY &&
-         target->GetType() != cmTarget::OBJECT_LIBRARY &&
-         target->GetType() != cmTarget::INTERFACE_LIBRARY)
+      if(target->GetType() != cmState::EXECUTABLE &&
+         target->GetType() != cmState::STATIC_LIBRARY &&
+         target->GetType() != cmState::SHARED_LIBRARY &&
+         target->GetType() != cmState::MODULE_LIBRARY &&
+         target->GetType() != cmState::OBJECT_LIBRARY &&
+         target->GetType() != cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "TARGETS given target \"" << (*targetIt)
@@ -396,7 +396,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
         this->SetError(e.str());
         return false;
         }
-      else if(target->GetType() == cmTarget::OBJECT_LIBRARY)
+      else if(target->GetType() == cmState::OBJECT_LIBRARY)
         {
         std::ostringstream e;
         e << "TARGETS given OBJECT library \"" << (*targetIt)
@@ -449,7 +449,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
 
     switch(target.GetType())
       {
-      case cmTarget::SHARED_LIBRARY:
+      case cmState::SHARED_LIBRARY:
         {
         // Shared libraries are handled differently on DLL and non-DLL
         // platforms.  All windows platforms are DLL platforms including
@@ -532,7 +532,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         }
         break;
-      case cmTarget::STATIC_LIBRARY:
+      case cmState::STATIC_LIBRARY:
         {
         // Static libraries use ARCHIVE properties.
         if (!archiveArgs.GetDestination().empty())
@@ -550,7 +550,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         }
         break;
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         {
         // Modules use LIBRARY properties.
         if (!libraryArgs.GetDestination().empty())
@@ -571,7 +571,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         }
         break;
-      case cmTarget::EXECUTABLE:
+      case cmState::EXECUTABLE:
         {
         if(target.IsAppBundleOnApple())
           {
@@ -635,7 +635,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         }
         break;
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
           // Nothing to do. An INTERFACE_LIBRARY can be installed, but the
           // only effect of that is to make it exportable. It installs no
           // other files itself.
@@ -654,7 +654,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
     bool createInstallGeneratorsForTargetFileSets = true;
 
     if(target.IsFrameworkOnApple()
-        || target.GetType() == cmTarget::INTERFACE_LIBRARY)
+        || target.GetType() == cmState::INTERFACE_LIBRARY)
       {
       createInstallGeneratorsForTargetFileSets = false;
       }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index a3d2927..66b6fc7 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -94,29 +94,29 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   std::vector<std::string> filesFrom;
   std::vector<std::string> filesTo;
   std::string literal_args;
-  cmTarget::TargetType targetType =
-      static_cast<cmTarget::TargetType>(this->Target->GetType());
+  cmState::TargetType targetType =
+      static_cast<cmState::TargetType>(this->Target->GetType());
   cmInstallType type = cmInstallType();
   switch(targetType)
     {
-    case cmTarget::EXECUTABLE: type = cmInstallType_EXECUTABLE; break;
-    case cmTarget::STATIC_LIBRARY: type = cmInstallType_STATIC_LIBRARY; break;
-    case cmTarget::SHARED_LIBRARY: type = cmInstallType_SHARED_LIBRARY; break;
-    case cmTarget::MODULE_LIBRARY: type = cmInstallType_MODULE_LIBRARY; break;
-    case cmTarget::INTERFACE_LIBRARY:
+    case cmState::EXECUTABLE: type = cmInstallType_EXECUTABLE; break;
+    case cmState::STATIC_LIBRARY: type = cmInstallType_STATIC_LIBRARY; break;
+    case cmState::SHARED_LIBRARY: type = cmInstallType_SHARED_LIBRARY; break;
+    case cmState::MODULE_LIBRARY: type = cmInstallType_MODULE_LIBRARY; break;
+    case cmState::INTERFACE_LIBRARY:
       // Not reachable. We never create a cmInstallTargetGenerator for
       // an INTERFACE_LIBRARY.
       assert(0 && "INTERFACE_LIBRARY targets have no installable outputs.");
       break;
-    case cmTarget::OBJECT_LIBRARY:
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::UNKNOWN_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
+    case cmState::UNKNOWN_LIBRARY:
       this->Target->Target->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR,
         "cmInstallTargetGenerator created with non-installable target.");
       return;
     }
-  if(targetType == cmTarget::EXECUTABLE)
+  if(targetType == cmState::EXECUTABLE)
     {
     // There is a bug in cmInstallCommand if this fails.
     assert(this->NamelinkMode == NamelinkModeNone);
@@ -375,7 +375,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
   cmGeneratorTarget *gtgt = target->GetMakefile()
                                   ->GetGlobalGenerator()
                                   ->GetGeneratorTarget(target);
-  if(target->GetType() == cmTarget::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     std::string targetName;
     std::string targetNameReal;
@@ -542,9 +542,9 @@ cmInstallTargetGenerator
                           std::string const& toDestDirPath)
 {
   if(this->ImportLibrary ||
-     !(this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->Target->GetType() == cmTarget::MODULE_LIBRARY ||
-       this->Target->GetType() == cmTarget::EXECUTABLE))
+     !(this->Target->GetType() == cmState::SHARED_LIBRARY ||
+       this->Target->GetType() == cmState::MODULE_LIBRARY ||
+       this->Target->GetType() == cmState::EXECUTABLE))
     {
     return;
     }
@@ -602,7 +602,7 @@ cmInstallTargetGenerator
 
   // Edit the install_name of the target itself if necessary.
   std::string new_id;
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->Target->GetType() == cmState::SHARED_LIBRARY)
     {
     std::string for_build =
       this->Target->GetInstallNameDirForBuildTree(config);
@@ -813,7 +813,7 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
 
   // don't strip static and import libraries, because it removes the only
   // symbol table they have so you can't link to them anymore
-  if(this->Target->GetType()==cmTarget::STATIC_LIBRARY || this->ImportLibrary)
+  if(this->Target->GetType()==cmState::STATIC_LIBRARY || this->ImportLibrary)
     {
     return;
     }
@@ -844,7 +844,7 @@ cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
                                         const std::string& toDestDirPath)
 {
   // Static libraries need ranlib on this platform.
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->Target->GetType() != cmState::STATIC_LIBRARY)
     {
     return;
     }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7cf0ad0..2a12f2b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -137,7 +137,7 @@ void cmLocalGenerator::TraceDependencies()
       t != targets.end(); ++t)
     {
     if (t->second->Target->IsImported()
-        || t->second->GetType() == cmTarget::INTERFACE_LIBRARY)
+        || t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -472,7 +472,7 @@ void cmLocalGenerator::ComputeTargetManifest()
       t != targets.end(); ++t)
     {
     cmGeneratorTarget& target = *t->second;
-    if (target.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (target.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -1347,12 +1347,12 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
 
   switch(target->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       this->GetStaticLibraryFlags(linkFlags, buildType, target->Target);
       break;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       libraryLinkVariable = "CMAKE_MODULE_LINKER_FLAGS";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       {
       linkFlags = this->Makefile->GetSafeDefinition(libraryLinkVariable);
       linkFlags += " ";
@@ -1404,7 +1404,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
                                 *target, false, false, useWatcomQuote);
       }
       break;
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       {
       linkFlags +=
         this->Makefile->GetSafeDefinition("CMAKE_EXE_LINKER_FLAGS");
@@ -1549,7 +1549,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
     this->Makefile->GetSafeDefinition("CMAKE_LIBRARY_PATH_TERMINATOR");
 
   // Flags to link an executable to shared libraries.
-  if (tgt.GetType() == cmTarget::EXECUTABLE &&
+  if (tgt.GetType() == cmState::EXECUTABLE &&
       this->StateSnapshot.GetState()->
         GetGlobalPropertyAsBool("TARGET_SUPPORTS_SHARED_LIBS"))
     {
@@ -1631,7 +1631,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
   ItemVector const& items = cli.GetItems();
   for(ItemVector::const_iterator li = items.begin(); li != items.end(); ++li)
     {
-    if(li->Target && li->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(li->Target && li->Target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -1817,8 +1817,8 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
     if(cmSystemTools::FileIsFullPath(inName.c_str()))
       {
       std::string tLocation;
-      if(target->GetType() >= cmTarget::EXECUTABLE &&
-         target->GetType() <= cmTarget::MODULE_LIBRARY)
+      if(target->GetType() >= cmState::EXECUTABLE &&
+         target->GetType() <= cmState::MODULE_LIBRARY)
         {
         tLocation = target->GetLocation(config);
         tLocation = cmSystemTools::GetFilenamePath(tLocation);
@@ -1838,23 +1838,23 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
       }
     switch (target->GetType())
       {
-      case cmTarget::EXECUTABLE:
-      case cmTarget::STATIC_LIBRARY:
-      case cmTarget::SHARED_LIBRARY:
-      case cmTarget::MODULE_LIBRARY:
-      case cmTarget::UNKNOWN_LIBRARY:
+      case cmState::EXECUTABLE:
+      case cmState::STATIC_LIBRARY:
+      case cmState::SHARED_LIBRARY:
+      case cmState::MODULE_LIBRARY:
+      case cmState::UNKNOWN_LIBRARY:
         dep = target->GetLocation(config);
         return true;
-      case cmTarget::OBJECT_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
         // An object library has no single file on which to depend.
         // This was listed to get the target-level dependency.
         return false;
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
         // An interface library has no file on which to depend.
         // This was listed to get the target-level dependency.
         return false;
-      case cmTarget::UTILITY:
-      case cmTarget::GLOBAL_TARGET:
+      case cmState::UTILITY:
+      case cmState::GLOBAL_TARGET:
         // A utility target has no file on which to depend.  This was listed
         // only to get the target-level dependency.
         return false;
@@ -2104,8 +2104,8 @@ void cmLocalGenerator
 
   std::string warnCMP0063;
   std::string *pWarnCMP0063 = 0;
-  if (target->GetType() != cmTarget::SHARED_LIBRARY &&
-      target->GetType() != cmTarget::MODULE_LIBRARY &&
+  if (target->GetType() != cmState::SHARED_LIBRARY &&
+      target->GetType() != cmState::MODULE_LIBRARY &&
       !target->IsExecutableWithExports())
     {
     switch (target->GetPolicyStatusCMP0063())
@@ -2151,8 +2151,8 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
 {
   int targetType = target->GetType();
 
-  bool shared = ((targetType == cmTarget::SHARED_LIBRARY) ||
-                  (targetType == cmTarget::MODULE_LIBRARY));
+  bool shared = ((targetType == cmState::SHARED_LIBRARY) ||
+                  (targetType == cmState::MODULE_LIBRARY));
 
   if (this->GetShouldUseOldFlags(shared, lang))
     {
@@ -2160,7 +2160,7 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
     }
   else
     {
-    if (target->GetType() == cmTarget::OBJECT_LIBRARY)
+    if (target->GetType() == cmState::OBJECT_LIBRARY)
       {
       if (target->GetPropertyAsBool("POSITION_INDEPENDENT_CODE"))
         {
@@ -2234,7 +2234,7 @@ void cmLocalGenerator::AddPositionIndependentFlags(std::string& flags,
 {
   const char* picFlags = 0;
 
-  if(targetType == cmTarget::EXECUTABLE)
+  if(targetType == cmState::EXECUTABLE)
     {
     std::string flagsVar = "CMAKE_";
     flagsVar += lang;
@@ -2512,7 +2512,7 @@ cmLocalGenerator
   cmTargets& tgts = this->Makefile->GetTargets();
   for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -2540,9 +2540,9 @@ cmLocalGenerator
       // Generate the proper install generator for this target type.
       switch(l->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::MODULE_LIBRARY:
           {
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
@@ -2550,7 +2550,7 @@ cmLocalGenerator
           g.Generate(os, config, configurationTypes);
           }
           break;
-        case cmTarget::SHARED_LIBRARY:
+        case cmState::SHARED_LIBRARY:
           {
 #if defined(_WIN32) || defined(__CYGWIN__)
           // Special code to handle DLL.  Install the import library
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 195a1e0..2535d2f 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -31,7 +31,7 @@ void cmLocalGhsMultiGenerator::Generate()
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
     {
-    if (l->second->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (l->second->GetType() == cmState::INTERFACE_LIBRARY
         || l->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 8f7a66f..47c712c 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -77,7 +77,7 @@ void cmLocalNinjaGenerator::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY
         || t->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index e4533cc..5a10d05 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -119,7 +119,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY
         || t->second->Target->IsImported())
       {
       continue;
@@ -180,7 +180,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
       ti != targets.end(); ++ti)
     {
     cmGeneratorTarget* gt = ti->second;
-    if (gt->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (gt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -423,12 +423,12 @@ void cmLocalUnixMakefileGenerator3
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if((t->second->GetType() == cmTarget::EXECUTABLE) ||
-       (t->second->GetType() == cmTarget::STATIC_LIBRARY) ||
-       (t->second->GetType() == cmTarget::SHARED_LIBRARY) ||
-       (t->second->GetType() == cmTarget::MODULE_LIBRARY) ||
-       (t->second->GetType() == cmTarget::OBJECT_LIBRARY) ||
-       (t->second->GetType() == cmTarget::UTILITY))
+    if((t->second->GetType() == cmState::EXECUTABLE) ||
+       (t->second->GetType() == cmState::STATIC_LIBRARY) ||
+       (t->second->GetType() == cmState::SHARED_LIBRARY) ||
+       (t->second->GetType() == cmState::MODULE_LIBRARY) ||
+       (t->second->GetType() == cmState::OBJECT_LIBRARY) ||
+       (t->second->GetType() == cmState::UTILITY))
       {
       if (t->second->Target->IsImported())
         {
@@ -1774,7 +1774,7 @@ void cmLocalUnixMakefileGenerator3
   cmTargets::iterator glIt;
   for ( glIt = targets->begin(); glIt != targets->end(); ++ glIt )
     {
-    if ( glIt->second.GetType() == cmTarget::GLOBAL_TARGET )
+    if ( glIt->second.GetType() == cmState::GLOBAL_TARGET )
       {
       std::string targetString = "Special rule for the target " + glIt->first;
       std::vector<std::string> commands;
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index b043b00..63fc283 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -77,7 +77,7 @@ void cmLocalVisualStudio10Generator::Generate()
   cmTargets &tgts = this->Makefile->GetTargets();
   for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index c620baf..48639a8 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -86,8 +86,8 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
   for(cmTargets::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY
-        || l->second.GetType() == cmTarget::GLOBAL_TARGET)
+    if (l->second.GetType() == cmState::INTERFACE_LIBRARY
+        || l->second.GetType() == cmState::GLOBAL_TARGET)
       {
       continue;
       }
@@ -132,22 +132,22 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
     {
     switch(l->second.GetType())
       {
-      case cmTarget::STATIC_LIBRARY:
-      case cmTarget::OBJECT_LIBRARY:
+      case cmState::STATIC_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
         this->SetBuildType(STATIC_LIBRARY, l->first.c_str(), l->second);
         break;
-      case cmTarget::SHARED_LIBRARY:
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::SHARED_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         this->SetBuildType(DLL, l->first.c_str(), l->second);
         break;
-      case cmTarget::EXECUTABLE:
+      case cmState::EXECUTABLE:
         this->SetBuildType(EXECUTABLE,l->first.c_str(), l->second);
         break;
-      case cmTarget::UTILITY:
-      case cmTarget::GLOBAL_TARGET:
+      case cmState::UTILITY:
+      case cmState::GLOBAL_TARGET:
         this->SetBuildType(UTILITY, l->first.c_str(), l->second);
         break;
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
         continue;
       default:
         cmSystemTools::Error("Bad target type: ", l->first.c_str());
@@ -263,8 +263,8 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // special care for dependencies.  The first rule must depend on all
   // the dependencies of all the rules.  The later rules must each
   // depend only on the previous rule.
-  if ((target.GetType() == cmTarget::UTILITY ||
-      target.GetType() == cmTarget::GLOBAL_TARGET) &&
+  if ((target.GetType() == cmState::UTILITY ||
+      target.GetType() == cmState::GLOBAL_TARGET) &&
       (!target.GetPreBuildCommands().empty() ||
        !target.GetPostBuildCommands().empty()))
     {
@@ -482,8 +482,8 @@ void cmLocalVisualStudio6Generator
       cmSystemTools::ExpandListArgument(dependsValue, depends);
       }
     if (GetVS6TargetName(source) != libName ||
-      target.GetType() == cmTarget::UTILITY ||
-      target.GetType() == cmTarget::GLOBAL_TARGET)
+      target.GetType() == cmState::UTILITY ||
+      target.GetType() == cmState::GLOBAL_TARGET)
       {
       fout << "# Begin Source File\n\n";
 
@@ -804,7 +804,7 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
 
   // VS6 forgets to create the output directory for archives if it
   // differs from the intermediate directory.
-  if(target.GetType() != cmTarget::STATIC_LIBRARY) { return pcc; }
+  if(target.GetType() != cmState::STATIC_LIBRARY) { return pcc; }
 
   cmGeneratorTarget* gt =
     this->GlobalGenerator->GetGeneratorTarget(&target);
@@ -835,7 +835,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
                                               const std::string& configName,
                                               const std::string& /* libName */)
 {
-  if (target.GetType() >= cmTarget::UTILITY )
+  if (target.GetType() >= cmState::UTILITY )
     {
     return "";
     }
@@ -948,8 +948,8 @@ void cmLocalVisualStudio6Generator
                  const std::string& libName, cmTarget &target,
                  std::vector<cmSourceGroup> &)
 {
-  bool targetBuilds = (target.GetType() >= cmTarget::EXECUTABLE &&
-                       target.GetType() <= cmTarget::MODULE_LIBRARY);
+  bool targetBuilds = (target.GetType() >= cmState::EXECUTABLE &&
+                       target.GetType() <= cmState::MODULE_LIBRARY);
 #ifdef CM_USE_OLD_VS6
   // Lookup the library and executable output directories.
   std::string libPath;
@@ -1108,12 +1108,12 @@ void cmLocalVisualStudio6Generator
     // add libraries to executables and dlls (but never include
     // a library in a library, bad recursion)
     // NEVER LINK STATIC LIBRARIES TO OTHER STATIC LIBRARIES
-    if ((target.GetType() != cmTarget::SHARED_LIBRARY
-         && target.GetType() != cmTarget::STATIC_LIBRARY
-         && target.GetType() != cmTarget::MODULE_LIBRARY) ||
-        (target.GetType()==cmTarget::SHARED_LIBRARY
+    if ((target.GetType() != cmState::SHARED_LIBRARY
+         && target.GetType() != cmState::STATIC_LIBRARY
+         && target.GetType() != cmState::MODULE_LIBRARY) ||
+        (target.GetType()==cmState::SHARED_LIBRARY
          && libName != GetVS6TargetName(j->first)) ||
-        (target.GetType()==cmTarget::MODULE_LIBRARY
+        (target.GetType()==cmState::MODULE_LIBRARY
          && libName != GetVS6TargetName(j->first)))
       {
       // Compute the proper name to use to link this library.
@@ -1195,7 +1195,7 @@ void cmLocalVisualStudio6Generator
   std::string extraLinkOptionsRelease;
   std::string extraLinkOptionsMinSizeRel;
   std::string extraLinkOptionsRelWithDebInfo;
-  if(target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
@@ -1208,7 +1208,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
@@ -1221,7 +1221,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
@@ -1313,9 +1313,9 @@ void cmLocalVisualStudio6Generator
 
   // Compute version number information.
   std::string targetVersionFlag;
-  if(target.GetType() == cmTarget::EXECUTABLE ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::EXECUTABLE ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY)
     {
     int major;
     int minor;
@@ -1332,10 +1332,10 @@ void cmLocalVisualStudio6Generator
   std::string outputNameRelease = outputName;
   std::string outputNameMinSizeRel = outputName;
   std::string outputNameRelWithDebInfo = outputName;
-  if(target.GetType() == cmTarget::EXECUTABLE ||
-     target.GetType() == cmTarget::STATIC_LIBRARY ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::EXECUTABLE ||
+     target.GetType() == cmState::STATIC_LIBRARY ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY)
     {
     outputName = gt->GetFullName();
     outputNameDebug = gt->GetFullName("Debug");
@@ -1343,7 +1343,7 @@ void cmLocalVisualStudio6Generator
     outputNameMinSizeRel = gt->GetFullName("MinSizeRel");
     outputNameRelWithDebInfo = gt->GetFullName("RelWithDebInfo");
     }
-  else if(target.GetType() == cmTarget::OBJECT_LIBRARY)
+  else if(target.GetType() == cmState::OBJECT_LIBRARY)
     {
     outputName = target.GetName();
     outputName += ".lib";
@@ -1359,10 +1359,10 @@ void cmLocalVisualStudio6Generator
   std::string outputDirRelease;
   std::string outputDirMinSizeRel;
   std::string outputDirRelWithDebInfo;
-  if(target.GetType() == cmTarget::EXECUTABLE ||
-     target.GetType() == cmTarget::STATIC_LIBRARY ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::EXECUTABLE ||
+     target.GetType() == cmState::STATIC_LIBRARY ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY)
     {
 #ifdef CM_USE_OLD_VS6
     outputDirOld =
@@ -1382,7 +1382,7 @@ void cmLocalVisualStudio6Generator
         removeQuotes(this->ConvertToOutputFormat(
                  gt->GetDirectory("RelWithDebInfo").c_str(), SHELL));
     }
-  else if(target.GetType() == cmTarget::OBJECT_LIBRARY)
+  else if(target.GetType() == cmState::OBJECT_LIBRARY)
     {
     std::string outputDir = cmake::GetCMakeFilesDirectoryPostSlash();
     outputDirDebug = outputDir + "Debug";
@@ -1396,9 +1396,9 @@ void cmLocalVisualStudio6Generator
   std::string optionsRelease;
   std::string optionsMinSizeRel;
   std::string optionsRelWithDebInfo;
-  if(target.GetType() == cmTarget::EXECUTABLE ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::EXECUTABLE ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsDebug =
       extraLinkOptions + " " + extraLinkOptionsDebug;
@@ -1424,9 +1424,9 @@ void cmLocalVisualStudio6Generator
   std::string targetImplibFlagRelease;
   std::string targetImplibFlagMinSizeRel;
   std::string targetImplibFlagRelWithDebInfo;
-  if(target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY ||
-     target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY ||
+     target.GetType() == cmState::EXECUTABLE)
     {
     std::string fullPathImpDebug = gt->GetDirectory("Debug", true);
     std::string fullPathImpRelease = gt->GetDirectory("Release", true);
@@ -1494,7 +1494,7 @@ void cmLocalVisualStudio6Generator
   std::string staticLibOptionsRelease;
   std::string staticLibOptionsMinSizeRel;
   std::string staticLibOptionsRelWithDebInfo;
-  if(target.GetType() == cmTarget::STATIC_LIBRARY )
+  if(target.GetType() == cmState::STATIC_LIBRARY )
     {
     const char *libflagsGlobal =
       this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS");
@@ -1567,8 +1567,8 @@ void cmLocalVisualStudio6Generator
                                  libnameExports.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
                                  mfcFlag);
-    if(target.GetType() == cmTarget::STATIC_LIBRARY ||
-       target.GetType() == cmTarget::OBJECT_LIBRARY)
+    if(target.GetType() == cmState::STATIC_LIBRARY ||
+       target.GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "CM_STATIC_LIB_ARGS_DEBUG",
                                    staticLibOptionsDebug.c_str());
@@ -1674,7 +1674,7 @@ void cmLocalVisualStudio6Generator
                     (exePath.c_str(), SHELL)).c_str());
 #endif
 
-    if(targetBuilds || target.GetType() == cmTarget::OBJECT_LIBRARY)
+    if(targetBuilds || target.GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "OUTPUT_DIRECTORY_DEBUG",
                                    outputDirDebug.c_str());
@@ -1698,8 +1698,8 @@ void cmLocalVisualStudio6Generator
       = this->Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
     cmSystemTools::ReplaceString(line, "DEBUG_POSTFIX",
                                  debugPostfix?debugPostfix:"");
-    if(target.GetType() >= cmTarget::EXECUTABLE &&
-       target.GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(target.GetType() >= cmState::EXECUTABLE &&
+       target.GetType() <= cmState::OBJECT_LIBRARY)
       {
       // store flags for each configuration
       std::string flags = " ";
@@ -1899,7 +1899,7 @@ void cmLocalVisualStudio6Generator
         this->ConvertToOutputFormat(l->Value.c_str(), SHELL);
       }
     else if (!l->Target
-        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->Target->GetType() != cmState::INTERFACE_LIBRARY)
       {
       options += l->Value;
       }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 82b18c6..e891c33 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -71,7 +71,7 @@ void cmLocalVisualStudio7Generator::AddHelperCommands()
 
   for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
     {
-    if(l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -106,7 +106,7 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules()
       // Add the rule to targets that need it.
       for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
         {
-        if (l->second.GetType() == cmTarget::GLOBAL_TARGET)
+        if (l->second.GetType() == cmState::GLOBAL_TARGET)
           {
           continue;
           }
@@ -131,7 +131,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       l != tgts.end(); l++)
     {
     cmTarget& tgt = l->second;
-    if(tgt.GetType() == cmTarget::GLOBAL_TARGET)
+    if(tgt.GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
       cmCustomCommandLine force_command;
@@ -182,7 +182,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
   for(cmTargets::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    if(l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -672,22 +672,22 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
   switch(target.GetType())
     {
-    case cmTarget::OBJECT_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
       targetBuilds = false; // no manifest tool for object library
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       projectType = "typeStaticLibrary";
       configType = "4";
       break;
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       projectType = "typeDynamicLibrary";
       configType = "2";
       break;
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       configType = "1";
       break;
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
       configType = "10";
     default:
       targetBuilds = false;
@@ -788,10 +788,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target.GetType() < cmTarget::UTILITY)
+  if (target.GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target.GetType() == cmTarget::OBJECT_LIBRARY?
+      target.GetType() == cmState::OBJECT_LIBRARY?
       intermediateDir : gt->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
@@ -882,7 +882,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target.GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(target.GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
     std::string pdb = gt->GetCompilePDBPath(configName);
@@ -1045,21 +1045,21 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     static_cast<cmGlobalVisualStudio7Generator*>(this->GlobalGenerator);
   std::string temp;
   std::string extraLinkOptions;
-  if(target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_EXE_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_SHARED_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS")
@@ -1099,7 +1099,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
   cmGeneratorTarget* gt =
     this->GlobalGenerator->GetGeneratorTarget(&target);
 
-  if (target.GetType() == cmTarget::SHARED_LIBRARY &&
+  if (target.GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -1109,9 +1109,9 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     }
   switch(target.GetType())
     {
-    case cmTarget::UNKNOWN_LIBRARY:
+    case cmState::UNKNOWN_LIBRARY:
       break;
-    case cmTarget::OBJECT_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
       {
       std::string libpath = this->GetTargetDirectory(target);
       libpath += "/";
@@ -1127,7 +1127,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
            << this->ConvertToXMLOutputPathSingle(libpath.c_str()) << "\"/>\n";
       break;
       }
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
     {
     std::string targetNameFull = gt->GetFullName(configName);
     std::string libpath = gt->GetDirectory(configName);
@@ -1161,8 +1161,8 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
          << this->ConvertToXMLOutputPathSingle(libpath.c_str()) << "\"/>\n";
     break;
     }
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
     {
     std::string targetName;
     std::string targetNameSO;
@@ -1260,7 +1260,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     fout << "/>\n";
     }
     break;
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
     {
     std::string targetName;
     std::string targetNameFull;
@@ -1374,9 +1374,9 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"/>\n";
     break;
     }
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::INTERFACE_LIBRARY:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
+    case cmState::INTERFACE_LIBRARY:
       break;
     }
 }
@@ -1408,7 +1408,7 @@ cmLocalVisualStudio7GeneratorInternals
       fout << lg->ConvertToXMLOutputPath(rel.c_str()) << " ";
       }
     else if (!l->Target
-        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->Target->GetType() != cmState::INTERFACE_LIBRARY)
       {
       fout << l->Value << " ";
       }
@@ -1775,8 +1775,8 @@ bool cmLocalVisualStudio7Generator
     std::string source = (*sf)->GetFullPath();
     FCInfo fcinfo(this, target, *(*sf), configs);
 
-    if (source != libName || target.GetType() == cmTarget::UTILITY ||
-      target.GetType() == cmTarget::GLOBAL_TARGET )
+    if (source != libName || target.GetType() == cmState::UTILITY ||
+      target.GetType() == cmState::GLOBAL_TARGET )
       {
       fout << "\t\t\t<File\n";
       std::string d = this->ConvertToXMLOutputPathSingle(source.c_str());
@@ -2026,7 +2026,7 @@ void cmLocalVisualStudio7Generator
                     cmTarget &target,
                     const std::string& /*libName*/)
 {
-  if (target.GetType() > cmTarget::GLOBAL_TARGET)
+  if (target.GetType() > cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -2043,7 +2043,7 @@ void cmLocalVisualStudio7Generator
   tool = this->FortranProject? "VFPreLinkEventTool":"VCPreLinkEventTool";
   event.Start(tool);
   bool addedPrelink = false;
-  if (target.GetType() == cmTarget::SHARED_LIBRARY &&
+  if (target.GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2124,30 +2124,30 @@ cmLocalVisualStudio7Generator
   const char* projectType = 0;
   switch(target.GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       projectType = "typeStaticLibrary";
       if(keyword)
         {
         keyword = "Static Library";
         }
       break;
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       projectType = "typeDynamicLibrary";
       if(!keyword)
         {
         keyword = "Dll";
         }
       break;
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       if(!keyword)
         {
         keyword = "Console Application";
         }
       projectType = 0;
       break;
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
     default:
       break;
     }
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index c830a82..2f44fb7 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -89,8 +89,8 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
   // If an executable exports symbols then VS wants to create an
   // import library but forgets to create the output directory.
   // The Intel Fortran plugin always forgets to the directory.
-  if(target.GetType() != cmTarget::EXECUTABLE &&
-     !(isFortran && target.GetType() == cmTarget::SHARED_LIBRARY))
+  if(target.GetType() != cmState::EXECUTABLE &&
+     !(isFortran && target.GetType() == cmState::SHARED_LIBRARY))
     { return pcc; }
   cmGeneratorTarget* gt =
       this->GetGlobalGenerator()->GetGeneratorTarget(&target);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d62c5c4..8f656b4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -759,7 +759,7 @@ void cmMakefile::ConfigureFinalPass()
   for (cmTargets::iterator l = this->Targets.begin();
        l != this->Targets.end(); l++)
     {
-    if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -810,7 +810,7 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target,
       return;
     }
 
-  if(ti->second.GetType() == cmTarget::OBJECT_LIBRARY)
+  if(ti->second.GetType() == cmState::OBJECT_LIBRARY)
     {
     std::ostringstream e;
     e << "Target \"" << target << "\" is an OBJECT library "
@@ -818,7 +818,7 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target,
     this->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
-  if(ti->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(ti->second.GetType() == cmState::INTERFACE_LIBRARY)
     {
     std::ostringstream e;
     e << "Target \"" << target << "\" is an INTERFACE library "
@@ -1184,7 +1184,7 @@ cmMakefile::AddUtilityCommand(const std::string& utilityName,
                               bool uses_terminal)
 {
   // Create a target instance for this utility.
-  cmTarget* target = this->AddNewTarget(cmTarget::UTILITY, utilityName);
+  cmTarget* target = this->AddNewTarget(cmState::UTILITY, utilityName);
   if (excludeFromAll)
     {
     target->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
@@ -1419,9 +1419,9 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
     if(tgt)
       {
       // if it is not a static or shared library then you can not link to it
-      if(!((tgt->GetType() == cmTarget::STATIC_LIBRARY) ||
-           (tgt->GetType() == cmTarget::SHARED_LIBRARY) ||
-           (tgt->GetType() == cmTarget::INTERFACE_LIBRARY) ||
+      if(!((tgt->GetType() == cmState::STATIC_LIBRARY) ||
+           (tgt->GetType() == cmState::SHARED_LIBRARY) ||
+           (tgt->GetType() == cmState::INTERFACE_LIBRARY) ||
            tgt->IsExecutableWithExports()))
         {
         std::ostringstream e;
@@ -2018,9 +2018,9 @@ void cmMakefile::AddGlobalLinkInformation(const std::string& name,
   // for these targets do not add anything
   switch(target.GetType())
     {
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::INTERFACE_LIBRARY:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
+    case cmState::INTERFACE_LIBRARY:
       return;
     default:;
     }
@@ -2057,20 +2057,20 @@ void cmMakefile::AddAlias(const std::string& lname, cmTarget *tgt)
 }
 
 cmTarget* cmMakefile::AddLibrary(const std::string& lname,
-                            cmTarget::TargetType type,
+                            cmState::TargetType type,
                             const std::vector<std::string> &srcs,
                             bool excludeFromAll)
 {
   // wrong type ? default to STATIC
-  if (    (type != cmTarget::STATIC_LIBRARY)
-       && (type != cmTarget::SHARED_LIBRARY)
-       && (type != cmTarget::MODULE_LIBRARY)
-       && (type != cmTarget::OBJECT_LIBRARY)
-       && (type != cmTarget::INTERFACE_LIBRARY))
+  if (    (type != cmState::STATIC_LIBRARY)
+       && (type != cmState::SHARED_LIBRARY)
+       && (type != cmState::MODULE_LIBRARY)
+       && (type != cmState::OBJECT_LIBRARY)
+       && (type != cmState::INTERFACE_LIBRARY))
     {
     this->IssueMessage(cmake::INTERNAL_ERROR,
                        "cmMakefile::AddLibrary given invalid target type.");
-    type = cmTarget::STATIC_LIBRARY;
+    type = cmState::STATIC_LIBRARY;
     }
 
   cmTarget* target = this->AddNewTarget(type, lname);
@@ -2091,7 +2091,7 @@ cmTarget* cmMakefile::AddExecutable(const char *exeName,
                                     const std::vector<std::string> &srcs,
                                     bool excludeFromAll)
 {
-  cmTarget* target = this->AddNewTarget(cmTarget::EXECUTABLE, exeName);
+  cmTarget* target = this->AddNewTarget(cmState::EXECUTABLE, exeName);
   if(excludeFromAll)
     {
     target->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
@@ -2103,7 +2103,7 @@ cmTarget* cmMakefile::AddExecutable(const char *exeName,
 
 //----------------------------------------------------------------------------
 cmTarget*
-cmMakefile::AddNewTarget(cmTarget::TargetType type, const std::string& name)
+cmMakefile::AddNewTarget(cmState::TargetType type, const std::string& name)
 {
   cmTargets::iterator it =
     this->Targets.insert(cmTargets::value_type(name, cmTarget())).first;
@@ -2299,8 +2299,8 @@ void cmMakefile::ExpandVariablesCMP0019()
        l != this->Targets.end(); ++l)
     {
     cmTarget &t = l->second;
-    if (t.GetType() == cmTarget::INTERFACE_LIBRARY
-        || t.GetType() == cmTarget::GLOBAL_TARGET)
+    if (t.GetType() == cmState::INTERFACE_LIBRARY
+        || t.GetType() == cmState::GLOBAL_TARGET)
       {
       continue;
       }
@@ -4178,7 +4178,7 @@ void cmMakefile::RaiseScope(const std::string& var, const char *varDef)
 //----------------------------------------------------------------------------
 cmTarget*
 cmMakefile::AddImportedTarget(const std::string& name,
-                              cmTarget::TargetType type,
+                              cmState::TargetType type,
                               bool global)
 {
   // Create the target.
@@ -4279,7 +4279,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
       // The conflict is with a non-imported target.
       // Allow this if the user has requested support.
       cmake* cm = this->GetCMakeInstance();
-      if(isCustom && existing->GetType() == cmTarget::UTILITY &&
+      if(isCustom && existing->GetType() == cmState::UTILITY &&
          this != existing->GetMakefile() &&
          cm->GetState()
            ->GetGlobalPropertyAsBool("ALLOW_DUPLICATE_CUSTOM_TARGETS"))
@@ -4295,22 +4295,22 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
         << "The existing target is ";
       switch(existing->GetType())
         {
-        case cmTarget::EXECUTABLE:
+        case cmState::EXECUTABLE:
           e << "an executable ";
           break;
-        case cmTarget::STATIC_LIBRARY:
+        case cmState::STATIC_LIBRARY:
           e << "a static library ";
           break;
-        case cmTarget::SHARED_LIBRARY:
+        case cmState::SHARED_LIBRARY:
           e << "a shared library ";
           break;
-        case cmTarget::MODULE_LIBRARY:
+        case cmState::MODULE_LIBRARY:
           e << "a module library ";
           break;
-        case cmTarget::UTILITY:
+        case cmState::UTILITY:
           e << "a custom target ";
           break;
-        case cmTarget::INTERFACE_LIBRARY:
+        case cmState::INTERFACE_LIBRARY:
           e << "an interface library ";
           break;
         default: break;
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index d9d5a8a..4215b72 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -172,10 +172,10 @@ public:
 
   /** Create a new imported target with the name and type given.  */
   cmTarget* AddImportedTarget(const std::string& name,
-                              cmTarget::TargetType type,
+                              cmState::TargetType type,
                               bool global);
 
-  cmTarget* AddNewTarget(cmTarget::TargetType type, const std::string& name);
+  cmTarget* AddNewTarget(cmState::TargetType type, const std::string& name);
 
   /**
    * Add an executable to the build.
@@ -281,7 +281,7 @@ public:
   /**
    * Set the name of the library.
    */
-  cmTarget* AddLibrary(const std::string& libname, cmTarget::TargetType type,
+  cmTarget* AddLibrary(const std::string& libname, cmState::TargetType type,
                   const std::vector<std::string> &srcs,
                   bool excludeFromAll = false);
   void AddAlias(const std::string& libname, cmTarget *tgt);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index cb19d9b..0b38656 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -26,7 +26,7 @@ cmMakefileLibraryTargetGenerator
   cmMakefileTargetGenerator(target)
 {
   this->CustomCommandDriver = OnDepends;
-  if (this->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmState::INTERFACE_LIBRARY)
     {
     this->GeneratorTarget->GetLibraryNames(
       this->TargetNameOut, this->TargetNameSO, this->TargetNameReal,
@@ -64,10 +64,10 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
   // Write the rule for this target type.
   switch(this->GeneratorTarget->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       this->WriteStaticLibraryRules();
       break;
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       this->WriteSharedLibraryRules(false);
       if(this->GeneratorTarget->NeedRelinkBeforeInstall(this->ConfigName))
         {
@@ -75,7 +75,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
         this->WriteSharedLibraryRules(true);
         }
       break;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       this->WriteModuleLibraryRules(false);
       if(this->GeneratorTarget->NeedRelinkBeforeInstall(this->ConfigName))
         {
@@ -83,7 +83,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
         this->WriteModuleLibraryRules(true);
         }
       break;
-    case cmTarget::OBJECT_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
       this->WriteObjectLibraryRules();
       break;
     default:
@@ -253,8 +253,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   this->LocalGenerator->AppendFlags(linkFlags, extraFlags);
 
   // Add OSX version flags, if any.
-  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
     {
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "COMPATIBILITY", true);
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "CURRENT", false);
@@ -353,13 +353,13 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     buildEcho += linkLanguage;
     switch(this->GeneratorTarget->GetType())
       {
-      case cmTarget::STATIC_LIBRARY:
+      case cmState::STATIC_LIBRARY:
         buildEcho += " static library ";
         break;
-      case cmTarget::SHARED_LIBRARY:
+      case cmState::SHARED_LIBRARY:
         buildEcho += " shared library ";
         break;
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         if (this->Target->IsCFBundleOnApple())
             buildEcho += " CFBundle";
         buildEcho += " shared module ";
@@ -377,10 +377,10 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   const char* forbiddenFlagVar = 0;
   switch(this->GeneratorTarget->GetType())
     {
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS";
       break;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       forbiddenFlagVar = "_CREATE_SHARED_MODULE_FORBIDDEN_FLAGS";
       break;
     default: break;
@@ -429,7 +429,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 #ifdef _WIN32
   // There may be a manifest file for this target.  Add it to the
   // clean set just in case.
-  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmState::STATIC_LIBRARY)
     {
     libCleanFiles.push_back(
       this->Convert((targetFullPath+".manifest").c_str(),
@@ -441,7 +441,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> commands1;
   // Add a command to remove any existing files for this library.
   // for static libs only
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
     {
     this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
                                              *this->Target, "target");
@@ -497,7 +497,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> archiveAppendCommands;
   std::vector<std::string> archiveFinishCommands;
   std::string::size_type archiveCommandLimit = std::string::npos;
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
     {
     haveStaticLibraryRule =
       this->Makefile->GetDefinition(linkRuleVar)? true:false;
@@ -552,7 +552,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Collect up flags to link in needed libraries.
   std::string linkLibs;
-  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmState::STATIC_LIBRARY)
     {
     this->CreateLinkLibs(linkLibs, relink, useResponseFileForLibs, depends,
                          useWatcomQuote);
@@ -566,7 +566,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
                           useWatcomQuote);
 
   // maybe create .def file from list of objects
-  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -667,7 +667,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Compute the directory portion of the install_name setting.
   std::string install_name_dir;
-  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir =
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 9b0e5dd..f3c9b6d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -68,16 +68,16 @@ cmMakefileTargetGenerator::New(cmGeneratorTarget *tgt)
 
   switch (tgt->GetType())
     {
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       result = new cmMakefileExecutableTargetGenerator(tgt);
       break;
-    case cmTarget::STATIC_LIBRARY:
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
-    case cmTarget::OBJECT_LIBRARY:
+    case cmState::STATIC_LIBRARY:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
       result = new cmMakefileLibraryTargetGenerator(tgt);
       break;
-    case cmTarget::UTILITY:
+    case cmState::UTILITY:
       result = new cmMakefileUtilityTargetGenerator(tgt);
       break;
     default:
@@ -542,10 +542,10 @@ cmMakefileTargetGenerator
   std::string targetFullPathReal;
   std::string targetFullPathPDB;
   std::string targetFullPathCompilePDB;
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
-     this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
     {
     targetFullPathReal =
       this->GeneratorTarget->GetFullPath(this->ConfigName, false, true);
@@ -554,7 +554,7 @@ cmMakefileTargetGenerator
     targetFullPathPDB += "/";
     targetFullPathPDB += this->GeneratorTarget->GetPDBName(this->ConfigName);
     }
-  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
     {
     targetFullPathCompilePDB =
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
@@ -1445,7 +1445,7 @@ void cmMakefileTargetGenerator
 ::AppendTargetDepends(std::vector<std::string>& depends)
 {
   // Static libraries never depend on anything for linking.
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
     {
     return;
     }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 02e47bd..b5648fe 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -41,7 +41,7 @@ cmNinjaNormalTargetGenerator(cmGeneratorTarget* target)
   , TargetLinkLanguage("")
 {
   this->TargetLinkLanguage = target->GetLinkerLanguage(this->GetConfigName());
-  if (target->GetType() == cmTarget::EXECUTABLE)
+  if (target->GetType() == cmState::EXECUTABLE)
     this->GetGeneratorTarget()->GetExecutableNames(this->TargetNameOut,
                                this->TargetNameReal,
                                this->TargetNameImport,
@@ -55,7 +55,7 @@ cmNinjaNormalTargetGenerator(cmGeneratorTarget* target)
                             this->TargetNamePDB,
                             GetLocalGenerator()->GetConfigName());
 
-  if(target->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(target->GetType() != cmState::OBJECT_LIBRARY)
     {
     // on Windows the output dir is already needed at compile time
     // ensure the directory exists (OutDir test)
@@ -87,7 +87,7 @@ void cmNinjaNormalTargetGenerator::Generate()
   // Write the build statements
   this->WriteObjectBuildStatements();
 
-  if(this->GetGeneratorTarget()->GetType() == cmTarget::OBJECT_LIBRARY)
+  if(this->GetGeneratorTarget()->GetType() == cmState::OBJECT_LIBRARY)
     {
     this->WriteObjectLibStatement();
     }
@@ -134,16 +134,16 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
 const char *cmNinjaNormalTargetGenerator::GetVisibleTypeName() const
 {
   switch (this->GetGeneratorTarget()->GetType()) {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "static library";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return "shared library";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       if (this->GetTarget()->IsCFBundleOnApple())
         return "CFBundle shared module";
       else
         return "shared module";
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return "executable";
     default:
       return 0;
@@ -157,7 +157,7 @@ cmNinjaNormalTargetGenerator
   return this->TargetLinkLanguage
     + "_"
     + cmTarget::GetTargetTypeName(
-        (cmTarget::TargetType)this->GetGeneratorTarget()->GetType())
+        (cmState::TargetType)this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
     + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
     ;
@@ -167,8 +167,8 @@ void
 cmNinjaNormalTargetGenerator
 ::WriteLinkRule(bool useResponseFile)
 {
-  cmTarget::TargetType targetType =
-      (cmTarget::TargetType)this->GetGeneratorTarget()->GetType();
+  cmState::TargetType targetType =
+      (cmState::TargetType)this->GetGeneratorTarget()->GetType();
   std::string ruleName = this->LanguageLinkerRule();
 
   // Select whether to use a response file for objects.
@@ -242,7 +242,7 @@ cmNinjaNormalTargetGenerator
     vars.Manifests = "$MANIFESTS";
 
     std::string langFlags;
-    if (targetType != cmTarget::EXECUTABLE)
+    if (targetType != cmState::EXECUTABLE)
       {
       langFlags += "$LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS";
       vars.LanguageCompileFlags = langFlags.c_str();
@@ -285,7 +285,7 @@ cmNinjaNormalTargetGenerator
     std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
-    if (targetType == cmTarget::EXECUTABLE)
+    if (targetType == cmState::EXECUTABLE)
       this->GetGlobalGenerator()->AddRule("CMAKE_SYMLINK_EXECUTABLE",
                                           cmakeCommand +
                                           " -E cmake_symlink_executable"
@@ -333,7 +333,7 @@ cmNinjaNormalTargetGenerator
     }
   }
   switch (this->GetGeneratorTarget()->GetType()) {
-    case cmTarget::STATIC_LIBRARY: {
+    case cmState::STATIC_LIBRARY: {
       // We have archive link commands set. First, delete the existing archive.
       {
       std::string cmakeCommand =
@@ -358,9 +358,9 @@ cmNinjaNormalTargetGenerator
       }
       return linkCmds;
     }
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
-    case cmTarget::EXECUTABLE:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
+    case cmState::EXECUTABLE:
       break;
     default:
       assert(0 && "Unexpected target type");
@@ -443,7 +443,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   // Write comments.
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
-  const cmTarget::TargetType targetType = target.GetType();
+  const cmState::TargetType targetType = target.GetType();
   this->GetBuildFileStream()
     << "# Link build statements for "
     << cmTarget::GetTargetTypeName(targetType)
@@ -490,7 +490,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                           &genTarget,
                           useWatcomQuote);
   if(this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS")
-     && target.GetType() == cmTarget::SHARED_LIBRARY)
+     && target.GetType() == cmState::SHARED_LIBRARY)
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
@@ -518,7 +518,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   // Compute architecture specific link flags.  Yes, these go into a different
   // variable for executables, probably due to a mistake made when duplicating
   // code between the Makefile executable and library generators.
-  if (targetType == cmTarget::EXECUTABLE)
+  if (targetType == cmState::EXECUTABLE)
     {
     std::string t = vars["FLAGS"];
     localGen.AddArchitectureFlags(t, &genTarget, TargetLinkLanguage, cfgName);
@@ -538,7 +538,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     vars["SONAME_FLAG"] = mf->GetSONameFlag(this->TargetLinkLanguage);
     vars["SONAME"] = this->TargetNameSO;
-    if (targetType == cmTarget::SHARED_LIBRARY)
+    if (targetType == cmState::SHARED_LIBRARY)
       {
       std::string install_dir =
           this->GetGeneratorTarget()->GetInstallNameDirForBuildTree(cfgName);
@@ -626,7 +626,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // maybe create .def file from list of objects
-  if (target.GetType() == cmTarget::SHARED_LIBRARY &&
+  if (target.GetType() == cmState::SHARED_LIBRARY &&
       this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -734,7 +734,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   if (targetOutput != targetOutputReal && !target.IsFrameworkOnApple())
     {
-    if (targetType == cmTarget::EXECUTABLE)
+    if (targetType == cmState::EXECUTABLE)
       {
       globalGen.WriteBuild(this->GetBuildFileStream(),
                             "Create executable symlink " + targetOutput,
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index ec90ba5..1028196 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -31,17 +31,17 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
 {
   switch (target->GetType())
     {
-      case cmTarget::EXECUTABLE:
-      case cmTarget::SHARED_LIBRARY:
-      case cmTarget::STATIC_LIBRARY:
-      case cmTarget::MODULE_LIBRARY:
-      case cmTarget::OBJECT_LIBRARY:
+      case cmState::EXECUTABLE:
+      case cmState::SHARED_LIBRARY:
+      case cmState::STATIC_LIBRARY:
+      case cmState::MODULE_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
         return new cmNinjaNormalTargetGenerator(target);
 
-      case cmTarget::UTILITY:
+      case cmState::UTILITY:
         return new cmNinjaUtilityTargetGenerator(target);;
 
-      case cmTarget::GLOBAL_TARGET: {
+      case cmState::GLOBAL_TARGET: {
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
@@ -189,8 +189,8 @@ ComputeDefines(cmSourceFile const* source, const std::string& language)
 cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
 {
   // Static libraries never depend on other targets for linking.
-  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
-      this->GeneratorTarget->GetType() == cmTarget::OBJECT_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY ||
+      this->GeneratorTarget->GetType() == cmState::OBJECT_LIBRARY)
     return cmNinjaDeps();
 
   cmComputeLinkInformation* cli =
@@ -283,16 +283,16 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
     {
     std::string pdbPath;
     std::string compilePdbPath;
-    if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
-       this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
-       this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+    if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE ||
+       this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
       {
       pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName());
       pdbPath += "/";
       pdbPath += this->GeneratorTarget->GetPDBName(this->GetConfigName());
       }
-    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
       {
       compilePdbPath =
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
@@ -481,7 +481,7 @@ cmNinjaTargetGenerator
   this->GetBuildFileStream()
     << "# Object build statements for "
     << cmTarget::GetTargetTypeName(
-         (cmTarget::TargetType)this->GetGeneratorTarget()->GetType())
+         (cmState::TargetType)this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmState.h b/Source/cmState.h
index f2c0c6f..0fe4812 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -181,6 +181,12 @@ public:
     friend class Snapshot;
   };
 
+  enum TargetType { EXECUTABLE, STATIC_LIBRARY,
+                    SHARED_LIBRARY, MODULE_LIBRARY,
+                    OBJECT_LIBRARY, UTILITY, GLOBAL_TARGET,
+                    INTERFACE_LIBRARY,
+                    UNKNOWN_LIBRARY};
+
   Snapshot CreateBaseSnapshot();
   Snapshot
   CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0128c78..eeced8d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -33,27 +33,27 @@
 #define UNORDERED_SET std::set
 #endif
 
-const char* cmTarget::GetTargetTypeName(TargetType targetType)
+const char* cmTarget::GetTargetTypeName(cmState::TargetType targetType)
 {
   switch( targetType )
     {
-      case cmTarget::STATIC_LIBRARY:
+      case cmState::STATIC_LIBRARY:
         return "STATIC_LIBRARY";
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         return "MODULE_LIBRARY";
-      case cmTarget::SHARED_LIBRARY:
+      case cmState::SHARED_LIBRARY:
         return "SHARED_LIBRARY";
-      case cmTarget::OBJECT_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
         return "OBJECT_LIBRARY";
-      case cmTarget::EXECUTABLE:
+      case cmState::EXECUTABLE:
         return "EXECUTABLE";
-      case cmTarget::UTILITY:
+      case cmState::UTILITY:
         return "UTILITY";
-      case cmTarget::GLOBAL_TARGET:
+      case cmState::GLOBAL_TARGET:
         return "GLOBAL_TARGET";
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
         return "INTERFACE_LIBRARY";
-      case cmTarget::UNKNOWN_LIBRARY:
+      case cmState::UNKNOWN_LIBRARY:
         return "UNKNOWN_LIBRARY";
     }
   assert(0 && "Unexpected target type");
@@ -93,13 +93,13 @@ cmTarget::cmTarget()
   this->BuildInterfaceIncludesAppended = false;
 }
 
-void cmTarget::SetType(TargetType type, const std::string& name)
+void cmTarget::SetType(cmState::TargetType type, const std::string& name)
 {
   this->Name = name;
   // only add dependency information for library targets
   this->TargetTypeValue = type;
-  if(this->TargetTypeValue >= STATIC_LIBRARY
-     && this->TargetTypeValue <= MODULE_LIBRARY)
+  if(this->TargetTypeValue >= cmState::STATIC_LIBRARY
+     && this->TargetTypeValue <= cmState::MODULE_LIBRARY)
     {
     this->RecordDependencies = true;
     }
@@ -129,7 +129,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
   this->IsApple = this->Makefile->IsOn("APPLE");
 
   // Setup default property values.
-  if (this->GetType() != INTERFACE_LIBRARY && this->GetType() != UTILITY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY
+      && this->GetType() != cmState::UTILITY)
     {
     this->SetPropertyDefault("ANDROID_API", 0);
     this->SetPropertyDefault("ANDROID_API_MIN", 0);
@@ -192,7 +193,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
   mf->GetConfigurations(configNames);
 
   // Setup per-configuration property default values.
-  if (this->GetType() != UTILITY)
+  if (this->GetType() != cmState::UTILITY)
     {
     const char* configProps[] = {
       "ARCHIVE_OUTPUT_DIRECTORY_",
@@ -208,7 +209,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
       std::string configUpper = cmSystemTools::UpperCase(*ci);
       for(const char** p = configProps; *p; ++p)
         {
-        if (this->TargetTypeValue == INTERFACE_LIBRARY
+        if (this->TargetTypeValue == cmState::INTERFACE_LIBRARY
             && strcmp(*p, "MAP_IMPORTED_CONFIG_") != 0)
           {
           continue;
@@ -223,8 +224,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
       // compatibility with previous CMake versions in which executables
       // did not support this variable.  Projects may still specify the
       // property directly.
-      if(this->TargetTypeValue != cmTarget::EXECUTABLE
-          && this->TargetTypeValue != cmTarget::INTERFACE_LIBRARY)
+      if(this->TargetTypeValue != cmState::EXECUTABLE
+          && this->TargetTypeValue != cmState::INTERFACE_LIBRARY)
         {
         std::string property = cmSystemTools::UpperCase(*ci);
         property += "_POSTFIX";
@@ -271,30 +272,32 @@ void cmTarget::SetMakefile(cmMakefile* mf)
           parentOptionsBts.begin(), parentOptionsBts.end());
     }
 
-  if (this->GetType() != INTERFACE_LIBRARY && this->GetType() != UTILITY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY
+      && this->GetType() != cmState::UTILITY)
     {
     this->SetPropertyDefault("C_VISIBILITY_PRESET", 0);
     this->SetPropertyDefault("CXX_VISIBILITY_PRESET", 0);
     this->SetPropertyDefault("VISIBILITY_INLINES_HIDDEN", 0);
     }
 
-  if(this->TargetTypeValue == cmTarget::EXECUTABLE)
+  if(this->TargetTypeValue == cmState::EXECUTABLE)
     {
     this->SetPropertyDefault("ANDROID_GUI", 0);
     this->SetPropertyDefault("CROSSCOMPILING_EMULATOR", 0);
     this->SetPropertyDefault("ENABLE_EXPORTS", 0);
     }
-  if(this->TargetTypeValue == cmTarget::SHARED_LIBRARY
-      || this->TargetTypeValue == cmTarget::MODULE_LIBRARY)
+  if(this->TargetTypeValue == cmState::SHARED_LIBRARY
+      || this->TargetTypeValue == cmState::MODULE_LIBRARY)
     {
     this->SetProperty("POSITION_INDEPENDENT_CODE", "True");
     }
-  if(this->TargetTypeValue == cmTarget::SHARED_LIBRARY)
+  if(this->TargetTypeValue == cmState::SHARED_LIBRARY)
     {
     this->SetPropertyDefault("WINDOWS_EXPORT_ALL_SYMBOLS", 0);
     }
 
-  if (this->GetType() != INTERFACE_LIBRARY && this->GetType() != UTILITY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY
+      && this->GetType() != cmState::UTILITY)
     {
     this->SetPropertyDefault("POSITION_INDEPENDENT_CODE", 0);
     }
@@ -302,15 +305,16 @@ void cmTarget::SetMakefile(cmMakefile* mf)
   // Record current policies for later use.
   this->Makefile->RecordPolicies(this->PolicyMap);
 
-  if (this->TargetTypeValue == INTERFACE_LIBRARY)
+  if (this->TargetTypeValue == cmState::INTERFACE_LIBRARY)
     {
     // This policy is checked in a few conditions. The properties relevant
-    // to the policy are always ignored for INTERFACE_LIBRARY targets,
+    // to the policy are always ignored for cmState::INTERFACE_LIBRARY targets,
     // so ensure that the conditions don't lead to nonsense.
     this->PolicyMap.Set(cmPolicies::CMP0022, cmPolicies::NEW);
     }
 
-  if (this->GetType() != INTERFACE_LIBRARY && this->GetType() != UTILITY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY
+      && this->GetType() != cmState::UTILITY)
     {
     this->SetPropertyDefault("JOB_POOL_COMPILE", 0);
     this->SetPropertyDefault("JOB_POOL_LINK", 0);
@@ -363,18 +367,18 @@ cmListFileBacktrace const& cmTarget::GetBacktrace() const
 //----------------------------------------------------------------------------
 bool cmTarget::IsExecutableWithExports() const
 {
-  return (this->GetType() == cmTarget::EXECUTABLE &&
+  return (this->GetType() == cmState::EXECUTABLE &&
           this->GetPropertyAsBool("ENABLE_EXPORTS"));
 }
 
 //----------------------------------------------------------------------------
 bool cmTarget::IsLinkable() const
 {
-  return (this->GetType() == cmTarget::STATIC_LIBRARY ||
-          this->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GetType() == cmTarget::MODULE_LIBRARY ||
-          this->GetType() == cmTarget::UNKNOWN_LIBRARY ||
-          this->GetType() == cmTarget::INTERFACE_LIBRARY ||
+  return (this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY ||
+          this->GetType() == cmState::UNKNOWN_LIBRARY ||
+          this->GetType() == cmState::INTERFACE_LIBRARY ||
           this->IsExecutableWithExports());
 }
 
@@ -382,14 +386,14 @@ bool cmTarget::IsLinkable() const
 bool cmTarget::HasImportLibrary() const
 {
   return (this->DLLPlatform &&
-          (this->GetType() == cmTarget::SHARED_LIBRARY ||
+          (this->GetType() == cmState::SHARED_LIBRARY ||
            this->IsExecutableWithExports()));
 }
 
 //----------------------------------------------------------------------------
 bool cmTarget::IsFrameworkOnApple() const
 {
-  return (this->GetType() == cmTarget::SHARED_LIBRARY &&
+  return (this->GetType() == cmState::SHARED_LIBRARY &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
@@ -397,7 +401,7 @@ bool cmTarget::IsFrameworkOnApple() const
 //----------------------------------------------------------------------------
 bool cmTarget::IsAppBundleOnApple() const
 {
-  return (this->GetType() == cmTarget::EXECUTABLE &&
+  return (this->GetType() == cmState::EXECUTABLE &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("MACOSX_BUNDLE"));
 }
@@ -405,7 +409,7 @@ bool cmTarget::IsAppBundleOnApple() const
 //----------------------------------------------------------------------------
 bool cmTarget::IsCFBundleOnApple() const
 {
-  return (this->GetType() == cmTarget::MODULE_LIBRARY &&
+  return (this->GetType() == cmState::MODULE_LIBRARY &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("BUNDLE"));
 }
@@ -789,7 +793,7 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
   }
 
   if (cmGeneratorExpression::Find(lib) != std::string::npos
-      || (tgt && tgt->GetType() == INTERFACE_LIBRARY)
+      || (tgt && tgt->GetType() == cmState::INTERFACE_LIBRARY)
       || (target == lib ))
     {
     return;
@@ -1238,7 +1242,7 @@ static bool whiteListedInterfaceProperty(const std::string& prop)
 //----------------------------------------------------------------------------
 void cmTarget::SetProperty(const std::string& prop, const char* value)
 {
-  if (this->GetType() == INTERFACE_LIBRARY
+  if (this->GetType() == cmState::INTERFACE_LIBRARY
       && !whiteListedInterfaceProperty(prop))
     {
     std::ostringstream e;
@@ -1347,7 +1351,7 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
 void cmTarget::AppendProperty(const std::string& prop, const char* value,
                               bool asString)
 {
-  if (this->GetType() == INTERFACE_LIBRARY
+  if (this->GetType() == cmState::INTERFACE_LIBRARY
       && !whiteListedInterfaceProperty(prop))
     {
     std::ostringstream e;
@@ -1459,10 +1463,10 @@ std::string cmTarget::GetExportName() const
 //----------------------------------------------------------------------------
 void cmTarget::AppendBuildInterfaceIncludes()
 {
-  if(this->GetType() != cmTarget::SHARED_LIBRARY &&
-     this->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->GetType() != cmTarget::MODULE_LIBRARY &&
-     this->GetType() != cmTarget::INTERFACE_LIBRARY &&
+  if(this->GetType() != cmState::SHARED_LIBRARY &&
+     this->GetType() != cmState::STATIC_LIBRARY &&
+     this->GetType() != cmState::MODULE_LIBRARY &&
+     this->GetType() != cmState::INTERFACE_LIBRARY &&
      !this->IsExecutableWithExports())
     {
     return;
@@ -1644,10 +1648,10 @@ void cmTarget::MarkAsImported()
 bool cmTarget::HaveWellDefinedOutputFiles() const
 {
   return
-    this->GetType() == cmTarget::STATIC_LIBRARY ||
-    this->GetType() == cmTarget::SHARED_LIBRARY ||
-    this->GetType() == cmTarget::MODULE_LIBRARY ||
-    this->GetType() == cmTarget::EXECUTABLE;
+    this->GetType() == cmState::STATIC_LIBRARY ||
+    this->GetType() == cmState::SHARED_LIBRARY ||
+    this->GetType() == cmState::MODULE_LIBRARY ||
+    this->GetType() == cmState::EXECUTABLE;
 }
 
 //----------------------------------------------------------------------------
@@ -1675,7 +1679,7 @@ void cmTarget::GetTargetVersion(bool soversion,
   minor = 0;
   patch = 0;
 
-  assert(this->GetType() != INTERFACE_LIBRARY);
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
 
   // Look for a VERSION or SOVERSION property.
   const char* prop = soversion? "SOVERSION" : "VERSION";
@@ -1743,7 +1747,7 @@ const char *cmTarget::GetProperty(const std::string& prop) const
 const char *cmTarget::GetProperty(const std::string& prop,
                                   cmMakefile* context) const
 {
-  if (this->GetType() == INTERFACE_LIBRARY
+  if (this->GetType() == cmState::INTERFACE_LIBRARY
       && !whiteListedInterfaceProperty(prop))
     {
     std::ostringstream e;
@@ -1755,11 +1759,11 @@ const char *cmTarget::GetProperty(const std::string& prop,
 
   // Watch for special "computed" properties that are dependent on
   // other properties or variables.  Always recompute them.
-  if(this->GetType() == cmTarget::EXECUTABLE ||
-     this->GetType() == cmTarget::STATIC_LIBRARY ||
-     this->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GetType() == cmTarget::MODULE_LIBRARY ||
-     this->GetType() == cmTarget::UNKNOWN_LIBRARY)
+  if(this->GetType() == cmState::EXECUTABLE ||
+     this->GetType() == cmState::STATIC_LIBRARY ||
+     this->GetType() == cmState::SHARED_LIBRARY ||
+     this->GetType() == cmState::MODULE_LIBRARY ||
+     this->GetType() == cmState::UNKNOWN_LIBRARY)
     {
     static const std::string propLOCATION = "LOCATION";
     if(prop == propLOCATION)
@@ -2069,17 +2073,17 @@ const char* cmTarget::GetSuffixVariableInternal(bool implib) const
 {
   switch(this->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "CMAKE_STATIC_LIBRARY_SUFFIX";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_SUFFIX"
               : "CMAKE_SHARED_LIBRARY_SUFFIX");
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_SUFFIX"
               : "CMAKE_SHARED_MODULE_SUFFIX");
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_SUFFIX"
                 // Android GUI application packages store the native
@@ -2098,17 +2102,17 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 {
   switch(this->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "CMAKE_STATIC_LIBRARY_PREFIX";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_PREFIX"
               : "CMAKE_SHARED_LIBRARY_PREFIX");
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_PREFIX"
               : "CMAKE_SHARED_MODULE_PREFIX");
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_PREFIX"
                 // Android GUI application packages store the native
@@ -2184,7 +2188,7 @@ void cmTarget::SetPropertyDefault(const std::string& property,
 //----------------------------------------------------------------------------
 std::string cmTarget::GetFrameworkVersion() const
 {
-  assert(this->GetType() != INTERFACE_LIBRARY);
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
 
   if(const char* fversion = this->GetProperty("FRAMEWORK_VERSION"))
     {
@@ -2204,8 +2208,8 @@ std::string cmTarget::GetFrameworkVersion() const
 const char* cmTarget::GetExportMacro() const
 {
   // Define the symbol for targets that export symbols.
-  if(this->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GetType() == cmTarget::MODULE_LIBRARY ||
+  if(this->GetType() == cmState::SHARED_LIBRARY ||
+     this->GetType() == cmState::MODULE_LIBRARY ||
      this->IsExecutableWithExports())
     {
     if(const char* custom_export_name = this->GetProperty("DEFINE_SYMBOL"))
@@ -2297,7 +2301,7 @@ cmTarget::GetImportInfo(const std::string& config) const
     i = this->ImportInfoMap.insert(entry).first;
     }
 
-  if(this->GetType() == INTERFACE_LIBRARY)
+  if(this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return &i->second;
     }
@@ -2317,10 +2321,10 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
                                const char** imp,
                                std::string& suffix) const
 {
-  if (this->GetType() == INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     // This method attempts to find a config-specific LOCATION for the
-    // IMPORTED library. In the case of INTERFACE_LIBRARY, there is no
+    // IMPORTED library. In the case of cmState::INTERFACE_LIBRARY, there is no
     // LOCATION at all, so leaving *loc and *imp unchanged is the appropriate
     // and valid response.
     return true;
@@ -2467,7 +2471,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
   std::string linkProp = "INTERFACE_LINK_LIBRARIES";
   const char *propertyLibs = this->GetProperty(linkProp);
 
-  if (this->GetType() != INTERFACE_LIBRARY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY)
     {
     if(!propertyLibs)
       {
@@ -2488,7 +2492,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     info.Libraries = propertyLibs;
     }
   }
-  if(this->GetType() == INTERFACE_LIBRARY)
+  if(this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
@@ -2516,7 +2520,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 
   // Get the soname.
-  if(this->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GetType() == cmState::SHARED_LIBRARY)
     {
     std::string soProp = "IMPORTED_SONAME";
     soProp += suffix;
@@ -2531,7 +2535,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 
   // Get the "no-soname" mark.
-  if(this->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GetType() == cmState::SHARED_LIBRARY)
     {
     std::string soProp = "IMPORTED_NO_SONAME";
     soProp += suffix;
@@ -2550,7 +2554,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     {
     info.ImportLibrary = imp;
     }
-  else if(this->GetType() == cmTarget::SHARED_LIBRARY ||
+  else if(this->GetType() == cmState::SHARED_LIBRARY ||
           this->IsExecutableWithExports())
     {
     std::string impProp = "IMPORTED_IMPLIB";
@@ -2597,7 +2601,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 
   // Get the cyclic repetition count.
-  if(this->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GetType() == cmState::STATIC_LIBRARY)
     {
     std::string linkProp = "IMPORTED_LINK_INTERFACE_MULTIPLICITY";
     linkProp += suffix;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index b0d5f4a..e5646f6 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -77,18 +77,13 @@ class cmTarget
 {
 public:
   cmTarget();
-  enum TargetType { EXECUTABLE, STATIC_LIBRARY,
-                    SHARED_LIBRARY, MODULE_LIBRARY,
-                    OBJECT_LIBRARY, UTILITY, GLOBAL_TARGET,
-                    INTERFACE_LIBRARY,
-                    UNKNOWN_LIBRARY};
-  static const char* GetTargetTypeName(TargetType targetType);
+  static const char* GetTargetTypeName(cmState::TargetType targetType);
   enum CustomCommandType { PRE_BUILD, PRE_LINK, POST_BUILD };
 
   /**
    * Return the type of target.
    */
-  TargetType GetType() const
+  cmState::TargetType GetType() const
     {
     return this->TargetTypeValue;
     }
@@ -96,7 +91,7 @@ public:
   /**
    * Set the target type
    */
-  void SetType(TargetType f, const std::string& name);
+  void SetType(cmState::TargetType f, const std::string& name);
 
   void MarkAsImported();
 
@@ -302,7 +297,7 @@ public:
     { return this->SystemIncludeDirectories; }
 
   bool LinkLanguagePropagatesToDependents() const
-  { return this->TargetTypeValue == STATIC_LIBRARY; }
+  { return this->TargetTypeValue == cmState::STATIC_LIBRARY; }
 
   cmStringRange GetIncludeDirectoriesEntries() const;
   cmBacktraceRange GetIncludeDirectoriesBacktraces() const;
@@ -420,7 +415,7 @@ private:
 #endif
   cmMakefile* Makefile;
   cmTargetInternalPointer Internal;
-  TargetType TargetTypeValue;
+  cmState::TargetType TargetTypeValue;
   bool HaveInstallRule;
   bool RecordDependencies;
   bool DLLPlatform;
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 1a1cf39..435346a 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -88,7 +88,7 @@ bool cmTargetLinkLibrariesCommand
     return true;
     }
 
-  if(this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
+  if(this->Target->GetType() == cmState::OBJECT_LIBRARY)
     {
     std::ostringstream e;
     e << "Object library target \"" << args[0] << "\" "
@@ -98,7 +98,7 @@ bool cmTargetLinkLibrariesCommand
     return true;
     }
 
-  if (this->Target->GetType() == cmTarget::UTILITY)
+  if (this->Target->GetType() == cmState::UTILITY)
     {
     std::ostringstream e;
     const char *modal = 0;
@@ -352,7 +352,7 @@ bool
 cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
                                             cmTargetLinkLibraryType llt)
 {
-  if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(this->Target->GetType() == cmState::INTERFACE_LIBRARY
       && this->CurrentProcessingState != ProcessingKeywordLinkInterface)
     {
     this->Makefile->IssueMessage(cmake::FATAL_ERROR,
@@ -428,7 +428,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
     else if(this->CurrentProcessingState != ProcessingKeywordPublicInterface
             && this->CurrentProcessingState != ProcessingPlainPublicInterface)
       {
-      if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+      if (this->Target->GetType() == cmState::STATIC_LIBRARY)
         {
         std::string configLib = this->Target
                                      ->GetDebugGeneratorExpressions(lib, llt);
@@ -458,7 +458,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
     return true;
     }
 
-  if (this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->Target->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return true;
     }
diff --git a/Source/cmTargetPropCommandBase.cxx b/Source/cmTargetPropCommandBase.cxx
index 4696de4..bfc19a4 100644
--- a/Source/cmTargetPropCommandBase.cxx
+++ b/Source/cmTargetPropCommandBase.cxx
@@ -44,12 +44,12 @@ bool cmTargetPropCommandBase
     this->HandleMissingTarget(args[0]);
     return false;
     }
-  if ((this->Target->GetType() != cmTarget::SHARED_LIBRARY)
-    && (this->Target->GetType() != cmTarget::STATIC_LIBRARY)
-    && (this->Target->GetType() != cmTarget::OBJECT_LIBRARY)
-    && (this->Target->GetType() != cmTarget::MODULE_LIBRARY)
-    && (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
-    && (this->Target->GetType() != cmTarget::EXECUTABLE))
+  if ((this->Target->GetType() != cmState::SHARED_LIBRARY)
+    && (this->Target->GetType() != cmState::STATIC_LIBRARY)
+    && (this->Target->GetType() != cmState::OBJECT_LIBRARY)
+    && (this->Target->GetType() != cmState::MODULE_LIBRARY)
+    && (this->Target->GetType() != cmState::INTERFACE_LIBRARY)
+    && (this->Target->GetType() != cmState::EXECUTABLE))
     {
     this->SetError("called with non-compilable target type");
     return false;
@@ -114,7 +114,7 @@ bool cmTargetPropCommandBase
     return false;
     }
 
-  if (this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if (this->Target->GetType() == cmState::INTERFACE_LIBRARY
       && scope != "INTERFACE")
     {
     this->SetError("may only be set INTERFACE properties on INTERFACE "
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 85fb405..d997596 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -90,7 +90,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   std::string exe = command[0];
   cmGeneratorTarget* target =
       this->LG->FindGeneratorTargetToUse(exe);
-  if(target && target->GetType() == cmTarget::EXECUTABLE)
+  if(target && target->GetType() == cmState::EXECUTABLE)
     {
     // Use the target file on disk.
     exe = target->GetFullPath(config);
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 3ef5f2e..218756d 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -269,7 +269,7 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
 void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
-  if(this->GeneratorTarget->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(this->GeneratorTarget->GetType() == cmState::INTERFACE_LIBRARY
       || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
@@ -278,7 +278,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
   this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
-  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
     {
     if(!this->ComputeClOptions())
       {
@@ -361,7 +361,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
   if(this->MSTools
-     && this->GeneratorTarget->GetType() <= cmTarget::GLOBAL_TARGET)
+     && this->GeneratorTarget->GetType() <= cmState::GLOBAL_TARGET)
     {
     this->WriteApplicationTypeSettings();
     this->VerifyNecessaryFiles();
@@ -669,15 +669,15 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
     std::string configType = "<ConfigurationType>";
     switch(this->GeneratorTarget->GetType())
       {
-      case cmTarget::SHARED_LIBRARY:
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::SHARED_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         configType += "DynamicLibrary";
         break;
-      case cmTarget::OBJECT_LIBRARY:
-      case cmTarget::STATIC_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
+      case cmState::STATIC_LIBRARY:
         configType += "StaticLibrary";
         break;
-      case cmTarget::EXECUTABLE:
+      case cmState::EXECUTABLE:
         if(this->NsightTegra &&
            !this->Target->GetPropertyAsBool("ANDROID_GUI"))
           {
@@ -689,8 +689,8 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
           configType += "Application";
           }
         break;
-      case cmTarget::UTILITY:
-      case cmTarget::GLOBAL_TARGET:
+      case cmState::UTILITY:
+      case cmState::GLOBAL_TARGET:
         if(this->NsightTegra)
           {
           // Tegra-Android platform does not understand "Utility".
@@ -701,8 +701,8 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
           configType += "Utility";
           }
         break;
-      case cmTarget::UNKNOWN_LIBRARY:
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::UNKNOWN_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
         break;
       }
     configType += "</ConfigurationType>\n";
@@ -744,7 +744,7 @@ void cmVisualStudio10TargetGenerator
   mfcLine += useOfMfcValue + "</UseOfMfc>\n";
   this->WriteString(mfcLine.c_str(), 2);
 
-  if((this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY &&
+  if((this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
      this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
@@ -753,7 +753,7 @@ void cmVisualStudio10TargetGenerator
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
-  else if (this->GeneratorTarget->GetType() <= cmTarget::MODULE_LIBRARY &&
+  else if (this->GeneratorTarget->GetType() <= cmState::MODULE_LIBRARY &&
            this->ClOptions[config]->UsingSBCS())
     {
     this->WriteString("<CharacterSet>NotSet</CharacterSet>\n", 2);
@@ -1481,7 +1481,7 @@ void cmVisualStudio10TargetGenerator::WriteSources(
 
 void cmVisualStudio10TargetGenerator::WriteAllSources()
 {
-  if(this->GeneratorTarget->GetType() > cmTarget::UTILITY)
+  if(this->GeneratorTarget->GetType() > cmState::UTILITY)
     {
     return;
     }
@@ -1743,9 +1743,9 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmTarget::TargetType ttype =
-      (cmTarget::TargetType)this->GeneratorTarget->GetType();
-  if(ttype > cmTarget::GLOBAL_TARGET)
+  cmState::TargetType ttype =
+      (cmState::TargetType)this->GeneratorTarget->GetType();
+  if(ttype > cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -1757,7 +1757,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
         config = this->Configurations.begin();
       config != this->Configurations.end(); ++config)
     {
-    if(ttype >= cmTarget::UTILITY)
+    if(ttype >= cmState::UTILITY)
       {
       this->WritePlatformConfigTag("IntDir", config->c_str(), 3);
       *this->BuildFileStream
@@ -1773,7 +1773,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
       intermediateDir += "/";
       std::string outDir;
       std::string targetNameFull;
-      if(ttype == cmTarget::OBJECT_LIBRARY)
+      if(ttype == cmState::OBJECT_LIBRARY)
         {
         outDir = intermediateDir;
         targetNameFull = this->Target->GetName();
@@ -1829,8 +1829,8 @@ OutputLinkIncremental(std::string const& configName)
     }
   // static libraries and things greater than modules do not need
   // to set this option
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
-     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmState::MODULE_LIBRARY)
     {
     return;
     }
@@ -1968,8 +1968,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
-      if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY )
+      if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+          this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY )
         {
         clOptions.AddDefine("_WINRT_DLL");
         }
@@ -2177,8 +2177,8 @@ WriteMasmOptions(std::string const& configName,
 void
 cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 {
-  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->GeneratorTarget->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmState::STATIC_LIBRARY &&
+     this->GeneratorTarget->GetType() != cmState::OBJECT_LIBRARY)
     {
     return;
     }
@@ -2214,9 +2214,9 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 void cmVisualStudio10TargetGenerator::WriteManifestOptions(
   std::string const& config)
 {
-  if (this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE &&
-      this->GeneratorTarget->GetType() != cmTarget::SHARED_LIBRARY &&
-      this->GeneratorTarget->GetType() != cmTarget::MODULE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmState::EXECUTABLE &&
+      this->GeneratorTarget->GetType() != cmState::SHARED_LIBRARY &&
+      this->GeneratorTarget->GetType() != cmState::MODULE_LIBRARY)
     {
     return;
     }
@@ -2382,9 +2382,9 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 //----------------------------------------------------------------------------
 bool cmVisualStudio10TargetGenerator::ComputeLinkOptions()
 {
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
-     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
     {
     for(std::vector<std::string>::const_iterator
           i = this->Configurations.begin();
@@ -2421,11 +2421,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string CONFIG = cmSystemTools::UpperCase(config);
 
   const char* linkType = "SHARED";
-  if(this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
     {
     linkType = "MODULE";
     }
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
     {
     linkType = "EXE";
     }
@@ -2508,7 +2508,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string targetNameFull;
   std::string targetNameImport;
   std::string targetNamePDB;
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
     {
     this->GeneratorTarget->GetExecutableNames(targetName, targetNameFull,
                                      targetNameImport, targetNamePDB,
@@ -2531,7 +2531,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2553,7 +2553,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2599,7 +2599,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
     if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
-       this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE)
+       this->GeneratorTarget->GetType() != cmState::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2637,7 +2637,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
                            "%(IgnoreSpecificDefaultLibraries)");
     }
 
-  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2654,8 +2654,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 void
 cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 {
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
-     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmState::MODULE_LIBRARY)
     {
     return;
     }
@@ -2693,7 +2693,7 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
       libVec.push_back(path);
       }
     else if (!l->Target
-        || l->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->GeneratorTarget->GetType() != cmState::INTERFACE_LIBRARY)
       {
       libVec.push_back(l->Value);
       }
@@ -2765,7 +2765,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WritePlatformConfigTag("ItemDefinitionGroup", i->c_str(), 1);
     *this->BuildFileStream << "\n";
     //    output cl compile flags <ClCompile></ClCompile>
-    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
       {
       this->WriteClOptions(*i, includes);
       //    output rc compile flags <ResourceCompile></ResourceCompile>
@@ -2783,7 +2783,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     //    output manifest flags  <Manifest></Manifest>
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
-       this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE &&
+       this->GeneratorTarget->GetType() == cmState::EXECUTABLE &&
        this->Target->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
@@ -2796,7 +2796,7 @@ void
 cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
 {
   bool addedPrelink = false;
-  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2868,7 +2868,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
        i != depends.end(); ++i)
     {
     cmTarget const* dt = (*i)->Target;
-    if(dt->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(dt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -3004,7 +3004,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
       this->GlobalGenerator->TargetsWindowsPhone())
-      && (cmTarget::EXECUTABLE == this->GeneratorTarget->GetType()))
+      && (cmState::EXECUTABLE == this->GeneratorTarget->GetType()))
     {
     std::string pfxFile;
     std::vector<cmSourceFile const*> certificates;
@@ -3133,7 +3133,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>14.0"
         "</MinimumVisualStudioVersion>\n", 2);
 
-      if(this->GeneratorTarget->GetType() < cmTarget::UTILITY)
+      if(this->GeneratorTarget->GetType() < cmState::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3147,7 +3147,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (this->GeneratorTarget->GetType() < cmTarget::UTILITY)
+      if (this->GeneratorTarget->GetType() < cmState::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3162,12 +3162,12 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
                         "</MinimumVisualStudioVersion>\n", 2);
 
       if (isWindowsStore
-          && this->GeneratorTarget->GetType() < cmTarget::UTILITY)
+          && this->GeneratorTarget->GetType() < cmState::UTILITY)
         {
         isAppContainer = true;
         }
       else if (isWindowsPhone &&
-               this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+               this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
         {
         this->WriteString("<XapOutputs>true</XapOutputs>\n", 2);
         this->WriteString("<XapFilename>", 2);
@@ -3224,7 +3224,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
 {
   // For Windows and Windows Phone executables, we will assume that if a
   // manifest is not present that we need to add all the necessary files
-  if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
     {
     std::vector<cmSourceFile const*> manifestSources;
     this->GeneratorTarget->GetAppManifest(manifestSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=305beb6f88e699ccc5efdb198b45e6089afd038d
commit 305beb6f88e699ccc5efdb198b45e6089afd038d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:56:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 23:54:12 2015 +0200

    cmTarget: Move link type enum out.
    
    Remove a reason for generate time code to depend on the cmTarget header/type.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 06eb3ec..e439182 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -373,13 +373,13 @@ void CCONV cmAddLinkLibraryForTarget(void *arg, const char *tgt,
   switch (libtype)
     {
     case CM_LIBRARY_GENERAL:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::GENERAL);
+      mf->AddLinkLibraryForTarget(tgt,value, GENERAL_LibraryType);
       break;
     case CM_LIBRARY_DEBUG:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::DEBUG);
+      mf->AddLinkLibraryForTarget(tgt,value, DEBUG_LibraryType);
       break;
     case CM_LIBRARY_OPTIMIZED:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::OPTIMIZED);
+      mf->AddLinkLibraryForTarget(tgt,value, OPTIMIZED_LibraryType);
       break;
     }
 }
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 22843f1..742651a 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -482,24 +482,24 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
 
   // Look for entries meant for this configuration.
   std::vector<cmLinkItem> actual_libs;
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
   for(std::vector<std::string>::const_iterator di = deplist.begin();
       di != deplist.end(); ++di)
     {
     if(*di == "debug")
       {
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(*di == "optimized")
       {
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(*di == "general")
       {
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(!di->empty())
@@ -517,17 +517,17 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
           {
           if(strcmp(val, "debug") == 0)
             {
-            llt = cmTarget::DEBUG;
+            llt = DEBUG_LibraryType;
             }
           else if(strcmp(val, "optimized") == 0)
             {
-            llt = cmTarget::OPTIMIZED;
+            llt = OPTIMIZED_LibraryType;
             }
           }
         }
 
       // If the library is meant for this link type then use it.
-      if(llt == cmTarget::GENERAL || llt == this->LinkType)
+      if(llt == GENERAL_LibraryType || llt == this->LinkType)
         {
         cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
         actual_libs.push_back(item);
@@ -539,7 +539,7 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
         }
 
       // Reset the link type until another explicit type is given.
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = false;
       }
     }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index d9760aa..889fb08 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -155,7 +155,7 @@ private:
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
-  cmTarget::LinkLibraryType LinkType;
+  cmTargetLinkLibraryType LinkType;
   bool HasConfig;
   bool DebugMode;
   bool OldLinkDirMode;
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index fde8fb1..0ef2ea5 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -120,15 +120,15 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
         std::string ltValue;
         switch(li->second)
           {
-          case cmTarget::GENERAL:
+          case GENERAL_LibraryType:
             valueNew += "general;";
             ltValue = "general";
             break;
-          case cmTarget::DEBUG:
+          case DEBUG_LibraryType:
             valueNew += "debug;";
             ltValue = "debug";
             break;
-          case cmTarget::OPTIMIZED:
+          case OPTIMIZED_LibraryType:
             valueNew += "optimized;";
             ltValue = "optimized";
             break;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1b8ad43..8c9251b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5416,13 +5416,13 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
                                 this->MaxLanguageStandards);
     }
 
-  cmTarget::LinkLibraryType linkType = this->Target->ComputeLinkType(config);
+  cmTargetLinkLibraryType linkType = this->Target->ComputeLinkType(config);
   cmTarget::LinkLibraryVectorType const& oldllibs =
     this->Target->GetOriginalLinkLibraries();
   for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
       li != oldllibs.end(); ++li)
     {
-    if(li->second != cmTarget::GENERAL && li->second != linkType)
+    if(li->second != GENERAL_LibraryType && li->second != linkType)
       {
       std::string name = this->Target->CheckCMP0004(li->first);
       if(name == this->GetName() || name.empty())
diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx
index 996b538..eb3bfce 100644
--- a/Source/cmLinkLibrariesCommand.cxx
+++ b/Source/cmLinkLibrariesCommand.cxx
@@ -34,7 +34,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::DEBUG);
+                                 DEBUG_LibraryType);
       }
     else if (*i == "optimized")
       {
@@ -46,7 +46,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::OPTIMIZED);
+                                 OPTIMIZED_LibraryType);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 6ecd9a8..c620baf 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1145,7 +1145,7 @@ void cmLocalVisualStudio6Generator
       libDebug =
         this->ConvertToOutputFormat(libDebug.c_str(), SHELL);
 
-      if (j->second == cmTarget::GENERAL)
+      if (j->second == GENERAL_LibraryType)
         {
         libOptions += " ";
         libOptions += lib;
@@ -1156,7 +1156,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineOptionsForDebug +=  libDebug;
         libMultiLineOptionsForDebug += "\n";
         }
-      if (j->second == cmTarget::DEBUG)
+      if (j->second == DEBUG_LibraryType)
         {
         libDebugOptions += " ";
         libDebugOptions += lib;
@@ -1165,7 +1165,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineDebugOptions += libDebug;
         libMultiLineDebugOptions += "\n";
         }
-      if (j->second == cmTarget::OPTIMIZED)
+      if (j->second == OPTIMIZED_LibraryType)
         {
         libOptimizedOptions += " ";
         libOptimizedOptions += lib;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 045cca8..d62c5c4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1400,7 +1400,7 @@ bool cmMakefile::ParseDefineFlag(std::string const& def, bool remove)
 }
 
 void cmMakefile::AddLinkLibrary(const std::string& lib,
-                                cmTarget::LinkLibraryType llt)
+                                cmTargetLinkLibraryType llt)
 {
   cmTarget::LibraryID tmp;
   tmp.first = lib;
@@ -1410,7 +1410,7 @@ void cmMakefile::AddLinkLibrary(const std::string& lib,
 
 void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
                                          const std::string& lib,
-                                         cmTarget::LinkLibraryType llt)
+                                         cmTargetLinkLibraryType llt)
 {
   cmTargets::iterator i = this->Targets.find(target);
   if ( i != this->Targets.end())
@@ -1471,7 +1471,7 @@ void cmMakefile::AddLinkDirectoryForTarget(const std::string& target,
 
 void cmMakefile::AddLinkLibrary(const std::string& lib)
 {
-  this->AddLinkLibrary(lib,cmTarget::GENERAL);
+  this->AddLinkLibrary(lib,GENERAL_LibraryType);
 }
 
 void cmMakefile::InitializeFromParent(cmMakefile* parent)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 99ed73d..d9d5a8a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -219,9 +219,9 @@ public:
    * Add a link library to the build.
    */
   void AddLinkLibrary(const std::string&);
-  void AddLinkLibrary(const std::string&, cmTarget::LinkLibraryType type);
+  void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type);
   void AddLinkLibraryForTarget(const std::string& tgt, const std::string&,
-                               cmTarget::LinkLibraryType type);
+                               cmTargetLinkLibraryType type);
   void AddLinkDirectoryForTarget(const std::string& tgt, const std::string& d);
 
   /**
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 468a589..dd8fa9c 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -123,4 +123,10 @@ static thisClass* SafeDownCast(cmObject *c) \
 } \
 class cmTypeMacro_UseTrailingSemicolon
 
+enum cmTargetLinkLibraryType {
+  GENERAL_LibraryType,
+  DEBUG_LibraryType,
+  OPTIMIZED_LibraryType
+};
+
 #endif
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 847a5c1..0128c78 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -632,13 +632,13 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories() const
 }
 
 //----------------------------------------------------------------------------
-cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
+cmTargetLinkLibraryType cmTarget::ComputeLinkType(
                                       const std::string& config) const
 {
   // No configuration is always optimized.
   if(config.empty())
     {
-    return cmTarget::OPTIMIZED;
+    return OPTIMIZED_LibraryType;
     }
 
   // Get the list of configurations considered to be DEBUG.
@@ -650,10 +650,10 @@ cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
   if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
       debugConfigs.end())
     {
-    return cmTarget::DEBUG;
+    return DEBUG_LibraryType;
     }
   // The current configuration is not a debug configuration.
-  return cmTarget::OPTIMIZED;
+  return OPTIMIZED_LibraryType;
 }
 
 //----------------------------------------------------------------------------
@@ -693,9 +693,9 @@ bool cmTarget::NameResolvesToFramework(const std::string& libname) const
 
 //----------------------------------------------------------------------------
 std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const
+                                  cmTargetLinkLibraryType llt) const
 {
-  if (llt == GENERAL)
+  if (llt == GENERAL_LibraryType)
     {
     return value;
     }
@@ -716,7 +716,7 @@ std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
     configString = "$<OR:" + configString + ">";
     }
 
-  if (llt == OPTIMIZED)
+  if (llt == OPTIMIZED_LibraryType)
     {
     configString = "$<NOT:" + configString + ">";
     }
@@ -773,15 +773,16 @@ void cmTarget::GetTllSignatureTraces(std::ostringstream &s,
 void cmTarget::AddLinkLibrary(cmMakefile& mf,
                               const std::string& target,
                               const std::string& lib,
-                              LinkLibraryType llt)
+                              cmTargetLinkLibraryType llt)
 {
   cmTarget *tgt = this->Makefile->FindTargetToUse(lib);
   {
   const bool isNonImportedTarget = tgt && !tgt->IsImported();
 
-  const std::string libName = (isNonImportedTarget && llt != GENERAL)
-                                                        ? targetNameGenex(lib)
-                                                        : lib;
+  const std::string libName =
+      (isNonImportedTarget && llt != GENERAL_LibraryType)
+      ? targetNameGenex(lib)
+      : lib;
   this->AppendProperty("LINK_LIBRARIES",
                        this->GetDebugGeneratorExpressions(libName,
                                                           llt).c_str());
@@ -822,13 +823,13 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
       }
     switch (llt)
       {
-      case cmTarget::GENERAL:
+      case GENERAL_LibraryType:
         dependencies += "general";
         break;
-      case cmTarget::DEBUG:
+      case DEBUG_LibraryType:
         dependencies += "debug";
         break;
-      case cmTarget::OPTIMIZED:
+      case OPTIMIZED_LibraryType:
         dependencies += "optimized";
         break;
       }
@@ -1162,7 +1163,7 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
 
     // Parse the dependency information, which is a set of
     // type, library pairs separated by ";". There is always a trailing ";".
-    cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+    cmTargetLinkLibraryType llt = GENERAL_LibraryType;
     std::string depline = deps;
     std::string::size_type start = 0;
     std::string::size_type end;
@@ -1174,22 +1175,22 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
         {
         if (l == "debug")
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         else if (l == "optimized")
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         else if (l == "general")
           {
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         else
           {
           LibraryID lib2(l,llt);
           this->InsertDependencyForVS6( dep_map, lib, lib2);
           this->GatherDependenciesForVS6( mf, lib2, dep_map);
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         }
       start = end+1; // skip the ;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 97515a7..b0d5f4a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -140,17 +140,15 @@ public:
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
 
-  enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
-
   //* how we identify a library, by name and type
-  typedef std::pair<std::string, LinkLibraryType> LibraryID;
+  typedef std::pair<std::string, cmTargetLinkLibraryType> LibraryID;
 
   typedef std::vector<LibraryID > LinkLibraryVectorType;
   const LinkLibraryVectorType &GetOriginalLinkLibraries() const
     {return this->OriginalLinkLibraries;}
 
   /** Compute the link type to use for the given configuration.  */
-  LinkLibraryType ComputeLinkType(const std::string& config) const;
+  cmTargetLinkLibraryType ComputeLinkType(const std::string& config) const;
 
   /**
    * Clear the dependency information recorded for this target, if any.
@@ -161,7 +159,7 @@ public:
   bool NameResolvesToFramework(const std::string& libname) const;
   void AddLinkLibrary(cmMakefile& mf,
                       const std::string& target, const std::string& lib,
-                      LinkLibraryType llt);
+                      cmTargetLinkLibraryType llt);
   enum TLLSignature {
     KeywordTLLSignature,
     PlainTLLSignature
@@ -297,7 +295,7 @@ public:
   void AppendBuildInterfaceIncludes();
 
   std::string GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const;
+                                  cmTargetLinkLibraryType llt) const;
 
   void AddSystemIncludeDirectories(const std::set<std::string> &incs);
   std::set<std::string> const & GetSystemIncludeDirectories() const
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index b57b921..1a1cf39 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -136,7 +136,7 @@ bool cmTargetLinkLibrariesCommand
     }
 
   // Keep track of link configuration specifiers.
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
 
   // Start with primary linking and switch to link interface
@@ -242,27 +242,27 @@ bool cmTargetLinkLibrariesCommand
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::DEBUG);
+        this->LinkLibraryTypeSpecifierWarning(llt, DEBUG_LibraryType);
         }
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "optimized")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::OPTIMIZED);
+        this->LinkLibraryTypeSpecifierWarning(llt, OPTIMIZED_LibraryType);
         }
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "general")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::GENERAL);
+        this->LinkLibraryTypeSpecifierWarning(llt, GENERAL_LibraryType);
         }
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(haveLLT)
@@ -282,7 +282,7 @@ bool cmTargetLinkLibrariesCommand
       // specifed that a library is both debug and optimized.  (this check is
       // only there for backwards compatibility when mixing projects built
       // with old versions of CMake and new)
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       std::string linkType = args[0];
       linkType += "_LINK_TYPE";
       const char* linkTypeString =
@@ -291,11 +291,11 @@ bool cmTargetLinkLibrariesCommand
         {
         if(strcmp(linkTypeString, "debug") == 0)
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         if(strcmp(linkTypeString, "optimized") == 0)
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         }
       if (!this->HandleLibrary(args[i], llt))
@@ -350,7 +350,7 @@ cmTargetLinkLibrariesCommand
 //----------------------------------------------------------------------------
 bool
 cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
-                                            cmTarget::LinkLibraryType llt)
+                                            cmTargetLinkLibraryType llt)
 {
   if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
       && this->CurrentProcessingState != ProcessingKeywordLinkInterface)
@@ -469,7 +469,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
   std::string prop;
 
   // Include this library in the link interface for the target.
-  if(llt == cmTarget::DEBUG || llt == cmTarget::GENERAL)
+  if(llt == DEBUG_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the DEBUG configuration interfaces.
     for(std::vector<std::string>::const_iterator i = debugConfigs.begin();
@@ -480,7 +480,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
       this->Target->AppendProperty(prop, lib.c_str());
       }
     }
-  if(llt == cmTarget::OPTIMIZED || llt == cmTarget::GENERAL)
+  if(llt == OPTIMIZED_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the non-DEBUG configuration interfaces.
     this->Target->AppendProperty("LINK_INTERFACE_LIBRARIES", lib.c_str());
diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h
index 47dd8bd..f061e6d 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -62,7 +62,7 @@ private:
 
   ProcessingState CurrentProcessingState;
 
-  bool HandleLibrary(const std::string& lib, cmTarget::LinkLibraryType llt);
+  bool HandleLibrary(const std::string& lib, cmTargetLinkLibraryType llt);
 };
 
 
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 7d499de..7268241 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -477,7 +477,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
             ++libIt)
       {
       mf->AddLinkLibraryForTarget(targetName, *libIt,
-                                  cmTarget::GENERAL);
+                                  GENERAL_LibraryType);
       }
 
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=664c328b02211a9e3273845cfd029203f1fe397f
commit 664c328b02211a9e3273845cfd029203f1fe397f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:15:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 23:54:12 2015 +0200

    cmTarget: Move ImportInfoMap out of internal class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 369e497..847a5c1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
-  ImportInfoMapType ImportInfoMap;
-
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -1538,7 +1535,7 @@ void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
   // Wipe out maps caching information affected by this property.
   if(this->IsImported() && cmHasLiteralPrefix(prop, "IMPORTED"))
     {
-    this->Internal->ImportInfoMap.clear();
+    this->ImportInfoMap.clear();
     }
 }
 
@@ -2288,16 +2285,15 @@ cmTarget::GetImportInfo(const std::string& config) const
     {
     config_upper = "NOCONFIG";
     }
-  typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
 
   ImportInfoMapType::const_iterator i =
-    this->Internal->ImportInfoMap.find(config_upper);
-  if(i == this->Internal->ImportInfoMap.end())
+    this->ImportInfoMap.find(config_upper);
+  if(i == this->ImportInfoMap.end())
     {
     ImportInfo info;
     this->ComputeImportInfo(config_upper, info);
     ImportInfoMapType::value_type entry(config_upper, info);
-    i = this->Internal->ImportInfoMap.insert(entry).first;
+    i = this->ImportInfoMap.insert(entry).first;
     }
 
   if(this->GetType() == INTERFACE_LIBRARY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 03c4cbe..97515a7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -449,6 +449,9 @@ private:
     std::string SharedDeps;
   };
 
+  typedef std::map<std::string, ImportInfo> ImportInfoMapType;
+  mutable ImportInfoMapType ImportInfoMap;
+
   ImportInfo const* GetImportInfo(const std::string& config) const;
   void ComputeImportInfo(std::string const& desired_config,
                          ImportInfo& info) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df52be7fd5704ac652b9795be41ac5107dc9819c
commit df52be7fd5704ac652b9795be41ac5107dc9819c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:20:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 23:54:12 2015 +0200

    cmTarget: Move backtrace member out of internal class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fd8ea3e..369e497 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  // The backtrace when the target was created.
-  cmListFileBacktrace Backtrace;
-
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
@@ -240,7 +237,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 
   // Save the backtrace of target construction.
-  this->Internal->Backtrace = this->Makefile->GetBacktrace();
+  this->Backtrace = this->Makefile->GetBacktrace();
 
   if (!this->IsImported())
     {
@@ -363,7 +360,7 @@ void cmTarget::FinishConfigure()
 //----------------------------------------------------------------------------
 cmListFileBacktrace const& cmTarget::GetBacktrace() const
 {
-  return this->Internal->Backtrace;
+  return this->Backtrace;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 01261ed..03c4cbe 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -471,6 +471,8 @@ private:
                             std::string const& suffix,
                             std::string const& name,
                             const char* version) const;
+
+  cmListFileBacktrace Backtrace;
 };
 
 #ifdef CMAKE_BUILD_WITH_CMAKE

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c266d709f232b336f8f06f1bb36a3fee45809d3
commit 4c266d709f232b336f8f06f1bb36a3fee45809d3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:11:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 23:54:12 2015 +0200

    cmTarget: Remove unneeded constructors.
    
    The compiler generated ones are fine here.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b8beb5c..fd8ea3e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,16 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  cmTargetInternals()
-    : Backtrace()
-    {
-    }
-  cmTargetInternals(cmTargetInternals const&)
-    : Backtrace()
-    {
-    }
-  ~cmTargetInternals();
-
   // The backtrace when the target was created.
   cmListFileBacktrace Backtrace;
 
@@ -95,11 +85,6 @@ public:
 };
 
 //----------------------------------------------------------------------------
-cmTargetInternals::~cmTargetInternals()
-{
-}
-
-//----------------------------------------------------------------------------
 cmTarget::cmTarget()
 {
   this->Makefile = 0;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1304be33b367820dca449c753ac502afb059f611
commit 1304be33b367820dca449c753ac502afb059f611
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 23:14:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 14 23:54:06 2015 +0200

    Generators: Use GetType from the cmGeneratorTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index bfa8c64..5c252df 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -290,7 +290,7 @@ cmComputeLinkInformation
   // the program that will load it.
   this->LoaderFlag = 0;
   if(!this->UseImportLibrary &&
-     this->Target->Target->GetType() == cmTarget::MODULE_LIBRARY)
+     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
     {
     std::string loader_flag_var = "CMAKE_SHARED_MODULE_LOADER_";
     loader_flag_var += this->LinkLanguage;
@@ -308,10 +308,10 @@ cmComputeLinkInformation
 
   // Get options needed to specify RPATHs.
   this->RuntimeUseChrpath = false;
-  if(this->Target->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
     {
     const char* tType =
-      ((this->Target->Target->GetType() == cmTarget::EXECUTABLE)?
+      ((this->Target->GetType() == cmTarget::EXECUTABLE)?
        "EXECUTABLE" : "SHARED_LIBRARY");
     std::string rtVar = "CMAKE_";
     rtVar += tType;
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 8f3def2..4094bf0 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -554,7 +554,8 @@ cmComputeTargetDepends
 
     // Describe the depender.
     e << "  \"" << depender->GetName() << "\" of type "
-      << cmTarget::GetTargetTypeName(depender->Target->GetType()) << "\n";
+      << cmTarget::GetTargetTypeName(
+           (cmTarget::TargetType)depender->GetType()) << "\n";
 
     // List its dependencies that are inside the component.
     EdgeList const& nl = this->InitialGraph[i];
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index fe83b08..9958672 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1632,7 +1632,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
       return std::string();
       }
 
-    cmTarget::TargetType targetType = target->Target->GetType();
+    cmTarget::TargetType targetType = (cmTarget::TargetType)target->GetType();
 
     if(targetType != cmTarget::SHARED_LIBRARY &&
        targetType != cmTarget::MODULE_LIBRARY &&
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6bebc2b..1b8ad43 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1965,7 +1965,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
     std::string msg = "cmTarget::GetCompileInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(this->Target->GetType());
+    msg += cmTarget::GetTargetTypeName((cmTarget::TargetType)this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -2155,7 +2155,7 @@ cmTargetTraceDependencies
   this->CurrentEntry = 0;
 
   // Queue all the source files already specified for the target.
-  if (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
     std::vector<std::string> configs;
     this->Makefile->GetConfigurations(configs);
@@ -3657,8 +3657,8 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
 bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmTarget::OBJECT_LIBRARY
+      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3669,8 +3669,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmTarget::OBJECT_LIBRARY
+      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3681,8 +3681,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmTarget::OBJECT_LIBRARY
+      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3693,8 +3693,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMaxProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmTarget::OBJECT_LIBRARY
+      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
     {
     return false;
     }
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 79e3a4c..6469294 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -148,7 +148,7 @@ void cmGhsMultiTargetGenerator::Generate()
     this->WriteCompilerFlags(config, language);
     this->WriteCompilerDefinitions(config, language);
     this->WriteIncludes(config, language);
-    if (this->Target->GetType() == cmTarget::EXECUTABLE)
+    if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
       {
       this->WriteTargetLinkLibraries();
       }
@@ -215,13 +215,13 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
   std::string outputDir(this->GetOutputDirectory(config));
   std::string outputFilename(this->GetOutputFilename(config));
 
-  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
                                    << outputDir << outputFilename << ".a\""
                                    << std::endl;
     }
-  else if (this->Target->GetType() == cmTarget::EXECUTABLE)
+  else if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     if (notKernel && !this->IsTargetGroup())
       {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3691b41..7cf0ad0 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -137,7 +137,7 @@ void cmLocalGenerator::TraceDependencies()
       t != targets.end(); ++t)
     {
     if (t->second->Target->IsImported()
-        || t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+        || t->second->GetType() == cmTarget::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -472,7 +472,7 @@ void cmLocalGenerator::ComputeTargetManifest()
       t != targets.end(); ++t)
     {
     cmGeneratorTarget& target = *t->second;
-    if (target.Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (target.GetType() == cmTarget::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 721f239..195a1e0 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -31,7 +31,7 @@ void cmLocalGhsMultiGenerator::Generate()
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
     {
-    if (l->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (l->second->GetType() == cmTarget::INTERFACE_LIBRARY
         || l->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 8d71469..8f7a66f 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -77,7 +77,7 @@ void cmLocalNinjaGenerator::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (t->second->GetType() == cmTarget::INTERFACE_LIBRARY
         || t->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 91c7acd..e4533cc 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -119,7 +119,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (t->second->GetType() == cmTarget::INTERFACE_LIBRARY
         || t->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 8b60a23..cb19d9b 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -26,7 +26,7 @@ cmMakefileLibraryTargetGenerator
   cmMakefileTargetGenerator(target)
 {
   this->CustomCommandDriver = OnDepends;
-  if (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
     this->GeneratorTarget->GetLibraryNames(
       this->TargetNameOut, this->TargetNameSO, this->TargetNameReal,
@@ -62,7 +62,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
 
   // write the link rules
   // Write the rule for this target type.
-  switch(this->Target->GetType())
+  switch(this->GeneratorTarget->GetType())
     {
     case cmTarget::STATIC_LIBRARY:
       this->WriteStaticLibraryRules();
@@ -253,8 +253,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   this->LocalGenerator->AppendFlags(linkFlags, extraFlags);
 
   // Add OSX version flags, if any.
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "COMPATIBILITY", true);
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "CURRENT", false);
@@ -351,7 +351,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     // Add the link message.
     std::string buildEcho = "Linking ";
     buildEcho += linkLanguage;
-    switch(this->Target->GetType())
+    switch(this->GeneratorTarget->GetType())
       {
       case cmTarget::STATIC_LIBRARY:
         buildEcho += " static library ";
@@ -375,7 +375,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     }
 
   const char* forbiddenFlagVar = 0;
-  switch(this->Target->GetType())
+  switch(this->GeneratorTarget->GetType())
     {
     case cmTarget::SHARED_LIBRARY:
       forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS";
@@ -429,7 +429,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 #ifdef _WIN32
   // There may be a manifest file for this target.  Add it to the
   // clean set just in case.
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
     {
     libCleanFiles.push_back(
       this->Convert((targetFullPath+".manifest").c_str(),
@@ -441,7 +441,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> commands1;
   // Add a command to remove any existing files for this library.
   // for static libs only
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
                                              *this->Target, "target");
@@ -497,7 +497,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> archiveAppendCommands;
   std::vector<std::string> archiveFinishCommands;
   std::string::size_type archiveCommandLimit = std::string::npos;
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     haveStaticLibraryRule =
       this->Makefile->GetDefinition(linkRuleVar)? true:false;
@@ -552,7 +552,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Collect up flags to link in needed libraries.
   std::string linkLibs;
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
     {
     this->CreateLinkLibs(linkLibs, relink, useResponseFileForLibs, depends,
                          useWatcomQuote);
@@ -566,7 +566,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
                           useWatcomQuote);
 
   // maybe create .def file from list of objects
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -667,7 +667,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Compute the directory portion of the install_name setting.
   std::string install_name_dir;
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir =
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index abcda21..9b0e5dd 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -542,10 +542,10 @@ cmMakefileTargetGenerator
   std::string targetFullPathReal;
   std::string targetFullPathPDB;
   std::string targetFullPathCompilePDB;
-  if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-     this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-     this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     targetFullPathReal =
       this->GeneratorTarget->GetFullPath(this->ConfigName, false, true);
@@ -554,7 +554,7 @@ cmMakefileTargetGenerator
     targetFullPathPDB += "/";
     targetFullPathPDB += this->GeneratorTarget->GetPDBName(this->ConfigName);
     }
-  if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
     {
     targetFullPathCompilePDB =
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
@@ -1445,7 +1445,7 @@ void cmMakefileTargetGenerator
 ::AppendTargetDepends(std::vector<std::string>& depends)
 {
   // Static libraries never depend on anything for linking.
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     return;
     }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index c64fe50..02e47bd 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -87,7 +87,7 @@ void cmNinjaNormalTargetGenerator::Generate()
   // Write the build statements
   this->WriteObjectBuildStatements();
 
-  if(this->GetTarget()->GetType() == cmTarget::OBJECT_LIBRARY)
+  if(this->GetGeneratorTarget()->GetType() == cmTarget::OBJECT_LIBRARY)
     {
     this->WriteObjectLibStatement();
     }
@@ -103,7 +103,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
   cmGlobalNinjaGenerator::WriteDivider(this->GetRulesFileStream());
   this->GetRulesFileStream()
     << "# Rules for each languages for "
-    << cmTarget::GetTargetTypeName(this->GetTarget()->GetType())
+    << cmTarget::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
@@ -133,7 +133,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
 
 const char *cmNinjaNormalTargetGenerator::GetVisibleTypeName() const
 {
-  switch (this->GetTarget()->GetType()) {
+  switch (this->GetGeneratorTarget()->GetType()) {
     case cmTarget::STATIC_LIBRARY:
       return "static library";
     case cmTarget::SHARED_LIBRARY:
@@ -156,7 +156,8 @@ cmNinjaNormalTargetGenerator
 {
   return this->TargetLinkLanguage
     + "_"
-    + cmTarget::GetTargetTypeName(this->GetTarget()->GetType())
+    + cmTarget::GetTargetTypeName(
+        (cmTarget::TargetType)this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
     + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
     ;
@@ -166,7 +167,8 @@ void
 cmNinjaNormalTargetGenerator
 ::WriteLinkRule(bool useResponseFile)
 {
-  cmTarget::TargetType targetType = this->GetTarget()->GetType();
+  cmTarget::TargetType targetType =
+      (cmTarget::TargetType)this->GetGeneratorTarget()->GetType();
   std::string ruleName = this->LanguageLinkerRule();
 
   // Select whether to use a response file for objects.
@@ -330,7 +332,7 @@ cmNinjaNormalTargetGenerator
     return linkCmds;
     }
   }
-  switch (this->GetTarget()->GetType()) {
+  switch (this->GetGeneratorTarget()->GetType()) {
     case cmTarget::STATIC_LIBRARY: {
       // We have archive link commands set. First, delete the existing archive.
       {
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4080d90..ec90ba5 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -189,8 +189,8 @@ ComputeDefines(cmSourceFile const* source, const std::string& language)
 cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
 {
   // Static libraries never depend on other targets for linking.
-  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-      this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+      this->GeneratorTarget->GetType() == cmTarget::OBJECT_LIBRARY)
     return cmNinjaDeps();
 
   cmComputeLinkInformation* cli =
@@ -283,16 +283,16 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
     {
     std::string pdbPath;
     std::string compilePdbPath;
-    if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-       this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-       this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+    if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+       this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
       {
       pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName());
       pdbPath += "/";
       pdbPath += this->GeneratorTarget->GetPDBName(this->GetConfigName());
       }
-    if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
       {
       compilePdbPath =
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
@@ -480,7 +480,8 @@ cmNinjaTargetGenerator
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
   this->GetBuildFileStream()
     << "# Object build statements for "
-    << cmTarget::GetTargetTypeName(this->GetTarget()->GetType())
+    << cmTarget::GetTargetTypeName(
+         (cmTarget::TargetType)this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a2aada6..3ef5f2e 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -269,7 +269,7 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
 void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
-  if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(this->GeneratorTarget->GetType() == cmTarget::INTERFACE_LIBRARY
       || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
@@ -278,7 +278,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
   this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
-  if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
     {
     if(!this->ComputeClOptions())
       {
@@ -360,7 +360,8 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ProjectGUID>", 2);
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
-  if(this->MSTools && this->Target->GetType() <= cmTarget::GLOBAL_TARGET)
+  if(this->MSTools
+     && this->GeneratorTarget->GetType() <= cmTarget::GLOBAL_TARGET)
     {
     this->WriteApplicationTypeSettings();
     this->VerifyNecessaryFiles();
@@ -666,7 +667,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
                                  i->c_str(),
                                  1, " Label=\"Configuration\"", "\n");
     std::string configType = "<ConfigurationType>";
-    switch(this->Target->GetType())
+    switch(this->GeneratorTarget->GetType())
       {
       case cmTarget::SHARED_LIBRARY:
       case cmTarget::MODULE_LIBRARY:
@@ -743,7 +744,7 @@ void cmVisualStudio10TargetGenerator
   mfcLine += useOfMfcValue + "</UseOfMfc>\n";
   this->WriteString(mfcLine.c_str(), 2);
 
-  if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY &&
+  if((this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
      this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
@@ -752,7 +753,7 @@ void cmVisualStudio10TargetGenerator
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
-  else if (this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
+  else if (this->GeneratorTarget->GetType() <= cmTarget::MODULE_LIBRARY &&
            this->ClOptions[config]->UsingSBCS())
     {
     this->WriteString("<CharacterSet>NotSet</CharacterSet>\n", 2);
@@ -1480,7 +1481,7 @@ void cmVisualStudio10TargetGenerator::WriteSources(
 
 void cmVisualStudio10TargetGenerator::WriteAllSources()
 {
-  if(this->Target->GetType() > cmTarget::UTILITY)
+  if(this->GeneratorTarget->GetType() > cmTarget::UTILITY)
     {
     return;
     }
@@ -1742,7 +1743,8 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmTarget::TargetType ttype = this->Target->GetType();
+  cmTarget::TargetType ttype =
+      (cmTarget::TargetType)this->GeneratorTarget->GetType();
   if(ttype > cmTarget::GLOBAL_TARGET)
     {
     return;
@@ -1827,8 +1829,8 @@ OutputLinkIncremental(std::string const& configName)
     }
   // static libraries and things greater than modules do not need
   // to set this option
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -1966,8 +1968,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
-      if (this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->Target->GetType() == cmTarget::MODULE_LIBRARY )
+      if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+          this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY )
         {
         clOptions.AddDefine("_WINRT_DLL");
         }
@@ -2175,8 +2177,8 @@ WriteMasmOptions(std::string const& configName,
 void
 cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 {
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->Target->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY &&
+     this->GeneratorTarget->GetType() != cmTarget::OBJECT_LIBRARY)
     {
     return;
     }
@@ -2212,9 +2214,9 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 void cmVisualStudio10TargetGenerator::WriteManifestOptions(
   std::string const& config)
 {
-  if (this->Target->GetType() != cmTarget::EXECUTABLE &&
-      this->Target->GetType() != cmTarget::SHARED_LIBRARY &&
-      this->Target->GetType() != cmTarget::MODULE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE &&
+      this->GeneratorTarget->GetType() != cmTarget::SHARED_LIBRARY &&
+      this->GeneratorTarget->GetType() != cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2380,9 +2382,9 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 //----------------------------------------------------------------------------
 bool cmVisualStudio10TargetGenerator::ComputeLinkOptions()
 {
-  if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-     this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     for(std::vector<std::string>::const_iterator
           i = this->Configurations.begin();
@@ -2419,11 +2421,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string CONFIG = cmSystemTools::UpperCase(config);
 
   const char* linkType = "SHARED";
-  if(this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     linkType = "MODULE";
     }
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     linkType = "EXE";
     }
@@ -2506,7 +2508,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string targetNameFull;
   std::string targetNameImport;
   std::string targetNamePDB;
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     this->GeneratorTarget->GetExecutableNames(targetName, targetNameFull,
                                      targetNameImport, targetNamePDB,
@@ -2529,7 +2531,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2551,7 +2553,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2597,7 +2599,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
     if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
-       this->Target->GetType() != cmTarget::EXECUTABLE)
+       this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2635,7 +2637,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
                            "%(IgnoreSpecificDefaultLibraries)");
     }
 
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2652,8 +2654,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 void
 cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 {
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2691,7 +2693,7 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
       libVec.push_back(path);
       }
     else if (!l->Target
-        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
       {
       libVec.push_back(l->Value);
       }
@@ -2763,7 +2765,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WritePlatformConfigTag("ItemDefinitionGroup", i->c_str(), 1);
     *this->BuildFileStream << "\n";
     //    output cl compile flags <ClCompile></ClCompile>
-    if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
       {
       this->WriteClOptions(*i, includes);
       //    output rc compile flags <ResourceCompile></ResourceCompile>
@@ -2781,7 +2783,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     //    output manifest flags  <Manifest></Manifest>
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
-       this->Target->GetType() == cmTarget::EXECUTABLE &&
+       this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE &&
        this->Target->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
@@ -2794,7 +2796,7 @@ void
 cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
 {
   bool addedPrelink = false;
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -3002,7 +3004,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
       this->GlobalGenerator->TargetsWindowsPhone())
-      && (cmTarget::EXECUTABLE == this->Target->GetType()))
+      && (cmTarget::EXECUTABLE == this->GeneratorTarget->GetType()))
     {
     std::string pfxFile;
     std::vector<cmSourceFile const*> certificates;
@@ -3131,7 +3133,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>14.0"
         "</MinimumVisualStudioVersion>\n", 2);
 
-      if(this->Target->GetType() < cmTarget::UTILITY)
+      if(this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3145,7 +3147,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (this->Target->GetType() < cmTarget::UTILITY)
+      if (this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3159,12 +3161,13 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>11.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (isWindowsStore && this->Target->GetType() < cmTarget::UTILITY)
+      if (isWindowsStore
+          && this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
       else if (isWindowsPhone &&
-               this->Target->GetType() == cmTarget::EXECUTABLE)
+               this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
         {
         this->WriteString("<XapOutputs>true</XapOutputs>\n", 2);
         this->WriteString("<XapFilename>", 2);
@@ -3221,7 +3224,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
 {
   // For Windows and Windows Phone executables, we will assume that if a
   // manifest is not present that we need to add all the necessary files
-  if (this->Target->GetType() == cmTarget::EXECUTABLE)
+  if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     std::vector<cmSourceFile const*> manifestSources;
     this->GeneratorTarget->GetAppManifest(manifestSources, "");

-----------------------------------------------------------------------

Summary of changes:
 Source/cmAddExecutableCommand.cxx             |    6 +-
 Source/cmAddLibraryCommand.cxx                |   64 +++----
 Source/cmCPluginAPI.cxx                       |    8 +-
 Source/cmCommonTargetGenerator.cxx            |    2 +-
 Source/cmComputeLinkDepends.cxx               |   20 +--
 Source/cmComputeLinkDepends.h                 |    2 +-
 Source/cmComputeLinkInformation.cxx           |   38 ++--
 Source/cmComputeTargetDepends.cxx             |   22 +--
 Source/cmCoreTryCompile.cxx                   |   12 +-
 Source/cmCustomCommandGenerator.cxx           |    2 +-
 Source/cmExportBuildFileGenerator.cxx         |    8 +-
 Source/cmExportCommand.cxx                    |    4 +-
 Source/cmExportFileGenerator.cxx              |   18 +-
 Source/cmExportInstallFileGenerator.cxx       |    6 +-
 Source/cmExportLibraryDependenciesCommand.cxx |   10 +-
 Source/cmExportTryCompileFileGenerator.cxx    |    2 +-
 Source/cmExtraCodeBlocksGenerator.cxx         |   40 ++---
 Source/cmExtraCodeLiteGenerator.cxx           |   16 +-
 Source/cmExtraEclipseCDT4Generator.cxx        |   28 +--
 Source/cmExtraKateGenerator.cxx               |   14 +-
 Source/cmExtraSublimeTextGenerator.cxx        |   14 +-
 Source/cmGeneratorExpressionNode.cxx          |   18 +-
 Source/cmGeneratorTarget.cxx                  |  148 ++++++++--------
 Source/cmGeneratorTarget.h                    |    2 +-
 Source/cmGhsMultiTargetGenerator.cxx          |    8 +-
 Source/cmGlobalGenerator.cxx                  |   26 +--
 Source/cmGlobalKdevelopGenerator.cxx          |    2 +-
 Source/cmGlobalNinjaGenerator.cxx             |   18 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx     |   70 ++++----
 Source/cmGlobalVisualStudio11Generator.cxx    |    6 +-
 Source/cmGlobalVisualStudio11Generator.h      |    2 +-
 Source/cmGlobalVisualStudio6Generator.cxx     |    2 +-
 Source/cmGlobalVisualStudio71Generator.cxx    |    2 +-
 Source/cmGlobalVisualStudio71Generator.h      |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx     |   12 +-
 Source/cmGlobalVisualStudio7Generator.h       |    2 +-
 Source/cmGlobalVisualStudio8Generator.cxx     |   12 +-
 Source/cmGlobalVisualStudio8Generator.h       |    4 +-
 Source/cmGlobalVisualStudioGenerator.cxx      |   20 +--
 Source/cmGlobalXCodeGenerator.cxx             |  132 +++++++-------
 Source/cmGraphVizWriter.cxx                   |   18 +-
 Source/cmGraphVizWriter.h                     |    2 +-
 Source/cmIncludeExternalMSProjectCommand.cxx  |    2 +-
 Source/cmInstallCommand.cxx                   |   26 +--
 Source/cmInstallTargetGenerator.cxx           |   37 ++--
 Source/cmLinkLibrariesCommand.cxx             |    4 +-
 Source/cmLocalGenerator.cxx                   |   64 +++----
 Source/cmLocalGhsMultiGenerator.cxx           |    2 +-
 Source/cmLocalNinjaGenerator.cxx              |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx      |   18 +-
 Source/cmLocalVisualStudio10Generator.cxx     |    2 +-
 Source/cmLocalVisualStudio6Generator.cxx      |  110 ++++++------
 Source/cmLocalVisualStudio7Generator.cxx      |   76 ++++----
 Source/cmLocalVisualStudioGenerator.cxx       |    4 +-
 Source/cmMakefile.cxx                         |   66 +++----
 Source/cmMakefile.h                           |   10 +-
 Source/cmMakefileLibraryTargetGenerator.cxx   |   42 ++---
 Source/cmMakefileTargetGenerator.cxx          |   24 +--
 Source/cmNinjaNormalTargetGenerator.cxx       |   51 +++---
 Source/cmNinjaTargetGenerator.cxx             |   30 ++--
 Source/cmStandardIncludes.h                   |    6 +
 Source/cmState.cxx                            |   27 +++
 Source/cmState.h                              |    8 +
 Source/cmTarget.cxx                           |  236 ++++++++++---------------
 Source/cmTarget.h                             |   29 ++-
 Source/cmTargetLinkLibrariesCommand.cxx       |   36 ++--
 Source/cmTargetLinkLibrariesCommand.h         |    2 +-
 Source/cmTargetPropCommandBase.cxx            |   14 +-
 Source/cmTestGenerator.cxx                    |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx    |  106 +++++------
 Source/cmake.cxx                              |    2 +-
 71 files changed, 939 insertions(+), 943 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 14 18:34:18 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 14 Oct 2015 18:34:18 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-557-gb0fc765
Message-ID: <20151014223418.E03D8C0557@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b0fc765ebda20e896101790d38a4ba3205412549 (commit)
       via  7f5ec9f109dc66bc22ac377a7fb57d9221aed56b (commit)
       via  06f56d3bf5d8210d190e1bfcf05673ceb78c5594 (commit)
       via  c8f8f16541f3ac6af3397f3a78ee68fc963af151 (commit)
       via  9f299a1225798f6485ab77c9140bf9c1d589e2fe (commit)
      from  0a462a9684f3138b712dc7738f160b479ce08f84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0fc765ebda20e896101790d38a4ba3205412549
commit b0fc765ebda20e896101790d38a4ba3205412549
Merge: 0a462a9 7f5ec9f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 18:34:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 18:34:16 2015 -0400

    Merge topic 'GetTargetDirectory-cmGeneratorTarget' into next
    
    7f5ec9f1 cmLocalGenerator: Port GetTargetDirectory to cmGeneratorTarget.
    06f56d3b cmLocalUnixMakefileGenerator3: Port AppendCleanCommand to cmGeneratorTarget.
    c8f8f165 cmLocalUnixMakefileGenerator3: Port another API to cmGeneratorTarget.
    9f299a12 cmLocalUnixMakefileGenerator3: Port API to cmGenertorTarget.

diff --cc Source/cmExtraCodeBlocksGenerator.cxx
index 5775602,cdb4d8b..3bc76fa
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@@ -352,13 -352,15 +352,15 @@@ void cmExtraCodeBlocksGenerato
            this->AppendTarget(fout, ti->first, 0,
                                   make.c_str(), *lg, compiler.c_str());
            break;
 -        case cmTarget::EXECUTABLE:
 -        case cmTarget::STATIC_LIBRARY:
 -        case cmTarget::SHARED_LIBRARY:
 -        case cmTarget::MODULE_LIBRARY:
 -        case cmTarget::OBJECT_LIBRARY:
 +        case cmState::EXECUTABLE:
 +        case cmState::STATIC_LIBRARY:
 +        case cmState::SHARED_LIBRARY:
 +        case cmState::MODULE_LIBRARY:
 +        case cmState::OBJECT_LIBRARY:
            {
-           this->AppendTarget(fout, ti->first, &ti->second,
+           cmGeneratorTarget* gt =
+               this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+           this->AppendTarget(fout, ti->first, gt,
                               make.c_str(), *lg, compiler.c_str());
            std::string fastTarget = ti->first;
            fastTarget += "/fast";
@@@ -559,9 -561,9 +561,9 @@@ void cmExtraCodeBlocksGenerator::Append
    fout<<"      <Target title=\"" << targetName << "\">\n";
    if (target!=0)
      {
-     int cbTargetType = this->GetCBTargetType(target);
+     int cbTargetType = this->GetCBTargetType(target->Target);
      std::string workingDir = lg->GetCurrentBinaryDirectory();
 -    if ( target->GetType()==cmTarget::EXECUTABLE)
 +    if ( target->GetType()==cmState::EXECUTABLE)
        {
        // Determine the directory where the executable target is created, and
        // set the working directory to this dir.
diff --cc Source/cmGlobalUnixMakefileGenerator3.cxx
index 4674fcd,a0ad72d..ee31e28
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@@ -428,14 -426,15 +426,15 @@@ void cmGlobalUnixMakefileGenerator
      for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
           l != lg->GetMakefile()->GetTargets().end(); l++)
        {
 -      if((l->second.GetType() == cmTarget::EXECUTABLE) ||
 -         (l->second.GetType() == cmTarget::STATIC_LIBRARY) ||
 -         (l->second.GetType() == cmTarget::SHARED_LIBRARY) ||
 -         (l->second.GetType() == cmTarget::MODULE_LIBRARY) ||
 -         (l->second.GetType() == cmTarget::OBJECT_LIBRARY) ||
 -         (l->second.GetType() == cmTarget::UTILITY))
 +      if((l->second.GetType() == cmState::EXECUTABLE) ||
 +         (l->second.GetType() == cmState::STATIC_LIBRARY) ||
 +         (l->second.GetType() == cmState::SHARED_LIBRARY) ||
 +         (l->second.GetType() == cmState::MODULE_LIBRARY) ||
 +         (l->second.GetType() == cmState::OBJECT_LIBRARY) ||
 +         (l->second.GetType() == cmState::UTILITY))
          {
-         std::string tname = lg->GetRelativeTargetDirectory(l->second);
+         cmGeneratorTarget* gt = this->GetGeneratorTarget(&l->second);
+         std::string tname = lg->GetRelativeTargetDirectory(gt);
          tname += "/DependInfo.cmake";
          cmSystemTools::ConvertToUnixSlashes(tname);
          cmakefileStream << "  \"" << tname << "\"\n";
diff --cc Source/cmLocalVisualStudio7Generator.cxx
index e891c33,65f42c2..1122919
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@@ -1109,11 -1109,11 +1109,11 @@@ void cmLocalVisualStudio7Generator::Out
      }
    switch(target.GetType())
      {
 -    case cmTarget::UNKNOWN_LIBRARY:
 +    case cmState::UNKNOWN_LIBRARY:
        break;
 -    case cmTarget::OBJECT_LIBRARY:
 +    case cmState::OBJECT_LIBRARY:
        {
-       std::string libpath = this->GetTargetDirectory(target);
+       std::string libpath = this->GetTargetDirectory(gt);
        libpath += "/";
        libpath += configName;
        libpath += "/";
diff --cc Source/cmMakefileLibraryTargetGenerator.cxx
index 0b38656,1278dcd..a0aa10b
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@@ -441,10 -441,10 +441,10 @@@ void cmMakefileLibraryTargetGenerator::
    std::vector<std::string> commands1;
    // Add a command to remove any existing files for this library.
    // for static libs only
 -  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
 +  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
      {
      this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
-                                              *this->Target, "target");
+                                              this->GeneratorTarget, "target");
      this->LocalGenerator->CreateCDCommand
        (commands1,
         this->Makefile->GetCurrentBinaryDirectory(),

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f5ec9f109dc66bc22ac377a7fb57d9221aed56b
commit 7f5ec9f109dc66bc22ac377a7fb57d9221aed56b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:27:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:33:12 2015 +0200

    cmLocalGenerator: Port GetTargetDirectory to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index f901414..06838fd 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -403,7 +403,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
         cmMakefile* mf = linkee->Target->GetMakefile();
         std::string di = mf->GetCurrentBinaryDirectory();
         di += "/";
-        di += lg->GetTargetDirectory(*linkee->Target);
+        di += lg->GetTargetDirectory(linkee);
         dirs.push_back(di);
         }
       }
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 0406644..cdb4d8b 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -358,11 +358,13 @@ void cmExtraCodeBlocksGenerator
         case cmTarget::MODULE_LIBRARY:
         case cmTarget::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, ti->first, &ti->second,
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          this->AppendTarget(fout, ti->first, gt,
                              make.c_str(), *lg, compiler.c_str());
           std::string fastTarget = ti->first;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, &ti->second,
+          this->AppendTarget(fout, fastTarget, gt,
                              make.c_str(), *lg, compiler.c_str());
           }
           break;
@@ -521,14 +523,14 @@ void cmExtraCodeBlocksGenerator
 // Write a dummy file for OBJECT libraries, so C::B can reference some file
 std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
                                         cmLocalGenerator* lg,
-                                        cmTarget* target) const
+                                        cmGeneratorTarget* target) const
 {
   // this file doesn't seem to be used by C::B in custom makefile mode,
   // but we generate a unique file for each OBJECT library so in case
   // C::B uses it in some way, the targets don't interfere with each other.
   std::string filename = lg->GetCurrentBinaryDirectory();
   filename += "/";
-  filename += lg->GetTargetDirectory(*target);
+  filename += lg->GetTargetDirectory(target);
   filename += "/";
   filename += target->GetName();
   filename += ".objlib";
@@ -547,7 +549,7 @@ std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
 // Generate the xml code for one target.
 void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
                                               const std::string& targetName,
-                                              cmTarget* target,
+                                              cmGeneratorTarget* target,
                                               const char* make,
                                               const cmLocalGenerator* lg,
                                               const char* compiler)
@@ -559,7 +561,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
-    int cbTargetType = this->GetCBTargetType(target);
+    int cbTargetType = this->GetCBTargetType(target->Target);
     std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmTarget::EXECUTABLE)
       {
@@ -591,9 +593,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
       }
     else
       {
-      cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(target);
-      location = gt->GetLocation(buildType);
+      location = target->GetLocation(buildType);
       }
 
     fout<<"         <Option output=\"" << location
@@ -604,12 +604,9 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
           "         <Option compiler=\"" << compiler << "\" />\n"
           "         <Compiler>\n";
 
-    cmGeneratorTarget *gtgt = this->GlobalGenerator
-                                  ->GetGeneratorTarget(target);
-
     // the compilerdefines for this target
     std::vector<std::string> cdefs;
-    gtgt->GetCompileDefinitions(cdefs, buildType, "C");
+    target->GetCompileDefinitions(cdefs, buildType, "C");
 
     // Expand the list.
     for(std::vector<std::string>::const_iterator di = cdefs.begin();
@@ -623,7 +620,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
     std::set<std::string> uniqIncludeDirs;
 
     std::vector<std::string> includes;
-    lg->GetIncludeDirectories(includes, gtgt, "C", buildType);
+    lg->GetIncludeDirectories(includes, target, "C", buildType);
 
     uniqIncludeDirs.insert(includes.begin(), includes.end());
 
diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h
index e5ede9a..f28809a 100644
--- a/Source/cmExtraCodeBlocksGenerator.h
+++ b/Source/cmExtraCodeBlocksGenerator.h
@@ -17,6 +17,7 @@
 
 class cmLocalGenerator;
 class cmMakefile;
+class cmGeneratorTarget;
 class cmTarget;
 class cmGeneratedFileStream;
 
@@ -49,7 +50,7 @@ private:
   void CreateNewProjectFile(const std::vector<cmLocalGenerator*>& lgs,
                                 const std::string& filename);
   std::string CreateDummyTargetFile(cmLocalGenerator* lg,
-                                    cmTarget* target) const;
+                                    cmGeneratorTarget* target) const;
 
   std::string GetCBCompilerId(const cmMakefile* mf);
   int GetCBTargetType(cmTarget* target);
@@ -57,7 +58,7 @@ private:
                                const std::string& target);
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string& targetName,
-                    cmTarget* target,
+                    cmGeneratorTarget* target,
                     const char* make,
                     const cmLocalGenerator* lg,
                     const char* compiler);
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index b7aeb02..44efbfc 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -1100,7 +1100,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
-          cleanArgs += (*it)->GetTargetDirectory(ti->second);
+          cmGeneratorTarget* gt =
+              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cleanArgs += (*it)->GetTargetDirectory(gt);
           cleanArgs += "/cmake_clean.cmake\"";
           this->AppendTarget(fout, "Clean", cmSystemTools::GetCMakeCommand(),
                              cleanArgs, virtDir, "", "");
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 32e6077..de640a4 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -717,13 +717,11 @@ std::string cmGlobalNinjaGenerator::GetEditCacheCommand() const
 void cmGlobalNinjaGenerator
 ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const
 {
-  cmTarget* target = gt->Target;
-
   // Compute full path to object file directory for this target.
   std::string dir;
   dir += gt->Makefile->GetCurrentBinaryDirectory();
   dir += "/";
-  dir += gt->LocalGenerator->GetTargetDirectory(*target);
+  dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
   gt->ObjectDirectory = dir;
 }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 129dc42..a0ad72d 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -114,13 +114,11 @@ void
 cmGlobalUnixMakefileGenerator3
 ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const
 {
-  cmTarget* target = gt->Target;
-
   // Compute full path to object file directory for this target.
   std::string dir;
   dir += gt->Makefile->GetCurrentBinaryDirectory();
   dir += "/";
-  dir += gt->LocalGenerator->GetTargetDirectory(*target);
+  dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
   gt->ObjectDirectory = dir;
 }
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index fa9c606..a30a2e7 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -147,7 +147,7 @@ void cmGlobalVisualStudioGenerator
 {
   std::string dir = gt->Makefile->GetCurrentBinaryDirectory();
   dir += "/";
-  std::string tgtDir = gt->LocalGenerator->GetTargetDirectory(*gt->Target);
+  std::string tgtDir = gt->LocalGenerator->GetTargetDirectory(gt);
   if(!tgtDir.empty())
     {
     dir += tgtDir;
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3691b41..a84ce8e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2908,7 +2908,7 @@ const char* cmLocalGenerator::GetCurrentSourceDirectory() const
 
 //----------------------------------------------------------------------------
 std::string
-cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
+cmLocalGenerator::GetTargetDirectory(const cmGeneratorTarget*) const
 {
   cmSystemTools::Error("GetTargetDirectory"
                        " called on cmLocalGenerator");
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 97e3f88..ee0a618 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -247,7 +247,8 @@ public:
    * Get the relative path from the generator output directory to a
    * per-target support directory.
    */
-  virtual std::string GetTargetDirectory(cmTarget const& target) const;
+  virtual std::string
+  GetTargetDirectory(cmGeneratorTarget const* target) const;
 
   /**
    * Get the level of backwards compatibility requested by the project
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 8d71469..71d3426 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -100,10 +100,10 @@ void cmLocalNinjaGenerator::Generate()
 
 // TODO: Picked up from cmLocalUnixMakefileGenerator3.  Refactor it.
 std::string cmLocalNinjaGenerator
-::GetTargetDirectory(cmTarget const& target) const
+::GetTargetDirectory(cmGeneratorTarget const* target) const
 {
   std::string dir = cmake::GetCMakeFilesDirectoryPostSlash();
-  dir += target.GetName();
+  dir += target->GetName();
 #if defined(__VMS)
   dir += "_dir";
 #else
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index 1645a8d..ce5f82d 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -37,7 +37,8 @@ public:
 
   virtual void Generate();
 
-  virtual std::string GetTargetDirectory(cmTarget const& target) const;
+  virtual
+  std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
 
   const cmGlobalNinjaGenerator* GetGlobalNinjaGenerator() const;
   cmGlobalNinjaGenerator* GetGlobalNinjaGenerator();
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 2e7a134..36602d8 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -191,7 +191,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
     std::string dir;
     dir += gt->Makefile->GetCurrentBinaryDirectory();
     dir += "/";
-    dir += this->GetTargetDirectory(*gt->Target);
+    dir += this->GetTargetDirectory(gt);
     dir += "/";
     // Compute the name of each object file.
     for(std::vector<cmSourceFile const*>::iterator
@@ -936,7 +936,7 @@ cmLocalUnixMakefileGenerator3
 ::GetRelativeTargetDirectory(cmGeneratorTarget* target)
 {
   std::string dir = this->HomeRelativeOutputPath;
-  dir += this->GetTargetDirectory(*target->Target);
+  dir += this->GetTargetDirectory(target);
   return this->Convert(dir,NONE,UNCHANGED);
 }
 
@@ -1222,7 +1222,7 @@ cmLocalUnixMakefileGenerator3
 {
   std::string cleanfile = this->Makefile->GetCurrentBinaryDirectory();
   cleanfile += "/";
-  cleanfile += this->GetTargetDirectory(target->Target);
+  cleanfile += this->GetTargetDirectory(target);
   cleanfile += "/cmake_clean";
   if(filename)
     {
@@ -1261,7 +1261,7 @@ cmLocalUnixMakefileGenerator3
     fout << "\n"
          << "# Per-language clean rules from dependency scanning.\n"
          << "foreach(lang " << cmJoin(languages, " ") << ")\n"
-         << "  include(" << this->GetTargetDirectory(target->Target)
+         << "  include(" << this->GetTargetDirectory(target)
          << "/cmake_clean_${lang}.cmake OPTIONAL)\n"
          << "endforeach()\n";
     }
@@ -2282,10 +2282,10 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
 //----------------------------------------------------------------------------
 std::string
 cmLocalUnixMakefileGenerator3
-::GetTargetDirectory(cmTarget const& target) const
+::GetTargetDirectory(cmGeneratorTarget const* target) const
 {
   std::string dir = cmake::GetCMakeFilesDirectoryPostSlash();
-  dir += target.GetName();
+  dir += target->GetName();
 #if defined(__VMS)
   dir += "_dir";
 #else
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 032e501..586dda0 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -106,7 +106,8 @@ public:
   /** Get whether the makefile is to have color.  */
   bool GetColorMakefile() const { return this->ColorMakefile; }
 
-  virtual std::string GetTargetDirectory(cmTarget const& target) const;
+  virtual
+  std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
 
     // create a command that cds to the start dir then runs the commands
   void CreateCDCommand(std::vector<std::string>& commands,
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 6ecd9a8..c7e9923 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1939,7 +1939,7 @@ void cmLocalVisualStudio6Generator
 
 std::string
 cmLocalVisualStudio6Generator
-::GetTargetDirectory(cmTarget const&) const
+::GetTargetDirectory(cmGeneratorTarget const*) const
 {
   // No per-target directory for this generator (yet).
   return "";
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index 828d252..b3b61bb 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -49,7 +49,8 @@ public:
    */
   void SetBuildType(BuildType, const std::string& libName, cmTarget&);
 
-  virtual std::string GetTargetDirectory(cmTarget const& target) const;
+  virtual
+  std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
 private:
   std::string DSPHeaderTemplate;
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 82b18c6..65f42c2 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -784,7 +784,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
   // The intermediate directory name consists of a directory for the
   // target and a subdirectory for the configuration name.
-  std::string intermediateDir = this->GetTargetDirectory(target);
+  std::string intermediateDir = this->GetTargetDirectory(gt);
   intermediateDir += "/";
   intermediateDir += configName;
 
@@ -1113,7 +1113,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       break;
     case cmTarget::OBJECT_LIBRARY:
       {
-      std::string libpath = this->GetTargetDirectory(target);
+      std::string libpath = this->GetTargetDirectory(gt);
       libpath += "/";
       libpath += configName;
       libpath += "/";
@@ -1725,7 +1725,9 @@ cmLocalVisualStudio7Generator
   std::string dir_max;
   dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
-  dir_max += this->GetTargetDirectory(target);
+  cmGeneratorTarget* gt =
+    this->GlobalGenerator->GetGeneratorTarget(&target);
+  dir_max += this->GetTargetDirectory(gt);
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
@@ -2369,10 +2371,10 @@ void cmLocalVisualStudio7Generator::ReadAndStoreExternalGUID(
 
 //----------------------------------------------------------------------------
 std::string cmLocalVisualStudio7Generator
-::GetTargetDirectory(cmTarget const& target) const
+::GetTargetDirectory(cmGeneratorTarget const* target) const
 {
   std::string dir;
-  dir += target.GetName();
+  dir += target->GetName();
   dir += ".dir";
   return dir;
 }
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index bc05a06..ba6a72b 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -53,7 +53,8 @@ public:
    */
   void SetBuildType(BuildType,const std::string& name);
 
-  virtual std::string GetTargetDirectory(cmTarget const&) const;
+  virtual
+  std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   cmSourceFile* CreateVCProjBuildRule();
   void WriteStampFiles();
   virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 70997bf..3b430d2 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -31,7 +31,7 @@ cmLocalXCodeGenerator::~cmLocalXCodeGenerator()
 
 //----------------------------------------------------------------------------
 std::string
-cmLocalXCodeGenerator::GetTargetDirectory(cmTarget const&) const
+cmLocalXCodeGenerator::GetTargetDirectory(cmGeneratorTarget const*) const
 {
   // No per-target directory for this generator (yet).
   return "";
diff --git a/Source/cmLocalXCodeGenerator.h b/Source/cmLocalXCodeGenerator.h
index 6d0926f..4381a6d 100644
--- a/Source/cmLocalXCodeGenerator.h
+++ b/Source/cmLocalXCodeGenerator.h
@@ -28,7 +28,8 @@ public:
                         cmMakefile* mf);
 
   virtual ~cmLocalXCodeGenerator();
-  virtual std::string GetTargetDirectory(cmTarget const& target) const;
+  virtual
+  std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   virtual void AppendFlagEscape(std::string& flags,
                                 const std::string& rawFlag);
   virtual void Generate();
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 007a997..1ed3e49 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -92,7 +92,7 @@ void cmMakefileTargetGenerator::CreateRuleFile()
 {
   // Create a directory for this target.
   this->TargetBuildDirectory =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+    this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->TargetBuildDirectoryFull =
     this->LocalGenerator->ConvertToFullPath(this->TargetBuildDirectory);
   cmSystemTools::MakeDirectory(this->TargetBuildDirectoryFull.c_str());
@@ -378,7 +378,8 @@ void cmMakefileTargetGenerator
   // Get the full path name of the object file.
   std::string const& objectName = this->GeneratorTarget
                                       ->GetObjectName(&source);
-  std::string obj = this->LocalGenerator->GetTargetDirectory(*this->Target);
+  std::string obj =
+      this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   obj += "/";
   obj += objectName;
 
@@ -1024,7 +1025,8 @@ bool cmMakefileTargetGenerator::WriteMakeRule(
 void cmMakefileTargetGenerator::WriteTargetDependRules()
 {
   // must write the targets depend info file
-  std::string dir = this->LocalGenerator->GetTargetDirectory(*this->Target);
+  std::string dir =
+      this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->InfoFileNameFull = dir;
   this->InfoFileNameFull += "/DependInfo.cmake";
   this->InfoFileNameFull =
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4080d90..e26ce51 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -245,7 +245,7 @@ cmNinjaTargetGenerator
     path += "/";
   std::string const& objectName = this->GeneratorTarget
                                       ->GetObjectName(source);
-  path += this->LocalGenerator->GetTargetDirectory(*this->Target);
+  path += this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   path += "/";
   path += objectName;
   return path;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a2aada6..7c65146 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -196,7 +196,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->IsMissingFiles = false;
   this->DefaultArtifactDir =
     this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") +
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+    this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
 }
 
 cmVisualStudio10TargetGenerator::~cmVisualStudio10TargetGenerator()
@@ -1765,7 +1765,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
     else
       {
       std::string intermediateDir = this->LocalGenerator->
-        GetTargetDirectory(*this->Target);
+        GetTargetDirectory(this->GeneratorTarget);
       intermediateDir += "/";
       intermediateDir += *config;
       intermediateDir += "/";
@@ -3021,7 +3021,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
       {
       // Move the manifest to a project directory to avoid clashes
       std::string artifactDir =
-        this->LocalGenerator->GetTargetDirectory(*this->Target);
+        this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
       this->ConvertToWindowsSlash(artifactDir);
       this->WriteString("<PropertyGroup>\n", 1);
       this->WriteString("<AppxPackageArtifactsDir>", 2);
@@ -3320,7 +3320,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
       this->LocalGenerator->GetCurrentBinaryDirectory() +
                              std::string("/WMAppManifest.xml");
   std::string artifactDir =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+    this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
   std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
@@ -3403,7 +3403,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP81()
   std::string manifestFile =
     this->DefaultArtifactDir + "/package.appxManifest";
   std::string artifactDir =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+    this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
   std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
@@ -3463,7 +3463,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
   std::string manifestFile =
     this->DefaultArtifactDir + "/package.appxManifest";
   std::string artifactDir =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+    this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
   std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
@@ -3515,7 +3515,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
   std::string manifestFile =
     this->DefaultArtifactDir + "/package.appxManifest";
   std::string artifactDir =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+    this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
   std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
@@ -3572,7 +3572,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
   std::string manifestFile =
     this->DefaultArtifactDir + "/package.appxManifest";
   std::string artifactDir =
-    this->LocalGenerator->GetTargetDirectory(*this->Target);
+    this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
   std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06f56d3bf5d8210d190e1bfcf05673ceb78c5594
commit 06f56d3bf5d8210d190e1bfcf05673ceb78c5594
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 00:23:53 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:23:53 2015 +0200

    cmLocalUnixMakefileGenerator3: Port AppendCleanCommand to cmGeneratorTarget.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index f0373e0..2e7a134 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1218,11 +1218,11 @@ void
 cmLocalUnixMakefileGenerator3
 ::AppendCleanCommand(std::vector<std::string>& commands,
                      const std::vector<std::string>& files,
-                     cmTarget& target, const char* filename)
+                     cmGeneratorTarget* target, const char* filename)
 {
   std::string cleanfile = this->Makefile->GetCurrentBinaryDirectory();
   cleanfile += "/";
-  cleanfile += this->GetTargetDirectory(target);
+  cleanfile += this->GetTargetDirectory(target->Target);
   cleanfile += "/cmake_clean";
   if(filename)
     {
@@ -1256,14 +1256,12 @@ cmLocalUnixMakefileGenerator3
     {
     // Get the set of source languages in the target.
     std::set<std::string> languages;
-    cmGeneratorTarget *gtgt =
-        this->GlobalGenerator->GetGeneratorTarget(&target);
-    gtgt->GetLanguages(languages,
+    target->GetLanguages(languages,
                       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     fout << "\n"
          << "# Per-language clean rules from dependency scanning.\n"
          << "foreach(lang " << cmJoin(languages, " ") << ")\n"
-         << "  include(" << this->GetTargetDirectory(target)
+         << "  include(" << this->GetTargetDirectory(target->Target)
          << "/cmake_clean_${lang}.cmake OPTIONAL)\n"
          << "endforeach()\n";
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index fb5ac2f..032e501 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -226,7 +226,7 @@ protected:
                            std::ostream* content = 0);
   void AppendCleanCommand(std::vector<std::string>& commands,
                           const std::vector<std::string>& files,
-                          cmTarget& target, const char* filename =0);
+                          cmGeneratorTarget* target, const char* filename =0);
 
   // Helper methods for dependeny updates.
   bool ScanDependencies(const char* targetDir,
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 8b60a23..1278dcd 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -444,7 +444,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
     {
     this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
-                                             *this->Target, "target");
+                                             this->GeneratorTarget, "target");
     this->LocalGenerator->CreateCDCommand
       (commands1,
        this->Makefile->GetCurrentBinaryDirectory(),
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 94d583b..007a997 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -932,7 +932,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
 
   // Construct the clean command.
   this->LocalGenerator->AppendCleanCommand(commands, this->CleanFiles,
-                                           *this->Target);
+                                           this->GeneratorTarget);
   this->LocalGenerator->CreateCDCommand
     (commands,
      this->LocalGenerator->GetCurrentBinaryDirectory(),

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8f8f16541f3ac6af3397f3a78ee68fc963af151
commit c8f8f16541f3ac6af3397f3a78ee68fc963af151
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 00:12:53 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:20:16 2015 +0200

    cmLocalUnixMakefileGenerator3: Port another API to cmGeneratorTarget.

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index d6f6490..129dc42 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -435,7 +435,8 @@ void cmGlobalUnixMakefileGenerator3
          (l->second.GetType() == cmTarget::OBJECT_LIBRARY) ||
          (l->second.GetType() == cmTarget::UTILITY))
         {
-        std::string tname = lg->GetRelativeTargetDirectory(l->second);
+        cmGeneratorTarget* gt = this->GetGeneratorTarget(&l->second);
+        std::string tname = lg->GetRelativeTargetDirectory(gt);
         tname += "/DependInfo.cmake";
         cmSystemTools::ConvertToUnixSlashes(tname);
         cmakefileStream << "  \"" << tname << "\"\n";
@@ -484,7 +485,7 @@ cmGlobalUnixMakefileGenerator3
           gtarget
             ->NeedRelinkBeforeInstall(lg->GetConfigName())))
         {
-        std::string tname = lg->GetRelativeTargetDirectory(*gtarget->Target);
+        std::string tname = lg->GetRelativeTargetDirectory(gtarget);
         tname += "/";
         tname += pass;
         depends.push_back(tname);
@@ -673,7 +674,7 @@ cmGlobalUnixMakefileGenerator3
 
         // Add a fast rule to build the target
         std::string localName =
-                          lg->GetRelativeTargetDirectory(*gtarget->Target);
+                          lg->GetRelativeTargetDirectory(gtarget);
         std::string makefileName;
         makefileName = localName;
         makefileName += "/build.make";
@@ -693,7 +694,7 @@ cmGlobalUnixMakefileGenerator3
         if(gtarget
              ->NeedRelinkBeforeInstall(lg->GetConfigName()))
           {
-          makeTargetName = lg->GetRelativeTargetDirectory(*gtarget->Target);
+          makeTargetName = lg->GetRelativeTargetDirectory(gtarget);
           makeTargetName += "/preinstall";
           localName = name;
           localName += "/preinstall";
@@ -750,7 +751,7 @@ cmGlobalUnixMakefileGenerator3
       {
       std::string makefileName;
       // Add a rule to build the target by name.
-      localName = lg->GetRelativeTargetDirectory(*gtarget->Target);
+      localName = lg->GetRelativeTargetDirectory(gtarget);
       makefileName = localName;
       makefileName += "/build.make";
 
@@ -861,7 +862,7 @@ cmGlobalUnixMakefileGenerator3
       }
       depends.clear();
       depends.push_back("cmake_check_build_system");
-      localName = lg->GetRelativeTargetDirectory(*gtarget->Target);
+      localName = lg->GetRelativeTargetDirectory(gtarget);
       localName += "/rule";
       lg->WriteMakeRule(ruleFileStream,
                         "Build rule for subdir invocation for target.",
@@ -878,7 +879,7 @@ cmGlobalUnixMakefileGenerator3
       if(gtarget
            ->NeedRelinkBeforeInstall(lg->GetConfigName()))
         {
-        localName = lg->GetRelativeTargetDirectory(*gtarget->Target);
+        localName = lg->GetRelativeTargetDirectory(gtarget);
         localName += "/preinstall";
         depends.clear();
         commands.clear();
@@ -899,7 +900,7 @@ cmGlobalUnixMakefileGenerator3
         }
 
       // add the clean rule
-      localName = lg->GetRelativeTargetDirectory(*gtarget->Target);
+      localName = lg->GetRelativeTargetDirectory(gtarget);
       makeTargetName = localName;
       makeTargetName += "/clean";
       depends.clear();
@@ -1066,7 +1067,8 @@ cmGlobalUnixMakefileGenerator3
       }
     cmLocalUnixMakefileGenerator3* lg3 =
       static_cast<cmLocalUnixMakefileGenerator3*>(dep->GetLocalGenerator());
-    std::string tgtName = lg3->GetRelativeTargetDirectory(*(*dep).Target);
+    std::string tgtName =
+        lg3->GetRelativeTargetDirectory(const_cast<cmGeneratorTarget*>(dep));
     tgtName += "/all";
     depends.push_back(tgtName);
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index c08ea8a..f0373e0 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -389,7 +389,7 @@ cmLocalUnixMakefileGenerator3
       t != info.end(); ++t)
     {
     std::string tgtMakefileName =
-      this->GetRelativeTargetDirectory(*(t->Target->Target));
+      this->GetRelativeTargetDirectory(t->Target);
     std::string targetName = tgtMakefileName;
     tgtMakefileName += "/build.make";
     targetName += "/";
@@ -438,7 +438,7 @@ void cmLocalUnixMakefileGenerator3
       emitted.insert(t->second->GetName());
 
       // for subdirs add a rule to build this specific target by name.
-      localName = this->GetRelativeTargetDirectory(*t->second->Target);
+      localName = this->GetRelativeTargetDirectory(t->second);
       localName += "/rule";
       commands.clear();
       depends.clear();
@@ -465,11 +465,11 @@ void cmLocalUnixMakefileGenerator3
 
       // Add a fast rule to build the target
       std::string makefileName =
-                         this->GetRelativeTargetDirectory(*t->second->Target);
+                         this->GetRelativeTargetDirectory(t->second);
       makefileName += "/build.make";
       // make sure the makefile name is suitable for a makefile
       std::string makeTargetName =
-        this->GetRelativeTargetDirectory(*t->second->Target);
+        this->GetRelativeTargetDirectory(t->second);
       makeTargetName += "/build";
       localName = t->second->GetName();
       localName += "/fast";
@@ -487,7 +487,7 @@ void cmLocalUnixMakefileGenerator3
       // installation.
       if(t->second->NeedRelinkBeforeInstall(this->ConfigName))
         {
-        makeTargetName = this->GetRelativeTargetDirectory(*t->second->Target);
+        makeTargetName = this->GetRelativeTargetDirectory(t->second);
         makeTargetName += "/preinstall";
         localName = t->second->GetName();
         localName += "/preinstall";
@@ -933,10 +933,10 @@ cmLocalUnixMakefileGenerator3
 //----------------------------------------------------------------------------
 std::string
 cmLocalUnixMakefileGenerator3
-::GetRelativeTargetDirectory(cmTarget const& target)
+::GetRelativeTargetDirectory(cmGeneratorTarget* target)
 {
   std::string dir = this->HomeRelativeOutputPath;
-  dir += this->GetTargetDirectory(target);
+  dir += this->GetTargetDirectory(*target->Target);
   return this->Convert(dir,NONE,UNCHANGED);
 }
 
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 82dedbd..fb5ac2f 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -131,7 +131,7 @@ public:
   void WriteSpecialTargetsTop(std::ostream& makefileStream);
   void WriteSpecialTargetsBottom(std::ostream& makefileStream);
 
-  std::string GetRelativeTargetDirectory(cmTarget const& target);
+  std::string GetRelativeTargetDirectory(cmGeneratorTarget* target);
 
   // File pairs for implicit dependency scanning.  The key of the map
   // is the depender and the value is the explicit dependee.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index abcda21..94d583b 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -870,7 +870,7 @@ cmMakefileTargetGenerator
   temp += ".provides.build";
   std::vector<std::string> r_commands;
   std::string tgtMakefileName =
-    this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
+    this->LocalGenerator->GetRelativeTargetDirectory(this->GeneratorTarget);
   tgtMakefileName += "/build.make";
   r_commands.push_back
     (this->LocalGenerator->GetRecursiveMakeCall(tgtMakefileName.c_str(),
@@ -898,7 +898,7 @@ void cmMakefileTargetGenerator::WriteTargetRequiresRules()
 
   // Construct the name of the dependency generation target.
   std::string depTarget =
-    this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
+    this->LocalGenerator->GetRelativeTargetDirectory(this->GeneratorTarget);
   depTarget += "/requires";
 
   // This target drives dependency generation for all object files.
@@ -927,7 +927,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
 
   // Construct the clean target name.
   std::string cleanTarget =
-    this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
+    this->LocalGenerator->GetRelativeTargetDirectory(this->GeneratorTarget);
   cleanTarget += "/clean";
 
   // Construct the clean command.
@@ -1086,7 +1086,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
 
   // Construct the name of the dependency generation target.
   std::string depTarget =
-    this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
+    this->LocalGenerator->GetRelativeTargetDirectory(this->GeneratorTarget);
   depTarget += "/depend";
 
   // Add a command to call CMake to scan dependencies.  CMake will
@@ -1400,7 +1400,7 @@ void cmMakefileTargetGenerator::WriteTargetDriverRule(
 {
   // Compute the name of the driver target.
   std::string dir =
-    this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
+    this->LocalGenerator->GetRelativeTargetDirectory(this->GeneratorTarget);
   std::string buildTargetRuleName = dir;
   buildTargetRuleName += relink?"/preinstall":"/build";
   buildTargetRuleName = this->Convert(buildTargetRuleName,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f299a1225798f6485ab77c9140bf9c1d589e2fe
commit 9f299a1225798f6485ab77c9140bf9c1d589e2fe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 00:11:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:11:21 2015 +0200

    cmLocalUnixMakefileGenerator3: Port API to cmGenertorTarget.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 91c7acd..c08ea8a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -209,7 +209,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
         }
       LocalObjectInfo& info = localObjectFiles[objectName];
       info.HasSourceExtension = hasSourceExtension;
-      info.push_back(LocalObjectEntry(gt->Target, sf->GetLanguage()));
+      info.push_back(LocalObjectEntry(gt, sf->GetLanguage()));
       }
     }
 }
@@ -389,7 +389,7 @@ cmLocalUnixMakefileGenerator3
       t != info.end(); ++t)
     {
     std::string tgtMakefileName =
-      this->GetRelativeTargetDirectory(*(t->Target));
+      this->GetRelativeTargetDirectory(*(t->Target->Target));
     std::string targetName = tgtMakefileName;
     tgtMakefileName += "/build.make";
     targetName += "/";
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 98f15e6..82dedbd 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -254,10 +254,10 @@ private:
 
   struct LocalObjectEntry
   {
-    cmTarget* Target;
+    cmGeneratorTarget* Target;
     std::string Language;
     LocalObjectEntry(): Target(0), Language() {}
-    LocalObjectEntry(cmTarget* t, const std::string& lang):
+    LocalObjectEntry(cmGeneratorTarget* t, const std::string& lang):
       Target(t), Language(lang) {}
   };
   struct LocalObjectInfo: public std::vector<LocalObjectEntry>

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx          |    2 +-
 Source/cmExtraCodeBlocksGenerator.cxx       |   25 +++++++++++--------------
 Source/cmExtraCodeBlocksGenerator.h         |    5 +++--
 Source/cmExtraEclipseCDT4Generator.cxx      |    4 +++-
 Source/cmGlobalNinjaGenerator.cxx           |    4 +---
 Source/cmGlobalUnixMakefileGenerator3.cxx   |   24 ++++++++++++------------
 Source/cmGlobalVisualStudioGenerator.cxx    |    2 +-
 Source/cmLocalGenerator.cxx                 |    2 +-
 Source/cmLocalGenerator.h                   |    3 ++-
 Source/cmLocalNinjaGenerator.cxx            |    4 ++--
 Source/cmLocalNinjaGenerator.h              |    3 ++-
 Source/cmLocalUnixMakefileGenerator3.cxx    |   26 ++++++++++++--------------
 Source/cmLocalUnixMakefileGenerator3.h      |   11 ++++++-----
 Source/cmLocalVisualStudio6Generator.cxx    |    2 +-
 Source/cmLocalVisualStudio6Generator.h      |    3 ++-
 Source/cmLocalVisualStudio7Generator.cxx    |   12 +++++++-----
 Source/cmLocalVisualStudio7Generator.h      |    3 ++-
 Source/cmLocalXCodeGenerator.cxx            |    2 +-
 Source/cmLocalXCodeGenerator.h              |    3 ++-
 Source/cmMakefileLibraryTargetGenerator.cxx |    2 +-
 Source/cmMakefileTargetGenerator.cxx        |   20 +++++++++++---------
 Source/cmNinjaTargetGenerator.cxx           |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx  |   16 ++++++++--------
 23 files changed, 93 insertions(+), 87 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 14 18:40:40 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 14 Oct 2015 18:40:40 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-559-g6606505
Message-ID: <20151014224040.4D502BF202@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6606505bd2c76d205d4ca46ee652c196cbbddb77 (commit)
       via  cad6dffc83775ea51b0f8e3acee5062233a8b693 (commit)
      from  b0fc765ebda20e896101790d38a4ba3205412549 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6606505bd2c76d205d4ca46ee652c196cbbddb77
commit 6606505bd2c76d205d4ca46ee652c196cbbddb77
Merge: b0fc765 cad6dff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 18:40:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 18:40:39 2015 -0400

    Merge topic 'clean-up-cmTarget' into next
    
    cad6dffc fixup! cmState: Move TargetType enum from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cad6dffc83775ea51b0f8e3acee5062233a8b693
commit cad6dffc83775ea51b0f8e3acee5062233a8b693
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 00:40:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:40:20 2015 +0200

    fixup! cmState: Move TargetType enum from cmTarget.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index bbb0126..6abac5d 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2692,7 +2692,7 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
       libVec.push_back(path);
       }
     else if (!l->Target
-        || l->GeneratorTarget->GetType() != cmState::INTERFACE_LIBRARY)
+        || l->Target->GetType() != cmState::INTERFACE_LIBRARY)
       {
       libVec.push_back(l->Value);
       }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 14 18:42:34 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 14 Oct 2015 18:42:34 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-569-g4d19575
Message-ID: <20151014224234.6403FBFB3D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4d19575c6be1f07347dbb99d74a48a1306ffc975 (commit)
       via  55474e6182b49acc4183fffdebccc7ae2a7335fa (commit)
       via  38df5c36d66313a5dd7859c1c55a41f60f141b13 (commit)
       via  4ee2b2670854b071c8b8ceafb2a4a00f72069ef9 (commit)
       via  eac15298a80b814e9d5fd0077a8c5bbcbd05a8c6 (commit)
       via  482b3811e4e6043c71632b560f2e773289eeb320 (commit)
       via  2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f (commit)
       via  a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d (commit)
       via  6694d99376c8fa7ff327a6b07787cef1bea9b93b (commit)
       via  983c00f8f97260e7650fcc440047b33898f0363c (commit)
      from  6606505bd2c76d205d4ca46ee652c196cbbddb77 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d19575c6be1f07347dbb99d74a48a1306ffc975
commit 4d19575c6be1f07347dbb99d74a48a1306ffc975
Merge: 6606505 55474e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 18:42:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 18:42:31 2015 -0400

    Merge topic 'clean-up-cmTarget' into next
    
    55474e61 cmState: Move GetTargetTypeName from cmTarget.
    38df5c36 Remove now-obsolete casts.
    4ee2b267 cmGeneratorTarget: Use enum for GetType.
    eac15298 cmState: Move TargetType enum from cmTarget.
    482b3811 cmTarget: Move link type enum out.
    2ee1cb85 cmTarget: Move ImportInfoMap out of internal class.
    a48bcabd cmTarget: Move backtrace member out of internal class.
    6694d993 cmTarget: Remove unneeded constructors.
    983c00f8 Generators: Use GetType from the cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55474e6182b49acc4183fffdebccc7ae2a7335fa
commit 55474e6182b49acc4183fffdebccc7ae2a7335fa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:26:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:41:40 2015 +0200

    cmState: Move GetTargetTypeName from cmTarget.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 138e630..f6de2ab 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -554,8 +554,7 @@ cmComputeTargetDepends
 
     // Describe the depender.
     e << "  \"" << depender->GetName() << "\" of type "
-      << cmTarget::GetTargetTypeName(
-           depender->GetType()) << "\n";
+      << cmState::GetTargetTypeName(depender->GetType()) << "\n";
 
     // List its dependencies that are inside the component.
     EdgeList const& nl = this->InitialGraph[i];
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index de3f992..5bb0f99 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -107,7 +107,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
             this->Makefile->IssueMessage(cmake::FATAL_ERROR,
               "Only libraries may be used as try_compile or try_run IMPORTED "
               "LINK_LIBRARIES.  Got " + std::string(tgt->GetName()) + " of "
-              "type " + tgt->GetTargetTypeName(tgt->GetType()) + ".");
+              "type " + cmState::GetTargetTypeName(tgt->GetType()) + ".");
             return -1;
           }
         if (tgt->IsImported())
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f5c5191..ba42591 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1965,7 +1965,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
     std::string msg = "cmTarget::GetCompileInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(this->GetType());
+    msg += cmState::GetTargetTypeName(this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -4697,7 +4697,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(this->GetType());
+    msg += cmState::GetTargetTypeName(this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2a12f2b..5e0ea8b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -760,7 +760,7 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
       }
     if(variable == "TARGET_TYPE")
       {
-      return cmTarget::GetTargetTypeName(replaceValues.CMTarget->GetType());
+      return cmState::GetTargetTypeName(replaceValues.CMTarget->GetType());
       }
     }
   if(replaceValues.Output)
@@ -2134,7 +2134,7 @@ void cmLocalGenerator
     w <<
       cmPolicies::GetPolicyWarning(cmPolicies::CMP0063) << "\n"
       "Target \"" << target->GetName() << "\" of "
-      "type \"" << cmTarget::GetTargetTypeName(target->GetType()) << "\" "
+      "type \"" << cmState::GetTargetTypeName(target->GetType()) << "\" "
       "has the following visibility properties set for " << lang << ":\n" <<
       warnCMP0063 <<
       "For compatibility CMake is not honoring them for this target.";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 8f656b4..a1f143a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1426,7 +1426,7 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
         {
         std::ostringstream e;
         e << "Target \"" << lib << "\" of type "
-          << cmTarget::GetTargetTypeName(tgt->GetType())
+          << cmState::GetTargetTypeName(tgt->GetType())
           << " may not be linked into another target.  "
           << "One may link only to STATIC or SHARED libraries, or "
           << "to executables with the ENABLE_EXPORTS property set.";
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index c5dfe2d..066c64e 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -103,7 +103,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
   cmGlobalNinjaGenerator::WriteDivider(this->GetRulesFileStream());
   this->GetRulesFileStream()
     << "# Rules for each languages for "
-    << cmTarget::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
+    << cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
@@ -156,8 +156,7 @@ cmNinjaNormalTargetGenerator
 {
   return this->TargetLinkLanguage
     + "_"
-    + cmTarget::GetTargetTypeName(
-        this->GetGeneratorTarget()->GetType())
+    + cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
     + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
     ;
@@ -446,7 +445,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   const cmState::TargetType targetType = target.GetType();
   this->GetBuildFileStream()
     << "# Link build statements for "
-    << cmTarget::GetTargetTypeName(targetType)
+    << cmState::GetTargetTypeName(targetType)
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 0d6afff..63c1490 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -480,8 +480,7 @@ cmNinjaTargetGenerator
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
   this->GetBuildFileStream()
     << "# Object build statements for "
-    << cmTarget::GetTargetTypeName(
-         this->GetGeneratorTarget()->GetType())
+    << cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 825204c..c491c7d 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -101,6 +101,33 @@ cmState::~cmState()
   cmDeleteAll(this->Commands);
 }
 
+const char* cmState::GetTargetTypeName(cmState::TargetType targetType)
+{
+  switch( targetType )
+    {
+      case cmState::STATIC_LIBRARY:
+        return "STATIC_LIBRARY";
+      case cmState::MODULE_LIBRARY:
+        return "MODULE_LIBRARY";
+      case cmState::SHARED_LIBRARY:
+        return "SHARED_LIBRARY";
+      case cmState::OBJECT_LIBRARY:
+        return "OBJECT_LIBRARY";
+      case cmState::EXECUTABLE:
+        return "EXECUTABLE";
+      case cmState::UTILITY:
+        return "UTILITY";
+      case cmState::GLOBAL_TARGET:
+        return "GLOBAL_TARGET";
+      case cmState::INTERFACE_LIBRARY:
+        return "INTERFACE_LIBRARY";
+      case cmState::UNKNOWN_LIBRARY:
+        return "UNKNOWN_LIBRARY";
+    }
+  assert(0 && "Unexpected target type");
+  return 0;
+}
+
 const char* cmCacheEntryTypes[] =
 { "BOOL",
   "PATH",
diff --git a/Source/cmState.h b/Source/cmState.h
index 0fe4812..7d1fc80 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -187,6 +187,8 @@ public:
                     INTERFACE_LIBRARY,
                     UNKNOWN_LIBRARY};
 
+  static const char* GetTargetTypeName(cmState::TargetType targetType);
+
   Snapshot CreateBaseSnapshot();
   Snapshot
   CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index eeced8d..fecdc45 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -33,33 +33,6 @@
 #define UNORDERED_SET std::set
 #endif
 
-const char* cmTarget::GetTargetTypeName(cmState::TargetType targetType)
-{
-  switch( targetType )
-    {
-      case cmState::STATIC_LIBRARY:
-        return "STATIC_LIBRARY";
-      case cmState::MODULE_LIBRARY:
-        return "MODULE_LIBRARY";
-      case cmState::SHARED_LIBRARY:
-        return "SHARED_LIBRARY";
-      case cmState::OBJECT_LIBRARY:
-        return "OBJECT_LIBRARY";
-      case cmState::EXECUTABLE:
-        return "EXECUTABLE";
-      case cmState::UTILITY:
-        return "UTILITY";
-      case cmState::GLOBAL_TARGET:
-        return "GLOBAL_TARGET";
-      case cmState::INTERFACE_LIBRARY:
-        return "INTERFACE_LIBRARY";
-      case cmState::UNKNOWN_LIBRARY:
-        return "UNKNOWN_LIBRARY";
-    }
-  assert(0 && "Unexpected target type");
-  return 0;
-}
-
 //----------------------------------------------------------------------------
 class cmTargetInternals
 {
@@ -1892,7 +1865,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
     // the type property returns what type the target is
     else if (prop == propTYPE)
       {
-      return cmTarget::GetTargetTypeName(this->GetType());
+      return cmState::GetTargetTypeName(this->GetType());
       }
     else if(prop == propINCLUDE_DIRECTORIES)
       {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index e5646f6..c0b9e09 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -77,7 +77,6 @@ class cmTarget
 {
 public:
   cmTarget();
-  static const char* GetTargetTypeName(cmState::TargetType targetType);
   enum CustomCommandType { PRE_BUILD, PRE_LINK, POST_BUILD };
 
   /**

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38df5c36d66313a5dd7859c1c55a41f60f141b13
commit 38df5c36d66313a5dd7859c1c55a41f60f141b13
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 23:44:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:41:40 2015 +0200

    Remove now-obsolete casts.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 05fc800..138e630 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -555,7 +555,7 @@ cmComputeTargetDepends
     // Describe the depender.
     e << "  \"" << depender->GetName() << "\" of type "
       << cmTarget::GetTargetTypeName(
-           (cmState::TargetType)depender->GetType()) << "\n";
+           depender->GetType()) << "\n";
 
     // List its dependencies that are inside the component.
     EdgeList const& nl = this->InitialGraph[i];
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index aa6f54b..e3253da 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1632,7 +1632,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
       return std::string();
       }
 
-    cmState::TargetType targetType = (cmState::TargetType)target->GetType();
+    cmState::TargetType targetType = target->GetType();
 
     if(targetType != cmState::SHARED_LIBRARY &&
        targetType != cmState::MODULE_LIBRARY &&
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dc02734..f5c5191 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1965,7 +1965,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
     std::string msg = "cmTarget::GetCompileInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName((cmState::TargetType)this->GetType());
+    msg += cmTarget::GetTargetTypeName(this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -4697,7 +4697,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(cmState::TargetType(this->GetType()));
+    msg += cmTarget::GetTargetTypeName(this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 66b6fc7..2f08165 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -94,8 +94,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   std::vector<std::string> filesFrom;
   std::vector<std::string> filesTo;
   std::string literal_args;
-  cmState::TargetType targetType =
-      static_cast<cmState::TargetType>(this->Target->GetType());
+  cmState::TargetType targetType = this->Target->GetType();
   cmInstallType type = cmInstallType();
   switch(targetType)
     {
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index b5648fe..c5dfe2d 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -157,7 +157,7 @@ cmNinjaNormalTargetGenerator
   return this->TargetLinkLanguage
     + "_"
     + cmTarget::GetTargetTypeName(
-        (cmState::TargetType)this->GetGeneratorTarget()->GetType())
+        this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
     + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
     ;
@@ -168,7 +168,7 @@ cmNinjaNormalTargetGenerator
 ::WriteLinkRule(bool useResponseFile)
 {
   cmState::TargetType targetType =
-      (cmState::TargetType)this->GetGeneratorTarget()->GetType();
+      this->GetGeneratorTarget()->GetType();
   std::string ruleName = this->LanguageLinkerRule();
 
   // Select whether to use a response file for objects.
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 1028196..0d6afff 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -481,7 +481,7 @@ cmNinjaTargetGenerator
   this->GetBuildFileStream()
     << "# Object build statements for "
     << cmTarget::GetTargetTypeName(
-         (cmState::TargetType)this->GetGeneratorTarget()->GetType())
+         this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 1b62821..6abac5d 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1743,8 +1743,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmState::TargetType ttype =
-      (cmState::TargetType)this->GeneratorTarget->GetType();
+  cmState::TargetType ttype = this->GeneratorTarget->GetType();
   if(ttype > cmState::GLOBAL_TARGET)
     {
     return;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ee2b2670854b071c8b8ceafb2a4a00f72069ef9
commit 4ee2b2670854b071c8b8ceafb2a4a00f72069ef9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:23:34 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:41:40 2015 +0200

    cmGeneratorTarget: Use enum for GetType.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dce2091..dc02734 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -323,7 +323,7 @@ cmLocalGenerator* cmGeneratorTarget::GetLocalGenerator() const
 }
 
 //----------------------------------------------------------------------------
-int cmGeneratorTarget::GetType() const
+cmState::TargetType cmGeneratorTarget::GetType() const
 {
   return this->Target->GetType();
 }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 258c556..05a7d4d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -41,7 +41,7 @@ public:
   cmComputeLinkInformation*
     GetLinkInformation(const std::string& config) const;
 
-  int GetType() const;
+  cmState::TargetType GetType() const;
   std::string GetName() const;
   const char *GetProperty(const std::string& prop) const;
   bool GetPropertyAsBool(const std::string& prop) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eac15298a80b814e9d5fd0077a8c5bbcbd05a8c6
commit eac15298a80b814e9d5fd0077a8c5bbcbd05a8c6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 00:21:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:41:39 2015 +0200

    cmState: Move TargetType enum from cmTarget.
    
    Mostly automated:
    
     values=( "EXECUTABLE" "STATIC_LIBRARY" "SHARED_LIBRARY" "MODULE_LIBRARY" "OBJECT_LIBRARY" "UTILITY" "GLOBAL_TARGET" "INTERFACE_LIBRARY" "UNKNOWN_LIBRARY" "TargetType")
     for i in "${values[@]}"; do     git grep -l cmTarget::$i | xargs sed -i "s|cmTarget::$i|cmState::$i|g"; done

diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index d15fc1e..47f6592 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -174,8 +174,8 @@ bool cmAddExecutableCommand
       this->SetError(e.str());
       return false;
       }
-    cmTarget::TargetType type = aliasedTarget->GetType();
-    if(type != cmTarget::EXECUTABLE)
+    cmState::TargetType type = aliasedTarget->GetType();
+    if(type != cmState::EXECUTABLE)
       {
       std::ostringstream e;
       e << "cannot create ALIAS target \"" << exename
@@ -210,7 +210,7 @@ bool cmAddExecutableCommand
       }
 
     // Create the imported target.
-    this->Makefile->AddImportedTarget(exename, cmTarget::EXECUTABLE,
+    this->Makefile->AddImportedTarget(exename, cmState::EXECUTABLE,
                                       importGlobal);
     return true;
     }
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index a844cf1..e0adee3 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -25,10 +25,10 @@ bool cmAddLibraryCommand
     }
   // Library type defaults to value of BUILD_SHARED_LIBS, if it exists,
   // otherwise it defaults to static library.
-  cmTarget::TargetType type = cmTarget::SHARED_LIBRARY;
+  cmState::TargetType type = cmState::SHARED_LIBRARY;
   if (cmSystemTools::IsOff(this->Makefile->GetDefinition("BUILD_SHARED_LIBS")))
     {
-    type = cmTarget::STATIC_LIBRARY;
+    type = cmState::STATIC_LIBRARY;
     }
   bool excludeFromAll = false;
   bool importTarget = false;
@@ -50,7 +50,7 @@ bool cmAddLibraryCommand
     std::string libType = *s;
     if(libType == "STATIC")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting STATIC type.";
@@ -58,12 +58,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::STATIC_LIBRARY;
+      type = cmState::STATIC_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "SHARED")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting SHARED type.";
@@ -71,12 +71,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::SHARED_LIBRARY;
+      type = cmState::SHARED_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "MODULE")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting MODULE type.";
@@ -84,12 +84,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::MODULE_LIBRARY;
+      type = cmState::MODULE_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "OBJECT")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting OBJECT type.";
@@ -97,12 +97,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::OBJECT_LIBRARY;
+      type = cmState::OBJECT_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "UNKNOWN")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting UNKNOWN type.";
@@ -110,12 +110,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::UNKNOWN_LIBRARY;
+      type = cmState::UNKNOWN_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(libType == "ALIAS")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library specified with conflicting ALIAS type.";
@@ -149,12 +149,12 @@ bool cmAddLibraryCommand
         return false;
         }
       ++s;
-      type = cmTarget::INTERFACE_LIBRARY;
+      type = cmState::INTERFACE_LIBRARY;
       haveSpecifiedType = true;
       }
     else if(*s == "EXCLUDE_FROM_ALL")
       {
-      if (type == cmTarget::INTERFACE_LIBRARY)
+      if (type == cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "INTERFACE library may not be used with EXCLUDE_FROM_ALL.";
@@ -174,7 +174,7 @@ bool cmAddLibraryCommand
       ++s;
       importGlobal = true;
       }
-    else if(type == cmTarget::INTERFACE_LIBRARY && *s == "GLOBAL")
+    else if(type == cmState::INTERFACE_LIBRARY && *s == "GLOBAL")
       {
       std::ostringstream e;
       e << "GLOBAL option may only be used with IMPORTED libraries.";
@@ -187,7 +187,7 @@ bool cmAddLibraryCommand
       }
     }
 
-  if (type == cmTarget::INTERFACE_LIBRARY)
+  if (type == cmState::INTERFACE_LIBRARY)
     {
     if (s != args.end())
       {
@@ -220,7 +220,7 @@ bool cmAddLibraryCommand
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037))
       {
       case cmPolicies::WARN:
-        if(type != cmTarget::INTERFACE_LIBRARY)
+        if(type != cmState::INTERFACE_LIBRARY)
           {
           e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0037) << "\n";
           issueMessage = true;
@@ -293,12 +293,12 @@ bool cmAddLibraryCommand
       this->SetError(e.str());
       return false;
       }
-    cmTarget::TargetType aliasedType = aliasedTarget->GetType();
-    if(aliasedType != cmTarget::SHARED_LIBRARY
-        && aliasedType != cmTarget::STATIC_LIBRARY
-        && aliasedType != cmTarget::MODULE_LIBRARY
-        && aliasedType != cmTarget::OBJECT_LIBRARY
-        && aliasedType != cmTarget::INTERFACE_LIBRARY)
+    cmState::TargetType aliasedType = aliasedTarget->GetType();
+    if(aliasedType != cmState::SHARED_LIBRARY
+        && aliasedType != cmState::STATIC_LIBRARY
+        && aliasedType != cmState::MODULE_LIBRARY
+        && aliasedType != cmState::OBJECT_LIBRARY
+        && aliasedType != cmState::INTERFACE_LIBRARY)
       {
       std::ostringstream e;
       e << "cannot create ALIAS target \"" << libName
@@ -328,19 +328,19 @@ bool cmAddLibraryCommand
     CMAKE_${LANG}_CREATE_SHARED_LIBRARY is defined and if not default to
     STATIC. But at this point we know only the name of the target, but not
     yet its linker language. */
-  if ((type == cmTarget::SHARED_LIBRARY ||
-       type == cmTarget::MODULE_LIBRARY) &&
+  if ((type == cmState::SHARED_LIBRARY ||
+       type == cmState::MODULE_LIBRARY) &&
        (this->Makefile->GetState()->GetGlobalPropertyAsBool(
                                       "TARGET_SUPPORTS_SHARED_LIBS") == false))
     {
     std::ostringstream w;
     w <<
       "ADD_LIBRARY called with " <<
-      (type==cmTarget::SHARED_LIBRARY ? "SHARED" : "MODULE") <<
+      (type==cmState::SHARED_LIBRARY ? "SHARED" : "MODULE") <<
       " option but the target platform does not support dynamic linking. "
       "Building a STATIC library instead. This may lead to problems.";
     this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
-    type = cmTarget::STATIC_LIBRARY;
+    type = cmState::STATIC_LIBRARY;
     }
 
   // Handle imported target creation.
@@ -352,7 +352,7 @@ bool cmAddLibraryCommand
       this->SetError("called with IMPORTED argument but no library type.");
       return false;
       }
-    if(type == cmTarget::OBJECT_LIBRARY)
+    if(type == cmState::OBJECT_LIBRARY)
       {
       this->Makefile->IssueMessage(
         cmake::FATAL_ERROR,
@@ -360,7 +360,7 @@ bool cmAddLibraryCommand
         );
       return true;
       }
-    if(type == cmTarget::INTERFACE_LIBRARY)
+    if(type == cmState::INTERFACE_LIBRARY)
       {
       if (!cmGeneratorExpression::IsValidTargetName(libName))
         {
@@ -387,7 +387,7 @@ bool cmAddLibraryCommand
     }
 
   // A non-imported target may not have UNKNOWN type.
-  if(type == cmTarget::UNKNOWN_LIBRARY)
+  if(type == cmState::UNKNOWN_LIBRARY)
     {
     this->Makefile->IssueMessage(
       cmake::FATAL_ERROR,
@@ -408,7 +408,7 @@ bool cmAddLibraryCommand
 
   std::vector<std::string> srclists;
 
-  if(type == cmTarget::INTERFACE_LIBRARY)
+  if(type == cmState::INTERFACE_LIBRARY)
     {
     if (!cmGeneratorExpression::IsValidTargetName(libName)
         || libName.find("::") != std::string::npos)
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index e439182..fb78446 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -395,7 +395,7 @@ void CCONV cmAddLibrary(void *arg, const char *libname, int shared,
     srcs2.push_back(srcs[i]);
     }
   mf->AddLibrary(libname,
-                 (shared? cmTarget::SHARED_LIBRARY : cmTarget::STATIC_LIBRARY),
+                 (shared? cmState::SHARED_LIBRARY : cmState::STATIC_LIBRARY),
                   srcs2);
 }
 
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index f901414..fe7299e 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -396,7 +396,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
                 // We can ignore the INTERFACE_LIBRARY items because
                 // Target->GetLinkInformation already processed their
                 // link interface and they don't have any output themselves.
-                && linkee->GetType() != cmTarget::INTERFACE_LIBRARY
+                && linkee->GetType() != cmState::INTERFACE_LIBRARY
                 && emitted.insert(linkee).second)
         {
         cmLocalGenerator* lg = linkee->GetLocalGenerator();
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 742651a..465db92 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -270,7 +270,7 @@ cmComputeLinkDepends::Compute()
     LinkEntry const& e = this->EntryList[i];
     cmGeneratorTarget const* t = e.Target;
     // Entries that we know the linker will re-use do not need to be repeated.
-    bool uniquify = t && t->GetType() == cmTarget::SHARED_LIBRARY;
+    bool uniquify = t && t->GetType() == cmState::SHARED_LIBRARY;
     if(!uniquify || emmitted.insert(i).second)
       {
       this->FinalLinkEntries.push_back(e);
@@ -367,7 +367,7 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe)
        entry.Target->GetLinkInterface(this->Config, this->Target))
       {
       const bool isIface =
-                      entry.Target->GetType() == cmTarget::INTERFACE_LIBRARY;
+                      entry.Target->GetType() == cmState::INTERFACE_LIBRARY;
       // This target provides its own link interface information.
       this->AddLinkEntries(depender_index, iface->Libraries);
 
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 5c252df..7bdc555 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -290,7 +290,7 @@ cmComputeLinkInformation
   // the program that will load it.
   this->LoaderFlag = 0;
   if(!this->UseImportLibrary &&
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+     this->Target->GetType() == cmState::MODULE_LIBRARY)
     {
     std::string loader_flag_var = "CMAKE_SHARED_MODULE_LOADER_";
     loader_flag_var += this->LinkLanguage;
@@ -308,10 +308,10 @@ cmComputeLinkInformation
 
   // Get options needed to specify RPATHs.
   this->RuntimeUseChrpath = false;
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->Target->GetType() != cmState::STATIC_LIBRARY)
     {
     const char* tType =
-      ((this->Target->GetType() == cmTarget::EXECUTABLE)?
+      ((this->Target->GetType() == cmState::EXECUTABLE)?
        "EXECUTABLE" : "SHARED_LIBRARY");
     std::string rtVar = "CMAKE_";
     rtVar += tType;
@@ -480,10 +480,10 @@ cmComputeLinkInformation::GetSharedLibrariesLinked()
 bool cmComputeLinkInformation::Compute()
 {
   // Skip targets that do not link.
-  if(!(this->Target->GetType() == cmTarget::EXECUTABLE ||
-       this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->Target->GetType() == cmTarget::MODULE_LIBRARY ||
-       this->Target->GetType() == cmTarget::STATIC_LIBRARY))
+  if(!(this->Target->GetType() == cmState::EXECUTABLE ||
+       this->Target->GetType() == cmState::SHARED_LIBRARY ||
+       this->Target->GetType() == cmState::MODULE_LIBRARY ||
+       this->Target->GetType() == cmState::STATIC_LIBRARY))
     {
     return false;
     }
@@ -544,7 +544,7 @@ bool cmComputeLinkInformation::Compute()
       cmGeneratorTarget const* tgt = *i;
       bool implib =
         (this->UseImportLibrary &&
-         (tgt->GetType() == cmTarget::SHARED_LIBRARY));
+         (tgt->GetType() == cmState::SHARED_LIBRARY));
       std::string lib = tgt->GetFullPath(this->Config , implib, true);
       this->OldLinkDirItems.push_back(lib);
       }
@@ -660,7 +660,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       this->Items.push_back(Item(linkItem, true, tgt));
       this->Depends.push_back(exe);
       }
-    else if(tgt->GetType() == cmTarget::INTERFACE_LIBRARY)
+    else if(tgt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       // Add the interface library as an item so it can be considered as part
       // of COMPATIBLE_INTERFACE_ enforcement.  The generators will ignore
@@ -672,12 +672,12 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
       // Decide whether to use an import library.
       bool implib =
         (this->UseImportLibrary &&
-         (impexe || tgt->GetType() == cmTarget::SHARED_LIBRARY));
+         (impexe || tgt->GetType() == cmState::SHARED_LIBRARY));
 
       // Pass the full path to the target file.
       std::string lib = tgt->GetFullPath(config, implib, true);
       if(!this->LinkDependsNoShared ||
-         tgt->GetType() != cmTarget::SHARED_LIBRARY)
+         tgt->GetType() != cmState::SHARED_LIBRARY)
         {
         this->Depends.push_back(lib);
         }
@@ -728,7 +728,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
     {
     // The target will provide a full path.  Make sure it is a shared
     // library.
-    if(tgt->GetType() != cmTarget::SHARED_LIBRARY)
+    if(tgt->GetType() != cmState::SHARED_LIBRARY)
       {
       return;
       }
@@ -818,9 +818,9 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
   const char* target_type_str = 0;
   switch(this->Target->GetType())
     {
-    case cmTarget::EXECUTABLE:     target_type_str = "EXE"; break;
-    case cmTarget::SHARED_LIBRARY: target_type_str = "SHARED_LIBRARY"; break;
-    case cmTarget::MODULE_LIBRARY: target_type_str = "SHARED_MODULE"; break;
+    case cmState::EXECUTABLE:     target_type_str = "EXE"; break;
+    case cmState::SHARED_LIBRARY: target_type_str = "SHARED_LIBRARY"; break;
+    case cmState::MODULE_LIBRARY: target_type_str = "SHARED_MODULE"; break;
     default: break;
     }
   if(target_type_str)
@@ -1084,13 +1084,13 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
   // shared and static libraries but static-mode can handle only
   // static libraries.  If a previous user item changed the link type
   // to static we need to make sure it is back to shared.
-  if(target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     this->SetCurrentLinkType(LinkShared);
     }
 
   // Keep track of shared library targets linked.
-  if(target->GetType() == cmTarget::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     this->SharedLibrariesLinked.insert(target);
     }
@@ -1790,14 +1790,14 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath,
 
   // Libraries with unknown type must be handled using just the file
   // on disk.
-  if(target->GetType() == cmTarget::UNKNOWN_LIBRARY)
+  if(target->GetType() == cmState::UNKNOWN_LIBRARY)
     {
     this->AddLibraryRuntimeInfo(fullPath);
     return;
     }
 
   // Skip targets that are not shared libraries (modules cannot be linked).
-  if(target->GetType() != cmTarget::SHARED_LIBRARY)
+  if(target->GetType() != cmState::SHARED_LIBRARY)
     {
     return;
     }
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 4094bf0..05fc800 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -207,7 +207,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
 {
   // Get the depender.
   cmGeneratorTarget const* depender = this->Targets[depender_index];
-  if (depender->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (depender->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
@@ -236,10 +236,10 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
       std::string objLib = (*oi)->GetObjectLibrary();
       if (!objLib.empty() && emitted.insert(objLib).second)
         {
-        if(depender->GetType() != cmTarget::EXECUTABLE &&
-            depender->GetType() != cmTarget::STATIC_LIBRARY &&
-            depender->GetType() != cmTarget::SHARED_LIBRARY &&
-            depender->GetType() != cmTarget::MODULE_LIBRARY)
+        if(depender->GetType() != cmState::EXECUTABLE &&
+            depender->GetType() != cmState::STATIC_LIBRARY &&
+            depender->GetType() != cmState::SHARED_LIBRARY &&
+            depender->GetType() != cmState::MODULE_LIBRARY)
           {
           this->GlobalGenerator->GetCMakeInstance()
             ->IssueMessage(cmake::FATAL_ERROR,
@@ -324,7 +324,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
   // name conflict between an external library and an executable
   // within the project.
   if(dependee &&
-     dependee->GetType() == cmTarget::EXECUTABLE &&
+     dependee->GetType() == cmState::EXECUTABLE &&
      !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
@@ -357,7 +357,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   cmGeneratorTarget const* dependee = dependee_name.Target;
 
   if(!dependee && !linking &&
-    (depender->GetType() != cmTarget::GLOBAL_TARGET))
+    (depender->GetType() != cmState::GLOBAL_TARGET))
     {
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     bool issueMessage = false;
@@ -400,7 +400,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   // name conflict between an external library and an executable
   // within the project.
   if(linking && dependee &&
-     dependee->GetType() == cmTarget::EXECUTABLE &&
+     dependee->GetType() == cmState::EXECUTABLE &&
      !dependee->Target->IsExecutableWithExports())
     {
     dependee = 0;
@@ -418,7 +418,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
                                              bool linking)
 {
   if(dependee->Target->IsImported() ||
-     dependee->GetType() == cmTarget::INTERFACE_LIBRARY)
+     dependee->GetType() == cmState::INTERFACE_LIBRARY)
     {
     // Skip IMPORTED and INTERFACE targets but follow their utility
     // dependencies.
@@ -523,7 +523,7 @@ cmComputeTargetDepends
     // Make sure the component is all STATIC_LIBRARY targets.
     for(NodeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni)
       {
-      if(this->Targets[*ni]->GetType() != cmTarget::STATIC_LIBRARY)
+      if(this->Targets[*ni]->GetType() != cmState::STATIC_LIBRARY)
         {
         this->ComplainAboutBadComponent(ccg, c);
         return false;
@@ -555,7 +555,7 @@ cmComputeTargetDepends
     // Describe the depender.
     e << "  \"" << depender->GetName() << "\" of type "
       << cmTarget::GetTargetTypeName(
-           (cmTarget::TargetType)depender->GetType()) << "\n";
+           (cmState::TargetType)depender->GetType()) << "\n";
 
     // List its dependencies that are inside the component.
     EdgeList const& nl = this->InitialGraph[i];
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 3d9c4bf..de3f992 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -93,12 +93,12 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         {
         switch(tgt->GetType())
           {
-          case cmTarget::SHARED_LIBRARY:
-          case cmTarget::STATIC_LIBRARY:
-          case cmTarget::INTERFACE_LIBRARY:
-          case cmTarget::UNKNOWN_LIBRARY:
+          case cmState::SHARED_LIBRARY:
+          case cmState::STATIC_LIBRARY:
+          case cmState::INTERFACE_LIBRARY:
+          case cmState::UNKNOWN_LIBRARY:
             break;
-          case cmTarget::EXECUTABLE:
+          case cmState::EXECUTABLE:
             if (tgt->IsExecutableWithExports())
               {
               break;
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 618f09f..8f7b480 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -44,7 +44,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
   std::string const& argv0 = this->CC.GetCommandLines()[c][0];
   cmGeneratorTarget* target =
       this->LG->FindGeneratorTargetToUse(argv0);
-  if(target && target->GetType() == cmTarget::EXECUTABLE &&
+  if(target && target->GetType() == cmState::EXECUTABLE &&
      (target->Target->IsImported()
       || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
     {
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 6c3cccd..2d74b97 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -59,7 +59,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
                          this->LG->GetMakefile()->GetBacktrace());
       return false;
       }
-    if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (te->GetType() == cmState::INTERFACE_LIBRARY)
       {
       this->GenerateRequiredCMakeVersion(os, "3.0.0");
       }
@@ -146,14 +146,14 @@ cmExportBuildFileGenerator
     cmGeneratorTarget* target = *tei;
     ImportPropertyMap properties;
 
-    if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
+    if (target->GetType() != cmState::INTERFACE_LIBRARY)
       {
       this->SetImportLocationProperty(config, suffix, target, properties);
       }
     if(!properties.empty())
       {
       // Get the rest of the target details.
-      if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
+      if (target->GetType() != cmState::INTERFACE_LIBRARY)
         {
         this->SetImportDetailProperties(config, suffix,
                                         target,
@@ -216,7 +216,7 @@ cmExportBuildFileGenerator
 
   // Add the import library for windows DLLs.
   if(dll_platform &&
-     (target->GetType() == cmTarget::SHARED_LIBRARY ||
+     (target->GetType() == cmState::SHARED_LIBRARY ||
       target->Target->IsExecutableWithExports()) &&
      mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX"))
     {
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index c2d9cc4..4eec66a 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -168,7 +168,7 @@ bool cmExportCommand
 
       if(cmTarget* target = gg->FindTarget(*currentTarget))
         {
-        if(target->GetType() == cmTarget::OBJECT_LIBRARY)
+        if(target->GetType() == cmState::OBJECT_LIBRARY)
           {
           std::ostringstream e;
           e << "given OBJECT library \"" << *currentTarget
@@ -176,7 +176,7 @@ bool cmExportCommand
           this->SetError(e.str());
           return false;
           }
-        if (target->GetType() == cmTarget::UTILITY)
+        if (target->GetType() == cmState::UTILITY)
           {
           this->SetError("given custom target \"" + *currentTarget
                          + "\" which may not be exported.");
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d6440ac..6127626 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -597,7 +597,7 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
   getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MAX",
                       ifaceProperties);
 
-  if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (target->GetType() != cmState::INTERFACE_LIBRARY)
     {
     getCompatibleInterfaceProperties(gtarget, ifaceProperties, "");
 
@@ -885,8 +885,8 @@ cmExportFileGenerator
   cmMakefile* mf = target->Makefile;
 
   // Add the soname for unix shared libraries.
-  if(target->GetType() == cmTarget::SHARED_LIBRARY ||
-     target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     // Check whether this is a DLL platform.
     bool dll_platform =
@@ -1059,22 +1059,22 @@ cmExportFileGenerator
   os << "# Create imported target " << targetName << "\n";
   switch(target->GetType())
     {
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       os << "add_executable(" << targetName << " IMPORTED)\n";
       break;
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       os << "add_library(" << targetName << " STATIC IMPORTED)\n";
       break;
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       os << "add_library(" << targetName << " SHARED IMPORTED)\n";
       break;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       os << "add_library(" << targetName << " MODULE IMPORTED)\n";
       break;
-    case cmTarget::UNKNOWN_LIBRARY:
+    case cmState::UNKNOWN_LIBRARY:
       os << "add_library(" << targetName << " UNKNOWN IMPORTED)\n";
       break;
-    case cmTarget::INTERFACE_LIBRARY:
+    case cmState::INTERFACE_LIBRARY:
       os << "add_library(" << targetName << " INTERFACE IMPORTED)\n";
       break;
     default:  // should never happen
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 7ffab0c..5a51442 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -134,7 +134,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     cmTarget* te = (*tei)->Target;
 
     requiresConfigFiles = requiresConfigFiles
-                              || te->GetType() != cmTarget::INTERFACE_LIBRARY;
+                              || te->GetType() != cmState::INTERFACE_LIBRARY;
 
     this->GenerateImportTargetCode(os, te);
 
@@ -180,7 +180,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         require2_8_12 = true;
         }
       }
-    if (te->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (te->GetType() == cmState::INTERFACE_LIBRARY)
       {
       require3_0_0 = true;
       }
@@ -337,7 +337,7 @@ cmExportInstallFileGenerator
     {
     // Collect import properties for this target.
     cmTargetExport const* te = *tei;
-    if (te->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (te->Target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index 0ef2ea5..21d961f 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -96,8 +96,8 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
       cmTarget const& target = l->second;
 
       // Skip non-library targets.
-      if(target.GetType() < cmTarget::STATIC_LIBRARY
-         || target.GetType() > cmTarget::MODULE_LIBRARY)
+      if(target.GetType() < cmState::STATIC_LIBRARY
+         || target.GetType() > cmState::MODULE_LIBRARY)
         {
         continue;
         }
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index f8dbe31..70fca2e 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -73,7 +73,7 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
   cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(prop);
 
   cmTarget dummyHead;
-  dummyHead.SetType(cmTarget::EXECUTABLE, "try_compile_dummy_exe");
+  dummyHead.SetType(cmState::EXECUTABLE, "try_compile_dummy_exe");
   dummyHead.SetMakefile(tgt->GetMakefile());
 
   cmGeneratorTarget* gtgt =
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 0406644..5775602 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -326,7 +326,7 @@ void cmExtraCodeBlocksGenerator
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::GLOBAL_TARGET:
+        case cmState::GLOBAL_TARGET:
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
@@ -338,7 +338,7 @@ void cmExtraCodeBlocksGenerator
             }
           }
           break;
-        case cmTarget::UTILITY:
+        case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
           if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
@@ -352,11 +352,11 @@ void cmExtraCodeBlocksGenerator
           this->AppendTarget(fout, ti->first, 0,
                                  make.c_str(), *lg, compiler.c_str());
           break;
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
           {
           this->AppendTarget(fout, ti->first, &ti->second,
                              make.c_str(), *lg, compiler.c_str());
@@ -392,12 +392,12 @@ void cmExtraCodeBlocksGenerator
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
-        case cmTarget::UTILITY: // can have sources since 2.6.3
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
+        case cmState::UTILITY: // can have sources since 2.6.3
           {
           std::vector<cmSourceFile*> sources;
           cmGeneratorTarget* gt =
@@ -561,7 +561,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
     {
     int cbTargetType = this->GetCBTargetType(target);
     std::string workingDir = lg->GetCurrentBinaryDirectory();
-    if ( target->GetType()==cmTarget::EXECUTABLE)
+    if ( target->GetType()==cmState::EXECUTABLE)
       {
       // Determine the directory where the executable target is created, and
       // set the working directory to this dir.
@@ -584,7 +584,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
 
     std::string buildType = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
     std::string location;
-    if ( target->GetType()==cmTarget::OBJECT_LIBRARY)
+    if ( target->GetType()==cmState::OBJECT_LIBRARY)
       {
       location = this->CreateDummyTargetFile(const_cast<cmLocalGenerator*>(lg),
                                              target);
@@ -724,7 +724,7 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
 // Translate the cmake target type into the CodeBlocks target type id
 int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
 {
-  if ( target->GetType()==cmTarget::EXECUTABLE)
+  if ( target->GetType()==cmState::EXECUTABLE)
     {
     if ((target->GetPropertyAsBool("WIN32_EXECUTABLE"))
         || (target->GetPropertyAsBool("MACOSX_BUNDLE")))
@@ -736,13 +736,13 @@ int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
       return 1;
       }
     }
-  else if (( target->GetType()==cmTarget::STATIC_LIBRARY)
-        || (target->GetType()==cmTarget::OBJECT_LIBRARY))
+  else if (( target->GetType()==cmState::STATIC_LIBRARY)
+        || (target->GetType()==cmState::OBJECT_LIBRARY))
     {
     return 2;
     }
-  else if ((target->GetType()==cmTarget::SHARED_LIBRARY)
-           || (target->GetType()==cmTarget::MODULE_LIBRARY))
+  else if ((target->GetType()==cmState::SHARED_LIBRARY)
+           || (target->GetType()==cmState::MODULE_LIBRARY))
     {
     return 3;
     }
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 31dbf3d..10f33be 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -162,22 +162,22 @@ void cmExtraCodeLiteGenerator
 
       switch(ti->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
+        case cmState::EXECUTABLE:
           {
           projectType = "Executable";
           }
         break;
-        case cmTarget::STATIC_LIBRARY:
+        case cmState::STATIC_LIBRARY:
           {
           projectType = "Static Library";
           }
         break;
-        case cmTarget::SHARED_LIBRARY:
+        case cmState::SHARED_LIBRARY:
           {
           projectType = "Dynamic Library";
           }
         break;
-        case cmTarget::MODULE_LIBRARY:
+        case cmState::MODULE_LIBRARY:
           {
           projectType = "Dynamic Library";
           }
@@ -188,10 +188,10 @@ void cmExtraCodeLiteGenerator
 
       switch(ti->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
           {
           std::vector<cmSourceFile*> sources;
           cmGeneratorTarget* gt =
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index b7aeb02..463e732 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -544,13 +544,13 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
       linkName2 += "/";
       switch(ti->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
           {
-          const char* prefix = (ti->second.GetType()==cmTarget::EXECUTABLE ?
+          const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
           linkName2 += prefix;
           linkName2 += ti->first;
@@ -1046,7 +1046,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::GLOBAL_TARGET:
+        case cmState::GLOBAL_TARGET:
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
@@ -1056,7 +1056,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
            }
          }
          break;
-       case cmTarget::UTILITY:
+       case cmState::UTILITY:
          // Add all utility targets, except the Nightly/Continuous/
          // Experimental-"sub"targets as e.g. NightlyStart
          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
@@ -1069,13 +1069,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 
          this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
          break;
-       case cmTarget::EXECUTABLE:
-       case cmTarget::STATIC_LIBRARY:
-       case cmTarget::SHARED_LIBRARY:
-       case cmTarget::MODULE_LIBRARY:
-       case cmTarget::OBJECT_LIBRARY:
+       case cmState::EXECUTABLE:
+       case cmState::STATIC_LIBRARY:
+       case cmState::SHARED_LIBRARY:
+       case cmState::MODULE_LIBRARY:
+       case cmState::OBJECT_LIBRARY:
          {
-         const char* prefix = (ti->second.GetType()==cmTarget::EXECUTABLE ?
+         const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
          this->AppendTarget(fout, ti->first, make, makeArgs, subdir, prefix);
          std::string fastTarget = ti->first;
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index fe77026..dc6421b 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -128,7 +128,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::GLOBAL_TARGET:
+        case cmState::GLOBAL_TARGET:
           {
           bool insertTarget = false;
           // Only add the global targets from CMAKE_BINARY_DIR,
@@ -159,7 +159,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             }
         }
         break;
-        case cmTarget::UTILITY:
+        case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
           if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
@@ -173,11 +173,11 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             this->AppendTarget(fout, ti->first, make, makeArgs,
                                currentDir, homeOutputDir);
           break;
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
         {
           this->AppendTarget(fout, ti->first, make, makeArgs,
                              currentDir, homeOutputDir);
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index b8ec0f9..d1599c4 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -168,7 +168,7 @@ void cmExtraSublimeTextGenerator::
       {
       switch(ti->second.GetType())
         {
-        case cmTarget::GLOBAL_TARGET:
+        case cmState::GLOBAL_TARGET:
           {
           // Only add the global targets from CMAKE_BINARY_DIR,
           // not from the subdirs
@@ -181,7 +181,7 @@ void cmExtraSublimeTextGenerator::
             }
           }
           break;
-        case cmTarget::UTILITY:
+        case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
           if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
@@ -196,11 +196,11 @@ void cmExtraSublimeTextGenerator::
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           break;
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::SHARED_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
-        case cmTarget::OBJECT_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::SHARED_LIBRARY:
+        case cmState::MODULE_LIBRARY:
+        case cmState::OBJECT_LIBRARY:
           {
           this->AppendTarget(fout, ti->first, *lg, &ti->second,
                              make.c_str(), makefile, compiler.c_str(),
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 9958672..aa6f54b 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1144,7 +1144,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if (!prop)
       {
       if (target->IsImported()
-          || target->GetType() == cmTarget::INTERFACE_LIBRARY)
+          || target->GetType() == cmState::INTERFACE_LIBRARY)
         {
         return linkedTargetsContent;
         }
@@ -1284,7 +1284,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
       reportError(context, content->GetOriginalExpression(), e.str());
       return std::string();
       }
-    if (gt->GetType() != cmTarget::OBJECT_LIBRARY)
+    if (gt->GetType() != cmState::OBJECT_LIBRARY)
       {
       std::ostringstream e;
       e << "Objects of target \"" << tgtName
@@ -1592,7 +1592,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactSonameTag>
                     "for DLL target platforms.");
       return std::string();
       }
-    if(target->GetType() != cmTarget::SHARED_LIBRARY)
+    if(target->GetType() != cmState::SHARED_LIBRARY)
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_SONAME_FILE is allowed only for "
@@ -1632,11 +1632,11 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
       return std::string();
       }
 
-    cmTarget::TargetType targetType = (cmTarget::TargetType)target->GetType();
+    cmState::TargetType targetType = (cmState::TargetType)target->GetType();
 
-    if(targetType != cmTarget::SHARED_LIBRARY &&
-       targetType != cmTarget::MODULE_LIBRARY &&
-       targetType != cmTarget::EXECUTABLE)
+    if(targetType != cmState::SHARED_LIBRARY &&
+       targetType != cmState::MODULE_LIBRARY &&
+       targetType != cmState::EXECUTABLE)
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_PDB_FILE is allowed only for "
@@ -1746,8 +1746,8 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
                     "No target \"" + name + "\"");
       return std::string();
       }
-    if(target->GetType() >= cmTarget::OBJECT_LIBRARY &&
-      target->GetType() != cmTarget::UNKNOWN_LIBRARY)
+    if(target->GetType() >= cmState::OBJECT_LIBRARY &&
+      target->GetType() != cmState::UNKNOWN_LIBRARY)
       {
       ::reportError(context, content->GetOriginalExpression(),
                   "Target \"" + name + "\" is not an executable or library.");
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8c9251b..dce2091 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -155,7 +155,7 @@ struct TagVisitor
     : Data(data), Target(target),
     GlobalGenerator(target->GetLocalGenerator()->GetGlobalGenerator()),
     Header(CM_HEADER_REGEX),
-    IsObjLib(target->GetType() == cmTarget::OBJECT_LIBRARY)
+    IsObjLib(target->GetType() == cmState::OBJECT_LIBRARY)
   {
   }
 
@@ -172,7 +172,7 @@ struct TagVisitor
       {
       DoAccept<IsSameTag<Tag, CustomCommandsTag>::Result>::Do(this->Data, sf);
       }
-    else if(this->Target->GetType() == cmTarget::UTILITY)
+    else if(this->Target->GetType() == cmState::UTILITY)
       {
       DoAccept<IsSameTag<Tag, ExtraSourcesTag>::Result>::Do(this->Data, sf);
       }
@@ -345,7 +345,7 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
 {
   switch(this->GetType())
     {
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       if(this->Target->IsDLLPlatform())
         {
         if(implib)
@@ -365,10 +365,10 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
         // library targets.
         return "LIBRARY";
         }
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       // Static libraries are always treated as archive targets.
       return "ARCHIVE";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       if(implib)
         {
         // Module libraries are always treated as library targets.
@@ -379,7 +379,7 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
         // Module import libraries are treated as archive targets.
         return "LIBRARY";
         }
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       if(implib)
         {
         // Executable import libraries are treated as archive targets.
@@ -852,7 +852,7 @@ const char* cmGeneratorTarget::GetLocationForBuild() const
 bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
                                               const std::string& config) const
 {
-  assert(this->GetType() != cmTarget::INTERFACE_LIBRARY);
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
   std::string config_upper;
   if(!config.empty())
     {
@@ -1042,7 +1042,7 @@ static bool processSources(cmGeneratorTarget const* tgt,
 void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files,
                               const std::string& config) const
 {
-  assert(this->GetType() != cmTarget::INTERFACE_LIBRARY);
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
 
   if (!this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
     {
@@ -1221,7 +1221,7 @@ bool cmGeneratorTarget::HasSOName(const std::string& config) const
 {
   // soname is supported only for shared libraries and modules,
   // and then only when the platform supports an soname flag.
-  return ((this->GetType() == cmTarget::SHARED_LIBRARY) &&
+  return ((this->GetType() == cmState::SHARED_LIBRARY) &&
           !this->GetPropertyAsBool("NO_SONAME") &&
           this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config)));
 }
@@ -1232,9 +1232,9 @@ cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const
 {
   // Only executables and shared libraries can have an rpath and may
   // need relinking.
-  if(this->GetType() != cmTarget::EXECUTABLE &&
-     this->GetType() != cmTarget::SHARED_LIBRARY &&
-     this->GetType() != cmTarget::MODULE_LIBRARY)
+  if(this->GetType() != cmState::EXECUTABLE &&
+     this->GetType() != cmState::SHARED_LIBRARY &&
+     this->GetType() != cmState::MODULE_LIBRARY)
     {
     return false;
     }
@@ -1296,9 +1296,9 @@ cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const
 bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
 {
   // Only certain target types have an rpath.
-  if(!(this->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->GetType() == cmTarget::MODULE_LIBRARY ||
-       this->GetType() == cmTarget::EXECUTABLE))
+  if(!(this->GetType() == cmState::SHARED_LIBRARY ||
+       this->GetType() == cmState::MODULE_LIBRARY ||
+       this->GetType() == cmState::EXECUTABLE))
     {
     return false;
     }
@@ -1363,7 +1363,7 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const
 bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName(
                                           const std::string& config) const
 {
-  if(this->IsImported() && this->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->IsImported() && this->GetType() == cmState::SHARED_LIBRARY)
     {
     if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
       {
@@ -1382,7 +1382,7 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
 
   if(!this->IsImported())
     {
-    if(this->GetType() != cmTarget::SHARED_LIBRARY)
+    if(this->GetType() != cmState::SHARED_LIBRARY)
       {
       return false;
       }
@@ -1960,12 +1960,12 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
     return 0;
     }
 
-  if(this->GetType() > cmTarget::OBJECT_LIBRARY)
+  if(this->GetType() > cmState::OBJECT_LIBRARY)
     {
     std::string msg = "cmTarget::GetCompileInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName((cmTarget::TargetType)this->GetType());
+    msg += cmTarget::GetTargetTypeName((cmState::TargetType)this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -2155,7 +2155,7 @@ cmTargetTraceDependencies
   this->CurrentEntry = 0;
 
   // Queue all the source files already specified for the target.
-  if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (target->GetType() != cmState::INTERFACE_LIBRARY)
     {
     std::vector<std::string> configs;
     this->Makefile->GetConfigurations(configs);
@@ -2313,8 +2313,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
     // the fact that the name matched a target was just a coincidence.
     if(cmSystemTools::FileIsFullPath(dep.c_str()))
       {
-      if(t->GetType() >= cmTarget::EXECUTABLE &&
-         t->GetType() <= cmTarget::MODULE_LIBRARY)
+      if(t->GetType() >= cmState::EXECUTABLE &&
+         t->GetType() <= cmState::MODULE_LIBRARY)
         {
         // This is really only for compatibility so we do not need to
         // worry about configuration names and output names.
@@ -2362,7 +2362,7 @@ cmTargetTraceDependencies
     // Check for a target with this name.
     if(cmTarget* t = this->Makefile->FindTargetToUse(command))
       {
-      if(t->GetType() == cmTarget::EXECUTABLE)
+      if(t->GetType() == cmState::EXECUTABLE)
         {
         // The command refers to an executable target built in
         // this project.  Add the target-level dependency to make
@@ -2450,7 +2450,7 @@ void cmGeneratorTarget::TraceDependencies()
   // would find nothing anyway, but when building CMake itself the "install"
   // target command ends up referencing the "cmake" target but we do not
   // really want the dependency because "install" depend on "all" anyway.
-  if(this->GetType() == cmTarget::GLOBAL_TARGET)
+  if(this->GetType() == cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -2498,7 +2498,7 @@ cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang,
 {
   switch(this->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       {
       std::string var = "CMAKE_" + lang + "_CREATE_STATIC_LIBRARY";
       if(this->GetFeatureAsBool(
@@ -2512,11 +2512,11 @@ cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang,
         }
       return var;
       }
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return "CMAKE_" + lang + "_CREATE_SHARED_LIBRARY";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return "CMAKE_" + lang + "_CREATE_SHARED_MODULE";
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return "CMAKE_" + lang + "_LINK_EXECUTABLE";
     default:
       break;
@@ -3041,13 +3041,13 @@ void cmGeneratorTarget::ComputeTargetManifest(
   std::string realName;
   std::string impName;
   std::string pdbName;
-  if(this->GetType() == cmTarget::EXECUTABLE)
+  if(this->GetType() == cmState::EXECUTABLE)
     {
     this->GetExecutableNames(name, realName, impName, pdbName, config);
     }
-  else if(this->GetType() == cmTarget::STATIC_LIBRARY ||
-          this->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GetType() == cmTarget::MODULE_LIBRARY)
+  else if(this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY)
     {
     this->GetLibraryNames(name, soName, realName, impName, pdbName,
                                   config);
@@ -3155,7 +3155,7 @@ cmGeneratorTarget::NormalGetRealName(const std::string& config) const
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     }
 
-  if(this->GetType() == cmTarget::EXECUTABLE)
+  if(this->GetType() == cmState::EXECUTABLE)
     {
     // Compute the real name that will be built.
     std::string name;
@@ -3255,8 +3255,8 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   }
 
   // The import library name.
-  if(this->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GetType() == cmState::SHARED_LIBRARY ||
+     this->GetType() == cmState::MODULE_LIBRARY)
     {
     impName = this->GetFullNameInternal(config, true);
     }
@@ -3294,7 +3294,7 @@ void cmGeneratorTarget::GetExecutableNames(std::string& name,
 #else
   // Check for executable version properties.
   const char* version = this->GetProperty("VERSION");
-  if(this->GetType() != cmTarget::EXECUTABLE || this->Makefile->IsOn("XCODE"))
+  if(this->GetType() != cmState::EXECUTABLE || this->Makefile->IsOn("XCODE"))
     {
     version = 0;
     }
@@ -3350,10 +3350,10 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
                                             std::string& outSuffix) const
 {
   // Use just the target name for non-main target types.
-  if(this->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->GetType() != cmTarget::SHARED_LIBRARY &&
-     this->GetType() != cmTarget::MODULE_LIBRARY &&
-     this->GetType() != cmTarget::EXECUTABLE)
+  if(this->GetType() != cmState::STATIC_LIBRARY &&
+     this->GetType() != cmState::SHARED_LIBRARY &&
+     this->GetType() != cmState::MODULE_LIBRARY &&
+     this->GetType() != cmState::EXECUTABLE)
     {
     outPrefix = "";
     outBase = this->GetName();
@@ -3374,9 +3374,9 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
 
   // The implib option is only allowed for shared libraries, module
   // libraries, and executables.
-  if(this->GetType() != cmTarget::SHARED_LIBRARY &&
-     this->GetType() != cmTarget::MODULE_LIBRARY &&
-     this->GetType() != cmTarget::EXECUTABLE)
+  if(this->GetType() != cmState::SHARED_LIBRARY &&
+     this->GetType() != cmState::MODULE_LIBRARY &&
+     this->GetType() != cmState::EXECUTABLE)
     {
     implib = false;
     }
@@ -3462,7 +3462,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
   // Name shared libraries with their version number on some platforms.
   if(const char* soversion = this->GetProperty("SOVERSION"))
     {
-    if(this->GetType() == cmTarget::SHARED_LIBRARY && !implib &&
+    if(this->GetType() == cmState::SHARED_LIBRARY && !implib &&
        this->Makefile->IsOn("CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION"))
       {
       outBase += "-";
@@ -3657,8 +3657,8 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
 bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::OBJECT_LIBRARY
+      || this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3669,8 +3669,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::OBJECT_LIBRARY
+      || this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3681,8 +3681,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::OBJECT_LIBRARY
+      || this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3693,8 +3693,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMaxProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::OBJECT_LIBRARY
+      || this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -4474,7 +4474,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
 
   // Link interfaces are not supported for executables that do not
   // export symbols.
-  if(this->GetType() == cmTarget::EXECUTABLE &&
+  if(this->GetType() == cmState::EXECUTABLE &&
      !this->Target->IsExecutableWithExports())
     {
     return 0;
@@ -4517,9 +4517,9 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
 {
   if(iface.ExplicitLibraries)
     {
-    if(this->GetType() == cmTarget::SHARED_LIBRARY
-        || this->GetType() == cmTarget::STATIC_LIBRARY
-        || this->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(this->GetType() == cmState::SHARED_LIBRARY
+        || this->GetType() == cmState::STATIC_LIBRARY
+        || this->GetType() == cmState::INTERFACE_LIBRARY)
       {
       // Shared libraries may have runtime implementation dependencies
       // on other shared libraries that are not in the interface.
@@ -4529,7 +4529,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
         {
         emitted.insert(*li);
         }
-      if (this->GetType() != cmTarget::INTERFACE_LIBRARY)
+      if (this->GetType() != cmState::INTERFACE_LIBRARY)
         {
         cmLinkImplementation const* impl =
             this->GetLinkImplementation(config);
@@ -4541,7 +4541,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
             if(li->Target)
               {
               // This is a runtime dependency on another shared library.
-              if(li->Target->GetType() == cmTarget::SHARED_LIBRARY)
+              if(li->Target->GetType() == cmState::SHARED_LIBRARY)
                 {
                 iface.SharedDeps.push_back(*li);
                 }
@@ -4579,7 +4579,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
       }
     }
 
-  if(this->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GetType() == cmState::STATIC_LIBRARY)
     {
     // Construct the property name suffix for this configuration.
     std::string suffix = "_";
@@ -4623,7 +4623,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
 
   // Link interfaces are not supported for executables that do not
   // export symbols.
-  if(this->GetType() == cmTarget::EXECUTABLE &&
+  if(this->GetType() == cmState::EXECUTABLE &&
      !this->Target->IsExecutableWithExports())
     {
     return 0;
@@ -4697,7 +4697,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(cmTarget::TargetType(this->GetType()));
+    msg += cmTarget::GetTargetTypeName(cmState::TargetType(this->GetType()));
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -4797,14 +4797,14 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
       conf = "";
       }
     }
-  else if(this->GetType() == cmTarget::EXECUTABLE)
+  else if(this->GetType() == cmState::EXECUTABLE)
     {
     // Lookup the output path for executables.
     out = this->Makefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
     }
-  else if(this->GetType() == cmTarget::STATIC_LIBRARY ||
-          this->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GetType() == cmTarget::MODULE_LIBRARY)
+  else if(this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY)
     {
     // Lookup the output path for libraries.
     out = this->Makefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
@@ -4934,7 +4934,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     linkIfaceProp = "INTERFACE_LINK_LIBRARIES";
     explicitLibraries = this->GetProperty(linkIfaceProp);
     }
-  else if(this->GetType() == cmTarget::SHARED_LIBRARY ||
+  else if(this->GetType() == cmState::SHARED_LIBRARY ||
           this->Target->IsExecutableWithExports())
     {
     // CMP0022 OLD behavior is to use LINK_INTERFACE_LIBRARIES if set on a
@@ -4982,8 +4982,8 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   // There is no implicit link interface for executables or modules
   // so if none was explicitly set then there is no link interface.
   if(!explicitLibraries &&
-     (this->GetType() == cmTarget::EXECUTABLE ||
-      (this->GetType() == cmTarget::MODULE_LIBRARY)))
+     (this->GetType() == cmState::EXECUTABLE ||
+      (this->GetType() == cmState::MODULE_LIBRARY)))
     {
     return;
     }
@@ -5445,13 +5445,13 @@ cmGeneratorTarget::FindTargetToLink(std::string const& name) const
   // Skip targets that will not really be linked.  This is probably a
   // name conflict between an external library and an executable
   // within the project.
-  if(tgt && tgt->GetType() == cmTarget::EXECUTABLE &&
+  if(tgt && tgt->GetType() == cmState::EXECUTABLE &&
      !tgt->IsExecutableWithExports())
     {
     tgt = 0;
     }
 
-  if(tgt && tgt->GetType() == cmTarget::OBJECT_LIBRARY)
+  if(tgt && tgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     std::ostringstream e;
     e << "Target \"" << this->GetName() << "\" links to "
@@ -5509,7 +5509,7 @@ bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
 bool cmGeneratorTarget::HasImportLibrary() const
 {
   return (this->Target->IsDLLPlatform() &&
-          (this->GetType() == cmTarget::SHARED_LIBRARY ||
+          (this->GetType() == cmState::SHARED_LIBRARY ||
            this->Target->IsExecutableWithExports()));
 }
 
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 6469294..d6cbf75 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -148,7 +148,7 @@ void cmGhsMultiTargetGenerator::Generate()
     this->WriteCompilerFlags(config, language);
     this->WriteCompilerDefinitions(config, language);
     this->WriteIncludes(config, language);
-    if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+    if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
       {
       this->WriteTargetLinkLibraries();
       }
@@ -191,7 +191,7 @@ GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(
     {
     output = GhsMultiGpj::INTERGRITY_APPLICATION;
     }
-  else if (target->GetType() == cmTarget::STATIC_LIBRARY)
+  else if (target->GetType() == cmState::STATIC_LIBRARY)
     {
     output = GhsMultiGpj::LIBRARY;
     }
@@ -215,13 +215,13 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
   std::string outputDir(this->GetOutputDirectory(config));
   std::string outputFilename(this->GetOutputFilename(config));
 
-  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
     {
     *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
                                    << outputDir << outputFilename << ".a\""
                                    << std::endl;
     }
-  else if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  else if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
     {
     if (notKernel && !this->IsTargetGroup())
       {
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e8be2d6..338f496 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1444,15 +1444,15 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
     for(cmTargets::iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      if (ti->second.GetType() == cmTarget::GLOBAL_TARGET)
+      if (ti->second.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(ti->second.GetType() != cmTarget::EXECUTABLE &&
-         ti->second.GetType() != cmTarget::STATIC_LIBRARY &&
-         ti->second.GetType() != cmTarget::SHARED_LIBRARY &&
-         ti->second.GetType() != cmTarget::MODULE_LIBRARY &&
-         ti->second.GetType() != cmTarget::OBJECT_LIBRARY)
+      if(ti->second.GetType() != cmState::EXECUTABLE &&
+         ti->second.GetType() != cmState::STATIC_LIBRARY &&
+         ti->second.GetType() != cmState::SHARED_LIBRARY &&
+         ti->second.GetType() != cmState::MODULE_LIBRARY &&
+         ti->second.GetType() != cmState::OBJECT_LIBRARY)
         {
         continue;
         }
@@ -1510,14 +1510,14 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
         ti != targets.end(); ++ti)
       {
       cmTarget* t = &ti->second;
-      if (t->GetType() == cmTarget::GLOBAL_TARGET)
+      if (t->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
       t->AppendBuildInterfaceIncludes();
 
-      if (t->GetType() == cmTarget::INTERFACE_LIBRARY)
+      if (t->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
@@ -1650,7 +1650,7 @@ void cmGlobalGenerator::CheckTargetProperties()
     for (cmTargets::iterator l = targets.begin();
          l != targets.end(); l++)
       {
-      if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+      if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
@@ -2058,7 +2058,7 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
 bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
                                    cmGeneratorTarget* target) const
 {
-  if(target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(target->GetType() == cmState::INTERFACE_LIBRARY
       || target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
     {
     // This target is excluded from its directory.
@@ -2519,7 +2519,7 @@ cmTarget cmGlobalGenerator::CreateGlobalTarget(
 {
   // Package
   cmTarget target;
-  target.SetType(cmTarget::GLOBAL_TARGET, name);
+  target.SetType(cmState::GLOBAL_TARGET, name);
   target.SetProperty("EXCLUDE_FROM_ALL","TRUE");
 
   std::vector<std::string> no_outputs;
@@ -2701,7 +2701,7 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
 //----------------------------------------------------------------------------
 bool cmGlobalGenerator::IsRootOnlyTarget(cmTarget* target) const
 {
-  return (target->GetType() == cmTarget::GLOBAL_TARGET ||
+  return (target->GetType() == cmState::GLOBAL_TARGET ||
           target->GetName() == this->GetAllTargetName());
 }
 
@@ -2915,7 +2915,7 @@ void cmGlobalGenerator::WriteSummary()
   for(TargetMap::const_iterator ti =
         this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
     {
-    if ((ti->second)->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if ((ti->second)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index ed36634..4eec3fb 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -72,7 +72,7 @@ void cmGlobalKdevelopGenerator::Generate()
       for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
            ti != targets.end(); ti++)
         {
-        if (ti->second->GetType()==cmTarget::EXECUTABLE)
+        if (ti->second->GetType()==cmState::EXECUTABLE)
           {
           executable = ti->second->GetLocation("");
           break;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 32e6077..064feae 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -926,18 +926,18 @@ cmGlobalNinjaGenerator
   bool realname = target->IsFrameworkOnApple();
 
   switch (target->GetType()) {
-  case cmTarget::EXECUTABLE:
-  case cmTarget::SHARED_LIBRARY:
-  case cmTarget::STATIC_LIBRARY:
-  case cmTarget::MODULE_LIBRARY:
+  case cmState::EXECUTABLE:
+  case cmState::SHARED_LIBRARY:
+  case cmState::STATIC_LIBRARY:
+  case cmState::MODULE_LIBRARY:
     {
     cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
     outputs.push_back(this->ConvertToNinjaPath(
       gtgt->GetFullPath(configName, false, realname)));
     break;
     }
-  case cmTarget::OBJECT_LIBRARY:
-  case cmTarget::UTILITY: {
+  case cmState::OBJECT_LIBRARY:
+  case cmState::UTILITY: {
     std::string path = this->ConvertToNinjaPath(
       target->GetMakefile()->GetCurrentBinaryDirectory());
     if (path.empty() || path == ".")
@@ -950,7 +950,7 @@ cmGlobalNinjaGenerator
     break;
   }
 
-  case cmTarget::GLOBAL_TARGET:
+  case cmState::GLOBAL_TARGET:
     // Always use the target in HOME instead of an unused duplicate in a
     // subdirectory.
     outputs.push_back(target->GetName());
@@ -965,7 +965,7 @@ void
 cmGlobalNinjaGenerator
 ::AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs)
 {
-  if (target->GetType() == cmTarget::GLOBAL_TARGET) {
+  if (target->GetType() == cmState::GLOBAL_TARGET) {
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
     std::set<std::string> const& utils = target->GetUtilities();
@@ -976,7 +976,7 @@ cmGlobalNinjaGenerator
     for (cmTargetDependSet::const_iterator i = targetDeps.begin();
          i != targetDeps.end(); ++i)
       {
-      if ((*i)->GetType() == cmTarget::INTERFACE_LIBRARY)
+      if ((*i)->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index d6f6490..4674fcd 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -428,12 +428,12 @@ void cmGlobalUnixMakefileGenerator3
     for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
          l != lg->GetMakefile()->GetTargets().end(); l++)
       {
-      if((l->second.GetType() == cmTarget::EXECUTABLE) ||
-         (l->second.GetType() == cmTarget::STATIC_LIBRARY) ||
-         (l->second.GetType() == cmTarget::SHARED_LIBRARY) ||
-         (l->second.GetType() == cmTarget::MODULE_LIBRARY) ||
-         (l->second.GetType() == cmTarget::OBJECT_LIBRARY) ||
-         (l->second.GetType() == cmTarget::UTILITY))
+      if((l->second.GetType() == cmState::EXECUTABLE) ||
+         (l->second.GetType() == cmState::STATIC_LIBRARY) ||
+         (l->second.GetType() == cmState::SHARED_LIBRARY) ||
+         (l->second.GetType() == cmState::MODULE_LIBRARY) ||
+         (l->second.GetType() == cmState::OBJECT_LIBRARY) ||
+         (l->second.GetType() == cmState::UTILITY))
         {
         std::string tname = lg->GetRelativeTargetDirectory(l->second);
         tname += "/DependInfo.cmake";
@@ -467,12 +467,12 @@ cmGlobalUnixMakefileGenerator3
     {
     cmGeneratorTarget* gtarget = l->second;
     int type = gtarget->GetType();
-    if((type == cmTarget::EXECUTABLE) ||
-       (type == cmTarget::STATIC_LIBRARY) ||
-       (type == cmTarget::SHARED_LIBRARY) ||
-       (type == cmTarget::MODULE_LIBRARY) ||
-       (type == cmTarget::OBJECT_LIBRARY) ||
-       (type == cmTarget::UTILITY))
+    if((type == cmState::EXECUTABLE) ||
+       (type == cmState::STATIC_LIBRARY) ||
+       (type == cmState::SHARED_LIBRARY) ||
+       (type == cmState::MODULE_LIBRARY) ||
+       (type == cmState::OBJECT_LIBRARY) ||
+       (type == cmState::UTILITY))
       {
       if(gtarget->Target->IsImported())
         {
@@ -645,12 +645,12 @@ cmGlobalUnixMakefileGenerator3
          emitted.insert(name).second &&
          // Handle user targets here.  Global targets are handled in
          // the local generator on a per-directory basis.
-         ((type == cmTarget::EXECUTABLE) ||
-          (type == cmTarget::STATIC_LIBRARY) ||
-          (type == cmTarget::SHARED_LIBRARY) ||
-          (type == cmTarget::MODULE_LIBRARY) ||
-          (type == cmTarget::OBJECT_LIBRARY) ||
-          (type == cmTarget::UTILITY)))
+         ((type == cmState::EXECUTABLE) ||
+          (type == cmState::STATIC_LIBRARY) ||
+          (type == cmState::SHARED_LIBRARY) ||
+          (type == cmState::MODULE_LIBRARY) ||
+          (type == cmState::OBJECT_LIBRARY) ||
+          (type == cmState::UTILITY)))
         {
         // Add a rule to build the target by name.
         lg->WriteDivider(ruleFileStream);
@@ -741,12 +741,12 @@ cmGlobalUnixMakefileGenerator3
     int type = gtarget->GetType();
     std::string name = gtarget->GetName();
     if (!name.empty()
-     && (  (type == cmTarget::EXECUTABLE)
-        || (type == cmTarget::STATIC_LIBRARY)
-        || (type == cmTarget::SHARED_LIBRARY)
-        || (type == cmTarget::MODULE_LIBRARY)
-        || (type == cmTarget::OBJECT_LIBRARY)
-        || (type == cmTarget::UTILITY)))
+     && (  (type == cmState::EXECUTABLE)
+        || (type == cmState::STATIC_LIBRARY)
+        || (type == cmState::SHARED_LIBRARY)
+        || (type == cmState::MODULE_LIBRARY)
+        || (type == cmState::OBJECT_LIBRARY)
+        || (type == cmState::UTILITY)))
       {
       std::string makefileName;
       // Add a rule to build the target by name.
@@ -937,7 +937,7 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
 
       cmLocalGenerator* tlg = gt->GetLocalGenerator();
 
-      if(gt->GetType() == cmTarget::INTERFACE_LIBRARY
+      if(gt->GetType() == cmState::INTERFACE_LIBRARY
           || gt->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
         continue;
@@ -984,7 +984,7 @@ cmGlobalUnixMakefileGenerator3
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
-      if ((*di)->GetType() == cmTarget::INTERFACE_LIBRARY)
+      if ((*di)->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
@@ -1060,7 +1060,7 @@ cmGlobalUnixMakefileGenerator3
     {
     // Create the target-level dependency.
     cmGeneratorTarget const* dep = *i;
-    if (dep->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (dep->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -1105,14 +1105,14 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
       for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
         {
         cmTarget const& target = t->second;
-        cmTarget::TargetType type = target.GetType();
-        if((type == cmTarget::EXECUTABLE) ||
-           (type == cmTarget::STATIC_LIBRARY) ||
-           (type == cmTarget::SHARED_LIBRARY) ||
-           (type == cmTarget::MODULE_LIBRARY) ||
-           (type == cmTarget::OBJECT_LIBRARY) ||
-           (type == cmTarget::GLOBAL_TARGET) ||
-           (type == cmTarget::UTILITY))
+        cmState::TargetType type = target.GetType();
+        if((type == cmState::EXECUTABLE) ||
+           (type == cmState::STATIC_LIBRARY) ||
+           (type == cmState::SHARED_LIBRARY) ||
+           (type == cmState::MODULE_LIBRARY) ||
+           (type == cmState::OBJECT_LIBRARY) ||
+           (type == cmState::GLOBAL_TARGET) ||
+           (type == cmState::UTILITY))
           {
           std::string name = target.GetName();
           if(emittedTargets.insert(name).second)
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index 419bf8a..b9b4fff 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -278,10 +278,10 @@ cmGlobalVisualStudio11Generator::GetInstalledWindowsCESDKs()
 
 //----------------------------------------------------------------------------
 bool
-cmGlobalVisualStudio11Generator::NeedsDeploy(cmTarget::TargetType type) const
+cmGlobalVisualStudio11Generator::NeedsDeploy(cmState::TargetType type) const
 {
-  if((type == cmTarget::EXECUTABLE ||
-      type == cmTarget::SHARED_LIBRARY) &&
+  if((type == cmState::EXECUTABLE ||
+      type == cmState::SHARED_LIBRARY) &&
      (this->SystemIsWindowsPhone ||
       this->SystemIsWindowsStore))
     {
diff --git a/Source/cmGlobalVisualStudio11Generator.h b/Source/cmGlobalVisualStudio11Generator.h
index 9499d80..f3f6b2b 100644
--- a/Source/cmGlobalVisualStudio11Generator.h
+++ b/Source/cmGlobalVisualStudio11Generator.h
@@ -48,7 +48,7 @@ protected:
   static std::set<std::string> GetInstalledWindowsCESDKs();
 
   /** Return true if the configuration needs to be deployed */
-  virtual bool NeedsDeploy(cmTarget::TargetType type) const;
+  virtual bool NeedsDeploy(cmState::TargetType type) const;
 private:
   class Factory;
   friend class Factory;
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index d5e9417..12eccf9 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -224,7 +224,7 @@ void cmGlobalVisualStudio6Generator
       tt != orderedProjectTargets.end(); ++tt)
     {
     cmTarget const* target = (*tt)->Target;
-    if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index b913afc..9bb37ce 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -272,7 +272,7 @@ void cmGlobalVisualStudio71Generator
 // executables to the libraries it uses are also done here
 void cmGlobalVisualStudio71Generator
 ::WriteProjectConfigurations(
-  std::ostream& fout, const std::string& name, cmTarget::TargetType,
+  std::ostream& fout, const std::string& name, cmState::TargetType,
   std::vector<std::string> const& configs,
   const std::set<std::string>& configsPartOfDefaultBuild,
   std::string const& platformMapping)
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index fbb9ecc..7f88e34 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -64,7 +64,7 @@ protected:
                            const std::string& name, const char* path,
                            cmTarget const& t);
   virtual void WriteProjectConfigurations(
-    std::ostream& fout, const std::string& name, cmTarget::TargetType type,
+    std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
     const std::set<std::string>& configsPartOfDefaultBuild,
     const std::string& platformMapping = "");
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 8651e2f..1909f21 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -402,7 +402,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
     cmTarget const* target = (*tt)->Target;
-    if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -442,7 +442,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
     cmTarget const* target = (*tt)->Target;
-    if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -536,7 +536,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends(
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
     cmTarget const* target = (*tt)->Target;
-    if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -762,7 +762,7 @@ cmGlobalVisualStudio7Generator
 // executables to the libraries it uses are also done here
 void cmGlobalVisualStudio7Generator
 ::WriteProjectConfigurations(
-  std::ostream& fout, const std::string& name, cmTarget::TargetType,
+  std::ostream& fout, const std::string& name, cmState::TargetType,
   std::vector<std::string> const& configs,
   const std::set<std::string>& configsPartOfDefaultBuild,
   const std::string& platformMapping)
@@ -1002,7 +1002,7 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
   // if it is a utilitiy target then only make it part of the
   // default build if another target depends on it
   int type = target->GetType();
-  if (type == cmTarget::GLOBAL_TARGET)
+  if (type == cmState::GLOBAL_TARGET)
     {
     // check if INSTALL target is part of default build
     if(target->GetName() == "INSTALL")
@@ -1025,7 +1025,7 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
       }
     return activeConfigs;
     }
-  if(type == cmTarget::UTILITY && !this->IsDependedOn(projectTargets, target))
+  if(type == cmState::UTILITY && !this->IsDependedOn(projectTargets, target))
     {
     return activeConfigs;
     }
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 35575d1..4ef0990 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -128,7 +128,7 @@ protected:
                            const std::string& name, const char* path,
                            cmTarget const&t);
   virtual void WriteProjectConfigurations(
-    std::ostream& fout, const std::string& name, cmTarget::TargetType type,
+    std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
     const std::set<std::string>& configsPartOfDefaultBuild,
     const std::string& platformMapping = "");
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 8cb7d24..0c41964 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -386,7 +386,7 @@ cmGlobalVisualStudio8Generator
 void
 cmGlobalVisualStudio8Generator
 ::WriteProjectConfigurations(
-  std::ostream& fout, const std::string& name, cmTarget::TargetType type,
+  std::ostream& fout, const std::string& name, cmState::TargetType type,
   std::vector<std::string> const& configs,
   const std::set<std::string>& configsPartOfDefaultBuild,
   std::string const& platformMapping)
@@ -423,10 +423,10 @@ cmGlobalVisualStudio8Generator
 
 //----------------------------------------------------------------------------
 bool
-cmGlobalVisualStudio8Generator::NeedsDeploy(cmTarget::TargetType type) const
+cmGlobalVisualStudio8Generator::NeedsDeploy(cmState::TargetType type) const
 {
-  bool needsDeploy = (type == cmTarget::EXECUTABLE ||
-                      type == cmTarget::SHARED_LIBRARY);
+  bool needsDeploy = (type == cmState::EXECUTABLE ||
+                      type == cmState::SHARED_LIBRARY);
   return this->TargetsWindowsCE() && needsDeploy;
 }
 
@@ -448,7 +448,7 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
   for(OrderedTargetDependSet::const_iterator i = depends.begin();
       i != depends.end(); ++i)
     {
-    if((*i)->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if((*i)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -468,7 +468,7 @@ bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
     {
     if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
       {
-      if(depTarget->GetType() != cmTarget::INTERFACE_LIBRARY
+      if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))
         {
         // This utility dependency names an external .vcproj target.
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index 9d6c64f..60c63d1 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -77,14 +77,14 @@ protected:
   bool AddCheckTarget();
 
   /** Return true if the configuration needs to be deployed */
-  virtual bool NeedsDeploy(cmTarget::TargetType type) const;
+  virtual bool NeedsDeploy(cmState::TargetType type) const;
 
   static cmIDEFlagTable const* GetExtraFlagTableVS8();
   virtual void WriteSLNHeader(std::ostream& fout);
   virtual void WriteSolutionConfigurations(
     std::ostream& fout, std::vector<std::string> const& configs);
   virtual void WriteProjectConfigurations(
-    std::ostream& fout, const std::string& name, cmTarget::TargetType type,
+    std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
     const std::set<std::string>& configsPartOfDefaultBuild,
     const std::string& platformMapping = "");
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index fa9c606..a57cef1 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -112,7 +112,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
         for(cmGeneratorTargetsType::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
-          if (t->second->GetType() == cmTarget::GLOBAL_TARGET
+          if (t->second->GetType() == cmState::GLOBAL_TARGET
               || t->first->IsImported())
             {
             continue;
@@ -337,12 +337,12 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
 void cmGlobalVisualStudioGenerator::FollowLinkDepends(
   cmTarget const* target, std::set<cmTarget const*>& linked)
 {
-  if(target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(target->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
   if(linked.insert(target).second &&
-     target->GetType() == cmTarget::STATIC_LIBRARY)
+     target->GetType() == cmState::STATIC_LIBRARY)
     {
     // Static library targets do not list their link dependencies so
     // we must follow them transitively now.
@@ -387,7 +387,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
 //----------------------------------------------------------------------------
 static bool VSLinkable(cmTarget const* t)
 {
-  return t->IsLinkable() || t->GetType() == cmTarget::OBJECT_LIBRARY;
+  return t->IsLinkable() || t->GetType() == cmState::OBJECT_LIBRARY;
 }
 
 //----------------------------------------------------------------------------
@@ -417,10 +417,10 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // leaving them out for the static library itself but following them
   // transitively for other targets.
 
-  bool allowLinkable = (target.GetType() != cmTarget::STATIC_LIBRARY &&
-                        target.GetType() != cmTarget::SHARED_LIBRARY &&
-                        target.GetType() != cmTarget::MODULE_LIBRARY &&
-                        target.GetType() != cmTarget::EXECUTABLE);
+  bool allowLinkable = (target.GetType() != cmState::STATIC_LIBRARY &&
+                        target.GetType() != cmState::SHARED_LIBRARY &&
+                        target.GetType() != cmState::MODULE_LIBRARY &&
+                        target.GetType() != cmState::EXECUTABLE);
 
   cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
   TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
@@ -429,7 +429,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
   std::set<cmTarget const*> linkDepends;
-  if(target.GetType() != cmTarget::STATIC_LIBRARY)
+  if(target.GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -457,7 +457,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // Collect all targets linked by this target so we can avoid
   // intermediate targets below.
   TargetSet linked;
-  if(target.GetType() != cmTarget::STATIC_LIBRARY)
+  if(target.GetType() != cmState::STATIC_LIBRARY)
     {
     linked = this->GetTargetLinkClosure(&target);
     }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6291796..bc05aea 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -513,7 +513,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       {
       cmTarget& target = l->second;
 
-      if (target.GetType() == cmTarget::GLOBAL_TARGET)
+      if (target.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
@@ -528,12 +528,12 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       // this will make sure that when the next target is built
       // things are up-to-date
       if(!makeHelper.empty() &&
-         (target.GetType() == cmTarget::EXECUTABLE ||
+         (target.GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//          target.GetType() == cmTarget::OBJECT_LIBRARY ||
-          target.GetType() == cmTarget::STATIC_LIBRARY ||
-          target.GetType() == cmTarget::SHARED_LIBRARY ||
-          target.GetType() == cmTarget::MODULE_LIBRARY))
+//          target.GetType() == cmState::OBJECT_LIBRARY ||
+          target.GetType() == cmState::STATIC_LIBRARY ||
+          target.GetType() == cmState::SHARED_LIBRARY ||
+          target.GetType() == cmState::MODULE_LIBRARY))
         {
         makeHelper[makeHelper.size()-1] = // fill placeholder
           this->PostBuildMakeTarget(target.GetName(), "$(CONFIGURATION)");
@@ -549,7 +549,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                                                     dir.c_str());
         }
 
-      if(target.GetType() != cmTarget::INTERFACE_LIBRARY
+      if(target.GetType() != cmState::INTERFACE_LIBRARY
           && !target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
         allbuild->AddUtility(target.GetName());
@@ -1100,13 +1100,13 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       continue;
       }
 
-    if(cmtarget.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
-    if(cmtarget.GetType() == cmTarget::UTILITY ||
-       cmtarget.GetType() == cmTarget::GLOBAL_TARGET)
+    if(cmtarget.GetType() == cmState::UTILITY ||
+       cmtarget.GetType() == cmState::GLOBAL_TARGET)
       {
       cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
       if (!t)
@@ -1366,9 +1366,9 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguages()
 void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
 {
   // This matters only for targets that link.
-  if(cmtarget.GetType() != cmTarget::EXECUTABLE &&
-     cmtarget.GetType() != cmTarget::SHARED_LIBRARY &&
-     cmtarget.GetType() != cmTarget::MODULE_LIBRARY)
+  if(cmtarget.GetType() != cmState::EXECUTABLE &&
+     cmtarget.GetType() != cmState::SHARED_LIBRARY &&
+     cmtarget.GetType() != cmState::MODULE_LIBRARY)
     {
     return;
     }
@@ -1467,7 +1467,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   std::vector<cmCustomCommand> postbuild
     = cmtarget.GetPostBuildCommands();
 
-  if(cmtarget.GetType() == cmTarget::SHARED_LIBRARY &&
+  if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
     !cmtarget.IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
@@ -1786,17 +1786,17 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  if(target.GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(target.GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   std::string defFlags;
-  bool shared = ((target.GetType() == cmTarget::SHARED_LIBRARY) ||
-                 (target.GetType() == cmTarget::MODULE_LIBRARY));
-  bool binary = ((target.GetType() == cmTarget::OBJECT_LIBRARY) ||
-                 (target.GetType() == cmTarget::STATIC_LIBRARY) ||
-                 (target.GetType() == cmTarget::EXECUTABLE) ||
+  bool shared = ((target.GetType() == cmState::SHARED_LIBRARY) ||
+                 (target.GetType() == cmState::MODULE_LIBRARY));
+  bool binary = ((target.GetType() == cmState::OBJECT_LIBRARY) ||
+                 (target.GetType() == cmState::STATIC_LIBRARY) ||
+                 (target.GetType() == cmState::EXECUTABLE) ||
                  shared);
 
   // Compute the compilation flags for each language.
@@ -1858,15 +1858,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   std::string extraLinkOptionsVar;
   std::string extraLinkOptions;
-  if(target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptionsVar = "CMAKE_EXE_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  else if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_SHARED_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmTarget::MODULE_LIBRARY)
+  else if(target.GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS";
     }
@@ -1878,8 +1878,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                configName);
     }
 
-  if(target.GetType() == cmTarget::OBJECT_LIBRARY ||
-     target.GetType() == cmTarget::STATIC_LIBRARY)
+  if(target.GetType() == cmState::OBJECT_LIBRARY ||
+     target.GetType() == cmState::STATIC_LIBRARY)
     {
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
@@ -1969,10 +1969,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Set attributes to specify the proper name for the target.
   std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
-  if(target.GetType() == cmTarget::STATIC_LIBRARY ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY ||
-     target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::STATIC_LIBRARY ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY ||
+     target.GetType() == cmState::EXECUTABLE)
     {
     if(this->XcodeVersion >= 21)
       {
@@ -2000,7 +2000,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     buildSettings->AddAttribute("EXECUTABLE_SUFFIX",
                                 this->CreateString(pnsuffix.c_str()));
     }
-  else if(target.GetType() == cmTarget::OBJECT_LIBRARY)
+  else if(target.GetType() == cmState::OBJECT_LIBRARY)
     {
     pnprefix = "lib";
     pnbase = target.GetName();
@@ -2031,15 +2031,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   // Handle settings for each target type.
   switch(target.GetType())
     {
-    case cmTarget::OBJECT_LIBRARY:
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
+    case cmState::STATIC_LIBRARY:
     {
     buildSettings->AddAttribute("LIBRARY_STYLE",
                                 this->CreateString("STATIC"));
     break;
     }
 
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
     {
     buildSettings->AddAttribute("LIBRARY_STYLE",
                                 this->CreateString("BUNDLE"));
@@ -2098,7 +2098,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
     break;
     }
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
     {
     if(target.GetPropertyAsBool("FRAMEWORK"))
       {
@@ -2135,7 +2135,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                 this->CreateString("DYNAMIC"));
     break;
     }
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
     {
     // Add the flags to create an executable.
     std::string createFlags =
@@ -2327,7 +2327,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Create the INSTALL_PATH attribute.
   std::string install_name_dir;
-  if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir = gtgt->GetInstallNameDirForBuildTree(configName);
@@ -2415,7 +2415,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Runtime version information.
-  if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     int major;
     int minor;
@@ -2550,7 +2550,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   this->XCodeObjectMap[&cmtarget] = target;
 
   // Add source files without build rules for editing convenience.
-  if(cmtarget.GetType() == cmTarget::UTILITY)
+  if(cmtarget.GetType() == cmState::UTILITY)
     {
     std::vector<cmSourceFile*> sources;
     cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
@@ -2627,8 +2627,8 @@ const char*
 cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
 {
   if(this->XcodeVersion >= 60 &&
-     (cmtarget.GetType() == cmTarget::STATIC_LIBRARY ||
-      cmtarget.GetType() == cmTarget::OBJECT_LIBRARY))
+     (cmtarget.GetType() == cmState::STATIC_LIBRARY ||
+      cmtarget.GetType() == cmState::OBJECT_LIBRARY))
     {
     return "OTHER_LIBTOOLFLAGS";
     }
@@ -2643,10 +2643,10 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
 {
   switch(cmtarget.GetType())
     {
-    case cmTarget::OBJECT_LIBRARY:
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "archive.ar";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       if (cmtarget.IsXCTestOnApple())
         return "wrapper.cfbundle";
       else if (cmtarget.IsCFBundleOnApple())
@@ -2654,10 +2654,10 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
       else
         return ((this->XcodeVersion >= 22)?
               "compiled.mach-o.executable" : "compiled.mach-o.dylib");
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
               "wrapper.framework" : "compiled.mach-o.dylib");
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return "compiled.mach-o.executable";
     default: break;
     }
@@ -2669,10 +2669,10 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(cmTarget& cmtarget)
 {
   switch(cmtarget.GetType())
     {
-    case cmTarget::OBJECT_LIBRARY:
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       if (cmtarget.IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
       else if (cmtarget.IsCFBundleOnApple())
@@ -2681,11 +2681,11 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(cmTarget& cmtarget)
         return ((this->XcodeVersion >= 22)?
                 "com.apple.product-type.tool" :
                 "com.apple.product-type.library.dynamic");
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
               "com.apple.product-type.framework" :
               "com.apple.product-type.library.dynamic");
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return (cmtarget.GetPropertyAsBool("MACOSX_BUNDLE")?
               "com.apple.product-type.application" :
               "com.apple.product-type.tool");
@@ -2699,7 +2699,7 @@ cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
                                           cmXCodeObject* buildPhases)
 {
-  if(cmtarget.GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
     }
@@ -2734,7 +2734,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
   std::string fullName;
-  if(cmtarget.GetType() == cmTarget::OBJECT_LIBRARY)
+  if(cmtarget.GetType() == cmState::OBJECT_LIBRARY)
     {
     fullName = "lib";
     fullName += cmtarget.GetName();
@@ -2909,7 +2909,7 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(cmtarget->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
@@ -2958,8 +2958,8 @@ void cmGlobalXCodeGenerator
       }
 
     // Skip link information for object libraries.
-    if(cmtarget->GetType() == cmTarget::OBJECT_LIBRARY ||
-       cmtarget->GetType() == cmTarget::STATIC_LIBRARY)
+    if(cmtarget->GetType() == cmState::OBJECT_LIBRARY ||
+       cmtarget->GetType() == cmState::STATIC_LIBRARY)
       {
       continue;
       }
@@ -3024,7 +3024,7 @@ void cmGlobalXCodeGenerator
         linkLibs += this->XCodeEscapePath(li->Value.c_str());
         }
       else if (!li->Target
-          || li->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+          || li->Target->GetType() != cmState::INTERFACE_LIBRARY)
         {
         linkLibs += li->Value;
         }
@@ -3063,11 +3063,11 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
       // groups:
       //
-      if(cmtarget.GetType() == cmTarget::GLOBAL_TARGET)
+      if(cmtarget.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(cmtarget.GetType() == cmTarget::INTERFACE_LIBRARY)
+      if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
@@ -3624,21 +3624,21 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
       cmTarget* t =target->GetTarget();
       cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
 
-      if(t->GetType() == cmTarget::EXECUTABLE ||
+      if(t->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//         t->GetType() == cmTarget::OBJECT_LIBRARY ||
-         t->GetType() == cmTarget::STATIC_LIBRARY ||
-         t->GetType() == cmTarget::SHARED_LIBRARY ||
-         t->GetType() == cmTarget::MODULE_LIBRARY)
+//         t->GetType() == cmState::OBJECT_LIBRARY ||
+         t->GetType() == cmState::STATIC_LIBRARY ||
+         t->GetType() == cmState::SHARED_LIBRARY ||
+         t->GetType() == cmState::MODULE_LIBRARY)
         {
         // Declare an entry point for the target post-build phase.
         makefileStream << this->PostBuildMakeTarget(t->GetName(), *ct)
                        << ":\n";
         }
 
-      if(t->GetType() == cmTarget::EXECUTABLE ||
-         t->GetType() == cmTarget::SHARED_LIBRARY ||
-         t->GetType() == cmTarget::MODULE_LIBRARY)
+      if(t->GetType() == cmState::EXECUTABLE ||
+         t->GetType() == cmState::SHARED_LIBRARY ||
+         t->GetType() == cmState::MODULE_LIBRARY)
         {
         std::string tfull = gt->GetFullPath(configName);
         std::string trel = this->ConvertToRelativeForMake(tfull.c_str());
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index b3cf91e..cc36c62 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -26,13 +26,13 @@ static const char* getShapeForTarget(const cmTarget* target)
 
   switch ( target->GetType() )
     {
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return "house";
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "diamond";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return "polygon";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return "octagon";
     default:
       break;
@@ -582,18 +582,18 @@ bool cmGraphVizWriter::IgnoreThisTarget(const std::string& name)
 }
 
 
-bool cmGraphVizWriter::GenerateForTargetType(cmTarget::TargetType targetType)
+bool cmGraphVizWriter::GenerateForTargetType(cmState::TargetType targetType)
                                                                           const
 {
   switch (targetType)
   {
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return this->GenerateForExecutables;
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return this->GenerateForStaticLibs;
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return this->GenerateForSharedLibs;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return this->GenerateForModuleLibs;
     default:
       break;
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 64de684..0a20e6e 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -62,7 +62,7 @@ protected:
 
   bool IgnoreThisTarget(const std::string& name);
 
-  bool GenerateForTargetType(cmTarget::TargetType targetType) const;
+  bool GenerateForTargetType(cmState::TargetType targetType) const;
 
   std::string GraphType;
   std::string GraphName;
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx
index 1e7258a..c64d128 100644
--- a/Source/cmIncludeExternalMSProjectCommand.cxx
+++ b/Source/cmIncludeExternalMSProjectCommand.cxx
@@ -77,7 +77,7 @@ bool cmIncludeExternalMSProjectCommand
       }
 
     // Create a target instance for this utility.
-    cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY,
+    cmTarget* target=this->Makefile->AddNewTarget(cmState::UTILITY,
                                                   utility_name.c_str());
 
     target->SetProperty("GENERATOR_FILE_NAME", utility_name.c_str());
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 333c2ff..c22edf3 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -383,12 +383,12 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
     if(cmTarget* target=this->Makefile->FindTarget(*targetIt))
       {
       // Found the target.  Check its type.
-      if(target->GetType() != cmTarget::EXECUTABLE &&
-         target->GetType() != cmTarget::STATIC_LIBRARY &&
-         target->GetType() != cmTarget::SHARED_LIBRARY &&
-         target->GetType() != cmTarget::MODULE_LIBRARY &&
-         target->GetType() != cmTarget::OBJECT_LIBRARY &&
-         target->GetType() != cmTarget::INTERFACE_LIBRARY)
+      if(target->GetType() != cmState::EXECUTABLE &&
+         target->GetType() != cmState::STATIC_LIBRARY &&
+         target->GetType() != cmState::SHARED_LIBRARY &&
+         target->GetType() != cmState::MODULE_LIBRARY &&
+         target->GetType() != cmState::OBJECT_LIBRARY &&
+         target->GetType() != cmState::INTERFACE_LIBRARY)
         {
         std::ostringstream e;
         e << "TARGETS given target \"" << (*targetIt)
@@ -396,7 +396,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
         this->SetError(e.str());
         return false;
         }
-      else if(target->GetType() == cmTarget::OBJECT_LIBRARY)
+      else if(target->GetType() == cmState::OBJECT_LIBRARY)
         {
         std::ostringstream e;
         e << "TARGETS given OBJECT library \"" << (*targetIt)
@@ -449,7 +449,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
 
     switch(target.GetType())
       {
-      case cmTarget::SHARED_LIBRARY:
+      case cmState::SHARED_LIBRARY:
         {
         // Shared libraries are handled differently on DLL and non-DLL
         // platforms.  All windows platforms are DLL platforms including
@@ -532,7 +532,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         }
         break;
-      case cmTarget::STATIC_LIBRARY:
+      case cmState::STATIC_LIBRARY:
         {
         // Static libraries use ARCHIVE properties.
         if (!archiveArgs.GetDestination().empty())
@@ -550,7 +550,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         }
         break;
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         {
         // Modules use LIBRARY properties.
         if (!libraryArgs.GetDestination().empty())
@@ -571,7 +571,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         }
         break;
-      case cmTarget::EXECUTABLE:
+      case cmState::EXECUTABLE:
         {
         if(target.IsAppBundleOnApple())
           {
@@ -635,7 +635,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
           }
         }
         break;
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
           // Nothing to do. An INTERFACE_LIBRARY can be installed, but the
           // only effect of that is to make it exportable. It installs no
           // other files itself.
@@ -654,7 +654,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
     bool createInstallGeneratorsForTargetFileSets = true;
 
     if(target.IsFrameworkOnApple()
-        || target.GetType() == cmTarget::INTERFACE_LIBRARY)
+        || target.GetType() == cmState::INTERFACE_LIBRARY)
       {
       createInstallGeneratorsForTargetFileSets = false;
       }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index a3d2927..66b6fc7 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -94,29 +94,29 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   std::vector<std::string> filesFrom;
   std::vector<std::string> filesTo;
   std::string literal_args;
-  cmTarget::TargetType targetType =
-      static_cast<cmTarget::TargetType>(this->Target->GetType());
+  cmState::TargetType targetType =
+      static_cast<cmState::TargetType>(this->Target->GetType());
   cmInstallType type = cmInstallType();
   switch(targetType)
     {
-    case cmTarget::EXECUTABLE: type = cmInstallType_EXECUTABLE; break;
-    case cmTarget::STATIC_LIBRARY: type = cmInstallType_STATIC_LIBRARY; break;
-    case cmTarget::SHARED_LIBRARY: type = cmInstallType_SHARED_LIBRARY; break;
-    case cmTarget::MODULE_LIBRARY: type = cmInstallType_MODULE_LIBRARY; break;
-    case cmTarget::INTERFACE_LIBRARY:
+    case cmState::EXECUTABLE: type = cmInstallType_EXECUTABLE; break;
+    case cmState::STATIC_LIBRARY: type = cmInstallType_STATIC_LIBRARY; break;
+    case cmState::SHARED_LIBRARY: type = cmInstallType_SHARED_LIBRARY; break;
+    case cmState::MODULE_LIBRARY: type = cmInstallType_MODULE_LIBRARY; break;
+    case cmState::INTERFACE_LIBRARY:
       // Not reachable. We never create a cmInstallTargetGenerator for
       // an INTERFACE_LIBRARY.
       assert(0 && "INTERFACE_LIBRARY targets have no installable outputs.");
       break;
-    case cmTarget::OBJECT_LIBRARY:
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::UNKNOWN_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
+    case cmState::UNKNOWN_LIBRARY:
       this->Target->Target->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR,
         "cmInstallTargetGenerator created with non-installable target.");
       return;
     }
-  if(targetType == cmTarget::EXECUTABLE)
+  if(targetType == cmState::EXECUTABLE)
     {
     // There is a bug in cmInstallCommand if this fails.
     assert(this->NamelinkMode == NamelinkModeNone);
@@ -375,7 +375,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
   cmGeneratorTarget *gtgt = target->GetMakefile()
                                   ->GetGlobalGenerator()
                                   ->GetGeneratorTarget(target);
-  if(target->GetType() == cmTarget::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     std::string targetName;
     std::string targetNameReal;
@@ -542,9 +542,9 @@ cmInstallTargetGenerator
                           std::string const& toDestDirPath)
 {
   if(this->ImportLibrary ||
-     !(this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->Target->GetType() == cmTarget::MODULE_LIBRARY ||
-       this->Target->GetType() == cmTarget::EXECUTABLE))
+     !(this->Target->GetType() == cmState::SHARED_LIBRARY ||
+       this->Target->GetType() == cmState::MODULE_LIBRARY ||
+       this->Target->GetType() == cmState::EXECUTABLE))
     {
     return;
     }
@@ -602,7 +602,7 @@ cmInstallTargetGenerator
 
   // Edit the install_name of the target itself if necessary.
   std::string new_id;
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->Target->GetType() == cmState::SHARED_LIBRARY)
     {
     std::string for_build =
       this->Target->GetInstallNameDirForBuildTree(config);
@@ -813,7 +813,7 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
 
   // don't strip static and import libraries, because it removes the only
   // symbol table they have so you can't link to them anymore
-  if(this->Target->GetType()==cmTarget::STATIC_LIBRARY || this->ImportLibrary)
+  if(this->Target->GetType()==cmState::STATIC_LIBRARY || this->ImportLibrary)
     {
     return;
     }
@@ -844,7 +844,7 @@ cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
                                         const std::string& toDestDirPath)
 {
   // Static libraries need ranlib on this platform.
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->Target->GetType() != cmState::STATIC_LIBRARY)
     {
     return;
     }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 7cf0ad0..2a12f2b 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -137,7 +137,7 @@ void cmLocalGenerator::TraceDependencies()
       t != targets.end(); ++t)
     {
     if (t->second->Target->IsImported()
-        || t->second->GetType() == cmTarget::INTERFACE_LIBRARY)
+        || t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -472,7 +472,7 @@ void cmLocalGenerator::ComputeTargetManifest()
       t != targets.end(); ++t)
     {
     cmGeneratorTarget& target = *t->second;
-    if (target.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (target.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -1347,12 +1347,12 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
 
   switch(target->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       this->GetStaticLibraryFlags(linkFlags, buildType, target->Target);
       break;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       libraryLinkVariable = "CMAKE_MODULE_LINKER_FLAGS";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       {
       linkFlags = this->Makefile->GetSafeDefinition(libraryLinkVariable);
       linkFlags += " ";
@@ -1404,7 +1404,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
                                 *target, false, false, useWatcomQuote);
       }
       break;
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       {
       linkFlags +=
         this->Makefile->GetSafeDefinition("CMAKE_EXE_LINKER_FLAGS");
@@ -1549,7 +1549,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
     this->Makefile->GetSafeDefinition("CMAKE_LIBRARY_PATH_TERMINATOR");
 
   // Flags to link an executable to shared libraries.
-  if (tgt.GetType() == cmTarget::EXECUTABLE &&
+  if (tgt.GetType() == cmState::EXECUTABLE &&
       this->StateSnapshot.GetState()->
         GetGlobalPropertyAsBool("TARGET_SUPPORTS_SHARED_LIBS"))
     {
@@ -1631,7 +1631,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
   ItemVector const& items = cli.GetItems();
   for(ItemVector::const_iterator li = items.begin(); li != items.end(); ++li)
     {
-    if(li->Target && li->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(li->Target && li->Target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -1817,8 +1817,8 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
     if(cmSystemTools::FileIsFullPath(inName.c_str()))
       {
       std::string tLocation;
-      if(target->GetType() >= cmTarget::EXECUTABLE &&
-         target->GetType() <= cmTarget::MODULE_LIBRARY)
+      if(target->GetType() >= cmState::EXECUTABLE &&
+         target->GetType() <= cmState::MODULE_LIBRARY)
         {
         tLocation = target->GetLocation(config);
         tLocation = cmSystemTools::GetFilenamePath(tLocation);
@@ -1838,23 +1838,23 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName,
       }
     switch (target->GetType())
       {
-      case cmTarget::EXECUTABLE:
-      case cmTarget::STATIC_LIBRARY:
-      case cmTarget::SHARED_LIBRARY:
-      case cmTarget::MODULE_LIBRARY:
-      case cmTarget::UNKNOWN_LIBRARY:
+      case cmState::EXECUTABLE:
+      case cmState::STATIC_LIBRARY:
+      case cmState::SHARED_LIBRARY:
+      case cmState::MODULE_LIBRARY:
+      case cmState::UNKNOWN_LIBRARY:
         dep = target->GetLocation(config);
         return true;
-      case cmTarget::OBJECT_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
         // An object library has no single file on which to depend.
         // This was listed to get the target-level dependency.
         return false;
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
         // An interface library has no file on which to depend.
         // This was listed to get the target-level dependency.
         return false;
-      case cmTarget::UTILITY:
-      case cmTarget::GLOBAL_TARGET:
+      case cmState::UTILITY:
+      case cmState::GLOBAL_TARGET:
         // A utility target has no file on which to depend.  This was listed
         // only to get the target-level dependency.
         return false;
@@ -2104,8 +2104,8 @@ void cmLocalGenerator
 
   std::string warnCMP0063;
   std::string *pWarnCMP0063 = 0;
-  if (target->GetType() != cmTarget::SHARED_LIBRARY &&
-      target->GetType() != cmTarget::MODULE_LIBRARY &&
+  if (target->GetType() != cmState::SHARED_LIBRARY &&
+      target->GetType() != cmState::MODULE_LIBRARY &&
       !target->IsExecutableWithExports())
     {
     switch (target->GetPolicyStatusCMP0063())
@@ -2151,8 +2151,8 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
 {
   int targetType = target->GetType();
 
-  bool shared = ((targetType == cmTarget::SHARED_LIBRARY) ||
-                  (targetType == cmTarget::MODULE_LIBRARY));
+  bool shared = ((targetType == cmState::SHARED_LIBRARY) ||
+                  (targetType == cmState::MODULE_LIBRARY));
 
   if (this->GetShouldUseOldFlags(shared, lang))
     {
@@ -2160,7 +2160,7 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
     }
   else
     {
-    if (target->GetType() == cmTarget::OBJECT_LIBRARY)
+    if (target->GetType() == cmState::OBJECT_LIBRARY)
       {
       if (target->GetPropertyAsBool("POSITION_INDEPENDENT_CODE"))
         {
@@ -2234,7 +2234,7 @@ void cmLocalGenerator::AddPositionIndependentFlags(std::string& flags,
 {
   const char* picFlags = 0;
 
-  if(targetType == cmTarget::EXECUTABLE)
+  if(targetType == cmState::EXECUTABLE)
     {
     std::string flagsVar = "CMAKE_";
     flagsVar += lang;
@@ -2512,7 +2512,7 @@ cmLocalGenerator
   cmTargets& tgts = this->Makefile->GetTargets();
   for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -2540,9 +2540,9 @@ cmLocalGenerator
       // Generate the proper install generator for this target type.
       switch(l->second.GetType())
         {
-        case cmTarget::EXECUTABLE:
-        case cmTarget::STATIC_LIBRARY:
-        case cmTarget::MODULE_LIBRARY:
+        case cmState::EXECUTABLE:
+        case cmState::STATIC_LIBRARY:
+        case cmState::MODULE_LIBRARY:
           {
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
@@ -2550,7 +2550,7 @@ cmLocalGenerator
           g.Generate(os, config, configurationTypes);
           }
           break;
-        case cmTarget::SHARED_LIBRARY:
+        case cmState::SHARED_LIBRARY:
           {
 #if defined(_WIN32) || defined(__CYGWIN__)
           // Special code to handle DLL.  Install the import library
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 195a1e0..2535d2f 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -31,7 +31,7 @@ void cmLocalGhsMultiGenerator::Generate()
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
     {
-    if (l->second->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (l->second->GetType() == cmState::INTERFACE_LIBRARY
         || l->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 8f7a66f..47c712c 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -77,7 +77,7 @@ void cmLocalNinjaGenerator::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY
         || t->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index e4533cc..5a10d05 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -119,7 +119,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY
         || t->second->Target->IsImported())
       {
       continue;
@@ -180,7 +180,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
       ti != targets.end(); ++ti)
     {
     cmGeneratorTarget* gt = ti->second;
-    if (gt->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (gt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -423,12 +423,12 @@ void cmLocalUnixMakefileGenerator3
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if((t->second->GetType() == cmTarget::EXECUTABLE) ||
-       (t->second->GetType() == cmTarget::STATIC_LIBRARY) ||
-       (t->second->GetType() == cmTarget::SHARED_LIBRARY) ||
-       (t->second->GetType() == cmTarget::MODULE_LIBRARY) ||
-       (t->second->GetType() == cmTarget::OBJECT_LIBRARY) ||
-       (t->second->GetType() == cmTarget::UTILITY))
+    if((t->second->GetType() == cmState::EXECUTABLE) ||
+       (t->second->GetType() == cmState::STATIC_LIBRARY) ||
+       (t->second->GetType() == cmState::SHARED_LIBRARY) ||
+       (t->second->GetType() == cmState::MODULE_LIBRARY) ||
+       (t->second->GetType() == cmState::OBJECT_LIBRARY) ||
+       (t->second->GetType() == cmState::UTILITY))
       {
       if (t->second->Target->IsImported())
         {
@@ -1774,7 +1774,7 @@ void cmLocalUnixMakefileGenerator3
   cmTargets::iterator glIt;
   for ( glIt = targets->begin(); glIt != targets->end(); ++ glIt )
     {
-    if ( glIt->second.GetType() == cmTarget::GLOBAL_TARGET )
+    if ( glIt->second.GetType() == cmState::GLOBAL_TARGET )
       {
       std::string targetString = "Special rule for the target " + glIt->first;
       std::vector<std::string> commands;
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index b043b00..63fc283 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -77,7 +77,7 @@ void cmLocalVisualStudio10Generator::Generate()
   cmTargets &tgts = this->Makefile->GetTargets();
   for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index c620baf..48639a8 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -86,8 +86,8 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
   for(cmTargets::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY
-        || l->second.GetType() == cmTarget::GLOBAL_TARGET)
+    if (l->second.GetType() == cmState::INTERFACE_LIBRARY
+        || l->second.GetType() == cmState::GLOBAL_TARGET)
       {
       continue;
       }
@@ -132,22 +132,22 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
     {
     switch(l->second.GetType())
       {
-      case cmTarget::STATIC_LIBRARY:
-      case cmTarget::OBJECT_LIBRARY:
+      case cmState::STATIC_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
         this->SetBuildType(STATIC_LIBRARY, l->first.c_str(), l->second);
         break;
-      case cmTarget::SHARED_LIBRARY:
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::SHARED_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         this->SetBuildType(DLL, l->first.c_str(), l->second);
         break;
-      case cmTarget::EXECUTABLE:
+      case cmState::EXECUTABLE:
         this->SetBuildType(EXECUTABLE,l->first.c_str(), l->second);
         break;
-      case cmTarget::UTILITY:
-      case cmTarget::GLOBAL_TARGET:
+      case cmState::UTILITY:
+      case cmState::GLOBAL_TARGET:
         this->SetBuildType(UTILITY, l->first.c_str(), l->second);
         break;
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
         continue;
       default:
         cmSystemTools::Error("Bad target type: ", l->first.c_str());
@@ -263,8 +263,8 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // special care for dependencies.  The first rule must depend on all
   // the dependencies of all the rules.  The later rules must each
   // depend only on the previous rule.
-  if ((target.GetType() == cmTarget::UTILITY ||
-      target.GetType() == cmTarget::GLOBAL_TARGET) &&
+  if ((target.GetType() == cmState::UTILITY ||
+      target.GetType() == cmState::GLOBAL_TARGET) &&
       (!target.GetPreBuildCommands().empty() ||
        !target.GetPostBuildCommands().empty()))
     {
@@ -482,8 +482,8 @@ void cmLocalVisualStudio6Generator
       cmSystemTools::ExpandListArgument(dependsValue, depends);
       }
     if (GetVS6TargetName(source) != libName ||
-      target.GetType() == cmTarget::UTILITY ||
-      target.GetType() == cmTarget::GLOBAL_TARGET)
+      target.GetType() == cmState::UTILITY ||
+      target.GetType() == cmState::GLOBAL_TARGET)
       {
       fout << "# Begin Source File\n\n";
 
@@ -804,7 +804,7 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
 
   // VS6 forgets to create the output directory for archives if it
   // differs from the intermediate directory.
-  if(target.GetType() != cmTarget::STATIC_LIBRARY) { return pcc; }
+  if(target.GetType() != cmState::STATIC_LIBRARY) { return pcc; }
 
   cmGeneratorTarget* gt =
     this->GlobalGenerator->GetGeneratorTarget(&target);
@@ -835,7 +835,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
                                               const std::string& configName,
                                               const std::string& /* libName */)
 {
-  if (target.GetType() >= cmTarget::UTILITY )
+  if (target.GetType() >= cmState::UTILITY )
     {
     return "";
     }
@@ -948,8 +948,8 @@ void cmLocalVisualStudio6Generator
                  const std::string& libName, cmTarget &target,
                  std::vector<cmSourceGroup> &)
 {
-  bool targetBuilds = (target.GetType() >= cmTarget::EXECUTABLE &&
-                       target.GetType() <= cmTarget::MODULE_LIBRARY);
+  bool targetBuilds = (target.GetType() >= cmState::EXECUTABLE &&
+                       target.GetType() <= cmState::MODULE_LIBRARY);
 #ifdef CM_USE_OLD_VS6
   // Lookup the library and executable output directories.
   std::string libPath;
@@ -1108,12 +1108,12 @@ void cmLocalVisualStudio6Generator
     // add libraries to executables and dlls (but never include
     // a library in a library, bad recursion)
     // NEVER LINK STATIC LIBRARIES TO OTHER STATIC LIBRARIES
-    if ((target.GetType() != cmTarget::SHARED_LIBRARY
-         && target.GetType() != cmTarget::STATIC_LIBRARY
-         && target.GetType() != cmTarget::MODULE_LIBRARY) ||
-        (target.GetType()==cmTarget::SHARED_LIBRARY
+    if ((target.GetType() != cmState::SHARED_LIBRARY
+         && target.GetType() != cmState::STATIC_LIBRARY
+         && target.GetType() != cmState::MODULE_LIBRARY) ||
+        (target.GetType()==cmState::SHARED_LIBRARY
          && libName != GetVS6TargetName(j->first)) ||
-        (target.GetType()==cmTarget::MODULE_LIBRARY
+        (target.GetType()==cmState::MODULE_LIBRARY
          && libName != GetVS6TargetName(j->first)))
       {
       // Compute the proper name to use to link this library.
@@ -1195,7 +1195,7 @@ void cmLocalVisualStudio6Generator
   std::string extraLinkOptionsRelease;
   std::string extraLinkOptionsMinSizeRel;
   std::string extraLinkOptionsRelWithDebInfo;
-  if(target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
@@ -1208,7 +1208,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
@@ -1221,7 +1221,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
@@ -1313,9 +1313,9 @@ void cmLocalVisualStudio6Generator
 
   // Compute version number information.
   std::string targetVersionFlag;
-  if(target.GetType() == cmTarget::EXECUTABLE ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::EXECUTABLE ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY)
     {
     int major;
     int minor;
@@ -1332,10 +1332,10 @@ void cmLocalVisualStudio6Generator
   std::string outputNameRelease = outputName;
   std::string outputNameMinSizeRel = outputName;
   std::string outputNameRelWithDebInfo = outputName;
-  if(target.GetType() == cmTarget::EXECUTABLE ||
-     target.GetType() == cmTarget::STATIC_LIBRARY ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::EXECUTABLE ||
+     target.GetType() == cmState::STATIC_LIBRARY ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY)
     {
     outputName = gt->GetFullName();
     outputNameDebug = gt->GetFullName("Debug");
@@ -1343,7 +1343,7 @@ void cmLocalVisualStudio6Generator
     outputNameMinSizeRel = gt->GetFullName("MinSizeRel");
     outputNameRelWithDebInfo = gt->GetFullName("RelWithDebInfo");
     }
-  else if(target.GetType() == cmTarget::OBJECT_LIBRARY)
+  else if(target.GetType() == cmState::OBJECT_LIBRARY)
     {
     outputName = target.GetName();
     outputName += ".lib";
@@ -1359,10 +1359,10 @@ void cmLocalVisualStudio6Generator
   std::string outputDirRelease;
   std::string outputDirMinSizeRel;
   std::string outputDirRelWithDebInfo;
-  if(target.GetType() == cmTarget::EXECUTABLE ||
-     target.GetType() == cmTarget::STATIC_LIBRARY ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::EXECUTABLE ||
+     target.GetType() == cmState::STATIC_LIBRARY ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY)
     {
 #ifdef CM_USE_OLD_VS6
     outputDirOld =
@@ -1382,7 +1382,7 @@ void cmLocalVisualStudio6Generator
         removeQuotes(this->ConvertToOutputFormat(
                  gt->GetDirectory("RelWithDebInfo").c_str(), SHELL));
     }
-  else if(target.GetType() == cmTarget::OBJECT_LIBRARY)
+  else if(target.GetType() == cmState::OBJECT_LIBRARY)
     {
     std::string outputDir = cmake::GetCMakeFilesDirectoryPostSlash();
     outputDirDebug = outputDir + "Debug";
@@ -1396,9 +1396,9 @@ void cmLocalVisualStudio6Generator
   std::string optionsRelease;
   std::string optionsMinSizeRel;
   std::string optionsRelWithDebInfo;
-  if(target.GetType() == cmTarget::EXECUTABLE ||
-     target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::EXECUTABLE ||
+     target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsDebug =
       extraLinkOptions + " " + extraLinkOptionsDebug;
@@ -1424,9 +1424,9 @@ void cmLocalVisualStudio6Generator
   std::string targetImplibFlagRelease;
   std::string targetImplibFlagMinSizeRel;
   std::string targetImplibFlagRelWithDebInfo;
-  if(target.GetType() == cmTarget::SHARED_LIBRARY ||
-     target.GetType() == cmTarget::MODULE_LIBRARY ||
-     target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::SHARED_LIBRARY ||
+     target.GetType() == cmState::MODULE_LIBRARY ||
+     target.GetType() == cmState::EXECUTABLE)
     {
     std::string fullPathImpDebug = gt->GetDirectory("Debug", true);
     std::string fullPathImpRelease = gt->GetDirectory("Release", true);
@@ -1494,7 +1494,7 @@ void cmLocalVisualStudio6Generator
   std::string staticLibOptionsRelease;
   std::string staticLibOptionsMinSizeRel;
   std::string staticLibOptionsRelWithDebInfo;
-  if(target.GetType() == cmTarget::STATIC_LIBRARY )
+  if(target.GetType() == cmState::STATIC_LIBRARY )
     {
     const char *libflagsGlobal =
       this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS");
@@ -1567,8 +1567,8 @@ void cmLocalVisualStudio6Generator
                                  libnameExports.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
                                  mfcFlag);
-    if(target.GetType() == cmTarget::STATIC_LIBRARY ||
-       target.GetType() == cmTarget::OBJECT_LIBRARY)
+    if(target.GetType() == cmState::STATIC_LIBRARY ||
+       target.GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "CM_STATIC_LIB_ARGS_DEBUG",
                                    staticLibOptionsDebug.c_str());
@@ -1674,7 +1674,7 @@ void cmLocalVisualStudio6Generator
                     (exePath.c_str(), SHELL)).c_str());
 #endif
 
-    if(targetBuilds || target.GetType() == cmTarget::OBJECT_LIBRARY)
+    if(targetBuilds || target.GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "OUTPUT_DIRECTORY_DEBUG",
                                    outputDirDebug.c_str());
@@ -1698,8 +1698,8 @@ void cmLocalVisualStudio6Generator
       = this->Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
     cmSystemTools::ReplaceString(line, "DEBUG_POSTFIX",
                                  debugPostfix?debugPostfix:"");
-    if(target.GetType() >= cmTarget::EXECUTABLE &&
-       target.GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(target.GetType() >= cmState::EXECUTABLE &&
+       target.GetType() <= cmState::OBJECT_LIBRARY)
       {
       // store flags for each configuration
       std::string flags = " ";
@@ -1899,7 +1899,7 @@ void cmLocalVisualStudio6Generator
         this->ConvertToOutputFormat(l->Value.c_str(), SHELL);
       }
     else if (!l->Target
-        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->Target->GetType() != cmState::INTERFACE_LIBRARY)
       {
       options += l->Value;
       }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 82b18c6..e891c33 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -71,7 +71,7 @@ void cmLocalVisualStudio7Generator::AddHelperCommands()
 
   for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
     {
-    if(l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -106,7 +106,7 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules()
       // Add the rule to targets that need it.
       for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
         {
-        if (l->second.GetType() == cmTarget::GLOBAL_TARGET)
+        if (l->second.GetType() == cmState::GLOBAL_TARGET)
           {
           continue;
           }
@@ -131,7 +131,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       l != tgts.end(); l++)
     {
     cmTarget& tgt = l->second;
-    if(tgt.GetType() == cmTarget::GLOBAL_TARGET)
+    if(tgt.GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
       cmCustomCommandLine force_command;
@@ -182,7 +182,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
   for(cmTargets::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    if(l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -672,22 +672,22 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
   switch(target.GetType())
     {
-    case cmTarget::OBJECT_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
       targetBuilds = false; // no manifest tool for object library
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       projectType = "typeStaticLibrary";
       configType = "4";
       break;
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       projectType = "typeDynamicLibrary";
       configType = "2";
       break;
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       configType = "1";
       break;
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
       configType = "10";
     default:
       targetBuilds = false;
@@ -788,10 +788,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target.GetType() < cmTarget::UTILITY)
+  if (target.GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target.GetType() == cmTarget::OBJECT_LIBRARY?
+      target.GetType() == cmState::OBJECT_LIBRARY?
       intermediateDir : gt->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
@@ -882,7 +882,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target.GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(target.GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
     std::string pdb = gt->GetCompilePDBPath(configName);
@@ -1045,21 +1045,21 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     static_cast<cmGlobalVisualStudio7Generator*>(this->GlobalGenerator);
   std::string temp;
   std::string extraLinkOptions;
-  if(target.GetType() == cmTarget::EXECUTABLE)
+  if(target.GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_EXE_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_SHARED_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(target.GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS")
@@ -1099,7 +1099,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
   cmGeneratorTarget* gt =
     this->GlobalGenerator->GetGeneratorTarget(&target);
 
-  if (target.GetType() == cmTarget::SHARED_LIBRARY &&
+  if (target.GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -1109,9 +1109,9 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     }
   switch(target.GetType())
     {
-    case cmTarget::UNKNOWN_LIBRARY:
+    case cmState::UNKNOWN_LIBRARY:
       break;
-    case cmTarget::OBJECT_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
       {
       std::string libpath = this->GetTargetDirectory(target);
       libpath += "/";
@@ -1127,7 +1127,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
            << this->ConvertToXMLOutputPathSingle(libpath.c_str()) << "\"/>\n";
       break;
       }
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
     {
     std::string targetNameFull = gt->GetFullName(configName);
     std::string libpath = gt->GetDirectory(configName);
@@ -1161,8 +1161,8 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
          << this->ConvertToXMLOutputPathSingle(libpath.c_str()) << "\"/>\n";
     break;
     }
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
     {
     std::string targetName;
     std::string targetNameSO;
@@ -1260,7 +1260,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     fout << "/>\n";
     }
     break;
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
     {
     std::string targetName;
     std::string targetNameFull;
@@ -1374,9 +1374,9 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"/>\n";
     break;
     }
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::INTERFACE_LIBRARY:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
+    case cmState::INTERFACE_LIBRARY:
       break;
     }
 }
@@ -1408,7 +1408,7 @@ cmLocalVisualStudio7GeneratorInternals
       fout << lg->ConvertToXMLOutputPath(rel.c_str()) << " ";
       }
     else if (!l->Target
-        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->Target->GetType() != cmState::INTERFACE_LIBRARY)
       {
       fout << l->Value << " ";
       }
@@ -1775,8 +1775,8 @@ bool cmLocalVisualStudio7Generator
     std::string source = (*sf)->GetFullPath();
     FCInfo fcinfo(this, target, *(*sf), configs);
 
-    if (source != libName || target.GetType() == cmTarget::UTILITY ||
-      target.GetType() == cmTarget::GLOBAL_TARGET )
+    if (source != libName || target.GetType() == cmState::UTILITY ||
+      target.GetType() == cmState::GLOBAL_TARGET )
       {
       fout << "\t\t\t<File\n";
       std::string d = this->ConvertToXMLOutputPathSingle(source.c_str());
@@ -2026,7 +2026,7 @@ void cmLocalVisualStudio7Generator
                     cmTarget &target,
                     const std::string& /*libName*/)
 {
-  if (target.GetType() > cmTarget::GLOBAL_TARGET)
+  if (target.GetType() > cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -2043,7 +2043,7 @@ void cmLocalVisualStudio7Generator
   tool = this->FortranProject? "VFPreLinkEventTool":"VCPreLinkEventTool";
   event.Start(tool);
   bool addedPrelink = false;
-  if (target.GetType() == cmTarget::SHARED_LIBRARY &&
+  if (target.GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2124,30 +2124,30 @@ cmLocalVisualStudio7Generator
   const char* projectType = 0;
   switch(target.GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       projectType = "typeStaticLibrary";
       if(keyword)
         {
         keyword = "Static Library";
         }
       break;
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       projectType = "typeDynamicLibrary";
       if(!keyword)
         {
         keyword = "Dll";
         }
       break;
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       if(!keyword)
         {
         keyword = "Console Application";
         }
       projectType = 0;
       break;
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
     default:
       break;
     }
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index c830a82..2f44fb7 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -89,8 +89,8 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
   // If an executable exports symbols then VS wants to create an
   // import library but forgets to create the output directory.
   // The Intel Fortran plugin always forgets to the directory.
-  if(target.GetType() != cmTarget::EXECUTABLE &&
-     !(isFortran && target.GetType() == cmTarget::SHARED_LIBRARY))
+  if(target.GetType() != cmState::EXECUTABLE &&
+     !(isFortran && target.GetType() == cmState::SHARED_LIBRARY))
     { return pcc; }
   cmGeneratorTarget* gt =
       this->GetGlobalGenerator()->GetGeneratorTarget(&target);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d62c5c4..8f656b4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -759,7 +759,7 @@ void cmMakefile::ConfigureFinalPass()
   for (cmTargets::iterator l = this->Targets.begin();
        l != this->Targets.end(); l++)
     {
-    if (l->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -810,7 +810,7 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target,
       return;
     }
 
-  if(ti->second.GetType() == cmTarget::OBJECT_LIBRARY)
+  if(ti->second.GetType() == cmState::OBJECT_LIBRARY)
     {
     std::ostringstream e;
     e << "Target \"" << target << "\" is an OBJECT library "
@@ -818,7 +818,7 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target,
     this->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
-  if(ti->second.GetType() == cmTarget::INTERFACE_LIBRARY)
+  if(ti->second.GetType() == cmState::INTERFACE_LIBRARY)
     {
     std::ostringstream e;
     e << "Target \"" << target << "\" is an INTERFACE library "
@@ -1184,7 +1184,7 @@ cmMakefile::AddUtilityCommand(const std::string& utilityName,
                               bool uses_terminal)
 {
   // Create a target instance for this utility.
-  cmTarget* target = this->AddNewTarget(cmTarget::UTILITY, utilityName);
+  cmTarget* target = this->AddNewTarget(cmState::UTILITY, utilityName);
   if (excludeFromAll)
     {
     target->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
@@ -1419,9 +1419,9 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
     if(tgt)
       {
       // if it is not a static or shared library then you can not link to it
-      if(!((tgt->GetType() == cmTarget::STATIC_LIBRARY) ||
-           (tgt->GetType() == cmTarget::SHARED_LIBRARY) ||
-           (tgt->GetType() == cmTarget::INTERFACE_LIBRARY) ||
+      if(!((tgt->GetType() == cmState::STATIC_LIBRARY) ||
+           (tgt->GetType() == cmState::SHARED_LIBRARY) ||
+           (tgt->GetType() == cmState::INTERFACE_LIBRARY) ||
            tgt->IsExecutableWithExports()))
         {
         std::ostringstream e;
@@ -2018,9 +2018,9 @@ void cmMakefile::AddGlobalLinkInformation(const std::string& name,
   // for these targets do not add anything
   switch(target.GetType())
     {
-    case cmTarget::UTILITY:
-    case cmTarget::GLOBAL_TARGET:
-    case cmTarget::INTERFACE_LIBRARY:
+    case cmState::UTILITY:
+    case cmState::GLOBAL_TARGET:
+    case cmState::INTERFACE_LIBRARY:
       return;
     default:;
     }
@@ -2057,20 +2057,20 @@ void cmMakefile::AddAlias(const std::string& lname, cmTarget *tgt)
 }
 
 cmTarget* cmMakefile::AddLibrary(const std::string& lname,
-                            cmTarget::TargetType type,
+                            cmState::TargetType type,
                             const std::vector<std::string> &srcs,
                             bool excludeFromAll)
 {
   // wrong type ? default to STATIC
-  if (    (type != cmTarget::STATIC_LIBRARY)
-       && (type != cmTarget::SHARED_LIBRARY)
-       && (type != cmTarget::MODULE_LIBRARY)
-       && (type != cmTarget::OBJECT_LIBRARY)
-       && (type != cmTarget::INTERFACE_LIBRARY))
+  if (    (type != cmState::STATIC_LIBRARY)
+       && (type != cmState::SHARED_LIBRARY)
+       && (type != cmState::MODULE_LIBRARY)
+       && (type != cmState::OBJECT_LIBRARY)
+       && (type != cmState::INTERFACE_LIBRARY))
     {
     this->IssueMessage(cmake::INTERNAL_ERROR,
                        "cmMakefile::AddLibrary given invalid target type.");
-    type = cmTarget::STATIC_LIBRARY;
+    type = cmState::STATIC_LIBRARY;
     }
 
   cmTarget* target = this->AddNewTarget(type, lname);
@@ -2091,7 +2091,7 @@ cmTarget* cmMakefile::AddExecutable(const char *exeName,
                                     const std::vector<std::string> &srcs,
                                     bool excludeFromAll)
 {
-  cmTarget* target = this->AddNewTarget(cmTarget::EXECUTABLE, exeName);
+  cmTarget* target = this->AddNewTarget(cmState::EXECUTABLE, exeName);
   if(excludeFromAll)
     {
     target->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
@@ -2103,7 +2103,7 @@ cmTarget* cmMakefile::AddExecutable(const char *exeName,
 
 //----------------------------------------------------------------------------
 cmTarget*
-cmMakefile::AddNewTarget(cmTarget::TargetType type, const std::string& name)
+cmMakefile::AddNewTarget(cmState::TargetType type, const std::string& name)
 {
   cmTargets::iterator it =
     this->Targets.insert(cmTargets::value_type(name, cmTarget())).first;
@@ -2299,8 +2299,8 @@ void cmMakefile::ExpandVariablesCMP0019()
        l != this->Targets.end(); ++l)
     {
     cmTarget &t = l->second;
-    if (t.GetType() == cmTarget::INTERFACE_LIBRARY
-        || t.GetType() == cmTarget::GLOBAL_TARGET)
+    if (t.GetType() == cmState::INTERFACE_LIBRARY
+        || t.GetType() == cmState::GLOBAL_TARGET)
       {
       continue;
       }
@@ -4178,7 +4178,7 @@ void cmMakefile::RaiseScope(const std::string& var, const char *varDef)
 //----------------------------------------------------------------------------
 cmTarget*
 cmMakefile::AddImportedTarget(const std::string& name,
-                              cmTarget::TargetType type,
+                              cmState::TargetType type,
                               bool global)
 {
   // Create the target.
@@ -4279,7 +4279,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
       // The conflict is with a non-imported target.
       // Allow this if the user has requested support.
       cmake* cm = this->GetCMakeInstance();
-      if(isCustom && existing->GetType() == cmTarget::UTILITY &&
+      if(isCustom && existing->GetType() == cmState::UTILITY &&
          this != existing->GetMakefile() &&
          cm->GetState()
            ->GetGlobalPropertyAsBool("ALLOW_DUPLICATE_CUSTOM_TARGETS"))
@@ -4295,22 +4295,22 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
         << "The existing target is ";
       switch(existing->GetType())
         {
-        case cmTarget::EXECUTABLE:
+        case cmState::EXECUTABLE:
           e << "an executable ";
           break;
-        case cmTarget::STATIC_LIBRARY:
+        case cmState::STATIC_LIBRARY:
           e << "a static library ";
           break;
-        case cmTarget::SHARED_LIBRARY:
+        case cmState::SHARED_LIBRARY:
           e << "a shared library ";
           break;
-        case cmTarget::MODULE_LIBRARY:
+        case cmState::MODULE_LIBRARY:
           e << "a module library ";
           break;
-        case cmTarget::UTILITY:
+        case cmState::UTILITY:
           e << "a custom target ";
           break;
-        case cmTarget::INTERFACE_LIBRARY:
+        case cmState::INTERFACE_LIBRARY:
           e << "an interface library ";
           break;
         default: break;
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index d9d5a8a..4215b72 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -172,10 +172,10 @@ public:
 
   /** Create a new imported target with the name and type given.  */
   cmTarget* AddImportedTarget(const std::string& name,
-                              cmTarget::TargetType type,
+                              cmState::TargetType type,
                               bool global);
 
-  cmTarget* AddNewTarget(cmTarget::TargetType type, const std::string& name);
+  cmTarget* AddNewTarget(cmState::TargetType type, const std::string& name);
 
   /**
    * Add an executable to the build.
@@ -281,7 +281,7 @@ public:
   /**
    * Set the name of the library.
    */
-  cmTarget* AddLibrary(const std::string& libname, cmTarget::TargetType type,
+  cmTarget* AddLibrary(const std::string& libname, cmState::TargetType type,
                   const std::vector<std::string> &srcs,
                   bool excludeFromAll = false);
   void AddAlias(const std::string& libname, cmTarget *tgt);
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index cb19d9b..0b38656 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -26,7 +26,7 @@ cmMakefileLibraryTargetGenerator
   cmMakefileTargetGenerator(target)
 {
   this->CustomCommandDriver = OnDepends;
-  if (this->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmState::INTERFACE_LIBRARY)
     {
     this->GeneratorTarget->GetLibraryNames(
       this->TargetNameOut, this->TargetNameSO, this->TargetNameReal,
@@ -64,10 +64,10 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
   // Write the rule for this target type.
   switch(this->GeneratorTarget->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       this->WriteStaticLibraryRules();
       break;
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       this->WriteSharedLibraryRules(false);
       if(this->GeneratorTarget->NeedRelinkBeforeInstall(this->ConfigName))
         {
@@ -75,7 +75,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
         this->WriteSharedLibraryRules(true);
         }
       break;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       this->WriteModuleLibraryRules(false);
       if(this->GeneratorTarget->NeedRelinkBeforeInstall(this->ConfigName))
         {
@@ -83,7 +83,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
         this->WriteModuleLibraryRules(true);
         }
       break;
-    case cmTarget::OBJECT_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
       this->WriteObjectLibraryRules();
       break;
     default:
@@ -253,8 +253,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   this->LocalGenerator->AppendFlags(linkFlags, extraFlags);
 
   // Add OSX version flags, if any.
-  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
     {
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "COMPATIBILITY", true);
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "CURRENT", false);
@@ -353,13 +353,13 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     buildEcho += linkLanguage;
     switch(this->GeneratorTarget->GetType())
       {
-      case cmTarget::STATIC_LIBRARY:
+      case cmState::STATIC_LIBRARY:
         buildEcho += " static library ";
         break;
-      case cmTarget::SHARED_LIBRARY:
+      case cmState::SHARED_LIBRARY:
         buildEcho += " shared library ";
         break;
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         if (this->Target->IsCFBundleOnApple())
             buildEcho += " CFBundle";
         buildEcho += " shared module ";
@@ -377,10 +377,10 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   const char* forbiddenFlagVar = 0;
   switch(this->GeneratorTarget->GetType())
     {
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS";
       break;
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       forbiddenFlagVar = "_CREATE_SHARED_MODULE_FORBIDDEN_FLAGS";
       break;
     default: break;
@@ -429,7 +429,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 #ifdef _WIN32
   // There may be a manifest file for this target.  Add it to the
   // clean set just in case.
-  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmState::STATIC_LIBRARY)
     {
     libCleanFiles.push_back(
       this->Convert((targetFullPath+".manifest").c_str(),
@@ -441,7 +441,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> commands1;
   // Add a command to remove any existing files for this library.
   // for static libs only
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
     {
     this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
                                              *this->Target, "target");
@@ -497,7 +497,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> archiveAppendCommands;
   std::vector<std::string> archiveFinishCommands;
   std::string::size_type archiveCommandLimit = std::string::npos;
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
     {
     haveStaticLibraryRule =
       this->Makefile->GetDefinition(linkRuleVar)? true:false;
@@ -552,7 +552,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Collect up flags to link in needed libraries.
   std::string linkLibs;
-  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmState::STATIC_LIBRARY)
     {
     this->CreateLinkLibs(linkLibs, relink, useResponseFileForLibs, depends,
                          useWatcomQuote);
@@ -566,7 +566,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
                           useWatcomQuote);
 
   // maybe create .def file from list of objects
-  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -667,7 +667,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Compute the directory portion of the install_name setting.
   std::string install_name_dir;
-  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir =
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 9b0e5dd..f3c9b6d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -68,16 +68,16 @@ cmMakefileTargetGenerator::New(cmGeneratorTarget *tgt)
 
   switch (tgt->GetType())
     {
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       result = new cmMakefileExecutableTargetGenerator(tgt);
       break;
-    case cmTarget::STATIC_LIBRARY:
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
-    case cmTarget::OBJECT_LIBRARY:
+    case cmState::STATIC_LIBRARY:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
+    case cmState::OBJECT_LIBRARY:
       result = new cmMakefileLibraryTargetGenerator(tgt);
       break;
-    case cmTarget::UTILITY:
+    case cmState::UTILITY:
       result = new cmMakefileUtilityTargetGenerator(tgt);
       break;
     default:
@@ -542,10 +542,10 @@ cmMakefileTargetGenerator
   std::string targetFullPathReal;
   std::string targetFullPathPDB;
   std::string targetFullPathCompilePDB;
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
-     this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
     {
     targetFullPathReal =
       this->GeneratorTarget->GetFullPath(this->ConfigName, false, true);
@@ -554,7 +554,7 @@ cmMakefileTargetGenerator
     targetFullPathPDB += "/";
     targetFullPathPDB += this->GeneratorTarget->GetPDBName(this->ConfigName);
     }
-  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
     {
     targetFullPathCompilePDB =
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
@@ -1445,7 +1445,7 @@ void cmMakefileTargetGenerator
 ::AppendTargetDepends(std::vector<std::string>& depends)
 {
   // Static libraries never depend on anything for linking.
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
     {
     return;
     }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 02e47bd..b5648fe 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -41,7 +41,7 @@ cmNinjaNormalTargetGenerator(cmGeneratorTarget* target)
   , TargetLinkLanguage("")
 {
   this->TargetLinkLanguage = target->GetLinkerLanguage(this->GetConfigName());
-  if (target->GetType() == cmTarget::EXECUTABLE)
+  if (target->GetType() == cmState::EXECUTABLE)
     this->GetGeneratorTarget()->GetExecutableNames(this->TargetNameOut,
                                this->TargetNameReal,
                                this->TargetNameImport,
@@ -55,7 +55,7 @@ cmNinjaNormalTargetGenerator(cmGeneratorTarget* target)
                             this->TargetNamePDB,
                             GetLocalGenerator()->GetConfigName());
 
-  if(target->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(target->GetType() != cmState::OBJECT_LIBRARY)
     {
     // on Windows the output dir is already needed at compile time
     // ensure the directory exists (OutDir test)
@@ -87,7 +87,7 @@ void cmNinjaNormalTargetGenerator::Generate()
   // Write the build statements
   this->WriteObjectBuildStatements();
 
-  if(this->GetGeneratorTarget()->GetType() == cmTarget::OBJECT_LIBRARY)
+  if(this->GetGeneratorTarget()->GetType() == cmState::OBJECT_LIBRARY)
     {
     this->WriteObjectLibStatement();
     }
@@ -134,16 +134,16 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
 const char *cmNinjaNormalTargetGenerator::GetVisibleTypeName() const
 {
   switch (this->GetGeneratorTarget()->GetType()) {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "static library";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return "shared library";
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       if (this->GetTarget()->IsCFBundleOnApple())
         return "CFBundle shared module";
       else
         return "shared module";
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return "executable";
     default:
       return 0;
@@ -157,7 +157,7 @@ cmNinjaNormalTargetGenerator
   return this->TargetLinkLanguage
     + "_"
     + cmTarget::GetTargetTypeName(
-        (cmTarget::TargetType)this->GetGeneratorTarget()->GetType())
+        (cmState::TargetType)this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
     + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
     ;
@@ -167,8 +167,8 @@ void
 cmNinjaNormalTargetGenerator
 ::WriteLinkRule(bool useResponseFile)
 {
-  cmTarget::TargetType targetType =
-      (cmTarget::TargetType)this->GetGeneratorTarget()->GetType();
+  cmState::TargetType targetType =
+      (cmState::TargetType)this->GetGeneratorTarget()->GetType();
   std::string ruleName = this->LanguageLinkerRule();
 
   // Select whether to use a response file for objects.
@@ -242,7 +242,7 @@ cmNinjaNormalTargetGenerator
     vars.Manifests = "$MANIFESTS";
 
     std::string langFlags;
-    if (targetType != cmTarget::EXECUTABLE)
+    if (targetType != cmState::EXECUTABLE)
       {
       langFlags += "$LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS";
       vars.LanguageCompileFlags = langFlags.c_str();
@@ -285,7 +285,7 @@ cmNinjaNormalTargetGenerator
     std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
-    if (targetType == cmTarget::EXECUTABLE)
+    if (targetType == cmState::EXECUTABLE)
       this->GetGlobalGenerator()->AddRule("CMAKE_SYMLINK_EXECUTABLE",
                                           cmakeCommand +
                                           " -E cmake_symlink_executable"
@@ -333,7 +333,7 @@ cmNinjaNormalTargetGenerator
     }
   }
   switch (this->GetGeneratorTarget()->GetType()) {
-    case cmTarget::STATIC_LIBRARY: {
+    case cmState::STATIC_LIBRARY: {
       // We have archive link commands set. First, delete the existing archive.
       {
       std::string cmakeCommand =
@@ -358,9 +358,9 @@ cmNinjaNormalTargetGenerator
       }
       return linkCmds;
     }
-    case cmTarget::SHARED_LIBRARY:
-    case cmTarget::MODULE_LIBRARY:
-    case cmTarget::EXECUTABLE:
+    case cmState::SHARED_LIBRARY:
+    case cmState::MODULE_LIBRARY:
+    case cmState::EXECUTABLE:
       break;
     default:
       assert(0 && "Unexpected target type");
@@ -443,7 +443,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   // Write comments.
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
-  const cmTarget::TargetType targetType = target.GetType();
+  const cmState::TargetType targetType = target.GetType();
   this->GetBuildFileStream()
     << "# Link build statements for "
     << cmTarget::GetTargetTypeName(targetType)
@@ -490,7 +490,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                           &genTarget,
                           useWatcomQuote);
   if(this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS")
-     && target.GetType() == cmTarget::SHARED_LIBRARY)
+     && target.GetType() == cmState::SHARED_LIBRARY)
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
@@ -518,7 +518,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   // Compute architecture specific link flags.  Yes, these go into a different
   // variable for executables, probably due to a mistake made when duplicating
   // code between the Makefile executable and library generators.
-  if (targetType == cmTarget::EXECUTABLE)
+  if (targetType == cmState::EXECUTABLE)
     {
     std::string t = vars["FLAGS"];
     localGen.AddArchitectureFlags(t, &genTarget, TargetLinkLanguage, cfgName);
@@ -538,7 +538,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     {
     vars["SONAME_FLAG"] = mf->GetSONameFlag(this->TargetLinkLanguage);
     vars["SONAME"] = this->TargetNameSO;
-    if (targetType == cmTarget::SHARED_LIBRARY)
+    if (targetType == cmState::SHARED_LIBRARY)
       {
       std::string install_dir =
           this->GetGeneratorTarget()->GetInstallNameDirForBuildTree(cfgName);
@@ -626,7 +626,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // maybe create .def file from list of objects
-  if (target.GetType() == cmTarget::SHARED_LIBRARY &&
+  if (target.GetType() == cmState::SHARED_LIBRARY &&
       this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -734,7 +734,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   if (targetOutput != targetOutputReal && !target.IsFrameworkOnApple())
     {
-    if (targetType == cmTarget::EXECUTABLE)
+    if (targetType == cmState::EXECUTABLE)
       {
       globalGen.WriteBuild(this->GetBuildFileStream(),
                             "Create executable symlink " + targetOutput,
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index ec90ba5..1028196 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -31,17 +31,17 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
 {
   switch (target->GetType())
     {
-      case cmTarget::EXECUTABLE:
-      case cmTarget::SHARED_LIBRARY:
-      case cmTarget::STATIC_LIBRARY:
-      case cmTarget::MODULE_LIBRARY:
-      case cmTarget::OBJECT_LIBRARY:
+      case cmState::EXECUTABLE:
+      case cmState::SHARED_LIBRARY:
+      case cmState::STATIC_LIBRARY:
+      case cmState::MODULE_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
         return new cmNinjaNormalTargetGenerator(target);
 
-      case cmTarget::UTILITY:
+      case cmState::UTILITY:
         return new cmNinjaUtilityTargetGenerator(target);;
 
-      case cmTarget::GLOBAL_TARGET: {
+      case cmState::GLOBAL_TARGET: {
         // We only want to process global targets that live in the home
         // (i.e. top-level) directory.  CMake creates copies of these targets
         // in every directory, which we don't need.
@@ -189,8 +189,8 @@ ComputeDefines(cmSourceFile const* source, const std::string& language)
 cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
 {
   // Static libraries never depend on other targets for linking.
-  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
-      this->GeneratorTarget->GetType() == cmTarget::OBJECT_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY ||
+      this->GeneratorTarget->GetType() == cmState::OBJECT_LIBRARY)
     return cmNinjaDeps();
 
   cmComputeLinkInformation* cli =
@@ -283,16 +283,16 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
     {
     std::string pdbPath;
     std::string compilePdbPath;
-    if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
-       this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
-       this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+    if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE ||
+       this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
       {
       pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName());
       pdbPath += "/";
       pdbPath += this->GeneratorTarget->GetPDBName(this->GetConfigName());
       }
-    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
       {
       compilePdbPath =
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
@@ -481,7 +481,7 @@ cmNinjaTargetGenerator
   this->GetBuildFileStream()
     << "# Object build statements for "
     << cmTarget::GetTargetTypeName(
-         (cmTarget::TargetType)this->GetGeneratorTarget()->GetType())
+         (cmState::TargetType)this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmState.h b/Source/cmState.h
index f2c0c6f..0fe4812 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -181,6 +181,12 @@ public:
     friend class Snapshot;
   };
 
+  enum TargetType { EXECUTABLE, STATIC_LIBRARY,
+                    SHARED_LIBRARY, MODULE_LIBRARY,
+                    OBJECT_LIBRARY, UTILITY, GLOBAL_TARGET,
+                    INTERFACE_LIBRARY,
+                    UNKNOWN_LIBRARY};
+
   Snapshot CreateBaseSnapshot();
   Snapshot
   CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0128c78..eeced8d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -33,27 +33,27 @@
 #define UNORDERED_SET std::set
 #endif
 
-const char* cmTarget::GetTargetTypeName(TargetType targetType)
+const char* cmTarget::GetTargetTypeName(cmState::TargetType targetType)
 {
   switch( targetType )
     {
-      case cmTarget::STATIC_LIBRARY:
+      case cmState::STATIC_LIBRARY:
         return "STATIC_LIBRARY";
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         return "MODULE_LIBRARY";
-      case cmTarget::SHARED_LIBRARY:
+      case cmState::SHARED_LIBRARY:
         return "SHARED_LIBRARY";
-      case cmTarget::OBJECT_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
         return "OBJECT_LIBRARY";
-      case cmTarget::EXECUTABLE:
+      case cmState::EXECUTABLE:
         return "EXECUTABLE";
-      case cmTarget::UTILITY:
+      case cmState::UTILITY:
         return "UTILITY";
-      case cmTarget::GLOBAL_TARGET:
+      case cmState::GLOBAL_TARGET:
         return "GLOBAL_TARGET";
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
         return "INTERFACE_LIBRARY";
-      case cmTarget::UNKNOWN_LIBRARY:
+      case cmState::UNKNOWN_LIBRARY:
         return "UNKNOWN_LIBRARY";
     }
   assert(0 && "Unexpected target type");
@@ -93,13 +93,13 @@ cmTarget::cmTarget()
   this->BuildInterfaceIncludesAppended = false;
 }
 
-void cmTarget::SetType(TargetType type, const std::string& name)
+void cmTarget::SetType(cmState::TargetType type, const std::string& name)
 {
   this->Name = name;
   // only add dependency information for library targets
   this->TargetTypeValue = type;
-  if(this->TargetTypeValue >= STATIC_LIBRARY
-     && this->TargetTypeValue <= MODULE_LIBRARY)
+  if(this->TargetTypeValue >= cmState::STATIC_LIBRARY
+     && this->TargetTypeValue <= cmState::MODULE_LIBRARY)
     {
     this->RecordDependencies = true;
     }
@@ -129,7 +129,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
   this->IsApple = this->Makefile->IsOn("APPLE");
 
   // Setup default property values.
-  if (this->GetType() != INTERFACE_LIBRARY && this->GetType() != UTILITY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY
+      && this->GetType() != cmState::UTILITY)
     {
     this->SetPropertyDefault("ANDROID_API", 0);
     this->SetPropertyDefault("ANDROID_API_MIN", 0);
@@ -192,7 +193,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
   mf->GetConfigurations(configNames);
 
   // Setup per-configuration property default values.
-  if (this->GetType() != UTILITY)
+  if (this->GetType() != cmState::UTILITY)
     {
     const char* configProps[] = {
       "ARCHIVE_OUTPUT_DIRECTORY_",
@@ -208,7 +209,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
       std::string configUpper = cmSystemTools::UpperCase(*ci);
       for(const char** p = configProps; *p; ++p)
         {
-        if (this->TargetTypeValue == INTERFACE_LIBRARY
+        if (this->TargetTypeValue == cmState::INTERFACE_LIBRARY
             && strcmp(*p, "MAP_IMPORTED_CONFIG_") != 0)
           {
           continue;
@@ -223,8 +224,8 @@ void cmTarget::SetMakefile(cmMakefile* mf)
       // compatibility with previous CMake versions in which executables
       // did not support this variable.  Projects may still specify the
       // property directly.
-      if(this->TargetTypeValue != cmTarget::EXECUTABLE
-          && this->TargetTypeValue != cmTarget::INTERFACE_LIBRARY)
+      if(this->TargetTypeValue != cmState::EXECUTABLE
+          && this->TargetTypeValue != cmState::INTERFACE_LIBRARY)
         {
         std::string property = cmSystemTools::UpperCase(*ci);
         property += "_POSTFIX";
@@ -271,30 +272,32 @@ void cmTarget::SetMakefile(cmMakefile* mf)
           parentOptionsBts.begin(), parentOptionsBts.end());
     }
 
-  if (this->GetType() != INTERFACE_LIBRARY && this->GetType() != UTILITY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY
+      && this->GetType() != cmState::UTILITY)
     {
     this->SetPropertyDefault("C_VISIBILITY_PRESET", 0);
     this->SetPropertyDefault("CXX_VISIBILITY_PRESET", 0);
     this->SetPropertyDefault("VISIBILITY_INLINES_HIDDEN", 0);
     }
 
-  if(this->TargetTypeValue == cmTarget::EXECUTABLE)
+  if(this->TargetTypeValue == cmState::EXECUTABLE)
     {
     this->SetPropertyDefault("ANDROID_GUI", 0);
     this->SetPropertyDefault("CROSSCOMPILING_EMULATOR", 0);
     this->SetPropertyDefault("ENABLE_EXPORTS", 0);
     }
-  if(this->TargetTypeValue == cmTarget::SHARED_LIBRARY
-      || this->TargetTypeValue == cmTarget::MODULE_LIBRARY)
+  if(this->TargetTypeValue == cmState::SHARED_LIBRARY
+      || this->TargetTypeValue == cmState::MODULE_LIBRARY)
     {
     this->SetProperty("POSITION_INDEPENDENT_CODE", "True");
     }
-  if(this->TargetTypeValue == cmTarget::SHARED_LIBRARY)
+  if(this->TargetTypeValue == cmState::SHARED_LIBRARY)
     {
     this->SetPropertyDefault("WINDOWS_EXPORT_ALL_SYMBOLS", 0);
     }
 
-  if (this->GetType() != INTERFACE_LIBRARY && this->GetType() != UTILITY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY
+      && this->GetType() != cmState::UTILITY)
     {
     this->SetPropertyDefault("POSITION_INDEPENDENT_CODE", 0);
     }
@@ -302,15 +305,16 @@ void cmTarget::SetMakefile(cmMakefile* mf)
   // Record current policies for later use.
   this->Makefile->RecordPolicies(this->PolicyMap);
 
-  if (this->TargetTypeValue == INTERFACE_LIBRARY)
+  if (this->TargetTypeValue == cmState::INTERFACE_LIBRARY)
     {
     // This policy is checked in a few conditions. The properties relevant
-    // to the policy are always ignored for INTERFACE_LIBRARY targets,
+    // to the policy are always ignored for cmState::INTERFACE_LIBRARY targets,
     // so ensure that the conditions don't lead to nonsense.
     this->PolicyMap.Set(cmPolicies::CMP0022, cmPolicies::NEW);
     }
 
-  if (this->GetType() != INTERFACE_LIBRARY && this->GetType() != UTILITY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY
+      && this->GetType() != cmState::UTILITY)
     {
     this->SetPropertyDefault("JOB_POOL_COMPILE", 0);
     this->SetPropertyDefault("JOB_POOL_LINK", 0);
@@ -363,18 +367,18 @@ cmListFileBacktrace const& cmTarget::GetBacktrace() const
 //----------------------------------------------------------------------------
 bool cmTarget::IsExecutableWithExports() const
 {
-  return (this->GetType() == cmTarget::EXECUTABLE &&
+  return (this->GetType() == cmState::EXECUTABLE &&
           this->GetPropertyAsBool("ENABLE_EXPORTS"));
 }
 
 //----------------------------------------------------------------------------
 bool cmTarget::IsLinkable() const
 {
-  return (this->GetType() == cmTarget::STATIC_LIBRARY ||
-          this->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GetType() == cmTarget::MODULE_LIBRARY ||
-          this->GetType() == cmTarget::UNKNOWN_LIBRARY ||
-          this->GetType() == cmTarget::INTERFACE_LIBRARY ||
+  return (this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY ||
+          this->GetType() == cmState::UNKNOWN_LIBRARY ||
+          this->GetType() == cmState::INTERFACE_LIBRARY ||
           this->IsExecutableWithExports());
 }
 
@@ -382,14 +386,14 @@ bool cmTarget::IsLinkable() const
 bool cmTarget::HasImportLibrary() const
 {
   return (this->DLLPlatform &&
-          (this->GetType() == cmTarget::SHARED_LIBRARY ||
+          (this->GetType() == cmState::SHARED_LIBRARY ||
            this->IsExecutableWithExports()));
 }
 
 //----------------------------------------------------------------------------
 bool cmTarget::IsFrameworkOnApple() const
 {
-  return (this->GetType() == cmTarget::SHARED_LIBRARY &&
+  return (this->GetType() == cmState::SHARED_LIBRARY &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
@@ -397,7 +401,7 @@ bool cmTarget::IsFrameworkOnApple() const
 //----------------------------------------------------------------------------
 bool cmTarget::IsAppBundleOnApple() const
 {
-  return (this->GetType() == cmTarget::EXECUTABLE &&
+  return (this->GetType() == cmState::EXECUTABLE &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("MACOSX_BUNDLE"));
 }
@@ -405,7 +409,7 @@ bool cmTarget::IsAppBundleOnApple() const
 //----------------------------------------------------------------------------
 bool cmTarget::IsCFBundleOnApple() const
 {
-  return (this->GetType() == cmTarget::MODULE_LIBRARY &&
+  return (this->GetType() == cmState::MODULE_LIBRARY &&
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("BUNDLE"));
 }
@@ -789,7 +793,7 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
   }
 
   if (cmGeneratorExpression::Find(lib) != std::string::npos
-      || (tgt && tgt->GetType() == INTERFACE_LIBRARY)
+      || (tgt && tgt->GetType() == cmState::INTERFACE_LIBRARY)
       || (target == lib ))
     {
     return;
@@ -1238,7 +1242,7 @@ static bool whiteListedInterfaceProperty(const std::string& prop)
 //----------------------------------------------------------------------------
 void cmTarget::SetProperty(const std::string& prop, const char* value)
 {
-  if (this->GetType() == INTERFACE_LIBRARY
+  if (this->GetType() == cmState::INTERFACE_LIBRARY
       && !whiteListedInterfaceProperty(prop))
     {
     std::ostringstream e;
@@ -1347,7 +1351,7 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
 void cmTarget::AppendProperty(const std::string& prop, const char* value,
                               bool asString)
 {
-  if (this->GetType() == INTERFACE_LIBRARY
+  if (this->GetType() == cmState::INTERFACE_LIBRARY
       && !whiteListedInterfaceProperty(prop))
     {
     std::ostringstream e;
@@ -1459,10 +1463,10 @@ std::string cmTarget::GetExportName() const
 //----------------------------------------------------------------------------
 void cmTarget::AppendBuildInterfaceIncludes()
 {
-  if(this->GetType() != cmTarget::SHARED_LIBRARY &&
-     this->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->GetType() != cmTarget::MODULE_LIBRARY &&
-     this->GetType() != cmTarget::INTERFACE_LIBRARY &&
+  if(this->GetType() != cmState::SHARED_LIBRARY &&
+     this->GetType() != cmState::STATIC_LIBRARY &&
+     this->GetType() != cmState::MODULE_LIBRARY &&
+     this->GetType() != cmState::INTERFACE_LIBRARY &&
      !this->IsExecutableWithExports())
     {
     return;
@@ -1644,10 +1648,10 @@ void cmTarget::MarkAsImported()
 bool cmTarget::HaveWellDefinedOutputFiles() const
 {
   return
-    this->GetType() == cmTarget::STATIC_LIBRARY ||
-    this->GetType() == cmTarget::SHARED_LIBRARY ||
-    this->GetType() == cmTarget::MODULE_LIBRARY ||
-    this->GetType() == cmTarget::EXECUTABLE;
+    this->GetType() == cmState::STATIC_LIBRARY ||
+    this->GetType() == cmState::SHARED_LIBRARY ||
+    this->GetType() == cmState::MODULE_LIBRARY ||
+    this->GetType() == cmState::EXECUTABLE;
 }
 
 //----------------------------------------------------------------------------
@@ -1675,7 +1679,7 @@ void cmTarget::GetTargetVersion(bool soversion,
   minor = 0;
   patch = 0;
 
-  assert(this->GetType() != INTERFACE_LIBRARY);
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
 
   // Look for a VERSION or SOVERSION property.
   const char* prop = soversion? "SOVERSION" : "VERSION";
@@ -1743,7 +1747,7 @@ const char *cmTarget::GetProperty(const std::string& prop) const
 const char *cmTarget::GetProperty(const std::string& prop,
                                   cmMakefile* context) const
 {
-  if (this->GetType() == INTERFACE_LIBRARY
+  if (this->GetType() == cmState::INTERFACE_LIBRARY
       && !whiteListedInterfaceProperty(prop))
     {
     std::ostringstream e;
@@ -1755,11 +1759,11 @@ const char *cmTarget::GetProperty(const std::string& prop,
 
   // Watch for special "computed" properties that are dependent on
   // other properties or variables.  Always recompute them.
-  if(this->GetType() == cmTarget::EXECUTABLE ||
-     this->GetType() == cmTarget::STATIC_LIBRARY ||
-     this->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GetType() == cmTarget::MODULE_LIBRARY ||
-     this->GetType() == cmTarget::UNKNOWN_LIBRARY)
+  if(this->GetType() == cmState::EXECUTABLE ||
+     this->GetType() == cmState::STATIC_LIBRARY ||
+     this->GetType() == cmState::SHARED_LIBRARY ||
+     this->GetType() == cmState::MODULE_LIBRARY ||
+     this->GetType() == cmState::UNKNOWN_LIBRARY)
     {
     static const std::string propLOCATION = "LOCATION";
     if(prop == propLOCATION)
@@ -2069,17 +2073,17 @@ const char* cmTarget::GetSuffixVariableInternal(bool implib) const
 {
   switch(this->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "CMAKE_STATIC_LIBRARY_SUFFIX";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_SUFFIX"
               : "CMAKE_SHARED_LIBRARY_SUFFIX");
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_SUFFIX"
               : "CMAKE_SHARED_MODULE_SUFFIX");
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_SUFFIX"
                 // Android GUI application packages store the native
@@ -2098,17 +2102,17 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 {
   switch(this->GetType())
     {
-    case cmTarget::STATIC_LIBRARY:
+    case cmState::STATIC_LIBRARY:
       return "CMAKE_STATIC_LIBRARY_PREFIX";
-    case cmTarget::SHARED_LIBRARY:
+    case cmState::SHARED_LIBRARY:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_PREFIX"
               : "CMAKE_SHARED_LIBRARY_PREFIX");
-    case cmTarget::MODULE_LIBRARY:
+    case cmState::MODULE_LIBRARY:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_PREFIX"
               : "CMAKE_SHARED_MODULE_PREFIX");
-    case cmTarget::EXECUTABLE:
+    case cmState::EXECUTABLE:
       return (implib
               ? "CMAKE_IMPORT_LIBRARY_PREFIX"
                 // Android GUI application packages store the native
@@ -2184,7 +2188,7 @@ void cmTarget::SetPropertyDefault(const std::string& property,
 //----------------------------------------------------------------------------
 std::string cmTarget::GetFrameworkVersion() const
 {
-  assert(this->GetType() != INTERFACE_LIBRARY);
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
 
   if(const char* fversion = this->GetProperty("FRAMEWORK_VERSION"))
     {
@@ -2204,8 +2208,8 @@ std::string cmTarget::GetFrameworkVersion() const
 const char* cmTarget::GetExportMacro() const
 {
   // Define the symbol for targets that export symbols.
-  if(this->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GetType() == cmTarget::MODULE_LIBRARY ||
+  if(this->GetType() == cmState::SHARED_LIBRARY ||
+     this->GetType() == cmState::MODULE_LIBRARY ||
      this->IsExecutableWithExports())
     {
     if(const char* custom_export_name = this->GetProperty("DEFINE_SYMBOL"))
@@ -2297,7 +2301,7 @@ cmTarget::GetImportInfo(const std::string& config) const
     i = this->ImportInfoMap.insert(entry).first;
     }
 
-  if(this->GetType() == INTERFACE_LIBRARY)
+  if(this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return &i->second;
     }
@@ -2317,10 +2321,10 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
                                const char** imp,
                                std::string& suffix) const
 {
-  if (this->GetType() == INTERFACE_LIBRARY)
+  if (this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     // This method attempts to find a config-specific LOCATION for the
-    // IMPORTED library. In the case of INTERFACE_LIBRARY, there is no
+    // IMPORTED library. In the case of cmState::INTERFACE_LIBRARY, there is no
     // LOCATION at all, so leaving *loc and *imp unchanged is the appropriate
     // and valid response.
     return true;
@@ -2467,7 +2471,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
   std::string linkProp = "INTERFACE_LINK_LIBRARIES";
   const char *propertyLibs = this->GetProperty(linkProp);
 
-  if (this->GetType() != INTERFACE_LIBRARY)
+  if (this->GetType() != cmState::INTERFACE_LIBRARY)
     {
     if(!propertyLibs)
       {
@@ -2488,7 +2492,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     info.Libraries = propertyLibs;
     }
   }
-  if(this->GetType() == INTERFACE_LIBRARY)
+  if(this->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
@@ -2516,7 +2520,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 
   // Get the soname.
-  if(this->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GetType() == cmState::SHARED_LIBRARY)
     {
     std::string soProp = "IMPORTED_SONAME";
     soProp += suffix;
@@ -2531,7 +2535,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 
   // Get the "no-soname" mark.
-  if(this->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GetType() == cmState::SHARED_LIBRARY)
     {
     std::string soProp = "IMPORTED_NO_SONAME";
     soProp += suffix;
@@ -2550,7 +2554,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     {
     info.ImportLibrary = imp;
     }
-  else if(this->GetType() == cmTarget::SHARED_LIBRARY ||
+  else if(this->GetType() == cmState::SHARED_LIBRARY ||
           this->IsExecutableWithExports())
     {
     std::string impProp = "IMPORTED_IMPLIB";
@@ -2597,7 +2601,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
     }
 
   // Get the cyclic repetition count.
-  if(this->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GetType() == cmState::STATIC_LIBRARY)
     {
     std::string linkProp = "IMPORTED_LINK_INTERFACE_MULTIPLICITY";
     linkProp += suffix;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index b0d5f4a..e5646f6 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -77,18 +77,13 @@ class cmTarget
 {
 public:
   cmTarget();
-  enum TargetType { EXECUTABLE, STATIC_LIBRARY,
-                    SHARED_LIBRARY, MODULE_LIBRARY,
-                    OBJECT_LIBRARY, UTILITY, GLOBAL_TARGET,
-                    INTERFACE_LIBRARY,
-                    UNKNOWN_LIBRARY};
-  static const char* GetTargetTypeName(TargetType targetType);
+  static const char* GetTargetTypeName(cmState::TargetType targetType);
   enum CustomCommandType { PRE_BUILD, PRE_LINK, POST_BUILD };
 
   /**
    * Return the type of target.
    */
-  TargetType GetType() const
+  cmState::TargetType GetType() const
     {
     return this->TargetTypeValue;
     }
@@ -96,7 +91,7 @@ public:
   /**
    * Set the target type
    */
-  void SetType(TargetType f, const std::string& name);
+  void SetType(cmState::TargetType f, const std::string& name);
 
   void MarkAsImported();
 
@@ -302,7 +297,7 @@ public:
     { return this->SystemIncludeDirectories; }
 
   bool LinkLanguagePropagatesToDependents() const
-  { return this->TargetTypeValue == STATIC_LIBRARY; }
+  { return this->TargetTypeValue == cmState::STATIC_LIBRARY; }
 
   cmStringRange GetIncludeDirectoriesEntries() const;
   cmBacktraceRange GetIncludeDirectoriesBacktraces() const;
@@ -420,7 +415,7 @@ private:
 #endif
   cmMakefile* Makefile;
   cmTargetInternalPointer Internal;
-  TargetType TargetTypeValue;
+  cmState::TargetType TargetTypeValue;
   bool HaveInstallRule;
   bool RecordDependencies;
   bool DLLPlatform;
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 1a1cf39..435346a 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -88,7 +88,7 @@ bool cmTargetLinkLibrariesCommand
     return true;
     }
 
-  if(this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
+  if(this->Target->GetType() == cmState::OBJECT_LIBRARY)
     {
     std::ostringstream e;
     e << "Object library target \"" << args[0] << "\" "
@@ -98,7 +98,7 @@ bool cmTargetLinkLibrariesCommand
     return true;
     }
 
-  if (this->Target->GetType() == cmTarget::UTILITY)
+  if (this->Target->GetType() == cmState::UTILITY)
     {
     std::ostringstream e;
     const char *modal = 0;
@@ -352,7 +352,7 @@ bool
 cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
                                             cmTargetLinkLibraryType llt)
 {
-  if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(this->Target->GetType() == cmState::INTERFACE_LIBRARY
       && this->CurrentProcessingState != ProcessingKeywordLinkInterface)
     {
     this->Makefile->IssueMessage(cmake::FATAL_ERROR,
@@ -428,7 +428,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
     else if(this->CurrentProcessingState != ProcessingKeywordPublicInterface
             && this->CurrentProcessingState != ProcessingPlainPublicInterface)
       {
-      if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+      if (this->Target->GetType() == cmState::STATIC_LIBRARY)
         {
         std::string configLib = this->Target
                                      ->GetDebugGeneratorExpressions(lib, llt);
@@ -458,7 +458,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
     return true;
     }
 
-  if (this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->Target->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return true;
     }
diff --git a/Source/cmTargetPropCommandBase.cxx b/Source/cmTargetPropCommandBase.cxx
index 4696de4..bfc19a4 100644
--- a/Source/cmTargetPropCommandBase.cxx
+++ b/Source/cmTargetPropCommandBase.cxx
@@ -44,12 +44,12 @@ bool cmTargetPropCommandBase
     this->HandleMissingTarget(args[0]);
     return false;
     }
-  if ((this->Target->GetType() != cmTarget::SHARED_LIBRARY)
-    && (this->Target->GetType() != cmTarget::STATIC_LIBRARY)
-    && (this->Target->GetType() != cmTarget::OBJECT_LIBRARY)
-    && (this->Target->GetType() != cmTarget::MODULE_LIBRARY)
-    && (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
-    && (this->Target->GetType() != cmTarget::EXECUTABLE))
+  if ((this->Target->GetType() != cmState::SHARED_LIBRARY)
+    && (this->Target->GetType() != cmState::STATIC_LIBRARY)
+    && (this->Target->GetType() != cmState::OBJECT_LIBRARY)
+    && (this->Target->GetType() != cmState::MODULE_LIBRARY)
+    && (this->Target->GetType() != cmState::INTERFACE_LIBRARY)
+    && (this->Target->GetType() != cmState::EXECUTABLE))
     {
     this->SetError("called with non-compilable target type");
     return false;
@@ -114,7 +114,7 @@ bool cmTargetPropCommandBase
     return false;
     }
 
-  if (this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if (this->Target->GetType() == cmState::INTERFACE_LIBRARY
       && scope != "INTERFACE")
     {
     this->SetError("may only be set INTERFACE properties on INTERFACE "
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 85fb405..d997596 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -90,7 +90,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
   std::string exe = command[0];
   cmGeneratorTarget* target =
       this->LG->FindGeneratorTargetToUse(exe);
-  if(target && target->GetType() == cmTarget::EXECUTABLE)
+  if(target && target->GetType() == cmState::EXECUTABLE)
     {
     // Use the target file on disk.
     exe = target->GetFullPath(config);
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index bfab4b9..1b62821 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -269,7 +269,7 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
 void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
-  if(this->GeneratorTarget->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(this->GeneratorTarget->GetType() == cmState::INTERFACE_LIBRARY
       || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
@@ -278,7 +278,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
   this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
-  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
     {
     if(!this->ComputeClOptions())
       {
@@ -361,7 +361,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
   if(this->MSTools
-     && this->GeneratorTarget->GetType() <= cmTarget::GLOBAL_TARGET)
+     && this->GeneratorTarget->GetType() <= cmState::GLOBAL_TARGET)
     {
     this->WriteApplicationTypeSettings();
     this->VerifyNecessaryFiles();
@@ -669,15 +669,15 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
     std::string configType = "<ConfigurationType>";
     switch(this->GeneratorTarget->GetType())
       {
-      case cmTarget::SHARED_LIBRARY:
-      case cmTarget::MODULE_LIBRARY:
+      case cmState::SHARED_LIBRARY:
+      case cmState::MODULE_LIBRARY:
         configType += "DynamicLibrary";
         break;
-      case cmTarget::OBJECT_LIBRARY:
-      case cmTarget::STATIC_LIBRARY:
+      case cmState::OBJECT_LIBRARY:
+      case cmState::STATIC_LIBRARY:
         configType += "StaticLibrary";
         break;
-      case cmTarget::EXECUTABLE:
+      case cmState::EXECUTABLE:
         if(this->NsightTegra &&
            !this->Target->GetPropertyAsBool("ANDROID_GUI"))
           {
@@ -689,8 +689,8 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
           configType += "Application";
           }
         break;
-      case cmTarget::UTILITY:
-      case cmTarget::GLOBAL_TARGET:
+      case cmState::UTILITY:
+      case cmState::GLOBAL_TARGET:
         if(this->NsightTegra)
           {
           // Tegra-Android platform does not understand "Utility".
@@ -701,8 +701,8 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
           configType += "Utility";
           }
         break;
-      case cmTarget::UNKNOWN_LIBRARY:
-      case cmTarget::INTERFACE_LIBRARY:
+      case cmState::UNKNOWN_LIBRARY:
+      case cmState::INTERFACE_LIBRARY:
         break;
       }
     configType += "</ConfigurationType>\n";
@@ -744,7 +744,7 @@ void cmVisualStudio10TargetGenerator
   mfcLine += useOfMfcValue + "</UseOfMfc>\n";
   this->WriteString(mfcLine.c_str(), 2);
 
-  if((this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY &&
+  if((this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
      this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
@@ -753,7 +753,7 @@ void cmVisualStudio10TargetGenerator
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
-  else if (this->GeneratorTarget->GetType() <= cmTarget::MODULE_LIBRARY &&
+  else if (this->GeneratorTarget->GetType() <= cmState::MODULE_LIBRARY &&
            this->ClOptions[config]->UsingSBCS())
     {
     this->WriteString("<CharacterSet>NotSet</CharacterSet>\n", 2);
@@ -1481,7 +1481,7 @@ void cmVisualStudio10TargetGenerator::WriteSources(
 
 void cmVisualStudio10TargetGenerator::WriteAllSources()
 {
-  if(this->GeneratorTarget->GetType() > cmTarget::UTILITY)
+  if(this->GeneratorTarget->GetType() > cmState::UTILITY)
     {
     return;
     }
@@ -1743,9 +1743,9 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmTarget::TargetType ttype =
-      (cmTarget::TargetType)this->GeneratorTarget->GetType();
-  if(ttype > cmTarget::GLOBAL_TARGET)
+  cmState::TargetType ttype =
+      (cmState::TargetType)this->GeneratorTarget->GetType();
+  if(ttype > cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -1757,7 +1757,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
         config = this->Configurations.begin();
       config != this->Configurations.end(); ++config)
     {
-    if(ttype >= cmTarget::UTILITY)
+    if(ttype >= cmState::UTILITY)
       {
       this->WritePlatformConfigTag("IntDir", config->c_str(), 3);
       *this->BuildFileStream
@@ -1773,7 +1773,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
       intermediateDir += "/";
       std::string outDir;
       std::string targetNameFull;
-      if(ttype == cmTarget::OBJECT_LIBRARY)
+      if(ttype == cmState::OBJECT_LIBRARY)
         {
         outDir = intermediateDir;
         targetNameFull = this->Target->GetName();
@@ -1829,8 +1829,8 @@ OutputLinkIncremental(std::string const& configName)
     }
   // static libraries and things greater than modules do not need
   // to set this option
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
-     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmState::MODULE_LIBRARY)
     {
     return;
     }
@@ -1968,8 +1968,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
-      if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY )
+      if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+          this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY )
         {
         clOptions.AddDefine("_WINRT_DLL");
         }
@@ -2177,8 +2177,8 @@ WriteMasmOptions(std::string const& configName,
 void
 cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 {
-  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->GeneratorTarget->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmState::STATIC_LIBRARY &&
+     this->GeneratorTarget->GetType() != cmState::OBJECT_LIBRARY)
     {
     return;
     }
@@ -2214,9 +2214,9 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 void cmVisualStudio10TargetGenerator::WriteManifestOptions(
   std::string const& config)
 {
-  if (this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE &&
-      this->GeneratorTarget->GetType() != cmTarget::SHARED_LIBRARY &&
-      this->GeneratorTarget->GetType() != cmTarget::MODULE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmState::EXECUTABLE &&
+      this->GeneratorTarget->GetType() != cmState::SHARED_LIBRARY &&
+      this->GeneratorTarget->GetType() != cmState::MODULE_LIBRARY)
     {
     return;
     }
@@ -2382,9 +2382,9 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 //----------------------------------------------------------------------------
 bool cmVisualStudio10TargetGenerator::ComputeLinkOptions()
 {
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
-     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
     {
     for(std::vector<std::string>::const_iterator
           i = this->Configurations.begin();
@@ -2421,11 +2421,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string CONFIG = cmSystemTools::UpperCase(config);
 
   const char* linkType = "SHARED";
-  if(this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::MODULE_LIBRARY)
     {
     linkType = "MODULE";
     }
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
     {
     linkType = "EXE";
     }
@@ -2508,7 +2508,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string targetNameFull;
   std::string targetNameImport;
   std::string targetNamePDB;
-  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
     {
     this->GeneratorTarget->GetExecutableNames(targetName, targetNameFull,
                                      targetNameImport, targetNamePDB,
@@ -2531,7 +2531,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2553,7 +2553,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2599,7 +2599,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
     if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
-       this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE)
+       this->GeneratorTarget->GetType() != cmState::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2637,7 +2637,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
                            "%(IgnoreSpecificDefaultLibraries)");
     }
 
-  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2654,8 +2654,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 void
 cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 {
-  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
-     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmState::MODULE_LIBRARY)
     {
     return;
     }
@@ -2693,7 +2693,7 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
       libVec.push_back(path);
       }
     else if (!l->Target
-        || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+        || l->Target->GetType() != cmState::INTERFACE_LIBRARY)
       {
       libVec.push_back(l->Value);
       }
@@ -2765,7 +2765,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WritePlatformConfigTag("ItemDefinitionGroup", i->c_str(), 1);
     *this->BuildFileStream << "\n";
     //    output cl compile flags <ClCompile></ClCompile>
-    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
       {
       this->WriteClOptions(*i, includes);
       //    output rc compile flags <ResourceCompile></ResourceCompile>
@@ -2783,7 +2783,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     //    output manifest flags  <Manifest></Manifest>
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
-       this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE &&
+       this->GeneratorTarget->GetType() == cmState::EXECUTABLE &&
        this->Target->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
@@ -2796,7 +2796,7 @@ void
 cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
 {
   bool addedPrelink = false;
-  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2868,7 +2868,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
        i != depends.end(); ++i)
     {
     cmTarget const* dt = (*i)->Target;
-    if(dt->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if(dt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -3004,7 +3004,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
       this->GlobalGenerator->TargetsWindowsPhone())
-      && (cmTarget::EXECUTABLE == this->GeneratorTarget->GetType()))
+      && (cmState::EXECUTABLE == this->GeneratorTarget->GetType()))
     {
     std::string pfxFile;
     std::vector<cmSourceFile const*> certificates;
@@ -3133,7 +3133,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>14.0"
         "</MinimumVisualStudioVersion>\n", 2);
 
-      if(this->GeneratorTarget->GetType() < cmTarget::UTILITY)
+      if(this->GeneratorTarget->GetType() < cmState::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3147,7 +3147,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (this->GeneratorTarget->GetType() < cmTarget::UTILITY)
+      if (this->GeneratorTarget->GetType() < cmState::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3162,12 +3162,12 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
                         "</MinimumVisualStudioVersion>\n", 2);
 
       if (isWindowsStore
-          && this->GeneratorTarget->GetType() < cmTarget::UTILITY)
+          && this->GeneratorTarget->GetType() < cmState::UTILITY)
         {
         isAppContainer = true;
         }
       else if (isWindowsPhone &&
-               this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+               this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
         {
         this->WriteString("<XapOutputs>true</XapOutputs>\n", 2);
         this->WriteString("<XapFilename>", 2);
@@ -3224,7 +3224,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
 {
   // For Windows and Windows Phone executables, we will assume that if a
   // manifest is not present that we need to add all the necessary files
-  if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
+  if (this->GeneratorTarget->GetType() == cmState::EXECUTABLE)
     {
     std::vector<cmSourceFile const*> manifestSources;
     this->GeneratorTarget->GetAppManifest(manifestSources, "");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=482b3811e4e6043c71632b560f2e773289eeb320
commit 482b3811e4e6043c71632b560f2e773289eeb320
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:56:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:41:22 2015 +0200

    cmTarget: Move link type enum out.
    
    Remove a reason for generate time code to depend on the cmTarget header/type.

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 06eb3ec..e439182 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -373,13 +373,13 @@ void CCONV cmAddLinkLibraryForTarget(void *arg, const char *tgt,
   switch (libtype)
     {
     case CM_LIBRARY_GENERAL:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::GENERAL);
+      mf->AddLinkLibraryForTarget(tgt,value, GENERAL_LibraryType);
       break;
     case CM_LIBRARY_DEBUG:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::DEBUG);
+      mf->AddLinkLibraryForTarget(tgt,value, DEBUG_LibraryType);
       break;
     case CM_LIBRARY_OPTIMIZED:
-      mf->AddLinkLibraryForTarget(tgt,value, cmTarget::OPTIMIZED);
+      mf->AddLinkLibraryForTarget(tgt,value, OPTIMIZED_LibraryType);
       break;
     }
 }
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 22843f1..742651a 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -482,24 +482,24 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
 
   // Look for entries meant for this configuration.
   std::vector<cmLinkItem> actual_libs;
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
   for(std::vector<std::string>::const_iterator di = deplist.begin();
       di != deplist.end(); ++di)
     {
     if(*di == "debug")
       {
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(*di == "optimized")
       {
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(*di == "general")
       {
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(!di->empty())
@@ -517,17 +517,17 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
           {
           if(strcmp(val, "debug") == 0)
             {
-            llt = cmTarget::DEBUG;
+            llt = DEBUG_LibraryType;
             }
           else if(strcmp(val, "optimized") == 0)
             {
-            llt = cmTarget::OPTIMIZED;
+            llt = OPTIMIZED_LibraryType;
             }
           }
         }
 
       // If the library is meant for this link type then use it.
-      if(llt == cmTarget::GENERAL || llt == this->LinkType)
+      if(llt == GENERAL_LibraryType || llt == this->LinkType)
         {
         cmLinkItem item(*di, this->FindTargetToLink(depender_index, *di));
         actual_libs.push_back(item);
@@ -539,7 +539,7 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
         }
 
       // Reset the link type until another explicit type is given.
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = false;
       }
     }
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index d9760aa..889fb08 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -155,7 +155,7 @@ private:
   void CheckWrongConfigItem(cmLinkItem const& item);
 
   int ComponentOrderId;
-  cmTarget::LinkLibraryType LinkType;
+  cmTargetLinkLibraryType LinkType;
   bool HasConfig;
   bool DebugMode;
   bool OldLinkDirMode;
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index fde8fb1..0ef2ea5 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -120,15 +120,15 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
         std::string ltValue;
         switch(li->second)
           {
-          case cmTarget::GENERAL:
+          case GENERAL_LibraryType:
             valueNew += "general;";
             ltValue = "general";
             break;
-          case cmTarget::DEBUG:
+          case DEBUG_LibraryType:
             valueNew += "debug;";
             ltValue = "debug";
             break;
-          case cmTarget::OPTIMIZED:
+          case OPTIMIZED_LibraryType:
             valueNew += "optimized;";
             ltValue = "optimized";
             break;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1b8ad43..8c9251b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5416,13 +5416,13 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
                                 this->MaxLanguageStandards);
     }
 
-  cmTarget::LinkLibraryType linkType = this->Target->ComputeLinkType(config);
+  cmTargetLinkLibraryType linkType = this->Target->ComputeLinkType(config);
   cmTarget::LinkLibraryVectorType const& oldllibs =
     this->Target->GetOriginalLinkLibraries();
   for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
       li != oldllibs.end(); ++li)
     {
-    if(li->second != cmTarget::GENERAL && li->second != linkType)
+    if(li->second != GENERAL_LibraryType && li->second != linkType)
       {
       std::string name = this->Target->CheckCMP0004(li->first);
       if(name == this->GetName() || name.empty())
diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx
index 996b538..eb3bfce 100644
--- a/Source/cmLinkLibrariesCommand.cxx
+++ b/Source/cmLinkLibrariesCommand.cxx
@@ -34,7 +34,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::DEBUG);
+                                 DEBUG_LibraryType);
       }
     else if (*i == "optimized")
       {
@@ -46,7 +46,7 @@ bool cmLinkLibrariesCommand
         return false;
         }
       this->Makefile->AddLinkLibrary(*i,
-                                 cmTarget::OPTIMIZED);
+                                 OPTIMIZED_LibraryType);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 6ecd9a8..c620baf 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1145,7 +1145,7 @@ void cmLocalVisualStudio6Generator
       libDebug =
         this->ConvertToOutputFormat(libDebug.c_str(), SHELL);
 
-      if (j->second == cmTarget::GENERAL)
+      if (j->second == GENERAL_LibraryType)
         {
         libOptions += " ";
         libOptions += lib;
@@ -1156,7 +1156,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineOptionsForDebug +=  libDebug;
         libMultiLineOptionsForDebug += "\n";
         }
-      if (j->second == cmTarget::DEBUG)
+      if (j->second == DEBUG_LibraryType)
         {
         libDebugOptions += " ";
         libDebugOptions += lib;
@@ -1165,7 +1165,7 @@ void cmLocalVisualStudio6Generator
         libMultiLineDebugOptions += libDebug;
         libMultiLineDebugOptions += "\n";
         }
-      if (j->second == cmTarget::OPTIMIZED)
+      if (j->second == OPTIMIZED_LibraryType)
         {
         libOptimizedOptions += " ";
         libOptimizedOptions += lib;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 045cca8..d62c5c4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1400,7 +1400,7 @@ bool cmMakefile::ParseDefineFlag(std::string const& def, bool remove)
 }
 
 void cmMakefile::AddLinkLibrary(const std::string& lib,
-                                cmTarget::LinkLibraryType llt)
+                                cmTargetLinkLibraryType llt)
 {
   cmTarget::LibraryID tmp;
   tmp.first = lib;
@@ -1410,7 +1410,7 @@ void cmMakefile::AddLinkLibrary(const std::string& lib,
 
 void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
                                          const std::string& lib,
-                                         cmTarget::LinkLibraryType llt)
+                                         cmTargetLinkLibraryType llt)
 {
   cmTargets::iterator i = this->Targets.find(target);
   if ( i != this->Targets.end())
@@ -1471,7 +1471,7 @@ void cmMakefile::AddLinkDirectoryForTarget(const std::string& target,
 
 void cmMakefile::AddLinkLibrary(const std::string& lib)
 {
-  this->AddLinkLibrary(lib,cmTarget::GENERAL);
+  this->AddLinkLibrary(lib,GENERAL_LibraryType);
 }
 
 void cmMakefile::InitializeFromParent(cmMakefile* parent)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 99ed73d..d9d5a8a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -219,9 +219,9 @@ public:
    * Add a link library to the build.
    */
   void AddLinkLibrary(const std::string&);
-  void AddLinkLibrary(const std::string&, cmTarget::LinkLibraryType type);
+  void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type);
   void AddLinkLibraryForTarget(const std::string& tgt, const std::string&,
-                               cmTarget::LinkLibraryType type);
+                               cmTargetLinkLibraryType type);
   void AddLinkDirectoryForTarget(const std::string& tgt, const std::string& d);
 
   /**
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 468a589..dd8fa9c 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -123,4 +123,10 @@ static thisClass* SafeDownCast(cmObject *c) \
 } \
 class cmTypeMacro_UseTrailingSemicolon
 
+enum cmTargetLinkLibraryType {
+  GENERAL_LibraryType,
+  DEBUG_LibraryType,
+  OPTIMIZED_LibraryType
+};
+
 #endif
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 847a5c1..0128c78 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -632,13 +632,13 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories() const
 }
 
 //----------------------------------------------------------------------------
-cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
+cmTargetLinkLibraryType cmTarget::ComputeLinkType(
                                       const std::string& config) const
 {
   // No configuration is always optimized.
   if(config.empty())
     {
-    return cmTarget::OPTIMIZED;
+    return OPTIMIZED_LibraryType;
     }
 
   // Get the list of configurations considered to be DEBUG.
@@ -650,10 +650,10 @@ cmTarget::LinkLibraryType cmTarget::ComputeLinkType(
   if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
       debugConfigs.end())
     {
-    return cmTarget::DEBUG;
+    return DEBUG_LibraryType;
     }
   // The current configuration is not a debug configuration.
-  return cmTarget::OPTIMIZED;
+  return OPTIMIZED_LibraryType;
 }
 
 //----------------------------------------------------------------------------
@@ -693,9 +693,9 @@ bool cmTarget::NameResolvesToFramework(const std::string& libname) const
 
 //----------------------------------------------------------------------------
 std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const
+                                  cmTargetLinkLibraryType llt) const
 {
-  if (llt == GENERAL)
+  if (llt == GENERAL_LibraryType)
     {
     return value;
     }
@@ -716,7 +716,7 @@ std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
     configString = "$<OR:" + configString + ">";
     }
 
-  if (llt == OPTIMIZED)
+  if (llt == OPTIMIZED_LibraryType)
     {
     configString = "$<NOT:" + configString + ">";
     }
@@ -773,15 +773,16 @@ void cmTarget::GetTllSignatureTraces(std::ostringstream &s,
 void cmTarget::AddLinkLibrary(cmMakefile& mf,
                               const std::string& target,
                               const std::string& lib,
-                              LinkLibraryType llt)
+                              cmTargetLinkLibraryType llt)
 {
   cmTarget *tgt = this->Makefile->FindTargetToUse(lib);
   {
   const bool isNonImportedTarget = tgt && !tgt->IsImported();
 
-  const std::string libName = (isNonImportedTarget && llt != GENERAL)
-                                                        ? targetNameGenex(lib)
-                                                        : lib;
+  const std::string libName =
+      (isNonImportedTarget && llt != GENERAL_LibraryType)
+      ? targetNameGenex(lib)
+      : lib;
   this->AppendProperty("LINK_LIBRARIES",
                        this->GetDebugGeneratorExpressions(libName,
                                                           llt).c_str());
@@ -822,13 +823,13 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
       }
     switch (llt)
       {
-      case cmTarget::GENERAL:
+      case GENERAL_LibraryType:
         dependencies += "general";
         break;
-      case cmTarget::DEBUG:
+      case DEBUG_LibraryType:
         dependencies += "debug";
         break;
-      case cmTarget::OPTIMIZED:
+      case OPTIMIZED_LibraryType:
         dependencies += "optimized";
         break;
       }
@@ -1162,7 +1163,7 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
 
     // Parse the dependency information, which is a set of
     // type, library pairs separated by ";". There is always a trailing ";".
-    cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+    cmTargetLinkLibraryType llt = GENERAL_LibraryType;
     std::string depline = deps;
     std::string::size_type start = 0;
     std::string::size_type end;
@@ -1174,22 +1175,22 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
         {
         if (l == "debug")
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         else if (l == "optimized")
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         else if (l == "general")
           {
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         else
           {
           LibraryID lib2(l,llt);
           this->InsertDependencyForVS6( dep_map, lib, lib2);
           this->GatherDependenciesForVS6( mf, lib2, dep_map);
-          llt = cmTarget::GENERAL;
+          llt = GENERAL_LibraryType;
           }
         }
       start = end+1; // skip the ;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 97515a7..b0d5f4a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -140,17 +140,15 @@ public:
   cmSourceFile* AddSourceCMP0049(const std::string& src);
   cmSourceFile* AddSource(const std::string& src);
 
-  enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
-
   //* how we identify a library, by name and type
-  typedef std::pair<std::string, LinkLibraryType> LibraryID;
+  typedef std::pair<std::string, cmTargetLinkLibraryType> LibraryID;
 
   typedef std::vector<LibraryID > LinkLibraryVectorType;
   const LinkLibraryVectorType &GetOriginalLinkLibraries() const
     {return this->OriginalLinkLibraries;}
 
   /** Compute the link type to use for the given configuration.  */
-  LinkLibraryType ComputeLinkType(const std::string& config) const;
+  cmTargetLinkLibraryType ComputeLinkType(const std::string& config) const;
 
   /**
    * Clear the dependency information recorded for this target, if any.
@@ -161,7 +159,7 @@ public:
   bool NameResolvesToFramework(const std::string& libname) const;
   void AddLinkLibrary(cmMakefile& mf,
                       const std::string& target, const std::string& lib,
-                      LinkLibraryType llt);
+                      cmTargetLinkLibraryType llt);
   enum TLLSignature {
     KeywordTLLSignature,
     PlainTLLSignature
@@ -297,7 +295,7 @@ public:
   void AppendBuildInterfaceIncludes();
 
   std::string GetDebugGeneratorExpressions(const std::string &value,
-                                  cmTarget::LinkLibraryType llt) const;
+                                  cmTargetLinkLibraryType llt) const;
 
   void AddSystemIncludeDirectories(const std::set<std::string> &incs);
   std::set<std::string> const & GetSystemIncludeDirectories() const
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index b57b921..1a1cf39 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -136,7 +136,7 @@ bool cmTargetLinkLibrariesCommand
     }
 
   // Keep track of link configuration specifiers.
-  cmTarget::LinkLibraryType llt = cmTarget::GENERAL;
+  cmTargetLinkLibraryType llt = GENERAL_LibraryType;
   bool haveLLT = false;
 
   // Start with primary linking and switch to link interface
@@ -242,27 +242,27 @@ bool cmTargetLinkLibrariesCommand
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::DEBUG);
+        this->LinkLibraryTypeSpecifierWarning(llt, DEBUG_LibraryType);
         }
-      llt = cmTarget::DEBUG;
+      llt = DEBUG_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "optimized")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::OPTIMIZED);
+        this->LinkLibraryTypeSpecifierWarning(llt, OPTIMIZED_LibraryType);
         }
-      llt = cmTarget::OPTIMIZED;
+      llt = OPTIMIZED_LibraryType;
       haveLLT = true;
       }
     else if(args[i] == "general")
       {
       if(haveLLT)
         {
-        this->LinkLibraryTypeSpecifierWarning(llt, cmTarget::GENERAL);
+        this->LinkLibraryTypeSpecifierWarning(llt, GENERAL_LibraryType);
         }
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       haveLLT = true;
       }
     else if(haveLLT)
@@ -282,7 +282,7 @@ bool cmTargetLinkLibrariesCommand
       // specifed that a library is both debug and optimized.  (this check is
       // only there for backwards compatibility when mixing projects built
       // with old versions of CMake and new)
-      llt = cmTarget::GENERAL;
+      llt = GENERAL_LibraryType;
       std::string linkType = args[0];
       linkType += "_LINK_TYPE";
       const char* linkTypeString =
@@ -291,11 +291,11 @@ bool cmTargetLinkLibrariesCommand
         {
         if(strcmp(linkTypeString, "debug") == 0)
           {
-          llt = cmTarget::DEBUG;
+          llt = DEBUG_LibraryType;
           }
         if(strcmp(linkTypeString, "optimized") == 0)
           {
-          llt = cmTarget::OPTIMIZED;
+          llt = OPTIMIZED_LibraryType;
           }
         }
       if (!this->HandleLibrary(args[i], llt))
@@ -350,7 +350,7 @@ cmTargetLinkLibrariesCommand
 //----------------------------------------------------------------------------
 bool
 cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
-                                            cmTarget::LinkLibraryType llt)
+                                            cmTargetLinkLibraryType llt)
 {
   if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
       && this->CurrentProcessingState != ProcessingKeywordLinkInterface)
@@ -469,7 +469,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
   std::string prop;
 
   // Include this library in the link interface for the target.
-  if(llt == cmTarget::DEBUG || llt == cmTarget::GENERAL)
+  if(llt == DEBUG_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the DEBUG configuration interfaces.
     for(std::vector<std::string>::const_iterator i = debugConfigs.begin();
@@ -480,7 +480,7 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
       this->Target->AppendProperty(prop, lib.c_str());
       }
     }
-  if(llt == cmTarget::OPTIMIZED || llt == cmTarget::GENERAL)
+  if(llt == OPTIMIZED_LibraryType || llt == GENERAL_LibraryType)
     {
     // Put in the non-DEBUG configuration interfaces.
     this->Target->AppendProperty("LINK_INTERFACE_LIBRARIES", lib.c_str());
diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h
index 47dd8bd..f061e6d 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -62,7 +62,7 @@ private:
 
   ProcessingState CurrentProcessingState;
 
-  bool HandleLibrary(const std::string& lib, cmTarget::LinkLibraryType llt);
+  bool HandleLibrary(const std::string& lib, cmTargetLinkLibraryType llt);
 };
 
 
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 7d499de..7268241 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -477,7 +477,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
             ++libIt)
       {
       mf->AddLinkLibraryForTarget(targetName, *libIt,
-                                  cmTarget::GENERAL);
+                                  GENERAL_LibraryType);
       }
 
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f
commit 2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:15:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:41:22 2015 +0200

    cmTarget: Move ImportInfoMap out of internal class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 369e497..847a5c1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
-  ImportInfoMapType ImportInfoMap;
-
   std::vector<std::string> IncludeDirectoriesEntries;
   std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
   std::vector<std::string> CompileOptionsEntries;
@@ -1538,7 +1535,7 @@ void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
   // Wipe out maps caching information affected by this property.
   if(this->IsImported() && cmHasLiteralPrefix(prop, "IMPORTED"))
     {
-    this->Internal->ImportInfoMap.clear();
+    this->ImportInfoMap.clear();
     }
 }
 
@@ -2288,16 +2285,15 @@ cmTarget::GetImportInfo(const std::string& config) const
     {
     config_upper = "NOCONFIG";
     }
-  typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
 
   ImportInfoMapType::const_iterator i =
-    this->Internal->ImportInfoMap.find(config_upper);
-  if(i == this->Internal->ImportInfoMap.end())
+    this->ImportInfoMap.find(config_upper);
+  if(i == this->ImportInfoMap.end())
     {
     ImportInfo info;
     this->ComputeImportInfo(config_upper, info);
     ImportInfoMapType::value_type entry(config_upper, info);
-    i = this->Internal->ImportInfoMap.insert(entry).first;
+    i = this->ImportInfoMap.insert(entry).first;
     }
 
   if(this->GetType() == INTERFACE_LIBRARY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 03c4cbe..97515a7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -449,6 +449,9 @@ private:
     std::string SharedDeps;
   };
 
+  typedef std::map<std::string, ImportInfo> ImportInfoMapType;
+  mutable ImportInfoMapType ImportInfoMap;
+
   ImportInfo const* GetImportInfo(const std::string& config) const;
   void ComputeImportInfo(std::string const& desired_config,
                          ImportInfo& info) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d
commit a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 13:20:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:41:21 2015 +0200

    cmTarget: Move backtrace member out of internal class.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fd8ea3e..369e497 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  // The backtrace when the target was created.
-  cmListFileBacktrace Backtrace;
-
   typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType;
   ImportInfoMapType ImportInfoMap;
 
@@ -240,7 +237,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     }
 
   // Save the backtrace of target construction.
-  this->Internal->Backtrace = this->Makefile->GetBacktrace();
+  this->Backtrace = this->Makefile->GetBacktrace();
 
   if (!this->IsImported())
     {
@@ -363,7 +360,7 @@ void cmTarget::FinishConfigure()
 //----------------------------------------------------------------------------
 cmListFileBacktrace const& cmTarget::GetBacktrace() const
 {
-  return this->Internal->Backtrace;
+  return this->Backtrace;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 01261ed..03c4cbe 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -471,6 +471,8 @@ private:
                             std::string const& suffix,
                             std::string const& name,
                             const char* version) const;
+
+  cmListFileBacktrace Backtrace;
 };
 
 #ifdef CMAKE_BUILD_WITH_CMAKE

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6694d99376c8fa7ff327a6b07787cef1bea9b93b
commit 6694d99376c8fa7ff327a6b07787cef1bea9b93b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:11:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:41:21 2015 +0200

    cmTarget: Remove unneeded constructors.
    
    The compiler generated ones are fine here.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b8beb5c..fd8ea3e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -64,16 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType)
 class cmTargetInternals
 {
 public:
-  cmTargetInternals()
-    : Backtrace()
-    {
-    }
-  cmTargetInternals(cmTargetInternals const&)
-    : Backtrace()
-    {
-    }
-  ~cmTargetInternals();
-
   // The backtrace when the target was created.
   cmListFileBacktrace Backtrace;
 
@@ -95,11 +85,6 @@ public:
 };
 
 //----------------------------------------------------------------------------
-cmTargetInternals::~cmTargetInternals()
-{
-}
-
-//----------------------------------------------------------------------------
 cmTarget::cmTarget()
 {
   this->Makefile = 0;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=983c00f8f97260e7650fcc440047b33898f0363c
commit 983c00f8f97260e7650fcc440047b33898f0363c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 23:14:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:41:19 2015 +0200

    Generators: Use GetType from the cmGeneratorTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index bfa8c64..5c252df 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -290,7 +290,7 @@ cmComputeLinkInformation
   // the program that will load it.
   this->LoaderFlag = 0;
   if(!this->UseImportLibrary &&
-     this->Target->Target->GetType() == cmTarget::MODULE_LIBRARY)
+     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
     {
     std::string loader_flag_var = "CMAKE_SHARED_MODULE_LOADER_";
     loader_flag_var += this->LinkLanguage;
@@ -308,10 +308,10 @@ cmComputeLinkInformation
 
   // Get options needed to specify RPATHs.
   this->RuntimeUseChrpath = false;
-  if(this->Target->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
     {
     const char* tType =
-      ((this->Target->Target->GetType() == cmTarget::EXECUTABLE)?
+      ((this->Target->GetType() == cmTarget::EXECUTABLE)?
        "EXECUTABLE" : "SHARED_LIBRARY");
     std::string rtVar = "CMAKE_";
     rtVar += tType;
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 8f3def2..4094bf0 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -554,7 +554,8 @@ cmComputeTargetDepends
 
     // Describe the depender.
     e << "  \"" << depender->GetName() << "\" of type "
-      << cmTarget::GetTargetTypeName(depender->Target->GetType()) << "\n";
+      << cmTarget::GetTargetTypeName(
+           (cmTarget::TargetType)depender->GetType()) << "\n";
 
     // List its dependencies that are inside the component.
     EdgeList const& nl = this->InitialGraph[i];
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index fe83b08..9958672 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1632,7 +1632,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag>
       return std::string();
       }
 
-    cmTarget::TargetType targetType = target->Target->GetType();
+    cmTarget::TargetType targetType = (cmTarget::TargetType)target->GetType();
 
     if(targetType != cmTarget::SHARED_LIBRARY &&
        targetType != cmTarget::MODULE_LIBRARY &&
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6bebc2b..1b8ad43 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1965,7 +1965,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
     std::string msg = "cmTarget::GetCompileInfo called for ";
     msg += this->GetName();
     msg += " which has type ";
-    msg += cmTarget::GetTargetTypeName(this->Target->GetType());
+    msg += cmTarget::GetTargetTypeName((cmTarget::TargetType)this->GetType());
     this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
@@ -2155,7 +2155,7 @@ cmTargetTraceDependencies
   this->CurrentEntry = 0;
 
   // Queue all the source files already specified for the target.
-  if (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (target->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
     std::vector<std::string> configs;
     this->Makefile->GetConfigurations(configs);
@@ -3657,8 +3657,8 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const
 bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmTarget::OBJECT_LIBRARY
+      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3669,8 +3669,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmTarget::OBJECT_LIBRARY
+      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3681,8 +3681,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmTarget::OBJECT_LIBRARY
+      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
     {
     return false;
     }
@@ -3693,8 +3693,8 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty(
 bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMaxProperty(
     const std::string &p, const std::string& config) const
 {
-  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY
-      || this->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+  if (this->GetType() == cmTarget::OBJECT_LIBRARY
+      || this->GetType() == cmTarget::INTERFACE_LIBRARY)
     {
     return false;
     }
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 79e3a4c..6469294 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -148,7 +148,7 @@ void cmGhsMultiTargetGenerator::Generate()
     this->WriteCompilerFlags(config, language);
     this->WriteCompilerDefinitions(config, language);
     this->WriteIncludes(config, language);
-    if (this->Target->GetType() == cmTarget::EXECUTABLE)
+    if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
       {
       this->WriteTargetLinkLibraries();
       }
@@ -215,13 +215,13 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
   std::string outputDir(this->GetOutputDirectory(config));
   std::string outputFilename(this->GetOutputFilename(config));
 
-  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
                                    << outputDir << outputFilename << ".a\""
                                    << std::endl;
     }
-  else if (this->Target->GetType() == cmTarget::EXECUTABLE)
+  else if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     if (notKernel && !this->IsTargetGroup())
       {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3691b41..7cf0ad0 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -137,7 +137,7 @@ void cmLocalGenerator::TraceDependencies()
       t != targets.end(); ++t)
     {
     if (t->second->Target->IsImported()
-        || t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+        || t->second->GetType() == cmTarget::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -472,7 +472,7 @@ void cmLocalGenerator::ComputeTargetManifest()
       t != targets.end(); ++t)
     {
     cmGeneratorTarget& target = *t->second;
-    if (target.Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (target.GetType() == cmTarget::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 721f239..195a1e0 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -31,7 +31,7 @@ void cmLocalGhsMultiGenerator::Generate()
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
     {
-    if (l->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (l->second->GetType() == cmTarget::INTERFACE_LIBRARY
         || l->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 8d71469..8f7a66f 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -77,7 +77,7 @@ void cmLocalNinjaGenerator::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (t->second->GetType() == cmTarget::INTERFACE_LIBRARY
         || t->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 91c7acd..e4533cc 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -119,7 +119,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+    if (t->second->GetType() == cmTarget::INTERFACE_LIBRARY
         || t->second->Target->IsImported())
       {
       continue;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 8b60a23..cb19d9b 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -26,7 +26,7 @@ cmMakefileLibraryTargetGenerator
   cmMakefileTargetGenerator(target)
 {
   this->CustomCommandDriver = OnDepends;
-  if (this->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmTarget::INTERFACE_LIBRARY)
     {
     this->GeneratorTarget->GetLibraryNames(
       this->TargetNameOut, this->TargetNameSO, this->TargetNameReal,
@@ -62,7 +62,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles()
 
   // write the link rules
   // Write the rule for this target type.
-  switch(this->Target->GetType())
+  switch(this->GeneratorTarget->GetType())
     {
     case cmTarget::STATIC_LIBRARY:
       this->WriteStaticLibraryRules();
@@ -253,8 +253,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   this->LocalGenerator->AppendFlags(linkFlags, extraFlags);
 
   // Add OSX version flags, if any.
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "COMPATIBILITY", true);
     this->AppendOSXVerFlag(linkFlags, linkLanguage, "CURRENT", false);
@@ -351,7 +351,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     // Add the link message.
     std::string buildEcho = "Linking ";
     buildEcho += linkLanguage;
-    switch(this->Target->GetType())
+    switch(this->GeneratorTarget->GetType())
       {
       case cmTarget::STATIC_LIBRARY:
         buildEcho += " static library ";
@@ -375,7 +375,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     }
 
   const char* forbiddenFlagVar = 0;
-  switch(this->Target->GetType())
+  switch(this->GeneratorTarget->GetType())
     {
     case cmTarget::SHARED_LIBRARY:
       forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS";
@@ -429,7 +429,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 #ifdef _WIN32
   // There may be a manifest file for this target.  Add it to the
   // clean set just in case.
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
     {
     libCleanFiles.push_back(
       this->Convert((targetFullPath+".manifest").c_str(),
@@ -441,7 +441,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> commands1;
   // Add a command to remove any existing files for this library.
   // for static libs only
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
                                              *this->Target, "target");
@@ -497,7 +497,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::vector<std::string> archiveAppendCommands;
   std::vector<std::string> archiveFinishCommands;
   std::string::size_type archiveCommandLimit = std::string::npos;
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     haveStaticLibraryRule =
       this->Makefile->GetDefinition(linkRuleVar)? true:false;
@@ -552,7 +552,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Collect up flags to link in needed libraries.
   std::string linkLibs;
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY)
     {
     this->CreateLinkLibs(linkLibs, relink, useResponseFileForLibs, depends,
                          useWatcomQuote);
@@ -566,7 +566,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
                           useWatcomQuote);
 
   // maybe create .def file from list of objects
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -667,7 +667,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Compute the directory portion of the install_name setting.
   std::string install_name_dir;
-  if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir =
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index abcda21..9b0e5dd 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -542,10 +542,10 @@ cmMakefileTargetGenerator
   std::string targetFullPathReal;
   std::string targetFullPathPDB;
   std::string targetFullPathCompilePDB;
-  if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-     this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-     this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     targetFullPathReal =
       this->GeneratorTarget->GetFullPath(this->ConfigName, false, true);
@@ -554,7 +554,7 @@ cmMakefileTargetGenerator
     targetFullPathPDB += "/";
     targetFullPathPDB += this->GeneratorTarget->GetPDBName(this->ConfigName);
     }
-  if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
     {
     targetFullPathCompilePDB =
       this->GeneratorTarget->GetCompilePDBPath(this->ConfigName);
@@ -1445,7 +1445,7 @@ void cmMakefileTargetGenerator
 ::AppendTargetDepends(std::vector<std::string>& depends)
 {
   // Static libraries never depend on anything for linking.
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY)
     {
     return;
     }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index c64fe50..02e47bd 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -87,7 +87,7 @@ void cmNinjaNormalTargetGenerator::Generate()
   // Write the build statements
   this->WriteObjectBuildStatements();
 
-  if(this->GetTarget()->GetType() == cmTarget::OBJECT_LIBRARY)
+  if(this->GetGeneratorTarget()->GetType() == cmTarget::OBJECT_LIBRARY)
     {
     this->WriteObjectLibStatement();
     }
@@ -103,7 +103,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
   cmGlobalNinjaGenerator::WriteDivider(this->GetRulesFileStream());
   this->GetRulesFileStream()
     << "# Rules for each languages for "
-    << cmTarget::GetTargetTypeName(this->GetTarget()->GetType())
+    << cmTarget::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
@@ -133,7 +133,7 @@ void cmNinjaNormalTargetGenerator::WriteLanguagesRules()
 
 const char *cmNinjaNormalTargetGenerator::GetVisibleTypeName() const
 {
-  switch (this->GetTarget()->GetType()) {
+  switch (this->GetGeneratorTarget()->GetType()) {
     case cmTarget::STATIC_LIBRARY:
       return "static library";
     case cmTarget::SHARED_LIBRARY:
@@ -156,7 +156,8 @@ cmNinjaNormalTargetGenerator
 {
   return this->TargetLinkLanguage
     + "_"
-    + cmTarget::GetTargetTypeName(this->GetTarget()->GetType())
+    + cmTarget::GetTargetTypeName(
+        (cmTarget::TargetType)this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
     + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
     ;
@@ -166,7 +167,8 @@ void
 cmNinjaNormalTargetGenerator
 ::WriteLinkRule(bool useResponseFile)
 {
-  cmTarget::TargetType targetType = this->GetTarget()->GetType();
+  cmTarget::TargetType targetType =
+      (cmTarget::TargetType)this->GetGeneratorTarget()->GetType();
   std::string ruleName = this->LanguageLinkerRule();
 
   // Select whether to use a response file for objects.
@@ -330,7 +332,7 @@ cmNinjaNormalTargetGenerator
     return linkCmds;
     }
   }
-  switch (this->GetTarget()->GetType()) {
+  switch (this->GetGeneratorTarget()->GetType()) {
     case cmTarget::STATIC_LIBRARY: {
       // We have archive link commands set. First, delete the existing archive.
       {
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4080d90..ec90ba5 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -189,8 +189,8 @@ ComputeDefines(cmSourceFile const* source, const std::string& language)
 cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
 {
   // Static libraries never depend on other targets for linking.
-  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-      this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
+  if (this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+      this->GeneratorTarget->GetType() == cmTarget::OBJECT_LIBRARY)
     return cmNinjaDeps();
 
   cmComputeLinkInformation* cli =
@@ -283,16 +283,16 @@ bool cmNinjaTargetGenerator::SetMsvcTargetPdbVariable(cmNinjaVars& vars) const
     {
     std::string pdbPath;
     std::string compilePdbPath;
-    if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-       this->Target->GetType() == cmTarget::STATIC_LIBRARY ||
-       this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-       this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+    if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+       this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+       this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
       {
       pdbPath = this->GeneratorTarget->GetPDBDirectory(this->GetConfigName());
       pdbPath += "/";
       pdbPath += this->GeneratorTarget->GetPDBName(this->GetConfigName());
       }
-    if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
       {
       compilePdbPath =
               this->GeneratorTarget->GetCompilePDBPath(this->GetConfigName());
@@ -480,7 +480,8 @@ cmNinjaTargetGenerator
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
   this->GetBuildFileStream()
     << "# Object build statements for "
-    << cmTarget::GetTargetTypeName(this->GetTarget()->GetType())
+    << cmTarget::GetTargetTypeName(
+         (cmTarget::TargetType)this->GetGeneratorTarget()->GetType())
     << " target "
     << this->GetTargetName()
     << "\n\n";
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a2aada6..bfab4b9 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -269,7 +269,7 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
 void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
-  if(this->Target->GetType() == cmTarget::INTERFACE_LIBRARY
+  if(this->GeneratorTarget->GetType() == cmTarget::INTERFACE_LIBRARY
       || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
@@ -278,7 +278,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
   this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
-  if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
     {
     if(!this->ComputeClOptions())
       {
@@ -360,7 +360,8 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ProjectGUID>", 2);
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
-  if(this->MSTools && this->Target->GetType() <= cmTarget::GLOBAL_TARGET)
+  if(this->MSTools
+     && this->GeneratorTarget->GetType() <= cmTarget::GLOBAL_TARGET)
     {
     this->WriteApplicationTypeSettings();
     this->VerifyNecessaryFiles();
@@ -666,7 +667,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
                                  i->c_str(),
                                  1, " Label=\"Configuration\"", "\n");
     std::string configType = "<ConfigurationType>";
-    switch(this->Target->GetType())
+    switch(this->GeneratorTarget->GetType())
       {
       case cmTarget::SHARED_LIBRARY:
       case cmTarget::MODULE_LIBRARY:
@@ -743,7 +744,7 @@ void cmVisualStudio10TargetGenerator
   mfcLine += useOfMfcValue + "</UseOfMfc>\n";
   this->WriteString(mfcLine.c_str(), 2);
 
-  if((this->Target->GetType() <= cmTarget::OBJECT_LIBRARY &&
+  if((this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
      this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
@@ -752,7 +753,7 @@ void cmVisualStudio10TargetGenerator
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
-  else if (this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
+  else if (this->GeneratorTarget->GetType() <= cmTarget::MODULE_LIBRARY &&
            this->ClOptions[config]->UsingSBCS())
     {
     this->WriteString("<CharacterSet>NotSet</CharacterSet>\n", 2);
@@ -1480,7 +1481,7 @@ void cmVisualStudio10TargetGenerator::WriteSources(
 
 void cmVisualStudio10TargetGenerator::WriteAllSources()
 {
-  if(this->Target->GetType() > cmTarget::UTILITY)
+  if(this->GeneratorTarget->GetType() > cmTarget::UTILITY)
     {
     return;
     }
@@ -1742,7 +1743,8 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
 
 void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
 {
-  cmTarget::TargetType ttype = this->Target->GetType();
+  cmTarget::TargetType ttype =
+      (cmTarget::TargetType)this->GeneratorTarget->GetType();
   if(ttype > cmTarget::GLOBAL_TARGET)
     {
     return;
@@ -1827,8 +1829,8 @@ OutputLinkIncremental(std::string const& configName)
     }
   // static libraries and things greater than modules do not need
   // to set this option
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -1966,8 +1968,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
-      if (this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-          this->Target->GetType() == cmTarget::MODULE_LIBRARY )
+      if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+          this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY )
         {
         clOptions.AddDefine("_WINRT_DLL");
         }
@@ -2175,8 +2177,8 @@ WriteMasmOptions(std::string const& configName,
 void
 cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 {
-  if(this->Target->GetType() != cmTarget::STATIC_LIBRARY &&
-     this->Target->GetType() != cmTarget::OBJECT_LIBRARY)
+  if(this->GeneratorTarget->GetType() != cmTarget::STATIC_LIBRARY &&
+     this->GeneratorTarget->GetType() != cmTarget::OBJECT_LIBRARY)
     {
     return;
     }
@@ -2212,9 +2214,9 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
 void cmVisualStudio10TargetGenerator::WriteManifestOptions(
   std::string const& config)
 {
-  if (this->Target->GetType() != cmTarget::EXECUTABLE &&
-      this->Target->GetType() != cmTarget::SHARED_LIBRARY &&
-      this->Target->GetType() != cmTarget::MODULE_LIBRARY)
+  if (this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE &&
+      this->GeneratorTarget->GetType() != cmTarget::SHARED_LIBRARY &&
+      this->GeneratorTarget->GetType() != cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2380,9 +2382,9 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
 //----------------------------------------------------------------------------
 bool cmVisualStudio10TargetGenerator::ComputeLinkOptions()
 {
-  if(this->Target->GetType() == cmTarget::EXECUTABLE ||
-     this->Target->GetType() == cmTarget::SHARED_LIBRARY ||
-     this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE ||
+     this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY ||
+     this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     for(std::vector<std::string>::const_iterator
           i = this->Configurations.begin();
@@ -2419,11 +2421,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string CONFIG = cmSystemTools::UpperCase(config);
 
   const char* linkType = "SHARED";
-  if(this->Target->GetType() == cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::MODULE_LIBRARY)
     {
     linkType = "MODULE";
     }
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     linkType = "EXE";
     }
@@ -2506,7 +2508,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   std::string targetNameFull;
   std::string targetNameImport;
   std::string targetNamePDB;
-  if(this->Target->GetType() == cmTarget::EXECUTABLE)
+  if(this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     this->GeneratorTarget->GetExecutableNames(targetName, targetNameFull,
                                      targetNameImport, targetNamePDB,
@@ -2529,7 +2531,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2551,7 +2553,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+        if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
           {
           if (this->ClOptions[config]->UsingUnicode())
             {
@@ -2597,7 +2599,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
     if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
-       this->Target->GetType() != cmTarget::EXECUTABLE)
+       this->GeneratorTarget->GetType() != cmTarget::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
       }
@@ -2635,7 +2637,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
                            "%(IgnoreSpecificDefaultLibraries)");
     }
 
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -2652,8 +2654,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 void
 cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 {
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY
-     || this->Target->GetType() > cmTarget::MODULE_LIBRARY)
+  if(this->GeneratorTarget->GetType() == cmTarget::STATIC_LIBRARY
+     || this->GeneratorTarget->GetType() > cmTarget::MODULE_LIBRARY)
     {
     return;
     }
@@ -2763,7 +2765,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WritePlatformConfigTag("ItemDefinitionGroup", i->c_str(), 1);
     *this->BuildFileStream << "\n";
     //    output cl compile flags <ClCompile></ClCompile>
-    if(this->Target->GetType() <= cmTarget::OBJECT_LIBRARY)
+    if(this->GeneratorTarget->GetType() <= cmTarget::OBJECT_LIBRARY)
       {
       this->WriteClOptions(*i, includes);
       //    output rc compile flags <ResourceCompile></ResourceCompile>
@@ -2781,7 +2783,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     //    output manifest flags  <Manifest></Manifest>
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
-       this->Target->GetType() == cmTarget::EXECUTABLE &&
+       this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE &&
        this->Target->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
@@ -2794,7 +2796,7 @@ void
 cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
 {
   bool addedPrelink = false;
-  if (this->Target->GetType() == cmTarget::SHARED_LIBRARY &&
+  if (this->GeneratorTarget->GetType() == cmTarget::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
     if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
@@ -3002,7 +3004,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile()
 {
   if((this->GlobalGenerator->TargetsWindowsStore() ||
       this->GlobalGenerator->TargetsWindowsPhone())
-      && (cmTarget::EXECUTABLE == this->Target->GetType()))
+      && (cmTarget::EXECUTABLE == this->GeneratorTarget->GetType()))
     {
     std::string pfxFile;
     std::vector<cmSourceFile const*> certificates;
@@ -3131,7 +3133,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>14.0"
         "</MinimumVisualStudioVersion>\n", 2);
 
-      if(this->Target->GetType() < cmTarget::UTILITY)
+      if(this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3145,7 +3147,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>12.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (this->Target->GetType() < cmTarget::UTILITY)
+      if (this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
@@ -3159,12 +3161,13 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       this->WriteString("<MinimumVisualStudioVersion>11.0"
                         "</MinimumVisualStudioVersion>\n", 2);
 
-      if (isWindowsStore && this->Target->GetType() < cmTarget::UTILITY)
+      if (isWindowsStore
+          && this->GeneratorTarget->GetType() < cmTarget::UTILITY)
         {
         isAppContainer = true;
         }
       else if (isWindowsPhone &&
-               this->Target->GetType() == cmTarget::EXECUTABLE)
+               this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
         {
         this->WriteString("<XapOutputs>true</XapOutputs>\n", 2);
         this->WriteString("<XapFilename>", 2);
@@ -3221,7 +3224,7 @@ void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()
 {
   // For Windows and Windows Phone executables, we will assume that if a
   // manifest is not present that we need to add all the necessary files
-  if (this->Target->GetType() == cmTarget::EXECUTABLE)
+  if (this->GeneratorTarget->GetType() == cmTarget::EXECUTABLE)
     {
     std::vector<cmSourceFile const*> manifestSources;
     this->GeneratorTarget->GetAppManifest(manifestSources, "");

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 14 19:05:15 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 14 Oct 2015 19:05:15 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-572-g4505432
Message-ID: <20151014230515.DF7D3C05F5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  450543241dc814f5035c13b49b2d763903b2fcd8 (commit)
       via  c9402d93bd1b5243017e68eafd0703d1ca45e9e6 (commit)
       via  5fd4e1b8d48203e72f736a5ad83a203a2408cb3e (commit)
      from  4d19575c6be1f07347dbb99d74a48a1306ffc975 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=450543241dc814f5035c13b49b2d763903b2fcd8
commit 450543241dc814f5035c13b49b2d763903b2fcd8
Merge: 4d19575 c9402d9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 19:05:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 19:05:13 2015 -0400

    Merge topic 'genex-consumers-generator-targets' into next
    
    c9402d93 Genex: Port some access API to cmGeneratorTarget.
    5fd4e1b8 Genex: Port implementation to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9402d93bd1b5243017e68eafd0703d1ca45e9e6
commit c9402d93bd1b5243017e68eafd0703d1ca45e9e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 18:41:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 01:01:48 2015 +0200

    Genex: Port some access API to cmGeneratorTarget.

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index f8dbe31..e0fd1a5 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -84,13 +84,13 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
                                      false, &gDummyHead,
                                      gtgt, &dagChecker);
 
-  const std::set<cmTarget const*> &allTargets = cge->GetAllTargetsSeen();
-  for(std::set<cmTarget const*>::const_iterator li = allTargets.begin();
+  const std::set<cmGeneratorTarget const*> &allTargets = cge->GetAllTargetsSeen();
+  for(std::set<cmGeneratorTarget const*>::const_iterator li = allTargets.begin();
       li != allTargets.end(); ++li)
     {
-    if(emitted.insert(*li).second)
+    if(emitted.insert((*li)->Target).second)
       {
-      this->Exports.push_back(*li);
+      this->Exports.push_back((*li)->Target);
       }
     }
   return result;
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index d9f67f2..6796a01 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -11,10 +11,9 @@
 ============================================================================*/
 #include "cmGeneratorExpression.h"
 
-#include "cmMakefile.h"
-#include "cmTarget.h"
 #include "assert.h"
 #include "cmAlgorithms.h"
+#include "cmSystemTools.h"
 
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionLexer.h"
@@ -463,10 +462,11 @@ bool cmGeneratorExpression::IsValidTargetName(const std::string &input)
 
 //----------------------------------------------------------------------------
 void
-cmCompiledGeneratorExpression::GetMaxLanguageStandard(cmTarget const* tgt,
+cmCompiledGeneratorExpression::GetMaxLanguageStandard(
+    const cmGeneratorTarget* tgt,
                   std::map<std::string, std::string>& mapping)
 {
-  typedef std::map<cmTarget const*,
+  typedef std::map<cmGeneratorTarget const*,
                    std::map<std::string, std::string> > MapType;
   MapType::const_iterator it = this->MaxLanguageStandard.find(tgt);
   if (it != this->MaxLanguageStandard.end())
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index d64d6ba..a1bd042 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -19,7 +19,6 @@
 #include <cmsys/RegularExpression.hxx>
 #include <cmsys/auto_ptr.hxx>
 
-class cmTarget;
 class cmGeneratorTarget;
 class cmLocalGenerator;
 class cmListFileBacktrace;
@@ -92,13 +91,13 @@ public:
                        std::string const& language = std::string()) const;
 
   /** Get set of targets found during evaluations.  */
-  std::set<cmTarget*> const& GetTargets() const
+  std::set<cmGeneratorTarget*> const& GetTargets() const
     { return this->DependTargets; }
 
   std::set<std::string> const& GetSeenTargetProperties() const
     { return this->SeenTargetProperties; }
 
-  std::set<cmTarget const*> const& GetAllTargetsSeen() const
+  std::set<cmGeneratorTarget const*> const& GetAllTargetsSeen() const
     { return this->AllTargetsSeen; }
 
   ~cmCompiledGeneratorExpression();
@@ -120,7 +119,7 @@ public:
   {
     return this->HadHeadSensitiveCondition;
   }
-  std::set<cmTarget const*> GetSourceSensitiveTargets() const
+  std::set<cmGeneratorTarget const*> GetSourceSensitiveTargets() const
   {
     return this->SourceSensitiveTargets;
   }
@@ -130,7 +129,7 @@ public:
     this->EvaluateForBuildsystem = eval;
   }
 
-  void GetMaxLanguageStandard(cmTarget const* tgt,
+  void GetMaxLanguageStandard(cmGeneratorTarget const* tgt,
                     std::map<std::string, std::string>& mapping);
 
 private:
@@ -150,15 +149,15 @@ private:
   const std::string Input;
   bool NeedsEvaluation;
 
-  mutable std::set<cmTarget*> DependTargets;
-  mutable std::set<cmTarget const*> AllTargetsSeen;
+  mutable std::set<cmGeneratorTarget*> DependTargets;
+  mutable std::set<cmGeneratorTarget const*> AllTargetsSeen;
   mutable std::set<std::string> SeenTargetProperties;
-  mutable std::map<cmTarget const*, std::map<std::string, std::string> >
+  mutable std::map<cmGeneratorTarget const*, std::map<std::string, std::string> >
                                                           MaxLanguageStandard;
   mutable std::string Output;
   mutable bool HadContextSensitiveCondition;
   mutable bool HadHeadSensitiveCondition;
-  mutable std::set<cmTarget const*>  SourceSensitiveTargets;
+  mutable std::set<cmGeneratorTarget const*>  SourceSensitiveTargets;
   bool EvaluateForBuildsystem;
 };
 
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index 934e2e7..e802138 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -18,7 +18,6 @@
 #include <map>
 #include <string>
 
-class cmTarget;
 class cmGeneratorTarget;
 class cmLocalGenerator;
 
@@ -34,11 +33,11 @@ struct cmGeneratorExpressionContext
 
 
   cmListFileBacktrace Backtrace;
-  std::set<cmTarget*> DependTargets;
-  std::set<cmTarget const*> AllTargets;
+  std::set<cmGeneratorTarget*> DependTargets;
+  std::set<cmGeneratorTarget const*> AllTargets;
   std::set<std::string> SeenTargetProperties;
-  std::set<cmTarget const*> SourceSensitiveTargets;
-  std::map<cmTarget const*, std::map<std::string, std::string> >
+  std::set<cmGeneratorTarget const*> SourceSensitiveTargets;
+  std::map<cmGeneratorTarget const*, std::map<std::string, std::string> >
                                                           MaxLanguageStandard;
   cmLocalGenerator *LG;
   std::string Config;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 704066a..a38da77 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -964,7 +964,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         reportError(context, content->GetOriginalExpression(), e.str());
         return std::string();
         }
-      context->AllTargets.insert(target->Target);
+      context->AllTargets.insert(target);
       }
 
     if (target == context->HeadTarget)
@@ -977,7 +977,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     if (propertyName == "SOURCES")
       {
-      context->SourceSensitiveTargets.insert(target->Target);
+      context->SourceSensitiveTargets.insert(target);
       }
 
     if (propertyName.empty())
@@ -1411,7 +1411,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
               l = standardDefault;
               }
             assert(l);
-            context->MaxLanguageStandard[target->Target][lit->first] = l;
+            context->MaxLanguageStandard[target][lit->first] = l;
             }
           else
             {
@@ -1755,8 +1755,8 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
                     "be used while evaluating link libraries");
       return std::string();
       }
-    context->DependTargets.insert(target->Target);
-    context->AllTargets.insert(target->Target);
+    context->DependTargets.insert(target);
+    context->AllTargets.insert(target);
 
     std::string result =
                 TargetFilesystemArtifactResultCreator<ArtifactT>::Create(
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6bebc2b..ca91f53 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2173,9 +2173,9 @@ cmTargetTraceDependencies
           si != sources.end(); ++si)
         {
         cmSourceFile* sf = *si;
-        const std::set<cmTarget const*> tgts =
+        const std::set<cmGeneratorTarget const*> tgts =
                           this->GlobalGenerator->GetFilenameTargetDepends(sf);
-        if (tgts.find(this->Target) != tgts.end())
+        if (tgts.find(this->GeneratorTarget) != tgts.end())
           {
           std::ostringstream e;
           e << "Evaluation output file\n  \"" << sf->GetFullPath()
@@ -2353,7 +2353,7 @@ cmTargetTraceDependencies
   cmGeneratorExpression ge(cc.GetBacktrace());
 
   // Add target-level dependencies referenced by generator expressions.
-  std::set<cmTarget*> targets;
+  std::set<cmGeneratorTarget*> targets;
 
   for(cmCustomCommandLines::const_iterator cit = cc.GetCommandLines().begin();
       cit != cc.GetCommandLines().end(); ++cit)
@@ -2379,12 +2379,12 @@ cmTargetTraceDependencies
       const cmsys::auto_ptr<cmCompiledGeneratorExpression> cge
                                                               = ge.Parse(*cli);
       cge->Evaluate(this->GeneratorTarget->GetLocalGenerator(), "", true);
-      std::set<cmTarget*> geTargets = cge->GetTargets();
+      std::set<cmGeneratorTarget*> geTargets = cge->GetTargets();
       targets.insert(geTargets.begin(), geTargets.end());
       }
     }
 
-  for(std::set<cmTarget*>::iterator ti = targets.begin();
+  for(std::set<cmGeneratorTarget*>::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
     this->Target->AddUtility((*ti)->GetName());
@@ -5412,7 +5412,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         this->LinkImplicitNullProperties.insert(*it);
         }
       }
-    cge->GetMaxLanguageStandard(this->Target,
+    cge->GetMaxLanguageStandard(this,
                                 this->MaxLanguageStandards);
     }
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e8be2d6..44ad2a7 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3029,13 +3029,13 @@ std::string cmGlobalGenerator::EscapeJSON(const std::string& s) {
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::SetFilenameTargetDepends(cmSourceFile* sf,
-                                              std::set<cmTarget const*> tgts)
+                                              std::set<cmGeneratorTarget const*> tgts)
 {
   this->FilenameTargetDepends[sf] = tgts;
 }
 
 //----------------------------------------------------------------------------
-std::set<cmTarget const*> const&
+std::set<cmGeneratorTarget const*> const&
 cmGlobalGenerator::GetFilenameTargetDepends(cmSourceFile* sf) const {
   return this->FilenameTargetDepends[sf];
 }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index fc81708..6887409 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -354,8 +354,8 @@ public:
   void CreateEvaluationSourceFiles(std::string const& config) const;
 
   void SetFilenameTargetDepends(cmSourceFile* sf,
-                                std::set<cmTarget const*> tgts);
-  std::set<cmTarget const*> const&
+                                std::set<const cmGeneratorTarget*> tgts);
+  const std::set<const cmGeneratorTarget*>&
   GetFilenameTargetDepends(cmSourceFile* sf) const;
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -508,7 +508,7 @@ private:
   // track targets to issue CMP0042 warning for.
   std::set<std::string> CMP0042WarnTargets;
 
-  mutable std::map<cmSourceFile*, std::set<cmTarget const*> >
+  mutable std::map<cmSourceFile*, std::set<cmGeneratorTarget const*> >
   FilenameTargetDepends;
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fd4e1b8d48203e72f736a5ad83a203a2408cb3e
commit 5fd4e1b8d48203e72f736a5ad83a203a2408cb3e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 18:27:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:57:04 2015 +0200

    Genex: Port implementation to cmGeneratorTarget.

diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index 4daf4e9..5c9462f 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -24,8 +24,8 @@ cmGeneratorExpressionContext::cmGeneratorExpressionContext(
     LG(lg),
     Config(config),
     Language(language),
-    HeadTarget(headTarget ? headTarget->Target : 0),
-    CurrentTarget(currentTarget ? currentTarget->Target : 0),
+    HeadTarget(headTarget),
+    CurrentTarget(currentTarget),
     Quiet(quiet),
     HadError(false),
     HadContextSensitiveCondition(false),
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index bbf0fcf..934e2e7 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -43,9 +43,11 @@ struct cmGeneratorExpressionContext
   cmLocalGenerator *LG;
   std::string Config;
   std::string Language;
-  cmTarget const* HeadTarget; // The target whose property is being evaluated.
-  cmTarget const* CurrentTarget; // The dependent of HeadTarget which appears
-                                 // directly or indirectly in the property.
+  // The target whose property is being evaluated.
+  cmGeneratorTarget const* HeadTarget;
+  // The dependent of HeadTarget which appears
+  // directly or indirectly in the property.
+  cmGeneratorTarget const* CurrentTarget;
   bool Quiet;
   bool HadError;
   bool HadContextSensitiveCondition;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index fe83b08..704066a 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -705,7 +705,7 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
       const char* loc = 0;
       const char* imp = 0;
       std::string suffix;
-      if (context->CurrentTarget->GetMappedConfig(context->Config,
+      if (context->CurrentTarget->Target->GetMappedConfig(context->Config,
                                                   &loc,
                                                   &imp,
                                                   suffix))
@@ -893,7 +893,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     static cmsys::RegularExpression propertyNameValidator("^[A-Za-z0-9_]+$");
 
-    cmTarget const* target = context->HeadTarget;
+    cmGeneratorTarget const* target = context->HeadTarget;
     std::string propertyName = *parameters.begin();
 
     if (parameters.size() == 1)
@@ -945,15 +945,15 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         {
         if(context->LG->GetMakefile()->IsAlias(targetName))
           {
-          if(cmTarget* tgt =
-             context->LG->GetMakefile()->FindTargetToUse(targetName))
+          if(cmGeneratorTarget* tgt =
+             context->LG->FindGeneratorTargetToUse(targetName))
             {
             return tgt->GetName();
             }
           }
         return "";
         }
-      target = context->LG->GetMakefile()->FindTargetToUse(targetName);
+      target = context->LG->FindGeneratorTargetToUse(targetName);
 
       if (!target)
         {
@@ -964,7 +964,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         reportError(context, content->GetOriginalExpression(), e.str());
         return std::string();
         }
-      context->AllTargets.insert(target);
+      context->AllTargets.insert(target->Target);
       }
 
     if (target == context->HeadTarget)
@@ -977,7 +977,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     if (propertyName == "SOURCES")
       {
-      context->SourceSensitiveTargets.insert(target);
+      context->SourceSensitiveTargets.insert(target->Target);
       }
 
     if (propertyName.empty())
@@ -997,12 +997,9 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
 
     assert(target);
 
-    cmGeneratorTarget* gtgt =
-        context->LG->GetGlobalGenerator()->GetGeneratorTarget(target);
-
     if (propertyName == "LINKER_LANGUAGE")
       {
-      if (target->LinkLanguagePropagatesToDependents() &&
+      if (target->Target->LinkLanguagePropagatesToDependents() &&
           dagCheckerParent && (dagCheckerParent->EvaluatingLinkLibraries()
             || dagCheckerParent->EvaluatingSources()))
         {
@@ -1011,7 +1008,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
             "link libraries for a static library");
         return std::string();
         }
-      return gtgt->GetLinkerLanguage(context->Config);
+      return target->GetLinkerLanguage(context->Config);
       }
 
     cmGeneratorExpressionDAGChecker dagChecker(context->Backtrace,
@@ -1110,20 +1107,17 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         }
       }
 #undef POPULATE_INTERFACE_PROPERTY_NAME
-    cmTarget const* headTarget = context->HeadTarget && isInterfaceProperty
+    cmGeneratorTarget const* headTarget = context->HeadTarget && isInterfaceProperty
                                ? context->HeadTarget : target;
 
     if(isInterfaceProperty)
       {
-      cmGeneratorTarget* gHeadTarget =
-          context->LG->GetGlobalGenerator()
-          ->GetGeneratorTarget(headTarget);
       if(cmLinkInterfaceLibraries const* iface =
-         gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
+         target->GetLinkInterfaceLibraries(context->Config, headTarget, true))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(iface->Libraries, gtgt,
-                                  gHeadTarget,
+          getLinkedTargetsContent(iface->Libraries, target,
+                                  headTarget,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1131,11 +1125,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     else if(!interfacePropertyName.empty())
       {
       if(cmLinkImplementationLibraries const* impl =
-         gtgt->GetLinkImplementationLibraries(context->Config))
+         target->GetLinkImplementationLibraries(context->Config))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(impl->Libraries, gtgt,
-                                  gtgt,
+          getLinkedTargetsContent(impl->Libraries, target,
+                                  target,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1148,40 +1142,40 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         {
         return linkedTargetsContent;
         }
-      if (gtgt->IsLinkInterfaceDependentBoolProperty(propertyName,
+      if (target->IsLinkInterfaceDependentBoolProperty(propertyName,
                                                      context->Config))
         {
         context->HadContextSensitiveCondition = true;
-        return gtgt->GetLinkInterfaceDependentBoolProperty(
+        return target->GetLinkInterfaceDependentBoolProperty(
                                                 propertyName,
                                                 context->Config) ? "1" : "0";
         }
-      if (gtgt->IsLinkInterfaceDependentStringProperty(propertyName,
+      if (target->IsLinkInterfaceDependentStringProperty(propertyName,
                                                        context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                              gtgt->GetLinkInterfaceDependentStringProperty(
+                              target->GetLinkInterfaceDependentStringProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
         }
-      if (gtgt->IsLinkInterfaceDependentNumberMinProperty(propertyName,
+      if (target->IsLinkInterfaceDependentNumberMinProperty(propertyName,
                                                           context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                          gtgt->GetLinkInterfaceDependentNumberMinProperty(
+                          target->GetLinkInterfaceDependentNumberMinProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
         }
-      if (gtgt->IsLinkInterfaceDependentNumberMaxProperty(propertyName,
+      if (target->IsLinkInterfaceDependentNumberMaxProperty(propertyName,
                                                           context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                          gtgt->GetLinkInterfaceDependentNumberMaxProperty(
+                          target->GetLinkInterfaceDependentNumberMaxProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
@@ -1193,22 +1187,22 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if (!target->IsImported()
         && dagCheckerParent && !dagCheckerParent->EvaluatingLinkLibraries())
       {
-      if (gtgt->IsLinkInterfaceDependentNumberMinProperty(propertyName,
+      if (target->IsLinkInterfaceDependentNumberMinProperty(propertyName,
                                                           context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                            gtgt->GetLinkInterfaceDependentNumberMinProperty(
+                            target->GetLinkInterfaceDependentNumberMinProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
         }
-      if (gtgt->IsLinkInterfaceDependentNumberMaxProperty(propertyName,
+      if (target->IsLinkInterfaceDependentNumberMaxProperty(propertyName,
                                                           context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                            gtgt->GetLinkInterfaceDependentNumberMaxProperty(
+                            target->GetLinkInterfaceDependentNumberMaxProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
@@ -1216,11 +1210,9 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     if(!interfacePropertyName.empty())
       {
-      cmGeneratorTarget* gHeadTarget =
-          context->LG->GetGlobalGenerator()->GetGeneratorTarget(headTarget);
       std::string result = this->EvaluateDependentExpression(prop,
                                         context->LG, context,
-                                        gHeadTarget, gtgt, &dagChecker);
+                                        headTarget, target, &dagChecker);
       if (!linkedTargetsContent.empty())
         {
         result += (result.empty() ? "" : ";") + linkedTargetsContent;
@@ -1341,7 +1333,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
                        const GeneratorExpressionContent *content,
                        cmGeneratorExpressionDAGChecker *dagChecker) const
   {
-    cmTarget const* target = context->HeadTarget;
+    cmGeneratorTarget const* target = context->HeadTarget;
     if (!target)
       {
       reportError(context, content->GetOriginalExpression(),
@@ -1361,7 +1353,8 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       {
       std::string error;
       std::string lang;
-      if (!context->LG->GetMakefile()->CompileFeatureKnown(context->HeadTarget,
+      if (!context->LG->GetMakefile()->CompileFeatureKnown(
+            context->HeadTarget->Target,
                                                   *it, lang, &error))
         {
         reportError(context, content->GetOriginalExpression(), error);
@@ -1407,7 +1400,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
           // All features known for the language are always available.
           continue;
           }
-        if (!context->LG->GetMakefile()->HaveStandardAvailable(target,
+        if (!context->LG->GetMakefile()->HaveStandardAvailable(target->Target,
                                                       lit->first, *it))
           {
           if (evalLL)
@@ -1418,7 +1411,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
               l = standardDefault;
               }
             assert(l);
-            context->MaxLanguageStandard[target][lit->first] = l;
+            context->MaxLanguageStandard[target->Target][lit->first] = l;
             }
           else
             {
@@ -1442,13 +1435,13 @@ static const char* targetPolicyWhitelist[] = {
 #undef TARGET_POLICY_STRING
 };
 
-cmPolicies::PolicyStatus statusForTarget(cmTarget const* tgt,
+cmPolicies::PolicyStatus statusForTarget(cmGeneratorTarget const* tgt,
                                          const char *policy)
 {
 #define RETURN_POLICY(POLICY) \
   if (strcmp(policy, #POLICY) == 0) \
   { \
-    return tgt->GetPolicyStatus ## POLICY (); \
+    return tgt->Target->GetPolicyStatus ## POLICY (); \
   } \
 
   CM_FOR_EACH_TARGET_POLICY(RETURN_POLICY)
@@ -1503,7 +1496,7 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode
       const char *policy = targetPolicyWhitelist[i];
       if (parameters.front() == policy)
         {
-        cmMakefile *mf = context->HeadTarget->GetMakefile();
+        cmMakefile *mf = context->HeadTarget->Target->GetMakefile();
         switch(statusForTarget(context->HeadTarget, policy))
           {
           case cmPolicies::WARN:

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportTryCompileFileGenerator.cxx |    8 +--
 Source/cmGeneratorExpression.cxx           |    8 +--
 Source/cmGeneratorExpression.h             |   17 +++---
 Source/cmGeneratorExpressionContext.cxx    |    4 +-
 Source/cmGeneratorExpressionContext.h      |   17 +++---
 Source/cmGeneratorExpressionNode.cxx       |   79 +++++++++++++---------------
 Source/cmGeneratorTarget.cxx               |   12 ++---
 Source/cmGlobalGenerator.cxx               |    4 +-
 Source/cmGlobalGenerator.h                 |    6 +--
 9 files changed, 74 insertions(+), 81 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Oct 15 00:01:07 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu, 15 Oct 2015 00:01:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-223-g8e394cf
Message-ID: <20151015040107.74668C0669@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  8e394cf9e39babefdc991b67fa4fd1921735eb7e (commit)
      from  088fcbf733a7d1968fc3586a7077f22cb41e1917 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e394cf9e39babefdc991b67fa4fd1921735eb7e
commit 8e394cf9e39babefdc991b67fa4fd1921735eb7e
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Oct 15 00:01:05 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 15 00:01:05 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index c57720a..bcccdc2 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151014)
+set(CMake_VERSION_PATCH 20151015)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 15 09:05:42 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 15 Oct 2015 09:05:42 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-574-gc9ede51
Message-ID: <20151015130542.8876CC08AF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c9ede510ec479901208d986e35fc50f47c6ace00 (commit)
       via  4cd52dc5511c8c3809b7cb260ac6afa7eec65f2e (commit)
      from  450543241dc814f5035c13b49b2d763903b2fcd8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9ede510ec479901208d986e35fc50f47c6ace00
commit c9ede510ec479901208d986e35fc50f47c6ace00
Merge: 4505432 4cd52dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 09:05:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 15 09:05:41 2015 -0400

    Merge topic 'ExternalProject-fix-git-version-error' into next
    
    4cd52dc5 ExternalProject: Fix Git version report in error message (#15791)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cd52dc5511c8c3809b7cb260ac6afa7eec65f2e
commit 4cd52dc5511c8c3809b7cb260ac6afa7eec65f2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 08:56:53 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 15 09:00:23 2015 -0400

    ExternalProject: Fix Git version report in error message (#15791)
    
    Refactoring in commit v3.4.0-rc1~77^2~1 (ExternalProject: Use
    GIT_VERSION_STRING instead of custom method, 2015-09-17) forgot
    to update the variable name used in an error message.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 90ceedf..dda45b9 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1739,7 +1739,7 @@ function(_ep_add_download_command name)
     # The git submodule update '--recursive' flag requires git >= v1.6.5
     #
     if(GIT_VERSION_STRING VERSION_LESS 1.6.5)
-      message(FATAL_ERROR "error: git version 1.6.5 or later required for 'git submodule update --recursive': git_version='${git_version}'")
+      message(FATAL_ERROR "error: git version 1.6.5 or later required for 'git submodule update --recursive': GIT_VERSION_STRING='${GIT_VERSION_STRING}'")
     endif()
 
     get_property(git_tag TARGET ${name} PROPERTY _EP_GIT_TAG)

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 15 09:39:35 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 15 Oct 2015 09:39:35 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-576-g1c7f65b
Message-ID: <20151015133935.8B600BF16E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1c7f65b28d6b12a4a3f7bf0dca56fb4ef4fcf386 (commit)
       via  c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67 (commit)
      from  c9ede510ec479901208d986e35fc50f47c6ace00 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c7f65b28d6b12a4a3f7bf0dca56fb4ef4fcf386
commit 1c7f65b28d6b12a4a3f7bf0dca56fb4ef4fcf386
Merge: c9ede51 c9e0173
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 09:39:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 15 09:39:34 2015 -0400

    Merge topic 'ExternalProject-fix-git-version' into next
    
    c9e0173e ExternalProject: Always use CMake builtin FindGit (#15791)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67
commit c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 09:34:46 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 15 09:35:43 2015 -0400

    ExternalProject: Always use CMake builtin FindGit (#15791)
    
    Unset CMAKE_MODULE_PATH before calling find_package(Git) to ensure we do
    not get a project-provided FindGit module that may not provide the
    GIT_VERSION_STRING that we need.  We do not need to restore the value
    explicitly because this occurs inside the _ep_add_download_command
    function call scope.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index dda45b9..c822bdb 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1731,6 +1731,7 @@ function(_ep_add_download_command name)
       --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name})
     list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
   elseif(git_repository)
+    unset(CMAKE_MODULE_PATH) # Use CMake builtin find module
     find_package(Git QUIET)
     if(NOT GIT_EXECUTABLE)
       message(FATAL_ERROR "error: could not find git for clone of ${name}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 15 10:07:57 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 15 Oct 2015 10:07:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-579-g8709f88
Message-ID: <20151015140757.6EE83C095F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8709f887f1565054381b8eed3c525f5192dc244b (commit)
       via  ce7ccafce29a618392e05f99881c41f4a4a07125 (commit)
       via  8e394cf9e39babefdc991b67fa4fd1921735eb7e (commit)
      from  1c7f65b28d6b12a4a3f7bf0dca56fb4ef4fcf386 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8709f887f1565054381b8eed3c525f5192dc244b
commit 8709f887f1565054381b8eed3c525f5192dc244b
Merge: 1c7f65b ce7ccaf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 10:07:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 15 10:07:56 2015 -0400

    Merge topic 'ghs-drop-optgroup' into next
    
    ce7ccafc GHS: Remove extra flag to GHS MULTI compiler (#15771)
    8e394cf9 CMake Nightly Date Stamp

diff --cc Source/cmGhsMultiTargetGenerator.cxx
index d6cbf75,be54220..c687ba7
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@@ -215,9 -215,9 +215,9 @@@ void cmGhsMultiTargetGenerator::WriteTy
    std::string outputDir(this->GetOutputDirectory(config));
    std::string outputFilename(this->GetOutputFilename(config));
  
 -  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
 +  if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
      {
-     *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
+     *this->GetFolderBuildStreams() << "    -o \""
                                     << outputDir << outputFilename << ".a\""
                                     << std::endl;
      }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce7ccafce29a618392e05f99881c41f4a4a07125
commit ce7ccafce29a618392e05f99881c41f4a4a07125
Author:     Geoff Viola <geoffrey.viola at asirobots.com>
AuthorDate: Wed Oct 14 00:27:18 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 15 09:56:47 2015 -0400

    GHS: Remove extra flag to GHS MULTI compiler (#15771)
    
    Do not produce "{optgroup=GhsCommonOptions}" in the generated .gpj
    files.  The flag was added originally to match an old project file, but
    it does not seem necessary and is not compatible with all GHS versions.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 79e3a4c..be54220 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -217,7 +217,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
 
   if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
     {
-    *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
+    *this->GetFolderBuildStreams() << "    -o \""
                                    << outputDir << outputFilename << ".a\""
                                    << std::endl;
     }
@@ -230,7 +230,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
     if (this->IsTargetGroup())
       {
       *this->GetFolderBuildStreams()
-          << "    {optgroup=GhsCommonOptions} -o \"" << outputDir
+          << "    -o \"" << outputDir
           << outputFilename << ".elf\"" << std::endl;
       *this->GetFolderBuildStreams() << "    :extraOutputFile=\"" << outputDir
                                      << outputFilename << ".elf.ael\""
@@ -238,7 +238,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
       }
     else
       {
-      *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
+      *this->GetFolderBuildStreams() << "    -o \""
                                      << outputDir << outputFilename << ".as\""
                                      << std::endl;
       }

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake            |    2 +-
 Source/cmGhsMultiTargetGenerator.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct 15 16:37:21 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu, 15 Oct 2015 16:37:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-582-g168acad
Message-ID: <20151015203721.53406C08B5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  168acad48d395ba3e138bbd9962927120069ad3e (commit)
       via  7450bd4f6b3b186cd56e6f1b38c6da6eea3a6652 (commit)
       via  bc3926bb42c3ee1718892edfefcaa81d1e51b7ad (commit)
      from  8709f887f1565054381b8eed3c525f5192dc244b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=168acad48d395ba3e138bbd9962927120069ad3e
commit 168acad48d395ba3e138bbd9962927120069ad3e
Merge: 8709f88 7450bd4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 16:37:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 15 16:37:20 2015 -0400

    Merge topic 'genex-consumers-generator-targets' into next
    
    7450bd4f fixup! Genex: Port some access API to cmGeneratorTarget.
    bc3926bb fixup! Genex: Port implementation to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7450bd4f6b3b186cd56e6f1b38c6da6eea3a6652
commit 7450bd4f6b3b186cd56e6f1b38c6da6eea3a6652
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 22:36:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 22:36:50 2015 +0200

    fixup! Genex: Port some access API to cmGeneratorTarget.

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index e0fd1a5..fe5717a 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -84,9 +84,10 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
                                      false, &gDummyHead,
                                      gtgt, &dagChecker);
 
-  const std::set<cmGeneratorTarget const*> &allTargets = cge->GetAllTargetsSeen();
-  for(std::set<cmGeneratorTarget const*>::const_iterator li = allTargets.begin();
-      li != allTargets.end(); ++li)
+  const std::set<cmGeneratorTarget const*> &allTargets =
+      cge->GetAllTargetsSeen();
+  for(std::set<cmGeneratorTarget const*>::const_iterator li =
+      allTargets.begin(); li != allTargets.end(); ++li)
     {
     if(emitted.insert((*li)->Target).second)
       {
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index a1bd042..efd381b 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -152,8 +152,8 @@ private:
   mutable std::set<cmGeneratorTarget*> DependTargets;
   mutable std::set<cmGeneratorTarget const*> AllTargetsSeen;
   mutable std::set<std::string> SeenTargetProperties;
-  mutable std::map<cmGeneratorTarget const*, std::map<std::string, std::string> >
-                                                          MaxLanguageStandard;
+  mutable std::map<cmGeneratorTarget const*,
+                   std::map<std::string, std::string> > MaxLanguageStandard;
   mutable std::string Output;
   mutable bool HadContextSensitiveCondition;
   mutable bool HadHeadSensitiveCondition;
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 44ad2a7..3afcb42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3029,7 +3029,7 @@ std::string cmGlobalGenerator::EscapeJSON(const std::string& s) {
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::SetFilenameTargetDepends(cmSourceFile* sf,
-                                              std::set<cmGeneratorTarget const*> tgts)
+                                     std::set<cmGeneratorTarget const*> tgts)
 {
   this->FilenameTargetDepends[sf] = tgts;
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc3926bb42c3ee1718892edfefcaa81d1e51b7ad
commit bc3926bb42c3ee1718892edfefcaa81d1e51b7ad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 22:34:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 22:34:13 2015 +0200

    fixup! Genex: Port implementation to cmGeneratorTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index a38da77..8521a15 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1107,7 +1107,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         }
       }
 #undef POPULATE_INTERFACE_PROPERTY_NAME
-    cmGeneratorTarget const* headTarget = context->HeadTarget && isInterfaceProperty
+    cmGeneratorTarget const* headTarget =
+        context->HeadTarget && isInterfaceProperty
                                ? context->HeadTarget : target;
 
     if(isInterfaceProperty)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportTryCompileFileGenerator.cxx |    7 ++++---
 Source/cmGeneratorExpression.h             |    4 ++--
 Source/cmGeneratorExpressionNode.cxx       |    3 ++-
 Source/cmGlobalGenerator.cxx               |    2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct 15 16:41:23 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu, 15 Oct 2015 16:41:23 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-585-g068e382
Message-ID: <20151015204123.5A6A1BFE06@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  068e3828eefa45cc64d9b24c3dc86f1b0cdfbe33 (commit)
       via  c4ae157865291d73113f81d4c9a9c2dd86598efc (commit)
       via  6d27a3dbfbfb8852d8b8ff5c6fc7432eebc604e5 (commit)
      from  168acad48d395ba3e138bbd9962927120069ad3e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=068e3828eefa45cc64d9b24c3dc86f1b0cdfbe33
commit 068e3828eefa45cc64d9b24c3dc86f1b0cdfbe33
Merge: 168acad c4ae157
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 16:41:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 15 16:41:22 2015 -0400

    Merge topic 'genex-consumers-generator-targets' into next
    
    c4ae1578 Genex: Port some access API to cmGeneratorTarget.
    6d27a3db Genex: Port implementation to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4ae157865291d73113f81d4c9a9c2dd86598efc
commit c4ae157865291d73113f81d4c9a9c2dd86598efc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 18:41:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 22:40:56 2015 +0200

    Genex: Port some access API to cmGeneratorTarget.

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index f8dbe31..fe5717a 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -84,13 +84,14 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
                                      false, &gDummyHead,
                                      gtgt, &dagChecker);
 
-  const std::set<cmTarget const*> &allTargets = cge->GetAllTargetsSeen();
-  for(std::set<cmTarget const*>::const_iterator li = allTargets.begin();
-      li != allTargets.end(); ++li)
+  const std::set<cmGeneratorTarget const*> &allTargets =
+      cge->GetAllTargetsSeen();
+  for(std::set<cmGeneratorTarget const*>::const_iterator li =
+      allTargets.begin(); li != allTargets.end(); ++li)
     {
-    if(emitted.insert(*li).second)
+    if(emitted.insert((*li)->Target).second)
       {
-      this->Exports.push_back(*li);
+      this->Exports.push_back((*li)->Target);
       }
     }
   return result;
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index d9f67f2..6796a01 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -11,10 +11,9 @@
 ============================================================================*/
 #include "cmGeneratorExpression.h"
 
-#include "cmMakefile.h"
-#include "cmTarget.h"
 #include "assert.h"
 #include "cmAlgorithms.h"
+#include "cmSystemTools.h"
 
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionLexer.h"
@@ -463,10 +462,11 @@ bool cmGeneratorExpression::IsValidTargetName(const std::string &input)
 
 //----------------------------------------------------------------------------
 void
-cmCompiledGeneratorExpression::GetMaxLanguageStandard(cmTarget const* tgt,
+cmCompiledGeneratorExpression::GetMaxLanguageStandard(
+    const cmGeneratorTarget* tgt,
                   std::map<std::string, std::string>& mapping)
 {
-  typedef std::map<cmTarget const*,
+  typedef std::map<cmGeneratorTarget const*,
                    std::map<std::string, std::string> > MapType;
   MapType::const_iterator it = this->MaxLanguageStandard.find(tgt);
   if (it != this->MaxLanguageStandard.end())
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index d64d6ba..efd381b 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -19,7 +19,6 @@
 #include <cmsys/RegularExpression.hxx>
 #include <cmsys/auto_ptr.hxx>
 
-class cmTarget;
 class cmGeneratorTarget;
 class cmLocalGenerator;
 class cmListFileBacktrace;
@@ -92,13 +91,13 @@ public:
                        std::string const& language = std::string()) const;
 
   /** Get set of targets found during evaluations.  */
-  std::set<cmTarget*> const& GetTargets() const
+  std::set<cmGeneratorTarget*> const& GetTargets() const
     { return this->DependTargets; }
 
   std::set<std::string> const& GetSeenTargetProperties() const
     { return this->SeenTargetProperties; }
 
-  std::set<cmTarget const*> const& GetAllTargetsSeen() const
+  std::set<cmGeneratorTarget const*> const& GetAllTargetsSeen() const
     { return this->AllTargetsSeen; }
 
   ~cmCompiledGeneratorExpression();
@@ -120,7 +119,7 @@ public:
   {
     return this->HadHeadSensitiveCondition;
   }
-  std::set<cmTarget const*> GetSourceSensitiveTargets() const
+  std::set<cmGeneratorTarget const*> GetSourceSensitiveTargets() const
   {
     return this->SourceSensitiveTargets;
   }
@@ -130,7 +129,7 @@ public:
     this->EvaluateForBuildsystem = eval;
   }
 
-  void GetMaxLanguageStandard(cmTarget const* tgt,
+  void GetMaxLanguageStandard(cmGeneratorTarget const* tgt,
                     std::map<std::string, std::string>& mapping);
 
 private:
@@ -150,15 +149,15 @@ private:
   const std::string Input;
   bool NeedsEvaluation;
 
-  mutable std::set<cmTarget*> DependTargets;
-  mutable std::set<cmTarget const*> AllTargetsSeen;
+  mutable std::set<cmGeneratorTarget*> DependTargets;
+  mutable std::set<cmGeneratorTarget const*> AllTargetsSeen;
   mutable std::set<std::string> SeenTargetProperties;
-  mutable std::map<cmTarget const*, std::map<std::string, std::string> >
-                                                          MaxLanguageStandard;
+  mutable std::map<cmGeneratorTarget const*,
+                   std::map<std::string, std::string> > MaxLanguageStandard;
   mutable std::string Output;
   mutable bool HadContextSensitiveCondition;
   mutable bool HadHeadSensitiveCondition;
-  mutable std::set<cmTarget const*>  SourceSensitiveTargets;
+  mutable std::set<cmGeneratorTarget const*>  SourceSensitiveTargets;
   bool EvaluateForBuildsystem;
 };
 
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index 934e2e7..e802138 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -18,7 +18,6 @@
 #include <map>
 #include <string>
 
-class cmTarget;
 class cmGeneratorTarget;
 class cmLocalGenerator;
 
@@ -34,11 +33,11 @@ struct cmGeneratorExpressionContext
 
 
   cmListFileBacktrace Backtrace;
-  std::set<cmTarget*> DependTargets;
-  std::set<cmTarget const*> AllTargets;
+  std::set<cmGeneratorTarget*> DependTargets;
+  std::set<cmGeneratorTarget const*> AllTargets;
   std::set<std::string> SeenTargetProperties;
-  std::set<cmTarget const*> SourceSensitiveTargets;
-  std::map<cmTarget const*, std::map<std::string, std::string> >
+  std::set<cmGeneratorTarget const*> SourceSensitiveTargets;
+  std::map<cmGeneratorTarget const*, std::map<std::string, std::string> >
                                                           MaxLanguageStandard;
   cmLocalGenerator *LG;
   std::string Config;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index dcb1c5c..8521a15 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -964,7 +964,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         reportError(context, content->GetOriginalExpression(), e.str());
         return std::string();
         }
-      context->AllTargets.insert(target->Target);
+      context->AllTargets.insert(target);
       }
 
     if (target == context->HeadTarget)
@@ -977,7 +977,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     if (propertyName == "SOURCES")
       {
-      context->SourceSensitiveTargets.insert(target->Target);
+      context->SourceSensitiveTargets.insert(target);
       }
 
     if (propertyName.empty())
@@ -1412,7 +1412,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
               l = standardDefault;
               }
             assert(l);
-            context->MaxLanguageStandard[target->Target][lit->first] = l;
+            context->MaxLanguageStandard[target][lit->first] = l;
             }
           else
             {
@@ -1756,8 +1756,8 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
                     "be used while evaluating link libraries");
       return std::string();
       }
-    context->DependTargets.insert(target->Target);
-    context->AllTargets.insert(target->Target);
+    context->DependTargets.insert(target);
+    context->AllTargets.insert(target);
 
     std::string result =
                 TargetFilesystemArtifactResultCreator<ArtifactT>::Create(
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6bebc2b..ca91f53 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2173,9 +2173,9 @@ cmTargetTraceDependencies
           si != sources.end(); ++si)
         {
         cmSourceFile* sf = *si;
-        const std::set<cmTarget const*> tgts =
+        const std::set<cmGeneratorTarget const*> tgts =
                           this->GlobalGenerator->GetFilenameTargetDepends(sf);
-        if (tgts.find(this->Target) != tgts.end())
+        if (tgts.find(this->GeneratorTarget) != tgts.end())
           {
           std::ostringstream e;
           e << "Evaluation output file\n  \"" << sf->GetFullPath()
@@ -2353,7 +2353,7 @@ cmTargetTraceDependencies
   cmGeneratorExpression ge(cc.GetBacktrace());
 
   // Add target-level dependencies referenced by generator expressions.
-  std::set<cmTarget*> targets;
+  std::set<cmGeneratorTarget*> targets;
 
   for(cmCustomCommandLines::const_iterator cit = cc.GetCommandLines().begin();
       cit != cc.GetCommandLines().end(); ++cit)
@@ -2379,12 +2379,12 @@ cmTargetTraceDependencies
       const cmsys::auto_ptr<cmCompiledGeneratorExpression> cge
                                                               = ge.Parse(*cli);
       cge->Evaluate(this->GeneratorTarget->GetLocalGenerator(), "", true);
-      std::set<cmTarget*> geTargets = cge->GetTargets();
+      std::set<cmGeneratorTarget*> geTargets = cge->GetTargets();
       targets.insert(geTargets.begin(), geTargets.end());
       }
     }
 
-  for(std::set<cmTarget*>::iterator ti = targets.begin();
+  for(std::set<cmGeneratorTarget*>::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
     this->Target->AddUtility((*ti)->GetName());
@@ -5412,7 +5412,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         this->LinkImplicitNullProperties.insert(*it);
         }
       }
-    cge->GetMaxLanguageStandard(this->Target,
+    cge->GetMaxLanguageStandard(this,
                                 this->MaxLanguageStandards);
     }
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e8be2d6..3afcb42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3029,13 +3029,13 @@ std::string cmGlobalGenerator::EscapeJSON(const std::string& s) {
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::SetFilenameTargetDepends(cmSourceFile* sf,
-                                              std::set<cmTarget const*> tgts)
+                                     std::set<cmGeneratorTarget const*> tgts)
 {
   this->FilenameTargetDepends[sf] = tgts;
 }
 
 //----------------------------------------------------------------------------
-std::set<cmTarget const*> const&
+std::set<cmGeneratorTarget const*> const&
 cmGlobalGenerator::GetFilenameTargetDepends(cmSourceFile* sf) const {
   return this->FilenameTargetDepends[sf];
 }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index fc81708..6887409 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -354,8 +354,8 @@ public:
   void CreateEvaluationSourceFiles(std::string const& config) const;
 
   void SetFilenameTargetDepends(cmSourceFile* sf,
-                                std::set<cmTarget const*> tgts);
-  std::set<cmTarget const*> const&
+                                std::set<const cmGeneratorTarget*> tgts);
+  const std::set<const cmGeneratorTarget*>&
   GetFilenameTargetDepends(cmSourceFile* sf) const;
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -508,7 +508,7 @@ private:
   // track targets to issue CMP0042 warning for.
   std::set<std::string> CMP0042WarnTargets;
 
-  mutable std::map<cmSourceFile*, std::set<cmTarget const*> >
+  mutable std::map<cmSourceFile*, std::set<cmGeneratorTarget const*> >
   FilenameTargetDepends;
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d27a3dbfbfb8852d8b8ff5c6fc7432eebc604e5
commit 6d27a3dbfbfb8852d8b8ff5c6fc7432eebc604e5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 18:27:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 22:40:55 2015 +0200

    Genex: Port implementation to cmGeneratorTarget.

diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index 4daf4e9..5c9462f 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -24,8 +24,8 @@ cmGeneratorExpressionContext::cmGeneratorExpressionContext(
     LG(lg),
     Config(config),
     Language(language),
-    HeadTarget(headTarget ? headTarget->Target : 0),
-    CurrentTarget(currentTarget ? currentTarget->Target : 0),
+    HeadTarget(headTarget),
+    CurrentTarget(currentTarget),
     Quiet(quiet),
     HadError(false),
     HadContextSensitiveCondition(false),
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index bbf0fcf..934e2e7 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -43,9 +43,11 @@ struct cmGeneratorExpressionContext
   cmLocalGenerator *LG;
   std::string Config;
   std::string Language;
-  cmTarget const* HeadTarget; // The target whose property is being evaluated.
-  cmTarget const* CurrentTarget; // The dependent of HeadTarget which appears
-                                 // directly or indirectly in the property.
+  // The target whose property is being evaluated.
+  cmGeneratorTarget const* HeadTarget;
+  // The dependent of HeadTarget which appears
+  // directly or indirectly in the property.
+  cmGeneratorTarget const* CurrentTarget;
   bool Quiet;
   bool HadError;
   bool HadContextSensitiveCondition;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index fe83b08..dcb1c5c 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -705,7 +705,7 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
       const char* loc = 0;
       const char* imp = 0;
       std::string suffix;
-      if (context->CurrentTarget->GetMappedConfig(context->Config,
+      if (context->CurrentTarget->Target->GetMappedConfig(context->Config,
                                                   &loc,
                                                   &imp,
                                                   suffix))
@@ -893,7 +893,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     static cmsys::RegularExpression propertyNameValidator("^[A-Za-z0-9_]+$");
 
-    cmTarget const* target = context->HeadTarget;
+    cmGeneratorTarget const* target = context->HeadTarget;
     std::string propertyName = *parameters.begin();
 
     if (parameters.size() == 1)
@@ -945,15 +945,15 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         {
         if(context->LG->GetMakefile()->IsAlias(targetName))
           {
-          if(cmTarget* tgt =
-             context->LG->GetMakefile()->FindTargetToUse(targetName))
+          if(cmGeneratorTarget* tgt =
+             context->LG->FindGeneratorTargetToUse(targetName))
             {
             return tgt->GetName();
             }
           }
         return "";
         }
-      target = context->LG->GetMakefile()->FindTargetToUse(targetName);
+      target = context->LG->FindGeneratorTargetToUse(targetName);
 
       if (!target)
         {
@@ -964,7 +964,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         reportError(context, content->GetOriginalExpression(), e.str());
         return std::string();
         }
-      context->AllTargets.insert(target);
+      context->AllTargets.insert(target->Target);
       }
 
     if (target == context->HeadTarget)
@@ -977,7 +977,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     if (propertyName == "SOURCES")
       {
-      context->SourceSensitiveTargets.insert(target);
+      context->SourceSensitiveTargets.insert(target->Target);
       }
 
     if (propertyName.empty())
@@ -997,12 +997,9 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
 
     assert(target);
 
-    cmGeneratorTarget* gtgt =
-        context->LG->GetGlobalGenerator()->GetGeneratorTarget(target);
-
     if (propertyName == "LINKER_LANGUAGE")
       {
-      if (target->LinkLanguagePropagatesToDependents() &&
+      if (target->Target->LinkLanguagePropagatesToDependents() &&
           dagCheckerParent && (dagCheckerParent->EvaluatingLinkLibraries()
             || dagCheckerParent->EvaluatingSources()))
         {
@@ -1011,7 +1008,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
             "link libraries for a static library");
         return std::string();
         }
-      return gtgt->GetLinkerLanguage(context->Config);
+      return target->GetLinkerLanguage(context->Config);
       }
 
     cmGeneratorExpressionDAGChecker dagChecker(context->Backtrace,
@@ -1110,20 +1107,18 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         }
       }
 #undef POPULATE_INTERFACE_PROPERTY_NAME
-    cmTarget const* headTarget = context->HeadTarget && isInterfaceProperty
+    cmGeneratorTarget const* headTarget =
+        context->HeadTarget && isInterfaceProperty
                                ? context->HeadTarget : target;
 
     if(isInterfaceProperty)
       {
-      cmGeneratorTarget* gHeadTarget =
-          context->LG->GetGlobalGenerator()
-          ->GetGeneratorTarget(headTarget);
       if(cmLinkInterfaceLibraries const* iface =
-         gtgt->GetLinkInterfaceLibraries(context->Config, gHeadTarget, true))
+         target->GetLinkInterfaceLibraries(context->Config, headTarget, true))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(iface->Libraries, gtgt,
-                                  gHeadTarget,
+          getLinkedTargetsContent(iface->Libraries, target,
+                                  headTarget,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1131,11 +1126,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     else if(!interfacePropertyName.empty())
       {
       if(cmLinkImplementationLibraries const* impl =
-         gtgt->GetLinkImplementationLibraries(context->Config))
+         target->GetLinkImplementationLibraries(context->Config))
         {
         linkedTargetsContent =
-          getLinkedTargetsContent(impl->Libraries, gtgt,
-                                  gtgt,
+          getLinkedTargetsContent(impl->Libraries, target,
+                                  target,
                                   context, &dagChecker,
                                   interfacePropertyName);
         }
@@ -1148,40 +1143,40 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
         {
         return linkedTargetsContent;
         }
-      if (gtgt->IsLinkInterfaceDependentBoolProperty(propertyName,
+      if (target->IsLinkInterfaceDependentBoolProperty(propertyName,
                                                      context->Config))
         {
         context->HadContextSensitiveCondition = true;
-        return gtgt->GetLinkInterfaceDependentBoolProperty(
+        return target->GetLinkInterfaceDependentBoolProperty(
                                                 propertyName,
                                                 context->Config) ? "1" : "0";
         }
-      if (gtgt->IsLinkInterfaceDependentStringProperty(propertyName,
+      if (target->IsLinkInterfaceDependentStringProperty(propertyName,
                                                        context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                              gtgt->GetLinkInterfaceDependentStringProperty(
+                              target->GetLinkInterfaceDependentStringProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
         }
-      if (gtgt->IsLinkInterfaceDependentNumberMinProperty(propertyName,
+      if (target->IsLinkInterfaceDependentNumberMinProperty(propertyName,
                                                           context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                          gtgt->GetLinkInterfaceDependentNumberMinProperty(
+                          target->GetLinkInterfaceDependentNumberMinProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
         }
-      if (gtgt->IsLinkInterfaceDependentNumberMaxProperty(propertyName,
+      if (target->IsLinkInterfaceDependentNumberMaxProperty(propertyName,
                                                           context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                          gtgt->GetLinkInterfaceDependentNumberMaxProperty(
+                          target->GetLinkInterfaceDependentNumberMaxProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
@@ -1193,22 +1188,22 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
     if (!target->IsImported()
         && dagCheckerParent && !dagCheckerParent->EvaluatingLinkLibraries())
       {
-      if (gtgt->IsLinkInterfaceDependentNumberMinProperty(propertyName,
+      if (target->IsLinkInterfaceDependentNumberMinProperty(propertyName,
                                                           context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                            gtgt->GetLinkInterfaceDependentNumberMinProperty(
+                            target->GetLinkInterfaceDependentNumberMinProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
         }
-      if (gtgt->IsLinkInterfaceDependentNumberMaxProperty(propertyName,
+      if (target->IsLinkInterfaceDependentNumberMaxProperty(propertyName,
                                                           context->Config))
         {
         context->HadContextSensitiveCondition = true;
         const char *propContent =
-                            gtgt->GetLinkInterfaceDependentNumberMaxProperty(
+                            target->GetLinkInterfaceDependentNumberMaxProperty(
                                                 propertyName,
                                                 context->Config);
         return propContent ? propContent : "";
@@ -1216,11 +1211,9 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       }
     if(!interfacePropertyName.empty())
       {
-      cmGeneratorTarget* gHeadTarget =
-          context->LG->GetGlobalGenerator()->GetGeneratorTarget(headTarget);
       std::string result = this->EvaluateDependentExpression(prop,
                                         context->LG, context,
-                                        gHeadTarget, gtgt, &dagChecker);
+                                        headTarget, target, &dagChecker);
       if (!linkedTargetsContent.empty())
         {
         result += (result.empty() ? "" : ";") + linkedTargetsContent;
@@ -1341,7 +1334,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
                        const GeneratorExpressionContent *content,
                        cmGeneratorExpressionDAGChecker *dagChecker) const
   {
-    cmTarget const* target = context->HeadTarget;
+    cmGeneratorTarget const* target = context->HeadTarget;
     if (!target)
       {
       reportError(context, content->GetOriginalExpression(),
@@ -1361,7 +1354,8 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
       {
       std::string error;
       std::string lang;
-      if (!context->LG->GetMakefile()->CompileFeatureKnown(context->HeadTarget,
+      if (!context->LG->GetMakefile()->CompileFeatureKnown(
+            context->HeadTarget->Target,
                                                   *it, lang, &error))
         {
         reportError(context, content->GetOriginalExpression(), error);
@@ -1407,7 +1401,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
           // All features known for the language are always available.
           continue;
           }
-        if (!context->LG->GetMakefile()->HaveStandardAvailable(target,
+        if (!context->LG->GetMakefile()->HaveStandardAvailable(target->Target,
                                                       lit->first, *it))
           {
           if (evalLL)
@@ -1418,7 +1412,7 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode
               l = standardDefault;
               }
             assert(l);
-            context->MaxLanguageStandard[target][lit->first] = l;
+            context->MaxLanguageStandard[target->Target][lit->first] = l;
             }
           else
             {
@@ -1442,13 +1436,13 @@ static const char* targetPolicyWhitelist[] = {
 #undef TARGET_POLICY_STRING
 };
 
-cmPolicies::PolicyStatus statusForTarget(cmTarget const* tgt,
+cmPolicies::PolicyStatus statusForTarget(cmGeneratorTarget const* tgt,
                                          const char *policy)
 {
 #define RETURN_POLICY(POLICY) \
   if (strcmp(policy, #POLICY) == 0) \
   { \
-    return tgt->GetPolicyStatus ## POLICY (); \
+    return tgt->Target->GetPolicyStatus ## POLICY (); \
   } \
 
   CM_FOR_EACH_TARGET_POLICY(RETURN_POLICY)
@@ -1503,7 +1497,7 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode
       const char *policy = targetPolicyWhitelist[i];
       if (parameters.front() == policy)
         {
-        cmMakefile *mf = context->HeadTarget->GetMakefile();
+        cmMakefile *mf = context->HeadTarget->Target->GetMakefile();
         switch(statusForTarget(context->HeadTarget, policy))
           {
           case cmPolicies::WARN:

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Oct 16 00:01:11 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri, 16 Oct 2015 00:01:11 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-224-g2f1c340
Message-ID: <20151016040112.6924DC0AFC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  2f1c3401ec132f0672c108a2312146f39e8f017b (commit)
      from  8e394cf9e39babefdc991b67fa4fd1921735eb7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f1c3401ec132f0672c108a2312146f39e8f017b
commit 2f1c3401ec132f0672c108a2312146f39e8f017b
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Oct 16 00:01:06 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 16 00:01:06 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index bcccdc2..4dcccb5 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151015)
+set(CMake_VERSION_PATCH 20151016)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 16 09:35:34 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 16 Oct 2015 09:35:34 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-229-ga4f0b01
Message-ID: <20151016133534.27DECC05B1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  a4f0b01939ca7c69c1e31f017c6e87b642388252 (commit)
       via  7f5ec9f109dc66bc22ac377a7fb57d9221aed56b (commit)
       via  06f56d3bf5d8210d190e1bfcf05673ceb78c5594 (commit)
       via  c8f8f16541f3ac6af3397f3a78ee68fc963af151 (commit)
       via  9f299a1225798f6485ab77c9140bf9c1d589e2fe (commit)
      from  2f1c3401ec132f0672c108a2312146f39e8f017b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4f0b01939ca7c69c1e31f017c6e87b642388252
commit a4f0b01939ca7c69c1e31f017c6e87b642388252
Merge: 2f1c340 7f5ec9f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 16 09:35:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 16 09:35:32 2015 -0400

    Merge topic 'GetTargetDirectory-cmGeneratorTarget'
    
    7f5ec9f1 cmLocalGenerator: Port GetTargetDirectory to cmGeneratorTarget.
    06f56d3b cmLocalUnixMakefileGenerator3: Port AppendCleanCommand to cmGeneratorTarget.
    c8f8f165 cmLocalUnixMakefileGenerator3: Port another API to cmGeneratorTarget.
    9f299a12 cmLocalUnixMakefileGenerator3: Port API to cmGenertorTarget.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx          |    2 +-
 Source/cmExtraCodeBlocksGenerator.cxx       |   25 +++++++++++--------------
 Source/cmExtraCodeBlocksGenerator.h         |    5 +++--
 Source/cmExtraEclipseCDT4Generator.cxx      |    4 +++-
 Source/cmGlobalNinjaGenerator.cxx           |    4 +---
 Source/cmGlobalUnixMakefileGenerator3.cxx   |   24 ++++++++++++------------
 Source/cmGlobalVisualStudioGenerator.cxx    |    2 +-
 Source/cmLocalGenerator.cxx                 |    2 +-
 Source/cmLocalGenerator.h                   |    3 ++-
 Source/cmLocalNinjaGenerator.cxx            |    4 ++--
 Source/cmLocalNinjaGenerator.h              |    3 ++-
 Source/cmLocalUnixMakefileGenerator3.cxx    |   26 ++++++++++++--------------
 Source/cmLocalUnixMakefileGenerator3.h      |   11 ++++++-----
 Source/cmLocalVisualStudio6Generator.cxx    |    2 +-
 Source/cmLocalVisualStudio6Generator.h      |    3 ++-
 Source/cmLocalVisualStudio7Generator.cxx    |   12 +++++++-----
 Source/cmLocalVisualStudio7Generator.h      |    3 ++-
 Source/cmLocalXCodeGenerator.cxx            |    2 +-
 Source/cmLocalXCodeGenerator.h              |    3 ++-
 Source/cmMakefileLibraryTargetGenerator.cxx |    2 +-
 Source/cmMakefileTargetGenerator.cxx        |   20 +++++++++++---------
 Source/cmNinjaTargetGenerator.cxx           |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx  |   16 ++++++++--------
 23 files changed, 93 insertions(+), 87 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 16 09:35:36 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 16 Oct 2015 09:35:36 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-239-gf135213
Message-ID: <20151016133537.0779FC05BD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  f13521317a43af4ebb2996c9916d1d1da695c5fc (commit)
       via  55474e6182b49acc4183fffdebccc7ae2a7335fa (commit)
       via  38df5c36d66313a5dd7859c1c55a41f60f141b13 (commit)
       via  4ee2b2670854b071c8b8ceafb2a4a00f72069ef9 (commit)
       via  eac15298a80b814e9d5fd0077a8c5bbcbd05a8c6 (commit)
       via  482b3811e4e6043c71632b560f2e773289eeb320 (commit)
       via  2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f (commit)
       via  a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d (commit)
       via  6694d99376c8fa7ff327a6b07787cef1bea9b93b (commit)
       via  983c00f8f97260e7650fcc440047b33898f0363c (commit)
      from  a4f0b01939ca7c69c1e31f017c6e87b642388252 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f13521317a43af4ebb2996c9916d1d1da695c5fc
commit f13521317a43af4ebb2996c9916d1d1da695c5fc
Merge: a4f0b01 55474e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 16 09:35:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 16 09:35:34 2015 -0400

    Merge topic 'clean-up-cmTarget'
    
    55474e61 cmState: Move GetTargetTypeName from cmTarget.
    38df5c36 Remove now-obsolete casts.
    4ee2b267 cmGeneratorTarget: Use enum for GetType.
    eac15298 cmState: Move TargetType enum from cmTarget.
    482b3811 cmTarget: Move link type enum out.
    2ee1cb85 cmTarget: Move ImportInfoMap out of internal class.
    a48bcabd cmTarget: Move backtrace member out of internal class.
    6694d993 cmTarget: Remove unneeded constructors.
    983c00f8 Generators: Use GetType from the cmGeneratorTarget.

diff --cc Source/cmExtraCodeBlocksGenerator.cxx
index cdb4d8b,5775602..3bc76fa
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@@ -352,15 -352,13 +352,15 @@@ void cmExtraCodeBlocksGenerato
            this->AppendTarget(fout, ti->first, 0,
                                   make.c_str(), *lg, compiler.c_str());
            break;
-         case cmTarget::EXECUTABLE:
-         case cmTarget::STATIC_LIBRARY:
-         case cmTarget::SHARED_LIBRARY:
-         case cmTarget::MODULE_LIBRARY:
-         case cmTarget::OBJECT_LIBRARY:
+         case cmState::EXECUTABLE:
+         case cmState::STATIC_LIBRARY:
+         case cmState::SHARED_LIBRARY:
+         case cmState::MODULE_LIBRARY:
+         case cmState::OBJECT_LIBRARY:
            {
 -          this->AppendTarget(fout, ti->first, &ti->second,
 +          cmGeneratorTarget* gt =
 +              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
 +          this->AppendTarget(fout, ti->first, gt,
                               make.c_str(), *lg, compiler.c_str());
            std::string fastTarget = ti->first;
            fastTarget += "/fast";
@@@ -561,9 -559,9 +561,9 @@@ void cmExtraCodeBlocksGenerator::Append
    fout<<"      <Target title=\"" << targetName << "\">\n";
    if (target!=0)
      {
 -    int cbTargetType = this->GetCBTargetType(target);
 +    int cbTargetType = this->GetCBTargetType(target->Target);
      std::string workingDir = lg->GetCurrentBinaryDirectory();
-     if ( target->GetType()==cmTarget::EXECUTABLE)
+     if ( target->GetType()==cmState::EXECUTABLE)
        {
        // Determine the directory where the executable target is created, and
        // set the working directory to this dir.
diff --cc Source/cmGlobalUnixMakefileGenerator3.cxx
index a0ad72d,4674fcd..ee31e28
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@@ -426,15 -428,14 +426,15 @@@ void cmGlobalUnixMakefileGenerator
      for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
           l != lg->GetMakefile()->GetTargets().end(); l++)
        {
-       if((l->second.GetType() == cmTarget::EXECUTABLE) ||
-          (l->second.GetType() == cmTarget::STATIC_LIBRARY) ||
-          (l->second.GetType() == cmTarget::SHARED_LIBRARY) ||
-          (l->second.GetType() == cmTarget::MODULE_LIBRARY) ||
-          (l->second.GetType() == cmTarget::OBJECT_LIBRARY) ||
-          (l->second.GetType() == cmTarget::UTILITY))
+       if((l->second.GetType() == cmState::EXECUTABLE) ||
+          (l->second.GetType() == cmState::STATIC_LIBRARY) ||
+          (l->second.GetType() == cmState::SHARED_LIBRARY) ||
+          (l->second.GetType() == cmState::MODULE_LIBRARY) ||
+          (l->second.GetType() == cmState::OBJECT_LIBRARY) ||
+          (l->second.GetType() == cmState::UTILITY))
          {
 -        std::string tname = lg->GetRelativeTargetDirectory(l->second);
 +        cmGeneratorTarget* gt = this->GetGeneratorTarget(&l->second);
 +        std::string tname = lg->GetRelativeTargetDirectory(gt);
          tname += "/DependInfo.cmake";
          cmSystemTools::ConvertToUnixSlashes(tname);
          cmakefileStream << "  \"" << tname << "\"\n";
diff --cc Source/cmLocalVisualStudio7Generator.cxx
index 65f42c2,e891c33..1122919
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@@ -1109,11 -1109,11 +1109,11 @@@ void cmLocalVisualStudio7Generator::Out
      }
    switch(target.GetType())
      {
-     case cmTarget::UNKNOWN_LIBRARY:
+     case cmState::UNKNOWN_LIBRARY:
        break;
-     case cmTarget::OBJECT_LIBRARY:
+     case cmState::OBJECT_LIBRARY:
        {
 -      std::string libpath = this->GetTargetDirectory(target);
 +      std::string libpath = this->GetTargetDirectory(gt);
        libpath += "/";
        libpath += configName;
        libpath += "/";
diff --cc Source/cmMakefileLibraryTargetGenerator.cxx
index 1278dcd,0b38656..a0aa10b
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@@ -441,10 -441,10 +441,10 @@@ void cmMakefileLibraryTargetGenerator::
    std::vector<std::string> commands1;
    // Add a command to remove any existing files for this library.
    // for static libs only
-   if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+   if(this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
      {
      this->LocalGenerator->AppendCleanCommand(commands1, libCleanFiles,
 -                                             *this->Target, "target");
 +                                             this->GeneratorTarget, "target");
      this->LocalGenerator->CreateCDCommand
        (commands1,
         this->Makefile->GetCurrentBinaryDirectory(),

-----------------------------------------------------------------------

Summary of changes:
 Source/cmAddExecutableCommand.cxx             |    6 +-
 Source/cmAddLibraryCommand.cxx                |   64 +++----
 Source/cmCPluginAPI.cxx                       |    8 +-
 Source/cmCommonTargetGenerator.cxx            |    2 +-
 Source/cmComputeLinkDepends.cxx               |   20 +--
 Source/cmComputeLinkDepends.h                 |    2 +-
 Source/cmComputeLinkInformation.cxx           |   38 ++--
 Source/cmComputeTargetDepends.cxx             |   22 +--
 Source/cmCoreTryCompile.cxx                   |   12 +-
 Source/cmCustomCommandGenerator.cxx           |    2 +-
 Source/cmExportBuildFileGenerator.cxx         |    8 +-
 Source/cmExportCommand.cxx                    |    4 +-
 Source/cmExportFileGenerator.cxx              |   18 +-
 Source/cmExportInstallFileGenerator.cxx       |    6 +-
 Source/cmExportLibraryDependenciesCommand.cxx |   10 +-
 Source/cmExportTryCompileFileGenerator.cxx    |    2 +-
 Source/cmExtraCodeBlocksGenerator.cxx         |   40 ++---
 Source/cmExtraCodeLiteGenerator.cxx           |   16 +-
 Source/cmExtraEclipseCDT4Generator.cxx        |   28 +--
 Source/cmExtraKateGenerator.cxx               |   14 +-
 Source/cmExtraSublimeTextGenerator.cxx        |   14 +-
 Source/cmGeneratorExpressionNode.cxx          |   18 +-
 Source/cmGeneratorTarget.cxx                  |  148 ++++++++--------
 Source/cmGeneratorTarget.h                    |    2 +-
 Source/cmGhsMultiTargetGenerator.cxx          |    8 +-
 Source/cmGlobalGenerator.cxx                  |   26 +--
 Source/cmGlobalKdevelopGenerator.cxx          |    2 +-
 Source/cmGlobalNinjaGenerator.cxx             |   18 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx     |   70 ++++----
 Source/cmGlobalVisualStudio11Generator.cxx    |    6 +-
 Source/cmGlobalVisualStudio11Generator.h      |    2 +-
 Source/cmGlobalVisualStudio6Generator.cxx     |    2 +-
 Source/cmGlobalVisualStudio71Generator.cxx    |    2 +-
 Source/cmGlobalVisualStudio71Generator.h      |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx     |   12 +-
 Source/cmGlobalVisualStudio7Generator.h       |    2 +-
 Source/cmGlobalVisualStudio8Generator.cxx     |   12 +-
 Source/cmGlobalVisualStudio8Generator.h       |    4 +-
 Source/cmGlobalVisualStudioGenerator.cxx      |   20 +--
 Source/cmGlobalXCodeGenerator.cxx             |  132 +++++++-------
 Source/cmGraphVizWriter.cxx                   |   18 +-
 Source/cmGraphVizWriter.h                     |    2 +-
 Source/cmIncludeExternalMSProjectCommand.cxx  |    2 +-
 Source/cmInstallCommand.cxx                   |   26 +--
 Source/cmInstallTargetGenerator.cxx           |   37 ++--
 Source/cmLinkLibrariesCommand.cxx             |    4 +-
 Source/cmLocalGenerator.cxx                   |   64 +++----
 Source/cmLocalGhsMultiGenerator.cxx           |    2 +-
 Source/cmLocalNinjaGenerator.cxx              |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx      |   18 +-
 Source/cmLocalVisualStudio10Generator.cxx     |    2 +-
 Source/cmLocalVisualStudio6Generator.cxx      |  110 ++++++------
 Source/cmLocalVisualStudio7Generator.cxx      |   76 ++++----
 Source/cmLocalVisualStudioGenerator.cxx       |    4 +-
 Source/cmMakefile.cxx                         |   66 +++----
 Source/cmMakefile.h                           |   10 +-
 Source/cmMakefileLibraryTargetGenerator.cxx   |   42 ++---
 Source/cmMakefileTargetGenerator.cxx          |   24 +--
 Source/cmNinjaNormalTargetGenerator.cxx       |   51 +++---
 Source/cmNinjaTargetGenerator.cxx             |   30 ++--
 Source/cmStandardIncludes.h                   |    6 +
 Source/cmState.cxx                            |   27 +++
 Source/cmState.h                              |    8 +
 Source/cmTarget.cxx                           |  236 ++++++++++---------------
 Source/cmTarget.h                             |   29 ++-
 Source/cmTargetLinkLibrariesCommand.cxx       |   36 ++--
 Source/cmTargetLinkLibrariesCommand.h         |    2 +-
 Source/cmTargetPropCommandBase.cxx            |   14 +-
 Source/cmTestGenerator.cxx                    |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx    |  106 +++++------
 Source/cmake.cxx                              |    2 +-
 71 files changed, 939 insertions(+), 943 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 16 09:35:39 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 16 Oct 2015 09:35:39 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-242-gdfd371d
Message-ID: <20151016133539.0D58AC05CD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  dfd371dc013f14fb8e52c4f16e4a0f03a1ead9ce (commit)
       via  c4ae157865291d73113f81d4c9a9c2dd86598efc (commit)
       via  6d27a3dbfbfb8852d8b8ff5c6fc7432eebc604e5 (commit)
      from  f13521317a43af4ebb2996c9916d1d1da695c5fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfd371dc013f14fb8e52c4f16e4a0f03a1ead9ce
commit dfd371dc013f14fb8e52c4f16e4a0f03a1ead9ce
Merge: f135213 c4ae157
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 16 09:35:37 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 16 09:35:37 2015 -0400

    Merge topic 'genex-consumers-generator-targets'
    
    c4ae1578 Genex: Port some access API to cmGeneratorTarget.
    6d27a3db Genex: Port implementation to cmGeneratorTarget.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportTryCompileFileGenerator.cxx |   11 ++--
 Source/cmGeneratorExpression.cxx           |    8 +--
 Source/cmGeneratorExpression.h             |   19 ++++---
 Source/cmGeneratorExpressionContext.cxx    |    4 +-
 Source/cmGeneratorExpressionContext.h      |   17 +++---
 Source/cmGeneratorExpressionNode.cxx       |   80 +++++++++++++---------------
 Source/cmGeneratorTarget.cxx               |   12 ++---
 Source/cmGlobalGenerator.cxx               |    4 +-
 Source/cmGlobalGenerator.h                 |    6 +--
 9 files changed, 78 insertions(+), 83 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 16 09:35:41 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 16 Oct 2015 09:35:41 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-245-g02f8d51
Message-ID: <20151016133541.096D7C05CD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  02f8d51f48ae4abfec5491a8ab47be35a6671bab (commit)
       via  c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67 (commit)
       via  4cd52dc5511c8c3809b7cb260ac6afa7eec65f2e (commit)
      from  dfd371dc013f14fb8e52c4f16e4a0f03a1ead9ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02f8d51f48ae4abfec5491a8ab47be35a6671bab
commit 02f8d51f48ae4abfec5491a8ab47be35a6671bab
Merge: dfd371d c9e0173
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 16 09:35:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 16 09:35:39 2015 -0400

    Merge topic 'ExternalProject-fix-git-version'
    
    c9e0173e ExternalProject: Always use CMake builtin FindGit (#15791)
    4cd52dc5 ExternalProject: Fix Git version report in error message (#15791)


-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 16 09:35:43 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 16 Oct 2015 09:35:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-247-g893ce30
Message-ID: <20151016133543.04C6EC05C7@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  893ce307f9a9f50dbd324a4c72b833e4a3649b0a (commit)
       via  ce7ccafce29a618392e05f99881c41f4a4a07125 (commit)
      from  02f8d51f48ae4abfec5491a8ab47be35a6671bab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=893ce307f9a9f50dbd324a4c72b833e4a3649b0a
commit 893ce307f9a9f50dbd324a4c72b833e4a3649b0a
Merge: 02f8d51 ce7ccaf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 16 09:35:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 16 09:35:41 2015 -0400

    Merge topic 'ghs-drop-optgroup'
    
    ce7ccafc GHS: Remove extra flag to GHS MULTI compiler (#15771)

diff --cc Source/cmGhsMultiTargetGenerator.cxx
index d6cbf75,be54220..c687ba7
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@@ -215,9 -215,9 +215,9 @@@ void cmGhsMultiTargetGenerator::WriteTy
    std::string outputDir(this->GetOutputDirectory(config));
    std::string outputFilename(this->GetOutputFilename(config));
  
 -  if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
 +  if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
      {
-     *this->GetFolderBuildStreams() << "    {optgroup=GhsCommonOptions} -o \""
+     *this->GetFolderBuildStreams() << "    -o \""
                                     << outputDir << outputFilename << ".a\""
                                     << std::endl;
      }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGhsMultiTargetGenerator.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 16 09:37:31 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 16 Oct 2015 09:37:31 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-592-g4075372
Message-ID: <20151016133731.7CDF3C06D7@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4075372122dbdd3f6a22cf1d51628df0e92a2bbd (commit)
       via  893ce307f9a9f50dbd324a4c72b833e4a3649b0a (commit)
       via  02f8d51f48ae4abfec5491a8ab47be35a6671bab (commit)
       via  dfd371dc013f14fb8e52c4f16e4a0f03a1ead9ce (commit)
       via  f13521317a43af4ebb2996c9916d1d1da695c5fc (commit)
       via  a4f0b01939ca7c69c1e31f017c6e87b642388252 (commit)
       via  2f1c3401ec132f0672c108a2312146f39e8f017b (commit)
      from  068e3828eefa45cc64d9b24c3dc86f1b0cdfbe33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4075372122dbdd3f6a22cf1d51628df0e92a2bbd
commit 4075372122dbdd3f6a22cf1d51628df0e92a2bbd
Merge: 068e382 893ce30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 16 09:36:24 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 16 09:36:24 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Oct 16 14:28:21 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri, 16 Oct 2015 14:28:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-614-g5783be8
Message-ID: <20151016182821.38227C01F2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5783be81b2b18d82eb95b9b2a39b2acd83704634 (commit)
       via  68e446bf9b8e6471c947e6c464c910468ba7aa69 (commit)
       via  5b5b3c2c19e0d56ddab120c469aa416f41bf20fa (commit)
       via  29ec1367612e788f6750a51bfbe94b0766769daf (commit)
       via  d29f1acf72cb068ac05f4876c20e3559f232f4f1 (commit)
       via  f170c3b04e279ea0fa86869512e4b3f3d27cf620 (commit)
       via  ed09f3b292bee34e8b30204c93ef5596a3124d00 (commit)
       via  beff29f0d4bf1ffface0e6833f29f2f04ceccf0b (commit)
       via  12e4790a0b40d8176940f855f7f6c9cfe6c39f9f (commit)
       via  14272277205ac7927a4c13b628ce411538f7b17c (commit)
       via  8f363d6771dfa792d606978e1e406229637078f6 (commit)
       via  5794dbc301ace0041c5fc50096cc5331e8ba3c34 (commit)
       via  a892b285f8c621ba50f45f5c4218980c911fd1b6 (commit)
       via  cb8c728f17a61732064280ddb98203cb277e5a3c (commit)
       via  fb4fca0b5efabdf061bd256ed9d35edae6f42b9d (commit)
       via  50fb2ad6463c500fde44c000c777aa3ac1cffc7e (commit)
       via  d233030f5bcfe2509b82433f7df6383cd301e34e (commit)
       via  0ebe2bbf4ae7f19b10f8374313b2bbd6fcd6c3da (commit)
       via  60bd9f9c92faae368fab1c44cf81b489c6a875cb (commit)
       via  82a6eaf4d0381f0e3236dbd067fe853653bbe6b5 (commit)
       via  8aaed08696a7444b80b6319e2b5af320ee589658 (commit)
       via  393654bf49f2c8d86e9ec88fc3c8322497432aea (commit)
      from  4075372122dbdd3f6a22cf1d51628df0e92a2bbd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5783be81b2b18d82eb95b9b2a39b2acd83704634
commit 5783be81b2b18d82eb95b9b2a39b2acd83704634
Merge: 4075372 68e446b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 14:28:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 16 14:28:18 2015 -0400

    Merge topic 'use-generator-target' into next
    
    68e446bf cmLocalGenerator: Port PList handling to cmGeneratorTarget.
    5b5b3c2c cmLocalGenerator: Port policy handling to cmGeneratorTarget.
    29ec1367 cmLocalGenerator: Port some API to cmGeneratorTarget.
    d29f1acf Use cmGeneratorTarget for property access.
    f170c3b0 Use GetName from cmGeneratorTarget.
    ed09f3b2 Use IsImported from cmGeneratorTarget.
    beff29f0 cmGeneratorTarget: Move ComputeVersionedName from cmTarget.
    12e4790a cmGeneratorTarget: Move GetTargetVersion from cmTarget.
    14272277 cmGeneratorTarget: Move CheckCMP0004 from cmTarget.
    8f363d67 cmGeneratorTarget: Move ImportInfo from cmTarget.
    5794dbc3 cmTarget: Inline the essential part of imported target location.
    a892b285 cmGeneratorTarget: Move ImportedGetLocation from cmTarget.
    cb8c728f cmGeneratorTarget: Move GetFullNameImported from cmTarget.
    fb4fca0b cmGeneratorTarget: Access global state through LocalGenerator.
    50fb2ad6 cmGeneratorTarget: Port Utility items to cmGeneratorTarget.
    d233030f cmGeneratorTarget: Port implementation to cmGeneratorTarget.
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68e446bf9b8e6471c947e6c464c910468ba7aa69
commit 68e446bf9b8e6471c947e6c464c910468ba7aa69
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:31:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:45 2015 +0200

    cmLocalGenerator: Port PList handling to cmGeneratorTarget.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 60aff64..9d5dd8e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3012,7 +3012,7 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 }
 
 //----------------------------------------------------------------------------
-static void cmLGInfoProp(cmMakefile* mf, cmTarget* target,
+static void cmLGInfoProp(cmMakefile* mf, cmGeneratorTarget* target,
     const std::string& prop)
 {
   if(const char* val = target->GetProperty(prop))
@@ -3022,7 +3022,7 @@ static void cmLGInfoProp(cmMakefile* mf, cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::GenerateAppleInfoPList(cmTarget* target,
+void cmLocalGenerator::GenerateAppleInfoPList(cmGeneratorTarget* target,
                                               const std::string& targetName,
                                               const char* fname)
 {
@@ -3066,7 +3066,7 @@ void cmLocalGenerator::GenerateAppleInfoPList(cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::GenerateFrameworkInfoPList(cmTarget* target,
+void cmLocalGenerator::GenerateFrameworkInfoPList(cmGeneratorTarget* target,
                                                 const std::string& targetName,
                                                 const char* fname)
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 5d2a349..2bc0e4a 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -279,13 +279,14 @@ public:
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
-  void GenerateAppleInfoPList(cmTarget* target, const std::string& targetName,
+  void GenerateAppleInfoPList(cmGeneratorTarget* target,
+                              const std::string& targetName,
                               const char* fname);
 
   /**
    * Generate a Mac OS X framework Info.plist file.
    */
-  void GenerateFrameworkInfoPList(cmTarget* target,
+  void GenerateFrameworkInfoPList(cmGeneratorTarget* target,
                                   const std::string& targetName,
                                   const char* fname);
   /** Construct a comment for a custom command.  */
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 4fe99e3..490759f 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -59,7 +59,7 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string& targetName,
   plist += "/";
   plist += this->GT->GetAppBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
-  this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateAppleInfoPList(this->GT,
                                                targetName,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);
@@ -90,7 +90,7 @@ void cmOSXBundleGenerator::CreateFramework(
   std::string plist = newoutpath;
   plist += "/Resources/Info.plist";
   std::string name = cmSystemTools::GetFilenameName(targetName);
-  this->LocalGenerator->GenerateFrameworkInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateFrameworkInfoPList(this->GT,
                                                    name,
                                                    plist.c_str());
 
@@ -182,7 +182,7 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
     this->GT->GetCFBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
   std::string name = cmSystemTools::GetFilenameName(targetName);
-  this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateAppleInfoPList(this->GT,
                                                name,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b5b3c2c19e0d56ddab120c469aa416f41bf20fa
commit 5b5b3c2c19e0d56ddab120c469aa416f41bf20fa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:29:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:45 2015 +0200

    cmLocalGenerator: Port policy handling to cmGeneratorTarget.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d830e26..60aff64 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2129,7 +2129,7 @@ void cmLocalGenerator
     }
 
   if (!warnCMP0063.empty() &&
-      this->WarnCMP0063.insert(target->Target).second)
+      this->WarnCMP0063.insert(target).second)
     {
     std::ostringstream w;
     w <<
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 749a93d..5d2a349 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -369,7 +369,7 @@ protected:
   std::string::size_type ObjectPathMax;
   std::set<std::string> ObjectMaxPathViolations;
 
-  std::set<cmTarget const*> WarnCMP0063;
+  std::set<cmGeneratorTarget const*> WarnCMP0063;
   cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29ec1367612e788f6750a51bfbe94b0766769daf
commit 29ec1367612e788f6750a51bfbe94b0766769daf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:19:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:45 2015 +0200

    cmLocalGenerator: Port some API to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index a197f88..41af89b 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -316,10 +316,11 @@ std::string cmCommonTargetGenerator::GetFlags(const std::string &l)
       this->AddFortranFlags(flags);
       }
 
-    this->LocalGenerator->AddCMP0018Flags(flags, this->Target,
+    this->LocalGenerator->AddCMP0018Flags(flags, this->GeneratorTarget,
                                           lang, this->ConfigName);
 
-    this->LocalGenerator->AddVisibilityPresetFlags(flags, this->Target,
+    this->LocalGenerator->AddVisibilityPresetFlags(flags,
+                                                   this->GeneratorTarget,
                                                    lang);
 
     // Append old-style preprocessor definition flags.
@@ -331,7 +332,7 @@ std::string cmCommonTargetGenerator::GetFlags(const std::string &l)
       AppendFlags(flags,this->GetFrameworkFlags(l));
 
     // Add target-specific flags.
-    this->LocalGenerator->AddCompileOptions(flags, this->Target,
+    this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
                                             lang, this->ConfigName);
 
     ByLanguageMap::value_type entry(l, flags);
@@ -354,7 +355,7 @@ std::string cmCommonTargetGenerator::GetDefines(const std::string &l)
       }
 
     // Add preprocessor definitions for this target and configuration.
-    this->LocalGenerator->AddCompileDefinitions(defines, this->Target,
+    this->LocalGenerator->AddCompileDefinitions(defines, this->GeneratorTarget,
                             this->LocalGenerator->GetConfigName(), l);
 
     std::string definesString;
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index d1599c4..a6b14ba 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -388,7 +388,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   //   }
 
   // Add shared-library flags if needed.
-  lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
+  lg->AddCMP0018Flags(flags, gtgt, language, config);
 
   // Add include directory flags.
   {
@@ -403,7 +403,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, gtgt->Target, language, config);
+  lg->AddCompileOptions(flags, gtgt, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -433,7 +433,7 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AddCompileDefinitions(defines, target->Target, config, language);
+  lg->AddCompileDefinitions(defines, target, config, language);
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d457e9c..d830e26 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -920,7 +920,7 @@ cmLocalGenerator::ExpandRuleVariables(std::string& s,
 }
 
 //----------------------------------------------------------------------------
-const char* cmLocalGenerator::GetRuleLauncher(cmTarget* target,
+const char* cmLocalGenerator::GetRuleLauncher(cmGeneratorTarget* target,
                                               const std::string& prop)
 {
   if(target)
@@ -934,7 +934,8 @@ const char* cmLocalGenerator::GetRuleLauncher(cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::InsertRuleLauncher(std::string& s, cmTarget* target,
+void cmLocalGenerator::InsertRuleLauncher(std::string& s,
+                                          cmGeneratorTarget* target,
                                           const std::string& prop)
 {
   if(const char* val = this->GetRuleLauncher(target, prop))
@@ -1087,27 +1088,23 @@ std::string cmLocalGenerator::GetIncludeFlags(
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCompileDefinitions(std::set<std::string>& defines,
-                                             cmTarget const* target,
+                                             cmGeneratorTarget const* target,
                                              const std::string& config,
                                              const std::string& lang)
 {
   std::vector<std::string> targetDefines;
-  cmGeneratorTarget* gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
-  gtgt->GetCompileDefinitions(targetDefines, config, lang);
+  target->GetCompileDefinitions(targetDefines, config, lang);
   this->AppendDefines(defines, targetDefines);
 }
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCompileOptions(
-  std::string& flags, cmTarget* target,
+  std::string& flags, cmGeneratorTarget* target,
   const std::string& lang, const std::string& config
   )
 {
   std::string langFlagRegexVar = std::string("CMAKE_")+lang+"_FLAG_REGEX";
 
-  cmGeneratorTarget* gtgt =
-      this->GlobalGenerator->GetGeneratorTarget(target);
-
   if(const char* langFlagRegexStr =
      this->Makefile->GetDefinition(langFlagRegexVar))
     {
@@ -1118,7 +1115,7 @@ void cmLocalGenerator::AddCompileOptions(
       {
       cmSystemTools::ParseWindowsCommandLine(targetFlags, opts);
       }
-    gtgt->GetCompileOptions(opts, config, lang);
+    target->GetCompileOptions(opts, config, lang);
     for(std::vector<std::string>::const_iterator i = opts.begin();
         i != opts.end(); ++i)
       {
@@ -1139,7 +1136,7 @@ void cmLocalGenerator::AddCompileOptions(
       this->AppendFlags(flags, targetFlags);
       }
     std::vector<std::string> opts;
-    gtgt->GetCompileOptions(opts, config, lang);
+    target->GetCompileOptions(opts, config, lang);
     for(std::vector<std::string>::const_iterator i = opts.begin();
         i != opts.end(); ++i)
       {
@@ -1148,19 +1145,19 @@ void cmLocalGenerator::AddCompileOptions(
       }
     }
   std::vector<std::string> features;
-  gtgt->GetCompileFeatures(features, config);
+  target->GetCompileFeatures(features, config);
   for(std::vector<std::string>::const_iterator it = features.begin();
       it != features.end(); ++it)
     {
-     if (!this->Makefile->AddRequiredTargetFeature(target, *it))
+     if (!this->Makefile->AddRequiredTargetFeature(target->Target, *it))
       {
       return;
       }
     }
 
   for(std::map<std::string, std::string>::const_iterator it
-      = gtgt->GetMaxLanguageStandards().begin();
-      it != gtgt->GetMaxLanguageStandards().end(); ++it)
+      = target->GetMaxLanguageStandards().begin();
+      it != target->GetMaxLanguageStandards().end(); ++it)
     {
     const char* standard = target->GetProperty(it->first + "_STANDARD");
     if(!standard)
@@ -1314,7 +1311,7 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
 
 void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags,
                                              std::string const& config,
-                                             cmTarget* target)
+                                             cmGeneratorTarget* target)
 {
   this->AppendFlags(flags,
     this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS"));
@@ -1348,7 +1345,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
   switch(target->GetType())
     {
     case cmState::STATIC_LIBRARY:
-      this->GetStaticLibraryFlags(linkFlags, buildType, target->Target);
+      this->GetStaticLibraryFlags(linkFlags, buildType, target);
       break;
     case cmState::MODULE_LIBRARY:
       libraryLinkVariable = "CMAKE_MODULE_LINKER_FLAGS";
@@ -1904,7 +1901,8 @@ void cmLocalGenerator::AddSharedFlags(std::string& flags,
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::
-AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
+AddCompilerRequirementFlag(std::string &flags,
+                           cmGeneratorTarget const* target,
                            const std::string& lang)
 {
   if (lang.empty())
@@ -1942,7 +1940,8 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
               "CMAKE_" + lang + standardProp
                       + "_" + type + "_COMPILE_OPTION";
 
-    const char *opt = target->GetMakefile()->GetDefinition(option_flag);
+    const char *opt = target->Target->GetMakefile()
+        ->GetDefinition(option_flag);
     if (!opt)
       {
       std::ostringstream e;
@@ -1983,7 +1982,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
     std::string e =
       lang + "_STANDARD is set to invalid value '" + standard + "'";
     this->GetGlobalGenerator()->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e, target->GetBacktrace());
+      ->IssueMessage(cmake::FATAL_ERROR, e, target->Target->GetBacktrace());
     return;
     }
 
@@ -2007,7 +2006,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
                       + "_" + type + "_COMPILE_OPTION";
 
     const char *opt =
-        target->GetMakefile()->GetRequiredDefinition(option_flag);
+        target->Target->GetMakefile()->GetRequiredDefinition(option_flag);
     this->AppendFlagEscape(flags, opt);
     return;
     }
@@ -2018,7 +2017,8 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
               "CMAKE_" + lang + *stdIt
                       + "_" + type + "_COMPILE_OPTION";
 
-    if (const char *opt = target->GetMakefile()->GetDefinition(option_flag))
+    if (const char *opt = target->Target
+        ->GetMakefile()->GetDefinition(option_flag))
       {
       this->AppendFlagEscape(flags, opt);
       return;
@@ -2094,7 +2094,7 @@ static void AddInlineVisibilityCompileOption(std::string &flags,
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator
-::AddVisibilityPresetFlags(std::string &flags, cmTarget const* target,
+::AddVisibilityPresetFlags(std::string &flags, cmGeneratorTarget const* target,
                             const std::string& lang)
 {
   if (lang.empty())
@@ -2106,9 +2106,9 @@ void cmLocalGenerator
   std::string *pWarnCMP0063 = 0;
   if (target->GetType() != cmState::SHARED_LIBRARY &&
       target->GetType() != cmState::MODULE_LIBRARY &&
-      !target->IsExecutableWithExports())
+      !target->Target->IsExecutableWithExports())
     {
-    switch (target->GetPolicyStatusCMP0063())
+    switch (target->Target->GetPolicyStatusCMP0063())
       {
       case cmPolicies::OLD:
         return;
@@ -2120,15 +2120,16 @@ void cmLocalGenerator
       }
     }
 
-  AddVisibilityCompileOption(flags, target, this, lang, pWarnCMP0063);
+  AddVisibilityCompileOption(flags, target->Target, this, lang, pWarnCMP0063);
 
   if(lang == "CXX")
     {
-    AddInlineVisibilityCompileOption(flags, target, this, pWarnCMP0063);
+    AddInlineVisibilityCompileOption(flags, target->Target,
+                                     this, pWarnCMP0063);
     }
 
   if (!warnCMP0063.empty() &&
-      this->WarnCMP0063.insert(target).second)
+      this->WarnCMP0063.insert(target->Target).second)
     {
     std::ostringstream w;
     w <<
@@ -2138,14 +2139,15 @@ void cmLocalGenerator
       "has the following visibility properties set for " << lang << ":\n" <<
       warnCMP0063 <<
       "For compatibility CMake is not honoring them for this target.";
-    target->GetMakefile()->GetCMakeInstance()
-      ->IssueMessage(cmake::AUTHOR_WARNING, w.str(), target->GetBacktrace());
+    target->Target->GetMakefile()->GetCMakeInstance()
+      ->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
+                     target->Target->GetBacktrace());
     }
 }
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
-                                       cmTarget const* target,
+                                       cmGeneratorTarget const* target,
                                        std::string const& lang,
                                        const std::string& config)
 {
@@ -2169,9 +2171,7 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
       return;
       }
 
-    cmGeneratorTarget* gtgt =
-        this->GlobalGenerator->GetGeneratorTarget(target);
-    if (gtgt->GetLinkInterfaceDependentBoolProperty(
+    if (target->GetLinkInterfaceDependentBoolProperty(
                                                 "POSITION_INDEPENDENT_CODE",
                                                 config))
       {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index ee0a618..749a93d 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -20,7 +20,6 @@
 class cmMakefile;
 class cmGlobalGenerator;
 class cmGeneratorTarget;
-class cmTarget;
 class cmTargetManifest;
 class cmSourceFile;
 class cmCustomCommand;
@@ -91,13 +90,15 @@ public:
 
   void AddLanguageFlags(std::string& flags, const std::string& lang,
                         const std::string& config);
-  void AddCMP0018Flags(std::string &flags, cmTarget const* target,
+  void AddCMP0018Flags(std::string &flags, cmGeneratorTarget const* target,
                        std::string const& lang, const std::string& config);
-  void AddVisibilityPresetFlags(std::string &flags, cmTarget const* target,
+  void AddVisibilityPresetFlags(std::string &flags,
+                                cmGeneratorTarget const* target,
                                 const std::string& lang);
   void AddConfigVariableFlags(std::string& flags, const std::string& var,
                               const std::string& config);
-  void AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
+  void AddCompilerRequirementFlag(std::string &flags,
+                                  cmGeneratorTarget const* target,
                                   const std::string& lang);
   ///! Append flags to a string.
   virtual void AppendFlags(std::string& flags, const std::string& newFlags);
@@ -188,10 +189,10 @@ public:
                              const std::string& lang = "C",
                              const std::string& config = "",
                              bool stripImplicitInclDirs = true) const;
-  void AddCompileOptions(std::string& flags, cmTarget* target,
+  void AddCompileOptions(std::string& flags, cmGeneratorTarget* target,
                          const std::string& lang, const std::string& config);
   void AddCompileDefinitions(std::set<std::string>& defines,
-                             cmTarget const* target,
+                             cmGeneratorTarget const* target,
                              const std::string& config,
                              const std::string& lang);
 
@@ -212,7 +213,7 @@ public:
       {
         memset(this, 0,  sizeof(*this));
       }
-    cmTarget* CMTarget;
+    cmGeneratorTarget* CMTarget;
     const char* TargetPDB;
     const char* TargetCompilePDB;
     const char* TargetVersionMajor;
@@ -298,7 +299,7 @@ public:
   /** Fill out the static linker flags for the given target.  */
   void GetStaticLibraryFlags(std::string& flags,
                              std::string const& config,
-                             cmTarget* target);
+                             cmGeneratorTarget* target);
 
   /** Fill out these strings for the given target.  Libraries to link,
    *  flags, and linkflags. */
@@ -341,8 +342,9 @@ protected:
   std::string ExpandRuleVariable(std::string const& variable,
                                  const RuleVariables& replaceValues);
 
-  const char* GetRuleLauncher(cmTarget* target, const std::string& prop);
-  void InsertRuleLauncher(std::string& s, cmTarget* target,
+  const char* GetRuleLauncher(cmGeneratorTarget* target,
+                              const std::string& prop);
+  void InsertRuleLauncher(std::string& s, cmGeneratorTarget* target,
                           const std::string& prop);
 
   // Handle old-style install rules stored in the targets.
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index f3ee2e3..add0aa9 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1034,7 +1034,7 @@ void
 cmLocalUnixMakefileGenerator3
 ::AppendCustomCommands(std::vector<std::string>& commands,
                        const std::vector<cmCustomCommand>& ccs,
-                       cmTarget* target,
+                       cmGeneratorTarget* target,
                        cmLocalGenerator::RelativeRoot relative)
 {
   for(std::vector<cmCustomCommand>::const_iterator i = ccs.begin();
@@ -1050,7 +1050,7 @@ void
 cmLocalUnixMakefileGenerator3
 ::AppendCustomCommand(std::vector<std::string>& commands,
                       cmCustomCommandGenerator const& ccg,
-                      cmTarget* target,
+                      cmGeneratorTarget* target,
                       bool echo_comment,
                       cmLocalGenerator::RelativeRoot relative,
                       std::ostream* content)
@@ -1181,7 +1181,7 @@ cmLocalUnixMakefileGenerator3
 std::string
 cmLocalUnixMakefileGenerator3::MakeLauncher(
   cmCustomCommandGenerator const& ccg,
-  cmTarget* target, RelativeRoot relative)
+  cmGeneratorTarget* target, RelativeRoot relative)
 {
   // Short-circuit if there is no launcher.
   const char* prop = "RULE_LAUNCH_CUSTOM";
@@ -1788,6 +1788,9 @@ void cmLocalUnixMakefileGenerator3
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 
+      cmGeneratorTarget* gt = this->GlobalGenerator
+          ->GetGeneratorTarget(&glIt->second);
+
       // Global targets store their rules in pre- and post-build commands.
       this->AppendCustomDepends(depends,
                                 glIt->second.GetPreBuildCommands());
@@ -1795,11 +1798,11 @@ void cmLocalUnixMakefileGenerator3
                                 glIt->second.GetPostBuildCommands());
       this->AppendCustomCommands(commands,
                                  glIt->second.GetPreBuildCommands(),
-                                 &glIt->second,
+                                 gt,
                                  cmLocalGenerator::START_OUTPUT);
       this->AppendCustomCommands(commands,
                                  glIt->second.GetPostBuildCommands(),
-                                 &glIt->second,
+                                 gt,
                                  cmLocalGenerator::START_OUTPUT);
       std::string targetName = glIt->second.GetName();
       this->WriteMakeRule(ruleFileStream, targetString.c_str(),
@@ -1976,10 +1979,11 @@ void cmLocalUnixMakefileGenerator3::ClearDependencies(cmMakefile* mf,
 
 
 void cmLocalUnixMakefileGenerator3
-::WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &target)
+::WriteDependLanguageInfo(std::ostream& cmakefileStream,
+                          cmGeneratorTarget* target)
 {
   ImplicitDependLanguageMap const& implicitLangs =
-    this->GetImplicitDepends(target);
+    this->GetImplicitDepends(*target->Target);
 
   // list the languages
   cmakefileStream
@@ -2030,7 +2034,7 @@ void cmLocalUnixMakefileGenerator3
 
     // Build a list of preprocessor definitions for the target.
     std::set<std::string> defines;
-    this->AddCompileDefinitions(defines, &target,
+    this->AddCompileDefinitions(defines, target,
                                 this->ConfigName, l->first);
     if(!defines.empty())
       {
@@ -2056,12 +2060,10 @@ void cmLocalUnixMakefileGenerator3
       << "set(CMAKE_" << l->first << "_TARGET_INCLUDE_PATH\n";
     std::vector<std::string> includes;
 
-    cmGeneratorTarget* gt = this->GetGlobalGenerator()
-                                ->GetGeneratorTarget(&target);
 
     const std::string& config =
       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-    this->GetIncludeDirectories(includes, gt,
+    this->GetIncludeDirectories(includes, target,
                                 l->first, config);
     for(std::vector<std::string>::iterator i = includes.begin();
         i != includes.end(); ++i)
@@ -2084,7 +2086,7 @@ void cmLocalUnixMakefileGenerator3
     cmSystemTools::ExpandListArgument(xform, transformRules);
     }
   if(const char* xform =
-     target.GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM"))
+     target->GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM"))
     {
     cmSystemTools::ExpandListArgument(xform, transformRules);
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 586dda0..beaddde 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -182,7 +182,8 @@ protected:
 
 
   // write the depend info
-  void WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &tgt);
+  void WriteDependLanguageInfo(std::ostream& cmakefileStream,
+                               cmGeneratorTarget *tgt);
 
   // write the local help rule
   void WriteHelpRule(std::ostream& ruleFileStream);
@@ -215,12 +216,12 @@ protected:
                           cmCustomCommandGenerator const& cc);
   void AppendCustomCommands(std::vector<std::string>& commands,
                             const std::vector<cmCustomCommand>& ccs,
-                            cmTarget* target,
+                            cmGeneratorTarget* target,
                             cmLocalGenerator::RelativeRoot relative =
                             cmLocalGenerator::HOME_OUTPUT);
   void AppendCustomCommand(std::vector<std::string>& commands,
                            cmCustomCommandGenerator const& ccg,
-                           cmTarget* target,
+                           cmGeneratorTarget* target,
                            bool echo_comment=false,
                            cmLocalGenerator::RelativeRoot relative =
                            cmLocalGenerator::HOME_OUTPUT,
@@ -237,7 +238,7 @@ protected:
 private:
   std::string ConvertShellCommand(std::string const& cmd, RelativeRoot root);
   std::string MakeLauncher(cmCustomCommandGenerator const& ccg,
-                           cmTarget* target, RelativeRoot relative);
+                           cmGeneratorTarget* target, RelativeRoot relative);
 
   virtual void ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 43bc4e1..178b462 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -280,10 +280,10 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     {
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -358,7 +358,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   cmLocalGenerator::RuleVariables vars;
   vars.RuleLauncher = "RULE_LAUNCH_LINK";
-  vars.CMTarget = this->Target;
+  vars.CMTarget = this->GeneratorTarget;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
   std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
@@ -449,7 +449,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     {
     this->LocalGenerator->
       AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->Target);
+                           this->GeneratorTarget);
     }
 
   // Write the build rule.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 28b4ab8..2ed5f70 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -115,7 +115,7 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
   // Add post-build rules.
   this->LocalGenerator->
     AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                         this->Target);
+                         this->GeneratorTarget);
 
   // Depend on the object files.
   this->AppendObjectDepends(depends);
@@ -146,7 +146,7 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules()
 
   std::string extraFlags;
   this->LocalGenerator->GetStaticLibraryFlags(extraFlags,
-    cmSystemTools::UpperCase(this->ConfigName), this->Target);
+    cmSystemTools::UpperCase(this->ConfigName), this->GeneratorTarget);
   this->WriteLibraryRules(linkRuleVar, extraFlags, false);
 }
 
@@ -458,10 +458,10 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     {
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -640,7 +640,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.TargetVersionMinor = targetVersionMinor.c_str();
 
   vars.RuleLauncher = "RULE_LAUNCH_LINK";
-  vars.CMTarget = this->Target;
+  vars.CMTarget = this->GeneratorTarget;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
   std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
@@ -811,7 +811,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     {
     this->LocalGenerator->
       AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->Target);
+                           this->GeneratorTarget);
     }
 
   // Compute the list of outputs.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index df50747..b7970fd 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -589,7 +589,7 @@ cmMakefileTargetGenerator
   }
   cmLocalGenerator::RuleVariables vars;
   vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
-  vars.CMTarget = this->Target;
+  vars.CMTarget = this->GeneratorTarget;
   vars.Language = lang.c_str();
   vars.Target = targetOutPathReal.c_str();
   vars.TargetPDB = targetOutPathPDB.c_str();
@@ -1040,7 +1040,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
     return;
     }
   this->LocalGenerator->
-    WriteDependLanguageInfo(*this->InfoFileStream,*this->Target);
+    WriteDependLanguageInfo(*this->InfoFileStream, this->GeneratorTarget);
 
   // Store multiple output pairs in the depend info file.
   if(!this->MultipleOutputPairs.empty())
@@ -1211,7 +1211,8 @@ void cmMakefileTargetGenerator
 
   // Now append the actual user-specified commands.
   std::ostringstream content;
-  this->LocalGenerator->AppendCustomCommand(commands, ccg, this->Target, false,
+  this->LocalGenerator->AppendCustomCommand(commands, ccg,
+                                            this->GeneratorTarget, false,
                                             cmLocalGenerator::HOME_OUTPUT,
                                             &content);
 
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 18594bb..11601c5 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -74,13 +74,13 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
     (depends, this->Target->GetPostBuildCommands());
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPreBuildCommands(), this->Target);
+    (commands, this->Target->GetPreBuildCommands(), this->GeneratorTarget);
 
   // Depend on all custom command outputs for sources
   this->DriveCustomCommands(depends);
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPostBuildCommands(), this->Target);
+    (commands, this->Target->GetPostBuildCommands(), this->GeneratorTarget);
 
   // Add dependencies on targets that must be built first.
   this->AppendTargetDepends(depends);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index e2061e5..e5e4b7f 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -178,7 +178,7 @@ cmNinjaNormalTargetGenerator
   if (!this->GetGlobalGenerator()->HasRule(ruleName)) {
     cmLocalGenerator::RuleVariables vars;
     vars.RuleLauncher = "RULE_LAUNCH_LINK";
-    vars.CMTarget = this->GetTarget();
+    vars.CMTarget = this->GetGeneratorTarget();
     vars.Language = this->TargetLinkLanguage.c_str();
 
     std::string responseFlag;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4d69a5e..cb1122c 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -335,7 +335,7 @@ cmNinjaTargetGenerator
 {
   cmLocalGenerator::RuleVariables vars;
   vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
-  vars.CMTarget = this->GetTarget();
+  vars.CMTarget = this->GetGeneratorTarget();
   vars.Language = lang.c_str();
   vars.Source = "$in";
   vars.Object = "$out";
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 41172f6..386d430 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -120,7 +120,7 @@ static void GetCompileDefinitionsAndDirectories(
   incs = cmJoin(includeDirs, ";");
 
   std::set<std::string> defines;
-  localGen->AddCompileDefinitions(defines, target->Target, config, "CXX");
+  localGen->AddCompileDefinitions(defines, target, config, "CXX");
 
   defs += cmJoin(defines, ";");
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d29f1acf72cb068ac05f4876c20e3559f232f4f1
commit d29f1acf72cb068ac05f4876c20e3559f232f4f1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:51:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:45 2015 +0200

    Use cmGeneratorTarget for property access.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index f7cc502..a197f88 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -109,7 +109,7 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const
 {
   std::string mod_dir;
   const char* target_mod_dir =
-    this->Target->GetProperty("Fortran_MODULE_DIRECTORY");
+    this->GeneratorTarget->GetProperty("Fortran_MODULE_DIRECTORY");
   const char* moddir_flag =
     this->Makefile->GetDefinition("CMAKE_Fortran_MODDIR_FLAG");
   if(target_mod_dir && moddir_flag)
@@ -214,7 +214,7 @@ cmCommonTargetGenerator
     this->LocalGenerator->GetFortranFormat(srcfmt);
   if(format == cmLocalGenerator::FortranFormatNone)
     {
-    const char* tgtfmt = this->Target->GetProperty("Fortran_FORMAT");
+    const char* tgtfmt = this->GeneratorTarget->GetProperty("Fortran_FORMAT");
     format = this->LocalGenerator->GetFortranFormat(tgtfmt);
     }
   const char* var = 0;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 20fb70b..5e26aad 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4859,7 +4859,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
     // Skip per-configuration subdirectory.
     conf = "";
     }
-  else if(const char* outdir = this->Target->GetProperty(propertyName))
+  else if(const char* outdir = this->GetProperty(propertyName))
     {
     // Use the user-specified output directory.
     cmGeneratorExpression ge;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 433af7e..43bc4e1 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -197,7 +197,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                            this->ConfigName);
 
 
-  if(this->Target->GetPropertyAsBool("WIN32_EXECUTABLE"))
+  if(this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE"))
     {
     this->LocalGenerator->AppendFlags
       (linkFlags, this->Makefile->GetDefinition("CMAKE_CREATE_WIN32_EXE"));
@@ -226,11 +226,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   // Add target-specific linker flags.
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->Target->GetProperty("LINK_FLAGS"));
+    (linkFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->Target->GetProperty(linkFlagsConfig));
+    (linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
 
   this->AddModuleDefinitionFlag(linkFlags);
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 6cde0f6..28b4ab8 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -166,11 +166,11 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty("LINK_FLAGS"));
+    (extraFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
 
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName);
@@ -190,11 +190,11 @@ void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                                    this->Target->GetProperty("LINK_FLAGS"));
+                           this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MODULE_LINKER_FLAGS", this->ConfigName);
   this->AddModuleDefinitionFlag(extraFlags);
@@ -213,11 +213,11 @@ void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                                    this->Target->GetProperty("LINK_FLAGS"));
+                             this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MACOSX_FRAMEWORK_LINKER_FLAGS", this->ConfigName);
 
@@ -569,7 +569,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
         this->GeneratorTarget->GetSupportDirectory();
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 603214d..df50747 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -667,7 +667,7 @@ cmMakefileTargetGenerator
   if (!compileCommands.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const iwyu_prop = lang + "_INCLUDE_WHAT_YOU_USE";
-    const char *iwyu = this->Target->GetProperty(iwyu_prop);
+    const char *iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     if (iwyu && *iwyu)
       {
       std::string run_iwyu = "$(CMAKE_COMMAND) -E __run_iwyu --iwyu=";
@@ -681,7 +681,7 @@ cmMakefileTargetGenerator
   if (!compileCommands.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
-    const char *clauncher = this->Target->GetProperty(clauncher_prop);
+    const char *clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
     if (clauncher && *clauncher)
       {
       std::vector<std::string> launcher_cmd;
@@ -1513,7 +1513,7 @@ void cmMakefileTargetGenerator
 
   // Add user-specified dependencies.
   if(const char* linkDepends =
-     this->Target->GetProperty("LINK_DEPENDS"))
+     this->GeneratorTarget->GetProperty("LINK_DEPENDS"))
     {
     cmSystemTools::ExpandListArgument(linkDepends, depends);
     }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 3d1579f..4d69a5e 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -218,7 +218,8 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
     }
 
   // Add user-specified dependencies.
-  if (const char* linkDepends = this->Target->GetProperty("LINK_DEPENDS"))
+  if (const char* linkDepends =
+      this->GeneratorTarget->GetProperty("LINK_DEPENDS"))
     {
     std::vector<std::string> linkDeps;
     cmSystemTools::ExpandListArgument(linkDepends, linkDeps);
@@ -410,7 +411,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const iwyu_prop = lang + "_INCLUDE_WHAT_YOU_USE";
-    const char *iwyu = this->Target->GetProperty(iwyu_prop);
+    const char *iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     if (iwyu && *iwyu)
       {
       std::string run_iwyu =
@@ -427,7 +428,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
-    const char *clauncher = this->Target->GetProperty(clauncher_prop);
+    const char *clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
     if (clauncher && *clauncher)
       {
       std::vector<std::string> launcher_cmd;
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 9feb7ac..5bbe268 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -90,7 +90,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
   } else {
     std::string command =
       this->GetLocalGenerator()->BuildCommandLine(commands);
-    const char *echoStr = this->GetTarget()->GetProperty("EchoString");
+    const char *echoStr =
+        this->GetGeneratorTarget()->GetProperty("EchoString");
     std::string desc;
     if (echoStr)
       desc = echoStr;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2225a46..f0344bb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -270,7 +270,7 @@ void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
   if(this->GeneratorTarget->GetType() == cmState::INTERFACE_LIBRARY
-      || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
+      || this->GeneratorTarget->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
     }
@@ -368,7 +368,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsProjectTypes =
-    this->Target->GetProperty("VS_GLOBAL_PROJECT_TYPES");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_PROJECT_TYPES");
   if(vsProjectTypes)
     {
     this->WriteString("<ProjectTypes>", 2);
@@ -376,9 +376,12 @@ void cmVisualStudio10TargetGenerator::Generate()
       "</ProjectTypes>\n";
     }
 
-  const char* vsProjectName = this->Target->GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalPath = this->Target->GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = this->Target->GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectName =
+      this->GeneratorTarget->GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalPath =
+      this->GeneratorTarget->GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider =
+      this->GeneratorTarget->GetProperty("VS_SCC_PROVIDER");
 
   if( vsProjectName && vsLocalPath && vsProvider )
     {
@@ -392,7 +395,8 @@ void cmVisualStudio10TargetGenerator::Generate()
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
       "</SccProvider>\n";
 
-    const char* vsAuxPath = this->Target->GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath =
+        this->GeneratorTarget->GetProperty("VS_SCC_AUXPATH");
     if( vsAuxPath )
       {
       this->WriteString("<SccAuxPath>", 2);
@@ -401,13 +405,13 @@ void cmVisualStudio10TargetGenerator::Generate()
       }
     }
 
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
     {
     this->WriteString("<WinMDAssembly>true</WinMDAssembly>\n", 2);
     }
 
   const char* vsGlobalKeyword =
-    this->Target->GetProperty("VS_GLOBAL_KEYWORD");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_KEYWORD");
   if(!vsGlobalKeyword)
     {
     this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
@@ -420,7 +424,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsGlobalRootNamespace =
-    this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
   if(vsGlobalRootNamespace)
     {
     this->WriteString("<RootNamespace>", 2);
@@ -431,14 +435,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(this->Platform)
                            << "</Platform>\n";
-  const char* projLabel = this->Target->GetProperty("PROJECT_LABEL");
+  const char* projLabel = this->GeneratorTarget->GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = this->Name.c_str();
     }
   this->WriteString("<ProjectName>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(projLabel) << "</ProjectName>\n";
-  if(const char* targetFrameworkVersion = this->Target->GetProperty(
+  if(const char* targetFrameworkVersion = this->GeneratorTarget->GetProperty(
        "VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     this->WriteString("<TargetFrameworkVersion>", 2);
@@ -497,7 +501,7 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReferences()
 {
   std::vector<std::string> references;
   if(const char* vsDotNetReferences =
-     this->Target->GetProperty("VS_DOTNET_REFERENCES"))
+     this->GeneratorTarget->GetProperty("VS_DOTNET_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsDotNetReferences, references);
     }
@@ -543,7 +547,7 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
           i != this->Configurations.end(); ++i)
         {
         this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
-        if(this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
+        if(this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
           {
           (*this->BuildFileStream ) << "$(RootNamespace).";
           }
@@ -610,7 +614,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTReferences()
 {
   std::vector<std::string> references;
   if(const char* vsWinRTReferences =
-     this->Target->GetProperty("VS_WINRT_REFERENCES"))
+     this->GeneratorTarget->GetProperty("VS_WINRT_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsWinRTReferences, references);
     }
@@ -679,7 +683,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
         break;
       case cmState::EXECUTABLE:
         if(this->NsightTegra &&
-           !this->Target->GetPropertyAsBool("ANDROID_GUI"))
+           !this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
           {
           // Android executables are .so too.
           configType += "DynamicLibrary";
@@ -746,10 +750,10 @@ void cmVisualStudio10TargetGenerator
 
   if((this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
-     this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
      this->GlobalGenerator->TargetsWindowsStore() ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
@@ -769,8 +773,8 @@ void cmVisualStudio10TargetGenerator
     pts += "</PlatformToolset>\n";
     this->WriteString(pts.c_str(), 2);
     }
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<WindowsAppContainer>true"
                       "</WindowsAppContainer>\n", 2);
@@ -788,27 +792,29 @@ void cmVisualStudio10TargetGenerator
   ntv += toolset? toolset : "Default";
   ntv += "</NdkToolchainVersion>\n";
   this->WriteString(ntv.c_str(), 2);
-  if(const char* minApi = this->Target->GetProperty("ANDROID_API_MIN"))
+  if(const char* minApi =
+     this->GeneratorTarget->GetProperty("ANDROID_API_MIN"))
     {
     this->WriteString("<AndroidMinAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(minApi) << "</AndroidMinAPI>\n";
     }
-  if(const char* api = this->Target->GetProperty("ANDROID_API"))
+  if(const char* api = this->GeneratorTarget->GetProperty("ANDROID_API"))
     {
     this->WriteString("<AndroidTargetAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(api) << "</AndroidTargetAPI>\n";
     }
 
-  if(const char* cpuArch = this->Target->GetProperty("ANDROID_ARCH"))
+  if(const char* cpuArch = this->GeneratorTarget->GetProperty("ANDROID_ARCH"))
     {
     this->WriteString("<AndroidArch>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(cpuArch) <<
       "</AndroidArch>\n";
     }
 
-  if(const char* stlType = this->Target->GetProperty("ANDROID_STL_TYPE"))
+  if(const char* stlType =
+     this->GeneratorTarget->GetProperty("ANDROID_STL_TYPE"))
     {
     this->WriteString("<AndroidStlType>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(stlType) <<
@@ -1963,7 +1969,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   if (this->MSTools)
     {
     // If we have the VS_WINRT_COMPONENT set then force Compile as WinRT.
-    if (this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+    if (this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
@@ -2012,7 +2018,7 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   if(this->NsightTegra)
     {
     if(const char* processMax =
-        this->Target->GetProperty("ANDROID_PROCESS_MAX"))
+        this->GeneratorTarget->GetProperty("ANDROID_PROCESS_MAX"))
       {
       this->WriteString("<ProcessMax>", 3);
       *this->BuildFileStream << cmVS10EscapeXML(processMax) <<
@@ -2270,18 +2276,18 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmVS10EscapeXML(antBuildPath) << "</AntBuildPath>\n";
   }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
+  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
     {
     this->WriteString("<SkipAntStep>true</SkipAntStep>\n", 3);
     }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_PROGUARD"))
+  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_PROGUARD"))
     {
     this->WriteString("<EnableProGuard>true</EnableProGuard>\n", 3);
     }
 
   if (const char* proGuardConfigLocation =
-      this->Target->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
+      this->GeneratorTarget->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
     {
     this->WriteString("<ProGuardConfigLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(proGuardConfigLocation) <<
@@ -2289,7 +2295,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* securePropertiesLocation =
-      this->Target->GetProperty("ANDROID_SECURE_PROPS_PATH"))
+      this->GeneratorTarget->GetProperty("ANDROID_SECURE_PROPS_PATH"))
     {
     this->WriteString("<SecurePropertiesLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(securePropertiesLocation) <<
@@ -2297,7 +2303,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2310,7 +2316,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDependenciesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2323,7 +2329,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* javaSourceDir =
-      this->Target->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
     {
     this->WriteString("<JavaSourceDir>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(javaSourceDir) <<
@@ -2331,7 +2337,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_JAR_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAR_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2344,7 +2350,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDeps =
-      this->Target->GetProperty("ANDROID_JAR_DEPENDENCIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAR_DEPENDENCIES"))
     {
     this->WriteString("<JarDependencies>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(jarDeps) <<
@@ -2352,7 +2358,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* assetsDirectories =
-      this->Target->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
     {
     this->WriteString("<AssetsDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(assetsDirectories) <<
@@ -2368,7 +2374,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
   }
 
   if (const char* antAdditionalOptions =
-      this->Target->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
+      this->GeneratorTarget->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
     {
     this->WriteString("<AdditionalOptions>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(antAdditionalOptions) <<
@@ -2439,7 +2445,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   flags += " ";
   flags += this->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
-  const char* targetLinkFlags = this->Target->GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags =
+      this->GeneratorTarget->GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     flags += " ";
@@ -2447,7 +2454,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     }
   std::string flagsProp = "LINK_FLAGS_";
   flagsProp += CONFIG;
-  if(const char* flagsConfig = this->Target->GetProperty(flagsProp.c_str()))
+  if(const char* flagsConfig =
+     this->GeneratorTarget->GetProperty(flagsProp.c_str()))
     {
     flags += " ";
     flags += flagsConfig;
@@ -2525,7 +2533,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     {
     linkOptions.AddFlag("Version", "");
 
-    if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
+    if ( this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE") )
       {
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
@@ -2597,7 +2605,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
+    if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
        this->GeneratorTarget->GetType() != cmState::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
@@ -2639,7 +2647,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)exportall.def");
       }
@@ -2783,7 +2791,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
        this->GeneratorTarget->GetType() == cmState::EXECUTABLE &&
-       this->Target->GetPropertyAsBool("ANDROID_GUI"))
+       this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
       }
@@ -2798,7 +2806,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
@@ -2911,14 +2919,14 @@ void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     if (desktopExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsDesktop",
                                          desktopExtensionsVersion);
       }
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     if (mobileExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsMobile",
@@ -2958,11 +2966,11 @@ void cmVisualStudio10TargetGenerator::WriteSDKReferences()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     const char* iotExtensionsVersion =
-      this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_IOT_EXTENSIONS_VERSION");
 
     if(desktopExtensionsVersion || mobileExtensionsVersion ||
        iotExtensionsVersion)
@@ -3194,7 +3202,8 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       "</WindowsTargetPlatformVersion>\n";
     }
   const char* targetPlatformMinVersion =
-      this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+      this->GeneratorTarget
+      ->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
   if(targetPlatformMinVersion)
     {
     this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
@@ -3213,7 +3222,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     }
 
   // Added IoT Startup Task support
-  if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
     {
     this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f170c3b04e279ea0fa86869512e4b3f3d27cf620
commit f170c3b04e279ea0fa86869512e4b3f3d27cf620
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 20:09:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:44 2015 +0200

    Use GetName from cmGeneratorTarget.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c37f797..d457e9c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1421,7 +1421,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
         {
         cmSystemTools::Error
           ("CMake can not determine linker language for target: ",
-           target->Target->GetName().c_str());
+           target->GetName().c_str());
         return;
         }
       this->AddLanguageFlags(flags, linkLanguage, buildType);
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index ea91095..433af7e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -168,7 +168,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->Target->GetName().c_str(), "\".");
+                         this->GeneratorTarget->GetName().c_str(), "\".");
     return;
     }
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 6695143..6cde0f6 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -122,11 +122,11 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->Target->GetName(),
+                                      this->GeneratorTarget->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->Target->GetName(), false);
+  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
 }
 
 //----------------------------------------------------------------------------
@@ -244,7 +244,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->Target->GetName().c_str(), "\".");
+                         this->GeneratorTarget->GetName().c_str(), "\".");
     return;
     }
 
@@ -574,7 +574,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
       std::string name_of_def_file =
         this->GeneratorTarget->GetSupportDirectory();
       name_of_def_file += std::string("/") +
-        this->Target->GetName();
+        this->GeneratorTarget->GetName();
       name_of_def_file += ".def";
       std::string cmd = cmSystemTools::GetCMakeCommand();
       cmd = this->Convert(cmd, cmLocalGenerator::NONE,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 48a29b3..603214d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -248,7 +248,8 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
     // Write an empty dependency file.
     cmGeneratedFileStream depFileStream(dependFileNameFull.c_str());
     depFileStream
-      << "# Empty dependencies file for " << this->Target->GetName() << ".\n"
+      << "# Empty dependencies file for "
+      << this->GeneratorTarget->GetName() << ".\n"
       << "# This may be replaced when dependencies are built." << std::endl;
     }
 
@@ -394,7 +395,7 @@ void cmMakefileTargetGenerator
     err << "Warning: Source file \""
         << source.GetFullPath()
         << "\" is listed multiple times for target \""
-        << this->Target->GetName()
+        << this->GeneratorTarget->GetName()
         << "\".";
     cmSystemTools::Message(err.str().c_str(), "Warning");
     return;
@@ -1267,10 +1268,10 @@ cmMakefileTargetGenerator
   // Write a make variable assignment that lists all objects for the
   // target.
   variableName =
-    this->LocalGenerator->CreateMakeVariable(this->Target->GetName(),
+    this->LocalGenerator->CreateMakeVariable(this->GeneratorTarget->GetName(),
                                              "_OBJECTS");
   *this->BuildFileStream
-    << "# Object files for target " << this->Target->GetName() << "\n"
+    << "# Object files for target " << this->GeneratorTarget->GetName() << "\n"
     << variableName << " =";
   std::string object;
   const char* lineContinue =
@@ -1292,12 +1293,12 @@ cmMakefileTargetGenerator
   // Write a make variable assignment that lists all external objects
   // for the target.
   variableNameExternal =
-    this->LocalGenerator->CreateMakeVariable(this->Target->GetName(),
+    this->LocalGenerator->CreateMakeVariable(this->GeneratorTarget->GetName(),
                                              "_EXTERNAL_OBJECTS");
   *this->BuildFileStream
     << "\n"
     << "# External object files for target "
-    << this->Target->GetName() << "\n"
+    << this->GeneratorTarget->GetName() << "\n"
     << variableNameExternal << " =";
   for(std::vector<std::string>::const_iterator i =
         this->ExternalObjects.begin();
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 303ca63..18594bb 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -42,7 +42,8 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
   this->CreateRuleFile();
 
   *this->BuildFileStream
-    << "# Utility rule file for " << this->Target->GetName() << ".\n\n";
+    << "# Utility rule file for "
+    << this->GeneratorTarget->GetName() << ".\n\n";
 
   if(!this->NoRuleMessages)
     {
@@ -101,11 +102,11 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->Target->GetName(),
+                                      this->GeneratorTarget->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->Target->GetName(), false);
+  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
 
   // Write clean target
   this->WriteTargetCleanRules();
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index a8f182b..e2061e5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -77,7 +77,7 @@ void cmNinjaNormalTargetGenerator::Generate()
   if (this->TargetLinkLanguage.empty()) {
     cmSystemTools::Error("CMake can not determine linker language for "
                          "target: ",
-                         this->GetTarget()->GetName().c_str());
+                         this->GetGeneratorTarget()->GetName().c_str());
     return;
   }
 
@@ -158,7 +158,8 @@ cmNinjaNormalTargetGenerator
     + "_"
     + cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
-    + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
+    + cmGlobalNinjaGenerator::EncodeRuleName(
+        this->GetGeneratorTarget()->GetName())
     ;
 }
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 0eba0b3..3d1579f 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -92,7 +92,7 @@ std::string cmNinjaTargetGenerator::LanguageCompilerRule(
   const std::string& lang) const
 {
   return lang + "_COMPILER__" +
-    cmGlobalNinjaGenerator::EncodeRuleName(this->Target->GetName());
+    cmGlobalNinjaGenerator::EncodeRuleName(this->GeneratorTarget->GetName());
 }
 
 std::string
@@ -271,7 +271,7 @@ cmNinjaTargetGenerator
 
 std::string cmNinjaTargetGenerator::GetTargetName() const
 {
-  return this->Target->GetName();
+  return this->GeneratorTarget->GetName();
 }
 
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 7968412..2225a46 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -178,7 +178,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
     this->GeneratorTarget->GetLocalGenerator();
-  this->Name = this->Target->GetName();
+  this->Name = this->GeneratorTarget->GetName();
   this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
   this->Platform = gg->GetPlatformName();
   this->NsightTegra = gg->IsNsightTegra();
@@ -1775,7 +1775,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
       if(ttype == cmState::OBJECT_LIBRARY)
         {
         outDir = intermediateDir;
-        targetNameFull = this->Target->GetName();
+        targetNameFull = this->GeneratorTarget->GetName();
         targetNameFull += ".lib";
         }
       else
@@ -3325,7 +3325,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3408,7 +3409,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP81()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3468,7 +3470,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3520,7 +3523,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3577,7 +3581,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed09f3b292bee34e8b30204c93ef5596a3124d00
commit ed09f3b292bee34e8b30204c93ef5596a3124d00
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 20:05:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:44 2015 +0200

    Use IsImported from cmGeneratorTarget.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index f6de2ab..a5a1f29 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -417,7 +417,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
                                              const cmGeneratorTarget* dependee,
                                              bool linking)
 {
-  if(dependee->Target->IsImported() ||
+  if(dependee->IsImported() ||
      dependee->GetType() == cmState::INTERFACE_LIBRARY)
     {
     // Skip IMPORTED and INTERFACE targets but follow their utility
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 8f7b480..dc06678 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -45,7 +45,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const
   cmGeneratorTarget* target =
       this->LG->FindGeneratorTargetToUse(argv0);
   if(target && target->GetType() == cmState::EXECUTABLE &&
-     (target->Target->IsImported()
+     (target->IsImported()
       || !this->LG->GetMakefile()->IsOn("CMAKE_CROSSCOMPILING")))
     {
     return target->GetLocation(this->Config);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4d153b7..20fb70b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -796,7 +796,7 @@ void cmGeneratorTarget
 const char* cmGeneratorTarget::GetLocation(const std::string& config) const
 {
   static std::string location;
-  if (this->Target->IsImported())
+  if (this->IsImported())
     {
     location = this->Target->ImportedGetFullPath(config, false);
     }
@@ -1491,7 +1491,7 @@ bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const
 //----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetSOName(const std::string& config) const
 {
-  if(this->Target->IsImported())
+  if(this->IsImported())
     {
     // Lookup the imported soname.
     if(cmGeneratorTarget::ImportInfo const* info =
@@ -1606,7 +1606,7 @@ cmGeneratorTarget::GetFrameworkDirectory(const std::string& config,
 std::string
 cmGeneratorTarget::GetFullName(const std::string& config, bool implib) const
 {
-  if(this->Target->IsImported())
+  if(this->IsImported())
     {
     return this->GetFullNameImported(config, implib);
     }
@@ -3033,7 +3033,7 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list,
 void cmGeneratorTarget::ComputeTargetManifest(
                                               const std::string& config) const
 {
-  if (this->Target->IsImported())
+  if (this->IsImported())
     {
     return;
     }
@@ -3107,7 +3107,7 @@ void cmGeneratorTarget::ComputeTargetManifest(
 std::string cmGeneratorTarget::GetFullPath(const std::string& config,
                                            bool implib, bool realname) const
 {
-  if(this->Target->IsImported())
+  if(this->IsImported())
     {
     return this->Target->ImportedGetFullPath(config, implib);
     }
@@ -3152,7 +3152,7 @@ cmGeneratorTarget::NormalGetRealName(const std::string& config) const
   // This should not be called for imported targets.
   // TODO: Split cmTarget into a class hierarchy to get compile-time
   // enforcement of the limited imported target API.
-  if(this->Target->IsImported())
+  if(this->IsImported())
     {
     std::string msg =  "NormalGetRealName called on imported target: ";
     msg += this->GetName();
@@ -3194,7 +3194,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   // This should not be called for imported targets.
   // TODO: Split cmTarget into a class hierarchy to get compile-time
   // enforcement of the limited imported target API.
-  if(this->Target->IsImported())
+  if(this->IsImported())
     {
     std::string msg =  "GetLibraryNames called on imported target: ";
     msg += this->GetName();
@@ -3283,7 +3283,7 @@ void cmGeneratorTarget::GetExecutableNames(std::string& name,
   // This should not be called for imported targets.
   // TODO: Split cmTarget into a class hierarchy to get compile-time
   // enforcement of the limited imported target API.
-  if(this->Target->IsImported())
+  if(this->IsImported())
     {
     std::string msg =
       "GetExecutableNames called on imported target: ";
@@ -4735,7 +4735,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
 std::string cmGeneratorTarget::GetDirectory(const std::string& config,
                                    bool implib) const
 {
-  if (this->Target->IsImported())
+  if (this->IsImported())
     {
     // Return the directory from which the target is imported.
     return
@@ -5413,7 +5413,7 @@ const cmLinkImplementation *
 cmGeneratorTarget::GetLinkImplementation(const std::string& config) const
 {
   // There is no link implementation for imported targets.
-  if(this->Target->IsImported())
+  if(this->IsImported())
     {
     return 0;
     }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index ee31e28..8e671a3 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -473,7 +473,7 @@ cmGlobalUnixMakefileGenerator3
        (type == cmState::OBJECT_LIBRARY) ||
        (type == cmState::UTILITY))
       {
-      if(gtarget->Target->IsImported())
+      if(gtarget->IsImported())
         {
         continue;
         }
@@ -632,7 +632,7 @@ cmGlobalUnixMakefileGenerator3
         t != targets.end(); ++t)
       {
       cmGeneratorTarget* gtarget = t->second;
-      if(gtarget->Target->IsImported())
+      if(gtarget->IsImported())
         {
         continue;
         }
@@ -733,7 +733,7 @@ cmGlobalUnixMakefileGenerator3
       t != targets.end(); ++t)
     {
     cmGeneratorTarget* gtarget = t->second;
-    if(gtarget->Target->IsImported())
+    if(gtarget->IsImported())
       {
       continue;
       }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e4cfcde..c37f797 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -476,7 +476,7 @@ void cmLocalGenerator::ComputeTargetManifest()
       {
       continue;
       }
-    if (target.Target->IsImported())
+    if (target.IsImported())
       {
       continue;
       }
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 2535d2f..a408a23 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -32,7 +32,7 @@ void cmLocalGhsMultiGenerator::Generate()
        ++l)
     {
     if (l->second->GetType() == cmState::INTERFACE_LIBRARY
-        || l->second->Target->IsImported())
+        || l->second->IsImported())
       {
       continue;
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=beff29f0d4bf1ffface0e6833f29f2f04ceccf0b
commit beff29f0d4bf1ffface0e6833f29f2f04ceccf0b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:44 2015 +0200

    cmGeneratorTarget: Move ComputeVersionedName from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7e4c917..4d153b7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3250,11 +3250,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   else
   {
     // The library's soname.
-    this->Target->ComputeVersionedName(soName, prefix, base, suffix,
+    this->ComputeVersionedName(soName, prefix, base, suffix,
                               name, soversion);
 
     // The library's real name on disk.
-    this->Target->ComputeVersionedName(realName, prefix, base, suffix,
+    this->ComputeVersionedName(realName, prefix, base, suffix,
                               name, version);
   }
 
@@ -4437,6 +4437,23 @@ void cmGeneratorTarget::GetTargetVersion(bool soversion,
 }
 
 //----------------------------------------------------------------------------
+void cmGeneratorTarget::ComputeVersionedName(std::string& vName,
+                                    std::string const& prefix,
+                                    std::string const& base,
+                                    std::string const& suffix,
+                                    std::string const& name,
+                                    const char* version) const
+{
+  vName = this->Makefile->IsOn("APPLE") ? (prefix+base) : name;
+  if(version)
+    {
+    vName += ".";
+    vName += version;
+    }
+  vName += this->Makefile->IsOn("APPLE") ? suffix : std::string();
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ReportPropertyOrigin(const std::string &p,
                                const std::string &result,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f3b8d1f..f5a894b 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -483,6 +483,13 @@ private:
   // Returns ARCHIVE, LIBRARY, or RUNTIME based on platform and type.
   const char* GetOutputTargetType(bool implib) const;
 
+  void ComputeVersionedName(std::string& vName,
+                            std::string const& prefix,
+                            std::string const& base,
+                            std::string const& suffix,
+                            std::string const& name,
+                            const char* version) const;
+
   struct CompatibleInterfacesBase
   {
     std::set<std::string> PropsBool;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 850fc6a..1c4faab 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2119,23 +2119,6 @@ cmTarget::ImportedGetFullPath(const std::string& config, bool pimplib) const
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::ComputeVersionedName(std::string& vName,
-                                    std::string const& prefix,
-                                    std::string const& base,
-                                    std::string const& suffix,
-                                    std::string const& name,
-                                    const char* version) const
-{
-  vName = this->IsApple? (prefix+base) : name;
-  if(version)
-    {
-    vName += ".";
-    vName += version;
-    }
-  vName += this->IsApple? suffix : std::string();
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::SetPropertyDefault(const std::string& property,
                                   const char* default_value)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index a9d2454..443a2d0 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -414,13 +414,6 @@ private:
   friend class cmGeneratorTarget;
   friend class cmTargetTraceDependencies;
 
-  void ComputeVersionedName(std::string& vName,
-                            std::string const& prefix,
-                            std::string const& base,
-                            std::string const& suffix,
-                            std::string const& name,
-                            const char* version) const;
-
   cmListFileBacktrace Backtrace;
 };
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12e4790a0b40d8176940f855f7f6c9cfe6c39f9f
commit 12e4790a0b40d8176940f855f7f6c9cfe6c39f9f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:44 2015 +0200

    cmGeneratorTarget: Move GetTargetVersion from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b6c2967..7e4c917 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4399,6 +4399,44 @@ cmGeneratorTarget::GetLinkInformation(const std::string& config) const
 }
 
 //----------------------------------------------------------------------------
+void cmGeneratorTarget::GetTargetVersion(int& major, int& minor) const
+{
+  int patch;
+  this->GetTargetVersion(false, major, minor, patch);
+}
+
+//----------------------------------------------------------------------------
+void cmGeneratorTarget::GetTargetVersion(bool soversion,
+                                int& major, int& minor, int& patch) const
+{
+  // Set the default values.
+  major = 0;
+  minor = 0;
+  patch = 0;
+
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
+
+  // Look for a VERSION or SOVERSION property.
+  const char* prop = soversion? "SOVERSION" : "VERSION";
+  if(const char* version = this->GetProperty(prop))
+    {
+    // Try to parse the version number and store the results that were
+    // successfully parsed.
+    int parsed_major;
+    int parsed_minor;
+    int parsed_patch;
+    switch(sscanf(version, "%d.%d.%d",
+                  &parsed_major, &parsed_minor, &parsed_patch))
+      {
+      case 3: patch = parsed_patch; // no break!
+      case 2: minor = parsed_minor; // no break!
+      case 1: major = parsed_major; // no break!
+      default: break;
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ReportPropertyOrigin(const std::string &p,
                                const std::string &result,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 0c198bb..f3b8d1f 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -445,6 +445,17 @@ public:
 
   const char* ImportedGetLocation(const std::string& config) const;
 
+  /** Get the target major and minor version numbers interpreted from
+      the VERSION property.  Version 0 is returned if the property is
+      not set or cannot be parsed.  */
+  void GetTargetVersion(int& major, int& minor) const;
+
+  /** Get the target major, minor, and patch version numbers
+      interpreted from the VERSION or SOVERSION property.  Version 0
+      is returned if the property is not set or cannot be parsed.  */
+  void
+  GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bc05aea..8454bc1 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2422,7 +2422,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     int patch;
 
     // VERSION -> current_version
-    target.GetTargetVersion(false, major, minor, patch);
+    gtgt->GetTargetVersion(false, major, minor, patch);
     std::ostringstream v;
 
     // Xcode always wants at least 1.0.0 or nothing
@@ -2434,7 +2434,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                 this->CreateString(v.str().c_str()));
 
     // SOVERSION -> compatibility_version
-    target.GetTargetVersion(true, major, minor, patch);
+    gtgt->GetTargetVersion(true, major, minor, patch);
     std::ostringstream vso;
 
     // Xcode always wants at least 1.0.0 or nothing
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index b6f5aed..3e901ba 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1319,7 +1319,7 @@ void cmLocalVisualStudio6Generator
     {
     int major;
     int minor;
-    target.GetTargetVersion(major, minor);
+    gt->GetTargetVersion(major, minor);
     std::ostringstream targetVersionStream;
     targetVersionStream << "/version:" << major << "." << minor;
     targetVersionFlag = targetVersionStream.str();
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 1122919..6d02bfa 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1215,7 +1215,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, target);
+    this->WriteTargetVersionAttribute(fout, gt);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
@@ -1314,7 +1314,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, target);
+    this->WriteTargetVersionAttribute(fout, gt);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
@@ -1384,11 +1384,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
 //----------------------------------------------------------------------------
 void
 cmLocalVisualStudio7Generator
-::WriteTargetVersionAttribute(std::ostream& fout, cmTarget& target)
+::WriteTargetVersionAttribute(std::ostream& fout, cmGeneratorTarget* gt)
 {
   int major;
   int minor;
-  target.GetTargetVersion(major, minor);
+  gt->GetTargetVersion(major, minor);
   fout << "\t\t\t\tVersion=\"" << major << "." << minor << "\"\n";
 }
 
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index ba6a72b..16cf004 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -106,7 +106,8 @@ private:
                        const char* source,
                        const cmCustomCommand& command,
                        FCInfo& fcinfo);
-  void WriteTargetVersionAttribute(std::ostream& fout, cmTarget& target);
+  void WriteTargetVersionAttribute(std::ostream& fout,
+                                   cmGeneratorTarget* gt);
 
   bool WriteGroup(const cmSourceGroup *sg,
                   cmTarget& target, std::ostream &fout,
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 2d2de5f..ea91095 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -382,7 +382,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   std::ostringstream minorStream;
   int major;
   int minor;
-  this->Target->GetTargetVersion(major, minor);
+  this->GeneratorTarget->GetTargetVersion(major, minor);
   majorStream << major;
   minorStream << minor;
   targetVersionMajor = majorStream.str();
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index a0aa10b..6695143 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -630,7 +630,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   std::ostringstream minorStream;
   int major;
   int minor;
-  this->Target->GetTargetVersion(major, minor);
+  this->GeneratorTarget->GetTargetVersion(major, minor);
   majorStream << major;
   minorStream << minor;
   targetVersionMajor = majorStream.str();
@@ -862,7 +862,7 @@ cmMakefileLibraryTargetGenerator
   int major;
   int minor;
   int patch;
-  this->Target->GetTargetVersion(so, major, minor, patch);
+  this->GeneratorTarget->GetTargetVersion(so, major, minor, patch);
   if(major > 0 || minor > 0 || patch > 0)
     {
     // Append the flag since a non-zero version is specified.
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 066c64e..a8f182b 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -227,7 +227,7 @@ cmNinjaNormalTargetGenerator
     std::ostringstream minorStream;
     int major;
     int minor;
-    this->GetTarget()->GetTargetVersion(major, minor);
+    this->GetGeneratorTarget()->GetTargetVersion(major, minor);
     majorStream << major;
     minorStream << minor;
     targetVersionMajor = majorStream.str();
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7f21efe..850fc6a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1616,44 +1616,6 @@ bool cmTarget::HaveWellDefinedOutputFiles() const
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::GetTargetVersion(int& major, int& minor) const
-{
-  int patch;
-  this->GetTargetVersion(false, major, minor, patch);
-}
-
-//----------------------------------------------------------------------------
-void cmTarget::GetTargetVersion(bool soversion,
-                                int& major, int& minor, int& patch) const
-{
-  // Set the default values.
-  major = 0;
-  minor = 0;
-  patch = 0;
-
-  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
-
-  // Look for a VERSION or SOVERSION property.
-  const char* prop = soversion? "SOVERSION" : "VERSION";
-  if(const char* version = this->GetProperty(prop))
-    {
-    // Try to parse the version number and store the results that were
-    // successfully parsed.
-    int parsed_major;
-    int parsed_minor;
-    int parsed_patch;
-    switch(sscanf(version, "%d.%d.%d",
-                  &parsed_major, &parsed_minor, &parsed_patch))
-      {
-      case 3: patch = parsed_patch; // no break!
-      case 2: minor = parsed_minor; // no break!
-      case 1: major = parsed_major; // no break!
-      default: break;
-      }
-    }
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const
 {
   if (this->IsImported())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 6cd876e..a9d2454 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -213,17 +213,6 @@ public:
 
   bool IsImported() const {return this->IsImportedTarget;}
 
-  /** Get the target major and minor version numbers interpreted from
-      the VERSION property.  Version 0 is returned if the property is
-      not set or cannot be parsed.  */
-  void GetTargetVersion(int& major, int& minor) const;
-
-  /** Get the target major, minor, and patch version numbers
-      interpreted from the VERSION or SOVERSION property.  Version 0
-      is returned if the property is not set or cannot be parsed.  */
-  void
-  GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const;
-
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14272277205ac7927a4c13b628ce411538f7b17c
commit 14272277205ac7927a4c13b628ce411538f7b17c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:44 2015 +0200

    cmGeneratorTarget: Move CheckCMP0004 from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 87a75b4..b6c2967 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4445,7 +4445,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
   for(std::vector<std::string>::const_iterator i = names.begin();
       i != names.end(); ++i)
     {
-    std::string name = this->Target->CheckCMP0004(*i);
+    std::string name = this->CheckCMP0004(*i);
     if(name == this->GetName() || name.empty())
       {
       continue;
@@ -5476,6 +5476,65 @@ void cmGeneratorTarget::GetObjectLibrariesCMP0026(
 }
 
 //----------------------------------------------------------------------------
+std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const
+{
+  // Strip whitespace off the library names because we used to do this
+  // in case variables were expanded at generate time.  We no longer
+  // do the expansion but users link to libraries like " ${VAR} ".
+  std::string lib = item;
+  std::string::size_type pos = lib.find_first_not_of(" \t\r\n");
+  if(pos != lib.npos)
+    {
+    lib = lib.substr(pos, lib.npos);
+    }
+  pos = lib.find_last_not_of(" \t\r\n");
+  if(pos != lib.npos)
+    {
+    lib = lib.substr(0, pos+1);
+    }
+  if(lib != item)
+    {
+    cmake* cm = this->LocalGenerator->GetCMakeInstance();
+    switch(this->Target->GetPolicyStatusCMP0004())
+      {
+      case cmPolicies::WARN:
+        {
+        std::ostringstream w;
+        w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0004) << "\n"
+          << "Target \"" << this->GetName() << "\" links to item \""
+          << item << "\" which has leading or trailing whitespace.";
+        cm->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
+                         this->Target->GetBacktrace());
+        }
+      case cmPolicies::OLD:
+        break;
+      case cmPolicies::NEW:
+        {
+        std::ostringstream e;
+        e << "Target \"" << this->GetName() << "\" links to item \""
+          << item << "\" which has leading or trailing whitespace.  "
+          << "This is now an error according to policy CMP0004.";
+        cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                         this->Target->GetBacktrace());
+        }
+        break;
+      case cmPolicies::REQUIRED_IF_USED:
+      case cmPolicies::REQUIRED_ALWAYS:
+        {
+        std::ostringstream e;
+        e << cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0004) << "\n"
+          << "Target \"" << this->GetName() << "\" links to item \""
+          << item << "\" which has leading or trailing whitespace.";
+        cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
+                         this->Target->GetBacktrace());
+        }
+        break;
+      }
+    }
+  return lib;
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages,
                             const std::string& config) const
 {
@@ -5636,7 +5695,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
         li != llibs.end(); ++li)
       {
       // Skip entries that resolve to the target itself or are empty.
-      std::string name = this->Target->CheckCMP0004(*li);
+      std::string name = this->CheckCMP0004(*li);
       if(name == this->GetName() || name.empty())
         {
         if(name == this->GetName())
@@ -5702,7 +5761,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
     {
     if(li->second != GENERAL_LibraryType && li->second != linkType)
       {
-      std::string name = this->Target->CheckCMP0004(li->first);
+      std::string name = this->CheckCMP0004(li->first);
       if(name == this->GetName() || name.empty())
         {
         continue;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f72c85d..0c198bb 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -537,6 +537,9 @@ private:
                          ImportInfo& info) const;
   ImportInfo const* GetImportInfo(const std::string& config) const;
 
+  /** Strip off leading and trailing whitespace from an item named in
+      the link dependencies of this target.  */
+  std::string CheckCMP0004(std::string const& item) const;
 
   cmLinkInterface const*
     GetImportLinkInterface(const std::string& config,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 55a9c49..7f21efe 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2368,63 +2368,6 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::CheckCMP0004(std::string const& item) const
-{
-  // Strip whitespace off the library names because we used to do this
-  // in case variables were expanded at generate time.  We no longer
-  // do the expansion but users link to libraries like " ${VAR} ".
-  std::string lib = item;
-  std::string::size_type pos = lib.find_first_not_of(" \t\r\n");
-  if(pos != lib.npos)
-    {
-    lib = lib.substr(pos, lib.npos);
-    }
-  pos = lib.find_last_not_of(" \t\r\n");
-  if(pos != lib.npos)
-    {
-    lib = lib.substr(0, pos+1);
-    }
-  if(lib != item)
-    {
-    cmake* cm = this->Makefile->GetCMakeInstance();
-    switch(this->GetPolicyStatusCMP0004())
-      {
-      case cmPolicies::WARN:
-        {
-        std::ostringstream w;
-        w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0004) << "\n"
-          << "Target \"" << this->GetName() << "\" links to item \""
-          << item << "\" which has leading or trailing whitespace.";
-        cm->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
-                         this->GetBacktrace());
-        }
-      case cmPolicies::OLD:
-        break;
-      case cmPolicies::NEW:
-        {
-        std::ostringstream e;
-        e << "Target \"" << this->GetName() << "\" links to item \""
-          << item << "\" which has leading or trailing whitespace.  "
-          << "This is now an error according to policy CMP0004.";
-        cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->GetBacktrace());
-        }
-        break;
-      case cmPolicies::REQUIRED_IF_USED:
-      case cmPolicies::REQUIRED_ALWAYS:
-        {
-        std::ostringstream e;
-        e << cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0004) << "\n"
-          << "Target \"" << this->GetName() << "\" links to item \""
-          << item << "\" which has leading or trailing whitespace.";
-        cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->GetBacktrace());
-        }
-        break;
-      }
-    }
-  return lib;
-}
-
-//----------------------------------------------------------------------------
 cmTargetInternalPointer::cmTargetInternalPointer()
 {
   this->Pointer = new cmTargetInternals;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index fa11953..6cd876e 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -213,10 +213,6 @@ public:
 
   bool IsImported() const {return this->IsImportedTarget;}
 
-  /** Strip off leading and trailing whitespace from an item named in
-      the link dependencies of this target.  */
-  std::string CheckCMP0004(std::string const& item) const;
-
   /** Get the target major and minor version numbers interpreted from
       the VERSION property.  Version 0 is returned if the property is
       not set or cannot be parsed.  */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f363d6771dfa792d606978e1e406229637078f6
commit 8f363d6771dfa792d606978e1e406229637078f6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:43 2015 +0200

    cmGeneratorTarget: Move ImportInfo from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2ef2f5c..87a75b4 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1364,7 +1364,8 @@ bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName(
 {
   if(this->IsImported() && this->GetType() == cmState::SHARED_LIBRARY)
     {
-    if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
+    if(cmGeneratorTarget::ImportInfo const* info =
+       this->GetImportInfo(config))
       {
       return info->NoSOName;
       }
@@ -1405,7 +1406,8 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
   else
     {
     // Lookup the imported soname.
-    if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
+    if(cmGeneratorTarget::ImportInfo const* info =
+       this->GetImportInfo(config))
       {
       if(!info->NoSOName && !info->SOName.empty())
         {
@@ -1492,7 +1494,8 @@ std::string cmGeneratorTarget::GetSOName(const std::string& config) const
   if(this->Target->IsImported())
     {
     // Lookup the imported soname.
-    if(cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config))
+    if(cmGeneratorTarget::ImportInfo const* info =
+       this->GetImportInfo(config))
       {
       if(info->NoSOName)
         {
@@ -5080,7 +5083,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
                                  cmGeneratorTarget const* headTarget,
                                  bool usage_requirements_only) const
 {
-  cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config);
+  cmGeneratorTarget::ImportInfo const* info = this->GetImportInfo(config);
   if(!info)
     {
     return 0;
@@ -5118,6 +5121,223 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
   return &iface;
 }
 
+//----------------------------------------------------------------------------
+cmGeneratorTarget::ImportInfo const*
+cmGeneratorTarget::GetImportInfo(const std::string& config) const
+{
+  // There is no imported information for non-imported targets.
+  if(!this->IsImported())
+    {
+    return 0;
+    }
+
+  // Lookup/compute/cache the import information for this
+  // configuration.
+  std::string config_upper;
+  if(!config.empty())
+    {
+    config_upper = cmSystemTools::UpperCase(config);
+    }
+  else
+    {
+    config_upper = "NOCONFIG";
+    }
+
+  ImportInfoMapType::const_iterator i =
+    this->ImportInfoMap.find(config_upper);
+  if(i == this->ImportInfoMap.end())
+    {
+    ImportInfo info;
+    this->ComputeImportInfo(config_upper, info);
+    ImportInfoMapType::value_type entry(config_upper, info);
+    i = this->ImportInfoMap.insert(entry).first;
+    }
+
+  if(this->GetType() == cmState::INTERFACE_LIBRARY)
+    {
+    return &i->second;
+    }
+  // If the location is empty then the target is not available for
+  // this configuration.
+  if(i->second.Location.empty() && i->second.ImportLibrary.empty())
+    {
+    return 0;
+    }
+
+  // Return the import information.
+  return &i->second;
+}
+
+//----------------------------------------------------------------------------
+void cmGeneratorTarget::ComputeImportInfo(std::string const& desired_config,
+                                 ImportInfo& info) const
+{
+  // This method finds information about an imported target from its
+  // properties.  The "IMPORTED_" namespace is reserved for properties
+  // defined by the project exporting the target.
+
+  // Initialize members.
+  info.NoSOName = false;
+
+  const char* loc = 0;
+  const char* imp = 0;
+  std::string suffix;
+  if (!this->Target->GetMappedConfig(desired_config, &loc, &imp, suffix))
+    {
+    return;
+    }
+
+  // Get the link interface.
+  {
+  std::string linkProp = "INTERFACE_LINK_LIBRARIES";
+  const char *propertyLibs = this->GetProperty(linkProp);
+
+  if (this->GetType() != cmState::INTERFACE_LIBRARY)
+    {
+    if(!propertyLibs)
+      {
+      linkProp = "IMPORTED_LINK_INTERFACE_LIBRARIES";
+      linkProp += suffix;
+      propertyLibs = this->GetProperty(linkProp);
+      }
+
+    if(!propertyLibs)
+      {
+      linkProp = "IMPORTED_LINK_INTERFACE_LIBRARIES";
+      propertyLibs = this->GetProperty(linkProp);
+      }
+    }
+  if(propertyLibs)
+    {
+    info.LibrariesProp = linkProp;
+    info.Libraries = propertyLibs;
+    }
+  }
+  if(this->GetType() == cmState::INTERFACE_LIBRARY)
+    {
+    return;
+    }
+
+  // A provided configuration has been chosen.  Load the
+  // configuration's properties.
+
+  // Get the location.
+  if(loc)
+    {
+    info.Location = loc;
+    }
+  else
+    {
+    std::string impProp = "IMPORTED_LOCATION";
+    impProp += suffix;
+    if(const char* config_location = this->GetProperty(impProp))
+      {
+      info.Location = config_location;
+      }
+    else if(const char* location = this->GetProperty("IMPORTED_LOCATION"))
+      {
+      info.Location = location;
+      }
+    }
+
+  // Get the soname.
+  if(this->GetType() == cmState::SHARED_LIBRARY)
+    {
+    std::string soProp = "IMPORTED_SONAME";
+    soProp += suffix;
+    if(const char* config_soname = this->GetProperty(soProp))
+      {
+      info.SOName = config_soname;
+      }
+    else if(const char* soname = this->GetProperty("IMPORTED_SONAME"))
+      {
+      info.SOName = soname;
+      }
+    }
+
+  // Get the "no-soname" mark.
+  if(this->GetType() == cmState::SHARED_LIBRARY)
+    {
+    std::string soProp = "IMPORTED_NO_SONAME";
+    soProp += suffix;
+    if(const char* config_no_soname = this->GetProperty(soProp))
+      {
+      info.NoSOName = cmSystemTools::IsOn(config_no_soname);
+      }
+    else if(const char* no_soname = this->GetProperty("IMPORTED_NO_SONAME"))
+      {
+      info.NoSOName = cmSystemTools::IsOn(no_soname);
+      }
+    }
+
+  // Get the import library.
+  if(imp)
+    {
+    info.ImportLibrary = imp;
+    }
+  else if(this->GetType() == cmState::SHARED_LIBRARY ||
+          this->Target->IsExecutableWithExports())
+    {
+    std::string impProp = "IMPORTED_IMPLIB";
+    impProp += suffix;
+    if(const char* config_implib = this->GetProperty(impProp))
+      {
+      info.ImportLibrary = config_implib;
+      }
+    else if(const char* implib = this->GetProperty("IMPORTED_IMPLIB"))
+      {
+      info.ImportLibrary = implib;
+      }
+    }
+
+  // Get the link dependencies.
+  {
+  std::string linkProp = "IMPORTED_LINK_DEPENDENT_LIBRARIES";
+  linkProp += suffix;
+  if(const char* config_libs = this->GetProperty(linkProp))
+    {
+    info.SharedDeps = config_libs;
+    }
+  else if(const char* libs =
+          this->GetProperty("IMPORTED_LINK_DEPENDENT_LIBRARIES"))
+    {
+    info.SharedDeps = libs;
+    }
+  }
+
+  // Get the link languages.
+  if(this->Target->LinkLanguagePropagatesToDependents())
+    {
+    std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES";
+    linkProp += suffix;
+    if(const char* config_libs = this->GetProperty(linkProp))
+      {
+      info.Languages = config_libs;
+      }
+    else if(const char* libs =
+            this->GetProperty("IMPORTED_LINK_INTERFACE_LANGUAGES"))
+      {
+      info.Languages = libs;
+      }
+    }
+
+  // Get the cyclic repetition count.
+  if(this->GetType() == cmState::STATIC_LIBRARY)
+    {
+    std::string linkProp = "IMPORTED_LINK_INTERFACE_MULTIPLICITY";
+    linkProp += suffix;
+    if(const char* config_reps = this->GetProperty(linkProp))
+      {
+      sscanf(config_reps, "%u", &info.Multiplicity);
+      }
+    else if(const char* reps =
+            this->GetProperty("IMPORTED_LINK_INTERFACE_MULTIPLICITY"))
+      {
+      sscanf(reps, "%u", &info.Multiplicity);
+      }
+    }
+}
+
 cmHeadToLinkInterfaceMap&
 cmGeneratorTarget::GetHeadToLinkInterfaceMap(const std::string &config) const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e48e36e..f72c85d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -516,6 +516,28 @@ private:
   cmHeadToLinkInterfaceMap& GetHeadToLinkInterfaceUsageRequirementsMap(
       std::string const& config) const;
 
+  // Cache import information from properties for each configuration.
+  struct ImportInfo
+  {
+    ImportInfo(): NoSOName(false), Multiplicity(0) {}
+    bool NoSOName;
+    int Multiplicity;
+    std::string Location;
+    std::string SOName;
+    std::string ImportLibrary;
+    std::string Languages;
+    std::string Libraries;
+    std::string LibrariesProp;
+    std::string SharedDeps;
+  };
+
+  typedef std::map<std::string, ImportInfo> ImportInfoMapType;
+  mutable ImportInfoMapType ImportInfoMap;
+  void ComputeImportInfo(std::string const& desired_config,
+                         ImportInfo& info) const;
+  ImportInfo const* GetImportInfo(const std::string& config) const;
+
+
   cmLinkInterface const*
     GetImportLinkInterface(const std::string& config,
                            const cmGeneratorTarget* head,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c5e19cc..55a9c49 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1316,7 +1316,6 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
   else
     {
     this->Properties.SetProperty(prop, value);
-    this->MaybeInvalidatePropertyCache(prop);
     }
 }
 
@@ -1409,7 +1408,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
   else
     {
     this->Properties.AppendProperty(prop, value, asString);
-    this->MaybeInvalidatePropertyCache(prop);
     }
 }
 
@@ -1508,16 +1506,6 @@ void cmTarget::InsertCompileDefinition(std::string const& entry,
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop)
-{
-  // Wipe out maps caching information affected by this property.
-  if(this->IsImported() && cmHasLiteralPrefix(prop, "IMPORTED"))
-    {
-    this->ImportInfoMap.clear();
-    }
-}
-
-//----------------------------------------------------------------------------
 static void cmTargetCheckLINK_INTERFACE_LIBRARIES(
   const std::string& prop, const char* value, cmMakefile* context,
   bool imported)
@@ -2248,53 +2236,6 @@ const char* cmTarget::GetExportMacro() const
     }
 }
 
-//----------------------------------------------------------------------------
-cmTarget::ImportInfo const*
-cmTarget::GetImportInfo(const std::string& config) const
-{
-  // There is no imported information for non-imported targets.
-  if(!this->IsImported())
-    {
-    return 0;
-    }
-
-  // Lookup/compute/cache the import information for this
-  // configuration.
-  std::string config_upper;
-  if(!config.empty())
-    {
-    config_upper = cmSystemTools::UpperCase(config);
-    }
-  else
-    {
-    config_upper = "NOCONFIG";
-    }
-
-  ImportInfoMapType::const_iterator i =
-    this->ImportInfoMap.find(config_upper);
-  if(i == this->ImportInfoMap.end())
-    {
-    ImportInfo info;
-    this->ComputeImportInfo(config_upper, info);
-    ImportInfoMapType::value_type entry(config_upper, info);
-    i = this->ImportInfoMap.insert(entry).first;
-    }
-
-  if(this->GetType() == cmState::INTERFACE_LIBRARY)
-    {
-    return &i->second;
-    }
-  // If the location is empty then the target is not available for
-  // this configuration.
-  if(i->second.Location.empty() && i->second.ImportLibrary.empty())
-    {
-    return 0;
-    }
-
-  // Return the import information.
-  return &i->second;
-}
-
 bool cmTarget::GetMappedConfig(std::string const& desired_config,
                                const char** loc,
                                const char** imp,
@@ -2427,176 +2368,6 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::ComputeImportInfo(std::string const& desired_config,
-                                 ImportInfo& info) const
-{
-  // This method finds information about an imported target from its
-  // properties.  The "IMPORTED_" namespace is reserved for properties
-  // defined by the project exporting the target.
-
-  // Initialize members.
-  info.NoSOName = false;
-
-  const char* loc = 0;
-  const char* imp = 0;
-  std::string suffix;
-  if (!this->GetMappedConfig(desired_config, &loc, &imp, suffix))
-    {
-    return;
-    }
-
-  // Get the link interface.
-  {
-  std::string linkProp = "INTERFACE_LINK_LIBRARIES";
-  const char *propertyLibs = this->GetProperty(linkProp);
-
-  if (this->GetType() != cmState::INTERFACE_LIBRARY)
-    {
-    if(!propertyLibs)
-      {
-      linkProp = "IMPORTED_LINK_INTERFACE_LIBRARIES";
-      linkProp += suffix;
-      propertyLibs = this->GetProperty(linkProp);
-      }
-
-    if(!propertyLibs)
-      {
-      linkProp = "IMPORTED_LINK_INTERFACE_LIBRARIES";
-      propertyLibs = this->GetProperty(linkProp);
-      }
-    }
-  if(propertyLibs)
-    {
-    info.LibrariesProp = linkProp;
-    info.Libraries = propertyLibs;
-    }
-  }
-  if(this->GetType() == cmState::INTERFACE_LIBRARY)
-    {
-    return;
-    }
-
-  // A provided configuration has been chosen.  Load the
-  // configuration's properties.
-
-  // Get the location.
-  if(loc)
-    {
-    info.Location = loc;
-    }
-  else
-    {
-    std::string impProp = "IMPORTED_LOCATION";
-    impProp += suffix;
-    if(const char* config_location = this->GetProperty(impProp))
-      {
-      info.Location = config_location;
-      }
-    else if(const char* location = this->GetProperty("IMPORTED_LOCATION"))
-      {
-      info.Location = location;
-      }
-    }
-
-  // Get the soname.
-  if(this->GetType() == cmState::SHARED_LIBRARY)
-    {
-    std::string soProp = "IMPORTED_SONAME";
-    soProp += suffix;
-    if(const char* config_soname = this->GetProperty(soProp))
-      {
-      info.SOName = config_soname;
-      }
-    else if(const char* soname = this->GetProperty("IMPORTED_SONAME"))
-      {
-      info.SOName = soname;
-      }
-    }
-
-  // Get the "no-soname" mark.
-  if(this->GetType() == cmState::SHARED_LIBRARY)
-    {
-    std::string soProp = "IMPORTED_NO_SONAME";
-    soProp += suffix;
-    if(const char* config_no_soname = this->GetProperty(soProp))
-      {
-      info.NoSOName = cmSystemTools::IsOn(config_no_soname);
-      }
-    else if(const char* no_soname = this->GetProperty("IMPORTED_NO_SONAME"))
-      {
-      info.NoSOName = cmSystemTools::IsOn(no_soname);
-      }
-    }
-
-  // Get the import library.
-  if(imp)
-    {
-    info.ImportLibrary = imp;
-    }
-  else if(this->GetType() == cmState::SHARED_LIBRARY ||
-          this->IsExecutableWithExports())
-    {
-    std::string impProp = "IMPORTED_IMPLIB";
-    impProp += suffix;
-    if(const char* config_implib = this->GetProperty(impProp))
-      {
-      info.ImportLibrary = config_implib;
-      }
-    else if(const char* implib = this->GetProperty("IMPORTED_IMPLIB"))
-      {
-      info.ImportLibrary = implib;
-      }
-    }
-
-  // Get the link dependencies.
-  {
-  std::string linkProp = "IMPORTED_LINK_DEPENDENT_LIBRARIES";
-  linkProp += suffix;
-  if(const char* config_libs = this->GetProperty(linkProp))
-    {
-    info.SharedDeps = config_libs;
-    }
-  else if(const char* libs =
-          this->GetProperty("IMPORTED_LINK_DEPENDENT_LIBRARIES"))
-    {
-    info.SharedDeps = libs;
-    }
-  }
-
-  // Get the link languages.
-  if(this->LinkLanguagePropagatesToDependents())
-    {
-    std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES";
-    linkProp += suffix;
-    if(const char* config_libs = this->GetProperty(linkProp))
-      {
-      info.Languages = config_libs;
-      }
-    else if(const char* libs =
-            this->GetProperty("IMPORTED_LINK_INTERFACE_LANGUAGES"))
-      {
-      info.Languages = libs;
-      }
-    }
-
-  // Get the cyclic repetition count.
-  if(this->GetType() == cmState::STATIC_LIBRARY)
-    {
-    std::string linkProp = "IMPORTED_LINK_INTERFACE_MULTIPLICITY";
-    linkProp += suffix;
-    if(const char* config_reps = this->GetProperty(linkProp))
-      {
-      sscanf(config_reps, "%u", &info.Multiplicity);
-      }
-    else if(const char* reps =
-            this->GetProperty("IMPORTED_LINK_INTERFACE_MULTIPLICITY"))
-      {
-      sscanf(reps, "%u", &info.Multiplicity);
-      }
-    }
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::CheckCMP0004(std::string const& item) const
 {
   // Strip whitespace off the library names because we used to do this
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7715c7c..fa11953 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -419,32 +419,8 @@ private:
   bool LinkLibrariesForVS6Analyzed;
 #endif
 
-  // Cache import information from properties for each configuration.
-  struct ImportInfo
-  {
-    ImportInfo(): NoSOName(false), Multiplicity(0) {}
-    bool NoSOName;
-    int Multiplicity;
-    std::string Location;
-    std::string SOName;
-    std::string ImportLibrary;
-    std::string Languages;
-    std::string Libraries;
-    std::string LibrariesProp;
-    std::string SharedDeps;
-  };
-
-  typedef std::map<std::string, ImportInfo> ImportInfoMapType;
-  mutable ImportInfoMapType ImportInfoMap;
-
-  ImportInfo const* GetImportInfo(const std::string& config) const;
-  void ComputeImportInfo(std::string const& desired_config,
-                         ImportInfo& info) const;
-
   std::string ProcessSourceItemCMP0049(const std::string& s);
 
-  void MaybeInvalidatePropertyCache(const std::string& prop);
-
   /** Return whether or not the target has a DLL import library.  */
   bool HasImportLibrary() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5794dbc301ace0041c5fc50096cc5331e8ba3c34
commit 5794dbc301ace0041c5fc50096cc5331e8ba3c34
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:39:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:43 2015 +0200

    cmTarget: Inline the essential part of imported target location.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 60c5e64..c5e19cc 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2091,13 +2091,75 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 
 //----------------------------------------------------------------------------
 std::string
-cmTarget::ImportedGetFullPath(const std::string& config, bool implib) const
+cmTarget::ImportedGetFullPath(const std::string& config, bool pimplib) const
 {
+  assert(this->IsImported());
+
+  // Lookup/compute/cache the import information for this
+  // configuration.
+  std::string config_upper;
+  if(!config.empty())
+    {
+    config_upper = cmSystemTools::UpperCase(config);
+    }
+  else
+    {
+    config_upper = "NOCONFIG";
+    }
+
   std::string result;
-  if(cmTarget::ImportInfo const* info = this->GetImportInfo(config))
+
+  const char* loc = 0;
+  const char* imp = 0;
+  std::string suffix;
+
+  if(this->GetType() != cmState::INTERFACE_LIBRARY
+     && this->GetMappedConfig(config_upper, &loc, &imp, suffix))
     {
-    result = implib? info->ImportLibrary : info->Location;
+    if (!pimplib)
+      {
+      if(loc)
+        {
+        result = loc;
+        }
+      else
+        {
+        std::string impProp = "IMPORTED_LOCATION";
+        impProp += suffix;
+        if(const char* config_location = this->GetProperty(impProp))
+          {
+          result = config_location;
+          }
+        else if(const char* location =
+                this->GetProperty("IMPORTED_LOCATION"))
+          {
+          result = location;
+          }
+        }
+      }
+    else
+      {
+      if(imp)
+        {
+        result = imp;
+        }
+      else if(this->GetType() == cmState::SHARED_LIBRARY ||
+              this->IsExecutableWithExports())
+        {
+        std::string impProp = "IMPORTED_IMPLIB";
+        impProp += suffix;
+        if(const char* config_implib = this->GetProperty(impProp))
+          {
+          result = config_implib;
+          }
+        else if(const char* implib = this->GetProperty("IMPORTED_IMPLIB"))
+          {
+          result = implib;
+          }
+        }
+      }
     }
+
   if(result.empty())
     {
     result = this->GetName();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a892b285f8c621ba50f45f5c4218980c911fd1b6
commit a892b285f8c621ba50f45f5c4218980c911fd1b6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:43 2015 +0200

    cmGeneratorTarget: Move ImportedGetLocation from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 98150df..2ef2f5c 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3344,6 +3344,16 @@ std::string cmGeneratorTarget::GetFullNameInternal(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
+const char*
+cmGeneratorTarget::ImportedGetLocation(const std::string& config) const
+{
+  static std::string location;
+  assert(this->IsImported());
+  location = this->Target->ImportedGetFullPath(config, false);
+  return location.c_str();
+}
+
+//----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetFullNameImported(const std::string& config,
                                                    bool implib) const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index cf8c18f..e48e36e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -443,6 +443,8 @@ public:
       no soname at all.  */
   bool IsImportedSharedLibWithoutSOName(const std::string& config) const;
 
+  const char* ImportedGetLocation(const std::string& config) const;
+
 private:
   friend class cmTargetTraceDependencies;
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index f9875b3..41172f6 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -132,6 +132,7 @@ static void SetupAutoMocTarget(cmGeneratorTarget const* target,
                           std::map<std::string, std::string> &configIncludes,
                           std::map<std::string, std::string> &configDefines)
 {
+  cmLocalGenerator* lg = target->GetLocalGenerator();
   cmMakefile* makefile = target->Target->GetMakefile();
 
   const char* tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
@@ -188,7 +189,8 @@ static void SetupAutoMocTarget(cmGeneratorTarget const* target,
   const char *qtVersion = makefile->GetDefinition("_target_qt_version");
   if (strcmp(qtVersion, "5") == 0)
     {
-    cmTarget *qt5Moc = makefile->FindTargetToUse("Qt5::moc");
+    cmGeneratorTarget *qt5Moc =
+        lg->FindGeneratorTargetToUse("Qt5::moc");
     if (!qt5Moc)
       {
       cmSystemTools::Error("Qt5::moc target not found ",
@@ -200,7 +202,8 @@ static void SetupAutoMocTarget(cmGeneratorTarget const* target,
     }
   else if (strcmp(qtVersion, "4") == 0)
     {
-    cmTarget *qt4Moc = makefile->FindTargetToUse("Qt4::moc");
+    cmGeneratorTarget *qt4Moc =
+        lg->FindGeneratorTargetToUse("Qt4::moc");
     if (!qt4Moc)
       {
       cmSystemTools::Error("Qt4::moc target not found ",
@@ -230,6 +233,7 @@ static void SetupAutoUicTarget(cmGeneratorTarget const* target,
                           std::vector<std::string> const& skipUic,
                           std::map<std::string, std::string> &configUicOptions)
 {
+  cmLocalGenerator* lg = target->GetLocalGenerator();
   cmMakefile *makefile = target->Target->GetMakefile();
 
   std::set<std::string> skipped;
@@ -303,7 +307,8 @@ static void SetupAutoUicTarget(cmGeneratorTarget const* target,
   std::string targetName = target->GetName();
   if (strcmp(qtVersion, "5") == 0)
     {
-    cmTarget *qt5Uic = makefile->FindTargetToUse("Qt5::uic");
+    cmGeneratorTarget *qt5Uic =
+        lg->FindGeneratorTargetToUse("Qt5::uic");
     if (!qt5Uic)
       {
       // Project does not use Qt5Widgets, but has AUTOUIC ON anyway
@@ -316,7 +321,8 @@ static void SetupAutoUicTarget(cmGeneratorTarget const* target,
     }
   else if (strcmp(qtVersion, "4") == 0)
     {
-    cmTarget *qt4Uic = makefile->FindTargetToUse("Qt4::uic");
+    cmGeneratorTarget *qt4Uic =
+        lg->FindGeneratorTargetToUse("Qt4::uic");
     if (!qt4Uic)
       {
       cmSystemTools::Error("Qt4::uic target not found ",
@@ -335,6 +341,7 @@ static void SetupAutoUicTarget(cmGeneratorTarget const* target,
 
 static std::string GetRccExecutable(cmGeneratorTarget const* target)
 {
+  cmLocalGenerator* lg = target->GetLocalGenerator();
   cmMakefile *makefile = target->Target->GetMakefile();
   const char *qtVersion = makefile->GetDefinition("_target_qt_version");
   if (!qtVersion)
@@ -355,7 +362,8 @@ static std::string GetRccExecutable(cmGeneratorTarget const* target)
   std::string targetName = target->GetName();
   if (strcmp(qtVersion, "5") == 0)
     {
-    cmTarget *qt5Rcc = makefile->FindTargetToUse("Qt5::rcc");
+    cmGeneratorTarget *qt5Rcc =
+        lg->FindGeneratorTargetToUse("Qt5::rcc");
     if (!qt5Rcc)
       {
       cmSystemTools::Error("Qt5::rcc target not found ",
@@ -366,7 +374,8 @@ static std::string GetRccExecutable(cmGeneratorTarget const* target)
     }
   else if (strcmp(qtVersion, "4") == 0)
     {
-    cmTarget *qt4Rcc = makefile->FindTargetToUse("Qt4::rcc");
+    cmGeneratorTarget *qt4Rcc =
+        lg->FindGeneratorTargetToUse("Qt4::rcc");
     if (!qt4Rcc)
       {
       cmSystemTools::Error("Qt4::rcc target not found ",
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index bd01140..60c5e64 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1628,15 +1628,6 @@ bool cmTarget::HaveWellDefinedOutputFiles() const
 }
 
 //----------------------------------------------------------------------------
-const char* cmTarget::ImportedGetLocation(const std::string& config) const
-{
-  static std::string location;
-  assert(this->IsImported());
-  location = this->ImportedGetFullPath(config, false);
-  return location.c_str();
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::GetTargetVersion(int& major, int& minor) const
 {
   int patch;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index a2846df..7715c7c 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -217,8 +217,6 @@ public:
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;
 
-  const char* ImportedGetLocation(const std::string& config) const;
-
   /** Get the target major and minor version numbers interpreted from
       the VERSION property.  Version 0 is returned if the property is
       not set or cannot be parsed.  */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb8c728f17a61732064280ddb98203cb277e5a3c
commit cb8c728f17a61732064280ddb98203cb277e5a3c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:43 2015 +0200

    cmGeneratorTarget: Move GetFullNameImported from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 806d27d..98150df 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1605,7 +1605,7 @@ cmGeneratorTarget::GetFullName(const std::string& config, bool implib) const
 {
   if(this->Target->IsImported())
     {
-    return this->Target->GetFullNameImported(config, implib);
+    return this->GetFullNameImported(config, implib);
     }
   else
     {
@@ -3344,6 +3344,14 @@ std::string cmGeneratorTarget::GetFullNameInternal(const std::string& config,
 }
 
 //----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetFullNameImported(const std::string& config,
+                                                   bool implib) const
+{
+  return cmSystemTools::GetFilenameName(
+    this->Target->ImportedGetFullPath(config, implib));
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
                                             bool implib,
                                             std::string& outPrefix,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 39c9772..cf8c18f 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -229,6 +229,9 @@ public:
   void
   GetObjectLibrariesCMP0026(std::vector<cmGeneratorTarget*>& objlibs) const;
 
+  std::string GetFullNameImported(const std::string& config,
+                                  bool implib) const;
+
   bool GetConfigCommonSourceFiles(std::vector<cmSourceFile*>& files) const;
 
   bool HaveBuildTreeRPATH(const std::string& config) const;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a7372e3..bd01140 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2100,14 +2100,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
 
 //----------------------------------------------------------------------------
 std::string
-cmTarget::GetFullNameImported(const std::string& config, bool implib) const
-{
-  return cmSystemTools::GetFilenameName(
-    this->ImportedGetFullPath(config, implib));
-}
-
-//----------------------------------------------------------------------------
-std::string
 cmTarget::ImportedGetFullPath(const std::string& config, bool implib) const
 {
   std::string result;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index dda6e6a..a2846df 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -383,9 +383,6 @@ private:
   void SetPropertyDefault(const std::string& property,
                           const char* default_value);
 
-  std::string GetFullNameImported(const std::string& config,
-                                  bool implib) const;
-
   std::string ImportedGetFullPath(const std::string& config,
                                   bool implib) const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb4fca0b5efabdf061bd256ed9d35edae6f42b9d
commit fb4fca0b5efabdf061bd256ed9d35edae6f42b9d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:24:43 2015 +0200

    cmGeneratorTarget: Access global state through LocalGenerator.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 96fcc90..f7cc502 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -400,8 +400,7 @@ cmCommonTargetGenerator::GetLinkedTargetDirectories() const
                 && emitted.insert(linkee).second)
         {
         cmLocalGenerator* lg = linkee->GetLocalGenerator();
-        cmMakefile* mf = linkee->Target->GetMakefile();
-        std::string di = mf->GetCurrentBinaryDirectory();
+        std::string di = lg->GetCurrentBinaryDirectory();
         di += "/";
         di += lg->GetTargetDirectory(linkee);
         dirs.push_back(di);
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 945c284..c7c0e73 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1497,11 +1497,11 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode
       const char *policy = targetPolicyWhitelist[i];
       if (parameters.front() == policy)
         {
-        cmMakefile *mf = context->HeadTarget->Target->GetMakefile();
+        cmLocalGenerator* lg = context->HeadTarget->GetLocalGenerator();
         switch(statusForTarget(context->HeadTarget, policy))
           {
           case cmPolicies::WARN:
-            mf->IssueMessage(cmake::AUTHOR_WARNING,
+            lg->IssueMessage(cmake::AUTHOR_WARNING,
                         cmPolicies::GetPolicyWarning(policyForString(policy)));
           case cmPolicies::REQUIRED_IF_USED:
           case cmPolicies::REQUIRED_ALWAYS:
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index d3b5d10..806d27d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -985,7 +985,7 @@ static bool processSources(cmGeneratorTarget const* tgt,
         {
         if(!e.empty())
           {
-          cmake* cm = mf->GetCMakeInstance();
+          cmake* cm = tgt->GetLocalGenerator()->GetCMakeInstance();
           cm->IssueMessage(cmake::FATAL_ERROR, e,
                           tgt->Target->GetBacktrace());
           }
@@ -1043,7 +1043,7 @@ void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files,
 {
   assert(this->GetType() != cmState::INTERFACE_LIBRARY);
 
-  if (!this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+  if (!this->LocalGenerator->GetGlobalGenerator()->GetConfigureDoneCMP0026())
     {
     // At configure-time, this method can be called as part of getting the
     // LOCATION property or to export() a file to be include()d.  However
@@ -1088,7 +1088,7 @@ void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files,
                                  "SOURCES")
                         != debugProperties.end();
 
-  if (this->Makefile->GetGlobalGenerator()->GetConfigureDoneCMP0026())
+  if (this->LocalGenerator->GetGlobalGenerator()->GetConfigureDoneCMP0026())
     {
     this->DebugSourcesDone = true;
     }
@@ -1447,7 +1447,7 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
     w << "  This could be because you are using a Mac OS X version";
     w << " less than 10.5 or because CMake's platform configuration is";
     w << " corrupt.";
-    cmake* cm = this->Makefile->GetCMakeInstance();
+    cmake* cm = this->LocalGenerator->GetCMakeInstance();
     cm->IssueMessage(cmake::FATAL_ERROR, w.str(),
                      this->Target->GetBacktrace());
     }
@@ -1474,7 +1474,7 @@ bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const
 
   if(cmp0042 == cmPolicies::WARN)
     {
-    this->Makefile->GetGlobalGenerator()->
+    this->LocalGenerator->GetGlobalGenerator()->
       AddCMP0042WarnTarget(this->GetName());
     }
 
@@ -1782,14 +1782,12 @@ class cmTargetSelectLinker
 {
   int Preference;
   cmGeneratorTarget const* Target;
-  cmMakefile* Makefile;
   cmGlobalGenerator* GG;
   std::set<std::string> Preferred;
 public:
   cmTargetSelectLinker(cmGeneratorTarget const* target)
       : Preference(0), Target(target)
     {
-    this->Makefile = this->Target->Makefile;
     this->GG = this->Target->GetLocalGenerator()->GetGlobalGenerator();
     }
   void Consider(const char* lang)
@@ -1823,7 +1821,7 @@ public:
         e << "  " << *li << "\n";
         }
       e << "Set the LINKER_LANGUAGE property for this target.";
-      cmake* cm = this->Makefile->GetCMakeInstance();
+      cmake* cm = this->Target->GetLocalGenerator()->GetCMakeInstance();
       cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
                        this->Target->Target->GetBacktrace());
       }
@@ -4823,7 +4821,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
   // specified as a relative path.  Treat a relative path as
   // relative to the current output directory for this makefile.
   out = (cmSystemTools::CollapseFullPath
-         (out, this->Makefile->GetCurrentBinaryDirectory()));
+         (out, this->LocalGenerator->GetCurrentBinaryDirectory()));
 
   // The generator may add the configuration's subdirectory.
   if(!conf.empty())
@@ -4888,7 +4886,7 @@ bool cmGeneratorTarget::ComputePDBOutputDir(const std::string& kind,
   // specified as a relative path.  Treat a relative path as
   // relative to the current output directory for this makefile.
   out = (cmSystemTools::CollapseFullPath
-         (out, this->Makefile->GetCurrentBinaryDirectory()));
+         (out, this->LocalGenerator->GetCurrentBinaryDirectory()));
 
   // The generator may add the configuration's subdirectory.
   if(!conf.empty())
@@ -5555,7 +5553,7 @@ bool cmGeneratorTarget::HasImportLibrary() const
 //----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetSupportDirectory() const
 {
-  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+  std::string dir = this->LocalGenerator->GetCurrentBinaryDirectory();
   dir += cmake::GetCMakeFilesDirectory();
   dir += "/";
   dir += this->GetName();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50fb2ad6463c500fde44c000c777aa3ac1cffc7e
commit 50fb2ad6463c500fde44c000c777aa3ac1cffc7e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:17:32 2015 +0200

    cmGeneratorTarget: Port Utility items to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 52ae310..d3b5d10 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -774,9 +774,8 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
     for(std::set<std::string>::const_iterator i = utilities.begin();
         i != utilities.end(); ++i)
       {
-      cmTarget* tgt = this->Makefile->FindTargetToUse(*i);
-      cmGeneratorTarget* gt = tgt ? this->GlobalGenerator
-          ->GetGeneratorTarget(tgt) : 0;
+      cmGeneratorTarget* gt =
+          this->LocalGenerator->FindGeneratorTargetToUse(*i);
       this->UtilityItems.insert(cmLinkItem(*i, gt));
       }
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d233030f5bcfe2509b82433f7df6383cd301e34e
commit d233030f5bcfe2509b82433f7df6383cd301e34e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:17:31 2015 +0200

    cmGeneratorTarget: Port implementation to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 994fcb1..52ae310 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5483,13 +5483,14 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
 cmGeneratorTarget*
 cmGeneratorTarget::FindTargetToLink(std::string const& name) const
 {
-  cmTarget const* tgt = this->Makefile->FindTargetToUse(name);
+  cmGeneratorTarget* tgt =
+      this->LocalGenerator->FindGeneratorTargetToUse(name);
 
   // Skip targets that will not really be linked.  This is probably a
   // name conflict between an external library and an executable
   // within the project.
   if(tgt && tgt->GetType() == cmState::EXECUTABLE &&
-     !tgt->IsExecutableWithExports())
+     !tgt->Target->IsExecutableWithExports())
     {
     tgt = 0;
     }
@@ -5502,17 +5503,13 @@ cmGeneratorTarget::FindTargetToLink(std::string const& name) const
       "allowed.  "
       "One may link only to STATIC or SHARED libraries, or to executables "
       "with the ENABLE_EXPORTS property set.";
-    cmake* cm = this->Makefile->GetCMakeInstance();
+    cmake* cm = this->LocalGenerator->GetCMakeInstance();
     cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
                      this->Target->GetBacktrace());
     tgt = 0;
     }
 
-  if (!tgt)
-    {
-    return 0;
-    }
-  return this->GlobalGenerator->GetGeneratorTarget(tgt);
+  return tgt;
 }
 
 //----------------------------------------------------------------------------

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ebe2bbf4ae7f19b10f8374313b2bbd6fcd6c3da
commit 0ebe2bbf4ae7f19b10f8374313b2bbd6fcd6c3da
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:17:31 2015 +0200

    cmGeneratorTarget: Port language computation to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9b3bf28..994fcb1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5276,10 +5276,10 @@ void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages,
           i = externalObjects.begin(); i != externalObjects.end(); ++i)
       {
       std::string objLib = (*i)->GetObjectLibrary();
-      if (cmTarget* tgt = this->Makefile->FindTargetToUse(objLib))
+      if (cmGeneratorTarget* tgt =
+          this->LocalGenerator->FindGeneratorTargetToUse(objLib))
         {
-        objectLibraries.push_back(this->GlobalGenerator
-                                  ->GetGeneratorTarget(tgt));
+        objectLibraries.push_back(tgt);
         }
       }
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60bd9f9c92faae368fab1c44cf81b489c6a875cb
commit 60bd9f9c92faae368fab1c44cf81b489c6a875cb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:17:22 2015 +0200

    cmGeneratorTarget: Move GetObjectLibrariesCMP0026 from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e4abfd3..9b3bf28 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5201,6 +5201,46 @@ bool cmGeneratorTarget::GetConfigCommonSourceFiles(
 }
 
 //----------------------------------------------------------------------------
+void cmGeneratorTarget::GetObjectLibrariesCMP0026(
+    std::vector<cmGeneratorTarget*>& objlibs) const
+{
+  // At configure-time, this method can be called as part of getting the
+  // LOCATION property or to export() a file to be include()d.  However
+  // there is no cmGeneratorTarget at configure-time, so search the SOURCES
+  // for TARGET_OBJECTS instead for backwards compatibility with OLD
+  // behavior of CMP0024 and CMP0026 only.
+  cmStringRange rng = this->Target->GetSourceEntries();
+  for(std::vector<std::string>::const_iterator
+        i = rng.begin(); i != rng.end(); ++i)
+    {
+    std::string const& entry = *i;
+
+    std::vector<std::string> files;
+    cmSystemTools::ExpandListArgument(entry, files);
+    for (std::vector<std::string>::const_iterator
+        li = files.begin(); li != files.end(); ++li)
+      {
+      if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
+          (*li)[li->size() - 1] == '>')
+        {
+        std::string objLibName = li->substr(17, li->size()-18);
+
+        if (cmGeneratorExpression::Find(objLibName) != std::string::npos)
+          {
+          continue;
+          }
+        cmGeneratorTarget *objLib =
+            this->LocalGenerator->FindGeneratorTargetToUse(objLibName);
+        if(objLib)
+          {
+          objlibs.push_back(objLib);
+          }
+        }
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages,
                             const std::string& config) const
 {
@@ -5220,14 +5260,13 @@ void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages,
   std::vector<cmSourceFile const*> externalObjects;
   if (!this->GlobalGenerator->GetConfigureDoneCMP0026())
     {
-    std::vector<cmTarget*> objectTargets;
-    this->Target->GetObjectLibrariesCMP0026(objectTargets);
+    std::vector<cmGeneratorTarget*> objectTargets;
+    this->GetObjectLibrariesCMP0026(objectTargets);
     objectLibraries.reserve(objectTargets.size());
-    for (std::vector<cmTarget*>::const_iterator it = objectTargets.begin();
-         it != objectTargets.end(); ++it)
+    for (std::vector<cmGeneratorTarget*>::const_iterator it =
+         objectTargets.begin(); it != objectTargets.end(); ++it)
       {
-      objectLibraries.push_back(this->GlobalGenerator
-                                ->GetGeneratorTarget(*it));
+      objectLibraries.push_back(*it);
       }
     }
   else
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 05a7d4d..39c9772 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -226,6 +226,9 @@ public:
   void GetLanguages(std::set<std::string>& languages,
                     std::string const& config) const;
 
+  void
+  GetObjectLibrariesCMP0026(std::vector<cmGeneratorTarget*>& objlibs) const;
+
   bool GetConfigCommonSourceFiles(std::vector<cmSourceFile*>& files) const;
 
   bool HaveBuildTreeRPATH(const std::string& config) const;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index fecdc45..a7372e3 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2204,45 +2204,6 @@ const char* cmTarget::GetExportMacro() const
 }
 
 //----------------------------------------------------------------------------
-void
-cmTarget::GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const
-{
-  // At configure-time, this method can be called as part of getting the
-  // LOCATION property or to export() a file to be include()d.  However
-  // there is no cmGeneratorTarget at configure-time, so search the SOURCES
-  // for TARGET_OBJECTS instead for backwards compatibility with OLD
-  // behavior of CMP0024 and CMP0026 only.
-  for(std::vector<std::string>::const_iterator
-        i = this->Internal->SourceEntries.begin();
-      i != this->Internal->SourceEntries.end(); ++i)
-    {
-    std::string const& entry = *i;
-
-    std::vector<std::string> files;
-    cmSystemTools::ExpandListArgument(entry, files);
-    for (std::vector<std::string>::const_iterator
-        li = files.begin(); li != files.end(); ++li)
-      {
-      if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") &&
-          (*li)[li->size() - 1] == '>')
-        {
-        std::string objLibName = li->substr(17, li->size()-18);
-
-        if (cmGeneratorExpression::Find(objLibName) != std::string::npos)
-          {
-          continue;
-          }
-        cmTarget *objLib = this->Makefile->FindTargetToUse(objLibName);
-        if(objLib)
-          {
-          objlibs.push_back(objLib);
-          }
-        }
-      }
-    }
-}
-
-//----------------------------------------------------------------------------
 cmTarget::ImportInfo const*
 cmTarget::GetImportInfo(const std::string& config) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index c0b9e09..dda6e6a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -213,8 +213,6 @@ public:
 
   bool IsImported() const {return this->IsImportedTarget;}
 
-  void GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const;
-
   /** Strip off leading and trailing whitespace from an item named in
       the link dependencies of this target.  */
   std::string CheckCMP0004(std::string const& item) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82a6eaf4d0381f0e3236dbd067fe853653bbe6b5
commit 82a6eaf4d0381f0e3236dbd067fe853653bbe6b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:17:13 2015 +0200

    cmGeneratorTarget: Port TraceDependencies to cmTarget.
    
    The problem of needing cmTarget is not solved with this, but the removal
    of the cmTarget member is valuable.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 466d3c2..e4abfd3 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2120,9 +2120,9 @@ public:
   cmTargetTraceDependencies(cmGeneratorTarget* target);
   void Trace();
 private:
-  cmTarget* Target;
   cmGeneratorTarget* GeneratorTarget;
   cmMakefile* Makefile;
+  cmLocalGenerator* LocalGenerator;
   cmGlobalGenerator const* GlobalGenerator;
   typedef cmGeneratorTarget::SourceEntry SourceEntry;
   SourceEntry* CurrentEntry;
@@ -2146,11 +2146,12 @@ private:
 //----------------------------------------------------------------------------
 cmTargetTraceDependencies
 ::cmTargetTraceDependencies(cmGeneratorTarget* target):
-  Target(target->Target), GeneratorTarget(target)
+  GeneratorTarget(target)
 {
   // Convenience.
-  this->Makefile = this->Target->GetMakefile();
-  this->GlobalGenerator = target->GetLocalGenerator()->GetGlobalGenerator();
+  this->Makefile = target->Target->GetMakefile();
+  this->LocalGenerator = target->GetLocalGenerator();
+  this->GlobalGenerator = this->LocalGenerator->GetGlobalGenerator();
   this->CurrentEntry = 0;
 
   // Queue all the source files already specified for the target.
@@ -2193,9 +2194,12 @@ cmTargetTraceDependencies
     }
 
   // Queue pre-build, pre-link, and post-build rule dependencies.
-  this->CheckCustomCommands(this->Target->GetPreBuildCommands());
-  this->CheckCustomCommands(this->Target->GetPreLinkCommands());
-  this->CheckCustomCommands(this->Target->GetPostBuildCommands());
+  this->CheckCustomCommands(
+        this->GeneratorTarget->Target->GetPreBuildCommands());
+  this->CheckCustomCommands(
+        this->GeneratorTarget->Target->GetPreLinkCommands());
+  this->CheckCustomCommands(
+        this->GeneratorTarget->Target->GetPostBuildCommands());
 }
 
 //----------------------------------------------------------------------------
@@ -2324,7 +2328,7 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
         tLocation = cmSystemTools::CollapseFullPath(tLocation);
         if(depLocation == tLocation)
           {
-          this->Target->AddUtility(util);
+          this->GeneratorTarget->Target->AddUtility(util);
           return true;
           }
         }
@@ -2333,7 +2337,7 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep)
       {
       // The original name of the dependency was not a full path.  It
       // must name a target, so add the target-level dependency.
-      this->Target->AddUtility(util);
+      this->GeneratorTarget->Target->AddUtility(util);
       return true;
       }
     }
@@ -2359,7 +2363,8 @@ cmTargetTraceDependencies
     {
     std::string const& command = *cit->begin();
     // Check for a target with this name.
-    if(cmTarget* t = this->Makefile->FindTargetToUse(command))
+    if(cmGeneratorTarget* t =
+       this->LocalGenerator->FindGeneratorTargetToUse(command))
       {
       if(t->GetType() == cmState::EXECUTABLE)
         {
@@ -2367,7 +2372,7 @@ cmTargetTraceDependencies
         // this project.  Add the target-level dependency to make
         // sure the executable is up to date before this custom
         // command possibly runs.
-        this->Target->AddUtility(command);
+        this->GeneratorTarget->Target->AddUtility(command);
         }
       }
 
@@ -2386,7 +2391,7 @@ cmTargetTraceDependencies
   for(std::set<cmGeneratorTarget*>::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
-    this->Target->AddUtility((*ti)->GetName());
+    this->GeneratorTarget->Target->AddUtility((*ti)->GetName());
     }
 
   // Queue the custom command dependencies.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8aaed08696a7444b80b6319e2b5af320ee589658
commit 8aaed08696a7444b80b6319e2b5af320ee589658
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 20:15:03 2015 +0200

    cmGeneratorTarget: Port object library handling to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6f91d1a..466d3c2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2004,27 +2004,26 @@ cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs,
 {
   std::vector<cmSourceFile const*> objectFiles;
   this->GetExternalObjects(objectFiles, config);
-  std::vector<cmTarget*> objectLibraries;
+  std::vector<cmGeneratorTarget*> objectLibraries;
   for(std::vector<cmSourceFile const*>::const_iterator
       it = objectFiles.begin(); it != objectFiles.end(); ++it)
     {
     std::string objLib = (*it)->GetObjectLibrary();
-    if (cmTarget* tgt = this->Makefile->FindTargetToUse(objLib))
+    if (cmGeneratorTarget* tgt =
+        this->LocalGenerator->FindGeneratorTargetToUse(objLib))
       {
       objectLibraries.push_back(tgt);
       }
     }
 
-  std::vector<cmTarget*>::const_iterator end
+  std::vector<cmGeneratorTarget*>::const_iterator end
       = cmRemoveDuplicates(objectLibraries);
 
-  for(std::vector<cmTarget*>::const_iterator
+  for(std::vector<cmGeneratorTarget*>::const_iterator
         ti = objectLibraries.begin();
       ti != end; ++ti)
     {
-    cmTarget* objLib = *ti;
-    cmGeneratorTarget* ogt =
-      this->GlobalGenerator->GetGeneratorTarget(objLib);
+    cmGeneratorTarget* ogt = *ti;
     std::vector<cmSourceFile const*> objectSources;
     ogt->GetObjectSources(objectSources, config);
     for(std::vector<cmSourceFile const*>::const_iterator

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=393654bf49f2c8d86e9ec88fc3c8322497432aea
commit 393654bf49f2c8d86e9ec88fc3c8322497432aea
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 19:19:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 16 19:20:17 2015 +0200

    cmGeneratorTarget: Port internal class to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4fd9cec..6f91d1a 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1691,7 +1691,7 @@ public:
                                cmGeneratorTarget const* head):
     Config(config), Languages(languages), HeadTarget(head),
     Makefile(target->Target->GetMakefile()), Target(target)
-  { this->Visited.insert(target->Target); }
+  { this->Visited.insert(target); }
 
   void Visit(cmLinkItem const& item)
     {
@@ -1732,7 +1732,7 @@ public:
         }
       return;
       }
-    if(!this->Visited.insert(item.Target->Target).second)
+    if(!this->Visited.insert(item.Target).second)
       {
       return;
       }
@@ -1758,7 +1758,7 @@ private:
   cmGeneratorTarget const* HeadTarget;
   cmMakefile* Makefile;
   const cmGeneratorTarget* Target;
-  std::set<cmTarget const*> Visited;
+  std::set<cmGeneratorTarget const*> Visited;
 };
 
 //----------------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |   16 +-
 Source/cmComputeTargetDepends.cxx              |    2 +-
 Source/cmCustomCommandGenerator.cxx            |    2 +-
 Source/cmExtraSublimeTextGenerator.cxx         |    6 +-
 Source/cmGeneratorExpressionNode.cxx           |    4 +-
 Source/cmGeneratorTarget.cxx                   |  537 ++++++++++++++++++++----
 Source/cmGeneratorTarget.h                     |   51 +++
 Source/cmGlobalUnixMakefileGenerator3.cxx      |    6 +-
 Source/cmGlobalXCodeGenerator.cxx              |    4 +-
 Source/cmLocalGenerator.cxx                    |   76 ++--
 Source/cmLocalGenerator.h                      |   29 +-
 Source/cmLocalGhsMultiGenerator.cxx            |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |   26 +-
 Source/cmLocalUnixMakefileGenerator3.h         |    9 +-
 Source/cmLocalVisualStudio6Generator.cxx       |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx       |    8 +-
 Source/cmLocalVisualStudio7Generator.h         |    3 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |   18 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |   38 +-
 Source/cmMakefileTargetGenerator.cxx           |   26 +-
 Source/cmMakefileUtilityTargetGenerator.cxx    |   11 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    9 +-
 Source/cmNinjaTargetGenerator.cxx              |   13 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |    3 +-
 Source/cmOSXBundleGenerator.cxx                |    6 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |   23 +-
 Source/cmTarget.cxx                            |  463 +++-----------------
 Source/cmTarget.h                              |   53 ---
 Source/cmVisualStudio10TargetGenerator.cxx     |  128 +++---
 29 files changed, 831 insertions(+), 743 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Oct 17 00:01:08 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 17 Oct 2015 00:01:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-248-g2f269fd
Message-ID: <20151017040108.3D299BFE1C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  2f269fdf0c293e80325c748c985279bc4067af3e (commit)
      from  893ce307f9a9f50dbd324a4c72b833e4a3649b0a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f269fdf0c293e80325c748c985279bc4067af3e
commit 2f269fdf0c293e80325c748c985279bc4067af3e
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Oct 17 00:01:06 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Oct 17 00:01:06 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 4dcccb5..bad0f37 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151016)
+set(CMake_VERSION_PATCH 20151017)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 17 06:42:22 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 17 Oct 2015 06:42:22 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-616-g672069c
Message-ID: <20151017104225.4C40DBF7BB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  672069cdff86598e620b1555b2fe3778d9d9ea53 (commit)
       via  3f5c977fce4899de082a072bdd4e853ee0e1488a (commit)
      from  5783be81b2b18d82eb95b9b2a39b2acd83704634 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=672069cdff86598e620b1555b2fe3778d9d9ea53
commit 672069cdff86598e620b1555b2fe3778d9d9ea53
Merge: 5783be8 3f5c977
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 06:42:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 17 06:42:20 2015 -0400

    Merge topic 'use-generator-target' into next
    
    3f5c977f fixup! cmLocalGenerator: Port some API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f5c977fce4899de082a072bdd4e853ee0e1488a
commit 3f5c977fce4899de082a072bdd4e853ee0e1488a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 12:41:54 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 12:41:54 2015 +0200

    fixup! cmLocalGenerator: Port some API to cmGeneratorTarget.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index c687ba7..019cdd1 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -265,8 +265,11 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const &config,
         this->LocalGenerator->AddLanguageFlags(
             flags, lang + std::string("_GHS_KERNEL"), config);
       }
-    this->LocalGenerator->AddCMP0018Flags(flags, this->Target, lang, config);
-    this->LocalGenerator->AddVisibilityPresetFlags(flags, this->Target, lang);
+    this->LocalGenerator->AddCMP0018Flags(flags, this->GeneratorTarget,
+                                          lang, config);
+    this->LocalGenerator->AddVisibilityPresetFlags(flags,
+                                                   this->GeneratorTarget,
+                                                   lang);
 
     // Append old-style preprocessor definition flags.
     if (std::string(" ") != std::string(this->Makefile->GetDefineFlags()))
@@ -276,7 +279,8 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const &config,
       }
 
     // Add target-specific flags.
-    this->LocalGenerator->AddCompileOptions(flags, this->Target, lang, config);
+    this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
+                                            lang, config);
 
     std::map<std::string, std::string>::value_type entry(language, flags);
     i = this->FlagsByLanguage.insert(entry).first;
@@ -299,7 +303,8 @@ std::string cmGhsMultiTargetGenerator::GetDefines(const std::string &language,
       }
 
     // Add preprocessor definitions for this target and configuration.
-    this->LocalGenerator->AddCompileDefinitions(defines, this->Target, config,
+    this->LocalGenerator->AddCompileDefinitions(defines,
+                                                this->GeneratorTarget, config,
                                                 language);
 
     std::string definesString;
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3e901ba..f40e6dd 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1750,12 +1750,12 @@ void cmLocalVisualStudio6Generator
       flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
       flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
 
-      this->AddCompileOptions(flags, &target, linkLanguage, "");
-      this->AddCompileOptions(flagsDebug, &target, linkLanguage, "Debug");
-      this->AddCompileOptions(flagsRelease, &target, linkLanguage, "Release");
-      this->AddCompileOptions(flagsMinSizeRel, &target, linkLanguage,
+      this->AddCompileOptions(flags, gt, linkLanguage, "");
+      this->AddCompileOptions(flagsDebug, gt, linkLanguage, "Debug");
+      this->AddCompileOptions(flagsRelease, gt, linkLanguage, "Release");
+      this->AddCompileOptions(flagsMinSizeRel, gt, linkLanguage,
                               "MinSizeRel");
-      this->AddCompileOptions(flagsRelWithDebInfo, &target, linkLanguage,
+      this->AddCompileOptions(flagsRelWithDebInfo, gt, linkLanguage,
                               "RelWithDebInfo");
 
       // if _UNICODE and _SBCS are not found, then add -D_MBCS
@@ -1775,14 +1775,14 @@ void cmLocalVisualStudio6Generator
       std::set<std::string> minsizeDefinesSet;
       std::set<std::string> debugrelDefinesSet;
 
-      this->AddCompileDefinitions(definesSet, &target, "", linkLanguage);
-      this->AddCompileDefinitions(debugDefinesSet, &target,
+      this->AddCompileDefinitions(definesSet, gt, "", linkLanguage);
+      this->AddCompileDefinitions(debugDefinesSet, gt,
                                   "DEBUG", linkLanguage);
-      this->AddCompileDefinitions(releaseDefinesSet, &target,
+      this->AddCompileDefinitions(releaseDefinesSet, gt,
                                   "RELEASE", linkLanguage);
-      this->AddCompileDefinitions(minsizeDefinesSet, &target,
+      this->AddCompileDefinitions(minsizeDefinesSet, gt,
                                   "MINSIZEREL", linkLanguage);
-      this->AddCompileDefinitions(debugrelDefinesSet, &target,
+      this->AddCompileDefinitions(debugrelDefinesSet, gt,
                                   "RELWITHDEBINFO", linkLanguage);
 
       std::string defines = " ";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 6d02bfa..485ac31 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -733,7 +733,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       }
 
     // Add the target-specific flags.
-    this->AddCompileOptions(flags, &target, linkLanguage, configName);
+    this->AddCompileOptions(flags, gt, linkLanguage, configName);
     }
 
   if(this->FortranProject)
@@ -1152,7 +1152,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
         }
       }
     std::string libflags;
-    this->GetStaticLibraryFlags(libflags, configTypeUpper, &target);
+    this->GetStaticLibraryFlags(libflags, configTypeUpper, gt);
     if(!libflags.empty())
       {
       fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f0344bb..2cbd306 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1932,7 +1932,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
     {
     clOptions.AddFlag("CompileAs", "CompileAsCpp");
     }
-  this->LocalGenerator->AddCompileOptions(flags, this->Target,
+  this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
                                           linkLanguage, configName.c_str());
 
   // Get preprocessor definitions for this directory.
@@ -2189,7 +2189,7 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
     }
   std::string libflags;
   this->LocalGenerator->GetStaticLibraryFlags(libflags,
-    cmSystemTools::UpperCase(config), this->Target);
+    cmSystemTools::UpperCase(config), this->GeneratorTarget);
   if(!libflags.empty())
     {
     this->WriteString("<Lib>\n", 2);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGhsMultiTargetGenerator.cxx       |   13 +++++++++----
 Source/cmLocalVisualStudio6Generator.cxx   |   20 ++++++++++----------
 Source/cmLocalVisualStudio7Generator.cxx   |    4 ++--
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++--
 4 files changed, 23 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 17 06:44:26 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 17 Oct 2015 06:44:26 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-618-g7c38530
Message-ID: <20151017104430.A9655BFA89@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7c38530a4c135de6a7c4eb50d948cdb68f5a8a54 (commit)
       via  ee36c9f18f785ebbd3653010315fae8722d4aab1 (commit)
      from  672069cdff86598e620b1555b2fe3778d9d9ea53 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c38530a4c135de6a7c4eb50d948cdb68f5a8a54
commit 7c38530a4c135de6a7c4eb50d948cdb68f5a8a54
Merge: 672069c ee36c9f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 06:44:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 17 06:44:25 2015 -0400

    Merge topic 'use-generator-target' into next
    
    ee36c9f1 fixup! cmLocalGenerator: Port some API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee36c9f18f785ebbd3653010315fae8722d4aab1
commit ee36c9f18f785ebbd3653010315fae8722d4aab1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 12:44:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 12:44:13 2015 +0200

    fixup! cmLocalGenerator: Port some API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 8454bc1..d4ccde6 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1814,14 +1814,14 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->CurrentLocalGenerator->AddLanguageFlags(flags, lang, configName);
 
     // Add shared-library flags if needed.
-    this->CurrentLocalGenerator->AddCMP0018Flags(flags, &target,
+    this->CurrentLocalGenerator->AddCMP0018Flags(flags, gtgt,
                                                  lang, configName);
 
-    this->CurrentLocalGenerator->AddVisibilityPresetFlags(flags, &target,
+    this->CurrentLocalGenerator->AddVisibilityPresetFlags(flags, gtgt,
                                                    lang);
 
     this->CurrentLocalGenerator->
-      AddCompileOptions(flags, &target, lang, configName);
+      AddCompileOptions(flags, gtgt, lang, configName);
     }
 
   std::string llang = gtgt->GetLinkerLanguage(configName);
@@ -1884,7 +1884,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
                               cmSystemTools::UpperCase(configName),
-                              &target);
+                              gtgt);
     }
   else
     {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 17 06:45:26 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 17 Oct 2015 06:45:26 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc1-622-g640dde74
Message-ID: <20151017104529.577AFBFB93@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  640dde743eaf4e35012d35b51c64fb3e819372fc (commit)
       via  af145f293fee74cac3be906f51299f2d2517e8c4 (commit)
       via  827d221fba94ffd792818b27e1866bb4a43f6844 (commit)
       via  d5f81679704ef21eefaa547ac51c48764bfe00f4 (commit)
      from  7c38530a4c135de6a7c4eb50d948cdb68f5a8a54 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=640dde743eaf4e35012d35b51c64fb3e819372fc
commit 640dde743eaf4e35012d35b51c64fb3e819372fc
Merge: 7c38530 af145f2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 06:45:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 17 06:45:24 2015 -0400

    Merge topic 'use-generator-target' into next
    
    af145f29 cmLocalGenerator: Port PList handling to cmGeneratorTarget.
    827d221f cmLocalGenerator: Port policy handling to cmGeneratorTarget.
    d5f81679 cmLocalGenerator: Port some API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af145f293fee74cac3be906f51299f2d2517e8c4
commit af145f293fee74cac3be906f51299f2d2517e8c4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:31:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 12:45:05 2015 +0200

    cmLocalGenerator: Port PList handling to cmGeneratorTarget.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 60aff64..9d5dd8e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3012,7 +3012,7 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 }
 
 //----------------------------------------------------------------------------
-static void cmLGInfoProp(cmMakefile* mf, cmTarget* target,
+static void cmLGInfoProp(cmMakefile* mf, cmGeneratorTarget* target,
     const std::string& prop)
 {
   if(const char* val = target->GetProperty(prop))
@@ -3022,7 +3022,7 @@ static void cmLGInfoProp(cmMakefile* mf, cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::GenerateAppleInfoPList(cmTarget* target,
+void cmLocalGenerator::GenerateAppleInfoPList(cmGeneratorTarget* target,
                                               const std::string& targetName,
                                               const char* fname)
 {
@@ -3066,7 +3066,7 @@ void cmLocalGenerator::GenerateAppleInfoPList(cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::GenerateFrameworkInfoPList(cmTarget* target,
+void cmLocalGenerator::GenerateFrameworkInfoPList(cmGeneratorTarget* target,
                                                 const std::string& targetName,
                                                 const char* fname)
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 5d2a349..2bc0e4a 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -279,13 +279,14 @@ public:
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
-  void GenerateAppleInfoPList(cmTarget* target, const std::string& targetName,
+  void GenerateAppleInfoPList(cmGeneratorTarget* target,
+                              const std::string& targetName,
                               const char* fname);
 
   /**
    * Generate a Mac OS X framework Info.plist file.
    */
-  void GenerateFrameworkInfoPList(cmTarget* target,
+  void GenerateFrameworkInfoPList(cmGeneratorTarget* target,
                                   const std::string& targetName,
                                   const char* fname);
   /** Construct a comment for a custom command.  */
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 4fe99e3..490759f 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -59,7 +59,7 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string& targetName,
   plist += "/";
   plist += this->GT->GetAppBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
-  this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateAppleInfoPList(this->GT,
                                                targetName,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);
@@ -90,7 +90,7 @@ void cmOSXBundleGenerator::CreateFramework(
   std::string plist = newoutpath;
   plist += "/Resources/Info.plist";
   std::string name = cmSystemTools::GetFilenameName(targetName);
-  this->LocalGenerator->GenerateFrameworkInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateFrameworkInfoPList(this->GT,
                                                    name,
                                                    plist.c_str());
 
@@ -182,7 +182,7 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
     this->GT->GetCFBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
   std::string name = cmSystemTools::GetFilenameName(targetName);
-  this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateAppleInfoPList(this->GT,
                                                name,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=827d221fba94ffd792818b27e1866bb4a43f6844
commit 827d221fba94ffd792818b27e1866bb4a43f6844
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:29:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 12:45:05 2015 +0200

    cmLocalGenerator: Port policy handling to cmGeneratorTarget.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d830e26..60aff64 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2129,7 +2129,7 @@ void cmLocalGenerator
     }
 
   if (!warnCMP0063.empty() &&
-      this->WarnCMP0063.insert(target->Target).second)
+      this->WarnCMP0063.insert(target).second)
     {
     std::ostringstream w;
     w <<
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 749a93d..5d2a349 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -369,7 +369,7 @@ protected:
   std::string::size_type ObjectPathMax;
   std::set<std::string> ObjectMaxPathViolations;
 
-  std::set<cmTarget const*> WarnCMP0063;
+  std::set<cmGeneratorTarget const*> WarnCMP0063;
   cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5f81679704ef21eefaa547ac51c48764bfe00f4
commit d5f81679704ef21eefaa547ac51c48764bfe00f4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:19:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 12:45:04 2015 +0200

    cmLocalGenerator: Port some API to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index a197f88..41af89b 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -316,10 +316,11 @@ std::string cmCommonTargetGenerator::GetFlags(const std::string &l)
       this->AddFortranFlags(flags);
       }
 
-    this->LocalGenerator->AddCMP0018Flags(flags, this->Target,
+    this->LocalGenerator->AddCMP0018Flags(flags, this->GeneratorTarget,
                                           lang, this->ConfigName);
 
-    this->LocalGenerator->AddVisibilityPresetFlags(flags, this->Target,
+    this->LocalGenerator->AddVisibilityPresetFlags(flags,
+                                                   this->GeneratorTarget,
                                                    lang);
 
     // Append old-style preprocessor definition flags.
@@ -331,7 +332,7 @@ std::string cmCommonTargetGenerator::GetFlags(const std::string &l)
       AppendFlags(flags,this->GetFrameworkFlags(l));
 
     // Add target-specific flags.
-    this->LocalGenerator->AddCompileOptions(flags, this->Target,
+    this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
                                             lang, this->ConfigName);
 
     ByLanguageMap::value_type entry(l, flags);
@@ -354,7 +355,7 @@ std::string cmCommonTargetGenerator::GetDefines(const std::string &l)
       }
 
     // Add preprocessor definitions for this target and configuration.
-    this->LocalGenerator->AddCompileDefinitions(defines, this->Target,
+    this->LocalGenerator->AddCompileDefinitions(defines, this->GeneratorTarget,
                             this->LocalGenerator->GetConfigName(), l);
 
     std::string definesString;
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index d1599c4..a6b14ba 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -388,7 +388,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   //   }
 
   // Add shared-library flags if needed.
-  lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
+  lg->AddCMP0018Flags(flags, gtgt, language, config);
 
   // Add include directory flags.
   {
@@ -403,7 +403,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, gtgt->Target, language, config);
+  lg->AddCompileOptions(flags, gtgt, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -433,7 +433,7 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AddCompileDefinitions(defines, target->Target, config, language);
+  lg->AddCompileDefinitions(defines, target, config, language);
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index c687ba7..019cdd1 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -265,8 +265,11 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const &config,
         this->LocalGenerator->AddLanguageFlags(
             flags, lang + std::string("_GHS_KERNEL"), config);
       }
-    this->LocalGenerator->AddCMP0018Flags(flags, this->Target, lang, config);
-    this->LocalGenerator->AddVisibilityPresetFlags(flags, this->Target, lang);
+    this->LocalGenerator->AddCMP0018Flags(flags, this->GeneratorTarget,
+                                          lang, config);
+    this->LocalGenerator->AddVisibilityPresetFlags(flags,
+                                                   this->GeneratorTarget,
+                                                   lang);
 
     // Append old-style preprocessor definition flags.
     if (std::string(" ") != std::string(this->Makefile->GetDefineFlags()))
@@ -276,7 +279,8 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const &config,
       }
 
     // Add target-specific flags.
-    this->LocalGenerator->AddCompileOptions(flags, this->Target, lang, config);
+    this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
+                                            lang, config);
 
     std::map<std::string, std::string>::value_type entry(language, flags);
     i = this->FlagsByLanguage.insert(entry).first;
@@ -299,7 +303,8 @@ std::string cmGhsMultiTargetGenerator::GetDefines(const std::string &language,
       }
 
     // Add preprocessor definitions for this target and configuration.
-    this->LocalGenerator->AddCompileDefinitions(defines, this->Target, config,
+    this->LocalGenerator->AddCompileDefinitions(defines,
+                                                this->GeneratorTarget, config,
                                                 language);
 
     std::string definesString;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 8454bc1..d4ccde6 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1814,14 +1814,14 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->CurrentLocalGenerator->AddLanguageFlags(flags, lang, configName);
 
     // Add shared-library flags if needed.
-    this->CurrentLocalGenerator->AddCMP0018Flags(flags, &target,
+    this->CurrentLocalGenerator->AddCMP0018Flags(flags, gtgt,
                                                  lang, configName);
 
-    this->CurrentLocalGenerator->AddVisibilityPresetFlags(flags, &target,
+    this->CurrentLocalGenerator->AddVisibilityPresetFlags(flags, gtgt,
                                                    lang);
 
     this->CurrentLocalGenerator->
-      AddCompileOptions(flags, &target, lang, configName);
+      AddCompileOptions(flags, gtgt, lang, configName);
     }
 
   std::string llang = gtgt->GetLinkerLanguage(configName);
@@ -1884,7 +1884,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
                               cmSystemTools::UpperCase(configName),
-                              &target);
+                              gtgt);
     }
   else
     {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d457e9c..d830e26 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -920,7 +920,7 @@ cmLocalGenerator::ExpandRuleVariables(std::string& s,
 }
 
 //----------------------------------------------------------------------------
-const char* cmLocalGenerator::GetRuleLauncher(cmTarget* target,
+const char* cmLocalGenerator::GetRuleLauncher(cmGeneratorTarget* target,
                                               const std::string& prop)
 {
   if(target)
@@ -934,7 +934,8 @@ const char* cmLocalGenerator::GetRuleLauncher(cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::InsertRuleLauncher(std::string& s, cmTarget* target,
+void cmLocalGenerator::InsertRuleLauncher(std::string& s,
+                                          cmGeneratorTarget* target,
                                           const std::string& prop)
 {
   if(const char* val = this->GetRuleLauncher(target, prop))
@@ -1087,27 +1088,23 @@ std::string cmLocalGenerator::GetIncludeFlags(
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCompileDefinitions(std::set<std::string>& defines,
-                                             cmTarget const* target,
+                                             cmGeneratorTarget const* target,
                                              const std::string& config,
                                              const std::string& lang)
 {
   std::vector<std::string> targetDefines;
-  cmGeneratorTarget* gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
-  gtgt->GetCompileDefinitions(targetDefines, config, lang);
+  target->GetCompileDefinitions(targetDefines, config, lang);
   this->AppendDefines(defines, targetDefines);
 }
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCompileOptions(
-  std::string& flags, cmTarget* target,
+  std::string& flags, cmGeneratorTarget* target,
   const std::string& lang, const std::string& config
   )
 {
   std::string langFlagRegexVar = std::string("CMAKE_")+lang+"_FLAG_REGEX";
 
-  cmGeneratorTarget* gtgt =
-      this->GlobalGenerator->GetGeneratorTarget(target);
-
   if(const char* langFlagRegexStr =
      this->Makefile->GetDefinition(langFlagRegexVar))
     {
@@ -1118,7 +1115,7 @@ void cmLocalGenerator::AddCompileOptions(
       {
       cmSystemTools::ParseWindowsCommandLine(targetFlags, opts);
       }
-    gtgt->GetCompileOptions(opts, config, lang);
+    target->GetCompileOptions(opts, config, lang);
     for(std::vector<std::string>::const_iterator i = opts.begin();
         i != opts.end(); ++i)
       {
@@ -1139,7 +1136,7 @@ void cmLocalGenerator::AddCompileOptions(
       this->AppendFlags(flags, targetFlags);
       }
     std::vector<std::string> opts;
-    gtgt->GetCompileOptions(opts, config, lang);
+    target->GetCompileOptions(opts, config, lang);
     for(std::vector<std::string>::const_iterator i = opts.begin();
         i != opts.end(); ++i)
       {
@@ -1148,19 +1145,19 @@ void cmLocalGenerator::AddCompileOptions(
       }
     }
   std::vector<std::string> features;
-  gtgt->GetCompileFeatures(features, config);
+  target->GetCompileFeatures(features, config);
   for(std::vector<std::string>::const_iterator it = features.begin();
       it != features.end(); ++it)
     {
-     if (!this->Makefile->AddRequiredTargetFeature(target, *it))
+     if (!this->Makefile->AddRequiredTargetFeature(target->Target, *it))
       {
       return;
       }
     }
 
   for(std::map<std::string, std::string>::const_iterator it
-      = gtgt->GetMaxLanguageStandards().begin();
-      it != gtgt->GetMaxLanguageStandards().end(); ++it)
+      = target->GetMaxLanguageStandards().begin();
+      it != target->GetMaxLanguageStandards().end(); ++it)
     {
     const char* standard = target->GetProperty(it->first + "_STANDARD");
     if(!standard)
@@ -1314,7 +1311,7 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
 
 void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags,
                                              std::string const& config,
-                                             cmTarget* target)
+                                             cmGeneratorTarget* target)
 {
   this->AppendFlags(flags,
     this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS"));
@@ -1348,7 +1345,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
   switch(target->GetType())
     {
     case cmState::STATIC_LIBRARY:
-      this->GetStaticLibraryFlags(linkFlags, buildType, target->Target);
+      this->GetStaticLibraryFlags(linkFlags, buildType, target);
       break;
     case cmState::MODULE_LIBRARY:
       libraryLinkVariable = "CMAKE_MODULE_LINKER_FLAGS";
@@ -1904,7 +1901,8 @@ void cmLocalGenerator::AddSharedFlags(std::string& flags,
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::
-AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
+AddCompilerRequirementFlag(std::string &flags,
+                           cmGeneratorTarget const* target,
                            const std::string& lang)
 {
   if (lang.empty())
@@ -1942,7 +1940,8 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
               "CMAKE_" + lang + standardProp
                       + "_" + type + "_COMPILE_OPTION";
 
-    const char *opt = target->GetMakefile()->GetDefinition(option_flag);
+    const char *opt = target->Target->GetMakefile()
+        ->GetDefinition(option_flag);
     if (!opt)
       {
       std::ostringstream e;
@@ -1983,7 +1982,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
     std::string e =
       lang + "_STANDARD is set to invalid value '" + standard + "'";
     this->GetGlobalGenerator()->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e, target->GetBacktrace());
+      ->IssueMessage(cmake::FATAL_ERROR, e, target->Target->GetBacktrace());
     return;
     }
 
@@ -2007,7 +2006,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
                       + "_" + type + "_COMPILE_OPTION";
 
     const char *opt =
-        target->GetMakefile()->GetRequiredDefinition(option_flag);
+        target->Target->GetMakefile()->GetRequiredDefinition(option_flag);
     this->AppendFlagEscape(flags, opt);
     return;
     }
@@ -2018,7 +2017,8 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
               "CMAKE_" + lang + *stdIt
                       + "_" + type + "_COMPILE_OPTION";
 
-    if (const char *opt = target->GetMakefile()->GetDefinition(option_flag))
+    if (const char *opt = target->Target
+        ->GetMakefile()->GetDefinition(option_flag))
       {
       this->AppendFlagEscape(flags, opt);
       return;
@@ -2094,7 +2094,7 @@ static void AddInlineVisibilityCompileOption(std::string &flags,
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator
-::AddVisibilityPresetFlags(std::string &flags, cmTarget const* target,
+::AddVisibilityPresetFlags(std::string &flags, cmGeneratorTarget const* target,
                             const std::string& lang)
 {
   if (lang.empty())
@@ -2106,9 +2106,9 @@ void cmLocalGenerator
   std::string *pWarnCMP0063 = 0;
   if (target->GetType() != cmState::SHARED_LIBRARY &&
       target->GetType() != cmState::MODULE_LIBRARY &&
-      !target->IsExecutableWithExports())
+      !target->Target->IsExecutableWithExports())
     {
-    switch (target->GetPolicyStatusCMP0063())
+    switch (target->Target->GetPolicyStatusCMP0063())
       {
       case cmPolicies::OLD:
         return;
@@ -2120,15 +2120,16 @@ void cmLocalGenerator
       }
     }
 
-  AddVisibilityCompileOption(flags, target, this, lang, pWarnCMP0063);
+  AddVisibilityCompileOption(flags, target->Target, this, lang, pWarnCMP0063);
 
   if(lang == "CXX")
     {
-    AddInlineVisibilityCompileOption(flags, target, this, pWarnCMP0063);
+    AddInlineVisibilityCompileOption(flags, target->Target,
+                                     this, pWarnCMP0063);
     }
 
   if (!warnCMP0063.empty() &&
-      this->WarnCMP0063.insert(target).second)
+      this->WarnCMP0063.insert(target->Target).second)
     {
     std::ostringstream w;
     w <<
@@ -2138,14 +2139,15 @@ void cmLocalGenerator
       "has the following visibility properties set for " << lang << ":\n" <<
       warnCMP0063 <<
       "For compatibility CMake is not honoring them for this target.";
-    target->GetMakefile()->GetCMakeInstance()
-      ->IssueMessage(cmake::AUTHOR_WARNING, w.str(), target->GetBacktrace());
+    target->Target->GetMakefile()->GetCMakeInstance()
+      ->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
+                     target->Target->GetBacktrace());
     }
 }
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
-                                       cmTarget const* target,
+                                       cmGeneratorTarget const* target,
                                        std::string const& lang,
                                        const std::string& config)
 {
@@ -2169,9 +2171,7 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
       return;
       }
 
-    cmGeneratorTarget* gtgt =
-        this->GlobalGenerator->GetGeneratorTarget(target);
-    if (gtgt->GetLinkInterfaceDependentBoolProperty(
+    if (target->GetLinkInterfaceDependentBoolProperty(
                                                 "POSITION_INDEPENDENT_CODE",
                                                 config))
       {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index ee0a618..749a93d 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -20,7 +20,6 @@
 class cmMakefile;
 class cmGlobalGenerator;
 class cmGeneratorTarget;
-class cmTarget;
 class cmTargetManifest;
 class cmSourceFile;
 class cmCustomCommand;
@@ -91,13 +90,15 @@ public:
 
   void AddLanguageFlags(std::string& flags, const std::string& lang,
                         const std::string& config);
-  void AddCMP0018Flags(std::string &flags, cmTarget const* target,
+  void AddCMP0018Flags(std::string &flags, cmGeneratorTarget const* target,
                        std::string const& lang, const std::string& config);
-  void AddVisibilityPresetFlags(std::string &flags, cmTarget const* target,
+  void AddVisibilityPresetFlags(std::string &flags,
+                                cmGeneratorTarget const* target,
                                 const std::string& lang);
   void AddConfigVariableFlags(std::string& flags, const std::string& var,
                               const std::string& config);
-  void AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
+  void AddCompilerRequirementFlag(std::string &flags,
+                                  cmGeneratorTarget const* target,
                                   const std::string& lang);
   ///! Append flags to a string.
   virtual void AppendFlags(std::string& flags, const std::string& newFlags);
@@ -188,10 +189,10 @@ public:
                              const std::string& lang = "C",
                              const std::string& config = "",
                              bool stripImplicitInclDirs = true) const;
-  void AddCompileOptions(std::string& flags, cmTarget* target,
+  void AddCompileOptions(std::string& flags, cmGeneratorTarget* target,
                          const std::string& lang, const std::string& config);
   void AddCompileDefinitions(std::set<std::string>& defines,
-                             cmTarget const* target,
+                             cmGeneratorTarget const* target,
                              const std::string& config,
                              const std::string& lang);
 
@@ -212,7 +213,7 @@ public:
       {
         memset(this, 0,  sizeof(*this));
       }
-    cmTarget* CMTarget;
+    cmGeneratorTarget* CMTarget;
     const char* TargetPDB;
     const char* TargetCompilePDB;
     const char* TargetVersionMajor;
@@ -298,7 +299,7 @@ public:
   /** Fill out the static linker flags for the given target.  */
   void GetStaticLibraryFlags(std::string& flags,
                              std::string const& config,
-                             cmTarget* target);
+                             cmGeneratorTarget* target);
 
   /** Fill out these strings for the given target.  Libraries to link,
    *  flags, and linkflags. */
@@ -341,8 +342,9 @@ protected:
   std::string ExpandRuleVariable(std::string const& variable,
                                  const RuleVariables& replaceValues);
 
-  const char* GetRuleLauncher(cmTarget* target, const std::string& prop);
-  void InsertRuleLauncher(std::string& s, cmTarget* target,
+  const char* GetRuleLauncher(cmGeneratorTarget* target,
+                              const std::string& prop);
+  void InsertRuleLauncher(std::string& s, cmGeneratorTarget* target,
                           const std::string& prop);
 
   // Handle old-style install rules stored in the targets.
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index f3ee2e3..add0aa9 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1034,7 +1034,7 @@ void
 cmLocalUnixMakefileGenerator3
 ::AppendCustomCommands(std::vector<std::string>& commands,
                        const std::vector<cmCustomCommand>& ccs,
-                       cmTarget* target,
+                       cmGeneratorTarget* target,
                        cmLocalGenerator::RelativeRoot relative)
 {
   for(std::vector<cmCustomCommand>::const_iterator i = ccs.begin();
@@ -1050,7 +1050,7 @@ void
 cmLocalUnixMakefileGenerator3
 ::AppendCustomCommand(std::vector<std::string>& commands,
                       cmCustomCommandGenerator const& ccg,
-                      cmTarget* target,
+                      cmGeneratorTarget* target,
                       bool echo_comment,
                       cmLocalGenerator::RelativeRoot relative,
                       std::ostream* content)
@@ -1181,7 +1181,7 @@ cmLocalUnixMakefileGenerator3
 std::string
 cmLocalUnixMakefileGenerator3::MakeLauncher(
   cmCustomCommandGenerator const& ccg,
-  cmTarget* target, RelativeRoot relative)
+  cmGeneratorTarget* target, RelativeRoot relative)
 {
   // Short-circuit if there is no launcher.
   const char* prop = "RULE_LAUNCH_CUSTOM";
@@ -1788,6 +1788,9 @@ void cmLocalUnixMakefileGenerator3
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 
+      cmGeneratorTarget* gt = this->GlobalGenerator
+          ->GetGeneratorTarget(&glIt->second);
+
       // Global targets store their rules in pre- and post-build commands.
       this->AppendCustomDepends(depends,
                                 glIt->second.GetPreBuildCommands());
@@ -1795,11 +1798,11 @@ void cmLocalUnixMakefileGenerator3
                                 glIt->second.GetPostBuildCommands());
       this->AppendCustomCommands(commands,
                                  glIt->second.GetPreBuildCommands(),
-                                 &glIt->second,
+                                 gt,
                                  cmLocalGenerator::START_OUTPUT);
       this->AppendCustomCommands(commands,
                                  glIt->second.GetPostBuildCommands(),
-                                 &glIt->second,
+                                 gt,
                                  cmLocalGenerator::START_OUTPUT);
       std::string targetName = glIt->second.GetName();
       this->WriteMakeRule(ruleFileStream, targetString.c_str(),
@@ -1976,10 +1979,11 @@ void cmLocalUnixMakefileGenerator3::ClearDependencies(cmMakefile* mf,
 
 
 void cmLocalUnixMakefileGenerator3
-::WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &target)
+::WriteDependLanguageInfo(std::ostream& cmakefileStream,
+                          cmGeneratorTarget* target)
 {
   ImplicitDependLanguageMap const& implicitLangs =
-    this->GetImplicitDepends(target);
+    this->GetImplicitDepends(*target->Target);
 
   // list the languages
   cmakefileStream
@@ -2030,7 +2034,7 @@ void cmLocalUnixMakefileGenerator3
 
     // Build a list of preprocessor definitions for the target.
     std::set<std::string> defines;
-    this->AddCompileDefinitions(defines, &target,
+    this->AddCompileDefinitions(defines, target,
                                 this->ConfigName, l->first);
     if(!defines.empty())
       {
@@ -2056,12 +2060,10 @@ void cmLocalUnixMakefileGenerator3
       << "set(CMAKE_" << l->first << "_TARGET_INCLUDE_PATH\n";
     std::vector<std::string> includes;
 
-    cmGeneratorTarget* gt = this->GetGlobalGenerator()
-                                ->GetGeneratorTarget(&target);
 
     const std::string& config =
       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-    this->GetIncludeDirectories(includes, gt,
+    this->GetIncludeDirectories(includes, target,
                                 l->first, config);
     for(std::vector<std::string>::iterator i = includes.begin();
         i != includes.end(); ++i)
@@ -2084,7 +2086,7 @@ void cmLocalUnixMakefileGenerator3
     cmSystemTools::ExpandListArgument(xform, transformRules);
     }
   if(const char* xform =
-     target.GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM"))
+     target->GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM"))
     {
     cmSystemTools::ExpandListArgument(xform, transformRules);
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 586dda0..beaddde 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -182,7 +182,8 @@ protected:
 
 
   // write the depend info
-  void WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &tgt);
+  void WriteDependLanguageInfo(std::ostream& cmakefileStream,
+                               cmGeneratorTarget *tgt);
 
   // write the local help rule
   void WriteHelpRule(std::ostream& ruleFileStream);
@@ -215,12 +216,12 @@ protected:
                           cmCustomCommandGenerator const& cc);
   void AppendCustomCommands(std::vector<std::string>& commands,
                             const std::vector<cmCustomCommand>& ccs,
-                            cmTarget* target,
+                            cmGeneratorTarget* target,
                             cmLocalGenerator::RelativeRoot relative =
                             cmLocalGenerator::HOME_OUTPUT);
   void AppendCustomCommand(std::vector<std::string>& commands,
                            cmCustomCommandGenerator const& ccg,
-                           cmTarget* target,
+                           cmGeneratorTarget* target,
                            bool echo_comment=false,
                            cmLocalGenerator::RelativeRoot relative =
                            cmLocalGenerator::HOME_OUTPUT,
@@ -237,7 +238,7 @@ protected:
 private:
   std::string ConvertShellCommand(std::string const& cmd, RelativeRoot root);
   std::string MakeLauncher(cmCustomCommandGenerator const& ccg,
-                           cmTarget* target, RelativeRoot relative);
+                           cmGeneratorTarget* target, RelativeRoot relative);
 
   virtual void ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3e901ba..f40e6dd 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1750,12 +1750,12 @@ void cmLocalVisualStudio6Generator
       flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
       flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
 
-      this->AddCompileOptions(flags, &target, linkLanguage, "");
-      this->AddCompileOptions(flagsDebug, &target, linkLanguage, "Debug");
-      this->AddCompileOptions(flagsRelease, &target, linkLanguage, "Release");
-      this->AddCompileOptions(flagsMinSizeRel, &target, linkLanguage,
+      this->AddCompileOptions(flags, gt, linkLanguage, "");
+      this->AddCompileOptions(flagsDebug, gt, linkLanguage, "Debug");
+      this->AddCompileOptions(flagsRelease, gt, linkLanguage, "Release");
+      this->AddCompileOptions(flagsMinSizeRel, gt, linkLanguage,
                               "MinSizeRel");
-      this->AddCompileOptions(flagsRelWithDebInfo, &target, linkLanguage,
+      this->AddCompileOptions(flagsRelWithDebInfo, gt, linkLanguage,
                               "RelWithDebInfo");
 
       // if _UNICODE and _SBCS are not found, then add -D_MBCS
@@ -1775,14 +1775,14 @@ void cmLocalVisualStudio6Generator
       std::set<std::string> minsizeDefinesSet;
       std::set<std::string> debugrelDefinesSet;
 
-      this->AddCompileDefinitions(definesSet, &target, "", linkLanguage);
-      this->AddCompileDefinitions(debugDefinesSet, &target,
+      this->AddCompileDefinitions(definesSet, gt, "", linkLanguage);
+      this->AddCompileDefinitions(debugDefinesSet, gt,
                                   "DEBUG", linkLanguage);
-      this->AddCompileDefinitions(releaseDefinesSet, &target,
+      this->AddCompileDefinitions(releaseDefinesSet, gt,
                                   "RELEASE", linkLanguage);
-      this->AddCompileDefinitions(minsizeDefinesSet, &target,
+      this->AddCompileDefinitions(minsizeDefinesSet, gt,
                                   "MINSIZEREL", linkLanguage);
-      this->AddCompileDefinitions(debugrelDefinesSet, &target,
+      this->AddCompileDefinitions(debugrelDefinesSet, gt,
                                   "RELWITHDEBINFO", linkLanguage);
 
       std::string defines = " ";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 6d02bfa..485ac31 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -733,7 +733,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       }
 
     // Add the target-specific flags.
-    this->AddCompileOptions(flags, &target, linkLanguage, configName);
+    this->AddCompileOptions(flags, gt, linkLanguage, configName);
     }
 
   if(this->FortranProject)
@@ -1152,7 +1152,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
         }
       }
     std::string libflags;
-    this->GetStaticLibraryFlags(libflags, configTypeUpper, &target);
+    this->GetStaticLibraryFlags(libflags, configTypeUpper, gt);
     if(!libflags.empty())
       {
       fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 43bc4e1..178b462 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -280,10 +280,10 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     {
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -358,7 +358,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   cmLocalGenerator::RuleVariables vars;
   vars.RuleLauncher = "RULE_LAUNCH_LINK";
-  vars.CMTarget = this->Target;
+  vars.CMTarget = this->GeneratorTarget;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
   std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
@@ -449,7 +449,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     {
     this->LocalGenerator->
       AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->Target);
+                           this->GeneratorTarget);
     }
 
   // Write the build rule.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 28b4ab8..2ed5f70 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -115,7 +115,7 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
   // Add post-build rules.
   this->LocalGenerator->
     AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                         this->Target);
+                         this->GeneratorTarget);
 
   // Depend on the object files.
   this->AppendObjectDepends(depends);
@@ -146,7 +146,7 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules()
 
   std::string extraFlags;
   this->LocalGenerator->GetStaticLibraryFlags(extraFlags,
-    cmSystemTools::UpperCase(this->ConfigName), this->Target);
+    cmSystemTools::UpperCase(this->ConfigName), this->GeneratorTarget);
   this->WriteLibraryRules(linkRuleVar, extraFlags, false);
 }
 
@@ -458,10 +458,10 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     {
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -640,7 +640,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.TargetVersionMinor = targetVersionMinor.c_str();
 
   vars.RuleLauncher = "RULE_LAUNCH_LINK";
-  vars.CMTarget = this->Target;
+  vars.CMTarget = this->GeneratorTarget;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
   std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
@@ -811,7 +811,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     {
     this->LocalGenerator->
       AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->Target);
+                           this->GeneratorTarget);
     }
 
   // Compute the list of outputs.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index df50747..b7970fd 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -589,7 +589,7 @@ cmMakefileTargetGenerator
   }
   cmLocalGenerator::RuleVariables vars;
   vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
-  vars.CMTarget = this->Target;
+  vars.CMTarget = this->GeneratorTarget;
   vars.Language = lang.c_str();
   vars.Target = targetOutPathReal.c_str();
   vars.TargetPDB = targetOutPathPDB.c_str();
@@ -1040,7 +1040,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
     return;
     }
   this->LocalGenerator->
-    WriteDependLanguageInfo(*this->InfoFileStream,*this->Target);
+    WriteDependLanguageInfo(*this->InfoFileStream, this->GeneratorTarget);
 
   // Store multiple output pairs in the depend info file.
   if(!this->MultipleOutputPairs.empty())
@@ -1211,7 +1211,8 @@ void cmMakefileTargetGenerator
 
   // Now append the actual user-specified commands.
   std::ostringstream content;
-  this->LocalGenerator->AppendCustomCommand(commands, ccg, this->Target, false,
+  this->LocalGenerator->AppendCustomCommand(commands, ccg,
+                                            this->GeneratorTarget, false,
                                             cmLocalGenerator::HOME_OUTPUT,
                                             &content);
 
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 18594bb..11601c5 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -74,13 +74,13 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
     (depends, this->Target->GetPostBuildCommands());
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPreBuildCommands(), this->Target);
+    (commands, this->Target->GetPreBuildCommands(), this->GeneratorTarget);
 
   // Depend on all custom command outputs for sources
   this->DriveCustomCommands(depends);
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPostBuildCommands(), this->Target);
+    (commands, this->Target->GetPostBuildCommands(), this->GeneratorTarget);
 
   // Add dependencies on targets that must be built first.
   this->AppendTargetDepends(depends);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index e2061e5..e5e4b7f 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -178,7 +178,7 @@ cmNinjaNormalTargetGenerator
   if (!this->GetGlobalGenerator()->HasRule(ruleName)) {
     cmLocalGenerator::RuleVariables vars;
     vars.RuleLauncher = "RULE_LAUNCH_LINK";
-    vars.CMTarget = this->GetTarget();
+    vars.CMTarget = this->GetGeneratorTarget();
     vars.Language = this->TargetLinkLanguage.c_str();
 
     std::string responseFlag;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4d69a5e..cb1122c 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -335,7 +335,7 @@ cmNinjaTargetGenerator
 {
   cmLocalGenerator::RuleVariables vars;
   vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
-  vars.CMTarget = this->GetTarget();
+  vars.CMTarget = this->GetGeneratorTarget();
   vars.Language = lang.c_str();
   vars.Source = "$in";
   vars.Object = "$out";
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 41172f6..386d430 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -120,7 +120,7 @@ static void GetCompileDefinitionsAndDirectories(
   incs = cmJoin(includeDirs, ";");
 
   std::set<std::string> defines;
-  localGen->AddCompileDefinitions(defines, target->Target, config, "CXX");
+  localGen->AddCompileDefinitions(defines, target, config, "CXX");
 
   defs += cmJoin(defines, ";");
 }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f0344bb..2cbd306 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1932,7 +1932,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
     {
     clOptions.AddFlag("CompileAs", "CompileAsCpp");
     }
-  this->LocalGenerator->AddCompileOptions(flags, this->Target,
+  this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
                                           linkLanguage, configName.c_str());
 
   // Get preprocessor definitions for this directory.
@@ -2189,7 +2189,7 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
     }
   std::string libflags;
   this->LocalGenerator->GetStaticLibraryFlags(libflags,
-    cmSystemTools::UpperCase(config), this->Target);
+    cmSystemTools::UpperCase(config), this->GeneratorTarget);
   if(!libflags.empty())
     {
     this->WriteString("<Lib>\n", 2);

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 17 09:27:32 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 17 Oct 2015 09:27:32 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-639-gc9224a0
Message-ID: <20151017132732.26357C069D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c9224a0aa83711e24dbda9514c7107fa1bce19c5 (commit)
       via  cefb623d84c7657574c3dc2cc62ff94f0d65acae (commit)
       via  429440edab6f0e15991f281928e9c38f798b4e4a (commit)
       via  39540916916e390fc7059f77f646cd7f341693b9 (commit)
       via  80c97771319f3ab6d32ffc77c2660d863e7a7166 (commit)
       via  0c454746a0865d2310fb0746a85c5491df196b72 (commit)
       via  943b26f4f39d94d50d1f0f9b84ef139225eb921f (commit)
       via  1884d054d86a1e8d326cdcbc904a2d4b34382a2b (commit)
       via  52b56835e39b93a42f7c5235b8469178dfc5db12 (commit)
       via  4f1135ba712f145edb70299d38ac539d70c13c42 (commit)
       via  274d73e8616430028ec1245ba6cdc66f73d7cdba (commit)
       via  80bfcc17eff2681012a234275f6f9bb60b84142e (commit)
       via  d693e2fca03d03f12f02c38270543b29b0270600 (commit)
       via  bf32afb11df8ca3e03c418a9073941dd3e12fb5c (commit)
       via  a4d256a66132604486d047aa019de58f398b408d (commit)
       via  772e91eba562f466e9ce11dfc7b61a8c716f7afb (commit)
       via  10902e4a6c66162c165cf804e46c8879290244a3 (commit)
      from  640dde743eaf4e35012d35b51c64fb3e819372fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9224a0aa83711e24dbda9514c7107fa1bce19c5
commit c9224a0aa83711e24dbda9514c7107fa1bce19c5
Merge: 640dde74 cefb623
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 09:27:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 17 09:27:28 2015 -0400

    Merge topic 'use-generator-target' into next
    
    cefb623d cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.
    429440ed cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.
    39540916 cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
    80c97771 cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
    0c454746 cmGeneratorTarget: Move IsLinkable from cmTarget.
    943b26f4 Xcode: Port internal API to cmGeneratorTarget.
    1884d054 cmGeneratorTarget: Move GetExportName from cmTarget.
    52b56835 Export: Port internal API to cmGeneratorTarget.
    4f1135ba Export: Port internal utility to cmGeneratorTarget.
    274d73e8 Export: Port some API to cmGlobalGenerator.
    80bfcc17 cmInstallTargetGenerator: Port GetInstallFilename to cmGeneratorTarget.
    d693e2fc Export: Port interface to cmGeneratorTarget.
    bf32afb1 cmExportTryCompileFileGenerator: Port to cmGeneratorTarget.
    a4d256a6 cmExportSet: Store a cmGeneratorTarget.
    772e91eb cmGlobalGenerator: Compute export() related classes early.
    10902e4a fixup! Use GetName from cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cefb623d84c7657574c3dc2cc62ff94f0d65acae
commit cefb623d84c7657574c3dc2cc62ff94f0d65acae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:59:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:25:41 2015 +0200

    cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 9bdf2f5..5177ec8 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1095,7 +1095,7 @@ cmExportFileGenerator
        << " PROPERTY MACOSX_BUNDLE 1)\n";
     }
 
-  if (target->Target->IsCFBundleOnApple())
+  if (target->IsCFBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY BUNDLE 1)\n";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7e457bb..b2959fe 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1574,7 +1574,7 @@ bool cmGeneratorTarget::IsBundleOnApple() const
 {
   return this->IsFrameworkOnApple()
       || this->IsAppBundleOnApple()
-      || this->Target->IsCFBundleOnApple();
+      || this->IsCFBundleOnApple();
 }
 
 //----------------------------------------------------------------------------
@@ -1943,7 +1943,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
     {
     fpath += this->GetFrameworkDirectory(config, contentOnly);
     }
-  if(this->Target->IsCFBundleOnApple())
+  if(this->IsCFBundleOnApple())
     {
     fpath += this->GetCFBundleDirectory(config, contentOnly);
     }
@@ -3483,7 +3483,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     targetSuffix = 0;
     }
 
-  if(this->Target->IsCFBundleOnApple())
+  if(this->IsCFBundleOnApple())
     {
     fw_prefix = this->GetCFBundleDirectory(config, false);
     fw_prefix += "/";
@@ -5966,6 +5966,14 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::IsXCTestOnApple() const
 {
-  return (this->Target->IsCFBundleOnApple() &&
+  return (this->IsCFBundleOnApple() &&
           this->GetPropertyAsBool("XCTEST"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsCFBundleOnApple() const
+{
+  return (this->GetType() == cmState::MODULE_LIBRARY &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("BUNDLE"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index ce2f42e..6537421 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -425,6 +425,9 @@ public:
   /** Return whether this target is a XCTest on Apple.  */
   bool IsXCTestOnApple() const;
 
+  /** Return whether this target is a CFBundle (plugin) on Apple.  */
+  bool IsCFBundleOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index e0cba04..017d1e1 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1197,7 +1197,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     // some build phases only apply to bundles and/or frameworks
     bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
     bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
-    bool isCFBundleTarget = cmtarget.IsCFBundleOnApple();
+    bool isCFBundleTarget = gtgt->IsCFBundleOnApple();
 
     cmXCodeObject* buildFiles = 0;
 
@@ -1993,7 +1993,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       pndir = gtgt->GetDirectory(configName);
       }
 
-    if(gtgt->IsFrameworkOnApple() || target.IsCFBundleOnApple())
+    if(gtgt->IsFrameworkOnApple() || gtgt->IsCFBundleOnApple())
       {
       pnprefix = "";
       }
@@ -2046,7 +2046,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     buildSettings->AddAttribute("LIBRARY_STYLE",
                                 this->CreateString("BUNDLE"));
-    if (target.IsCFBundleOnApple())
+    if (gtgt->IsCFBundleOnApple())
       {
       // It turns out that a BUNDLE is basically the same
       // in many ways as an application bundle, as far as
@@ -2653,7 +2653,7 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
     case cmState::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
-      else if (target->Target->IsCFBundleOnApple())
+      else if (target->IsCFBundleOnApple())
         return "wrapper.plug-in";
       else
         return ((this->XcodeVersion >= 22)?
@@ -2680,7 +2680,7 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
     case cmState::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
-      else if (target->Target->IsCFBundleOnApple())
+      else if (target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
       else
         return ((this->XcodeVersion >= 22)?
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index e16dfd7..a97cc5f 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -226,7 +226,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       }
-    else if(this->Target->Target->IsCFBundleOnApple())
+    else if(this->Target->IsCFBundleOnApple())
       {
       // Install the whole app bundle directory.
       type = cmInstallType_DIRECTORY;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 015c880..df2a8c9 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -279,7 +279,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
     outpath += "/";
     }
-  else if(this->Target->IsCFBundleOnApple())
+  else if(this->GeneratorTarget->IsCFBundleOnApple())
     {
     outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateCFBundle(targetName, outpath);
@@ -360,7 +360,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         buildEcho += " shared library ";
         break;
       case cmState::MODULE_LIBRARY:
-        if (this->Target->IsCFBundleOnApple())
+        if (this->GeneratorTarget->IsCFBundleOnApple())
             buildEcho += " CFBundle";
         buildEcho += " shared module ";
         break;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 8a4f17e..dafbda9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -139,7 +139,7 @@ const char *cmNinjaNormalTargetGenerator::GetVisibleTypeName() const
     case cmState::SHARED_LIBRARY:
       return "shared library";
     case cmState::MODULE_LIBRARY:
-      if (this->GetTarget()->IsCFBundleOnApple())
+      if (this->GetGeneratorTarget()->IsCFBundleOnApple())
         return "CFBundle shared module";
       else
         return "shared module";
@@ -434,7 +434,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
                                               gt.GetDirectory(cfgName));
     }
-  else if(target.IsCFBundleOnApple())
+  else if(gt.IsCFBundleOnApple())
     {
     // Create the core foundation bundle.
     this->OSXBundleGenerator->CreateCFBundle(this->TargetNameOut,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 02a5ea6..f663678 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -369,14 +369,6 @@ bool cmTarget::IsAppBundleOnApple() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsCFBundleOnApple() const
-{
-  return (this->GetType() == cmState::MODULE_LIBRARY &&
-          this->Makefile->IsOn("APPLE") &&
-          this->GetPropertyAsBool("BUNDLE"));
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7cf4808..0e966e9 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -235,9 +235,6 @@ public:
       Apple.  */
   bool IsFrameworkOnApple() const;
 
-  /** Return whether this target is a CFBundle (plugin) on Apple.  */
-  bool IsCFBundleOnApple() const;
-
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=429440edab6f0e15991f281928e9c38f798b4e4a
commit 429440edab6f0e15991f281928e9c38f798b4e4a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 00:15:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:25:16 2015 +0200

    cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ab0d02b..7e457bb 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1587,7 +1587,7 @@ std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config,
   const char *ext = this->GetProperty("BUNDLE_EXTENSION");
   if (!ext)
     {
-    if (this->Target->IsXCTestOnApple())
+    if (this->IsXCTestOnApple())
       {
       ext = "xctest";
       }
@@ -5962,3 +5962,10 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("MACOSX_BUNDLE"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsXCTestOnApple() const
+{
+  return (this->Target->IsCFBundleOnApple() &&
+          this->GetPropertyAsBool("XCTEST"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 24a1c2c..ce2f42e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -422,6 +422,9 @@ public:
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 
+  /** Return whether this target is a XCTest on Apple.  */
+  bool IsXCTestOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 5e12378..e0cba04 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2651,7 +2651,7 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
     case cmState::STATIC_LIBRARY:
       return "archive.ar";
     case cmState::MODULE_LIBRARY:
-      if (target->Target->IsXCTestOnApple())
+      if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
       else if (target->Target->IsCFBundleOnApple())
         return "wrapper.plug-in";
@@ -2678,7 +2678,7 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
     case cmState::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
     case cmState::MODULE_LIBRARY:
-      if (target->Target->IsXCTestOnApple())
+      if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
       else if (target->Target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 761267d..02a5ea6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -377,13 +377,6 @@ bool cmTarget::IsCFBundleOnApple() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsXCTestOnApple() const
-{
-  return (this->IsCFBundleOnApple() &&
-          this->GetPropertyAsBool("XCTEST"));
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 51e97fd..7cf4808 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -238,9 +238,6 @@ public:
   /** Return whether this target is a CFBundle (plugin) on Apple.  */
   bool IsCFBundleOnApple() const;
 
-  /** Return whether this target is a XCTest on Apple.  */
-  bool IsXCTestOnApple() const;
-
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39540916916e390fc7059f77f646cd7f341693b9
commit 39540916916e390fc7059f77f646cd7f341693b9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:58:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:24:34 2015 +0200

    cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
    
    Leave the cmTarget method behind for now to implement cmInstallCommand.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 781220d..3af7b71 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -202,7 +202,7 @@ cmExportBuildFileGenerator
   std::string prop = "IMPORTED_LOCATION";
   prop += suffix;
   std::string value;
-  if(target->Target->IsAppBundleOnApple())
+  if(target->IsAppBundleOnApple())
     {
     value = target->GetFullPath(config, false);
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 132c0b5..9bdf2f5 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1089,7 +1089,7 @@ cmExportFileGenerator
     }
 
   // Mark the imported executable if it is an application bundle.
-  if(target->Target->IsAppBundleOnApple())
+  if(target->IsAppBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY MACOSX_BUNDLE 1)\n";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index d57d67f..a2d6ad1 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -433,7 +433,7 @@ cmExportInstallFileGenerator
     prop += suffix;
 
     // Append the installed file name.
-    if(target->Target->IsAppBundleOnApple())
+    if(target->IsAppBundleOnApple())
       {
       value += itgen->GetInstallFilename(target, config);
       value += ".app/Contents/MacOS/";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 42b5c63..ab0d02b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -851,7 +851,7 @@ const char* cmGeneratorTarget::GetLocationForBuild() const
     location += cfgid;
     }
 
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     std::string macdir = this->BuildMacContentDirectory("", "",
                                                                 false);
@@ -1573,7 +1573,7 @@ cmGeneratorTarget::GetAppBundleDirectory(const std::string& config,
 bool cmGeneratorTarget::IsBundleOnApple() const
 {
   return this->IsFrameworkOnApple()
-      || this->Target->IsAppBundleOnApple()
+      || this->IsAppBundleOnApple()
       || this->Target->IsCFBundleOnApple();
 }
 
@@ -1935,7 +1935,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
                                             bool contentOnly) const
 {
   std::string fpath = base;
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     fpath += this->GetAppBundleDirectory(config, contentOnly);
     }
@@ -3143,7 +3143,7 @@ std::string cmGeneratorTarget::NormalGetFullPath(const std::string& config,
 {
   std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     fpath = this->BuildMacContentDirectory(fpath, config, false);
     fpath += "/";
@@ -3438,8 +3438,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     configPostfix = this->GetProperty(configProp);
     // Mac application bundles and frameworks have no postfix.
     if(configPostfix &&
-       (this->Target->IsAppBundleOnApple()
-         || this->IsFrameworkOnApple()))
+       (this->IsAppBundleOnApple() || this->IsFrameworkOnApple()))
       {
       configPostfix = 0;
       }
@@ -5955,3 +5954,11 @@ bool cmGeneratorTarget::IsFrameworkOnApple() const
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsAppBundleOnApple() const
+{
+  return (this->GetType() == cmState::EXECUTABLE &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("MACOSX_BUNDLE"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 471a500..24a1c2c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -419,6 +419,9 @@ public:
       Apple.  */
   bool IsFrameworkOnApple() const;
 
+  /** Return whether this target is an executable Bundle on Apple.  */
+  bool IsAppBundleOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 9c0aca0..e16dfd7 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -150,7 +150,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       std::string to1 = toDir + targetName;
 
       // Handle OSX Bundles.
-      if(this->Target->Target->IsAppBundleOnApple())
+      if(this->Target->IsAppBundleOnApple())
         {
         // Install the whole app bundle directory.
         type = cmInstallType_DIRECTORY;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 178b462..31fb37b 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -100,7 +100,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   // Construct the full path version of the names.
   std::string outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
-  if(this->Target->IsAppBundleOnApple())
+  if(this->GeneratorTarget->IsAppBundleOnApple())
     {
     this->OSXBundleGenerator->CreateAppBundle(targetName, outpath);
     }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4cfbda5..8a4f17e 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -412,7 +412,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                      gt.GetFullPath(cfgName,
                                        /*implib=*/true));
 
-  if (target.IsAppBundleOnApple())
+  if (gt.IsAppBundleOnApple())
     {
     // Create the app bundle
     std::string outpath = gt.GetDirectory(cfgName);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80c97771319f3ab6d32ffc77c2660d863e7a7166
commit 80c97771319f3ab6d32ffc77c2660d863e7a7166
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:57:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:24:34 2015 +0200

    cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
    
    Leave the cmTarget method behind for now to implement cmInstallCommand.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 889c55c..2497f82 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1111,7 +1111,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
 
   // For compatibility with CMake 2.4 include the item's directory in
   // the linker search path.
-  if(this->OldLinkDirMode && !target->Target->IsFrameworkOnApple() &&
+  if(this->OldLinkDirMode && !target->IsFrameworkOnApple() &&
      this->OldLinkDirMask.find(cmSystemTools::GetFilenamePath(item)) ==
      this->OldLinkDirMask.end())
     {
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index fdc21db..132c0b5 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1082,7 +1082,7 @@ cmExportFileGenerator
     }
 
   // Mark the imported library if it is a framework.
-  if(target->Target->IsFrameworkOnApple())
+  if(target->IsFrameworkOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY FRAMEWORK 1)\n";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index bdf29b2..42b5c63 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1572,7 +1572,7 @@ cmGeneratorTarget::GetAppBundleDirectory(const std::string& config,
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::IsBundleOnApple() const
 {
-  return this->Target->IsFrameworkOnApple()
+  return this->IsFrameworkOnApple()
       || this->Target->IsAppBundleOnApple()
       || this->Target->IsCFBundleOnApple();
 }
@@ -1939,7 +1939,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
     {
     fpath += this->GetAppBundleDirectory(config, contentOnly);
     }
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     fpath += this->GetFrameworkDirectory(config, contentOnly);
     }
@@ -1959,7 +1959,7 @@ cmGeneratorTarget::GetMacContentDirectory(const std::string& config,
   std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
   bool contentOnly = true;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     // additional files with a framework go into the version specific
     // directory
@@ -3227,7 +3227,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   const char* version = this->GetProperty("VERSION");
   const char* soversion = this->GetProperty("SOVERSION");
   if(!this->HasSOName(config) ||
-     this->Target->IsFrameworkOnApple())
+     this->IsFrameworkOnApple())
     {
     // Versioning is supported only for shared libraries and modules,
     // and then only when the platform supports an soname flag.
@@ -3255,7 +3255,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   // The library name.
   name = prefix+base+suffix;
 
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     realName = prefix;
     if(!this->Makefile->PlatformIsAppleIos())
@@ -3439,7 +3439,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     // Mac application bundles and frameworks have no postfix.
     if(configPostfix &&
        (this->Target->IsAppBundleOnApple()
-         || this->Target->IsFrameworkOnApple()))
+         || this->IsFrameworkOnApple()))
       {
       configPostfix = 0;
       }
@@ -3476,7 +3476,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
 
   // frameworks have directory prefix but no suffix
   std::string fw_prefix;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     fw_prefix = this->GetOutputName(config, false);
     fw_prefix += ".framework/";
@@ -5947,3 +5947,11 @@ bool cmGeneratorTarget::IsLinkable() const
           this->GetType() == cmState::INTERFACE_LIBRARY ||
           this->Target->IsExecutableWithExports());
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsFrameworkOnApple() const
+{
+  return (this->GetType() == cmState::SHARED_LIBRARY &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("FRAMEWORK"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index a4a432c..471a500 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -415,6 +415,10 @@ public:
   /** Return whether this target may be used to link another target.  */
   bool IsLinkable() const;
 
+  /** Return whether this target is a shared library Framework on
+      Apple.  */
+  bool IsFrameworkOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index f54f936..1142ddd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2208,7 +2208,8 @@ cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
 
   if(cmTarget* tgt = this->FindTarget(libname))
     {
-    if(tgt->IsFrameworkOnApple())
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
+    if(gt->IsFrameworkOnApple())
        {
        return true;
        }
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 02da028..89a6dff 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -917,11 +917,13 @@ cmGlobalNinjaGenerator
   std::string configName =
     target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
+
   // for frameworks, we want the real name, not smple name
   // frameworks always appear versioned, and the build.ninja
   // will always attempt to manage symbolic links instead
   // of letting cmOSXBundleGenerator do it.
-  bool realname = target->IsFrameworkOnApple();
+  bool realname = gtgt->IsFrameworkOnApple();
 
   switch (target->GetType()) {
   case cmState::EXECUTABLE:
@@ -929,7 +931,6 @@ cmGlobalNinjaGenerator
   case cmState::STATIC_LIBRARY:
   case cmState::MODULE_LIBRARY:
     {
-    cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
     outputs.push_back(this->ConvertToNinjaPath(
       gtgt->GetFullPath(configName, false, realname)));
     break;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 7e5d963..5e12378 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -787,14 +787,16 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
 
   // Is this a resource file in this target? Add it to the resources group...
   //
+
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmGeneratorTarget::SourceFileFlags tsFlags =
-            this->GetGeneratorTarget(&cmtarget)->GetTargetSourceFileFlags(sf);
+      gtgt->GetTargetSourceFileFlags(sf);
   bool isResource = tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource;
 
   // Is this a "private" or "public" framework header file?
   // Set the ATTRIBUTES attribute appropriately...
   //
-  if(cmtarget.IsFrameworkOnApple())
+  if(gtgt->IsFrameworkOnApple())
     {
     if(tsFlags.Type == cmGeneratorTarget::SourceFileTypePrivateHeader)
       {
@@ -1193,7 +1195,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       }
 
     // some build phases only apply to bundles and/or frameworks
-    bool isFrameworkTarget = cmtarget.IsFrameworkOnApple();
+    bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
     bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
     bool isCFBundleTarget = cmtarget.IsCFBundleOnApple();
 
@@ -1289,7 +1291,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
         copyFilesBuildPhase->AddAttribute("dstSubfolderSpec",
           this->CreateString("6"));
         std::ostringstream ostr;
-        if (cmtarget.IsFrameworkOnApple())
+        if (gtgt->IsFrameworkOnApple())
           {
           // dstPath in frameworks is relative to Versions/<version>
           ostr << mit->first;
@@ -1467,8 +1469,10 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   std::vector<cmCustomCommand> postbuild
     = cmtarget.GetPostBuildCommands();
 
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+
   if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
-    !cmtarget.IsFrameworkOnApple())
+    !gtgt->IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
     cmd.resize(1);
@@ -1500,7 +1504,6 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
     }
 
   std::vector<cmSourceFile*> classes;
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   if (!gtgt->GetConfigCommonSourceFiles(classes))
     {
     return;
@@ -1943,7 +1946,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   const char* version = target.GetProperty("VERSION");
   const char* soversion = target.GetProperty("SOVERSION");
-  if(!gtgt->HasSOName(configName) || target.IsFrameworkOnApple())
+  if(!gtgt->HasSOName(configName) || gtgt->IsFrameworkOnApple())
     {
     version = 0;
     soversion = 0;
@@ -1990,7 +1993,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       pndir = gtgt->GetDirectory(configName);
       }
 
-    if(target.IsFrameworkOnApple() || target.IsCFBundleOnApple())
+    if(gtgt->IsFrameworkOnApple() || target.IsCFBundleOnApple())
       {
       pnprefix = "";
       }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index c2798b2..9c0aca0 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -208,7 +208,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       // An import library looks like a static library.
       type = cmInstallType_STATIC_LIBRARY;
       }
-    else if(this->Target->Target->IsFrameworkOnApple())
+    else if(this->Target->IsFrameworkOnApple())
       {
       // There is a bug in cmInstallCommand if this fails.
       assert(this->NamelinkMode == NamelinkModeNone);
@@ -605,7 +605,7 @@ cmInstallTargetGenerator
     std::string for_install =
       this->Target->GetInstallNameDirForInstallTree();
 
-    if(this->Target->Target->IsFrameworkOnApple() && for_install.empty())
+    if(this->Target->IsFrameworkOnApple() && for_install.empty())
       {
       // Frameworks seem to have an id corresponding to their own full
       // path.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2ed5f70..015c880 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -153,7 +153,7 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules()
 //----------------------------------------------------------------------------
 void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 {
-  if(this->Target->IsFrameworkOnApple())
+  if(this->GeneratorTarget->IsFrameworkOnApple())
     {
     this->WriteFrameworkRules(relink);
     return;
@@ -273,7 +273,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   // Construct the full path version of the names.
   std::string outpath;
   std::string outpathImp;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->GeneratorTarget->IsFrameworkOnApple())
     {
     outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
@@ -791,7 +791,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Add a rule to create necessary symlinks for the library.
   // Frameworks are handled by cmOSXBundleGenerator.
-  if(targetOutPath != targetOutPathReal && !this->Target->IsFrameworkOnApple())
+  if(targetOutPath != targetOutPathReal
+     && !this->GeneratorTarget->IsFrameworkOnApple())
     {
     std::string symlink = "$(CMAKE_COMMAND) -E cmake_symlink_library ";
     symlink += targetOutPathReal;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index e5e4b7f..4cfbda5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -281,7 +281,7 @@ cmNinjaNormalTargetGenerator
   }
 
   if (this->TargetNameOut != this->TargetNameReal &&
-    !this->GetTarget()->IsFrameworkOnApple()) {
+    !this->GetGeneratorTarget()->IsFrameworkOnApple()) {
     std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
@@ -428,7 +428,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     targetOutputReal += this->TargetNameReal;
     targetOutputReal = this->ConvertToNinjaPath(targetOutputReal);
     }
-  else if (target.IsFrameworkOnApple())
+  else if (gt.IsFrameworkOnApple())
     {
     // Create the library framework.
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
@@ -732,7 +732,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                         &usedResponseFile);
   this->WriteLinkRule(usedResponseFile);
 
-  if (targetOutput != targetOutputReal && !target.IsFrameworkOnApple())
+  if (targetOutput != targetOutputReal && !gt.IsFrameworkOnApple())
     {
     if (targetType == cmState::EXECUTABLE)
       {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c454746a0865d2310fb0746a85c5491df196b72
commit 0c454746a0865d2310fb0746a85c5491df196b72
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:44:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:24:34 2015 +0200

    cmGeneratorTarget: Move IsLinkable from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 7bdc555..889c55c 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -643,7 +643,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
     return;
     }
 
-  if(tgt && tgt->Target->IsLinkable())
+  if(tgt && tgt->IsLinkable())
     {
     // This is a CMake target.  Ask the target for its real name.
     if(impexe && this->LoaderFlag)
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 3e58400..fdc21db 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -210,7 +210,7 @@ bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  if(!target->Target->IsLinkable())
+  if(!target->IsLinkable())
     {
     return false;
     }
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index c7c0e73..1a878e2 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1654,7 +1654,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
                             const GeneratorExpressionContent *content)
   {
     // The file used to link to the target (.so, .lib, .a).
-    if(!target->Target->IsLinkable())
+    if(!target->IsLinkable())
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_LINKER_FILE is allowed only for libraries and "
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 03c950e..bdf29b2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5936,3 +5936,14 @@ std::string cmGeneratorTarget::GetSupportDirectory() const
 #endif
   return dir;
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsLinkable() const
+{
+  return (this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY ||
+          this->GetType() == cmState::UNKNOWN_LIBRARY ||
+          this->GetType() == cmState::INTERFACE_LIBRARY ||
+          this->Target->IsExecutableWithExports());
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 1029158..a4a432c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -412,6 +412,9 @@ public:
   /** Get a build-tree directory in which to place target support files.  */
   std::string GetSupportDirectory() const;
 
+  /** Return whether this target may be used to link another target.  */
+  bool IsLinkable() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d81d3b8..fcc27ca 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -385,7 +385,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
 }
 
 //----------------------------------------------------------------------------
-static bool VSLinkable(cmTarget const* t)
+static bool VSLinkable(cmGeneratorTarget const* t)
 {
   return t->IsLinkable() || t->GetType() == cmState::OBJECT_LIBRARY;
 }
@@ -475,7 +475,8 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
       di != utilDepends.end(); ++di)
     {
     cmTarget const* dep = *di;
-    if(allowLinkable || !VSLinkable(dep) || linked.count(dep))
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(dep);
+    if(allowLinkable || !VSLinkable(gt) || linked.count(dep))
       {
       // Direct dependency allowed.
       vsTargetDepend.insert(dep->GetName());
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 57a2d24..761267d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -345,17 +345,6 @@ bool cmTarget::IsExecutableWithExports() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsLinkable() const
-{
-  return (this->GetType() == cmState::STATIC_LIBRARY ||
-          this->GetType() == cmState::SHARED_LIBRARY ||
-          this->GetType() == cmState::MODULE_LIBRARY ||
-          this->GetType() == cmState::UNKNOWN_LIBRARY ||
-          this->GetType() == cmState::INTERFACE_LIBRARY ||
-          this->IsExecutableWithExports());
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::HasImportLibrary() const
 {
   return (this->DLLPlatform &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index dafe86a..51e97fd 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -228,9 +228,6 @@ public:
       enabled.  */
   bool IsExecutableWithExports() const;
 
-  /** Return whether this target may be used to link another target.  */
-  bool IsLinkable() const;
-
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=943b26f4f39d94d50d1f0f9b84ef139225eb921f
commit 943b26f4f39d94d50d1f0f9b84ef139225eb921f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:20:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:24:30 2015 +0200

    Xcode: Port internal API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d4ccde6..7e5d963 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2639,23 +2639,24 @@ cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
 }
 
 //----------------------------------------------------------------------------
-const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
+const char* cmGlobalXCodeGenerator::GetTargetFileType(
+    cmGeneratorTarget* target)
 {
-  switch(cmtarget.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
       return "archive.ar";
     case cmState::MODULE_LIBRARY:
-      if (cmtarget.IsXCTestOnApple())
+      if (target->Target->IsXCTestOnApple())
         return "wrapper.cfbundle";
-      else if (cmtarget.IsCFBundleOnApple())
+      else if (target->Target->IsCFBundleOnApple())
         return "wrapper.plug-in";
       else
         return ((this->XcodeVersion >= 22)?
               "compiled.mach-o.executable" : "compiled.mach-o.dylib");
     case cmState::SHARED_LIBRARY:
-      return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
+      return (target->GetPropertyAsBool("FRAMEWORK")?
               "wrapper.framework" : "compiled.mach-o.dylib");
     case cmState::EXECUTABLE:
       return "compiled.mach-o.executable";
@@ -2665,28 +2666,29 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
 }
 
 //----------------------------------------------------------------------------
-const char* cmGlobalXCodeGenerator::GetTargetProductType(cmTarget& cmtarget)
+const char* cmGlobalXCodeGenerator::GetTargetProductType(
+    cmGeneratorTarget* target)
 {
-  switch(cmtarget.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
     case cmState::MODULE_LIBRARY:
-      if (cmtarget.IsXCTestOnApple())
+      if (target->Target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
-      else if (cmtarget.IsCFBundleOnApple())
+      else if (target->Target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
       else
         return ((this->XcodeVersion >= 22)?
                 "com.apple.product-type.tool" :
                 "com.apple.product-type.library.dynamic");
     case cmState::SHARED_LIBRARY:
-      return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
+      return (target->GetPropertyAsBool("FRAMEWORK")?
               "com.apple.product-type.framework" :
               "com.apple.product-type.library.dynamic");
     case cmState::EXECUTABLE:
-      return (cmtarget.GetPropertyAsBool("MACOSX_BUNDLE")?
+      return (target->GetPropertyAsBool("MACOSX_BUNDLE")?
               "com.apple.product-type.application" :
               "com.apple.product-type.tool");
     default: break;
@@ -2727,9 +2729,11 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
   target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
 
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+
   cmXCodeObject* fileRef =
     this->CreateObject(cmXCodeObject::PBXFileReference);
-  if(const char* fileType = this->GetTargetFileType(cmtarget))
+  if(const char* fileType = this->GetTargetFileType(gtgt))
     {
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
@@ -2742,7 +2746,6 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     }
   else
     {
-    cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
     fullName = gtgt->GetFullName(defConfig.c_str());
     }
   fileRef->AddAttribute("path", this->CreateString(fullName.c_str()));
@@ -2752,7 +2755,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   fileRef->SetComment(cmtarget.GetName().c_str());
   target->AddAttribute("productReference",
                        this->CreateObjectReference(fileRef));
-  if(const char* productType = this->GetTargetProductType(cmtarget))
+  if(const char* productType = this->GetTargetProductType(gtgt))
     {
     target->AddAttribute("productType", this->CreateString(productType));
     }
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 9daf0ab..feb5009 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -137,8 +137,8 @@ private:
   void ForceLinkerLanguages();
   void ForceLinkerLanguage(cmTarget& cmtarget);
   const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
-  const char* GetTargetFileType(cmTarget& cmtarget);
-  const char* GetTargetProductType(cmTarget& cmtarget);
+  const char* GetTargetFileType(cmGeneratorTarget* target);
+  const char* GetTargetProductType(cmGeneratorTarget* target);
   std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget);
   void AppendOrAddBuildSetting(cmXCodeObject* settings, const char* attr,
                                const char* value);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1884d054d86a1e8d326cdcbc904a2d4b34382a2b
commit 1884d054d86a1e8d326cdcbc904a2d4b34382a2b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:08:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:12:08 2015 +0200

    cmGeneratorTarget: Move GetExportName from cmTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index d191e47..781220d 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -48,7 +48,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     {
     cmGeneratorTarget *te = this->LG
                                 ->FindGeneratorTargetToUse(*tei);
-    expectedTargets += sep + this->Namespace + te->Target->GetExportName();
+    expectedTargets += sep + this->Namespace + te->GetExportName();
     sep = " ";
     if(this->ExportedTargets.insert(te).second)
       {
@@ -253,7 +253,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
       {
       std::string missingTarget = namespaces[0];
 
-      missingTarget += dependee->Target->GetExportName();
+      missingTarget += dependee->GetExportName();
       link_libs += missingTarget;
       missingTargets.push_back(missingTarget);
       return;
@@ -268,7 +268,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
   // Assume the target will be exported by another command.
   // Append it with the export namespace.
   link_libs += this->Namespace;
-  link_libs += dependee->Target->GetExportName();
+  link_libs += dependee->GetExportName();
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 1c3e9fe..3e58400 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 #include "cmTargetExport.h"
 #include "cmVersion.h"
 #include "cmComputeLinkInformation.h"
@@ -623,7 +622,7 @@ void cmExportFileGenerator::GenerateInterfaceProperties(
   if (!properties.empty())
     {
     std::string targetName = this->Namespace;
-    targetName += target->Target->GetExportName();
+    targetName += target->GetExportName();
     os << "set_target_properties(" << targetName << " PROPERTIES\n";
     for(ImportPropertyMap::const_iterator pi = properties.begin();
         pi != properties.end(); ++pi)
@@ -655,7 +654,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     }
   if(this->ExportedTargets.find(tgt) != this->ExportedTargets.end())
     {
-    input = this->Namespace + tgt->Target->GetExportName();
+    input = this->Namespace + tgt->GetExportName();
     }
   else
     {
@@ -1047,7 +1046,7 @@ cmExportFileGenerator
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->Target->GetExportName();
+  targetName += target->GetExportName();
 
   // Create the imported target.
   os << "# Create imported target " << targetName << "\n";
@@ -1114,7 +1113,7 @@ cmExportFileGenerator
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->Target->GetExportName();
+  targetName += target->GetExportName();
 
   // Set the import properties.
   os << "# Import target \"" << targetName << "\" for configuration \""
@@ -1234,7 +1233,7 @@ cmExportFileGenerator
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
-  targetName += target->Target->GetExportName();
+  targetName += target->GetExportName();
 
   os << "list(APPEND _IMPORT_CHECK_TARGETS " << targetName << " )\n"
         "list(APPEND _IMPORT_CHECK_FILES_FOR_" << targetName << " ";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index ea5badc..d57d67f 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -49,7 +49,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
     {
     expectedTargets +=
-        sep + this->Namespace + (*tei)->Target->Target->GetExportName();
+        sep + this->Namespace + (*tei)->Target->GetExportName();
     sep = " ";
     cmTargetExport * te = *tei;
     if(this->ExportedTargets.insert(te->Target).second)
@@ -465,7 +465,7 @@ cmExportInstallFileGenerator::HandleMissingTarget(std::string& link_libs,
     {
     std::string missingTarget = namespaces[0];
 
-    missingTarget += dependee->Target->GetExportName();
+    missingTarget += dependee->GetExportName();
     link_libs += missingTarget;
     missingTargets.push_back(missingTarget);
     }
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5e26aad..03c950e 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -335,6 +335,26 @@ std::string cmGeneratorTarget::GetName() const
 }
 
 //----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetExportName() const
+{
+  const char *exportName = this->GetProperty("EXPORT_NAME");
+
+  if (exportName && *exportName)
+    {
+    if (!cmGeneratorExpression::IsValidTargetName(exportName))
+      {
+      std::ostringstream e;
+      e << "EXPORT_NAME property \"" << exportName << "\" for \""
+        << this->GetName() << "\": is not valid.";
+      cmSystemTools::Error(e.str().c_str());
+      return "";
+      }
+    return exportName;
+    }
+  return this->GetName();
+}
+
+//----------------------------------------------------------------------------
 const char *cmGeneratorTarget::GetProperty(const std::string& prop) const
 {
   return this->Target->GetProperty(prop);
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f5a894b..1029158 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -43,6 +43,8 @@ public:
 
   cmState::TargetType GetType() const;
   std::string GetName() const;
+  std::string GetExportName() const;
+
   const char *GetProperty(const std::string& prop) const;
   bool GetPropertyAsBool(const std::string& prop) const;
   void GetSourceFiles(std::vector<cmSourceFile*>& files,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1c4faab..57a2d24 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1412,26 +1412,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetExportName() const
-{
-  const char *exportName = this->GetProperty("EXPORT_NAME");
-
-  if (exportName && *exportName)
-    {
-    if (!cmGeneratorExpression::IsValidTargetName(exportName))
-      {
-      std::ostringstream e;
-      e << "EXPORT_NAME property \"" << exportName << "\" for \""
-        << this->GetName() << "\": is not valid.";
-      cmSystemTools::Error(e.str().c_str());
-      return "";
-      }
-    return exportName;
-    }
-  return this->GetName();
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AppendBuildInterfaceIncludes()
 {
   if(this->GetType() != cmState::SHARED_LIBRARY &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 443a2d0..dafe86a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -96,7 +96,6 @@ public:
 
   ///! Set/Get the name of the target
   const std::string& GetName() const {return this->Name;}
-  std::string GetExportName() const;
 
   ///! Set the cmMakefile that owns this target
   void SetMakefile(cmMakefile *mf);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52b56835e39b93a42f7c5235b8469178dfc5db12
commit 52b56835e39b93a42f7c5235b8469178dfc5db12
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:10:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:10:46 2015 +0200

    Export: Port internal API to cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index cf84146..d191e47 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -174,7 +174,7 @@ cmExportBuildFileGenerator
       //                              properties);
 
       // Generate code in the export file.
-      this->GenerateImportPropertyCode(os, config, target->Target,
+      this->GenerateImportPropertyCode(os, config, target,
                                        properties);
       }
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b597b53..1c3e9fe 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1108,13 +1108,13 @@ cmExportFileGenerator
 void
 cmExportFileGenerator
 ::GenerateImportPropertyCode(std::ostream& os, const std::string& config,
-                             cmTarget const* target,
+                             cmGeneratorTarget const* target,
                              ImportPropertyMap const& properties)
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->GetExportName();
+  targetName += target->Target->GetExportName();
 
   // Set the import properties.
   os << "# Import target \"" << targetName << "\" for configuration \""
@@ -1228,13 +1228,13 @@ cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os)
 //----------------------------------------------------------------------------
 void
 cmExportFileGenerator
-::GenerateImportedFileChecksCode(std::ostream& os, cmTarget* target,
+::GenerateImportedFileChecksCode(std::ostream& os, cmGeneratorTarget* target,
                                  ImportPropertyMap const& properties,
                                 const std::set<std::string>& importedLocations)
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
-  targetName += target->GetExportName();
+  targetName += target->Target->GetExportName();
 
   os << "list(APPEND _IMPORT_CHECK_TARGETS " << targetName << " )\n"
         "list(APPEND _IMPORT_CHECK_FILES_FOR_" << targetName << " ";
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index be5c6f7..18f0b00 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -78,9 +78,10 @@ protected:
   void GenerateImportTargetCode(std::ostream& os,
                                 cmGeneratorTarget const* target);
   void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
-                                  cmTarget const* target,
+                                  cmGeneratorTarget const* target,
                                   ImportPropertyMap const& properties);
-  void GenerateImportedFileChecksCode(std::ostream& os, cmTarget* target,
+  void GenerateImportedFileChecksCode(std::ostream& os,
+                                      cmGeneratorTarget* target,
                                       ImportPropertyMap const& properties,
                                const std::set<std::string>& importedLocations);
   void GenerateImportedFileCheckLoop(std::ostream& os);
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 988b0dc..ea5badc 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -375,8 +375,8 @@ cmExportInstallFileGenerator
       //                              properties);
 
       // Generate code in the export file.
-      this->GenerateImportPropertyCode(os, config, gtgt->Target, properties);
-      this->GenerateImportedFileChecksCode(os, gtgt->Target, properties,
+      this->GenerateImportPropertyCode(os, config, gtgt, properties);
+      this->GenerateImportedFileChecksCode(os, gtgt, properties,
                                            importedLocations);
       }
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f1135ba712f145edb70299d38ac539d70c13c42
commit 4f1135ba712f145edb70299d38ac539d70c13c42
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:05:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:05:46 2015 +0200

    Export: Port internal utility to cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index c24138f..cf84146 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -237,14 +237,15 @@ void
 cmExportBuildFileGenerator::HandleMissingTarget(
     std::string& link_libs,
     std::vector<std::string>& missingTargets,
-    cmTarget* depender,
-    cmTarget* dependee)
+    cmGeneratorTarget* depender,
+    cmGeneratorTarget* dependee)
 {
   // The target is not in the export.
   if(!this->AppendMode)
     {
     const std::string name = dependee->GetName();
-    cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+    cmGlobalGenerator* gg =
+        dependee->GetLocalGenerator()->GetGlobalGenerator();
     std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
 
     int targetOccurrences = (int)namespaces.size();
@@ -252,7 +253,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
       {
       std::string missingTarget = namespaces[0];
 
-      missingTarget += dependee->GetExportName();
+      missingTarget += dependee->Target->GetExportName();
       link_libs += missingTarget;
       missingTargets.push_back(missingTarget);
       return;
@@ -267,7 +268,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
   // Assume the target will be exported by another command.
   // Append it with the export namespace.
   link_libs += this->Namespace;
-  link_libs += dependee->GetExportName();
+  link_libs += dependee->Target->GetExportName();
 }
 
 //----------------------------------------------------------------------------
@@ -315,8 +316,8 @@ cmExportBuildFileGenerator
 //----------------------------------------------------------------------------
 void
 cmExportBuildFileGenerator
-::ComplainAboutMissingTarget(cmTarget* depender,
-                             cmTarget* dependee,
+::ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                             cmGeneratorTarget* dependee,
                              int occurrences)
 {
   if(cmSystemTools::GetErrorOccuredFlag())
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index c7d317f..85aae2f 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -54,11 +54,11 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmTarget* depender,
-                                   cmTarget* dependee);
+                                   cmGeneratorTarget* depender,
+                                   cmGeneratorTarget* dependee);
 
-  void ComplainAboutMissingTarget(cmTarget* depender,
-                                  cmTarget* dependee,
+  void ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                                  cmGeneratorTarget* dependee,
                                   int occurrences);
 
   /** Fill in properties indicating built file locations.  */
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 192a932..b597b53 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -661,7 +661,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     {
     std::string namespacedTarget;
     this->HandleMissingTarget(namespacedTarget, missingTargets,
-                              target->Target, tgt->Target);
+                              target, tgt);
     if (!namespacedTarget.empty())
       {
       input = namespacedTarget;
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index e1ff83d..be5c6f7 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -119,8 +119,8 @@ protected:
    *  export set.  */
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmTarget* depender,
-                                   cmTarget* dependee) = 0;
+                                   cmGeneratorTarget* depender,
+                                   cmGeneratorTarget* dependee) = 0;
   void PopulateInterfaceProperty(const std::string&,
                                  cmGeneratorTarget *target,
                                  cmGeneratorExpression::PreprocessContext,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 48f92b0..988b0dc 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -453,19 +453,19 @@ cmExportInstallFileGenerator
 
 //----------------------------------------------------------------------------
 void
-cmExportInstallFileGenerator::HandleMissingTarget(
-  std::string& link_libs, std::vector<std::string>& missingTargets,
-  cmTarget* depender, cmTarget* dependee)
+cmExportInstallFileGenerator::HandleMissingTarget(std::string& link_libs,
+  std::vector<std::string>& missingTargets,
+  cmGeneratorTarget* depender, cmGeneratorTarget* dependee)
 {
   const std::string name = dependee->GetName();
-  cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+  cmGlobalGenerator* gg = dependee->GetLocalGenerator()->GetGlobalGenerator();
   std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
   int targetOccurrences = (int)namespaces.size();
   if (targetOccurrences == 1)
     {
     std::string missingTarget = namespaces[0];
 
-    missingTarget += dependee->GetExportName();
+    missingTarget += dependee->Target->GetExportName();
     link_libs += missingTarget;
     missingTargets.push_back(missingTarget);
     }
@@ -520,8 +520,8 @@ cmExportInstallFileGenerator
 //----------------------------------------------------------------------------
 void
 cmExportInstallFileGenerator
-::ComplainAboutMissingTarget(cmTarget* depender,
-                             cmTarget* dependee,
+::ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                             cmGeneratorTarget* dependee,
                              int occurrences)
 {
   std::ostringstream e;
diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h
index b1fa70e..13dae89 100644
--- a/Source/cmExportInstallFileGenerator.h
+++ b/Source/cmExportInstallFileGenerator.h
@@ -57,13 +57,13 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmTarget* depender,
-                                   cmTarget* dependee);
+                                   cmGeneratorTarget* depender,
+                                   cmGeneratorTarget* dependee);
 
   virtual void ReplaceInstallPrefix(std::string &input);
 
-  void ComplainAboutMissingTarget(cmTarget* depender,
-                                  cmTarget* dependee,
+  void ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                                  cmGeneratorTarget* dependee,
                                   int occurrences);
 
   std::vector<std::string> FindNamespaces(cmGlobalGenerator* gg,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=274d73e8616430028ec1245ba6cdc66f73d7cdba
commit 274d73e8616430028ec1245ba6cdc66f73d7cdba
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:01:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 15:02:04 2015 +0200

    Export: Port some API to cmGlobalGenerator.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 194d9a2..c24138f 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -235,14 +235,17 @@ cmExportBuildFileGenerator
 //----------------------------------------------------------------------------
 void
 cmExportBuildFileGenerator::HandleMissingTarget(
-  std::string& link_libs, std::vector<std::string>& missingTargets,
-  cmMakefile* mf, cmTarget* depender, cmTarget* dependee)
+    std::string& link_libs,
+    std::vector<std::string>& missingTargets,
+    cmTarget* depender,
+    cmTarget* dependee)
 {
   // The target is not in the export.
   if(!this->AppendMode)
     {
     const std::string name = dependee->GetName();
-    std::vector<std::string> namespaces = this->FindNamespaces(mf, name);
+    cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+    std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
 
     int targetOccurrences = (int)namespaces.size();
     if (targetOccurrences == 1)
@@ -287,10 +290,9 @@ void cmExportBuildFileGenerator
 //----------------------------------------------------------------------------
 std::vector<std::string>
 cmExportBuildFileGenerator
-::FindNamespaces(cmMakefile* mf, const std::string& name)
+::FindNamespaces(cmGlobalGenerator* gg, const std::string& name)
 {
   std::vector<std::string> namespaces;
-  cmGlobalGenerator* gg = mf->GetGlobalGenerator();
 
   std::map<std::string, cmExportBuildFileGenerator*>& exportSets
                                                   = gg->GetBuildExportSets();
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index 16695f1..c7d317f 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -54,7 +54,6 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmMakefile* mf,
                                    cmTarget* depender,
                                    cmTarget* dependee);
 
@@ -72,7 +71,7 @@ protected:
                              const std::string& config);
 
   std::vector<std::string>
-  FindNamespaces(cmMakefile* mf, const std::string& name);
+  FindNamespaces(cmGlobalGenerator* gg, const std::string& name);
 
   std::vector<std::string> Targets;
   cmExportSet *ExportSet;
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 0985542..192a932 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -661,7 +661,6 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     {
     std::string namespacedTarget;
     this->HandleMissingTarget(namespacedTarget, missingTargets,
-                              target->Target->GetMakefile(),
                               target->Target, tgt->Target);
     if (!namespacedTarget.empty())
       {
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 3280a03..e1ff83d 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -119,7 +119,6 @@ protected:
    *  export set.  */
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmMakefile* mf,
                                    cmTarget* depender,
                                    cmTarget* dependee) = 0;
   void PopulateInterfaceProperty(const std::string&,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 67697f8..48f92b0 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -455,10 +455,11 @@ cmExportInstallFileGenerator
 void
 cmExportInstallFileGenerator::HandleMissingTarget(
   std::string& link_libs, std::vector<std::string>& missingTargets,
-  cmMakefile* mf, cmTarget* depender, cmTarget* dependee)
+  cmTarget* depender, cmTarget* dependee)
 {
   const std::string name = dependee->GetName();
-  std::vector<std::string> namespaces = this->FindNamespaces(mf, name);
+  cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+  std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
   int targetOccurrences = (int)namespaces.size();
   if (targetOccurrences == 1)
     {
@@ -479,10 +480,9 @@ cmExportInstallFileGenerator::HandleMissingTarget(
 //----------------------------------------------------------------------------
 std::vector<std::string>
 cmExportInstallFileGenerator
-::FindNamespaces(cmMakefile* mf, const std::string& name)
+::FindNamespaces(cmGlobalGenerator* gg, const std::string& name)
 {
   std::vector<std::string> namespaces;
-  cmGlobalGenerator* gg = mf->GetGlobalGenerator();
   const cmExportSetMap& exportSets = gg->GetExportSets();
 
   for(cmExportSetMap::const_iterator expIt = exportSets.begin();
diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h
index b06fee5..b1fa70e 100644
--- a/Source/cmExportInstallFileGenerator.h
+++ b/Source/cmExportInstallFileGenerator.h
@@ -57,7 +57,6 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmMakefile* mf,
                                    cmTarget* depender,
                                    cmTarget* dependee);
 
@@ -67,7 +66,7 @@ protected:
                                   cmTarget* dependee,
                                   int occurrences);
 
-  std::vector<std::string> FindNamespaces(cmMakefile* mf,
+  std::vector<std::string> FindNamespaces(cmGlobalGenerator* gg,
                                           const std::string& name);
 
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80bfcc17eff2681012a234275f6f9bb60b84142e
commit 80bfcc17eff2681012a234275f6f9bb60b84142e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 14:54:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 14:54:58 2015 +0200

    cmInstallTargetGenerator: Port GetInstallFilename to cmGeneratorTarget.

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index da963f3..67697f8 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -399,7 +399,7 @@ cmExportInstallFileGenerator
     }
 
   // Get the target to be installed.
-  cmTarget* target = itgen->GetTarget()->Target;
+  cmGeneratorTarget* target = itgen->GetTarget();
 
   // Construct the installed location of the target.
   std::string dest = itgen->GetDestination(config);
@@ -433,7 +433,7 @@ cmExportInstallFileGenerator
     prop += suffix;
 
     // Append the installed file name.
-    if(target->IsAppBundleOnApple())
+    if(target->Target->IsAppBundleOnApple())
       {
       value += itgen->GetInstallFilename(target, config);
       value += ".app/Contents/MacOS/";
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 2f08165..c2798b2 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -359,34 +359,31 @@ cmInstallTargetGenerator::GetInstallFilename(const std::string& config) const
 {
   NameType nameType = this->ImportLibrary? NameImplib : NameNormal;
   return
-    cmInstallTargetGenerator::GetInstallFilename(this->Target->Target, config,
+    cmInstallTargetGenerator::GetInstallFilename(this->Target, config,
                                                  nameType);
 }
 
 //----------------------------------------------------------------------------
 std::string
-cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
+cmInstallTargetGenerator::GetInstallFilename(cmGeneratorTarget const* target,
                                              const std::string& config,
                                              NameType nameType)
 {
   std::string fname;
   // Compute the name of the library.
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
   if(target->GetType() == cmState::EXECUTABLE)
     {
     std::string targetName;
     std::string targetNameReal;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gtgt->GetExecutableNames(targetName, targetNameReal,
+    target->GetExecutableNames(targetName, targetNameReal,
                                targetNameImport, targetNamePDB,
                                config);
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -410,12 +407,12 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     std::string targetNameReal;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gtgt->GetLibraryNames(targetName, targetNameSO, targetNameReal,
+    target->GetLibraryNames(targetName, targetNameSO, targetNameReal,
                             targetNameImport, targetNamePDB, config);
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -585,7 +582,7 @@ cmInstallTargetGenerator
         // The directory portions differ.  Append the filename to
         // create the mapping.
         std::string fname =
-          this->GetInstallFilename(tgt->Target, config, NameSO);
+          this->GetInstallFilename(tgt, config, NameSO);
 
         // Map from the build-tree install_name.
         for_build += fname;
@@ -622,7 +619,7 @@ cmInstallTargetGenerator
       {
       // Prepare to refer to the install-tree install_name.
       new_id = for_install;
-      new_id += this->GetInstallFilename(this->Target->Target, config, NameSO);
+      new_id += this->GetInstallFilename(this->Target, config, NameSO);
       }
     }
 
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index a8f4a75..ec89c05 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -14,7 +14,6 @@
 
 #include "cmInstallGenerator.h"
 
-class cmTarget;
 class cmGeneratorTarget;
 
 /** \class cmInstallTargetGenerator
@@ -54,7 +53,7 @@ public:
     NameReal
   };
 
-  static std::string GetInstallFilename(cmTarget const* target,
+  static std::string GetInstallFilename(const cmGeneratorTarget* target,
                                         const std::string& config,
                                         NameType nameType = NameNormal);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d693e2fca03d03f12f02c38270543b29b0270600
commit d693e2fca03d03f12f02c38270543b29b0270600
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 14:33:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 14:33:51 2015 +0200

    Export: Port interface to cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 30a8bf2..194d9a2 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -50,7 +50,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
-    if(this->ExportedTargets.insert(te->Target).second)
+    if(this->ExportedTargets.insert(te).second)
       {
       this->Exports.push_back(te);
       }
@@ -80,45 +80,44 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->Exports.end(); ++tei)
     {
     cmGeneratorTarget* gte = *tei;
-    cmTarget* te = gte->Target;
-    this->GenerateImportTargetCode(os, te);
+    this->GenerateImportTargetCode(os, gte);
 
-    te->AppendBuildInterfaceIncludes();
+    gte->Target->AppendBuildInterfaceIncludes();
 
     ImportPropertyMap properties;
 
-    this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
+    this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_SOURCES", te,
+    this->PopulateInterfaceProperty("INTERFACE_SOURCES", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
+    this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", te,
+    this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS", te,
+    this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES", te,
+    this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
-                                  te, properties);
+                                  gte, properties);
     const bool newCMP0022Behavior =
-                              te->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                           && te->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gte->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gte->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
-      this->PopulateInterfaceLinkLibrariesProperty(te,
+      this->PopulateInterfaceLinkLibrariesProperty(gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
       }
     this->PopulateCompatibleInterfaceProperties(gte, properties);
 
-    this->GenerateInterfaceProperties(te, os, properties);
+    this->GenerateInterfaceProperties(gte, os, properties);
     }
 
   // Generate import file content for each configuration.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 4e8bc86..0985542 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -155,7 +155,7 @@ void cmExportFileGenerator::GenerateImportConfig(std::ostream& os,
 //----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateInterfaceProperty(
                                               const std::string& propName,
-                                              cmTarget *target,
+                                              cmGeneratorTarget *target,
                                               ImportPropertyMap &properties)
 {
   const char *input = target->GetProperty(propName);
@@ -169,7 +169,7 @@ void cmExportFileGenerator::PopulateInterfaceProperty(
 void cmExportFileGenerator::PopulateInterfaceProperty(
                       const std::string& propName,
                       const std::string& outputName,
-                      cmTarget *target,
+                      cmGeneratorTarget *target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
@@ -206,12 +206,12 @@ void cmExportFileGenerator::GenerateRequiredCMakeVersion(std::ostream& os,
 
 //----------------------------------------------------------------------------
 bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty(
-                      cmTarget *target,
+                      cmGeneratorTarget *target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  if(!target->IsLinkable())
+  if(!target->Target->IsLinkable())
     {
     return false;
     }
@@ -420,7 +420,7 @@ void cmExportFileGenerator::PopulateSourcesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, gt->Target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, gt,
                                                 missingTargets);
 
     if (!checkInterfaceDirs(prepro, gt, propName))
@@ -488,7 +488,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
     if (!checkInterfaceDirs(prepro, target, propName))
@@ -502,7 +502,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
 //----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateInterfaceProperty(
                       const std::string& propName,
-                      cmTarget *target,
+                      cmGeneratorTarget* target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
@@ -574,15 +574,14 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
                                 cmGeneratorTarget *gtarget,
                                 ImportPropertyMap &properties)
 {
-  cmTarget *target = gtarget->Target;
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_BOOL",
-                                target, properties);
+                                gtarget, properties);
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_STRING",
-                                target, properties);
+                                gtarget, properties);
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_NUMBER_MIN",
-                                target, properties);
+                                gtarget, properties);
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_NUMBER_MAX",
-                                target, properties);
+                                gtarget, properties);
 
   std::set<std::string> ifaceProperties;
 
@@ -593,12 +592,12 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
   getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MAX",
                       ifaceProperties);
 
-  if (target->GetType() != cmState::INTERFACE_LIBRARY)
+  if (gtarget->GetType() != cmState::INTERFACE_LIBRARY)
     {
     getCompatibleInterfaceProperties(gtarget, ifaceProperties, "");
 
     std::vector<std::string> configNames;
-    target->GetMakefile()->GetConfigurations(configNames);
+    gtarget->Target->GetMakefile()->GetConfigurations(configNames);
 
     for (std::vector<std::string>::const_iterator ci = configNames.begin();
       ci != configNames.end(); ++ci)
@@ -611,19 +610,20 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
     it != ifaceProperties.end(); ++it)
     {
     this->PopulateInterfaceProperty("INTERFACE_" + *it,
-                                    target, properties);
+                                    gtarget, properties);
     }
 }
 
 //----------------------------------------------------------------------------
-void cmExportFileGenerator::GenerateInterfaceProperties(cmTarget const* target,
+void cmExportFileGenerator::GenerateInterfaceProperties(
+                                        const cmGeneratorTarget* target,
                                         std::ostream& os,
                                         const ImportPropertyMap &properties)
 {
   if (!properties.empty())
     {
     std::string targetName = this->Namespace;
-    targetName += target->GetExportName();
+    targetName += target->Target->GetExportName();
     os << "set_target_properties(" << targetName << " PROPERTIES\n";
     for(ImportPropertyMap::const_iterator pi = properties.begin();
         pi != properties.end(); ++pi)
@@ -638,12 +638,12 @@ void cmExportFileGenerator::GenerateInterfaceProperties(cmTarget const* target,
 //----------------------------------------------------------------------------
 bool
 cmExportFileGenerator::AddTargetNamespace(std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets)
 {
-  cmMakefile *mf = target->GetMakefile();
+  cmLocalGenerator *lg = target->GetLocalGenerator();
 
-  cmTarget *tgt = mf->FindTargetToUse(input);
+  cmGeneratorTarget *tgt = lg->FindGeneratorTargetToUse(input);
   if (!tgt)
     {
     return false;
@@ -655,13 +655,14 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     }
   if(this->ExportedTargets.find(tgt) != this->ExportedTargets.end())
     {
-    input = this->Namespace + tgt->GetExportName();
+    input = this->Namespace + tgt->Target->GetExportName();
     }
   else
     {
     std::string namespacedTarget;
     this->HandleMissingTarget(namespacedTarget, missingTargets,
-                              mf, target, tgt);
+                              target->Target->GetMakefile(),
+                              target->Target, tgt->Target);
     if (!namespacedTarget.empty())
       {
       input = namespacedTarget;
@@ -674,7 +675,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
 void
 cmExportFileGenerator::ResolveTargetsInGeneratorExpressions(
                                     std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets,
                                     FreeTargetsReplace replace)
 {
@@ -711,14 +712,12 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpressions(
 void
 cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
                                     std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets)
 {
   std::string::size_type pos = 0;
   std::string::size_type lastPos = pos;
 
-  cmMakefile *mf = target->GetMakefile();
-
   while((pos = input.find("$<TARGET_PROPERTY:", lastPos)) != input.npos)
     {
     std::string::size_type nameStartPos = pos +
@@ -779,7 +778,7 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
 
   if (!errorString.empty())
     {
-    mf->IssueMessage(cmake::FATAL_ERROR, errorString);
+    target->GetLocalGenerator()->IssueMessage(cmake::FATAL_ERROR, errorString);
     }
 }
 
@@ -860,7 +859,7 @@ cmExportFileGenerator
                                                          preprocessRule);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                missingTargets,
                                                ReplaceFreeTargets);
     properties["IMPORTED_LINK_INTERFACE_LIBRARIES" + suffix] = prepro;
@@ -962,7 +961,7 @@ cmExportFileGenerator
     sep = ";";
 
     std::string temp = *li;
-    this->AddTargetNamespace(temp, target->Target, missingTargets);
+    this->AddTargetNamespace(temp, target, missingTargets);
     link_entries += temp;
     }
 
@@ -1044,12 +1043,12 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os,
 //----------------------------------------------------------------------------
 void
 cmExportFileGenerator
-::GenerateImportTargetCode(std::ostream& os, cmTarget const* target)
+::GenerateImportTargetCode(std::ostream& os, const cmGeneratorTarget* target)
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->GetExportName();
+  targetName += target->Target->GetExportName();
 
   // Create the imported target.
   os << "# Create imported target " << targetName << "\n";
@@ -1078,27 +1077,27 @@ cmExportFileGenerator
     }
 
   // Mark the imported executable if it has exports.
-  if(target->IsExecutableWithExports())
+  if(target->Target->IsExecutableWithExports())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY ENABLE_EXPORTS 1)\n";
     }
 
   // Mark the imported library if it is a framework.
-  if(target->IsFrameworkOnApple())
+  if(target->Target->IsFrameworkOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY FRAMEWORK 1)\n";
     }
 
   // Mark the imported executable if it is an application bundle.
-  if(target->IsAppBundleOnApple())
+  if(target->Target->IsAppBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY MACOSX_BUNDLE 1)\n";
     }
 
-  if (target->IsCFBundleOnApple())
+  if (target->Target->IsCFBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY BUNDLE 1)\n";
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 44f779b..3280a03 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -75,7 +75,8 @@ protected:
                                 const std::string& config = "");
   void GenerateImportFooterCode(std::ostream& os);
   void GenerateImportVersionCode(std::ostream& os);
-  void GenerateImportTargetCode(std::ostream& os, cmTarget const* target);
+  void GenerateImportTargetCode(std::ostream& os,
+                                cmGeneratorTarget const* target);
   void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
                                   cmTarget const* target,
                                   ImportPropertyMap const& properties);
@@ -122,19 +123,21 @@ protected:
                                    cmTarget* depender,
                                    cmTarget* dependee) = 0;
   void PopulateInterfaceProperty(const std::string&,
-                                 cmTarget *target,
+                                 cmGeneratorTarget *target,
                                  cmGeneratorExpression::PreprocessContext,
                                  ImportPropertyMap &properties,
                                  std::vector<std::string> &missingTargets);
-  bool PopulateInterfaceLinkLibrariesProperty(cmTarget *target,
+  bool PopulateInterfaceLinkLibrariesProperty(cmGeneratorTarget* target,
                                  cmGeneratorExpression::PreprocessContext,
                                  ImportPropertyMap &properties,
                                  std::vector<std::string> &missingTargets);
-  void PopulateInterfaceProperty(const std::string& propName, cmTarget *target,
+  void PopulateInterfaceProperty(const std::string& propName,
+                                 cmGeneratorTarget* target,
                                  ImportPropertyMap &properties);
   void PopulateCompatibleInterfaceProperties(cmGeneratorTarget *target,
                                  ImportPropertyMap &properties);
-  void GenerateInterfaceProperties(cmTarget const* target, std::ostream& os,
+  void GenerateInterfaceProperties(cmGeneratorTarget const* target,
+                                   std::ostream& os,
                                    const ImportPropertyMap &properties);
   void PopulateIncludeDirectoriesInterface(
                       cmTargetExport *target,
@@ -159,7 +162,7 @@ protected:
   };
 
   void ResolveTargetsInGeneratorExpressions(std::string &input,
-                          cmTarget* target,
+                          cmGeneratorTarget* target,
                           std::vector<std::string> &missingTargets,
                           FreeTargetsReplace replace = NoReplaceFreeTargets);
 
@@ -182,20 +185,20 @@ protected:
   bool AppendMode;
 
   // The set of targets included in the export.
-  std::set<cmTarget*> ExportedTargets;
+  std::set<cmGeneratorTarget*> ExportedTargets;
 
 private:
   void PopulateInterfaceProperty(const std::string&, const std::string&,
-                                 cmTarget *target,
+                                 cmGeneratorTarget* target,
                                  cmGeneratorExpression::PreprocessContext,
                                  ImportPropertyMap &properties,
                                  std::vector<std::string> &missingTargets);
 
-  bool AddTargetNamespace(std::string &input, cmTarget* target,
+  bool AddTargetNamespace(std::string &input, cmGeneratorTarget* target,
                           std::vector<std::string> &missingTargets);
 
   void ResolveTargetsInGeneratorExpression(std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets);
 
   virtual void ReplaceInstallPrefix(std::string &input);
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index d7ca6d5..da963f3 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -52,7 +52,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         sep + this->Namespace + (*tei)->Target->Target->GetExportName();
     sep = " ";
     cmTargetExport * te = *tei;
-    if(this->ExportedTargets.insert(te->Target->Target).second)
+    if(this->ExportedTargets.insert(te->Target).second)
       {
       allTargets.push_back(te);
       }
@@ -133,12 +133,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       tei != allTargets.end(); ++tei)
     {
     cmGeneratorTarget* gt = (*tei)->Target;
-    cmTarget* te = gt->Target;
 
     requiresConfigFiles = requiresConfigFiles
-                              || te->GetType() != cmState::INTERFACE_LIBRARY;
+                              || gt->GetType() != cmState::INTERFACE_LIBRARY;
 
-    this->GenerateImportTargetCode(os, te);
+    this->GenerateImportTargetCode(os, gt);
 
     ImportPropertyMap properties;
 
@@ -149,32 +148,32 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
 
     const bool newCMP0022Behavior =
-                              te->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                           && te->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gt->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gt->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
-      if (this->PopulateInterfaceLinkLibrariesProperty(te,
+      if (this->PopulateInterfaceLinkLibrariesProperty(gt,
                                     cmGeneratorExpression::InstallInterface,
                                     properties, missingTargets)
           && !this->ExportOld)
@@ -182,11 +181,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         require2_8_12 = true;
         }
       }
-    if (te->GetType() == cmState::INTERFACE_LIBRARY)
+    if (gt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       require3_0_0 = true;
       }
-    if(te->GetProperty("INTERFACE_SOURCES"))
+    if(gt->GetProperty("INTERFACE_SOURCES"))
       {
       // We can only generate INTERFACE_SOURCES in CMake 3.3, but CMake 3.1
       // can consume them.
@@ -194,11 +193,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       }
 
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
-                                  te, properties);
+                                  gt, properties);
 
     this->PopulateCompatibleInterfaceProperties(gt, properties);
 
-    this->GenerateInterfaceProperties(gt->Target, os, properties);
+    this->GenerateInterfaceProperties(gt, os, properties);
     }
 
   if (require3_1_0)
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 0fafa86..1daa67e 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -28,38 +28,38 @@ cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
 
 bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
 {
-  std::set<cmTarget const*> emitted;
-  std::set<cmTarget const*> emittedDeps;
+  std::set<cmGeneratorTarget const*> emitted;
+  std::set<cmGeneratorTarget const*> emittedDeps;
   while(!this->Exports.empty())
     {
     cmGeneratorTarget const* te = this->Exports.back();
     this->Exports.pop_back();
-    if (emitted.insert(te->Target).second)
+    if (emitted.insert(te).second)
       {
-      emittedDeps.insert(te->Target);
-      this->GenerateImportTargetCode(os, te->Target);
+      emittedDeps.insert(te);
+      this->GenerateImportTargetCode(os, te);
 
       ImportPropertyMap properties;
 
 #define FIND_TARGETS(PROPERTY) \
-      this->FindTargets("INTERFACE_" #PROPERTY, te->Target, emittedDeps);
+      this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 
 #undef FIND_TARGETS
 
-      this->PopulateProperties(te->Target, properties, emittedDeps);
+      this->PopulateProperties(te, properties, emittedDeps);
 
-      this->GenerateInterfaceProperties(te->Target, os, properties);
+      this->GenerateInterfaceProperties(te, os, properties);
       }
     }
   return true;
 }
 
 std::string cmExportTryCompileFileGenerator::FindTargets(
-                                          const std::string& propName,
-                                          cmTarget const* tgt,
-                                          std::set<cmTarget const*> &emitted)
+                                  const std::string& propName,
+                                  cmGeneratorTarget const* tgt,
+                                  std::set<cmGeneratorTarget const*> &emitted)
 {
   const char *prop = tgt->GetProperty(propName);
   if(!prop)
@@ -77,24 +77,22 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
 
   cmTarget dummyHead;
   dummyHead.SetType(cmState::EXECUTABLE, "try_compile_dummy_exe");
-  dummyHead.SetMakefile(tgt->GetMakefile());
+  dummyHead.SetMakefile(tgt->Target->GetMakefile());
 
-  cmGeneratorTarget* gtgt =
-      tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
-  cmGeneratorTarget gDummyHead(&dummyHead, gtgt->GetLocalGenerator());
+  cmGeneratorTarget gDummyHead(&dummyHead, tgt->GetLocalGenerator());
 
-  std::string result = cge->Evaluate(gtgt->GetLocalGenerator(), this->Config,
+  std::string result = cge->Evaluate(tgt->GetLocalGenerator(), this->Config,
                                      false, &gDummyHead,
-                                     gtgt, &dagChecker);
+                                     tgt, &dagChecker);
 
   const std::set<cmGeneratorTarget const*> &allTargets =
       cge->GetAllTargetsSeen();
   for(std::set<cmGeneratorTarget const*>::const_iterator li =
       allTargets.begin(); li != allTargets.end(); ++li)
     {
-    if(emitted.insert((*li)->Target).second)
+    if(emitted.insert(*li).second)
       {
-      this->Exports.push_back((*li));
+      this->Exports.push_back(*li);
       }
     }
   return result;
@@ -102,13 +100,12 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
 
 //----------------------------------------------------------------------------
 void
-cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
-                                                ImportPropertyMap& properties,
-                                          std::set<cmTarget const*> &emitted)
+cmExportTryCompileFileGenerator::PopulateProperties(
+                                 const cmGeneratorTarget* target,
+                                 ImportPropertyMap& properties,
+                                 std::set<cmGeneratorTarget const*> &emitted)
 {
-  cmPropertyMap props = target->GetProperties();
-  cmGeneratorTarget* gt =
-      target->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(target);
+  cmPropertyMap props = target->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     properties[i->first] = i->second.GetValue();
@@ -126,8 +123,8 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
           li != depends.end(); ++li)
         {
         cmGeneratorTarget *tgt =
-            gt->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
-        if(tgt && emitted.insert(tgt->Target).second)
+            target->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
+        if(tgt && emitted.insert(tgt).second)
           {
           this->Exports.push_back(tgt);
           }
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 4507787..19d8024 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -41,15 +41,16 @@ protected:
                                    cmTarget*,
                                    cmTarget*) {}
 
-  void PopulateProperties(cmTarget const* target,
+  void PopulateProperties(cmGeneratorTarget const* target,
                           ImportPropertyMap& properties,
-                          std::set<cmTarget const*> &emitted);
+                          std::set<const cmGeneratorTarget*>& emitted);
 
   std::string InstallNameDir(cmGeneratorTarget* target,
                              const std::string& config);
 private:
-  std::string FindTargets(const std::string& prop, cmTarget const* tgt,
-                   std::set<cmTarget const*> &emitted);
+  std::string FindTargets(const std::string& prop,
+                          const cmGeneratorTarget* tgt,
+                          std::set<const cmGeneratorTarget*>& emitted);
 
 
   std::vector<cmGeneratorTarget const*> Exports;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf32afb11df8ca3e03c418a9073941dd3e12fb5c
commit bf32afb11df8ca3e03c418a9073941dd3e12fb5c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 14:27:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 14:27:59 2015 +0200

    cmExportTryCompileFileGenerator: Port to cmGeneratorTarget.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 5bb0f99..4a1f770 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -34,7 +34,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
   std::string outputVariable;
   std::string copyFile;
   std::string copyFileError;
-  std::vector<cmTarget const*> targets;
+  std::vector<std::string> targets;
   std::string libsToLink = " ";
   bool useOldLinkLibs = true;
   char targetNameBuf[64];
@@ -112,7 +112,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
           }
         if (tgt->IsImported())
           {
-          targets.push_back(tgt);
+          targets.push_back(argv[i]);
           }
         }
       }
@@ -375,9 +375,8 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
     if (!targets.empty())
       {
       std::string fname = "/" + std::string(targetName) + "Targets.cmake";
-      cmExportTryCompileFileGenerator tcfg(gg);
+      cmExportTryCompileFileGenerator tcfg(gg, targets, this->Makefile);
       tcfg.SetExportFile((this->BinaryDirectory + fname).c_str());
-      tcfg.SetExports(targets);
       tcfg.SetConfig(this->Makefile->GetSafeDefinition(
                                           "CMAKE_TRY_COMPILE_CONFIGURATION"));
 
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index d0e65e1..0fafa86 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -14,13 +14,16 @@
 
 #include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
 #include "cmGeneratorExpressionDAGChecker.h"
 
 //----------------------------------------------------------------------------
 cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
-    cmGlobalGenerator* gg)
+    cmGlobalGenerator* gg,
+    const std::vector<std::string>& targets,
+    cmMakefile* mf)
 {
-  gg->CreateGenerationObjects(cmGlobalGenerator::ImportedOnly);
+  gg->CreateImportedGenerationObjects(mf, targets, this->Exports);
 }
 
 bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
@@ -29,25 +32,25 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
   std::set<cmTarget const*> emittedDeps;
   while(!this->Exports.empty())
     {
-    cmTarget const* te = this->Exports.back();
+    cmGeneratorTarget const* te = this->Exports.back();
     this->Exports.pop_back();
-    if (emitted.insert(te).second)
+    if (emitted.insert(te->Target).second)
       {
-      emittedDeps.insert(te);
-      this->GenerateImportTargetCode(os, te);
+      emittedDeps.insert(te->Target);
+      this->GenerateImportTargetCode(os, te->Target);
 
       ImportPropertyMap properties;
 
 #define FIND_TARGETS(PROPERTY) \
-      this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
+      this->FindTargets("INTERFACE_" #PROPERTY, te->Target, emittedDeps);
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 
 #undef FIND_TARGETS
 
-      this->PopulateProperties(te, properties, emittedDeps);
+      this->PopulateProperties(te->Target, properties, emittedDeps);
 
-      this->GenerateInterfaceProperties(te, os, properties);
+      this->GenerateInterfaceProperties(te->Target, os, properties);
       }
     }
   return true;
@@ -91,7 +94,7 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
     {
     if(emitted.insert((*li)->Target).second)
       {
-      this->Exports.push_back((*li)->Target);
+      this->Exports.push_back((*li));
       }
     }
   return result;
@@ -104,6 +107,8 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
                                           std::set<cmTarget const*> &emitted)
 {
   cmPropertyMap props = target->GetProperties();
+  cmGeneratorTarget* gt =
+      target->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(target);
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     properties[i->first] = i->second.GetValue();
@@ -120,8 +125,9 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
       for(std::vector<std::string>::const_iterator li = depends.begin();
           li != depends.end(); ++li)
         {
-        cmTarget *tgt = target->GetMakefile()->FindTargetToUse(*li);
-        if(tgt && emitted.insert(tgt).second)
+        cmGeneratorTarget *tgt =
+            gt->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
+        if(tgt && emitted.insert(tgt->Target).second)
           {
           this->Exports.push_back(tgt);
           }
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 8838eca..4507787 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -20,11 +20,11 @@ class cmInstallTargetGenerator;
 class cmExportTryCompileFileGenerator: public cmExportFileGenerator
 {
 public:
-  cmExportTryCompileFileGenerator(cmGlobalGenerator* gg);
+  cmExportTryCompileFileGenerator(cmGlobalGenerator* gg,
+                                  std::vector<std::string> const& targets,
+                                  cmMakefile* mf);
 
   /** Set the list of targets to export.  */
-  void SetExports(const std::vector<cmTarget const*> &exports)
-    { this->Exports = exports; }
   void SetConfig(const std::string& config) { this->Config = config; }
 protected:
 
@@ -52,7 +52,7 @@ private:
                    std::set<cmTarget const*> &emitted);
 
 
-  std::vector<cmTarget const*> Exports;
+  std::vector<cmGeneratorTarget const*> Exports;
   std::string Config;
 };
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 9d54f6f..f54f936 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1202,6 +1202,26 @@ void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
   this->ComputeBuildFileGenerators();
 }
 
+void cmGlobalGenerator::CreateImportedGenerationObjects(cmMakefile* mf,
+    const std::vector<std::string>& targets,
+    std::vector<const cmGeneratorTarget*>& exports)
+{
+  this->CreateGenerationObjects(ImportedOnly);
+  std::vector<cmMakefile*>::iterator mfit =
+      std::find(this->Makefiles.begin(), this->Makefiles.end(), mf);
+  cmLocalGenerator* lg =
+      this->LocalGenerators[std::distance(this->Makefiles.begin(), mfit)];
+  for (std::vector<std::string>::const_iterator it = targets.begin();
+       it != targets.end(); ++it)
+    {
+    cmGeneratorTarget* gt = lg->FindGeneratorTargetToUse(*it);
+    if (gt)
+      {
+      exports.push_back(gt);
+      }
+    }
+}
+
 cmExportBuildFileGenerator*
 cmGlobalGenerator::GetExportedTargetsFile(const std::string &filename) const
 {
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ad8992f..4e6b11d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -91,6 +91,9 @@ public:
     ImportedOnly
   };
 
+  void CreateImportedGenerationObjects(cmMakefile* mf,
+                             std::vector<std::string> const& targets,
+                             std::vector<cmGeneratorTarget const*>& exports);
   void CreateGenerationObjects(TargetTypes targetTypes = AllTargets);
 
   /**

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4d256a66132604486d047aa019de58f398b408d
commit a4d256a66132604486d047aa019de58f398b408d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 13:31:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 13:48:02 2015 +0200

    cmExportSet: Store a cmGeneratorTarget.
    
    Set the member at compute time from the stored name.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 72b101f..30a8bf2 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -27,6 +27,10 @@ cmExportBuildFileGenerator::cmExportBuildFileGenerator()
 void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
 {
   this->LG = lg;
+  if (this->ExportSet)
+    {
+    this->ExportSet->Compute(lg);
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -274,7 +278,7 @@ void cmExportBuildFileGenerator
           tei = this->ExportSet->GetTargetExports()->begin();
           tei != this->ExportSet->GetTargetExports()->end(); ++tei)
       {
-      targets.push_back((*tei)->GetName());
+      targets.push_back((*tei)->TargetName);
       }
     return;
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 6127626..4e8bc86 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -398,11 +398,11 @@ void cmExportFileGenerator::PopulateSourcesInterface(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  cmTarget *target = tei->Target;
+  cmGeneratorTarget* gt = tei->Target;
   assert(preprocessRule == cmGeneratorExpression::InstallInterface);
 
   const char *propName = "INTERFACE_SOURCES";
-  const char *input = target->GetProperty(propName);
+  const char *input = gt->GetProperty(propName);
 
   if (!input)
     {
@@ -420,11 +420,9 @@ void cmExportFileGenerator::PopulateSourcesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, gt->Target,
                                                 missingTargets);
 
-    cmGeneratorTarget* gt = target->GetMakefile()
-        ->GetGlobalGenerator()->GetGeneratorTarget(target);
     if (!checkInterfaceDirs(prepro, gt, propName))
       {
       return;
@@ -440,9 +438,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  cmGeneratorTarget *target = tei->Target->GetMakefile()
-                                 ->GetGlobalGenerator()
-                                 ->GetGeneratorTarget(tei->Target);
+  cmGeneratorTarget *target = tei->Target;
   assert(preprocessRule == cmGeneratorExpression::InstallInterface);
 
   const char *propName = "INTERFACE_INCLUDE_DIRECTORIES";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 5a51442..d7ca6d5 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -48,10 +48,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
       tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
     {
-    expectedTargets += sep + this->Namespace + (*tei)->Target->GetExportName();
+    expectedTargets +=
+        sep + this->Namespace + (*tei)->Target->Target->GetExportName();
     sep = " ";
     cmTargetExport * te = *tei;
-    if(this->ExportedTargets.insert(te->Target).second)
+    if(this->ExportedTargets.insert(te->Target->Target).second)
       {
       allTargets.push_back(te);
       }
@@ -131,7 +132,8 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         tei = allTargets.begin();
       tei != allTargets.end(); ++tei)
     {
-    cmTarget* te = (*tei)->Target;
+    cmGeneratorTarget* gt = (*tei)->Target;
+    cmTarget* te = gt->Target;
 
     requiresConfigFiles = requiresConfigFiles
                               || te->GetType() != cmState::INTERFACE_LIBRARY;
@@ -193,13 +195,10 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
-    cmGeneratorTarget *gtgt = te->GetMakefile()
-                                ->GetGlobalGenerator()
-                                ->GetGeneratorTarget(te);
 
-    this->PopulateCompatibleInterfaceProperties(gtgt, properties);
+    this->PopulateCompatibleInterfaceProperties(gt, properties);
 
-    this->GenerateInterfaceProperties(te, os, properties);
+    this->GenerateInterfaceProperties(gt->Target, os, properties);
     }
 
   if (require3_1_0)
@@ -362,8 +361,7 @@ cmExportInstallFileGenerator
     if(!properties.empty())
       {
       // Get the rest of the target details.
-      cmGeneratorTarget *gtgt = te->Target->GetMakefile()
-                    ->GetGlobalGenerator()->GetGeneratorTarget(te->Target);
+      cmGeneratorTarget *gtgt = te->Target;
       this->SetImportDetailProperties(config, suffix,
                                       gtgt, properties, missingTargets);
 
@@ -378,8 +376,8 @@ cmExportInstallFileGenerator
       //                              properties);
 
       // Generate code in the export file.
-      this->GenerateImportPropertyCode(os, config, te->Target, properties);
-      this->GenerateImportedFileChecksCode(os, te->Target, properties,
+      this->GenerateImportPropertyCode(os, config, gtgt->Target, properties);
+      this->GenerateImportedFileChecksCode(os, gtgt->Target, properties,
                                            importedLocations);
       }
     }
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index 4148fb5..0059b64 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -13,12 +13,22 @@
 #include "cmExportSet.h"
 #include "cmTargetExport.h"
 #include "cmAlgorithms.h"
+#include "cmLocalGenerator.h"
 
 cmExportSet::~cmExportSet()
 {
   cmDeleteAll(this->TargetExports);
 }
 
+void cmExportSet::Compute(cmLocalGenerator* lg)
+{
+  for (std::vector<cmTargetExport*>::iterator it = this->TargetExports.begin();
+       it != this->TargetExports.end(); ++it)
+    {
+    (*it)->Target = lg->FindGeneratorTargetToUse((*it)->TargetName);
+    }
+}
+
 void cmExportSet::AddTargetExport(cmTargetExport* te)
 {
   this->TargetExports.push_back(te);
diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h
index a57aa12..d780a22 100644
--- a/Source/cmExportSet.h
+++ b/Source/cmExportSet.h
@@ -15,6 +15,7 @@
 #include "cmSystemTools.h"
 class cmTargetExport;
 class cmInstallExportGenerator;
+class cmLocalGenerator;
 
 /// A set of targets that were installed with the same EXPORT parameter.
 class cmExportSet
@@ -25,6 +26,8 @@ public:
   /// Destructor
   ~cmExportSet();
 
+  void Compute(cmLocalGenerator* lg);
+
   void AddTargetExport(cmTargetExport* tgt);
 
   void AddInstallation(cmInstallExportGenerator const* installation);
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index c22edf3..6b06fce 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -773,7 +773,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
     if(!exports.GetString().empty() && !namelinkOnly)
       {
       cmTargetExport *te = new cmTargetExport;
-      te->Target = &target;
+      te->TargetName = target.GetName();
       te->ArchiveGenerator = archiveGenerator;
       te->BundleGenerator = bundleGenerator;
       te->FrameworkGenerator = frameworkGenerator;
@@ -1379,16 +1379,17 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
         tei != exportSet->GetTargetExports()->end(); ++tei)
       {
       cmTargetExport const* te = *tei;
+      cmTarget* tgt = this->Makefile->FindTarget(te->TargetName);
       const bool newCMP0022Behavior =
-                      te->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                   && te->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+                      tgt->GetPolicyStatusCMP0022() != cmPolicies::WARN
+                   && tgt->GetPolicyStatusCMP0022() != cmPolicies::OLD;
 
       if(!newCMP0022Behavior)
         {
         std::ostringstream e;
         e << "INSTALL(EXPORT) given keyword \""
           << "EXPORT_LINK_INTERFACE_LIBRARIES" << "\", but target \""
-          << te->Target->GetName()
+          << te->TargetName
           << "\" does not have policy CMP0022 set to NEW.";
         this->SetError(e.str());
         return false;
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index f7c9cc2..9570ba3 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -56,6 +56,7 @@ cmInstallExportGenerator::~cmInstallExportGenerator()
 void cmInstallExportGenerator::Compute(cmLocalGenerator* lg)
 {
   this->LocalGenerator = lg;
+  this->ExportSet->Compute(lg);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTargetExport.h b/Source/cmTargetExport.h
index 7665888..2781337 100644
--- a/Source/cmTargetExport.h
+++ b/Source/cmTargetExport.h
@@ -14,7 +14,7 @@
 
 #include "cmStandardIncludes.h"
 
-class cmTarget;
+class cmGeneratorTarget;
 class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 
@@ -25,7 +25,8 @@ class cmInstallFilesGenerator;
 class cmTargetExport
 {
 public:
-  cmTarget* Target; ///< The target
+  std::string TargetName;
+  cmGeneratorTarget* Target;
 
   ///@name Generators
   ///@{

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=772e91eba562f466e9ce11dfc7b61a8c716f7afb
commit 772e91eba562f466e9ce11dfc7b61a8c716f7afb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 13:29:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 13:30:48 2015 +0200

    cmGlobalGenerator: Compute export() related classes early.
    
    Simplify CMP0024 handling.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a42ea22..9d54f6f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1199,6 +1199,7 @@ void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
   cmDeleteAll(this->GeneratorTargets);
   this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
+  this->ComputeBuildFileGenerators();
 }
 
 cmExportBuildFileGenerator*
@@ -1279,8 +1280,6 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
-  this->ComputeBuildFileGenerators();
-
   unsigned int i;
 
   // Add generator specific helper commands
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 6887409..ad8992f 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -365,8 +365,6 @@ public:
   bool GetConfigureDoneCMP0026() const
   { return this->ConfigureDoneCMP0026AndCMP0024; }
 
-  void ComputeBuildFileGenerators();
-
   std::string MakeSilentFlag;
 protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
@@ -471,6 +469,8 @@ private:
   void CheckCompilerIdCompatibility(cmMakefile* mf,
                                     std::string const& lang) const;
 
+  void ComputeBuildFileGenerators();
+
   cmExternalMakefileProjectGenerator* ExtraGenerator;
 
   // track files replaced during a Generate
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 97d4d56..8890e2b 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -126,7 +126,6 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
-    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10902e4a6c66162c165cf804e46c8879290244a3
commit 10902e4a6c66162c165cf804e46c8879290244a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 12:52:16 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 12:52:16 2015 +0200

    fixup! Use GetName from cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 2d74b97..72b101f 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -274,7 +274,7 @@ void cmExportBuildFileGenerator
           tei = this->ExportSet->GetTargetExports()->begin();
           tei != this->ExportSet->GetTargetExports()->end(); ++tei)
       {
-      targets.push_back((*tei)->Target->GetName());
+      targets.push_back((*tei)->GetName());
       }
     return;
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkInformation.cxx            |    4 +-
 Source/cmCoreTryCompile.cxx                    |    7 +-
 Source/cmExportBuildFileGenerator.cxx          |   58 ++++++++-------
 Source/cmExportBuildFileGenerator.h            |   11 ++-
 Source/cmExportFileGenerator.cxx               |   69 ++++++++----------
 Source/cmExportFileGenerator.h                 |   33 +++++----
 Source/cmExportInstallFileGenerator.cxx        |   63 ++++++++--------
 Source/cmExportInstallFileGenerator.h          |   11 ++-
 Source/cmExportSet.cxx                         |   10 +++
 Source/cmExportSet.h                           |    3 +
 Source/cmExportTryCompileFileGenerator.cxx     |   45 ++++++------
 Source/cmExportTryCompileFileGenerator.h       |   17 +++--
 Source/cmGeneratorExpressionNode.cxx           |    2 +-
 Source/cmGeneratorTarget.cxx                   |   93 ++++++++++++++++++++----
 Source/cmGeneratorTarget.h                     |   18 +++++
 Source/cmGlobalGenerator.cxx                   |   26 ++++++-
 Source/cmGlobalGenerator.h                     |    7 +-
 Source/cmGlobalNinjaGenerator.cxx              |    5 +-
 Source/cmGlobalVisualStudioGenerator.cxx       |    5 +-
 Source/cmGlobalXCodeGenerator.cxx              |   54 ++++++++------
 Source/cmGlobalXCodeGenerator.h                |    4 +-
 Source/cmIncludeCommand.cxx                    |    1 -
 Source/cmInstallCommand.cxx                    |    9 ++-
 Source/cmInstallExportGenerator.cxx            |    1 +
 Source/cmInstallTargetGenerator.cxx            |   27 +++----
 Source/cmInstallTargetGenerator.h              |    3 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    2 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |   11 +--
 Source/cmNinjaNormalTargetGenerator.cxx        |   12 +--
 Source/cmTarget.cxx                            |   46 ------------
 Source/cmTarget.h                              |   10 ---
 Source/cmTargetExport.h                        |    5 +-
 32 files changed, 369 insertions(+), 303 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 17 10:59:09 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 17 Oct 2015 10:59:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-641-gfc64d57
Message-ID: <20151017145909.4B8E5C0AE5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fc64d57d37c302feca79a9a5398c8269d639f91b (commit)
       via  02e1c493bb45e1a192069b67fe9b682f041ca6f9 (commit)
      from  c9224a0aa83711e24dbda9514c7107fa1bce19c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc64d57d37c302feca79a9a5398c8269d639f91b
commit fc64d57d37c302feca79a9a5398c8269d639f91b
Merge: c9224a0 02e1c49
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 10:59:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 17 10:59:08 2015 -0400

    Merge topic 'use-generator-target' into next
    
    02e1c493 fixup! Export: Port internal utility to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02e1c493bb45e1a192069b67fe9b682f041ca6f9
commit 02e1c493bb45e1a192069b67fe9b682f041ca6f9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 16:58:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 16:58:50 2015 +0200

    fixup! Export: Port internal utility to cmGeneratorTarget.

diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 19d8024..07f274f 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -38,8 +38,8 @@ protected:
   virtual void HandleMissingTarget(std::string&,
                                    std::vector<std::string>&,
                                    cmMakefile*,
-                                   cmTarget*,
-                                   cmTarget*) {}
+                                   cmGeneratorTarget*,
+                                   cmGeneratorTarget*) {}
 
   void PopulateProperties(cmGeneratorTarget const* target,
                           ImportPropertyMap& properties,

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportTryCompileFileGenerator.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 17 11:29:00 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 17 Oct 2015 11:29:00 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-643-g7427b77
Message-ID: <20151017152900.B3A90C03C3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7427b779900b67548c474dadbd410861a8e80bbe (commit)
       via  f0451cd02bb479ba0a3ab68c9fd15cf14c7d5ae9 (commit)
      from  fc64d57d37c302feca79a9a5398c8269d639f91b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7427b779900b67548c474dadbd410861a8e80bbe
commit 7427b779900b67548c474dadbd410861a8e80bbe
Merge: fc64d57 f0451cd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 11:29:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 17 11:29:00 2015 -0400

    Merge topic 'use-generator-target' into next
    
    f0451cd0 fixup! Export: Port some API to cmGlobalGenerator.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0451cd02bb479ba0a3ab68c9fd15cf14c7d5ae9
commit f0451cd02bb479ba0a3ab68c9fd15cf14c7d5ae9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 17:28:39 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:28:39 2015 +0200

    fixup! Export: Port some API to cmGlobalGenerator.

diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 07f274f..fc135a4 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -37,7 +37,6 @@ protected:
                             std::vector<std::string>&) {}
   virtual void HandleMissingTarget(std::string&,
                                    std::vector<std::string>&,
-                                   cmMakefile*,
                                    cmGeneratorTarget*,
                                    cmGeneratorTarget*) {}
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportTryCompileFileGenerator.h |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 17 11:31:57 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 17 Oct 2015 11:31:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-664-gb00a1f3
Message-ID: <20151017153157.861D3C044D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b00a1f312283af0e3dca58a58a4a2e03220eed3b (commit)
       via  fc5cb15ed74293da1ac0609ca19a5248f49a7329 (commit)
       via  600b6cc722e5c2f8ab89d81ad1ba769fb737144c (commit)
       via  d62cc0c2c706856c9d6e3a90f1b60cee414d854d (commit)
       via  c3e40261dd83c385985f12bc4c0c99d0d839994b (commit)
       via  d179ca77724410452012005d3853d920b04b4ed8 (commit)
       via  947fdd95c30510095e75cf905b14c2cf1b88210d (commit)
       via  4e41d0b5ea3e5b259a6d93d54b106010f6a07248 (commit)
       via  55020c374b0e2b62844486cdccb8030d7f9fc501 (commit)
       via  c16774d718dec0e462342e69245fdb4b16bbc32b (commit)
       via  152f0f18b9f5321d70b14ad0cfe30d0bcd950217 (commit)
       via  12c1f02eef5600c3af762c610c0105376becde64 (commit)
       via  a51306f892bfa078ebb2bffcd3061e1c8401c5b0 (commit)
       via  c6aac95dbdcfb3d0de70d0b75790bc59637a2771 (commit)
       via  73be3fb3489e5c7b8db7fe7b74dc70f863c60ef8 (commit)
       via  f3717655fc820691377d1f6a09c9ee4f45acd423 (commit)
       via  c1f02e29ffabb7cb83049fb7c3dd67d4a750e22b (commit)
       via  31c4aee75a18b11d86a364d01fdae3250200866d (commit)
       via  3e8ef6427393546c77da1b74234311d3b60edd98 (commit)
       via  cfb2f7508af637c9c35758fbd5dac6c8cb679bdb (commit)
       via  b857f0d84b539056bc6a810161eb22e9b9baca43 (commit)
      from  7427b779900b67548c474dadbd410861a8e80bbe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b00a1f312283af0e3dca58a58a4a2e03220eed3b
commit b00a1f312283af0e3dca58a58a4a2e03220eed3b
Merge: 7427b77 fc5cb15
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 11:31:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 17 11:31:54 2015 -0400

    Merge topic 'use-generator-target' into next
    
    fc5cb15e cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.
    600b6cc7 cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.
    d62cc0c2 cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
    c3e40261 cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
    d179ca77 cmGeneratorTarget: Move IsLinkable from cmTarget.
    947fdd95 Xcode: Port internal API to cmGeneratorTarget.
    4e41d0b5 cmGeneratorTarget: Move GetExportName from cmTarget.
    55020c37 Export: Port internal API to cmGeneratorTarget.
    c16774d7 Export: Port internal utility to cmGeneratorTarget.
    152f0f18 Export: Port some API to cmGlobalGenerator.
    12c1f02e cmInstallTargetGenerator: Port GetInstallFilename to cmGeneratorTarget.
    a51306f8 Export: Port interface to cmGeneratorTarget.
    c6aac95d cmExportTryCompileFileGenerator: Port to cmGeneratorTarget.
    73be3fb3 cmExportSet: Store a cmGeneratorTarget.
    f3717655 cmGlobalGenerator: Compute export() related classes early.
    c1f02e29 cmLocalGenerator: Port PList handling to cmGeneratorTarget.
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc5cb15ed74293da1ac0609ca19a5248f49a7329
commit fc5cb15ed74293da1ac0609ca19a5248f49a7329
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:59:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:29 2015 +0200

    cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 9bdf2f5..5177ec8 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1095,7 +1095,7 @@ cmExportFileGenerator
        << " PROPERTY MACOSX_BUNDLE 1)\n";
     }
 
-  if (target->Target->IsCFBundleOnApple())
+  if (target->IsCFBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY BUNDLE 1)\n";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7e457bb..b2959fe 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1574,7 +1574,7 @@ bool cmGeneratorTarget::IsBundleOnApple() const
 {
   return this->IsFrameworkOnApple()
       || this->IsAppBundleOnApple()
-      || this->Target->IsCFBundleOnApple();
+      || this->IsCFBundleOnApple();
 }
 
 //----------------------------------------------------------------------------
@@ -1943,7 +1943,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
     {
     fpath += this->GetFrameworkDirectory(config, contentOnly);
     }
-  if(this->Target->IsCFBundleOnApple())
+  if(this->IsCFBundleOnApple())
     {
     fpath += this->GetCFBundleDirectory(config, contentOnly);
     }
@@ -3483,7 +3483,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     targetSuffix = 0;
     }
 
-  if(this->Target->IsCFBundleOnApple())
+  if(this->IsCFBundleOnApple())
     {
     fw_prefix = this->GetCFBundleDirectory(config, false);
     fw_prefix += "/";
@@ -5966,6 +5966,14 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::IsXCTestOnApple() const
 {
-  return (this->Target->IsCFBundleOnApple() &&
+  return (this->IsCFBundleOnApple() &&
           this->GetPropertyAsBool("XCTEST"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsCFBundleOnApple() const
+{
+  return (this->GetType() == cmState::MODULE_LIBRARY &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("BUNDLE"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index ce2f42e..6537421 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -425,6 +425,9 @@ public:
   /** Return whether this target is a XCTest on Apple.  */
   bool IsXCTestOnApple() const;
 
+  /** Return whether this target is a CFBundle (plugin) on Apple.  */
+  bool IsCFBundleOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index e0cba04..017d1e1 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1197,7 +1197,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     // some build phases only apply to bundles and/or frameworks
     bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
     bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
-    bool isCFBundleTarget = cmtarget.IsCFBundleOnApple();
+    bool isCFBundleTarget = gtgt->IsCFBundleOnApple();
 
     cmXCodeObject* buildFiles = 0;
 
@@ -1993,7 +1993,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       pndir = gtgt->GetDirectory(configName);
       }
 
-    if(gtgt->IsFrameworkOnApple() || target.IsCFBundleOnApple())
+    if(gtgt->IsFrameworkOnApple() || gtgt->IsCFBundleOnApple())
       {
       pnprefix = "";
       }
@@ -2046,7 +2046,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     buildSettings->AddAttribute("LIBRARY_STYLE",
                                 this->CreateString("BUNDLE"));
-    if (target.IsCFBundleOnApple())
+    if (gtgt->IsCFBundleOnApple())
       {
       // It turns out that a BUNDLE is basically the same
       // in many ways as an application bundle, as far as
@@ -2653,7 +2653,7 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
     case cmState::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
-      else if (target->Target->IsCFBundleOnApple())
+      else if (target->IsCFBundleOnApple())
         return "wrapper.plug-in";
       else
         return ((this->XcodeVersion >= 22)?
@@ -2680,7 +2680,7 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
     case cmState::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
-      else if (target->Target->IsCFBundleOnApple())
+      else if (target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
       else
         return ((this->XcodeVersion >= 22)?
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index e16dfd7..a97cc5f 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -226,7 +226,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       }
-    else if(this->Target->Target->IsCFBundleOnApple())
+    else if(this->Target->IsCFBundleOnApple())
       {
       // Install the whole app bundle directory.
       type = cmInstallType_DIRECTORY;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 015c880..df2a8c9 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -279,7 +279,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
     outpath += "/";
     }
-  else if(this->Target->IsCFBundleOnApple())
+  else if(this->GeneratorTarget->IsCFBundleOnApple())
     {
     outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateCFBundle(targetName, outpath);
@@ -360,7 +360,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         buildEcho += " shared library ";
         break;
       case cmState::MODULE_LIBRARY:
-        if (this->Target->IsCFBundleOnApple())
+        if (this->GeneratorTarget->IsCFBundleOnApple())
             buildEcho += " CFBundle";
         buildEcho += " shared module ";
         break;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 8a4f17e..dafbda9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -139,7 +139,7 @@ const char *cmNinjaNormalTargetGenerator::GetVisibleTypeName() const
     case cmState::SHARED_LIBRARY:
       return "shared library";
     case cmState::MODULE_LIBRARY:
-      if (this->GetTarget()->IsCFBundleOnApple())
+      if (this->GetGeneratorTarget()->IsCFBundleOnApple())
         return "CFBundle shared module";
       else
         return "shared module";
@@ -434,7 +434,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
                                               gt.GetDirectory(cfgName));
     }
-  else if(target.IsCFBundleOnApple())
+  else if(gt.IsCFBundleOnApple())
     {
     // Create the core foundation bundle.
     this->OSXBundleGenerator->CreateCFBundle(this->TargetNameOut,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 02a5ea6..f663678 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -369,14 +369,6 @@ bool cmTarget::IsAppBundleOnApple() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsCFBundleOnApple() const
-{
-  return (this->GetType() == cmState::MODULE_LIBRARY &&
-          this->Makefile->IsOn("APPLE") &&
-          this->GetPropertyAsBool("BUNDLE"));
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7cf4808..0e966e9 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -235,9 +235,6 @@ public:
       Apple.  */
   bool IsFrameworkOnApple() const;
 
-  /** Return whether this target is a CFBundle (plugin) on Apple.  */
-  bool IsCFBundleOnApple() const;
-
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=600b6cc722e5c2f8ab89d81ad1ba769fb737144c
commit 600b6cc722e5c2f8ab89d81ad1ba769fb737144c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 00:15:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:28 2015 +0200

    cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ab0d02b..7e457bb 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1587,7 +1587,7 @@ std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config,
   const char *ext = this->GetProperty("BUNDLE_EXTENSION");
   if (!ext)
     {
-    if (this->Target->IsXCTestOnApple())
+    if (this->IsXCTestOnApple())
       {
       ext = "xctest";
       }
@@ -5962,3 +5962,10 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("MACOSX_BUNDLE"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsXCTestOnApple() const
+{
+  return (this->Target->IsCFBundleOnApple() &&
+          this->GetPropertyAsBool("XCTEST"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 24a1c2c..ce2f42e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -422,6 +422,9 @@ public:
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 
+  /** Return whether this target is a XCTest on Apple.  */
+  bool IsXCTestOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 5e12378..e0cba04 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2651,7 +2651,7 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
     case cmState::STATIC_LIBRARY:
       return "archive.ar";
     case cmState::MODULE_LIBRARY:
-      if (target->Target->IsXCTestOnApple())
+      if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
       else if (target->Target->IsCFBundleOnApple())
         return "wrapper.plug-in";
@@ -2678,7 +2678,7 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
     case cmState::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
     case cmState::MODULE_LIBRARY:
-      if (target->Target->IsXCTestOnApple())
+      if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
       else if (target->Target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 761267d..02a5ea6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -377,13 +377,6 @@ bool cmTarget::IsCFBundleOnApple() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsXCTestOnApple() const
-{
-  return (this->IsCFBundleOnApple() &&
-          this->GetPropertyAsBool("XCTEST"));
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 51e97fd..7cf4808 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -238,9 +238,6 @@ public:
   /** Return whether this target is a CFBundle (plugin) on Apple.  */
   bool IsCFBundleOnApple() const;
 
-  /** Return whether this target is a XCTest on Apple.  */
-  bool IsXCTestOnApple() const;
-
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d62cc0c2c706856c9d6e3a90f1b60cee414d854d
commit d62cc0c2c706856c9d6e3a90f1b60cee414d854d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:58:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:28 2015 +0200

    cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
    
    Leave the cmTarget method behind for now to implement cmInstallCommand.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 781220d..3af7b71 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -202,7 +202,7 @@ cmExportBuildFileGenerator
   std::string prop = "IMPORTED_LOCATION";
   prop += suffix;
   std::string value;
-  if(target->Target->IsAppBundleOnApple())
+  if(target->IsAppBundleOnApple())
     {
     value = target->GetFullPath(config, false);
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 132c0b5..9bdf2f5 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1089,7 +1089,7 @@ cmExportFileGenerator
     }
 
   // Mark the imported executable if it is an application bundle.
-  if(target->Target->IsAppBundleOnApple())
+  if(target->IsAppBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY MACOSX_BUNDLE 1)\n";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index d57d67f..a2d6ad1 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -433,7 +433,7 @@ cmExportInstallFileGenerator
     prop += suffix;
 
     // Append the installed file name.
-    if(target->Target->IsAppBundleOnApple())
+    if(target->IsAppBundleOnApple())
       {
       value += itgen->GetInstallFilename(target, config);
       value += ".app/Contents/MacOS/";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 42b5c63..ab0d02b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -851,7 +851,7 @@ const char* cmGeneratorTarget::GetLocationForBuild() const
     location += cfgid;
     }
 
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     std::string macdir = this->BuildMacContentDirectory("", "",
                                                                 false);
@@ -1573,7 +1573,7 @@ cmGeneratorTarget::GetAppBundleDirectory(const std::string& config,
 bool cmGeneratorTarget::IsBundleOnApple() const
 {
   return this->IsFrameworkOnApple()
-      || this->Target->IsAppBundleOnApple()
+      || this->IsAppBundleOnApple()
       || this->Target->IsCFBundleOnApple();
 }
 
@@ -1935,7 +1935,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
                                             bool contentOnly) const
 {
   std::string fpath = base;
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     fpath += this->GetAppBundleDirectory(config, contentOnly);
     }
@@ -3143,7 +3143,7 @@ std::string cmGeneratorTarget::NormalGetFullPath(const std::string& config,
 {
   std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     fpath = this->BuildMacContentDirectory(fpath, config, false);
     fpath += "/";
@@ -3438,8 +3438,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     configPostfix = this->GetProperty(configProp);
     // Mac application bundles and frameworks have no postfix.
     if(configPostfix &&
-       (this->Target->IsAppBundleOnApple()
-         || this->IsFrameworkOnApple()))
+       (this->IsAppBundleOnApple() || this->IsFrameworkOnApple()))
       {
       configPostfix = 0;
       }
@@ -5955,3 +5954,11 @@ bool cmGeneratorTarget::IsFrameworkOnApple() const
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsAppBundleOnApple() const
+{
+  return (this->GetType() == cmState::EXECUTABLE &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("MACOSX_BUNDLE"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 471a500..24a1c2c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -419,6 +419,9 @@ public:
       Apple.  */
   bool IsFrameworkOnApple() const;
 
+  /** Return whether this target is an executable Bundle on Apple.  */
+  bool IsAppBundleOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 9c0aca0..e16dfd7 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -150,7 +150,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       std::string to1 = toDir + targetName;
 
       // Handle OSX Bundles.
-      if(this->Target->Target->IsAppBundleOnApple())
+      if(this->Target->IsAppBundleOnApple())
         {
         // Install the whole app bundle directory.
         type = cmInstallType_DIRECTORY;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 178b462..31fb37b 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -100,7 +100,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   // Construct the full path version of the names.
   std::string outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
-  if(this->Target->IsAppBundleOnApple())
+  if(this->GeneratorTarget->IsAppBundleOnApple())
     {
     this->OSXBundleGenerator->CreateAppBundle(targetName, outpath);
     }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4cfbda5..8a4f17e 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -412,7 +412,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                      gt.GetFullPath(cfgName,
                                        /*implib=*/true));
 
-  if (target.IsAppBundleOnApple())
+  if (gt.IsAppBundleOnApple())
     {
     // Create the app bundle
     std::string outpath = gt.GetDirectory(cfgName);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3e40261dd83c385985f12bc4c0c99d0d839994b
commit c3e40261dd83c385985f12bc4c0c99d0d839994b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:57:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:27 2015 +0200

    cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
    
    Leave the cmTarget method behind for now to implement cmInstallCommand.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 889c55c..2497f82 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1111,7 +1111,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
 
   // For compatibility with CMake 2.4 include the item's directory in
   // the linker search path.
-  if(this->OldLinkDirMode && !target->Target->IsFrameworkOnApple() &&
+  if(this->OldLinkDirMode && !target->IsFrameworkOnApple() &&
      this->OldLinkDirMask.find(cmSystemTools::GetFilenamePath(item)) ==
      this->OldLinkDirMask.end())
     {
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index fdc21db..132c0b5 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1082,7 +1082,7 @@ cmExportFileGenerator
     }
 
   // Mark the imported library if it is a framework.
-  if(target->Target->IsFrameworkOnApple())
+  if(target->IsFrameworkOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY FRAMEWORK 1)\n";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index bdf29b2..42b5c63 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1572,7 +1572,7 @@ cmGeneratorTarget::GetAppBundleDirectory(const std::string& config,
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::IsBundleOnApple() const
 {
-  return this->Target->IsFrameworkOnApple()
+  return this->IsFrameworkOnApple()
       || this->Target->IsAppBundleOnApple()
       || this->Target->IsCFBundleOnApple();
 }
@@ -1939,7 +1939,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
     {
     fpath += this->GetAppBundleDirectory(config, contentOnly);
     }
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     fpath += this->GetFrameworkDirectory(config, contentOnly);
     }
@@ -1959,7 +1959,7 @@ cmGeneratorTarget::GetMacContentDirectory(const std::string& config,
   std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
   bool contentOnly = true;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     // additional files with a framework go into the version specific
     // directory
@@ -3227,7 +3227,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   const char* version = this->GetProperty("VERSION");
   const char* soversion = this->GetProperty("SOVERSION");
   if(!this->HasSOName(config) ||
-     this->Target->IsFrameworkOnApple())
+     this->IsFrameworkOnApple())
     {
     // Versioning is supported only for shared libraries and modules,
     // and then only when the platform supports an soname flag.
@@ -3255,7 +3255,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   // The library name.
   name = prefix+base+suffix;
 
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     realName = prefix;
     if(!this->Makefile->PlatformIsAppleIos())
@@ -3439,7 +3439,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     // Mac application bundles and frameworks have no postfix.
     if(configPostfix &&
        (this->Target->IsAppBundleOnApple()
-         || this->Target->IsFrameworkOnApple()))
+         || this->IsFrameworkOnApple()))
       {
       configPostfix = 0;
       }
@@ -3476,7 +3476,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
 
   // frameworks have directory prefix but no suffix
   std::string fw_prefix;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     fw_prefix = this->GetOutputName(config, false);
     fw_prefix += ".framework/";
@@ -5947,3 +5947,11 @@ bool cmGeneratorTarget::IsLinkable() const
           this->GetType() == cmState::INTERFACE_LIBRARY ||
           this->Target->IsExecutableWithExports());
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsFrameworkOnApple() const
+{
+  return (this->GetType() == cmState::SHARED_LIBRARY &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("FRAMEWORK"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index a4a432c..471a500 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -415,6 +415,10 @@ public:
   /** Return whether this target may be used to link another target.  */
   bool IsLinkable() const;
 
+  /** Return whether this target is a shared library Framework on
+      Apple.  */
+  bool IsFrameworkOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index f54f936..1142ddd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2208,7 +2208,8 @@ cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
 
   if(cmTarget* tgt = this->FindTarget(libname))
     {
-    if(tgt->IsFrameworkOnApple())
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
+    if(gt->IsFrameworkOnApple())
        {
        return true;
        }
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 02da028..89a6dff 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -917,11 +917,13 @@ cmGlobalNinjaGenerator
   std::string configName =
     target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
+
   // for frameworks, we want the real name, not smple name
   // frameworks always appear versioned, and the build.ninja
   // will always attempt to manage symbolic links instead
   // of letting cmOSXBundleGenerator do it.
-  bool realname = target->IsFrameworkOnApple();
+  bool realname = gtgt->IsFrameworkOnApple();
 
   switch (target->GetType()) {
   case cmState::EXECUTABLE:
@@ -929,7 +931,6 @@ cmGlobalNinjaGenerator
   case cmState::STATIC_LIBRARY:
   case cmState::MODULE_LIBRARY:
     {
-    cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
     outputs.push_back(this->ConvertToNinjaPath(
       gtgt->GetFullPath(configName, false, realname)));
     break;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 7e5d963..5e12378 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -787,14 +787,16 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
 
   // Is this a resource file in this target? Add it to the resources group...
   //
+
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmGeneratorTarget::SourceFileFlags tsFlags =
-            this->GetGeneratorTarget(&cmtarget)->GetTargetSourceFileFlags(sf);
+      gtgt->GetTargetSourceFileFlags(sf);
   bool isResource = tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource;
 
   // Is this a "private" or "public" framework header file?
   // Set the ATTRIBUTES attribute appropriately...
   //
-  if(cmtarget.IsFrameworkOnApple())
+  if(gtgt->IsFrameworkOnApple())
     {
     if(tsFlags.Type == cmGeneratorTarget::SourceFileTypePrivateHeader)
       {
@@ -1193,7 +1195,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       }
 
     // some build phases only apply to bundles and/or frameworks
-    bool isFrameworkTarget = cmtarget.IsFrameworkOnApple();
+    bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
     bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
     bool isCFBundleTarget = cmtarget.IsCFBundleOnApple();
 
@@ -1289,7 +1291,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
         copyFilesBuildPhase->AddAttribute("dstSubfolderSpec",
           this->CreateString("6"));
         std::ostringstream ostr;
-        if (cmtarget.IsFrameworkOnApple())
+        if (gtgt->IsFrameworkOnApple())
           {
           // dstPath in frameworks is relative to Versions/<version>
           ostr << mit->first;
@@ -1467,8 +1469,10 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   std::vector<cmCustomCommand> postbuild
     = cmtarget.GetPostBuildCommands();
 
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+
   if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
-    !cmtarget.IsFrameworkOnApple())
+    !gtgt->IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
     cmd.resize(1);
@@ -1500,7 +1504,6 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
     }
 
   std::vector<cmSourceFile*> classes;
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   if (!gtgt->GetConfigCommonSourceFiles(classes))
     {
     return;
@@ -1943,7 +1946,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   const char* version = target.GetProperty("VERSION");
   const char* soversion = target.GetProperty("SOVERSION");
-  if(!gtgt->HasSOName(configName) || target.IsFrameworkOnApple())
+  if(!gtgt->HasSOName(configName) || gtgt->IsFrameworkOnApple())
     {
     version = 0;
     soversion = 0;
@@ -1990,7 +1993,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       pndir = gtgt->GetDirectory(configName);
       }
 
-    if(target.IsFrameworkOnApple() || target.IsCFBundleOnApple())
+    if(gtgt->IsFrameworkOnApple() || target.IsCFBundleOnApple())
       {
       pnprefix = "";
       }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index c2798b2..9c0aca0 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -208,7 +208,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       // An import library looks like a static library.
       type = cmInstallType_STATIC_LIBRARY;
       }
-    else if(this->Target->Target->IsFrameworkOnApple())
+    else if(this->Target->IsFrameworkOnApple())
       {
       // There is a bug in cmInstallCommand if this fails.
       assert(this->NamelinkMode == NamelinkModeNone);
@@ -605,7 +605,7 @@ cmInstallTargetGenerator
     std::string for_install =
       this->Target->GetInstallNameDirForInstallTree();
 
-    if(this->Target->Target->IsFrameworkOnApple() && for_install.empty())
+    if(this->Target->IsFrameworkOnApple() && for_install.empty())
       {
       // Frameworks seem to have an id corresponding to their own full
       // path.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2ed5f70..015c880 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -153,7 +153,7 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules()
 //----------------------------------------------------------------------------
 void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 {
-  if(this->Target->IsFrameworkOnApple())
+  if(this->GeneratorTarget->IsFrameworkOnApple())
     {
     this->WriteFrameworkRules(relink);
     return;
@@ -273,7 +273,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   // Construct the full path version of the names.
   std::string outpath;
   std::string outpathImp;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->GeneratorTarget->IsFrameworkOnApple())
     {
     outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
@@ -791,7 +791,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Add a rule to create necessary symlinks for the library.
   // Frameworks are handled by cmOSXBundleGenerator.
-  if(targetOutPath != targetOutPathReal && !this->Target->IsFrameworkOnApple())
+  if(targetOutPath != targetOutPathReal
+     && !this->GeneratorTarget->IsFrameworkOnApple())
     {
     std::string symlink = "$(CMAKE_COMMAND) -E cmake_symlink_library ";
     symlink += targetOutPathReal;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index e5e4b7f..4cfbda5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -281,7 +281,7 @@ cmNinjaNormalTargetGenerator
   }
 
   if (this->TargetNameOut != this->TargetNameReal &&
-    !this->GetTarget()->IsFrameworkOnApple()) {
+    !this->GetGeneratorTarget()->IsFrameworkOnApple()) {
     std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
@@ -428,7 +428,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     targetOutputReal += this->TargetNameReal;
     targetOutputReal = this->ConvertToNinjaPath(targetOutputReal);
     }
-  else if (target.IsFrameworkOnApple())
+  else if (gt.IsFrameworkOnApple())
     {
     // Create the library framework.
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
@@ -732,7 +732,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                         &usedResponseFile);
   this->WriteLinkRule(usedResponseFile);
 
-  if (targetOutput != targetOutputReal && !target.IsFrameworkOnApple())
+  if (targetOutput != targetOutputReal && !gt.IsFrameworkOnApple())
     {
     if (targetType == cmState::EXECUTABLE)
       {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d179ca77724410452012005d3853d920b04b4ed8
commit d179ca77724410452012005d3853d920b04b4ed8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:44:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:26 2015 +0200

    cmGeneratorTarget: Move IsLinkable from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 7bdc555..889c55c 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -643,7 +643,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
     return;
     }
 
-  if(tgt && tgt->Target->IsLinkable())
+  if(tgt && tgt->IsLinkable())
     {
     // This is a CMake target.  Ask the target for its real name.
     if(impexe && this->LoaderFlag)
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 3e58400..fdc21db 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -210,7 +210,7 @@ bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  if(!target->Target->IsLinkable())
+  if(!target->IsLinkable())
     {
     return false;
     }
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index c7c0e73..1a878e2 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1654,7 +1654,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
                             const GeneratorExpressionContent *content)
   {
     // The file used to link to the target (.so, .lib, .a).
-    if(!target->Target->IsLinkable())
+    if(!target->IsLinkable())
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_LINKER_FILE is allowed only for libraries and "
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 03c950e..bdf29b2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5936,3 +5936,14 @@ std::string cmGeneratorTarget::GetSupportDirectory() const
 #endif
   return dir;
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsLinkable() const
+{
+  return (this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY ||
+          this->GetType() == cmState::UNKNOWN_LIBRARY ||
+          this->GetType() == cmState::INTERFACE_LIBRARY ||
+          this->Target->IsExecutableWithExports());
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 1029158..a4a432c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -412,6 +412,9 @@ public:
   /** Get a build-tree directory in which to place target support files.  */
   std::string GetSupportDirectory() const;
 
+  /** Return whether this target may be used to link another target.  */
+  bool IsLinkable() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d81d3b8..fcc27ca 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -385,7 +385,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
 }
 
 //----------------------------------------------------------------------------
-static bool VSLinkable(cmTarget const* t)
+static bool VSLinkable(cmGeneratorTarget const* t)
 {
   return t->IsLinkable() || t->GetType() == cmState::OBJECT_LIBRARY;
 }
@@ -475,7 +475,8 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
       di != utilDepends.end(); ++di)
     {
     cmTarget const* dep = *di;
-    if(allowLinkable || !VSLinkable(dep) || linked.count(dep))
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(dep);
+    if(allowLinkable || !VSLinkable(gt) || linked.count(dep))
       {
       // Direct dependency allowed.
       vsTargetDepend.insert(dep->GetName());
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 57a2d24..761267d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -345,17 +345,6 @@ bool cmTarget::IsExecutableWithExports() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsLinkable() const
-{
-  return (this->GetType() == cmState::STATIC_LIBRARY ||
-          this->GetType() == cmState::SHARED_LIBRARY ||
-          this->GetType() == cmState::MODULE_LIBRARY ||
-          this->GetType() == cmState::UNKNOWN_LIBRARY ||
-          this->GetType() == cmState::INTERFACE_LIBRARY ||
-          this->IsExecutableWithExports());
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::HasImportLibrary() const
 {
   return (this->DLLPlatform &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index dafe86a..51e97fd 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -228,9 +228,6 @@ public:
       enabled.  */
   bool IsExecutableWithExports() const;
 
-  /** Return whether this target may be used to link another target.  */
-  bool IsLinkable() const;
-
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=947fdd95c30510095e75cf905b14c2cf1b88210d
commit 947fdd95c30510095e75cf905b14c2cf1b88210d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:20:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:26 2015 +0200

    Xcode: Port internal API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d4ccde6..7e5d963 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2639,23 +2639,24 @@ cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
 }
 
 //----------------------------------------------------------------------------
-const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
+const char* cmGlobalXCodeGenerator::GetTargetFileType(
+    cmGeneratorTarget* target)
 {
-  switch(cmtarget.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
       return "archive.ar";
     case cmState::MODULE_LIBRARY:
-      if (cmtarget.IsXCTestOnApple())
+      if (target->Target->IsXCTestOnApple())
         return "wrapper.cfbundle";
-      else if (cmtarget.IsCFBundleOnApple())
+      else if (target->Target->IsCFBundleOnApple())
         return "wrapper.plug-in";
       else
         return ((this->XcodeVersion >= 22)?
               "compiled.mach-o.executable" : "compiled.mach-o.dylib");
     case cmState::SHARED_LIBRARY:
-      return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
+      return (target->GetPropertyAsBool("FRAMEWORK")?
               "wrapper.framework" : "compiled.mach-o.dylib");
     case cmState::EXECUTABLE:
       return "compiled.mach-o.executable";
@@ -2665,28 +2666,29 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
 }
 
 //----------------------------------------------------------------------------
-const char* cmGlobalXCodeGenerator::GetTargetProductType(cmTarget& cmtarget)
+const char* cmGlobalXCodeGenerator::GetTargetProductType(
+    cmGeneratorTarget* target)
 {
-  switch(cmtarget.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
     case cmState::MODULE_LIBRARY:
-      if (cmtarget.IsXCTestOnApple())
+      if (target->Target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
-      else if (cmtarget.IsCFBundleOnApple())
+      else if (target->Target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
       else
         return ((this->XcodeVersion >= 22)?
                 "com.apple.product-type.tool" :
                 "com.apple.product-type.library.dynamic");
     case cmState::SHARED_LIBRARY:
-      return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
+      return (target->GetPropertyAsBool("FRAMEWORK")?
               "com.apple.product-type.framework" :
               "com.apple.product-type.library.dynamic");
     case cmState::EXECUTABLE:
-      return (cmtarget.GetPropertyAsBool("MACOSX_BUNDLE")?
+      return (target->GetPropertyAsBool("MACOSX_BUNDLE")?
               "com.apple.product-type.application" :
               "com.apple.product-type.tool");
     default: break;
@@ -2727,9 +2729,11 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
   target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
 
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+
   cmXCodeObject* fileRef =
     this->CreateObject(cmXCodeObject::PBXFileReference);
-  if(const char* fileType = this->GetTargetFileType(cmtarget))
+  if(const char* fileType = this->GetTargetFileType(gtgt))
     {
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
@@ -2742,7 +2746,6 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     }
   else
     {
-    cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
     fullName = gtgt->GetFullName(defConfig.c_str());
     }
   fileRef->AddAttribute("path", this->CreateString(fullName.c_str()));
@@ -2752,7 +2755,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   fileRef->SetComment(cmtarget.GetName().c_str());
   target->AddAttribute("productReference",
                        this->CreateObjectReference(fileRef));
-  if(const char* productType = this->GetTargetProductType(cmtarget))
+  if(const char* productType = this->GetTargetProductType(gtgt))
     {
     target->AddAttribute("productType", this->CreateString(productType));
     }
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 9daf0ab..feb5009 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -137,8 +137,8 @@ private:
   void ForceLinkerLanguages();
   void ForceLinkerLanguage(cmTarget& cmtarget);
   const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
-  const char* GetTargetFileType(cmTarget& cmtarget);
-  const char* GetTargetProductType(cmTarget& cmtarget);
+  const char* GetTargetFileType(cmGeneratorTarget* target);
+  const char* GetTargetProductType(cmGeneratorTarget* target);
   std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget);
   void AppendOrAddBuildSetting(cmXCodeObject* settings, const char* attr,
                                const char* value);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e41d0b5ea3e5b259a6d93d54b106010f6a07248
commit 4e41d0b5ea3e5b259a6d93d54b106010f6a07248
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:08:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:25 2015 +0200

    cmGeneratorTarget: Move GetExportName from cmTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index d191e47..781220d 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -48,7 +48,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     {
     cmGeneratorTarget *te = this->LG
                                 ->FindGeneratorTargetToUse(*tei);
-    expectedTargets += sep + this->Namespace + te->Target->GetExportName();
+    expectedTargets += sep + this->Namespace + te->GetExportName();
     sep = " ";
     if(this->ExportedTargets.insert(te).second)
       {
@@ -253,7 +253,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
       {
       std::string missingTarget = namespaces[0];
 
-      missingTarget += dependee->Target->GetExportName();
+      missingTarget += dependee->GetExportName();
       link_libs += missingTarget;
       missingTargets.push_back(missingTarget);
       return;
@@ -268,7 +268,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
   // Assume the target will be exported by another command.
   // Append it with the export namespace.
   link_libs += this->Namespace;
-  link_libs += dependee->Target->GetExportName();
+  link_libs += dependee->GetExportName();
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 1c3e9fe..3e58400 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 #include "cmTargetExport.h"
 #include "cmVersion.h"
 #include "cmComputeLinkInformation.h"
@@ -623,7 +622,7 @@ void cmExportFileGenerator::GenerateInterfaceProperties(
   if (!properties.empty())
     {
     std::string targetName = this->Namespace;
-    targetName += target->Target->GetExportName();
+    targetName += target->GetExportName();
     os << "set_target_properties(" << targetName << " PROPERTIES\n";
     for(ImportPropertyMap::const_iterator pi = properties.begin();
         pi != properties.end(); ++pi)
@@ -655,7 +654,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     }
   if(this->ExportedTargets.find(tgt) != this->ExportedTargets.end())
     {
-    input = this->Namespace + tgt->Target->GetExportName();
+    input = this->Namespace + tgt->GetExportName();
     }
   else
     {
@@ -1047,7 +1046,7 @@ cmExportFileGenerator
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->Target->GetExportName();
+  targetName += target->GetExportName();
 
   // Create the imported target.
   os << "# Create imported target " << targetName << "\n";
@@ -1114,7 +1113,7 @@ cmExportFileGenerator
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->Target->GetExportName();
+  targetName += target->GetExportName();
 
   // Set the import properties.
   os << "# Import target \"" << targetName << "\" for configuration \""
@@ -1234,7 +1233,7 @@ cmExportFileGenerator
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
-  targetName += target->Target->GetExportName();
+  targetName += target->GetExportName();
 
   os << "list(APPEND _IMPORT_CHECK_TARGETS " << targetName << " )\n"
         "list(APPEND _IMPORT_CHECK_FILES_FOR_" << targetName << " ";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index ea5badc..d57d67f 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -49,7 +49,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
     {
     expectedTargets +=
-        sep + this->Namespace + (*tei)->Target->Target->GetExportName();
+        sep + this->Namespace + (*tei)->Target->GetExportName();
     sep = " ";
     cmTargetExport * te = *tei;
     if(this->ExportedTargets.insert(te->Target).second)
@@ -465,7 +465,7 @@ cmExportInstallFileGenerator::HandleMissingTarget(std::string& link_libs,
     {
     std::string missingTarget = namespaces[0];
 
-    missingTarget += dependee->Target->GetExportName();
+    missingTarget += dependee->GetExportName();
     link_libs += missingTarget;
     missingTargets.push_back(missingTarget);
     }
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5e26aad..03c950e 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -335,6 +335,26 @@ std::string cmGeneratorTarget::GetName() const
 }
 
 //----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetExportName() const
+{
+  const char *exportName = this->GetProperty("EXPORT_NAME");
+
+  if (exportName && *exportName)
+    {
+    if (!cmGeneratorExpression::IsValidTargetName(exportName))
+      {
+      std::ostringstream e;
+      e << "EXPORT_NAME property \"" << exportName << "\" for \""
+        << this->GetName() << "\": is not valid.";
+      cmSystemTools::Error(e.str().c_str());
+      return "";
+      }
+    return exportName;
+    }
+  return this->GetName();
+}
+
+//----------------------------------------------------------------------------
 const char *cmGeneratorTarget::GetProperty(const std::string& prop) const
 {
   return this->Target->GetProperty(prop);
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f5a894b..1029158 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -43,6 +43,8 @@ public:
 
   cmState::TargetType GetType() const;
   std::string GetName() const;
+  std::string GetExportName() const;
+
   const char *GetProperty(const std::string& prop) const;
   bool GetPropertyAsBool(const std::string& prop) const;
   void GetSourceFiles(std::vector<cmSourceFile*>& files,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1c4faab..57a2d24 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1412,26 +1412,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetExportName() const
-{
-  const char *exportName = this->GetProperty("EXPORT_NAME");
-
-  if (exportName && *exportName)
-    {
-    if (!cmGeneratorExpression::IsValidTargetName(exportName))
-      {
-      std::ostringstream e;
-      e << "EXPORT_NAME property \"" << exportName << "\" for \""
-        << this->GetName() << "\": is not valid.";
-      cmSystemTools::Error(e.str().c_str());
-      return "";
-      }
-    return exportName;
-    }
-  return this->GetName();
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AppendBuildInterfaceIncludes()
 {
   if(this->GetType() != cmState::SHARED_LIBRARY &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 443a2d0..dafe86a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -96,7 +96,6 @@ public:
 
   ///! Set/Get the name of the target
   const std::string& GetName() const {return this->Name;}
-  std::string GetExportName() const;
 
   ///! Set the cmMakefile that owns this target
   void SetMakefile(cmMakefile *mf);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55020c374b0e2b62844486cdccb8030d7f9fc501
commit 55020c374b0e2b62844486cdccb8030d7f9fc501
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:10:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:24 2015 +0200

    Export: Port internal API to cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index cf84146..d191e47 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -174,7 +174,7 @@ cmExportBuildFileGenerator
       //                              properties);
 
       // Generate code in the export file.
-      this->GenerateImportPropertyCode(os, config, target->Target,
+      this->GenerateImportPropertyCode(os, config, target,
                                        properties);
       }
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b597b53..1c3e9fe 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1108,13 +1108,13 @@ cmExportFileGenerator
 void
 cmExportFileGenerator
 ::GenerateImportPropertyCode(std::ostream& os, const std::string& config,
-                             cmTarget const* target,
+                             cmGeneratorTarget const* target,
                              ImportPropertyMap const& properties)
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->GetExportName();
+  targetName += target->Target->GetExportName();
 
   // Set the import properties.
   os << "# Import target \"" << targetName << "\" for configuration \""
@@ -1228,13 +1228,13 @@ cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os)
 //----------------------------------------------------------------------------
 void
 cmExportFileGenerator
-::GenerateImportedFileChecksCode(std::ostream& os, cmTarget* target,
+::GenerateImportedFileChecksCode(std::ostream& os, cmGeneratorTarget* target,
                                  ImportPropertyMap const& properties,
                                 const std::set<std::string>& importedLocations)
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
-  targetName += target->GetExportName();
+  targetName += target->Target->GetExportName();
 
   os << "list(APPEND _IMPORT_CHECK_TARGETS " << targetName << " )\n"
         "list(APPEND _IMPORT_CHECK_FILES_FOR_" << targetName << " ";
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index be5c6f7..18f0b00 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -78,9 +78,10 @@ protected:
   void GenerateImportTargetCode(std::ostream& os,
                                 cmGeneratorTarget const* target);
   void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
-                                  cmTarget const* target,
+                                  cmGeneratorTarget const* target,
                                   ImportPropertyMap const& properties);
-  void GenerateImportedFileChecksCode(std::ostream& os, cmTarget* target,
+  void GenerateImportedFileChecksCode(std::ostream& os,
+                                      cmGeneratorTarget* target,
                                       ImportPropertyMap const& properties,
                                const std::set<std::string>& importedLocations);
   void GenerateImportedFileCheckLoop(std::ostream& os);
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 988b0dc..ea5badc 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -375,8 +375,8 @@ cmExportInstallFileGenerator
       //                              properties);
 
       // Generate code in the export file.
-      this->GenerateImportPropertyCode(os, config, gtgt->Target, properties);
-      this->GenerateImportedFileChecksCode(os, gtgt->Target, properties,
+      this->GenerateImportPropertyCode(os, config, gtgt, properties);
+      this->GenerateImportedFileChecksCode(os, gtgt, properties,
                                            importedLocations);
       }
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c16774d718dec0e462342e69245fdb4b16bbc32b
commit c16774d718dec0e462342e69245fdb4b16bbc32b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:05:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:22 2015 +0200

    Export: Port internal utility to cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index c24138f..cf84146 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -237,14 +237,15 @@ void
 cmExportBuildFileGenerator::HandleMissingTarget(
     std::string& link_libs,
     std::vector<std::string>& missingTargets,
-    cmTarget* depender,
-    cmTarget* dependee)
+    cmGeneratorTarget* depender,
+    cmGeneratorTarget* dependee)
 {
   // The target is not in the export.
   if(!this->AppendMode)
     {
     const std::string name = dependee->GetName();
-    cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+    cmGlobalGenerator* gg =
+        dependee->GetLocalGenerator()->GetGlobalGenerator();
     std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
 
     int targetOccurrences = (int)namespaces.size();
@@ -252,7 +253,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
       {
       std::string missingTarget = namespaces[0];
 
-      missingTarget += dependee->GetExportName();
+      missingTarget += dependee->Target->GetExportName();
       link_libs += missingTarget;
       missingTargets.push_back(missingTarget);
       return;
@@ -267,7 +268,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
   // Assume the target will be exported by another command.
   // Append it with the export namespace.
   link_libs += this->Namespace;
-  link_libs += dependee->GetExportName();
+  link_libs += dependee->Target->GetExportName();
 }
 
 //----------------------------------------------------------------------------
@@ -315,8 +316,8 @@ cmExportBuildFileGenerator
 //----------------------------------------------------------------------------
 void
 cmExportBuildFileGenerator
-::ComplainAboutMissingTarget(cmTarget* depender,
-                             cmTarget* dependee,
+::ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                             cmGeneratorTarget* dependee,
                              int occurrences)
 {
   if(cmSystemTools::GetErrorOccuredFlag())
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index c7d317f..85aae2f 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -54,11 +54,11 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmTarget* depender,
-                                   cmTarget* dependee);
+                                   cmGeneratorTarget* depender,
+                                   cmGeneratorTarget* dependee);
 
-  void ComplainAboutMissingTarget(cmTarget* depender,
-                                  cmTarget* dependee,
+  void ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                                  cmGeneratorTarget* dependee,
                                   int occurrences);
 
   /** Fill in properties indicating built file locations.  */
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 192a932..b597b53 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -661,7 +661,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     {
     std::string namespacedTarget;
     this->HandleMissingTarget(namespacedTarget, missingTargets,
-                              target->Target, tgt->Target);
+                              target, tgt);
     if (!namespacedTarget.empty())
       {
       input = namespacedTarget;
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index e1ff83d..be5c6f7 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -119,8 +119,8 @@ protected:
    *  export set.  */
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmTarget* depender,
-                                   cmTarget* dependee) = 0;
+                                   cmGeneratorTarget* depender,
+                                   cmGeneratorTarget* dependee) = 0;
   void PopulateInterfaceProperty(const std::string&,
                                  cmGeneratorTarget *target,
                                  cmGeneratorExpression::PreprocessContext,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 48f92b0..988b0dc 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -453,19 +453,19 @@ cmExportInstallFileGenerator
 
 //----------------------------------------------------------------------------
 void
-cmExportInstallFileGenerator::HandleMissingTarget(
-  std::string& link_libs, std::vector<std::string>& missingTargets,
-  cmTarget* depender, cmTarget* dependee)
+cmExportInstallFileGenerator::HandleMissingTarget(std::string& link_libs,
+  std::vector<std::string>& missingTargets,
+  cmGeneratorTarget* depender, cmGeneratorTarget* dependee)
 {
   const std::string name = dependee->GetName();
-  cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+  cmGlobalGenerator* gg = dependee->GetLocalGenerator()->GetGlobalGenerator();
   std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
   int targetOccurrences = (int)namespaces.size();
   if (targetOccurrences == 1)
     {
     std::string missingTarget = namespaces[0];
 
-    missingTarget += dependee->GetExportName();
+    missingTarget += dependee->Target->GetExportName();
     link_libs += missingTarget;
     missingTargets.push_back(missingTarget);
     }
@@ -520,8 +520,8 @@ cmExportInstallFileGenerator
 //----------------------------------------------------------------------------
 void
 cmExportInstallFileGenerator
-::ComplainAboutMissingTarget(cmTarget* depender,
-                             cmTarget* dependee,
+::ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                             cmGeneratorTarget* dependee,
                              int occurrences)
 {
   std::ostringstream e;
diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h
index b1fa70e..13dae89 100644
--- a/Source/cmExportInstallFileGenerator.h
+++ b/Source/cmExportInstallFileGenerator.h
@@ -57,13 +57,13 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmTarget* depender,
-                                   cmTarget* dependee);
+                                   cmGeneratorTarget* depender,
+                                   cmGeneratorTarget* dependee);
 
   virtual void ReplaceInstallPrefix(std::string &input);
 
-  void ComplainAboutMissingTarget(cmTarget* depender,
-                                  cmTarget* dependee,
+  void ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                                  cmGeneratorTarget* dependee,
                                   int occurrences);
 
   std::vector<std::string> FindNamespaces(cmGlobalGenerator* gg,
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 50c3187..fc135a4 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -37,8 +37,8 @@ protected:
                             std::vector<std::string>&) {}
   virtual void HandleMissingTarget(std::string&,
                                    std::vector<std::string>&,
-                                   cmTarget*,
-                                   cmTarget*) {}
+                                   cmGeneratorTarget*,
+                                   cmGeneratorTarget*) {}
 
   void PopulateProperties(cmGeneratorTarget const* target,
                           ImportPropertyMap& properties,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=152f0f18b9f5321d70b14ad0cfe30d0bcd950217
commit 152f0f18b9f5321d70b14ad0cfe30d0bcd950217
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:01:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:31:07 2015 +0200

    Export: Port some API to cmGlobalGenerator.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 194d9a2..c24138f 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -235,14 +235,17 @@ cmExportBuildFileGenerator
 //----------------------------------------------------------------------------
 void
 cmExportBuildFileGenerator::HandleMissingTarget(
-  std::string& link_libs, std::vector<std::string>& missingTargets,
-  cmMakefile* mf, cmTarget* depender, cmTarget* dependee)
+    std::string& link_libs,
+    std::vector<std::string>& missingTargets,
+    cmTarget* depender,
+    cmTarget* dependee)
 {
   // The target is not in the export.
   if(!this->AppendMode)
     {
     const std::string name = dependee->GetName();
-    std::vector<std::string> namespaces = this->FindNamespaces(mf, name);
+    cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+    std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
 
     int targetOccurrences = (int)namespaces.size();
     if (targetOccurrences == 1)
@@ -287,10 +290,9 @@ void cmExportBuildFileGenerator
 //----------------------------------------------------------------------------
 std::vector<std::string>
 cmExportBuildFileGenerator
-::FindNamespaces(cmMakefile* mf, const std::string& name)
+::FindNamespaces(cmGlobalGenerator* gg, const std::string& name)
 {
   std::vector<std::string> namespaces;
-  cmGlobalGenerator* gg = mf->GetGlobalGenerator();
 
   std::map<std::string, cmExportBuildFileGenerator*>& exportSets
                                                   = gg->GetBuildExportSets();
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index 16695f1..c7d317f 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -54,7 +54,6 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmMakefile* mf,
                                    cmTarget* depender,
                                    cmTarget* dependee);
 
@@ -72,7 +71,7 @@ protected:
                              const std::string& config);
 
   std::vector<std::string>
-  FindNamespaces(cmMakefile* mf, const std::string& name);
+  FindNamespaces(cmGlobalGenerator* gg, const std::string& name);
 
   std::vector<std::string> Targets;
   cmExportSet *ExportSet;
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 0985542..192a932 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -661,7 +661,6 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     {
     std::string namespacedTarget;
     this->HandleMissingTarget(namespacedTarget, missingTargets,
-                              target->Target->GetMakefile(),
                               target->Target, tgt->Target);
     if (!namespacedTarget.empty())
       {
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 3280a03..e1ff83d 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -119,7 +119,6 @@ protected:
    *  export set.  */
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmMakefile* mf,
                                    cmTarget* depender,
                                    cmTarget* dependee) = 0;
   void PopulateInterfaceProperty(const std::string&,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 67697f8..48f92b0 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -455,10 +455,11 @@ cmExportInstallFileGenerator
 void
 cmExportInstallFileGenerator::HandleMissingTarget(
   std::string& link_libs, std::vector<std::string>& missingTargets,
-  cmMakefile* mf, cmTarget* depender, cmTarget* dependee)
+  cmTarget* depender, cmTarget* dependee)
 {
   const std::string name = dependee->GetName();
-  std::vector<std::string> namespaces = this->FindNamespaces(mf, name);
+  cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+  std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
   int targetOccurrences = (int)namespaces.size();
   if (targetOccurrences == 1)
     {
@@ -479,10 +480,9 @@ cmExportInstallFileGenerator::HandleMissingTarget(
 //----------------------------------------------------------------------------
 std::vector<std::string>
 cmExportInstallFileGenerator
-::FindNamespaces(cmMakefile* mf, const std::string& name)
+::FindNamespaces(cmGlobalGenerator* gg, const std::string& name)
 {
   std::vector<std::string> namespaces;
-  cmGlobalGenerator* gg = mf->GetGlobalGenerator();
   const cmExportSetMap& exportSets = gg->GetExportSets();
 
   for(cmExportSetMap::const_iterator expIt = exportSets.begin();
diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h
index b06fee5..b1fa70e 100644
--- a/Source/cmExportInstallFileGenerator.h
+++ b/Source/cmExportInstallFileGenerator.h
@@ -57,7 +57,6 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmMakefile* mf,
                                    cmTarget* depender,
                                    cmTarget* dependee);
 
@@ -67,7 +66,7 @@ protected:
                                   cmTarget* dependee,
                                   int occurrences);
 
-  std::vector<std::string> FindNamespaces(cmMakefile* mf,
+  std::vector<std::string> FindNamespaces(cmGlobalGenerator* gg,
                                           const std::string& name);
 
 
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 19d8024..50c3187 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -37,7 +37,6 @@ protected:
                             std::vector<std::string>&) {}
   virtual void HandleMissingTarget(std::string&,
                                    std::vector<std::string>&,
-                                   cmMakefile*,
                                    cmTarget*,
                                    cmTarget*) {}
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12c1f02eef5600c3af762c610c0105376becde64
commit 12c1f02eef5600c3af762c610c0105376becde64
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 14:54:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:42 2015 +0200

    cmInstallTargetGenerator: Port GetInstallFilename to cmGeneratorTarget.

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index da963f3..67697f8 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -399,7 +399,7 @@ cmExportInstallFileGenerator
     }
 
   // Get the target to be installed.
-  cmTarget* target = itgen->GetTarget()->Target;
+  cmGeneratorTarget* target = itgen->GetTarget();
 
   // Construct the installed location of the target.
   std::string dest = itgen->GetDestination(config);
@@ -433,7 +433,7 @@ cmExportInstallFileGenerator
     prop += suffix;
 
     // Append the installed file name.
-    if(target->IsAppBundleOnApple())
+    if(target->Target->IsAppBundleOnApple())
       {
       value += itgen->GetInstallFilename(target, config);
       value += ".app/Contents/MacOS/";
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 2f08165..c2798b2 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -359,34 +359,31 @@ cmInstallTargetGenerator::GetInstallFilename(const std::string& config) const
 {
   NameType nameType = this->ImportLibrary? NameImplib : NameNormal;
   return
-    cmInstallTargetGenerator::GetInstallFilename(this->Target->Target, config,
+    cmInstallTargetGenerator::GetInstallFilename(this->Target, config,
                                                  nameType);
 }
 
 //----------------------------------------------------------------------------
 std::string
-cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
+cmInstallTargetGenerator::GetInstallFilename(cmGeneratorTarget const* target,
                                              const std::string& config,
                                              NameType nameType)
 {
   std::string fname;
   // Compute the name of the library.
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
   if(target->GetType() == cmState::EXECUTABLE)
     {
     std::string targetName;
     std::string targetNameReal;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gtgt->GetExecutableNames(targetName, targetNameReal,
+    target->GetExecutableNames(targetName, targetNameReal,
                                targetNameImport, targetNamePDB,
                                config);
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -410,12 +407,12 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     std::string targetNameReal;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gtgt->GetLibraryNames(targetName, targetNameSO, targetNameReal,
+    target->GetLibraryNames(targetName, targetNameSO, targetNameReal,
                             targetNameImport, targetNamePDB, config);
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -585,7 +582,7 @@ cmInstallTargetGenerator
         // The directory portions differ.  Append the filename to
         // create the mapping.
         std::string fname =
-          this->GetInstallFilename(tgt->Target, config, NameSO);
+          this->GetInstallFilename(tgt, config, NameSO);
 
         // Map from the build-tree install_name.
         for_build += fname;
@@ -622,7 +619,7 @@ cmInstallTargetGenerator
       {
       // Prepare to refer to the install-tree install_name.
       new_id = for_install;
-      new_id += this->GetInstallFilename(this->Target->Target, config, NameSO);
+      new_id += this->GetInstallFilename(this->Target, config, NameSO);
       }
     }
 
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index a8f4a75..ec89c05 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -14,7 +14,6 @@
 
 #include "cmInstallGenerator.h"
 
-class cmTarget;
 class cmGeneratorTarget;
 
 /** \class cmInstallTargetGenerator
@@ -54,7 +53,7 @@ public:
     NameReal
   };
 
-  static std::string GetInstallFilename(cmTarget const* target,
+  static std::string GetInstallFilename(const cmGeneratorTarget* target,
                                         const std::string& config,
                                         NameType nameType = NameNormal);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a51306f892bfa078ebb2bffcd3061e1c8401c5b0
commit a51306f892bfa078ebb2bffcd3061e1c8401c5b0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 14:33:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:42 2015 +0200

    Export: Port interface to cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 30a8bf2..194d9a2 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -50,7 +50,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
-    if(this->ExportedTargets.insert(te->Target).second)
+    if(this->ExportedTargets.insert(te).second)
       {
       this->Exports.push_back(te);
       }
@@ -80,45 +80,44 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->Exports.end(); ++tei)
     {
     cmGeneratorTarget* gte = *tei;
-    cmTarget* te = gte->Target;
-    this->GenerateImportTargetCode(os, te);
+    this->GenerateImportTargetCode(os, gte);
 
-    te->AppendBuildInterfaceIncludes();
+    gte->Target->AppendBuildInterfaceIncludes();
 
     ImportPropertyMap properties;
 
-    this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
+    this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_SOURCES", te,
+    this->PopulateInterfaceProperty("INTERFACE_SOURCES", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
+    this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", te,
+    this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS", te,
+    this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES", te,
+    this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
-                                  te, properties);
+                                  gte, properties);
     const bool newCMP0022Behavior =
-                              te->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                           && te->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gte->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gte->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
-      this->PopulateInterfaceLinkLibrariesProperty(te,
+      this->PopulateInterfaceLinkLibrariesProperty(gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
       }
     this->PopulateCompatibleInterfaceProperties(gte, properties);
 
-    this->GenerateInterfaceProperties(te, os, properties);
+    this->GenerateInterfaceProperties(gte, os, properties);
     }
 
   // Generate import file content for each configuration.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 4e8bc86..0985542 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -155,7 +155,7 @@ void cmExportFileGenerator::GenerateImportConfig(std::ostream& os,
 //----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateInterfaceProperty(
                                               const std::string& propName,
-                                              cmTarget *target,
+                                              cmGeneratorTarget *target,
                                               ImportPropertyMap &properties)
 {
   const char *input = target->GetProperty(propName);
@@ -169,7 +169,7 @@ void cmExportFileGenerator::PopulateInterfaceProperty(
 void cmExportFileGenerator::PopulateInterfaceProperty(
                       const std::string& propName,
                       const std::string& outputName,
-                      cmTarget *target,
+                      cmGeneratorTarget *target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
@@ -206,12 +206,12 @@ void cmExportFileGenerator::GenerateRequiredCMakeVersion(std::ostream& os,
 
 //----------------------------------------------------------------------------
 bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty(
-                      cmTarget *target,
+                      cmGeneratorTarget *target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  if(!target->IsLinkable())
+  if(!target->Target->IsLinkable())
     {
     return false;
     }
@@ -420,7 +420,7 @@ void cmExportFileGenerator::PopulateSourcesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, gt->Target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, gt,
                                                 missingTargets);
 
     if (!checkInterfaceDirs(prepro, gt, propName))
@@ -488,7 +488,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
     if (!checkInterfaceDirs(prepro, target, propName))
@@ -502,7 +502,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
 //----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateInterfaceProperty(
                       const std::string& propName,
-                      cmTarget *target,
+                      cmGeneratorTarget* target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
@@ -574,15 +574,14 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
                                 cmGeneratorTarget *gtarget,
                                 ImportPropertyMap &properties)
 {
-  cmTarget *target = gtarget->Target;
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_BOOL",
-                                target, properties);
+                                gtarget, properties);
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_STRING",
-                                target, properties);
+                                gtarget, properties);
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_NUMBER_MIN",
-                                target, properties);
+                                gtarget, properties);
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_NUMBER_MAX",
-                                target, properties);
+                                gtarget, properties);
 
   std::set<std::string> ifaceProperties;
 
@@ -593,12 +592,12 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
   getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MAX",
                       ifaceProperties);
 
-  if (target->GetType() != cmState::INTERFACE_LIBRARY)
+  if (gtarget->GetType() != cmState::INTERFACE_LIBRARY)
     {
     getCompatibleInterfaceProperties(gtarget, ifaceProperties, "");
 
     std::vector<std::string> configNames;
-    target->GetMakefile()->GetConfigurations(configNames);
+    gtarget->Target->GetMakefile()->GetConfigurations(configNames);
 
     for (std::vector<std::string>::const_iterator ci = configNames.begin();
       ci != configNames.end(); ++ci)
@@ -611,19 +610,20 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
     it != ifaceProperties.end(); ++it)
     {
     this->PopulateInterfaceProperty("INTERFACE_" + *it,
-                                    target, properties);
+                                    gtarget, properties);
     }
 }
 
 //----------------------------------------------------------------------------
-void cmExportFileGenerator::GenerateInterfaceProperties(cmTarget const* target,
+void cmExportFileGenerator::GenerateInterfaceProperties(
+                                        const cmGeneratorTarget* target,
                                         std::ostream& os,
                                         const ImportPropertyMap &properties)
 {
   if (!properties.empty())
     {
     std::string targetName = this->Namespace;
-    targetName += target->GetExportName();
+    targetName += target->Target->GetExportName();
     os << "set_target_properties(" << targetName << " PROPERTIES\n";
     for(ImportPropertyMap::const_iterator pi = properties.begin();
         pi != properties.end(); ++pi)
@@ -638,12 +638,12 @@ void cmExportFileGenerator::GenerateInterfaceProperties(cmTarget const* target,
 //----------------------------------------------------------------------------
 bool
 cmExportFileGenerator::AddTargetNamespace(std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets)
 {
-  cmMakefile *mf = target->GetMakefile();
+  cmLocalGenerator *lg = target->GetLocalGenerator();
 
-  cmTarget *tgt = mf->FindTargetToUse(input);
+  cmGeneratorTarget *tgt = lg->FindGeneratorTargetToUse(input);
   if (!tgt)
     {
     return false;
@@ -655,13 +655,14 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     }
   if(this->ExportedTargets.find(tgt) != this->ExportedTargets.end())
     {
-    input = this->Namespace + tgt->GetExportName();
+    input = this->Namespace + tgt->Target->GetExportName();
     }
   else
     {
     std::string namespacedTarget;
     this->HandleMissingTarget(namespacedTarget, missingTargets,
-                              mf, target, tgt);
+                              target->Target->GetMakefile(),
+                              target->Target, tgt->Target);
     if (!namespacedTarget.empty())
       {
       input = namespacedTarget;
@@ -674,7 +675,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
 void
 cmExportFileGenerator::ResolveTargetsInGeneratorExpressions(
                                     std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets,
                                     FreeTargetsReplace replace)
 {
@@ -711,14 +712,12 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpressions(
 void
 cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
                                     std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets)
 {
   std::string::size_type pos = 0;
   std::string::size_type lastPos = pos;
 
-  cmMakefile *mf = target->GetMakefile();
-
   while((pos = input.find("$<TARGET_PROPERTY:", lastPos)) != input.npos)
     {
     std::string::size_type nameStartPos = pos +
@@ -779,7 +778,7 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
 
   if (!errorString.empty())
     {
-    mf->IssueMessage(cmake::FATAL_ERROR, errorString);
+    target->GetLocalGenerator()->IssueMessage(cmake::FATAL_ERROR, errorString);
     }
 }
 
@@ -860,7 +859,7 @@ cmExportFileGenerator
                                                          preprocessRule);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                missingTargets,
                                                ReplaceFreeTargets);
     properties["IMPORTED_LINK_INTERFACE_LIBRARIES" + suffix] = prepro;
@@ -962,7 +961,7 @@ cmExportFileGenerator
     sep = ";";
 
     std::string temp = *li;
-    this->AddTargetNamespace(temp, target->Target, missingTargets);
+    this->AddTargetNamespace(temp, target, missingTargets);
     link_entries += temp;
     }
 
@@ -1044,12 +1043,12 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os,
 //----------------------------------------------------------------------------
 void
 cmExportFileGenerator
-::GenerateImportTargetCode(std::ostream& os, cmTarget const* target)
+::GenerateImportTargetCode(std::ostream& os, const cmGeneratorTarget* target)
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->GetExportName();
+  targetName += target->Target->GetExportName();
 
   // Create the imported target.
   os << "# Create imported target " << targetName << "\n";
@@ -1078,27 +1077,27 @@ cmExportFileGenerator
     }
 
   // Mark the imported executable if it has exports.
-  if(target->IsExecutableWithExports())
+  if(target->Target->IsExecutableWithExports())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY ENABLE_EXPORTS 1)\n";
     }
 
   // Mark the imported library if it is a framework.
-  if(target->IsFrameworkOnApple())
+  if(target->Target->IsFrameworkOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY FRAMEWORK 1)\n";
     }
 
   // Mark the imported executable if it is an application bundle.
-  if(target->IsAppBundleOnApple())
+  if(target->Target->IsAppBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY MACOSX_BUNDLE 1)\n";
     }
 
-  if (target->IsCFBundleOnApple())
+  if (target->Target->IsCFBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY BUNDLE 1)\n";
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 44f779b..3280a03 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -75,7 +75,8 @@ protected:
                                 const std::string& config = "");
   void GenerateImportFooterCode(std::ostream& os);
   void GenerateImportVersionCode(std::ostream& os);
-  void GenerateImportTargetCode(std::ostream& os, cmTarget const* target);
+  void GenerateImportTargetCode(std::ostream& os,
+                                cmGeneratorTarget const* target);
   void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
                                   cmTarget const* target,
                                   ImportPropertyMap const& properties);
@@ -122,19 +123,21 @@ protected:
                                    cmTarget* depender,
                                    cmTarget* dependee) = 0;
   void PopulateInterfaceProperty(const std::string&,
-                                 cmTarget *target,
+                                 cmGeneratorTarget *target,
                                  cmGeneratorExpression::PreprocessContext,
                                  ImportPropertyMap &properties,
                                  std::vector<std::string> &missingTargets);
-  bool PopulateInterfaceLinkLibrariesProperty(cmTarget *target,
+  bool PopulateInterfaceLinkLibrariesProperty(cmGeneratorTarget* target,
                                  cmGeneratorExpression::PreprocessContext,
                                  ImportPropertyMap &properties,
                                  std::vector<std::string> &missingTargets);
-  void PopulateInterfaceProperty(const std::string& propName, cmTarget *target,
+  void PopulateInterfaceProperty(const std::string& propName,
+                                 cmGeneratorTarget* target,
                                  ImportPropertyMap &properties);
   void PopulateCompatibleInterfaceProperties(cmGeneratorTarget *target,
                                  ImportPropertyMap &properties);
-  void GenerateInterfaceProperties(cmTarget const* target, std::ostream& os,
+  void GenerateInterfaceProperties(cmGeneratorTarget const* target,
+                                   std::ostream& os,
                                    const ImportPropertyMap &properties);
   void PopulateIncludeDirectoriesInterface(
                       cmTargetExport *target,
@@ -159,7 +162,7 @@ protected:
   };
 
   void ResolveTargetsInGeneratorExpressions(std::string &input,
-                          cmTarget* target,
+                          cmGeneratorTarget* target,
                           std::vector<std::string> &missingTargets,
                           FreeTargetsReplace replace = NoReplaceFreeTargets);
 
@@ -182,20 +185,20 @@ protected:
   bool AppendMode;
 
   // The set of targets included in the export.
-  std::set<cmTarget*> ExportedTargets;
+  std::set<cmGeneratorTarget*> ExportedTargets;
 
 private:
   void PopulateInterfaceProperty(const std::string&, const std::string&,
-                                 cmTarget *target,
+                                 cmGeneratorTarget* target,
                                  cmGeneratorExpression::PreprocessContext,
                                  ImportPropertyMap &properties,
                                  std::vector<std::string> &missingTargets);
 
-  bool AddTargetNamespace(std::string &input, cmTarget* target,
+  bool AddTargetNamespace(std::string &input, cmGeneratorTarget* target,
                           std::vector<std::string> &missingTargets);
 
   void ResolveTargetsInGeneratorExpression(std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets);
 
   virtual void ReplaceInstallPrefix(std::string &input);
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index d7ca6d5..da963f3 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -52,7 +52,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         sep + this->Namespace + (*tei)->Target->Target->GetExportName();
     sep = " ";
     cmTargetExport * te = *tei;
-    if(this->ExportedTargets.insert(te->Target->Target).second)
+    if(this->ExportedTargets.insert(te->Target).second)
       {
       allTargets.push_back(te);
       }
@@ -133,12 +133,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       tei != allTargets.end(); ++tei)
     {
     cmGeneratorTarget* gt = (*tei)->Target;
-    cmTarget* te = gt->Target;
 
     requiresConfigFiles = requiresConfigFiles
-                              || te->GetType() != cmState::INTERFACE_LIBRARY;
+                              || gt->GetType() != cmState::INTERFACE_LIBRARY;
 
-    this->GenerateImportTargetCode(os, te);
+    this->GenerateImportTargetCode(os, gt);
 
     ImportPropertyMap properties;
 
@@ -149,32 +148,32 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
 
     const bool newCMP0022Behavior =
-                              te->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                           && te->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gt->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gt->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
-      if (this->PopulateInterfaceLinkLibrariesProperty(te,
+      if (this->PopulateInterfaceLinkLibrariesProperty(gt,
                                     cmGeneratorExpression::InstallInterface,
                                     properties, missingTargets)
           && !this->ExportOld)
@@ -182,11 +181,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         require2_8_12 = true;
         }
       }
-    if (te->GetType() == cmState::INTERFACE_LIBRARY)
+    if (gt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       require3_0_0 = true;
       }
-    if(te->GetProperty("INTERFACE_SOURCES"))
+    if(gt->GetProperty("INTERFACE_SOURCES"))
       {
       // We can only generate INTERFACE_SOURCES in CMake 3.3, but CMake 3.1
       // can consume them.
@@ -194,11 +193,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       }
 
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
-                                  te, properties);
+                                  gt, properties);
 
     this->PopulateCompatibleInterfaceProperties(gt, properties);
 
-    this->GenerateInterfaceProperties(gt->Target, os, properties);
+    this->GenerateInterfaceProperties(gt, os, properties);
     }
 
   if (require3_1_0)
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 0fafa86..1daa67e 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -28,38 +28,38 @@ cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
 
 bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
 {
-  std::set<cmTarget const*> emitted;
-  std::set<cmTarget const*> emittedDeps;
+  std::set<cmGeneratorTarget const*> emitted;
+  std::set<cmGeneratorTarget const*> emittedDeps;
   while(!this->Exports.empty())
     {
     cmGeneratorTarget const* te = this->Exports.back();
     this->Exports.pop_back();
-    if (emitted.insert(te->Target).second)
+    if (emitted.insert(te).second)
       {
-      emittedDeps.insert(te->Target);
-      this->GenerateImportTargetCode(os, te->Target);
+      emittedDeps.insert(te);
+      this->GenerateImportTargetCode(os, te);
 
       ImportPropertyMap properties;
 
 #define FIND_TARGETS(PROPERTY) \
-      this->FindTargets("INTERFACE_" #PROPERTY, te->Target, emittedDeps);
+      this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 
 #undef FIND_TARGETS
 
-      this->PopulateProperties(te->Target, properties, emittedDeps);
+      this->PopulateProperties(te, properties, emittedDeps);
 
-      this->GenerateInterfaceProperties(te->Target, os, properties);
+      this->GenerateInterfaceProperties(te, os, properties);
       }
     }
   return true;
 }
 
 std::string cmExportTryCompileFileGenerator::FindTargets(
-                                          const std::string& propName,
-                                          cmTarget const* tgt,
-                                          std::set<cmTarget const*> &emitted)
+                                  const std::string& propName,
+                                  cmGeneratorTarget const* tgt,
+                                  std::set<cmGeneratorTarget const*> &emitted)
 {
   const char *prop = tgt->GetProperty(propName);
   if(!prop)
@@ -77,24 +77,22 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
 
   cmTarget dummyHead;
   dummyHead.SetType(cmState::EXECUTABLE, "try_compile_dummy_exe");
-  dummyHead.SetMakefile(tgt->GetMakefile());
+  dummyHead.SetMakefile(tgt->Target->GetMakefile());
 
-  cmGeneratorTarget* gtgt =
-      tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
-  cmGeneratorTarget gDummyHead(&dummyHead, gtgt->GetLocalGenerator());
+  cmGeneratorTarget gDummyHead(&dummyHead, tgt->GetLocalGenerator());
 
-  std::string result = cge->Evaluate(gtgt->GetLocalGenerator(), this->Config,
+  std::string result = cge->Evaluate(tgt->GetLocalGenerator(), this->Config,
                                      false, &gDummyHead,
-                                     gtgt, &dagChecker);
+                                     tgt, &dagChecker);
 
   const std::set<cmGeneratorTarget const*> &allTargets =
       cge->GetAllTargetsSeen();
   for(std::set<cmGeneratorTarget const*>::const_iterator li =
       allTargets.begin(); li != allTargets.end(); ++li)
     {
-    if(emitted.insert((*li)->Target).second)
+    if(emitted.insert(*li).second)
       {
-      this->Exports.push_back((*li));
+      this->Exports.push_back(*li);
       }
     }
   return result;
@@ -102,13 +100,12 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
 
 //----------------------------------------------------------------------------
 void
-cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
-                                                ImportPropertyMap& properties,
-                                          std::set<cmTarget const*> &emitted)
+cmExportTryCompileFileGenerator::PopulateProperties(
+                                 const cmGeneratorTarget* target,
+                                 ImportPropertyMap& properties,
+                                 std::set<cmGeneratorTarget const*> &emitted)
 {
-  cmPropertyMap props = target->GetProperties();
-  cmGeneratorTarget* gt =
-      target->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(target);
+  cmPropertyMap props = target->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     properties[i->first] = i->second.GetValue();
@@ -126,8 +123,8 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
           li != depends.end(); ++li)
         {
         cmGeneratorTarget *tgt =
-            gt->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
-        if(tgt && emitted.insert(tgt->Target).second)
+            target->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
+        if(tgt && emitted.insert(tgt).second)
           {
           this->Exports.push_back(tgt);
           }
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 4507787..19d8024 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -41,15 +41,16 @@ protected:
                                    cmTarget*,
                                    cmTarget*) {}
 
-  void PopulateProperties(cmTarget const* target,
+  void PopulateProperties(cmGeneratorTarget const* target,
                           ImportPropertyMap& properties,
-                          std::set<cmTarget const*> &emitted);
+                          std::set<const cmGeneratorTarget*>& emitted);
 
   std::string InstallNameDir(cmGeneratorTarget* target,
                              const std::string& config);
 private:
-  std::string FindTargets(const std::string& prop, cmTarget const* tgt,
-                   std::set<cmTarget const*> &emitted);
+  std::string FindTargets(const std::string& prop,
+                          const cmGeneratorTarget* tgt,
+                          std::set<const cmGeneratorTarget*>& emitted);
 
 
   std::vector<cmGeneratorTarget const*> Exports;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6aac95dbdcfb3d0de70d0b75790bc59637a2771
commit c6aac95dbdcfb3d0de70d0b75790bc59637a2771
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 14:27:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:41 2015 +0200

    cmExportTryCompileFileGenerator: Port to cmGeneratorTarget.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 5bb0f99..4a1f770 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -34,7 +34,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
   std::string outputVariable;
   std::string copyFile;
   std::string copyFileError;
-  std::vector<cmTarget const*> targets;
+  std::vector<std::string> targets;
   std::string libsToLink = " ";
   bool useOldLinkLibs = true;
   char targetNameBuf[64];
@@ -112,7 +112,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
           }
         if (tgt->IsImported())
           {
-          targets.push_back(tgt);
+          targets.push_back(argv[i]);
           }
         }
       }
@@ -375,9 +375,8 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
     if (!targets.empty())
       {
       std::string fname = "/" + std::string(targetName) + "Targets.cmake";
-      cmExportTryCompileFileGenerator tcfg(gg);
+      cmExportTryCompileFileGenerator tcfg(gg, targets, this->Makefile);
       tcfg.SetExportFile((this->BinaryDirectory + fname).c_str());
-      tcfg.SetExports(targets);
       tcfg.SetConfig(this->Makefile->GetSafeDefinition(
                                           "CMAKE_TRY_COMPILE_CONFIGURATION"));
 
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index d0e65e1..0fafa86 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -14,13 +14,16 @@
 
 #include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
 #include "cmGeneratorExpressionDAGChecker.h"
 
 //----------------------------------------------------------------------------
 cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
-    cmGlobalGenerator* gg)
+    cmGlobalGenerator* gg,
+    const std::vector<std::string>& targets,
+    cmMakefile* mf)
 {
-  gg->CreateGenerationObjects(cmGlobalGenerator::ImportedOnly);
+  gg->CreateImportedGenerationObjects(mf, targets, this->Exports);
 }
 
 bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
@@ -29,25 +32,25 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
   std::set<cmTarget const*> emittedDeps;
   while(!this->Exports.empty())
     {
-    cmTarget const* te = this->Exports.back();
+    cmGeneratorTarget const* te = this->Exports.back();
     this->Exports.pop_back();
-    if (emitted.insert(te).second)
+    if (emitted.insert(te->Target).second)
       {
-      emittedDeps.insert(te);
-      this->GenerateImportTargetCode(os, te);
+      emittedDeps.insert(te->Target);
+      this->GenerateImportTargetCode(os, te->Target);
 
       ImportPropertyMap properties;
 
 #define FIND_TARGETS(PROPERTY) \
-      this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
+      this->FindTargets("INTERFACE_" #PROPERTY, te->Target, emittedDeps);
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 
 #undef FIND_TARGETS
 
-      this->PopulateProperties(te, properties, emittedDeps);
+      this->PopulateProperties(te->Target, properties, emittedDeps);
 
-      this->GenerateInterfaceProperties(te, os, properties);
+      this->GenerateInterfaceProperties(te->Target, os, properties);
       }
     }
   return true;
@@ -91,7 +94,7 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
     {
     if(emitted.insert((*li)->Target).second)
       {
-      this->Exports.push_back((*li)->Target);
+      this->Exports.push_back((*li));
       }
     }
   return result;
@@ -104,6 +107,8 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
                                           std::set<cmTarget const*> &emitted)
 {
   cmPropertyMap props = target->GetProperties();
+  cmGeneratorTarget* gt =
+      target->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(target);
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     properties[i->first] = i->second.GetValue();
@@ -120,8 +125,9 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
       for(std::vector<std::string>::const_iterator li = depends.begin();
           li != depends.end(); ++li)
         {
-        cmTarget *tgt = target->GetMakefile()->FindTargetToUse(*li);
-        if(tgt && emitted.insert(tgt).second)
+        cmGeneratorTarget *tgt =
+            gt->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
+        if(tgt && emitted.insert(tgt->Target).second)
           {
           this->Exports.push_back(tgt);
           }
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 8838eca..4507787 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -20,11 +20,11 @@ class cmInstallTargetGenerator;
 class cmExportTryCompileFileGenerator: public cmExportFileGenerator
 {
 public:
-  cmExportTryCompileFileGenerator(cmGlobalGenerator* gg);
+  cmExportTryCompileFileGenerator(cmGlobalGenerator* gg,
+                                  std::vector<std::string> const& targets,
+                                  cmMakefile* mf);
 
   /** Set the list of targets to export.  */
-  void SetExports(const std::vector<cmTarget const*> &exports)
-    { this->Exports = exports; }
   void SetConfig(const std::string& config) { this->Config = config; }
 protected:
 
@@ -52,7 +52,7 @@ private:
                    std::set<cmTarget const*> &emitted);
 
 
-  std::vector<cmTarget const*> Exports;
+  std::vector<cmGeneratorTarget const*> Exports;
   std::string Config;
 };
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 9d54f6f..f54f936 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1202,6 +1202,26 @@ void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
   this->ComputeBuildFileGenerators();
 }
 
+void cmGlobalGenerator::CreateImportedGenerationObjects(cmMakefile* mf,
+    const std::vector<std::string>& targets,
+    std::vector<const cmGeneratorTarget*>& exports)
+{
+  this->CreateGenerationObjects(ImportedOnly);
+  std::vector<cmMakefile*>::iterator mfit =
+      std::find(this->Makefiles.begin(), this->Makefiles.end(), mf);
+  cmLocalGenerator* lg =
+      this->LocalGenerators[std::distance(this->Makefiles.begin(), mfit)];
+  for (std::vector<std::string>::const_iterator it = targets.begin();
+       it != targets.end(); ++it)
+    {
+    cmGeneratorTarget* gt = lg->FindGeneratorTargetToUse(*it);
+    if (gt)
+      {
+      exports.push_back(gt);
+      }
+    }
+}
+
 cmExportBuildFileGenerator*
 cmGlobalGenerator::GetExportedTargetsFile(const std::string &filename) const
 {
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ad8992f..4e6b11d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -91,6 +91,9 @@ public:
     ImportedOnly
   };
 
+  void CreateImportedGenerationObjects(cmMakefile* mf,
+                             std::vector<std::string> const& targets,
+                             std::vector<cmGeneratorTarget const*>& exports);
   void CreateGenerationObjects(TargetTypes targetTypes = AllTargets);
 
   /**

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73be3fb3489e5c7b8db7fe7b74dc70f863c60ef8
commit 73be3fb3489e5c7b8db7fe7b74dc70f863c60ef8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 13:31:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:41 2015 +0200

    cmExportSet: Store a cmGeneratorTarget.
    
    Set the member at compute time from the stored name.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 72b101f..30a8bf2 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -27,6 +27,10 @@ cmExportBuildFileGenerator::cmExportBuildFileGenerator()
 void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
 {
   this->LG = lg;
+  if (this->ExportSet)
+    {
+    this->ExportSet->Compute(lg);
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -274,7 +278,7 @@ void cmExportBuildFileGenerator
           tei = this->ExportSet->GetTargetExports()->begin();
           tei != this->ExportSet->GetTargetExports()->end(); ++tei)
       {
-      targets.push_back((*tei)->GetName());
+      targets.push_back((*tei)->TargetName);
       }
     return;
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 6127626..4e8bc86 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -398,11 +398,11 @@ void cmExportFileGenerator::PopulateSourcesInterface(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  cmTarget *target = tei->Target;
+  cmGeneratorTarget* gt = tei->Target;
   assert(preprocessRule == cmGeneratorExpression::InstallInterface);
 
   const char *propName = "INTERFACE_SOURCES";
-  const char *input = target->GetProperty(propName);
+  const char *input = gt->GetProperty(propName);
 
   if (!input)
     {
@@ -420,11 +420,9 @@ void cmExportFileGenerator::PopulateSourcesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, gt->Target,
                                                 missingTargets);
 
-    cmGeneratorTarget* gt = target->GetMakefile()
-        ->GetGlobalGenerator()->GetGeneratorTarget(target);
     if (!checkInterfaceDirs(prepro, gt, propName))
       {
       return;
@@ -440,9 +438,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  cmGeneratorTarget *target = tei->Target->GetMakefile()
-                                 ->GetGlobalGenerator()
-                                 ->GetGeneratorTarget(tei->Target);
+  cmGeneratorTarget *target = tei->Target;
   assert(preprocessRule == cmGeneratorExpression::InstallInterface);
 
   const char *propName = "INTERFACE_INCLUDE_DIRECTORIES";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 5a51442..d7ca6d5 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -48,10 +48,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
       tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
     {
-    expectedTargets += sep + this->Namespace + (*tei)->Target->GetExportName();
+    expectedTargets +=
+        sep + this->Namespace + (*tei)->Target->Target->GetExportName();
     sep = " ";
     cmTargetExport * te = *tei;
-    if(this->ExportedTargets.insert(te->Target).second)
+    if(this->ExportedTargets.insert(te->Target->Target).second)
       {
       allTargets.push_back(te);
       }
@@ -131,7 +132,8 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         tei = allTargets.begin();
       tei != allTargets.end(); ++tei)
     {
-    cmTarget* te = (*tei)->Target;
+    cmGeneratorTarget* gt = (*tei)->Target;
+    cmTarget* te = gt->Target;
 
     requiresConfigFiles = requiresConfigFiles
                               || te->GetType() != cmState::INTERFACE_LIBRARY;
@@ -193,13 +195,10 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
-    cmGeneratorTarget *gtgt = te->GetMakefile()
-                                ->GetGlobalGenerator()
-                                ->GetGeneratorTarget(te);
 
-    this->PopulateCompatibleInterfaceProperties(gtgt, properties);
+    this->PopulateCompatibleInterfaceProperties(gt, properties);
 
-    this->GenerateInterfaceProperties(te, os, properties);
+    this->GenerateInterfaceProperties(gt->Target, os, properties);
     }
 
   if (require3_1_0)
@@ -362,8 +361,7 @@ cmExportInstallFileGenerator
     if(!properties.empty())
       {
       // Get the rest of the target details.
-      cmGeneratorTarget *gtgt = te->Target->GetMakefile()
-                    ->GetGlobalGenerator()->GetGeneratorTarget(te->Target);
+      cmGeneratorTarget *gtgt = te->Target;
       this->SetImportDetailProperties(config, suffix,
                                       gtgt, properties, missingTargets);
 
@@ -378,8 +376,8 @@ cmExportInstallFileGenerator
       //                              properties);
 
       // Generate code in the export file.
-      this->GenerateImportPropertyCode(os, config, te->Target, properties);
-      this->GenerateImportedFileChecksCode(os, te->Target, properties,
+      this->GenerateImportPropertyCode(os, config, gtgt->Target, properties);
+      this->GenerateImportedFileChecksCode(os, gtgt->Target, properties,
                                            importedLocations);
       }
     }
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index 4148fb5..0059b64 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -13,12 +13,22 @@
 #include "cmExportSet.h"
 #include "cmTargetExport.h"
 #include "cmAlgorithms.h"
+#include "cmLocalGenerator.h"
 
 cmExportSet::~cmExportSet()
 {
   cmDeleteAll(this->TargetExports);
 }
 
+void cmExportSet::Compute(cmLocalGenerator* lg)
+{
+  for (std::vector<cmTargetExport*>::iterator it = this->TargetExports.begin();
+       it != this->TargetExports.end(); ++it)
+    {
+    (*it)->Target = lg->FindGeneratorTargetToUse((*it)->TargetName);
+    }
+}
+
 void cmExportSet::AddTargetExport(cmTargetExport* te)
 {
   this->TargetExports.push_back(te);
diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h
index a57aa12..d780a22 100644
--- a/Source/cmExportSet.h
+++ b/Source/cmExportSet.h
@@ -15,6 +15,7 @@
 #include "cmSystemTools.h"
 class cmTargetExport;
 class cmInstallExportGenerator;
+class cmLocalGenerator;
 
 /// A set of targets that were installed with the same EXPORT parameter.
 class cmExportSet
@@ -25,6 +26,8 @@ public:
   /// Destructor
   ~cmExportSet();
 
+  void Compute(cmLocalGenerator* lg);
+
   void AddTargetExport(cmTargetExport* tgt);
 
   void AddInstallation(cmInstallExportGenerator const* installation);
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index c22edf3..6b06fce 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -773,7 +773,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
     if(!exports.GetString().empty() && !namelinkOnly)
       {
       cmTargetExport *te = new cmTargetExport;
-      te->Target = &target;
+      te->TargetName = target.GetName();
       te->ArchiveGenerator = archiveGenerator;
       te->BundleGenerator = bundleGenerator;
       te->FrameworkGenerator = frameworkGenerator;
@@ -1379,16 +1379,17 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
         tei != exportSet->GetTargetExports()->end(); ++tei)
       {
       cmTargetExport const* te = *tei;
+      cmTarget* tgt = this->Makefile->FindTarget(te->TargetName);
       const bool newCMP0022Behavior =
-                      te->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                   && te->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+                      tgt->GetPolicyStatusCMP0022() != cmPolicies::WARN
+                   && tgt->GetPolicyStatusCMP0022() != cmPolicies::OLD;
 
       if(!newCMP0022Behavior)
         {
         std::ostringstream e;
         e << "INSTALL(EXPORT) given keyword \""
           << "EXPORT_LINK_INTERFACE_LIBRARIES" << "\", but target \""
-          << te->Target->GetName()
+          << te->TargetName
           << "\" does not have policy CMP0022 set to NEW.";
         this->SetError(e.str());
         return false;
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index f7c9cc2..9570ba3 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -56,6 +56,7 @@ cmInstallExportGenerator::~cmInstallExportGenerator()
 void cmInstallExportGenerator::Compute(cmLocalGenerator* lg)
 {
   this->LocalGenerator = lg;
+  this->ExportSet->Compute(lg);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTargetExport.h b/Source/cmTargetExport.h
index 7665888..2781337 100644
--- a/Source/cmTargetExport.h
+++ b/Source/cmTargetExport.h
@@ -14,7 +14,7 @@
 
 #include "cmStandardIncludes.h"
 
-class cmTarget;
+class cmGeneratorTarget;
 class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 
@@ -25,7 +25,8 @@ class cmInstallFilesGenerator;
 class cmTargetExport
 {
 public:
-  cmTarget* Target; ///< The target
+  std::string TargetName;
+  cmGeneratorTarget* Target;
 
   ///@name Generators
   ///@{

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3717655fc820691377d1f6a09c9ee4f45acd423
commit f3717655fc820691377d1f6a09c9ee4f45acd423
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 13:29:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:40 2015 +0200

    cmGlobalGenerator: Compute export() related classes early.
    
    Simplify CMP0024 handling.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a42ea22..9d54f6f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1199,6 +1199,7 @@ void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
   cmDeleteAll(this->GeneratorTargets);
   this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
+  this->ComputeBuildFileGenerators();
 }
 
 cmExportBuildFileGenerator*
@@ -1279,8 +1280,6 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
-  this->ComputeBuildFileGenerators();
-
   unsigned int i;
 
   // Add generator specific helper commands
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 6887409..ad8992f 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -365,8 +365,6 @@ public:
   bool GetConfigureDoneCMP0026() const
   { return this->ConfigureDoneCMP0026AndCMP0024; }
 
-  void ComputeBuildFileGenerators();
-
   std::string MakeSilentFlag;
 protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
@@ -471,6 +469,8 @@ private:
   void CheckCompilerIdCompatibility(cmMakefile* mf,
                                     std::string const& lang) const;
 
+  void ComputeBuildFileGenerators();
+
   cmExternalMakefileProjectGenerator* ExtraGenerator;
 
   // track files replaced during a Generate
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 97d4d56..8890e2b 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -126,7 +126,6 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
-    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1f02e29ffabb7cb83049fb7c3dd67d4a750e22b
commit c1f02e29ffabb7cb83049fb7c3dd67d4a750e22b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:31:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:39 2015 +0200

    cmLocalGenerator: Port PList handling to cmGeneratorTarget.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 60aff64..9d5dd8e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3012,7 +3012,7 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 }
 
 //----------------------------------------------------------------------------
-static void cmLGInfoProp(cmMakefile* mf, cmTarget* target,
+static void cmLGInfoProp(cmMakefile* mf, cmGeneratorTarget* target,
     const std::string& prop)
 {
   if(const char* val = target->GetProperty(prop))
@@ -3022,7 +3022,7 @@ static void cmLGInfoProp(cmMakefile* mf, cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::GenerateAppleInfoPList(cmTarget* target,
+void cmLocalGenerator::GenerateAppleInfoPList(cmGeneratorTarget* target,
                                               const std::string& targetName,
                                               const char* fname)
 {
@@ -3066,7 +3066,7 @@ void cmLocalGenerator::GenerateAppleInfoPList(cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::GenerateFrameworkInfoPList(cmTarget* target,
+void cmLocalGenerator::GenerateFrameworkInfoPList(cmGeneratorTarget* target,
                                                 const std::string& targetName,
                                                 const char* fname)
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 5d2a349..2bc0e4a 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -279,13 +279,14 @@ public:
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
-  void GenerateAppleInfoPList(cmTarget* target, const std::string& targetName,
+  void GenerateAppleInfoPList(cmGeneratorTarget* target,
+                              const std::string& targetName,
                               const char* fname);
 
   /**
    * Generate a Mac OS X framework Info.plist file.
    */
-  void GenerateFrameworkInfoPList(cmTarget* target,
+  void GenerateFrameworkInfoPList(cmGeneratorTarget* target,
                                   const std::string& targetName,
                                   const char* fname);
   /** Construct a comment for a custom command.  */
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 4fe99e3..490759f 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -59,7 +59,7 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string& targetName,
   plist += "/";
   plist += this->GT->GetAppBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
-  this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateAppleInfoPList(this->GT,
                                                targetName,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);
@@ -90,7 +90,7 @@ void cmOSXBundleGenerator::CreateFramework(
   std::string plist = newoutpath;
   plist += "/Resources/Info.plist";
   std::string name = cmSystemTools::GetFilenameName(targetName);
-  this->LocalGenerator->GenerateFrameworkInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateFrameworkInfoPList(this->GT,
                                                    name,
                                                    plist.c_str());
 
@@ -182,7 +182,7 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
     this->GT->GetCFBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
   std::string name = cmSystemTools::GetFilenameName(targetName);
-  this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateAppleInfoPList(this->GT,
                                                name,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31c4aee75a18b11d86a364d01fdae3250200866d
commit 31c4aee75a18b11d86a364d01fdae3250200866d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:29:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:39 2015 +0200

    cmLocalGenerator: Port policy handling to cmGeneratorTarget.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d830e26..60aff64 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2129,7 +2129,7 @@ void cmLocalGenerator
     }
 
   if (!warnCMP0063.empty() &&
-      this->WarnCMP0063.insert(target->Target).second)
+      this->WarnCMP0063.insert(target).second)
     {
     std::ostringstream w;
     w <<
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 749a93d..5d2a349 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -369,7 +369,7 @@ protected:
   std::string::size_type ObjectPathMax;
   std::set<std::string> ObjectMaxPathViolations;
 
-  std::set<cmTarget const*> WarnCMP0063;
+  std::set<cmGeneratorTarget const*> WarnCMP0063;
   cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e8ef6427393546c77da1b74234311d3b60edd98
commit 3e8ef6427393546c77da1b74234311d3b60edd98
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:19:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:38 2015 +0200

    cmLocalGenerator: Port some API to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index a197f88..41af89b 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -316,10 +316,11 @@ std::string cmCommonTargetGenerator::GetFlags(const std::string &l)
       this->AddFortranFlags(flags);
       }
 
-    this->LocalGenerator->AddCMP0018Flags(flags, this->Target,
+    this->LocalGenerator->AddCMP0018Flags(flags, this->GeneratorTarget,
                                           lang, this->ConfigName);
 
-    this->LocalGenerator->AddVisibilityPresetFlags(flags, this->Target,
+    this->LocalGenerator->AddVisibilityPresetFlags(flags,
+                                                   this->GeneratorTarget,
                                                    lang);
 
     // Append old-style preprocessor definition flags.
@@ -331,7 +332,7 @@ std::string cmCommonTargetGenerator::GetFlags(const std::string &l)
       AppendFlags(flags,this->GetFrameworkFlags(l));
 
     // Add target-specific flags.
-    this->LocalGenerator->AddCompileOptions(flags, this->Target,
+    this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
                                             lang, this->ConfigName);
 
     ByLanguageMap::value_type entry(l, flags);
@@ -354,7 +355,7 @@ std::string cmCommonTargetGenerator::GetDefines(const std::string &l)
       }
 
     // Add preprocessor definitions for this target and configuration.
-    this->LocalGenerator->AddCompileDefinitions(defines, this->Target,
+    this->LocalGenerator->AddCompileDefinitions(defines, this->GeneratorTarget,
                             this->LocalGenerator->GetConfigName(), l);
 
     std::string definesString;
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index d1599c4..a6b14ba 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -388,7 +388,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   //   }
 
   // Add shared-library flags if needed.
-  lg->AddCMP0018Flags(flags, gtgt->Target, language, config);
+  lg->AddCMP0018Flags(flags, gtgt, language, config);
 
   // Add include directory flags.
   {
@@ -403,7 +403,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  lg->AddCompileOptions(flags, gtgt->Target, language, config);
+  lg->AddCompileOptions(flags, gtgt, language, config);
 
   // Add source file specific flags.
   lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
@@ -433,7 +433,7 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AddCompileDefinitions(defines, target->Target, config, language);
+  lg->AddCompileDefinitions(defines, target, config, language);
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index c687ba7..019cdd1 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -265,8 +265,11 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const &config,
         this->LocalGenerator->AddLanguageFlags(
             flags, lang + std::string("_GHS_KERNEL"), config);
       }
-    this->LocalGenerator->AddCMP0018Flags(flags, this->Target, lang, config);
-    this->LocalGenerator->AddVisibilityPresetFlags(flags, this->Target, lang);
+    this->LocalGenerator->AddCMP0018Flags(flags, this->GeneratorTarget,
+                                          lang, config);
+    this->LocalGenerator->AddVisibilityPresetFlags(flags,
+                                                   this->GeneratorTarget,
+                                                   lang);
 
     // Append old-style preprocessor definition flags.
     if (std::string(" ") != std::string(this->Makefile->GetDefineFlags()))
@@ -276,7 +279,8 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const &config,
       }
 
     // Add target-specific flags.
-    this->LocalGenerator->AddCompileOptions(flags, this->Target, lang, config);
+    this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
+                                            lang, config);
 
     std::map<std::string, std::string>::value_type entry(language, flags);
     i = this->FlagsByLanguage.insert(entry).first;
@@ -299,7 +303,8 @@ std::string cmGhsMultiTargetGenerator::GetDefines(const std::string &language,
       }
 
     // Add preprocessor definitions for this target and configuration.
-    this->LocalGenerator->AddCompileDefinitions(defines, this->Target, config,
+    this->LocalGenerator->AddCompileDefinitions(defines,
+                                                this->GeneratorTarget, config,
                                                 language);
 
     std::string definesString;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 8454bc1..d4ccde6 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1814,14 +1814,14 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->CurrentLocalGenerator->AddLanguageFlags(flags, lang, configName);
 
     // Add shared-library flags if needed.
-    this->CurrentLocalGenerator->AddCMP0018Flags(flags, &target,
+    this->CurrentLocalGenerator->AddCMP0018Flags(flags, gtgt,
                                                  lang, configName);
 
-    this->CurrentLocalGenerator->AddVisibilityPresetFlags(flags, &target,
+    this->CurrentLocalGenerator->AddVisibilityPresetFlags(flags, gtgt,
                                                    lang);
 
     this->CurrentLocalGenerator->
-      AddCompileOptions(flags, &target, lang, configName);
+      AddCompileOptions(flags, gtgt, lang, configName);
     }
 
   std::string llang = gtgt->GetLinkerLanguage(configName);
@@ -1884,7 +1884,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
                               cmSystemTools::UpperCase(configName),
-                              &target);
+                              gtgt);
     }
   else
     {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d457e9c..d830e26 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -920,7 +920,7 @@ cmLocalGenerator::ExpandRuleVariables(std::string& s,
 }
 
 //----------------------------------------------------------------------------
-const char* cmLocalGenerator::GetRuleLauncher(cmTarget* target,
+const char* cmLocalGenerator::GetRuleLauncher(cmGeneratorTarget* target,
                                               const std::string& prop)
 {
   if(target)
@@ -934,7 +934,8 @@ const char* cmLocalGenerator::GetRuleLauncher(cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::InsertRuleLauncher(std::string& s, cmTarget* target,
+void cmLocalGenerator::InsertRuleLauncher(std::string& s,
+                                          cmGeneratorTarget* target,
                                           const std::string& prop)
 {
   if(const char* val = this->GetRuleLauncher(target, prop))
@@ -1087,27 +1088,23 @@ std::string cmLocalGenerator::GetIncludeFlags(
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCompileDefinitions(std::set<std::string>& defines,
-                                             cmTarget const* target,
+                                             cmGeneratorTarget const* target,
                                              const std::string& config,
                                              const std::string& lang)
 {
   std::vector<std::string> targetDefines;
-  cmGeneratorTarget* gtgt = this->GlobalGenerator->GetGeneratorTarget(target);
-  gtgt->GetCompileDefinitions(targetDefines, config, lang);
+  target->GetCompileDefinitions(targetDefines, config, lang);
   this->AppendDefines(defines, targetDefines);
 }
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCompileOptions(
-  std::string& flags, cmTarget* target,
+  std::string& flags, cmGeneratorTarget* target,
   const std::string& lang, const std::string& config
   )
 {
   std::string langFlagRegexVar = std::string("CMAKE_")+lang+"_FLAG_REGEX";
 
-  cmGeneratorTarget* gtgt =
-      this->GlobalGenerator->GetGeneratorTarget(target);
-
   if(const char* langFlagRegexStr =
      this->Makefile->GetDefinition(langFlagRegexVar))
     {
@@ -1118,7 +1115,7 @@ void cmLocalGenerator::AddCompileOptions(
       {
       cmSystemTools::ParseWindowsCommandLine(targetFlags, opts);
       }
-    gtgt->GetCompileOptions(opts, config, lang);
+    target->GetCompileOptions(opts, config, lang);
     for(std::vector<std::string>::const_iterator i = opts.begin();
         i != opts.end(); ++i)
       {
@@ -1139,7 +1136,7 @@ void cmLocalGenerator::AddCompileOptions(
       this->AppendFlags(flags, targetFlags);
       }
     std::vector<std::string> opts;
-    gtgt->GetCompileOptions(opts, config, lang);
+    target->GetCompileOptions(opts, config, lang);
     for(std::vector<std::string>::const_iterator i = opts.begin();
         i != opts.end(); ++i)
       {
@@ -1148,19 +1145,19 @@ void cmLocalGenerator::AddCompileOptions(
       }
     }
   std::vector<std::string> features;
-  gtgt->GetCompileFeatures(features, config);
+  target->GetCompileFeatures(features, config);
   for(std::vector<std::string>::const_iterator it = features.begin();
       it != features.end(); ++it)
     {
-     if (!this->Makefile->AddRequiredTargetFeature(target, *it))
+     if (!this->Makefile->AddRequiredTargetFeature(target->Target, *it))
       {
       return;
       }
     }
 
   for(std::map<std::string, std::string>::const_iterator it
-      = gtgt->GetMaxLanguageStandards().begin();
-      it != gtgt->GetMaxLanguageStandards().end(); ++it)
+      = target->GetMaxLanguageStandards().begin();
+      it != target->GetMaxLanguageStandards().end(); ++it)
     {
     const char* standard = target->GetProperty(it->first + "_STANDARD");
     if(!standard)
@@ -1314,7 +1311,7 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
 
 void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags,
                                              std::string const& config,
-                                             cmTarget* target)
+                                             cmGeneratorTarget* target)
 {
   this->AppendFlags(flags,
     this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS"));
@@ -1348,7 +1345,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
   switch(target->GetType())
     {
     case cmState::STATIC_LIBRARY:
-      this->GetStaticLibraryFlags(linkFlags, buildType, target->Target);
+      this->GetStaticLibraryFlags(linkFlags, buildType, target);
       break;
     case cmState::MODULE_LIBRARY:
       libraryLinkVariable = "CMAKE_MODULE_LINKER_FLAGS";
@@ -1904,7 +1901,8 @@ void cmLocalGenerator::AddSharedFlags(std::string& flags,
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::
-AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
+AddCompilerRequirementFlag(std::string &flags,
+                           cmGeneratorTarget const* target,
                            const std::string& lang)
 {
   if (lang.empty())
@@ -1942,7 +1940,8 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
               "CMAKE_" + lang + standardProp
                       + "_" + type + "_COMPILE_OPTION";
 
-    const char *opt = target->GetMakefile()->GetDefinition(option_flag);
+    const char *opt = target->Target->GetMakefile()
+        ->GetDefinition(option_flag);
     if (!opt)
       {
       std::ostringstream e;
@@ -1983,7 +1982,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
     std::string e =
       lang + "_STANDARD is set to invalid value '" + standard + "'";
     this->GetGlobalGenerator()->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e, target->GetBacktrace());
+      ->IssueMessage(cmake::FATAL_ERROR, e, target->Target->GetBacktrace());
     return;
     }
 
@@ -2007,7 +2006,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
                       + "_" + type + "_COMPILE_OPTION";
 
     const char *opt =
-        target->GetMakefile()->GetRequiredDefinition(option_flag);
+        target->Target->GetMakefile()->GetRequiredDefinition(option_flag);
     this->AppendFlagEscape(flags, opt);
     return;
     }
@@ -2018,7 +2017,8 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
               "CMAKE_" + lang + *stdIt
                       + "_" + type + "_COMPILE_OPTION";
 
-    if (const char *opt = target->GetMakefile()->GetDefinition(option_flag))
+    if (const char *opt = target->Target
+        ->GetMakefile()->GetDefinition(option_flag))
       {
       this->AppendFlagEscape(flags, opt);
       return;
@@ -2094,7 +2094,7 @@ static void AddInlineVisibilityCompileOption(std::string &flags,
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator
-::AddVisibilityPresetFlags(std::string &flags, cmTarget const* target,
+::AddVisibilityPresetFlags(std::string &flags, cmGeneratorTarget const* target,
                             const std::string& lang)
 {
   if (lang.empty())
@@ -2106,9 +2106,9 @@ void cmLocalGenerator
   std::string *pWarnCMP0063 = 0;
   if (target->GetType() != cmState::SHARED_LIBRARY &&
       target->GetType() != cmState::MODULE_LIBRARY &&
-      !target->IsExecutableWithExports())
+      !target->Target->IsExecutableWithExports())
     {
-    switch (target->GetPolicyStatusCMP0063())
+    switch (target->Target->GetPolicyStatusCMP0063())
       {
       case cmPolicies::OLD:
         return;
@@ -2120,15 +2120,16 @@ void cmLocalGenerator
       }
     }
 
-  AddVisibilityCompileOption(flags, target, this, lang, pWarnCMP0063);
+  AddVisibilityCompileOption(flags, target->Target, this, lang, pWarnCMP0063);
 
   if(lang == "CXX")
     {
-    AddInlineVisibilityCompileOption(flags, target, this, pWarnCMP0063);
+    AddInlineVisibilityCompileOption(flags, target->Target,
+                                     this, pWarnCMP0063);
     }
 
   if (!warnCMP0063.empty() &&
-      this->WarnCMP0063.insert(target).second)
+      this->WarnCMP0063.insert(target->Target).second)
     {
     std::ostringstream w;
     w <<
@@ -2138,14 +2139,15 @@ void cmLocalGenerator
       "has the following visibility properties set for " << lang << ":\n" <<
       warnCMP0063 <<
       "For compatibility CMake is not honoring them for this target.";
-    target->GetMakefile()->GetCMakeInstance()
-      ->IssueMessage(cmake::AUTHOR_WARNING, w.str(), target->GetBacktrace());
+    target->Target->GetMakefile()->GetCMakeInstance()
+      ->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
+                     target->Target->GetBacktrace());
     }
 }
 
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
-                                       cmTarget const* target,
+                                       cmGeneratorTarget const* target,
                                        std::string const& lang,
                                        const std::string& config)
 {
@@ -2169,9 +2171,7 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags,
       return;
       }
 
-    cmGeneratorTarget* gtgt =
-        this->GlobalGenerator->GetGeneratorTarget(target);
-    if (gtgt->GetLinkInterfaceDependentBoolProperty(
+    if (target->GetLinkInterfaceDependentBoolProperty(
                                                 "POSITION_INDEPENDENT_CODE",
                                                 config))
       {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index ee0a618..749a93d 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -20,7 +20,6 @@
 class cmMakefile;
 class cmGlobalGenerator;
 class cmGeneratorTarget;
-class cmTarget;
 class cmTargetManifest;
 class cmSourceFile;
 class cmCustomCommand;
@@ -91,13 +90,15 @@ public:
 
   void AddLanguageFlags(std::string& flags, const std::string& lang,
                         const std::string& config);
-  void AddCMP0018Flags(std::string &flags, cmTarget const* target,
+  void AddCMP0018Flags(std::string &flags, cmGeneratorTarget const* target,
                        std::string const& lang, const std::string& config);
-  void AddVisibilityPresetFlags(std::string &flags, cmTarget const* target,
+  void AddVisibilityPresetFlags(std::string &flags,
+                                cmGeneratorTarget const* target,
                                 const std::string& lang);
   void AddConfigVariableFlags(std::string& flags, const std::string& var,
                               const std::string& config);
-  void AddCompilerRequirementFlag(std::string &flags, cmTarget const* target,
+  void AddCompilerRequirementFlag(std::string &flags,
+                                  cmGeneratorTarget const* target,
                                   const std::string& lang);
   ///! Append flags to a string.
   virtual void AppendFlags(std::string& flags, const std::string& newFlags);
@@ -188,10 +189,10 @@ public:
                              const std::string& lang = "C",
                              const std::string& config = "",
                              bool stripImplicitInclDirs = true) const;
-  void AddCompileOptions(std::string& flags, cmTarget* target,
+  void AddCompileOptions(std::string& flags, cmGeneratorTarget* target,
                          const std::string& lang, const std::string& config);
   void AddCompileDefinitions(std::set<std::string>& defines,
-                             cmTarget const* target,
+                             cmGeneratorTarget const* target,
                              const std::string& config,
                              const std::string& lang);
 
@@ -212,7 +213,7 @@ public:
       {
         memset(this, 0,  sizeof(*this));
       }
-    cmTarget* CMTarget;
+    cmGeneratorTarget* CMTarget;
     const char* TargetPDB;
     const char* TargetCompilePDB;
     const char* TargetVersionMajor;
@@ -298,7 +299,7 @@ public:
   /** Fill out the static linker flags for the given target.  */
   void GetStaticLibraryFlags(std::string& flags,
                              std::string const& config,
-                             cmTarget* target);
+                             cmGeneratorTarget* target);
 
   /** Fill out these strings for the given target.  Libraries to link,
    *  flags, and linkflags. */
@@ -341,8 +342,9 @@ protected:
   std::string ExpandRuleVariable(std::string const& variable,
                                  const RuleVariables& replaceValues);
 
-  const char* GetRuleLauncher(cmTarget* target, const std::string& prop);
-  void InsertRuleLauncher(std::string& s, cmTarget* target,
+  const char* GetRuleLauncher(cmGeneratorTarget* target,
+                              const std::string& prop);
+  void InsertRuleLauncher(std::string& s, cmGeneratorTarget* target,
                           const std::string& prop);
 
   // Handle old-style install rules stored in the targets.
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index f3ee2e3..add0aa9 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1034,7 +1034,7 @@ void
 cmLocalUnixMakefileGenerator3
 ::AppendCustomCommands(std::vector<std::string>& commands,
                        const std::vector<cmCustomCommand>& ccs,
-                       cmTarget* target,
+                       cmGeneratorTarget* target,
                        cmLocalGenerator::RelativeRoot relative)
 {
   for(std::vector<cmCustomCommand>::const_iterator i = ccs.begin();
@@ -1050,7 +1050,7 @@ void
 cmLocalUnixMakefileGenerator3
 ::AppendCustomCommand(std::vector<std::string>& commands,
                       cmCustomCommandGenerator const& ccg,
-                      cmTarget* target,
+                      cmGeneratorTarget* target,
                       bool echo_comment,
                       cmLocalGenerator::RelativeRoot relative,
                       std::ostream* content)
@@ -1181,7 +1181,7 @@ cmLocalUnixMakefileGenerator3
 std::string
 cmLocalUnixMakefileGenerator3::MakeLauncher(
   cmCustomCommandGenerator const& ccg,
-  cmTarget* target, RelativeRoot relative)
+  cmGeneratorTarget* target, RelativeRoot relative)
 {
   // Short-circuit if there is no launcher.
   const char* prop = "RULE_LAUNCH_CUSTOM";
@@ -1788,6 +1788,9 @@ void cmLocalUnixMakefileGenerator3
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 
+      cmGeneratorTarget* gt = this->GlobalGenerator
+          ->GetGeneratorTarget(&glIt->second);
+
       // Global targets store their rules in pre- and post-build commands.
       this->AppendCustomDepends(depends,
                                 glIt->second.GetPreBuildCommands());
@@ -1795,11 +1798,11 @@ void cmLocalUnixMakefileGenerator3
                                 glIt->second.GetPostBuildCommands());
       this->AppendCustomCommands(commands,
                                  glIt->second.GetPreBuildCommands(),
-                                 &glIt->second,
+                                 gt,
                                  cmLocalGenerator::START_OUTPUT);
       this->AppendCustomCommands(commands,
                                  glIt->second.GetPostBuildCommands(),
-                                 &glIt->second,
+                                 gt,
                                  cmLocalGenerator::START_OUTPUT);
       std::string targetName = glIt->second.GetName();
       this->WriteMakeRule(ruleFileStream, targetString.c_str(),
@@ -1976,10 +1979,11 @@ void cmLocalUnixMakefileGenerator3::ClearDependencies(cmMakefile* mf,
 
 
 void cmLocalUnixMakefileGenerator3
-::WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &target)
+::WriteDependLanguageInfo(std::ostream& cmakefileStream,
+                          cmGeneratorTarget* target)
 {
   ImplicitDependLanguageMap const& implicitLangs =
-    this->GetImplicitDepends(target);
+    this->GetImplicitDepends(*target->Target);
 
   // list the languages
   cmakefileStream
@@ -2030,7 +2034,7 @@ void cmLocalUnixMakefileGenerator3
 
     // Build a list of preprocessor definitions for the target.
     std::set<std::string> defines;
-    this->AddCompileDefinitions(defines, &target,
+    this->AddCompileDefinitions(defines, target,
                                 this->ConfigName, l->first);
     if(!defines.empty())
       {
@@ -2056,12 +2060,10 @@ void cmLocalUnixMakefileGenerator3
       << "set(CMAKE_" << l->first << "_TARGET_INCLUDE_PATH\n";
     std::vector<std::string> includes;
 
-    cmGeneratorTarget* gt = this->GetGlobalGenerator()
-                                ->GetGeneratorTarget(&target);
 
     const std::string& config =
       this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-    this->GetIncludeDirectories(includes, gt,
+    this->GetIncludeDirectories(includes, target,
                                 l->first, config);
     for(std::vector<std::string>::iterator i = includes.begin();
         i != includes.end(); ++i)
@@ -2084,7 +2086,7 @@ void cmLocalUnixMakefileGenerator3
     cmSystemTools::ExpandListArgument(xform, transformRules);
     }
   if(const char* xform =
-     target.GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM"))
+     target->GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM"))
     {
     cmSystemTools::ExpandListArgument(xform, transformRules);
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 586dda0..beaddde 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -182,7 +182,8 @@ protected:
 
 
   // write the depend info
-  void WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &tgt);
+  void WriteDependLanguageInfo(std::ostream& cmakefileStream,
+                               cmGeneratorTarget *tgt);
 
   // write the local help rule
   void WriteHelpRule(std::ostream& ruleFileStream);
@@ -215,12 +216,12 @@ protected:
                           cmCustomCommandGenerator const& cc);
   void AppendCustomCommands(std::vector<std::string>& commands,
                             const std::vector<cmCustomCommand>& ccs,
-                            cmTarget* target,
+                            cmGeneratorTarget* target,
                             cmLocalGenerator::RelativeRoot relative =
                             cmLocalGenerator::HOME_OUTPUT);
   void AppendCustomCommand(std::vector<std::string>& commands,
                            cmCustomCommandGenerator const& ccg,
-                           cmTarget* target,
+                           cmGeneratorTarget* target,
                            bool echo_comment=false,
                            cmLocalGenerator::RelativeRoot relative =
                            cmLocalGenerator::HOME_OUTPUT,
@@ -237,7 +238,7 @@ protected:
 private:
   std::string ConvertShellCommand(std::string const& cmd, RelativeRoot root);
   std::string MakeLauncher(cmCustomCommandGenerator const& ccg,
-                           cmTarget* target, RelativeRoot relative);
+                           cmGeneratorTarget* target, RelativeRoot relative);
 
   virtual void ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3e901ba..f40e6dd 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1750,12 +1750,12 @@ void cmLocalVisualStudio6Generator
       flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
       flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
 
-      this->AddCompileOptions(flags, &target, linkLanguage, "");
-      this->AddCompileOptions(flagsDebug, &target, linkLanguage, "Debug");
-      this->AddCompileOptions(flagsRelease, &target, linkLanguage, "Release");
-      this->AddCompileOptions(flagsMinSizeRel, &target, linkLanguage,
+      this->AddCompileOptions(flags, gt, linkLanguage, "");
+      this->AddCompileOptions(flagsDebug, gt, linkLanguage, "Debug");
+      this->AddCompileOptions(flagsRelease, gt, linkLanguage, "Release");
+      this->AddCompileOptions(flagsMinSizeRel, gt, linkLanguage,
                               "MinSizeRel");
-      this->AddCompileOptions(flagsRelWithDebInfo, &target, linkLanguage,
+      this->AddCompileOptions(flagsRelWithDebInfo, gt, linkLanguage,
                               "RelWithDebInfo");
 
       // if _UNICODE and _SBCS are not found, then add -D_MBCS
@@ -1775,14 +1775,14 @@ void cmLocalVisualStudio6Generator
       std::set<std::string> minsizeDefinesSet;
       std::set<std::string> debugrelDefinesSet;
 
-      this->AddCompileDefinitions(definesSet, &target, "", linkLanguage);
-      this->AddCompileDefinitions(debugDefinesSet, &target,
+      this->AddCompileDefinitions(definesSet, gt, "", linkLanguage);
+      this->AddCompileDefinitions(debugDefinesSet, gt,
                                   "DEBUG", linkLanguage);
-      this->AddCompileDefinitions(releaseDefinesSet, &target,
+      this->AddCompileDefinitions(releaseDefinesSet, gt,
                                   "RELEASE", linkLanguage);
-      this->AddCompileDefinitions(minsizeDefinesSet, &target,
+      this->AddCompileDefinitions(minsizeDefinesSet, gt,
                                   "MINSIZEREL", linkLanguage);
-      this->AddCompileDefinitions(debugrelDefinesSet, &target,
+      this->AddCompileDefinitions(debugrelDefinesSet, gt,
                                   "RELWITHDEBINFO", linkLanguage);
 
       std::string defines = " ";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 6d02bfa..485ac31 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -733,7 +733,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       }
 
     // Add the target-specific flags.
-    this->AddCompileOptions(flags, &target, linkLanguage, configName);
+    this->AddCompileOptions(flags, gt, linkLanguage, configName);
     }
 
   if(this->FortranProject)
@@ -1152,7 +1152,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
         }
       }
     std::string libflags;
-    this->GetStaticLibraryFlags(libflags, configTypeUpper, &target);
+    this->GetStaticLibraryFlags(libflags, configTypeUpper, gt);
     if(!libflags.empty())
       {
       fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 43bc4e1..178b462 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -280,10 +280,10 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     {
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -358,7 +358,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   cmLocalGenerator::RuleVariables vars;
   vars.RuleLauncher = "RULE_LAUNCH_LINK";
-  vars.CMTarget = this->Target;
+  vars.CMTarget = this->GeneratorTarget;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
   std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
@@ -449,7 +449,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     {
     this->LocalGenerator->
       AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->Target);
+                           this->GeneratorTarget);
     }
 
   // Write the build rule.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 28b4ab8..2ed5f70 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -115,7 +115,7 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
   // Add post-build rules.
   this->LocalGenerator->
     AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                         this->Target);
+                         this->GeneratorTarget);
 
   // Depend on the object files.
   this->AppendObjectDepends(depends);
@@ -146,7 +146,7 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules()
 
   std::string extraFlags;
   this->LocalGenerator->GetStaticLibraryFlags(extraFlags,
-    cmSystemTools::UpperCase(this->ConfigName), this->Target);
+    cmSystemTools::UpperCase(this->ConfigName), this->GeneratorTarget);
   this->WriteLibraryRules(linkRuleVar, extraFlags, false);
 }
 
@@ -458,10 +458,10 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     {
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     this->LocalGenerator
       ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->Target);
+                             this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -640,7 +640,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.TargetVersionMinor = targetVersionMinor.c_str();
 
   vars.RuleLauncher = "RULE_LAUNCH_LINK";
-  vars.CMTarget = this->Target;
+  vars.CMTarget = this->GeneratorTarget;
   vars.Language = linkLanguage.c_str();
   vars.Objects = buildObjs.c_str();
   std::string objectDir = this->GeneratorTarget->GetSupportDirectory();
@@ -811,7 +811,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     {
     this->LocalGenerator->
       AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->Target);
+                           this->GeneratorTarget);
     }
 
   // Compute the list of outputs.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index df50747..b7970fd 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -589,7 +589,7 @@ cmMakefileTargetGenerator
   }
   cmLocalGenerator::RuleVariables vars;
   vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
-  vars.CMTarget = this->Target;
+  vars.CMTarget = this->GeneratorTarget;
   vars.Language = lang.c_str();
   vars.Target = targetOutPathReal.c_str();
   vars.TargetPDB = targetOutPathPDB.c_str();
@@ -1040,7 +1040,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
     return;
     }
   this->LocalGenerator->
-    WriteDependLanguageInfo(*this->InfoFileStream,*this->Target);
+    WriteDependLanguageInfo(*this->InfoFileStream, this->GeneratorTarget);
 
   // Store multiple output pairs in the depend info file.
   if(!this->MultipleOutputPairs.empty())
@@ -1211,7 +1211,8 @@ void cmMakefileTargetGenerator
 
   // Now append the actual user-specified commands.
   std::ostringstream content;
-  this->LocalGenerator->AppendCustomCommand(commands, ccg, this->Target, false,
+  this->LocalGenerator->AppendCustomCommand(commands, ccg,
+                                            this->GeneratorTarget, false,
                                             cmLocalGenerator::HOME_OUTPUT,
                                             &content);
 
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 18594bb..11601c5 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -74,13 +74,13 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
     (depends, this->Target->GetPostBuildCommands());
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPreBuildCommands(), this->Target);
+    (commands, this->Target->GetPreBuildCommands(), this->GeneratorTarget);
 
   // Depend on all custom command outputs for sources
   this->DriveCustomCommands(depends);
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPostBuildCommands(), this->Target);
+    (commands, this->Target->GetPostBuildCommands(), this->GeneratorTarget);
 
   // Add dependencies on targets that must be built first.
   this->AppendTargetDepends(depends);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index e2061e5..e5e4b7f 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -178,7 +178,7 @@ cmNinjaNormalTargetGenerator
   if (!this->GetGlobalGenerator()->HasRule(ruleName)) {
     cmLocalGenerator::RuleVariables vars;
     vars.RuleLauncher = "RULE_LAUNCH_LINK";
-    vars.CMTarget = this->GetTarget();
+    vars.CMTarget = this->GetGeneratorTarget();
     vars.Language = this->TargetLinkLanguage.c_str();
 
     std::string responseFlag;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4d69a5e..cb1122c 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -335,7 +335,7 @@ cmNinjaTargetGenerator
 {
   cmLocalGenerator::RuleVariables vars;
   vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
-  vars.CMTarget = this->GetTarget();
+  vars.CMTarget = this->GetGeneratorTarget();
   vars.Language = lang.c_str();
   vars.Source = "$in";
   vars.Object = "$out";
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 41172f6..386d430 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -120,7 +120,7 @@ static void GetCompileDefinitionsAndDirectories(
   incs = cmJoin(includeDirs, ";");
 
   std::set<std::string> defines;
-  localGen->AddCompileDefinitions(defines, target->Target, config, "CXX");
+  localGen->AddCompileDefinitions(defines, target, config, "CXX");
 
   defs += cmJoin(defines, ";");
 }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f0344bb..2cbd306 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1932,7 +1932,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
     {
     clOptions.AddFlag("CompileAs", "CompileAsCpp");
     }
-  this->LocalGenerator->AddCompileOptions(flags, this->Target,
+  this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
                                           linkLanguage, configName.c_str());
 
   // Get preprocessor definitions for this directory.
@@ -2189,7 +2189,7 @@ cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config)
     }
   std::string libflags;
   this->LocalGenerator->GetStaticLibraryFlags(libflags,
-    cmSystemTools::UpperCase(config), this->Target);
+    cmSystemTools::UpperCase(config), this->GeneratorTarget);
   if(!libflags.empty())
     {
     this->WriteString("<Lib>\n", 2);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfb2f7508af637c9c35758fbd5dac6c8cb679bdb
commit cfb2f7508af637c9c35758fbd5dac6c8cb679bdb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:51:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:38 2015 +0200

    Use cmGeneratorTarget for property access.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index f7cc502..a197f88 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -109,7 +109,7 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const
 {
   std::string mod_dir;
   const char* target_mod_dir =
-    this->Target->GetProperty("Fortran_MODULE_DIRECTORY");
+    this->GeneratorTarget->GetProperty("Fortran_MODULE_DIRECTORY");
   const char* moddir_flag =
     this->Makefile->GetDefinition("CMAKE_Fortran_MODDIR_FLAG");
   if(target_mod_dir && moddir_flag)
@@ -214,7 +214,7 @@ cmCommonTargetGenerator
     this->LocalGenerator->GetFortranFormat(srcfmt);
   if(format == cmLocalGenerator::FortranFormatNone)
     {
-    const char* tgtfmt = this->Target->GetProperty("Fortran_FORMAT");
+    const char* tgtfmt = this->GeneratorTarget->GetProperty("Fortran_FORMAT");
     format = this->LocalGenerator->GetFortranFormat(tgtfmt);
     }
   const char* var = 0;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 20fb70b..5e26aad 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4859,7 +4859,7 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config,
     // Skip per-configuration subdirectory.
     conf = "";
     }
-  else if(const char* outdir = this->Target->GetProperty(propertyName))
+  else if(const char* outdir = this->GetProperty(propertyName))
     {
     // Use the user-specified output directory.
     cmGeneratorExpression ge;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 433af7e..43bc4e1 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -197,7 +197,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                            this->ConfigName);
 
 
-  if(this->Target->GetPropertyAsBool("WIN32_EXECUTABLE"))
+  if(this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE"))
     {
     this->LocalGenerator->AppendFlags
       (linkFlags, this->Makefile->GetDefinition("CMAKE_CREATE_WIN32_EXE"));
@@ -226,11 +226,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   // Add target-specific linker flags.
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->Target->GetProperty("LINK_FLAGS"));
+    (linkFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (linkFlags, this->Target->GetProperty(linkFlagsConfig));
+    (linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
 
   this->AddModuleDefinitionFlag(linkFlags);
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 6cde0f6..28b4ab8 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -166,11 +166,11 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty("LINK_FLAGS"));
+    (extraFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
 
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName);
@@ -190,11 +190,11 @@ void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                                    this->Target->GetProperty("LINK_FLAGS"));
+                           this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MODULE_LINKER_FLAGS", this->ConfigName);
   this->AddModuleDefinitionFlag(extraFlags);
@@ -213,11 +213,11 @@ void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink)
 
   std::string extraFlags;
   this->LocalGenerator->AppendFlags(extraFlags,
-                                    this->Target->GetProperty("LINK_FLAGS"));
+                             this->GeneratorTarget->GetProperty("LINK_FLAGS"));
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName);
   this->LocalGenerator->AppendFlags
-    (extraFlags, this->Target->GetProperty(linkFlagsConfig));
+    (extraFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig));
   this->LocalGenerator->AddConfigVariableFlags
     (extraFlags, "CMAKE_MACOSX_FRAMEWORK_LINKER_FLAGS", this->ConfigName);
 
@@ -569,7 +569,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if(this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file =
         this->GeneratorTarget->GetSupportDirectory();
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 603214d..df50747 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -667,7 +667,7 @@ cmMakefileTargetGenerator
   if (!compileCommands.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const iwyu_prop = lang + "_INCLUDE_WHAT_YOU_USE";
-    const char *iwyu = this->Target->GetProperty(iwyu_prop);
+    const char *iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     if (iwyu && *iwyu)
       {
       std::string run_iwyu = "$(CMAKE_COMMAND) -E __run_iwyu --iwyu=";
@@ -681,7 +681,7 @@ cmMakefileTargetGenerator
   if (!compileCommands.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
-    const char *clauncher = this->Target->GetProperty(clauncher_prop);
+    const char *clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
     if (clauncher && *clauncher)
       {
       std::vector<std::string> launcher_cmd;
@@ -1513,7 +1513,7 @@ void cmMakefileTargetGenerator
 
   // Add user-specified dependencies.
   if(const char* linkDepends =
-     this->Target->GetProperty("LINK_DEPENDS"))
+     this->GeneratorTarget->GetProperty("LINK_DEPENDS"))
     {
     cmSystemTools::ExpandListArgument(linkDepends, depends);
     }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 3d1579f..4d69a5e 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -218,7 +218,8 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
     }
 
   // Add user-specified dependencies.
-  if (const char* linkDepends = this->Target->GetProperty("LINK_DEPENDS"))
+  if (const char* linkDepends =
+      this->GeneratorTarget->GetProperty("LINK_DEPENDS"))
     {
     std::vector<std::string> linkDeps;
     cmSystemTools::ExpandListArgument(linkDepends, linkDeps);
@@ -410,7 +411,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const iwyu_prop = lang + "_INCLUDE_WHAT_YOU_USE";
-    const char *iwyu = this->Target->GetProperty(iwyu_prop);
+    const char *iwyu = this->GeneratorTarget->GetProperty(iwyu_prop);
     if (iwyu && *iwyu)
       {
       std::string run_iwyu =
@@ -427,7 +428,7 @@ cmNinjaTargetGenerator
   if (!compileCmds.empty() && (lang == "C" || lang == "CXX"))
     {
     std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
-    const char *clauncher = this->Target->GetProperty(clauncher_prop);
+    const char *clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
     if (clauncher && *clauncher)
       {
       std::vector<std::string> launcher_cmd;
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 9feb7ac..5bbe268 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -90,7 +90,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
   } else {
     std::string command =
       this->GetLocalGenerator()->BuildCommandLine(commands);
-    const char *echoStr = this->GetTarget()->GetProperty("EchoString");
+    const char *echoStr =
+        this->GetGeneratorTarget()->GetProperty("EchoString");
     std::string desc;
     if (echoStr)
       desc = echoStr;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2225a46..f0344bb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -270,7 +270,7 @@ void cmVisualStudio10TargetGenerator::Generate()
 {
   // do not generate external ms projects
   if(this->GeneratorTarget->GetType() == cmState::INTERFACE_LIBRARY
-      || this->Target->GetProperty("EXTERNAL_MSPROJECT"))
+      || this->GeneratorTarget->GetProperty("EXTERNAL_MSPROJECT"))
     {
     return;
     }
@@ -368,7 +368,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsProjectTypes =
-    this->Target->GetProperty("VS_GLOBAL_PROJECT_TYPES");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_PROJECT_TYPES");
   if(vsProjectTypes)
     {
     this->WriteString("<ProjectTypes>", 2);
@@ -376,9 +376,12 @@ void cmVisualStudio10TargetGenerator::Generate()
       "</ProjectTypes>\n";
     }
 
-  const char* vsProjectName = this->Target->GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalPath = this->Target->GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = this->Target->GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectName =
+      this->GeneratorTarget->GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalPath =
+      this->GeneratorTarget->GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider =
+      this->GeneratorTarget->GetProperty("VS_SCC_PROVIDER");
 
   if( vsProjectName && vsLocalPath && vsProvider )
     {
@@ -392,7 +395,8 @@ void cmVisualStudio10TargetGenerator::Generate()
     (*this->BuildFileStream) << cmVS10EscapeXML(vsProvider) <<
       "</SccProvider>\n";
 
-    const char* vsAuxPath = this->Target->GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath =
+        this->GeneratorTarget->GetProperty("VS_SCC_AUXPATH");
     if( vsAuxPath )
       {
       this->WriteString("<SccAuxPath>", 2);
@@ -401,13 +405,13 @@ void cmVisualStudio10TargetGenerator::Generate()
       }
     }
 
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
     {
     this->WriteString("<WinMDAssembly>true</WinMDAssembly>\n", 2);
     }
 
   const char* vsGlobalKeyword =
-    this->Target->GetProperty("VS_GLOBAL_KEYWORD");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_KEYWORD");
   if(!vsGlobalKeyword)
     {
     this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
@@ -420,7 +424,7 @@ void cmVisualStudio10TargetGenerator::Generate()
     }
 
   const char* vsGlobalRootNamespace =
-    this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
+    this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE");
   if(vsGlobalRootNamespace)
     {
     this->WriteString("<RootNamespace>", 2);
@@ -431,14 +435,14 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<Platform>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(this->Platform)
                            << "</Platform>\n";
-  const char* projLabel = this->Target->GetProperty("PROJECT_LABEL");
+  const char* projLabel = this->GeneratorTarget->GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = this->Name.c_str();
     }
   this->WriteString("<ProjectName>", 2);
   (*this->BuildFileStream) << cmVS10EscapeXML(projLabel) << "</ProjectName>\n";
-  if(const char* targetFrameworkVersion = this->Target->GetProperty(
+  if(const char* targetFrameworkVersion = this->GeneratorTarget->GetProperty(
        "VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     this->WriteString("<TargetFrameworkVersion>", 2);
@@ -497,7 +501,7 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReferences()
 {
   std::vector<std::string> references;
   if(const char* vsDotNetReferences =
-     this->Target->GetProperty("VS_DOTNET_REFERENCES"))
+     this->GeneratorTarget->GetProperty("VS_DOTNET_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsDotNetReferences, references);
     }
@@ -543,7 +547,7 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
           i != this->Configurations.end(); ++i)
         {
         this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
-        if(this->Target->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
+        if(this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE"))
           {
           (*this->BuildFileStream ) << "$(RootNamespace).";
           }
@@ -610,7 +614,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTReferences()
 {
   std::vector<std::string> references;
   if(const char* vsWinRTReferences =
-     this->Target->GetProperty("VS_WINRT_REFERENCES"))
+     this->GeneratorTarget->GetProperty("VS_WINRT_REFERENCES"))
     {
     cmSystemTools::ExpandListArgument(vsWinRTReferences, references);
     }
@@ -679,7 +683,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
         break;
       case cmState::EXECUTABLE:
         if(this->NsightTegra &&
-           !this->Target->GetPropertyAsBool("ANDROID_GUI"))
+           !this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
           {
           // Android executables are .so too.
           configType += "DynamicLibrary";
@@ -746,10 +750,10 @@ void cmVisualStudio10TargetGenerator
 
   if((this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY &&
       this->ClOptions[config]->UsingUnicode()) ||
-     this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
      this->GlobalGenerator->TargetsWindowsPhone() ||
      this->GlobalGenerator->TargetsWindowsStore() ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<CharacterSet>Unicode</CharacterSet>\n", 2);
     }
@@ -769,8 +773,8 @@ void cmVisualStudio10TargetGenerator
     pts += "</PlatformToolset>\n";
     this->WriteString(pts.c_str(), 2);
     }
-  if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
-     this->Target->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") ||
+     this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS"))
     {
     this->WriteString("<WindowsAppContainer>true"
                       "</WindowsAppContainer>\n", 2);
@@ -788,27 +792,29 @@ void cmVisualStudio10TargetGenerator
   ntv += toolset? toolset : "Default";
   ntv += "</NdkToolchainVersion>\n";
   this->WriteString(ntv.c_str(), 2);
-  if(const char* minApi = this->Target->GetProperty("ANDROID_API_MIN"))
+  if(const char* minApi =
+     this->GeneratorTarget->GetProperty("ANDROID_API_MIN"))
     {
     this->WriteString("<AndroidMinAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(minApi) << "</AndroidMinAPI>\n";
     }
-  if(const char* api = this->Target->GetProperty("ANDROID_API"))
+  if(const char* api = this->GeneratorTarget->GetProperty("ANDROID_API"))
     {
     this->WriteString("<AndroidTargetAPI>", 2);
     (*this->BuildFileStream ) <<
       "android-" << cmVS10EscapeXML(api) << "</AndroidTargetAPI>\n";
     }
 
-  if(const char* cpuArch = this->Target->GetProperty("ANDROID_ARCH"))
+  if(const char* cpuArch = this->GeneratorTarget->GetProperty("ANDROID_ARCH"))
     {
     this->WriteString("<AndroidArch>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(cpuArch) <<
       "</AndroidArch>\n";
     }
 
-  if(const char* stlType = this->Target->GetProperty("ANDROID_STL_TYPE"))
+  if(const char* stlType =
+     this->GeneratorTarget->GetProperty("ANDROID_STL_TYPE"))
     {
     this->WriteString("<AndroidStlType>", 2);
     (*this->BuildFileStream) << cmVS10EscapeXML(stlType) <<
@@ -1963,7 +1969,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   if (this->MSTools)
     {
     // If we have the VS_WINRT_COMPONENT set then force Compile as WinRT.
-    if (this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT"))
+    if (this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT"))
       {
       clOptions.AddFlag("CompileAsWinRT", "true");
       // For WinRT components, add the _WINRT_DLL define to produce a lib
@@ -2012,7 +2018,7 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   if(this->NsightTegra)
     {
     if(const char* processMax =
-        this->Target->GetProperty("ANDROID_PROCESS_MAX"))
+        this->GeneratorTarget->GetProperty("ANDROID_PROCESS_MAX"))
       {
       this->WriteString("<ProcessMax>", 3);
       *this->BuildFileStream << cmVS10EscapeXML(processMax) <<
@@ -2270,18 +2276,18 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     cmVS10EscapeXML(antBuildPath) << "</AntBuildPath>\n";
   }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
+  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_SKIP_ANT_STEP"))
     {
     this->WriteString("<SkipAntStep>true</SkipAntStep>\n", 3);
     }
 
-  if (this->Target->GetPropertyAsBool("ANDROID_PROGUARD"))
+  if (this->GeneratorTarget->GetPropertyAsBool("ANDROID_PROGUARD"))
     {
     this->WriteString("<EnableProGuard>true</EnableProGuard>\n", 3);
     }
 
   if (const char* proGuardConfigLocation =
-      this->Target->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
+      this->GeneratorTarget->GetProperty("ANDROID_PROGUARD_CONFIG_PATH"))
     {
     this->WriteString("<ProGuardConfigLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(proGuardConfigLocation) <<
@@ -2289,7 +2295,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* securePropertiesLocation =
-      this->Target->GetProperty("ANDROID_SECURE_PROPS_PATH"))
+      this->GeneratorTarget->GetProperty("ANDROID_SECURE_PROPS_PATH"))
     {
     this->WriteString("<SecurePropertiesLocation>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(securePropertiesLocation) <<
@@ -2297,7 +2303,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2310,7 +2316,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* nativeLibDependenciesExpression =
-      this->Target->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_NATIVE_LIB_DEPENDENCIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2323,7 +2329,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* javaSourceDir =
-      this->Target->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAVA_SOURCE_DIR"))
     {
     this->WriteString("<JavaSourceDir>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(javaSourceDir) <<
@@ -2331,7 +2337,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDirectoriesExpression =
-      this->Target->GetProperty("ANDROID_JAR_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAR_DIRECTORIES"))
     {
     cmGeneratorExpression ge;
     cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
@@ -2344,7 +2350,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* jarDeps =
-      this->Target->GetProperty("ANDROID_JAR_DEPENDENCIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_JAR_DEPENDENCIES"))
     {
     this->WriteString("<JarDependencies>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(jarDeps) <<
@@ -2352,7 +2358,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
     }
 
   if (const char* assetsDirectories =
-      this->Target->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
+      this->GeneratorTarget->GetProperty("ANDROID_ASSETS_DIRECTORIES"))
     {
     this->WriteString("<AssetsDirectories>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(assetsDirectories) <<
@@ -2368,7 +2374,7 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
   }
 
   if (const char* antAdditionalOptions =
-      this->Target->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
+      this->GeneratorTarget->GetProperty("ANDROID_ANT_ADDITIONAL_OPTIONS"))
     {
     this->WriteString("<AdditionalOptions>", 3);
     (*this->BuildFileStream) << cmVS10EscapeXML(antAdditionalOptions) <<
@@ -2439,7 +2445,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   flags += " ";
   flags += this->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
-  const char* targetLinkFlags = this->Target->GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags =
+      this->GeneratorTarget->GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     flags += " ";
@@ -2447,7 +2454,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     }
   std::string flagsProp = "LINK_FLAGS_";
   flagsProp += CONFIG;
-  if(const char* flagsConfig = this->Target->GetProperty(flagsProp.c_str()))
+  if(const char* flagsConfig =
+     this->GeneratorTarget->GetProperty(flagsProp.c_str()))
     {
     flags += " ";
     flags += flagsConfig;
@@ -2525,7 +2533,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     {
     linkOptions.AddFlag("Version", "");
 
-    if ( this->Target->GetPropertyAsBool("WIN32_EXECUTABLE") )
+    if ( this->GeneratorTarget->GetPropertyAsBool("WIN32_EXECUTABLE") )
       {
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
@@ -2597,7 +2605,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
 
     // A Windows Runtime component uses internal .NET metadata,
     // so does not have an import library.
-    if(this->Target->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
+    if(this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_COMPONENT") &&
        this->GeneratorTarget->GetType() != cmState::EXECUTABLE)
       {
       linkOptions.AddFlag("GenerateWindowsMetadata", "true");
@@ -2639,7 +2647,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)exportall.def");
       }
@@ -2783,7 +2791,7 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups()
     this->WriteManifestOptions(*i);
     if(this->NsightTegra &&
        this->GeneratorTarget->GetType() == cmState::EXECUTABLE &&
-       this->Target->GetPropertyAsBool("ANDROID_GUI"))
+       this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI"))
       {
       this->WriteAntBuildOptions(*i);
       }
@@ -2798,7 +2806,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (this->Target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (this->GeneratorTarget->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
@@ -2911,14 +2919,14 @@ void cmVisualStudio10TargetGenerator::WritePlatformExtensions()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     if (desktopExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsDesktop",
                                          desktopExtensionsVersion);
       }
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     if (mobileExtensionsVersion)
       {
       this->WriteSinglePlatformExtension("WindowsMobile",
@@ -2958,11 +2966,11 @@ void cmVisualStudio10TargetGenerator::WriteSDKReferences()
       cmHasLiteralPrefix(this->GlobalGenerator->GetSystemVersion(), "10.0"))
     {
     const char* desktopExtensionsVersion =
-      this->Target->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_DESKTOP_EXTENSIONS_VERSION");
     const char* mobileExtensionsVersion =
-      this->Target->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_MOBILE_EXTENSIONS_VERSION");
     const char* iotExtensionsVersion =
-      this->Target->GetProperty("VS_IOT_EXTENSIONS_VERSION");
+      this->GeneratorTarget->GetProperty("VS_IOT_EXTENSIONS_VERSION");
 
     if(desktopExtensionsVersion || mobileExtensionsVersion ||
        iotExtensionsVersion)
@@ -3194,7 +3202,8 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
       "</WindowsTargetPlatformVersion>\n";
     }
   const char* targetPlatformMinVersion =
-      this->Target->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
+      this->GeneratorTarget
+      ->GetProperty("VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION");
   if(targetPlatformMinVersion)
     {
     this->WriteString("<WindowsTargetPlatformMinVersion>", 2);
@@ -3213,7 +3222,7 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
     }
 
   // Added IoT Startup Task support
-  if(this->Target->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
+  if(this->GeneratorTarget->GetPropertyAsBool("VS_IOT_STARTUP_TASK"))
     {
     this->WriteString("<ContainsStartupTask>true</ContainsStartupTask>\n", 2);
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b857f0d84b539056bc6a810161eb22e9b9baca43
commit b857f0d84b539056bc6a810161eb22e9b9baca43
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 16 20:09:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:30:37 2015 +0200

    Use GetName from cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 2d74b97..72b101f 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -274,7 +274,7 @@ void cmExportBuildFileGenerator
           tei = this->ExportSet->GetTargetExports()->begin();
           tei != this->ExportSet->GetTargetExports()->end(); ++tei)
       {
-      targets.push_back((*tei)->Target->GetName());
+      targets.push_back((*tei)->GetName());
       }
     return;
     }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c37f797..d457e9c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1421,7 +1421,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
         {
         cmSystemTools::Error
           ("CMake can not determine linker language for target: ",
-           target->Target->GetName().c_str());
+           target->GetName().c_str());
         return;
         }
       this->AddLanguageFlags(flags, linkLanguage, buildType);
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index ea91095..433af7e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -168,7 +168,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->Target->GetName().c_str(), "\".");
+                         this->GeneratorTarget->GetName().c_str(), "\".");
     return;
     }
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 6695143..6cde0f6 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -122,11 +122,11 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->Target->GetName(),
+                                      this->GeneratorTarget->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->Target->GetName(), false);
+  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
 }
 
 //----------------------------------------------------------------------------
@@ -244,7 +244,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(linkLanguage.empty())
     {
     cmSystemTools::Error("Cannot determine link language for target \"",
-                         this->Target->GetName().c_str(), "\".");
+                         this->GeneratorTarget->GetName().c_str(), "\".");
     return;
     }
 
@@ -574,7 +574,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
       std::string name_of_def_file =
         this->GeneratorTarget->GetSupportDirectory();
       name_of_def_file += std::string("/") +
-        this->Target->GetName();
+        this->GeneratorTarget->GetName();
       name_of_def_file += ".def";
       std::string cmd = cmSystemTools::GetCMakeCommand();
       cmd = this->Convert(cmd, cmLocalGenerator::NONE,
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 48a29b3..603214d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -248,7 +248,8 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
     // Write an empty dependency file.
     cmGeneratedFileStream depFileStream(dependFileNameFull.c_str());
     depFileStream
-      << "# Empty dependencies file for " << this->Target->GetName() << ".\n"
+      << "# Empty dependencies file for "
+      << this->GeneratorTarget->GetName() << ".\n"
       << "# This may be replaced when dependencies are built." << std::endl;
     }
 
@@ -394,7 +395,7 @@ void cmMakefileTargetGenerator
     err << "Warning: Source file \""
         << source.GetFullPath()
         << "\" is listed multiple times for target \""
-        << this->Target->GetName()
+        << this->GeneratorTarget->GetName()
         << "\".";
     cmSystemTools::Message(err.str().c_str(), "Warning");
     return;
@@ -1267,10 +1268,10 @@ cmMakefileTargetGenerator
   // Write a make variable assignment that lists all objects for the
   // target.
   variableName =
-    this->LocalGenerator->CreateMakeVariable(this->Target->GetName(),
+    this->LocalGenerator->CreateMakeVariable(this->GeneratorTarget->GetName(),
                                              "_OBJECTS");
   *this->BuildFileStream
-    << "# Object files for target " << this->Target->GetName() << "\n"
+    << "# Object files for target " << this->GeneratorTarget->GetName() << "\n"
     << variableName << " =";
   std::string object;
   const char* lineContinue =
@@ -1292,12 +1293,12 @@ cmMakefileTargetGenerator
   // Write a make variable assignment that lists all external objects
   // for the target.
   variableNameExternal =
-    this->LocalGenerator->CreateMakeVariable(this->Target->GetName(),
+    this->LocalGenerator->CreateMakeVariable(this->GeneratorTarget->GetName(),
                                              "_EXTERNAL_OBJECTS");
   *this->BuildFileStream
     << "\n"
     << "# External object files for target "
-    << this->Target->GetName() << "\n"
+    << this->GeneratorTarget->GetName() << "\n"
     << variableNameExternal << " =";
   for(std::vector<std::string>::const_iterator i =
         this->ExternalObjects.begin();
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 303ca63..18594bb 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -42,7 +42,8 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
   this->CreateRuleFile();
 
   *this->BuildFileStream
-    << "# Utility rule file for " << this->Target->GetName() << ".\n\n";
+    << "# Utility rule file for "
+    << this->GeneratorTarget->GetName() << ".\n\n";
 
   if(!this->NoRuleMessages)
     {
@@ -101,11 +102,11 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Write the rule.
   this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
-                                      this->Target->GetName(),
+                                      this->GeneratorTarget->GetName(),
                                       depends, commands, true);
 
   // Write the main driver rule to build everything in this target.
-  this->WriteTargetDriverRule(this->Target->GetName(), false);
+  this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false);
 
   // Write clean target
   this->WriteTargetCleanRules();
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index a8f182b..e2061e5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -77,7 +77,7 @@ void cmNinjaNormalTargetGenerator::Generate()
   if (this->TargetLinkLanguage.empty()) {
     cmSystemTools::Error("CMake can not determine linker language for "
                          "target: ",
-                         this->GetTarget()->GetName().c_str());
+                         this->GetGeneratorTarget()->GetName().c_str());
     return;
   }
 
@@ -158,7 +158,8 @@ cmNinjaNormalTargetGenerator
     + "_"
     + cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType())
     + "_LINKER__"
-    + cmGlobalNinjaGenerator::EncodeRuleName(this->GetTarget()->GetName())
+    + cmGlobalNinjaGenerator::EncodeRuleName(
+        this->GetGeneratorTarget()->GetName())
     ;
 }
 
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 0eba0b3..3d1579f 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -92,7 +92,7 @@ std::string cmNinjaTargetGenerator::LanguageCompilerRule(
   const std::string& lang) const
 {
   return lang + "_COMPILER__" +
-    cmGlobalNinjaGenerator::EncodeRuleName(this->Target->GetName());
+    cmGlobalNinjaGenerator::EncodeRuleName(this->GeneratorTarget->GetName());
 }
 
 std::string
@@ -271,7 +271,7 @@ cmNinjaTargetGenerator
 
 std::string cmNinjaTargetGenerator::GetTargetName() const
 {
-  return this->Target->GetName();
+  return this->GeneratorTarget->GetName();
 }
 
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 7968412..2225a46 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -178,7 +178,7 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
     this->GeneratorTarget->GetLocalGenerator();
-  this->Name = this->Target->GetName();
+  this->Name = this->GeneratorTarget->GetName();
   this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
   this->Platform = gg->GetPlatformName();
   this->NsightTegra = gg->IsNsightTegra();
@@ -1775,7 +1775,7 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
       if(ttype == cmState::OBJECT_LIBRARY)
         {
         outDir = intermediateDir;
-        targetNameFull = this->Target->GetName();
+        targetNameFull = this->GeneratorTarget->GetName();
         targetNameFull += ".lib";
         }
       else
@@ -3325,7 +3325,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3408,7 +3409,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP81()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3468,7 +3470,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS80()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3520,7 +3523,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS81()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);
@@ -3577,7 +3581,8 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWS10_0()
     this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget);
   this->ConvertToWindowsSlash(artifactDir);
   std::string artifactDirXML = cmVS10EscapeXML(artifactDir);
-  std::string targetNameXML = cmVS10EscapeXML(this->Target->GetName());
+  std::string targetNameXML =
+      cmVS10EscapeXML(this->GeneratorTarget->GetName());
 
   cmGeneratedFileStream fout(manifestFile.c_str());
   fout.SetCopyIfDifferent(true);

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 17 11:38:32 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 17 Oct 2015 11:38:32 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-666-g000a87a
Message-ID: <20151017153832.B5660C06ED@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  000a87a49e29b30f397992b249e7b3ada30aacbd (commit)
       via  5227cfe53987e0ccbccb0513d5d8f5bb08222b17 (commit)
      from  b00a1f312283af0e3dca58a58a4a2e03220eed3b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=000a87a49e29b30f397992b249e7b3ada30aacbd
commit 000a87a49e29b30f397992b249e7b3ada30aacbd
Merge: b00a1f3 5227cfe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 11:38:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 17 11:38:32 2015 -0400

    Merge topic 'use-generator-target' into next
    
    5227cfe5 fixup! cmLocalGenerator: Port PList handling to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5227cfe53987e0ccbccb0513d5d8f5bb08222b17
commit 5227cfe53987e0ccbccb0513d5d8f5bb08222b17
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 17:38:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 17:38:10 2015 +0200

    fixup! cmLocalGenerator: Port PList handling to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 017d1e1..ea1b1a0 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2065,7 +2065,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       // a per-configuration Info.plist file. The cfbundle plist
       // is very similar to the application bundle plist
       this->CurrentLocalGenerator
-        ->GenerateAppleInfoPList(&target, "$(EXECUTABLE_NAME)",
+        ->GenerateAppleInfoPList(gtgt, "$(EXECUTABLE_NAME)",
                                  plist.c_str());
       std::string path =
         this->ConvertToRelativeForXCode(plist.c_str());
@@ -2114,7 +2114,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       // so let it replace the framework name. This avoids creating
       // a per-configuration Info.plist file.
       this->CurrentLocalGenerator
-        ->GenerateFrameworkInfoPList(&target, "$(EXECUTABLE_NAME)",
+        ->GenerateFrameworkInfoPList(gtgt, "$(EXECUTABLE_NAME)",
                                      plist.c_str());
       std::string path =
         this->ConvertToRelativeForXCode(plist.c_str());
@@ -2157,7 +2157,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       // so let it replace the executable name.  This avoids creating
       // a per-configuration Info.plist file.
       this->CurrentLocalGenerator
-        ->GenerateAppleInfoPList(&target, "$(EXECUTABLE_NAME)",
+        ->GenerateAppleInfoPList(gtgt, "$(EXECUTABLE_NAME)",
                                  plist.c_str());
       std::string path =
         this->ConvertToRelativeForXCode(plist.c_str());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Oct 18 00:01:16 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun, 18 Oct 2015 00:01:16 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-249-g764720c
Message-ID: <20151018040116.7D8B6C01B4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  764720c32b8f5f1a4421b274100c213dba17ec1d (commit)
      from  2f269fdf0c293e80325c748c985279bc4067af3e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=764720c32b8f5f1a4421b274100c213dba17ec1d
commit 764720c32b8f5f1a4421b274100c213dba17ec1d
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Oct 18 00:01:13 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Oct 18 00:01:13 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index bad0f37..ee3512f 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151017)
+set(CMake_VERSION_PATCH 20151018)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sun Oct 18 10:29:51 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sun, 18 Oct 2015 10:29:51 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-683-ga11fc24
Message-ID: <20151018142951.045D7BFF87@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a11fc241782983650d2acf21c02bc03b91e316a5 (commit)
       via  93f60505956fffb710bd6b500ea13619f01f9f23 (commit)
       via  0d66e7258e6bc16a0489d6003fae155a37cb9622 (commit)
       via  9267b251d85227466e397b5ebe31fe9e87ed252c (commit)
       via  ea9280d857b05724f5fbab88832fa294fca0efbe (commit)
       via  b04a0f096a221c03639dd4c86f5ef712745be705 (commit)
       via  a527abf0995fc1bdd45afdb20e80b728dd0ef045 (commit)
       via  eb3be7d68851ce87354f6bd90e0be3a670d22d56 (commit)
       via  d231c31b98eb80929d9aabf8e606abde39fc08f4 (commit)
       via  e6661282436d7901617d2f96d9acf9d4cb7db9d5 (commit)
       via  2b9cc1e24871c6b527900e119640ef0adf706f0d (commit)
       via  97062ac268d1bcc62a528aea2e22a7dd6f6efa8f (commit)
       via  6a72b3c84e016d7e540aa3d9b079200b3fb52ab7 (commit)
       via  1293c1561a58b2f8b0bd4ec05bb249fc36f487ac (commit)
       via  381e7afd363d64c72b83e69fd6c6cad5fc3eefb4 (commit)
       via  65911cae4dd5a81f23a59bf9187b95bda3168fe9 (commit)
       via  37ab74a607a021567a0a1e2c7df43da33d32d5ec (commit)
      from  000a87a49e29b30f397992b249e7b3ada30aacbd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a11fc241782983650d2acf21c02bc03b91e316a5
commit a11fc241782983650d2acf21c02bc03b91e316a5
Merge: 000a87a 93f6050
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 10:29:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 18 10:29:48 2015 -0400

    Merge topic 'use-generator-target' into next
    
    93f60505 cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.
    0d66e725 cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.
    9267b251 cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
    ea9280d8 cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
    b04a0f09 cmGeneratorTarget: Move IsLinkable from cmTarget.
    a527abf0 Xcode: Port internal API to cmGeneratorTarget.
    eb3be7d6 cmGeneratorTarget: Move GetExportName from cmTarget.
    d231c31b Export: Port internal API to cmGeneratorTarget.
    e6661282 Export: Port internal utility to cmGeneratorTarget.
    2b9cc1e2 Export: Port some API to cmGlobalGenerator.
    97062ac2 cmInstallTargetGenerator: Port GetInstallFilename to cmGeneratorTarget.
    6a72b3c8 Export: Port interface to cmGeneratorTarget.
    1293c156 cmExportTryCompileFileGenerator: Port to cmGeneratorTarget.
    381e7afd cmExportSet: Store a cmGeneratorTarget.
    65911cae cmGlobalGenerator: Compute export() related classes early.
    37ab74a6 cmLocalGenerator: Port PList handling to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93f60505956fffb710bd6b500ea13619f01f9f23
commit 93f60505956fffb710bd6b500ea13619f01f9f23
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:59:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:31 2015 +0200

    cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 9bdf2f5..5177ec8 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1095,7 +1095,7 @@ cmExportFileGenerator
        << " PROPERTY MACOSX_BUNDLE 1)\n";
     }
 
-  if (target->Target->IsCFBundleOnApple())
+  if (target->IsCFBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY BUNDLE 1)\n";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7e457bb..b2959fe 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1574,7 +1574,7 @@ bool cmGeneratorTarget::IsBundleOnApple() const
 {
   return this->IsFrameworkOnApple()
       || this->IsAppBundleOnApple()
-      || this->Target->IsCFBundleOnApple();
+      || this->IsCFBundleOnApple();
 }
 
 //----------------------------------------------------------------------------
@@ -1943,7 +1943,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
     {
     fpath += this->GetFrameworkDirectory(config, contentOnly);
     }
-  if(this->Target->IsCFBundleOnApple())
+  if(this->IsCFBundleOnApple())
     {
     fpath += this->GetCFBundleDirectory(config, contentOnly);
     }
@@ -3483,7 +3483,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     targetSuffix = 0;
     }
 
-  if(this->Target->IsCFBundleOnApple())
+  if(this->IsCFBundleOnApple())
     {
     fw_prefix = this->GetCFBundleDirectory(config, false);
     fw_prefix += "/";
@@ -5966,6 +5966,14 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::IsXCTestOnApple() const
 {
-  return (this->Target->IsCFBundleOnApple() &&
+  return (this->IsCFBundleOnApple() &&
           this->GetPropertyAsBool("XCTEST"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsCFBundleOnApple() const
+{
+  return (this->GetType() == cmState::MODULE_LIBRARY &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("BUNDLE"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index ce2f42e..6537421 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -425,6 +425,9 @@ public:
   /** Return whether this target is a XCTest on Apple.  */
   bool IsXCTestOnApple() const;
 
+  /** Return whether this target is a CFBundle (plugin) on Apple.  */
+  bool IsCFBundleOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index a489767..ea1b1a0 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1197,7 +1197,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     // some build phases only apply to bundles and/or frameworks
     bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
     bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
-    bool isCFBundleTarget = cmtarget.IsCFBundleOnApple();
+    bool isCFBundleTarget = gtgt->IsCFBundleOnApple();
 
     cmXCodeObject* buildFiles = 0;
 
@@ -1993,7 +1993,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       pndir = gtgt->GetDirectory(configName);
       }
 
-    if(gtgt->IsFrameworkOnApple() || target.IsCFBundleOnApple())
+    if(gtgt->IsFrameworkOnApple() || gtgt->IsCFBundleOnApple())
       {
       pnprefix = "";
       }
@@ -2046,7 +2046,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     buildSettings->AddAttribute("LIBRARY_STYLE",
                                 this->CreateString("BUNDLE"));
-    if (target.IsCFBundleOnApple())
+    if (gtgt->IsCFBundleOnApple())
       {
       // It turns out that a BUNDLE is basically the same
       // in many ways as an application bundle, as far as
@@ -2653,7 +2653,7 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
     case cmState::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
-      else if (target->Target->IsCFBundleOnApple())
+      else if (target->IsCFBundleOnApple())
         return "wrapper.plug-in";
       else
         return ((this->XcodeVersion >= 22)?
@@ -2680,7 +2680,7 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
     case cmState::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
-      else if (target->Target->IsCFBundleOnApple())
+      else if (target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
       else
         return ((this->XcodeVersion >= 22)?
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index e16dfd7..a97cc5f 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -226,7 +226,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       }
-    else if(this->Target->Target->IsCFBundleOnApple())
+    else if(this->Target->IsCFBundleOnApple())
       {
       // Install the whole app bundle directory.
       type = cmInstallType_DIRECTORY;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 015c880..df2a8c9 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -279,7 +279,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
     outpath += "/";
     }
-  else if(this->Target->IsCFBundleOnApple())
+  else if(this->GeneratorTarget->IsCFBundleOnApple())
     {
     outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateCFBundle(targetName, outpath);
@@ -360,7 +360,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         buildEcho += " shared library ";
         break;
       case cmState::MODULE_LIBRARY:
-        if (this->Target->IsCFBundleOnApple())
+        if (this->GeneratorTarget->IsCFBundleOnApple())
             buildEcho += " CFBundle";
         buildEcho += " shared module ";
         break;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 8a4f17e..dafbda9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -139,7 +139,7 @@ const char *cmNinjaNormalTargetGenerator::GetVisibleTypeName() const
     case cmState::SHARED_LIBRARY:
       return "shared library";
     case cmState::MODULE_LIBRARY:
-      if (this->GetTarget()->IsCFBundleOnApple())
+      if (this->GetGeneratorTarget()->IsCFBundleOnApple())
         return "CFBundle shared module";
       else
         return "shared module";
@@ -434,7 +434,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
                                               gt.GetDirectory(cfgName));
     }
-  else if(target.IsCFBundleOnApple())
+  else if(gt.IsCFBundleOnApple())
     {
     // Create the core foundation bundle.
     this->OSXBundleGenerator->CreateCFBundle(this->TargetNameOut,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 02a5ea6..f663678 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -369,14 +369,6 @@ bool cmTarget::IsAppBundleOnApple() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsCFBundleOnApple() const
-{
-  return (this->GetType() == cmState::MODULE_LIBRARY &&
-          this->Makefile->IsOn("APPLE") &&
-          this->GetPropertyAsBool("BUNDLE"));
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7cf4808..0e966e9 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -235,9 +235,6 @@ public:
       Apple.  */
   bool IsFrameworkOnApple() const;
 
-  /** Return whether this target is a CFBundle (plugin) on Apple.  */
-  bool IsCFBundleOnApple() const;
-
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d66e7258e6bc16a0489d6003fae155a37cb9622
commit 0d66e7258e6bc16a0489d6003fae155a37cb9622
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 00:15:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:31 2015 +0200

    cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ab0d02b..7e457bb 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1587,7 +1587,7 @@ std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config,
   const char *ext = this->GetProperty("BUNDLE_EXTENSION");
   if (!ext)
     {
-    if (this->Target->IsXCTestOnApple())
+    if (this->IsXCTestOnApple())
       {
       ext = "xctest";
       }
@@ -5962,3 +5962,10 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("MACOSX_BUNDLE"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsXCTestOnApple() const
+{
+  return (this->Target->IsCFBundleOnApple() &&
+          this->GetPropertyAsBool("XCTEST"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 24a1c2c..ce2f42e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -422,6 +422,9 @@ public:
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 
+  /** Return whether this target is a XCTest on Apple.  */
+  bool IsXCTestOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 527a84f..a489767 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2651,7 +2651,7 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
     case cmState::STATIC_LIBRARY:
       return "archive.ar";
     case cmState::MODULE_LIBRARY:
-      if (target->Target->IsXCTestOnApple())
+      if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
       else if (target->Target->IsCFBundleOnApple())
         return "wrapper.plug-in";
@@ -2678,7 +2678,7 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
     case cmState::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
     case cmState::MODULE_LIBRARY:
-      if (target->Target->IsXCTestOnApple())
+      if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
       else if (target->Target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 761267d..02a5ea6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -377,13 +377,6 @@ bool cmTarget::IsCFBundleOnApple() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsXCTestOnApple() const
-{
-  return (this->IsCFBundleOnApple() &&
-          this->GetPropertyAsBool("XCTEST"));
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 51e97fd..7cf4808 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -238,9 +238,6 @@ public:
   /** Return whether this target is a CFBundle (plugin) on Apple.  */
   bool IsCFBundleOnApple() const;
 
-  /** Return whether this target is a XCTest on Apple.  */
-  bool IsXCTestOnApple() const;
-
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9267b251d85227466e397b5ebe31fe9e87ed252c
commit 9267b251d85227466e397b5ebe31fe9e87ed252c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:58:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:31 2015 +0200

    cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
    
    Leave the cmTarget method behind for now to implement cmInstallCommand.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 781220d..3af7b71 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -202,7 +202,7 @@ cmExportBuildFileGenerator
   std::string prop = "IMPORTED_LOCATION";
   prop += suffix;
   std::string value;
-  if(target->Target->IsAppBundleOnApple())
+  if(target->IsAppBundleOnApple())
     {
     value = target->GetFullPath(config, false);
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 132c0b5..9bdf2f5 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1089,7 +1089,7 @@ cmExportFileGenerator
     }
 
   // Mark the imported executable if it is an application bundle.
-  if(target->Target->IsAppBundleOnApple())
+  if(target->IsAppBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY MACOSX_BUNDLE 1)\n";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index d57d67f..a2d6ad1 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -433,7 +433,7 @@ cmExportInstallFileGenerator
     prop += suffix;
 
     // Append the installed file name.
-    if(target->Target->IsAppBundleOnApple())
+    if(target->IsAppBundleOnApple())
       {
       value += itgen->GetInstallFilename(target, config);
       value += ".app/Contents/MacOS/";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 42b5c63..ab0d02b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -851,7 +851,7 @@ const char* cmGeneratorTarget::GetLocationForBuild() const
     location += cfgid;
     }
 
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     std::string macdir = this->BuildMacContentDirectory("", "",
                                                                 false);
@@ -1573,7 +1573,7 @@ cmGeneratorTarget::GetAppBundleDirectory(const std::string& config,
 bool cmGeneratorTarget::IsBundleOnApple() const
 {
   return this->IsFrameworkOnApple()
-      || this->Target->IsAppBundleOnApple()
+      || this->IsAppBundleOnApple()
       || this->Target->IsCFBundleOnApple();
 }
 
@@ -1935,7 +1935,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
                                             bool contentOnly) const
 {
   std::string fpath = base;
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     fpath += this->GetAppBundleDirectory(config, contentOnly);
     }
@@ -3143,7 +3143,7 @@ std::string cmGeneratorTarget::NormalGetFullPath(const std::string& config,
 {
   std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     fpath = this->BuildMacContentDirectory(fpath, config, false);
     fpath += "/";
@@ -3438,8 +3438,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     configPostfix = this->GetProperty(configProp);
     // Mac application bundles and frameworks have no postfix.
     if(configPostfix &&
-       (this->Target->IsAppBundleOnApple()
-         || this->IsFrameworkOnApple()))
+       (this->IsAppBundleOnApple() || this->IsFrameworkOnApple()))
       {
       configPostfix = 0;
       }
@@ -5955,3 +5954,11 @@ bool cmGeneratorTarget::IsFrameworkOnApple() const
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsAppBundleOnApple() const
+{
+  return (this->GetType() == cmState::EXECUTABLE &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("MACOSX_BUNDLE"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 471a500..24a1c2c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -419,6 +419,9 @@ public:
       Apple.  */
   bool IsFrameworkOnApple() const;
 
+  /** Return whether this target is an executable Bundle on Apple.  */
+  bool IsAppBundleOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 9c0aca0..e16dfd7 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -150,7 +150,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       std::string to1 = toDir + targetName;
 
       // Handle OSX Bundles.
-      if(this->Target->Target->IsAppBundleOnApple())
+      if(this->Target->IsAppBundleOnApple())
         {
         // Install the whole app bundle directory.
         type = cmInstallType_DIRECTORY;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 178b462..31fb37b 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -100,7 +100,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   // Construct the full path version of the names.
   std::string outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
-  if(this->Target->IsAppBundleOnApple())
+  if(this->GeneratorTarget->IsAppBundleOnApple())
     {
     this->OSXBundleGenerator->CreateAppBundle(targetName, outpath);
     }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4cfbda5..8a4f17e 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -412,7 +412,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                      gt.GetFullPath(cfgName,
                                        /*implib=*/true));
 
-  if (target.IsAppBundleOnApple())
+  if (gt.IsAppBundleOnApple())
     {
     // Create the app bundle
     std::string outpath = gt.GetDirectory(cfgName);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea9280d857b05724f5fbab88832fa294fca0efbe
commit ea9280d857b05724f5fbab88832fa294fca0efbe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:57:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:30 2015 +0200

    cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
    
    Leave the cmTarget method behind for now to implement cmInstallCommand.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 889c55c..2497f82 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1111,7 +1111,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
 
   // For compatibility with CMake 2.4 include the item's directory in
   // the linker search path.
-  if(this->OldLinkDirMode && !target->Target->IsFrameworkOnApple() &&
+  if(this->OldLinkDirMode && !target->IsFrameworkOnApple() &&
      this->OldLinkDirMask.find(cmSystemTools::GetFilenamePath(item)) ==
      this->OldLinkDirMask.end())
     {
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index fdc21db..132c0b5 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1082,7 +1082,7 @@ cmExportFileGenerator
     }
 
   // Mark the imported library if it is a framework.
-  if(target->Target->IsFrameworkOnApple())
+  if(target->IsFrameworkOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY FRAMEWORK 1)\n";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index bdf29b2..42b5c63 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1572,7 +1572,7 @@ cmGeneratorTarget::GetAppBundleDirectory(const std::string& config,
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::IsBundleOnApple() const
 {
-  return this->Target->IsFrameworkOnApple()
+  return this->IsFrameworkOnApple()
       || this->Target->IsAppBundleOnApple()
       || this->Target->IsCFBundleOnApple();
 }
@@ -1939,7 +1939,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
     {
     fpath += this->GetAppBundleDirectory(config, contentOnly);
     }
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     fpath += this->GetFrameworkDirectory(config, contentOnly);
     }
@@ -1959,7 +1959,7 @@ cmGeneratorTarget::GetMacContentDirectory(const std::string& config,
   std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
   bool contentOnly = true;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     // additional files with a framework go into the version specific
     // directory
@@ -3227,7 +3227,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   const char* version = this->GetProperty("VERSION");
   const char* soversion = this->GetProperty("SOVERSION");
   if(!this->HasSOName(config) ||
-     this->Target->IsFrameworkOnApple())
+     this->IsFrameworkOnApple())
     {
     // Versioning is supported only for shared libraries and modules,
     // and then only when the platform supports an soname flag.
@@ -3255,7 +3255,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   // The library name.
   name = prefix+base+suffix;
 
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     realName = prefix;
     if(!this->Makefile->PlatformIsAppleIos())
@@ -3439,7 +3439,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     // Mac application bundles and frameworks have no postfix.
     if(configPostfix &&
        (this->Target->IsAppBundleOnApple()
-         || this->Target->IsFrameworkOnApple()))
+         || this->IsFrameworkOnApple()))
       {
       configPostfix = 0;
       }
@@ -3476,7 +3476,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
 
   // frameworks have directory prefix but no suffix
   std::string fw_prefix;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     fw_prefix = this->GetOutputName(config, false);
     fw_prefix += ".framework/";
@@ -5947,3 +5947,11 @@ bool cmGeneratorTarget::IsLinkable() const
           this->GetType() == cmState::INTERFACE_LIBRARY ||
           this->Target->IsExecutableWithExports());
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsFrameworkOnApple() const
+{
+  return (this->GetType() == cmState::SHARED_LIBRARY &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("FRAMEWORK"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index a4a432c..471a500 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -415,6 +415,10 @@ public:
   /** Return whether this target may be used to link another target.  */
   bool IsLinkable() const;
 
+  /** Return whether this target is a shared library Framework on
+      Apple.  */
+  bool IsFrameworkOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index f54f936..1142ddd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2208,7 +2208,8 @@ cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
 
   if(cmTarget* tgt = this->FindTarget(libname))
     {
-    if(tgt->IsFrameworkOnApple())
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
+    if(gt->IsFrameworkOnApple())
        {
        return true;
        }
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 02da028..89a6dff 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -917,11 +917,13 @@ cmGlobalNinjaGenerator
   std::string configName =
     target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
+
   // for frameworks, we want the real name, not smple name
   // frameworks always appear versioned, and the build.ninja
   // will always attempt to manage symbolic links instead
   // of letting cmOSXBundleGenerator do it.
-  bool realname = target->IsFrameworkOnApple();
+  bool realname = gtgt->IsFrameworkOnApple();
 
   switch (target->GetType()) {
   case cmState::EXECUTABLE:
@@ -929,7 +931,6 @@ cmGlobalNinjaGenerator
   case cmState::STATIC_LIBRARY:
   case cmState::MODULE_LIBRARY:
     {
-    cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
     outputs.push_back(this->ConvertToNinjaPath(
       gtgt->GetFullPath(configName, false, realname)));
     break;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index faaf823..527a84f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -787,14 +787,16 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
 
   // Is this a resource file in this target? Add it to the resources group...
   //
+
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmGeneratorTarget::SourceFileFlags tsFlags =
-            this->GetGeneratorTarget(&cmtarget)->GetTargetSourceFileFlags(sf);
+      gtgt->GetTargetSourceFileFlags(sf);
   bool isResource = tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource;
 
   // Is this a "private" or "public" framework header file?
   // Set the ATTRIBUTES attribute appropriately...
   //
-  if(cmtarget.IsFrameworkOnApple())
+  if(gtgt->IsFrameworkOnApple())
     {
     if(tsFlags.Type == cmGeneratorTarget::SourceFileTypePrivateHeader)
       {
@@ -1193,7 +1195,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       }
 
     // some build phases only apply to bundles and/or frameworks
-    bool isFrameworkTarget = cmtarget.IsFrameworkOnApple();
+    bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
     bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
     bool isCFBundleTarget = cmtarget.IsCFBundleOnApple();
 
@@ -1289,7 +1291,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
         copyFilesBuildPhase->AddAttribute("dstSubfolderSpec",
           this->CreateString("6"));
         std::ostringstream ostr;
-        if (cmtarget.IsFrameworkOnApple())
+        if (gtgt->IsFrameworkOnApple())
           {
           // dstPath in frameworks is relative to Versions/<version>
           ostr << mit->first;
@@ -1467,8 +1469,10 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   std::vector<cmCustomCommand> postbuild
     = cmtarget.GetPostBuildCommands();
 
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+
   if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
-    !cmtarget.IsFrameworkOnApple())
+    !gtgt->IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
     cmd.resize(1);
@@ -1500,7 +1504,6 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
     }
 
   std::vector<cmSourceFile*> classes;
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   if (!gtgt->GetConfigCommonSourceFiles(classes))
     {
     return;
@@ -1943,7 +1946,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   const char* version = target.GetProperty("VERSION");
   const char* soversion = target.GetProperty("SOVERSION");
-  if(!gtgt->HasSOName(configName) || target.IsFrameworkOnApple())
+  if(!gtgt->HasSOName(configName) || gtgt->IsFrameworkOnApple())
     {
     version = 0;
     soversion = 0;
@@ -1990,7 +1993,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       pndir = gtgt->GetDirectory(configName);
       }
 
-    if(target.IsFrameworkOnApple() || target.IsCFBundleOnApple())
+    if(gtgt->IsFrameworkOnApple() || target.IsCFBundleOnApple())
       {
       pnprefix = "";
       }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index c2798b2..9c0aca0 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -208,7 +208,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       // An import library looks like a static library.
       type = cmInstallType_STATIC_LIBRARY;
       }
-    else if(this->Target->Target->IsFrameworkOnApple())
+    else if(this->Target->IsFrameworkOnApple())
       {
       // There is a bug in cmInstallCommand if this fails.
       assert(this->NamelinkMode == NamelinkModeNone);
@@ -605,7 +605,7 @@ cmInstallTargetGenerator
     std::string for_install =
       this->Target->GetInstallNameDirForInstallTree();
 
-    if(this->Target->Target->IsFrameworkOnApple() && for_install.empty())
+    if(this->Target->IsFrameworkOnApple() && for_install.empty())
       {
       // Frameworks seem to have an id corresponding to their own full
       // path.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2ed5f70..015c880 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -153,7 +153,7 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules()
 //----------------------------------------------------------------------------
 void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 {
-  if(this->Target->IsFrameworkOnApple())
+  if(this->GeneratorTarget->IsFrameworkOnApple())
     {
     this->WriteFrameworkRules(relink);
     return;
@@ -273,7 +273,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   // Construct the full path version of the names.
   std::string outpath;
   std::string outpathImp;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->GeneratorTarget->IsFrameworkOnApple())
     {
     outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
@@ -791,7 +791,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Add a rule to create necessary symlinks for the library.
   // Frameworks are handled by cmOSXBundleGenerator.
-  if(targetOutPath != targetOutPathReal && !this->Target->IsFrameworkOnApple())
+  if(targetOutPath != targetOutPathReal
+     && !this->GeneratorTarget->IsFrameworkOnApple())
     {
     std::string symlink = "$(CMAKE_COMMAND) -E cmake_symlink_library ";
     symlink += targetOutPathReal;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index e5e4b7f..4cfbda5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -281,7 +281,7 @@ cmNinjaNormalTargetGenerator
   }
 
   if (this->TargetNameOut != this->TargetNameReal &&
-    !this->GetTarget()->IsFrameworkOnApple()) {
+    !this->GetGeneratorTarget()->IsFrameworkOnApple()) {
     std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
@@ -428,7 +428,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     targetOutputReal += this->TargetNameReal;
     targetOutputReal = this->ConvertToNinjaPath(targetOutputReal);
     }
-  else if (target.IsFrameworkOnApple())
+  else if (gt.IsFrameworkOnApple())
     {
     // Create the library framework.
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
@@ -732,7 +732,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                         &usedResponseFile);
   this->WriteLinkRule(usedResponseFile);
 
-  if (targetOutput != targetOutputReal && !target.IsFrameworkOnApple())
+  if (targetOutput != targetOutputReal && !gt.IsFrameworkOnApple())
     {
     if (targetType == cmState::EXECUTABLE)
       {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b04a0f096a221c03639dd4c86f5ef712745be705
commit b04a0f096a221c03639dd4c86f5ef712745be705
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:44:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:30 2015 +0200

    cmGeneratorTarget: Move IsLinkable from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 7bdc555..889c55c 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -643,7 +643,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
     return;
     }
 
-  if(tgt && tgt->Target->IsLinkable())
+  if(tgt && tgt->IsLinkable())
     {
     // This is a CMake target.  Ask the target for its real name.
     if(impexe && this->LoaderFlag)
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 3e58400..fdc21db 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -210,7 +210,7 @@ bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  if(!target->Target->IsLinkable())
+  if(!target->IsLinkable())
     {
     return false;
     }
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index c7c0e73..1a878e2 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1654,7 +1654,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
                             const GeneratorExpressionContent *content)
   {
     // The file used to link to the target (.so, .lib, .a).
-    if(!target->Target->IsLinkable())
+    if(!target->IsLinkable())
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_LINKER_FILE is allowed only for libraries and "
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 03c950e..bdf29b2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5936,3 +5936,14 @@ std::string cmGeneratorTarget::GetSupportDirectory() const
 #endif
   return dir;
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsLinkable() const
+{
+  return (this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY ||
+          this->GetType() == cmState::UNKNOWN_LIBRARY ||
+          this->GetType() == cmState::INTERFACE_LIBRARY ||
+          this->Target->IsExecutableWithExports());
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 1029158..a4a432c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -412,6 +412,9 @@ public:
   /** Get a build-tree directory in which to place target support files.  */
   std::string GetSupportDirectory() const;
 
+  /** Return whether this target may be used to link another target.  */
+  bool IsLinkable() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d81d3b8..fcc27ca 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -385,7 +385,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
 }
 
 //----------------------------------------------------------------------------
-static bool VSLinkable(cmTarget const* t)
+static bool VSLinkable(cmGeneratorTarget const* t)
 {
   return t->IsLinkable() || t->GetType() == cmState::OBJECT_LIBRARY;
 }
@@ -475,7 +475,8 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
       di != utilDepends.end(); ++di)
     {
     cmTarget const* dep = *di;
-    if(allowLinkable || !VSLinkable(dep) || linked.count(dep))
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(dep);
+    if(allowLinkable || !VSLinkable(gt) || linked.count(dep))
       {
       // Direct dependency allowed.
       vsTargetDepend.insert(dep->GetName());
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 57a2d24..761267d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -345,17 +345,6 @@ bool cmTarget::IsExecutableWithExports() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsLinkable() const
-{
-  return (this->GetType() == cmState::STATIC_LIBRARY ||
-          this->GetType() == cmState::SHARED_LIBRARY ||
-          this->GetType() == cmState::MODULE_LIBRARY ||
-          this->GetType() == cmState::UNKNOWN_LIBRARY ||
-          this->GetType() == cmState::INTERFACE_LIBRARY ||
-          this->IsExecutableWithExports());
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::HasImportLibrary() const
 {
   return (this->DLLPlatform &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index dafe86a..51e97fd 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -228,9 +228,6 @@ public:
       enabled.  */
   bool IsExecutableWithExports() const;
 
-  /** Return whether this target may be used to link another target.  */
-  bool IsLinkable() const;
-
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a527abf0995fc1bdd45afdb20e80b728dd0ef045
commit a527abf0995fc1bdd45afdb20e80b728dd0ef045
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:20:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:30 2015 +0200

    Xcode: Port internal API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fec7a05..faaf823 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2639,23 +2639,24 @@ cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
 }
 
 //----------------------------------------------------------------------------
-const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
+const char* cmGlobalXCodeGenerator::GetTargetFileType(
+    cmGeneratorTarget* target)
 {
-  switch(cmtarget.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
       return "archive.ar";
     case cmState::MODULE_LIBRARY:
-      if (cmtarget.IsXCTestOnApple())
+      if (target->Target->IsXCTestOnApple())
         return "wrapper.cfbundle";
-      else if (cmtarget.IsCFBundleOnApple())
+      else if (target->Target->IsCFBundleOnApple())
         return "wrapper.plug-in";
       else
         return ((this->XcodeVersion >= 22)?
               "compiled.mach-o.executable" : "compiled.mach-o.dylib");
     case cmState::SHARED_LIBRARY:
-      return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
+      return (target->GetPropertyAsBool("FRAMEWORK")?
               "wrapper.framework" : "compiled.mach-o.dylib");
     case cmState::EXECUTABLE:
       return "compiled.mach-o.executable";
@@ -2665,28 +2666,29 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(cmTarget& cmtarget)
 }
 
 //----------------------------------------------------------------------------
-const char* cmGlobalXCodeGenerator::GetTargetProductType(cmTarget& cmtarget)
+const char* cmGlobalXCodeGenerator::GetTargetProductType(
+    cmGeneratorTarget* target)
 {
-  switch(cmtarget.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
     case cmState::MODULE_LIBRARY:
-      if (cmtarget.IsXCTestOnApple())
+      if (target->Target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
-      else if (cmtarget.IsCFBundleOnApple())
+      else if (target->Target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
       else
         return ((this->XcodeVersion >= 22)?
                 "com.apple.product-type.tool" :
                 "com.apple.product-type.library.dynamic");
     case cmState::SHARED_LIBRARY:
-      return (cmtarget.GetPropertyAsBool("FRAMEWORK")?
+      return (target->GetPropertyAsBool("FRAMEWORK")?
               "com.apple.product-type.framework" :
               "com.apple.product-type.library.dynamic");
     case cmState::EXECUTABLE:
-      return (cmtarget.GetPropertyAsBool("MACOSX_BUNDLE")?
+      return (target->GetPropertyAsBool("MACOSX_BUNDLE")?
               "com.apple.product-type.application" :
               "com.apple.product-type.tool");
     default: break;
@@ -2727,9 +2729,11 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
   target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
 
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+
   cmXCodeObject* fileRef =
     this->CreateObject(cmXCodeObject::PBXFileReference);
-  if(const char* fileType = this->GetTargetFileType(cmtarget))
+  if(const char* fileType = this->GetTargetFileType(gtgt))
     {
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
@@ -2742,7 +2746,6 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     }
   else
     {
-    cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
     fullName = gtgt->GetFullName(defConfig.c_str());
     }
   fileRef->AddAttribute("path", this->CreateString(fullName.c_str()));
@@ -2752,7 +2755,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   fileRef->SetComment(cmtarget.GetName().c_str());
   target->AddAttribute("productReference",
                        this->CreateObjectReference(fileRef));
-  if(const char* productType = this->GetTargetProductType(cmtarget))
+  if(const char* productType = this->GetTargetProductType(gtgt))
     {
     target->AddAttribute("productType", this->CreateString(productType));
     }
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 9daf0ab..feb5009 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -137,8 +137,8 @@ private:
   void ForceLinkerLanguages();
   void ForceLinkerLanguage(cmTarget& cmtarget);
   const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
-  const char* GetTargetFileType(cmTarget& cmtarget);
-  const char* GetTargetProductType(cmTarget& cmtarget);
+  const char* GetTargetFileType(cmGeneratorTarget* target);
+  const char* GetTargetProductType(cmGeneratorTarget* target);
   std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget);
   void AppendOrAddBuildSetting(cmXCodeObject* settings, const char* attr,
                                const char* value);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb3be7d68851ce87354f6bd90e0be3a670d22d56
commit eb3be7d68851ce87354f6bd90e0be3a670d22d56
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:08:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:30 2015 +0200

    cmGeneratorTarget: Move GetExportName from cmTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index d191e47..781220d 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -48,7 +48,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     {
     cmGeneratorTarget *te = this->LG
                                 ->FindGeneratorTargetToUse(*tei);
-    expectedTargets += sep + this->Namespace + te->Target->GetExportName();
+    expectedTargets += sep + this->Namespace + te->GetExportName();
     sep = " ";
     if(this->ExportedTargets.insert(te).second)
       {
@@ -253,7 +253,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
       {
       std::string missingTarget = namespaces[0];
 
-      missingTarget += dependee->Target->GetExportName();
+      missingTarget += dependee->GetExportName();
       link_libs += missingTarget;
       missingTargets.push_back(missingTarget);
       return;
@@ -268,7 +268,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
   // Assume the target will be exported by another command.
   // Append it with the export namespace.
   link_libs += this->Namespace;
-  link_libs += dependee->Target->GetExportName();
+  link_libs += dependee->GetExportName();
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 1c3e9fe..3e58400 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 #include "cmTargetExport.h"
 #include "cmVersion.h"
 #include "cmComputeLinkInformation.h"
@@ -623,7 +622,7 @@ void cmExportFileGenerator::GenerateInterfaceProperties(
   if (!properties.empty())
     {
     std::string targetName = this->Namespace;
-    targetName += target->Target->GetExportName();
+    targetName += target->GetExportName();
     os << "set_target_properties(" << targetName << " PROPERTIES\n";
     for(ImportPropertyMap::const_iterator pi = properties.begin();
         pi != properties.end(); ++pi)
@@ -655,7 +654,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     }
   if(this->ExportedTargets.find(tgt) != this->ExportedTargets.end())
     {
-    input = this->Namespace + tgt->Target->GetExportName();
+    input = this->Namespace + tgt->GetExportName();
     }
   else
     {
@@ -1047,7 +1046,7 @@ cmExportFileGenerator
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->Target->GetExportName();
+  targetName += target->GetExportName();
 
   // Create the imported target.
   os << "# Create imported target " << targetName << "\n";
@@ -1114,7 +1113,7 @@ cmExportFileGenerator
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->Target->GetExportName();
+  targetName += target->GetExportName();
 
   // Set the import properties.
   os << "# Import target \"" << targetName << "\" for configuration \""
@@ -1234,7 +1233,7 @@ cmExportFileGenerator
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
-  targetName += target->Target->GetExportName();
+  targetName += target->GetExportName();
 
   os << "list(APPEND _IMPORT_CHECK_TARGETS " << targetName << " )\n"
         "list(APPEND _IMPORT_CHECK_FILES_FOR_" << targetName << " ";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index ea5badc..d57d67f 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -49,7 +49,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
     {
     expectedTargets +=
-        sep + this->Namespace + (*tei)->Target->Target->GetExportName();
+        sep + this->Namespace + (*tei)->Target->GetExportName();
     sep = " ";
     cmTargetExport * te = *tei;
     if(this->ExportedTargets.insert(te->Target).second)
@@ -465,7 +465,7 @@ cmExportInstallFileGenerator::HandleMissingTarget(std::string& link_libs,
     {
     std::string missingTarget = namespaces[0];
 
-    missingTarget += dependee->Target->GetExportName();
+    missingTarget += dependee->GetExportName();
     link_libs += missingTarget;
     missingTargets.push_back(missingTarget);
     }
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5e26aad..03c950e 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -335,6 +335,26 @@ std::string cmGeneratorTarget::GetName() const
 }
 
 //----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetExportName() const
+{
+  const char *exportName = this->GetProperty("EXPORT_NAME");
+
+  if (exportName && *exportName)
+    {
+    if (!cmGeneratorExpression::IsValidTargetName(exportName))
+      {
+      std::ostringstream e;
+      e << "EXPORT_NAME property \"" << exportName << "\" for \""
+        << this->GetName() << "\": is not valid.";
+      cmSystemTools::Error(e.str().c_str());
+      return "";
+      }
+    return exportName;
+    }
+  return this->GetName();
+}
+
+//----------------------------------------------------------------------------
 const char *cmGeneratorTarget::GetProperty(const std::string& prop) const
 {
   return this->Target->GetProperty(prop);
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index f5a894b..1029158 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -43,6 +43,8 @@ public:
 
   cmState::TargetType GetType() const;
   std::string GetName() const;
+  std::string GetExportName() const;
+
   const char *GetProperty(const std::string& prop) const;
   bool GetPropertyAsBool(const std::string& prop) const;
   void GetSourceFiles(std::vector<cmSourceFile*>& files,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1c4faab..57a2d24 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1412,26 +1412,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::GetExportName() const
-{
-  const char *exportName = this->GetProperty("EXPORT_NAME");
-
-  if (exportName && *exportName)
-    {
-    if (!cmGeneratorExpression::IsValidTargetName(exportName))
-      {
-      std::ostringstream e;
-      e << "EXPORT_NAME property \"" << exportName << "\" for \""
-        << this->GetName() << "\": is not valid.";
-      cmSystemTools::Error(e.str().c_str());
-      return "";
-      }
-    return exportName;
-    }
-  return this->GetName();
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AppendBuildInterfaceIncludes()
 {
   if(this->GetType() != cmState::SHARED_LIBRARY &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 443a2d0..dafe86a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -96,7 +96,6 @@ public:
 
   ///! Set/Get the name of the target
   const std::string& GetName() const {return this->Name;}
-  std::string GetExportName() const;
 
   ///! Set the cmMakefile that owns this target
   void SetMakefile(cmMakefile *mf);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d231c31b98eb80929d9aabf8e606abde39fc08f4
commit d231c31b98eb80929d9aabf8e606abde39fc08f4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:10:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:30 2015 +0200

    Export: Port internal API to cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index cf84146..d191e47 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -174,7 +174,7 @@ cmExportBuildFileGenerator
       //                              properties);
 
       // Generate code in the export file.
-      this->GenerateImportPropertyCode(os, config, target->Target,
+      this->GenerateImportPropertyCode(os, config, target,
                                        properties);
       }
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b597b53..1c3e9fe 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1108,13 +1108,13 @@ cmExportFileGenerator
 void
 cmExportFileGenerator
 ::GenerateImportPropertyCode(std::ostream& os, const std::string& config,
-                             cmTarget const* target,
+                             cmGeneratorTarget const* target,
                              ImportPropertyMap const& properties)
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->GetExportName();
+  targetName += target->Target->GetExportName();
 
   // Set the import properties.
   os << "# Import target \"" << targetName << "\" for configuration \""
@@ -1228,13 +1228,13 @@ cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os)
 //----------------------------------------------------------------------------
 void
 cmExportFileGenerator
-::GenerateImportedFileChecksCode(std::ostream& os, cmTarget* target,
+::GenerateImportedFileChecksCode(std::ostream& os, cmGeneratorTarget* target,
                                  ImportPropertyMap const& properties,
                                 const std::set<std::string>& importedLocations)
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
-  targetName += target->GetExportName();
+  targetName += target->Target->GetExportName();
 
   os << "list(APPEND _IMPORT_CHECK_TARGETS " << targetName << " )\n"
         "list(APPEND _IMPORT_CHECK_FILES_FOR_" << targetName << " ";
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index be5c6f7..18f0b00 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -78,9 +78,10 @@ protected:
   void GenerateImportTargetCode(std::ostream& os,
                                 cmGeneratorTarget const* target);
   void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
-                                  cmTarget const* target,
+                                  cmGeneratorTarget const* target,
                                   ImportPropertyMap const& properties);
-  void GenerateImportedFileChecksCode(std::ostream& os, cmTarget* target,
+  void GenerateImportedFileChecksCode(std::ostream& os,
+                                      cmGeneratorTarget* target,
                                       ImportPropertyMap const& properties,
                                const std::set<std::string>& importedLocations);
   void GenerateImportedFileCheckLoop(std::ostream& os);
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 988b0dc..ea5badc 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -375,8 +375,8 @@ cmExportInstallFileGenerator
       //                              properties);
 
       // Generate code in the export file.
-      this->GenerateImportPropertyCode(os, config, gtgt->Target, properties);
-      this->GenerateImportedFileChecksCode(os, gtgt->Target, properties,
+      this->GenerateImportPropertyCode(os, config, gtgt, properties);
+      this->GenerateImportedFileChecksCode(os, gtgt, properties,
                                            importedLocations);
       }
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6661282436d7901617d2f96d9acf9d4cb7db9d5
commit e6661282436d7901617d2f96d9acf9d4cb7db9d5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:05:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:30 2015 +0200

    Export: Port internal utility to cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index c24138f..cf84146 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -237,14 +237,15 @@ void
 cmExportBuildFileGenerator::HandleMissingTarget(
     std::string& link_libs,
     std::vector<std::string>& missingTargets,
-    cmTarget* depender,
-    cmTarget* dependee)
+    cmGeneratorTarget* depender,
+    cmGeneratorTarget* dependee)
 {
   // The target is not in the export.
   if(!this->AppendMode)
     {
     const std::string name = dependee->GetName();
-    cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+    cmGlobalGenerator* gg =
+        dependee->GetLocalGenerator()->GetGlobalGenerator();
     std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
 
     int targetOccurrences = (int)namespaces.size();
@@ -252,7 +253,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
       {
       std::string missingTarget = namespaces[0];
 
-      missingTarget += dependee->GetExportName();
+      missingTarget += dependee->Target->GetExportName();
       link_libs += missingTarget;
       missingTargets.push_back(missingTarget);
       return;
@@ -267,7 +268,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
   // Assume the target will be exported by another command.
   // Append it with the export namespace.
   link_libs += this->Namespace;
-  link_libs += dependee->GetExportName();
+  link_libs += dependee->Target->GetExportName();
 }
 
 //----------------------------------------------------------------------------
@@ -315,8 +316,8 @@ cmExportBuildFileGenerator
 //----------------------------------------------------------------------------
 void
 cmExportBuildFileGenerator
-::ComplainAboutMissingTarget(cmTarget* depender,
-                             cmTarget* dependee,
+::ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                             cmGeneratorTarget* dependee,
                              int occurrences)
 {
   if(cmSystemTools::GetErrorOccuredFlag())
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index c7d317f..85aae2f 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -54,11 +54,11 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmTarget* depender,
-                                   cmTarget* dependee);
+                                   cmGeneratorTarget* depender,
+                                   cmGeneratorTarget* dependee);
 
-  void ComplainAboutMissingTarget(cmTarget* depender,
-                                  cmTarget* dependee,
+  void ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                                  cmGeneratorTarget* dependee,
                                   int occurrences);
 
   /** Fill in properties indicating built file locations.  */
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 192a932..b597b53 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -661,7 +661,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     {
     std::string namespacedTarget;
     this->HandleMissingTarget(namespacedTarget, missingTargets,
-                              target->Target, tgt->Target);
+                              target, tgt);
     if (!namespacedTarget.empty())
       {
       input = namespacedTarget;
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index e1ff83d..be5c6f7 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -119,8 +119,8 @@ protected:
    *  export set.  */
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmTarget* depender,
-                                   cmTarget* dependee) = 0;
+                                   cmGeneratorTarget* depender,
+                                   cmGeneratorTarget* dependee) = 0;
   void PopulateInterfaceProperty(const std::string&,
                                  cmGeneratorTarget *target,
                                  cmGeneratorExpression::PreprocessContext,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 48f92b0..988b0dc 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -453,19 +453,19 @@ cmExportInstallFileGenerator
 
 //----------------------------------------------------------------------------
 void
-cmExportInstallFileGenerator::HandleMissingTarget(
-  std::string& link_libs, std::vector<std::string>& missingTargets,
-  cmTarget* depender, cmTarget* dependee)
+cmExportInstallFileGenerator::HandleMissingTarget(std::string& link_libs,
+  std::vector<std::string>& missingTargets,
+  cmGeneratorTarget* depender, cmGeneratorTarget* dependee)
 {
   const std::string name = dependee->GetName();
-  cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+  cmGlobalGenerator* gg = dependee->GetLocalGenerator()->GetGlobalGenerator();
   std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
   int targetOccurrences = (int)namespaces.size();
   if (targetOccurrences == 1)
     {
     std::string missingTarget = namespaces[0];
 
-    missingTarget += dependee->GetExportName();
+    missingTarget += dependee->Target->GetExportName();
     link_libs += missingTarget;
     missingTargets.push_back(missingTarget);
     }
@@ -520,8 +520,8 @@ cmExportInstallFileGenerator
 //----------------------------------------------------------------------------
 void
 cmExportInstallFileGenerator
-::ComplainAboutMissingTarget(cmTarget* depender,
-                             cmTarget* dependee,
+::ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                             cmGeneratorTarget* dependee,
                              int occurrences)
 {
   std::ostringstream e;
diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h
index b1fa70e..13dae89 100644
--- a/Source/cmExportInstallFileGenerator.h
+++ b/Source/cmExportInstallFileGenerator.h
@@ -57,13 +57,13 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmTarget* depender,
-                                   cmTarget* dependee);
+                                   cmGeneratorTarget* depender,
+                                   cmGeneratorTarget* dependee);
 
   virtual void ReplaceInstallPrefix(std::string &input);
 
-  void ComplainAboutMissingTarget(cmTarget* depender,
-                                  cmTarget* dependee,
+  void ComplainAboutMissingTarget(cmGeneratorTarget* depender,
+                                  cmGeneratorTarget* dependee,
                                   int occurrences);
 
   std::vector<std::string> FindNamespaces(cmGlobalGenerator* gg,
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 50c3187..fc135a4 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -37,8 +37,8 @@ protected:
                             std::vector<std::string>&) {}
   virtual void HandleMissingTarget(std::string&,
                                    std::vector<std::string>&,
-                                   cmTarget*,
-                                   cmTarget*) {}
+                                   cmGeneratorTarget*,
+                                   cmGeneratorTarget*) {}
 
   void PopulateProperties(cmGeneratorTarget const* target,
                           ImportPropertyMap& properties,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b9cc1e24871c6b527900e119640ef0adf706f0d
commit 2b9cc1e24871c6b527900e119640ef0adf706f0d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 15:01:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:30 2015 +0200

    Export: Port some API to cmGlobalGenerator.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 194d9a2..c24138f 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -235,14 +235,17 @@ cmExportBuildFileGenerator
 //----------------------------------------------------------------------------
 void
 cmExportBuildFileGenerator::HandleMissingTarget(
-  std::string& link_libs, std::vector<std::string>& missingTargets,
-  cmMakefile* mf, cmTarget* depender, cmTarget* dependee)
+    std::string& link_libs,
+    std::vector<std::string>& missingTargets,
+    cmTarget* depender,
+    cmTarget* dependee)
 {
   // The target is not in the export.
   if(!this->AppendMode)
     {
     const std::string name = dependee->GetName();
-    std::vector<std::string> namespaces = this->FindNamespaces(mf, name);
+    cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+    std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
 
     int targetOccurrences = (int)namespaces.size();
     if (targetOccurrences == 1)
@@ -287,10 +290,9 @@ void cmExportBuildFileGenerator
 //----------------------------------------------------------------------------
 std::vector<std::string>
 cmExportBuildFileGenerator
-::FindNamespaces(cmMakefile* mf, const std::string& name)
+::FindNamespaces(cmGlobalGenerator* gg, const std::string& name)
 {
   std::vector<std::string> namespaces;
-  cmGlobalGenerator* gg = mf->GetGlobalGenerator();
 
   std::map<std::string, cmExportBuildFileGenerator*>& exportSets
                                                   = gg->GetBuildExportSets();
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index 16695f1..c7d317f 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -54,7 +54,6 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmMakefile* mf,
                                    cmTarget* depender,
                                    cmTarget* dependee);
 
@@ -72,7 +71,7 @@ protected:
                              const std::string& config);
 
   std::vector<std::string>
-  FindNamespaces(cmMakefile* mf, const std::string& name);
+  FindNamespaces(cmGlobalGenerator* gg, const std::string& name);
 
   std::vector<std::string> Targets;
   cmExportSet *ExportSet;
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 0985542..192a932 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -661,7 +661,6 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     {
     std::string namespacedTarget;
     this->HandleMissingTarget(namespacedTarget, missingTargets,
-                              target->Target->GetMakefile(),
                               target->Target, tgt->Target);
     if (!namespacedTarget.empty())
       {
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 3280a03..e1ff83d 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -119,7 +119,6 @@ protected:
    *  export set.  */
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmMakefile* mf,
                                    cmTarget* depender,
                                    cmTarget* dependee) = 0;
   void PopulateInterfaceProperty(const std::string&,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 67697f8..48f92b0 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -455,10 +455,11 @@ cmExportInstallFileGenerator
 void
 cmExportInstallFileGenerator::HandleMissingTarget(
   std::string& link_libs, std::vector<std::string>& missingTargets,
-  cmMakefile* mf, cmTarget* depender, cmTarget* dependee)
+  cmTarget* depender, cmTarget* dependee)
 {
   const std::string name = dependee->GetName();
-  std::vector<std::string> namespaces = this->FindNamespaces(mf, name);
+  cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator();
+  std::vector<std::string> namespaces = this->FindNamespaces(gg, name);
   int targetOccurrences = (int)namespaces.size();
   if (targetOccurrences == 1)
     {
@@ -479,10 +480,9 @@ cmExportInstallFileGenerator::HandleMissingTarget(
 //----------------------------------------------------------------------------
 std::vector<std::string>
 cmExportInstallFileGenerator
-::FindNamespaces(cmMakefile* mf, const std::string& name)
+::FindNamespaces(cmGlobalGenerator* gg, const std::string& name)
 {
   std::vector<std::string> namespaces;
-  cmGlobalGenerator* gg = mf->GetGlobalGenerator();
   const cmExportSetMap& exportSets = gg->GetExportSets();
 
   for(cmExportSetMap::const_iterator expIt = exportSets.begin();
diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h
index b06fee5..b1fa70e 100644
--- a/Source/cmExportInstallFileGenerator.h
+++ b/Source/cmExportInstallFileGenerator.h
@@ -57,7 +57,6 @@ protected:
                             std::vector<std::string> &missingTargets);
   virtual void HandleMissingTarget(std::string& link_libs,
                                    std::vector<std::string>& missingTargets,
-                                   cmMakefile* mf,
                                    cmTarget* depender,
                                    cmTarget* dependee);
 
@@ -67,7 +66,7 @@ protected:
                                   cmTarget* dependee,
                                   int occurrences);
 
-  std::vector<std::string> FindNamespaces(cmMakefile* mf,
+  std::vector<std::string> FindNamespaces(cmGlobalGenerator* gg,
                                           const std::string& name);
 
 
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 19d8024..50c3187 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -37,7 +37,6 @@ protected:
                             std::vector<std::string>&) {}
   virtual void HandleMissingTarget(std::string&,
                                    std::vector<std::string>&,
-                                   cmMakefile*,
                                    cmTarget*,
                                    cmTarget*) {}
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97062ac268d1bcc62a528aea2e22a7dd6f6efa8f
commit 97062ac268d1bcc62a528aea2e22a7dd6f6efa8f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 14:54:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:30 2015 +0200

    cmInstallTargetGenerator: Port GetInstallFilename to cmGeneratorTarget.

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index da963f3..67697f8 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -399,7 +399,7 @@ cmExportInstallFileGenerator
     }
 
   // Get the target to be installed.
-  cmTarget* target = itgen->GetTarget()->Target;
+  cmGeneratorTarget* target = itgen->GetTarget();
 
   // Construct the installed location of the target.
   std::string dest = itgen->GetDestination(config);
@@ -433,7 +433,7 @@ cmExportInstallFileGenerator
     prop += suffix;
 
     // Append the installed file name.
-    if(target->IsAppBundleOnApple())
+    if(target->Target->IsAppBundleOnApple())
       {
       value += itgen->GetInstallFilename(target, config);
       value += ".app/Contents/MacOS/";
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 2f08165..c2798b2 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -359,34 +359,31 @@ cmInstallTargetGenerator::GetInstallFilename(const std::string& config) const
 {
   NameType nameType = this->ImportLibrary? NameImplib : NameNormal;
   return
-    cmInstallTargetGenerator::GetInstallFilename(this->Target->Target, config,
+    cmInstallTargetGenerator::GetInstallFilename(this->Target, config,
                                                  nameType);
 }
 
 //----------------------------------------------------------------------------
 std::string
-cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
+cmInstallTargetGenerator::GetInstallFilename(cmGeneratorTarget const* target,
                                              const std::string& config,
                                              NameType nameType)
 {
   std::string fname;
   // Compute the name of the library.
-  cmGeneratorTarget *gtgt = target->GetMakefile()
-                                  ->GetGlobalGenerator()
-                                  ->GetGeneratorTarget(target);
   if(target->GetType() == cmState::EXECUTABLE)
     {
     std::string targetName;
     std::string targetNameReal;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gtgt->GetExecutableNames(targetName, targetNameReal,
+    target->GetExecutableNames(targetName, targetNameReal,
                                targetNameImport, targetNamePDB,
                                config);
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -410,12 +407,12 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target,
     std::string targetNameReal;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gtgt->GetLibraryNames(targetName, targetNameSO, targetNameReal,
+    target->GetLibraryNames(targetName, targetNameSO, targetNameReal,
                             targetNameImport, targetNamePDB, config);
     if(nameType == NameImplib)
       {
       // Use the import library name.
-      if(!gtgt->GetImplibGNUtoMS(targetNameImport, fname,
+      if(!target->GetImplibGNUtoMS(targetNameImport, fname,
                                    "${CMAKE_IMPORT_LIBRARY_SUFFIX}"))
         {
         fname = targetNameImport;
@@ -585,7 +582,7 @@ cmInstallTargetGenerator
         // The directory portions differ.  Append the filename to
         // create the mapping.
         std::string fname =
-          this->GetInstallFilename(tgt->Target, config, NameSO);
+          this->GetInstallFilename(tgt, config, NameSO);
 
         // Map from the build-tree install_name.
         for_build += fname;
@@ -622,7 +619,7 @@ cmInstallTargetGenerator
       {
       // Prepare to refer to the install-tree install_name.
       new_id = for_install;
-      new_id += this->GetInstallFilename(this->Target->Target, config, NameSO);
+      new_id += this->GetInstallFilename(this->Target, config, NameSO);
       }
     }
 
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index a8f4a75..ec89c05 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -14,7 +14,6 @@
 
 #include "cmInstallGenerator.h"
 
-class cmTarget;
 class cmGeneratorTarget;
 
 /** \class cmInstallTargetGenerator
@@ -54,7 +53,7 @@ public:
     NameReal
   };
 
-  static std::string GetInstallFilename(cmTarget const* target,
+  static std::string GetInstallFilename(const cmGeneratorTarget* target,
                                         const std::string& config,
                                         NameType nameType = NameNormal);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a72b3c84e016d7e540aa3d9b079200b3fb52ab7
commit 6a72b3c84e016d7e540aa3d9b079200b3fb52ab7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 14:33:51 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:29 2015 +0200

    Export: Port interface to cmGeneratorTarget.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 30a8bf2..194d9a2 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -50,7 +50,7 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
                                 ->FindGeneratorTargetToUse(*tei);
     expectedTargets += sep + this->Namespace + te->Target->GetExportName();
     sep = " ";
-    if(this->ExportedTargets.insert(te->Target).second)
+    if(this->ExportedTargets.insert(te).second)
       {
       this->Exports.push_back(te);
       }
@@ -80,45 +80,44 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->Exports.end(); ++tei)
     {
     cmGeneratorTarget* gte = *tei;
-    cmTarget* te = gte->Target;
-    this->GenerateImportTargetCode(os, te);
+    this->GenerateImportTargetCode(os, gte);
 
-    te->AppendBuildInterfaceIncludes();
+    gte->Target->AppendBuildInterfaceIncludes();
 
     ImportPropertyMap properties;
 
-    this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
+    this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_SOURCES", te,
+    this->PopulateInterfaceProperty("INTERFACE_SOURCES", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
+    this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", te,
+    this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS", te,
+    this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES", te,
+    this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES", gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
-                                  te, properties);
+                                  gte, properties);
     const bool newCMP0022Behavior =
-                              te->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                           && te->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gte->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gte->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
-      this->PopulateInterfaceLinkLibrariesProperty(te,
+      this->PopulateInterfaceLinkLibrariesProperty(gte,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
       }
     this->PopulateCompatibleInterfaceProperties(gte, properties);
 
-    this->GenerateInterfaceProperties(te, os, properties);
+    this->GenerateInterfaceProperties(gte, os, properties);
     }
 
   // Generate import file content for each configuration.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 4e8bc86..0985542 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -155,7 +155,7 @@ void cmExportFileGenerator::GenerateImportConfig(std::ostream& os,
 //----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateInterfaceProperty(
                                               const std::string& propName,
-                                              cmTarget *target,
+                                              cmGeneratorTarget *target,
                                               ImportPropertyMap &properties)
 {
   const char *input = target->GetProperty(propName);
@@ -169,7 +169,7 @@ void cmExportFileGenerator::PopulateInterfaceProperty(
 void cmExportFileGenerator::PopulateInterfaceProperty(
                       const std::string& propName,
                       const std::string& outputName,
-                      cmTarget *target,
+                      cmGeneratorTarget *target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
@@ -206,12 +206,12 @@ void cmExportFileGenerator::GenerateRequiredCMakeVersion(std::ostream& os,
 
 //----------------------------------------------------------------------------
 bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty(
-                      cmTarget *target,
+                      cmGeneratorTarget *target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  if(!target->IsLinkable())
+  if(!target->Target->IsLinkable())
     {
     return false;
     }
@@ -420,7 +420,7 @@ void cmExportFileGenerator::PopulateSourcesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, gt->Target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, gt,
                                                 missingTargets);
 
     if (!checkInterfaceDirs(prepro, gt, propName))
@@ -488,7 +488,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
     if (!checkInterfaceDirs(prepro, target, propName))
@@ -502,7 +502,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
 //----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateInterfaceProperty(
                       const std::string& propName,
-                      cmTarget *target,
+                      cmGeneratorTarget* target,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
@@ -574,15 +574,14 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
                                 cmGeneratorTarget *gtarget,
                                 ImportPropertyMap &properties)
 {
-  cmTarget *target = gtarget->Target;
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_BOOL",
-                                target, properties);
+                                gtarget, properties);
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_STRING",
-                                target, properties);
+                                gtarget, properties);
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_NUMBER_MIN",
-                                target, properties);
+                                gtarget, properties);
   this->PopulateInterfaceProperty("COMPATIBLE_INTERFACE_NUMBER_MAX",
-                                target, properties);
+                                gtarget, properties);
 
   std::set<std::string> ifaceProperties;
 
@@ -593,12 +592,12 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
   getPropertyContents(gtarget, "COMPATIBLE_INTERFACE_NUMBER_MAX",
                       ifaceProperties);
 
-  if (target->GetType() != cmState::INTERFACE_LIBRARY)
+  if (gtarget->GetType() != cmState::INTERFACE_LIBRARY)
     {
     getCompatibleInterfaceProperties(gtarget, ifaceProperties, "");
 
     std::vector<std::string> configNames;
-    target->GetMakefile()->GetConfigurations(configNames);
+    gtarget->Target->GetMakefile()->GetConfigurations(configNames);
 
     for (std::vector<std::string>::const_iterator ci = configNames.begin();
       ci != configNames.end(); ++ci)
@@ -611,19 +610,20 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties(
     it != ifaceProperties.end(); ++it)
     {
     this->PopulateInterfaceProperty("INTERFACE_" + *it,
-                                    target, properties);
+                                    gtarget, properties);
     }
 }
 
 //----------------------------------------------------------------------------
-void cmExportFileGenerator::GenerateInterfaceProperties(cmTarget const* target,
+void cmExportFileGenerator::GenerateInterfaceProperties(
+                                        const cmGeneratorTarget* target,
                                         std::ostream& os,
                                         const ImportPropertyMap &properties)
 {
   if (!properties.empty())
     {
     std::string targetName = this->Namespace;
-    targetName += target->GetExportName();
+    targetName += target->Target->GetExportName();
     os << "set_target_properties(" << targetName << " PROPERTIES\n";
     for(ImportPropertyMap::const_iterator pi = properties.begin();
         pi != properties.end(); ++pi)
@@ -638,12 +638,12 @@ void cmExportFileGenerator::GenerateInterfaceProperties(cmTarget const* target,
 //----------------------------------------------------------------------------
 bool
 cmExportFileGenerator::AddTargetNamespace(std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets)
 {
-  cmMakefile *mf = target->GetMakefile();
+  cmLocalGenerator *lg = target->GetLocalGenerator();
 
-  cmTarget *tgt = mf->FindTargetToUse(input);
+  cmGeneratorTarget *tgt = lg->FindGeneratorTargetToUse(input);
   if (!tgt)
     {
     return false;
@@ -655,13 +655,14 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
     }
   if(this->ExportedTargets.find(tgt) != this->ExportedTargets.end())
     {
-    input = this->Namespace + tgt->GetExportName();
+    input = this->Namespace + tgt->Target->GetExportName();
     }
   else
     {
     std::string namespacedTarget;
     this->HandleMissingTarget(namespacedTarget, missingTargets,
-                              mf, target, tgt);
+                              target->Target->GetMakefile(),
+                              target->Target, tgt->Target);
     if (!namespacedTarget.empty())
       {
       input = namespacedTarget;
@@ -674,7 +675,7 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input,
 void
 cmExportFileGenerator::ResolveTargetsInGeneratorExpressions(
                                     std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets,
                                     FreeTargetsReplace replace)
 {
@@ -711,14 +712,12 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpressions(
 void
 cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
                                     std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets)
 {
   std::string::size_type pos = 0;
   std::string::size_type lastPos = pos;
 
-  cmMakefile *mf = target->GetMakefile();
-
   while((pos = input.find("$<TARGET_PROPERTY:", lastPos)) != input.npos)
     {
     std::string::size_type nameStartPos = pos +
@@ -779,7 +778,7 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
 
   if (!errorString.empty())
     {
-    mf->IssueMessage(cmake::FATAL_ERROR, errorString);
+    target->GetLocalGenerator()->IssueMessage(cmake::FATAL_ERROR, errorString);
     }
 }
 
@@ -860,7 +859,7 @@ cmExportFileGenerator
                                                          preprocessRule);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target->Target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                missingTargets,
                                                ReplaceFreeTargets);
     properties["IMPORTED_LINK_INTERFACE_LIBRARIES" + suffix] = prepro;
@@ -962,7 +961,7 @@ cmExportFileGenerator
     sep = ";";
 
     std::string temp = *li;
-    this->AddTargetNamespace(temp, target->Target, missingTargets);
+    this->AddTargetNamespace(temp, target, missingTargets);
     link_entries += temp;
     }
 
@@ -1044,12 +1043,12 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os,
 //----------------------------------------------------------------------------
 void
 cmExportFileGenerator
-::GenerateImportTargetCode(std::ostream& os, cmTarget const* target)
+::GenerateImportTargetCode(std::ostream& os, const cmGeneratorTarget* target)
 {
   // Construct the imported target name.
   std::string targetName = this->Namespace;
 
-  targetName += target->GetExportName();
+  targetName += target->Target->GetExportName();
 
   // Create the imported target.
   os << "# Create imported target " << targetName << "\n";
@@ -1078,27 +1077,27 @@ cmExportFileGenerator
     }
 
   // Mark the imported executable if it has exports.
-  if(target->IsExecutableWithExports())
+  if(target->Target->IsExecutableWithExports())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY ENABLE_EXPORTS 1)\n";
     }
 
   // Mark the imported library if it is a framework.
-  if(target->IsFrameworkOnApple())
+  if(target->Target->IsFrameworkOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY FRAMEWORK 1)\n";
     }
 
   // Mark the imported executable if it is an application bundle.
-  if(target->IsAppBundleOnApple())
+  if(target->Target->IsAppBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY MACOSX_BUNDLE 1)\n";
     }
 
-  if (target->IsCFBundleOnApple())
+  if (target->Target->IsCFBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY BUNDLE 1)\n";
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 44f779b..3280a03 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -75,7 +75,8 @@ protected:
                                 const std::string& config = "");
   void GenerateImportFooterCode(std::ostream& os);
   void GenerateImportVersionCode(std::ostream& os);
-  void GenerateImportTargetCode(std::ostream& os, cmTarget const* target);
+  void GenerateImportTargetCode(std::ostream& os,
+                                cmGeneratorTarget const* target);
   void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
                                   cmTarget const* target,
                                   ImportPropertyMap const& properties);
@@ -122,19 +123,21 @@ protected:
                                    cmTarget* depender,
                                    cmTarget* dependee) = 0;
   void PopulateInterfaceProperty(const std::string&,
-                                 cmTarget *target,
+                                 cmGeneratorTarget *target,
                                  cmGeneratorExpression::PreprocessContext,
                                  ImportPropertyMap &properties,
                                  std::vector<std::string> &missingTargets);
-  bool PopulateInterfaceLinkLibrariesProperty(cmTarget *target,
+  bool PopulateInterfaceLinkLibrariesProperty(cmGeneratorTarget* target,
                                  cmGeneratorExpression::PreprocessContext,
                                  ImportPropertyMap &properties,
                                  std::vector<std::string> &missingTargets);
-  void PopulateInterfaceProperty(const std::string& propName, cmTarget *target,
+  void PopulateInterfaceProperty(const std::string& propName,
+                                 cmGeneratorTarget* target,
                                  ImportPropertyMap &properties);
   void PopulateCompatibleInterfaceProperties(cmGeneratorTarget *target,
                                  ImportPropertyMap &properties);
-  void GenerateInterfaceProperties(cmTarget const* target, std::ostream& os,
+  void GenerateInterfaceProperties(cmGeneratorTarget const* target,
+                                   std::ostream& os,
                                    const ImportPropertyMap &properties);
   void PopulateIncludeDirectoriesInterface(
                       cmTargetExport *target,
@@ -159,7 +162,7 @@ protected:
   };
 
   void ResolveTargetsInGeneratorExpressions(std::string &input,
-                          cmTarget* target,
+                          cmGeneratorTarget* target,
                           std::vector<std::string> &missingTargets,
                           FreeTargetsReplace replace = NoReplaceFreeTargets);
 
@@ -182,20 +185,20 @@ protected:
   bool AppendMode;
 
   // The set of targets included in the export.
-  std::set<cmTarget*> ExportedTargets;
+  std::set<cmGeneratorTarget*> ExportedTargets;
 
 private:
   void PopulateInterfaceProperty(const std::string&, const std::string&,
-                                 cmTarget *target,
+                                 cmGeneratorTarget* target,
                                  cmGeneratorExpression::PreprocessContext,
                                  ImportPropertyMap &properties,
                                  std::vector<std::string> &missingTargets);
 
-  bool AddTargetNamespace(std::string &input, cmTarget* target,
+  bool AddTargetNamespace(std::string &input, cmGeneratorTarget* target,
                           std::vector<std::string> &missingTargets);
 
   void ResolveTargetsInGeneratorExpression(std::string &input,
-                                    cmTarget* target,
+                                    cmGeneratorTarget* target,
                                     std::vector<std::string> &missingTargets);
 
   virtual void ReplaceInstallPrefix(std::string &input);
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index d7ca6d5..da963f3 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -52,7 +52,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         sep + this->Namespace + (*tei)->Target->Target->GetExportName();
     sep = " ";
     cmTargetExport * te = *tei;
-    if(this->ExportedTargets.insert(te->Target->Target).second)
+    if(this->ExportedTargets.insert(te->Target).second)
       {
       allTargets.push_back(te);
       }
@@ -133,12 +133,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       tei != allTargets.end(); ++tei)
     {
     cmGeneratorTarget* gt = (*tei)->Target;
-    cmTarget* te = gt->Target;
 
     requiresConfigFiles = requiresConfigFiles
-                              || te->GetType() != cmState::INTERFACE_LIBRARY;
+                              || gt->GetType() != cmState::INTERFACE_LIBRARY;
 
-    this->GenerateImportTargetCode(os, te);
+    this->GenerateImportTargetCode(os, gt);
 
     ImportPropertyMap properties;
 
@@ -149,32 +148,32 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_AUTOUIC_OPTIONS",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_FEATURES",
-                                  te,
+                                  gt,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
 
     const bool newCMP0022Behavior =
-                              te->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                           && te->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gt->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gt->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
-      if (this->PopulateInterfaceLinkLibrariesProperty(te,
+      if (this->PopulateInterfaceLinkLibrariesProperty(gt,
                                     cmGeneratorExpression::InstallInterface,
                                     properties, missingTargets)
           && !this->ExportOld)
@@ -182,11 +181,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         require2_8_12 = true;
         }
       }
-    if (te->GetType() == cmState::INTERFACE_LIBRARY)
+    if (gt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       require3_0_0 = true;
       }
-    if(te->GetProperty("INTERFACE_SOURCES"))
+    if(gt->GetProperty("INTERFACE_SOURCES"))
       {
       // We can only generate INTERFACE_SOURCES in CMake 3.3, but CMake 3.1
       // can consume them.
@@ -194,11 +193,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       }
 
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
-                                  te, properties);
+                                  gt, properties);
 
     this->PopulateCompatibleInterfaceProperties(gt, properties);
 
-    this->GenerateInterfaceProperties(gt->Target, os, properties);
+    this->GenerateInterfaceProperties(gt, os, properties);
     }
 
   if (require3_1_0)
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 0fafa86..1daa67e 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -28,38 +28,38 @@ cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
 
 bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
 {
-  std::set<cmTarget const*> emitted;
-  std::set<cmTarget const*> emittedDeps;
+  std::set<cmGeneratorTarget const*> emitted;
+  std::set<cmGeneratorTarget const*> emittedDeps;
   while(!this->Exports.empty())
     {
     cmGeneratorTarget const* te = this->Exports.back();
     this->Exports.pop_back();
-    if (emitted.insert(te->Target).second)
+    if (emitted.insert(te).second)
       {
-      emittedDeps.insert(te->Target);
-      this->GenerateImportTargetCode(os, te->Target);
+      emittedDeps.insert(te);
+      this->GenerateImportTargetCode(os, te);
 
       ImportPropertyMap properties;
 
 #define FIND_TARGETS(PROPERTY) \
-      this->FindTargets("INTERFACE_" #PROPERTY, te->Target, emittedDeps);
+      this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 
 #undef FIND_TARGETS
 
-      this->PopulateProperties(te->Target, properties, emittedDeps);
+      this->PopulateProperties(te, properties, emittedDeps);
 
-      this->GenerateInterfaceProperties(te->Target, os, properties);
+      this->GenerateInterfaceProperties(te, os, properties);
       }
     }
   return true;
 }
 
 std::string cmExportTryCompileFileGenerator::FindTargets(
-                                          const std::string& propName,
-                                          cmTarget const* tgt,
-                                          std::set<cmTarget const*> &emitted)
+                                  const std::string& propName,
+                                  cmGeneratorTarget const* tgt,
+                                  std::set<cmGeneratorTarget const*> &emitted)
 {
   const char *prop = tgt->GetProperty(propName);
   if(!prop)
@@ -77,24 +77,22 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
 
   cmTarget dummyHead;
   dummyHead.SetType(cmState::EXECUTABLE, "try_compile_dummy_exe");
-  dummyHead.SetMakefile(tgt->GetMakefile());
+  dummyHead.SetMakefile(tgt->Target->GetMakefile());
 
-  cmGeneratorTarget* gtgt =
-      tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
-  cmGeneratorTarget gDummyHead(&dummyHead, gtgt->GetLocalGenerator());
+  cmGeneratorTarget gDummyHead(&dummyHead, tgt->GetLocalGenerator());
 
-  std::string result = cge->Evaluate(gtgt->GetLocalGenerator(), this->Config,
+  std::string result = cge->Evaluate(tgt->GetLocalGenerator(), this->Config,
                                      false, &gDummyHead,
-                                     gtgt, &dagChecker);
+                                     tgt, &dagChecker);
 
   const std::set<cmGeneratorTarget const*> &allTargets =
       cge->GetAllTargetsSeen();
   for(std::set<cmGeneratorTarget const*>::const_iterator li =
       allTargets.begin(); li != allTargets.end(); ++li)
     {
-    if(emitted.insert((*li)->Target).second)
+    if(emitted.insert(*li).second)
       {
-      this->Exports.push_back((*li));
+      this->Exports.push_back(*li);
       }
     }
   return result;
@@ -102,13 +100,12 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
 
 //----------------------------------------------------------------------------
 void
-cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
-                                                ImportPropertyMap& properties,
-                                          std::set<cmTarget const*> &emitted)
+cmExportTryCompileFileGenerator::PopulateProperties(
+                                 const cmGeneratorTarget* target,
+                                 ImportPropertyMap& properties,
+                                 std::set<cmGeneratorTarget const*> &emitted)
 {
-  cmPropertyMap props = target->GetProperties();
-  cmGeneratorTarget* gt =
-      target->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(target);
+  cmPropertyMap props = target->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     properties[i->first] = i->second.GetValue();
@@ -126,8 +123,8 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
           li != depends.end(); ++li)
         {
         cmGeneratorTarget *tgt =
-            gt->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
-        if(tgt && emitted.insert(tgt->Target).second)
+            target->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
+        if(tgt && emitted.insert(tgt).second)
           {
           this->Exports.push_back(tgt);
           }
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 4507787..19d8024 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -41,15 +41,16 @@ protected:
                                    cmTarget*,
                                    cmTarget*) {}
 
-  void PopulateProperties(cmTarget const* target,
+  void PopulateProperties(cmGeneratorTarget const* target,
                           ImportPropertyMap& properties,
-                          std::set<cmTarget const*> &emitted);
+                          std::set<const cmGeneratorTarget*>& emitted);
 
   std::string InstallNameDir(cmGeneratorTarget* target,
                              const std::string& config);
 private:
-  std::string FindTargets(const std::string& prop, cmTarget const* tgt,
-                   std::set<cmTarget const*> &emitted);
+  std::string FindTargets(const std::string& prop,
+                          const cmGeneratorTarget* tgt,
+                          std::set<const cmGeneratorTarget*>& emitted);
 
 
   std::vector<cmGeneratorTarget const*> Exports;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1293c1561a58b2f8b0bd4ec05bb249fc36f487ac
commit 1293c1561a58b2f8b0bd4ec05bb249fc36f487ac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 14:27:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:29 2015 +0200

    cmExportTryCompileFileGenerator: Port to cmGeneratorTarget.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 5bb0f99..4a1f770 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -34,7 +34,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
   std::string outputVariable;
   std::string copyFile;
   std::string copyFileError;
-  std::vector<cmTarget const*> targets;
+  std::vector<std::string> targets;
   std::string libsToLink = " ";
   bool useOldLinkLibs = true;
   char targetNameBuf[64];
@@ -112,7 +112,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
           }
         if (tgt->IsImported())
           {
-          targets.push_back(tgt);
+          targets.push_back(argv[i]);
           }
         }
       }
@@ -375,9 +375,8 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
     if (!targets.empty())
       {
       std::string fname = "/" + std::string(targetName) + "Targets.cmake";
-      cmExportTryCompileFileGenerator tcfg(gg);
+      cmExportTryCompileFileGenerator tcfg(gg, targets, this->Makefile);
       tcfg.SetExportFile((this->BinaryDirectory + fname).c_str());
-      tcfg.SetExports(targets);
       tcfg.SetConfig(this->Makefile->GetSafeDefinition(
                                           "CMAKE_TRY_COMPILE_CONFIGURATION"));
 
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index d0e65e1..0fafa86 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -14,13 +14,16 @@
 
 #include "cmGeneratedFileStream.h"
 #include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
 #include "cmGeneratorExpressionDAGChecker.h"
 
 //----------------------------------------------------------------------------
 cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
-    cmGlobalGenerator* gg)
+    cmGlobalGenerator* gg,
+    const std::vector<std::string>& targets,
+    cmMakefile* mf)
 {
-  gg->CreateGenerationObjects(cmGlobalGenerator::ImportedOnly);
+  gg->CreateImportedGenerationObjects(mf, targets, this->Exports);
 }
 
 bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
@@ -29,25 +32,25 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
   std::set<cmTarget const*> emittedDeps;
   while(!this->Exports.empty())
     {
-    cmTarget const* te = this->Exports.back();
+    cmGeneratorTarget const* te = this->Exports.back();
     this->Exports.pop_back();
-    if (emitted.insert(te).second)
+    if (emitted.insert(te->Target).second)
       {
-      emittedDeps.insert(te);
-      this->GenerateImportTargetCode(os, te);
+      emittedDeps.insert(te->Target);
+      this->GenerateImportTargetCode(os, te->Target);
 
       ImportPropertyMap properties;
 
 #define FIND_TARGETS(PROPERTY) \
-      this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
+      this->FindTargets("INTERFACE_" #PROPERTY, te->Target, emittedDeps);
 
       CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
 
 #undef FIND_TARGETS
 
-      this->PopulateProperties(te, properties, emittedDeps);
+      this->PopulateProperties(te->Target, properties, emittedDeps);
 
-      this->GenerateInterfaceProperties(te, os, properties);
+      this->GenerateInterfaceProperties(te->Target, os, properties);
       }
     }
   return true;
@@ -91,7 +94,7 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
     {
     if(emitted.insert((*li)->Target).second)
       {
-      this->Exports.push_back((*li)->Target);
+      this->Exports.push_back((*li));
       }
     }
   return result;
@@ -104,6 +107,8 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
                                           std::set<cmTarget const*> &emitted)
 {
   cmPropertyMap props = target->GetProperties();
+  cmGeneratorTarget* gt =
+      target->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(target);
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     properties[i->first] = i->second.GetValue();
@@ -120,8 +125,9 @@ cmExportTryCompileFileGenerator::PopulateProperties(cmTarget const* target,
       for(std::vector<std::string>::const_iterator li = depends.begin();
           li != depends.end(); ++li)
         {
-        cmTarget *tgt = target->GetMakefile()->FindTargetToUse(*li);
-        if(tgt && emitted.insert(tgt).second)
+        cmGeneratorTarget *tgt =
+            gt->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
+        if(tgt && emitted.insert(tgt->Target).second)
           {
           this->Exports.push_back(tgt);
           }
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h
index 8838eca..4507787 100644
--- a/Source/cmExportTryCompileFileGenerator.h
+++ b/Source/cmExportTryCompileFileGenerator.h
@@ -20,11 +20,11 @@ class cmInstallTargetGenerator;
 class cmExportTryCompileFileGenerator: public cmExportFileGenerator
 {
 public:
-  cmExportTryCompileFileGenerator(cmGlobalGenerator* gg);
+  cmExportTryCompileFileGenerator(cmGlobalGenerator* gg,
+                                  std::vector<std::string> const& targets,
+                                  cmMakefile* mf);
 
   /** Set the list of targets to export.  */
-  void SetExports(const std::vector<cmTarget const*> &exports)
-    { this->Exports = exports; }
   void SetConfig(const std::string& config) { this->Config = config; }
 protected:
 
@@ -52,7 +52,7 @@ private:
                    std::set<cmTarget const*> &emitted);
 
 
-  std::vector<cmTarget const*> Exports;
+  std::vector<cmGeneratorTarget const*> Exports;
   std::string Config;
 };
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 9d54f6f..f54f936 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1202,6 +1202,26 @@ void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
   this->ComputeBuildFileGenerators();
 }
 
+void cmGlobalGenerator::CreateImportedGenerationObjects(cmMakefile* mf,
+    const std::vector<std::string>& targets,
+    std::vector<const cmGeneratorTarget*>& exports)
+{
+  this->CreateGenerationObjects(ImportedOnly);
+  std::vector<cmMakefile*>::iterator mfit =
+      std::find(this->Makefiles.begin(), this->Makefiles.end(), mf);
+  cmLocalGenerator* lg =
+      this->LocalGenerators[std::distance(this->Makefiles.begin(), mfit)];
+  for (std::vector<std::string>::const_iterator it = targets.begin();
+       it != targets.end(); ++it)
+    {
+    cmGeneratorTarget* gt = lg->FindGeneratorTargetToUse(*it);
+    if (gt)
+      {
+      exports.push_back(gt);
+      }
+    }
+}
+
 cmExportBuildFileGenerator*
 cmGlobalGenerator::GetExportedTargetsFile(const std::string &filename) const
 {
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ad8992f..4e6b11d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -91,6 +91,9 @@ public:
     ImportedOnly
   };
 
+  void CreateImportedGenerationObjects(cmMakefile* mf,
+                             std::vector<std::string> const& targets,
+                             std::vector<cmGeneratorTarget const*>& exports);
   void CreateGenerationObjects(TargetTypes targetTypes = AllTargets);
 
   /**

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=381e7afd363d64c72b83e69fd6c6cad5fc3eefb4
commit 381e7afd363d64c72b83e69fd6c6cad5fc3eefb4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 13:31:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:29 2015 +0200

    cmExportSet: Store a cmGeneratorTarget.
    
    Set the member at compute time from the stored name.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 72b101f..30a8bf2 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -27,6 +27,10 @@ cmExportBuildFileGenerator::cmExportBuildFileGenerator()
 void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
 {
   this->LG = lg;
+  if (this->ExportSet)
+    {
+    this->ExportSet->Compute(lg);
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -274,7 +278,7 @@ void cmExportBuildFileGenerator
           tei = this->ExportSet->GetTargetExports()->begin();
           tei != this->ExportSet->GetTargetExports()->end(); ++tei)
       {
-      targets.push_back((*tei)->GetName());
+      targets.push_back((*tei)->TargetName);
       }
     return;
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 6127626..4e8bc86 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -398,11 +398,11 @@ void cmExportFileGenerator::PopulateSourcesInterface(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  cmTarget *target = tei->Target;
+  cmGeneratorTarget* gt = tei->Target;
   assert(preprocessRule == cmGeneratorExpression::InstallInterface);
 
   const char *propName = "INTERFACE_SOURCES";
-  const char *input = target->GetProperty(propName);
+  const char *input = gt->GetProperty(propName);
 
   if (!input)
     {
@@ -420,11 +420,9 @@ void cmExportFileGenerator::PopulateSourcesInterface(
                                                          true);
   if (!prepro.empty())
     {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target,
+    this->ResolveTargetsInGeneratorExpressions(prepro, gt->Target,
                                                 missingTargets);
 
-    cmGeneratorTarget* gt = target->GetMakefile()
-        ->GetGlobalGenerator()->GetGeneratorTarget(target);
     if (!checkInterfaceDirs(prepro, gt, propName))
       {
       return;
@@ -440,9 +438,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  cmGeneratorTarget *target = tei->Target->GetMakefile()
-                                 ->GetGlobalGenerator()
-                                 ->GetGeneratorTarget(tei->Target);
+  cmGeneratorTarget *target = tei->Target;
   assert(preprocessRule == cmGeneratorExpression::InstallInterface);
 
   const char *propName = "INTERFACE_INCLUDE_DIRECTORIES";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 5a51442..d7ca6d5 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -48,10 +48,11 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
       tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
     {
-    expectedTargets += sep + this->Namespace + (*tei)->Target->GetExportName();
+    expectedTargets +=
+        sep + this->Namespace + (*tei)->Target->Target->GetExportName();
     sep = " ";
     cmTargetExport * te = *tei;
-    if(this->ExportedTargets.insert(te->Target).second)
+    if(this->ExportedTargets.insert(te->Target->Target).second)
       {
       allTargets.push_back(te);
       }
@@ -131,7 +132,8 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
         tei = allTargets.begin();
       tei != allTargets.end(); ++tei)
     {
-    cmTarget* te = (*tei)->Target;
+    cmGeneratorTarget* gt = (*tei)->Target;
+    cmTarget* te = gt->Target;
 
     requiresConfigFiles = requiresConfigFiles
                               || te->GetType() != cmState::INTERFACE_LIBRARY;
@@ -193,13 +195,10 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
-    cmGeneratorTarget *gtgt = te->GetMakefile()
-                                ->GetGlobalGenerator()
-                                ->GetGeneratorTarget(te);
 
-    this->PopulateCompatibleInterfaceProperties(gtgt, properties);
+    this->PopulateCompatibleInterfaceProperties(gt, properties);
 
-    this->GenerateInterfaceProperties(te, os, properties);
+    this->GenerateInterfaceProperties(gt->Target, os, properties);
     }
 
   if (require3_1_0)
@@ -362,8 +361,7 @@ cmExportInstallFileGenerator
     if(!properties.empty())
       {
       // Get the rest of the target details.
-      cmGeneratorTarget *gtgt = te->Target->GetMakefile()
-                    ->GetGlobalGenerator()->GetGeneratorTarget(te->Target);
+      cmGeneratorTarget *gtgt = te->Target;
       this->SetImportDetailProperties(config, suffix,
                                       gtgt, properties, missingTargets);
 
@@ -378,8 +376,8 @@ cmExportInstallFileGenerator
       //                              properties);
 
       // Generate code in the export file.
-      this->GenerateImportPropertyCode(os, config, te->Target, properties);
-      this->GenerateImportedFileChecksCode(os, te->Target, properties,
+      this->GenerateImportPropertyCode(os, config, gtgt->Target, properties);
+      this->GenerateImportedFileChecksCode(os, gtgt->Target, properties,
                                            importedLocations);
       }
     }
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index 4148fb5..0059b64 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -13,12 +13,22 @@
 #include "cmExportSet.h"
 #include "cmTargetExport.h"
 #include "cmAlgorithms.h"
+#include "cmLocalGenerator.h"
 
 cmExportSet::~cmExportSet()
 {
   cmDeleteAll(this->TargetExports);
 }
 
+void cmExportSet::Compute(cmLocalGenerator* lg)
+{
+  for (std::vector<cmTargetExport*>::iterator it = this->TargetExports.begin();
+       it != this->TargetExports.end(); ++it)
+    {
+    (*it)->Target = lg->FindGeneratorTargetToUse((*it)->TargetName);
+    }
+}
+
 void cmExportSet::AddTargetExport(cmTargetExport* te)
 {
   this->TargetExports.push_back(te);
diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h
index a57aa12..d780a22 100644
--- a/Source/cmExportSet.h
+++ b/Source/cmExportSet.h
@@ -15,6 +15,7 @@
 #include "cmSystemTools.h"
 class cmTargetExport;
 class cmInstallExportGenerator;
+class cmLocalGenerator;
 
 /// A set of targets that were installed with the same EXPORT parameter.
 class cmExportSet
@@ -25,6 +26,8 @@ public:
   /// Destructor
   ~cmExportSet();
 
+  void Compute(cmLocalGenerator* lg);
+
   void AddTargetExport(cmTargetExport* tgt);
 
   void AddInstallation(cmInstallExportGenerator const* installation);
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index c22edf3..6b06fce 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -773,7 +773,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
     if(!exports.GetString().empty() && !namelinkOnly)
       {
       cmTargetExport *te = new cmTargetExport;
-      te->Target = &target;
+      te->TargetName = target.GetName();
       te->ArchiveGenerator = archiveGenerator;
       te->BundleGenerator = bundleGenerator;
       te->FrameworkGenerator = frameworkGenerator;
@@ -1379,16 +1379,17 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args)
         tei != exportSet->GetTargetExports()->end(); ++tei)
       {
       cmTargetExport const* te = *tei;
+      cmTarget* tgt = this->Makefile->FindTarget(te->TargetName);
       const bool newCMP0022Behavior =
-                      te->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                   && te->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+                      tgt->GetPolicyStatusCMP0022() != cmPolicies::WARN
+                   && tgt->GetPolicyStatusCMP0022() != cmPolicies::OLD;
 
       if(!newCMP0022Behavior)
         {
         std::ostringstream e;
         e << "INSTALL(EXPORT) given keyword \""
           << "EXPORT_LINK_INTERFACE_LIBRARIES" << "\", but target \""
-          << te->Target->GetName()
+          << te->TargetName
           << "\" does not have policy CMP0022 set to NEW.";
         this->SetError(e.str());
         return false;
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index f7c9cc2..9570ba3 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -56,6 +56,7 @@ cmInstallExportGenerator::~cmInstallExportGenerator()
 void cmInstallExportGenerator::Compute(cmLocalGenerator* lg)
 {
   this->LocalGenerator = lg;
+  this->ExportSet->Compute(lg);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTargetExport.h b/Source/cmTargetExport.h
index 7665888..2781337 100644
--- a/Source/cmTargetExport.h
+++ b/Source/cmTargetExport.h
@@ -14,7 +14,7 @@
 
 #include "cmStandardIncludes.h"
 
-class cmTarget;
+class cmGeneratorTarget;
 class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 
@@ -25,7 +25,8 @@ class cmInstallFilesGenerator;
 class cmTargetExport
 {
 public:
-  cmTarget* Target; ///< The target
+  std::string TargetName;
+  cmGeneratorTarget* Target;
 
   ///@name Generators
   ///@{

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65911cae4dd5a81f23a59bf9187b95bda3168fe9
commit 65911cae4dd5a81f23a59bf9187b95bda3168fe9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 13:29:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:29 2015 +0200

    cmGlobalGenerator: Compute export() related classes early.
    
    Simplify CMP0024 handling.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a42ea22..9d54f6f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1199,6 +1199,7 @@ void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
   cmDeleteAll(this->GeneratorTargets);
   this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
+  this->ComputeBuildFileGenerators();
 }
 
 cmExportBuildFileGenerator*
@@ -1279,8 +1280,6 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
-  this->ComputeBuildFileGenerators();
-
   unsigned int i;
 
   // Add generator specific helper commands
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 6887409..ad8992f 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -365,8 +365,6 @@ public:
   bool GetConfigureDoneCMP0026() const
   { return this->ConfigureDoneCMP0026AndCMP0024; }
 
-  void ComputeBuildFileGenerators();
-
   std::string MakeSilentFlag;
 protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
@@ -471,6 +469,8 @@ private:
   void CheckCompilerIdCompatibility(cmMakefile* mf,
                                     std::string const& lang) const;
 
+  void ComputeBuildFileGenerators();
+
   cmExternalMakefileProjectGenerator* ExtraGenerator;
 
   // track files replaced during a Generate
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 97d4d56..8890e2b 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -126,7 +126,6 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
-    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37ab74a607a021567a0a1e2c7df43da33d32d5ec
commit 37ab74a607a021567a0a1e2c7df43da33d32d5ec
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 22:31:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 18 16:29:29 2015 +0200

    cmLocalGenerator: Port PList handling to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d4ccde6..fec7a05 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2062,7 +2062,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       // a per-configuration Info.plist file. The cfbundle plist
       // is very similar to the application bundle plist
       this->CurrentLocalGenerator
-        ->GenerateAppleInfoPList(&target, "$(EXECUTABLE_NAME)",
+        ->GenerateAppleInfoPList(gtgt, "$(EXECUTABLE_NAME)",
                                  plist.c_str());
       std::string path =
         this->ConvertToRelativeForXCode(plist.c_str());
@@ -2111,7 +2111,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       // so let it replace the framework name. This avoids creating
       // a per-configuration Info.plist file.
       this->CurrentLocalGenerator
-        ->GenerateFrameworkInfoPList(&target, "$(EXECUTABLE_NAME)",
+        ->GenerateFrameworkInfoPList(gtgt, "$(EXECUTABLE_NAME)",
                                      plist.c_str());
       std::string path =
         this->ConvertToRelativeForXCode(plist.c_str());
@@ -2154,7 +2154,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       // so let it replace the executable name.  This avoids creating
       // a per-configuration Info.plist file.
       this->CurrentLocalGenerator
-        ->GenerateAppleInfoPList(&target, "$(EXECUTABLE_NAME)",
+        ->GenerateAppleInfoPList(gtgt, "$(EXECUTABLE_NAME)",
                                  plist.c_str());
       std::string path =
         this->ConvertToRelativeForXCode(plist.c_str());
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 60aff64..9d5dd8e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3012,7 +3012,7 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 }
 
 //----------------------------------------------------------------------------
-static void cmLGInfoProp(cmMakefile* mf, cmTarget* target,
+static void cmLGInfoProp(cmMakefile* mf, cmGeneratorTarget* target,
     const std::string& prop)
 {
   if(const char* val = target->GetProperty(prop))
@@ -3022,7 +3022,7 @@ static void cmLGInfoProp(cmMakefile* mf, cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::GenerateAppleInfoPList(cmTarget* target,
+void cmLocalGenerator::GenerateAppleInfoPList(cmGeneratorTarget* target,
                                               const std::string& targetName,
                                               const char* fname)
 {
@@ -3066,7 +3066,7 @@ void cmLocalGenerator::GenerateAppleInfoPList(cmTarget* target,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalGenerator::GenerateFrameworkInfoPList(cmTarget* target,
+void cmLocalGenerator::GenerateFrameworkInfoPList(cmGeneratorTarget* target,
                                                 const std::string& targetName,
                                                 const char* fname)
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 5d2a349..2bc0e4a 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -279,13 +279,14 @@ public:
   /**
    * Generate a Mac OS X application bundle Info.plist file.
    */
-  void GenerateAppleInfoPList(cmTarget* target, const std::string& targetName,
+  void GenerateAppleInfoPList(cmGeneratorTarget* target,
+                              const std::string& targetName,
                               const char* fname);
 
   /**
    * Generate a Mac OS X framework Info.plist file.
    */
-  void GenerateFrameworkInfoPList(cmTarget* target,
+  void GenerateFrameworkInfoPList(cmGeneratorTarget* target,
                                   const std::string& targetName,
                                   const char* fname);
   /** Construct a comment for a custom command.  */
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 4fe99e3..490759f 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -59,7 +59,7 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string& targetName,
   plist += "/";
   plist += this->GT->GetAppBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
-  this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateAppleInfoPList(this->GT,
                                                targetName,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);
@@ -90,7 +90,7 @@ void cmOSXBundleGenerator::CreateFramework(
   std::string plist = newoutpath;
   plist += "/Resources/Info.plist";
   std::string name = cmSystemTools::GetFilenameName(targetName);
-  this->LocalGenerator->GenerateFrameworkInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateFrameworkInfoPList(this->GT,
                                                    name,
                                                    plist.c_str());
 
@@ -182,7 +182,7 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
     this->GT->GetCFBundleDirectory(this->ConfigName, true);
   plist += "/Info.plist";
   std::string name = cmSystemTools::GetFilenameName(targetName);
-  this->LocalGenerator->GenerateAppleInfoPList(this->GT->Target,
+  this->LocalGenerator->GenerateAppleInfoPList(this->GT,
                                                name,
                                                plist.c_str());
   this->Makefile->AddCMakeOutputFile(plist);

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Oct 19 00:01:07 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon, 19 Oct 2015 00:01:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-250-gbf7d21b
Message-ID: <20151019040107.DF36FC06CE@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  bf7d21b0cd7bfad2469a4ae337056a754e6b0fe5 (commit)
      from  764720c32b8f5f1a4421b274100c213dba17ec1d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf7d21b0cd7bfad2469a4ae337056a754e6b0fe5
commit bf7d21b0cd7bfad2469a4ae337056a754e6b0fe5
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Oct 19 00:01:05 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 19 00:01:05 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ee3512f..782b0d7 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151018)
+set(CMake_VERSION_PATCH 20151019)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 09:15:55 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 09:15:55 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-687-ga478b43
Message-ID: <20151019131555.378E7C0137@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a478b43f4f505b79ff41b2068c70fcfc588f5336 (commit)
       via  bf7d21b0cd7bfad2469a4ae337056a754e6b0fe5 (commit)
       via  764720c32b8f5f1a4421b274100c213dba17ec1d (commit)
       via  2f269fdf0c293e80325c748c985279bc4067af3e (commit)
      from  a11fc241782983650d2acf21c02bc03b91e316a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a478b43f4f505b79ff41b2068c70fcfc588f5336
commit a478b43f4f505b79ff41b2068c70fcfc588f5336
Merge: a11fc24 bf7d21b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 09:15:41 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 09:15:41 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 09:17:04 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 09:17:04 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-690-ga376dc0
Message-ID: <20151019131704.6DF82C0198@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a376dc0290cc0086e1c13b816b6e0975b44874ed (commit)
       via  c6d75294b2827a7f24baed4814046d9d0bd6a61d (commit)
       via  9c6a7203fb0c6034771011a8ac58ae447726b919 (commit)
      from  a478b43f4f505b79ff41b2068c70fcfc588f5336 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a376dc0290cc0086e1c13b816b6e0975b44874ed
commit a376dc0290cc0086e1c13b816b6e0975b44874ed
Merge: a478b43 c6d7529
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 09:17:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 09:17:03 2015 -0400

    Merge topic 'update-kwsys' into next
    
    c6d75294 Merge branch 'upstream-kwsys' into update-kwsys
    9c6a7203 KWSys 2015-10-16 (a7e5360f)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6d75294b2827a7f24baed4814046d9d0bd6a61d
commit c6d75294b2827a7f24baed4814046d9d0bd6a61d
Merge: bf7d21b 9c6a720
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 09:16:32 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 09:16:32 2015 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c6a7203fb0c6034771011a8ac58ae447726b919
commit 9c6a7203fb0c6034771011a8ac58ae447726b919
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Fri Oct 16 09:04:33 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 09:16:26 2015 -0400

    KWSys 2015-10-16 (a7e5360f)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ a7e5360f | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' ed82989c..a7e5360f
    Jan Niklas Hasse (1):
          a7e5360f Terminal: Force color output when CLICOLOR_FORCE is set != 0

diff --git a/Terminal.c b/Terminal.c
index d13f79a..a8abb6c 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -184,14 +184,25 @@ static const char* kwsysTerminalVT100Names[] =
 static int kwsysTerminalStreamIsVT100(FILE* stream, int default_vt100,
                                       int default_tty)
 {
+  /* Force color according to http://bixense.com/clicolors/ convention.  */
+  {
+  const char* clicolor_force = getenv("CLICOLOR_FORCE");
+  if (clicolor_force && *clicolor_force && strcmp(clicolor_force, "0") != 0)
+    {
+    return 1;
+    }
+  }
+
   /* If running inside emacs the terminal is not VT100.  Some emacs
      seem to claim the TERM is xterm even though they do not support
      VT100 escapes.  */
+  {
   const char* emacs = getenv("EMACS");
   if(emacs && *emacs == 't')
     {
     return 0;
     }
+  }
 
   /* Check for a valid terminal.  */
   if(!default_vt100)

-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/Terminal.c |   11 +++++++++++
 1 file changed, 11 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 10:43:44 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 10:43:44 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-692-g770cf22
Message-ID: <20151019144344.EEC53BF7AD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  770cf22f35ebcbc48afdeb1db41f9a93ffb5cc42 (commit)
       via  5908dcb66e251ac32693ab3329bc64120a019dd9 (commit)
      from  a376dc0290cc0086e1c13b816b6e0975b44874ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=770cf22f35ebcbc48afdeb1db41f9a93ffb5cc42
commit 770cf22f35ebcbc48afdeb1db41f9a93ffb5cc42
Merge: a376dc0 5908dcb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 10:43:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 10:43:44 2015 -0400

    Merge topic 'deprecate-CMakeForceCompiler' into next
    
    5908dcb6 CMakeForceCompiler: Deprecate this module and its macros


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5908dcb66e251ac32693ab3329bc64120a019dd9
commit 5908dcb66e251ac32693ab3329bc64120a019dd9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 10:26:07 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 10:42:34 2015 -0400

    CMakeForceCompiler: Deprecate this module and its macros
    
    This module was added by commit v2.6.0~1489 (...supporting embedded
    compilers..., 2007-07-02) to avoid needing to build the compiler id
    detection source on toolchains that need special flags or linker files
    to produce executables.  Since then CMake has learned other ways to
    identify such compilers (e.g. passing vendor-specific verion flags and
    checking for vendor-specific banners in the output).  Furthermore, CMake
    now detects a lot more than just the compiler id during language
    initialization in order to support things like <LANG>_STANDARD and
    COMPILE_FEATURES.  Therefore CMakeForceCompiler is no longer a viable
    approach because it skips such detection.
    
    One remaining challenge to support toolchains that require special
    linker files is to build the test for a working compiler, compiler ABI
    detection binary, and other try_compile cases.  This will have to be
    worked out as such cases are encountered.

diff --git a/Help/release/dev/deprecate-CMakeForceCompiler.rst b/Help/release/dev/deprecate-CMakeForceCompiler.rst
new file mode 100644
index 0000000..dc6e817
--- /dev/null
+++ b/Help/release/dev/deprecate-CMakeForceCompiler.rst
@@ -0,0 +1,5 @@
+deprecate-CMakeForceCompiler
+----------------------------
+
+* The :module:`CMakeForceCompiler` module and its macros are now deprecated.
+  See module documentation for an explanation.
diff --git a/Modules/CMakeForceCompiler.cmake b/Modules/CMakeForceCompiler.cmake
index 1d8b110..343ab3f 100644
--- a/Modules/CMakeForceCompiler.cmake
+++ b/Modules/CMakeForceCompiler.cmake
@@ -2,11 +2,17 @@
 # CMakeForceCompiler
 # ------------------
 #
+# Deprecated.  Do not use.
 #
+# The macros provided by this module were once intended for use by
+# cross-compiling toolchain files when CMake was not able to automatically
+# detect the compiler identification.  Since the introduction of this module,
+# CMake's compiler identification capabilities have improved and can now be
+# taught to recognize any compiler.  Furthermore, the suite of information
+# CMake detects from a compiler is now too extensive to be provided by
+# toolchain files using these macros.
 #
-# This module defines macros intended for use by cross-compiling
-# toolchain files when CMake is not able to automatically detect the
-# compiler identification.
+# -------------------------------------------------------------------------
 #
 # Macro CMAKE_FORCE_C_COMPILER has the following signature:
 #
@@ -64,6 +70,8 @@
 #  License text for the above reference.)
 
 macro(CMAKE_FORCE_C_COMPILER compiler id)
+  message(DEPRECATION "The CMAKE_FORCE_C_COMPILER macro is deprecated.  "
+    "Instead just set CMAKE_C_COMPILER and allow CMake to identify the compiler.")
   set(CMAKE_C_COMPILER "${compiler}")
   set(CMAKE_C_COMPILER_ID_RUN TRUE)
   set(CMAKE_C_COMPILER_ID ${id})
@@ -76,6 +84,8 @@ macro(CMAKE_FORCE_C_COMPILER compiler id)
 endmacro()
 
 macro(CMAKE_FORCE_CXX_COMPILER compiler id)
+  message(DEPRECATION "The CMAKE_FORCE_CXX_COMPILER macro is deprecated.  "
+    "Instead just set CMAKE_CXX_COMPILER and allow CMake to identify the compiler.")
   set(CMAKE_CXX_COMPILER "${compiler}")
   set(CMAKE_CXX_COMPILER_ID_RUN TRUE)
   set(CMAKE_CXX_COMPILER_ID ${id})
@@ -88,6 +98,8 @@ macro(CMAKE_FORCE_CXX_COMPILER compiler id)
 endmacro()
 
 macro(CMAKE_FORCE_Fortran_COMPILER compiler id)
+  message(DEPRECATION "The CMAKE_FORCE_Fortran_COMPILER macro is deprecated.  "
+    "Instead just set CMAKE_Fortran_COMPILER and allow CMake to identify the compiler.")
   set(CMAKE_Fortran_COMPILER "${compiler}")
   set(CMAKE_Fortran_COMPILER_ID_RUN TRUE)
   set(CMAKE_Fortran_COMPILER_ID ${id})

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/deprecate-CMakeForceCompiler.rst |    5 +++++
 Modules/CMakeForceCompiler.cmake                  |   18 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/deprecate-CMakeForceCompiler.rst


hooks/post-receive
-- 
CMake

From joe.snyder at kitware.com  Mon Oct 19 10:46:09 2015
From: joe.snyder at kitware.com (Joe Snyder)
Date: Mon, 19 Oct 2015 10:46:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-694-gf89d719
Message-ID: <20151019144609.50B2BBFD11@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f89d71957b470b16631cd1d54f5478aea1008530 (commit)
       via  2d4e6f4e1712472b6423efa3be8eddb8ff68c330 (commit)
      from  770cf22f35ebcbc48afdeb1db41f9a93ffb5cc42 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f89d71957b470b16631cd1d54f5478aea1008530
commit f89d71957b470b16631cd1d54f5478aea1008530
Merge: 770cf22 2d4e6f4
Author:     Joe Snyder <joe.snyder at kitware.com>
AuthorDate: Mon Oct 19 10:46:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 10:46:07 2015 -0400

    Merge topic 'fix_delphi_coverage' into next
    
    2d4e6f4e BUG: Switch Delphi Coverage Files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d4e6f4e1712472b6423efa3be8eddb8ff68c330
commit 2d4e6f4e1712472b6423efa3be8eddb8ff68c330
Author:     Joseph Snyder <joe.snyder at kitware.com>
AuthorDate: Wed Aug 13 18:03:53 2014 -0400
Commit:     Joseph Snyder <joe.snyder at kitware.com>
CommitDate: Wed Aug 13 18:03:53 2014 -0400

    BUG: Switch Delphi Coverage Files
    
    The HTML file for the Delphi Code coverage was being found by the Dashboard
    coverage run of CMake itself.  Switch it to be a configured file to
    eliminate this extra reading.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3f28c25..ae61bca 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2587,8 +2587,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
      "${CMake_BINARY_DIR}/Testing/DelphiCoverage/DartConfiguration.tcl")
   file(COPY "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/src"
     DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
-  file(COPY "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html"
-    DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
+  configure_file(
+    "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in"
+    "${CMake_BINARY_DIR}/Testing/DelphiCoverage/UTCovTest(UTCovTest.pas).html")
   add_test(NAME CTestDelphiCoverage
     COMMAND cmake -E chdir
     ${CMake_BINARY_DIR}/Testing/DelphiCoverage
diff --git a/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html b/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in
similarity index 100%
rename from Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html
rename to Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt                                              |    5 +++--
 ...vTest(UTCovTest.pas).html => UTCovTest(UTCovTest.pas).html.in} |    0
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename Tests/DelphiCoverage/{UTCovTest(UTCovTest.pas).html => UTCovTest(UTCovTest.pas).html.in} (100%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 11:07:54 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 11:07:54 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-696-g2dae101
Message-ID: <20151019150754.5CF93C0935@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2dae1015d77b7b83bdc1e77cb27c09ee16e46365 (commit)
       via  f19d6a2c953aef79a9b807a51c6b7a7379d888cb (commit)
      from  f89d71957b470b16631cd1d54f5478aea1008530 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dae1015d77b7b83bdc1e77cb27c09ee16e46365
commit 2dae1015d77b7b83bdc1e77cb27c09ee16e46365
Merge: f89d719 f19d6a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 11:07:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 11:07:53 2015 -0400

    Merge topic 'doc-add_test-requirements' into next
    
    f19d6a2c Help: Document add_test expectations of test command (#15798)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f19d6a2c953aef79a9b807a51c6b7a7379d888cb
commit f19d6a2c953aef79a9b807a51c6b7a7379d888cb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 11:07:01 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 11:07:01 2015 -0400

    Help: Document add_test expectations of test command (#15798)

diff --git a/Help/command/add_test.rst b/Help/command/add_test.rst
index 7e7e6bd..d8a96e9 100644
--- a/Help/command/add_test.rst
+++ b/Help/command/add_test.rst
@@ -28,6 +28,13 @@ quotes, or other characters special in CMake syntax.  The options are:
   directory set to the build directory corresponding to the
   current source directory.
 
+The given test command is expected to exit with code ``0`` to pass and
+non-zero to fail, or vice-versa if the :prop_test:`WILL_FAIL` test
+property is set.  Any output written to stdout or stderr will be
+captured by :manual:`ctest(1)` but does not affect the pass/fail status
+unless the :prop_test:`PASS_REGULAR_EXPRESSION` or
+:prop_test:`FAIL_REGULAR_EXPRESSION` test property is used.
+
 The ``COMMAND`` and ``WORKING_DIRECTORY`` options may use "generator
 expressions" with the syntax ``$<...>``.  See the
 :manual:`cmake-generator-expressions(7)` manual for available expressions.

-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_test.rst |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 11:10:43 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 11:10:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-698-g6569d40
Message-ID: <20151019151043.5E9EABBB85@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6569d40a72c9502b812c563f473871400bb87b0d (commit)
       via  ed77504d89f99c1a395b5472f51d181ad25b90c0 (commit)
      from  2dae1015d77b7b83bdc1e77cb27c09ee16e46365 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6569d40a72c9502b812c563f473871400bb87b0d
commit 6569d40a72c9502b812c563f473871400bb87b0d
Merge: 2dae101 ed77504
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 11:10:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 11:10:42 2015 -0400

    Merge topic 'deprecate-CMakeForceCompiler' into next
    
    ed77504d CMakeForceCompiler: Deprecate this module and its macros


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed77504d89f99c1a395b5472f51d181ad25b90c0
commit ed77504d89f99c1a395b5472f51d181ad25b90c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 10:26:07 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 11:09:27 2015 -0400

    CMakeForceCompiler: Deprecate this module and its macros
    
    This module was added by commit v2.6.0~1489 (...supporting embedded
    compilers..., 2007-07-02) to avoid needing to build the compiler id
    detection source on toolchains that need special flags or linker files
    to produce executables.  Since then CMake has learned other ways to
    identify such compilers (e.g. passing vendor-specific version flags and
    checking for vendor-specific banners in the output).  Furthermore, CMake
    now detects a lot more than just the compiler id during language
    initialization in order to support things like <LANG>_STANDARD and
    COMPILE_FEATURES.  Therefore CMakeForceCompiler is no longer a viable
    approach because it skips such detection.
    
    One remaining challenge to support toolchains that require special
    linker files is to build the test for a working compiler, compiler ABI
    detection binary, and other try_compile cases.  This will have to be
    worked out as such cases are encountered.

diff --git a/Help/release/dev/deprecate-CMakeForceCompiler.rst b/Help/release/dev/deprecate-CMakeForceCompiler.rst
new file mode 100644
index 0000000..dc6e817
--- /dev/null
+++ b/Help/release/dev/deprecate-CMakeForceCompiler.rst
@@ -0,0 +1,5 @@
+deprecate-CMakeForceCompiler
+----------------------------
+
+* The :module:`CMakeForceCompiler` module and its macros are now deprecated.
+  See module documentation for an explanation.
diff --git a/Modules/CMakeForceCompiler.cmake b/Modules/CMakeForceCompiler.cmake
index 1d8b110..343ab3f 100644
--- a/Modules/CMakeForceCompiler.cmake
+++ b/Modules/CMakeForceCompiler.cmake
@@ -2,11 +2,17 @@
 # CMakeForceCompiler
 # ------------------
 #
+# Deprecated.  Do not use.
 #
+# The macros provided by this module were once intended for use by
+# cross-compiling toolchain files when CMake was not able to automatically
+# detect the compiler identification.  Since the introduction of this module,
+# CMake's compiler identification capabilities have improved and can now be
+# taught to recognize any compiler.  Furthermore, the suite of information
+# CMake detects from a compiler is now too extensive to be provided by
+# toolchain files using these macros.
 #
-# This module defines macros intended for use by cross-compiling
-# toolchain files when CMake is not able to automatically detect the
-# compiler identification.
+# -------------------------------------------------------------------------
 #
 # Macro CMAKE_FORCE_C_COMPILER has the following signature:
 #
@@ -64,6 +70,8 @@
 #  License text for the above reference.)
 
 macro(CMAKE_FORCE_C_COMPILER compiler id)
+  message(DEPRECATION "The CMAKE_FORCE_C_COMPILER macro is deprecated.  "
+    "Instead just set CMAKE_C_COMPILER and allow CMake to identify the compiler.")
   set(CMAKE_C_COMPILER "${compiler}")
   set(CMAKE_C_COMPILER_ID_RUN TRUE)
   set(CMAKE_C_COMPILER_ID ${id})
@@ -76,6 +84,8 @@ macro(CMAKE_FORCE_C_COMPILER compiler id)
 endmacro()
 
 macro(CMAKE_FORCE_CXX_COMPILER compiler id)
+  message(DEPRECATION "The CMAKE_FORCE_CXX_COMPILER macro is deprecated.  "
+    "Instead just set CMAKE_CXX_COMPILER and allow CMake to identify the compiler.")
   set(CMAKE_CXX_COMPILER "${compiler}")
   set(CMAKE_CXX_COMPILER_ID_RUN TRUE)
   set(CMAKE_CXX_COMPILER_ID ${id})
@@ -88,6 +98,8 @@ macro(CMAKE_FORCE_CXX_COMPILER compiler id)
 endmacro()
 
 macro(CMAKE_FORCE_Fortran_COMPILER compiler id)
+  message(DEPRECATION "The CMAKE_FORCE_Fortran_COMPILER macro is deprecated.  "
+    "Instead just set CMAKE_Fortran_COMPILER and allow CMake to identify the compiler.")
   set(CMAKE_Fortran_COMPILER "${compiler}")
   set(CMAKE_Fortran_COMPILER_ID_RUN TRUE)
   set(CMAKE_Fortran_COMPILER_ID ${id})

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 13:05:22 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 13:05:22 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-252-g919f26f
Message-ID: <20151019170522.A2B2CC0A7B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  919f26ffba4e5b8e1c206182d906081da8c701e9 (commit)
       via  f19d6a2c953aef79a9b807a51c6b7a7379d888cb (commit)
      from  bf7d21b0cd7bfad2469a4ae337056a754e6b0fe5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=919f26ffba4e5b8e1c206182d906081da8c701e9
commit 919f26ffba4e5b8e1c206182d906081da8c701e9
Merge: bf7d21b f19d6a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 13:05:21 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 13:05:21 2015 -0400

    Merge topic 'doc-add_test-requirements'
    
    f19d6a2c Help: Document add_test expectations of test command (#15798)


-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_test.rst |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 13:05:45 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 13:05:45 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-700-g752c301
Message-ID: <20151019170545.B6315C0A83@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  752c301eae3244b8ec98dd389dc742f2d431fe09 (commit)
       via  919f26ffba4e5b8e1c206182d906081da8c701e9 (commit)
      from  6569d40a72c9502b812c563f473871400bb87b0d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=752c301eae3244b8ec98dd389dc742f2d431fe09
commit 752c301eae3244b8ec98dd389dc742f2d431fe09
Merge: 6569d40 919f26f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 13:05:34 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 13:05:34 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 13:07:45 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 13:07:45 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-255-g383abcd
Message-ID: <20151019170745.C12A6C0AA7@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  383abcdc35af1279d428886d8b3084282ffda5d1 (commit)
       via  22bfb39dea2476df8f7aa5ed5c773a7a6720c4bc (commit)
       via  7d94947a68e76c39cfbeaa14eeb69050afe1363d (commit)
      from  919f26ffba4e5b8e1c206182d906081da8c701e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 13:07:45 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 13:07:45 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-704-g6f61eae
Message-ID: <20151019170745.E31BAC0AA8@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6f61eaec79937e9706c86346dd419f1a7bcd6ab5 (commit)
       via  383abcdc35af1279d428886d8b3084282ffda5d1 (commit)
       via  22bfb39dea2476df8f7aa5ed5c773a7a6720c4bc (commit)
       via  7d94947a68e76c39cfbeaa14eeb69050afe1363d (commit)
      from  752c301eae3244b8ec98dd389dc742f2d431fe09 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f61eaec79937e9706c86346dd419f1a7bcd6ab5
commit 6f61eaec79937e9706c86346dd419f1a7bcd6ab5
Merge: 752c301 383abcd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 13:07:06 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 13:07:06 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 13:07:46 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 13:07:46 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.4.0-rc1-21-g22bfb39
Message-ID: <20151019170746.0A9AEC0AA9@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, release has been updated
       via  22bfb39dea2476df8f7aa5ed5c773a7a6720c4bc (commit)
       via  f19d6a2c953aef79a9b807a51c6b7a7379d888cb (commit)
       via  7d94947a68e76c39cfbeaa14eeb69050afe1363d (commit)
       via  c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67 (commit)
       via  4cd52dc5511c8c3809b7cb260ac6afa7eec65f2e (commit)
      from  be616c189d969f9f984356bd052e3b5f39290771 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_test.rst     |    7 +++++++
 Modules/ExternalProject.cmake |    3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 19 13:19:54 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 19 Oct 2015 13:19:54 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-709-gd21ed9a
Message-ID: <20151019171954.F3F22C035B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d21ed9a402e0056501539f5c2535991936131d59 (commit)
       via  4565a2e1c2643fcd1b40f4a041564fc4ab60c17c (commit)
       via  db3d85059c2e48b1a4da99230098f63d04dd4e93 (commit)
       via  c26ff8a90b985f7189aa114b0bcac35b2f476b55 (commit)
       via  30710b8d32344a7a9acf944f97fc947fd491cd65 (commit)
      from  6f61eaec79937e9706c86346dd419f1a7bcd6ab5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d21ed9a402e0056501539f5c2535991936131d59
commit d21ed9a402e0056501539f5c2535991936131d59
Merge: 6f61eae 4565a2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 13:19:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 13:19:53 2015 -0400

    Merge topic 'FindFLEX-DEFINES_FILE' into next
    
    4565a2e1 Help: Add notes for topic 'FindFLEX-DEFINES_FILE'
    db3d8505 FindFLEX: Add a DEFINES_FILE option to specify flex-generated header (#15781)
    c26ff8a9 FindFLEX: Fix typo in ADD_FLEX_BISON_DEPENDENCY errors
    30710b8d FindFLEX: Use CMAKE_PARSE_ARGUMENTS to parse arguments


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4565a2e1c2643fcd1b40f4a041564fc4ab60c17c
commit 4565a2e1c2643fcd1b40f4a041564fc4ab60c17c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 13:19:11 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 13:19:11 2015 -0400

    Help: Add notes for topic 'FindFLEX-DEFINES_FILE'

diff --git a/Help/release/dev/FindFLEX-DEFINES_FILE.rst b/Help/release/dev/FindFLEX-DEFINES_FILE.rst
new file mode 100644
index 0000000..95133aa
--- /dev/null
+++ b/Help/release/dev/FindFLEX-DEFINES_FILE.rst
@@ -0,0 +1,6 @@
+FindFLEX-DEFINES_FILE
+---------------------
+
+* The :module:`FindFLEX` module ``FLEX_TARGET`` macro learned a
+  new ``DEFINES_FILE`` option to specify a custom output header
+  to be generated.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db3d85059c2e48b1a4da99230098f63d04dd4e93
commit db3d85059c2e48b1a4da99230098f63d04dd4e93
Author:     Chris Davies <chrislewellyn at googlemail.com>
AuthorDate: Sat Oct 17 17:51:51 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 13:10:43 2015 -0400

    FindFLEX: Add a DEFINES_FILE option to specify flex-generated header (#15781)

diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index 55a9537..ca66493 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -27,13 +27,17 @@
 #
 # ::
 #
-#   FLEX_TARGET(Name FlexInput FlexOutput [COMPILE_FLAGS <string>])
+#   FLEX_TARGET(Name FlexInput FlexOutput
+#               [COMPILE_FLAGS <string>]
+#               [DEFINES_FILE <string>]
+#               )
 #
 # which creates a custom command to generate the <FlexOutput> file from
 # the <FlexInput> file.  If COMPILE_FLAGS option is specified, the next
-# parameter is added to the flex command line.  Name is an alias used to
-# get details of this custom command.  Indeed the macro defines the
-# following variables:
+# parameter is added to the flex command line. If flex is configured to
+# output a header file, the DEFINES_FILE option may be used to specify its
+# name. Name is an alias used to get details of this custom command.
+# Indeed the macro defines the following variables:
 #
 # ::
 #
@@ -41,6 +45,7 @@
 #   FLEX_${Name}_OUTPUTS - the source file generated by the custom rule, an
 #   alias for FlexOutput
 #   FLEX_${Name}_INPUT - the flex source file, an alias for ${FlexInput}
+#   FLEX_${Name}_OUTPUT_HEADER - the header flex output, if any.
 #
 #
 #
@@ -147,11 +152,13 @@ if(FLEX_EXECUTABLE)
   #============================================================
   #
   macro(FLEX_TARGET Name Input Output)
+    set(FLEX_TARGET_outputs "${Output}")
     set(FLEX_EXECUTABLE_opts "")
 
     set(FLEX_TARGET_PARAM_OPTIONS)
     set(FLEX_TARGET_PARAM_ONE_VALUE_KEYWORDS
       COMPILE_FLAGS
+      DEFINES_FILE
       )
     set(FLEX_TARGET_PARAM_MULTI_VALUE_KEYWORDS)
 
@@ -163,7 +170,7 @@ if(FLEX_EXECUTABLE)
       ${ARGN}
       )
 
-    set(FLEX_TARGET_usage "FLEX_TARGET(<Name> <Input> <Output> [COMPILE_FLAGS <string>]")
+    set(FLEX_TARGET_usage "FLEX_TARGET(<Name> <Input> <Output> [COMPILE_FLAGS <string>] [DEFINES_FILE <string>]")
 
     if(NOT "${FLEX_TARGET_ARG_UNPARSED_ARGUMENTS}" STREQUAL "")
       message(SEND_ERROR ${FLEX_TARGET_usage})
@@ -172,8 +179,12 @@ if(FLEX_EXECUTABLE)
         set(FLEX_EXECUTABLE_opts "${FLEX_TARGET_ARG_COMPILE_FLAGS}")
         separate_arguments(FLEX_EXECUTABLE_opts)
       endif()
+      if(NOT "${FLEX_TARGET_ARG_DEFINES_FILE}" STREQUAL "")
+        list(APPEND FLEX_TARGET_outputs "${FLEX_TARGET_ARG_DEFINES_FILE}")
+        list(APPEND FLEX_EXECUTABLE_opts --header-file=${FLEX_TARGET_ARG_DEFINES_FILE})
+      endif()
 
-      add_custom_command(OUTPUT ${Output}
+      add_custom_command(OUTPUT ${FLEX_TARGET_outputs}
         COMMAND ${FLEX_EXECUTABLE}
         ARGS ${FLEX_EXECUTABLE_opts} -o${Output} ${Input}
         DEPENDS ${Input}
@@ -184,6 +195,11 @@ if(FLEX_EXECUTABLE)
       set(FLEX_${Name}_OUTPUTS ${Output})
       set(FLEX_${Name}_INPUT ${Input})
       set(FLEX_${Name}_COMPILE_FLAGS ${FLEX_EXECUTABLE_opts})
+      if("${FLEX_TARGET_ARG_DEFINES_FILE}" STREQUAL "")
+        set(FLEX_${Name}_OUTPUT_HEADER "")
+      else()
+        set(FLEX_${Name}_OUTPUT_HEADER ${FLEX_TARGET_ARG_DEFINES_FILE})
+      endif()
     endif()
   endmacro()
   #============================================================

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c26ff8a90b985f7189aa114b0bcac35b2f476b55
commit c26ff8a90b985f7189aa114b0bcac35b2f476b55
Author:     Chris Davies <chrislewellyn at googlemail.com>
AuthorDate: Sat Oct 17 17:50:00 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 09:55:37 2015 -0400

    FindFLEX: Fix typo in ADD_FLEX_BISON_DEPENDENCY errors

diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index 8ede93b..55a9537 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -196,11 +196,11 @@ if(FLEX_EXECUTABLE)
   macro(ADD_FLEX_BISON_DEPENDENCY FlexTarget BisonTarget)
 
     if(NOT FLEX_${FlexTarget}_OUTPUTS)
-      message(SEND_ERROR "Flex target `${FlexTarget}' does not exists.")
+      message(SEND_ERROR "Flex target `${FlexTarget}' does not exist.")
     endif()
 
     if(NOT BISON_${BisonTarget}_OUTPUT_HEADER)
-      message(SEND_ERROR "Bison target `${BisonTarget}' does not exists.")
+      message(SEND_ERROR "Bison target `${BisonTarget}' does not exist.")
     endif()
 
     set_source_files_properties(${FLEX_${FlexTarget}_OUTPUTS}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30710b8d32344a7a9acf944f97fc947fd491cd65
commit 30710b8d32344a7a9acf944f97fc947fd491cd65
Author:     Chris Davies <chrislewellyn at googlemail.com>
AuthorDate: Sat Oct 17 17:50:00 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 09:46:25 2015 -0400

    FindFLEX: Use CMAKE_PARSE_ARGUMENTS to parse arguments

diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index c837c52..8ede93b 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -113,6 +113,8 @@ find_path(FLEX_INCLUDE_DIR FlexLexer.h
 
 mark_as_advanced(FL_LIBRARY FLEX_INCLUDE_DIR)
 
+include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
+
 set(FLEX_INCLUDE_DIRS ${FLEX_INCLUDE_DIR})
 set(FLEX_LIBRARIES ${FL_LIBRARY})
 
@@ -145,31 +147,44 @@ if(FLEX_EXECUTABLE)
   #============================================================
   #
   macro(FLEX_TARGET Name Input Output)
+    set(FLEX_EXECUTABLE_opts "")
+
+    set(FLEX_TARGET_PARAM_OPTIONS)
+    set(FLEX_TARGET_PARAM_ONE_VALUE_KEYWORDS
+      COMPILE_FLAGS
+      )
+    set(FLEX_TARGET_PARAM_MULTI_VALUE_KEYWORDS)
+
+    cmake_parse_arguments(
+      FLEX_TARGET_ARG
+      "${FLEX_TARGET_PARAM_OPTIONS}"
+      "${FLEX_TARGET_PARAM_ONE_VALUE_KEYWORDS}"
+      "${FLEX_TARGET_MULTI_VALUE_KEYWORDS}"
+      ${ARGN}
+      )
+
     set(FLEX_TARGET_usage "FLEX_TARGET(<Name> <Input> <Output> [COMPILE_FLAGS <string>]")
-    if(${ARGC} GREATER 3)
-      if(${ARGC} EQUAL 5)
-        if("${ARGV3}" STREQUAL "COMPILE_FLAGS")
-          set(FLEX_EXECUTABLE_opts  "${ARGV4}")
-          separate_arguments(FLEX_EXECUTABLE_opts)
-        else()
-          message(SEND_ERROR ${FLEX_TARGET_usage})
-        endif()
-      else()
-        message(SEND_ERROR ${FLEX_TARGET_usage})
+
+    if(NOT "${FLEX_TARGET_ARG_UNPARSED_ARGUMENTS}" STREQUAL "")
+      message(SEND_ERROR ${FLEX_TARGET_usage})
+    else()
+      if(NOT "${FLEX_TARGET_ARG_COMPILE_FLAGS}" STREQUAL "")
+        set(FLEX_EXECUTABLE_opts "${FLEX_TARGET_ARG_COMPILE_FLAGS}")
+        separate_arguments(FLEX_EXECUTABLE_opts)
       endif()
-    endif()
 
-    add_custom_command(OUTPUT ${Output}
-      COMMAND ${FLEX_EXECUTABLE}
-      ARGS ${FLEX_EXECUTABLE_opts} -o${Output} ${Input}
-      DEPENDS ${Input}
-      COMMENT "[FLEX][${Name}] Building scanner with flex ${FLEX_VERSION}"
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
-    set(FLEX_${Name}_DEFINED TRUE)
-    set(FLEX_${Name}_OUTPUTS ${Output})
-    set(FLEX_${Name}_INPUT ${Input})
-    set(FLEX_${Name}_COMPILE_FLAGS ${FLEX_EXECUTABLE_opts})
+      add_custom_command(OUTPUT ${Output}
+        COMMAND ${FLEX_EXECUTABLE}
+        ARGS ${FLEX_EXECUTABLE_opts} -o${Output} ${Input}
+        DEPENDS ${Input}
+        COMMENT "[FLEX][${Name}] Building scanner with flex ${FLEX_VERSION}"
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+      set(FLEX_${Name}_DEFINED TRUE)
+      set(FLEX_${Name}_OUTPUTS ${Output})
+      set(FLEX_${Name}_INPUT ${Input})
+      set(FLEX_${Name}_COMPILE_FLAGS ${FLEX_EXECUTABLE_opts})
+    endif()
   endmacro()
   #============================================================
 

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindFLEX-DEFINES_FILE.rst |    6 ++
 Modules/FindFLEX.cmake                     |   87 +++++++++++++++++++---------
 2 files changed, 65 insertions(+), 28 deletions(-)
 create mode 100644 Help/release/dev/FindFLEX-DEFINES_FILE.rst


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 19 14:27:36 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 19 Oct 2015 14:27:36 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-711-g09ea169
Message-ID: <20151019182736.A2F07C0698@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  09ea1692740698a16454f67e35041558960d11e7 (commit)
       via  afef984e57cdaab76df8c668803dcf7607ed0447 (commit)
      from  d21ed9a402e0056501539f5c2535991936131d59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09ea1692740698a16454f67e35041558960d11e7
commit 09ea1692740698a16454f67e35041558960d11e7
Merge: d21ed9a afef984
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 14:27:35 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 14:27:35 2015 -0400

    Merge topic 'use-generator-target' into next
    
    afef984e fixup! cmGeneratorTarget: Move IsLinkable from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afef984e57cdaab76df8c668803dcf7607ed0447
commit afef984e57cdaab76df8c668803dcf7607ed0447
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 20:26:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 19 20:26:17 2015 +0200

    fixup! cmGeneratorTarget: Move IsLinkable from cmTarget.

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index fcc27ca..9af5b35 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -475,8 +475,8 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
       di != utilDepends.end(); ++di)
     {
     cmTarget const* dep = *di;
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(dep);
-    if(allowLinkable || !VSLinkable(gt) || linked.count(dep))
+    cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
+    if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
       {
       // Direct dependency allowed.
       vsTargetDepend.insert(dep->GetName());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 19 14:28:05 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 19 Oct 2015 14:28:05 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-717-ge17e6c2
Message-ID: <20151019182805.50AD4C06FC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e17e6c2fe24f89c5fab89484bb3d37558eec949f (commit)
       via  d8f8940bc68f09e382320d1ffe36947ba880ae65 (commit)
       via  7550879f570502f31aeafbd48f04bafd17234696 (commit)
       via  88d10d55ac68f2251a549cf09292af8a1fb66ba3 (commit)
       via  b5f5de70c0b754010f151cde75783a2cc62db835 (commit)
       via  8e20ea6ef2258867bd6554536fa7b914f266df96 (commit)
      from  09ea1692740698a16454f67e35041558960d11e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e17e6c2fe24f89c5fab89484bb3d37558eec949f
commit e17e6c2fe24f89c5fab89484bb3d37558eec949f
Merge: 09ea169 d8f8940
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 14:28:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 14:28:03 2015 -0400

    Merge topic 'use-generator-target' into next
    
    d8f8940b cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.
    7550879f cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.
    88d10d55 cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
    b5f5de70 cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
    8e20ea6e cmGeneratorTarget: Move IsLinkable from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8f8940bc68f09e382320d1ffe36947ba880ae65
commit d8f8940bc68f09e382320d1ffe36947ba880ae65
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:59:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 19 20:27:41 2015 +0200

    cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 9bdf2f5..5177ec8 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1095,7 +1095,7 @@ cmExportFileGenerator
        << " PROPERTY MACOSX_BUNDLE 1)\n";
     }
 
-  if (target->Target->IsCFBundleOnApple())
+  if (target->IsCFBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY BUNDLE 1)\n";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7e457bb..b2959fe 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1574,7 +1574,7 @@ bool cmGeneratorTarget::IsBundleOnApple() const
 {
   return this->IsFrameworkOnApple()
       || this->IsAppBundleOnApple()
-      || this->Target->IsCFBundleOnApple();
+      || this->IsCFBundleOnApple();
 }
 
 //----------------------------------------------------------------------------
@@ -1943,7 +1943,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
     {
     fpath += this->GetFrameworkDirectory(config, contentOnly);
     }
-  if(this->Target->IsCFBundleOnApple())
+  if(this->IsCFBundleOnApple())
     {
     fpath += this->GetCFBundleDirectory(config, contentOnly);
     }
@@ -3483,7 +3483,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     targetSuffix = 0;
     }
 
-  if(this->Target->IsCFBundleOnApple())
+  if(this->IsCFBundleOnApple())
     {
     fw_prefix = this->GetCFBundleDirectory(config, false);
     fw_prefix += "/";
@@ -5966,6 +5966,14 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::IsXCTestOnApple() const
 {
-  return (this->Target->IsCFBundleOnApple() &&
+  return (this->IsCFBundleOnApple() &&
           this->GetPropertyAsBool("XCTEST"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsCFBundleOnApple() const
+{
+  return (this->GetType() == cmState::MODULE_LIBRARY &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("BUNDLE"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index ce2f42e..6537421 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -425,6 +425,9 @@ public:
   /** Return whether this target is a XCTest on Apple.  */
   bool IsXCTestOnApple() const;
 
+  /** Return whether this target is a CFBundle (plugin) on Apple.  */
+  bool IsCFBundleOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index a489767..ea1b1a0 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1197,7 +1197,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     // some build phases only apply to bundles and/or frameworks
     bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
     bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
-    bool isCFBundleTarget = cmtarget.IsCFBundleOnApple();
+    bool isCFBundleTarget = gtgt->IsCFBundleOnApple();
 
     cmXCodeObject* buildFiles = 0;
 
@@ -1993,7 +1993,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       pndir = gtgt->GetDirectory(configName);
       }
 
-    if(gtgt->IsFrameworkOnApple() || target.IsCFBundleOnApple())
+    if(gtgt->IsFrameworkOnApple() || gtgt->IsCFBundleOnApple())
       {
       pnprefix = "";
       }
@@ -2046,7 +2046,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     buildSettings->AddAttribute("LIBRARY_STYLE",
                                 this->CreateString("BUNDLE"));
-    if (target.IsCFBundleOnApple())
+    if (gtgt->IsCFBundleOnApple())
       {
       // It turns out that a BUNDLE is basically the same
       // in many ways as an application bundle, as far as
@@ -2653,7 +2653,7 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
     case cmState::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
-      else if (target->Target->IsCFBundleOnApple())
+      else if (target->IsCFBundleOnApple())
         return "wrapper.plug-in";
       else
         return ((this->XcodeVersion >= 22)?
@@ -2680,7 +2680,7 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
     case cmState::MODULE_LIBRARY:
       if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
-      else if (target->Target->IsCFBundleOnApple())
+      else if (target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
       else
         return ((this->XcodeVersion >= 22)?
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index e16dfd7..a97cc5f 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -226,7 +226,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       filesFrom.push_back(from1);
       filesTo.push_back(to1);
       }
-    else if(this->Target->Target->IsCFBundleOnApple())
+    else if(this->Target->IsCFBundleOnApple())
       {
       // Install the whole app bundle directory.
       type = cmInstallType_DIRECTORY;
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 015c880..df2a8c9 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -279,7 +279,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
     outpath += "/";
     }
-  else if(this->Target->IsCFBundleOnApple())
+  else if(this->GeneratorTarget->IsCFBundleOnApple())
     {
     outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateCFBundle(targetName, outpath);
@@ -360,7 +360,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
         buildEcho += " shared library ";
         break;
       case cmState::MODULE_LIBRARY:
-        if (this->Target->IsCFBundleOnApple())
+        if (this->GeneratorTarget->IsCFBundleOnApple())
             buildEcho += " CFBundle";
         buildEcho += " shared module ";
         break;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 8a4f17e..dafbda9 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -139,7 +139,7 @@ const char *cmNinjaNormalTargetGenerator::GetVisibleTypeName() const
     case cmState::SHARED_LIBRARY:
       return "shared library";
     case cmState::MODULE_LIBRARY:
-      if (this->GetTarget()->IsCFBundleOnApple())
+      if (this->GetGeneratorTarget()->IsCFBundleOnApple())
         return "CFBundle shared module";
       else
         return "shared module";
@@ -434,7 +434,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
                                               gt.GetDirectory(cfgName));
     }
-  else if(target.IsCFBundleOnApple())
+  else if(gt.IsCFBundleOnApple())
     {
     // Create the core foundation bundle.
     this->OSXBundleGenerator->CreateCFBundle(this->TargetNameOut,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 02a5ea6..f663678 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -369,14 +369,6 @@ bool cmTarget::IsAppBundleOnApple() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsCFBundleOnApple() const
-{
-  return (this->GetType() == cmState::MODULE_LIBRARY &&
-          this->Makefile->IsOn("APPLE") &&
-          this->GetPropertyAsBool("BUNDLE"));
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7cf4808..0e966e9 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -235,9 +235,6 @@ public:
       Apple.  */
   bool IsFrameworkOnApple() const;
 
-  /** Return whether this target is a CFBundle (plugin) on Apple.  */
-  bool IsCFBundleOnApple() const;
-
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7550879f570502f31aeafbd48f04bafd17234696
commit 7550879f570502f31aeafbd48f04bafd17234696
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 00:15:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 19 20:27:41 2015 +0200

    cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ab0d02b..7e457bb 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1587,7 +1587,7 @@ std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config,
   const char *ext = this->GetProperty("BUNDLE_EXTENSION");
   if (!ext)
     {
-    if (this->Target->IsXCTestOnApple())
+    if (this->IsXCTestOnApple())
       {
       ext = "xctest";
       }
@@ -5962,3 +5962,10 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("MACOSX_BUNDLE"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsXCTestOnApple() const
+{
+  return (this->Target->IsCFBundleOnApple() &&
+          this->GetPropertyAsBool("XCTEST"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 24a1c2c..ce2f42e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -422,6 +422,9 @@ public:
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 
+  /** Return whether this target is a XCTest on Apple.  */
+  bool IsXCTestOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 527a84f..a489767 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2651,7 +2651,7 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType(
     case cmState::STATIC_LIBRARY:
       return "archive.ar";
     case cmState::MODULE_LIBRARY:
-      if (target->Target->IsXCTestOnApple())
+      if (target->IsXCTestOnApple())
         return "wrapper.cfbundle";
       else if (target->Target->IsCFBundleOnApple())
         return "wrapper.plug-in";
@@ -2678,7 +2678,7 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
     case cmState::STATIC_LIBRARY:
       return "com.apple.product-type.library.static";
     case cmState::MODULE_LIBRARY:
-      if (target->Target->IsXCTestOnApple())
+      if (target->IsXCTestOnApple())
         return "com.apple.product-type.bundle.unit-test";
       else if (target->Target->IsCFBundleOnApple())
         return "com.apple.product-type.bundle";
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 761267d..02a5ea6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -377,13 +377,6 @@ bool cmTarget::IsCFBundleOnApple() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsXCTestOnApple() const
-{
-  return (this->IsCFBundleOnApple() &&
-          this->GetPropertyAsBool("XCTEST"));
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   if (!srcs.empty())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 51e97fd..7cf4808 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -238,9 +238,6 @@ public:
   /** Return whether this target is a CFBundle (plugin) on Apple.  */
   bool IsCFBundleOnApple() const;
 
-  /** Return whether this target is a XCTest on Apple.  */
-  bool IsXCTestOnApple() const;
-
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88d10d55ac68f2251a549cf09292af8a1fb66ba3
commit 88d10d55ac68f2251a549cf09292af8a1fb66ba3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:58:19 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 19 20:27:41 2015 +0200

    cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
    
    Leave the cmTarget method behind for now to implement cmInstallCommand.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 781220d..3af7b71 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -202,7 +202,7 @@ cmExportBuildFileGenerator
   std::string prop = "IMPORTED_LOCATION";
   prop += suffix;
   std::string value;
-  if(target->Target->IsAppBundleOnApple())
+  if(target->IsAppBundleOnApple())
     {
     value = target->GetFullPath(config, false);
     }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 132c0b5..9bdf2f5 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1089,7 +1089,7 @@ cmExportFileGenerator
     }
 
   // Mark the imported executable if it is an application bundle.
-  if(target->Target->IsAppBundleOnApple())
+  if(target->IsAppBundleOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY MACOSX_BUNDLE 1)\n";
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index d57d67f..a2d6ad1 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -433,7 +433,7 @@ cmExportInstallFileGenerator
     prop += suffix;
 
     // Append the installed file name.
-    if(target->Target->IsAppBundleOnApple())
+    if(target->IsAppBundleOnApple())
       {
       value += itgen->GetInstallFilename(target, config);
       value += ".app/Contents/MacOS/";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 42b5c63..ab0d02b 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -851,7 +851,7 @@ const char* cmGeneratorTarget::GetLocationForBuild() const
     location += cfgid;
     }
 
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     std::string macdir = this->BuildMacContentDirectory("", "",
                                                                 false);
@@ -1573,7 +1573,7 @@ cmGeneratorTarget::GetAppBundleDirectory(const std::string& config,
 bool cmGeneratorTarget::IsBundleOnApple() const
 {
   return this->IsFrameworkOnApple()
-      || this->Target->IsAppBundleOnApple()
+      || this->IsAppBundleOnApple()
       || this->Target->IsCFBundleOnApple();
 }
 
@@ -1935,7 +1935,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
                                             bool contentOnly) const
 {
   std::string fpath = base;
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     fpath += this->GetAppBundleDirectory(config, contentOnly);
     }
@@ -3143,7 +3143,7 @@ std::string cmGeneratorTarget::NormalGetFullPath(const std::string& config,
 {
   std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
-  if(this->Target->IsAppBundleOnApple())
+  if(this->IsAppBundleOnApple())
     {
     fpath = this->BuildMacContentDirectory(fpath, config, false);
     fpath += "/";
@@ -3438,8 +3438,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     configPostfix = this->GetProperty(configProp);
     // Mac application bundles and frameworks have no postfix.
     if(configPostfix &&
-       (this->Target->IsAppBundleOnApple()
-         || this->IsFrameworkOnApple()))
+       (this->IsAppBundleOnApple() || this->IsFrameworkOnApple()))
       {
       configPostfix = 0;
       }
@@ -5955,3 +5954,11 @@ bool cmGeneratorTarget::IsFrameworkOnApple() const
           this->Makefile->IsOn("APPLE") &&
           this->GetPropertyAsBool("FRAMEWORK"));
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsAppBundleOnApple() const
+{
+  return (this->GetType() == cmState::EXECUTABLE &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("MACOSX_BUNDLE"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 471a500..24a1c2c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -419,6 +419,9 @@ public:
       Apple.  */
   bool IsFrameworkOnApple() const;
 
+  /** Return whether this target is an executable Bundle on Apple.  */
+  bool IsAppBundleOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 9c0aca0..e16dfd7 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -150,7 +150,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       std::string to1 = toDir + targetName;
 
       // Handle OSX Bundles.
-      if(this->Target->Target->IsAppBundleOnApple())
+      if(this->Target->IsAppBundleOnApple())
         {
         // Install the whole app bundle directory.
         type = cmInstallType_DIRECTORY;
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 178b462..31fb37b 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -100,7 +100,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
 
   // Construct the full path version of the names.
   std::string outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
-  if(this->Target->IsAppBundleOnApple())
+  if(this->GeneratorTarget->IsAppBundleOnApple())
     {
     this->OSXBundleGenerator->CreateAppBundle(targetName, outpath);
     }
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4cfbda5..8a4f17e 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -412,7 +412,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                      gt.GetFullPath(cfgName,
                                        /*implib=*/true));
 
-  if (target.IsAppBundleOnApple())
+  if (gt.IsAppBundleOnApple())
     {
     // Create the app bundle
     std::string outpath = gt.GetDirectory(cfgName);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5f5de70c0b754010f151cde75783a2cc62db835
commit b5f5de70c0b754010f151cde75783a2cc62db835
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:57:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 19 20:27:41 2015 +0200

    cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
    
    Leave the cmTarget method behind for now to implement cmInstallCommand.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 889c55c..2497f82 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1111,7 +1111,7 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
 
   // For compatibility with CMake 2.4 include the item's directory in
   // the linker search path.
-  if(this->OldLinkDirMode && !target->Target->IsFrameworkOnApple() &&
+  if(this->OldLinkDirMode && !target->IsFrameworkOnApple() &&
      this->OldLinkDirMask.find(cmSystemTools::GetFilenamePath(item)) ==
      this->OldLinkDirMask.end())
     {
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index fdc21db..132c0b5 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1082,7 +1082,7 @@ cmExportFileGenerator
     }
 
   // Mark the imported library if it is a framework.
-  if(target->Target->IsFrameworkOnApple())
+  if(target->IsFrameworkOnApple())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY FRAMEWORK 1)\n";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index bdf29b2..42b5c63 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1572,7 +1572,7 @@ cmGeneratorTarget::GetAppBundleDirectory(const std::string& config,
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::IsBundleOnApple() const
 {
-  return this->Target->IsFrameworkOnApple()
+  return this->IsFrameworkOnApple()
       || this->Target->IsAppBundleOnApple()
       || this->Target->IsCFBundleOnApple();
 }
@@ -1939,7 +1939,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base,
     {
     fpath += this->GetAppBundleDirectory(config, contentOnly);
     }
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     fpath += this->GetFrameworkDirectory(config, contentOnly);
     }
@@ -1959,7 +1959,7 @@ cmGeneratorTarget::GetMacContentDirectory(const std::string& config,
   std::string fpath = this->GetDirectory(config, implib);
   fpath += "/";
   bool contentOnly = true;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     // additional files with a framework go into the version specific
     // directory
@@ -3227,7 +3227,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   const char* version = this->GetProperty("VERSION");
   const char* soversion = this->GetProperty("SOVERSION");
   if(!this->HasSOName(config) ||
-     this->Target->IsFrameworkOnApple())
+     this->IsFrameworkOnApple())
     {
     // Versioning is supported only for shared libraries and modules,
     // and then only when the platform supports an soname flag.
@@ -3255,7 +3255,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   // The library name.
   name = prefix+base+suffix;
 
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     realName = prefix;
     if(!this->Makefile->PlatformIsAppleIos())
@@ -3439,7 +3439,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
     // Mac application bundles and frameworks have no postfix.
     if(configPostfix &&
        (this->Target->IsAppBundleOnApple()
-         || this->Target->IsFrameworkOnApple()))
+         || this->IsFrameworkOnApple()))
       {
       configPostfix = 0;
       }
@@ -3476,7 +3476,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
 
   // frameworks have directory prefix but no suffix
   std::string fw_prefix;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->IsFrameworkOnApple())
     {
     fw_prefix = this->GetOutputName(config, false);
     fw_prefix += ".framework/";
@@ -5947,3 +5947,11 @@ bool cmGeneratorTarget::IsLinkable() const
           this->GetType() == cmState::INTERFACE_LIBRARY ||
           this->Target->IsExecutableWithExports());
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsFrameworkOnApple() const
+{
+  return (this->GetType() == cmState::SHARED_LIBRARY &&
+          this->Makefile->IsOn("APPLE") &&
+          this->GetPropertyAsBool("FRAMEWORK"));
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index a4a432c..471a500 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -415,6 +415,10 @@ public:
   /** Return whether this target may be used to link another target.  */
   bool IsLinkable() const;
 
+  /** Return whether this target is a shared library Framework on
+      Apple.  */
+  bool IsFrameworkOnApple() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index f54f936..1142ddd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2208,7 +2208,8 @@ cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
 
   if(cmTarget* tgt = this->FindTarget(libname))
     {
-    if(tgt->IsFrameworkOnApple())
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
+    if(gt->IsFrameworkOnApple())
        {
        return true;
        }
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 02da028..89a6dff 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -917,11 +917,13 @@ cmGlobalNinjaGenerator
   std::string configName =
     target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
+
   // for frameworks, we want the real name, not smple name
   // frameworks always appear versioned, and the build.ninja
   // will always attempt to manage symbolic links instead
   // of letting cmOSXBundleGenerator do it.
-  bool realname = target->IsFrameworkOnApple();
+  bool realname = gtgt->IsFrameworkOnApple();
 
   switch (target->GetType()) {
   case cmState::EXECUTABLE:
@@ -929,7 +931,6 @@ cmGlobalNinjaGenerator
   case cmState::STATIC_LIBRARY:
   case cmState::MODULE_LIBRARY:
     {
-    cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
     outputs.push_back(this->ConvertToNinjaPath(
       gtgt->GetFullPath(configName, false, realname)));
     break;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index faaf823..527a84f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -787,14 +787,16 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
 
   // Is this a resource file in this target? Add it to the resources group...
   //
+
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmGeneratorTarget::SourceFileFlags tsFlags =
-            this->GetGeneratorTarget(&cmtarget)->GetTargetSourceFileFlags(sf);
+      gtgt->GetTargetSourceFileFlags(sf);
   bool isResource = tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource;
 
   // Is this a "private" or "public" framework header file?
   // Set the ATTRIBUTES attribute appropriately...
   //
-  if(cmtarget.IsFrameworkOnApple())
+  if(gtgt->IsFrameworkOnApple())
     {
     if(tsFlags.Type == cmGeneratorTarget::SourceFileTypePrivateHeader)
       {
@@ -1193,7 +1195,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       }
 
     // some build phases only apply to bundles and/or frameworks
-    bool isFrameworkTarget = cmtarget.IsFrameworkOnApple();
+    bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
     bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
     bool isCFBundleTarget = cmtarget.IsCFBundleOnApple();
 
@@ -1289,7 +1291,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
         copyFilesBuildPhase->AddAttribute("dstSubfolderSpec",
           this->CreateString("6"));
         std::ostringstream ostr;
-        if (cmtarget.IsFrameworkOnApple())
+        if (gtgt->IsFrameworkOnApple())
           {
           // dstPath in frameworks is relative to Versions/<version>
           ostr << mit->first;
@@ -1467,8 +1469,10 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   std::vector<cmCustomCommand> postbuild
     = cmtarget.GetPostBuildCommands();
 
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+
   if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
-    !cmtarget.IsFrameworkOnApple())
+    !gtgt->IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
     cmd.resize(1);
@@ -1500,7 +1504,6 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
     }
 
   std::vector<cmSourceFile*> classes;
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   if (!gtgt->GetConfigCommonSourceFiles(classes))
     {
     return;
@@ -1943,7 +1946,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   const char* version = target.GetProperty("VERSION");
   const char* soversion = target.GetProperty("SOVERSION");
-  if(!gtgt->HasSOName(configName) || target.IsFrameworkOnApple())
+  if(!gtgt->HasSOName(configName) || gtgt->IsFrameworkOnApple())
     {
     version = 0;
     soversion = 0;
@@ -1990,7 +1993,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       pndir = gtgt->GetDirectory(configName);
       }
 
-    if(target.IsFrameworkOnApple() || target.IsCFBundleOnApple())
+    if(gtgt->IsFrameworkOnApple() || target.IsCFBundleOnApple())
       {
       pnprefix = "";
       }
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index c2798b2..9c0aca0 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -208,7 +208,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
       // An import library looks like a static library.
       type = cmInstallType_STATIC_LIBRARY;
       }
-    else if(this->Target->Target->IsFrameworkOnApple())
+    else if(this->Target->IsFrameworkOnApple())
       {
       // There is a bug in cmInstallCommand if this fails.
       assert(this->NamelinkMode == NamelinkModeNone);
@@ -605,7 +605,7 @@ cmInstallTargetGenerator
     std::string for_install =
       this->Target->GetInstallNameDirForInstallTree();
 
-    if(this->Target->Target->IsFrameworkOnApple() && for_install.empty())
+    if(this->Target->IsFrameworkOnApple() && for_install.empty())
       {
       // Frameworks seem to have an id corresponding to their own full
       // path.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 2ed5f70..015c880 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -153,7 +153,7 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules()
 //----------------------------------------------------------------------------
 void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 {
-  if(this->Target->IsFrameworkOnApple())
+  if(this->GeneratorTarget->IsFrameworkOnApple())
     {
     this->WriteFrameworkRules(relink);
     return;
@@ -273,7 +273,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   // Construct the full path version of the names.
   std::string outpath;
   std::string outpathImp;
-  if(this->Target->IsFrameworkOnApple())
+  if(this->GeneratorTarget->IsFrameworkOnApple())
     {
     outpath = this->GeneratorTarget->GetDirectory(this->ConfigName);
     this->OSXBundleGenerator->CreateFramework(targetName, outpath);
@@ -791,7 +791,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
 
   // Add a rule to create necessary symlinks for the library.
   // Frameworks are handled by cmOSXBundleGenerator.
-  if(targetOutPath != targetOutPathReal && !this->Target->IsFrameworkOnApple())
+  if(targetOutPath != targetOutPathReal
+     && !this->GeneratorTarget->IsFrameworkOnApple())
     {
     std::string symlink = "$(CMAKE_COMMAND) -E cmake_symlink_library ";
     symlink += targetOutPathReal;
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index e5e4b7f..4cfbda5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -281,7 +281,7 @@ cmNinjaNormalTargetGenerator
   }
 
   if (this->TargetNameOut != this->TargetNameReal &&
-    !this->GetTarget()->IsFrameworkOnApple()) {
+    !this->GetGeneratorTarget()->IsFrameworkOnApple()) {
     std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
@@ -428,7 +428,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     targetOutputReal += this->TargetNameReal;
     targetOutputReal = this->ConvertToNinjaPath(targetOutputReal);
     }
-  else if (target.IsFrameworkOnApple())
+  else if (gt.IsFrameworkOnApple())
     {
     // Create the library framework.
     this->OSXBundleGenerator->CreateFramework(this->TargetNameOut,
@@ -732,7 +732,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                         &usedResponseFile);
   this->WriteLinkRule(usedResponseFile);
 
-  if (targetOutput != targetOutputReal && !target.IsFrameworkOnApple())
+  if (targetOutput != targetOutputReal && !gt.IsFrameworkOnApple())
     {
     if (targetType == cmState::EXECUTABLE)
       {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e20ea6ef2258867bd6554536fa7b914f266df96
commit 8e20ea6ef2258867bd6554536fa7b914f266df96
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 23:44:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 19 20:27:40 2015 +0200

    cmGeneratorTarget: Move IsLinkable from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 7bdc555..889c55c 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -643,7 +643,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
     return;
     }
 
-  if(tgt && tgt->Target->IsLinkable())
+  if(tgt && tgt->IsLinkable())
     {
     // This is a CMake target.  Ask the target for its real name.
     if(impexe && this->LoaderFlag)
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 3e58400..fdc21db 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -210,7 +210,7 @@ bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty(
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets)
 {
-  if(!target->Target->IsLinkable())
+  if(!target->IsLinkable())
     {
     return false;
     }
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index c7c0e73..1a878e2 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1654,7 +1654,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag>
                             const GeneratorExpressionContent *content)
   {
     // The file used to link to the target (.so, .lib, .a).
-    if(!target->Target->IsLinkable())
+    if(!target->IsLinkable())
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_LINKER_FILE is allowed only for libraries and "
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 03c950e..bdf29b2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5936,3 +5936,14 @@ std::string cmGeneratorTarget::GetSupportDirectory() const
 #endif
   return dir;
 }
+
+//----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsLinkable() const
+{
+  return (this->GetType() == cmState::STATIC_LIBRARY ||
+          this->GetType() == cmState::SHARED_LIBRARY ||
+          this->GetType() == cmState::MODULE_LIBRARY ||
+          this->GetType() == cmState::UNKNOWN_LIBRARY ||
+          this->GetType() == cmState::INTERFACE_LIBRARY ||
+          this->Target->IsExecutableWithExports());
+}
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 1029158..a4a432c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -412,6 +412,9 @@ public:
   /** Get a build-tree directory in which to place target support files.  */
   std::string GetSupportDirectory() const;
 
+  /** Return whether this target may be used to link another target.  */
+  bool IsLinkable() const;
+
   struct SourceFileFlags
   GetTargetSourceFileFlags(const cmSourceFile* sf) const;
 
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d81d3b8..9af5b35 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -385,7 +385,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
 }
 
 //----------------------------------------------------------------------------
-static bool VSLinkable(cmTarget const* t)
+static bool VSLinkable(cmGeneratorTarget const* t)
 {
   return t->IsLinkable() || t->GetType() == cmState::OBJECT_LIBRARY;
 }
@@ -475,7 +475,8 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
       di != utilDepends.end(); ++di)
     {
     cmTarget const* dep = *di;
-    if(allowLinkable || !VSLinkable(dep) || linked.count(dep))
+    cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
+    if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
       {
       // Direct dependency allowed.
       vsTargetDepend.insert(dep->GetName());
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 57a2d24..761267d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -345,17 +345,6 @@ bool cmTarget::IsExecutableWithExports() const
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::IsLinkable() const
-{
-  return (this->GetType() == cmState::STATIC_LIBRARY ||
-          this->GetType() == cmState::SHARED_LIBRARY ||
-          this->GetType() == cmState::MODULE_LIBRARY ||
-          this->GetType() == cmState::UNKNOWN_LIBRARY ||
-          this->GetType() == cmState::INTERFACE_LIBRARY ||
-          this->IsExecutableWithExports());
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::HasImportLibrary() const
 {
   return (this->DLLPlatform &&
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index dafe86a..51e97fd 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -228,9 +228,6 @@ public:
       enabled.  */
   bool IsExecutableWithExports() const;
 
-  /** Return whether this target may be used to link another target.  */
-  bool IsLinkable() const;
-
   /** Return whether or not the target is for a DLL platform.  */
   bool IsDLLPlatform() const { return this->DLLPlatform; }
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Oct 20 00:01:09 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 20 Oct 2015 00:01:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-256-g693141c
Message-ID: <20151020040109.759F0C0198@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  693141c40e87a77f0a0258e21235197d421c26a5 (commit)
      from  383abcdc35af1279d428886d8b3084282ffda5d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=693141c40e87a77f0a0258e21235197d421c26a5
commit 693141c40e87a77f0a0258e21235197d421c26a5
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Oct 20 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 20 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 782b0d7..8bbaa0e 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151019)
+set(CMake_VERSION_PATCH 20151020)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 20 11:15:05 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 20 Oct 2015 11:15:05 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-719-g846d838
Message-ID: <20151020151505.C6FB9BFA50@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  846d838c55836073bb97d4589a20885af9328079 (commit)
       via  3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f (commit)
      from  e17e6c2fe24f89c5fab89484bb3d37558eec949f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=846d838c55836073bb97d4589a20885af9328079
commit 846d838c55836073bb97d4589a20885af9328079
Merge: e17e6c2 3cd2e0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 20 11:15:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 11:15:04 2015 -0400

    Merge topic 'fix_delphi_coverage' into next
    
    3cd2e0e2 Tests: Fix DelphiCoverage test file selection


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f
commit 3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f
Author:     Joseph Snyder <joe.snyder at kitware.com>
AuthorDate: Wed Aug 13 18:03:53 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 20 11:13:25 2015 -0400

    Tests: Fix DelphiCoverage test file selection
    
    The HTML file for the Delphi Code coverage was being found by the
    Dashboard coverage run of CMake itself.  Switch it to be a configured
    file to eliminate this extra reading.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3f28c25..ae61bca 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2587,8 +2587,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
      "${CMake_BINARY_DIR}/Testing/DelphiCoverage/DartConfiguration.tcl")
   file(COPY "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/src"
     DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
-  file(COPY "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html"
-    DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
+  configure_file(
+    "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in"
+    "${CMake_BINARY_DIR}/Testing/DelphiCoverage/UTCovTest(UTCovTest.pas).html")
   add_test(NAME CTestDelphiCoverage
     COMMAND cmake -E chdir
     ${CMake_BINARY_DIR}/Testing/DelphiCoverage
diff --git a/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html b/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in
similarity index 100%
rename from Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html
rename to Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 20 11:16:39 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 20 Oct 2015 11:16:39 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-259-gfca389e
Message-ID: <20151020151640.06E96BFD11@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  fca389e78ca8d5fe377a4116dedf8b9307126380 (commit)
       via  c6d75294b2827a7f24baed4814046d9d0bd6a61d (commit)
       via  9c6a7203fb0c6034771011a8ac58ae447726b919 (commit)
      from  693141c40e87a77f0a0258e21235197d421c26a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fca389e78ca8d5fe377a4116dedf8b9307126380
commit fca389e78ca8d5fe377a4116dedf8b9307126380
Merge: 693141c c6d7529
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 20 11:16:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 11:16:38 2015 -0400

    Merge topic 'update-kwsys'
    
    c6d75294 Merge branch 'upstream-kwsys' into update-kwsys
    9c6a7203 KWSys 2015-10-16 (a7e5360f)


-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/Terminal.c |   11 +++++++++++
 1 file changed, 11 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 20 11:16:42 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 20 Oct 2015 11:16:42 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-261-g1fcc01f
Message-ID: <20151020151642.0A176BFD4C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  1fcc01f2074cc5fd56489ccab90457b51082e10e (commit)
       via  3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f (commit)
      from  fca389e78ca8d5fe377a4116dedf8b9307126380 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fcc01f2074cc5fd56489ccab90457b51082e10e
commit 1fcc01f2074cc5fd56489ccab90457b51082e10e
Merge: fca389e 3cd2e0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 20 11:16:40 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 11:16:40 2015 -0400

    Merge topic 'fix_delphi_coverage'
    
    3cd2e0e2 Tests: Fix DelphiCoverage test file selection


-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt                                              |    5 +++--
 ...vTest(UTCovTest.pas).html => UTCovTest(UTCovTest.pas).html.in} |    0
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename Tests/DelphiCoverage/{UTCovTest(UTCovTest.pas).html => UTCovTest(UTCovTest.pas).html.in} (100%)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 20 11:16:44 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 20 Oct 2015 11:16:44 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-266-g5ec8064
Message-ID: <20151020151644.52845BFD4E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  5ec8064b76aca89b6e0274e53c272f298655b992 (commit)
       via  4565a2e1c2643fcd1b40f4a041564fc4ab60c17c (commit)
       via  db3d85059c2e48b1a4da99230098f63d04dd4e93 (commit)
       via  c26ff8a90b985f7189aa114b0bcac35b2f476b55 (commit)
       via  30710b8d32344a7a9acf944f97fc947fd491cd65 (commit)
      from  1fcc01f2074cc5fd56489ccab90457b51082e10e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ec8064b76aca89b6e0274e53c272f298655b992
commit 5ec8064b76aca89b6e0274e53c272f298655b992
Merge: 1fcc01f 4565a2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 20 11:16:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 11:16:42 2015 -0400

    Merge topic 'FindFLEX-DEFINES_FILE'
    
    4565a2e1 Help: Add notes for topic 'FindFLEX-DEFINES_FILE'
    db3d8505 FindFLEX: Add a DEFINES_FILE option to specify flex-generated header (#15781)
    c26ff8a9 FindFLEX: Fix typo in ADD_FLEX_BISON_DEPENDENCY errors
    30710b8d FindFLEX: Use CMAKE_PARSE_ARGUMENTS to parse arguments


-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindFLEX-DEFINES_FILE.rst |    6 ++
 Modules/FindFLEX.cmake                     |   87 +++++++++++++++++++---------
 2 files changed, 65 insertions(+), 28 deletions(-)
 create mode 100644 Help/release/dev/FindFLEX-DEFINES_FILE.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 20 11:16:46 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 20 Oct 2015 11:16:46 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-303-g9afbb73
Message-ID: <20151020151646.BC89CBFD50@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  9afbb733ec2a55424e6c25c6afa7fdd14219d6b1 (commit)
       via  d8f8940bc68f09e382320d1ffe36947ba880ae65 (commit)
       via  7550879f570502f31aeafbd48f04bafd17234696 (commit)
       via  88d10d55ac68f2251a549cf09292af8a1fb66ba3 (commit)
       via  b5f5de70c0b754010f151cde75783a2cc62db835 (commit)
       via  8e20ea6ef2258867bd6554536fa7b914f266df96 (commit)
       via  a527abf0995fc1bdd45afdb20e80b728dd0ef045 (commit)
       via  eb3be7d68851ce87354f6bd90e0be3a670d22d56 (commit)
       via  d231c31b98eb80929d9aabf8e606abde39fc08f4 (commit)
       via  e6661282436d7901617d2f96d9acf9d4cb7db9d5 (commit)
       via  2b9cc1e24871c6b527900e119640ef0adf706f0d (commit)
       via  97062ac268d1bcc62a528aea2e22a7dd6f6efa8f (commit)
       via  6a72b3c84e016d7e540aa3d9b079200b3fb52ab7 (commit)
       via  1293c1561a58b2f8b0bd4ec05bb249fc36f487ac (commit)
       via  381e7afd363d64c72b83e69fd6c6cad5fc3eefb4 (commit)
       via  65911cae4dd5a81f23a59bf9187b95bda3168fe9 (commit)
       via  37ab74a607a021567a0a1e2c7df43da33d32d5ec (commit)
       via  31c4aee75a18b11d86a364d01fdae3250200866d (commit)
       via  3e8ef6427393546c77da1b74234311d3b60edd98 (commit)
       via  cfb2f7508af637c9c35758fbd5dac6c8cb679bdb (commit)
       via  b857f0d84b539056bc6a810161eb22e9b9baca43 (commit)
       via  ed09f3b292bee34e8b30204c93ef5596a3124d00 (commit)
       via  beff29f0d4bf1ffface0e6833f29f2f04ceccf0b (commit)
       via  12e4790a0b40d8176940f855f7f6c9cfe6c39f9f (commit)
       via  14272277205ac7927a4c13b628ce411538f7b17c (commit)
       via  8f363d6771dfa792d606978e1e406229637078f6 (commit)
       via  5794dbc301ace0041c5fc50096cc5331e8ba3c34 (commit)
       via  a892b285f8c621ba50f45f5c4218980c911fd1b6 (commit)
       via  cb8c728f17a61732064280ddb98203cb277e5a3c (commit)
       via  fb4fca0b5efabdf061bd256ed9d35edae6f42b9d (commit)
       via  50fb2ad6463c500fde44c000c777aa3ac1cffc7e (commit)
       via  d233030f5bcfe2509b82433f7df6383cd301e34e (commit)
       via  0ebe2bbf4ae7f19b10f8374313b2bbd6fcd6c3da (commit)
       via  60bd9f9c92faae368fab1c44cf81b489c6a875cb (commit)
       via  82a6eaf4d0381f0e3236dbd067fe853653bbe6b5 (commit)
       via  8aaed08696a7444b80b6319e2b5af320ee589658 (commit)
       via  393654bf49f2c8d86e9ec88fc3c8322497432aea (commit)
      from  5ec8064b76aca89b6e0274e53c272f298655b992 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9afbb733ec2a55424e6c25c6afa7fdd14219d6b1
commit 9afbb733ec2a55424e6c25c6afa7fdd14219d6b1
Merge: 5ec8064 d8f8940
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 20 11:16:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 11:16:45 2015 -0400

    Merge topic 'use-generator-target'
    
    d8f8940b cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.
    7550879f cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.
    88d10d55 cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
    b5f5de70 cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
    8e20ea6e cmGeneratorTarget: Move IsLinkable from cmTarget.
    a527abf0 Xcode: Port internal API to cmGeneratorTarget.
    eb3be7d6 cmGeneratorTarget: Move GetExportName from cmTarget.
    d231c31b Export: Port internal API to cmGeneratorTarget.
    e6661282 Export: Port internal utility to cmGeneratorTarget.
    2b9cc1e2 Export: Port some API to cmGlobalGenerator.
    97062ac2 cmInstallTargetGenerator: Port GetInstallFilename to cmGeneratorTarget.
    6a72b3c8 Export: Port interface to cmGeneratorTarget.
    1293c156 cmExportTryCompileFileGenerator: Port to cmGeneratorTarget.
    381e7afd cmExportSet: Store a cmGeneratorTarget.
    65911cae cmGlobalGenerator: Compute export() related classes early.
    37ab74a6 cmLocalGenerator: Port PList handling to cmGeneratorTarget.
    ...


-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |   16 +-
 Source/cmComputeLinkInformation.cxx            |    4 +-
 Source/cmComputeTargetDepends.cxx              |    2 +-
 Source/cmCoreTryCompile.cxx                    |    7 +-
 Source/cmCustomCommandGenerator.cxx            |    2 +-
 Source/cmExportBuildFileGenerator.cxx          |   58 ++-
 Source/cmExportBuildFileGenerator.h            |   11 +-
 Source/cmExportFileGenerator.cxx               |   69 ++-
 Source/cmExportFileGenerator.h                 |   33 +-
 Source/cmExportInstallFileGenerator.cxx        |   63 ++-
 Source/cmExportInstallFileGenerator.h          |   11 +-
 Source/cmExportSet.cxx                         |   10 +
 Source/cmExportSet.h                           |    3 +
 Source/cmExportTryCompileFileGenerator.cxx     |   45 +-
 Source/cmExportTryCompileFileGenerator.h       |   22 +-
 Source/cmExtraSublimeTextGenerator.cxx         |    6 +-
 Source/cmGeneratorExpressionNode.cxx           |    6 +-
 Source/cmGeneratorTarget.cxx                   |  630 ++++++++++++++++++++----
 Source/cmGeneratorTarget.h                     |   69 +++
 Source/cmGhsMultiTargetGenerator.cxx           |   13 +-
 Source/cmGlobalGenerator.cxx                   |   26 +-
 Source/cmGlobalGenerator.h                     |    7 +-
 Source/cmGlobalNinjaGenerator.cxx              |    5 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |    6 +-
 Source/cmGlobalVisualStudioGenerator.cxx       |    5 +-
 Source/cmGlobalXCodeGenerator.cxx              |   72 +--
 Source/cmGlobalXCodeGenerator.h                |    4 +-
 Source/cmIncludeCommand.cxx                    |    1 -
 Source/cmInstallCommand.cxx                    |    9 +-
 Source/cmInstallExportGenerator.cxx            |    1 +
 Source/cmInstallTargetGenerator.cxx            |   27 +-
 Source/cmInstallTargetGenerator.h              |    3 +-
 Source/cmLocalGenerator.cxx                    |   76 +--
 Source/cmLocalGenerator.h                      |   29 +-
 Source/cmLocalGhsMultiGenerator.cxx            |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |   26 +-
 Source/cmLocalUnixMakefileGenerator3.h         |    9 +-
 Source/cmLocalVisualStudio6Generator.cxx       |   22 +-
 Source/cmLocalVisualStudio7Generator.cxx       |   12 +-
 Source/cmLocalVisualStudio7Generator.h         |    3 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |   20 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |   49 +-
 Source/cmMakefileTargetGenerator.cxx           |   26 +-
 Source/cmMakefileUtilityTargetGenerator.cxx    |   11 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |   21 +-
 Source/cmNinjaTargetGenerator.cxx              |   13 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |    3 +-
 Source/cmOSXBundleGenerator.cxx                |    6 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |   23 +-
 Source/cmTarget.cxx                            |  509 +++----------------
 Source/cmTarget.h                              |   63 ---
 Source/cmTargetExport.h                        |    5 +-
 Source/cmVisualStudio10TargetGenerator.cxx     |  132 ++---
 53 files changed, 1232 insertions(+), 1074 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 20 11:17:18 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 20 Oct 2015 11:17:18 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-725-g1fe5b92
Message-ID: <20151020151718.37D62BFDB4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1fe5b927e070f42067487b7dd0c3cac720d879bf (commit)
       via  9afbb733ec2a55424e6c25c6afa7fdd14219d6b1 (commit)
       via  5ec8064b76aca89b6e0274e53c272f298655b992 (commit)
       via  1fcc01f2074cc5fd56489ccab90457b51082e10e (commit)
       via  fca389e78ca8d5fe377a4116dedf8b9307126380 (commit)
       via  693141c40e87a77f0a0258e21235197d421c26a5 (commit)
      from  846d838c55836073bb97d4589a20885af9328079 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fe5b927e070f42067487b7dd0c3cac720d879bf
commit 1fe5b927e070f42067487b7dd0c3cac720d879bf
Merge: 846d838 9afbb73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 20 11:17:00 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 20 11:17:00 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 20 14:43:53 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 20 Oct 2015 14:43:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-727-gb440006
Message-ID: <20151020184353.7EB8CBD097@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b440006bcad4df6916b90b7505352cc866bf8b96 (commit)
       via  123de1914c7e7d53d1e295c73994b2780041b8fc (commit)
      from  1fe5b927e070f42067487b7dd0c3cac720d879bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b440006bcad4df6916b90b7505352cc866bf8b96
commit b440006bcad4df6916b90b7505352cc866bf8b96
Merge: 1fe5b92 123de19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 20 14:43:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 14:43:52 2015 -0400

    Merge topic 'ninja-refactor-deptype-selection' into next
    
    123de191 Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=123de1914c7e7d53d1e295c73994b2780041b8fc
commit 123de1914c7e7d53d1e295c73994b2780041b8fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 20 13:52:12 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 20 14:14:20 2015 -0400

    Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains
    
    Set variables in the platform information modules to tell the Ninja
    generator what deps type to use instead of hard-coding conditions in the
    generator itself.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index b421b0d..a61413a 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -302,6 +302,7 @@ macro(__windows_compiler_msvc lang)
   set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
   set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG")
   set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
+  set(CMAKE_NINJA_DEPTYPE_${lang} msvc)
 
   if(NOT CMAKE_RC_COMPILER_INIT)
     set(CMAKE_RC_COMPILER_INIT rc)
@@ -311,4 +312,5 @@ macro(__windows_compiler_msvc lang)
   endif()
 
   enable_language(RC)
+  set(CMAKE_NINJA_CMCLDEPS_RC 1)
 endmacro()
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index cb1122c..b018005 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -148,17 +148,9 @@ void cmNinjaTargetGenerator::AddIncludeFlags(std::string& languageFlags,
 
 bool cmNinjaTargetGenerator::NeedDepTypeMSVC(const std::string& lang) const
 {
-  if (lang == "C" || lang == "CXX")
-    {
-    cmMakefile* mf = this->GetMakefile();
-    return (
-      strcmp(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID"), "MSVC") == 0 ||
-      strcmp(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"), "MSVC") == 0 ||
-      strcmp(mf->GetSafeDefinition("CMAKE_C_SIMULATE_ID"), "MSVC") == 0 ||
-      strcmp(mf->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID"), "MSVC") == 0
-      );
-    }
-  return false;
+  return strcmp(
+    this->GetMakefile()->GetSafeDefinition("CMAKE_NINJA_DEPTYPE_" + lang),
+    "msvc") == 0;
 }
 
 // TODO: Refactor with
@@ -359,7 +351,7 @@ cmNinjaTargetGenerator
     depfile = "";
     flags += " /showIncludes";
     }
-  else if (lang == "RC" && this->NeedDepTypeMSVC("C"))
+  else if (mf->IsOn("CMAKE_NINJA_CMCLDEPS_"+lang))
     {
     // For the MS resource compiler we need cmcldeps, but skip dependencies
     // for source-file try_compile cases because they are always fresh.

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |    2 ++
 Source/cmNinjaTargetGenerator.cxx   |   16 ++++------------
 2 files changed, 6 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From gjasny at googlemail.com  Tue Oct 20 16:50:14 2015
From: gjasny at googlemail.com (Gregor Jasny)
Date: Tue, 20 Oct 2015 16:50:14 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-733-g03c0c9c
Message-ID: <20151020205014.82349C01FA@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  03c0c9cc4098108010dc115bbdde4158fe423a40 (commit)
       via  18f848549bcbe4de8bfee66762304c2d241965fb (commit)
       via  b004a2d4798afd1747e8f52f52a7184890eb606c (commit)
       via  23520f1dca774bdb9aac3b0e264447d822d716de (commit)
       via  0b75f567d2ceb3de072ce50cfc9609a1760c35ac (commit)
       via  eefcb1e9bbcc3c5c6bfa140531d3ab5bb03f8961 (commit)
      from  b440006bcad4df6916b90b7505352cc866bf8b96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03c0c9cc4098108010dc115bbdde4158fe423a40
commit 03c0c9cc4098108010dc115bbdde4158fe423a40
Merge: b440006 18f8485
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Oct 20 16:50:12 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 16:50:12 2015 -0400

    Merge topic 'xcode-optimization-flags' into next
    
    18f84854 Xcode: Add test case for bug report (#15794)
    b004a2d4 fixup! Add test case for Xcode optimisation level settings (#15794)
    23520f1d Use regex itself to check for white spaces around flag
    0b75f567 Xcode: Use regular expression to extract all optimisation flags (#15794)
    eefcb1e9 Add test case for Xcode optimisation level settings (#15794)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18f848549bcbe4de8bfee66762304c2d241965fb
commit 18f848549bcbe4de8bfee66762304c2d241965fb
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Oct 20 22:01:29 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Tue Oct 20 22:01:29 2015 +0200

    Xcode: Add test case for bug report (#15794)

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index b716f0d..a8c6816 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -5,6 +5,7 @@ run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
 run_cmake(XcodeObjectNeedsQuote)
 run_cmake(XcodeOptimizationFlags)
+run_cmake(XcodePreserveObjcFlag)
 if (NOT XCODE_VERSION VERSION_LESS 6)
   run_cmake(XcodePlatformFrameworks)
 endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake
new file mode 100644
index 0000000..332906f
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake
@@ -0,0 +1,7 @@
+set(expect "-ObjC")
+file(STRINGS ${RunCMake_TEST_BINARY_DIR}/XcodePreserveObjcFlag.xcodeproj/project.pbxproj actual
+     REGEX "OTHER_CPLUSPLUSFLAGS = [^;]*;" LIMIT_COUNT 1)
+if(NOT "${actual}" MATCHES "${expect}")
+  message(SEND_ERROR "The actual project contains the line:\n ${actual}\n"
+    "which does not match expected regex:\n ${expect}\n")
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake
new file mode 100644
index 0000000..64db633
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake
@@ -0,0 +1,6 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported configuration types")
+
+project(XcodePreserveObjcFlag CXX)
+
+add_library(foo STATIC foo.cpp)
+set_target_properties(foo PROPERTIES COMPILE_OPTIONS -ObjC)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b004a2d4798afd1747e8f52f52a7184890eb606c
commit b004a2d4798afd1747e8f52f52a7184890eb606c
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Oct 20 21:59:42 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Tue Oct 20 21:59:42 2015 +0200

    fixup! Add test case for Xcode optimisation level settings (#15794)

diff --git a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
index 53da440..e14bf80 100644
--- a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
@@ -4,8 +4,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "")
 
 project(XcodeOptimizationFlags CXX)
 
-message(STATUS "NONE ${CMAKE_CXX_FLAGS} CXX ${CMAKE_CXX_FLAGS_RELEASE}")
-
 add_library(fooO1 STATIC foo.cpp)
 set_target_properties(fooO1 PROPERTIES COMPILE_OPTIONS -O1)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23520f1dca774bdb9aac3b0e264447d822d716de
commit 23520f1dca774bdb9aac3b0e264447d822d716de
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Oct 20 21:39:45 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Tue Oct 20 21:39:45 2015 +0200

    Use regex itself to check for white spaces around flag

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 2a838e6..0e3af88 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1615,6 +1615,7 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag,
 // This function removes each matching occurrence of the expression and
 // returns the last one (i.e., the dominant flag in GCC)
 std::string cmGlobalXCodeGenerator::ExtractFlagRegex(const char* exp,
+                                                     int matchIndex,
                                                      std::string& flags)
 {
   std::string retFlag;
@@ -1630,24 +1631,12 @@ std::string cmGlobalXCodeGenerator::ExtractFlagRegex(const char* exp,
 
   while(regex.find(flags.c_str() + offset))
     {
-    const std::string::size_type startPos = offset + regex.start(0);
-    const std::string::size_type endPos = offset + regex.end(0);
+    const std::string::size_type startPos = offset + regex.start(matchIndex);
+    const std::string::size_type endPos = offset + regex.end(matchIndex);
     const std::string::size_type size = endPos - startPos;
 
     offset = startPos + 1;
 
-    // match must be start of string or preceded by white space
-    if(startPos > 0 && flags[startPos - 1] != ' ')
-      {
-      continue;
-      }
-
-    // match must be succeeded by white space or end of string
-    if(endPos < flags.size() && flags[endPos] != ' ')
-      {
-      continue;
-      }
-
     retFlag.assign(flags, startPos, size);
     flags.replace(startPos, size, size, ' ');
     }
@@ -2279,7 +2268,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     std::string& flags = cflags[*li];
     std::string& gflag = gflags[*li];
-    std::string oflag = this->ExtractFlagRegex("-Ofast|-Os|-O[0-9]*", flags);
+    std::string oflag =
+      this->ExtractFlagRegex("(^| )(-Ofast|-Os|-O[0-9]*)( |$)", 2, flags);
     if(oflag.size() == 2)
       {
       optLevel = "1";
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 9de7de6..791324d 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -151,7 +151,8 @@ private:
                            cmXCodeObject* buildSettings,
                            const std::string& buildType);
   std::string ExtractFlag(const char* flag, std::string& flags);
-  std::string ExtractFlagRegex(const char* exp, std::string& flags);
+  std::string ExtractFlagRegex(const char* exp, int matchIndex,
+                               std::string& flags);
   void SortXCodeObjects();
   // delete all objects in the this->XCodeObjects vector.
   void ClearXCodeObjects();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b75f567d2ceb3de072ce50cfc9609a1760c35ac
commit 0b75f567d2ceb3de072ce50cfc9609a1760c35ac
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Oct 18 22:43:25 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Oct 18 22:43:25 2015 +0200

    Xcode: Use regular expression to extract all optimisation flags (#15794)

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bc05aea..2a838e6 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1612,6 +1612,50 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag,
 }
 
 //----------------------------------------------------------------------------
+// This function removes each matching occurrence of the expression and
+// returns the last one (i.e., the dominant flag in GCC)
+std::string cmGlobalXCodeGenerator::ExtractFlagRegex(const char* exp,
+                                                     std::string& flags)
+{
+  std::string retFlag;
+
+  cmsys::RegularExpression regex(exp);
+  assert(regex.is_valid());
+  if(!regex.is_valid())
+    {
+    return retFlag;
+    }
+
+  std::string::size_type offset = 0;
+
+  while(regex.find(flags.c_str() + offset))
+    {
+    const std::string::size_type startPos = offset + regex.start(0);
+    const std::string::size_type endPos = offset + regex.end(0);
+    const std::string::size_type size = endPos - startPos;
+
+    offset = startPos + 1;
+
+    // match must be start of string or preceded by white space
+    if(startPos > 0 && flags[startPos - 1] != ' ')
+      {
+      continue;
+      }
+
+    // match must be succeeded by white space or end of string
+    if(endPos < flags.size() && flags[endPos] != ' ')
+      {
+      continue;
+      }
+
+    retFlag.assign(flags, startPos, size);
+    flags.replace(startPos, size, size, ' ');
+    }
+
+  return retFlag;
+}
+
+//----------------------------------------------------------------------------
 void
 cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 cmTarget& target,
@@ -2227,9 +2271,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   bool same_gflags = true;
   std::map<std::string, std::string> gflags;
   std::string const* last_gflag = 0;
-  char optLevel[2];
-  optLevel[0] = '0';
-  optLevel[1] = 0;
+  std::string optLevel = "0";
 
   // Minimal map of flags to build settings.
   for (std::set<std::string>::iterator li = languages.begin();
@@ -2237,14 +2279,14 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     std::string& flags = cflags[*li];
     std::string& gflag = gflags[*li];
-    std::string oflag = this->ExtractFlag("-O", flags);
-    if(oflag.size() == 3)
+    std::string oflag = this->ExtractFlagRegex("-Ofast|-Os|-O[0-9]*", flags);
+    if(oflag.size() == 2)
       {
-      optLevel[0] = oflag[2];
+      optLevel = "1";
       }
-    if(oflag.size() == 2)
+    else if(oflag.size() > 2)
       {
-      optLevel[0] = '1';
+      optLevel = oflag.substr(2);
       }
     gflag = this->ExtractFlag("-g", flags);
     // put back gdwarf-2 if used since there is no way
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 9daf0ab..9de7de6 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -151,6 +151,7 @@ private:
                            cmXCodeObject* buildSettings,
                            const std::string& buildType);
   std::string ExtractFlag(const char* flag, std::string& flags);
+  std::string ExtractFlagRegex(const char* exp, std::string& flags);
   void SortXCodeObjects();
   // delete all objects in the this->XCodeObjects vector.
   void ClearXCodeObjects();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eefcb1e9bbcc3c5c6bfa140531d3ab5bb03f8961
commit eefcb1e9bbcc3c5c6bfa140531d3ab5bb03f8961
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Oct 18 21:53:12 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Oct 18 21:53:12 2015 +0200

    Add test case for Xcode optimisation level settings (#15794)

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 8ab618b..b716f0d 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -4,6 +4,7 @@ run_cmake(XcodeFileType)
 run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
 run_cmake(XcodeObjectNeedsQuote)
+run_cmake(XcodeOptimizationFlags)
 if (NOT XCODE_VERSION VERSION_LESS 6)
   run_cmake(XcodePlatformFrameworks)
 endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags-check.cmake b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags-check.cmake
new file mode 100644
index 0000000..f5595b3
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags-check.cmake
@@ -0,0 +1,7 @@
+foreach(level 1 2 3 s fast)
+  file(STRINGS ${RunCMake_TEST_BINARY_DIR}/XcodeOptimizationFlags.xcodeproj/project.pbxproj actual-${level}
+       REGEX "GCC_OPTIMIZATION_LEVEL = ${level};" LIMIT_COUNT 1)
+  if(NOT actual-${level})
+    message(SEND_ERROR "Optimization level '${level}' not found in Xcode project.")
+  endif()
+endforeach()
diff --git a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
new file mode 100644
index 0000000..53da440
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
@@ -0,0 +1,22 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported configuration types")
+
+set(CMAKE_CXX_FLAGS_RELEASE "")
+
+project(XcodeOptimizationFlags CXX)
+
+message(STATUS "NONE ${CMAKE_CXX_FLAGS} CXX ${CMAKE_CXX_FLAGS_RELEASE}")
+
+add_library(fooO1 STATIC foo.cpp)
+set_target_properties(fooO1 PROPERTIES COMPILE_OPTIONS -O1)
+
+add_library(fooO2 STATIC foo.cpp)
+set_target_properties(fooO2 PROPERTIES COMPILE_OPTIONS -O2)
+
+add_library(fooO3 STATIC foo.cpp)
+set_target_properties(fooO3 PROPERTIES COMPILE_OPTIONS -O3)
+
+add_library(fooOs STATIC foo.cpp)
+set_target_properties(fooOs PROPERTIES COMPILE_OPTIONS -Os)
+
+add_library(fooOfast STATIC foo.cpp)
+set_target_properties(fooOfast PROPERTIES COMPILE_OPTIONS -Ofast)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx                  |   48 ++++++++++++++++----
 Source/cmGlobalXCodeGenerator.h                    |    2 +
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake     |    2 +
 .../XcodeOptimizationFlags-check.cmake             |    7 +++
 .../XcodeProject/XcodeOptimizationFlags.cmake      |   20 ++++++++
 ...eck.cmake => XcodePreserveObjcFlag-check.cmake} |    6 +--
 .../XcodeProject/XcodePreserveObjcFlag.cmake       |    6 +++
 7 files changed, 80 insertions(+), 11 deletions(-)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeOptimizationFlags-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
 copy Tests/RunCMake/XcodeProject/{XcodeObjectNeedsQuote-check.cmake => XcodePreserveObjcFlag-check.cmake} (56%)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 17:41:08 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 17:41:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-735-gc8286a5
Message-ID: <20151020214108.395F6BBB73@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c8286a5ff5e2c7843a0ee33376dd3b0032317d48 (commit)
       via  d6a03b475e023da9b7532a5b8735caec36b5de86 (commit)
      from  03c0c9cc4098108010dc115bbdde4158fe423a40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8286a5ff5e2c7843a0ee33376dd3b0032317d48
commit c8286a5ff5e2c7843a0ee33376dd3b0032317d48
Merge: 03c0c9c d6a03b4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 17:41:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 17:41:06 2015 -0400

    Merge topic 'fix-CMP0054-elseif-warning' into next
    
    d6a03b47 cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6a03b475e023da9b7532a5b8735caec36b5de86
commit d6a03b475e023da9b7532a5b8735caec36b5de86
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 19:13:52 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 20 23:40:12 2015 +0200

    cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)
    
    Commit v3.4.0-rc1~494^2~4 (cmMakefile: Add API for elseif to create
    backtrace., 2015-05-29) removed the use of cmMakefileCall to push/pop
    execution context in favor of a new way to create backtraces.
    
    However, a call to cmMakefile::GetExecutionContext is still invoked to
    issue a contextual CMP0054 warning through cmConditionEvaluator.  As
    the elseif is not part of the call stack, this resulted in trying to
    access an empty vector.
    
    Avoid the attempt at getting execution context when evaluating elseif by
    constructing a context and backtrace on behalf of the cmConditionEvaluator
    in all cases.

diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 7874803..5330acd 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -11,9 +11,14 @@
 ============================================================================*/
 
 #include "cmConditionEvaluator.h"
+#include "cmOutputConverter.h"
 
-cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile):
+cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile,
+                                           const cmListFileContext &context,
+                                           const cmListFileBacktrace& bt):
   Makefile(makefile),
+  ExecutionContext(context),
+  Backtrace(bt),
   Policy12Status(makefile.GetPolicyStatus(cmPolicies::CMP0012)),
   Policy54Status(makefile.GetPolicyStatus(cmPolicies::CMP0054)),
   Policy57Status(makefile.GetPolicyStatus(cmPolicies::CMP0057)),
@@ -98,6 +103,25 @@ bool cmConditionEvaluator::IsTrue(
     errorString, status, true);
 }
 
+cmListFileContext cmConditionEvaluator::GetConditionContext(
+    cmMakefile* mf,
+    const cmCommandContext& command,
+    const std::string& filePath)
+{
+  cmListFileContext context =
+      cmListFileContext::FromCommandContext(
+        command,
+        filePath);
+
+  if(!mf->GetCMakeInstance()->GetIsInTryCompile())
+    {
+    cmOutputConverter converter(mf->GetStateSnapshot());
+    context.FilePath = converter.Convert(context.FilePath,
+                                         cmOutputConverter::HOME);
+    }
+  return context;
+}
+
 //=========================================================================
 const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
   cmExpandedCommandArgument const& argument) const
@@ -113,7 +137,8 @@ const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
 
   if(def && argument.WasQuoted() && this->Policy54Status == cmPolicies::WARN)
     {
-    if(!this->Makefile.HasCMP0054AlreadyBeenReported())
+    if(!this->Makefile.HasCMP0054AlreadyBeenReported(
+         this->ExecutionContext))
       {
       std::ostringstream e;
       e << (cmPolicies::GetPolicyWarning(cmPolicies::CMP0054)) << "\n";
@@ -122,7 +147,9 @@ const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
         "when the policy is set to NEW.  "
         "Since the policy is not set the OLD behavior will be used.";
 
-      this->Makefile.IssueMessage(cmake::AUTHOR_WARNING, e.str());
+      this->Makefile.GetCMakeInstance()
+          ->IssueMessage(cmake::AUTHOR_WARNING, e.str(),
+                         this->Backtrace);
       }
     }
 
@@ -159,7 +186,8 @@ bool cmConditionEvaluator::IsKeyword(std::string const& keyword,
   if(isKeyword && argument.WasQuoted() &&
     this->Policy54Status == cmPolicies::WARN)
     {
-    if(!this->Makefile.HasCMP0054AlreadyBeenReported())
+    if(!this->Makefile.HasCMP0054AlreadyBeenReported(
+         this->ExecutionContext))
       {
       std::ostringstream e;
       e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0054) << "\n";
@@ -168,7 +196,9 @@ bool cmConditionEvaluator::IsKeyword(std::string const& keyword,
         "when the policy is set to NEW.  "
         "Since the policy is not set the OLD behavior will be used.";
 
-      this->Makefile.IssueMessage(cmake::AUTHOR_WARNING, e.str());
+      this->Makefile.GetCMakeInstance()
+          ->IssueMessage(cmake::AUTHOR_WARNING, e.str(),
+                         this->Backtrace);
       }
     }
 
diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h
index c4e2d11..8600825 100644
--- a/Source/cmConditionEvaluator.h
+++ b/Source/cmConditionEvaluator.h
@@ -22,7 +22,9 @@ class cmConditionEvaluator
 public:
   typedef std::list<cmExpandedCommandArgument> cmArgumentList;
 
-  cmConditionEvaluator(cmMakefile& makefile);
+  cmConditionEvaluator(cmMakefile& makefile,
+                       cmListFileContext const& context,
+                       cmListFileBacktrace const& bt);
 
   // this is a shared function for both If and Else to determine if the
   // arguments were valid, and if so, was the response true. If there is
@@ -31,6 +33,9 @@ public:
       std::string &errorString,
       cmake::MessageType &status);
 
+  static cmListFileContext GetConditionContext(cmMakefile* mf,
+      const cmCommandContext& command, std::string const& filePath);
+
 private:
   // Filter the given variable definition based on policy CMP0054.
   const char* GetDefinitionIfUnquoted(
@@ -91,6 +96,8 @@ private:
       cmake::MessageType &status);
 
   cmMakefile& Makefile;
+  cmListFileContext ExecutionContext;
+  cmListFileBacktrace Backtrace;
   cmPolicies::PolicyStatus Policy12Status;
   cmPolicies::PolicyStatus Policy54Status;
   cmPolicies::PolicyStatus Policy57Status;
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 20448c1..9e71d37 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -106,7 +106,14 @@ IsFunctionBlocked(const cmListFileFunction& lff,
 
             cmake::MessageType messType;
 
-            cmConditionEvaluator conditionEvaluator(mf);
+            cmListFileContext conditionContext =
+                cmConditionEvaluator::GetConditionContext(
+                  &mf, this->Functions[c],
+                  this->GetStartingContext().FilePath);
+
+            cmConditionEvaluator conditionEvaluator(
+                  mf, conditionContext,
+                  mf.GetBacktrace(this->Functions[c]));
 
             bool isTrue = conditionEvaluator.IsTrue(
               expandedArguments, errorString, messType);
@@ -195,7 +202,16 @@ bool cmIfCommand
 
   cmake::MessageType status;
 
-  cmConditionEvaluator conditionEvaluator(*(this->Makefile));
+  cmListFileContext execContext = this->Makefile->GetExecutionContext();
+
+  cmCommandContext commandContext;
+  commandContext.Line = execContext.Line;
+  commandContext.Name = execContext.Name;
+
+  cmConditionEvaluator conditionEvaluator(
+        *(this->Makefile), cmConditionEvaluator::GetConditionContext(
+          this->Makefile, commandContext, execContext.FilePath),
+        this->Makefile->GetBacktrace());
 
   bool isTrue = conditionEvaluator.IsTrue(
     expandedArguments, errorString, status);
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 077470d..cb66a75 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4658,9 +4658,10 @@ bool cmMakefile::SetPolicyVersion(const char *version)
 }
 
 //----------------------------------------------------------------------------
-bool cmMakefile::HasCMP0054AlreadyBeenReported() const
+bool cmMakefile::HasCMP0054AlreadyBeenReported(
+    cmListFileContext const& context) const
 {
-  return !this->CMP0054ReportedIds.insert(this->GetExecutionContext()).second;
+  return !this->CMP0054ReportedIds.insert(context).second;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8724c6e..111f074 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -336,7 +336,7 @@ public:
    * Determine if the given context, name pair has already been reported
    * in context of CMP0054.
    */
-  bool HasCMP0054AlreadyBeenReported() const;
+  bool HasCMP0054AlreadyBeenReported(const cmListFileContext &context) const;
 
   bool IgnoreErrorsCMP0061() const;
 
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index 012c580..4b7afd8 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -49,7 +49,20 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
       mf.ExpandArguments(this->Args, expandedArguments);
       cmake::MessageType messageType;
 
-      cmConditionEvaluator conditionEvaluator(mf);
+      cmListFileContext execContext = this->GetStartingContext();
+
+      cmCommandContext commandContext;
+      commandContext.Line = execContext.Line;
+      commandContext.Name = execContext.Name;
+
+      cmListFileContext conditionContext =
+          cmConditionEvaluator::GetConditionContext(
+            &mf, commandContext,
+            this->GetStartingContext().FilePath);
+
+      cmConditionEvaluator conditionEvaluator(
+            mf, conditionContext,
+            mf.GetBacktrace(commandContext));
 
       bool isTrue = conditionEvaluator.IsTrue(
         expandedArguments, errorString, messageType);
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
index 3d875ae..3cfa5d2 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
@@ -9,3 +9,15 @@ CMake Warning \(dev\) at CMP0054-WARN.cmake:3 \(if\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
++
+CMake Warning \(dev\) at CMP0054-WARN.cmake:5 \(elseif\):
+  Policy CMP0054 is not set: Only interpret if\(\) arguments as variables or
+  keywords when unquoted.  Run "cmake --help-policy CMP0054" for policy
+  details.  Use the cmake_policy command to set the policy and suppress this
+  warning.
+
+  Quoted variables like "FOO" will no longer be dereferenced when the policy
+  is set to NEW.  Since the policy is not set the OLD behavior will be used.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
+This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake b/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
index 37855fc..a608929 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
@@ -2,4 +2,6 @@ set(FOO "BAR")
 
 if(NOT "FOO" STREQUAL "BAR")
   message(FATAL_ERROR "The given literals should match")
+elseif("FOO" STREQUAL "BING")
+  message(FATAL_ERROR "The given literals should not match")
 endif()
diff --git a/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt
index b1ebd49..5a8c263 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN-stderr.txt
@@ -10,3 +10,16 @@ CMake Warning \(dev\) at CMP0054-keywords-WARN.cmake:1 \(if\):
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.
++
+CMake Warning \(dev\) at CMP0054-keywords-WARN.cmake:3 \(elseif\):
+  Policy CMP0054 is not set: Only interpret if\(\) arguments as variables or
+  keywords when unquoted.  Run "cmake --help-policy CMP0054" for policy
+  details.  Use the cmake_policy command to set the policy and suppress this
+  warning.
+
+  Quoted keywords like "DEFINED" will no longer be interpreted as keywords
+  when the policy is set to NEW.  Since the policy is not set the OLD
+  behavior will be used.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
+This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake b/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake
index ee0a623..118ab3d 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake
+++ b/Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake
@@ -1,3 +1,5 @@
 if("NOT" 1)
   message(FATAL_ERROR "[\"NOT\" 1] evaluated true")
+elseif("DEFINED" NotDefined)
+  message(FATAL_ERROR "[\"DEFINED\" NotDefined] evaluated true")
 endif()

-----------------------------------------------------------------------

Summary of changes:
 Source/cmConditionEvaluator.cxx                    |   40 +++++++++++++++++---
 Source/cmConditionEvaluator.h                      |    9 ++++-
 Source/cmIfCommand.cxx                             |   20 +++++++++-
 Source/cmMakefile.cxx                              |    5 ++-
 Source/cmMakefile.h                                |    2 +-
 Source/cmWhileCommand.cxx                          |   15 +++++++-
 Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt     |   12 ++++++
 Tests/RunCMake/CMP0054/CMP0054-WARN.cmake          |    2 +
 .../CMP0054/CMP0054-keywords-WARN-stderr.txt       |   13 +++++++
 Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake |    2 +
 10 files changed, 108 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 18:26:57 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 18:26:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-741-g1bc5bbf
Message-ID: <20151020222657.E9DEAC05AC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1bc5bbf165a5d818d9589d5b6599727af47afaa3 (commit)
       via  c6f8df7c86b99f41f30ea8c5968f8394d05082cf (commit)
       via  e9316ead07a15e4eb85a8dd92e1e7d42ae5b6ccf (commit)
       via  69d4ddd992b62c68fe4f6d609a439356d282654d (commit)
       via  3df749af55c04d5b7bb0ee848c6df112178327bc (commit)
       via  3029c27e46a193c6319a3c909f938e6614c2b14f (commit)
      from  c8286a5ff5e2c7843a0ee33376dd3b0032317d48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bc5bbf165a5d818d9589d5b6599727af47afaa3
commit 1bc5bbf165a5d818d9589d5b6599727af47afaa3
Merge: c8286a5 c6f8df7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 18:26:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 18:26:56 2015 -0400

    Merge topic 'inline-cmMakeDepend-content' into next
    
    c6f8df7c cmMakeDepend: Inline into inheriting class.
    e9316ead cmMakeDepend: Inline into only user.
    69d4ddd9 cmMakeDepend: Inline into header.
    3df749af Remove vestigial declarations.
    3029c27e cmMakeDepend: Use public cmMakefile API.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6f8df7c86b99f41f30ea8c5968f8394d05082cf
commit c6f8df7c86b99f41f30ea8c5968f8394d05082cf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 22:14:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:26:04 2015 +0200

    cmMakeDepend: Inline into inheriting class.
    
    Devirtualize the API.

diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx
index a1500fc..59dafba 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -72,16 +72,13 @@ public:
   }
 };
 
-
-// cmMakeDepend is used to generate dependancy information for
-// the classes in a makefile
-class cmMakeDepend
+class cmLBDepend
 {
 public:
   /**
    * Construct the object with verbose turned off.
    */
-  cmMakeDepend()
+  cmLBDepend()
   {
     this->Verbose = false;
     this->IncludeFileRegularExpression.compile("^.*$");
@@ -91,7 +88,7 @@ public:
   /**
    * Destructor.
    */
-  virtual ~cmMakeDepend()
+  ~cmLBDepend()
   {
     cmDeleteAll(this->DependInformationMap);
   }
@@ -99,7 +96,7 @@ public:
   /**
    * Set the makefile that is used as a source of classes.
    */
-  virtual void SetMakefile(cmMakefile* makefile)
+  void SetMakefile(cmMakefile* makefile)
   {
     this->Makefile = makefile;
 
@@ -153,7 +150,7 @@ public:
   /**
    * Add a directory to the search path for include files.
    */
-  virtual void AddSearchPath(const std::string& path)
+  void AddSearchPath(const std::string& path)
   {
     this->IncludeDirectories.push_back(path);
   }
@@ -173,25 +170,47 @@ protected:
   /**
    * Compute the depend information for this class.
    */
-  virtual void DependWalk(cmDependInformation* info)
+
+  void DependWalk(cmDependInformation* info)
   {
-    cmsys::RegularExpression includeLine
-        ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
     cmsys::ifstream fin(info->FullPath.c_str());
     if(!fin)
       {
-      cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
+      cmSystemTools::Error("error can not open ", info->FullPath.c_str());
       return;
       }
 
-    // TODO: Write real read loop (see cmSystemTools::CopyFile).
     std::string line;
-    while( cmSystemTools::GetLineFromStream(fin, line) )
+    while(cmSystemTools::GetLineFromStream(fin, line))
       {
-      if(includeLine.find(line.c_str()))
+      if(cmHasLiteralPrefix(line.c_str(), "#include"))
         {
+        // if it is an include line then create a string class
+        std::string currentline = line;
+        size_t qstart = currentline.find('\"', 8);
+        size_t qend;
+        // if a quote is not found look for a <
+        if(qstart == std::string::npos)
+          {
+          qstart = currentline.find('<', 8);
+          // if a < is not found then move on
+          if(qstart == std::string::npos)
+            {
+            cmSystemTools::Error("unknown include directive ",
+                                 currentline.c_str() );
+            continue;
+            }
+          else
+            {
+            qend = currentline.find('>', qstart+1);
+            }
+          }
+        else
+          {
+          qend = currentline.find('\"', qstart+1);
+          }
         // extract the file being included
-        std::string includeFile = includeLine.match(1);
+        std::string includeFile = currentline.substr(qstart+1, qend - qstart-1);
         // see if the include matches the regular expression
         if(!this->IncludeFileRegularExpression.find(includeFile))
           {
@@ -205,8 +224,99 @@ protected:
             }
           continue;
           }
+
         // Add this file and all its dependencies.
         this->AddDependency(info, includeFile.c_str());
+        /// add the cxx file if it exists
+        std::string cxxFile = includeFile;
+        std::string::size_type pos = cxxFile.rfind('.');
+        if(pos != std::string::npos)
+          {
+          std::string root = cxxFile.substr(0, pos);
+          cxxFile = root + ".cxx";
+          bool found = false;
+          // try jumping to .cxx .cpp and .c in order
+          if(cmSystemTools::FileExists(cxxFile.c_str()))
+            {
+            found = true;
+            }
+          for(std::vector<std::string>::iterator i =
+              this->IncludeDirectories.begin();
+              i != this->IncludeDirectories.end(); ++i)
+            {
+            std::string path = *i;
+            path = path + "/";
+            path = path + cxxFile;
+            if(cmSystemTools::FileExists(path.c_str()))
+              {
+              found = true;
+              }
+            }
+          if (!found)
+            {
+            cxxFile = root + ".cpp";
+            if(cmSystemTools::FileExists(cxxFile.c_str()))
+              {
+              found = true;
+              }
+            for(std::vector<std::string>::iterator i =
+                this->IncludeDirectories.begin();
+                i != this->IncludeDirectories.end(); ++i)
+              {
+              std::string path = *i;
+              path = path + "/";
+              path = path + cxxFile;
+              if(cmSystemTools::FileExists(path.c_str()))
+                {
+                found = true;
+                }
+              }
+            }
+          if (!found)
+            {
+            cxxFile = root + ".c";
+            if(cmSystemTools::FileExists(cxxFile.c_str()))
+              {
+              found = true;
+              }
+            for(std::vector<std::string>::iterator i =
+                this->IncludeDirectories.begin();
+                i != this->IncludeDirectories.end(); ++i)
+              {
+              std::string path = *i;
+              path = path + "/";
+              path = path + cxxFile;
+              if(cmSystemTools::FileExists(path.c_str()))
+                {
+                found = true;
+                }
+              }
+            }
+          if (!found)
+            {
+            cxxFile = root + ".txx";
+            if(cmSystemTools::FileExists(cxxFile.c_str()))
+              {
+              found = true;
+              }
+            for(std::vector<std::string>::iterator i =
+                this->IncludeDirectories.begin();
+                i != this->IncludeDirectories.end(); ++i)
+              {
+              std::string path = *i;
+              path = path + "/";
+              path = path + cxxFile;
+              if(cmSystemTools::FileExists(path.c_str()))
+                {
+                found = true;
+                }
+              }
+            }
+          if (found)
+            {
+            this->AddDependency(info, cxxFile.c_str());
+            }
+          }
         }
       }
   }
@@ -214,7 +324,7 @@ protected:
   /**
    * Add a dependency.  Possibly walk it for more dependencies.
    */
-  virtual void AddDependency(cmDependInformation* info, const char* file)
+  void AddDependency(cmDependInformation* info, const char* file)
   {
     cmDependInformation* dependInfo =
         this->GetDependInformation(file, info->PathOnly.c_str());
@@ -450,164 +560,6 @@ protected:
   DirectoryToFileToPathMapType DirectoryToFileToPathMap;
 };
 
-class cmLBDepend : public cmMakeDepend
-{
-  /**
-   * Compute the depend information for this class.
-   */
-  virtual void DependWalk(cmDependInformation* info);
-};
-
-void cmLBDepend::DependWalk(cmDependInformation* info)
-{
-  cmsys::ifstream fin(info->FullPath.c_str());
-  if(!fin)
-    {
-    cmSystemTools::Error("error can not open ", info->FullPath.c_str());
-    return;
-    }
-
-  std::string line;
-  while(cmSystemTools::GetLineFromStream(fin, line))
-    {
-    if(cmHasLiteralPrefix(line.c_str(), "#include"))
-      {
-      // if it is an include line then create a string class
-      std::string currentline = line;
-      size_t qstart = currentline.find('\"', 8);
-      size_t qend;
-      // if a quote is not found look for a <
-      if(qstart == std::string::npos)
-        {
-        qstart = currentline.find('<', 8);
-        // if a < is not found then move on
-        if(qstart == std::string::npos)
-          {
-          cmSystemTools::Error("unknown include directive ",
-                               currentline.c_str() );
-          continue;
-          }
-        else
-          {
-          qend = currentline.find('>', qstart+1);
-          }
-        }
-      else
-        {
-        qend = currentline.find('\"', qstart+1);
-        }
-      // extract the file being included
-      std::string includeFile = currentline.substr(qstart+1, qend - qstart-1);
-      // see if the include matches the regular expression
-      if(!this->IncludeFileRegularExpression.find(includeFile))
-        {
-        if(this->Verbose)
-          {
-          std::string message = "Skipping ";
-          message += includeFile;
-          message += " for file ";
-          message += info->FullPath.c_str();
-          cmSystemTools::Error(message.c_str(), 0);
-          }
-        continue;
-        }
-
-      // Add this file and all its dependencies.
-      this->AddDependency(info, includeFile.c_str());
-      /// add the cxx file if it exists
-      std::string cxxFile = includeFile;
-      std::string::size_type pos = cxxFile.rfind('.');
-      if(pos != std::string::npos)
-        {
-        std::string root = cxxFile.substr(0, pos);
-        cxxFile = root + ".cxx";
-        bool found = false;
-        // try jumping to .cxx .cpp and .c in order
-        if(cmSystemTools::FileExists(cxxFile.c_str()))
-          {
-          found = true;
-          }
-        for(std::vector<std::string>::iterator i =
-              this->IncludeDirectories.begin();
-            i != this->IncludeDirectories.end(); ++i)
-          {
-          std::string path = *i;
-          path = path + "/";
-          path = path + cxxFile;
-          if(cmSystemTools::FileExists(path.c_str()))
-            {
-            found = true;
-            }
-          }
-        if (!found)
-          {
-          cxxFile = root + ".cpp";
-          if(cmSystemTools::FileExists(cxxFile.c_str()))
-            {
-            found = true;
-            }
-          for(std::vector<std::string>::iterator i =
-                this->IncludeDirectories.begin();
-              i != this->IncludeDirectories.end(); ++i)
-            {
-            std::string path = *i;
-            path = path + "/";
-            path = path + cxxFile;
-            if(cmSystemTools::FileExists(path.c_str()))
-              {
-              found = true;
-              }
-            }
-          }
-        if (!found)
-          {
-          cxxFile = root + ".c";
-          if(cmSystemTools::FileExists(cxxFile.c_str()))
-            {
-            found = true;
-            }
-          for(std::vector<std::string>::iterator i =
-                this->IncludeDirectories.begin();
-              i != this->IncludeDirectories.end(); ++i)
-            {
-            std::string path = *i;
-            path = path + "/";
-            path = path + cxxFile;
-            if(cmSystemTools::FileExists(path.c_str()))
-              {
-              found = true;
-              }
-            }
-          }
-        if (!found)
-          {
-          cxxFile = root + ".txx";
-          if(cmSystemTools::FileExists(cxxFile.c_str()))
-            {
-            found = true;
-            }
-          for(std::vector<std::string>::iterator i =
-                this->IncludeDirectories.begin();
-              i != this->IncludeDirectories.end(); ++i)
-            {
-            std::string path = *i;
-            path = path + "/";
-            path = path + cxxFile;
-            if(cmSystemTools::FileExists(path.c_str()))
-              {
-              found = true;
-              }
-            }
-          }
-        if (found)
-          {
-          this->AddDependency(info, cxxFile.c_str());
-          }
-        }
-      }
-    }
-}
-
 // cmOutputRequiredFilesCommand
 bool cmOutputRequiredFilesCommand
 ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9316ead07a15e4eb85a8dd92e1e7d42ae5b6ccf
commit e9316ead07a15e4eb85a8dd92e1e7d42ae5b6ccf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 00:12:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:24:12 2015 +0200

    cmMakeDepend: Inline into only user.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 1c0ec39..fd71b0e 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -299,7 +299,6 @@ set(SRCS
   cmLocalUnixMakefileGenerator3.cxx
   cmLocale.h
   ${MACH_SRCS}
-  cmMakeDepend.h
   cmMakefile.cxx
   cmMakefile.h
   cmMakefileTargetGenerator.cxx
diff --git a/Source/cmMakeDepend.h b/Source/cmMakeDepend.h
deleted file mode 100644
index 566f7be..0000000
--- a/Source/cmMakeDepend.h
+++ /dev/null
@@ -1,461 +0,0 @@
-/*============================================================================
-  CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  Distributed under the OSI-approved BSD License (the "License");
-  see accompanying file Copyright.txt for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even the
-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the License for more information.
-============================================================================*/
-#ifndef cmMakeDepend_h
-#define cmMakeDepend_h
-
-#include "cmMakefile.h"
-#include "cmSourceFile.h"
-#include "cmSystemTools.h"
-#include "cmGeneratorExpression.h"
-#include "cmAlgorithms.h"
-
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
-
-/** \class cmDependInformation
- * \brief Store dependency information for a single source file.
- *
- * This structure stores the depend information for a single source file.
- */
-class cmDependInformation
-{
-public:
-  /**
-   * Construct with dependency generation marked not done; instance
-   * not placed in cmMakefile's list.
-   */
-  cmDependInformation(): DependDone(false), SourceFile(0) {}
-
-  /**
-   * The set of files on which this one depends.
-   */
-  typedef std::set<cmDependInformation*> DependencySetType;
-  DependencySetType DependencySet;
-
-  /**
-   * This flag indicates whether dependency checking has been
-   * performed for this file.
-   */
-  bool DependDone;
-
-  /**
-   * If this object corresponds to a cmSourceFile instance, this points
-   * to it.
-   */
-  const cmSourceFile *SourceFile;
-
-  /**
-   * Full path to this file.
-   */
-  std::string FullPath;
-
-  /**
-   * Full path not including file name.
-   */
-  std::string PathOnly;
-
-  /**
-   * Name used to #include this file.
-   */
-  std::string IncludeName;
-
-  /**
-   * This method adds the dependencies of another file to this one.
-   */
-  void AddDependencies(cmDependInformation* info)
-  {
-  if(this != info)
-    {
-    this->DependencySet.insert(info);
-    }
-  }
-};
-
-
-// cmMakeDepend is used to generate dependancy information for
-// the classes in a makefile
-class cmMakeDepend
-{
-public:
-  /**
-   * Construct the object with verbose turned off.
-   */
-  cmMakeDepend()
-  {
-    this->Verbose = false;
-    this->IncludeFileRegularExpression.compile("^.*$");
-    this->ComplainFileRegularExpression.compile("^$");
-  }
-
-  /**
-   * Destructor.
-   */
-  virtual ~cmMakeDepend()
-  {
-    cmDeleteAll(this->DependInformationMap);
-  }
-
-  /**
-   * Set the makefile that is used as a source of classes.
-   */
-  virtual void SetMakefile(cmMakefile* makefile)
-  {
-    this->Makefile = makefile;
-
-    // Now extract the include file regular expression from the makefile.
-    this->IncludeFileRegularExpression.compile(
-          this->Makefile->GetIncludeRegularExpression());
-    this->ComplainFileRegularExpression.compile(
-          this->Makefile->GetComplainRegularExpression());
-
-    // Now extract any include paths from the targets
-    std::set<std::string> uniqueIncludes;
-    std::vector<std::string> orderedAndUniqueIncludes;
-    cmTargets &targets = this->Makefile->GetTargets();
-    for (cmTargets::iterator l = targets.begin();
-         l != targets.end(); ++l)
-      {
-      const char *incDirProp = l->second.GetProperty("INCLUDE_DIRECTORIES");
-      if (!incDirProp)
-        {
-        continue;
-        }
-
-      std::string incDirs =
-          cmGeneratorExpression::Preprocess(incDirProp,
-              cmGeneratorExpression::StripAllGeneratorExpressions);
-
-      std::vector<std::string> includes;
-      cmSystemTools::ExpandListArgument(incDirs, includes);
-
-      for(std::vector<std::string>::const_iterator j = includes.begin();
-          j != includes.end(); ++j)
-        {
-        std::string path = *j;
-        this->Makefile->ExpandVariablesInString(path);
-        if(uniqueIncludes.insert(path).second)
-          {
-          orderedAndUniqueIncludes.push_back(path);
-          }
-        }
-      }
-
-    for(std::vector<std::string>::const_iterator
-        it = orderedAndUniqueIncludes.begin();
-        it != orderedAndUniqueIncludes.end();
-        ++it)
-      {
-      this->AddSearchPath(*it);
-      }
-  }
-
-  /**
-   * Add a directory to the search path for include files.
-   */
-  virtual void AddSearchPath(const std::string& path)
-  {
-    this->IncludeDirectories.push_back(path);
-  }
-
-  /**
-   * Generate dependencies for the file given.  Returns a pointer to
-   * the cmDependInformation object for the file.
-   */
-  const cmDependInformation* FindDependencies(const char* file)
-  {
-    cmDependInformation* info = this->GetDependInformation(file,0);
-    this->GenerateDependInformation(info);
-    return info;
-  }
-
-protected:
-  /**
-   * Compute the depend information for this class.
-   */
-  virtual void DependWalk(cmDependInformation* info)
-  {
-    cmsys::RegularExpression includeLine
-        ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
-    cmsys::ifstream fin(info->FullPath.c_str());
-    if(!fin)
-      {
-      cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
-      return;
-      }
-
-    // TODO: Write real read loop (see cmSystemTools::CopyFile).
-    std::string line;
-    while( cmSystemTools::GetLineFromStream(fin, line) )
-      {
-      if(includeLine.find(line.c_str()))
-        {
-        // extract the file being included
-        std::string includeFile = includeLine.match(1);
-        // see if the include matches the regular expression
-        if(!this->IncludeFileRegularExpression.find(includeFile))
-          {
-          if(this->Verbose)
-            {
-            std::string message = "Skipping ";
-            message += includeFile;
-            message += " for file ";
-            message += info->FullPath.c_str();
-            cmSystemTools::Error(message.c_str(), 0);
-            }
-          continue;
-          }
-        // Add this file and all its dependencies.
-        this->AddDependency(info, includeFile.c_str());
-        }
-      }
-  }
-
-  /**
-   * Add a dependency.  Possibly walk it for more dependencies.
-   */
-  virtual void AddDependency(cmDependInformation* info, const char* file)
-  {
-    cmDependInformation* dependInfo =
-        this->GetDependInformation(file, info->PathOnly.c_str());
-    this->GenerateDependInformation(dependInfo);
-    info->AddDependencies(dependInfo);
-  }
-
-  /**
-   * Fill in the given object with dependency information.  If the
-   * information is already complete, nothing is done.
-   */
-  void GenerateDependInformation(cmDependInformation* info)
-  {
-    // If dependencies are already done, stop now.
-    if(info->DependDone)
-      {
-      return;
-      }
-    else
-      {
-      // Make sure we don't visit the same file more than once.
-      info->DependDone = true;
-      }
-    const char* path = info->FullPath.c_str();
-    if(!path)
-      {
-      cmSystemTools::Error(
-            "Attempt to find dependencies for file without path!");
-      return;
-      }
-
-    bool found = false;
-
-    // If the file exists, use it to find dependency information.
-    if(cmSystemTools::FileExists(path, true))
-      {
-      // Use the real file to find its dependencies.
-      this->DependWalk(info);
-      found = true;
-      }
-
-
-    // See if the cmSourceFile for it has any files specified as
-    // dependency hints.
-    if(info->SourceFile != 0)
-      {
-
-      // Get the cmSourceFile corresponding to this.
-      const cmSourceFile& cFile = *(info->SourceFile);
-      // See if there are any hints for finding dependencies for the missing
-      // file.
-      if(!cFile.GetDepends().empty())
-        {
-        // Dependency hints have been given.  Use them to begin the
-        // recursion.
-        for(std::vector<std::string>::const_iterator file =
-            cFile.GetDepends().begin(); file != cFile.GetDepends().end();
-            ++file)
-          {
-          this->AddDependency(info, file->c_str());
-          }
-
-        // Found dependency information.  We are done.
-        found = true;
-        }
-      }
-
-    if(!found)
-      {
-      // Try to find the file amongst the sources
-      cmSourceFile *srcFile = this->Makefile->GetSource
-          (cmSystemTools::GetFilenameWithoutExtension(path));
-      if (srcFile)
-        {
-        if (srcFile->GetFullPath() == path)
-          {
-          found=true;
-          }
-        else
-          {
-          //try to guess which include path to use
-          for(std::vector<std::string>::iterator t =
-              this->IncludeDirectories.begin();
-              t != this->IncludeDirectories.end(); ++t)
-            {
-            std::string incpath = *t;
-            if (!incpath.empty() && incpath[incpath.size() - 1] != '/')
-              {
-              incpath = incpath + "/";
-              }
-            incpath = incpath + path;
-            if (srcFile->GetFullPath() == incpath)
-              {
-              // set the path to the guessed path
-              info->FullPath = incpath;
-              found=true;
-              }
-            }
-          }
-        }
-      }
-
-    if(!found)
-      {
-      // Couldn't find any dependency information.
-      if(this->ComplainFileRegularExpression.find(info->IncludeName.c_str()))
-        {
-        cmSystemTools::Error("error cannot find dependencies for ", path);
-        }
-      else
-        {
-        // Destroy the name of the file so that it won't be output as a
-        // dependency.
-        info->FullPath = "";
-        }
-      }
-  }
-
-  /**
-   * Get an instance of cmDependInformation corresponding to the given file
-   * name.
-   */
-  cmDependInformation* GetDependInformation(const char* file,
-                                            const char *extraPath)
-  {
-    // Get the full path for the file so that lookup is unambiguous.
-    std::string fullPath = this->FullPath(file, extraPath);
-
-    // Try to find the file's instance of cmDependInformation.
-    DependInformationMapType::const_iterator result =
-        this->DependInformationMap.find(fullPath);
-    if(result != this->DependInformationMap.end())
-      {
-      // Found an instance, return it.
-      return result->second;
-      }
-    else
-      {
-      // Didn't find an instance.  Create a new one and save it.
-      cmDependInformation* info = new cmDependInformation;
-      info->FullPath = fullPath;
-      info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
-      info->IncludeName = file;
-      this->DependInformationMap[fullPath] = info;
-      return info;
-      }
-  }
-
-  /**
-   * Find the full path name for the given file name.
-   * This uses the include directories.
-   * TODO: Cache path conversions to reduce FileExists calls.
-   */
-  std::string FullPath(const char *fname, const char *extraPath)
-  {
-    DirectoryToFileToPathMapType::iterator m;
-    if(extraPath)
-      {
-      m = this->DirectoryToFileToPathMap.find(extraPath);
-      }
-    else
-      {
-      m = this->DirectoryToFileToPathMap.find("");
-      }
-
-    if(m != this->DirectoryToFileToPathMap.end())
-      {
-      FileToPathMapType& map = m->second;
-      FileToPathMapType::iterator p = map.find(fname);
-      if(p != map.end())
-        {
-        return p->second;
-        }
-      }
-
-    if(cmSystemTools::FileExists(fname, true))
-      {
-      std::string fp = cmSystemTools::CollapseFullPath(fname);
-      this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
-      return fp;
-      }
-
-    for(std::vector<std::string>::iterator i = this->IncludeDirectories.begin();
-        i != this->IncludeDirectories.end(); ++i)
-      {
-      std::string path = *i;
-      if (!path.empty() && path[path.size() - 1] != '/')
-        {
-        path = path + "/";
-        }
-      path = path + fname;
-      if(cmSystemTools::FileExists(path.c_str(), true)
-         && !cmSystemTools::FileIsDirectory(path))
-        {
-        std::string fp = cmSystemTools::CollapseFullPath(path);
-        this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
-        return fp;
-        }
-      }
-
-    if (extraPath)
-      {
-      std::string path = extraPath;
-      if (!path.empty() && path[path.size() - 1] != '/')
-        {
-        path = path + "/";
-        }
-      path = path + fname;
-      if(cmSystemTools::FileExists(path.c_str(), true)
-         && !cmSystemTools::FileIsDirectory(path))
-        {
-        std::string fp = cmSystemTools::CollapseFullPath(path);
-        this->DirectoryToFileToPathMap[extraPath][fname] = fp;
-        return fp;
-        }
-      }
-
-    // Couldn't find the file.
-    return std::string(fname);
-  }
-
-  cmMakefile* Makefile;
-  bool Verbose;
-  cmsys::RegularExpression IncludeFileRegularExpression;
-  cmsys::RegularExpression ComplainFileRegularExpression;
-  std::vector<std::string> IncludeDirectories;
-  typedef std::map<std::string, std::string> FileToPathMapType;
-  typedef std::map<std::string, FileToPathMapType>
-  DirectoryToFileToPathMapType;
-  typedef std::map<std::string, cmDependInformation*>
-  DependInformationMapType;
-  DependInformationMapType DependInformationMap;
-  DirectoryToFileToPathMapType DirectoryToFileToPathMap;
-};
-
-#endif
diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx
index 2d57d3b..a1500fc 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -10,10 +10,446 @@
   See the License for more information.
 ============================================================================*/
 #include "cmOutputRequiredFilesCommand.h"
-#include "cmMakeDepend.h"
 #include "cmAlgorithms.h"
 #include <cmsys/FStream.hxx>
 
+/** \class cmDependInformation
+ * \brief Store dependency information for a single source file.
+ *
+ * This structure stores the depend information for a single source file.
+ */
+class cmDependInformation
+{
+public:
+  /**
+   * Construct with dependency generation marked not done; instance
+   * not placed in cmMakefile's list.
+   */
+  cmDependInformation(): DependDone(false), SourceFile(0) {}
+
+  /**
+   * The set of files on which this one depends.
+   */
+  typedef std::set<cmDependInformation*> DependencySetType;
+  DependencySetType DependencySet;
+
+  /**
+   * This flag indicates whether dependency checking has been
+   * performed for this file.
+   */
+  bool DependDone;
+
+  /**
+   * If this object corresponds to a cmSourceFile instance, this points
+   * to it.
+   */
+  const cmSourceFile *SourceFile;
+
+  /**
+   * Full path to this file.
+   */
+  std::string FullPath;
+
+  /**
+   * Full path not including file name.
+   */
+  std::string PathOnly;
+
+  /**
+   * Name used to #include this file.
+   */
+  std::string IncludeName;
+
+  /**
+   * This method adds the dependencies of another file to this one.
+   */
+  void AddDependencies(cmDependInformation* info)
+  {
+  if(this != info)
+    {
+    this->DependencySet.insert(info);
+    }
+  }
+};
+
+
+// cmMakeDepend is used to generate dependancy information for
+// the classes in a makefile
+class cmMakeDepend
+{
+public:
+  /**
+   * Construct the object with verbose turned off.
+   */
+  cmMakeDepend()
+  {
+    this->Verbose = false;
+    this->IncludeFileRegularExpression.compile("^.*$");
+    this->ComplainFileRegularExpression.compile("^$");
+  }
+
+  /**
+   * Destructor.
+   */
+  virtual ~cmMakeDepend()
+  {
+    cmDeleteAll(this->DependInformationMap);
+  }
+
+  /**
+   * Set the makefile that is used as a source of classes.
+   */
+  virtual void SetMakefile(cmMakefile* makefile)
+  {
+    this->Makefile = makefile;
+
+    // Now extract the include file regular expression from the makefile.
+    this->IncludeFileRegularExpression.compile(
+          this->Makefile->GetIncludeRegularExpression());
+    this->ComplainFileRegularExpression.compile(
+          this->Makefile->GetComplainRegularExpression());
+
+    // Now extract any include paths from the targets
+    std::set<std::string> uniqueIncludes;
+    std::vector<std::string> orderedAndUniqueIncludes;
+    cmTargets &targets = this->Makefile->GetTargets();
+    for (cmTargets::iterator l = targets.begin();
+         l != targets.end(); ++l)
+      {
+      const char *incDirProp = l->second.GetProperty("INCLUDE_DIRECTORIES");
+      if (!incDirProp)
+        {
+        continue;
+        }
+
+      std::string incDirs =
+          cmGeneratorExpression::Preprocess(incDirProp,
+              cmGeneratorExpression::StripAllGeneratorExpressions);
+
+      std::vector<std::string> includes;
+      cmSystemTools::ExpandListArgument(incDirs, includes);
+
+      for(std::vector<std::string>::const_iterator j = includes.begin();
+          j != includes.end(); ++j)
+        {
+        std::string path = *j;
+        this->Makefile->ExpandVariablesInString(path);
+        if(uniqueIncludes.insert(path).second)
+          {
+          orderedAndUniqueIncludes.push_back(path);
+          }
+        }
+      }
+
+    for(std::vector<std::string>::const_iterator
+        it = orderedAndUniqueIncludes.begin();
+        it != orderedAndUniqueIncludes.end();
+        ++it)
+      {
+      this->AddSearchPath(*it);
+      }
+  }
+
+  /**
+   * Add a directory to the search path for include files.
+   */
+  virtual void AddSearchPath(const std::string& path)
+  {
+    this->IncludeDirectories.push_back(path);
+  }
+
+  /**
+   * Generate dependencies for the file given.  Returns a pointer to
+   * the cmDependInformation object for the file.
+   */
+  const cmDependInformation* FindDependencies(const char* file)
+  {
+    cmDependInformation* info = this->GetDependInformation(file,0);
+    this->GenerateDependInformation(info);
+    return info;
+  }
+
+protected:
+  /**
+   * Compute the depend information for this class.
+   */
+  virtual void DependWalk(cmDependInformation* info)
+  {
+    cmsys::RegularExpression includeLine
+        ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
+    cmsys::ifstream fin(info->FullPath.c_str());
+    if(!fin)
+      {
+      cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
+      return;
+      }
+
+    // TODO: Write real read loop (see cmSystemTools::CopyFile).
+    std::string line;
+    while( cmSystemTools::GetLineFromStream(fin, line) )
+      {
+      if(includeLine.find(line.c_str()))
+        {
+        // extract the file being included
+        std::string includeFile = includeLine.match(1);
+        // see if the include matches the regular expression
+        if(!this->IncludeFileRegularExpression.find(includeFile))
+          {
+          if(this->Verbose)
+            {
+            std::string message = "Skipping ";
+            message += includeFile;
+            message += " for file ";
+            message += info->FullPath.c_str();
+            cmSystemTools::Error(message.c_str(), 0);
+            }
+          continue;
+          }
+        // Add this file and all its dependencies.
+        this->AddDependency(info, includeFile.c_str());
+        }
+      }
+  }
+
+  /**
+   * Add a dependency.  Possibly walk it for more dependencies.
+   */
+  virtual void AddDependency(cmDependInformation* info, const char* file)
+  {
+    cmDependInformation* dependInfo =
+        this->GetDependInformation(file, info->PathOnly.c_str());
+    this->GenerateDependInformation(dependInfo);
+    info->AddDependencies(dependInfo);
+  }
+
+  /**
+   * Fill in the given object with dependency information.  If the
+   * information is already complete, nothing is done.
+   */
+  void GenerateDependInformation(cmDependInformation* info)
+  {
+    // If dependencies are already done, stop now.
+    if(info->DependDone)
+      {
+      return;
+      }
+    else
+      {
+      // Make sure we don't visit the same file more than once.
+      info->DependDone = true;
+      }
+    const char* path = info->FullPath.c_str();
+    if(!path)
+      {
+      cmSystemTools::Error(
+            "Attempt to find dependencies for file without path!");
+      return;
+      }
+
+    bool found = false;
+
+    // If the file exists, use it to find dependency information.
+    if(cmSystemTools::FileExists(path, true))
+      {
+      // Use the real file to find its dependencies.
+      this->DependWalk(info);
+      found = true;
+      }
+
+
+    // See if the cmSourceFile for it has any files specified as
+    // dependency hints.
+    if(info->SourceFile != 0)
+      {
+
+      // Get the cmSourceFile corresponding to this.
+      const cmSourceFile& cFile = *(info->SourceFile);
+      // See if there are any hints for finding dependencies for the missing
+      // file.
+      if(!cFile.GetDepends().empty())
+        {
+        // Dependency hints have been given.  Use them to begin the
+        // recursion.
+        for(std::vector<std::string>::const_iterator file =
+            cFile.GetDepends().begin(); file != cFile.GetDepends().end();
+            ++file)
+          {
+          this->AddDependency(info, file->c_str());
+          }
+
+        // Found dependency information.  We are done.
+        found = true;
+        }
+      }
+
+    if(!found)
+      {
+      // Try to find the file amongst the sources
+      cmSourceFile *srcFile = this->Makefile->GetSource
+          (cmSystemTools::GetFilenameWithoutExtension(path));
+      if (srcFile)
+        {
+        if (srcFile->GetFullPath() == path)
+          {
+          found=true;
+          }
+        else
+          {
+          //try to guess which include path to use
+          for(std::vector<std::string>::iterator t =
+              this->IncludeDirectories.begin();
+              t != this->IncludeDirectories.end(); ++t)
+            {
+            std::string incpath = *t;
+            if (!incpath.empty() && incpath[incpath.size() - 1] != '/')
+              {
+              incpath = incpath + "/";
+              }
+            incpath = incpath + path;
+            if (srcFile->GetFullPath() == incpath)
+              {
+              // set the path to the guessed path
+              info->FullPath = incpath;
+              found=true;
+              }
+            }
+          }
+        }
+      }
+
+    if(!found)
+      {
+      // Couldn't find any dependency information.
+      if(this->ComplainFileRegularExpression.find(info->IncludeName.c_str()))
+        {
+        cmSystemTools::Error("error cannot find dependencies for ", path);
+        }
+      else
+        {
+        // Destroy the name of the file so that it won't be output as a
+        // dependency.
+        info->FullPath = "";
+        }
+      }
+  }
+
+  /**
+   * Get an instance of cmDependInformation corresponding to the given file
+   * name.
+   */
+  cmDependInformation* GetDependInformation(const char* file,
+                                            const char *extraPath)
+  {
+    // Get the full path for the file so that lookup is unambiguous.
+    std::string fullPath = this->FullPath(file, extraPath);
+
+    // Try to find the file's instance of cmDependInformation.
+    DependInformationMapType::const_iterator result =
+        this->DependInformationMap.find(fullPath);
+    if(result != this->DependInformationMap.end())
+      {
+      // Found an instance, return it.
+      return result->second;
+      }
+    else
+      {
+      // Didn't find an instance.  Create a new one and save it.
+      cmDependInformation* info = new cmDependInformation;
+      info->FullPath = fullPath;
+      info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
+      info->IncludeName = file;
+      this->DependInformationMap[fullPath] = info;
+      return info;
+      }
+  }
+
+  /**
+   * Find the full path name for the given file name.
+   * This uses the include directories.
+   * TODO: Cache path conversions to reduce FileExists calls.
+   */
+  std::string FullPath(const char *fname, const char *extraPath)
+  {
+    DirectoryToFileToPathMapType::iterator m;
+    if(extraPath)
+      {
+      m = this->DirectoryToFileToPathMap.find(extraPath);
+      }
+    else
+      {
+      m = this->DirectoryToFileToPathMap.find("");
+      }
+
+    if(m != this->DirectoryToFileToPathMap.end())
+      {
+      FileToPathMapType& map = m->second;
+      FileToPathMapType::iterator p = map.find(fname);
+      if(p != map.end())
+        {
+        return p->second;
+        }
+      }
+
+    if(cmSystemTools::FileExists(fname, true))
+      {
+      std::string fp = cmSystemTools::CollapseFullPath(fname);
+      this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
+      return fp;
+      }
+
+    for(std::vector<std::string>::iterator i = this->IncludeDirectories.begin();
+        i != this->IncludeDirectories.end(); ++i)
+      {
+      std::string path = *i;
+      if (!path.empty() && path[path.size() - 1] != '/')
+        {
+        path = path + "/";
+        }
+      path = path + fname;
+      if(cmSystemTools::FileExists(path.c_str(), true)
+         && !cmSystemTools::FileIsDirectory(path))
+        {
+        std::string fp = cmSystemTools::CollapseFullPath(path);
+        this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
+        return fp;
+        }
+      }
+
+    if (extraPath)
+      {
+      std::string path = extraPath;
+      if (!path.empty() && path[path.size() - 1] != '/')
+        {
+        path = path + "/";
+        }
+      path = path + fname;
+      if(cmSystemTools::FileExists(path.c_str(), true)
+         && !cmSystemTools::FileIsDirectory(path))
+        {
+        std::string fp = cmSystemTools::CollapseFullPath(path);
+        this->DirectoryToFileToPathMap[extraPath][fname] = fp;
+        return fp;
+        }
+      }
+
+    // Couldn't find the file.
+    return std::string(fname);
+  }
+
+  cmMakefile* Makefile;
+  bool Verbose;
+  cmsys::RegularExpression IncludeFileRegularExpression;
+  cmsys::RegularExpression ComplainFileRegularExpression;
+  std::vector<std::string> IncludeDirectories;
+  typedef std::map<std::string, std::string> FileToPathMapType;
+  typedef std::map<std::string, FileToPathMapType>
+  DirectoryToFileToPathMapType;
+  typedef std::map<std::string, cmDependInformation*>
+  DependInformationMapType;
+  DependInformationMapType DependInformationMap;
+  DirectoryToFileToPathMapType DirectoryToFileToPathMap;
+};
+
 class cmLBDepend : public cmMakeDepend
 {
   /**
diff --git a/Source/cmOutputRequiredFilesCommand.h b/Source/cmOutputRequiredFilesCommand.h
index 6a09673..b5eb932 100644
--- a/Source/cmOutputRequiredFilesCommand.h
+++ b/Source/cmOutputRequiredFilesCommand.h
@@ -13,7 +13,8 @@
 #define cmOutputRequiredFilesCommand_h
 
 #include "cmCommand.h"
-#include "cmMakeDepend.h"
+
+class cmDependInformation;
 
 class cmOutputRequiredFilesCommand : public cmCommand
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69d4ddd992b62c68fe4f6d609a439356d282654d
commit 69d4ddd992b62c68fe4f6d609a439356d282654d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 00:09:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:22:23 2015 +0200

    cmMakeDepend: Inline into header.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index ee690e6..1c0ec39 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -299,7 +299,6 @@ set(SRCS
   cmLocalUnixMakefileGenerator3.cxx
   cmLocale.h
   ${MACH_SRCS}
-  cmMakeDepend.cxx
   cmMakeDepend.h
   cmMakefile.cxx
   cmMakefile.h
diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx
deleted file mode 100644
index f4a22ed..0000000
--- a/Source/cmMakeDepend.cxx
+++ /dev/null
@@ -1,361 +0,0 @@
-/*============================================================================
-  CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  Distributed under the OSI-approved BSD License (the "License");
-  see accompanying file Copyright.txt for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even the
-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the License for more information.
-============================================================================*/
-#include "cmMakeDepend.h"
-#include "cmSystemTools.h"
-#include "cmGeneratorExpression.h"
-#include "cmAlgorithms.h"
-
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
-
-void cmDependInformation::AddDependencies(cmDependInformation* info)
-{
-  if(this != info)
-    {
-    this->DependencySet.insert(info);
-    }
-}
-
-cmMakeDepend::cmMakeDepend()
-{
-  this->Verbose = false;
-  this->IncludeFileRegularExpression.compile("^.*$");
-  this->ComplainFileRegularExpression.compile("^$");
-}
-
-
-cmMakeDepend::~cmMakeDepend()
-{
-  cmDeleteAll(this->DependInformationMap);
-}
-
-
-// Set the makefile that depends will be made from.
-// The pointer is kept so the cmSourceFile array can
-// be updated with the depend information in the cmMakefile.
-
-void cmMakeDepend::SetMakefile(cmMakefile* makefile)
-{
-  this->Makefile = makefile;
-
-  // Now extract the include file regular expression from the makefile.
-  this->IncludeFileRegularExpression.compile(
-    this->Makefile->GetIncludeRegularExpression());
-  this->ComplainFileRegularExpression.compile(
-    this->Makefile->GetComplainRegularExpression());
-
-  // Now extract any include paths from the targets
-  std::set<std::string> uniqueIncludes;
-  std::vector<std::string> orderedAndUniqueIncludes;
-  cmTargets &targets = this->Makefile->GetTargets();
-  for (cmTargets::iterator l = targets.begin();
-       l != targets.end(); ++l)
-    {
-    const char *incDirProp = l->second.GetProperty("INCLUDE_DIRECTORIES");
-    if (!incDirProp)
-      {
-      continue;
-      }
-
-    std::string incDirs = cmGeneratorExpression::Preprocess(incDirProp,
-                      cmGeneratorExpression::StripAllGeneratorExpressions);
-
-    std::vector<std::string> includes;
-    cmSystemTools::ExpandListArgument(incDirs, includes);
-
-    for(std::vector<std::string>::const_iterator j = includes.begin();
-        j != includes.end(); ++j)
-      {
-      std::string path = *j;
-      this->Makefile->ExpandVariablesInString(path);
-      if(uniqueIncludes.insert(path).second)
-        {
-        orderedAndUniqueIncludes.push_back(path);
-        }
-      }
-    }
-
-  for(std::vector<std::string>::const_iterator
-    it = orderedAndUniqueIncludes.begin();
-    it != orderedAndUniqueIncludes.end();
-    ++it)
-    {
-    this->AddSearchPath(*it);
-    }
-}
-
-
-const cmDependInformation* cmMakeDepend::FindDependencies(const char* file)
-{
-  cmDependInformation* info = this->GetDependInformation(file,0);
-  this->GenerateDependInformation(info);
-  return info;
-}
-
-void cmMakeDepend::GenerateDependInformation(cmDependInformation* info)
-{
-  // If dependencies are already done, stop now.
-  if(info->DependDone)
-    {
-    return;
-    }
-  else
-    {
-    // Make sure we don't visit the same file more than once.
-    info->DependDone = true;
-    }
-  const char* path = info->FullPath.c_str();
-  if(!path)
-    {
-    cmSystemTools::Error(
-      "Attempt to find dependencies for file without path!");
-    return;
-    }
-
-  bool found = false;
-
-  // If the file exists, use it to find dependency information.
-  if(cmSystemTools::FileExists(path, true))
-    {
-    // Use the real file to find its dependencies.
-    this->DependWalk(info);
-    found = true;
-    }
-
-
-  // See if the cmSourceFile for it has any files specified as
-  // dependency hints.
-  if(info->SourceFile != 0)
-    {
-
-    // Get the cmSourceFile corresponding to this.
-    const cmSourceFile& cFile = *(info->SourceFile);
-    // See if there are any hints for finding dependencies for the missing
-    // file.
-    if(!cFile.GetDepends().empty())
-      {
-      // Dependency hints have been given.  Use them to begin the
-      // recursion.
-      for(std::vector<std::string>::const_iterator file =
-            cFile.GetDepends().begin(); file != cFile.GetDepends().end();
-          ++file)
-        {
-        this->AddDependency(info, file->c_str());
-        }
-
-      // Found dependency information.  We are done.
-      found = true;
-      }
-    }
-
-  if(!found)
-    {
-    // Try to find the file amongst the sources
-    cmSourceFile *srcFile = this->Makefile->GetSource
-      (cmSystemTools::GetFilenameWithoutExtension(path));
-    if (srcFile)
-      {
-      if (srcFile->GetFullPath() == path)
-        {
-        found=true;
-        }
-      else
-        {
-        //try to guess which include path to use
-        for(std::vector<std::string>::iterator t =
-              this->IncludeDirectories.begin();
-            t != this->IncludeDirectories.end(); ++t)
-          {
-          std::string incpath = *t;
-          if (!incpath.empty() && incpath[incpath.size() - 1] != '/')
-            {
-            incpath = incpath + "/";
-            }
-          incpath = incpath + path;
-          if (srcFile->GetFullPath() == incpath)
-            {
-            // set the path to the guessed path
-            info->FullPath = incpath;
-            found=true;
-            }
-          }
-        }
-      }
-    }
-
-  if(!found)
-    {
-    // Couldn't find any dependency information.
-    if(this->ComplainFileRegularExpression.find(info->IncludeName.c_str()))
-      {
-      cmSystemTools::Error("error cannot find dependencies for ", path);
-      }
-    else
-      {
-      // Destroy the name of the file so that it won't be output as a
-      // dependency.
-      info->FullPath = "";
-      }
-    }
-}
-
-// This function actually reads the file specified and scans it for
-// #include directives
-void cmMakeDepend::DependWalk(cmDependInformation* info)
-{
-  cmsys::RegularExpression includeLine
-    ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
-  cmsys::ifstream fin(info->FullPath.c_str());
-  if(!fin)
-    {
-    cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
-    return;
-    }
-
-  // TODO: Write real read loop (see cmSystemTools::CopyFile).
-  std::string line;
-  while( cmSystemTools::GetLineFromStream(fin, line) )
-    {
-    if(includeLine.find(line.c_str()))
-      {
-      // extract the file being included
-      std::string includeFile = includeLine.match(1);
-      // see if the include matches the regular expression
-      if(!this->IncludeFileRegularExpression.find(includeFile))
-        {
-        if(this->Verbose)
-          {
-          std::string message = "Skipping ";
-          message += includeFile;
-          message += " for file ";
-          message += info->FullPath.c_str();
-          cmSystemTools::Error(message.c_str(), 0);
-          }
-        continue;
-        }
-
-      // Add this file and all its dependencies.
-      this->AddDependency(info, includeFile.c_str());
-      }
-    }
-}
-
-
-void cmMakeDepend::AddDependency(cmDependInformation* info, const char* file)
-{
-  cmDependInformation* dependInfo =
-    this->GetDependInformation(file, info->PathOnly.c_str());
-  this->GenerateDependInformation(dependInfo);
-  info->AddDependencies(dependInfo);
-}
-
-cmDependInformation* cmMakeDepend::GetDependInformation(const char* file,
-                                                        const char *extraPath)
-{
-  // Get the full path for the file so that lookup is unambiguous.
-  std::string fullPath = this->FullPath(file, extraPath);
-
-  // Try to find the file's instance of cmDependInformation.
-  DependInformationMapType::const_iterator result =
-    this->DependInformationMap.find(fullPath);
-  if(result != this->DependInformationMap.end())
-    {
-    // Found an instance, return it.
-    return result->second;
-    }
-  else
-    {
-    // Didn't find an instance.  Create a new one and save it.
-    cmDependInformation* info = new cmDependInformation;
-    info->FullPath = fullPath;
-    info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
-    info->IncludeName = file;
-    this->DependInformationMap[fullPath] = info;
-    return info;
-    }
-}
-
-
-// find the full path to fname by searching the this->IncludeDirectories array
-std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath)
-{
-  DirectoryToFileToPathMapType::iterator m;
-  if(extraPath)
-    {
-    m = this->DirectoryToFileToPathMap.find(extraPath);
-    }
-  else
-    {
-    m = this->DirectoryToFileToPathMap.find("");
-    }
-
-  if(m != this->DirectoryToFileToPathMap.end())
-    {
-    FileToPathMapType& map = m->second;
-    FileToPathMapType::iterator p = map.find(fname);
-    if(p != map.end())
-      {
-      return p->second;
-      }
-    }
-
-  if(cmSystemTools::FileExists(fname, true))
-    {
-    std::string fp = cmSystemTools::CollapseFullPath(fname);
-    this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
-    return fp;
-    }
-
-  for(std::vector<std::string>::iterator i = this->IncludeDirectories.begin();
-      i != this->IncludeDirectories.end(); ++i)
-    {
-    std::string path = *i;
-    if (!path.empty() && path[path.size() - 1] != '/')
-      {
-      path = path + "/";
-      }
-    path = path + fname;
-    if(cmSystemTools::FileExists(path.c_str(), true)
-       && !cmSystemTools::FileIsDirectory(path))
-      {
-      std::string fp = cmSystemTools::CollapseFullPath(path);
-      this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
-      return fp;
-      }
-    }
-
-  if (extraPath)
-    {
-    std::string path = extraPath;
-    if (!path.empty() && path[path.size() - 1] != '/')
-      {
-      path = path + "/";
-      }
-    path = path + fname;
-    if(cmSystemTools::FileExists(path.c_str(), true)
-       && !cmSystemTools::FileIsDirectory(path))
-      {
-      std::string fp = cmSystemTools::CollapseFullPath(path);
-      this->DirectoryToFileToPathMap[extraPath][fname] = fp;
-      return fp;
-      }
-    }
-
-  // Couldn't find the file.
-  return std::string(fname);
-}
-
-// Add a directory to the search path
-void cmMakeDepend::AddSearchPath(const std::string& path)
-{
-  this->IncludeDirectories.push_back(path);
-}
diff --git a/Source/cmMakeDepend.h b/Source/cmMakeDepend.h
index 2c9d515..566f7be 100644
--- a/Source/cmMakeDepend.h
+++ b/Source/cmMakeDepend.h
@@ -14,8 +14,12 @@
 
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
+#include "cmSystemTools.h"
+#include "cmGeneratorExpression.h"
+#include "cmAlgorithms.h"
 
 #include <cmsys/RegularExpression.hxx>
+#include <cmsys/FStream.hxx>
 
 /** \class cmDependInformation
  * \brief Store dependency information for a single source file.
@@ -67,7 +71,13 @@ public:
   /**
    * This method adds the dependencies of another file to this one.
    */
-  void AddDependencies(cmDependInformation*);
+  void AddDependencies(cmDependInformation* info)
+  {
+  if(this != info)
+    {
+    this->DependencySet.insert(info);
+    }
+  }
 };
 
 
@@ -79,59 +89,360 @@ public:
   /**
    * Construct the object with verbose turned off.
    */
-  cmMakeDepend();
+  cmMakeDepend()
+  {
+    this->Verbose = false;
+    this->IncludeFileRegularExpression.compile("^.*$");
+    this->ComplainFileRegularExpression.compile("^$");
+  }
 
   /**
    * Destructor.
    */
-  virtual ~cmMakeDepend();
+  virtual ~cmMakeDepend()
+  {
+    cmDeleteAll(this->DependInformationMap);
+  }
 
   /**
    * Set the makefile that is used as a source of classes.
    */
-  virtual void SetMakefile(cmMakefile* makefile);
+  virtual void SetMakefile(cmMakefile* makefile)
+  {
+    this->Makefile = makefile;
+
+    // Now extract the include file regular expression from the makefile.
+    this->IncludeFileRegularExpression.compile(
+          this->Makefile->GetIncludeRegularExpression());
+    this->ComplainFileRegularExpression.compile(
+          this->Makefile->GetComplainRegularExpression());
+
+    // Now extract any include paths from the targets
+    std::set<std::string> uniqueIncludes;
+    std::vector<std::string> orderedAndUniqueIncludes;
+    cmTargets &targets = this->Makefile->GetTargets();
+    for (cmTargets::iterator l = targets.begin();
+         l != targets.end(); ++l)
+      {
+      const char *incDirProp = l->second.GetProperty("INCLUDE_DIRECTORIES");
+      if (!incDirProp)
+        {
+        continue;
+        }
+
+      std::string incDirs =
+          cmGeneratorExpression::Preprocess(incDirProp,
+              cmGeneratorExpression::StripAllGeneratorExpressions);
+
+      std::vector<std::string> includes;
+      cmSystemTools::ExpandListArgument(incDirs, includes);
+
+      for(std::vector<std::string>::const_iterator j = includes.begin();
+          j != includes.end(); ++j)
+        {
+        std::string path = *j;
+        this->Makefile->ExpandVariablesInString(path);
+        if(uniqueIncludes.insert(path).second)
+          {
+          orderedAndUniqueIncludes.push_back(path);
+          }
+        }
+      }
+
+    for(std::vector<std::string>::const_iterator
+        it = orderedAndUniqueIncludes.begin();
+        it != orderedAndUniqueIncludes.end();
+        ++it)
+      {
+      this->AddSearchPath(*it);
+      }
+  }
 
   /**
    * Add a directory to the search path for include files.
    */
-  virtual void AddSearchPath(const std::string&);
+  virtual void AddSearchPath(const std::string& path)
+  {
+    this->IncludeDirectories.push_back(path);
+  }
 
   /**
    * Generate dependencies for the file given.  Returns a pointer to
    * the cmDependInformation object for the file.
    */
-  const cmDependInformation* FindDependencies(const char* file);
+  const cmDependInformation* FindDependencies(const char* file)
+  {
+    cmDependInformation* info = this->GetDependInformation(file,0);
+    this->GenerateDependInformation(info);
+    return info;
+  }
 
 protected:
   /**
    * Compute the depend information for this class.
    */
-  virtual void DependWalk(cmDependInformation* info);
+  virtual void DependWalk(cmDependInformation* info)
+  {
+    cmsys::RegularExpression includeLine
+        ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
+    cmsys::ifstream fin(info->FullPath.c_str());
+    if(!fin)
+      {
+      cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
+      return;
+      }
+
+    // TODO: Write real read loop (see cmSystemTools::CopyFile).
+    std::string line;
+    while( cmSystemTools::GetLineFromStream(fin, line) )
+      {
+      if(includeLine.find(line.c_str()))
+        {
+        // extract the file being included
+        std::string includeFile = includeLine.match(1);
+        // see if the include matches the regular expression
+        if(!this->IncludeFileRegularExpression.find(includeFile))
+          {
+          if(this->Verbose)
+            {
+            std::string message = "Skipping ";
+            message += includeFile;
+            message += " for file ";
+            message += info->FullPath.c_str();
+            cmSystemTools::Error(message.c_str(), 0);
+            }
+          continue;
+          }
+        // Add this file and all its dependencies.
+        this->AddDependency(info, includeFile.c_str());
+        }
+      }
+  }
 
   /**
    * Add a dependency.  Possibly walk it for more dependencies.
    */
-  virtual void AddDependency(cmDependInformation* info, const char* file);
+  virtual void AddDependency(cmDependInformation* info, const char* file)
+  {
+    cmDependInformation* dependInfo =
+        this->GetDependInformation(file, info->PathOnly.c_str());
+    this->GenerateDependInformation(dependInfo);
+    info->AddDependencies(dependInfo);
+  }
 
   /**
    * Fill in the given object with dependency information.  If the
    * information is already complete, nothing is done.
    */
-  void GenerateDependInformation(cmDependInformation* info);
+  void GenerateDependInformation(cmDependInformation* info)
+  {
+    // If dependencies are already done, stop now.
+    if(info->DependDone)
+      {
+      return;
+      }
+    else
+      {
+      // Make sure we don't visit the same file more than once.
+      info->DependDone = true;
+      }
+    const char* path = info->FullPath.c_str();
+    if(!path)
+      {
+      cmSystemTools::Error(
+            "Attempt to find dependencies for file without path!");
+      return;
+      }
+
+    bool found = false;
+
+    // If the file exists, use it to find dependency information.
+    if(cmSystemTools::FileExists(path, true))
+      {
+      // Use the real file to find its dependencies.
+      this->DependWalk(info);
+      found = true;
+      }
+
+
+    // See if the cmSourceFile for it has any files specified as
+    // dependency hints.
+    if(info->SourceFile != 0)
+      {
+
+      // Get the cmSourceFile corresponding to this.
+      const cmSourceFile& cFile = *(info->SourceFile);
+      // See if there are any hints for finding dependencies for the missing
+      // file.
+      if(!cFile.GetDepends().empty())
+        {
+        // Dependency hints have been given.  Use them to begin the
+        // recursion.
+        for(std::vector<std::string>::const_iterator file =
+            cFile.GetDepends().begin(); file != cFile.GetDepends().end();
+            ++file)
+          {
+          this->AddDependency(info, file->c_str());
+          }
+
+        // Found dependency information.  We are done.
+        found = true;
+        }
+      }
+
+    if(!found)
+      {
+      // Try to find the file amongst the sources
+      cmSourceFile *srcFile = this->Makefile->GetSource
+          (cmSystemTools::GetFilenameWithoutExtension(path));
+      if (srcFile)
+        {
+        if (srcFile->GetFullPath() == path)
+          {
+          found=true;
+          }
+        else
+          {
+          //try to guess which include path to use
+          for(std::vector<std::string>::iterator t =
+              this->IncludeDirectories.begin();
+              t != this->IncludeDirectories.end(); ++t)
+            {
+            std::string incpath = *t;
+            if (!incpath.empty() && incpath[incpath.size() - 1] != '/')
+              {
+              incpath = incpath + "/";
+              }
+            incpath = incpath + path;
+            if (srcFile->GetFullPath() == incpath)
+              {
+              // set the path to the guessed path
+              info->FullPath = incpath;
+              found=true;
+              }
+            }
+          }
+        }
+      }
+
+    if(!found)
+      {
+      // Couldn't find any dependency information.
+      if(this->ComplainFileRegularExpression.find(info->IncludeName.c_str()))
+        {
+        cmSystemTools::Error("error cannot find dependencies for ", path);
+        }
+      else
+        {
+        // Destroy the name of the file so that it won't be output as a
+        // dependency.
+        info->FullPath = "";
+        }
+      }
+  }
 
   /**
    * Get an instance of cmDependInformation corresponding to the given file
    * name.
    */
   cmDependInformation* GetDependInformation(const char* file,
-                                            const char *extraPath);
+                                            const char *extraPath)
+  {
+    // Get the full path for the file so that lookup is unambiguous.
+    std::string fullPath = this->FullPath(file, extraPath);
+
+    // Try to find the file's instance of cmDependInformation.
+    DependInformationMapType::const_iterator result =
+        this->DependInformationMap.find(fullPath);
+    if(result != this->DependInformationMap.end())
+      {
+      // Found an instance, return it.
+      return result->second;
+      }
+    else
+      {
+      // Didn't find an instance.  Create a new one and save it.
+      cmDependInformation* info = new cmDependInformation;
+      info->FullPath = fullPath;
+      info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
+      info->IncludeName = file;
+      this->DependInformationMap[fullPath] = info;
+      return info;
+      }
+  }
 
   /**
    * Find the full path name for the given file name.
    * This uses the include directories.
    * TODO: Cache path conversions to reduce FileExists calls.
    */
-  std::string FullPath(const char *filename, const char *extraPath);
+  std::string FullPath(const char *fname, const char *extraPath)
+  {
+    DirectoryToFileToPathMapType::iterator m;
+    if(extraPath)
+      {
+      m = this->DirectoryToFileToPathMap.find(extraPath);
+      }
+    else
+      {
+      m = this->DirectoryToFileToPathMap.find("");
+      }
+
+    if(m != this->DirectoryToFileToPathMap.end())
+      {
+      FileToPathMapType& map = m->second;
+      FileToPathMapType::iterator p = map.find(fname);
+      if(p != map.end())
+        {
+        return p->second;
+        }
+      }
+
+    if(cmSystemTools::FileExists(fname, true))
+      {
+      std::string fp = cmSystemTools::CollapseFullPath(fname);
+      this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
+      return fp;
+      }
+
+    for(std::vector<std::string>::iterator i = this->IncludeDirectories.begin();
+        i != this->IncludeDirectories.end(); ++i)
+      {
+      std::string path = *i;
+      if (!path.empty() && path[path.size() - 1] != '/')
+        {
+        path = path + "/";
+        }
+      path = path + fname;
+      if(cmSystemTools::FileExists(path.c_str(), true)
+         && !cmSystemTools::FileIsDirectory(path))
+        {
+        std::string fp = cmSystemTools::CollapseFullPath(path);
+        this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
+        return fp;
+        }
+      }
+
+    if (extraPath)
+      {
+      std::string path = extraPath;
+      if (!path.empty() && path[path.size() - 1] != '/')
+        {
+        path = path + "/";
+        }
+      path = path + fname;
+      if(cmSystemTools::FileExists(path.c_str(), true)
+         && !cmSystemTools::FileIsDirectory(path))
+        {
+        std::string fp = cmSystemTools::CollapseFullPath(path);
+        this->DirectoryToFileToPathMap[extraPath][fname] = fp;
+        return fp;
+        }
+      }
+
+    // Couldn't find the file.
+    return std::string(fname);
+  }
 
   cmMakefile* Makefile;
   bool Verbose;
diff --git a/bootstrap b/bootstrap
index 54f7ca6..9541cc8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -259,7 +259,6 @@ CMAKE_CXX_SOURCES="\
   cmPropertyMap \
   cmPropertyDefinition \
   cmPropertyDefinitionMap \
-  cmMakeDepend \
   cmMakefile \
   cmExportBuildFileGenerator \
   cmExportFileGenerator \

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3df749af55c04d5b7bb0ee848c6df112178327bc
commit 3df749af55c04d5b7bb0ee848c6df112178327bc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 00:15:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:19:57 2015 +0200

    Remove vestigial declarations.

diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index beaddde..7e0f248 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -19,7 +19,6 @@
 
 class cmCustomCommand;
 class cmCustomCommandGenerator;
-class cmDependInformation;
 class cmDepends;
 class cmMakefileTargetGenerator;
 class cmTarget;
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 4215b72..ce127d8 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -41,7 +41,6 @@
 class cmFunctionBlocker;
 class cmCommand;
 class cmInstallGenerator;
-class cmMakeDepend;
 class cmSourceFile;
 class cmTest;
 class cmTestGenerator;
@@ -856,9 +855,6 @@ private:
   bool EnforceUniqueDir(const std::string& srcPath,
                         const std::string& binPath) const;
 
-  friend class cmMakeDepend;    // make depend needs direct access
-                                // to the Sources array
-
   typedef std::vector<cmFunctionBlocker*> FunctionBlockersType;
   FunctionBlockersType FunctionBlockers;
   std::vector<FunctionBlockersType::size_type> FunctionBlockerBarriers;
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index fd4527b..e38c50b 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -18,7 +18,6 @@
 #include "cmOSXBundleGenerator.h"
 
 class cmCustomCommandGenerator;
-class cmDependInformation;
 class cmDepends;
 class cmGeneratorTarget;
 class cmGeneratedFileStream;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3029c27e46a193c6319a3c909f938e6614c2b14f
commit 3029c27e46a193c6319a3c909f938e6614c2b14f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 00:19:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:19:45 2015 +0200

    cmMakeDepend: Use public cmMakefile API.

diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx
index cbc7e02..f4a22ed 100644
--- a/Source/cmMakeDepend.cxx
+++ b/Source/cmMakeDepend.cxx
@@ -51,7 +51,7 @@ void cmMakeDepend::SetMakefile(cmMakefile* makefile)
   this->IncludeFileRegularExpression.compile(
     this->Makefile->GetIncludeRegularExpression());
   this->ComplainFileRegularExpression.compile(
-    this->Makefile->ComplainFileRegularExpression.c_str());
+    this->Makefile->GetComplainRegularExpression());
 
   // Now extract any include paths from the targets
   std::set<std::string> uniqueIncludes;

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeLists.txt                   |    2 -
 Source/cmLocalUnixMakefileGenerator3.h  |    1 -
 Source/cmMakeDepend.cxx                 |  361 -------------------
 Source/cmMakeDepend.h                   |  150 --------
 Source/cmMakefile.h                     |    4 -
 Source/cmMakefileTargetGenerator.h      |    1 -
 Source/cmOutputRequiredFilesCommand.cxx |  596 +++++++++++++++++++++++++------
 Source/cmOutputRequiredFilesCommand.h   |    3 +-
 bootstrap                               |    1 -
 9 files changed, 494 insertions(+), 625 deletions(-)
 delete mode 100644 Source/cmMakeDepend.cxx
 delete mode 100644 Source/cmMakeDepend.h


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 18:43:14 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 18:43:14 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-743-ga3de829
Message-ID: <20151020224314.F0C96BFD95@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a3de829edbb478a949ae9877e6a1541657869305 (commit)
       via  0f185d838e86a536c2c9200dcb82e735316d6728 (commit)
      from  1bc5bbf165a5d818d9589d5b6599727af47afaa3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3de829edbb478a949ae9877e6a1541657869305
commit a3de829edbb478a949ae9877e6a1541657869305
Merge: 1bc5bbf 0f185d8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 18:43:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 18:43:14 2015 -0400

    Merge topic 'inline-cmMakeDepend-content' into next
    
    0f185d83 fixup! cmMakeDepend: Inline into inheriting class.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f185d838e86a536c2c9200dcb82e735316d6728
commit 0f185d838e86a536c2c9200dcb82e735316d6728
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 00:42:54 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:42:54 2015 +0200

    fixup! cmMakeDepend: Inline into inheriting class.

diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx
index 59dafba..54208ac 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -210,7 +210,8 @@ protected:
           qend = currentline.find('\"', qstart+1);
           }
         // extract the file being included
-        std::string includeFile = currentline.substr(qstart+1, qend - qstart-1);
+        std::string includeFile =
+          currentline.substr(qstart+1, qend - qstart-1);
         // see if the include matches the regular expression
         if(!this->IncludeFileRegularExpression.find(includeFile))
           {
@@ -507,7 +508,8 @@ protected:
       return fp;
       }
 
-    for(std::vector<std::string>::iterator i = this->IncludeDirectories.begin();
+    for(std::vector<std::string>::iterator i =
+        this->IncludeDirectories.begin();
         i != this->IncludeDirectories.end(); ++i)
       {
       std::string path = *i;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmOutputRequiredFilesCommand.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 18:43:36 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 18:43:36 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-747-g657b36f
Message-ID: <20151020224336.07B9DBFF73@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  657b36f08e5329c2fdcd6f299685796dc8abfbd0 (commit)
       via  c0969b10330a205a693bdf658185740eea51736e (commit)
       via  6a1e73281f216d2644dc3527be01c3d38b9e1263 (commit)
       via  00f50b006cc9afd014374fabc10bdef1330075a2 (commit)
      from  a3de829edbb478a949ae9877e6a1541657869305 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=657b36f08e5329c2fdcd6f299685796dc8abfbd0
commit 657b36f08e5329c2fdcd6f299685796dc8abfbd0
Merge: a3de829 c0969b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 18:43:35 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 18:43:35 2015 -0400

    Merge topic 'inline-cmMakeDepend-content' into next
    
    c0969b10 cmMakeDepend: Inline into inheriting class.
    6a1e7328 cmMakeDepend: Inline into only user.
    00f50b00 cmMakeDepend: Inline into header.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0969b10330a205a693bdf658185740eea51736e
commit c0969b10330a205a693bdf658185740eea51736e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 22:14:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:41:53 2015 +0200

    cmMakeDepend: Inline into inheriting class.
    
    Devirtualize the API.

diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx
index 19d93d9..54208ac 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -72,16 +72,13 @@ public:
   }
 };
 
-
-// cmMakeDepend is used to generate dependancy information for
-// the classes in a makefile
-class cmMakeDepend
+class cmLBDepend
 {
 public:
   /**
    * Construct the object with verbose turned off.
    */
-  cmMakeDepend()
+  cmLBDepend()
   {
     this->Verbose = false;
     this->IncludeFileRegularExpression.compile("^.*$");
@@ -91,7 +88,7 @@ public:
   /**
    * Destructor.
    */
-  virtual ~cmMakeDepend()
+  ~cmLBDepend()
   {
     cmDeleteAll(this->DependInformationMap);
   }
@@ -99,7 +96,7 @@ public:
   /**
    * Set the makefile that is used as a source of classes.
    */
-  virtual void SetMakefile(cmMakefile* makefile)
+  void SetMakefile(cmMakefile* makefile)
   {
     this->Makefile = makefile;
 
@@ -153,7 +150,7 @@ public:
   /**
    * Add a directory to the search path for include files.
    */
-  virtual void AddSearchPath(const std::string& path)
+  void AddSearchPath(const std::string& path)
   {
     this->IncludeDirectories.push_back(path);
   }
@@ -173,25 +170,48 @@ protected:
   /**
    * Compute the depend information for this class.
    */
-  virtual void DependWalk(cmDependInformation* info)
+
+  void DependWalk(cmDependInformation* info)
   {
-    cmsys::RegularExpression includeLine
-        ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
     cmsys::ifstream fin(info->FullPath.c_str());
     if(!fin)
       {
-      cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
+      cmSystemTools::Error("error can not open ", info->FullPath.c_str());
       return;
       }
 
-    // TODO: Write real read loop (see cmSystemTools::CopyFile).
     std::string line;
-    while( cmSystemTools::GetLineFromStream(fin, line) )
+    while(cmSystemTools::GetLineFromStream(fin, line))
       {
-      if(includeLine.find(line.c_str()))
+      if(cmHasLiteralPrefix(line.c_str(), "#include"))
         {
+        // if it is an include line then create a string class
+        std::string currentline = line;
+        size_t qstart = currentline.find('\"', 8);
+        size_t qend;
+        // if a quote is not found look for a <
+        if(qstart == std::string::npos)
+          {
+          qstart = currentline.find('<', 8);
+          // if a < is not found then move on
+          if(qstart == std::string::npos)
+            {
+            cmSystemTools::Error("unknown include directive ",
+                                 currentline.c_str() );
+            continue;
+            }
+          else
+            {
+            qend = currentline.find('>', qstart+1);
+            }
+          }
+        else
+          {
+          qend = currentline.find('\"', qstart+1);
+          }
         // extract the file being included
-        std::string includeFile = includeLine.match(1);
+        std::string includeFile =
+          currentline.substr(qstart+1, qend - qstart-1);
         // see if the include matches the regular expression
         if(!this->IncludeFileRegularExpression.find(includeFile))
           {
@@ -205,8 +225,99 @@ protected:
             }
           continue;
           }
+
         // Add this file and all its dependencies.
         this->AddDependency(info, includeFile.c_str());
+        /// add the cxx file if it exists
+        std::string cxxFile = includeFile;
+        std::string::size_type pos = cxxFile.rfind('.');
+        if(pos != std::string::npos)
+          {
+          std::string root = cxxFile.substr(0, pos);
+          cxxFile = root + ".cxx";
+          bool found = false;
+          // try jumping to .cxx .cpp and .c in order
+          if(cmSystemTools::FileExists(cxxFile.c_str()))
+            {
+            found = true;
+            }
+          for(std::vector<std::string>::iterator i =
+              this->IncludeDirectories.begin();
+              i != this->IncludeDirectories.end(); ++i)
+            {
+            std::string path = *i;
+            path = path + "/";
+            path = path + cxxFile;
+            if(cmSystemTools::FileExists(path.c_str()))
+              {
+              found = true;
+              }
+            }
+          if (!found)
+            {
+            cxxFile = root + ".cpp";
+            if(cmSystemTools::FileExists(cxxFile.c_str()))
+              {
+              found = true;
+              }
+            for(std::vector<std::string>::iterator i =
+                this->IncludeDirectories.begin();
+                i != this->IncludeDirectories.end(); ++i)
+              {
+              std::string path = *i;
+              path = path + "/";
+              path = path + cxxFile;
+              if(cmSystemTools::FileExists(path.c_str()))
+                {
+                found = true;
+                }
+              }
+            }
+          if (!found)
+            {
+            cxxFile = root + ".c";
+            if(cmSystemTools::FileExists(cxxFile.c_str()))
+              {
+              found = true;
+              }
+            for(std::vector<std::string>::iterator i =
+                this->IncludeDirectories.begin();
+                i != this->IncludeDirectories.end(); ++i)
+              {
+              std::string path = *i;
+              path = path + "/";
+              path = path + cxxFile;
+              if(cmSystemTools::FileExists(path.c_str()))
+                {
+                found = true;
+                }
+              }
+            }
+          if (!found)
+            {
+            cxxFile = root + ".txx";
+            if(cmSystemTools::FileExists(cxxFile.c_str()))
+              {
+              found = true;
+              }
+            for(std::vector<std::string>::iterator i =
+                this->IncludeDirectories.begin();
+                i != this->IncludeDirectories.end(); ++i)
+              {
+              std::string path = *i;
+              path = path + "/";
+              path = path + cxxFile;
+              if(cmSystemTools::FileExists(path.c_str()))
+                {
+                found = true;
+                }
+              }
+            }
+          if (found)
+            {
+            this->AddDependency(info, cxxFile.c_str());
+            }
+          }
         }
       }
   }
@@ -214,7 +325,7 @@ protected:
   /**
    * Add a dependency.  Possibly walk it for more dependencies.
    */
-  virtual void AddDependency(cmDependInformation* info, const char* file)
+  void AddDependency(cmDependInformation* info, const char* file)
   {
     cmDependInformation* dependInfo =
         this->GetDependInformation(file, info->PathOnly.c_str());
@@ -451,164 +562,6 @@ protected:
   DirectoryToFileToPathMapType DirectoryToFileToPathMap;
 };
 
-class cmLBDepend : public cmMakeDepend
-{
-  /**
-   * Compute the depend information for this class.
-   */
-  virtual void DependWalk(cmDependInformation* info);
-};
-
-void cmLBDepend::DependWalk(cmDependInformation* info)
-{
-  cmsys::ifstream fin(info->FullPath.c_str());
-  if(!fin)
-    {
-    cmSystemTools::Error("error can not open ", info->FullPath.c_str());
-    return;
-    }
-
-  std::string line;
-  while(cmSystemTools::GetLineFromStream(fin, line))
-    {
-    if(cmHasLiteralPrefix(line.c_str(), "#include"))
-      {
-      // if it is an include line then create a string class
-      std::string currentline = line;
-      size_t qstart = currentline.find('\"', 8);
-      size_t qend;
-      // if a quote is not found look for a <
-      if(qstart == std::string::npos)
-        {
-        qstart = currentline.find('<', 8);
-        // if a < is not found then move on
-        if(qstart == std::string::npos)
-          {
-          cmSystemTools::Error("unknown include directive ",
-                               currentline.c_str() );
-          continue;
-          }
-        else
-          {
-          qend = currentline.find('>', qstart+1);
-          }
-        }
-      else
-        {
-        qend = currentline.find('\"', qstart+1);
-        }
-      // extract the file being included
-      std::string includeFile = currentline.substr(qstart+1, qend - qstart-1);
-      // see if the include matches the regular expression
-      if(!this->IncludeFileRegularExpression.find(includeFile))
-        {
-        if(this->Verbose)
-          {
-          std::string message = "Skipping ";
-          message += includeFile;
-          message += " for file ";
-          message += info->FullPath.c_str();
-          cmSystemTools::Error(message.c_str(), 0);
-          }
-        continue;
-        }
-
-      // Add this file and all its dependencies.
-      this->AddDependency(info, includeFile.c_str());
-      /// add the cxx file if it exists
-      std::string cxxFile = includeFile;
-      std::string::size_type pos = cxxFile.rfind('.');
-      if(pos != std::string::npos)
-        {
-        std::string root = cxxFile.substr(0, pos);
-        cxxFile = root + ".cxx";
-        bool found = false;
-        // try jumping to .cxx .cpp and .c in order
-        if(cmSystemTools::FileExists(cxxFile.c_str()))
-          {
-          found = true;
-          }
-        for(std::vector<std::string>::iterator i =
-              this->IncludeDirectories.begin();
-            i != this->IncludeDirectories.end(); ++i)
-          {
-          std::string path = *i;
-          path = path + "/";
-          path = path + cxxFile;
-          if(cmSystemTools::FileExists(path.c_str()))
-            {
-            found = true;
-            }
-          }
-        if (!found)
-          {
-          cxxFile = root + ".cpp";
-          if(cmSystemTools::FileExists(cxxFile.c_str()))
-            {
-            found = true;
-            }
-          for(std::vector<std::string>::iterator i =
-                this->IncludeDirectories.begin();
-              i != this->IncludeDirectories.end(); ++i)
-            {
-            std::string path = *i;
-            path = path + "/";
-            path = path + cxxFile;
-            if(cmSystemTools::FileExists(path.c_str()))
-              {
-              found = true;
-              }
-            }
-          }
-        if (!found)
-          {
-          cxxFile = root + ".c";
-          if(cmSystemTools::FileExists(cxxFile.c_str()))
-            {
-            found = true;
-            }
-          for(std::vector<std::string>::iterator i =
-                this->IncludeDirectories.begin();
-              i != this->IncludeDirectories.end(); ++i)
-            {
-            std::string path = *i;
-            path = path + "/";
-            path = path + cxxFile;
-            if(cmSystemTools::FileExists(path.c_str()))
-              {
-              found = true;
-              }
-            }
-          }
-        if (!found)
-          {
-          cxxFile = root + ".txx";
-          if(cmSystemTools::FileExists(cxxFile.c_str()))
-            {
-            found = true;
-            }
-          for(std::vector<std::string>::iterator i =
-                this->IncludeDirectories.begin();
-              i != this->IncludeDirectories.end(); ++i)
-            {
-            std::string path = *i;
-            path = path + "/";
-            path = path + cxxFile;
-            if(cmSystemTools::FileExists(path.c_str()))
-              {
-              found = true;
-              }
-            }
-          }
-        if (found)
-          {
-          this->AddDependency(info, cxxFile.c_str());
-          }
-        }
-      }
-    }
-}
-
 // cmOutputRequiredFilesCommand
 bool cmOutputRequiredFilesCommand
 ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a1e73281f216d2644dc3527be01c3d38b9e1263
commit 6a1e73281f216d2644dc3527be01c3d38b9e1263
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 00:12:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:41:26 2015 +0200

    cmMakeDepend: Inline into only user.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 1c0ec39..fd71b0e 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -299,7 +299,6 @@ set(SRCS
   cmLocalUnixMakefileGenerator3.cxx
   cmLocale.h
   ${MACH_SRCS}
-  cmMakeDepend.h
   cmMakefile.cxx
   cmMakefile.h
   cmMakefileTargetGenerator.cxx
diff --git a/Source/cmMakeDepend.h b/Source/cmMakeDepend.h
deleted file mode 100644
index d45e23b..0000000
--- a/Source/cmMakeDepend.h
+++ /dev/null
@@ -1,462 +0,0 @@
-/*============================================================================
-  CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  Distributed under the OSI-approved BSD License (the "License");
-  see accompanying file Copyright.txt for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even the
-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the License for more information.
-============================================================================*/
-#ifndef cmMakeDepend_h
-#define cmMakeDepend_h
-
-#include "cmMakefile.h"
-#include "cmSourceFile.h"
-#include "cmSystemTools.h"
-#include "cmGeneratorExpression.h"
-#include "cmAlgorithms.h"
-
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
-
-/** \class cmDependInformation
- * \brief Store dependency information for a single source file.
- *
- * This structure stores the depend information for a single source file.
- */
-class cmDependInformation
-{
-public:
-  /**
-   * Construct with dependency generation marked not done; instance
-   * not placed in cmMakefile's list.
-   */
-  cmDependInformation(): DependDone(false), SourceFile(0) {}
-
-  /**
-   * The set of files on which this one depends.
-   */
-  typedef std::set<cmDependInformation*> DependencySetType;
-  DependencySetType DependencySet;
-
-  /**
-   * This flag indicates whether dependency checking has been
-   * performed for this file.
-   */
-  bool DependDone;
-
-  /**
-   * If this object corresponds to a cmSourceFile instance, this points
-   * to it.
-   */
-  const cmSourceFile *SourceFile;
-
-  /**
-   * Full path to this file.
-   */
-  std::string FullPath;
-
-  /**
-   * Full path not including file name.
-   */
-  std::string PathOnly;
-
-  /**
-   * Name used to #include this file.
-   */
-  std::string IncludeName;
-
-  /**
-   * This method adds the dependencies of another file to this one.
-   */
-  void AddDependencies(cmDependInformation* info)
-  {
-  if(this != info)
-    {
-    this->DependencySet.insert(info);
-    }
-  }
-};
-
-
-// cmMakeDepend is used to generate dependancy information for
-// the classes in a makefile
-class cmMakeDepend
-{
-public:
-  /**
-   * Construct the object with verbose turned off.
-   */
-  cmMakeDepend()
-  {
-    this->Verbose = false;
-    this->IncludeFileRegularExpression.compile("^.*$");
-    this->ComplainFileRegularExpression.compile("^$");
-  }
-
-  /**
-   * Destructor.
-   */
-  virtual ~cmMakeDepend()
-  {
-    cmDeleteAll(this->DependInformationMap);
-  }
-
-  /**
-   * Set the makefile that is used as a source of classes.
-   */
-  virtual void SetMakefile(cmMakefile* makefile)
-  {
-    this->Makefile = makefile;
-
-    // Now extract the include file regular expression from the makefile.
-    this->IncludeFileRegularExpression.compile(
-          this->Makefile->GetIncludeRegularExpression());
-    this->ComplainFileRegularExpression.compile(
-          this->Makefile->GetComplainRegularExpression());
-
-    // Now extract any include paths from the targets
-    std::set<std::string> uniqueIncludes;
-    std::vector<std::string> orderedAndUniqueIncludes;
-    cmTargets &targets = this->Makefile->GetTargets();
-    for (cmTargets::iterator l = targets.begin();
-         l != targets.end(); ++l)
-      {
-      const char *incDirProp = l->second.GetProperty("INCLUDE_DIRECTORIES");
-      if (!incDirProp)
-        {
-        continue;
-        }
-
-      std::string incDirs =
-          cmGeneratorExpression::Preprocess(incDirProp,
-              cmGeneratorExpression::StripAllGeneratorExpressions);
-
-      std::vector<std::string> includes;
-      cmSystemTools::ExpandListArgument(incDirs, includes);
-
-      for(std::vector<std::string>::const_iterator j = includes.begin();
-          j != includes.end(); ++j)
-        {
-        std::string path = *j;
-        this->Makefile->ExpandVariablesInString(path);
-        if(uniqueIncludes.insert(path).second)
-          {
-          orderedAndUniqueIncludes.push_back(path);
-          }
-        }
-      }
-
-    for(std::vector<std::string>::const_iterator
-        it = orderedAndUniqueIncludes.begin();
-        it != orderedAndUniqueIncludes.end();
-        ++it)
-      {
-      this->AddSearchPath(*it);
-      }
-  }
-
-  /**
-   * Add a directory to the search path for include files.
-   */
-  virtual void AddSearchPath(const std::string& path)
-  {
-    this->IncludeDirectories.push_back(path);
-  }
-
-  /**
-   * Generate dependencies for the file given.  Returns a pointer to
-   * the cmDependInformation object for the file.
-   */
-  const cmDependInformation* FindDependencies(const char* file)
-  {
-    cmDependInformation* info = this->GetDependInformation(file,0);
-    this->GenerateDependInformation(info);
-    return info;
-  }
-
-protected:
-  /**
-   * Compute the depend information for this class.
-   */
-  virtual void DependWalk(cmDependInformation* info)
-  {
-    cmsys::RegularExpression includeLine
-        ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
-    cmsys::ifstream fin(info->FullPath.c_str());
-    if(!fin)
-      {
-      cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
-      return;
-      }
-
-    // TODO: Write real read loop (see cmSystemTools::CopyFile).
-    std::string line;
-    while( cmSystemTools::GetLineFromStream(fin, line) )
-      {
-      if(includeLine.find(line.c_str()))
-        {
-        // extract the file being included
-        std::string includeFile = includeLine.match(1);
-        // see if the include matches the regular expression
-        if(!this->IncludeFileRegularExpression.find(includeFile))
-          {
-          if(this->Verbose)
-            {
-            std::string message = "Skipping ";
-            message += includeFile;
-            message += " for file ";
-            message += info->FullPath.c_str();
-            cmSystemTools::Error(message.c_str(), 0);
-            }
-          continue;
-          }
-        // Add this file and all its dependencies.
-        this->AddDependency(info, includeFile.c_str());
-        }
-      }
-  }
-
-  /**
-   * Add a dependency.  Possibly walk it for more dependencies.
-   */
-  virtual void AddDependency(cmDependInformation* info, const char* file)
-  {
-    cmDependInformation* dependInfo =
-        this->GetDependInformation(file, info->PathOnly.c_str());
-    this->GenerateDependInformation(dependInfo);
-    info->AddDependencies(dependInfo);
-  }
-
-  /**
-   * Fill in the given object with dependency information.  If the
-   * information is already complete, nothing is done.
-   */
-  void GenerateDependInformation(cmDependInformation* info)
-  {
-    // If dependencies are already done, stop now.
-    if(info->DependDone)
-      {
-      return;
-      }
-    else
-      {
-      // Make sure we don't visit the same file more than once.
-      info->DependDone = true;
-      }
-    const char* path = info->FullPath.c_str();
-    if(!path)
-      {
-      cmSystemTools::Error(
-            "Attempt to find dependencies for file without path!");
-      return;
-      }
-
-    bool found = false;
-
-    // If the file exists, use it to find dependency information.
-    if(cmSystemTools::FileExists(path, true))
-      {
-      // Use the real file to find its dependencies.
-      this->DependWalk(info);
-      found = true;
-      }
-
-
-    // See if the cmSourceFile for it has any files specified as
-    // dependency hints.
-    if(info->SourceFile != 0)
-      {
-
-      // Get the cmSourceFile corresponding to this.
-      const cmSourceFile& cFile = *(info->SourceFile);
-      // See if there are any hints for finding dependencies for the missing
-      // file.
-      if(!cFile.GetDepends().empty())
-        {
-        // Dependency hints have been given.  Use them to begin the
-        // recursion.
-        for(std::vector<std::string>::const_iterator file =
-            cFile.GetDepends().begin(); file != cFile.GetDepends().end();
-            ++file)
-          {
-          this->AddDependency(info, file->c_str());
-          }
-
-        // Found dependency information.  We are done.
-        found = true;
-        }
-      }
-
-    if(!found)
-      {
-      // Try to find the file amongst the sources
-      cmSourceFile *srcFile = this->Makefile->GetSource
-          (cmSystemTools::GetFilenameWithoutExtension(path));
-      if (srcFile)
-        {
-        if (srcFile->GetFullPath() == path)
-          {
-          found=true;
-          }
-        else
-          {
-          //try to guess which include path to use
-          for(std::vector<std::string>::iterator t =
-              this->IncludeDirectories.begin();
-              t != this->IncludeDirectories.end(); ++t)
-            {
-            std::string incpath = *t;
-            if (!incpath.empty() && incpath[incpath.size() - 1] != '/')
-              {
-              incpath = incpath + "/";
-              }
-            incpath = incpath + path;
-            if (srcFile->GetFullPath() == incpath)
-              {
-              // set the path to the guessed path
-              info->FullPath = incpath;
-              found=true;
-              }
-            }
-          }
-        }
-      }
-
-    if(!found)
-      {
-      // Couldn't find any dependency information.
-      if(this->ComplainFileRegularExpression.find(info->IncludeName.c_str()))
-        {
-        cmSystemTools::Error("error cannot find dependencies for ", path);
-        }
-      else
-        {
-        // Destroy the name of the file so that it won't be output as a
-        // dependency.
-        info->FullPath = "";
-        }
-      }
-  }
-
-  /**
-   * Get an instance of cmDependInformation corresponding to the given file
-   * name.
-   */
-  cmDependInformation* GetDependInformation(const char* file,
-                                            const char *extraPath)
-  {
-    // Get the full path for the file so that lookup is unambiguous.
-    std::string fullPath = this->FullPath(file, extraPath);
-
-    // Try to find the file's instance of cmDependInformation.
-    DependInformationMapType::const_iterator result =
-        this->DependInformationMap.find(fullPath);
-    if(result != this->DependInformationMap.end())
-      {
-      // Found an instance, return it.
-      return result->second;
-      }
-    else
-      {
-      // Didn't find an instance.  Create a new one and save it.
-      cmDependInformation* info = new cmDependInformation;
-      info->FullPath = fullPath;
-      info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
-      info->IncludeName = file;
-      this->DependInformationMap[fullPath] = info;
-      return info;
-      }
-  }
-
-  /**
-   * Find the full path name for the given file name.
-   * This uses the include directories.
-   * TODO: Cache path conversions to reduce FileExists calls.
-   */
-  std::string FullPath(const char *fname, const char *extraPath)
-  {
-    DirectoryToFileToPathMapType::iterator m;
-    if(extraPath)
-      {
-      m = this->DirectoryToFileToPathMap.find(extraPath);
-      }
-    else
-      {
-      m = this->DirectoryToFileToPathMap.find("");
-      }
-
-    if(m != this->DirectoryToFileToPathMap.end())
-      {
-      FileToPathMapType& map = m->second;
-      FileToPathMapType::iterator p = map.find(fname);
-      if(p != map.end())
-        {
-        return p->second;
-        }
-      }
-
-    if(cmSystemTools::FileExists(fname, true))
-      {
-      std::string fp = cmSystemTools::CollapseFullPath(fname);
-      this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
-      return fp;
-      }
-
-    for(std::vector<std::string>::iterator i =
-        this->IncludeDirectories.begin();
-        i != this->IncludeDirectories.end(); ++i)
-      {
-      std::string path = *i;
-      if (!path.empty() && path[path.size() - 1] != '/')
-        {
-        path = path + "/";
-        }
-      path = path + fname;
-      if(cmSystemTools::FileExists(path.c_str(), true)
-         && !cmSystemTools::FileIsDirectory(path))
-        {
-        std::string fp = cmSystemTools::CollapseFullPath(path);
-        this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
-        return fp;
-        }
-      }
-
-    if (extraPath)
-      {
-      std::string path = extraPath;
-      if (!path.empty() && path[path.size() - 1] != '/')
-        {
-        path = path + "/";
-        }
-      path = path + fname;
-      if(cmSystemTools::FileExists(path.c_str(), true)
-         && !cmSystemTools::FileIsDirectory(path))
-        {
-        std::string fp = cmSystemTools::CollapseFullPath(path);
-        this->DirectoryToFileToPathMap[extraPath][fname] = fp;
-        return fp;
-        }
-      }
-
-    // Couldn't find the file.
-    return std::string(fname);
-  }
-
-  cmMakefile* Makefile;
-  bool Verbose;
-  cmsys::RegularExpression IncludeFileRegularExpression;
-  cmsys::RegularExpression ComplainFileRegularExpression;
-  std::vector<std::string> IncludeDirectories;
-  typedef std::map<std::string, std::string> FileToPathMapType;
-  typedef std::map<std::string, FileToPathMapType>
-  DirectoryToFileToPathMapType;
-  typedef std::map<std::string, cmDependInformation*>
-  DependInformationMapType;
-  DependInformationMapType DependInformationMap;
-  DirectoryToFileToPathMapType DirectoryToFileToPathMap;
-};
-
-#endif
diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx
index 2d57d3b..19d93d9 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -10,10 +10,447 @@
   See the License for more information.
 ============================================================================*/
 #include "cmOutputRequiredFilesCommand.h"
-#include "cmMakeDepend.h"
 #include "cmAlgorithms.h"
 #include <cmsys/FStream.hxx>
 
+/** \class cmDependInformation
+ * \brief Store dependency information for a single source file.
+ *
+ * This structure stores the depend information for a single source file.
+ */
+class cmDependInformation
+{
+public:
+  /**
+   * Construct with dependency generation marked not done; instance
+   * not placed in cmMakefile's list.
+   */
+  cmDependInformation(): DependDone(false), SourceFile(0) {}
+
+  /**
+   * The set of files on which this one depends.
+   */
+  typedef std::set<cmDependInformation*> DependencySetType;
+  DependencySetType DependencySet;
+
+  /**
+   * This flag indicates whether dependency checking has been
+   * performed for this file.
+   */
+  bool DependDone;
+
+  /**
+   * If this object corresponds to a cmSourceFile instance, this points
+   * to it.
+   */
+  const cmSourceFile *SourceFile;
+
+  /**
+   * Full path to this file.
+   */
+  std::string FullPath;
+
+  /**
+   * Full path not including file name.
+   */
+  std::string PathOnly;
+
+  /**
+   * Name used to #include this file.
+   */
+  std::string IncludeName;
+
+  /**
+   * This method adds the dependencies of another file to this one.
+   */
+  void AddDependencies(cmDependInformation* info)
+  {
+  if(this != info)
+    {
+    this->DependencySet.insert(info);
+    }
+  }
+};
+
+
+// cmMakeDepend is used to generate dependancy information for
+// the classes in a makefile
+class cmMakeDepend
+{
+public:
+  /**
+   * Construct the object with verbose turned off.
+   */
+  cmMakeDepend()
+  {
+    this->Verbose = false;
+    this->IncludeFileRegularExpression.compile("^.*$");
+    this->ComplainFileRegularExpression.compile("^$");
+  }
+
+  /**
+   * Destructor.
+   */
+  virtual ~cmMakeDepend()
+  {
+    cmDeleteAll(this->DependInformationMap);
+  }
+
+  /**
+   * Set the makefile that is used as a source of classes.
+   */
+  virtual void SetMakefile(cmMakefile* makefile)
+  {
+    this->Makefile = makefile;
+
+    // Now extract the include file regular expression from the makefile.
+    this->IncludeFileRegularExpression.compile(
+          this->Makefile->GetIncludeRegularExpression());
+    this->ComplainFileRegularExpression.compile(
+          this->Makefile->GetComplainRegularExpression());
+
+    // Now extract any include paths from the targets
+    std::set<std::string> uniqueIncludes;
+    std::vector<std::string> orderedAndUniqueIncludes;
+    cmTargets &targets = this->Makefile->GetTargets();
+    for (cmTargets::iterator l = targets.begin();
+         l != targets.end(); ++l)
+      {
+      const char *incDirProp = l->second.GetProperty("INCLUDE_DIRECTORIES");
+      if (!incDirProp)
+        {
+        continue;
+        }
+
+      std::string incDirs =
+          cmGeneratorExpression::Preprocess(incDirProp,
+              cmGeneratorExpression::StripAllGeneratorExpressions);
+
+      std::vector<std::string> includes;
+      cmSystemTools::ExpandListArgument(incDirs, includes);
+
+      for(std::vector<std::string>::const_iterator j = includes.begin();
+          j != includes.end(); ++j)
+        {
+        std::string path = *j;
+        this->Makefile->ExpandVariablesInString(path);
+        if(uniqueIncludes.insert(path).second)
+          {
+          orderedAndUniqueIncludes.push_back(path);
+          }
+        }
+      }
+
+    for(std::vector<std::string>::const_iterator
+        it = orderedAndUniqueIncludes.begin();
+        it != orderedAndUniqueIncludes.end();
+        ++it)
+      {
+      this->AddSearchPath(*it);
+      }
+  }
+
+  /**
+   * Add a directory to the search path for include files.
+   */
+  virtual void AddSearchPath(const std::string& path)
+  {
+    this->IncludeDirectories.push_back(path);
+  }
+
+  /**
+   * Generate dependencies for the file given.  Returns a pointer to
+   * the cmDependInformation object for the file.
+   */
+  const cmDependInformation* FindDependencies(const char* file)
+  {
+    cmDependInformation* info = this->GetDependInformation(file,0);
+    this->GenerateDependInformation(info);
+    return info;
+  }
+
+protected:
+  /**
+   * Compute the depend information for this class.
+   */
+  virtual void DependWalk(cmDependInformation* info)
+  {
+    cmsys::RegularExpression includeLine
+        ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
+    cmsys::ifstream fin(info->FullPath.c_str());
+    if(!fin)
+      {
+      cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
+      return;
+      }
+
+    // TODO: Write real read loop (see cmSystemTools::CopyFile).
+    std::string line;
+    while( cmSystemTools::GetLineFromStream(fin, line) )
+      {
+      if(includeLine.find(line.c_str()))
+        {
+        // extract the file being included
+        std::string includeFile = includeLine.match(1);
+        // see if the include matches the regular expression
+        if(!this->IncludeFileRegularExpression.find(includeFile))
+          {
+          if(this->Verbose)
+            {
+            std::string message = "Skipping ";
+            message += includeFile;
+            message += " for file ";
+            message += info->FullPath.c_str();
+            cmSystemTools::Error(message.c_str(), 0);
+            }
+          continue;
+          }
+        // Add this file and all its dependencies.
+        this->AddDependency(info, includeFile.c_str());
+        }
+      }
+  }
+
+  /**
+   * Add a dependency.  Possibly walk it for more dependencies.
+   */
+  virtual void AddDependency(cmDependInformation* info, const char* file)
+  {
+    cmDependInformation* dependInfo =
+        this->GetDependInformation(file, info->PathOnly.c_str());
+    this->GenerateDependInformation(dependInfo);
+    info->AddDependencies(dependInfo);
+  }
+
+  /**
+   * Fill in the given object with dependency information.  If the
+   * information is already complete, nothing is done.
+   */
+  void GenerateDependInformation(cmDependInformation* info)
+  {
+    // If dependencies are already done, stop now.
+    if(info->DependDone)
+      {
+      return;
+      }
+    else
+      {
+      // Make sure we don't visit the same file more than once.
+      info->DependDone = true;
+      }
+    const char* path = info->FullPath.c_str();
+    if(!path)
+      {
+      cmSystemTools::Error(
+            "Attempt to find dependencies for file without path!");
+      return;
+      }
+
+    bool found = false;
+
+    // If the file exists, use it to find dependency information.
+    if(cmSystemTools::FileExists(path, true))
+      {
+      // Use the real file to find its dependencies.
+      this->DependWalk(info);
+      found = true;
+      }
+
+
+    // See if the cmSourceFile for it has any files specified as
+    // dependency hints.
+    if(info->SourceFile != 0)
+      {
+
+      // Get the cmSourceFile corresponding to this.
+      const cmSourceFile& cFile = *(info->SourceFile);
+      // See if there are any hints for finding dependencies for the missing
+      // file.
+      if(!cFile.GetDepends().empty())
+        {
+        // Dependency hints have been given.  Use them to begin the
+        // recursion.
+        for(std::vector<std::string>::const_iterator file =
+            cFile.GetDepends().begin(); file != cFile.GetDepends().end();
+            ++file)
+          {
+          this->AddDependency(info, file->c_str());
+          }
+
+        // Found dependency information.  We are done.
+        found = true;
+        }
+      }
+
+    if(!found)
+      {
+      // Try to find the file amongst the sources
+      cmSourceFile *srcFile = this->Makefile->GetSource
+          (cmSystemTools::GetFilenameWithoutExtension(path));
+      if (srcFile)
+        {
+        if (srcFile->GetFullPath() == path)
+          {
+          found=true;
+          }
+        else
+          {
+          //try to guess which include path to use
+          for(std::vector<std::string>::iterator t =
+              this->IncludeDirectories.begin();
+              t != this->IncludeDirectories.end(); ++t)
+            {
+            std::string incpath = *t;
+            if (!incpath.empty() && incpath[incpath.size() - 1] != '/')
+              {
+              incpath = incpath + "/";
+              }
+            incpath = incpath + path;
+            if (srcFile->GetFullPath() == incpath)
+              {
+              // set the path to the guessed path
+              info->FullPath = incpath;
+              found=true;
+              }
+            }
+          }
+        }
+      }
+
+    if(!found)
+      {
+      // Couldn't find any dependency information.
+      if(this->ComplainFileRegularExpression.find(info->IncludeName.c_str()))
+        {
+        cmSystemTools::Error("error cannot find dependencies for ", path);
+        }
+      else
+        {
+        // Destroy the name of the file so that it won't be output as a
+        // dependency.
+        info->FullPath = "";
+        }
+      }
+  }
+
+  /**
+   * Get an instance of cmDependInformation corresponding to the given file
+   * name.
+   */
+  cmDependInformation* GetDependInformation(const char* file,
+                                            const char *extraPath)
+  {
+    // Get the full path for the file so that lookup is unambiguous.
+    std::string fullPath = this->FullPath(file, extraPath);
+
+    // Try to find the file's instance of cmDependInformation.
+    DependInformationMapType::const_iterator result =
+        this->DependInformationMap.find(fullPath);
+    if(result != this->DependInformationMap.end())
+      {
+      // Found an instance, return it.
+      return result->second;
+      }
+    else
+      {
+      // Didn't find an instance.  Create a new one and save it.
+      cmDependInformation* info = new cmDependInformation;
+      info->FullPath = fullPath;
+      info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
+      info->IncludeName = file;
+      this->DependInformationMap[fullPath] = info;
+      return info;
+      }
+  }
+
+  /**
+   * Find the full path name for the given file name.
+   * This uses the include directories.
+   * TODO: Cache path conversions to reduce FileExists calls.
+   */
+  std::string FullPath(const char *fname, const char *extraPath)
+  {
+    DirectoryToFileToPathMapType::iterator m;
+    if(extraPath)
+      {
+      m = this->DirectoryToFileToPathMap.find(extraPath);
+      }
+    else
+      {
+      m = this->DirectoryToFileToPathMap.find("");
+      }
+
+    if(m != this->DirectoryToFileToPathMap.end())
+      {
+      FileToPathMapType& map = m->second;
+      FileToPathMapType::iterator p = map.find(fname);
+      if(p != map.end())
+        {
+        return p->second;
+        }
+      }
+
+    if(cmSystemTools::FileExists(fname, true))
+      {
+      std::string fp = cmSystemTools::CollapseFullPath(fname);
+      this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
+      return fp;
+      }
+
+    for(std::vector<std::string>::iterator i =
+        this->IncludeDirectories.begin();
+        i != this->IncludeDirectories.end(); ++i)
+      {
+      std::string path = *i;
+      if (!path.empty() && path[path.size() - 1] != '/')
+        {
+        path = path + "/";
+        }
+      path = path + fname;
+      if(cmSystemTools::FileExists(path.c_str(), true)
+         && !cmSystemTools::FileIsDirectory(path))
+        {
+        std::string fp = cmSystemTools::CollapseFullPath(path);
+        this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
+        return fp;
+        }
+      }
+
+    if (extraPath)
+      {
+      std::string path = extraPath;
+      if (!path.empty() && path[path.size() - 1] != '/')
+        {
+        path = path + "/";
+        }
+      path = path + fname;
+      if(cmSystemTools::FileExists(path.c_str(), true)
+         && !cmSystemTools::FileIsDirectory(path))
+        {
+        std::string fp = cmSystemTools::CollapseFullPath(path);
+        this->DirectoryToFileToPathMap[extraPath][fname] = fp;
+        return fp;
+        }
+      }
+
+    // Couldn't find the file.
+    return std::string(fname);
+  }
+
+  cmMakefile* Makefile;
+  bool Verbose;
+  cmsys::RegularExpression IncludeFileRegularExpression;
+  cmsys::RegularExpression ComplainFileRegularExpression;
+  std::vector<std::string> IncludeDirectories;
+  typedef std::map<std::string, std::string> FileToPathMapType;
+  typedef std::map<std::string, FileToPathMapType>
+  DirectoryToFileToPathMapType;
+  typedef std::map<std::string, cmDependInformation*>
+  DependInformationMapType;
+  DependInformationMapType DependInformationMap;
+  DirectoryToFileToPathMapType DirectoryToFileToPathMap;
+};
+
 class cmLBDepend : public cmMakeDepend
 {
   /**
diff --git a/Source/cmOutputRequiredFilesCommand.h b/Source/cmOutputRequiredFilesCommand.h
index 6a09673..b5eb932 100644
--- a/Source/cmOutputRequiredFilesCommand.h
+++ b/Source/cmOutputRequiredFilesCommand.h
@@ -13,7 +13,8 @@
 #define cmOutputRequiredFilesCommand_h
 
 #include "cmCommand.h"
-#include "cmMakeDepend.h"
+
+class cmDependInformation;
 
 class cmOutputRequiredFilesCommand : public cmCommand
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00f50b006cc9afd014374fabc10bdef1330075a2
commit 00f50b006cc9afd014374fabc10bdef1330075a2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 00:09:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:39:51 2015 +0200

    cmMakeDepend: Inline into header.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index ee690e6..1c0ec39 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -299,7 +299,6 @@ set(SRCS
   cmLocalUnixMakefileGenerator3.cxx
   cmLocale.h
   ${MACH_SRCS}
-  cmMakeDepend.cxx
   cmMakeDepend.h
   cmMakefile.cxx
   cmMakefile.h
diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx
deleted file mode 100644
index f4a22ed..0000000
--- a/Source/cmMakeDepend.cxx
+++ /dev/null
@@ -1,361 +0,0 @@
-/*============================================================================
-  CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  Distributed under the OSI-approved BSD License (the "License");
-  see accompanying file Copyright.txt for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even the
-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the License for more information.
-============================================================================*/
-#include "cmMakeDepend.h"
-#include "cmSystemTools.h"
-#include "cmGeneratorExpression.h"
-#include "cmAlgorithms.h"
-
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
-
-void cmDependInformation::AddDependencies(cmDependInformation* info)
-{
-  if(this != info)
-    {
-    this->DependencySet.insert(info);
-    }
-}
-
-cmMakeDepend::cmMakeDepend()
-{
-  this->Verbose = false;
-  this->IncludeFileRegularExpression.compile("^.*$");
-  this->ComplainFileRegularExpression.compile("^$");
-}
-
-
-cmMakeDepend::~cmMakeDepend()
-{
-  cmDeleteAll(this->DependInformationMap);
-}
-
-
-// Set the makefile that depends will be made from.
-// The pointer is kept so the cmSourceFile array can
-// be updated with the depend information in the cmMakefile.
-
-void cmMakeDepend::SetMakefile(cmMakefile* makefile)
-{
-  this->Makefile = makefile;
-
-  // Now extract the include file regular expression from the makefile.
-  this->IncludeFileRegularExpression.compile(
-    this->Makefile->GetIncludeRegularExpression());
-  this->ComplainFileRegularExpression.compile(
-    this->Makefile->GetComplainRegularExpression());
-
-  // Now extract any include paths from the targets
-  std::set<std::string> uniqueIncludes;
-  std::vector<std::string> orderedAndUniqueIncludes;
-  cmTargets &targets = this->Makefile->GetTargets();
-  for (cmTargets::iterator l = targets.begin();
-       l != targets.end(); ++l)
-    {
-    const char *incDirProp = l->second.GetProperty("INCLUDE_DIRECTORIES");
-    if (!incDirProp)
-      {
-      continue;
-      }
-
-    std::string incDirs = cmGeneratorExpression::Preprocess(incDirProp,
-                      cmGeneratorExpression::StripAllGeneratorExpressions);
-
-    std::vector<std::string> includes;
-    cmSystemTools::ExpandListArgument(incDirs, includes);
-
-    for(std::vector<std::string>::const_iterator j = includes.begin();
-        j != includes.end(); ++j)
-      {
-      std::string path = *j;
-      this->Makefile->ExpandVariablesInString(path);
-      if(uniqueIncludes.insert(path).second)
-        {
-        orderedAndUniqueIncludes.push_back(path);
-        }
-      }
-    }
-
-  for(std::vector<std::string>::const_iterator
-    it = orderedAndUniqueIncludes.begin();
-    it != orderedAndUniqueIncludes.end();
-    ++it)
-    {
-    this->AddSearchPath(*it);
-    }
-}
-
-
-const cmDependInformation* cmMakeDepend::FindDependencies(const char* file)
-{
-  cmDependInformation* info = this->GetDependInformation(file,0);
-  this->GenerateDependInformation(info);
-  return info;
-}
-
-void cmMakeDepend::GenerateDependInformation(cmDependInformation* info)
-{
-  // If dependencies are already done, stop now.
-  if(info->DependDone)
-    {
-    return;
-    }
-  else
-    {
-    // Make sure we don't visit the same file more than once.
-    info->DependDone = true;
-    }
-  const char* path = info->FullPath.c_str();
-  if(!path)
-    {
-    cmSystemTools::Error(
-      "Attempt to find dependencies for file without path!");
-    return;
-    }
-
-  bool found = false;
-
-  // If the file exists, use it to find dependency information.
-  if(cmSystemTools::FileExists(path, true))
-    {
-    // Use the real file to find its dependencies.
-    this->DependWalk(info);
-    found = true;
-    }
-
-
-  // See if the cmSourceFile for it has any files specified as
-  // dependency hints.
-  if(info->SourceFile != 0)
-    {
-
-    // Get the cmSourceFile corresponding to this.
-    const cmSourceFile& cFile = *(info->SourceFile);
-    // See if there are any hints for finding dependencies for the missing
-    // file.
-    if(!cFile.GetDepends().empty())
-      {
-      // Dependency hints have been given.  Use them to begin the
-      // recursion.
-      for(std::vector<std::string>::const_iterator file =
-            cFile.GetDepends().begin(); file != cFile.GetDepends().end();
-          ++file)
-        {
-        this->AddDependency(info, file->c_str());
-        }
-
-      // Found dependency information.  We are done.
-      found = true;
-      }
-    }
-
-  if(!found)
-    {
-    // Try to find the file amongst the sources
-    cmSourceFile *srcFile = this->Makefile->GetSource
-      (cmSystemTools::GetFilenameWithoutExtension(path));
-    if (srcFile)
-      {
-      if (srcFile->GetFullPath() == path)
-        {
-        found=true;
-        }
-      else
-        {
-        //try to guess which include path to use
-        for(std::vector<std::string>::iterator t =
-              this->IncludeDirectories.begin();
-            t != this->IncludeDirectories.end(); ++t)
-          {
-          std::string incpath = *t;
-          if (!incpath.empty() && incpath[incpath.size() - 1] != '/')
-            {
-            incpath = incpath + "/";
-            }
-          incpath = incpath + path;
-          if (srcFile->GetFullPath() == incpath)
-            {
-            // set the path to the guessed path
-            info->FullPath = incpath;
-            found=true;
-            }
-          }
-        }
-      }
-    }
-
-  if(!found)
-    {
-    // Couldn't find any dependency information.
-    if(this->ComplainFileRegularExpression.find(info->IncludeName.c_str()))
-      {
-      cmSystemTools::Error("error cannot find dependencies for ", path);
-      }
-    else
-      {
-      // Destroy the name of the file so that it won't be output as a
-      // dependency.
-      info->FullPath = "";
-      }
-    }
-}
-
-// This function actually reads the file specified and scans it for
-// #include directives
-void cmMakeDepend::DependWalk(cmDependInformation* info)
-{
-  cmsys::RegularExpression includeLine
-    ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
-  cmsys::ifstream fin(info->FullPath.c_str());
-  if(!fin)
-    {
-    cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
-    return;
-    }
-
-  // TODO: Write real read loop (see cmSystemTools::CopyFile).
-  std::string line;
-  while( cmSystemTools::GetLineFromStream(fin, line) )
-    {
-    if(includeLine.find(line.c_str()))
-      {
-      // extract the file being included
-      std::string includeFile = includeLine.match(1);
-      // see if the include matches the regular expression
-      if(!this->IncludeFileRegularExpression.find(includeFile))
-        {
-        if(this->Verbose)
-          {
-          std::string message = "Skipping ";
-          message += includeFile;
-          message += " for file ";
-          message += info->FullPath.c_str();
-          cmSystemTools::Error(message.c_str(), 0);
-          }
-        continue;
-        }
-
-      // Add this file and all its dependencies.
-      this->AddDependency(info, includeFile.c_str());
-      }
-    }
-}
-
-
-void cmMakeDepend::AddDependency(cmDependInformation* info, const char* file)
-{
-  cmDependInformation* dependInfo =
-    this->GetDependInformation(file, info->PathOnly.c_str());
-  this->GenerateDependInformation(dependInfo);
-  info->AddDependencies(dependInfo);
-}
-
-cmDependInformation* cmMakeDepend::GetDependInformation(const char* file,
-                                                        const char *extraPath)
-{
-  // Get the full path for the file so that lookup is unambiguous.
-  std::string fullPath = this->FullPath(file, extraPath);
-
-  // Try to find the file's instance of cmDependInformation.
-  DependInformationMapType::const_iterator result =
-    this->DependInformationMap.find(fullPath);
-  if(result != this->DependInformationMap.end())
-    {
-    // Found an instance, return it.
-    return result->second;
-    }
-  else
-    {
-    // Didn't find an instance.  Create a new one and save it.
-    cmDependInformation* info = new cmDependInformation;
-    info->FullPath = fullPath;
-    info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
-    info->IncludeName = file;
-    this->DependInformationMap[fullPath] = info;
-    return info;
-    }
-}
-
-
-// find the full path to fname by searching the this->IncludeDirectories array
-std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath)
-{
-  DirectoryToFileToPathMapType::iterator m;
-  if(extraPath)
-    {
-    m = this->DirectoryToFileToPathMap.find(extraPath);
-    }
-  else
-    {
-    m = this->DirectoryToFileToPathMap.find("");
-    }
-
-  if(m != this->DirectoryToFileToPathMap.end())
-    {
-    FileToPathMapType& map = m->second;
-    FileToPathMapType::iterator p = map.find(fname);
-    if(p != map.end())
-      {
-      return p->second;
-      }
-    }
-
-  if(cmSystemTools::FileExists(fname, true))
-    {
-    std::string fp = cmSystemTools::CollapseFullPath(fname);
-    this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
-    return fp;
-    }
-
-  for(std::vector<std::string>::iterator i = this->IncludeDirectories.begin();
-      i != this->IncludeDirectories.end(); ++i)
-    {
-    std::string path = *i;
-    if (!path.empty() && path[path.size() - 1] != '/')
-      {
-      path = path + "/";
-      }
-    path = path + fname;
-    if(cmSystemTools::FileExists(path.c_str(), true)
-       && !cmSystemTools::FileIsDirectory(path))
-      {
-      std::string fp = cmSystemTools::CollapseFullPath(path);
-      this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
-      return fp;
-      }
-    }
-
-  if (extraPath)
-    {
-    std::string path = extraPath;
-    if (!path.empty() && path[path.size() - 1] != '/')
-      {
-      path = path + "/";
-      }
-    path = path + fname;
-    if(cmSystemTools::FileExists(path.c_str(), true)
-       && !cmSystemTools::FileIsDirectory(path))
-      {
-      std::string fp = cmSystemTools::CollapseFullPath(path);
-      this->DirectoryToFileToPathMap[extraPath][fname] = fp;
-      return fp;
-      }
-    }
-
-  // Couldn't find the file.
-  return std::string(fname);
-}
-
-// Add a directory to the search path
-void cmMakeDepend::AddSearchPath(const std::string& path)
-{
-  this->IncludeDirectories.push_back(path);
-}
diff --git a/Source/cmMakeDepend.h b/Source/cmMakeDepend.h
index 2c9d515..d45e23b 100644
--- a/Source/cmMakeDepend.h
+++ b/Source/cmMakeDepend.h
@@ -14,8 +14,12 @@
 
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
+#include "cmSystemTools.h"
+#include "cmGeneratorExpression.h"
+#include "cmAlgorithms.h"
 
 #include <cmsys/RegularExpression.hxx>
+#include <cmsys/FStream.hxx>
 
 /** \class cmDependInformation
  * \brief Store dependency information for a single source file.
@@ -67,7 +71,13 @@ public:
   /**
    * This method adds the dependencies of another file to this one.
    */
-  void AddDependencies(cmDependInformation*);
+  void AddDependencies(cmDependInformation* info)
+  {
+  if(this != info)
+    {
+    this->DependencySet.insert(info);
+    }
+  }
 };
 
 
@@ -79,59 +89,361 @@ public:
   /**
    * Construct the object with verbose turned off.
    */
-  cmMakeDepend();
+  cmMakeDepend()
+  {
+    this->Verbose = false;
+    this->IncludeFileRegularExpression.compile("^.*$");
+    this->ComplainFileRegularExpression.compile("^$");
+  }
 
   /**
    * Destructor.
    */
-  virtual ~cmMakeDepend();
+  virtual ~cmMakeDepend()
+  {
+    cmDeleteAll(this->DependInformationMap);
+  }
 
   /**
    * Set the makefile that is used as a source of classes.
    */
-  virtual void SetMakefile(cmMakefile* makefile);
+  virtual void SetMakefile(cmMakefile* makefile)
+  {
+    this->Makefile = makefile;
+
+    // Now extract the include file regular expression from the makefile.
+    this->IncludeFileRegularExpression.compile(
+          this->Makefile->GetIncludeRegularExpression());
+    this->ComplainFileRegularExpression.compile(
+          this->Makefile->GetComplainRegularExpression());
+
+    // Now extract any include paths from the targets
+    std::set<std::string> uniqueIncludes;
+    std::vector<std::string> orderedAndUniqueIncludes;
+    cmTargets &targets = this->Makefile->GetTargets();
+    for (cmTargets::iterator l = targets.begin();
+         l != targets.end(); ++l)
+      {
+      const char *incDirProp = l->second.GetProperty("INCLUDE_DIRECTORIES");
+      if (!incDirProp)
+        {
+        continue;
+        }
+
+      std::string incDirs =
+          cmGeneratorExpression::Preprocess(incDirProp,
+              cmGeneratorExpression::StripAllGeneratorExpressions);
+
+      std::vector<std::string> includes;
+      cmSystemTools::ExpandListArgument(incDirs, includes);
+
+      for(std::vector<std::string>::const_iterator j = includes.begin();
+          j != includes.end(); ++j)
+        {
+        std::string path = *j;
+        this->Makefile->ExpandVariablesInString(path);
+        if(uniqueIncludes.insert(path).second)
+          {
+          orderedAndUniqueIncludes.push_back(path);
+          }
+        }
+      }
+
+    for(std::vector<std::string>::const_iterator
+        it = orderedAndUniqueIncludes.begin();
+        it != orderedAndUniqueIncludes.end();
+        ++it)
+      {
+      this->AddSearchPath(*it);
+      }
+  }
 
   /**
    * Add a directory to the search path for include files.
    */
-  virtual void AddSearchPath(const std::string&);
+  virtual void AddSearchPath(const std::string& path)
+  {
+    this->IncludeDirectories.push_back(path);
+  }
 
   /**
    * Generate dependencies for the file given.  Returns a pointer to
    * the cmDependInformation object for the file.
    */
-  const cmDependInformation* FindDependencies(const char* file);
+  const cmDependInformation* FindDependencies(const char* file)
+  {
+    cmDependInformation* info = this->GetDependInformation(file,0);
+    this->GenerateDependInformation(info);
+    return info;
+  }
 
 protected:
   /**
    * Compute the depend information for this class.
    */
-  virtual void DependWalk(cmDependInformation* info);
+  virtual void DependWalk(cmDependInformation* info)
+  {
+    cmsys::RegularExpression includeLine
+        ("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
+    cmsys::ifstream fin(info->FullPath.c_str());
+    if(!fin)
+      {
+      cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
+      return;
+      }
+
+    // TODO: Write real read loop (see cmSystemTools::CopyFile).
+    std::string line;
+    while( cmSystemTools::GetLineFromStream(fin, line) )
+      {
+      if(includeLine.find(line.c_str()))
+        {
+        // extract the file being included
+        std::string includeFile = includeLine.match(1);
+        // see if the include matches the regular expression
+        if(!this->IncludeFileRegularExpression.find(includeFile))
+          {
+          if(this->Verbose)
+            {
+            std::string message = "Skipping ";
+            message += includeFile;
+            message += " for file ";
+            message += info->FullPath.c_str();
+            cmSystemTools::Error(message.c_str(), 0);
+            }
+          continue;
+          }
+        // Add this file and all its dependencies.
+        this->AddDependency(info, includeFile.c_str());
+        }
+      }
+  }
 
   /**
    * Add a dependency.  Possibly walk it for more dependencies.
    */
-  virtual void AddDependency(cmDependInformation* info, const char* file);
+  virtual void AddDependency(cmDependInformation* info, const char* file)
+  {
+    cmDependInformation* dependInfo =
+        this->GetDependInformation(file, info->PathOnly.c_str());
+    this->GenerateDependInformation(dependInfo);
+    info->AddDependencies(dependInfo);
+  }
 
   /**
    * Fill in the given object with dependency information.  If the
    * information is already complete, nothing is done.
    */
-  void GenerateDependInformation(cmDependInformation* info);
+  void GenerateDependInformation(cmDependInformation* info)
+  {
+    // If dependencies are already done, stop now.
+    if(info->DependDone)
+      {
+      return;
+      }
+    else
+      {
+      // Make sure we don't visit the same file more than once.
+      info->DependDone = true;
+      }
+    const char* path = info->FullPath.c_str();
+    if(!path)
+      {
+      cmSystemTools::Error(
+            "Attempt to find dependencies for file without path!");
+      return;
+      }
+
+    bool found = false;
+
+    // If the file exists, use it to find dependency information.
+    if(cmSystemTools::FileExists(path, true))
+      {
+      // Use the real file to find its dependencies.
+      this->DependWalk(info);
+      found = true;
+      }
+
+
+    // See if the cmSourceFile for it has any files specified as
+    // dependency hints.
+    if(info->SourceFile != 0)
+      {
+
+      // Get the cmSourceFile corresponding to this.
+      const cmSourceFile& cFile = *(info->SourceFile);
+      // See if there are any hints for finding dependencies for the missing
+      // file.
+      if(!cFile.GetDepends().empty())
+        {
+        // Dependency hints have been given.  Use them to begin the
+        // recursion.
+        for(std::vector<std::string>::const_iterator file =
+            cFile.GetDepends().begin(); file != cFile.GetDepends().end();
+            ++file)
+          {
+          this->AddDependency(info, file->c_str());
+          }
+
+        // Found dependency information.  We are done.
+        found = true;
+        }
+      }
+
+    if(!found)
+      {
+      // Try to find the file amongst the sources
+      cmSourceFile *srcFile = this->Makefile->GetSource
+          (cmSystemTools::GetFilenameWithoutExtension(path));
+      if (srcFile)
+        {
+        if (srcFile->GetFullPath() == path)
+          {
+          found=true;
+          }
+        else
+          {
+          //try to guess which include path to use
+          for(std::vector<std::string>::iterator t =
+              this->IncludeDirectories.begin();
+              t != this->IncludeDirectories.end(); ++t)
+            {
+            std::string incpath = *t;
+            if (!incpath.empty() && incpath[incpath.size() - 1] != '/')
+              {
+              incpath = incpath + "/";
+              }
+            incpath = incpath + path;
+            if (srcFile->GetFullPath() == incpath)
+              {
+              // set the path to the guessed path
+              info->FullPath = incpath;
+              found=true;
+              }
+            }
+          }
+        }
+      }
+
+    if(!found)
+      {
+      // Couldn't find any dependency information.
+      if(this->ComplainFileRegularExpression.find(info->IncludeName.c_str()))
+        {
+        cmSystemTools::Error("error cannot find dependencies for ", path);
+        }
+      else
+        {
+        // Destroy the name of the file so that it won't be output as a
+        // dependency.
+        info->FullPath = "";
+        }
+      }
+  }
 
   /**
    * Get an instance of cmDependInformation corresponding to the given file
    * name.
    */
   cmDependInformation* GetDependInformation(const char* file,
-                                            const char *extraPath);
+                                            const char *extraPath)
+  {
+    // Get the full path for the file so that lookup is unambiguous.
+    std::string fullPath = this->FullPath(file, extraPath);
+
+    // Try to find the file's instance of cmDependInformation.
+    DependInformationMapType::const_iterator result =
+        this->DependInformationMap.find(fullPath);
+    if(result != this->DependInformationMap.end())
+      {
+      // Found an instance, return it.
+      return result->second;
+      }
+    else
+      {
+      // Didn't find an instance.  Create a new one and save it.
+      cmDependInformation* info = new cmDependInformation;
+      info->FullPath = fullPath;
+      info->PathOnly = cmSystemTools::GetFilenamePath(fullPath);
+      info->IncludeName = file;
+      this->DependInformationMap[fullPath] = info;
+      return info;
+      }
+  }
 
   /**
    * Find the full path name for the given file name.
    * This uses the include directories.
    * TODO: Cache path conversions to reduce FileExists calls.
    */
-  std::string FullPath(const char *filename, const char *extraPath);
+  std::string FullPath(const char *fname, const char *extraPath)
+  {
+    DirectoryToFileToPathMapType::iterator m;
+    if(extraPath)
+      {
+      m = this->DirectoryToFileToPathMap.find(extraPath);
+      }
+    else
+      {
+      m = this->DirectoryToFileToPathMap.find("");
+      }
+
+    if(m != this->DirectoryToFileToPathMap.end())
+      {
+      FileToPathMapType& map = m->second;
+      FileToPathMapType::iterator p = map.find(fname);
+      if(p != map.end())
+        {
+        return p->second;
+        }
+      }
+
+    if(cmSystemTools::FileExists(fname, true))
+      {
+      std::string fp = cmSystemTools::CollapseFullPath(fname);
+      this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
+      return fp;
+      }
+
+    for(std::vector<std::string>::iterator i =
+        this->IncludeDirectories.begin();
+        i != this->IncludeDirectories.end(); ++i)
+      {
+      std::string path = *i;
+      if (!path.empty() && path[path.size() - 1] != '/')
+        {
+        path = path + "/";
+        }
+      path = path + fname;
+      if(cmSystemTools::FileExists(path.c_str(), true)
+         && !cmSystemTools::FileIsDirectory(path))
+        {
+        std::string fp = cmSystemTools::CollapseFullPath(path);
+        this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
+        return fp;
+        }
+      }
+
+    if (extraPath)
+      {
+      std::string path = extraPath;
+      if (!path.empty() && path[path.size() - 1] != '/')
+        {
+        path = path + "/";
+        }
+      path = path + fname;
+      if(cmSystemTools::FileExists(path.c_str(), true)
+         && !cmSystemTools::FileIsDirectory(path))
+        {
+        std::string fp = cmSystemTools::CollapseFullPath(path);
+        this->DirectoryToFileToPathMap[extraPath][fname] = fp;
+        return fp;
+        }
+      }
+
+    // Couldn't find the file.
+    return std::string(fname);
+  }
 
   cmMakefile* Makefile;
   bool Verbose;
diff --git a/bootstrap b/bootstrap
index 54f7ca6..9541cc8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -259,7 +259,6 @@ CMAKE_CXX_SOURCES="\
   cmPropertyMap \
   cmPropertyDefinition \
   cmPropertyDefinitionMap \
-  cmMakeDepend \
   cmMakefile \
   cmExportBuildFileGenerator \
   cmExportFileGenerator \

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 18:44:00 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 18:44:00 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-753-g7fcccb9
Message-ID: <20151020224400.34C82BFF73@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7fcccb9f7b854319c23febac9c9280c271e8740c (commit)
       via  2ac7d953c36c36293922e53daed7a1737a813d23 (commit)
       via  379d66ac571ff5082db73cb48a29a3ce4c51ebd2 (commit)
       via  04b6bb167636ccf2fe565239a44249366ee1e452 (commit)
       via  400e3d19fcebf7d6e9551d585d60754bd937c28c (commit)
       via  726e461b3885aca4144ec79d08bf62c7ebade96d (commit)
      from  657b36f08e5329c2fdcd6f299685796dc8abfbd0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fcccb9f7b854319c23febac9c9280c271e8740c
commit 7fcccb9f7b854319c23febac9c9280c271e8740c
Merge: 657b36f 2ac7d95
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 18:43:57 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 18:43:57 2015 -0400

    Merge topic 'cmLocalGenerator-generator-target-storage' into next
    
    2ac7d953 cmLocalGenerator: Store a vector of generator targets.
    379d66ac cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.
    04b6bb16 cmLocalGenerator: Simplify semantic of adding generator targets.
    400e3d19 cmLocalGenerator: Don't store imported generator targets
    726e461b CMP0063: Split unit test by target type.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ac7d953c36c36293922e53daed7a1737a813d23
commit 2ac7d953c36c36293922e53daed7a1737a813d23
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 16:53:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 20 23:58:49 2015 +0200

    cmLocalGenerator: Store a vector of generator targets.
    
    Not a map from cmTarget to cmGeneratorTarget.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 31c05fd..1921f03 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,13 +965,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
-    for (cmGeneratorTargetsType::iterator l = targets.begin();
+    std::vector<cmGeneratorTarget*> targets = (*it)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
       std::vector<std::string> includeDirs;
       std::string config = mf->GetSafeDefinition("CMAKE_BUILD_TYPE");
-      (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
+      (*it)->GetIncludeDirectories(includeDirs, *l, "C", config);
       this->AppendIncludeDirectories(fout, includeDirs, emmited);
       }
     }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a55365f..32cfcea 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1584,7 +1584,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
-      lg->AddGeneratorTarget(t, gt);
+      lg->AddGeneratorTarget(gt);
       }
     }
 
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 4eec3fb..8659e34 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,13 +68,14 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
-      for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
-           ti != targets.end(); ti++)
+      std::vector<cmGeneratorTarget*> const& targets =
+          (*lg)->GetGeneratorTargets();
+      for (std::vector<cmGeneratorTarget*>::const_iterator ti =
+           targets.begin(); ti != targets.end(); ti++)
         {
-        if (ti->second->GetType()==cmState::EXECUTABLE)
+        if ((*ti)->GetType()==cmState::EXECUTABLE)
           {
-          executable = ti->second->GetLocation("");
+          executable = (*ti)->GetLocation("");
           break;
           }
         }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 44e3de6..74d23a3 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -460,11 +460,11 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator l = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
-    cmGeneratorTarget* gtarget = l->second;
+    cmGeneratorTarget* gtarget = *l;
     int type = gtarget->GetType();
     if((type == cmState::EXECUTABLE) ||
        (type == cmState::STATIC_LIBRARY) ||
@@ -623,11 +623,11 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-    for(cmGeneratorTargetsType::iterator t = targets.begin();
+    std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
-      cmGeneratorTarget* gtarget = t->second;
+      cmGeneratorTarget* gtarget = *t;
       // Don't emit the same rule twice (e.g. two targets with the same
       // simple name)
       int type = gtarget->GetType();
@@ -720,11 +720,11 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    cmGeneratorTarget* gtarget = t->second;
+    cmGeneratorTarget* gtarget = *t;
     int type = gtarget->GetType();
     std::string name = gtarget->GetName();
     if (!name.empty()
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 61b19cf..a22315c 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -256,7 +256,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
                           noCommandLines);
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
-  lg->AddGeneratorTarget(tgt, gt);
+  lg->AddGeneratorTarget(gt);
   this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 3838ebc..3514e57 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -459,7 +459,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         "echo", "Build all projects");
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
-  root->AddGeneratorTarget(allbuild, allBuildGt);
+  root->AddGeneratorTarget(allBuildGt);
   root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
@@ -495,7 +495,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           "make", "-f", file.c_str());
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
-    root->AddGeneratorTarget(check, checkGt);
+    root->AddGeneratorTarget(checkGt);
     root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 833ffbf..41d7cce 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,15 +132,15 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    t->second->TraceDependencies();
+    (*t)->TraceDependencies();
     }
 }
 
@@ -448,9 +448,9 @@ void cmLocalGenerator::GenerateInstallRules()
 }
 
 
-void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
 {
-  this->GeneratorTargets[t] = gt;
+  this->GeneratorTargets.push_back(gt);
 }
 
 //----------------------------------------------------------------------------
@@ -465,12 +465,12 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    cmGeneratorTarget& target = *t->second;
-    if (target.GetType() == cmState::INTERFACE_LIBRARY)
+    cmGeneratorTarget* target = *t;
+    if (target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -478,7 +478,7 @@ void cmLocalGenerator::ComputeTargetManifest()
         ci != configNames.end(); ++ci)
       {
       const char* config = ci->c_str();
-      target.ComputeTargetManifest(config);
+      target->ComputeTargetManifest(config);
       }
     }
 }
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 307c67f..1375985 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -113,12 +113,12 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
-  const cmGeneratorTargetsType &GetGeneratorTargets() const
+  const std::vector<cmGeneratorTarget*> &GetGeneratorTargets() const
     {
       return this->GeneratorTargets;
     }
 
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
+  void AddGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
@@ -367,7 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
-  cmGeneratorTargetsType GeneratorTargets;
+  std::vector<cmGeneratorTarget*> GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 869ba2c..a77a75e 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,16 +26,16 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
 
-  for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
-       ++l)
+  for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+       l != tgts.end(); ++l)
     {
-    if (l->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmGhsMultiTargetGenerator tg(l->second);
+    cmGhsMultiTargetGenerator tg(*l);
     tg.Generate();
     }
 }
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 756c139..3dd18bd 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,23 +73,23 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(t->second);
+    cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(*t);
     if(tg)
       {
       tg->Generate();
       // Add the target to "all" if required.
       if (!this->GetGlobalNinjaGenerator()->IsExcluded(
             this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0],
-            t->second))
-        this->GetGlobalNinjaGenerator()->AddDependencyToAll(t->second->Target);
+            *t))
+        this->GetGlobalNinjaGenerator()->AddDependencyToAll((*t)->Target);
       delete tg;
       }
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 5485da4..07f763b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,18 +113,18 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     cmsys::auto_ptr<cmMakefileTargetGenerator> tg(
-      cmMakefileTargetGenerator::New(t->second));
+      cmMakefileTargetGenerator::New(*t));
     if (tg.get())
       {
       tg->WriteRuleFiles();
@@ -174,11 +174,11 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator ti = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
-    cmGeneratorTarget* gt = ti->second;
+    cmGeneratorTarget* gt = *ti;
     if (gt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -417,22 +417,22 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
   std::string localName;
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if((t->second->GetType() == cmState::EXECUTABLE) ||
-       (t->second->GetType() == cmState::STATIC_LIBRARY) ||
-       (t->second->GetType() == cmState::SHARED_LIBRARY) ||
-       (t->second->GetType() == cmState::MODULE_LIBRARY) ||
-       (t->second->GetType() == cmState::OBJECT_LIBRARY) ||
-       (t->second->GetType() == cmState::UTILITY))
+    if(((*t)->GetType() == cmState::EXECUTABLE) ||
+       ((*t)->GetType() == cmState::STATIC_LIBRARY) ||
+       ((*t)->GetType() == cmState::SHARED_LIBRARY) ||
+       ((*t)->GetType() == cmState::MODULE_LIBRARY) ||
+       ((*t)->GetType() == cmState::OBJECT_LIBRARY) ||
+       ((*t)->GetType() == cmState::UTILITY))
       {
-      emitted.insert(t->second->GetName());
+      emitted.insert((*t)->GetName());
 
       // for subdirs add a rule to build this specific target by name.
-      localName = this->GetRelativeTargetDirectory(t->second);
+      localName = this->GetRelativeTargetDirectory(*t);
       localName += "/rule";
       commands.clear();
       depends.clear();
@@ -449,23 +449,23 @@ void cmLocalUnixMakefileGenerator3
                           localName, depends, commands, true);
 
       // Add a target with the canonical name (no prefix, suffix or path).
-      if(localName != t->second->GetName())
+      if(localName != (*t)->GetName())
         {
         commands.clear();
         depends.push_back(localName);
         this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
-                            t->second->GetName(), depends, commands, true);
+                            (*t)->GetName(), depends, commands, true);
         }
 
       // Add a fast rule to build the target
       std::string makefileName =
-                         this->GetRelativeTargetDirectory(t->second);
+                         this->GetRelativeTargetDirectory(*t);
       makefileName += "/build.make";
       // make sure the makefile name is suitable for a makefile
       std::string makeTargetName =
-        this->GetRelativeTargetDirectory(t->second);
+        this->GetRelativeTargetDirectory(*t);
       makeTargetName += "/build";
-      localName = t->second->GetName();
+      localName = (*t)->GetName();
       localName += "/fast";
       depends.clear();
       commands.clear();
@@ -479,11 +479,11 @@ void cmLocalUnixMakefileGenerator3
 
       // Add a local name for the rule to relink the target before
       // installation.
-      if(t->second->NeedRelinkBeforeInstall(this->ConfigName))
+      if((*t)->NeedRelinkBeforeInstall(this->ConfigName))
         {
-        makeTargetName = this->GetRelativeTargetDirectory(t->second);
+        makeTargetName = this->GetRelativeTargetDirectory(*t);
         makeTargetName += "/preinstall";
-        localName = t->second->GetName();
+        localName = (*t)->GetName();
         localName += "/preinstall";
         depends.clear();
         commands.clear();
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 16b8942..225c03e 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -895,7 +895,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    lg->AddGeneratorTarget(autogenTarget, gt);
+    lg->AddGeneratorTarget(gt);
     lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=379d66ac571ff5082db73cb48a29a3ce4c51ebd2
commit 379d66ac571ff5082db73cb48a29a3ce4c51ebd2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 16:32:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 20 23:58:49 2015 +0200

    cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index aecae35..a55365f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1574,7 +1574,6 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
                                                cmLocalGenerator *lg)
 {
-  cmGeneratorTargetsType generatorTargets;
   cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
     {
@@ -1585,7 +1584,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
-      generatorTargets[t] = gt;
+      lg->AddGeneratorTarget(t, gt);
       }
     }
 
@@ -1596,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
     this->GeneratorTargets[*j] = gt;
     }
-  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2bc0e4a..307c67f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -118,10 +118,6 @@ public:
       return this->GeneratorTargets;
     }
 
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-    {
-      this->GeneratorTargets = targets;
-    }
   void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04b6bb167636ccf2fe565239a44249366ee1e452
commit 04b6bb167636ccf2fe565239a44249366ee1e452
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 16:40:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 20 23:58:49 2015 +0200

    cmLocalGenerator: Simplify semantic of adding generator targets.
    
    Don't store on the global generator as a side effect.  Update clients to adapt.

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 0c41964..61b19cf 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -257,6 +257,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   lg->AddGeneratorTarget(tgt, gt);
+  this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 9af5b35..91ca9a3 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -88,6 +88,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       gen[0]->AddGeneratorTarget(allBuild, gt);
+      this->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index ea1b1a0..3838ebc 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -460,6 +460,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   root->AddGeneratorTarget(allbuild, allBuildGt);
+  root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -495,6 +496,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     root->AddGeneratorTarget(check, checkGt);
+    root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1a4516c..833ffbf 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -451,7 +451,6 @@ void cmLocalGenerator::GenerateInstallRules()
 void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
 {
   this->GeneratorTargets[t] = gt;
-  this->GetGlobalGenerator()->AddGeneratorTarget(t, gt);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 386d430..16b8942 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -896,6 +896,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     lg->AddGeneratorTarget(autogenTarget, gt);
+    lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=400e3d19fcebf7d6e9551d585d60754bd937c28c
commit 400e3d19fcebf7d6e9551d585d60754bd937c28c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 16:33:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 20 23:58:48 2015 +0200

    cmLocalGenerator: Don't store imported generator targets
    
    No consumers need them.  This makes GetGeneratorTargets more comparable
    to cmMakefile::GetTargets, which does not include imported targets.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 236fb7d..31c05fd 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -969,10 +969,6 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
     for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
-      if (l->first->IsImported())
-        {
-        continue;
-        }
       std::vector<std::string> includeDirs;
       std::string config = mf->GetSafeDefinition("CMAKE_BUILD_TYPE");
       (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1142ddd..aecae35 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1595,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     {
     cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
     this->GeneratorTargets[*j] = gt;
-    generatorTargets[*j] = gt;
     }
   lg->SetGeneratorTargets(generatorTargets);
 }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 8e671a3..44e3de6 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -473,10 +473,6 @@ cmGlobalUnixMakefileGenerator3
        (type == cmState::OBJECT_LIBRARY) ||
        (type == cmState::UTILITY))
       {
-      if(gtarget->IsImported())
-        {
-        continue;
-        }
       // Add this to the list of depends rules in this directory.
       if((!check_all || !gtarget->GetPropertyAsBool("EXCLUDE_FROM_ALL")) &&
          (!check_relink ||
@@ -632,10 +628,6 @@ cmGlobalUnixMakefileGenerator3
         t != targets.end(); ++t)
       {
       cmGeneratorTarget* gtarget = t->second;
-      if(gtarget->IsImported())
-        {
-        continue;
-        }
       // Don't emit the same rule twice (e.g. two targets with the same
       // simple name)
       int type = gtarget->GetType();
@@ -733,10 +725,6 @@ cmGlobalUnixMakefileGenerator3
       t != targets.end(); ++t)
     {
     cmGeneratorTarget* gtarget = t->second;
-    if(gtarget->IsImported())
-      {
-      continue;
-      }
     int type = gtarget->GetType();
     std::string name = gtarget->GetName();
     if (!name.empty()
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9d5dd8e..1a4516c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -136,8 +136,7 @@ void cmLocalGenerator::TraceDependencies()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->Target->IsImported()
-        || t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -476,10 +475,6 @@ void cmLocalGenerator::ComputeTargetManifest()
       {
       continue;
       }
-    if (target.IsImported())
-      {
-      continue;
-      }
     for(std::vector<std::string>::iterator ci = configNames.begin();
         ci != configNames.end(); ++ci)
       {
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index a408a23..869ba2c 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -31,8 +31,7 @@ void cmLocalGhsMultiGenerator::Generate()
   for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
        ++l)
     {
-    if (l->second->GetType() == cmState::INTERFACE_LIBRARY
-        || l->second->IsImported())
+    if (l->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 4da77e0..756c139 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -77,8 +77,7 @@ void cmLocalNinjaGenerator::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY
-        || t->second->Target->IsImported())
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index add0aa9..5485da4 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -119,8 +119,7 @@ void cmLocalUnixMakefileGenerator3::Generate()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY
-        || t->second->Target->IsImported())
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -430,11 +429,6 @@ void cmLocalUnixMakefileGenerator3
        (t->second->GetType() == cmState::OBJECT_LIBRARY) ||
        (t->second->GetType() == cmState::UTILITY))
       {
-      if (t->second->Target->IsImported())
-        {
-        continue;
-        }
-
       emitted.insert(t->second->GetName());
 
       // for subdirs add a rule to build this specific target by name.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=726e461b3885aca4144ec79d08bf62c7ebade96d
commit 726e461b3885aca4144ec79d08bf62c7ebade96d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 23:54:33 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 20 23:58:48 2015 +0200

    CMP0063: Split unit test by target type.
    
    Don't rely on the order of warnings for targets being deterministic.

diff --git a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe-stderr.txt b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe-stderr.txt
new file mode 100644
index 0000000..b8d726f
--- /dev/null
+++ b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe-stderr.txt
@@ -0,0 +1,15 @@
+CMake Warning \(dev\) at CMP0063-WARN-exe.cmake:[0-9]+ \(add_executable\):
+  Policy CMP0063 is not set: Honor visibility properties for all target
+  types.  Run "cmake --help-policy CMP0063" for policy details.  Use the
+  cmake_policy command to set the policy and suppress this warning.
+
+  Target "myexe" of type "EXECUTABLE" has the following visibility properties
+  set for CXX:
+
+    CXX_VISIBILITY_PRESET
+    VISIBILITY_INLINES_HIDDEN
+
+  For compatibility CMake is not honoring them for this target.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes.cmake b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe.cmake
similarity index 68%
copy from Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes.cmake
copy to Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe.cmake
index 3388e4d..cef1d75 100644
--- a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes.cmake
+++ b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe.cmake
@@ -5,4 +5,7 @@ enable_language(CXX)
 set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
 set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
 
-include(CMP0063-Common.cmake)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+
+add_executable(myexe lib.cpp)
diff --git a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj-stderr.txt b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj-stderr.txt
new file mode 100644
index 0000000..3a7732a
--- /dev/null
+++ b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj-stderr.txt
@@ -0,0 +1,15 @@
+CMake Warning \(dev\) at CMP0063-WARN-obj.cmake:[0-9]+ \(add_library\):
+  Policy CMP0063 is not set: Honor visibility properties for all target
+  types.  Run "cmake --help-policy CMP0063" for policy details.  Use the
+  cmake_policy command to set the policy and suppress this warning.
+
+  Target "myobject" of type "OBJECT_LIBRARY" has the following visibility
+  properties set for CXX:
+
+    CXX_VISIBILITY_PRESET
+    VISIBILITY_INLINES_HIDDEN
+
+  For compatibility CMake is not honoring them for this target.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes.cmake b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj.cmake
similarity index 67%
copy from Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes.cmake
copy to Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj.cmake
index 3388e4d..81d1c33 100644
--- a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes.cmake
+++ b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj.cmake
@@ -5,4 +5,7 @@ enable_language(CXX)
 set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
 set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
 
-include(CMP0063-Common.cmake)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+
+add_library(myobject OBJECT lib.cpp)
diff --git a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta-stderr.txt b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta-stderr.txt
new file mode 100644
index 0000000..1efa1b5
--- /dev/null
+++ b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta-stderr.txt
@@ -0,0 +1,15 @@
+CMake Warning \(dev\) at CMP0063-WARN-sta.cmake:[0-9]+ \(add_library\):
+  Policy CMP0063 is not set: Honor visibility properties for all target
+  types.  Run "cmake --help-policy CMP0063" for policy details.  Use the
+  cmake_policy command to set the policy and suppress this warning.
+
+  Target "mystatic" of type "STATIC_LIBRARY" has the following visibility
+  properties set for CXX:
+
+    CXX_VISIBILITY_PRESET
+    VISIBILITY_INLINES_HIDDEN
+
+  For compatibility CMake is not honoring them for this target.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
+This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes.cmake b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta.cmake
similarity index 67%
rename from Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes.cmake
rename to Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta.cmake
index 3388e4d..132e076 100644
--- a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes.cmake
+++ b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta.cmake
@@ -5,4 +5,7 @@ enable_language(CXX)
 set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
 set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
 
-include(CMP0063-Common.cmake)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+
+add_library(mystatic STATIC lib.cpp)
diff --git a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes-stderr.txt b/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes-stderr.txt
deleted file mode 100644
index 59a4b8f..0000000
--- a/Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes-stderr.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-^CMake Warning \(dev\) at CMP0063-Common.cmake:[0-9]+ \(add_executable\):
-  Policy CMP0063 is not set: Honor visibility properties for all target
-  types.  Run "cmake --help-policy CMP0063" for policy details.  Use the
-  cmake_policy command to set the policy and suppress this warning.
-
-  Target "myexe" of type "EXECUTABLE" has the following visibility properties
-  set for CXX:
-
-    CXX_VISIBILITY_PRESET
-    VISIBILITY_INLINES_HIDDEN
-
-  For compatibility CMake is not honoring them for this target.
-Call Stack \(most recent call first\):
-  CMP0063-WARN-yes.cmake:[0-9]+ \(include\)
-  CMakeLists.txt:[0-9]+ \(include\)
-This warning is for project developers.  Use -Wno-dev to suppress it.
-+
-CMake Warning \(dev\) at CMP0063-Common.cmake:[0-9]+ \(add_library\):
-  Policy CMP0063 is not set: Honor visibility properties for all target
-  types.  Run "cmake --help-policy CMP0063" for policy details.  Use the
-  cmake_policy command to set the policy and suppress this warning.
-
-  Target "myobject" of type "OBJECT_LIBRARY" has the following visibility
-  properties set for CXX:
-
-    CXX_VISIBILITY_PRESET
-    VISIBILITY_INLINES_HIDDEN
-
-  For compatibility CMake is not honoring them for this target.
-Call Stack \(most recent call first\):
-  CMP0063-WARN-yes.cmake:[0-9]+ \(include\)
-  CMakeLists.txt:[0-9]+ \(include\)
-This warning is for project developers.  Use -Wno-dev to suppress it.
-+
-CMake Warning \(dev\) at CMP0063-Common.cmake:[0-9]+ \(add_library\):
-  Policy CMP0063 is not set: Honor visibility properties for all target
-  types.  Run "cmake --help-policy CMP0063" for policy details.  Use the
-  cmake_policy command to set the policy and suppress this warning.
-
-  Target "mystatic" of type "STATIC_LIBRARY" has the following visibility
-  properties set for CXX:
-
-    CXX_VISIBILITY_PRESET
-    VISIBILITY_INLINES_HIDDEN
-
-  For compatibility CMake is not honoring them for this target.
-Call Stack \(most recent call first\):
-  CMP0063-WARN-yes.cmake:[0-9]+ \(include\)
-  CMakeLists.txt:[0-9]+ \(include\)
-This warning is for project developers.  Use -Wno-dev to suppress it.$
diff --git a/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake b/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
index c7eb808..7a000ee 100644
--- a/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
+++ b/Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
@@ -2,6 +2,8 @@ include(RunCMake)
 
 run_cmake(PropertyTypo)
 run_cmake(CMP0063-OLD)
-run_cmake(CMP0063-WARN-yes)
+run_cmake(CMP0063-WARN-exe)
+run_cmake(CMP0063-WARN-obj)
+run_cmake(CMP0063-WARN-sta)
 run_cmake(CMP0063-WARN-no)
 run_cmake(CMP0063-NEW)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx             |   10 ++--
 Source/cmGlobalGenerator.cxx                       |    5 +-
 Source/cmGlobalKdevelopGenerator.cxx               |   11 ++--
 Source/cmGlobalUnixMakefileGenerator3.cxx          |   30 ++++-------
 Source/cmGlobalVisualStudio8Generator.cxx          |    3 +-
 Source/cmGlobalVisualStudioGenerator.cxx           |    1 +
 Source/cmGlobalXCodeGenerator.cxx                  |    6 ++-
 Source/cmLocalGenerator.cxx                        |   28 ++++------
 Source/cmLocalGenerator.h                          |   10 ++--
 Source/cmLocalGhsMultiGenerator.cxx                |   11 ++--
 Source/cmLocalNinjaGenerator.cxx                   |   13 +++--
 Source/cmLocalUnixMakefileGenerator3.cxx           |   56 +++++++++-----------
 Source/cmQtAutoGeneratorInitializer.cxx            |    3 +-
 .../VisibilityPreset/CMP0063-WARN-exe-stderr.txt   |   15 ++++++
 ...P0063-WARN-yes.cmake => CMP0063-WARN-exe.cmake} |    5 +-
 .../VisibilityPreset/CMP0063-WARN-obj-stderr.txt   |   15 ++++++
 ...P0063-WARN-yes.cmake => CMP0063-WARN-obj.cmake} |    5 +-
 .../VisibilityPreset/CMP0063-WARN-sta-stderr.txt   |   15 ++++++
 ...P0063-WARN-yes.cmake => CMP0063-WARN-sta.cmake} |    5 +-
 .../VisibilityPreset/CMP0063-WARN-yes-stderr.txt   |   50 -----------------
 Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake |    4 +-
 21 files changed, 138 insertions(+), 163 deletions(-)
 create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe-stderr.txt
 copy Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake => CMP0063-WARN-exe.cmake} (68%)
 create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj-stderr.txt
 copy Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake => CMP0063-WARN-obj.cmake} (67%)
 create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta-stderr.txt
 rename Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake => CMP0063-WARN-sta.cmake} (67%)
 delete mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes-stderr.txt


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 18:45:47 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 18:45:47 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-765-g9407f97
Message-ID: <20151020224547.7F6A6C0100@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9407f9732a9c7b32b5689094cbd29a3a74a0d6a5 (commit)
       via  cde492f0b1d5cdd7106f937cfc53108f821e9876 (commit)
       via  25601a41cdfd2381cbfb54d2756317e96a297cd5 (commit)
       via  2388d660afbce79a91468546cdd561c32a264086 (commit)
       via  0d946486ef25927b8ececefda8fc2fdb2046bcad (commit)
       via  e4cd731d0518276fdc8e1a51885044d600a0293b (commit)
       via  d9423b618c7c8e70e7f2b27adff57dd9dbe4bf94 (commit)
       via  056af502257c68f6670313d65c96c80341af0110 (commit)
       via  a4991893050f0611d3593dad84c2d8b72326b015 (commit)
       via  215cd21a0238ba00aec7c81014fe83e3d47187a6 (commit)
       via  1df8bd3ab0f6621b90a8801c1d10cfc94c74ff96 (commit)
       via  83703bda7d1017e1f75ec1b92d672d5ef17194d5 (commit)
      from  7fcccb9f7b854319c23febac9c9280c271e8740c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9407f9732a9c7b32b5689094cbd29a3a74a0d6a5
commit 9407f9732a9c7b32b5689094cbd29a3a74a0d6a5
Merge: 7fcccb9 cde492f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 18:45:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 18:45:44 2015 -0400

    Merge topic 'use-generator-target' into next
    
    cde492f0 Access policy status from cmGeneratorTarget at generate time.
    25601a41 cmGeneratorTarget: Copy the policy map from the cmTarget.
    2388d660 cmTarget: Remove unused NameResolvesToFramework.
    0d946486 cmCommonTargetGenerator: Use NameResolvesToFramework without cmTarget.
    e4cd731d Move ComputeLinkType out of cmTarget.
    d9423b61 cmGeneratorTarget: Move IsDLLPlatform from cmTarget.
    056af502 cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.
    a4991893 cmGeneratorTarget: Move GetExportMacro from cmTarget.
    215cd21a cmGeneratorTarget: Provide direct access to the backtrace.
    1df8bd3a cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget.
    83703bda cmGeneratorTarget: Copy IsExecutableWithExports from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cde492f0b1d5cdd7106f937cfc53108f821e9876
commit cde492f0b1d5cdd7106f937cfc53108f821e9876
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 01:12:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:04 2015 +0200

    Access policy status from cmGeneratorTarget at generate time.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index eca0f66..a32bb48 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -407,7 +407,7 @@ cmComputeLinkInformation
   // order to support such projects we need to add the directories
   // containing libraries linked with a full path to the -L path.
   this->OldLinkDirMode =
-    this->Target->Target->GetPolicyStatusCMP0003() != cmPolicies::NEW;
+    this->Target->GetPolicyStatusCMP0003() != cmPolicies::NEW;
   if(this->OldLinkDirMode)
     {
     // Construct a mask to not bother with this behavior for link
@@ -1140,7 +1140,7 @@ void cmComputeLinkInformation::AddFullItem(std::string const& item)
   // Full path libraries should specify a valid library file name.
   // See documentation of CMP0008.
   std::string generator = this->GlobalGenerator->GetName();
-  if(this->Target->Target->GetPolicyStatusCMP0008() != cmPolicies::NEW &&
+  if(this->Target->GetPolicyStatusCMP0008() != cmPolicies::NEW &&
      (generator.find("Visual Studio") != generator.npos ||
       generator.find("Xcode") != generator.npos))
     {
@@ -1221,7 +1221,7 @@ bool cmComputeLinkInformation::CheckImplicitDirItem(std::string const& item)
     }
 
   // Check the policy for whether we should use the approach below.
-  switch (this->Target->Target->GetPolicyStatusCMP0060())
+  switch (this->Target->GetPolicyStatusCMP0060())
     {
     case cmPolicies::WARN:
       if (this->CMP0060Warn)
@@ -1531,7 +1531,7 @@ void cmComputeLinkInformation::HandleBadFullItem(std::string const& item,
   this->OrderLinkerSearchPath->AddLinkLibrary(item);
 
   // Produce any needed message.
-  switch(this->Target->Target->GetPolicyStatusCMP0008())
+  switch(this->Target->GetPolicyStatusCMP0008())
     {
     case cmPolicies::WARN:
       {
@@ -1583,7 +1583,7 @@ bool cmComputeLinkInformation::FinishLinkerSearchDirectories()
     }
 
   // Enforce policy constraints.
-  switch(this->Target->Target->GetPolicyStatusCMP0003())
+  switch(this->Target->GetPolicyStatusCMP0003())
     {
     case cmPolicies::WARN:
       if(!this->CMakeInstance->GetState()
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 2ae8084..03f4fdd 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -362,7 +362,7 @@ void cmComputeTargetDepends::AddTargetDepend(
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     bool issueMessage = false;
     std::ostringstream e;
-    switch(depender->Target->GetPolicyStatusCMP0046())
+    switch(depender->GetPolicyStatusCMP0046())
       {
       case cmPolicies::WARN:
         e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0046) << "\n";
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index be65a19..23c11d7 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -107,8 +107,8 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   gte, properties);
     const bool newCMP0022Behavior =
-        gte->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
-        && gte->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gte->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gte->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
       this->PopulateInterfaceLinkLibrariesProperty(gte,
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index c542f85..1a84625 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -270,7 +270,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch (target->Target->GetPolicyStatusCMP0041())
+        switch (target->GetPolicyStatusCMP0041())
           {
           case cmPolicies::WARN:
             messageType = cmake::WARNING;
@@ -317,7 +317,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         {
         if (!shouldContinue)
           {
-          switch(target->Target->GetPolicyStatusCMP0052())
+          switch(target->GetPolicyStatusCMP0052())
             {
             case cmPolicies::WARN:
               {
@@ -830,10 +830,8 @@ cmExportFileGenerator
     }
 
   const bool newCMP0022Behavior =
-                        target->Target
-                              ->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                     && target->Target
-                              ->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+                        target->GetPolicyStatusCMP0022() != cmPolicies::WARN
+                     && target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
 
   if(newCMP0022Behavior && !this->ExportOld)
     {
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index a2d6ad1..b695904 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -169,8 +169,8 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
                                   properties, missingTargets);
 
     const bool newCMP0022Behavior =
-        gt->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
-        && gt->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gt->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gt->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
       if (this->PopulateInterfaceLinkLibrariesProperty(gt,
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index fc5c049..713ab6a 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1498,7 +1498,7 @@ bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const
     return this->GetPropertyAsBool("MACOSX_RPATH");
     }
 
-  cmPolicies::PolicyStatus cmp0042 = this->Target->GetPolicyStatusCMP0042();
+  cmPolicies::PolicyStatus cmp0042 = this->GetPolicyStatusCMP0042();
 
   if(cmp0042 == cmPolicies::WARN)
     {
@@ -2635,7 +2635,7 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
         cmake::MessageType messageType = cmake::FATAL_ERROR;
         if (checkCMP0027)
           {
-          switch(tgt->Target->GetPolicyStatusCMP0027())
+          switch(tgt->GetPolicyStatusCMP0027())
             {
             case cmPolicies::WARN:
               e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0027) << "\n";
@@ -2674,7 +2674,7 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
           }
         else
           {
-          switch(tgt->Target->GetPolicyStatusCMP0021())
+          switch(tgt->GetPolicyStatusCMP0021())
             {
             case cmPolicies::WARN:
               {
@@ -4706,8 +4706,8 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
         }
       }
     }
-  else if (this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN
-        || this->Target->GetPolicyStatusCMP0022() == cmPolicies::OLD)
+  else if (this->GetPolicyStatusCMP0022() == cmPolicies::WARN
+        || this->GetPolicyStatusCMP0022() == cmPolicies::OLD)
     {
     // The link implementation is the default link interface.
     cmLinkImplementationLibraries const*
@@ -5075,8 +5075,8 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   // libraries and executables that export symbols.
   const char* explicitLibraries = 0;
   std::string linkIfaceProp;
-  if(this->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD &&
-     this->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN)
+  if(this->GetPolicyStatusCMP0022() != cmPolicies::OLD &&
+     this->GetPolicyStatusCMP0022() != cmPolicies::WARN)
     {
     // CMP0022 NEW behavior is to use INTERFACE_LINK_LIBRARIES.
     linkIfaceProp = "INTERFACE_LINK_LIBRARIES";
@@ -5102,7 +5102,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     }
 
   if(explicitLibraries &&
-     this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
+     this->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
      !this->PolicyWarnedCMP0022)
     {
     // Compare the explicitly set old link interface properties to the
@@ -5147,8 +5147,8 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
                                 iface.Libraries,
                                 iface.HadHeadSensitiveCondition);
     }
-  else if (this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN
-        || this->Target->GetPolicyStatusCMP0022() == cmPolicies::OLD)
+  else if (this->GetPolicyStatusCMP0022() == cmPolicies::WARN
+        || this->GetPolicyStatusCMP0022() == cmPolicies::OLD)
     // If CMP0022 is NEW then the plain tll signature sets the
     // INTERFACE_LINK_LIBRARIES, so if we get here then the project
     // cleared the property explicitly and we should not fall back
@@ -5159,7 +5159,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
       this->GetLinkImplementationLibrariesInternal(config, headTarget);
     iface.Libraries.insert(iface.Libraries.end(),
                            impl->Libraries.begin(), impl->Libraries.end());
-    if(this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
+    if(this->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
        !this->PolicyWarnedCMP0022 && !usage_requirements_only)
       {
       // Compare the link implementation fallback link interface to the
@@ -5621,7 +5621,7 @@ std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const
   if(lib != item)
     {
     cmake* cm = this->LocalGenerator->GetCMakeInstance();
-    switch(this->Target->GetPolicyStatusCMP0004())
+    switch(this->GetPolicyStatusCMP0004())
       {
       case cmPolicies::WARN:
         {
@@ -5829,7 +5829,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
           bool noMessage = false;
           cmake::MessageType messageType = cmake::FATAL_ERROR;
           std::ostringstream e;
-          switch(this->Target->GetPolicyStatusCMP0038())
+          switch(this->GetPolicyStatusCMP0038())
             {
             case cmPolicies::WARN:
               {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c65d9e0..93ddac0 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1551,7 +1551,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
         GetGlobalPropertyAsBool("TARGET_SUPPORTS_SHARED_LIBS"))
     {
     bool add_shlib_flags = false;
-    switch(tgt.Target->GetPolicyStatusCMP0065())
+    switch(tgt.GetPolicyStatusCMP0065())
       {
       case cmPolicies::WARN:
         if(!tgt.GetPropertyAsBool("ENABLE_EXPORTS") &&
@@ -2108,7 +2108,7 @@ void cmLocalGenerator
       target->GetType() != cmState::MODULE_LIBRARY &&
       !target->IsExecutableWithExports())
     {
-    switch (target->Target->GetPolicyStatusCMP0063())
+    switch (target->GetPolicyStatusCMP0063())
       {
       case cmPolicies::OLD:
         return;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25601a41cdfd2381cbfb54d2756317e96a297cd5
commit 25601a41cdfd2381cbfb54d2756317e96a297cd5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 01:05:42 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:04 2015 +0200

    cmGeneratorTarget: Copy the policy map from the cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2a35259..fc5c049 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -308,6 +308,8 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
   this->DLLPlatform = (this->Makefile->IsOn("WIN32") ||
                        this->Makefile->IsOn("CYGWIN") ||
                        this->Makefile->IsOn("MINGW"));
+
+  this->PolicyMap = t->PolicyMap;
 }
 
 cmGeneratorTarget::~cmGeneratorTarget()
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index eaec83b..2dc3a6f 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -33,6 +33,14 @@ public:
   bool IsImported() const;
   const char *GetLocation(const std::string& config) const;
 
+#define DECLARE_TARGET_POLICY(POLICY) \
+  cmPolicies::PolicyStatus GetPolicyStatus ## POLICY () const \
+    { return this->PolicyMap.Get(cmPolicies::POLICY); }
+
+  CM_FOR_EACH_TARGET_POLICY(DECLARE_TARGET_POLICY)
+
+#undef DECLARE_TARGET_POLICY
+
   /** Get the location of the target in the build tree with a placeholder
       referencing the configuration in the native build system.  This
       location is suitable for use as the LOCATION target property.  */
@@ -641,6 +649,7 @@ private:
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
   mutable std::set<cmLinkItem> UtilityItems;
+  cmPolicies::PolicyMap PolicyMap;
   mutable bool PolicyWarnedCMP0022;
   mutable bool DebugIncludesDone;
   mutable bool DebugCompileOptionsDone;
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index a549d18..5023055 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -230,6 +230,23 @@ class cmPolicy;
 #define CM_FOR_EACH_POLICY_ID(POLICY) \
   CM_FOR_EACH_POLICY_TABLE(POLICY, CM_SELECT_ID)
 
+#define CM_FOR_EACH_TARGET_POLICY(F) \
+  F(CMP0003) \
+  F(CMP0004) \
+  F(CMP0008) \
+  F(CMP0020) \
+  F(CMP0021) \
+  F(CMP0022) \
+  F(CMP0027) \
+  F(CMP0038) \
+  F(CMP0041) \
+  F(CMP0042) \
+  F(CMP0046) \
+  F(CMP0052) \
+  F(CMP0060) \
+  F(CMP0063) \
+  F(CMP0065)
+
 
 /** \class cmPolicies
  * \brief Handles changes in CMake behavior and policies
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 8a99472..e8c05da 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -26,23 +26,6 @@
 # endif
 #endif
 
-#define CM_FOR_EACH_TARGET_POLICY(F) \
-  F(CMP0003) \
-  F(CMP0004) \
-  F(CMP0008) \
-  F(CMP0020) \
-  F(CMP0021) \
-  F(CMP0022) \
-  F(CMP0027) \
-  F(CMP0038) \
-  F(CMP0041) \
-  F(CMP0042) \
-  F(CMP0046) \
-  F(CMP0052) \
-  F(CMP0060) \
-  F(CMP0063) \
-  F(CMP0065)
-
 class cmake;
 class cmMakefile;
 class cmSourceFile;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2388d660afbce79a91468546cdd561c32a264086
commit 2388d660afbce79a91468546cdd561c32a264086
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 01:01:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:04 2015 +0200

    cmTarget: Remove unused NameResolvesToFramework.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0d8c57d..e056469 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -611,13 +611,6 @@ void cmTarget::ClearDependencyInformation( cmMakefile& mf,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::NameResolvesToFramework(const std::string& libname) const
-{
-  return this->Makefile->GetGlobalGenerator()->
-    NameResolvesToFramework(libname);
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
                                   cmTargetLinkLibraryType llt) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 9ed7f84..8a99472 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -145,8 +145,6 @@ public:
    */
   void ClearDependencyInformation(cmMakefile& mf, const std::string& target);
 
-  // Check to see if a library is a framework and treat it different on Mac
-  bool NameResolvesToFramework(const std::string& libname) const;
   void AddLinkLibrary(cmMakefile& mf,
                       const std::string& target, const std::string& lib,
                       cmTargetLinkLibraryType llt);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d946486ef25927b8ececefda8fc2fdb2046bcad
commit 0d946486ef25927b8ececefda8fc2fdb2046bcad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 01:01:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:04 2015 +0200

    cmCommonTargetGenerator: Use NameResolvesToFramework without cmTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 1982bba..6920faf 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -265,7 +265,7 @@ std::string cmCommonTargetGenerator::GetFrameworkFlags(std::string const& l)
   for(std::vector<std::string>::iterator i = includes.begin();
       i != includes.end(); ++i)
     {
-    if(this->Target->NameResolvesToFramework(*i))
+    if(this->GlobalGenerator->NameResolvesToFramework(*i))
       {
       std::string frameworkDir = *i;
       frameworkDir += "/../";

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4cd731d0518276fdc8e1a51885044d600a0293b
commit e4cd731d0518276fdc8e1a51885044d600a0293b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 00:57:35 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:03 2015 +0200

    Move ComputeLinkType out of cmTarget.
    
    Keep it out of the way, so that it does not become part of cmGeneratorTarget,
    but where it can be used to implement CMP0003.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 465db92..13098ad 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -185,7 +185,9 @@ cmComputeLinkDepends
   // The configuration being linked.
   this->HasConfig = !config.empty();
   this->Config = (this->HasConfig)? config : std::string();
-  this->LinkType = this->Target->Target->ComputeLinkType(this->Config);
+  std::vector<std::string> debugConfigs =
+    this->Makefile->GetCMakeInstance()->GetDebugConfigs();
+  this->LinkType = CMP0003_ComputeLinkType(this->Config, debugConfigs);
 
   // Enable debug mode if requested.
   this->DebugMode = this->Makefile->IsOn("CMAKE_LINK_DEPENDS_DEBUG_MODE");
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6e312ce..2a35259 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5877,7 +5877,12 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
                                 this->MaxLanguageStandards);
     }
 
-  cmTargetLinkLibraryType linkType = this->Target->ComputeLinkType(config);
+  // Get the list of configurations considered to be DEBUG.
+  std::vector<std::string> debugConfigs =
+    this->Makefile->GetCMakeInstance()->GetDebugConfigs();
+
+  cmTargetLinkLibraryType linkType =
+      CMP0003_ComputeLinkType(config, debugConfigs);
   cmTarget::LinkLibraryVectorType const& oldllibs =
     this->Target->GetOriginalLinkLibraries();
   for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index b875cc0..b603bcc 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -14,6 +14,7 @@
 #define cmLinkItem_h
 
 #include "cmListFileCache.h"
+#include "cmSystemTools.h"
 
 class cmGeneratorTarget;
 
@@ -118,4 +119,27 @@ struct cmOptionalLinkImplementation: public cmLinkImplementation
   bool HadHeadSensitiveCondition;
 };
 
+/** Compute the link type to use for the given configuration.  */
+inline cmTargetLinkLibraryType
+CMP0003_ComputeLinkType(const std::string& config,
+                        std::vector<std::string> const& debugConfigs)
+{
+  // No configuration is always optimized.
+  if(config.empty())
+    {
+    return OPTIMIZED_LibraryType;
+    }
+
+  // Check if any entry in the list matches this configuration.
+  std::string configUpper = cmSystemTools::UpperCase(config);
+  if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
+      debugConfigs.end())
+    {
+    return DEBUG_LibraryType;
+    }
+  // The current configuration is not a debug configuration.
+  return OPTIMIZED_LibraryType;
+}
+
+
 #endif
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 63d3d07..0d8c57d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -583,31 +583,6 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories() const
 }
 
 //----------------------------------------------------------------------------
-cmTargetLinkLibraryType cmTarget::ComputeLinkType(
-                                      const std::string& config) const
-{
-  // No configuration is always optimized.
-  if(config.empty())
-    {
-    return OPTIMIZED_LibraryType;
-    }
-
-  // Get the list of configurations considered to be DEBUG.
-  std::vector<std::string> debugConfigs =
-    this->Makefile->GetCMakeInstance()->GetDebugConfigs();
-
-  // Check if any entry in the list matches this configuration.
-  std::string configUpper = cmSystemTools::UpperCase(config);
-  if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
-      debugConfigs.end())
-    {
-    return DEBUG_LibraryType;
-    }
-  // The current configuration is not a debug configuration.
-  return OPTIMIZED_LibraryType;
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::ClearDependencyInformation( cmMakefile& mf,
                                            const std::string& target )
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 33631e7..9ed7f84 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -140,9 +140,6 @@ public:
   const LinkLibraryVectorType &GetOriginalLinkLibraries() const
     {return this->OriginalLinkLibraries;}
 
-  /** Compute the link type to use for the given configuration.  */
-  cmTargetLinkLibraryType ComputeLinkType(const std::string& config) const;
-
   /**
    * Clear the dependency information recorded for this target, if any.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9423b618c7c8e70e7f2b27adff57dd9dbe4bf94
commit d9423b618c7c8e70e7f2b27adff57dd9dbe4bf94
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 00:44:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:03 2015 +0200

    cmGeneratorTarget: Move IsDLLPlatform from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 1a878e2..7a7e4ff 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1579,7 +1579,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactSonameTag>
                             const GeneratorExpressionContent *content)
   {
     // The target soname file (.so.1).
-    if(target->Target->IsDLLPlatform())
+    if(target->IsDLLPlatform())
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_SONAME_FILE is not allowed "
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1483af7..6e312ce 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -304,6 +304,10 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
         t->GetSourceEntries(),
         t->GetSourceBacktraces(),
         this->SourceEntries, true);
+
+  this->DLLPlatform = (this->Makefile->IsOn("WIN32") ||
+                       this->Makefile->IsOn("CYGWIN") ||
+                       this->Makefile->IsOn("MINGW"));
 }
 
 cmGeneratorTarget::~cmGeneratorTarget()
@@ -366,7 +370,7 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
   switch(this->GetType())
     {
     case cmState::SHARED_LIBRARY:
-      if(this->Target->IsDLLPlatform())
+      if(this->IsDLLPlatform())
         {
         if(implib)
           {
@@ -2058,6 +2062,11 @@ cmGeneratorTarget::GetModuleDefinitionFile(const std::string& config) const
   return data;
 }
 
+bool cmGeneratorTarget::IsDLLPlatform() const
+{
+  return this->DLLPlatform;
+}
+
 //----------------------------------------------------------------------------
 void
 cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs,
@@ -5964,7 +5973,7 @@ bool cmGeneratorTarget::IsExecutableWithExports() const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasImportLibrary() const
 {
-  return (this->Target->IsDLLPlatform() &&
+  return (this->IsDLLPlatform() &&
           (this->GetType() == cmState::SHARED_LIBRARY ||
            this->IsExecutableWithExports()));
 }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 26b229d..eaec83b 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -196,6 +196,9 @@ public:
 
   std::string GetModuleDefinitionFile(const std::string& config) const;
 
+  /** Return whether or not the target is for a DLL platform.  */
+  bool IsDLLPlatform() const;
+
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 
@@ -646,6 +649,7 @@ private:
   mutable bool DebugSourcesDone;
   mutable bool LinkImplementationLanguageIsContextDependent;
   mutable bool UtilityItemsDone;
+  bool DLLPlatform;
 
   bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
                            std::string& out) const;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 26f0d63..33631e7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -224,9 +224,6 @@ public:
       enabled.  */
   bool IsExecutableWithExports() const;
 
-  /** Return whether or not the target is for a DLL platform.  */
-  bool IsDLLPlatform() const { return this->DLLPlatform; }
-
   /** Return whether this target is a shared library Framework on
       Apple.  */
   bool IsFrameworkOnApple() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=056af502257c68f6670313d65c96c80341af0110
commit 056af502257c68f6670313d65c96c80341af0110
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 00:42:01 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:03 2015 +0200

    cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f41243e..1483af7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1709,6 +1709,16 @@ cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const
 }
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
+{
+  return
+    this->GetType() == cmState::STATIC_LIBRARY ||
+    this->GetType() == cmState::SHARED_LIBRARY ||
+    this->GetType() == cmState::MODULE_LIBRARY ||
+    this->GetType() == cmState::EXECUTABLE;
+}
+
+//----------------------------------------------------------------------------
 const char* cmGeneratorTarget::GetExportMacro() const
 {
   // Define the symbol for targets that export symbols.
@@ -4819,7 +4829,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     }
 
   // Only libraries and executables have well-defined output files.
-  if(!this->Target->HaveWellDefinedOutputFiles())
+  if(!this->HaveWellDefinedOutputFiles())
     {
     std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
     msg += this->GetName();
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index b32bfd9..26b229d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -196,6 +196,9 @@ public:
 
   std::string GetModuleDefinitionFile(const std::string& config) const;
 
+  /** @return whether this target have a well defined output file name. */
+  bool HaveWellDefinedOutputFiles() const;
+
   /** Link information from the transitive closure of the link
       implementation and the interfaces of its dependencies.  */
   struct LinkClosure
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 490759f..e9dc433 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -34,7 +34,7 @@ cmOSXBundleGenerator(cmGeneratorTarget* target,
 //----------------------------------------------------------------------------
 bool cmOSXBundleGenerator::MustSkip()
 {
-  return !this->GT->Target->HaveWellDefinedOutputFiles();
+  return !this->GT->HaveWellDefinedOutputFiles();
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 58dea03..63d3d07 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1560,16 +1560,6 @@ void cmTarget::MarkAsImported()
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HaveWellDefinedOutputFiles() const
-{
-  return
-    this->GetType() == cmState::STATIC_LIBRARY ||
-    this->GetType() == cmState::SHARED_LIBRARY ||
-    this->GetType() == cmState::MODULE_LIBRARY ||
-    this->GetType() == cmState::EXECUTABLE;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const
 {
   if (this->IsImported())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 865bc8d..26f0d63 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -241,9 +241,6 @@ public:
   /** Get a backtrace from the creation of the target.  */
   cmListFileBacktrace const& GetBacktrace() const;
 
-  /** @return whether this target have a well defined output file name. */
-  bool HaveWellDefinedOutputFiles() const;
-
   void InsertInclude(std::string const& entry,
                      cmListFileBacktrace const& bt,
                      bool before = false);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4991893050f0611d3593dad84c2d8b72326b015
commit a4991893050f0611d3593dad84c2d8b72326b015
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 22:42:01 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:03 2015 +0200

    cmGeneratorTarget: Move GetExportMacro from cmTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 41af89b..1982bba 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -349,7 +349,8 @@ std::string cmCommonTargetGenerator::GetDefines(const std::string &l)
     std::set<std::string> defines;
     const char *lang = l.c_str();
     // Add the export symbol definition for shared library objects.
-    if(const char* exportMacro = this->Target->GetExportMacro())
+    if(const char* exportMacro =
+       this->GeneratorTarget->GetExportMacro())
       {
       this->LocalGenerator->AppendDefines(defines, exportMacro);
       }
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index a6b14ba..ac0202b 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -427,7 +427,7 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
   const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->Target->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     lg->AppendDefines(defines, exportMacro);
     }
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 0a1a364..f41243e 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1709,6 +1709,32 @@ cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const
 }
 
 //----------------------------------------------------------------------------
+const char* cmGeneratorTarget::GetExportMacro() const
+{
+  // Define the symbol for targets that export symbols.
+  if(this->GetType() == cmState::SHARED_LIBRARY ||
+     this->GetType() == cmState::MODULE_LIBRARY ||
+     this->IsExecutableWithExports())
+    {
+    if(const char* custom_export_name = this->GetProperty("DEFINE_SYMBOL"))
+      {
+      this->ExportMacro = custom_export_name;
+      }
+    else
+      {
+      std::string in = this->GetName();
+      in += "_EXPORTS";
+      this->ExportMacro = cmSystemTools::MakeCidentifier(in);
+      }
+    return this->ExportMacro.c_str();
+    }
+  else
+    {
+    return 0;
+    }
+}
+
+//----------------------------------------------------------------------------
 class cmTargetCollectLinkLanguages
 {
 public:
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 9533f43..b32bfd9 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -168,6 +168,10 @@ public:
 
   cmListFileBacktrace GetBacktrace() const;
 
+  /** Get the macro to define when building sources in this target.
+      If no macro should be defined null is returned.  */
+  const char* GetExportMacro() const;
+
   /** Get the soname of the target.  Allowed only for a shared library.  */
   std::string GetSOName(const std::string& config) const;
 
@@ -487,6 +491,8 @@ private:
   std::set<cmSourceFile const*> ExplicitObjectName;
   mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache;
 
+  mutable std::string ExportMacro;
+
   void ConstructSourceFileFlags() const;
   mutable bool SourceFileFlagsConstructed;
   mutable std::map<cmSourceFile const*, SourceFileFlags> SourceFlagsMap;
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 019cdd1..01e6f8c 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -297,7 +297,7 @@ std::string cmGhsMultiTargetGenerator::GetDefines(const std::string &language,
     std::set<std::string> defines;
     const char *lang = language.c_str();
     // Add the export symbol definition for shared library objects.
-    if (const char *exportMacro = this->Target->GetExportMacro())
+    if (const char *exportMacro = this->GeneratorTarget->GetExportMacro())
       {
       this->LocalGenerator->AppendDefines(defines, exportMacro);
       }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index ea1b1a0..35f6a58 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1848,7 +1848,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->AppendDefines(ppDefs,
       "CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"");
     }
-  if(const char* exportMacro = target.GetExportMacro())
+  if(const char* exportMacro = gtgt->GetExportMacro())
     {
     // Add the export symbol definition for shared library objects.
     this->AppendDefines(ppDefs, exportMacro);
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index f40e6dd..314d9bf 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1543,7 +1543,7 @@ void cmLocalVisualStudio6Generator
 
   // Add the export symbol definition for shared library objects.
   std::string exportSymbol;
-  if(const char* exportMacro = target.GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     exportSymbol = exportMacro;
     }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 485ac31..5e76f8a 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -777,7 +777,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target.GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     targetOptions.AddDefine(exportMacro);
     }
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f663678..58dea03 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2109,32 +2109,6 @@ std::string cmTarget::GetFrameworkVersion() const
     }
 }
 
-//----------------------------------------------------------------------------
-const char* cmTarget::GetExportMacro() const
-{
-  // Define the symbol for targets that export symbols.
-  if(this->GetType() == cmState::SHARED_LIBRARY ||
-     this->GetType() == cmState::MODULE_LIBRARY ||
-     this->IsExecutableWithExports())
-    {
-    if(const char* custom_export_name = this->GetProperty("DEFINE_SYMBOL"))
-      {
-      this->ExportMacro = custom_export_name;
-      }
-    else
-      {
-      std::string in = this->GetName();
-      in += "_EXPORTS";
-      this->ExportMacro = cmSystemTools::MakeCindentifier(in);
-      }
-    return this->ExportMacro.c_str();
-    }
-  else
-    {
-    return 0;
-    }
-}
-
 bool cmTarget::GetMappedConfig(std::string const& desired_config,
                                const char** loc,
                                const char** imp,
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 0e966e9..865bc8d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -220,10 +220,6 @@ public:
                        const char** imp,
                        std::string& suffix) const;
 
-  /** Get the macro to define when building sources in this target.
-      If no macro should be defined null is returned.  */
-  const char* GetExportMacro() const;
-
   /** Return whether this target is an executable with symbol exports
       enabled.  */
   bool IsExecutableWithExports() const;
@@ -369,7 +365,6 @@ private:
   std::string Name;
   std::string InstallPath;
   std::string RuntimeInstallPath;
-  mutable std::string ExportMacro;
   std::vector<std::string> LinkDirectories;
   std::vector<cmCustomCommand> PreBuildCommands;
   std::vector<cmCustomCommand> PreLinkCommands;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2cbd306..f4c632d 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1961,7 +1961,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   configDefine += configName;
   configDefine += "\"";
   clOptions.AddDefine(configDefine);
-  if(const char* exportMacro = this->Target->GetExportMacro())
+  if(const char* exportMacro =
+          this->GeneratorTarget->GetExportMacro())
     {
     clOptions.AddDefine(exportMacro);
     }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=215cd21a0238ba00aec7c81014fe83e3d47187a6
commit 215cd21a0238ba00aec7c81014fe83e3d47187a6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 22:39:08 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:03 2015 +0200

    cmGeneratorTarget: Provide direct access to the backtrace.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 6ca15a3..eca0f66 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -571,7 +571,7 @@ bool cmComputeLinkInformation::Compute()
       "name."
       ;
     this->CMakeInstance->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
-                                      this->Target->Target->GetBacktrace());
+                                      this->Target->GetBacktrace());
     }
 
   return true;
@@ -1548,7 +1548,7 @@ void cmComputeLinkInformation::HandleBadFullItem(std::string const& item,
           << "  " << item << "\n"
           << "which is a full-path but not a valid library file name.";
         this->CMakeInstance->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
-                                        this->Target->Target->GetBacktrace());
+                                        this->Target->GetBacktrace());
         }
       }
     case cmPolicies::OLD:
@@ -1566,7 +1566,7 @@ void cmComputeLinkInformation::HandleBadFullItem(std::string const& item,
           << "  " << item << "\n"
           << "which is a full-path but not a valid library file name.";
       this->CMakeInstance->IssueMessage(cmake::FATAL_ERROR, e.str(),
-                                        this->Target->Target->GetBacktrace());
+                                        this->Target->GetBacktrace());
       }
       break;
     }
@@ -1594,7 +1594,7 @@ bool cmComputeLinkInformation::FinishLinkerSearchDirectories()
         std::ostringstream w;
         this->PrintLinkPolicyDiagnosis(w);
         this->CMakeInstance->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
-                                        this->Target->Target->GetBacktrace());
+                                        this->Target->GetBacktrace());
         }
     case cmPolicies::OLD:
       // OLD behavior is to add the paths containing libraries with
@@ -1610,7 +1610,7 @@ bool cmComputeLinkInformation::FinishLinkerSearchDirectories()
       e << cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0003) << "\n";
       this->PrintLinkPolicyDiagnosis(e);
       this->CMakeInstance->IssueMessage(cmake::FATAL_ERROR, e.str(),
-                                        this->Target->Target->GetBacktrace());
+                                        this->Target->GetBacktrace());
       return false;
       }
     }
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 3541922..2ae8084 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -245,7 +245,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
             ->IssueMessage(cmake::FATAL_ERROR,
                             "Only executables and non-OBJECT libraries may "
                             "reference target objects.",
-                            depender->Target->GetBacktrace());
+                            depender->GetBacktrace());
           return;
           }
         const_cast<cmGeneratorTarget*>(depender)->Target->AddUtility(objLib);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c68b84a..0a1a364 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -62,7 +62,7 @@ void reportBadObjLib(std::vector<cmSourceFile*> const& badObjLib,
     e << "but may contain only sources that compile, header files, and "
          "other files that would not affect linking of a normal library.";
     cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
-                     target->Target->GetBacktrace());
+                     target->GetBacktrace());
     }
 }
 
@@ -483,7 +483,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
           ->IssueMessage(
       cmake::FATAL_ERROR,
       "Target '" + this->GetName() + "' OUTPUT_NAME depends on itself.",
-      this->Target->GetBacktrace());
+      this->GetBacktrace());
     }
   return i->second;
 }
@@ -1007,7 +1007,7 @@ static bool processSources(cmGeneratorTarget const* tgt,
           {
           cmake* cm = tgt->GetLocalGenerator()->GetCMakeInstance();
           cm->IssueMessage(cmake::FATAL_ERROR, e,
-                          tgt->Target->GetBacktrace());
+                          tgt->GetBacktrace());
           }
         return contextDependent;
         }
@@ -1471,7 +1471,7 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
     w << " corrupt.";
     cmake* cm = this->LocalGenerator->GetCMakeInstance();
     cm->IssueMessage(cmake::FATAL_ERROR, w.str(),
-                     this->Target->GetBacktrace());
+                     this->GetBacktrace());
     }
 
   return true;
@@ -1703,6 +1703,11 @@ std::string cmGeneratorTarget::GetInstallNameDirForInstallTree() const
     }
 }
 
+cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const
+{
+  return this->Target->GetBacktrace();
+}
+
 //----------------------------------------------------------------------------
 class cmTargetCollectLinkLanguages
 {
@@ -1749,7 +1754,7 @@ public:
             "call is missing for an IMPORTED target, or an ALIAS target is "
             "missing?";
           this->Target->GetLocalGenerator()->GetCMakeInstance()->IssueMessage(
-            messageType, e.str(), this->Target->Target->GetBacktrace());
+            messageType, e.str(), this->Target->GetBacktrace());
           }
         }
       return;
@@ -1846,7 +1851,7 @@ public:
       e << "Set the LINKER_LANGUAGE property for this target.";
       cmake* cm = this->Target->GetLocalGenerator()->GetCMakeInstance();
       cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
-                       this->Target->Target->GetBacktrace());
+                       this->Target->GetBacktrace());
       }
     return *this->Preferred.begin();
     }
@@ -4831,7 +4836,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     this->LocalGenerator->GetCMakeInstance()->IssueMessage(
       cmake::FATAL_ERROR,
       "Target '" + this->GetName() + "' OUTPUT_DIRECTORY depends on itself.",
-      this->Target->GetBacktrace());
+      this->GetBacktrace());
     return 0;
     }
   return &i->second;
@@ -5578,7 +5583,7 @@ std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const
           << "Target \"" << this->GetName() << "\" links to item \""
           << item << "\" which has leading or trailing whitespace.";
         cm->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
-                         this->Target->GetBacktrace());
+                         this->GetBacktrace());
         }
       case cmPolicies::OLD:
         break;
@@ -5589,7 +5594,7 @@ std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const
           << item << "\" which has leading or trailing whitespace.  "
           << "This is now an error according to policy CMP0004.";
         cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
-                         this->Target->GetBacktrace());
+                         this->GetBacktrace());
         }
         break;
       case cmPolicies::REQUIRED_IF_USED:
@@ -5600,7 +5605,7 @@ std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const
           << "Target \"" << this->GetName() << "\" links to item \""
           << item << "\" which has leading or trailing whitespace.";
         cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
-                         this->Target->GetBacktrace());
+                         this->GetBacktrace());
         }
         break;
       }
@@ -5798,7 +5803,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
             {
             e << "Target \"" << this->GetName() << "\" links to itself.";
             this->LocalGenerator->GetCMakeInstance()->IssueMessage(
-              messageType, e.str(), this->Target->GetBacktrace());
+              messageType, e.str(), this->GetBacktrace());
             if (messageType == cmake::FATAL_ERROR)
               {
               return;
@@ -5873,7 +5878,7 @@ cmGeneratorTarget::FindTargetToLink(std::string const& name) const
       "with the ENABLE_EXPORTS property set.";
     cmake* cm = this->LocalGenerator->GetCMakeInstance();
     cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
-                     this->Target->GetBacktrace());
+                     this->GetBacktrace());
     tgt = 0;
     }
 
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index a6b7f6e..9533f43 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -166,6 +166,8 @@ public:
     * install tree.  For example: "\@rpath/" or "\@loader_path/". */
   std::string GetInstallNameDirForInstallTree() const;
 
+  cmListFileBacktrace GetBacktrace() const;
+
   /** Get the soname of the target.  Allowed only for a shared library.  */
   std::string GetSOName(const std::string& config) const;
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index deda88e..c65d9e0 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1982,7 +1982,7 @@ AddCompilerRequirementFlag(std::string &flags,
     std::string e =
       lang + "_STANDARD is set to invalid value '" + standard + "'";
     this->GetGlobalGenerator()->GetCMakeInstance()
-      ->IssueMessage(cmake::FATAL_ERROR, e, target->Target->GetBacktrace());
+      ->IssueMessage(cmake::FATAL_ERROR, e, target->GetBacktrace());
     return;
     }
 
@@ -2141,7 +2141,7 @@ void cmLocalGenerator
       "For compatibility CMake is not honoring them for this target.";
     target->Target->GetMakefile()->GetCMakeInstance()
       ->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
-                     target->Target->GetBacktrace());
+                     target->GetBacktrace());
     }
 }
 
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 35ee127..e3eedc7 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -555,7 +555,7 @@ void cmOrderDirectories::FindImplicitConflicts()
     << "Some of these libraries may not be found correctly.";
   this->GlobalGenerator->GetCMakeInstance()
     ->IssueMessage(cmake::WARNING, w.str(),
-                   this->Target->Target->GetBacktrace());
+                   this->Target->GetBacktrace());
 }
 
 //----------------------------------------------------------------------------
@@ -637,5 +637,5 @@ void cmOrderDirectories::DiagnoseCycle()
   e << "Some of these libraries may not be found correctly.";
   this->GlobalGenerator->GetCMakeInstance()
     ->IssueMessage(cmake::WARNING, e.str(),
-                   this->Target->Target->GetBacktrace());
+                   this->Target->GetBacktrace());
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1df8bd3ab0f6621b90a8801c1d10cfc94c74ff96
commit 1df8bd3ab0f6621b90a8801c1d10cfc94c74ff96
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 00:41:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:37:01 2015 +0200

    cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1142ddd..08ad2ef 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2704,13 +2704,13 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
     for (cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
       {
       cmTarget* target = &l->second;
-      if(this->IsRootOnlyTarget(target) &&
+      cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
+      if(this->IsRootOnlyTarget(gt) &&
          target->GetMakefile() != root->GetMakefile())
         {
         continue;
         }
       // put the target in the set of original targets
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
       originalTargets.insert(gt);
       // Get the set of targets that depend on target
       this->AddTargetDepends(gt, projectTargets);
@@ -2719,7 +2719,7 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
 }
 
 //----------------------------------------------------------------------------
-bool cmGlobalGenerator::IsRootOnlyTarget(cmTarget* target) const
+bool cmGlobalGenerator::IsRootOnlyTarget(cmGeneratorTarget* target) const
 {
   return (target->GetType() == cmState::GLOBAL_TARGET ||
           target->GetName() == this->GetAllTargetName());
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 4e6b11d..c59d42d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -376,7 +376,7 @@ protected:
   void GetTargetSets(TargetDependSet& projectTargets,
                              TargetDependSet& originalTargets,
                              cmLocalGenerator* root, GeneratorVector const&);
-  bool IsRootOnlyTarget(cmTarget* target) const;
+  bool IsRootOnlyTarget(cmGeneratorTarget* target) const;
   void AddTargetDepends(const cmGeneratorTarget* target,
                         TargetDependSet& projectTargets);
   void SetLanguageEnabledFlag(const std::string& l, cmMakefile* mf);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83703bda7d1017e1f75ec1b92d672d5ef17194d5
commit 83703bda7d1017e1f75ec1b92d672d5ef17194d5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 00:34:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:36:09 2015 +0200

    cmGeneratorTarget: Copy IsExecutableWithExports from cmTarget.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 2497f82..6ca15a3 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -635,7 +635,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,
 {
   // Compute the proper name to use to link this library.
   const std::string& config = this->Config;
-  bool impexe = (tgt && tgt->Target->IsExecutableWithExports());
+  bool impexe = (tgt && tgt->IsExecutableWithExports());
   if(impexe && !this->UseImportLibrary && !this->LoaderFlag)
     {
     // Skip linking to executables on platforms with no import
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index a5a1f29..3541922 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -325,7 +325,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,
   // within the project.
   if(dependee &&
      dependee->GetType() == cmState::EXECUTABLE &&
-     !dependee->Target->IsExecutableWithExports())
+     !dependee->IsExecutableWithExports())
     {
     dependee = 0;
     }
@@ -401,7 +401,7 @@ void cmComputeTargetDepends::AddTargetDepend(
   // within the project.
   if(linking && dependee &&
      dependee->GetType() == cmState::EXECUTABLE &&
-     !dependee->Target->IsExecutableWithExports())
+     !dependee->IsExecutableWithExports())
     {
     dependee = 0;
     }
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 3af7b71..be65a19 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -220,7 +220,7 @@ cmExportBuildFileGenerator
   // Add the import library for windows DLLs.
   if(dll_platform &&
      (target->GetType() == cmState::SHARED_LIBRARY ||
-      target->Target->IsExecutableWithExports()) &&
+      target->IsExecutableWithExports()) &&
      mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX"))
     {
     std::string prop = "IMPORTED_IMPLIB";
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 5177ec8..c542f85 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1075,7 +1075,7 @@ cmExportFileGenerator
     }
 
   // Mark the imported executable if it has exports.
-  if(target->Target->IsExecutableWithExports())
+  if(target->IsExecutableWithExports())
     {
     os << "set_property(TARGET " << targetName
        << " PROPERTY ENABLE_EXPORTS 1)\n";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b2959fe..c68b84a 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4571,7 +4571,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config,
   // Link interfaces are not supported for executables that do not
   // export symbols.
   if(this->GetType() == cmState::EXECUTABLE &&
-     !this->Target->IsExecutableWithExports())
+     !this->IsExecutableWithExports())
     {
     return 0;
     }
@@ -4720,7 +4720,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config,
   // Link interfaces are not supported for executables that do not
   // export symbols.
   if(this->GetType() == cmState::EXECUTABLE &&
-     !this->Target->IsExecutableWithExports())
+     !this->IsExecutableWithExports())
     {
     return 0;
     }
@@ -5031,7 +5031,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     explicitLibraries = this->GetProperty(linkIfaceProp);
     }
   else if(this->GetType() == cmState::SHARED_LIBRARY ||
-          this->Target->IsExecutableWithExports())
+          this->IsExecutableWithExports())
     {
     // CMP0022 OLD behavior is to use LINK_INTERFACE_LIBRARIES if set on a
     // shared lib or executable.
@@ -5350,7 +5350,7 @@ void cmGeneratorTarget::ComputeImportInfo(std::string const& desired_config,
     info.ImportLibrary = imp;
     }
   else if(this->GetType() == cmState::SHARED_LIBRARY ||
-          this->Target->IsExecutableWithExports())
+          this->IsExecutableWithExports())
     {
     std::string impProp = "IMPORTED_IMPLIB";
     impProp += suffix;
@@ -5858,7 +5858,7 @@ cmGeneratorTarget::FindTargetToLink(std::string const& name) const
   // name conflict between an external library and an executable
   // within the project.
   if(tgt && tgt->GetType() == cmState::EXECUTABLE &&
-     !tgt->Target->IsExecutableWithExports())
+     !tgt->IsExecutableWithExports())
     {
     tgt = 0;
     }
@@ -5914,11 +5914,18 @@ bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName,
 }
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::IsExecutableWithExports() const
+{
+  return (this->GetType() == cmState::EXECUTABLE &&
+          this->GetPropertyAsBool("ENABLE_EXPORTS"));
+}
+
+//----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasImportLibrary() const
 {
   return (this->Target->IsDLLPlatform() &&
           (this->GetType() == cmState::SHARED_LIBRARY ||
-           this->Target->IsExecutableWithExports()));
+           this->IsExecutableWithExports()));
 }
 
 //----------------------------------------------------------------------------
@@ -5944,7 +5951,7 @@ bool cmGeneratorTarget::IsLinkable() const
           this->GetType() == cmState::MODULE_LIBRARY ||
           this->GetType() == cmState::UNKNOWN_LIBRARY ||
           this->GetType() == cmState::INTERFACE_LIBRARY ||
-          this->Target->IsExecutableWithExports());
+          this->IsExecutableWithExports());
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 6537421..a6b7f6e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -406,6 +406,8 @@ public:
   bool GetImplibGNUtoMS(std::string const& gnuName, std::string& out,
                         const char* newExt = 0) const;
 
+  bool IsExecutableWithExports() const;
+
   /** Return whether or not the target has a DLL import library.  */
   bool HasImportLibrary() const;
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9d5dd8e..deda88e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1444,7 +1444,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
           this->Makefile->GetSafeDefinition("CMAKE_CREATE_CONSOLE_EXE");
         linkFlags += " ";
         }
-      if (target->Target->IsExecutableWithExports())
+      if (target->IsExecutableWithExports())
         {
         std::string exportFlagVar = "CMAKE_EXE_EXPORTS_";
         exportFlagVar += linkLanguage;
@@ -2106,7 +2106,7 @@ void cmLocalGenerator
   std::string *pWarnCMP0063 = 0;
   if (target->GetType() != cmState::SHARED_LIBRARY &&
       target->GetType() != cmState::MODULE_LIBRARY &&
-      !target->Target->IsExecutableWithExports())
+      !target->IsExecutableWithExports())
     {
     switch (target->Target->GetPolicyStatusCMP0063())
       {
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 31fb37b..020e64c 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -209,7 +209,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     }
 
   // Add symbol export flags if necessary.
-  if(this->Target->IsExecutableWithExports())
+  if(this->GeneratorTarget->IsExecutableWithExports())
     {
     std::string export_flag_var = "CMAKE_EXE_EXPORTS_";
     export_flag_var += linkLanguage;
@@ -297,7 +297,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   std::string linkRule = this->GetLinkRule(linkRuleVar);
   std::vector<std::string> commands1;
   cmSystemTools::ExpandListArgument(linkRule, real_link_commands);
-  if(this->Target->IsExecutableWithExports())
+  if(this->GeneratorTarget->IsExecutableWithExports())
     {
     // If a separate rule for creating an import library is specified
     // add it now.

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |    5 +-
 Source/cmComputeLinkDepends.cxx                |    4 +-
 Source/cmComputeLinkInformation.cxx            |   22 ++--
 Source/cmComputeTargetDepends.cxx              |    8 +-
 Source/cmExportBuildFileGenerator.cxx          |    6 +-
 Source/cmExportFileGenerator.cxx               |   12 +--
 Source/cmExportInstallFileGenerator.cxx        |    4 +-
 Source/cmExtraSublimeTextGenerator.cxx         |    2 +-
 Source/cmGeneratorExpressionNode.cxx           |    2 +-
 Source/cmGeneratorTarget.cxx                   |  136 +++++++++++++++++-------
 Source/cmGeneratorTarget.h                     |   26 +++++
 Source/cmGhsMultiTargetGenerator.cxx           |    2 +-
 Source/cmGlobalGenerator.cxx                   |    6 +-
 Source/cmGlobalGenerator.h                     |    2 +-
 Source/cmGlobalXCodeGenerator.cxx              |    2 +-
 Source/cmLinkItem.h                            |   24 +++++
 Source/cmLocalGenerator.cxx                    |   12 +--
 Source/cmLocalVisualStudio6Generator.cxx       |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx       |    2 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    4 +-
 Source/cmOSXBundleGenerator.cxx                |    2 +-
 Source/cmOrderDirectories.cxx                  |    4 +-
 Source/cmPolicies.h                            |   17 +++
 Source/cmTarget.cxx                            |   68 ------------
 Source/cmTarget.h                              |   33 ------
 Source/cmVisualStudio10TargetGenerator.cxx     |    3 +-
 26 files changed, 221 insertions(+), 189 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 18:53:08 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 18:53:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-767-gd06f93a
Message-ID: <20151020225308.3B44EC0329@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d06f93ac425f3fc61720fb2752111457e4b56431 (commit)
       via  876808594963e8b4547e415aaa755cb115eb1bed (commit)
      from  9407f9732a9c7b32b5689094cbd29a3a74a0d6a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d06f93ac425f3fc61720fb2752111457e4b56431
commit d06f93ac425f3fc61720fb2752111457e4b56431
Merge: 9407f97 8768085
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 18:53:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 18:53:07 2015 -0400

    Merge topic 'use-generator-target' into next
    
    87680859 fixup! cmGeneratorTarget: Move GetExportMacro from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=876808594963e8b4547e415aaa755cb115eb1bed
commit 876808594963e8b4547e415aaa755cb115eb1bed
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 00:51:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:51:57 2015 +0200

    fixup! cmGeneratorTarget: Move GetExportMacro from cmTarget.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 314d9bf..a51eb67 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1543,7 +1543,7 @@ void cmLocalVisualStudio6Generator
 
   // Add the export symbol definition for shared library objects.
   std::string exportSymbol;
-  if(const char* exportMacro = target->GetExportMacro())
+  if(const char* exportMacro = gt->GetExportMacro())
     {
     exportSymbol = exportMacro;
     }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5e76f8a..819998c 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -777,7 +777,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->GetExportMacro())
+  if(const char* exportMacro = gt->GetExportMacro())
     {
     targetOptions.AddDefine(exportMacro);
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 18:53:38 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 18:53:38 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-776-gedb7311
Message-ID: <20151020225338.418D6C0383@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  edb731113d63696ae691dfca207c2155129ff27c (commit)
       via  c099e00fc0a9c47a2addaca145952b1c33195fab (commit)
       via  d74bca5a8fee1d45c60b60a70a2a1a90abb74180 (commit)
       via  c6e86955086e1824cd666bc69c802d48074cc138 (commit)
       via  18046bd50a502508f170baa6cec5c81efb33f180 (commit)
       via  91411641a7b8029d05899b11590fb4e676716a85 (commit)
       via  6d94078e623d5f1316f1972ffda06ac1d66b6f2f (commit)
       via  3ebc62850c7461dca4723b063b5e5f019409db84 (commit)
       via  311018e5ad27abf7c76003ec91d3f26ef316e3cc (commit)
      from  d06f93ac425f3fc61720fb2752111457e4b56431 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edb731113d63696ae691dfca207c2155129ff27c
commit edb731113d63696ae691dfca207c2155129ff27c
Merge: d06f93a c099e00
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 18:53:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 18:53:36 2015 -0400

    Merge topic 'use-generator-target' into next
    
    c099e00f Access policy status from cmGeneratorTarget at generate time.
    d74bca5a cmGeneratorTarget: Copy the policy map from the cmTarget.
    c6e86955 cmTarget: Remove unused NameResolvesToFramework.
    18046bd5 cmCommonTargetGenerator: Use NameResolvesToFramework without cmTarget.
    91411641 Move ComputeLinkType out of cmTarget.
    6d94078e cmGeneratorTarget: Move IsDLLPlatform from cmTarget.
    3ebc6285 cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.
    311018e5 cmGeneratorTarget: Move GetExportMacro from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c099e00fc0a9c47a2addaca145952b1c33195fab
commit c099e00fc0a9c47a2addaca145952b1c33195fab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 01:12:37 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:52:23 2015 +0200

    Access policy status from cmGeneratorTarget at generate time.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index eca0f66..a32bb48 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -407,7 +407,7 @@ cmComputeLinkInformation
   // order to support such projects we need to add the directories
   // containing libraries linked with a full path to the -L path.
   this->OldLinkDirMode =
-    this->Target->Target->GetPolicyStatusCMP0003() != cmPolicies::NEW;
+    this->Target->GetPolicyStatusCMP0003() != cmPolicies::NEW;
   if(this->OldLinkDirMode)
     {
     // Construct a mask to not bother with this behavior for link
@@ -1140,7 +1140,7 @@ void cmComputeLinkInformation::AddFullItem(std::string const& item)
   // Full path libraries should specify a valid library file name.
   // See documentation of CMP0008.
   std::string generator = this->GlobalGenerator->GetName();
-  if(this->Target->Target->GetPolicyStatusCMP0008() != cmPolicies::NEW &&
+  if(this->Target->GetPolicyStatusCMP0008() != cmPolicies::NEW &&
      (generator.find("Visual Studio") != generator.npos ||
       generator.find("Xcode") != generator.npos))
     {
@@ -1221,7 +1221,7 @@ bool cmComputeLinkInformation::CheckImplicitDirItem(std::string const& item)
     }
 
   // Check the policy for whether we should use the approach below.
-  switch (this->Target->Target->GetPolicyStatusCMP0060())
+  switch (this->Target->GetPolicyStatusCMP0060())
     {
     case cmPolicies::WARN:
       if (this->CMP0060Warn)
@@ -1531,7 +1531,7 @@ void cmComputeLinkInformation::HandleBadFullItem(std::string const& item,
   this->OrderLinkerSearchPath->AddLinkLibrary(item);
 
   // Produce any needed message.
-  switch(this->Target->Target->GetPolicyStatusCMP0008())
+  switch(this->Target->GetPolicyStatusCMP0008())
     {
     case cmPolicies::WARN:
       {
@@ -1583,7 +1583,7 @@ bool cmComputeLinkInformation::FinishLinkerSearchDirectories()
     }
 
   // Enforce policy constraints.
-  switch(this->Target->Target->GetPolicyStatusCMP0003())
+  switch(this->Target->GetPolicyStatusCMP0003())
     {
     case cmPolicies::WARN:
       if(!this->CMakeInstance->GetState()
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 2ae8084..03f4fdd 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -362,7 +362,7 @@ void cmComputeTargetDepends::AddTargetDepend(
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     bool issueMessage = false;
     std::ostringstream e;
-    switch(depender->Target->GetPolicyStatusCMP0046())
+    switch(depender->GetPolicyStatusCMP0046())
       {
       case cmPolicies::WARN:
         e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0046) << "\n";
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index be65a19..23c11d7 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -107,8 +107,8 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   gte, properties);
     const bool newCMP0022Behavior =
-        gte->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
-        && gte->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gte->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gte->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
       this->PopulateInterfaceLinkLibrariesProperty(gte,
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index c542f85..1a84625 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -270,7 +270,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
         {
-        switch (target->Target->GetPolicyStatusCMP0041())
+        switch (target->GetPolicyStatusCMP0041())
           {
           case cmPolicies::WARN:
             messageType = cmake::WARNING;
@@ -317,7 +317,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
         {
         if (!shouldContinue)
           {
-          switch(target->Target->GetPolicyStatusCMP0052())
+          switch(target->GetPolicyStatusCMP0052())
             {
             case cmPolicies::WARN:
               {
@@ -830,10 +830,8 @@ cmExportFileGenerator
     }
 
   const bool newCMP0022Behavior =
-                        target->Target
-                              ->GetPolicyStatusCMP0022() != cmPolicies::WARN
-                     && target->Target
-                              ->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+                        target->GetPolicyStatusCMP0022() != cmPolicies::WARN
+                     && target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
 
   if(newCMP0022Behavior && !this->ExportOld)
     {
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index a2d6ad1..b695904 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -169,8 +169,8 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
                                   properties, missingTargets);
 
     const bool newCMP0022Behavior =
-        gt->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN
-        && gt->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD;
+        gt->GetPolicyStatusCMP0022() != cmPolicies::WARN
+        && gt->GetPolicyStatusCMP0022() != cmPolicies::OLD;
     if (newCMP0022Behavior)
       {
       if (this->PopulateInterfaceLinkLibrariesProperty(gt,
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index fc5c049..713ab6a 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1498,7 +1498,7 @@ bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const
     return this->GetPropertyAsBool("MACOSX_RPATH");
     }
 
-  cmPolicies::PolicyStatus cmp0042 = this->Target->GetPolicyStatusCMP0042();
+  cmPolicies::PolicyStatus cmp0042 = this->GetPolicyStatusCMP0042();
 
   if(cmp0042 == cmPolicies::WARN)
     {
@@ -2635,7 +2635,7 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
         cmake::MessageType messageType = cmake::FATAL_ERROR;
         if (checkCMP0027)
           {
-          switch(tgt->Target->GetPolicyStatusCMP0027())
+          switch(tgt->GetPolicyStatusCMP0027())
             {
             case cmPolicies::WARN:
               e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0027) << "\n";
@@ -2674,7 +2674,7 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt,
           }
         else
           {
-          switch(tgt->Target->GetPolicyStatusCMP0021())
+          switch(tgt->GetPolicyStatusCMP0021())
             {
             case cmPolicies::WARN:
               {
@@ -4706,8 +4706,8 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
         }
       }
     }
-  else if (this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN
-        || this->Target->GetPolicyStatusCMP0022() == cmPolicies::OLD)
+  else if (this->GetPolicyStatusCMP0022() == cmPolicies::WARN
+        || this->GetPolicyStatusCMP0022() == cmPolicies::OLD)
     {
     // The link implementation is the default link interface.
     cmLinkImplementationLibraries const*
@@ -5075,8 +5075,8 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
   // libraries and executables that export symbols.
   const char* explicitLibraries = 0;
   std::string linkIfaceProp;
-  if(this->Target->GetPolicyStatusCMP0022() != cmPolicies::OLD &&
-     this->Target->GetPolicyStatusCMP0022() != cmPolicies::WARN)
+  if(this->GetPolicyStatusCMP0022() != cmPolicies::OLD &&
+     this->GetPolicyStatusCMP0022() != cmPolicies::WARN)
     {
     // CMP0022 NEW behavior is to use INTERFACE_LINK_LIBRARIES.
     linkIfaceProp = "INTERFACE_LINK_LIBRARIES";
@@ -5102,7 +5102,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     }
 
   if(explicitLibraries &&
-     this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
+     this->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
      !this->PolicyWarnedCMP0022)
     {
     // Compare the explicitly set old link interface properties to the
@@ -5147,8 +5147,8 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
                                 iface.Libraries,
                                 iface.HadHeadSensitiveCondition);
     }
-  else if (this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN
-        || this->Target->GetPolicyStatusCMP0022() == cmPolicies::OLD)
+  else if (this->GetPolicyStatusCMP0022() == cmPolicies::WARN
+        || this->GetPolicyStatusCMP0022() == cmPolicies::OLD)
     // If CMP0022 is NEW then the plain tll signature sets the
     // INTERFACE_LINK_LIBRARIES, so if we get here then the project
     // cleared the property explicitly and we should not fall back
@@ -5159,7 +5159,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
       this->GetLinkImplementationLibrariesInternal(config, headTarget);
     iface.Libraries.insert(iface.Libraries.end(),
                            impl->Libraries.begin(), impl->Libraries.end());
-    if(this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
+    if(this->GetPolicyStatusCMP0022() == cmPolicies::WARN &&
        !this->PolicyWarnedCMP0022 && !usage_requirements_only)
       {
       // Compare the link implementation fallback link interface to the
@@ -5621,7 +5621,7 @@ std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const
   if(lib != item)
     {
     cmake* cm = this->LocalGenerator->GetCMakeInstance();
-    switch(this->Target->GetPolicyStatusCMP0004())
+    switch(this->GetPolicyStatusCMP0004())
       {
       case cmPolicies::WARN:
         {
@@ -5829,7 +5829,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
           bool noMessage = false;
           cmake::MessageType messageType = cmake::FATAL_ERROR;
           std::ostringstream e;
-          switch(this->Target->GetPolicyStatusCMP0038())
+          switch(this->GetPolicyStatusCMP0038())
             {
             case cmPolicies::WARN:
               {
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c65d9e0..93ddac0 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1551,7 +1551,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
         GetGlobalPropertyAsBool("TARGET_SUPPORTS_SHARED_LIBS"))
     {
     bool add_shlib_flags = false;
-    switch(tgt.Target->GetPolicyStatusCMP0065())
+    switch(tgt.GetPolicyStatusCMP0065())
       {
       case cmPolicies::WARN:
         if(!tgt.GetPropertyAsBool("ENABLE_EXPORTS") &&
@@ -2108,7 +2108,7 @@ void cmLocalGenerator
       target->GetType() != cmState::MODULE_LIBRARY &&
       !target->IsExecutableWithExports())
     {
-    switch (target->Target->GetPolicyStatusCMP0063())
+    switch (target->GetPolicyStatusCMP0063())
       {
       case cmPolicies::OLD:
         return;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d74bca5a8fee1d45c60b60a70a2a1a90abb74180
commit d74bca5a8fee1d45c60b60a70a2a1a90abb74180
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 01:05:42 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:52:23 2015 +0200

    cmGeneratorTarget: Copy the policy map from the cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 2a35259..fc5c049 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -308,6 +308,8 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
   this->DLLPlatform = (this->Makefile->IsOn("WIN32") ||
                        this->Makefile->IsOn("CYGWIN") ||
                        this->Makefile->IsOn("MINGW"));
+
+  this->PolicyMap = t->PolicyMap;
 }
 
 cmGeneratorTarget::~cmGeneratorTarget()
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index eaec83b..2dc3a6f 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -33,6 +33,14 @@ public:
   bool IsImported() const;
   const char *GetLocation(const std::string& config) const;
 
+#define DECLARE_TARGET_POLICY(POLICY) \
+  cmPolicies::PolicyStatus GetPolicyStatus ## POLICY () const \
+    { return this->PolicyMap.Get(cmPolicies::POLICY); }
+
+  CM_FOR_EACH_TARGET_POLICY(DECLARE_TARGET_POLICY)
+
+#undef DECLARE_TARGET_POLICY
+
   /** Get the location of the target in the build tree with a placeholder
       referencing the configuration in the native build system.  This
       location is suitable for use as the LOCATION target property.  */
@@ -641,6 +649,7 @@ private:
   typedef std::map<OutputNameKey, std::string> OutputNameMapType;
   mutable OutputNameMapType OutputNameMap;
   mutable std::set<cmLinkItem> UtilityItems;
+  cmPolicies::PolicyMap PolicyMap;
   mutable bool PolicyWarnedCMP0022;
   mutable bool DebugIncludesDone;
   mutable bool DebugCompileOptionsDone;
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index a549d18..5023055 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -230,6 +230,23 @@ class cmPolicy;
 #define CM_FOR_EACH_POLICY_ID(POLICY) \
   CM_FOR_EACH_POLICY_TABLE(POLICY, CM_SELECT_ID)
 
+#define CM_FOR_EACH_TARGET_POLICY(F) \
+  F(CMP0003) \
+  F(CMP0004) \
+  F(CMP0008) \
+  F(CMP0020) \
+  F(CMP0021) \
+  F(CMP0022) \
+  F(CMP0027) \
+  F(CMP0038) \
+  F(CMP0041) \
+  F(CMP0042) \
+  F(CMP0046) \
+  F(CMP0052) \
+  F(CMP0060) \
+  F(CMP0063) \
+  F(CMP0065)
+
 
 /** \class cmPolicies
  * \brief Handles changes in CMake behavior and policies
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 8a99472..e8c05da 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -26,23 +26,6 @@
 # endif
 #endif
 
-#define CM_FOR_EACH_TARGET_POLICY(F) \
-  F(CMP0003) \
-  F(CMP0004) \
-  F(CMP0008) \
-  F(CMP0020) \
-  F(CMP0021) \
-  F(CMP0022) \
-  F(CMP0027) \
-  F(CMP0038) \
-  F(CMP0041) \
-  F(CMP0042) \
-  F(CMP0046) \
-  F(CMP0052) \
-  F(CMP0060) \
-  F(CMP0063) \
-  F(CMP0065)
-
 class cmake;
 class cmMakefile;
 class cmSourceFile;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6e86955086e1824cd666bc69c802d48074cc138
commit c6e86955086e1824cd666bc69c802d48074cc138
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 01:01:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:52:23 2015 +0200

    cmTarget: Remove unused NameResolvesToFramework.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0d8c57d..e056469 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -611,13 +611,6 @@ void cmTarget::ClearDependencyInformation( cmMakefile& mf,
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::NameResolvesToFramework(const std::string& libname) const
-{
-  return this->Makefile->GetGlobalGenerator()->
-    NameResolvesToFramework(libname);
-}
-
-//----------------------------------------------------------------------------
 std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value,
                                   cmTargetLinkLibraryType llt) const
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 9ed7f84..8a99472 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -145,8 +145,6 @@ public:
    */
   void ClearDependencyInformation(cmMakefile& mf, const std::string& target);
 
-  // Check to see if a library is a framework and treat it different on Mac
-  bool NameResolvesToFramework(const std::string& libname) const;
   void AddLinkLibrary(cmMakefile& mf,
                       const std::string& target, const std::string& lib,
                       cmTargetLinkLibraryType llt);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18046bd50a502508f170baa6cec5c81efb33f180
commit 18046bd50a502508f170baa6cec5c81efb33f180
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 01:01:21 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:52:22 2015 +0200

    cmCommonTargetGenerator: Use NameResolvesToFramework without cmTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 1982bba..6920faf 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -265,7 +265,7 @@ std::string cmCommonTargetGenerator::GetFrameworkFlags(std::string const& l)
   for(std::vector<std::string>::iterator i = includes.begin();
       i != includes.end(); ++i)
     {
-    if(this->Target->NameResolvesToFramework(*i))
+    if(this->GlobalGenerator->NameResolvesToFramework(*i))
       {
       std::string frameworkDir = *i;
       frameworkDir += "/../";

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91411641a7b8029d05899b11590fb4e676716a85
commit 91411641a7b8029d05899b11590fb4e676716a85
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 00:57:35 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:52:22 2015 +0200

    Move ComputeLinkType out of cmTarget.
    
    Keep it out of the way, so that it does not become part of cmGeneratorTarget,
    but where it can be used to implement CMP0003.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 465db92..13098ad 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -185,7 +185,9 @@ cmComputeLinkDepends
   // The configuration being linked.
   this->HasConfig = !config.empty();
   this->Config = (this->HasConfig)? config : std::string();
-  this->LinkType = this->Target->Target->ComputeLinkType(this->Config);
+  std::vector<std::string> debugConfigs =
+    this->Makefile->GetCMakeInstance()->GetDebugConfigs();
+  this->LinkType = CMP0003_ComputeLinkType(this->Config, debugConfigs);
 
   // Enable debug mode if requested.
   this->DebugMode = this->Makefile->IsOn("CMAKE_LINK_DEPENDS_DEBUG_MODE");
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6e312ce..2a35259 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5877,7 +5877,12 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
                                 this->MaxLanguageStandards);
     }
 
-  cmTargetLinkLibraryType linkType = this->Target->ComputeLinkType(config);
+  // Get the list of configurations considered to be DEBUG.
+  std::vector<std::string> debugConfigs =
+    this->Makefile->GetCMakeInstance()->GetDebugConfigs();
+
+  cmTargetLinkLibraryType linkType =
+      CMP0003_ComputeLinkType(config, debugConfigs);
   cmTarget::LinkLibraryVectorType const& oldllibs =
     this->Target->GetOriginalLinkLibraries();
   for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin();
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index b875cc0..b603bcc 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -14,6 +14,7 @@
 #define cmLinkItem_h
 
 #include "cmListFileCache.h"
+#include "cmSystemTools.h"
 
 class cmGeneratorTarget;
 
@@ -118,4 +119,27 @@ struct cmOptionalLinkImplementation: public cmLinkImplementation
   bool HadHeadSensitiveCondition;
 };
 
+/** Compute the link type to use for the given configuration.  */
+inline cmTargetLinkLibraryType
+CMP0003_ComputeLinkType(const std::string& config,
+                        std::vector<std::string> const& debugConfigs)
+{
+  // No configuration is always optimized.
+  if(config.empty())
+    {
+    return OPTIMIZED_LibraryType;
+    }
+
+  // Check if any entry in the list matches this configuration.
+  std::string configUpper = cmSystemTools::UpperCase(config);
+  if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
+      debugConfigs.end())
+    {
+    return DEBUG_LibraryType;
+    }
+  // The current configuration is not a debug configuration.
+  return OPTIMIZED_LibraryType;
+}
+
+
 #endif
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 63d3d07..0d8c57d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -583,31 +583,6 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories() const
 }
 
 //----------------------------------------------------------------------------
-cmTargetLinkLibraryType cmTarget::ComputeLinkType(
-                                      const std::string& config) const
-{
-  // No configuration is always optimized.
-  if(config.empty())
-    {
-    return OPTIMIZED_LibraryType;
-    }
-
-  // Get the list of configurations considered to be DEBUG.
-  std::vector<std::string> debugConfigs =
-    this->Makefile->GetCMakeInstance()->GetDebugConfigs();
-
-  // Check if any entry in the list matches this configuration.
-  std::string configUpper = cmSystemTools::UpperCase(config);
-  if (std::find(debugConfigs.begin(), debugConfigs.end(), configUpper) !=
-      debugConfigs.end())
-    {
-    return DEBUG_LibraryType;
-    }
-  // The current configuration is not a debug configuration.
-  return OPTIMIZED_LibraryType;
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::ClearDependencyInformation( cmMakefile& mf,
                                            const std::string& target )
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 33631e7..9ed7f84 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -140,9 +140,6 @@ public:
   const LinkLibraryVectorType &GetOriginalLinkLibraries() const
     {return this->OriginalLinkLibraries;}
 
-  /** Compute the link type to use for the given configuration.  */
-  cmTargetLinkLibraryType ComputeLinkType(const std::string& config) const;
-
   /**
    * Clear the dependency information recorded for this target, if any.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d94078e623d5f1316f1972ffda06ac1d66b6f2f
commit 6d94078e623d5f1316f1972ffda06ac1d66b6f2f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 00:44:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:52:22 2015 +0200

    cmGeneratorTarget: Move IsDLLPlatform from cmTarget.

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 1a878e2..7a7e4ff 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1579,7 +1579,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactSonameTag>
                             const GeneratorExpressionContent *content)
   {
     // The target soname file (.so.1).
-    if(target->Target->IsDLLPlatform())
+    if(target->IsDLLPlatform())
       {
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_SONAME_FILE is not allowed "
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1483af7..6e312ce 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -304,6 +304,10 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
         t->GetSourceEntries(),
         t->GetSourceBacktraces(),
         this->SourceEntries, true);
+
+  this->DLLPlatform = (this->Makefile->IsOn("WIN32") ||
+                       this->Makefile->IsOn("CYGWIN") ||
+                       this->Makefile->IsOn("MINGW"));
 }
 
 cmGeneratorTarget::~cmGeneratorTarget()
@@ -366,7 +370,7 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const
   switch(this->GetType())
     {
     case cmState::SHARED_LIBRARY:
-      if(this->Target->IsDLLPlatform())
+      if(this->IsDLLPlatform())
         {
         if(implib)
           {
@@ -2058,6 +2062,11 @@ cmGeneratorTarget::GetModuleDefinitionFile(const std::string& config) const
   return data;
 }
 
+bool cmGeneratorTarget::IsDLLPlatform() const
+{
+  return this->DLLPlatform;
+}
+
 //----------------------------------------------------------------------------
 void
 cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs,
@@ -5964,7 +5973,7 @@ bool cmGeneratorTarget::IsExecutableWithExports() const
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HasImportLibrary() const
 {
-  return (this->Target->IsDLLPlatform() &&
+  return (this->IsDLLPlatform() &&
           (this->GetType() == cmState::SHARED_LIBRARY ||
            this->IsExecutableWithExports()));
 }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 26b229d..eaec83b 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -196,6 +196,9 @@ public:
 
   std::string GetModuleDefinitionFile(const std::string& config) const;
 
+  /** Return whether or not the target is for a DLL platform.  */
+  bool IsDLLPlatform() const;
+
   /** @return whether this target have a well defined output file name. */
   bool HaveWellDefinedOutputFiles() const;
 
@@ -646,6 +649,7 @@ private:
   mutable bool DebugSourcesDone;
   mutable bool LinkImplementationLanguageIsContextDependent;
   mutable bool UtilityItemsDone;
+  bool DLLPlatform;
 
   bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
                            std::string& out) const;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 26f0d63..33631e7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -224,9 +224,6 @@ public:
       enabled.  */
   bool IsExecutableWithExports() const;
 
-  /** Return whether or not the target is for a DLL platform.  */
-  bool IsDLLPlatform() const { return this->DLLPlatform; }
-
   /** Return whether this target is a shared library Framework on
       Apple.  */
   bool IsFrameworkOnApple() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ebc62850c7461dca4723b063b5e5f019409db84
commit 3ebc62850c7461dca4723b063b5e5f019409db84
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 00:42:01 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:52:22 2015 +0200

    cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f41243e..1483af7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1709,6 +1709,16 @@ cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const
 }
 
 //----------------------------------------------------------------------------
+bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
+{
+  return
+    this->GetType() == cmState::STATIC_LIBRARY ||
+    this->GetType() == cmState::SHARED_LIBRARY ||
+    this->GetType() == cmState::MODULE_LIBRARY ||
+    this->GetType() == cmState::EXECUTABLE;
+}
+
+//----------------------------------------------------------------------------
 const char* cmGeneratorTarget::GetExportMacro() const
 {
   // Define the symbol for targets that export symbols.
@@ -4819,7 +4829,7 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo(
     }
 
   // Only libraries and executables have well-defined output files.
-  if(!this->Target->HaveWellDefinedOutputFiles())
+  if(!this->HaveWellDefinedOutputFiles())
     {
     std::string msg = "cmGeneratorTarget::GetOutputInfo called for ";
     msg += this->GetName();
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index b32bfd9..26b229d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -196,6 +196,9 @@ public:
 
   std::string GetModuleDefinitionFile(const std::string& config) const;
 
+  /** @return whether this target have a well defined output file name. */
+  bool HaveWellDefinedOutputFiles() const;
+
   /** Link information from the transitive closure of the link
       implementation and the interfaces of its dependencies.  */
   struct LinkClosure
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 490759f..e9dc433 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -34,7 +34,7 @@ cmOSXBundleGenerator(cmGeneratorTarget* target,
 //----------------------------------------------------------------------------
 bool cmOSXBundleGenerator::MustSkip()
 {
-  return !this->GT->Target->HaveWellDefinedOutputFiles();
+  return !this->GT->HaveWellDefinedOutputFiles();
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 58dea03..63d3d07 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1560,16 +1560,6 @@ void cmTarget::MarkAsImported()
 }
 
 //----------------------------------------------------------------------------
-bool cmTarget::HaveWellDefinedOutputFiles() const
-{
-  return
-    this->GetType() == cmState::STATIC_LIBRARY ||
-    this->GetType() == cmState::SHARED_LIBRARY ||
-    this->GetType() == cmState::MODULE_LIBRARY ||
-    this->GetType() == cmState::EXECUTABLE;
-}
-
-//----------------------------------------------------------------------------
 bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const
 {
   if (this->IsImported())
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 865bc8d..26f0d63 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -241,9 +241,6 @@ public:
   /** Get a backtrace from the creation of the target.  */
   cmListFileBacktrace const& GetBacktrace() const;
 
-  /** @return whether this target have a well defined output file name. */
-  bool HaveWellDefinedOutputFiles() const;
-
   void InsertInclude(std::string const& entry,
                      cmListFileBacktrace const& bt,
                      bool before = false);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=311018e5ad27abf7c76003ec91d3f26ef316e3cc
commit 311018e5ad27abf7c76003ec91d3f26ef316e3cc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 22:42:01 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 00:52:22 2015 +0200

    cmGeneratorTarget: Move GetExportMacro from cmTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 41af89b..1982bba 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -349,7 +349,8 @@ std::string cmCommonTargetGenerator::GetDefines(const std::string &l)
     std::set<std::string> defines;
     const char *lang = l.c_str();
     // Add the export symbol definition for shared library objects.
-    if(const char* exportMacro = this->Target->GetExportMacro())
+    if(const char* exportMacro =
+       this->GeneratorTarget->GetExportMacro())
       {
       this->LocalGenerator->AppendDefines(defines, exportMacro);
       }
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index a6b14ba..ac0202b 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -427,7 +427,7 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg,
   const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->Target->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     lg->AppendDefines(defines, exportMacro);
     }
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 0a1a364..f41243e 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1709,6 +1709,32 @@ cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const
 }
 
 //----------------------------------------------------------------------------
+const char* cmGeneratorTarget::GetExportMacro() const
+{
+  // Define the symbol for targets that export symbols.
+  if(this->GetType() == cmState::SHARED_LIBRARY ||
+     this->GetType() == cmState::MODULE_LIBRARY ||
+     this->IsExecutableWithExports())
+    {
+    if(const char* custom_export_name = this->GetProperty("DEFINE_SYMBOL"))
+      {
+      this->ExportMacro = custom_export_name;
+      }
+    else
+      {
+      std::string in = this->GetName();
+      in += "_EXPORTS";
+      this->ExportMacro = cmSystemTools::MakeCidentifier(in);
+      }
+    return this->ExportMacro.c_str();
+    }
+  else
+    {
+    return 0;
+    }
+}
+
+//----------------------------------------------------------------------------
 class cmTargetCollectLinkLanguages
 {
 public:
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 9533f43..b32bfd9 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -168,6 +168,10 @@ public:
 
   cmListFileBacktrace GetBacktrace() const;
 
+  /** Get the macro to define when building sources in this target.
+      If no macro should be defined null is returned.  */
+  const char* GetExportMacro() const;
+
   /** Get the soname of the target.  Allowed only for a shared library.  */
   std::string GetSOName(const std::string& config) const;
 
@@ -487,6 +491,8 @@ private:
   std::set<cmSourceFile const*> ExplicitObjectName;
   mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache;
 
+  mutable std::string ExportMacro;
+
   void ConstructSourceFileFlags() const;
   mutable bool SourceFileFlagsConstructed;
   mutable std::map<cmSourceFile const*, SourceFileFlags> SourceFlagsMap;
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 019cdd1..01e6f8c 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -297,7 +297,7 @@ std::string cmGhsMultiTargetGenerator::GetDefines(const std::string &language,
     std::set<std::string> defines;
     const char *lang = language.c_str();
     // Add the export symbol definition for shared library objects.
-    if (const char *exportMacro = this->Target->GetExportMacro())
+    if (const char *exportMacro = this->GeneratorTarget->GetExportMacro())
       {
       this->LocalGenerator->AppendDefines(defines, exportMacro);
       }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index ea1b1a0..35f6a58 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1848,7 +1848,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->AppendDefines(ppDefs,
       "CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"");
     }
-  if(const char* exportMacro = target.GetExportMacro())
+  if(const char* exportMacro = gtgt->GetExportMacro())
     {
     // Add the export symbol definition for shared library objects.
     this->AppendDefines(ppDefs, exportMacro);
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index f40e6dd..a51eb67 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1543,7 +1543,7 @@ void cmLocalVisualStudio6Generator
 
   // Add the export symbol definition for shared library objects.
   std::string exportSymbol;
-  if(const char* exportMacro = target.GetExportMacro())
+  if(const char* exportMacro = gt->GetExportMacro())
     {
     exportSymbol = exportMacro;
     }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 485ac31..819998c 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -777,7 +777,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target.GetExportMacro())
+  if(const char* exportMacro = gt->GetExportMacro())
     {
     targetOptions.AddDefine(exportMacro);
     }
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f663678..58dea03 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2109,32 +2109,6 @@ std::string cmTarget::GetFrameworkVersion() const
     }
 }
 
-//----------------------------------------------------------------------------
-const char* cmTarget::GetExportMacro() const
-{
-  // Define the symbol for targets that export symbols.
-  if(this->GetType() == cmState::SHARED_LIBRARY ||
-     this->GetType() == cmState::MODULE_LIBRARY ||
-     this->IsExecutableWithExports())
-    {
-    if(const char* custom_export_name = this->GetProperty("DEFINE_SYMBOL"))
-      {
-      this->ExportMacro = custom_export_name;
-      }
-    else
-      {
-      std::string in = this->GetName();
-      in += "_EXPORTS";
-      this->ExportMacro = cmSystemTools::MakeCindentifier(in);
-      }
-    return this->ExportMacro.c_str();
-    }
-  else
-    {
-    return 0;
-    }
-}
-
 bool cmTarget::GetMappedConfig(std::string const& desired_config,
                                const char** loc,
                                const char** imp,
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 0e966e9..865bc8d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -220,10 +220,6 @@ public:
                        const char** imp,
                        std::string& suffix) const;
 
-  /** Get the macro to define when building sources in this target.
-      If no macro should be defined null is returned.  */
-  const char* GetExportMacro() const;
-
   /** Return whether this target is an executable with symbol exports
       enabled.  */
   bool IsExecutableWithExports() const;
@@ -369,7 +365,6 @@ private:
   std::string Name;
   std::string InstallPath;
   std::string RuntimeInstallPath;
-  mutable std::string ExportMacro;
   std::vector<std::string> LinkDirectories;
   std::vector<cmCustomCommand> PreBuildCommands;
   std::vector<cmCustomCommand> PreLinkCommands;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2cbd306..f4c632d 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1961,7 +1961,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   configDefine += configName;
   configDefine += "\"";
   clOptions.AddDefine(configDefine);
-  if(const char* exportMacro = this->Target->GetExportMacro())
+  if(const char* exportMacro =
+          this->GeneratorTarget->GetExportMacro())
     {
     clOptions.AddDefine(exportMacro);
     }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 19:18:17 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 19:18:17 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-778-ga174f7e
Message-ID: <20151020231817.685DBBFFEF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a174f7e14b464be73a4282f9d1ade942f1476b5c (commit)
       via  47f10ce212e3b0cdcbf72c2c24b257ba3ae3d935 (commit)
      from  edb731113d63696ae691dfca207c2155129ff27c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a174f7e14b464be73a4282f9d1ade942f1476b5c
commit a174f7e14b464be73a4282f9d1ade942f1476b5c
Merge: edb7311 47f10ce
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 19:18:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 19:18:16 2015 -0400

    Merge topic 'cmLocalGenerator-generator-target-storage' into next
    
    47f10ce2 Revert "cmLocalGenerator: Store a vector of generator targets."


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47f10ce212e3b0cdcbf72c2c24b257ba3ae3d935
commit 47f10ce212e3b0cdcbf72c2c24b257ba3ae3d935
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 01:17:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 01:17:46 2015 +0200

    Revert "cmLocalGenerator: Store a vector of generator targets."
    
    This reverts commit 2ac7d953c36c36293922e53daed7a1737a813d23.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 1921f03..31c05fd 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,13 +965,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    std::vector<cmGeneratorTarget*> targets = (*it)->GetGeneratorTargets();
-    for (std::vector<cmGeneratorTarget*>::iterator l = targets.begin();
+    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
+    for (cmGeneratorTargetsType::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
       std::vector<std::string> includeDirs;
       std::string config = mf->GetSafeDefinition("CMAKE_BUILD_TYPE");
-      (*it)->GetIncludeDirectories(includeDirs, *l, "C", config);
+      (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
       this->AppendIncludeDirectories(fout, includeDirs, emmited);
       }
     }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 32cfcea..a55365f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1584,7 +1584,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
-      lg->AddGeneratorTarget(gt);
+      lg->AddGeneratorTarget(t, gt);
       }
     }
 
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 8659e34..4eec3fb 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,14 +68,13 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      std::vector<cmGeneratorTarget*> const& targets =
-          (*lg)->GetGeneratorTargets();
-      for (std::vector<cmGeneratorTarget*>::const_iterator ti =
-           targets.begin(); ti != targets.end(); ti++)
+      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
+      for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
+           ti != targets.end(); ti++)
         {
-        if ((*ti)->GetType()==cmState::EXECUTABLE)
+        if (ti->second->GetType()==cmState::EXECUTABLE)
           {
-          executable = (*ti)->GetLocation("");
+          executable = ti->second->GetLocation("");
           break;
           }
         }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 74d23a3..44e3de6 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -460,11 +460,11 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
-  for(std::vector<cmGeneratorTarget*>::iterator l = targets.begin();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
+  for(cmGeneratorTargetsType::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
-    cmGeneratorTarget* gtarget = *l;
+    cmGeneratorTarget* gtarget = l->second;
     int type = gtarget->GetType();
     if((type == cmState::EXECUTABLE) ||
        (type == cmState::STATIC_LIBRARY) ||
@@ -623,11 +623,11 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
-    for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
+    for(cmGeneratorTargetsType::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
-      cmGeneratorTarget* gtarget = *t;
+      cmGeneratorTarget* gtarget = t->second;
       // Don't emit the same rule twice (e.g. two targets with the same
       // simple name)
       int type = gtarget->GetType();
@@ -720,11 +720,11 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
-  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
+  for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    cmGeneratorTarget* gtarget = *t;
+    cmGeneratorTarget* gtarget = t->second;
     int type = gtarget->GetType();
     std::string name = gtarget->GetName();
     if (!name.empty()
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index a22315c..61b19cf 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -256,7 +256,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
                           noCommandLines);
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
-  lg->AddGeneratorTarget(gt);
+  lg->AddGeneratorTarget(tgt, gt);
   this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 3514e57..3838ebc 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -459,7 +459,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         "echo", "Build all projects");
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
-  root->AddGeneratorTarget(allBuildGt);
+  root->AddGeneratorTarget(allbuild, allBuildGt);
   root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
@@ -495,7 +495,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           "make", "-f", file.c_str());
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
-    root->AddGeneratorTarget(checkGt);
+    root->AddGeneratorTarget(check, checkGt);
     root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 41d7cce..833ffbf 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,15 +132,15 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
-  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    (*t)->TraceDependencies();
+    t->second->TraceDependencies();
     }
 }
 
@@ -448,9 +448,9 @@ void cmLocalGenerator::GenerateInstallRules()
 }
 
 
-void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
+void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
 {
-  this->GeneratorTargets.push_back(gt);
+  this->GeneratorTargets[t] = gt;
 }
 
 //----------------------------------------------------------------------------
@@ -465,12 +465,12 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
-  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    cmGeneratorTarget* target = *t;
-    if (target->GetType() == cmState::INTERFACE_LIBRARY)
+    cmGeneratorTarget& target = *t->second;
+    if (target.GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -478,7 +478,7 @@ void cmLocalGenerator::ComputeTargetManifest()
         ci != configNames.end(); ++ci)
       {
       const char* config = ci->c_str();
-      target->ComputeTargetManifest(config);
+      target.ComputeTargetManifest(config);
       }
     }
 }
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 1375985..307c67f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -113,12 +113,12 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
-  const std::vector<cmGeneratorTarget*> &GetGeneratorTargets() const
+  const cmGeneratorTargetsType &GetGeneratorTargets() const
     {
       return this->GeneratorTargets;
     }
 
-  void AddGeneratorTarget(cmGeneratorTarget* gt);
+  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
@@ -367,7 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
-  std::vector<cmGeneratorTarget*> GeneratorTargets;
+  cmGeneratorTargetsType GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index a77a75e..869ba2c 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,16 +26,16 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
 
-  for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
-       l != tgts.end(); ++l)
+  for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
+       ++l)
     {
-    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY)
+    if (l->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmGhsMultiTargetGenerator tg(*l);
+    cmGhsMultiTargetGenerator tg(l->second);
     tg.Generate();
     }
 }
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 3dd18bd..756c139 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,23 +73,23 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
-  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(*t);
+    cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(t->second);
     if(tg)
       {
       tg->Generate();
       // Add the target to "all" if required.
       if (!this->GetGlobalNinjaGenerator()->IsExcluded(
             this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0],
-            *t))
-        this->GetGlobalNinjaGenerator()->AddDependencyToAll((*t)->Target);
+            t->second))
+        this->GetGlobalNinjaGenerator()->AddDependencyToAll(t->second->Target);
       delete tg;
       }
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 07f763b..5485da4 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,18 +113,18 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
-  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+  for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
+    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     cmsys::auto_ptr<cmMakefileTargetGenerator> tg(
-      cmMakefileTargetGenerator::New(*t));
+      cmMakefileTargetGenerator::New(t->second));
     if (tg.get())
       {
       tg->WriteRuleFiles();
@@ -174,11 +174,11 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
-  for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  for(cmGeneratorTargetsType::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
-    cmGeneratorTarget* gt = *ti;
+    cmGeneratorTarget* gt = ti->second;
     if (gt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -417,22 +417,22 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
   std::string localName;
-  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+  for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if(((*t)->GetType() == cmState::EXECUTABLE) ||
-       ((*t)->GetType() == cmState::STATIC_LIBRARY) ||
-       ((*t)->GetType() == cmState::SHARED_LIBRARY) ||
-       ((*t)->GetType() == cmState::MODULE_LIBRARY) ||
-       ((*t)->GetType() == cmState::OBJECT_LIBRARY) ||
-       ((*t)->GetType() == cmState::UTILITY))
+    if((t->second->GetType() == cmState::EXECUTABLE) ||
+       (t->second->GetType() == cmState::STATIC_LIBRARY) ||
+       (t->second->GetType() == cmState::SHARED_LIBRARY) ||
+       (t->second->GetType() == cmState::MODULE_LIBRARY) ||
+       (t->second->GetType() == cmState::OBJECT_LIBRARY) ||
+       (t->second->GetType() == cmState::UTILITY))
       {
-      emitted.insert((*t)->GetName());
+      emitted.insert(t->second->GetName());
 
       // for subdirs add a rule to build this specific target by name.
-      localName = this->GetRelativeTargetDirectory(*t);
+      localName = this->GetRelativeTargetDirectory(t->second);
       localName += "/rule";
       commands.clear();
       depends.clear();
@@ -449,23 +449,23 @@ void cmLocalUnixMakefileGenerator3
                           localName, depends, commands, true);
 
       // Add a target with the canonical name (no prefix, suffix or path).
-      if(localName != (*t)->GetName())
+      if(localName != t->second->GetName())
         {
         commands.clear();
         depends.push_back(localName);
         this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
-                            (*t)->GetName(), depends, commands, true);
+                            t->second->GetName(), depends, commands, true);
         }
 
       // Add a fast rule to build the target
       std::string makefileName =
-                         this->GetRelativeTargetDirectory(*t);
+                         this->GetRelativeTargetDirectory(t->second);
       makefileName += "/build.make";
       // make sure the makefile name is suitable for a makefile
       std::string makeTargetName =
-        this->GetRelativeTargetDirectory(*t);
+        this->GetRelativeTargetDirectory(t->second);
       makeTargetName += "/build";
-      localName = (*t)->GetName();
+      localName = t->second->GetName();
       localName += "/fast";
       depends.clear();
       commands.clear();
@@ -479,11 +479,11 @@ void cmLocalUnixMakefileGenerator3
 
       // Add a local name for the rule to relink the target before
       // installation.
-      if((*t)->NeedRelinkBeforeInstall(this->ConfigName))
+      if(t->second->NeedRelinkBeforeInstall(this->ConfigName))
         {
-        makeTargetName = this->GetRelativeTargetDirectory(*t);
+        makeTargetName = this->GetRelativeTargetDirectory(t->second);
         makeTargetName += "/preinstall";
-        localName = (*t)->GetName();
+        localName = t->second->GetName();
         localName += "/preinstall";
         depends.clear();
         commands.clear();
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 225c03e..16b8942 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -895,7 +895,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    lg->AddGeneratorTarget(gt);
+    lg->AddGeneratorTarget(autogenTarget, gt);
     lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx    |    6 ++--
 Source/cmGlobalGenerator.cxx              |    2 +-
 Source/cmGlobalKdevelopGenerator.cxx      |   11 +++----
 Source/cmGlobalUnixMakefileGenerator3.cxx |   18 +++++------
 Source/cmGlobalVisualStudio8Generator.cxx |    2 +-
 Source/cmGlobalXCodeGenerator.cxx         |    4 +--
 Source/cmLocalGenerator.cxx               |   22 ++++++-------
 Source/cmLocalGenerator.h                 |    6 ++--
 Source/cmLocalGhsMultiGenerator.cxx       |   10 +++---
 Source/cmLocalNinjaGenerator.cxx          |   12 +++----
 Source/cmLocalUnixMakefileGenerator3.cxx  |   50 ++++++++++++++---------------
 Source/cmQtAutoGeneratorInitializer.cxx   |    2 +-
 12 files changed, 72 insertions(+), 73 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 20 19:18:39 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 20 Oct 2015 19:18:39 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-780-g2fc8bee
Message-ID: <20151020231839.18F13C001F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2fc8bee548c8d15d34ae9357523e0d5423026c03 (commit)
       via  a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8 (commit)
      from  a174f7e14b464be73a4282f9d1ade942f1476b5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fc8bee548c8d15d34ae9357523e0d5423026c03
commit 2fc8bee548c8d15d34ae9357523e0d5423026c03
Merge: a174f7e a4bbdc5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 20 19:18:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 20 19:18:38 2015 -0400

    Merge topic 'cmLocalGenerator-generator-target-storage' into next
    
    a4bbdc5e cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8
commit a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 16:32:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 01:18:27 2015 +0200

    cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index aecae35..a55365f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1574,7 +1574,6 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
                                                cmLocalGenerator *lg)
 {
-  cmGeneratorTargetsType generatorTargets;
   cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
     {
@@ -1585,7 +1584,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
-      generatorTargets[t] = gt;
+      lg->AddGeneratorTarget(t, gt);
       }
     }
 
@@ -1596,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
     this->GeneratorTargets[*j] = gt;
     }
-  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2bc0e4a..307c67f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -118,10 +118,6 @@ public:
       return this->GeneratorTargets;
     }
 
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-    {
-      this->GeneratorTargets = targets;
-    }
   void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Oct 21 00:01:08 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed, 21 Oct 2015 00:01:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-304-g893a7fc
Message-ID: <20151021040108.706ECC067C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  893a7fc2ed71760e1c76c4639985d0e1aec87d04 (commit)
      from  9afbb733ec2a55424e6c25c6afa7fdd14219d6b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=893a7fc2ed71760e1c76c4639985d0e1aec87d04
commit 893a7fc2ed71760e1c76c4639985d0e1aec87d04
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Oct 21 00:01:06 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Oct 21 00:01:06 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8bbaa0e..d1132d2 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151020)
+set(CMake_VERSION_PATCH 20151021)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 08:53:24 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 08:53:24 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-782-g3df8be1
Message-ID: <20151021125324.0B8B8C093C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3df8be1826ac49fb99a495288873bb02f6690e38 (commit)
       via  5a208f834ea6d786611a5dc34dd7ed1d781dd1bc (commit)
      from  2fc8bee548c8d15d34ae9357523e0d5423026c03 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3df8be1826ac49fb99a495288873bb02f6690e38
commit 3df8be1826ac49fb99a495288873bb02f6690e38
Merge: 2fc8bee 5a208f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 08:53:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 08:53:23 2015 -0400

    Merge topic 'doc-file-GLOB-no-order' into next
    
    5a208f83 Help: Document that file(GLOB*) order is undefined


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a208f834ea6d786611a5dc34dd7ed1d781dd1bc
commit 5a208f834ea6d786611a5dc34dd7ed1d781dd1bc
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Wed Oct 21 02:53:37 2015 +0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 08:51:54 2015 -0400

    Help: Document that file(GLOB*) order is undefined
    
    Since this command use 'readdir' under the hood the order of list is
    undefined:
    * http://stackoverflow.com/questions/8977441/does-readdir-guarantee-an-order

diff --git a/Help/command/file.rst b/Help/command/file.rst
index bbddd40..96ac6c7 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -103,7 +103,8 @@ Generate a list of files that match the ``<globbing-expressions>`` and
 store it into the ``<variable>``.  Globbing expressions are similar to
 regular expressions, but much simpler.  If ``RELATIVE`` flag is
 specified, the results will be returned as relative paths to the given
-path.
+path.  No specific order of results is defined.  If order is important then
+sort the list explicitly (e.g. using the :command:`list(SORT)` command).
 
 By default ``GLOB`` lists directories - directories are omited in result if
 ``LIST_DIRECTORIES`` is set to false.

-----------------------------------------------------------------------

Summary of changes:
 Help/command/file.rst |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:16:48 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:16:48 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-306-gf1de724
Message-ID: <20151021131648.6E4DCC0005@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  f1de724f41a516574f22d2b0e61ebf4b6d65c601 (commit)
       via  5a208f834ea6d786611a5dc34dd7ed1d781dd1bc (commit)
      from  893a7fc2ed71760e1c76c4639985d0e1aec87d04 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1de724f41a516574f22d2b0e61ebf4b6d65c601
commit f1de724f41a516574f22d2b0e61ebf4b6d65c601
Merge: 893a7fc 5a208f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:16:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 09:16:47 2015 -0400

    Merge topic 'doc-file-GLOB-no-order'
    
    5a208f83 Help: Document that file(GLOB*) order is undefined


-----------------------------------------------------------------------

Summary of changes:
 Help/command/file.rst |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:16:50 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:16:50 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-308-ge2d4bfe
Message-ID: <20151021131650.D417EC0021@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 (commit)
       via  d6a03b475e023da9b7532a5b8735caec36b5de86 (commit)
      from  f1de724f41a516574f22d2b0e61ebf4b6d65c601 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5
commit e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5
Merge: f1de724 d6a03b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:16:49 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 09:16:49 2015 -0400

    Merge topic 'fix-CMP0054-elseif-warning'
    
    d6a03b47 cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)


-----------------------------------------------------------------------

Summary of changes:
 Source/cmConditionEvaluator.cxx                    |   40 +++++++++++++++++---
 Source/cmConditionEvaluator.h                      |    9 ++++-
 Source/cmIfCommand.cxx                             |   20 +++++++++-
 Source/cmMakefile.cxx                              |    5 ++-
 Source/cmMakefile.h                                |    2 +-
 Source/cmWhileCommand.cxx                          |   15 +++++++-
 Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt     |   12 ++++++
 Tests/RunCMake/CMP0054/CMP0054-WARN.cmake          |    2 +
 .../CMP0054/CMP0054-keywords-WARN-stderr.txt       |   13 +++++++
 Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake |    2 +
 10 files changed, 108 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:16:53 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:16:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-310-g196de9d
Message-ID: <20151021131653.26EDDC003E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  196de9d14d281103e0ee5c36e9dfd39504804aeb (commit)
       via  ed77504d89f99c1a395b5472f51d181ad25b90c0 (commit)
      from  e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=196de9d14d281103e0ee5c36e9dfd39504804aeb
commit 196de9d14d281103e0ee5c36e9dfd39504804aeb
Merge: e2d4bfe ed77504
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:16:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 09:16:51 2015 -0400

    Merge topic 'deprecate-CMakeForceCompiler'
    
    ed77504d CMakeForceCompiler: Deprecate this module and its macros


-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/deprecate-CMakeForceCompiler.rst |    5 +++++
 Modules/CMakeForceCompiler.cmake                  |   18 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/deprecate-CMakeForceCompiler.rst


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:16:55 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:16:55 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-312-g8bcf2c8
Message-ID: <20151021131655.43657C0024@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e (commit)
       via  123de1914c7e7d53d1e295c73994b2780041b8fc (commit)
      from  196de9d14d281103e0ee5c36e9dfd39504804aeb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e
commit 8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e
Merge: 196de9d 123de19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:16:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 09:16:53 2015 -0400

    Merge topic 'ninja-refactor-deptype-selection'
    
    123de191 Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains


-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |    2 ++
 Source/cmNinjaTargetGenerator.cxx   |   16 ++++------------
 2 files changed, 6 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:16:57 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:16:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-317-g740f85a
Message-ID: <20151021131657.DB776C0020@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  740f85a204d7a837e3ad408a79992f6a9c0b000c (commit)
       via  a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8 (commit)
       via  04b6bb167636ccf2fe565239a44249366ee1e452 (commit)
       via  400e3d19fcebf7d6e9551d585d60754bd937c28c (commit)
       via  726e461b3885aca4144ec79d08bf62c7ebade96d (commit)
      from  8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=740f85a204d7a837e3ad408a79992f6a9c0b000c
commit 740f85a204d7a837e3ad408a79992f6a9c0b000c
Merge: 8bcf2c8 a4bbdc5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:16:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 09:16:56 2015 -0400

    Merge topic 'cmLocalGenerator-generator-target-storage'
    
    a4bbdc5e cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.
    04b6bb16 cmLocalGenerator: Simplify semantic of adding generator targets.
    400e3d19 cmLocalGenerator: Don't store imported generator targets
    726e461b CMP0063: Split unit test by target type.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx             |    4 --
 Source/cmGlobalGenerator.cxx                       |    5 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx          |   12 -----
 Source/cmGlobalVisualStudio8Generator.cxx          |    1 +
 Source/cmGlobalVisualStudioGenerator.cxx           |    1 +
 Source/cmGlobalXCodeGenerator.cxx                  |    2 +
 Source/cmLocalGenerator.cxx                        |    8 +---
 Source/cmLocalGenerator.h                          |    4 --
 Source/cmLocalGhsMultiGenerator.cxx                |    3 +-
 Source/cmLocalNinjaGenerator.cxx                   |    3 +-
 Source/cmLocalUnixMakefileGenerator3.cxx           |    8 +---
 Source/cmQtAutoGeneratorInitializer.cxx            |    1 +
 .../VisibilityPreset/CMP0063-WARN-exe-stderr.txt   |   15 ++++++
 ...P0063-WARN-yes.cmake => CMP0063-WARN-exe.cmake} |    5 +-
 .../VisibilityPreset/CMP0063-WARN-obj-stderr.txt   |   15 ++++++
 ...P0063-WARN-yes.cmake => CMP0063-WARN-obj.cmake} |    5 +-
 .../VisibilityPreset/CMP0063-WARN-sta-stderr.txt   |   15 ++++++
 ...P0063-WARN-yes.cmake => CMP0063-WARN-sta.cmake} |    5 +-
 .../VisibilityPreset/CMP0063-WARN-yes-stderr.txt   |   50 --------------------
 Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake |    4 +-
 20 files changed, 70 insertions(+), 96 deletions(-)
 create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe-stderr.txt
 copy Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake => CMP0063-WARN-exe.cmake} (68%)
 create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj-stderr.txt
 copy Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake => CMP0063-WARN-obj.cmake} (67%)
 create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta-stderr.txt
 rename Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake => CMP0063-WARN-sta.cmake} (67%)
 delete mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes-stderr.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:17:00 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:17:00 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-323-gd31d92b
Message-ID: <20151021131700.26EF9C003E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  d31d92bf1d8b13ddff2c85c1fd380519867b788c (commit)
       via  c0969b10330a205a693bdf658185740eea51736e (commit)
       via  6a1e73281f216d2644dc3527be01c3d38b9e1263 (commit)
       via  00f50b006cc9afd014374fabc10bdef1330075a2 (commit)
       via  3df749af55c04d5b7bb0ee848c6df112178327bc (commit)
       via  3029c27e46a193c6319a3c909f938e6614c2b14f (commit)
      from  740f85a204d7a837e3ad408a79992f6a9c0b000c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d31d92bf1d8b13ddff2c85c1fd380519867b788c
commit d31d92bf1d8b13ddff2c85c1fd380519867b788c
Merge: 740f85a c0969b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:16:58 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 09:16:58 2015 -0400

    Merge topic 'inline-cmMakeDepend-content'
    
    c0969b10 cmMakeDepend: Inline into inheriting class.
    6a1e7328 cmMakeDepend: Inline into only user.
    00f50b00 cmMakeDepend: Inline into header.
    3df749af Remove vestigial declarations.
    3029c27e cmMakeDepend: Use public cmMakefile API.


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeLists.txt                   |    2 -
 Source/cmLocalUnixMakefileGenerator3.h  |    1 -
 Source/cmMakeDepend.cxx                 |  361 -------------------
 Source/cmMakeDepend.h                   |  150 --------
 Source/cmMakefile.h                     |    4 -
 Source/cmMakefileTargetGenerator.h      |    1 -
 Source/cmOutputRequiredFilesCommand.cxx |  598 +++++++++++++++++++++++++------
 Source/cmOutputRequiredFilesCommand.h   |    3 +-
 bootstrap                               |    1 -
 9 files changed, 496 insertions(+), 625 deletions(-)
 delete mode 100644 Source/cmMakeDepend.cxx
 delete mode 100644 Source/cmMakeDepend.h


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:17:02 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:17:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-335-g9206120
Message-ID: <20151021131702.AC847C0045@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  9206120e30d91389470aa0908965103dc301bbae (commit)
       via  c099e00fc0a9c47a2addaca145952b1c33195fab (commit)
       via  d74bca5a8fee1d45c60b60a70a2a1a90abb74180 (commit)
       via  c6e86955086e1824cd666bc69c802d48074cc138 (commit)
       via  18046bd50a502508f170baa6cec5c81efb33f180 (commit)
       via  91411641a7b8029d05899b11590fb4e676716a85 (commit)
       via  6d94078e623d5f1316f1972ffda06ac1d66b6f2f (commit)
       via  3ebc62850c7461dca4723b063b5e5f019409db84 (commit)
       via  311018e5ad27abf7c76003ec91d3f26ef316e3cc (commit)
       via  215cd21a0238ba00aec7c81014fe83e3d47187a6 (commit)
       via  1df8bd3ab0f6621b90a8801c1d10cfc94c74ff96 (commit)
       via  83703bda7d1017e1f75ec1b92d672d5ef17194d5 (commit)
      from  d31d92bf1d8b13ddff2c85c1fd380519867b788c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9206120e30d91389470aa0908965103dc301bbae
commit 9206120e30d91389470aa0908965103dc301bbae
Merge: d31d92b c099e00
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:17:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 09:17:01 2015 -0400

    Merge topic 'use-generator-target'
    
    c099e00f Access policy status from cmGeneratorTarget at generate time.
    d74bca5a cmGeneratorTarget: Copy the policy map from the cmTarget.
    c6e86955 cmTarget: Remove unused NameResolvesToFramework.
    18046bd5 cmCommonTargetGenerator: Use NameResolvesToFramework without cmTarget.
    91411641 Move ComputeLinkType out of cmTarget.
    6d94078e cmGeneratorTarget: Move IsDLLPlatform from cmTarget.
    3ebc6285 cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.
    311018e5 cmGeneratorTarget: Move GetExportMacro from cmTarget.
    215cd21a cmGeneratorTarget: Provide direct access to the backtrace.
    1df8bd3a cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget.
    83703bda cmGeneratorTarget: Copy IsExecutableWithExports from cmTarget.


-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |    5 +-
 Source/cmComputeLinkDepends.cxx                |    4 +-
 Source/cmComputeLinkInformation.cxx            |   22 ++--
 Source/cmComputeTargetDepends.cxx              |    8 +-
 Source/cmExportBuildFileGenerator.cxx          |    6 +-
 Source/cmExportFileGenerator.cxx               |   12 +--
 Source/cmExportInstallFileGenerator.cxx        |    4 +-
 Source/cmExtraSublimeTextGenerator.cxx         |    2 +-
 Source/cmGeneratorExpressionNode.cxx           |    2 +-
 Source/cmGeneratorTarget.cxx                   |  136 +++++++++++++++++-------
 Source/cmGeneratorTarget.h                     |   26 +++++
 Source/cmGhsMultiTargetGenerator.cxx           |    2 +-
 Source/cmGlobalGenerator.cxx                   |    6 +-
 Source/cmGlobalGenerator.h                     |    2 +-
 Source/cmGlobalXCodeGenerator.cxx              |    2 +-
 Source/cmLinkItem.h                            |   24 +++++
 Source/cmLocalGenerator.cxx                    |   12 +--
 Source/cmLocalVisualStudio6Generator.cxx       |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx       |    2 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    4 +-
 Source/cmOSXBundleGenerator.cxx                |    2 +-
 Source/cmOrderDirectories.cxx                  |    4 +-
 Source/cmPolicies.h                            |   17 +++
 Source/cmTarget.cxx                            |   68 ------------
 Source/cmTarget.h                              |   33 ------
 Source/cmVisualStudio10TargetGenerator.cxx     |    3 +-
 26 files changed, 221 insertions(+), 189 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:17:37 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:17:37 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-791-g6a889f1
Message-ID: <20151021131737.5606EC009B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6a889f151253e98bb7cbe7d500f07c88021a8bce (commit)
       via  9206120e30d91389470aa0908965103dc301bbae (commit)
       via  d31d92bf1d8b13ddff2c85c1fd380519867b788c (commit)
       via  740f85a204d7a837e3ad408a79992f6a9c0b000c (commit)
       via  8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e (commit)
       via  196de9d14d281103e0ee5c36e9dfd39504804aeb (commit)
       via  e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 (commit)
       via  f1de724f41a516574f22d2b0e61ebf4b6d65c601 (commit)
       via  893a7fc2ed71760e1c76c4639985d0e1aec87d04 (commit)
      from  3df8be1826ac49fb99a495288873bb02f6690e38 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a889f151253e98bb7cbe7d500f07c88021a8bce
commit 6a889f151253e98bb7cbe7d500f07c88021a8bce
Merge: 3df8be1 9206120
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:17:25 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 09:17:25 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:25:56 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:25:56 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-338-ge4b7d5a
Message-ID: <20151021132556.3483FC0356@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  e4b7d5afde91efafb59749a0a513732a089a6f0a (commit)
       via  2ad1fed8ee1ddcee831ffe5b70f2abab52430b70 (commit)
       via  779b6ac4f8ba71fe23c1edbcef8678e96e053b6f (commit)
      from  9206120e30d91389470aa0908965103dc301bbae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:25:56 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:25:56 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-795-gf3ec156
Message-ID: <20151021132556.5694BC0357@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f3ec1567ed0a0980074091afcddf5a6c8a1b015d (commit)
       via  e4b7d5afde91efafb59749a0a513732a089a6f0a (commit)
       via  2ad1fed8ee1ddcee831ffe5b70f2abab52430b70 (commit)
       via  779b6ac4f8ba71fe23c1edbcef8678e96e053b6f (commit)
      from  6a889f151253e98bb7cbe7d500f07c88021a8bce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3ec1567ed0a0980074091afcddf5a6c8a1b015d
commit f3ec1567ed0a0980074091afcddf5a6c8a1b015d
Merge: 6a889f1 e4b7d5a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:25:40 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 09:25:40 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:25:56 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:25:56 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.4.0-rc1-25-g2ad1fed
Message-ID: <20151021132556.70F0FC035A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, release has been updated
       via  2ad1fed8ee1ddcee831ffe5b70f2abab52430b70 (commit)
       via  779b6ac4f8ba71fe23c1edbcef8678e96e053b6f (commit)
       via  5a208f834ea6d786611a5dc34dd7ed1d781dd1bc (commit)
       via  d6a03b475e023da9b7532a5b8735caec36b5de86 (commit)
      from  22bfb39dea2476df8f7aa5ed5c773a7a6720c4bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Help/command/file.rst                              |    3 +-
 Source/cmConditionEvaluator.cxx                    |   40 +++++++++++++++++---
 Source/cmConditionEvaluator.h                      |    9 ++++-
 Source/cmIfCommand.cxx                             |   20 +++++++++-
 Source/cmMakefile.cxx                              |    5 ++-
 Source/cmMakefile.h                                |    2 +-
 Source/cmWhileCommand.cxx                          |   15 +++++++-
 Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt     |   12 ++++++
 Tests/RunCMake/CMP0054/CMP0054-WARN.cmake          |    2 +
 .../CMP0054/CMP0054-keywords-WARN-stderr.txt       |   13 +++++++
 Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake |    2 +
 11 files changed, 110 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 09:28:24 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 09:28:24 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-798-gd861762
Message-ID: <20151021132824.A3C19C0552@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d861762709fdf5bd01be4b83e4701194203c646a (commit)
       via  58c5065bc5bb5d08939669c2abaea4ac8835b75c (commit)
       via  498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit)
      from  f3ec1567ed0a0980074091afcddf5a6c8a1b015d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d861762709fdf5bd01be4b83e4701194203c646a
commit d861762709fdf5bd01be4b83e4701194203c646a
Merge: f3ec156 58c5065
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:28:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 09:28:23 2015 -0400

    Merge topic 'test-release' into next
    
    58c5065b Merge branch 'release' into test-release
    498db9b9 CMake 3.4.0-rc2


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58c5065bc5bb5d08939669c2abaea4ac8835b75c
commit 58c5065bc5bb5d08939669c2abaea4ac8835b75c
Merge: e4b7d5a 498db9b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:27:40 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 09:27:40 2015 -0400

    Merge branch 'release' into test-release


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e
commit 498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 09:26:43 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 09:26:43 2015 -0400

    CMake 3.4.0-rc2

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index aaef212..fef0b2e 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -2,4 +2,4 @@
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 4)
 set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_RC 2)

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 11:43:58 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 11:43:58 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-809-g0efd880
Message-ID: <20151021154358.4039DC00AA@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0efd8804fb40059974f5aa1d6d2eda81e074ddd1 (commit)
       via  f8c53bc39a4cefa7451daed75440cd481f124e8c (commit)
       via  ba06360340174b280a39feac915dcbb1306a8afb (commit)
       via  681338ddfd95a1542b05bdcc385cce59d08658a4 (commit)
       via  d5cf49da4240421a03ee3c2d17078371650a23bf (commit)
       via  832fe4b133f47781f4e08df1f83fdc4e3e7aa06b (commit)
       via  0b82f51a308d2ae36a449e6a02a5117199da373a (commit)
       via  5333c04cd046187dc10cd6576e8fdc1342753d36 (commit)
       via  e861e12f6ed677debd63a78ca80f9e85def77081 (commit)
       via  932848f420a738ee07997198fead5b2c2fbf4787 (commit)
       via  1a8c7bc2c649781d1163c1966245a45e0fb829ba (commit)
      from  d861762709fdf5bd01be4b83e4701194203c646a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0efd8804fb40059974f5aa1d6d2eda81e074ddd1
commit 0efd8804fb40059974f5aa1d6d2eda81e074ddd1
Merge: d861762 f8c53bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:43:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 11:43:53 2015 -0400

    Merge topic 'update-libarchive' into next
    
    f8c53bc3 cmSystemTools: Preemptively adapt to future libarchive 4.0 changes
    ba063603 cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes
    681338dd Update libarchive configuration within CMake
    d5cf49da libarchive: Update README-CMake.txt for new snapshot
    832fe4b1 libarchive: Fix VS 7.1 Debug build
    0b82f51a libarchive: Guard bcyrpt.h with HAVE_BCRYPT_H
    5333c04c libarchive: Drop CMake-specific Borland compiler workaround
    e861e12f libarchive: Define version macro before first use
    932848f4 Merge branch 'libarchive-upstream' into update-libarchive
    1a8c7bc2 libarchive 3.1.2-601-g3bfe5f1 (reduced)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8c53bc39a4cefa7451daed75440cd481f124e8c
commit f8c53bc39a4cefa7451daed75440cd481f124e8c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:56:09 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 11:34:29 2015 -0400

    cmSystemTools: Preemptively adapt to future libarchive 4.0 changes

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2c5aa8a..b2827dc 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -29,6 +29,9 @@
 # include "cmArchiveWrite.h"
 # include "cmLocale.h"
 # include <cm_libarchive.h>
+# ifndef __LA_INT64_T
+#  define __LA_INT64_T la_int64_t
+# endif
 #endif
 #include <cmsys/FStream.hxx>
 #include <cmsys/Terminal.h>

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba06360340174b280a39feac915dcbb1306a8afb
commit ba06360340174b280a39feac915dcbb1306a8afb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:37:14 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 11:34:29 2015 -0400

    cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 7946950..e62a2ed 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -18,6 +18,10 @@
 #include <cm_libarchive.h>
 #include "cm_get_date.h"
 
+#ifndef __LA_SSIZE_T
+# define __LA_SSIZE_T la_ssize_t
+#endif
+
 //----------------------------------------------------------------------------
 static std::string cm_archive_error_string(struct archive* a)
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=681338ddfd95a1542b05bdcc385cce59d08658a4
commit 681338ddfd95a1542b05bdcc385cce59d08658a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:08:30 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 11:34:28 2015 -0400

    Update libarchive configuration within CMake
    
    Hard-code libarchive build options to the way CMake needs them.  Set
    them as internal cache entries so users do not see them when building
    CMake.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c96f68b..ebee14b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -372,12 +372,14 @@ macro (CMAKE_BUILD_UTILITIES)
     set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system found LZMA library if found")
     set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system found ZLIB library if found")
     set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system found BZip2 library if found")
+    set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system found libxml2 library if found")
     set(ENABLE_EXPAT OFF CACHE INTERNAL "Enable the use of the system found EXPAT library if found")
     set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system found PCREPOSIX library if found")
     set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system found LibGCC library if found")
     set(ENABLE_XATTR OFF CACHE INTERNAL "Enable extended attribute support")
     set(ENABLE_ACL OFF CACHE INTERNAL "Enable ACL support")
     set(ENABLE_ICONV OFF CACHE INTERNAL "Enable iconv support")
+    set(ENABLE_CNG OFF CACHE INTERNAL "Enable the use of CNG(Crypto Next Generation)")
     add_subdirectory(Utilities/cmlibarchive)
     CMAKE_SET_TARGET_FOLDER(cmlibarchive "Utilities/3rdParty")
     set(CMAKE_TAR_LIBRARIES cmlibarchive ${BZIP2_LIBRARIES})

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5cf49da4240421a03ee3c2d17078371650a23bf
commit d5cf49da4240421a03ee3c2d17078371650a23bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:21:39 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 11:34:28 2015 -0400

    libarchive: Update README-CMake.txt for new snapshot

diff --git a/Utilities/cmlibarchive/README-CMake.txt b/Utilities/cmlibarchive/README-CMake.txt
index 8f3b29b..0a3e34a 100644
--- a/Utilities/cmlibarchive/README-CMake.txt
+++ b/Utilities/cmlibarchive/README-CMake.txt
@@ -11,7 +11,7 @@ branch, but it is merged into our history.
 Update libarchive from upstream as follows.  Create a local branch to
 explicitly reference the upstream snapshot branch head:
 
- git branch libarchive-upstream 37f225b7
+ git branch libarchive-upstream 1a8c7bc2
 
 Use a temporary directory to checkout the branch:
 
@@ -24,7 +24,7 @@ Use a temporary directory to checkout the branch:
 Now place the (reduced) libarchive content in this directory.  See
 instructions shown by
 
- git log 37f225b7
+ git log 1a8c7bc2
 
 for help extracting the content from the upstream svn repo.  Then run
 the following commands to commit the new version.  Substitute the
@@ -34,8 +34,8 @@ appropriate date and version number:
 
  GIT_AUTHOR_NAME='LibArchive Upstream' \
  GIT_AUTHOR_EMAIL='libarchive-discuss at googlegroups.com' \
- GIT_AUTHOR_DATE='Mon Apr 14 19:19:05 2014 -0700' \
- git commit -m 'libarchive 3.1.2-246-ga5a5d28b (reduced)' &&
+ GIT_AUTHOR_DATE='Wed Oct 21 01:47:34 2015 -0700' \
+ git commit -m 'libarchive 3.1.2-601-g3bfe5f1 (reduced)' &&
  git commit --amend
 
 Edit the commit message to describe the procedure used to obtain the

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=832fe4b133f47781f4e08df1f83fdc4e3e7aa06b
commit 832fe4b133f47781f4e08df1f83fdc4e3e7aa06b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:32:11 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 11:34:28 2015 -0400

    libarchive: Fix VS 7.1 Debug build
    
    This version of the MS C runtime library forgets to export
    _byteswap_ushort.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
index f8e01af..c359d83 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
@@ -1712,7 +1712,7 @@ lha_crc16(uint16_t crc, const void *pp, size_t len)
 	for (;len >= 8; len -= 8) {
 		/* This if statement expects compiler optimization will
 		 * remove the stament which will not be executed. */
-#ifdef _MSC_VER  /* Visual Studio */
+#if defined(_MSC_VER) && _MSC_VER >= 1400  /* Visual Studio */
 #  define bswap16(x) _byteswap_ushort(x)
 #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8) \
       || defined(__clang__)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b82f51a308d2ae36a449e6a02a5117199da373a
commit 0b82f51a308d2ae36a449e6a02a5117199da373a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:16:29 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 11:18:50 2015 -0400

    libarchive: Guard bcyrpt.h with HAVE_BCRYPT_H

diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
index 3e48bc3..6a8bbf2 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
@@ -35,7 +35,7 @@
 
 typedef	CCHmacContext archive_hmac_sha1_ctx;
 
-#elif defined(_WIN32) && !defined(__CYGWIN__)
+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
 #include <bcrypt.h>
 
 typedef struct {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5333c04cd046187dc10cd6576e8fdc1342753d36
commit 5333c04cd046187dc10cd6576e8fdc1342753d36
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:31:57 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 10:31:57 2015 -0400

    libarchive: Drop CMake-specific Borland compiler workaround
    
    We no longer build CMake with the Borland compiler.

diff --git a/Utilities/cmlibarchive/libarchive/archive.h b/Utilities/cmlibarchive/libarchive/archive.h
index 275aa0d..a8d4c6c 100644
--- a/Utilities/cmlibarchive/libarchive/archive.h
+++ b/Utilities/cmlibarchive/libarchive/archive.h
@@ -55,13 +55,6 @@
 # include <inttypes.h>
 #endif
 
-/* Borland symbols are case-insensitive.  This workaround only works
-   within CMake because we do not mix compilers.  */
-#if defined(__BORLANDC__)
-# define archive_read_open_FILE archive_read_open_FILE_
-# define archive_write_open_FILE archive_write_open_FILE_
-#endif
-
 /* Get appropriate definitions of 64-bit integer */
 #if !defined(__LA_INT64_T_DEFINED)
 /* Older code relied on the __LA_INT64_T macro; after 4.0 we'll switch to the typedef exclusively. */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e861e12f6ed677debd63a78ca80f9e85def77081
commit e861e12f6ed677debd63a78ca80f9e85def77081
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:30:29 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 10:30:29 2015 -0400

    libarchive: Define version macro before first use

diff --git a/Utilities/cmlibarchive/libarchive/archive.h b/Utilities/cmlibarchive/libarchive/archive.h
index 747615e..275aa0d 100644
--- a/Utilities/cmlibarchive/libarchive/archive.h
+++ b/Utilities/cmlibarchive/libarchive/archive.h
@@ -28,6 +28,16 @@
 #ifndef ARCHIVE_H_INCLUDED
 #define	ARCHIVE_H_INCLUDED
 
+/*
+ * The version number is expressed as a single integer that makes it
+ * easy to compare versions at build time: for version a.b.c, the
+ * version number is printf("%d%03d%03d",a,b,c).  For example, if you
+ * know your application requires version 2.12.108 or later, you can
+ * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
+ */
+/* Note: Compiler will complain if this does not match archive_entry.h! */
+#define	ARCHIVE_VERSION_NUMBER 3001002
+
 #include <sys/stat.h>
 #include <stddef.h>  /* for wchar_t */
 #include <stdio.h> /* For FILE * */
@@ -138,16 +148,6 @@ extern "C" {
  * header and library are very different, you should expect some
  * strangeness.  Don't do that.
  */
-
-/*
- * The version number is expressed as a single integer that makes it
- * easy to compare versions at build time: for version a.b.c, the
- * version number is printf("%d%03d%03d",a,b,c).  For example, if you
- * know your application requires version 2.12.108 or later, you can
- * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
- */
-/* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3001002
 __LA_DECL int		archive_version_number(void);
 
 /*

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=932848f420a738ee07997198fead5b2c2fbf4787
commit 932848f420a738ee07997198fead5b2c2fbf4787
Merge: e4b7d5a 1a8c7bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:12:35 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 10:18:52 2015 -0400

    Merge branch 'libarchive-upstream' into update-libarchive
    
    Resolve conflicts by integrating changes from both sides.

diff --cc Utilities/cmlibarchive/CMakeLists.txt
index b150408,0000000..6b13c2f
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@@ -1,1332 -1,0 +1,1393 @@@
 +PROJECT(libarchive C)
 +#
 +SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
 +if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
 +  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)
 +endif()
 +
 +# On MacOS, prefer MacPorts libraries to system libraries.
 +# I haven't come up with a compelling argument for this to be conditional.
 +list(APPEND CMAKE_PREFIX_PATH /opt/local)
++# Enable @rpath in the install name.
++# detail in "cmake  --help-policy CMP0042"
++SET(CMAKE_MACOSX_RPATH ON)
 +
 +#
 +# Version - read from 'version' file.
 +#
 +FILE(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/build/version _version)
 +STRING(REGEX REPLACE
 + "^([0-9])[0-9][0-9][0-9][0-9][0-9][0-9][a-z]?$" "\\1" _major ${_version})
 +STRING(REGEX REPLACE
 + "^[0-9]([0-9][0-9][0-9])[0-9][0-9][0-9][a-z]?$" "\\1" _minor ${_version})
 +STRING(REGEX REPLACE
 + "^[0-9][0-9][0-9][0-9]([0-9][0-9][0-9])[a-z]?$" "\\1" _revision ${_version})
 +STRING(REGEX REPLACE
 + "^[0-9][0-9][0-9][0-9][0-9][0-9][0-9]([a-z]?)$" "\\1" _quality ${_version})
 +SET(_version_number ${_major}${_minor}${_revision})
 +STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_minor ${_minor})
 +STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_revision ${_revision})
 +#
 +SET(VERSION                    "${_major}.${_trimmed_minor}.${_trimmed_revision}${_quality}")
 +SET(BSDCPIO_VERSION_STRING     "${VERSION}")
 +SET(BSDTAR_VERSION_STRING      "${VERSION}")
 +SET(BSDCAT_VERSION_STRING      "${VERSION}")
 +SET(LIBARCHIVE_VERSION_NUMBER  "${_version_number}")
 +SET(LIBARCHIVE_VERSION_STRING  "${VERSION}")
 +
 +# INTERFACE_VERSION increments with every release
 +# libarchive 2.7 == interface version 9 = 2 + 7
 +# libarchive 2.8 == interface version 10 = 2 + 8
 +# libarchive 2.9 == interface version 11 = 2 + 9
 +# libarchive 3.0 == interface version 12
 +# libarchive 3.1 == interface version 13
 +math(EXPR INTERFACE_VERSION  "13 + ${_minor}")
 +
 +# Set SOVERSION == Interface version
 +# ?? Should there be more here ??
 +SET(SOVERSION "${INTERFACE_VERSION}")
 +
 +# Enalbe CMAKE_PUSH_CHECK_STATE() and CMAKE_POP_CHECK_STATE() macros
 +# saving and restoring the state of the variables.
 +INCLUDE(${CMake_SOURCE_DIR}/Modules/CMakePushCheckState.cmake)
 +
 +# Initialize the state of the variables. This initialization is not
 +# necessary but this shows you what value the variables initially have.
 +SET(CMAKE_REQUIRED_DEFINITIONS)
 +SET(CMAKE_REQUIRED_INCLUDES)
 +SET(CMAKE_REQUIRED_LIBRARIES)
 +SET(CMAKE_REQUIRED_FLAGS)
 +
 +# Disable warnings to avoid changing 3rd party code.
 +IF(CMAKE_C_COMPILER_ID MATCHES
 +    "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$")
 +  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
 +ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
 +  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall")
 +ENDIF()
 +
 +# Enable CTest/CDash support
 +include(CTest)
 +
 +OPTION(ENABLE_NETTLE "Enable use of Nettle" ON)
 +OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
 +OPTION(ENABLE_LZMA "Enable the use of the system found LZMA library if found" ON)
 +OPTION(ENABLE_ZLIB "Enable the use of the system found ZLIB library if found" ON)
 +OPTION(ENABLE_BZip2 "Enable the use of the system found BZip2 library if found" ON)
++OPTION(ENABLE_LIBXML2 "Enable the use of the system found libxml2 library if found" ON)
 +OPTION(ENABLE_EXPAT "Enable the use of the system found EXPAT library if found" ON)
 +OPTION(ENABLE_PCREPOSIX "Enable the use of the system found PCREPOSIX library if found" ON)
 +OPTION(ENABLE_LibGCC "Enable the use of the system found LibGCC library if found" ON)
++# CNG is used for encrypt/decrypt Zip archives on Windows.
++OPTION(ENABLE_CNG "Enable the use of CNG(Crypto Next Generation)" ON)
 +
 +OPTION(ENABLE_XATTR "Enable extended attribute support" ON)
 +OPTION(ENABLE_ACL "Enable ACL support" ON)
 +OPTION(ENABLE_ICONV "Enable iconv support" ON)
 +
 +IF(WIN32)
 +  IF(MSVC60)
 +    SET(WINVER 0x0400)
 +  ELSE()
 +    SET(WINVER 0x0500)
 +  ENDIF()
 +  SET(_WIN32_WINNT ${WINVER})
 +ENDIF(WIN32)
 +
 +IF("${CMAKE_C_PLATFORM_ID}" MATCHES "^(HP-UX)$")
 +  ADD_DEFINITIONS(-D_XOPEN_SOURCE=500) # Ask wchar.h for mbstate_t
 +ENDIF()
 +
 +#
 +INCLUDE(CheckCSourceCompiles)
 +INCLUDE(CheckCSourceRuns)
 +INCLUDE(CheckFileOffsetBits)
 +INCLUDE(CheckFuncs)
 +INCLUDE(CheckHeaderDirent)
 +INCLUDE(CheckIncludeFile)
 +INCLUDE(CheckIncludeFiles)
 +INCLUDE(CheckLibraryExists)
 +INCLUDE(CheckStructMember)
 +INCLUDE(CheckSymbolExists)
 +INCLUDE(CheckTypeExists)
 +INCLUDE(CheckTypeSize)
 +
 +#
 +# Generate list.h
 +#
 +MACRO (GENERATE_LIST_H _listfile _cmlist __list_sources)
 +  SET(_argv ${ARGV})
 +  # Remove _listfile and _cmlist from _argv
 +  LIST(REMOVE_AT _argv 0 1)
 +  IF (NOT EXISTS "${_listfile}" OR
 +     ${_cmlist} IS_NEWER_THAN "${_listfile}")
 +
 +    MESSAGE(STATUS "Generating ${_listfile}")
 +    FILE(WRITE ${_listfile} "")
 +    FOREACH (testfile ${_argv})
 +      IF (testfile MATCHES "^test_[^/]+[.]c$")
 +        FILE(STRINGS ${testfile} testvar REGEX "^DEFINE_TEST")
 +        FOREACH (deftest ${testvar})
 +          FILE(APPEND ${_listfile} "${deftest}\n")
 +        ENDFOREACH (deftest)
 +      ENDIF (testfile MATCHES "^test_[^/]+[.]c$")
 +    ENDFOREACH (testfile)
 +
 +  ENDIF (NOT EXISTS "${_listfile}" OR
 +     ${_cmlist} IS_NEWER_THAN "${_listfile}")
 +ENDMACRO (GENERATE_LIST_H)
 +#
 +# Generate installation rules for man pages.
 +#
 +MACRO (INSTALL_MAN __mans)
 +  FOREACH (_man ${ARGV})
 +    STRING(REGEX REPLACE "^.+[.]([1-9])" "\\1" _mansect ${_man})
 +    INSTALL(FILES ${_man} DESTINATION "share/man/man${_mansect}")
 +  ENDFOREACH (_man)
 +ENDMACRO (INSTALL_MAN __mans)
 +#
 +# Find out what macro is needed to use libraries on Windows.
 +#
 +MACRO (TRY_MACRO_FOR_LIBRARY INCLUDES LIBRARIES
 +       TRY_TYPE SAMPLE_SOURCE MACRO_LIST)
 +  IF(WIN32 AND NOT CYGWIN)
 +    CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
 +    SET(CMAKE_REQUIRED_INCLUDES ${INCLUDES})
 +    SET(CMAKE_REQUIRED_LIBRARIES ${LIBRARIES})
 +    FOREACH(VAR ${MACRO_LIST})
 +      # Clear ${VAR} from CACHE If the libraries which ${VAR} was
 +      # checked with are changed.
 +      SET(VAR_WITH_LIB "${VAR}_WITH_LIB")
 +      GET_PROPERTY(PREV_VAR_WITH_LIB VARIABLE PROPERTY ${VAR_WITH_LIB})
 +      IF(NOT "${PREV_VAR_WITH_LIB}" STREQUAL "${LIBRARIES}")
 +        UNSET(${VAR} CACHE)
 +      ENDIF(NOT "${PREV_VAR_WITH_LIB}" STREQUAL "${LIBRARIES}")
 +      # Check if the library can be used with the macro.
 +      IF("${TRY_TYPE}" MATCHES "COMPILES")
 +        CHECK_C_SOURCE_COMPILES("${SAMPLE_SOURCE}" ${VAR})
 +      ELSEIF("${TRY_TYPE}" MATCHES "RUNS")
 +        CHECK_C_SOURCE_RUNS("${SAMPLE_SOURCE}" ${VAR})
 +      ELSE("${TRY_TYPE}" MATCHES "COMPILES")
 +        MESSAGE(FATAL_ERROR "UNKNOWN KEYWORD \"${TRY_TYPE}\" FOR TRY_TYPE")
 +      ENDIF("${TRY_TYPE}" MATCHES "COMPILES")
 +      # Save the libraries which ${VAR} is checked with.
 +      SET(${VAR_WITH_LIB} "${LIBRARIES}" CACHE INTERNAL
 +          "Macro ${VAR} is checked with")
 +    ENDFOREACH(VAR)
 +    CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 +  ENDIF(WIN32 AND NOT CYGWIN)
 +ENDMACRO (TRY_MACRO_FOR_LIBRARY)
 +#
 +# Check compress/decompress libraries
 +#
 +IF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN)
 +  # GnuWin32 is only for Win32, not Win64.
 +  SET(__GNUWIN32PATH "C:/Program Files/GnuWin32")
 +ENDIF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN)
 +IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
 +  # You have to add a path availabel DLL file into PATH environment variable.
 +  # Maybe DLL path is "C:/Program Files/GnuWin32/bin".
 +  # The zlib and the bzip2 Setup program have installed programs and DLLs into
 +  # "C:/Program Files/GnuWin32" by default.
 +  # This is convenience setting for Windows.
 +  SET(CMAKE_PREFIX_PATH ${__GNUWIN32PATH} $(CMAKE_PREFIX_PATH))
 +  #
 +  # If you didn't use Setup program or installed into nonstandard path,
 +  # cmake cannot find out your zlib or bzip2 libraries and include files,
 +  # you should execute cmake with  -DCMAKE_PREFIX_PATH option.
 +  #   e.g.
 +  #     cmake -DCMAKE_PREFIX_PATH=<your-GnuWin32-path> <path-to-source>
 +  #
 +  # If compiling error occured in zconf.h, You may need patch to zconf.h.
 +  #--- zconf.h.orig	2005-07-21 00:40:26.000000000
 +  #+++ zconf.h	2009-01-19 11:39:10.093750000
 +  #@@ -286,7 +286,7 @@
 +  #
 +  # #if 1           /* HAVE_UNISTD_H -- this line is updated by ./configure */
 +  # #  include <sys/types.h> /* for off_t */
 +  #-#  include <unistd.h>    /* for SEEK_* and off_t */
 +  #+#  include <stdio.h>    /* for SEEK_* and off_t */
 +  # #  ifdef VMS
 +  # #    include <unixio.h>   /* for off_t */
 +  # #  endif
 +ENDIF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
 +
 +SET(ADDITIONAL_LIBS "")
 +#
 +# Find ZLIB
 +#
 +IF(ENABLE_ZLIB)
 +  FIND_PACKAGE(ZLIB)
 +ELSE()
 +  SET(ZLIB_FOUND FALSE) # Override cached value
 +ENDIF()
 +IF(ZLIB_FOUND)
 +  SET(HAVE_LIBZ 1)
 +  SET(HAVE_ZLIB_H 1)
 +  INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 +  LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
 +  IF(WIN32 AND NOT CYGWIN)
 +    #
 +    # Test if ZLIB_WINAPI macro is needed to use.
 +    #
 +    TRY_MACRO_FOR_LIBRARY(
 +      "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
 +      RUNS
 +      "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
 +      ZLIB_WINAPI)
 +    IF(ZLIB_WINAPI)
 +      ADD_DEFINITIONS(-DZLIB_WINAPI)
 +    ELSE(ZLIB_WINAPI)
 +      # Test if a macro is needed for the library.
 +      TRY_MACRO_FOR_LIBRARY(
 +        "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
 +        COMPILES
 +        "#include <zlib.h>\nint main() {return zlibVersion()?1:0; }"
 +        "ZLIB_DLL;WITHOUT_ZLIB_DLL")
 +      IF(ZLIB_DLL)
 +        ADD_DEFINITIONS(-DZLIB_DLL)
 +      ENDIF(ZLIB_DLL)
 +    ENDIF(ZLIB_WINAPI)
 +  ENDIF(WIN32 AND NOT CYGWIN)
 +ELSE(ZLIB_FOUND)
 +  MESSAGE(FATAL_ERROR "CMake requires zlib to be available to libarchive")
 +ENDIF(ZLIB_FOUND)
 +#
 +# Find BZip2
 +#
 +IF(ENABLE_BZip2)
 +  FIND_PACKAGE(BZip2)
 +ELSE()
 +  SET(BZIP2_FOUND FALSE) # Override cached value
 +ENDIF()
 +IF(BZIP2_FOUND)
 +  SET(HAVE_LIBBZ2 1)
 +  SET(HAVE_BZLIB_H 1)
 +  INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
 +  LIST(APPEND ADDITIONAL_LIBS ${BZIP2_LIBRARIES})
 +  # Test if a macro is needed for the library.
 +  TRY_MACRO_FOR_LIBRARY(
 +    "${BZIP2_INCLUDE_DIR}" "${BZIP2_LIBRARIES}"
 +    COMPILES
 +    "#include <bzlib.h>\nint main() {return BZ2_bzlibVersion()?1:0; }"
 +    "USE_BZIP2_DLL;USE_BZIP2_STATIC")
 +  IF(USE_BZIP2_DLL)
 +    ADD_DEFINITIONS(-DUSE_BZIP2_DLL)
 +  ELSEIF(USE_BZIP2_STATIC)
 +    ADD_DEFINITIONS(-DUSE_BZIP2_STATIC)
 +  ENDIF(USE_BZIP2_DLL)
 +ENDIF(BZIP2_FOUND)
 +MARK_AS_ADVANCED(CLEAR BZIP2_INCLUDE_DIR)
 +MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES)
++
++
 +#
 +# Find LZMA
 +#
 +IF(ENABLE_LZMA)
 +  FIND_PACKAGE(LZMA)
 +ELSE()
 +  SET(LZMA_FOUND FALSE) # Override cached value
 +  SET(LZMADEC_FOUND FALSE) # Override cached value
 +ENDIF()
 +
 +IF(LZMA_FOUND)
 +  SET(HAVE_LIBLZMA 1)
 +  SET(HAVE_LZMA_H 1)
 +  INCLUDE_DIRECTORIES(${LZMA_INCLUDE_DIR})
 +  LIST(APPEND ADDITIONAL_LIBS ${LZMA_LIBRARIES})
 +  IF(CMAKE_USE_SYSTEM_LIBLZMA)
 +    # Test if a macro is needed for the library.
 +    TRY_MACRO_FOR_LIBRARY(
 +      "${LZMA_INCLUDE_DIR}" "${LZMA_LIBRARIES}"
 +      COMPILES
 +      "#include <lzma.h>\nint main() {return (int)lzma_version_number(); }"
 +      "WITHOUT_LZMA_API_STATIC;LZMA_API_STATIC")
 +    IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC)
 +      ADD_DEFINITIONS(-DLZMA_API_STATIC)
 +    ENDIF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC)
 +  ELSE()
 +    ADD_DEFINITIONS(-DLZMA_API_STATIC)
 +  ENDIF()
 +ELSEIF(LZMADEC_FOUND)
 +  SET(HAVE_LIBLZMADEC 1)
 +  SET(HAVE_LZMADEC_H 1)
 +  INCLUDE_DIRECTORIES(${LZMADEC_INCLUDE_DIR})
 +  LIST(APPEND ADDITIONAL_LIBS ${LZMADEC_LIBRARIES})
 +ELSE(LZMA_FOUND)
 +# LZMA not found and will not be used.
 +ENDIF(LZMA_FOUND)
 +IF(0) # CMake does not need LZO2 support in libarchive
 +#
 +# Find LZO2
 +#
 +IF (LZO2_INCLUDE_DIR)
 +  # Already in cache, be silent
 +  SET(LZO2_FIND_QUIETLY TRUE)
 +ENDIF (LZO2_INCLUDE_DIR)
 +
 +FIND_PATH(LZO2_INCLUDE_DIR lzo/lzoconf.h)
 +FIND_LIBRARY(LZO2_LIBRARY NAMES lzo2 liblzo2)
 +INCLUDE(FindPackageHandleStandardArgs)
 +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO2 DEFAULT_MSG LZO2_LIBRARY LZO2_INCLUDE_DIR)
 +IF(LZO2_FOUND)
 +  SET(HAVE_LIBLZO2 1)
 +  SET(HAVE_LZO_LZOCONF_H 1)
 +  SET(HAVE_LZO_LZO1X_H 1)
 +  INCLUDE_DIRECTORIES(${LZO2_INCLUDE_DIR})
 +  LIST(APPEND ADDITIONAL_LIBS ${LZO2_LIBRARY})
 +  #
 +  # TODO: test for static library.
 +  #
 +ENDIF(LZO2_FOUND)
 +MARK_AS_ADVANCED(CLEAR LZO2_INCLUDE_DIR)
 +MARK_AS_ADVANCED(CLEAR LZO2_LIBRARY)
 +ENDIF()
++IF(0) # CMake does not need LZ4 support in libarchive
++#
++# Find LZ4
++#
++IF (LZ4_INCLUDE_DIR)
++  # Already in cache, be silent
++  SET(LZ4_FIND_QUIETLY TRUE)
++ENDIF (LZ4_INCLUDE_DIR)
++
++FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
++FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
++IF(LZ4_FOUND)
++  SET(HAVE_LIBLZ4 1)
++  SET(HAVE_LZ4_H 1)
++  CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
++  SET(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIR})
++  CHECK_INCLUDE_FILES("lz4hc.h" HAVE_LZ4HC_H)
++  CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
++  INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR})
++  LIST(APPEND ADDITIONAL_LIBS ${LZ4_LIBRARY})
++  #
++  # TODO: test for static library.
++  #
++ENDIF(LZ4_FOUND)
++MARK_AS_ADVANCED(CLEAR LZ4_INCLUDE_DIR)
++MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY)
++ENDIF()
 +
 +#
 +# Check headers
 +#
 +CHECK_HEADER_DIRENT()
 +
 +SET(INCLUDES "")
 +MACRO (LA_CHECK_INCLUDE_FILE header var)
 +      CHECK_INCLUDE_FILES("${INCLUDES};${header}" ${var})
 +      IF (${var})
 +      	 SET(INCLUDES ${INCLUDES} ${header})
 +      ENDIF (${var})
 +ENDMACRO (LA_CHECK_INCLUDE_FILE)
 +
 +# Some FreeBSD headers assume sys/types.h was already included.
 +LA_CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
 +
 +# Alphabetize the rest unless there's a compelling reason
 +IF(ENABLE_ACL)
 +  LA_CHECK_INCLUDE_FILE("acl/libacl.h" HAVE_ACL_LIBACL_H)
 +ELSE(ENABLE_ACL)
 +  SET(HAVE_ACL_LIBACL_H FALSE)
 +ENDIF(ENABLE_ACL)
 +LA_CHECK_INCLUDE_FILE("ctype.h" HAVE_CTYPE_H)
 +LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
 +LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H)
 +LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
 +LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
 +LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H)
 +
 +CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
 +#include <ext2fs/ext2_fs.h>
 +int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS)
 +
 +LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
 +LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H)
 +LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
 +LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H)
 +LA_CHECK_INCLUDE_FILE("langinfo.h" HAVE_LANGINFO_H)
 +LA_CHECK_INCLUDE_FILE("limits.h" HAVE_LIMITS_H)
 +LA_CHECK_INCLUDE_FILE("linux/types.h" HAVE_LINUX_TYPES_H)
 +LA_CHECK_INCLUDE_FILE("linux/fiemap.h" HAVE_LINUX_FIEMAP_H)
 +LA_CHECK_INCLUDE_FILE("linux/fs.h" HAVE_LINUX_FS_H)
 +LA_CHECK_INCLUDE_FILE("linux/magic.h" HAVE_LINUX_MAGIC_H)
 +LA_CHECK_INCLUDE_FILE("locale.h" HAVE_LOCALE_H)
 +LA_CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
 +LA_CHECK_INCLUDE_FILE("paths.h" HAVE_PATHS_H)
 +LA_CHECK_INCLUDE_FILE("poll.h" HAVE_POLL_H)
 +LA_CHECK_INCLUDE_FILE("process.h" HAVE_PROCESS_H)
++LA_CHECK_INCLUDE_FILE("pthread.h" HAVE_PTHREAD_H)
 +LA_CHECK_INCLUDE_FILE("pwd.h" HAVE_PWD_H)
++LA_CHECK_INCLUDE_FILE("readpassphrase.h" HAVE_READPASSPHRASE_H)
 +LA_CHECK_INCLUDE_FILE("regex.h" HAVE_REGEX_H)
 +LA_CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
 +LA_CHECK_INCLUDE_FILE("spawn.h" HAVE_SPAWN_H)
 +LA_CHECK_INCLUDE_FILE("stdarg.h" HAVE_STDARG_H)
 +LA_CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
 +LA_CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
 +LA_CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
 +LA_CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
 +LA_CHECK_INCLUDE_FILE("sys/acl.h" HAVE_SYS_ACL_H)
 +LA_CHECK_INCLUDE_FILE("sys/cdefs.h" HAVE_SYS_CDEFS_H)
 +LA_CHECK_INCLUDE_FILE("sys/ioctl.h" HAVE_SYS_IOCTL_H)
 +LA_CHECK_INCLUDE_FILE("sys/mkdev.h" HAVE_SYS_MKDEV_H)
 +LA_CHECK_INCLUDE_FILE("sys/mount.h" HAVE_SYS_MOUNT_H)
 +LA_CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
 +LA_CHECK_INCLUDE_FILE("sys/poll.h" HAVE_SYS_POLL_H)
 +LA_CHECK_INCLUDE_FILE("sys/select.h" HAVE_SYS_SELECT_H)
 +LA_CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
 +LA_CHECK_INCLUDE_FILE("sys/statfs.h" HAVE_SYS_STATFS_H)
 +LA_CHECK_INCLUDE_FILE("sys/statvfs.h" HAVE_SYS_STATVFS_H)
 +LA_CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H)
 +LA_CHECK_INCLUDE_FILE("sys/utime.h" HAVE_SYS_UTIME_H)
 +LA_CHECK_INCLUDE_FILE("sys/utsname.h" HAVE_SYS_UTSNAME_H)
 +LA_CHECK_INCLUDE_FILE("sys/vfs.h" HAVE_SYS_VFS_H)
 +LA_CHECK_INCLUDE_FILE("sys/wait.h" HAVE_SYS_WAIT_H)
 +LA_CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H)
 +LA_CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
 +LA_CHECK_INCLUDE_FILE("utime.h" HAVE_UTIME_H)
 +LA_CHECK_INCLUDE_FILE("wchar.h" HAVE_WCHAR_H)
 +LA_CHECK_INCLUDE_FILE("wctype.h" HAVE_WCTYPE_H)
 +LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
++IF(ENABLE_CNG)
++  LA_CHECK_INCLUDE_FILE("Bcrypt.h" HAVE_BCRYPT_H)
++ELSE(ENABLE_CNG)
++  UNSET(HAVE_BCRYPT_H CACHE)
++ENDIF(ENABLE_CNG)
 +# Following files need windwos.h, so we should test it after windows.h test.
 +LA_CHECK_INCLUDE_FILE("wincrypt.h" HAVE_WINCRYPT_H)
 +LA_CHECK_INCLUDE_FILE("winioctl.h" HAVE_WINIOCTL_H)
 +
 +#
 +# Check whether use of __EXTENSIONS__ is safe.
 +# We need some macro such as _GNU_SOURCE to use extension functions.
 +#
 +SET(_INCLUDE_FILES)
 +FOREACH (it ${_HEADER})
 +   SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
 +ENDFOREACH (it)
 +
 +CHECK_C_SOURCE_COMPILES(
 +  "#define __EXTENSIONS__ 1
 +   ${_INCLUDE_FILES}
 +   int main() { return 0;}"
 + SAFE_TO_DEFINE_EXTENSIONS)
 +
 +#
 +# Find Nettle
 +#
 +IF(ENABLE_NETTLE)
 +  FIND_PACKAGE(Nettle)
 +  IF(NETTLE_FOUND)
 +    SET(HAVE_LIBNETTLE 1)
 +    SET(HAVE_NETTLE_MD5_H 1)
 +    SET(HAVE_NETTLE_RIPEMD160_H 1)
 +    SET(HAVE_NETTLE_SHA_H 1)
 +    INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR})
 +    LIST(APPEND ADDITIONAL_LIBS ${NETTLE_LIBRARIES})
++    LA_CHECK_INCLUDE_FILE("nettle/pbkdf2.h" HAVE_NETTLE_PBKDF2_H)
 +  ENDIF(NETTLE_FOUND)
 +  MARK_AS_ADVANCED(CLEAR NETTLE_INCLUDE_DIR)
 +  MARK_AS_ADVANCED(CLEAR NETTLE_LIBRARIES)
 +ENDIF(ENABLE_NETTLE)
 +
 +#
 +# Find OpenSSL
 +# (Except on Mac, where OpenSSL is deprecated.)
 +#
 +IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
 +  FIND_PACKAGE(OpenSSL)
++  IF(OPENSSL_FOUND)
++    SET(HAVE_LIBCRYPTO 1)
++  ENDIF(OPENSSL_FOUND)
 +ELSE()
 +  SET(OPENSSL_FOUND FALSE) # Override cached value
 +ENDIF()
 +
 +# FreeBSD libmd
 +IF(NOT OPENSSL_FOUND)
 +  CHECK_LIBRARY_EXISTS(md "MD5Init" "" LIBMD_FOUND)
 +  IF(LIBMD_FOUND)
 +    CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
 +    SET(CMAKE_REQUIRED_LIBRARIES "md")
 +    FIND_LIBRARY(LIBMD_LIBRARY NAMES md)
 +    LIST(APPEND ADDITIONAL_LIBS ${LIBMD_LIBRARY})
 +    CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 +  ENDIF(LIBMD_FOUND)
 +ENDIF(NOT OPENSSL_FOUND)
 +
 +#
 +# How to prove that CRYPTO functions, which have several names on various
- # platforms, just see if archive_crypto.c can compile and link against
++# platforms, just see if archive_digest.c can compile and link against
 +# required libraries.
 +#
 +MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
 +    FOREACH(ALGORITHM ${ALGORITHMS})
 +      IF(NOT ARCHIVE_CRYPTO_${ALGORITHM})
 +      STRING(TOLOWER "${ALGORITHM}" lower_algorithm)
 +      STRING(TOUPPER "${ALGORITHM}" algorithm)
 +      IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND NOT OPENSSL_FOUND)
 +        SET(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} FALSE)
 +      ELSEIF("${IMPLEMENTATION}" MATCHES "^NETTLE$" AND NOT NETTLE_FOUND)
 +        SET(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} FALSE)
 +      ENDIF("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND NOT OPENSSL_FOUND)
 +
 +      IF(NOT DEFINED ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
 +        # Probe the local implementation for whether this
 +	# crypto implementation is available on this platform.
 +	SET(TRY_CRYPTO_REQUIRED_INCLUDES
 +	  "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive;${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp")
 +	SET(TRY_CRYPTO_REQUIRED_LIBS)
 +	IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
 +	    SET(TRY_CRYPTO_REQUIRED_INCLUDES
 +	      "${TRY_CRYPTO_REQUIRED_INCLUDES};${OPENSSL_INCLUDE_DIR}")
 +	    SET(TRY_CRYPTO_REQUIRED_LIBS
 +	        "-DLINK_LIBRARIES:STRING=${OPENSSL_LIBRARIES}")
 +	ELSEIF("${IMPLEMENTATION}" MATCHES "^NETTLE$" AND NETTLE_FOUND)
 +	    SET(TRY_CRYPTO_REQUIRED_INCLUDES
 +	      "${TRY_CRYPTO_REQUIRED_INCLUDES};${NETTLE_INCLUDE_DIR}")
 +	    SET(TRY_CRYPTO_REQUIRED_LIBS
 +	        "-DLINK_LIBRARIES:STRING=${NETTLE_LIBRARY}")
 +	ELSEIF("${IMPLEMENTATION}" MATCHES "^LIBMD$" AND LIBMD_FOUND)
 +	    SET(TRY_CRYPTO_REQUIRED_LIBS
 +	        "-DLINK_LIBRARIES:STRING=${LIBMD_LIBRARY}")
 +	ENDIF("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
 +
 +    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
 +      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h)
 +	FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h"
 +	     CONFDEFS_H)
- 	FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_crypto.c"
++	FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_digest.c"
 +	     ARCHIVE_CRYPTO_C)
 +
 +	SET(SOURCE "${CONFDEFS_H}
 +
 +#define ARCHIVE_${algorithm}_COMPILE_TEST
 +#define ARCHIVE_CRYPTO_${algorithm}_${IMPLEMENTATION}
 +#define PLATFORM_CONFIG_H \"check_crypto_md.h\"
 +
 +${ARCHIVE_CRYPTO_C}
 +
 +int
 +main(int argc, char **argv)
 +{
 +  archive_${lower_algorithm}_ctx ctx;
 +  archive_${lower_algorithm}_init(&ctx);
 +  archive_${lower_algorithm}_update(&ctx, *argv, argc);
 +  archive_${lower_algorithm}_final(&ctx, NULL);
 +  return 0;
 +}
 +")
 +
 +  FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.h" "")
 +	FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.c" "${SOURCE}")
 +	MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}")
 +
 +	TRY_COMPILE(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}
 +	  ${CMAKE_BINARY_DIR}
 +	  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.c
 +	  CMAKE_FLAGS
 +	   "${TRY_CRYPTO_REQUIRED_LIBS}"
 +	   "${TRY_CRYPTO_REQUIRED_INCLUDES}"
 +	  OUTPUT_VARIABLE OUTPUT)
 +
 +	# Inform user whether or not we found it; if not, log why we didn't.
 +        IF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
 +          MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} -- found")
 +		  SET(ARCHIVE_CRYPTO_${ALGORITHM} 1)
 +        ELSE (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
 +          MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} -- not found")
 +          FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
 +    	    "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} failed with the following output:\n"
 +    	    "${OUTPUT}\n"
 +    	    "Source file was:\n${SOURCE}\n")
 +        ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
 +      ENDIF(NOT DEFINED ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
 +
 +      # Add appropriate libs/includes depending on whether the implementation
 +      # was found on this platform.
 +      IF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
 +        IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
 +          INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
 +	  LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES})
 +	   LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS)
 +        ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
 +      ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
 +      ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM})
 +    ENDFOREACH(ALGORITHM ${ALGORITHMS})
 +ENDMACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
 +
 +#
 +# CRYPTO functions on Windows is defined at archive_windows.c, thus we do not
 +# need the test what the functions can be mapped to archive_{crypto name}_init,
 +# archive_{crypto name}_update and archive_{crypto name}_final.
 +# The functions on Windows use CALG_{crypto name} macro to create a crypt object
 +# and then we need to know what CALG_{crypto name} macros is available to show
 +# ARCHIVE_CRYPTO_{crypto name}_WIN macros because Windows 2000 and earlier version
 +# of Windows XP do not support SHA256, SHA384 and SHA512.
 +#
 +MACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
 +  IF(WIN32 AND NOT CYGWIN)
 +    FOREACH(CRYPTO ${CRYPTO_LIST})
 +      IF(NOT ARCHIVE_CRYPTO_${CRYPTO})
 +      IF(NOT DEFINED ARCHIVE_CRYPTO_${CRYPTO}_WIN)
 +	STRING(TOUPPER "${CRYPTO}" crypto)
 +	SET(ALGID "")
 +	IF ("${CRYPTO}" MATCHES "^MD5$")
 +	    SET(ALGID "CALG_MD5")
 +	ENDIF ("${CRYPTO}" MATCHES "^MD5$")
 +	IF ("${CRYPTO}" MATCHES "^SHA1$")
 +	    SET(ALGID "CALG_SHA1")
 +	ENDIF ("${CRYPTO}" MATCHES "^SHA1$")
 +	IF ("${CRYPTO}" MATCHES "^SHA256$")
 +	    SET(ALGID "CALG_SHA_256")
 +	ENDIF ("${CRYPTO}" MATCHES "^SHA256$")
 +	IF ("${CRYPTO}" MATCHES "^SHA384$")
 +	    SET(ALGID "CALG_SHA_384")
 +	ENDIF ("${CRYPTO}" MATCHES "^SHA384$")
 +	IF ("${CRYPTO}" MATCHES "^SHA512$")
 +	    SET(ALGID "CALG_SHA_512")
 +	ENDIF ("${CRYPTO}" MATCHES "^SHA512$")
 +
 +    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
 +      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h)
 +	FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h"
 +	     CONFDEFS_H)
 +
 +	SET(SOURCE "${CONFDEFS_H}
 +
 +#define ${crypto}_COMPILE_TEST
 +#include <windows.h>
 +#include <wincrypt.h>
 +
 +int
 +main(int argc, char **argv)
 +{
 +	return ${ALGID};
 +}
 +")
 +	SET(SOURCE_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_win.c")
 +
 +	FILE(WRITE "${SOURCE_FILE}" "${SOURCE}")
 +	MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN")
 +
 +	TRY_COMPILE(ARCHIVE_CRYPTO_${CRYPTO}_WIN
 +	  ${CMAKE_BINARY_DIR}
 +	  ${SOURCE_FILE}
 +	  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive"
 +	  OUTPUT_VARIABLE OUTPUT)
 +
 +	IF (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
 +	    MESSAGE(STATUS
 +	        "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN -- found")
 +		SET(ARCHIVE_CRYPTO_${CRYPTO} 1)
 +	ELSE (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
 +	    MESSAGE(STATUS
 +	         "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN -- not found")
 +    	    FILE(APPEND
 +	        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
 +                "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN failed with the following output:\n"
 +        	"${OUTPUT}\n"
 +        	"Source file was:\n${SOURCE}\n")
 +	ENDIF (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
 +
 +      ENDIF(NOT DEFINED ARCHIVE_CRYPTO_${CRYPTO}_WIN)
 +      ENDIF(NOT ARCHIVE_CRYPTO_${CRYPTO})
 +    ENDFOREACH(CRYPTO)
 +  ENDIF(WIN32 AND NOT CYGWIN)
 +ENDMACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
 +
 +#
 +# Find iconv
 +# POSIX defines the second arg as const char **
 +# and requires it to be in libc.  But we can accept
 +# a non-const argument here and can support iconv()
 +# being in libiconv.
 +#
 +MACRO(CHECK_ICONV LIB TRY_ICONV_CONST)
 +  IF(NOT HAVE_ICONV)
 +    CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
-     IF (CMAKE_C_COMPILER_ID STREQUAL "GNU")
++    IF (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
++        CMAKE_C_COMPILER_ID STREQUAL "Clang")
 +      #
 +      # During checking iconv proto type, we should use -Werror to avoid the
 +      # success of iconv detection with a warnig which success is a miss
 +      # detection. So this needs for all build mode(even it's a release mode).
 +      #
 +      SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
-     ENDIF (CMAKE_C_COMPILER_ID STREQUAL "GNU")
++    ENDIF ()
 +    IF (MSVC)
 +      # NOTE: /WX option is the same as gcc's -Werror option.
 +      SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} /WX")
 +    ENDIF (MSVC)
 +    #
 +    CHECK_C_SOURCE_COMPILES(
 +      "#include <stdlib.h>
 +       #include <iconv.h>
 +       int main() {
 +          ${TRY_ICONV_CONST} char *ccp;
 +          iconv_t cd = iconv_open(\"\", \"\");
 +          iconv(cd, &ccp, (size_t *)0, (char **)0, (size_t *)0);
 +          iconv_close(cd);
 +          return 0;
 +       }"
 +     HAVE_ICONV_${LIB}_${TRY_ICONV_CONST})
 +    IF(HAVE_ICONV_${LIB}_${TRY_ICONV_CONST})
 +      SET(HAVE_ICONV true)
 +      SET(ICONV_CONST ${TRY_ICONV_CONST})
 +    ENDIF(HAVE_ICONV_${LIB}_${TRY_ICONV_CONST})
 +    CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 +  ENDIF(NOT HAVE_ICONV)
 +ENDMACRO(CHECK_ICONV TRY_ICONV_CONST)
 +
 +IF(ENABLE_ICONV)
 +  CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
 +  FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
 +  MARK_AS_ADVANCED(ICONV_INCLUDE_DIR)
 +  IF(ICONV_INCLUDE_DIR)
 +    #SET(INCLUDES ${INCLUDES} "iconv.h")
 +    SET(HAVE_ICONV_H 1)
 +    INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
 +    SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
 +    CHECK_ICONV("libc" "const")
 +    CHECK_ICONV("libc" "")
 +
 +    # If iconv isn't in libc and we have a libiconv, try that.
 +    FIND_LIBRARY(LIBICONV_PATH NAMES iconv libiconv)
 +    IF(NOT HAVE_ICONV AND LIBICONV_PATH)
 +      LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBICONV_PATH})
 +      # Test if a macro is needed for the library.
 +      TRY_MACRO_FOR_LIBRARY(
 +        "${ICONV_INCLUDE_DIR}" "${LIBICONV_PATH}"
 +        COMPILES
 +        "#include <iconv.h>\nint main() {return iconv_close((iconv_t)0);}"
 +        "WITHOUT_LIBICONV_STATIC;LIBICONV_STATIC")
 +      IF(NOT WITHOUT_LIBICONV_STATIC AND LIBICONV_STATIC)
 +        ADD_DEFINITIONS(-DLIBICONV_STATIC)
 +      ENDIF(NOT WITHOUT_LIBICONV_STATIC AND LIBICONV_STATIC)
 +      #
 +      # Set up CMAKE_REQUIRED_* for CHECK_ICONV
 +      #
 +      SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
 +      SET(CMAKE_REQUIRED_LIBRARIES ${LIBICONV_PATH})
 +      IF(LIBICONV_STATIC)
 +        # LIBICONV_STATIC is necessary for the success of CHECK_ICONV
 +        # on Windows.
 +        SET(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC")
 +      ELSE(LIBICONV_STATIC)
 +        SET(CMAKE_REQUIRED_DEFINITIONS)
 +      ENDIF(LIBICONV_STATIC)
 +      CHECK_ICONV("libiconv" "const")
 +      CHECK_ICONV("libiconv" "")
 +      IF (HAVE_ICONV)
 +        LIST(APPEND ADDITIONAL_LIBS ${LIBICONV_PATH})
 +      ENDIF(HAVE_ICONV)
 +    ENDIF(NOT HAVE_ICONV AND LIBICONV_PATH)
 +  ENDIF(ICONV_INCLUDE_DIR)
 +  #
 +  # Find locale_charset() for libiconv.
 +  #
 +  IF(LIBICONV_PATH)
 +    SET(CMAKE_REQUIRED_DEFINITIONS)
 +    SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
 +    SET(CMAKE_REQUIRED_LIBRARIES)
 +    CHECK_INCLUDE_FILES("localcharset.h" HAVE_LOCALCHARSET_H)
 +    FIND_LIBRARY(LIBCHARSET_PATH NAMES charset libcharset)
 +    IF(LIBCHARSET_PATH)
 +      SET(CMAKE_REQUIRED_LIBRARIES ${LIBCHARSET_PATH})
 +      IF(WIN32 AND NOT CYGWIN)
 +        # Test if a macro is needed for the library.
 +        TRY_MACRO_FOR_LIBRARY(
 +          "${ICONV_INCLUDE_DIR}" "${LIBCHARSET_PATH}"
 +          COMPILES
 +          "#include <localcharset.h>\nint main() {return locale_charset()?1:0;}"
 +          "WITHOUT_LIBCHARSET_STATIC;LIBCHARSET_STATIC")
 +        IF(NOT WITHOUT_LIBCHARSET_STATIC AND LIBCHARSET_STATIC)
 +          ADD_DEFINITIONS(-DLIBCHARSET_STATIC)
 +        ENDIF(NOT WITHOUT_LIBCHARSET_STATIC AND LIBCHARSET_STATIC)
 +        IF(WITHOUT_LIBCHARSET_STATIC OR LIBCHARSET_STATIC)
 +          SET(HAVE_LOCALE_CHARSET ON CACHE INTERNAL
 +              "Have function locale_charset")
 +        ENDIF(WITHOUT_LIBCHARSET_STATIC OR LIBCHARSET_STATIC)
 +      ELSE(WIN32 AND NOT CYGWIN)
 +        CHECK_FUNCTION_EXISTS_GLIBC(locale_charset HAVE_LOCALE_CHARSET)
 +      ENDIF(WIN32 AND NOT CYGWIN)
 +      IF(HAVE_LOCALE_CHARSET)
 +        LIST(APPEND ADDITIONAL_LIBS ${LIBCHARSET_PATH})
 +      ENDIF(HAVE_LOCALE_CHARSET)
 +    ENDIF(LIBCHARSET_PATH)
 +  ENDIF(LIBICONV_PATH)
 +  CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 +ELSE(ENABLE_ICONV)
 +  # Make sure ICONV variables are not in CACHE after ENABLE_ICONV disabled
 +  # (once enabled).
 +  UNSET(HAVE_LOCALE_CHARSET CACHE)
 +  UNSET(HAVE_ICONV CACHE)
 +  UNSET(HAVE_ICONV_libc_ CACHE)
 +  UNSET(HAVE_ICONV_libc_const CACHE)
 +  UNSET(HAVE_ICONV_libiconv_ CACHE)
 +  UNSET(HAVE_ICONV_libiconv_const CACHE)
 +  UNSET(ICONV_INCLUDE_DIR CACHE)
 +  UNSET(LIBICONV_PATH CACHE)
 +  UNSET(LIBICONV_DLL CACHE)
 +  UNSET(LIBICONV_STATIC CACHE)
 +  UNSET(LIBCHARSET_DLL CACHE)
 +  UNSET(LIBCHARSET_STATIC CACHE)
 +ENDIF(ENABLE_ICONV)
 +
 +IF(0) # CMake does not need XML support in libarchive
 +#
 +# Find Libxml2
 +#
- FIND_PACKAGE(LibXml2)
++IF(ENABLE_LIBXML2)
++  FIND_PACKAGE(LibXml2)
++ELSE()
++  SET(LIBXML2_FOUND FALSE)
++ENDIF()
 +IF(LIBXML2_FOUND)
 +  CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
 +  INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 +  LIST(APPEND ADDITIONAL_LIBS ${LIBXML2_LIBRARIES})
 +  SET(HAVE_LIBXML2 1)
 +  # libxml2's include files use iconv.h
 +  SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
 +  CHECK_INCLUDE_FILES("libxml/xmlreader.h" HAVE_LIBXML_XMLREADER_H)
 +  CHECK_INCLUDE_FILES("libxml/xmlwriter.h" HAVE_LIBXML_XMLWRITER_H)
 +  # Test if a macro is needed for the library.
 +  TRY_MACRO_FOR_LIBRARY(
 +    "${ICONV_INCLUDE_DIR};${LIBXML2_INCLUDE_DIR}"
 +    "ws2_32.lib;${ZLIB_LIBRARIES};${LIBICONV_PATH};${LIBXML2_LIBRARIES}"
 +    COMPILES
 +    "#include <stddef.h>\n#include <libxml/xmlreader.h>\nint main() {return xmlTextReaderRead((xmlTextReaderPtr)(void *)0);}"
 +    "WITHOUT_LIBXML_STATIC;LIBXML_STATIC")
 +  IF(NOT WITHOUT_LIBXML_STATIC AND LIBXML_STATIC)
 +    ADD_DEFINITIONS(-DLIBXML_STATIC)
 +  ENDIF(NOT WITHOUT_LIBXML_STATIC AND LIBXML_STATIC)
 +  CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 +ELSE(LIBXML2_FOUND)
 +  #
 +  # Find Expat
 +  #
-   FIND_PACKAGE(EXPAT)
++  IF(ENABLE_EXPAT)
++    FIND_PACKAGE(EXPAT)
++  ELSE()
++    SET(EXPAT_FOUND FALSE)
++  ENDIF()
 +  IF(EXPAT_FOUND)
 +    CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
 +    INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
 +    LIST(APPEND ADDITIONAL_LIBS ${EXPAT_LIBRARIES})
 +    SET(HAVE_LIBEXPAT 1)
 +    LA_CHECK_INCLUDE_FILE("expat.h" HAVE_EXPAT_H)
 +    CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 +  ENDIF(EXPAT_FOUND)
 +ENDIF(LIBXML2_FOUND)
 +MARK_AS_ADVANCED(CLEAR LIBXML2_INCLUDE_DIR)
 +MARK_AS_ADVANCED(CLEAR LIBXML2_LIBRARIES)
 +ENDIF()
 +
 +#
 +# Check functions
 +#
 +CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
- IF (CMAKE_C_COMPILER_ID STREQUAL "GNU")
++IF (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
++    CMAKE_C_COMPILER_ID STREQUAL "Clang")
 +  #
 +  # During checking functions, we should use -fno-builtin to avoid the
 +  # failure of function detection which failure is an error "conflicting
 +  # types for built-in function" caused by using -Werror option.
 +  #
 +  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-builtin")
 +ENDIF ()
 +CHECK_SYMBOL_EXISTS(_CrtSetReportMode "crtdbg.h" HAVE__CrtSetReportMode)
++CHECK_FUNCTION_EXISTS_GLIBC(arc4random_buf HAVE_ARC4RANDOM_BUF)
 +CHECK_FUNCTION_EXISTS_GLIBC(chflags HAVE_CHFLAGS)
 +CHECK_FUNCTION_EXISTS_GLIBC(chown HAVE_CHOWN)
 +CHECK_FUNCTION_EXISTS_GLIBC(chroot HAVE_CHROOT)
 +CHECK_FUNCTION_EXISTS_GLIBC(ctime_r HAVE_CTIME_R)
 +CHECK_FUNCTION_EXISTS_GLIBC(dirfd HAVE_DIRFD)
 +CHECK_FUNCTION_EXISTS_GLIBC(fchdir HAVE_FCHDIR)
 +CHECK_FUNCTION_EXISTS_GLIBC(fchflags HAVE_FCHFLAGS)
 +CHECK_FUNCTION_EXISTS_GLIBC(fchmod HAVE_FCHMOD)
 +CHECK_FUNCTION_EXISTS_GLIBC(fchown HAVE_FCHOWN)
 +CHECK_FUNCTION_EXISTS_GLIBC(fcntl HAVE_FCNTL)
 +CHECK_FUNCTION_EXISTS_GLIBC(fdopendir HAVE_FDOPENDIR)
 +CHECK_FUNCTION_EXISTS_GLIBC(fork HAVE_FORK)
 +CHECK_FUNCTION_EXISTS_GLIBC(fstat HAVE_FSTAT)
 +CHECK_FUNCTION_EXISTS_GLIBC(fstatat HAVE_FSTATAT)
 +CHECK_FUNCTION_EXISTS_GLIBC(fstatfs HAVE_FSTATFS)
 +CHECK_FUNCTION_EXISTS_GLIBC(fstatvfs HAVE_FSTATVFS)
 +CHECK_FUNCTION_EXISTS_GLIBC(ftruncate HAVE_FTRUNCATE)
 +CHECK_FUNCTION_EXISTS_GLIBC(futimens HAVE_FUTIMENS)
 +CHECK_FUNCTION_EXISTS_GLIBC(futimes HAVE_FUTIMES)
 +CHECK_FUNCTION_EXISTS_GLIBC(futimesat HAVE_FUTIMESAT)
 +CHECK_FUNCTION_EXISTS_GLIBC(geteuid HAVE_GETEUID)
 +CHECK_FUNCTION_EXISTS_GLIBC(getgrgid_r HAVE_GETGRGID_R)
 +CHECK_FUNCTION_EXISTS_GLIBC(getgrnam_r HAVE_GETGRNAM_R)
 +CHECK_FUNCTION_EXISTS_GLIBC(getpwnam_r HAVE_GETPWNAM_R)
 +CHECK_FUNCTION_EXISTS_GLIBC(getpwuid_r HAVE_GETPWUID_R)
 +CHECK_FUNCTION_EXISTS_GLIBC(getpid HAVE_GETPID)
 +CHECK_FUNCTION_EXISTS_GLIBC(getvfsbyname HAVE_GETVFSBYNAME)
 +CHECK_FUNCTION_EXISTS_GLIBC(gmtime_r HAVE_GMTIME_R)
 +CHECK_FUNCTION_EXISTS_GLIBC(lchflags HAVE_LCHFLAGS)
 +CHECK_FUNCTION_EXISTS_GLIBC(lchmod HAVE_LCHMOD)
 +CHECK_FUNCTION_EXISTS_GLIBC(lchown HAVE_LCHOWN)
 +CHECK_FUNCTION_EXISTS_GLIBC(link HAVE_LINK)
 +CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
 +CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT)
 +CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES)
 +CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC)
 +CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
 +CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
 +CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
 +CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
 +CHECK_FUNCTION_EXISTS_GLIBC(mkstemp HAVE_MKSTEMP)
 +CHECK_FUNCTION_EXISTS_GLIBC(nl_langinfo HAVE_NL_LANGINFO)
 +CHECK_FUNCTION_EXISTS_GLIBC(openat HAVE_OPENAT)
 +CHECK_FUNCTION_EXISTS_GLIBC(pipe HAVE_PIPE)
 +CHECK_FUNCTION_EXISTS_GLIBC(poll HAVE_POLL)
 +CHECK_FUNCTION_EXISTS_GLIBC(posix_spawnp HAVE_POSIX_SPAWNP)
 +CHECK_FUNCTION_EXISTS_GLIBC(readlink HAVE_READLINK)
++CHECK_FUNCTION_EXISTS_GLIBC(readpassphrase HAVE_READPASSPHRASE)
 +CHECK_FUNCTION_EXISTS_GLIBC(select HAVE_SELECT)
 +CHECK_FUNCTION_EXISTS_GLIBC(setenv HAVE_SETENV)
 +CHECK_FUNCTION_EXISTS_GLIBC(setlocale HAVE_SETLOCALE)
 +CHECK_FUNCTION_EXISTS_GLIBC(sigaction HAVE_SIGACTION)
 +CHECK_FUNCTION_EXISTS_GLIBC(statfs HAVE_STATFS)
 +CHECK_FUNCTION_EXISTS_GLIBC(statvfs HAVE_STATVFS)
 +CHECK_FUNCTION_EXISTS_GLIBC(strchr HAVE_STRCHR)
 +CHECK_FUNCTION_EXISTS_GLIBC(strdup HAVE_STRDUP)
 +CHECK_FUNCTION_EXISTS_GLIBC(strerror HAVE_STRERROR)
 +CHECK_FUNCTION_EXISTS_GLIBC(strncpy_s HAVE_STRNCPY_S)
 +CHECK_FUNCTION_EXISTS_GLIBC(strrchr HAVE_STRRCHR)
 +CHECK_FUNCTION_EXISTS_GLIBC(symlink HAVE_SYMLINK)
 +CHECK_FUNCTION_EXISTS_GLIBC(timegm HAVE_TIMEGM)
 +CHECK_FUNCTION_EXISTS_GLIBC(tzset HAVE_TZSET)
 +CHECK_FUNCTION_EXISTS_GLIBC(unsetenv HAVE_UNSETENV)
 +CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
 +CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
 +CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
 +CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
 +CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
 +CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
 +CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
 +CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
 +CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
 +CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
 +CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
 +CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
 +CHECK_FUNCTION_EXISTS_GLIBC(_localtime64_s HAVE__LOCALTIME64_S)
 +CHECK_FUNCTION_EXISTS_GLIBC(_mkgmtime64 HAVE__MKGMTIME64)
 +
 +SET(CMAKE_REQUIRED_LIBRARIES "")
 +CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
 +CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
 +CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R)
 +CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
 +CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
 +CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
 +CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
++CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
 +
 +CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 +
 +# Make sure we have the POSIX version of readdir_r, not the
 +# older 2-argument version.
 +CHECK_C_SOURCE_COMPILES(
 +  "#include <dirent.h>\nint main() {DIR *d = opendir(\".\"); struct dirent e,*r; return readdir_r(d,&e,&r);}"
 +  HAVE_READDIR_R)
 +
 +
 +# Only detect readlinkat() if we also have AT_FDCWD in unistd.h.
 +# NOTE: linux requires fcntl.h for AT_FDCWD.
 +CHECK_C_SOURCE_COMPILES(
 +  "#include <fcntl.h>\n#include <unistd.h>\nint main() {char buf[10]; return readlinkat(AT_FDCWD, \"\", buf, 0);}"
 +  HAVE_READLINKAT)
 +
 +
 +# To verify major(), we need to both include the header
 +# of interest and verify that the result can be linked.
 +# CHECK_FUNCTION_EXISTS doesn't accept a header argument,
 +# CHECK_SYMBOL_EXISTS doesn't test linkage.
 +CHECK_C_SOURCE_COMPILES(
 +  "#include <sys/mkdev.h>\nint main() { return major(256); }"
 +  MAJOR_IN_MKDEV)
 +CHECK_C_SOURCE_COMPILES(
 +  "#include <sys/sysmacros.h>\nint main() { return major(256); }"
 +  MAJOR_IN_SYSMACROS)
 +
 +IF(HAVE_STRERROR_R)
 +  SET(HAVE_DECL_STRERROR_R 1)
 +ENDIF(HAVE_STRERROR_R)
 +
 +#
 +# Check defines
 +#
 +SET(headers "limits.h")
 +IF(HAVE_STDINT_H)
 +  LIST(APPEND headers "stdint.h")
 +ENDIF(HAVE_STDINT_H)
 +IF(HAVE_INTTYPES_H)
 +  LIST(APPEND headers "inttypes.h")
 +ENDIF(HAVE_INTTYPES_H)
 +CHECK_SYMBOL_EXISTS(EFTYPE           "errno.h"    HAVE_EFTYPE)
 +CHECK_SYMBOL_EXISTS(EILSEQ           "errno.h"    HAVE_EILSEQ)
 +CHECK_SYMBOL_EXISTS(D_MD_ORDER       "langinfo.h" HAVE_D_MD_ORDER)
 +CHECK_SYMBOL_EXISTS(INT64_MAX        "${headers}" HAVE_DECL_INT64_MAX)
 +CHECK_SYMBOL_EXISTS(INT64_MIN        "${headers}" HAVE_DECL_INT64_MIN)
 +CHECK_SYMBOL_EXISTS(UINT32_MAX       "${headers}" HAVE_DECL_UINT32_MAX)
 +CHECK_SYMBOL_EXISTS(UINT64_MAX       "${headers}" HAVE_DECL_UINT64_MAX)
 +CHECK_SYMBOL_EXISTS(SIZE_MAX         "${headers}" HAVE_DECL_SIZE_MAX)
 +CHECK_SYMBOL_EXISTS(SSIZE_MAX        "limits.h"   HAVE_DECL_SSIZE_MAX)
 +
 +#
 +# Check struct members
 +#
 +# Check for tm_gmtoff in struct tm
 +CHECK_STRUCT_MEMBER("struct tm" tm_gmtoff
 +    "time.h" HAVE_STRUCT_TM_TM_GMTOFF)
 +CHECK_STRUCT_MEMBER("struct tm" __tm_gmtoff
 +    "time.h" HAVE_STRUCT_TM___TM_GMTOFF)
 +
 +# Check for f_namemax in struct statfs
 +CHECK_STRUCT_MEMBER("struct statfs" f_namemax
 +    "sys/param.h;sys/mount.h" HAVE_STRUCT_STATFS_F_NAMEMAX)
 +
 +# Check for birthtime in struct stat
 +CHECK_STRUCT_MEMBER("struct stat" st_birthtime
 +    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_BIRTHTIME)
 +
 +# Check for high-resolution timestamps in struct stat
 +CHECK_STRUCT_MEMBER("struct stat" st_birthtimespec.tv_nsec
 +    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC)
 +CHECK_STRUCT_MEMBER("struct stat" st_mtimespec.tv_nsec
 +    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC)
 +CHECK_STRUCT_MEMBER("struct stat" st_mtim.tv_nsec
 +    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
 +CHECK_STRUCT_MEMBER("struct stat" st_mtime_n
 +    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIME_N)
 +CHECK_STRUCT_MEMBER("struct stat" st_umtime
 +    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_UMTIME)
 +CHECK_STRUCT_MEMBER("struct stat" st_mtime_usec
 +    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIME_USEC)
 +# Check for block size support in struct stat
 +CHECK_STRUCT_MEMBER("struct stat" st_blksize
 +    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_BLKSIZE)
 +# Check for st_flags in struct stat (BSD fflags)
 +CHECK_STRUCT_MEMBER("struct stat" st_flags
 +    "sys/types.h;sys/stat.h" HAVE_STRUCT_STAT_ST_FLAGS)
 +
 +IF(HAVE_SYS_STATVFS_H)
 +  CHECK_STRUCT_MEMBER("struct statvfs" f_iosize
 +    "sys/types.h;sys/statvfs.h" HAVE_STRUCT_STATVFS_F_IOSIZE)
 +ENDIF()
 +
 +#
 +#
 +CHECK_STRUCT_MEMBER("struct tm" tm_sec
 +    "sys/types.h;sys/time.h;time.h" TIME_WITH_SYS_TIME)
 +
 +#
 +# Check for integer types
 +#
 +#
 +CHECK_TYPE_SIZE("short" SIZE_OF_SHORT)
 +CHECK_TYPE_SIZE("int" SIZE_OF_INT)
 +CHECK_TYPE_SIZE("long" SIZE_OF_LONG)
 +CHECK_TYPE_SIZE("long long"     SIZE_OF_LONG_LONG)
 +
 +CHECK_TYPE_SIZE("unsigned short" SIZE_OF_UNSIGNED_SHORT)
 +CHECK_TYPE_SIZE("unsigned" SIZE_OF_UNSIGNED)
 +CHECK_TYPE_SIZE("unsigned long" SIZE_OF_UNSIGNED_LONG)
 +CHECK_TYPE_SIZE("unsigned long long" SIZE_OF_UNSIGNED_LONG_LONG)
 +
 +CHECK_TYPE_SIZE("__int64" __INT64)
 +CHECK_TYPE_SIZE("unsigned __int64" UNSIGNED___INT64)
 +
 +CHECK_TYPE_SIZE(int16_t INT16_T)
 +CHECK_TYPE_SIZE(int32_t INT32_T)
 +CHECK_TYPE_SIZE(int64_t INT64_T)
 +CHECK_TYPE_SIZE(intmax_t INTMAX_T)
 +CHECK_TYPE_SIZE(uint8_t UINT8_T)
 +CHECK_TYPE_SIZE(uint16_t UINT16_T)
 +CHECK_TYPE_SIZE(uint32_t UINT32_T)
 +CHECK_TYPE_SIZE(uint64_t UINT64_T)
 +CHECK_TYPE_SIZE(uintmax_t UINTMAX_T)
 +
 +CHECK_TYPE_SIZE(dev_t       DEV_T)
 +IF(NOT HAVE_DEV_T)
 +  IF(MSVC)
 +    SET(dev_t "unsigned int")
 +  ENDIF(MSVC)
 +ENDIF(NOT HAVE_DEV_T)
 +#
 +CHECK_TYPE_SIZE(gid_t       GID_T)
 +IF(NOT HAVE_GID_T)
 +  IF(WIN32)
 +    SET(gid_t "short")
 +  ELSE(WIN32)
 +    SET(gid_t "unsigned int")
 +  ENDIF(WIN32)
 +ENDIF(NOT HAVE_GID_T)
 +#
 +CHECK_TYPE_SIZE(id_t        ID_T)
 +IF(NOT HAVE_ID_T)
 +  IF(WIN32)
 +    SET(id_t "short")
 +  ELSE(WIN32)
 +    SET(id_t "unsigned int")
 +  ENDIF(WIN32)
 +ENDIF(NOT HAVE_ID_T)
 +#
 +CHECK_TYPE_SIZE(mode_t      MODE_T)
 +IF(NOT HAVE_MODE_T)
 +  IF(WIN32)
 +    SET(mode_t "unsigned short")
 +  ELSE(WIN32)
 +    SET(mode_t "int")
 +  ENDIF(WIN32)
 +ENDIF(NOT HAVE_MODE_T)
 +#
 +CHECK_TYPE_SIZE(off_t       OFF_T)
 +IF(NOT HAVE_OFF_T)
 +  SET(off_t "__int64")
 +ENDIF(NOT HAVE_OFF_T)
 +#
 +CHECK_TYPE_SIZE(size_t      SIZE_T)
 +IF(NOT HAVE_SIZE_T)
 +  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
 +    SET(size_t "uint64_t")
 +  ELSE("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
 +    SET(size_t   "uint32_t")
 +  ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
 +ENDIF(NOT HAVE_SIZE_T)
 +#
 +CHECK_TYPE_SIZE(ssize_t     SSIZE_T)
 +IF(NOT HAVE_SSIZE_T)
 +  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
 +    SET(ssize_t "int64_t")
 +  ELSE("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
 +    SET(ssize_t "long")
 +  ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
 +ENDIF(NOT HAVE_SSIZE_T)
 +#
 +CHECK_TYPE_SIZE(uid_t       UID_T)
 +IF(NOT HAVE_UID_T)
 +  IF(WIN32)
 +    SET(uid_t "short")
 +  ELSE(WIN32)
 +    SET(uid_t "unsigned int")
 +  ENDIF(WIN32)
 +ENDIF(NOT HAVE_UID_T)
 +#
 +CHECK_TYPE_SIZE(pid_t       PID_T)
 +IF(NOT HAVE_PID_T)
 +  IF(WIN32)
 +    SET(pid_t "int")
 +  ELSE(WIN32)
 +    MESSAGE(FATAL_ERROR "pid_t doesn't exist on this platform?")
 +  ENDIF(WIN32)
 +ENDIF(NOT HAVE_PID_T)
 +#
 +CHECK_TYPE_SIZE(intptr_t   INTPTR_T)
 +IF(NOT HAVE_INTPTR_T)
 +  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
 +    SET(intptr_t "int64_t")
 +  ELSE()
 +    SET(intptr_t "int32_t")
 +  ENDIF()
 +ENDIF(NOT HAVE_INTPTR_T)
 +#
 +CHECK_TYPE_SIZE(uintptr_t   UINTPTR_T)
 +IF(NOT HAVE_UINTPTR_T)
 +  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
 +    SET(uintptr_t "uint64_t")
 +  ELSE()
 +    SET(uintptr_t "uint32_t")
 +  ENDIF()
 +ENDIF(NOT HAVE_UINTPTR_T)
 +#
 +CHECK_TYPE_SIZE(wchar_t     SIZEOF_WCHAR_T)
 +IF(HAVE_SIZEOF_WCHAR_T)
 +  SET(HAVE_WCHAR_T 1)
 +ENDIF(HAVE_SIZEOF_WCHAR_T)
 +#
 +# Check if _FILE_OFFSET_BITS macro needed for large files
 +#
 +CHECK_FILE_OFFSET_BITS()
 +
 +#
 +# Check for Extended Attribute libraries, headers, and functions
 +#
 +IF(ENABLE_XATTR)
 +  LA_CHECK_INCLUDE_FILE(attr/xattr.h     HAVE_ATTR_XATTR_H)
 +  LA_CHECK_INCLUDE_FILE(sys/xattr.h      HAVE_SYS_XATTR_H)
 +  LA_CHECK_INCLUDE_FILE(sys/extattr.h      HAVE_SYS_EXTATTR_H)
 +  CHECK_LIBRARY_EXISTS(attr "setxattr" "" HAVE_LIBATTR)
 +  IF(HAVE_LIBATTR)
 +    SET(CMAKE_REQUIRED_LIBRARIES "attr")
 +  ENDIF(HAVE_LIBATTR)
 +  CHECK_SYMBOL_EXISTS(EXTATTR_NAMESPACE_USER "sys/types.h;sys/extattr.h" HAVE_DECL_EXTATTR_NAMESPACE_USER)
 +  CHECK_FUNCTION_EXISTS_GLIBC(extattr_get_file HAVE_EXTATTR_GET_FILE)
 +  CHECK_FUNCTION_EXISTS_GLIBC(extattr_list_file HAVE_EXTATTR_LIST_FILE)
 +  CHECK_FUNCTION_EXISTS_GLIBC(extattr_set_fd HAVE_EXTATTR_SET_FD)
 +  CHECK_FUNCTION_EXISTS_GLIBC(extattr_set_file HAVE_EXTATTR_SET_FILE)
 +  CHECK_FUNCTION_EXISTS_GLIBC(fgetxattr HAVE_FGETXATTR)
 +  CHECK_FUNCTION_EXISTS_GLIBC(flistxattr HAVE_FLISTXATTR)
 +  CHECK_FUNCTION_EXISTS_GLIBC(fsetxattr HAVE_FSETXATTR)
 +  CHECK_FUNCTION_EXISTS_GLIBC(getxattr HAVE_GETXATTR)
 +  CHECK_FUNCTION_EXISTS_GLIBC(lgetxattr HAVE_LGETXATTR)
 +  CHECK_FUNCTION_EXISTS_GLIBC(listxattr HAVE_LISTXATTR)
 +  CHECK_FUNCTION_EXISTS_GLIBC(llistxattr HAVE_LLISTXATTR)
 +  CHECK_FUNCTION_EXISTS_GLIBC(lsetxattr HAVE_LSETXATTR)
 +  CHECK_FUNCTION_EXISTS_GLIBC(fgetea HAVE_FGETEA)
 +  CHECK_FUNCTION_EXISTS_GLIBC(flistea HAVE_FLISTEA)
 +  CHECK_FUNCTION_EXISTS_GLIBC(fsetea HAVE_FSETEA)
 +  CHECK_FUNCTION_EXISTS_GLIBC(getea HAVE_GETEA)
 +  CHECK_FUNCTION_EXISTS_GLIBC(lgetea HAVE_LGETEA)
 +  CHECK_FUNCTION_EXISTS_GLIBC(listea HAVE_LISTEA)
 +  CHECK_FUNCTION_EXISTS_GLIBC(llistea HAVE_LLISTEA)
 +  CHECK_FUNCTION_EXISTS_GLIBC(lsetea HAVE_LSETEA)
 +ELSE(ENABLE_XATTR)
 +  SET(HAVE_ATTR_LIB FALSE)
 +  SET(HAVE_ATTR_XATTR_H FALSE)
 +  SET(HAVE_DECL_EXTATTR_NAMESPACE_USER FALSE)
 +  SET(HAVE_EXTATTR_GET_FILE FALSE)
 +  SET(HAVE_EXTATTR_LIST_FILE FALSE)
 +  SET(HAVE_EXTATTR_SET_FD FALSE)
 +  SET(HAVE_EXTATTR_SET_FILE FALSE)
 +  SET(HAVE_FGETEA FALSE)
 +  SET(HAVE_FGETXATTR FALSE)
 +  SET(HAVE_FLISTEA FALSE)
 +  SET(HAVE_FLISTXATTR FALSE)
 +  SET(HAVE_FSETEA FALSE)
 +  SET(HAVE_FSETXATTR FALSE)
 +  SET(HAVE_GETEA FALSE)
 +  SET(HAVE_GETXATTR FALSE)
 +  SET(HAVE_LGETEA FALSE)
 +  SET(HAVE_LGETXATTR FALSE)
 +  SET(HAVE_LISTEA FALSE)
 +  SET(HAVE_LISTXATTR FALSE)
 +  SET(HAVE_LLISTEA FALSE)
 +  SET(HAVE_LLISTXATTR FALSE)
 +  SET(HAVE_LSETEA FALSE)
 +  SET(HAVE_LSETXATTR FALSE)
 +  SET(HAVE_SYS_EXTATTR_H FALSE)
 +  SET(HAVE_SYS_XATTR_H FALSE)
 +ENDIF(ENABLE_XATTR)
 +
 +#
 +# Check for ACL libraries, headers, and functions
 +#
 +# The ACL support in libarchive is written against the POSIX1e draft,
 +# which was never officially approved and varies quite a bit across
 +# platforms.  Worse, some systems have completely non-POSIX acl functions,
 +# which makes the following checks rather more complex than I would like.
 +#
 +IF(ENABLE_ACL)
 +  CHECK_LIBRARY_EXISTS(acl "acl_get_file" "" HAVE_LIBACL)
 +  IF(HAVE_LIBACL)
 +    SET(CMAKE_REQUIRED_LIBRARIES "acl")
 +    FIND_LIBRARY(ACL_LIBRARY NAMES acl)
 +    LIST(APPEND ADDITIONAL_LIBS ${ACL_LIBRARY})
 +  ENDIF(HAVE_LIBACL)
 +  #
 +  CHECK_FUNCTION_EXISTS_GLIBC(acl_create_entry HAVE_ACL_CREATE_ENTRY)
 +  CHECK_FUNCTION_EXISTS_GLIBC(acl_init HAVE_ACL_INIT)
 +  CHECK_FUNCTION_EXISTS_GLIBC(acl_set_fd HAVE_ACL_SET_FD)
 +  CHECK_FUNCTION_EXISTS_GLIBC(acl_set_fd_np HAVE_ACL_SET_FD_NP)
 +  CHECK_FUNCTION_EXISTS_GLIBC(acl_set_file HAVE_ACL_SET_FILE)
 +  CHECK_TYPE_EXISTS(acl_permset_t "${INCLUDES}"    HAVE_ACL_PERMSET_T)
 +
 +  # The "acl_get_perm()" function was omitted from the POSIX draft.
 +  # (It's a pretty obvious oversight; otherwise, there's no way to
 +  # test for specific permissions in a permset.)  Linux uses the obvious
 +  # name, FreeBSD adds _np to mark it as "non-Posix extension."
 +  # Test for both as a double-check that we really have POSIX-style ACL support.
 +  CHECK_FUNCTION_EXISTS(acl_get_perm HAVE_ACL_GET_PERM)
 +  CHECK_FUNCTION_EXISTS(acl_get_perm_np HAVE_ACL_GET_PERM_NP)
 +  CHECK_FUNCTION_EXISTS(acl_get_link HAVE_ACL_GET_LINK)
 +  CHECK_FUNCTION_EXISTS(acl_get_link_np HAVE_ACL_GET_LINK_NP)
 +  CHECK_FUNCTION_EXISTS(acl_is_trivial_np HAVE_ACL_IS_TRIVIAL_NP)
 +  CHECK_FUNCTION_EXISTS(acl_set_link_np HAVE_ACL_SET_LINK_NP)
 +
 +  # MacOS has an acl.h that isn't POSIX.  It can be detected by
 +  # checking for ACL_USER
 +  CHECK_SYMBOL_EXISTS(ACL_USER "${INCLUDES}" HAVE_ACL_USER)
 +ELSE(ENABLE_ACL)
 +  # If someone runs cmake, then disables ACL support, we need
 +  # to forcibly override the cached values for these.
 +  SET(HAVE_ACL_CREATE_ENTRY FALSE)
 +  SET(HAVE_ACL_GET_LINK FALSE)
 +  SET(HAVE_ACL_GET_LINK_NP FALSE)
 +  SET(HAVE_ACL_GET_PERM FALSE)
 +  SET(HAVE_ACL_GET_PERM_NP FALSE)
 +  SET(HAVE_ACL_INIT FALSE)
 +  SET(HAVE_ACL_LIB FALSE)
 +  SET(HAVE_ACL_PERMSET_T FALSE)
 +  SET(HAVE_ACL_SET_FD FALSE)
 +  SET(HAVE_ACL_SET_FD_NP FALSE)
 +  SET(HAVE_ACL_SET_FILE FALSE)
 +  SET(HAVE_ACL_USER FALSE)
 +ENDIF(ENABLE_ACL)
 +
 +#
 +# Check MD5/RMD160/SHA support
 +# NOTE: Crypto checks must be run last before generating config.h
 +#
 +CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA384;SHA512" LIBC)
 +CHECK_CRYPTO("SHA256;SHA384;SHA512" LIBC2)
 +CHECK_CRYPTO("SHA256;SHA384;SHA512" LIBC3)
 +CHECK_CRYPTO("MD5;SHA1;SHA256;SHA384;SHA512" LIBSYSTEM)
 +CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA384;SHA512" NETTLE)
 +CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA384;SHA512" OPENSSL)
 +
 +# Libmd has to be probed after OpenSSL.
 +CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA512" LIBMD)
 +
 +CHECK_CRYPTO_WIN("MD5;SHA1;SHA256;SHA384;SHA512")
 +
 +# Generate "config.h" from "build/cmake/config.h.in"
 +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
 +	${CMAKE_CURRENT_BINARY_DIR}/config.h)
 +INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 +ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 +
 +#
 +# Register installation of PDF documents.
 +#
 +IF(WIN32 AND NOT CYGWIN)
 +  #
 +  # On Windows platform, It's better that we install PDF documents
 +  # on one's computer.
 +  # These PDF documents are available in the release package.
 +  #
 +  IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doc/pdf)
 +    INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/pdf
 +            DESTINATION share/man
 +            FILES_MATCHING PATTERN "*.pdf"
 +    )
 +  ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doc/pdf)
 +ENDIF(WIN32 AND NOT CYGWIN)
 +#
 +#
 +#
 +INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/libarchive)
 +#
 +IF(MSVC)
 +  ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
 +ENDIF(MSVC)
 +
 +# We need CoreServices on Mac OS.
 +IF(APPLE)
 +  LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices")
 +ENDIF(APPLE)
 +
 +add_subdirectory(libarchive)
 +
 +install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive)
diff --cc Utilities/cmlibarchive/build/cmake/config.h.in
index 32a29d0,0000000..1abeaaa
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/build/cmake/config.h.in
+++ b/Utilities/cmlibarchive/build/cmake/config.h.in
@@@ -1,1157 -1,0 +1,1196 @@@
 +/* config.h.  Generated from build/cmake/config.h.in by cmake configure */
 +#if defined(__osf__)
 +# define _OSF_SOURCE
 +#endif
 +
 +/*
 + * Ensure we have C99-style int64_t, etc, all defined.
 + */
 +
 +/* First, we need to know if the system has already defined them. */
 +#cmakedefine HAVE_INT16_T
 +#cmakedefine HAVE_INT32_T
 +#cmakedefine HAVE_INT64_T
 +#cmakedefine HAVE_INTMAX_T
 +
 +#cmakedefine HAVE_UINT8_T
 +#cmakedefine HAVE_UINT16_T
 +#cmakedefine HAVE_UINT32_T
 +#cmakedefine HAVE_UINT64_T
 +#cmakedefine HAVE_UINTMAX_T
 +
 +/* We might have the types we want under other spellings. */
 +#cmakedefine HAVE___INT64
 +#cmakedefine HAVE_U_INT64_T
 +#cmakedefine HAVE_UNSIGNED___INT64
 +
 +/* The sizes of various standard integer types. */
 + at SIZE_OF_SHORT_CODE@
 + at SIZE_OF_INT_CODE@
 + at SIZE_OF_LONG_CODE@
 + at SIZE_OF_LONG_LONG_CODE@
 + at SIZE_OF_UNSIGNED_SHORT_CODE@
 + at SIZE_OF_UNSIGNED_CODE@
 + at SIZE_OF_UNSIGNED_LONG_CODE@
 + at SIZE_OF_UNSIGNED_LONG_LONG_CODE@
 +
 +/*
 + * If we lack int64_t, define it to the first of __int64, int, long, and long long
 + * that exists and is the right size.
 + */
 +#if !defined(HAVE_INT64_T) && defined(HAVE___INT64)
 +typedef __int64 int64_t;
 +#define HAVE_INT64_T
 +#endif
 +
 +#if !defined(HAVE_INT64_T) && SIZE_OF_INT == 8
 +typedef int int64_t;
 +#define HAVE_INT64_T
 +#endif
 +
 +#if !defined(HAVE_INT64_T) && SIZE_OF_LONG == 8
 +typedef long int64_t;
 +#define HAVE_INT64_T
 +#endif
 +
 +#if !defined(HAVE_INT64_T) && SIZE_OF_LONG_LONG == 8
 +typedef long long int64_t;
 +#define HAVE_INT64_T
 +#endif
 +
 +#if !defined(HAVE_INT64_T)
 +#error No 64-bit integer type was found.
 +#endif
 +
 +/*
 + * Similarly for int32_t
 + */
 +#if !defined(HAVE_INT32_T) && SIZE_OF_INT == 4
- typedef long int32_t;
++typedef int int32_t;
 +#define HAVE_INT32_T
 +#endif
 +
 +#if !defined(HAVE_INT32_T) && SIZE_OF_LONG == 4
 +typedef long int32_t;
 +#define HAVE_INT32_T
 +#endif
 +
 +#if !defined(HAVE_INT32_T)
 +#error No 32-bit integer type was found.
 +#endif
 +
 +/*
 + * Similarly for int16_t
 + */
 +#if !defined(HAVE_INT16_T) && SIZE_OF_INT == 2
 +typedef int int16_t;
 +#define HAVE_INT16_T
 +#endif
 +
 +#if !defined(HAVE_INT16_T) && SIZE_OF_SHORT == 2
 +typedef short int16_t;
 +#define HAVE_INT16_T
 +#endif
 +
 +#if !defined(HAVE_INT16_T)
 +#error No 16-bit integer type was found.
 +#endif
 +
 +/*
 + * Similarly for uint64_t
 + */
 +#if !defined(HAVE_UINT64_T) && defined(HAVE_UNSIGNED___INT64)
 +typedef unsigned __int64 uint64_t;
 +#define HAVE_UINT64_T
 +#endif
 +
 +#if !defined(HAVE_UINT64_T) && SIZE_OF_UNSIGNED == 8
 +typedef unsigned uint64_t;
 +#define HAVE_UINT64_T
 +#endif
 +
 +#if !defined(HAVE_UINT64_T) && SIZE_OF_UNSIGNED_LONG == 8
 +typedef unsigned long uint64_t;
 +#define HAVE_UINT64_T
 +#endif
 +
 +#if !defined(HAVE_UINT64_T) && SIZE_OF_UNSIGNED_LONG_LONG == 8
 +typedef unsigned long long uint64_t;
 +#define HAVE_UINT64_T
 +#endif
 +
 +#if !defined(HAVE_UINT64_T)
 +#error No 64-bit unsigned integer type was found.
 +#endif
 +
 +
 +/*
 + * Similarly for uint32_t
 + */
 +#if !defined(HAVE_UINT32_T) && SIZE_OF_UNSIGNED == 4
 +typedef unsigned uint32_t;
 +#define HAVE_UINT32_T
 +#endif
 +
 +#if !defined(HAVE_UINT32_T) && SIZE_OF_UNSIGNED_LONG == 4
 +typedef unsigned long uint32_t;
 +#define HAVE_UINT32_T
 +#endif
 +
 +#if !defined(HAVE_UINT32_T)
 +#error No 32-bit unsigned integer type was found.
 +#endif
 +
 +/*
 + * Similarly for uint16_t
 + */
 +#if !defined(HAVE_UINT16_T) && SIZE_OF_UNSIGNED == 2
 +typedef unsigned uint16_t;
 +#define HAVE_UINT16_T
 +#endif
 +
 +#if !defined(HAVE_UINT16_T) && SIZE_OF_UNSIGNED_SHORT == 2
 +typedef unsigned short uint16_t;
 +#define HAVE_UINT16_T
 +#endif
 +
 +#if !defined(HAVE_UINT16_T)
 +#error No 16-bit unsigned integer type was found.
 +#endif
 +
 +/*
 + * Similarly for uint8_t
 + */
 +#if !defined(HAVE_UINT8_T)
 +typedef unsigned char uint8_t;
 +#define HAVE_UINT8_T
 +#endif
 +
 +#if !defined(HAVE_UINT16_T)
 +#error No 8-bit unsigned integer type was found.
 +#endif
 +
 +/* Define intmax_t and uintmax_t if they are not already defined. */
 +#if !defined(HAVE_INTMAX_T)
 +typedef int64_t intmax_t;
 +#define INTMAX_MIN INT64_MIN
 +#define INTMAX_MAX INT64_MAX
 +#endif
 +
 +#if !defined(HAVE_UINTMAX_T)
 +typedef uint64_t uintmax_t;
 +#endif
 +
 +/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
 +#cmakedefine ZLIB_WINAPI 1
 +
 +/* MD5 via ARCHIVE_CRYPTO_MD5_LIBC supported. */
 +#cmakedefine ARCHIVE_CRYPTO_MD5_LIBC 1
 +
 +/* MD5 via ARCHIVE_CRYPTO_MD5_LIBSYSTEM supported. */
 +#cmakedefine ARCHIVE_CRYPTO_MD5_LIBSYSTEM 1
 +
 +/* MD5 via ARCHIVE_CRYPTO_MD5_NETTLE supported. */
 +#cmakedefine ARCHIVE_CRYPTO_MD5_NETTLE 1
 +
 +/* MD5 via ARCHIVE_CRYPTO_MD5_OPENSSL supported. */
 +#cmakedefine ARCHIVE_CRYPTO_MD5_OPENSSL 1
 +
 +/* MD5 via ARCHIVE_CRYPTO_MD5_WIN supported. */
 +#cmakedefine ARCHIVE_CRYPTO_MD5_WIN 1
 +
 +/* RMD160 via ARCHIVE_CRYPTO_RMD160_LIBC supported. */
 +#cmakedefine ARCHIVE_CRYPTO_RMD160_LIBC 1
 +
 +/* RMD160 via ARCHIVE_CRYPTO_RMD160_NETTLE supported. */
 +#cmakedefine ARCHIVE_CRYPTO_RMD160_NETTLE 1
 +
 +/* RMD160 via ARCHIVE_CRYPTO_RMD160_OPENSSL supported. */
 +#cmakedefine ARCHIVE_CRYPTO_RMD160_OPENSSL 1
 +
 +/* SHA1 via ARCHIVE_CRYPTO_SHA1_LIBC supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA1_LIBC 1
 +
 +/* SHA1 via ARCHIVE_CRYPTO_SHA1_LIBSYSTEM supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA1_LIBSYSTEM 1
 +
 +/* SHA1 via ARCHIVE_CRYPTO_SHA1_NETTLE supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA1_NETTLE 1
 +
 +/* SHA1 via ARCHIVE_CRYPTO_SHA1_OPENSSL supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA1_OPENSSL 1
 +
 +/* SHA1 via ARCHIVE_CRYPTO_SHA1_WIN supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA1_WIN 1
 +
 +/* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBC supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA256_LIBC 1
 +
 +/* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBC2 supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA256_LIBC2 1
 +
 +/* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBC3 supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA256_LIBC3 1
 +
 +/* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBSYSTEM supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA256_LIBSYSTEM 1
 +
 +/* SHA256 via ARCHIVE_CRYPTO_SHA256_NETTLE supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA256_NETTLE 1
 +
 +/* SHA256 via ARCHIVE_CRYPTO_SHA256_OPENSSL supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA256_OPENSSL 1
 +
 +/* SHA256 via ARCHIVE_CRYPTO_SHA256_WIN supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA256_WIN 1
 +
 +/* SHA384 via ARCHIVE_CRYPTO_SHA384_LIBC supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA384_LIBC 1
 +
 +/* SHA384 via ARCHIVE_CRYPTO_SHA384_LIBC2 supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA384_LIBC2 1
 +
 +/* SHA384 via ARCHIVE_CRYPTO_SHA384_LIBC3 supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA384_LIBC3 1
 +
 +/* SHA384 via ARCHIVE_CRYPTO_SHA384_LIBSYSTEM supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA384_LIBSYSTEM 1
 +
 +/* SHA384 via ARCHIVE_CRYPTO_SHA384_NETTLE supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA384_NETTLE 1
 +
 +/* SHA384 via ARCHIVE_CRYPTO_SHA384_OPENSSL supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA384_OPENSSL 1
 +
 +/* SHA384 via ARCHIVE_CRYPTO_SHA384_WIN supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA384_WIN 1
 +
 +/* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBC supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA512_LIBC 1
 +
 +/* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBC2 supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA512_LIBC2 1
 +
 +/* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBC3 supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA512_LIBC3 1
 +
 +/* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBSYSTEM supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA512_LIBSYSTEM 1
 +
 +/* SHA512 via ARCHIVE_CRYPTO_SHA512_NETTLE supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA512_NETTLE 1
 +
 +/* SHA512 via ARCHIVE_CRYPTO_SHA512_OPENSSL supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA512_OPENSSL 1
 +
 +/* SHA512 via ARCHIVE_CRYPTO_SHA512_WIN supported. */
 +#cmakedefine ARCHIVE_CRYPTO_SHA512_WIN 1
 +
 +/* Version number of bsdcpio */
 +#cmakedefine BSDCPIO_VERSION_STRING "${BSDCPIO_VERSION_STRING}"
 +
 +/* Version number of bsdtar */
 +#cmakedefine BSDTAR_VERSION_STRING "${BSDTAR_VERSION_STRING}"
 +
 +/* Version number of bsdcat */
 +#cmakedefine BSDCAT_VERSION_STRING "${BSDCAT_VERSION_STRING}"
 +
 +/* Define to 1 if you have the `acl_create_entry' function. */
 +#cmakedefine HAVE_ACL_CREATE_ENTRY 1
 +
 +/* Define to 1 if you have the `acl_get_link' function. */
 +#cmakedefine HAVE_ACL_GET_LINK 1
 +
 +/* Define to 1 if you have the `acl_get_link_np' function. */
 +#cmakedefine HAVE_ACL_GET_LINK_NP 1
 +
 +/* Define to 1 if you have the `acl_get_perm' function. */
 +#cmakedefine HAVE_ACL_GET_PERM 1
 +
 +/* Define to 1 if you have the `acl_get_perm_np' function. */
 +#cmakedefine HAVE_ACL_GET_PERM_NP 1
 +
 +/* Define to 1 if you have the `acl_init' function. */
 +#cmakedefine HAVE_ACL_INIT 1
 +
 +/* Define to 1 if you have the <acl/libacl.h> header file. */
 +#cmakedefine HAVE_ACL_LIBACL_H 1
 +
 +/* Define to 1 if the system has the type `acl_permset_t'. */
 +#cmakedefine HAVE_ACL_PERMSET_T 1
 +
 +/* Define to 1 if you have the `acl_set_fd' function. */
 +#cmakedefine HAVE_ACL_SET_FD 1
 +
 +/* Define to 1 if you have the `acl_set_fd_np' function. */
 +#cmakedefine HAVE_ACL_SET_FD_NP 1
 +
 +/* Define to 1 if you have the `acl_set_file' function. */
 +#cmakedefine HAVE_ACL_SET_FILE 1
 +
 +/* True for systems with POSIX ACL support */
 +#cmakedefine HAVE_ACL_USER 1
 +
++/* Define to 1 if you have the `arc4random_buf' function. */
++#cmakedefine HAVE_ARC4RANDOM_BUF 1
++
 +/* Define to 1 if you have the <attr/xattr.h> header file. */
 +#cmakedefine HAVE_ATTR_XATTR_H 1
 +
++/* Define to 1 if you have the <Bcrypt.h> header file. */
++#cmakedefine HAVE_BCRYPT_H 1
++
 +/* Define to 1 if you have the <bsdxml.h> header file. */
 +#cmakedefine HAVE_BSDXML_H 1
 +
 +/* Define to 1 if you have the <bzlib.h> header file. */
 +#cmakedefine HAVE_BZLIB_H 1
 +
 +/* Define to 1 if you have the `chflags' function. */
 +#cmakedefine HAVE_CHFLAGS 1
 +
 +/* Define to 1 if you have the `chown' function. */
 +#cmakedefine HAVE_CHOWN 1
 +
 +/* Define to 1 if you have the `chroot' function. */
 +#cmakedefine HAVE_CHROOT 1
 +
 +/* Define to 1 if you have the <copyfile.h> header file. */
 +#cmakedefine HAVE_COPYFILE_H 1
 +
 +/* Define to 1 if you have the `ctime_r' function. */
 +#cmakedefine HAVE_CTIME_R 1
 +
 +/* Define to 1 if you have the <ctype.h> header file. */
 +#cmakedefine HAVE_CTYPE_H 1
 +
 +/* Define to 1 if you have the `cygwin_conv_path' function. */
 +#cmakedefine HAVE_CYGWIN_CONV_PATH 1
 +
 +/* Define to 1 if you have the declaration of `INT64_MAX', and to 0 if you
 +   don't. */
 +#cmakedefine HAVE_DECL_INT64_MAX 1
 +
 +/* Define to 1 if you have the declaration of `INT64_MIN', and to 0 if you
 +   don't. */
 +#cmakedefine HAVE_DECL_INT64_MIN 1
 +
 +/* Define to 1 if you have the declaration of `SIZE_MAX', and to 0 if you
 +   don't. */
 +#cmakedefine HAVE_DECL_SIZE_MAX 1
 +
 +/* Define to 1 if you have the declaration of `SSIZE_MAX', and to 0 if you
 +   don't. */
 +#cmakedefine HAVE_DECL_SSIZE_MAX 1
 +
 +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
 +   don't. */
 +#cmakedefine HAVE_DECL_STRERROR_R 1
 +
 +/* Define to 1 if you have the declaration of `UINT32_MAX', and to 0 if you
 +   don't. */
 +#cmakedefine HAVE_DECL_UINT32_MAX 1
 +
 +/* Define to 1 if you have the declaration of `UINT64_MAX', and to 0 if you
 +   don't. */
 +#cmakedefine HAVE_DECL_UINT64_MAX 1
 +
 +/* Define to 1 if you have the <direct.h> header file. */
 +#cmakedefine HAVE_DIRECT_H 1
 +
 +/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
 +   */
 +#cmakedefine HAVE_DIRENT_H 1
 +
 +/* Define to 1 if you have the `dirfd' function. */
 +#cmakedefine HAVE_DIRFD 1
 +
 +/* Define to 1 if you have the <dlfcn.h> header file. */
 +#cmakedefine HAVE_DLFCN_H 1
 +
 +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 +#cmakedefine HAVE_DOPRNT 1
 +
 +/* Define to 1 if nl_langinfo supports D_MD_ORDER */
 +#cmakedefine HAVE_D_MD_ORDER 1
 +
 +/* A possible errno value for invalid file format errors */
 +#cmakedefine HAVE_EFTYPE 1
 +
 +/* A possible errno value for invalid file format errors */
 +#cmakedefine HAVE_EILSEQ 1
 +
 +/* Define to 1 if you have the <errno.h> header file. */
 +#cmakedefine HAVE_ERRNO_H 1
 +
 +/* Define to 1 if you have the <expat.h> header file. */
 +#cmakedefine HAVE_EXPAT_H 1
 +
 +/* Define to 1 if you have the <ext2fs/ext2_fs.h> header file. */
 +#cmakedefine HAVE_EXT2FS_EXT2_FS_H 1
 +
 +/* Define to 1 if you have the `extattr_get_file' function. */
 +#cmakedefine HAVE_EXTATTR_GET_FILE 1
 +
 +/* Define to 1 if you have the `extattr_list_file' function. */
 +#cmakedefine HAVE_EXTATTR_LIST_FILE 1
 +
 +/* Define to 1 if you have the `extattr_set_fd' function. */
 +#cmakedefine HAVE_EXTATTR_SET_FD 1
 +
 +/* Define to 1 if you have the `extattr_set_file' function. */
 +#cmakedefine HAVE_EXTATTR_SET_FILE 1
 +
 +/* Define to 1 if EXTATTR_NAMESPACE_USER is defined in sys/extattr.h. */
 +#cmakedefine HAVE_DECL_EXTATTR_NAMESPACE_USER 1
 +
 +/* Define to 1 if you have the `fchdir' function. */
 +#cmakedefine HAVE_FCHDIR 1
 +
 +/* Define to 1 if you have the `fchflags' function. */
 +#cmakedefine HAVE_FCHFLAGS 1
 +
 +/* Define to 1 if you have the `fchmod' function. */
 +#cmakedefine HAVE_FCHMOD 1
 +
 +/* Define to 1 if you have the `fchown' function. */
 +#cmakedefine HAVE_FCHOWN 1
 +
 +/* Define to 1 if you have the `fcntl' function. */
 +#cmakedefine HAVE_FCNTL 1
 +
 +/* Define to 1 if you have the <fcntl.h> header file. */
 +#cmakedefine HAVE_FCNTL_H 1
 +
 +/* Define to 1 if you have the `fdopendir' function. */
 +#cmakedefine HAVE_FDOPENDIR 1
 +
 +/* Define to 1 if you have the `fgetea' function. */
 +#cmakedefine HAVE_FGETEA 1
 +
 +/* Define to 1 if you have the `fgetxattr' function. */
 +#cmakedefine HAVE_FGETXATTR 1
 +
 +/* Define to 1 if you have the `flistea' function. */
 +#cmakedefine HAVE_FLISTEA 1
 +
 +/* Define to 1 if you have the `flistxattr' function. */
 +#cmakedefine HAVE_FLISTXATTR 1
 +
 +/* Define to 1 if you have the `fork' function. */
 +#cmakedefine HAVE_FORK 1
 +
 +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 +#cmakedefine HAVE_FSEEKO 1
 +
 +/* Define to 1 if you have the `fsetea' function. */
 +#cmakedefine HAVE_FSETEA 1
 +
 +/* Define to 1 if you have the `fsetxattr' function. */
 +#cmakedefine HAVE_FSETXATTR 1
 +
 +/* Define to 1 if you have the `fstat' function. */
 +#cmakedefine HAVE_FSTAT 1
 +
 +/* Define to 1 if you have the `fstatat' function. */
 +#cmakedefine HAVE_FSTATAT 1
 +
 +/* Define to 1 if you have the `fstatfs' function. */
 +#cmakedefine HAVE_FSTATFS 1
 +
 +/* Define to 1 if you have the `fstatvfs' function. */
 +#cmakedefine HAVE_FSTATVFS 1
 +
 +/* Define to 1 if you have the `ftruncate' function. */
 +#cmakedefine HAVE_FTRUNCATE 1
 +
 +/* Define to 1 if you have the `futimens' function. */
 +#cmakedefine HAVE_FUTIMENS 1
 +
 +/* Define to 1 if you have the `futimes' function. */
 +#cmakedefine HAVE_FUTIMES 1
 +
 +/* Define to 1 if you have the `futimesat' function. */
 +#cmakedefine HAVE_FUTIMESAT 1
 +
 +/* Define to 1 if you have the `getea' function. */
 +#cmakedefine HAVE_GETEA 1
 +
 +/* Define to 1 if you have the `geteuid' function. */
 +#cmakedefine HAVE_GETEUID 1
 +
 +/* Define to 1 if you have the `getgrgid_r' function. */
 +#cmakedefine HAVE_GETGRGID_R 1
 +
 +/* Define to 1 if you have the `getgrnam_r' function. */
 +#cmakedefine HAVE_GETGRNAM_R 1
 +
 +/* Define to 1 if you have the `getpid' function. */
 +#cmakedefine HAVE_GETPID 1
 +
 +/* Define to 1 if you have the `getpwnam_r' function. */
 +#cmakedefine HAVE_GETPWNAM_R 1
 +
 +/* Define to 1 if you have the `getpwuid_r' function. */
 +#cmakedefine HAVE_GETPWUID_R 1
 +
 +/* Define to 1 if you have the `getvfsbyname' function. */
 +#cmakedefine HAVE_GETVFSBYNAME 1
 +
 +/* Define to 1 if you have the `getxattr' function. */
 +#cmakedefine HAVE_GETXATTR 1
 +
 +/* Define to 1 if you have the `gmtime_r' function. */
 +#cmakedefine HAVE_GMTIME_R 1
 +
 +/* Define to 1 if you have the <grp.h> header file. */
 +#cmakedefine HAVE_GRP_H 1
 +
 +/* Define to 1 if you have the `iconv' function. */
 +#cmakedefine HAVE_ICONV 1
 +
 +/* Define to 1 if you have the <iconv.h> header file. */
 +#cmakedefine HAVE_ICONV_H 1
 +
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#cmakedefine HAVE_INTTYPES_H 1
 +
 +/* Define to 1 if you have the <io.h> header file. */
 +#cmakedefine HAVE_IO_H 1
 +
 +/* Define to 1 if you have the <langinfo.h> header file. */
 +#cmakedefine HAVE_LANGINFO_H 1
 +
 +/* Define to 1 if you have the `lchflags' function. */
 +#cmakedefine HAVE_LCHFLAGS 1
 +
 +/* Define to 1 if you have the `lchmod' function. */
 +#cmakedefine HAVE_LCHMOD 1
 +
 +/* Define to 1 if you have the `lchown' function. */
 +#cmakedefine HAVE_LCHOWN 1
 +
 +/* Define to 1 if you have the `lgetea' function. */
 +#cmakedefine HAVE_LGETEA 1
 +
 +/* Define to 1 if you have the `lgetxattr' function. */
 +#cmakedefine HAVE_LGETXATTR 1
 +
 +/* Define to 1 if you have the `acl' library (-lacl). */
 +#cmakedefine HAVE_LIBACL 1
 +
 +/* Define to 1 if you have the `attr' library (-lattr). */
 +#cmakedefine HAVE_LIBATTR 1
 +
 +/* Define to 1 if you have the `bsdxml' library (-lbsdxml). */
 +#cmakedefine HAVE_LIBBSDXML 1
 +
 +/* Define to 1 if you have the `bz2' library (-lbz2). */
 +#cmakedefine HAVE_LIBBZ2 1
 +
++/* Define to 1 if you have the `charset' library (-lcharset). */
++#cmakedefine HAVE_LIBCHARSET 1
++
++/* Define to 1 if you have the `crypto' library (-lcrypto). */
++#cmakedefine HAVE_LIBCRYPTO 1
++
 +/* Define to 1 if you have the `expat' library (-lexpat). */
 +#cmakedefine HAVE_LIBEXPAT 1
 +
 +/* Define to 1 if you have the `gcc' library (-lgcc). */
 +#cmakedefine HAVE_LIBGCC 1
 +
++/* Define to 1 if you have the `lz4' library (-llz4). */
++#cmakedefine HAVE_LIBLZ4 1
++
 +/* Define to 1 if you have the `lzma' library (-llzma). */
 +#cmakedefine HAVE_LIBLZMA 1
 +
 +/* Define to 1 if you have the `lzmadec' library (-llzmadec). */
 +#cmakedefine HAVE_LIBLZMADEC 1
 +
 +/* Define to 1 if you have the `lzo2' library (-llzo2). */
 +#cmakedefine HAVE_LIBLZO2 1
 +
 +/* Define to 1 if you have the `nettle' library (-lnettle). */
 +#cmakedefine HAVE_LIBNETTLE 1
 +
 +/* Define to 1 if you have the `pcre' library (-lpcre). */
 +#cmakedefine HAVE_LIBPCRE 1
 +
 +/* Define to 1 if you have the `pcreposix' library (-lpcreposix). */
 +#cmakedefine HAVE_LIBPCREPOSIX 1
 +
 +/* Define to 1 if you have the `xml2' library (-lxml2). */
 +#cmakedefine HAVE_LIBXML2 1
 +
 +/* Define to 1 if you have the <libxml/xmlreader.h> header file. */
 +#cmakedefine HAVE_LIBXML_XMLREADER_H 1
 +
 +/* Define to 1 if you have the <libxml/xmlwriter.h> header file. */
 +#cmakedefine HAVE_LIBXML_XMLWRITER_H 1
 +
 +/* Define to 1 if you have the `z' library (-lz). */
 +#cmakedefine HAVE_LIBZ 1
 +
 +/* Define to 1 if you have the <limits.h> header file. */
 +#cmakedefine HAVE_LIMITS_H 1
 +
 +/* Define to 1 if you have the `link' function. */
 +#cmakedefine HAVE_LINK 1
 +
 +/* Define to 1 if you have the <linux/types.h> header file. */
 +#cmakedefine HAVE_LINUX_TYPES_H 1
 +
 +/* Define to 1 if you have the <linux/fiemap.h> header file. */
 +#cmakedefine HAVE_LINUX_FIEMAP_H 1
 +
 +/* Define to 1 if you have the <linux/fs.h> header file. */
 +#cmakedefine HAVE_LINUX_FS_H 1
 +
 +/* Define to 1 if you have the <linux/magic.h> header file. */
 +#cmakedefine HAVE_LINUX_MAGIC_H 1
 +
 +/* Define to 1 if you have the <linux/types.h> header file. */
 +#cmakedefine HAVE_LINUX_TYPES_H 1
 +
 +/* Define to 1 if you have the `listea' function. */
 +#cmakedefine HAVE_LISTEA 1
 +
 +/* Define to 1 if you have the `listxattr' function. */
 +#cmakedefine HAVE_LISTXATTR 1
 +
 +/* Define to 1 if you have the `llistea' function. */
 +#cmakedefine HAVE_LLISTEA 1
 +
 +/* Define to 1 if you have the `llistxattr' function. */
 +#cmakedefine HAVE_LLISTXATTR 1
 +
 +/* Define to 1 if you have the <localcharset.h> header file. */
 +#cmakedefine HAVE_LOCALCHARSET_H 1
 +
 +/* Define to 1 if you have the `locale_charset' function. */
 +#cmakedefine HAVE_LOCALE_CHARSET 1
 +
 +/* Define to 1 if you have the <locale.h> header file. */
 +#cmakedefine HAVE_LOCALE_H 1
 +
 +/* Define to 1 if you have the `localtime_r' function. */
 +#cmakedefine HAVE_LOCALTIME_R 1
 +
 +/* Define to 1 if the system has the type `long long int'. */
 +#cmakedefine HAVE_LONG_LONG_INT 1
 +
 +/* Define to 1 if you have the `lsetea' function. */
 +#cmakedefine HAVE_LSETEA 1
 +
 +/* Define to 1 if you have the `lsetxattr' function. */
 +#cmakedefine HAVE_LSETXATTR 1
 +
 +/* Define to 1 if you have the `lstat' function. */
 +#cmakedefine HAVE_LSTAT 1
 +
 +/* Define to 1 if `lstat' has the bug that it succeeds when given the
 +   zero-length file name argument. */
 +#cmakedefine HAVE_LSTAT_EMPTY_STRING_BUG 1
 +
 +/* Define to 1 if you have the `lutimes' function. */
 +#cmakedefine HAVE_LUTIMES 1
 +
++/* Define to 1 if you have the <lz4hc.h> header file. */
++#cmakedefine HAVE_LZ4HC_H 1
++
++/* Define to 1 if you have the <lz4.h> header file. */
++#cmakedefine HAVE_LZ4_H 1
++
 +/* Define to 1 if you have the <lzmadec.h> header file. */
 +#cmakedefine HAVE_LZMADEC_H 1
 +
 +/* Define to 1 if you have the <lzma.h> header file. */
 +#cmakedefine HAVE_LZMA_H 1
 +
 +/* Define to 1 if you have the <lzo/lzo1x.h> header file. */
 +#cmakedefine HAVE_LZO_LZO1X_H 1
 +
 +/* Define to 1 if you have the <lzo/lzoconf.h> header file. */
 +#cmakedefine HAVE_LZO_LZOCONF_H 1
 +
 +/* Define to 1 if you have the `mbrtowc' function. */
 +#cmakedefine HAVE_MBRTOWC 1
 +
 +/* Define to 1 if you have the `memmove' function. */
 +#cmakedefine HAVE_MEMMOVE 1
 +
 +/* Define to 1 if you have the <memory.h> header file. */
 +#cmakedefine HAVE_MEMORY_H 1
 +
 +/* Define to 1 if you have the `mkdir' function. */
 +#cmakedefine HAVE_MKDIR 1
 +
 +/* Define to 1 if you have the `mkfifo' function. */
 +#cmakedefine HAVE_MKFIFO 1
 +
 +/* Define to 1 if you have the `mknod' function. */
 +#cmakedefine HAVE_MKNOD 1
 +
 +/* Define to 1 if you have the `mkstemp' function. */
 +#cmakedefine HAVE_MKSTEMP 1
 +
 +/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 +#cmakedefine HAVE_NDIR_H 1
 +
 +/* Define to 1 if you have the <nettle/md5.h> header file. */
 +#cmakedefine HAVE_NETTLE_MD5_H 1
 +
++/* Define to 1 if you have the <nettle/pbkdf2.h> header file. */
++#cmakedefine HAVE_NETTLE_PBKDF2_H 1
++
 +/* Define to 1 if you have the <nettle/ripemd160.h> header file. */
 +#cmakedefine HAVE_NETTLE_RIPEMD160_H 1
 +
 +/* Define to 1 if you have the <nettle/sha.h> header file. */
 +#cmakedefine HAVE_NETTLE_SHA_H 1
 +
 +/* Define to 1 if you have the `nl_langinfo' function. */
 +#cmakedefine HAVE_NL_LANGINFO 1
 +
 +/* Define to 1 if you have the `openat' function. */
 +#cmakedefine HAVE_OPENAT 1
 +
 +/* Define to 1 if you have the <paths.h> header file. */
 +#cmakedefine HAVE_PATHS_H 1
 +
 +/* Define to 1 if you have the <pcreposix.h> header file. */
 +#cmakedefine HAVE_PCREPOSIX_H 1
 +
 +/* Define to 1 if you have the `pipe' function. */
 +#cmakedefine HAVE_PIPE 1
 +
++/* Define to 1 if you have the `PKCS5_PBKDF2_HMAC_SHA1' function. */
++#cmakedefine HAVE_PKCS5_PBKDF2_HMAC_SHA1 1
++
 +/* Define to 1 if you have the `poll' function. */
 +#cmakedefine HAVE_POLL 1
 +
 +/* Define to 1 if you have the <poll.h> header file. */
 +#cmakedefine HAVE_POLL_H 1
 +
 +/* Define to 1 if you have the `posix_spawnp' function. */
 +#cmakedefine HAVE_POSIX_SPAWNP 1
 +
 +/* Define to 1 if you have the <process.h> header file. */
 +#cmakedefine HAVE_PROCESS_H 1
 +
++/* Define to 1 if you have the <pthread.h> header file. */
++#cmakedefine HAVE_PTHREAD_H 1
++
 +/* Define to 1 if you have the <pwd.h> header file. */
 +#cmakedefine HAVE_PWD_H 1
 +
 +/* Define to 1 if you have the `readdir_r' function. */
 +#cmakedefine HAVE_READDIR_R 1
 +
 +/* Define to 1 if you have the `readlink' function. */
 +#cmakedefine HAVE_READLINK 1
 +
 +/* Define to 1 if you have the `readlinkat' function. */
 +#cmakedefine HAVE_READLINKAT 1
 +
++/* Define to 1 if you have the `readpassphrase' function. */
++#cmakedefine HAVE_READPASSPHRASE 1
++
++/* Define to 1 if you have the <readpassphrase.h> header file. */
++#cmakedefine HAVE_READPASSPHRASE_H 1
++
 +/* Define to 1 if you have the <regex.h> header file. */
 +#cmakedefine HAVE_REGEX_H 1
 +
 +/* Define to 1 if you have the `select' function. */
 +#cmakedefine HAVE_SELECT 1
 +
 +/* Define to 1 if you have the `setenv' function. */
 +#cmakedefine HAVE_SETENV 1
 +
 +/* Define to 1 if you have the `setlocale' function. */
 +#cmakedefine HAVE_SETLOCALE 1
 +
 +/* Define to 1 if you have the `sigaction' function. */
 +#cmakedefine HAVE_SIGACTION 1
 +
 +/* Define to 1 if you have the <signal.h> header file. */
 +#cmakedefine HAVE_SIGNAL_H 1
 +
 +/* Define to 1 if you have the <spawn.h> header file. */
 +#cmakedefine HAVE_SPAWN_H 1
 +
 +/* Define to 1 if you have the `statfs' function. */
 +#cmakedefine HAVE_STATFS 1
 +
 +/* Define to 1 if you have the `statvfs' function. */
 +#cmakedefine HAVE_STATVFS 1
 +
 +/* Define to 1 if `stat' has the bug that it succeeds when given the
 +   zero-length file name argument. */
 +#cmakedefine HAVE_STAT_EMPTY_STRING_BUG 1
 +
 +/* Define to 1 if you have the <stdarg.h> header file. */
 +#cmakedefine HAVE_STDARG_H 1
 +
 +/* Define to 1 if you have the <stdint.h> header file. */
 +#cmakedefine HAVE_STDINT_H 1
 +
 +/* Define to 1 if you have the <stdlib.h> header file. */
 +#cmakedefine HAVE_STDLIB_H 1
 +
 +/* Define to 1 if you have the `strchr' function. */
 +#cmakedefine HAVE_STRCHR 1
 +
 +/* Define to 1 if you have the `strdup' function. */
 +#cmakedefine HAVE_STRDUP 1
 +
 +/* Define to 1 if you have the `strerror' function. */
 +#cmakedefine HAVE_STRERROR 1
 +
 +/* Define to 1 if you have the `strerror_r' function. */
 +#cmakedefine HAVE_STRERROR_R 1
 +
 +/* Define to 1 if you have the `strftime' function. */
 +#cmakedefine HAVE_STRFTIME 1
 +
 +/* Define to 1 if you have the <strings.h> header file. */
 +#cmakedefine HAVE_STRINGS_H 1
 +
 +/* Define to 1 if you have the <string.h> header file. */
 +#cmakedefine HAVE_STRING_H 1
 +
 +/* Define to 1 if you have the `strrchr' function. */
 +#cmakedefine HAVE_STRRCHR 1
 +
 +/* Define to 1 if `f_namemax' is a member of `struct statfs'. */
 +#cmakedefine HAVE_STRUCT_STATFS_F_NAMEMAX 1
 +
 +/* Define to 1 if `f_iosize' is a member of `struct statvfs'. */
 +#cmakedefine HAVE_STRUCT_STATVFS_F_IOSIZE 1
 +
 +/* Define to 1 if `st_birthtime' is a member of `struct stat'. */
 +#cmakedefine HAVE_STRUCT_STAT_ST_BIRTHTIME 1
 +
 +/* Define to 1 if `st_birthtimespec.tv_nsec' is a member of `struct stat'. */
 +#cmakedefine HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
 +
 +/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 +#cmakedefine HAVE_STRUCT_STAT_ST_BLKSIZE 1
 +
 +/* Define to 1 if `st_flags' is a member of `struct stat'. */
 +#cmakedefine HAVE_STRUCT_STAT_ST_FLAGS 1
 +
 +/* Define to 1 if `st_mtimespec.tv_nsec' is a member of `struct stat'. */
 +#cmakedefine HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
 +
 +/* Define to 1 if `st_mtime_n' is a member of `struct stat'. */
 +#cmakedefine HAVE_STRUCT_STAT_ST_MTIME_N 1
 +
 +/* Define to 1 if `st_mtime_usec' is a member of `struct stat'. */
 +#cmakedefine HAVE_STRUCT_STAT_ST_MTIME_USEC 1
 +
 +/* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */
 +#cmakedefine HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
 +
 +/* Define to 1 if `st_umtime' is a member of `struct stat'. */
 +#cmakedefine HAVE_STRUCT_STAT_ST_UMTIME 1
 +
 +/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
 +#cmakedefine HAVE_STRUCT_TM_TM_GMTOFF 1
 +
 +/* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */
 +#cmakedefine HAVE_STRUCT_TM___TM_GMTOFF 1
 +
 +/* Define to 1 if you have the `symlink' function. */
 +#cmakedefine HAVE_SYMLINK 1
 +
 +/* Define to 1 if you have the <sys/acl.h> header file. */
 +#cmakedefine HAVE_SYS_ACL_H 1
 +
 +/* Define to 1 if you have the <sys/cdefs.h> header file. */
 +#cmakedefine HAVE_SYS_CDEFS_H 1
 +
 +/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
 +   */
 +#cmakedefine HAVE_SYS_DIR_H 1
 +
 +/* Define to 1 if you have the <sys/ea.h> header file. */
 +#cmakedefine HAVE_SYS_EA_H 1
 +
 +/* Define to 1 if you have the <sys/extattr.h> header file. */
 +#cmakedefine HAVE_SYS_EXTATTR_H 1
 +
 +/* Define to 1 if you have the <sys/ioctl.h> header file. */
 +#cmakedefine HAVE_SYS_IOCTL_H 1
 +
 +/* Define to 1 if you have the <sys/mkdev.h> header file. */
 +#cmakedefine HAVE_SYS_MKDEV_H 1
 +
 +/* Define to 1 if you have the <sys/mount.h> header file. */
 +#cmakedefine HAVE_SYS_MOUNT_H 1
 +
 +/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
 +   */
 +#cmakedefine HAVE_SYS_NDIR_H 1
 +
 +/* Define to 1 if you have the <sys/param.h> header file. */
 +#cmakedefine HAVE_SYS_PARAM_H 1
 +
 +/* Define to 1 if you have the <sys/poll.h> header file. */
 +#cmakedefine HAVE_SYS_POLL_H 1
 +
 +/* Define to 1 if you have the <sys/select.h> header file. */
 +#cmakedefine HAVE_SYS_SELECT_H 1
 +
 +/* Define to 1 if you have the <sys/statfs.h> header file. */
 +#cmakedefine HAVE_SYS_STATFS_H 1
 +
 +/* Define to 1 if you have the <sys/statvfs.h> header file. */
 +#cmakedefine HAVE_SYS_STATVFS_H 1
 +
 +/* Define to 1 if you have the <sys/stat.h> header file. */
 +#cmakedefine HAVE_SYS_STAT_H 1
 +
 +/* Define to 1 if you have the <sys/time.h> header file. */
 +#cmakedefine HAVE_SYS_TIME_H 1
 +
 +/* Define to 1 if you have the <sys/types.h> header file. */
 +#cmakedefine HAVE_SYS_TYPES_H 1
 +
 +/* Define to 1 if you have the <sys/utime.h> header file. */
 +#cmakedefine HAVE_SYS_UTIME_H 1
 +
 +/* Define to 1 if you have the <sys/utsname.h> header file. */
 +#cmakedefine HAVE_SYS_UTSNAME_H 1
 +
 +/* Define to 1 if you have the <sys/vfs.h> header file. */
 +#cmakedefine HAVE_SYS_VFS_H 1
 +
 +/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 +#cmakedefine HAVE_SYS_WAIT_H 1
 +
 +/* Define to 1 if you have the <sys/xattr.h> header file. */
 +#cmakedefine HAVE_SYS_XATTR_H 1
 +
 +/* Define to 1 if you have the `timegm' function. */
 +#cmakedefine HAVE_TIMEGM 1
 +
 +/* Define to 1 if you have the <time.h> header file. */
 +#cmakedefine HAVE_TIME_H 1
 +
 +/* Define to 1 if you have the `tzset' function. */
 +#cmakedefine HAVE_TZSET 1
 +
 +/* Define to 1 if you have the <unistd.h> header file. */
 +#cmakedefine HAVE_UNISTD_H 1
 +
 +/* Define to 1 if you have the `unsetenv' function. */
 +#cmakedefine HAVE_UNSETENV 1
 +
 +/* Define to 1 if the system has the type `unsigned long long'. */
 +#cmakedefine HAVE_UNSIGNED_LONG_LONG 1
 +
 +/* Define to 1 if the system has the type `unsigned long long int'. */
 +#cmakedefine HAVE_UNSIGNED_LONG_LONG_INT 1
 +
 +/* Define to 1 if you have the `utime' function. */
 +#cmakedefine HAVE_UTIME 1
 +
 +/* Define to 1 if you have the `utimensat' function. */
 +#cmakedefine HAVE_UTIMENSAT 1
 +
 +/* Define to 1 if you have the `utimes' function. */
 +#cmakedefine HAVE_UTIMES 1
 +
 +/* Define to 1 if you have the <utime.h> header file. */
 +#cmakedefine HAVE_UTIME_H 1
 +
 +/* Define to 1 if you have the `vfork' function. */
 +#cmakedefine HAVE_VFORK 1
 +
 +/* Define to 1 if you have the `vprintf' function. */
 +#cmakedefine HAVE_VPRINTF 1
 +
 +/* Define to 1 if you have the <wchar.h> header file. */
 +#cmakedefine HAVE_WCHAR_H 1
 +
 +/* Define to 1 if the system has the type `wchar_t'. */
 +#cmakedefine HAVE_WCHAR_T 1
 +
 +/* Define to 1 if you have the `wcrtomb' function. */
 +#cmakedefine HAVE_WCRTOMB 1
 +
 +/* Define to 1 if you have the `wcscmp' function. */
 +#cmakedefine HAVE_WCSCMP 1
 +
 +/* Define to 1 if you have the `wcscpy' function. */
 +#cmakedefine HAVE_WCSCPY 1
 +
 +/* Define to 1 if you have the `wcslen' function. */
 +#cmakedefine HAVE_WCSLEN 1
 +
 +/* Define to 1 if you have the `wctomb' function. */
 +#cmakedefine HAVE_WCTOMB 1
 +
 +/* Define to 1 if you have the <wctype.h> header file. */
 +#cmakedefine HAVE_WCTYPE_H 1
 +
 +/* Define to 1 if you have the <wincrypt.h> header file. */
 +#cmakedefine HAVE_WINCRYPT_H 1
 +
 +/* Define to 1 if you have the <windows.h> header file. */
 +#cmakedefine HAVE_WINDOWS_H 1
 +
 +/* Define to 1 if you have the <winioctl.h> header file. */
 +#cmakedefine HAVE_WINIOCTL_H 1
 +
 +/* Define to 1 if you have _CrtSetReportMode in <crtdbg.h>  */
 +#cmakedefine HAVE__CrtSetReportMode 1
 +
 +/* Define to 1 if you have the `wmemcmp' function. */
 +#cmakedefine HAVE_WMEMCMP 1
 +
 +/* Define to 1 if you have the `wmemcpy' function. */
 +#cmakedefine HAVE_WMEMCPY 1
 +
++/* Define to 1 if you have the `wmemmove' function. */
++#cmakedefine HAVE_WMEMMOVE 1
++
 +/* Define to 1 if you have a working EXT2_IOC_GETFLAGS */
 +#cmakedefine HAVE_WORKING_EXT2_IOC_GETFLAGS 1
 +
 +/* Define to 1 if you have the <zlib.h> header file. */
 +#cmakedefine HAVE_ZLIB_H 1
 +
 +/* Define to 1 if you have the `_ctime64_s' function. */
 +#cmakedefine HAVE__CTIME64_S 1
 +
 +/* Define to 1 if you have the `_fseeki64' function. */
 +#cmakedefine HAVE__FSEEKI64 1
 +
 +/* Define to 1 if you have the `_get_timezone' function. */
 +#cmakedefine HAVE__GET_TIMEZONE 1
 +
 +/* Define to 1 if you have the `_localtime64_s' function. */
 +#cmakedefine HAVE__LOCALTIME64_S 1
 +
 +/* Define to 1 if you have the `_mkgmtime64' function. */
 +#cmakedefine HAVE__MKGMTIME64 1
 +
 +/* Define as const if the declaration of iconv() needs const. */
 +#define ICONV_CONST ${ICONV_CONST}
 +
 +/* Version number of libarchive as a single integer */
 +#cmakedefine LIBARCHIVE_VERSION_NUMBER "${LIBARCHIVE_VERSION_NUMBER}"
 +
 +/* Version number of libarchive */
 +#cmakedefine LIBARCHIVE_VERSION_STRING "${LIBARCHIVE_VERSION_STRING}"
 +
 +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
 +   slash. */
 +#cmakedefine LSTAT_FOLLOWS_SLASHED_SYMLINK 1
 +
 +/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
 +   */
 +#cmakedefine MAJOR_IN_MKDEV 1
 +
 +/* Define to 1 if `major', `minor', and `makedev' are declared in
 +   <sysmacros.h>. */
 +#cmakedefine MAJOR_IN_SYSMACROS 1
 +
 +/* Define to 1 if your C compiler doesn't accept -c and -o together. */
 +#cmakedefine NO_MINUS_C_MINUS_O 1
 +
 +/* The size of `wchar_t', as computed by sizeof. */
 +#cmakedefine SIZEOF_WCHAR_T ${SIZEOF_WCHAR_T}
 +
 +/* Define to 1 if strerror_r returns char *. */
 +#cmakedefine STRERROR_R_CHAR_P 1
 +
 +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 +#cmakedefine TIME_WITH_SYS_TIME 1
 +
 +/*
 + * Some platform requires a macro to use extension functions.
 + */
 +#cmakedefine SAFE_TO_DEFINE_EXTENSIONS 1
 +#ifdef SAFE_TO_DEFINE_EXTENSIONS
 +/* Enable extensions on AIX 3, Interix.  */
 +#ifndef _ALL_SOURCE
 +# define _ALL_SOURCE 1
 +#endif
 +/* Enable GNU extensions on systems that have them.  */
 +#ifndef _GNU_SOURCE
 +# define _GNU_SOURCE 1
 +#endif
 +/* Enable threading extensions on Solaris.  */
 +#ifndef _POSIX_PTHREAD_SEMANTICS
 +# define _POSIX_PTHREAD_SEMANTICS 1
 +#endif
 +/* Enable extensions on HP NonStop.  */
 +#ifndef _TANDEM_SOURCE
 +# define _TANDEM_SOURCE 1
 +#endif
 +/* Enable general extensions on Solaris.  */
 +#ifndef __EXTENSIONS__
 +# define __EXTENSIONS__ 1
 +#endif
 +#endif /* SAFE_TO_DEFINE_EXTENSIONS */
 +
 +/* Version number of package */
 +#cmakedefine VERSION "${VERSION}"
 +
 +/* Number of bits in a file offset, on hosts where this is settable. */
 +#cmakedefine _FILE_OFFSET_BITS ${_FILE_OFFSET_BITS}
 +
 +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 +#cmakedefine _LARGEFILE_SOURCE 1
 +
 +/* Define for large files, on AIX-style hosts. */
 +#cmakedefine _LARGE_FILES ${_LARGE_FILES}
 +
 +/* Define for Windows to use Windows 2000+ APIs. */
 +#ifndef _WIN32_WINNT
 +#cmakedefine _WIN32_WINNT ${_WIN32_WINNT}
 +#endif // _WIN32_WINNT
 +
 +#ifndef WINVER
 +#cmakedefine WINVER ${WINVER}
 +#endif // WINVER
 +
 +/* Define to empty if `const' does not conform to ANSI C. */
 +#cmakedefine const ${const}
 +
 +/* Define to `int' if <sys/types.h> doesn't define. */
 +#cmakedefine gid_t ${gid_t}
 +
 +/* Define to `unsigned long' if <sys/types.h> does not define. */
 +#cmakedefine id_t ${id_t}
 +
 +/* Define to `int' if <sys/types.h> does not define. */
 +#cmakedefine mode_t ${mode_t}
 +
 +/* Define to `long long' if <sys/types.h> does not define. */
 +#cmakedefine off_t ${off_t}
 +
 +/* Define to `int' if <sys/types.h> doesn't define. */
 +#cmakedefine pid_t ${pid_t}
 +
 +/* Define to `unsigned int' if <sys/types.h> does not define. */
 +#cmakedefine size_t ${size_t}
 +
 +/* Define to `int' if <sys/types.h> does not define. */
 +#cmakedefine ssize_t ${ssize_t}
 +
 +/* Define to `int' if <sys/types.h> doesn't define. */
 +#cmakedefine uid_t ${uid_t}
 +
 +/* Define to `int' if <sys/types.h> does not define. */
 +#cmakedefine intptr_t ${intptr_t}
 +
 +/* Define to `unsigned int' if <sys/types.h> does not define. */
 +#cmakedefine uintptr_t ${uintptr_t}
diff --cc Utilities/cmlibarchive/libarchive/CMakeLists.txt
index 8908a62,0000000..891c728
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/libarchive/CMakeLists.txt
@@@ -1,177 -1,0 +1,194 @@@
 +
 +############################################
 +#
 +# How to build libarchive
 +#
 +############################################
 +
 +# Public headers
 +SET(include_HEADERS
 +  archive.h
 +  archive_entry.h
 +)
 +
 +# Sources and private headers
 +SET(libarchive_SOURCES
 +  archive_acl.c
 +  archive_check_magic.c
 +  archive_cmdline.c
 +  archive_cmdline_private.h
 +  archive_crc32.h
-   archive_crypto.c
-   archive_crypto_private.h
++  archive_cryptor.c
++  archive_cryptor_private.h
++  archive_digest.c
++  archive_digest_private.h
 +  archive_endian.h
 +  archive_entry.c
 +  archive_entry.h
 +  archive_entry_copy_stat.c
 +  archive_entry_link_resolver.c
 +  archive_entry_locale.h
 +  archive_entry_private.h
 +  archive_entry_sparse.c
 +  archive_entry_stat.c
 +  archive_entry_strmode.c
 +  archive_entry_xattr.c
 +  archive_getdate.c
++  archive_hmac.c
++  archive_hmac_private.h
 +  archive_match.c
 +  archive_options.c
 +  archive_options_private.h
 +  archive_pack_dev.h
 +  archive_pack_dev.c
 +  archive_pathmatch.c
 +  archive_pathmatch.h
 +  archive_platform.h
 +  archive_ppmd_private.h
 +  archive_ppmd7.c
 +  archive_ppmd7_private.h
 +  archive_private.h
++  archive_random.c
++  archive_random_private.h
 +  archive_rb.c
 +  archive_rb.h
 +  archive_read.c
++  archive_read_add_passphrase.c
 +  archive_read_append_filter.c
 +  archive_read_data_into_fd.c
 +  archive_read_disk_entry_from_file.c
 +  archive_read_disk_posix.c
 +  archive_read_disk_private.h
 +  archive_read_disk_set_standard_lookup.c
 +  archive_read_extract.c
 +  archive_read_extract2.c
 +  archive_read_open_fd.c
 +  archive_read_open_file.c
 +  archive_read_open_filename.c
 +  archive_read_open_memory.c
 +  archive_read_private.h
 +  archive_read_set_format.c
 +  archive_read_set_options.c
 +  archive_read_support_filter_all.c
 +  archive_read_support_filter_bzip2.c
 +  archive_read_support_filter_compress.c
 +  archive_read_support_filter_gzip.c
 +  archive_read_support_filter_grzip.c
 +  archive_read_support_filter_lrzip.c
++  archive_read_support_filter_lz4.c
 +  archive_read_support_filter_lzop.c
 +  archive_read_support_filter_none.c
 +  archive_read_support_filter_program.c
 +  archive_read_support_filter_rpm.c
 +  archive_read_support_filter_uu.c
 +  archive_read_support_filter_xz.c
 +  archive_read_support_format_7zip.c
 +  archive_read_support_format_all.c
 +  archive_read_support_format_ar.c
 +  archive_read_support_format_by_code.c
 +  archive_read_support_format_cab.c
 +  archive_read_support_format_cpio.c
 +  archive_read_support_format_empty.c
 +  archive_read_support_format_iso9660.c
 +  archive_read_support_format_lha.c
 +  archive_read_support_format_mtree.c
 +  archive_read_support_format_rar.c
 +  archive_read_support_format_raw.c
 +  archive_read_support_format_tar.c
++  archive_read_support_format_warc.c
 +  archive_read_support_format_xar.c
 +  archive_read_support_format_zip.c
 +  archive_string.c
 +  archive_string.h
 +  archive_string_composition.h
 +  archive_string_sprintf.c
 +  archive_util.c
 +  archive_virtual.c
 +  archive_write.c
 +  archive_write_disk_acl.c
 +  archive_write_disk_posix.c
 +  archive_write_disk_private.h
 +  archive_write_disk_set_standard_lookup.c
 +  archive_write_private.h
 +  archive_write_open_fd.c
 +  archive_write_open_file.c
 +  archive_write_open_filename.c
 +  archive_write_open_memory.c
 +  archive_write_add_filter.c
 +  archive_write_add_filter_b64encode.c
 +  archive_write_add_filter_by_name.c
 +  archive_write_add_filter_bzip2.c
 +  archive_write_add_filter_compress.c
 +  archive_write_add_filter_grzip.c
 +  archive_write_add_filter_gzip.c
 +  archive_write_add_filter_lrzip.c
++  archive_write_add_filter_lz4.c
 +  archive_write_add_filter_lzop.c
 +  archive_write_add_filter_none.c
 +  archive_write_add_filter_program.c
 +  archive_write_add_filter_uuencode.c
 +  archive_write_add_filter_xz.c
 +  archive_write_set_format.c
 +  archive_write_set_format_7zip.c
 +  archive_write_set_format_ar.c
 +  archive_write_set_format_by_name.c
 +  archive_write_set_format_cpio.c
 +  archive_write_set_format_cpio_newc.c
++  archive_write_set_format_filter_by_ext.c
 +  archive_write_set_format_gnutar.c
 +  archive_write_set_format_iso9660.c
 +  archive_write_set_format_mtree.c
 +  archive_write_set_format_pax.c
 +  archive_write_set_format_raw.c
 +  archive_write_set_format_shar.c
 +  archive_write_set_format_ustar.c
 +  archive_write_set_format_v7tar.c
++  archive_write_set_format_warc.c
 +  archive_write_set_format_xar.c
 +  archive_write_set_format_zip.c
 +  archive_write_set_options.c
++  archive_write_set_passphrase.c
++  archive_xxhash.h
 +  filter_fork_posix.c
 +  filter_fork.h
++  xxhash.c
 +)
 +
 +# Man pages
 +SET(libarchive_MANS
 +  archive_entry.3
 +  archive_entry_acl.3
 +  archive_entry_linkify.3
 +  archive_entry_paths.3
 +  archive_entry_perms.3
 +  archive_entry_stat.3
 +  archive_entry_time.3
 +  archive_read.3
++  archive_read_add_passphrase.3
 +  archive_read_disk.3
 +  archive_read_set_options.3
 +  archive_util.3
 +  archive_write.3
 +  archive_write_disk.3
 +  archive_write_set_options.3
++  archive_write_set_passphrase.3
 +  cpio.5
 +  libarchive.3
 +  libarchive_internals.3
 +  libarchive-formats.5
 +  mtree.5
 +  tar.5
 +)
 +
 +IF(WIN32 AND NOT CYGWIN)
 +  LIST(APPEND libarchive_SOURCES archive_entry_copy_bhfi.c)
 +  LIST(APPEND libarchive_SOURCES archive_read_disk_windows.c)
 +  LIST(APPEND libarchive_SOURCES archive_windows.c)
 +  LIST(APPEND libarchive_SOURCES archive_windows.h)
 +  LIST(APPEND libarchive_SOURCES archive_write_disk_windows.c)
 +  LIST(APPEND libarchive_SOURCES filter_fork_windows.c)
 +ENDIF(WIN32 AND NOT CYGWIN)
 +
 +# CMake needs just one static "cmlibarchive" library.
 +ADD_LIBRARY(cmlibarchive STATIC ${libarchive_SOURCES} ${include_HEADERS})
 +TARGET_LINK_LIBRARIES(cmlibarchive ${ADDITIONAL_LIBS})
diff --cc Utilities/cmlibarchive/libarchive/archive.h
index 9cf762d,0000000..747615e
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive.h
+++ b/Utilities/cmlibarchive/libarchive/archive.h
@@@ -1,1116 -1,0 +1,1171 @@@
 +/*-
 + * Copyright (c) 2003-2010 Tim Kientzle
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + *
 + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.50 2008/05/26 17:00:22 kientzle Exp $
 + */
 +
 +#ifndef ARCHIVE_H_INCLUDED
 +#define	ARCHIVE_H_INCLUDED
 +
 +#include <sys/stat.h>
 +#include <stddef.h>  /* for wchar_t */
 +#include <stdio.h> /* For FILE * */
 +
 +/*
 + * Note: archive.h is for use outside of libarchive; the configuration
 + * headers (config.h, archive_platform.h, etc.) are purely internal.
 + * Do NOT use HAVE_XXX configuration macros to control the behavior of
 + * this header!  If you must conditionalize, use predefined compiler and/or
 + * platform macros.
 + */
 +#if defined(__BORLANDC__) && __BORLANDC__ >= 0x560
 +# include <stdint.h>
 +#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS) && !defined(__osf__)
 +# include <inttypes.h>
 +#endif
 +
 +/* Borland symbols are case-insensitive.  This workaround only works
 +   within CMake because we do not mix compilers.  */
 +#if defined(__BORLANDC__)
 +# define archive_read_open_FILE archive_read_open_FILE_
 +# define archive_write_open_FILE archive_write_open_FILE_
 +#endif
 +
- /* Get appropriate definitions of standard POSIX-style types. */
- /* These should match the types used in 'struct stat' */
- #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
- # define	__LA_INT64_T	__int64
- # if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
- #  define	__LA_SSIZE_T	ssize_t
- # elif defined(_WIN64)
- #  define	__LA_SSIZE_T	__int64
++/* Get appropriate definitions of 64-bit integer */
++#if !defined(__LA_INT64_T_DEFINED)
++/* Older code relied on the __LA_INT64_T macro; after 4.0 we'll switch to the typedef exclusively. */
++# if ARCHIVE_VERSION_NUMBER < 4000000
++#define __LA_INT64_T la_int64_t
++# endif
++#define __LA_INT64_T_DEFINED
++# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
++typedef __int64 la_int64_t;
 +# else
- #  define	__LA_SSIZE_T	long
++# include <unistd.h>  /* ssize_t */
++#  if defined(_SCO_DS) || defined(__osf__)
++typedef long long la_int64_t;
++#  else
++typedef int64_t la_int64_t;
++#  endif
 +# endif
- #else
- # include <unistd.h>  /* ssize_t, uid_t, and gid_t */
- # if defined(_SCO_DS) || defined(__osf__)
- #  define	__LA_INT64_T	long long
++#endif
++
++/* The la_ssize_t should match the type used in 'struct stat' */
++#if !defined(__LA_SSIZE_T_DEFINED)
++/* Older code relied on the __LA_SSIZE_T macro; after 4.0 we'll switch to the typedef exclusively. */
++# if ARCHIVE_VERSION_NUMBER < 4000000
++#define __LA_SSIZE_T la_ssize_t
++# endif
++#define __LA_SSIZE_T_DEFINED
++# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
++#  if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
++typedef ssize_t la_ssize_t;
++#  elif defined(_WIN64)
++typedef __int64 la_ssize_t;
++#  else
++typedef long la_ssize_t;
++#  endif
 +# else
- #  define	__LA_INT64_T	int64_t
++# include <unistd.h>  /* ssize_t */
++typedef ssize_t la_ssize_t;
 +# endif
- # define	__LA_SSIZE_T	ssize_t
 +#endif
 +
 +/*
 + * On Windows, define LIBARCHIVE_STATIC if you're building or using a
 + * .lib.  The default here assumes you're building a DLL.  Only
 + * libarchive source should ever define __LIBARCHIVE_BUILD.
 + */
 +#if ((defined __WIN32__) || (defined _WIN32) || defined(__CYGWIN__)) && (!defined LIBARCHIVE_STATIC)
 +# ifdef __LIBARCHIVE_BUILD
 +#  ifdef __GNUC__
 +#   define __LA_DECL	__attribute__((dllexport)) extern
 +#  else
 +#   define __LA_DECL	__declspec(dllexport)
 +#  endif
 +# else
 +#  ifdef __GNUC__
 +#   define __LA_DECL
 +#  else
 +#   define __LA_DECL	__declspec(dllimport)
 +#  endif
 +# endif
 +#else
 +/* Static libraries or non-Windows needs no special declaration. */
 +# define __LA_DECL
 +#endif
 +
 +#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__MINGW32__)
 +#define	__LA_PRINTF(fmtarg, firstvararg) \
 +	__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
 +#else
 +#define	__LA_PRINTF(fmtarg, firstvararg)	/* nothing */
 +#endif
 +
 +/* CMake uses some deprecated APIs to build with old libarchive versions.  */
 +#define __LA_DEPRECATED
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +/*
 + * The version number is provided as both a macro and a function.
 + * The macro identifies the installed header; the function identifies
 + * the library version (which may not be the same if you're using a
 + * dynamically-linked version of the library).  Of course, if the
 + * header and library are very different, you should expect some
 + * strangeness.  Don't do that.
 + */
 +
 +/*
 + * The version number is expressed as a single integer that makes it
 + * easy to compare versions at build time: for version a.b.c, the
 + * version number is printf("%d%03d%03d",a,b,c).  For example, if you
 + * know your application requires version 2.12.108 or later, you can
 + * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
 + */
 +/* Note: Compiler will complain if this does not match archive_entry.h! */
 +#define	ARCHIVE_VERSION_NUMBER 3001002
 +__LA_DECL int		archive_version_number(void);
 +
 +/*
 + * Textual name/version of the library, useful for version displays.
 + */
- #define	ARCHIVE_VERSION_STRING "libarchive 3.1.2"
++#define	ARCHIVE_VERSION_ONLY_STRING "3.1.2"
++#define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 +__LA_DECL const char *	archive_version_string(void);
 +
 +/*
 + * Detailed textual name/version of the library and its dependencies.
++ * This has the form:
++ *    "libarchive x.y.z zlib/a.b.c liblzma/d.e.f ... etc ..."
++ * the list of libraries described here will vary depending on how
++ * libarchive was compiled.
 + */
 +__LA_DECL const char *	archive_version_details(void);
 +
 +/* Declare our basic types. */
 +struct archive;
 +struct archive_entry;
 +
 +/*
 + * Error codes: Use archive_errno() and archive_error_string()
 + * to retrieve details.  Unless specified otherwise, all functions
 + * that return 'int' use these codes.
 + */
 +#define	ARCHIVE_EOF	  1	/* Found end of archive. */
 +#define	ARCHIVE_OK	  0	/* Operation was successful. */
 +#define	ARCHIVE_RETRY	(-10)	/* Retry might succeed. */
 +#define	ARCHIVE_WARN	(-20)	/* Partial success. */
 +/* For example, if write_header "fails", then you can't push data. */
 +#define	ARCHIVE_FAILED	(-25)	/* Current operation cannot complete. */
 +/* But if write_header is "fatal," then this archive is dead and useless. */
 +#define	ARCHIVE_FATAL	(-30)	/* No more operations are possible. */
 +
 +/*
 + * As far as possible, archive_errno returns standard platform errno codes.
 + * Of course, the details vary by platform, so the actual definitions
 + * here are stored in "archive_platform.h".  The symbols are listed here
 + * for reference; as a rule, clients should not need to know the exact
 + * platform-dependent error code.
 + */
 +/* Unrecognized or invalid file format. */
 +/* #define	ARCHIVE_ERRNO_FILE_FORMAT */
 +/* Illegal usage of the library. */
 +/* #define	ARCHIVE_ERRNO_PROGRAMMER_ERROR */
 +/* Unknown or unclassified error. */
 +/* #define	ARCHIVE_ERRNO_MISC */
 +
 +/*
 + * Callbacks are invoked to automatically read/skip/write/open/close the
 + * archive. You can provide your own for complex tasks (like breaking
 + * archives across multiple tapes) or use standard ones built into the
 + * library.
 + */
 +
 +/* Returns pointer and size of next block of data from archive. */
- typedef __LA_SSIZE_T	archive_read_callback(struct archive *,
++typedef la_ssize_t	archive_read_callback(struct archive *,
 +			    void *_client_data, const void **_buffer);
 +
 +/* Skips at most request bytes from archive and returns the skipped amount.
 + * This may skip fewer bytes than requested; it may even skip zero bytes.
 + * If you do skip fewer bytes than requested, libarchive will invoke your
 + * read callback and discard data as necessary to make up the full skip.
 + */
- typedef __LA_INT64_T	archive_skip_callback(struct archive *,
- 			    void *_client_data, __LA_INT64_T request);
++typedef la_int64_t	archive_skip_callback(struct archive *,
++			    void *_client_data, la_int64_t request);
 +
 +/* Seeks to specified location in the file and returns the position.
 + * Whence values are SEEK_SET, SEEK_CUR, SEEK_END from stdio.h.
 + * Return ARCHIVE_FATAL if the seek fails for any reason.
 + */
- typedef __LA_INT64_T	archive_seek_callback(struct archive *,
-     void *_client_data, __LA_INT64_T offset, int whence);
++typedef la_int64_t	archive_seek_callback(struct archive *,
++    void *_client_data, la_int64_t offset, int whence);
 +
 +/* Returns size actually written, zero on EOF, -1 on error. */
- typedef __LA_SSIZE_T	archive_write_callback(struct archive *,
++typedef la_ssize_t	archive_write_callback(struct archive *,
 +			    void *_client_data,
 +			    const void *_buffer, size_t _length);
 +
 +typedef int	archive_open_callback(struct archive *, void *_client_data);
 +
 +typedef int	archive_close_callback(struct archive *, void *_client_data);
 +
 +/* Switches from one client data object to the next/prev client data object.
 + * This is useful for reading from different data blocks such as a set of files
 + * that make up one large file.
 + */
 +typedef int archive_switch_callback(struct archive *, void *_client_data1,
 +			    void *_client_data2);
 +
 +/*
++ * Returns a passphrase used for encryption or decryption, NULL on nothing
++ * to do and give it up.
++ */
++typedef const char *archive_passphrase_callback(struct archive *,
++			    void *_client_data);
++
++/*
 + * Codes to identify various stream filters.
 + */
 +#define	ARCHIVE_FILTER_NONE	0
 +#define	ARCHIVE_FILTER_GZIP	1
 +#define	ARCHIVE_FILTER_BZIP2	2
 +#define	ARCHIVE_FILTER_COMPRESS	3
 +#define	ARCHIVE_FILTER_PROGRAM	4
 +#define	ARCHIVE_FILTER_LZMA	5
 +#define	ARCHIVE_FILTER_XZ	6
 +#define	ARCHIVE_FILTER_UU	7
 +#define	ARCHIVE_FILTER_RPM	8
 +#define	ARCHIVE_FILTER_LZIP	9
 +#define	ARCHIVE_FILTER_LRZIP	10
 +#define	ARCHIVE_FILTER_LZOP	11
 +#define	ARCHIVE_FILTER_GRZIP	12
++#define	ARCHIVE_FILTER_LZ4	13
 +
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +#define	ARCHIVE_COMPRESSION_NONE	ARCHIVE_FILTER_NONE
 +#define	ARCHIVE_COMPRESSION_GZIP	ARCHIVE_FILTER_GZIP
 +#define	ARCHIVE_COMPRESSION_BZIP2	ARCHIVE_FILTER_BZIP2
 +#define	ARCHIVE_COMPRESSION_COMPRESS	ARCHIVE_FILTER_COMPRESS
 +#define	ARCHIVE_COMPRESSION_PROGRAM	ARCHIVE_FILTER_PROGRAM
 +#define	ARCHIVE_COMPRESSION_LZMA	ARCHIVE_FILTER_LZMA
 +#define	ARCHIVE_COMPRESSION_XZ		ARCHIVE_FILTER_XZ
 +#define	ARCHIVE_COMPRESSION_UU		ARCHIVE_FILTER_UU
 +#define	ARCHIVE_COMPRESSION_RPM		ARCHIVE_FILTER_RPM
 +#define	ARCHIVE_COMPRESSION_LZIP	ARCHIVE_FILTER_LZIP
 +#define	ARCHIVE_COMPRESSION_LRZIP	ARCHIVE_FILTER_LRZIP
 +#endif
 +
 +/*
 + * Codes returned by archive_format.
 + *
 + * Top 16 bits identifies the format family (e.g., "tar"); lower
 + * 16 bits indicate the variant.  This is updated by read_next_header.
 + * Note that the lower 16 bits will often vary from entry to entry.
 + * In some cases, this variation occurs as libarchive learns more about
 + * the archive (for example, later entries might utilize extensions that
 + * weren't necessary earlier in the archive; in this case, libarchive
 + * will change the format code to indicate the extended format that
 + * was used).  In other cases, it's because different tools have
 + * modified the archive and so different parts of the archive
 + * actually have slightly different formats.  (Both tar and cpio store
 + * format codes in each entry, so it is quite possible for each
 + * entry to be in a different format.)
 + */
 +#define	ARCHIVE_FORMAT_BASE_MASK		0xff0000
 +#define	ARCHIVE_FORMAT_CPIO			0x10000
 +#define	ARCHIVE_FORMAT_CPIO_POSIX		(ARCHIVE_FORMAT_CPIO | 1)
 +#define	ARCHIVE_FORMAT_CPIO_BIN_LE		(ARCHIVE_FORMAT_CPIO | 2)
 +#define	ARCHIVE_FORMAT_CPIO_BIN_BE		(ARCHIVE_FORMAT_CPIO | 3)
 +#define	ARCHIVE_FORMAT_CPIO_SVR4_NOCRC		(ARCHIVE_FORMAT_CPIO | 4)
 +#define	ARCHIVE_FORMAT_CPIO_SVR4_CRC		(ARCHIVE_FORMAT_CPIO | 5)
 +#define	ARCHIVE_FORMAT_CPIO_AFIO_LARGE		(ARCHIVE_FORMAT_CPIO | 6)
 +#define	ARCHIVE_FORMAT_SHAR			0x20000
 +#define	ARCHIVE_FORMAT_SHAR_BASE		(ARCHIVE_FORMAT_SHAR | 1)
 +#define	ARCHIVE_FORMAT_SHAR_DUMP		(ARCHIVE_FORMAT_SHAR | 2)
 +#define	ARCHIVE_FORMAT_TAR			0x30000
 +#define	ARCHIVE_FORMAT_TAR_USTAR		(ARCHIVE_FORMAT_TAR | 1)
 +#define	ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE	(ARCHIVE_FORMAT_TAR | 2)
 +#define	ARCHIVE_FORMAT_TAR_PAX_RESTRICTED	(ARCHIVE_FORMAT_TAR | 3)
 +#define	ARCHIVE_FORMAT_TAR_GNUTAR		(ARCHIVE_FORMAT_TAR | 4)
 +#define	ARCHIVE_FORMAT_ISO9660			0x40000
 +#define	ARCHIVE_FORMAT_ISO9660_ROCKRIDGE	(ARCHIVE_FORMAT_ISO9660 | 1)
 +#define	ARCHIVE_FORMAT_ZIP			0x50000
 +#define	ARCHIVE_FORMAT_EMPTY			0x60000
 +#define	ARCHIVE_FORMAT_AR			0x70000
 +#define	ARCHIVE_FORMAT_AR_GNU			(ARCHIVE_FORMAT_AR | 1)
 +#define	ARCHIVE_FORMAT_AR_BSD			(ARCHIVE_FORMAT_AR | 2)
 +#define	ARCHIVE_FORMAT_MTREE			0x80000
 +#define	ARCHIVE_FORMAT_RAW			0x90000
 +#define	ARCHIVE_FORMAT_XAR			0xA0000
 +#define	ARCHIVE_FORMAT_LHA			0xB0000
 +#define	ARCHIVE_FORMAT_CAB			0xC0000
 +#define	ARCHIVE_FORMAT_RAR			0xD0000
 +#define	ARCHIVE_FORMAT_7ZIP			0xE0000
++#define	ARCHIVE_FORMAT_WARC			0xF0000
 +
 +/*
 + * Codes returned by archive_read_format_capabilities().
 + *
 + * This list can be extended with values between 0 and 0xffff.
 + * The original purpose of this list was to let different archive
 + * format readers expose their general capabilities in terms of
 + * encryption.
 + */
 +#define ARCHIVE_READ_FORMAT_CAPS_NONE (0) /* no special capabilities */
 +#define ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA (1<<0)  /* reader can detect encrypted data */
 +#define ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA (1<<1)  /* reader can detect encryptable metadata (pathname, mtime, etc.) */
 +
 +/*
 + * Codes returned by archive_read_has_encrypted_entries().
 + *
 + * In case the archive does not support encryption detection at all
 + * ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED is returned. If the reader
 + * for some other reason (e.g. not enough bytes read) cannot say if
 + * there are encrypted entries, ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW
 + * is returned.
 + */
 +#define ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED -2
 +#define ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW -1
 +
 +/*-
 + * Basic outline for reading an archive:
 + *   1) Ask archive_read_new for an archive reader object.
 + *   2) Update any global properties as appropriate.
 + *      In particular, you'll certainly want to call appropriate
 + *      archive_read_support_XXX functions.
 + *   3) Call archive_read_open_XXX to open the archive
 + *   4) Repeatedly call archive_read_next_header to get information about
 + *      successive archive entries.  Call archive_read_data to extract
 + *      data for entries of interest.
 + *   5) Call archive_read_finish to end processing.
 + */
 +__LA_DECL struct archive	*archive_read_new(void);
 +
 +/*
 + * The archive_read_support_XXX calls enable auto-detect for this
 + * archive handle.  They also link in the necessary support code.
 + * For example, if you don't want bzlib linked in, don't invoke
 + * support_compression_bzip2().  The "all" functions provide the
 + * obvious shorthand.
 + */
 +
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +__LA_DECL int archive_read_support_compression_all(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_bzip2(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_compress(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_gzip(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_lzip(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_lzma(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_none(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_program(struct archive *,
 +		     const char *command) __LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_program_signature
 +		(struct archive *, const char *,
 +		 const void * /* match */, size_t) __LA_DEPRECATED;
 +
 +__LA_DECL int archive_read_support_compression_rpm(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_uu(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_read_support_compression_xz(struct archive *)
 +		__LA_DEPRECATED;
 +#endif
 +
 +__LA_DECL int archive_read_support_filter_all(struct archive *);
 +__LA_DECL int archive_read_support_filter_bzip2(struct archive *);
 +__LA_DECL int archive_read_support_filter_compress(struct archive *);
 +__LA_DECL int archive_read_support_filter_gzip(struct archive *);
 +__LA_DECL int archive_read_support_filter_grzip(struct archive *);
 +__LA_DECL int archive_read_support_filter_lrzip(struct archive *);
++__LA_DECL int archive_read_support_filter_lz4(struct archive *);
 +__LA_DECL int archive_read_support_filter_lzip(struct archive *);
 +__LA_DECL int archive_read_support_filter_lzma(struct archive *);
 +__LA_DECL int archive_read_support_filter_lzop(struct archive *);
 +__LA_DECL int archive_read_support_filter_none(struct archive *);
 +__LA_DECL int archive_read_support_filter_program(struct archive *,
 +		     const char *command);
 +__LA_DECL int archive_read_support_filter_program_signature
 +		(struct archive *, const char * /* cmd */,
 +				    const void * /* match */, size_t);
 +__LA_DECL int archive_read_support_filter_rpm(struct archive *);
 +__LA_DECL int archive_read_support_filter_uu(struct archive *);
 +__LA_DECL int archive_read_support_filter_xz(struct archive *);
 +
 +__LA_DECL int archive_read_support_format_7zip(struct archive *);
 +__LA_DECL int archive_read_support_format_all(struct archive *);
 +__LA_DECL int archive_read_support_format_ar(struct archive *);
 +__LA_DECL int archive_read_support_format_by_code(struct archive *, int);
 +__LA_DECL int archive_read_support_format_cab(struct archive *);
 +__LA_DECL int archive_read_support_format_cpio(struct archive *);
 +__LA_DECL int archive_read_support_format_empty(struct archive *);
 +__LA_DECL int archive_read_support_format_gnutar(struct archive *);
 +__LA_DECL int archive_read_support_format_iso9660(struct archive *);
 +__LA_DECL int archive_read_support_format_lha(struct archive *);
 +__LA_DECL int archive_read_support_format_mtree(struct archive *);
 +__LA_DECL int archive_read_support_format_rar(struct archive *);
 +__LA_DECL int archive_read_support_format_raw(struct archive *);
 +__LA_DECL int archive_read_support_format_tar(struct archive *);
++__LA_DECL int archive_read_support_format_warc(struct archive *);
 +__LA_DECL int archive_read_support_format_xar(struct archive *);
 +/* archive_read_support_format_zip() enables both streamable and seekable
 + * zip readers. */
 +__LA_DECL int archive_read_support_format_zip(struct archive *);
 +/* Reads Zip archives as stream from beginning to end.  Doesn't
 + * correctly handle SFX ZIP files or ZIP archives that have been modified
 + * in-place. */
 +__LA_DECL int archive_read_support_format_zip_streamable(struct archive *);
 +/* Reads starting from central directory; requires seekable input. */
 +__LA_DECL int archive_read_support_format_zip_seekable(struct archive *);
 +
 +/* Functions to manually set the format and filters to be used. This is
 + * useful to bypass the bidding process when the format and filters to use
 + * is known in advance.
 + */
 +__LA_DECL int archive_read_set_format(struct archive *, int);
 +__LA_DECL int archive_read_append_filter(struct archive *, int);
 +__LA_DECL int archive_read_append_filter_program(struct archive *,
 +    const char *);
 +__LA_DECL int archive_read_append_filter_program_signature
 +    (struct archive *, const char *, const void * /* match */, size_t);
 +
 +/* Set various callbacks. */
 +__LA_DECL int archive_read_set_open_callback(struct archive *,
 +    archive_open_callback *);
 +__LA_DECL int archive_read_set_read_callback(struct archive *,
 +    archive_read_callback *);
 +__LA_DECL int archive_read_set_seek_callback(struct archive *,
 +    archive_seek_callback *);
 +__LA_DECL int archive_read_set_skip_callback(struct archive *,
 +    archive_skip_callback *);
 +__LA_DECL int archive_read_set_close_callback(struct archive *,
 +    archive_close_callback *);
 +/* Callback used to switch between one data object to the next */
 +__LA_DECL int archive_read_set_switch_callback(struct archive *,
 +    archive_switch_callback *);
 +
 +/* This sets the first data object. */
 +__LA_DECL int archive_read_set_callback_data(struct archive *, void *);
 +/* This sets data object at specified index */
 +__LA_DECL int archive_read_set_callback_data2(struct archive *, void *,
 +    unsigned int);
 +/* This adds a data object at the specified index. */
 +__LA_DECL int archive_read_add_callback_data(struct archive *, void *,
 +    unsigned int);
 +/* This appends a data object to the end of list */
 +__LA_DECL int archive_read_append_callback_data(struct archive *, void *);
 +/* This prepends a data object to the beginning of list */
 +__LA_DECL int archive_read_prepend_callback_data(struct archive *, void *);
 +
 +/* Opening freezes the callbacks. */
 +__LA_DECL int archive_read_open1(struct archive *);
 +
 +/* Convenience wrappers around the above. */
 +__LA_DECL int archive_read_open(struct archive *, void *_client_data,
 +		     archive_open_callback *, archive_read_callback *,
 +		     archive_close_callback *);
 +__LA_DECL int archive_read_open2(struct archive *, void *_client_data,
 +		     archive_open_callback *, archive_read_callback *,
 +		     archive_skip_callback *, archive_close_callback *);
 +
 +/*
 + * A variety of shortcuts that invoke archive_read_open() with
 + * canned callbacks suitable for common situations.  The ones that
 + * accept a block size handle tape blocking correctly.
 + */
 +/* Use this if you know the filename.  Note: NULL indicates stdin. */
 +__LA_DECL int archive_read_open_filename(struct archive *,
 +		     const char *_filename, size_t _block_size);
 +/* Use this for reading multivolume files by filenames.
 + * NOTE: Must be NULL terminated. Sorting is NOT done. */
 +__LA_DECL int archive_read_open_filenames(struct archive *,
 +		     const char **_filenames, size_t _block_size);
 +__LA_DECL int archive_read_open_filename_w(struct archive *,
 +		     const wchar_t *_filename, size_t _block_size);
 +/* archive_read_open_file() is a deprecated synonym for ..._open_filename(). */
 +__LA_DECL int archive_read_open_file(struct archive *,
 +		     const char *_filename, size_t _block_size) __LA_DEPRECATED;
 +/* Read an archive that's stored in memory. */
 +__LA_DECL int archive_read_open_memory(struct archive *,
- 		     void * buff, size_t size);
++		     const void * buff, size_t size);
 +/* A more involved version that is only used for internal testing. */
- __LA_DECL int archive_read_open_memory2(struct archive *a, void *buff,
++__LA_DECL int archive_read_open_memory2(struct archive *a, const void *buff,
 +		     size_t size, size_t read_size);
 +/* Read an archive that's already open, using the file descriptor. */
 +__LA_DECL int archive_read_open_fd(struct archive *, int _fd,
 +		     size_t _block_size);
 +/* Read an archive that's already open, using a FILE *. */
 +/* Note: DO NOT use this with tape drives. */
 +__LA_DECL int archive_read_open_FILE(struct archive *, FILE *_file);
 +
 +/* Parses and returns next entry header. */
 +__LA_DECL int archive_read_next_header(struct archive *,
 +		     struct archive_entry **);
 +
 +/* Parses and returns next entry header using the archive_entry passed in */
 +__LA_DECL int archive_read_next_header2(struct archive *,
 +		     struct archive_entry *);
 +
 +/*
 + * Retrieve the byte offset in UNCOMPRESSED data where last-read
 + * header started.
 + */
- __LA_DECL __LA_INT64_T		 archive_read_header_position(struct archive *);
++__LA_DECL la_int64_t		 archive_read_header_position(struct archive *);
 +
 +/*
 + * Returns 1 if the archive contains at least one encrypted entry.
 + * If the archive format not support encryption at all
 + * ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED is returned.
 + * If for any other reason (e.g. not enough data read so far)
 + * we cannot say whether there are encrypted entries, then
 + * ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW is returned.
 + * In general, this function will return values below zero when the
 + * reader is uncertain or totally uncapable of encryption support.
 + * When this function returns 0 you can be sure that the reader
 + * supports encryption detection but no encrypted entries have
 + * been found yet.
 + *
 + * NOTE: If the metadata/header of an archive is also encrypted, you
 + * cannot rely on the number of encrypted entries. That is why this
 + * function does not return the number of encrypted entries but#
 + * just shows that there are some.
 + */
 +__LA_DECL int	archive_read_has_encrypted_entries(struct archive *);
 +
 +/*
 + * Returns a bitmask of capabilities that are supported by the archive format reader.
 + * If the reader has no special capabilities, ARCHIVE_READ_FORMAT_CAPS_NONE is returned.
 + */
 +__LA_DECL int		 archive_read_format_capabilities(struct archive *);
 +
 +/* Read data from the body of an entry.  Similar to read(2). */
- __LA_DECL __LA_SSIZE_T		 archive_read_data(struct archive *,
++__LA_DECL la_ssize_t		 archive_read_data(struct archive *,
 +				    void *, size_t);
 +
 +/* Seek within the body of an entry.  Similar to lseek(2). */
- __LA_DECL __LA_INT64_T archive_seek_data(struct archive *, __LA_INT64_T, int);
++__LA_DECL la_int64_t archive_seek_data(struct archive *, la_int64_t, int);
 +
 +/*
 + * A zero-copy version of archive_read_data that also exposes the file offset
 + * of each returned block.  Note that the client has no way to specify
 + * the desired size of the block.  The API does guarantee that offsets will
 + * be strictly increasing and that returned blocks will not overlap.
 + */
 +__LA_DECL int archive_read_data_block(struct archive *a,
- 		    const void **buff, size_t *size, __LA_INT64_T *offset);
++		    const void **buff, size_t *size, la_int64_t *offset);
 +
 +/*-
 + * Some convenience functions that are built on archive_read_data:
 + *  'skip': skips entire entry
 + *  'into_buffer': writes data into memory buffer that you provide
 + *  'into_fd': writes data to specified filedes
 + */
 +__LA_DECL int archive_read_data_skip(struct archive *);
 +__LA_DECL int archive_read_data_into_fd(struct archive *, int fd);
 +
 +/*
 + * Set read options.
 + */
 +/* Apply option to the format only. */
 +__LA_DECL int archive_read_set_format_option(struct archive *_a,
 +			    const char *m, const char *o,
 +			    const char *v);
 +/* Apply option to the filter only. */
 +__LA_DECL int archive_read_set_filter_option(struct archive *_a,
 +			    const char *m, const char *o,
 +			    const char *v);
 +/* Apply option to both the format and the filter. */
 +__LA_DECL int archive_read_set_option(struct archive *_a,
 +			    const char *m, const char *o,
 +			    const char *v);
 +/* Apply option string to both the format and the filter. */
 +__LA_DECL int archive_read_set_options(struct archive *_a,
 +			    const char *opts);
 +
++/*
++ * Add a decryption passphrase.
++ */
++__LA_DECL int archive_read_add_passphrase(struct archive *, const char *);
++__LA_DECL int archive_read_set_passphrase_callback(struct archive *,
++			    void *client_data, archive_passphrase_callback *);
++
++
 +/*-
 + * Convenience function to recreate the current entry (whose header
 + * has just been read) on disk.
 + *
 + * This does quite a bit more than just copy data to disk. It also:
 + *  - Creates intermediate directories as required.
 + *  - Manages directory permissions:  non-writable directories will
 + *    be initially created with write permission enabled; when the
 + *    archive is closed, dir permissions are edited to the values specified
 + *    in the archive.
 + *  - Checks hardlinks:  hardlinks will not be extracted unless the
 + *    linked-to file was also extracted within the same session. (TODO)
 + */
 +
 +/* The "flags" argument selects optional behavior, 'OR' the flags you want. */
 +
 +/* Default: Do not try to set owner/group. */
 +#define	ARCHIVE_EXTRACT_OWNER			(0x0001)
 +/* Default: Do obey umask, do not restore SUID/SGID/SVTX bits. */
 +#define	ARCHIVE_EXTRACT_PERM			(0x0002)
 +/* Default: Do not restore mtime/atime. */
 +#define	ARCHIVE_EXTRACT_TIME			(0x0004)
 +/* Default: Replace existing files. */
 +#define	ARCHIVE_EXTRACT_NO_OVERWRITE 		(0x0008)
 +/* Default: Try create first, unlink only if create fails with EEXIST. */
 +#define	ARCHIVE_EXTRACT_UNLINK			(0x0010)
 +/* Default: Do not restore ACLs. */
 +#define	ARCHIVE_EXTRACT_ACL			(0x0020)
 +/* Default: Do not restore fflags. */
 +#define	ARCHIVE_EXTRACT_FFLAGS			(0x0040)
 +/* Default: Do not restore xattrs. */
 +#define	ARCHIVE_EXTRACT_XATTR 			(0x0080)
 +/* Default: Do not try to guard against extracts redirected by symlinks. */
 +/* Note: With ARCHIVE_EXTRACT_UNLINK, will remove any intermediate symlink. */
 +#define	ARCHIVE_EXTRACT_SECURE_SYMLINKS		(0x0100)
 +/* Default: Do not reject entries with '..' as path elements. */
 +#define	ARCHIVE_EXTRACT_SECURE_NODOTDOT		(0x0200)
 +/* Default: Create parent directories as needed. */
 +#define	ARCHIVE_EXTRACT_NO_AUTODIR		(0x0400)
 +/* Default: Overwrite files, even if one on disk is newer. */
 +#define	ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER	(0x0800)
 +/* Detect blocks of 0 and write holes instead. */
 +#define	ARCHIVE_EXTRACT_SPARSE			(0x1000)
 +/* Default: Do not restore Mac extended metadata. */
 +/* This has no effect except on Mac OS. */
 +#define	ARCHIVE_EXTRACT_MAC_METADATA		(0x2000)
 +/* Default: Use HFS+ compression if it was compressed. */
 +/* This has no effect except on Mac OS v10.6 or later. */
 +#define	ARCHIVE_EXTRACT_NO_HFS_COMPRESSION	(0x4000)
 +/* Default: Do not use HFS+ compression if it was not compressed. */
 +/* This has no effect except on Mac OS v10.6 or later. */
 +#define	ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED	(0x8000)
++/* Default: Do not reject entries with absolute paths */
++#define ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS (0x10000)
++/* Default: Do not clear no-change flags when unlinking object */
++#define	ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS	(0x20000)
 +
 +__LA_DECL int archive_read_extract(struct archive *, struct archive_entry *,
 +		     int flags);
 +__LA_DECL int archive_read_extract2(struct archive *, struct archive_entry *,
 +		     struct archive * /* dest */);
 +__LA_DECL void	 archive_read_extract_set_progress_callback(struct archive *,
 +		     void (*_progress_func)(void *), void *_user_data);
 +
 +/* Record the dev/ino of a file that will not be written.  This is
 + * generally set to the dev/ino of the archive being read. */
 +__LA_DECL void		archive_read_extract_set_skip_file(struct archive *,
- 		     __LA_INT64_T, __LA_INT64_T);
++		     la_int64_t, la_int64_t);
 +
 +/* Close the file and release most resources. */
 +__LA_DECL int		 archive_read_close(struct archive *);
 +/* Release all resources and destroy the object. */
 +/* Note that archive_read_free will call archive_read_close for you. */
 +__LA_DECL int		 archive_read_free(struct archive *);
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +/* Synonym for archive_read_free() for backwards compatibility. */
 +__LA_DECL int		 archive_read_finish(struct archive *) __LA_DEPRECATED;
 +#endif
 +
 +/*-
 + * To create an archive:
 + *   1) Ask archive_write_new for an archive writer object.
 + *   2) Set any global properties.  In particular, you should set
 + *      the compression and format to use.
 + *   3) Call archive_write_open to open the file (most people
 + *       will use archive_write_open_file or archive_write_open_fd,
 + *       which provide convenient canned I/O callbacks for you).
 + *   4) For each entry:
 + *      - construct an appropriate struct archive_entry structure
 + *      - archive_write_header to write the header
 + *      - archive_write_data to write the entry data
 + *   5) archive_write_close to close the output
 + *   6) archive_write_free to cleanup the writer and release resources
 + */
 +__LA_DECL struct archive	*archive_write_new(void);
 +__LA_DECL int archive_write_set_bytes_per_block(struct archive *,
 +		     int bytes_per_block);
 +__LA_DECL int archive_write_get_bytes_per_block(struct archive *);
 +/* XXX This is badly misnamed; suggestions appreciated. XXX */
 +__LA_DECL int archive_write_set_bytes_in_last_block(struct archive *,
 +		     int bytes_in_last_block);
 +__LA_DECL int archive_write_get_bytes_in_last_block(struct archive *);
 +
 +/* The dev/ino of a file that won't be archived.  This is used
 + * to avoid recursively adding an archive to itself. */
 +__LA_DECL int archive_write_set_skip_file(struct archive *,
-     __LA_INT64_T, __LA_INT64_T);
++    la_int64_t, la_int64_t);
 +
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +__LA_DECL int archive_write_set_compression_bzip2(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_write_set_compression_compress(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_write_set_compression_gzip(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_write_set_compression_lzip(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_write_set_compression_lzma(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_write_set_compression_none(struct archive *)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_write_set_compression_program(struct archive *,
 +		     const char *cmd) __LA_DEPRECATED;
 +__LA_DECL int archive_write_set_compression_xz(struct archive *)
 +		__LA_DEPRECATED;
 +#endif
 +
 +/* A convenience function to set the filter based on the code. */
 +__LA_DECL int archive_write_add_filter(struct archive *, int filter_code);
 +__LA_DECL int archive_write_add_filter_by_name(struct archive *,
 +		     const char *name);
 +__LA_DECL int archive_write_add_filter_b64encode(struct archive *);
 +__LA_DECL int archive_write_add_filter_bzip2(struct archive *);
 +__LA_DECL int archive_write_add_filter_compress(struct archive *);
 +__LA_DECL int archive_write_add_filter_grzip(struct archive *);
 +__LA_DECL int archive_write_add_filter_gzip(struct archive *);
 +__LA_DECL int archive_write_add_filter_lrzip(struct archive *);
++__LA_DECL int archive_write_add_filter_lz4(struct archive *);
 +__LA_DECL int archive_write_add_filter_lzip(struct archive *);
 +__LA_DECL int archive_write_add_filter_lzma(struct archive *);
 +__LA_DECL int archive_write_add_filter_lzop(struct archive *);
 +__LA_DECL int archive_write_add_filter_none(struct archive *);
 +__LA_DECL int archive_write_add_filter_program(struct archive *,
 +		     const char *cmd);
 +__LA_DECL int archive_write_add_filter_uuencode(struct archive *);
 +__LA_DECL int archive_write_add_filter_xz(struct archive *);
 +
 +
 +/* A convenience function to set the format based on the code or name. */
 +__LA_DECL int archive_write_set_format(struct archive *, int format_code);
 +__LA_DECL int archive_write_set_format_by_name(struct archive *,
 +		     const char *name);
 +/* To minimize link pollution, use one or more of the following. */
 +__LA_DECL int archive_write_set_format_7zip(struct archive *);
 +__LA_DECL int archive_write_set_format_ar_bsd(struct archive *);
 +__LA_DECL int archive_write_set_format_ar_svr4(struct archive *);
 +__LA_DECL int archive_write_set_format_cpio(struct archive *);
 +__LA_DECL int archive_write_set_format_cpio_newc(struct archive *);
 +__LA_DECL int archive_write_set_format_gnutar(struct archive *);
 +__LA_DECL int archive_write_set_format_iso9660(struct archive *);
 +__LA_DECL int archive_write_set_format_mtree(struct archive *);
 +__LA_DECL int archive_write_set_format_mtree_classic(struct archive *);
 +/* TODO: int archive_write_set_format_old_tar(struct archive *); */
 +__LA_DECL int archive_write_set_format_pax(struct archive *);
 +__LA_DECL int archive_write_set_format_pax_restricted(struct archive *);
 +__LA_DECL int archive_write_set_format_raw(struct archive *);
 +__LA_DECL int archive_write_set_format_shar(struct archive *);
 +__LA_DECL int archive_write_set_format_shar_dump(struct archive *);
 +__LA_DECL int archive_write_set_format_ustar(struct archive *);
 +__LA_DECL int archive_write_set_format_v7tar(struct archive *);
++__LA_DECL int archive_write_set_format_warc(struct archive *);
 +__LA_DECL int archive_write_set_format_xar(struct archive *);
 +__LA_DECL int archive_write_set_format_zip(struct archive *);
++__LA_DECL int archive_write_set_format_filter_by_ext(struct archive *a, const char *filename);
++__LA_DECL int archive_write_set_format_filter_by_ext_def(struct archive *a, const char *filename, const char * def_ext);
 +__LA_DECL int archive_write_zip_set_compression_deflate(struct archive *);
 +__LA_DECL int archive_write_zip_set_compression_store(struct archive *);
 +__LA_DECL int archive_write_open(struct archive *, void *,
 +		     archive_open_callback *, archive_write_callback *,
 +		     archive_close_callback *);
 +__LA_DECL int archive_write_open_fd(struct archive *, int _fd);
 +__LA_DECL int archive_write_open_filename(struct archive *, const char *_file);
 +__LA_DECL int archive_write_open_filename_w(struct archive *,
 +		     const wchar_t *_file);
 +/* A deprecated synonym for archive_write_open_filename() */
 +__LA_DECL int archive_write_open_file(struct archive *, const char *_file)
 +		__LA_DEPRECATED;
 +__LA_DECL int archive_write_open_FILE(struct archive *, FILE *);
 +/* _buffSize is the size of the buffer, _used refers to a variable that
 + * will be updated after each write into the buffer. */
 +__LA_DECL int archive_write_open_memory(struct archive *,
 +			void *_buffer, size_t _buffSize, size_t *_used);
 +
 +/*
 + * Note that the library will truncate writes beyond the size provided
 + * to archive_write_header or pad if the provided data is short.
 + */
 +__LA_DECL int archive_write_header(struct archive *,
 +		     struct archive_entry *);
- __LA_DECL __LA_SSIZE_T	archive_write_data(struct archive *,
++__LA_DECL la_ssize_t	archive_write_data(struct archive *,
 +			    const void *, size_t);
 +
 +/* This interface is currently only available for archive_write_disk handles.  */
- __LA_DECL __LA_SSIZE_T	 archive_write_data_block(struct archive *,
- 				    const void *, size_t, __LA_INT64_T);
++__LA_DECL la_ssize_t	 archive_write_data_block(struct archive *,
++				    const void *, size_t, la_int64_t);
 +
 +__LA_DECL int		 archive_write_finish_entry(struct archive *);
 +__LA_DECL int		 archive_write_close(struct archive *);
 +/* Marks the archive as FATAL so that a subsequent free() operation
 + * won't try to close() cleanly.  Provides a fast abort capability
 + * when the client discovers that things have gone wrong. */
 +__LA_DECL int            archive_write_fail(struct archive *);
 +/* This can fail if the archive wasn't already closed, in which case
 + * archive_write_free() will implicitly call archive_write_close(). */
 +__LA_DECL int		 archive_write_free(struct archive *);
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +/* Synonym for archive_write_free() for backwards compatibility. */
 +__LA_DECL int		 archive_write_finish(struct archive *) __LA_DEPRECATED;
 +#endif
 +
 +/*
 + * Set write options.
 + */
 +/* Apply option to the format only. */
 +__LA_DECL int archive_write_set_format_option(struct archive *_a,
 +			    const char *m, const char *o,
 +			    const char *v);
 +/* Apply option to the filter only. */
 +__LA_DECL int archive_write_set_filter_option(struct archive *_a,
 +			    const char *m, const char *o,
 +			    const char *v);
 +/* Apply option to both the format and the filter. */
 +__LA_DECL int archive_write_set_option(struct archive *_a,
 +			    const char *m, const char *o,
 +			    const char *v);
 +/* Apply option string to both the format and the filter. */
 +__LA_DECL int archive_write_set_options(struct archive *_a,
 +			    const char *opts);
 +
++/*
++ * Set a encryption passphrase.
++ */
++__LA_DECL int archive_write_set_passphrase(struct archive *_a, const char *p);
++__LA_DECL int archive_write_set_passphrase_callback(struct archive *,
++			    void *client_data, archive_passphrase_callback *);
++
 +/*-
 + * ARCHIVE_WRITE_DISK API
 + *
 + * To create objects on disk:
 + *   1) Ask archive_write_disk_new for a new archive_write_disk object.
 + *   2) Set any global properties.  In particular, you probably
 + *      want to set the options.
 + *   3) For each entry:
 + *      - construct an appropriate struct archive_entry structure
 + *      - archive_write_header to create the file/dir/etc on disk
 + *      - archive_write_data to write the entry data
 + *   4) archive_write_free to cleanup the writer and release resources
 + *
 + * In particular, you can use this in conjunction with archive_read()
 + * to pull entries out of an archive and create them on disk.
 + */
 +__LA_DECL struct archive	*archive_write_disk_new(void);
 +/* This file will not be overwritten. */
 +__LA_DECL int archive_write_disk_set_skip_file(struct archive *,
-     __LA_INT64_T, __LA_INT64_T);
++    la_int64_t, la_int64_t);
 +/* Set flags to control how the next item gets created.
 + * This accepts a bitmask of ARCHIVE_EXTRACT_XXX flags defined above. */
 +__LA_DECL int		 archive_write_disk_set_options(struct archive *,
 +		     int flags);
 +/*
 + * The lookup functions are given uname/uid (or gname/gid) pairs and
 + * return a uid (gid) suitable for this system.  These are used for
 + * restoring ownership and for setting ACLs.  The default functions
 + * are naive, they just return the uid/gid.  These are small, so reasonable
 + * for applications that don't need to preserve ownership; they
 + * are probably also appropriate for applications that are doing
 + * same-system backup and restore.
 + */
 +/*
 + * The "standard" lookup functions use common system calls to lookup
 + * the uname/gname, falling back to the uid/gid if the names can't be
 + * found.  They cache lookups and are reasonably fast, but can be very
 + * large, so they are not used unless you ask for them.  In
 + * particular, these match the specifications of POSIX "pax" and old
 + * POSIX "tar".
 + */
 +__LA_DECL int	 archive_write_disk_set_standard_lookup(struct archive *);
 +/*
 + * If neither the default (naive) nor the standard (big) functions suit
 + * your needs, you can write your own and register them.  Be sure to
 + * include a cleanup function if you have allocated private data.
 + */
 +__LA_DECL int archive_write_disk_set_group_lookup(struct archive *,
 +    void * /* private_data */,
-     __LA_INT64_T (*)(void *, const char *, __LA_INT64_T),
++    la_int64_t (*)(void *, const char *, la_int64_t),
 +    void (* /* cleanup */)(void *));
 +__LA_DECL int archive_write_disk_set_user_lookup(struct archive *,
 +    void * /* private_data */,
-     __LA_INT64_T (*)(void *, const char *, __LA_INT64_T),
++    la_int64_t (*)(void *, const char *, la_int64_t),
 +    void (* /* cleanup */)(void *));
- __LA_DECL __LA_INT64_T archive_write_disk_gid(struct archive *, const char *, __LA_INT64_T);
- __LA_DECL __LA_INT64_T archive_write_disk_uid(struct archive *, const char *, __LA_INT64_T);
++__LA_DECL la_int64_t archive_write_disk_gid(struct archive *, const char *, la_int64_t);
++__LA_DECL la_int64_t archive_write_disk_uid(struct archive *, const char *, la_int64_t);
 +
 +/*
 + * ARCHIVE_READ_DISK API
 + *
 + * This is still evolving and somewhat experimental.
 + */
 +__LA_DECL struct archive *archive_read_disk_new(void);
 +/* The names for symlink modes here correspond to an old BSD
 + * command-line argument convention: -L, -P, -H */
 +/* Follow all symlinks. */
 +__LA_DECL int archive_read_disk_set_symlink_logical(struct archive *);
 +/* Follow no symlinks. */
 +__LA_DECL int archive_read_disk_set_symlink_physical(struct archive *);
 +/* Follow symlink initially, then not. */
 +__LA_DECL int archive_read_disk_set_symlink_hybrid(struct archive *);
 +/* TODO: Handle Linux stat32/stat64 ugliness. <sigh> */
 +__LA_DECL int archive_read_disk_entry_from_file(struct archive *,
 +    struct archive_entry *, int /* fd */, const struct stat *);
 +/* Look up gname for gid or uname for uid. */
 +/* Default implementations are very, very stupid. */
- __LA_DECL const char *archive_read_disk_gname(struct archive *, __LA_INT64_T);
- __LA_DECL const char *archive_read_disk_uname(struct archive *, __LA_INT64_T);
++__LA_DECL const char *archive_read_disk_gname(struct archive *, la_int64_t);
++__LA_DECL const char *archive_read_disk_uname(struct archive *, la_int64_t);
 +/* "Standard" implementation uses getpwuid_r, getgrgid_r and caches the
 + * results for performance. */
 +__LA_DECL int	archive_read_disk_set_standard_lookup(struct archive *);
 +/* You can install your own lookups if you like. */
 +__LA_DECL int	archive_read_disk_set_gname_lookup(struct archive *,
 +    void * /* private_data */,
-     const char *(* /* lookup_fn */)(void *, __LA_INT64_T),
++    const char *(* /* lookup_fn */)(void *, la_int64_t),
 +    void (* /* cleanup_fn */)(void *));
 +__LA_DECL int	archive_read_disk_set_uname_lookup(struct archive *,
 +    void * /* private_data */,
-     const char *(* /* lookup_fn */)(void *, __LA_INT64_T),
++    const char *(* /* lookup_fn */)(void *, la_int64_t),
 +    void (* /* cleanup_fn */)(void *));
 +/* Start traversal. */
 +__LA_DECL int	archive_read_disk_open(struct archive *, const char *);
 +__LA_DECL int	archive_read_disk_open_w(struct archive *, const wchar_t *);
 +/*
 + * Request that current entry be visited.  If you invoke it on every
 + * directory, you'll get a physical traversal.  This is ignored if the
 + * current entry isn't a directory or a link to a directory.  So, if
 + * you invoke this on every returned path, you'll get a full logical
 + * traversal.
 + */
 +__LA_DECL int	archive_read_disk_descend(struct archive *);
 +__LA_DECL int	archive_read_disk_can_descend(struct archive *);
 +__LA_DECL int	archive_read_disk_current_filesystem(struct archive *);
 +__LA_DECL int	archive_read_disk_current_filesystem_is_synthetic(struct archive *);
 +__LA_DECL int	archive_read_disk_current_filesystem_is_remote(struct archive *);
 +/* Request that the access time of the entry visited by travesal be restored. */
 +__LA_DECL int  archive_read_disk_set_atime_restored(struct archive *);
 +/*
 + * Set behavior. The "flags" argument selects optional behavior.
 + */
 +/* Request that the access time of the entry visited by travesal be restored.
 + * This is the same as archive_read_disk_set_atime_restored. */
 +#define	ARCHIVE_READDISK_RESTORE_ATIME		(0x0001)
 +/* Default: Do not skip an entry which has nodump flags. */
 +#define	ARCHIVE_READDISK_HONOR_NODUMP		(0x0002)
 +/* Default: Skip a mac resource fork file whose prefix is "._" because of
 + * using copyfile. */
 +#define	ARCHIVE_READDISK_MAC_COPYFILE		(0x0004)
- /* Default: Do not traverse mount points. */
++/* Default: Traverse mount points. */
 +#define	ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS	(0x0008)
++/* Default: Xattrs are read from disk. */
++#define	ARCHIVE_READDISK_NO_XATTR		(0x0010)
 +
 +__LA_DECL int  archive_read_disk_set_behavior(struct archive *,
 +		    int flags);
 +
 +/*
 + * Set archive_match object that will be used in archive_read_disk to
 + * know whether an entry should be skipped. The callback function
 + * _excluded_func will be invoked when an entry is skipped by the result
 + * of archive_match.
 + */
 +__LA_DECL int	archive_read_disk_set_matching(struct archive *,
 +		    struct archive *_matching, void (*_excluded_func)
 +		    (struct archive *, void *, struct archive_entry *),
 +		    void *_client_data);
 +__LA_DECL int	archive_read_disk_set_metadata_filter_callback(struct archive *,
 +		    int (*_metadata_filter_func)(struct archive *, void *,
 +		    	struct archive_entry *), void *_client_data);
 +
 +/* Simplified cleanup interface;
 + * This calls archive_read_free() or archive_write_free() as needed. */
 +__LA_DECL int	archive_free(struct archive *);
 +
 +/*
 + * Accessor functions to read/set various information in
 + * the struct archive object:
 + */
 +
 +/* Number of filters in the current filter pipeline. */
 +/* Filter #0 is the one closest to the format, -1 is a synonym for the
 + * last filter, which is always the pseudo-filter that wraps the
 + * client callbacks. */
 +__LA_DECL int		 archive_filter_count(struct archive *);
- __LA_DECL __LA_INT64_T	 archive_filter_bytes(struct archive *, int);
++__LA_DECL la_int64_t	 archive_filter_bytes(struct archive *, int);
 +__LA_DECL int		 archive_filter_code(struct archive *, int);
 +__LA_DECL const char *	 archive_filter_name(struct archive *, int);
 +
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +/* These don't properly handle multiple filters, so are deprecated and
 + * will eventually be removed. */
 +/* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, -1); */
- __LA_DECL __LA_INT64_T	 archive_position_compressed(struct archive *)
++__LA_DECL la_int64_t	 archive_position_compressed(struct archive *)
 +				__LA_DEPRECATED;
 +/* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, 0); */
- __LA_DECL __LA_INT64_T	 archive_position_uncompressed(struct archive *)
++__LA_DECL la_int64_t	 archive_position_uncompressed(struct archive *)
 +				__LA_DEPRECATED;
 +/* As of libarchive 3.0, this is an alias for archive_filter_name(a, 0); */
 +__LA_DECL const char	*archive_compression_name(struct archive *)
 +				__LA_DEPRECATED;
 +/* As of libarchive 3.0, this is an alias for archive_filter_code(a, 0); */
 +__LA_DECL int		 archive_compression(struct archive *)
 +				__LA_DEPRECATED;
 +#endif
 +
 +__LA_DECL int		 archive_errno(struct archive *);
 +__LA_DECL const char	*archive_error_string(struct archive *);
 +__LA_DECL const char	*archive_format_name(struct archive *);
 +__LA_DECL int		 archive_format(struct archive *);
 +__LA_DECL void		 archive_clear_error(struct archive *);
 +__LA_DECL void		 archive_set_error(struct archive *, int _err,
 +			    const char *fmt, ...) __LA_PRINTF(3, 4);
 +__LA_DECL void		 archive_copy_error(struct archive *dest,
 +			    struct archive *src);
 +__LA_DECL int		 archive_file_count(struct archive *);
 +
 +/*
 + * ARCHIVE_MATCH API
 + */
 +__LA_DECL struct archive *archive_match_new(void);
 +__LA_DECL int	archive_match_free(struct archive *);
 +
 +/*
 + * Test if archive_entry is excluded.
 + * This is a convenience function. This is the same as calling all
 + * archive_match_path_excluded, archive_match_time_excluded
 + * and archive_match_owner_excluded.
 + */
 +__LA_DECL int	archive_match_excluded(struct archive *,
 +		    struct archive_entry *);
 +
 +/*
 + * Test if pathname is excluded. The conditions are set by following functions.
 + */
 +__LA_DECL int	archive_match_path_excluded(struct archive *,
 +		    struct archive_entry *);
 +/* Add exclusion pathname pattern. */
 +__LA_DECL int	archive_match_exclude_pattern(struct archive *, const char *);
 +__LA_DECL int	archive_match_exclude_pattern_w(struct archive *,
 +		    const wchar_t *);
 +/* Add exclusion pathname pattern from file. */
 +__LA_DECL int	archive_match_exclude_pattern_from_file(struct archive *,
 +		    const char *, int _nullSeparator);
 +__LA_DECL int	archive_match_exclude_pattern_from_file_w(struct archive *,
 +		    const wchar_t *, int _nullSeparator);
 +/* Add inclusion pathname pattern. */
 +__LA_DECL int	archive_match_include_pattern(struct archive *, const char *);
 +__LA_DECL int	archive_match_include_pattern_w(struct archive *,
 +		    const wchar_t *);
 +/* Add inclusion pathname pattern from file. */
 +__LA_DECL int	archive_match_include_pattern_from_file(struct archive *,
 +		    const char *, int _nullSeparator);
 +__LA_DECL int	archive_match_include_pattern_from_file_w(struct archive *,
 +		    const wchar_t *, int _nullSeparator);
 +/*
 + * How to get statistic information for inclusion patterns.
 + */
 +/* Return the amount number of unmatched inclusion patterns. */
 +__LA_DECL int	archive_match_path_unmatched_inclusions(struct archive *);
 +/* Return the pattern of unmatched inclusion with ARCHIVE_OK.
 + * Return ARCHIVE_EOF if there is no inclusion pattern. */
 +__LA_DECL int	archive_match_path_unmatched_inclusions_next(
 +		    struct archive *, const char **);
 +__LA_DECL int	archive_match_path_unmatched_inclusions_next_w(
 +		    struct archive *, const wchar_t **);
 +
 +/*
 + * Test if a file is excluded by its time stamp.
 + * The conditions are set by following functions.
 + */
 +__LA_DECL int	archive_match_time_excluded(struct archive *,
 +		    struct archive_entry *);
 +
 +/*
 + * Flags to tell a matching type of time stamps. These are used for
 + * following functinos.
 + */
 +/* Time flag: mtime to be tested. */
 +#define ARCHIVE_MATCH_MTIME	(0x0100)
 +/* Time flag: ctime to be tested. */
 +#define ARCHIVE_MATCH_CTIME	(0x0200)
 +/* Comparison flag: Match the time if it is newer than. */
 +#define ARCHIVE_MATCH_NEWER	(0x0001)
 +/* Comparison flag: Match the time if it is older than. */
 +#define ARCHIVE_MATCH_OLDER	(0x0002)
 +/* Comparison flag: Match the time if it is equal to. */
 +#define ARCHIVE_MATCH_EQUAL	(0x0010)
 +/* Set inclusion time. */
 +__LA_DECL int	archive_match_include_time(struct archive *, int _flag,
 +		    time_t _sec, long _nsec);
 +/* Set inclusion time by a date string. */
 +__LA_DECL int	archive_match_include_date(struct archive *, int _flag,
 +		    const char *_datestr);
 +__LA_DECL int	archive_match_include_date_w(struct archive *, int _flag,
 +		    const wchar_t *_datestr);
 +/* Set inclusion time by a particluar file. */
 +__LA_DECL int	archive_match_include_file_time(struct archive *,
 +		    int _flag, const char *_pathname);
 +__LA_DECL int	archive_match_include_file_time_w(struct archive *,
 +		    int _flag, const wchar_t *_pathname);
 +/* Add exclusion entry. */
 +__LA_DECL int	archive_match_exclude_entry(struct archive *,
 +		    int _flag, struct archive_entry *);
 +
 +/*
 + * Test if a file is excluded by its uid ,gid, uname or gname.
 + * The conditions are set by following functions.
 + */
 +__LA_DECL int	archive_match_owner_excluded(struct archive *,
 +		    struct archive_entry *);
 +/* Add inclusion uid, gid, uname and gname. */
- __LA_DECL int	archive_match_include_uid(struct archive *, __LA_INT64_T);
- __LA_DECL int	archive_match_include_gid(struct archive *, __LA_INT64_T);
++__LA_DECL int	archive_match_include_uid(struct archive *, la_int64_t);
++__LA_DECL int	archive_match_include_gid(struct archive *, la_int64_t);
 +__LA_DECL int	archive_match_include_uname(struct archive *, const char *);
 +__LA_DECL int	archive_match_include_uname_w(struct archive *,
 +		    const wchar_t *);
 +__LA_DECL int	archive_match_include_gname(struct archive *, const char *);
 +__LA_DECL int	archive_match_include_gname_w(struct archive *,
 +		    const wchar_t *);
 +
 +/* Utility functions */
 +/* Convenience function to sort a NULL terminated list of strings */
 +__LA_DECL int archive_utility_string_sort(char **);
 +
 +#ifdef __cplusplus
 +}
 +#endif
 +
 +/* These are meaningless outside of this header. */
 +#undef __LA_DECL
 +
- /* These need to remain defined because they're used in the
-  * callback type definitions.  XXX Fix this.  This is ugly. XXX */
- /* #undef __LA_INT64_T */
- /* #undef __LA_SSIZE_T */
- 
 +#endif /* !ARCHIVE_H_INCLUDED */
diff --cc Utilities/cmlibarchive/libarchive/archive_cryptor.c
index 0000000,9b01df8..9b01df8
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
diff --cc Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
index 0000000,b62ec0c..b62ec0c
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
diff --cc Utilities/cmlibarchive/libarchive/archive_entry.h
index efc4d73,0000000..68d8ab9
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_entry.h
+++ b/Utilities/cmlibarchive/libarchive/archive_entry.h
@@@ -1,616 -1,0 +1,637 @@@
 +/*-
 + * Copyright (c) 2003-2008 Tim Kientzle
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + *
 + * $FreeBSD: head/lib/libarchive/archive_entry.h 201096 2009-12-28 02:41:27Z kientzle $
 + */
 +
 +#ifndef ARCHIVE_ENTRY_H_INCLUDED
 +#define	ARCHIVE_ENTRY_H_INCLUDED
 +
 +/* Note: Compiler will complain if this does not match archive.h! */
 +#define	ARCHIVE_VERSION_NUMBER 3001002
 +
 +/*
 + * Note: archive_entry.h is for use outside of libarchive; the
 + * configuration headers (config.h, archive_platform.h, etc.) are
 + * purely internal.  Do NOT use HAVE_XXX configuration macros to
 + * control the behavior of this header!  If you must conditionalize,
 + * use predefined compiler and/or platform macros.
 + */
 +
 +#include <sys/types.h>
 +#include <stddef.h>  /* for wchar_t */
 +#include <time.h>
 +
++#if defined(_WIN32) && !defined(__CYGWIN__)
++#include <windows.h>
++#endif
++
 +/* Get a suitable 64-bit integer type. */
- #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
- # define	__LA_INT64_T	__int64
- #else
- #include <unistd.h>
- # if defined(_SCO_DS) || defined(__osf__)
- #  define	__LA_INT64_T	long long
++#if !defined(__LA_INT64_T_DEFINED)
++# if ARCHIVE_VERSION_NUMBER < 4000000
++#define __LA_INT64_T la_int64_t
++# endif
++#define __LA_INT64_T_DEFINED
++# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
++typedef __int64 la_int64_t;
 +# else
- #  define	__LA_INT64_T	int64_t
++#include <unistd.h>
++#  if defined(_SCO_DS) || defined(__osf__)
++typedef long long la_int64_t;
++#  else
++typedef int64_t la_int64_t;
++#  endif
 +# endif
 +#endif
 +
 +/* Get a suitable definition for mode_t */
 +#if ARCHIVE_VERSION_NUMBER >= 3999000
 +/* Switch to plain 'int' for libarchive 4.0.  It's less broken than 'mode_t' */
 +# define	__LA_MODE_T	int
 +#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__) && !defined(__WATCOMC__)
 +# define	__LA_MODE_T	unsigned short
 +#else
 +# define	__LA_MODE_T	mode_t
 +#endif
 +
 +/*
 + * On Windows, define LIBARCHIVE_STATIC if you're building or using a
 + * .lib.  The default here assumes you're building a DLL.  Only
 + * libarchive source should ever define __LIBARCHIVE_BUILD.
 + */
 +#if ((defined __WIN32__) || (defined _WIN32) || defined(__CYGWIN__)) && (!defined LIBARCHIVE_STATIC)
 +# ifdef __LIBARCHIVE_BUILD
 +#  ifdef __GNUC__
 +#   define __LA_DECL	__attribute__((dllexport)) extern
 +#  else
 +#   define __LA_DECL	__declspec(dllexport)
 +#  endif
 +# else
 +#  ifdef __GNUC__
 +#   define __LA_DECL
 +#  else
 +#   define __LA_DECL	__declspec(dllimport)
 +#  endif
 +# endif
 +#else
 +/* Static libraries on all platforms and shared libraries on non-Windows. */
 +# define __LA_DECL
 +#endif
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +/*
 + * Description of an archive entry.
 + *
 + * You can think of this as "struct stat" with some text fields added in.
 + *
 + * TODO: Add "comment", "charset", and possibly other entries that are
 + * supported by "pax interchange" format.  However, GNU, ustar, cpio,
 + * and other variants don't support these features, so they're not an
 + * excruciatingly high priority right now.
 + *
 + * TODO: "pax interchange" format allows essentially arbitrary
 + * key/value attributes to be attached to any entry.  Supporting
 + * such extensions may make this library useful for special
 + * applications (e.g., a package manager could attach special
 + * package-management attributes to each entry).
 + */
 +struct archive;
 +struct archive_entry;
 +
 +/*
 + * File-type constants.  These are returned from archive_entry_filetype()
 + * and passed to archive_entry_set_filetype().
 + *
 + * These values match S_XXX defines on every platform I've checked,
 + * including Windows, AIX, Linux, Solaris, and BSD.  They're
 + * (re)defined here because platforms generally don't define the ones
 + * they don't support.  For example, Windows doesn't define S_IFLNK or
 + * S_IFBLK.  Instead of having a mass of conditional logic and system
 + * checks to define any S_XXX values that aren't supported locally,
 + * I've just defined a new set of such constants so that
 + * libarchive-based applications can manipulate and identify archive
 + * entries properly even if the hosting platform can't store them on
 + * disk.
 + *
 + * These values are also used directly within some portable formats,
 + * such as cpio.  If you find a platform that varies from these, the
 + * correct solution is to leave these alone and translate from these
 + * portable values to platform-native values when entries are read from
 + * or written to disk.
 + */
 +/*
 + * In libarchive 4.0, we can drop the casts here.
 + * They're needed to work around Borland C's broken mode_t.
 + */
 +#define AE_IFMT		((__LA_MODE_T)0170000)
 +#define AE_IFREG	((__LA_MODE_T)0100000)
 +#define AE_IFLNK	((__LA_MODE_T)0120000)
 +#define AE_IFSOCK	((__LA_MODE_T)0140000)
 +#define AE_IFCHR	((__LA_MODE_T)0020000)
 +#define AE_IFBLK	((__LA_MODE_T)0060000)
 +#define AE_IFDIR	((__LA_MODE_T)0040000)
 +#define AE_IFIFO	((__LA_MODE_T)0010000)
 +
 +/*
 + * Basic object manipulation
 + */
 +
 +__LA_DECL struct archive_entry	*archive_entry_clear(struct archive_entry *);
 +/* The 'clone' function does a deep copy; all of the strings are copied too. */
 +__LA_DECL struct archive_entry	*archive_entry_clone(struct archive_entry *);
 +__LA_DECL void			 archive_entry_free(struct archive_entry *);
 +__LA_DECL struct archive_entry	*archive_entry_new(void);
 +
 +/*
 + * This form of archive_entry_new2() will pull character-set
 + * conversion information from the specified archive handle.  The
 + * older archive_entry_new(void) form is equivalent to calling
 + * archive_entry_new2(NULL) and will result in the use of an internal
 + * default character-set conversion.
 + */
 +__LA_DECL struct archive_entry	*archive_entry_new2(struct archive *);
 +
 +/*
 + * Retrieve fields from an archive_entry.
 + *
 + * There are a number of implicit conversions among these fields.  For
 + * example, if a regular string field is set and you read the _w wide
 + * character field, the entry will implicitly convert narrow-to-wide
 + * using the current locale.  Similarly, dev values are automatically
 + * updated when you write devmajor or devminor and vice versa.
 + *
 + * In addition, fields can be "set" or "unset."  Unset string fields
 + * return NULL, non-string fields have _is_set() functions to test
 + * whether they've been set.  You can "unset" a string field by
 + * assigning NULL; non-string fields have _unset() functions to
 + * unset them.
 + *
 + * Note: There is one ambiguity in the above; string fields will
 + * also return NULL when implicit character set conversions fail.
 + * This is usually what you want.
 + */
 +__LA_DECL time_t	 archive_entry_atime(struct archive_entry *);
 +__LA_DECL long		 archive_entry_atime_nsec(struct archive_entry *);
 +__LA_DECL int		 archive_entry_atime_is_set(struct archive_entry *);
 +__LA_DECL time_t	 archive_entry_birthtime(struct archive_entry *);
 +__LA_DECL long		 archive_entry_birthtime_nsec(struct archive_entry *);
 +__LA_DECL int		 archive_entry_birthtime_is_set(struct archive_entry *);
 +__LA_DECL time_t	 archive_entry_ctime(struct archive_entry *);
 +__LA_DECL long		 archive_entry_ctime_nsec(struct archive_entry *);
 +__LA_DECL int		 archive_entry_ctime_is_set(struct archive_entry *);
 +__LA_DECL dev_t		 archive_entry_dev(struct archive_entry *);
 +__LA_DECL int		 archive_entry_dev_is_set(struct archive_entry *);
 +__LA_DECL dev_t		 archive_entry_devmajor(struct archive_entry *);
 +__LA_DECL dev_t		 archive_entry_devminor(struct archive_entry *);
 +__LA_DECL __LA_MODE_T	 archive_entry_filetype(struct archive_entry *);
 +__LA_DECL void		 archive_entry_fflags(struct archive_entry *,
 +			    unsigned long * /* set */,
 +			    unsigned long * /* clear */);
 +__LA_DECL const char	*archive_entry_fflags_text(struct archive_entry *);
- __LA_DECL __LA_INT64_T	 archive_entry_gid(struct archive_entry *);
++__LA_DECL la_int64_t	 archive_entry_gid(struct archive_entry *);
 +__LA_DECL const char	*archive_entry_gname(struct archive_entry *);
++__LA_DECL const char	*archive_entry_gname_utf8(struct archive_entry *);
 +__LA_DECL const wchar_t	*archive_entry_gname_w(struct archive_entry *);
 +__LA_DECL const char	*archive_entry_hardlink(struct archive_entry *);
++__LA_DECL const char	*archive_entry_hardlink_utf8(struct archive_entry *);
 +__LA_DECL const wchar_t	*archive_entry_hardlink_w(struct archive_entry *);
- __LA_DECL __LA_INT64_T	 archive_entry_ino(struct archive_entry *);
- __LA_DECL __LA_INT64_T	 archive_entry_ino64(struct archive_entry *);
++__LA_DECL la_int64_t	 archive_entry_ino(struct archive_entry *);
++__LA_DECL la_int64_t	 archive_entry_ino64(struct archive_entry *);
 +__LA_DECL int		 archive_entry_ino_is_set(struct archive_entry *);
 +__LA_DECL __LA_MODE_T	 archive_entry_mode(struct archive_entry *);
 +__LA_DECL time_t	 archive_entry_mtime(struct archive_entry *);
 +__LA_DECL long		 archive_entry_mtime_nsec(struct archive_entry *);
 +__LA_DECL int		 archive_entry_mtime_is_set(struct archive_entry *);
 +__LA_DECL unsigned int	 archive_entry_nlink(struct archive_entry *);
 +__LA_DECL const char	*archive_entry_pathname(struct archive_entry *);
++__LA_DECL const char	*archive_entry_pathname_utf8(struct archive_entry *);
 +__LA_DECL const wchar_t	*archive_entry_pathname_w(struct archive_entry *);
 +__LA_DECL __LA_MODE_T	 archive_entry_perm(struct archive_entry *);
 +__LA_DECL dev_t		 archive_entry_rdev(struct archive_entry *);
 +__LA_DECL dev_t		 archive_entry_rdevmajor(struct archive_entry *);
 +__LA_DECL dev_t		 archive_entry_rdevminor(struct archive_entry *);
 +__LA_DECL const char	*archive_entry_sourcepath(struct archive_entry *);
 +__LA_DECL const wchar_t	*archive_entry_sourcepath_w(struct archive_entry *);
- __LA_DECL __LA_INT64_T	 archive_entry_size(struct archive_entry *);
++__LA_DECL la_int64_t	 archive_entry_size(struct archive_entry *);
 +__LA_DECL int		 archive_entry_size_is_set(struct archive_entry *);
 +__LA_DECL const char	*archive_entry_strmode(struct archive_entry *);
 +__LA_DECL const char	*archive_entry_symlink(struct archive_entry *);
++__LA_DECL const char	*archive_entry_symlink_utf8(struct archive_entry *);
 +__LA_DECL const wchar_t	*archive_entry_symlink_w(struct archive_entry *);
- __LA_DECL __LA_INT64_T	 archive_entry_uid(struct archive_entry *);
++__LA_DECL la_int64_t	 archive_entry_uid(struct archive_entry *);
 +__LA_DECL const char	*archive_entry_uname(struct archive_entry *);
++__LA_DECL const char	*archive_entry_uname_utf8(struct archive_entry *);
 +__LA_DECL const wchar_t	*archive_entry_uname_w(struct archive_entry *);
 +__LA_DECL int archive_entry_is_data_encrypted(struct archive_entry *);
 +__LA_DECL int archive_entry_is_metadata_encrypted(struct archive_entry *);
 +__LA_DECL int archive_entry_is_encrypted(struct archive_entry *);
 +
 +/*
 + * Set fields in an archive_entry.
 + *
 + * Note: Before libarchive 2.4, there were 'set' and 'copy' versions
 + * of the string setters.  'copy' copied the actual string, 'set' just
 + * stored the pointer.  In libarchive 2.4 and later, strings are
 + * always copied.
 + */
 +
 +__LA_DECL void	archive_entry_set_atime(struct archive_entry *, time_t, long);
 +__LA_DECL void  archive_entry_unset_atime(struct archive_entry *);
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +__LA_DECL void archive_entry_copy_bhfi(struct archive_entry *, struct _BY_HANDLE_FILE_INFORMATION *);
 +#endif
 +__LA_DECL void	archive_entry_set_birthtime(struct archive_entry *, time_t, long);
 +__LA_DECL void  archive_entry_unset_birthtime(struct archive_entry *);
 +__LA_DECL void	archive_entry_set_ctime(struct archive_entry *, time_t, long);
 +__LA_DECL void  archive_entry_unset_ctime(struct archive_entry *);
 +__LA_DECL void	archive_entry_set_dev(struct archive_entry *, dev_t);
 +__LA_DECL void	archive_entry_set_devmajor(struct archive_entry *, dev_t);
 +__LA_DECL void	archive_entry_set_devminor(struct archive_entry *, dev_t);
 +__LA_DECL void	archive_entry_set_filetype(struct archive_entry *, unsigned int);
 +__LA_DECL void	archive_entry_set_fflags(struct archive_entry *,
 +	    unsigned long /* set */, unsigned long /* clear */);
 +/* Returns pointer to start of first invalid token, or NULL if none. */
 +/* Note that all recognized tokens are processed, regardless. */
 +__LA_DECL const char *archive_entry_copy_fflags_text(struct archive_entry *,
 +	    const char *);
 +__LA_DECL const wchar_t *archive_entry_copy_fflags_text_w(struct archive_entry *,
 +	    const wchar_t *);
- __LA_DECL void	archive_entry_set_gid(struct archive_entry *, __LA_INT64_T);
++__LA_DECL void	archive_entry_set_gid(struct archive_entry *, la_int64_t);
 +__LA_DECL void	archive_entry_set_gname(struct archive_entry *, const char *);
++__LA_DECL void	archive_entry_set_gname_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_gname(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_gname_w(struct archive_entry *, const wchar_t *);
 +__LA_DECL int	archive_entry_update_gname_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_set_hardlink(struct archive_entry *, const char *);
++__LA_DECL void	archive_entry_set_hardlink_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_hardlink(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *);
 +__LA_DECL int	archive_entry_update_hardlink_utf8(struct archive_entry *, const char *);
- __LA_DECL void	archive_entry_set_ino(struct archive_entry *, __LA_INT64_T);
- __LA_DECL void	archive_entry_set_ino64(struct archive_entry *, __LA_INT64_T);
++__LA_DECL void	archive_entry_set_ino(struct archive_entry *, la_int64_t);
++__LA_DECL void	archive_entry_set_ino64(struct archive_entry *, la_int64_t);
 +__LA_DECL void	archive_entry_set_link(struct archive_entry *, const char *);
++__LA_DECL void	archive_entry_set_link_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_link(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_link_w(struct archive_entry *, const wchar_t *);
 +__LA_DECL int	archive_entry_update_link_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_set_mode(struct archive_entry *, __LA_MODE_T);
 +__LA_DECL void	archive_entry_set_mtime(struct archive_entry *, time_t, long);
 +__LA_DECL void  archive_entry_unset_mtime(struct archive_entry *);
 +__LA_DECL void	archive_entry_set_nlink(struct archive_entry *, unsigned int);
 +__LA_DECL void	archive_entry_set_pathname(struct archive_entry *, const char *);
++__LA_DECL void	archive_entry_set_pathname_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_pathname(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_pathname_w(struct archive_entry *, const wchar_t *);
 +__LA_DECL int	archive_entry_update_pathname_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_set_perm(struct archive_entry *, __LA_MODE_T);
 +__LA_DECL void	archive_entry_set_rdev(struct archive_entry *, dev_t);
 +__LA_DECL void	archive_entry_set_rdevmajor(struct archive_entry *, dev_t);
 +__LA_DECL void	archive_entry_set_rdevminor(struct archive_entry *, dev_t);
- __LA_DECL void	archive_entry_set_size(struct archive_entry *, __LA_INT64_T);
++__LA_DECL void	archive_entry_set_size(struct archive_entry *, la_int64_t);
 +__LA_DECL void	archive_entry_unset_size(struct archive_entry *);
 +__LA_DECL void	archive_entry_copy_sourcepath(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_sourcepath_w(struct archive_entry *, const wchar_t *);
 +__LA_DECL void	archive_entry_set_symlink(struct archive_entry *, const char *);
++__LA_DECL void	archive_entry_set_symlink_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_symlink(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *);
 +__LA_DECL int	archive_entry_update_symlink_utf8(struct archive_entry *, const char *);
- __LA_DECL void	archive_entry_set_uid(struct archive_entry *, __LA_INT64_T);
++__LA_DECL void	archive_entry_set_uid(struct archive_entry *, la_int64_t);
 +__LA_DECL void	archive_entry_set_uname(struct archive_entry *, const char *);
++__LA_DECL void	archive_entry_set_uname_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_uname(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_copy_uname_w(struct archive_entry *, const wchar_t *);
 +__LA_DECL int	archive_entry_update_uname_utf8(struct archive_entry *, const char *);
 +__LA_DECL void	archive_entry_set_is_data_encrypted(struct archive_entry *, char is_encrypted);
 +__LA_DECL void	archive_entry_set_is_metadata_encrypted(struct archive_entry *, char is_encrypted);
 +/*
 + * Routines to bulk copy fields to/from a platform-native "struct
 + * stat."  Libarchive used to just store a struct stat inside of each
 + * archive_entry object, but this created issues when trying to
 + * manipulate archives on systems different than the ones they were
 + * created on.
 + *
 + * TODO: On Linux and other LFS systems, provide both stat32 and
 + * stat64 versions of these functions and all of the macro glue so
 + * that archive_entry_stat is magically defined to
 + * archive_entry_stat32 or archive_entry_stat64 as appropriate.
 + */
 +__LA_DECL const struct stat	*archive_entry_stat(struct archive_entry *);
 +__LA_DECL void	archive_entry_copy_stat(struct archive_entry *, const struct stat *);
 +
 +/*
 + * Storage for Mac OS-specific AppleDouble metadata information.
 + * Apple-format tar files store a separate binary blob containing
 + * encoded metadata with ACL, extended attributes, etc.
 + * This provides a place to store that blob.
 + */
 +
 +__LA_DECL const void * archive_entry_mac_metadata(struct archive_entry *, size_t *);
 +__LA_DECL void archive_entry_copy_mac_metadata(struct archive_entry *, const void *, size_t);
 +
 +/*
 + * ACL routines.  This used to simply store and return text-format ACL
 + * strings, but that proved insufficient for a number of reasons:
 + *   = clients need control over uname/uid and gname/gid mappings
 + *   = there are many different ACL text formats
 + *   = would like to be able to read/convert archives containing ACLs
 + *     on platforms that lack ACL libraries
 + *
 + *  This last point, in particular, forces me to implement a reasonably
 + *  complete set of ACL support routines.
 + */
 +
 +/*
 + * Permission bits.
 + */
 +#define	ARCHIVE_ENTRY_ACL_EXECUTE             0x00000001
 +#define	ARCHIVE_ENTRY_ACL_WRITE               0x00000002
 +#define	ARCHIVE_ENTRY_ACL_READ                0x00000004
 +#define	ARCHIVE_ENTRY_ACL_READ_DATA           0x00000008
 +#define	ARCHIVE_ENTRY_ACL_LIST_DIRECTORY      0x00000008
 +#define	ARCHIVE_ENTRY_ACL_WRITE_DATA          0x00000010
 +#define	ARCHIVE_ENTRY_ACL_ADD_FILE            0x00000010
 +#define	ARCHIVE_ENTRY_ACL_APPEND_DATA         0x00000020
 +#define	ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY    0x00000020
 +#define	ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS    0x00000040
 +#define	ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS   0x00000080
 +#define	ARCHIVE_ENTRY_ACL_DELETE_CHILD        0x00000100
 +#define	ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES     0x00000200
 +#define	ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES    0x00000400
 +#define	ARCHIVE_ENTRY_ACL_DELETE              0x00000800
 +#define	ARCHIVE_ENTRY_ACL_READ_ACL            0x00001000
 +#define	ARCHIVE_ENTRY_ACL_WRITE_ACL           0x00002000
 +#define	ARCHIVE_ENTRY_ACL_WRITE_OWNER         0x00004000
 +#define	ARCHIVE_ENTRY_ACL_SYNCHRONIZE         0x00008000
 +
 +#define	ARCHIVE_ENTRY_ACL_PERMS_POSIX1E			\
 +	(ARCHIVE_ENTRY_ACL_EXECUTE			\
 +	    | ARCHIVE_ENTRY_ACL_WRITE			\
 +	    | ARCHIVE_ENTRY_ACL_READ)
 +
 +#define ARCHIVE_ENTRY_ACL_PERMS_NFS4			\
 +	(ARCHIVE_ENTRY_ACL_EXECUTE			\
 +	    | ARCHIVE_ENTRY_ACL_READ_DATA		\
 +	    | ARCHIVE_ENTRY_ACL_LIST_DIRECTORY 		\
 +	    | ARCHIVE_ENTRY_ACL_WRITE_DATA		\
 +	    | ARCHIVE_ENTRY_ACL_ADD_FILE		\
 +	    | ARCHIVE_ENTRY_ACL_APPEND_DATA		\
 +	    | ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY	\
 +	    | ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS	\
 +	    | ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS	\
 +	    | ARCHIVE_ENTRY_ACL_DELETE_CHILD		\
 +	    | ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES		\
 +	    | ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES	\
 +	    | ARCHIVE_ENTRY_ACL_DELETE			\
 +	    | ARCHIVE_ENTRY_ACL_READ_ACL		\
 +	    | ARCHIVE_ENTRY_ACL_WRITE_ACL		\
 +	    | ARCHIVE_ENTRY_ACL_WRITE_OWNER		\
 +	    | ARCHIVE_ENTRY_ACL_SYNCHRONIZE)
 +
 +/*
 + * Inheritance values (NFS4 ACLs only); included in permset.
 + */
 +#define	ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT                0x02000000
 +#define	ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT           0x04000000
 +#define	ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT        0x08000000
 +#define	ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY                0x10000000
 +#define	ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS           0x20000000
 +#define	ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS               0x40000000
 +
 +#define	ARCHIVE_ENTRY_ACL_INHERITANCE_NFS4			\
 +	(ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT			\
 +	    | ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT		\
 +	    | ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT	\
 +	    | ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY		\
 +	    | ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS		\
 +	    | ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS)
 +
 +/* We need to be able to specify combinations of these. */
 +#define	ARCHIVE_ENTRY_ACL_TYPE_ACCESS	256  /* POSIX.1e only */
 +#define	ARCHIVE_ENTRY_ACL_TYPE_DEFAULT	512  /* POSIX.1e only */
 +#define	ARCHIVE_ENTRY_ACL_TYPE_ALLOW	1024 /* NFS4 only */
 +#define	ARCHIVE_ENTRY_ACL_TYPE_DENY	2048 /* NFS4 only */
 +#define	ARCHIVE_ENTRY_ACL_TYPE_AUDIT	4096 /* NFS4 only */
 +#define	ARCHIVE_ENTRY_ACL_TYPE_ALARM	8192 /* NFS4 only */
 +#define	ARCHIVE_ENTRY_ACL_TYPE_POSIX1E	(ARCHIVE_ENTRY_ACL_TYPE_ACCESS \
 +	    | ARCHIVE_ENTRY_ACL_TYPE_DEFAULT)
 +#define	ARCHIVE_ENTRY_ACL_TYPE_NFS4	(ARCHIVE_ENTRY_ACL_TYPE_ALLOW \
 +	    | ARCHIVE_ENTRY_ACL_TYPE_DENY \
 +	    | ARCHIVE_ENTRY_ACL_TYPE_AUDIT \
 +	    | ARCHIVE_ENTRY_ACL_TYPE_ALARM)
 +
 +/* Tag values mimic POSIX.1e */
 +#define	ARCHIVE_ENTRY_ACL_USER		10001	/* Specified user. */
 +#define	ARCHIVE_ENTRY_ACL_USER_OBJ 	10002	/* User who owns the file. */
 +#define	ARCHIVE_ENTRY_ACL_GROUP		10003	/* Specified group. */
 +#define	ARCHIVE_ENTRY_ACL_GROUP_OBJ	10004	/* Group who owns the file. */
 +#define	ARCHIVE_ENTRY_ACL_MASK		10005	/* Modify group access (POSIX.1e only) */
 +#define	ARCHIVE_ENTRY_ACL_OTHER		10006	/* Public (POSIX.1e only) */
 +#define	ARCHIVE_ENTRY_ACL_EVERYONE	10107   /* Everyone (NFS4 only) */
 +
 +/*
 + * Set the ACL by clearing it and adding entries one at a time.
 + * Unlike the POSIX.1e ACL routines, you must specify the type
 + * (access/default) for each entry.  Internally, the ACL data is just
 + * a soup of entries.  API calls here allow you to retrieve just the
 + * entries of interest.  This design (which goes against the spirit of
 + * POSIX.1e) is useful for handling archive formats that combine
 + * default and access information in a single ACL list.
 + */
 +__LA_DECL void	 archive_entry_acl_clear(struct archive_entry *);
 +__LA_DECL int	 archive_entry_acl_add_entry(struct archive_entry *,
 +	    int /* type */, int /* permset */, int /* tag */,
 +	    int /* qual */, const char * /* name */);
 +__LA_DECL int	 archive_entry_acl_add_entry_w(struct archive_entry *,
 +	    int /* type */, int /* permset */, int /* tag */,
 +	    int /* qual */, const wchar_t * /* name */);
 +
 +/*
 + * To retrieve the ACL, first "reset", then repeatedly ask for the
 + * "next" entry.  The want_type parameter allows you to request only
 + * certain types of entries.
 + */
 +__LA_DECL int	 archive_entry_acl_reset(struct archive_entry *, int /* want_type */);
 +__LA_DECL int	 archive_entry_acl_next(struct archive_entry *, int /* want_type */,
 +	    int * /* type */, int * /* permset */, int * /* tag */,
 +	    int * /* qual */, const char ** /* name */);
 +__LA_DECL int	 archive_entry_acl_next_w(struct archive_entry *, int /* want_type */,
 +	    int * /* type */, int * /* permset */, int * /* tag */,
 +	    int * /* qual */, const wchar_t ** /* name */);
 +
 +/*
 + * Construct a text-format ACL.  The flags argument is a bitmask that
 + * can include any of the following:
 + *
 + * ARCHIVE_ENTRY_ACL_TYPE_ACCESS - Include POSIX.1e "access" entries.
 + * ARCHIVE_ENTRY_ACL_TYPE_DEFAULT - Include POSIX.1e "default" entries.
 + * ARCHIVE_ENTRY_ACL_TYPE_NFS4 - Include NFS4 entries.
 + * ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID - Include extra numeric ID field in
 + *    each ACL entry.  ('star' introduced this for POSIX.1e, this flag
 + *    also applies to NFS4.)
 + * ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT - Include "default:" before each
 + *    default ACL entry, as used in old Solaris ACLs.
 + */
 +#define	ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID	1024
 +#define	ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT	2048
 +__LA_DECL const wchar_t	*archive_entry_acl_text_w(struct archive_entry *,
 +		    int /* flags */);
 +__LA_DECL const char *archive_entry_acl_text(struct archive_entry *,
 +		    int /* flags */);
 +
 +/* Return a count of entries matching 'want_type' */
 +__LA_DECL int	 archive_entry_acl_count(struct archive_entry *, int /* want_type */);
 +
 +/* Return an opaque ACL object. */
 +/* There's not yet anything clients can actually do with this... */
 +struct archive_acl;
 +__LA_DECL struct archive_acl *archive_entry_acl(struct archive_entry *);
 +
 +/*
 + * extended attributes
 + */
 +
 +__LA_DECL void	 archive_entry_xattr_clear(struct archive_entry *);
 +__LA_DECL void	 archive_entry_xattr_add_entry(struct archive_entry *,
 +	    const char * /* name */, const void * /* value */,
 +	    size_t /* size */);
 +
 +/*
 + * To retrieve the xattr list, first "reset", then repeatedly ask for the
 + * "next" entry.
 + */
 +
 +__LA_DECL int	archive_entry_xattr_count(struct archive_entry *);
 +__LA_DECL int	archive_entry_xattr_reset(struct archive_entry *);
 +__LA_DECL int	archive_entry_xattr_next(struct archive_entry *,
 +	    const char ** /* name */, const void ** /* value */, size_t *);
 +
 +/*
 + * sparse
 + */
 +
 +__LA_DECL void	 archive_entry_sparse_clear(struct archive_entry *);
 +__LA_DECL void	 archive_entry_sparse_add_entry(struct archive_entry *,
- 	    __LA_INT64_T /* offset */, __LA_INT64_T /* length */);
++	    la_int64_t /* offset */, la_int64_t /* length */);
 +
 +/*
 + * To retrieve the xattr list, first "reset", then repeatedly ask for the
 + * "next" entry.
 + */
 +
 +__LA_DECL int	archive_entry_sparse_count(struct archive_entry *);
 +__LA_DECL int	archive_entry_sparse_reset(struct archive_entry *);
 +__LA_DECL int	archive_entry_sparse_next(struct archive_entry *,
- 	    __LA_INT64_T * /* offset */, __LA_INT64_T * /* length */);
++	    la_int64_t * /* offset */, la_int64_t * /* length */);
 +
 +/*
 + * Utility to match up hardlinks.
 + *
 + * The 'struct archive_entry_linkresolver' is a cache of archive entries
 + * for files with multiple links.  Here's how to use it:
 + *   1. Create a lookup object with archive_entry_linkresolver_new()
 + *   2. Tell it the archive format you're using.
 + *   3. Hand each archive_entry to archive_entry_linkify().
 + *      That function will return 0, 1, or 2 entries that should
 + *      be written.
 + *   4. Call archive_entry_linkify(resolver, NULL) until
 + *      no more entries are returned.
 + *   5. Call archive_entry_linkresolver_free(resolver) to free resources.
 + *
 + * The entries returned have their hardlink and size fields updated
 + * appropriately.  If an entry is passed in that does not refer to
 + * a file with multiple links, it is returned unchanged.  The intention
 + * is that you should be able to simply filter all entries through
 + * this machine.
 + *
 + * To make things more efficient, be sure that each entry has a valid
 + * nlinks value.  The hardlink cache uses this to track when all links
 + * have been found.  If the nlinks value is zero, it will keep every
 + * name in the cache indefinitely, which can use a lot of memory.
 + *
 + * Note that archive_entry_size() is reset to zero if the file
 + * body should not be written to the archive.  Pay attention!
 + */
 +struct archive_entry_linkresolver;
 +
 +/*
 + * There are three different strategies for marking hardlinks.
 + * The descriptions below name them after the best-known
 + * formats that rely on each strategy:
 + *
 + * "Old cpio" is the simplest, it always returns any entry unmodified.
 + *    As far as I know, only cpio formats use this.  Old cpio archives
 + *    store every link with the full body; the onus is on the dearchiver
 + *    to detect and properly link the files as they are restored.
 + * "tar" is also pretty simple; it caches a copy the first time it sees
 + *    any link.  Subsequent appearances are modified to be hardlink
 + *    references to the first one without any body.  Used by all tar
 + *    formats, although the newest tar formats permit the "old cpio" strategy
 + *    as well.  This strategy is very simple for the dearchiver,
 + *    and reasonably straightforward for the archiver.
 + * "new cpio" is trickier.  It stores the body only with the last
 + *    occurrence.  The complication is that we might not
 + *    see every link to a particular file in a single session, so
 + *    there's no easy way to know when we've seen the last occurrence.
 + *    The solution here is to queue one link until we see the next.
 + *    At the end of the session, you can enumerate any remaining
 + *    entries by calling archive_entry_linkify(NULL) and store those
 + *    bodies.  If you have a file with three links l1, l2, and l3,
 + *    you'll get the following behavior if you see all three links:
 + *           linkify(l1) => NULL   (the resolver stores l1 internally)
 + *           linkify(l2) => l1     (resolver stores l2, you write l1)
 + *           linkify(l3) => l2, l3 (all links seen, you can write both).
 + *    If you only see l1 and l2, you'll get this behavior:
 + *           linkify(l1) => NULL
 + *           linkify(l2) => l1
 + *           linkify(NULL) => l2   (at end, you retrieve remaining links)
 + *    As the name suggests, this strategy is used by newer cpio variants.
 + *    It's noticeably more complex for the archiver, slightly more complex
 + *    for the dearchiver than the tar strategy, but makes it straightforward
 + *    to restore a file using any link by simply continuing to scan until
 + *    you see a link that is stored with a body.  In contrast, the tar
 + *    strategy requires you to rescan the archive from the beginning to
 + *    correctly extract an arbitrary link.
 + */
 +
 +__LA_DECL struct archive_entry_linkresolver *archive_entry_linkresolver_new(void);
 +__LA_DECL void archive_entry_linkresolver_set_strategy(
 +	struct archive_entry_linkresolver *, int /* format_code */);
 +__LA_DECL void archive_entry_linkresolver_free(struct archive_entry_linkresolver *);
 +__LA_DECL void archive_entry_linkify(struct archive_entry_linkresolver *,
 +    struct archive_entry **, struct archive_entry **);
 +__LA_DECL struct archive_entry *archive_entry_partial_links(
 +    struct archive_entry_linkresolver *res, unsigned int *links);
 +
 +#ifdef __cplusplus
 +}
 +#endif
 +
 +/* This is meaningless outside of this header. */
 +#undef __LA_DECL
 +
 +#endif /* !ARCHIVE_ENTRY_H_INCLUDED */
diff --cc Utilities/cmlibarchive/libarchive/archive_hmac.c
index 0000000,898853b..898853b
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac.c
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac.c
diff --cc Utilities/cmlibarchive/libarchive/archive_hmac_private.h
index 0000000,3e48bc3..3e48bc3
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
diff --cc Utilities/cmlibarchive/libarchive/archive_random.c
index 0000000,57c49d5..57c49d5
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
diff --cc Utilities/cmlibarchive/libarchive/archive_read.c
index a65b94d,0000000..033ed8b
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read.c
@@@ -1,1696 -1,0 +1,1732 @@@
 +/*-
 + * Copyright (c) 2003-2011 Tim Kientzle
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +/*
 + * This file contains the "essential" portions of the read API, that
 + * is, stuff that will probably always be used by any client that
 + * actually needs to read an archive.  Optional pieces have been, as
 + * far as possible, separated out into separate files to avoid
 + * needlessly bloating statically-linked clients.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD: head/lib/libarchive/archive_read.c 201157 2009-12-29 05:30:23Z kientzle $");
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#include <stdio.h>
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_STRING_H
 +#include <string.h>
 +#endif
 +#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
 +#endif
 +
 +#include "archive.h"
 +#include "archive_entry.h"
 +#include "archive_private.h"
 +#include "archive_read_private.h"
 +
 +#define minimum(a, b) (a < b ? a : b)
 +
 +static int	choose_filters(struct archive_read *);
 +static int	choose_format(struct archive_read *);
 +static struct archive_vtable *archive_read_vtable(void);
 +static int64_t	_archive_filter_bytes(struct archive *, int);
 +static int	_archive_filter_code(struct archive *, int);
 +static const char *_archive_filter_name(struct archive *, int);
 +static int  _archive_filter_count(struct archive *);
 +static int	_archive_read_close(struct archive *);
 +static int	_archive_read_data_block(struct archive *,
 +		    const void **, size_t *, int64_t *);
 +static int	_archive_read_free(struct archive *);
 +static int	_archive_read_next_header(struct archive *,
 +		    struct archive_entry **);
 +static int	_archive_read_next_header2(struct archive *,
 +		    struct archive_entry *);
 +static int64_t  advance_file_pointer(struct archive_read_filter *, int64_t);
 +
 +static struct archive_vtable *
 +archive_read_vtable(void)
 +{
 +	static struct archive_vtable av;
 +	static int inited = 0;
 +
 +	if (!inited) {
 +		av.archive_filter_bytes = _archive_filter_bytes;
 +		av.archive_filter_code = _archive_filter_code;
 +		av.archive_filter_name = _archive_filter_name;
 +		av.archive_filter_count = _archive_filter_count;
 +		av.archive_read_data_block = _archive_read_data_block;
 +		av.archive_read_next_header = _archive_read_next_header;
 +		av.archive_read_next_header2 = _archive_read_next_header2;
 +		av.archive_free = _archive_read_free;
 +		av.archive_close = _archive_read_close;
 +		inited = 1;
 +	}
 +	return (&av);
 +}
 +
 +/*
 + * Allocate, initialize and return a struct archive object.
 + */
 +struct archive *
 +archive_read_new(void)
 +{
 +	struct archive_read *a;
 +
- 	a = (struct archive_read *)malloc(sizeof(*a));
++	a = (struct archive_read *)calloc(1, sizeof(*a));
 +	if (a == NULL)
 +		return (NULL);
- 	memset(a, 0, sizeof(*a));
 +	a->archive.magic = ARCHIVE_READ_MAGIC;
 +
 +	a->archive.state = ARCHIVE_STATE_NEW;
 +	a->entry = archive_entry_new2(&a->archive);
 +	a->archive.vtable = archive_read_vtable();
 +
++	a->passphrases.last = &a->passphrases.first;
++
 +	return (&a->archive);
 +}
 +
 +/*
 + * Record the do-not-extract-to file. This belongs in archive_read_extract.c.
 + */
 +void
 +archive_read_extract_set_skip_file(struct archive *_a, int64_t d, int64_t i)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +
 +	if (ARCHIVE_OK != __archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +		ARCHIVE_STATE_ANY, "archive_read_extract_set_skip_file"))
 +		return;
 +	a->skip_file_set = 1;
 +	a->skip_file_dev = d;
 +	a->skip_file_ino = i;
 +}
 +
 +/*
 + * Open the archive
 + */
 +int
 +archive_read_open(struct archive *a, void *client_data,
 +    archive_open_callback *client_opener, archive_read_callback *client_reader,
 +    archive_close_callback *client_closer)
 +{
 +	/* Old archive_read_open() is just a thin shell around
 +	 * archive_read_open1. */
 +	archive_read_set_open_callback(a, client_opener);
 +	archive_read_set_read_callback(a, client_reader);
 +	archive_read_set_close_callback(a, client_closer);
 +	archive_read_set_callback_data(a, client_data);
 +	return archive_read_open1(a);
 +}
 +
 +
 +int
 +archive_read_open2(struct archive *a, void *client_data,
 +    archive_open_callback *client_opener,
 +    archive_read_callback *client_reader,
 +    archive_skip_callback *client_skipper,
 +    archive_close_callback *client_closer)
 +{
 +	/* Old archive_read_open2() is just a thin shell around
 +	 * archive_read_open1. */
 +	archive_read_set_callback_data(a, client_data);
 +	archive_read_set_open_callback(a, client_opener);
 +	archive_read_set_read_callback(a, client_reader);
 +	archive_read_set_skip_callback(a, client_skipper);
 +	archive_read_set_close_callback(a, client_closer);
 +	return archive_read_open1(a);
 +}
 +
 +static ssize_t
 +client_read_proxy(struct archive_read_filter *self, const void **buff)
 +{
 +	ssize_t r;
 +	r = (self->archive->client.reader)(&self->archive->archive,
 +	    self->data, buff);
 +	return (r);
 +}
 +
 +static int64_t
 +client_skip_proxy(struct archive_read_filter *self, int64_t request)
 +{
 +	if (request < 0)
 +		__archive_errx(1, "Negative skip requested.");
 +	if (request == 0)
 +		return 0;
 +
 +	if (self->archive->client.skipper != NULL) {
 +		/* Seek requests over 1GiB are broken down into
 +		 * multiple seeks.  This avoids overflows when the
 +		 * requests get passed through 32-bit arguments. */
 +		int64_t skip_limit = (int64_t)1 << 30;
 +		int64_t total = 0;
 +		for (;;) {
 +			int64_t get, ask = request;
 +			if (ask > skip_limit)
 +				ask = skip_limit;
 +			get = (self->archive->client.skipper)
 +				(&self->archive->archive, self->data, ask);
- 			if (get == 0)
++			total += get;
++			if (get == 0 || get == request)
 +				return (total);
++			if (get > request)
++				return ARCHIVE_FATAL;
 +			request -= get;
- 			total += get;
 +		}
 +	} else if (self->archive->client.seeker != NULL
 +		&& request > 64 * 1024) {
 +		/* If the client provided a seeker but not a skipper,
 +		 * we can use the seeker to skip forward.
 +		 *
 +		 * Note: This isn't always a good idea.  The client
 +		 * skipper is allowed to skip by less than requested
 +		 * if it needs to maintain block alignment.  The
 +		 * seeker is not allowed to play such games, so using
 +		 * the seeker here may be a performance loss compared
 +		 * to just reading and discarding.  That's why we
 +		 * only do this for skips of over 64k.
 +		 */
 +		int64_t before = self->position;
 +		int64_t after = (self->archive->client.seeker)
 +		    (&self->archive->archive, self->data, request, SEEK_CUR);
 +		if (after != before + request)
 +			return ARCHIVE_FATAL;
 +		return after - before;
 +	}
 +	return 0;
 +}
 +
 +static int64_t
 +client_seek_proxy(struct archive_read_filter *self, int64_t offset, int whence)
 +{
 +	/* DO NOT use the skipper here!  If we transparently handled
 +	 * forward seek here by using the skipper, that will break
 +	 * other libarchive code that assumes a successful forward
 +	 * seek means it can also seek backwards.
 +	 */
- 	if (self->archive->client.seeker == NULL)
++	if (self->archive->client.seeker == NULL) {
++		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
++		    "Current client reader does not support seeking a device");
 +		return (ARCHIVE_FAILED);
++	}
 +	return (self->archive->client.seeker)(&self->archive->archive,
 +	    self->data, offset, whence);
 +}
 +
 +static int
 +client_close_proxy(struct archive_read_filter *self)
 +{
 +	int r = ARCHIVE_OK, r2;
 +	unsigned int i;
 +
 +	if (self->archive->client.closer == NULL)
 +		return (r);
 +	for (i = 0; i < self->archive->client.nodes; i++)
 +	{
 +		r2 = (self->archive->client.closer)
 +			((struct archive *)self->archive,
 +				self->archive->client.dataset[i].data);
 +		if (r > r2)
 +			r = r2;
 +	}
 +	return (r);
 +}
 +
 +static int
 +client_open_proxy(struct archive_read_filter *self)
 +{
 +  int r = ARCHIVE_OK;
 +	if (self->archive->client.opener != NULL)
 +		r = (self->archive->client.opener)(
 +		    (struct archive *)self->archive, self->data);
 +	return (r);
 +}
 +
 +static int
 +client_switch_proxy(struct archive_read_filter *self, unsigned int iindex)
 +{
 +  int r1 = ARCHIVE_OK, r2 = ARCHIVE_OK;
 +	void *data2 = NULL;
 +
 +	/* Don't do anything if already in the specified data node */
 +	if (self->archive->client.cursor == iindex)
 +		return (ARCHIVE_OK);
 +
 +	self->archive->client.cursor = iindex;
 +	data2 = self->archive->client.dataset[self->archive->client.cursor].data;
 +	if (self->archive->client.switcher != NULL)
 +	{
 +		r1 = r2 = (self->archive->client.switcher)
 +			((struct archive *)self->archive, self->data, data2);
 +		self->data = data2;
 +	}
 +	else
 +	{
 +		/* Attempt to call close and open instead */
 +		if (self->archive->client.closer != NULL)
 +			r1 = (self->archive->client.closer)
 +				((struct archive *)self->archive, self->data);
 +		self->data = data2;
 +		if (self->archive->client.opener != NULL)
 +			r2 = (self->archive->client.opener)
 +				((struct archive *)self->archive, self->data);
 +	}
 +	return (r1 < r2) ? r1 : r2;
 +}
 +
 +int
 +archive_read_set_open_callback(struct archive *_a,
 +    archive_open_callback *client_opener)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "archive_read_set_open_callback");
 +	a->client.opener = client_opener;
 +	return ARCHIVE_OK;
 +}
 +
 +int
 +archive_read_set_read_callback(struct archive *_a,
 +    archive_read_callback *client_reader)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "archive_read_set_read_callback");
 +	a->client.reader = client_reader;
 +	return ARCHIVE_OK;
 +}
 +
 +int
 +archive_read_set_skip_callback(struct archive *_a,
 +    archive_skip_callback *client_skipper)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "archive_read_set_skip_callback");
 +	a->client.skipper = client_skipper;
 +	return ARCHIVE_OK;
 +}
 +
 +int
 +archive_read_set_seek_callback(struct archive *_a,
 +    archive_seek_callback *client_seeker)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "archive_read_set_seek_callback");
 +	a->client.seeker = client_seeker;
 +	return ARCHIVE_OK;
 +}
 +
 +int
 +archive_read_set_close_callback(struct archive *_a,
 +    archive_close_callback *client_closer)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "archive_read_set_close_callback");
 +	a->client.closer = client_closer;
 +	return ARCHIVE_OK;
 +}
 +
 +int
 +archive_read_set_switch_callback(struct archive *_a,
 +    archive_switch_callback *client_switcher)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "archive_read_set_switch_callback");
 +	a->client.switcher = client_switcher;
 +	return ARCHIVE_OK;
 +}
 +
 +int
 +archive_read_set_callback_data(struct archive *_a, void *client_data)
 +{
 +	return archive_read_set_callback_data2(_a, client_data, 0);
 +}
 +
 +int
 +archive_read_set_callback_data2(struct archive *_a, void *client_data,
 +    unsigned int iindex)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "archive_read_set_callback_data2");
 +
 +	if (a->client.nodes == 0)
 +	{
 +		a->client.dataset = (struct archive_read_data_node *)
 +		    calloc(1, sizeof(*a->client.dataset));
 +		if (a->client.dataset == NULL)
 +		{
 +			archive_set_error(&a->archive, ENOMEM,
 +				"No memory.");
 +			return ARCHIVE_FATAL;
 +		}
 +		a->client.nodes = 1;
 +	}
 +
 +	if (iindex > a->client.nodes - 1)
 +	{
 +		archive_set_error(&a->archive, EINVAL,
 +			"Invalid index specified.");
 +		return ARCHIVE_FATAL;
 +	}
 +	a->client.dataset[iindex].data = client_data;
 +	a->client.dataset[iindex].begin_position = -1;
 +	a->client.dataset[iindex].total_size = -1;
 +	return ARCHIVE_OK;
 +}
 +
 +int
 +archive_read_add_callback_data(struct archive *_a, void *client_data,
 +    unsigned int iindex)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	void *p;
 +	unsigned int i;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "archive_read_add_callback_data");
 +	if (iindex > a->client.nodes) {
 +		archive_set_error(&a->archive, EINVAL,
 +			"Invalid index specified.");
 +		return ARCHIVE_FATAL;
 +	}
 +	p = realloc(a->client.dataset, sizeof(*a->client.dataset)
 +		* (++(a->client.nodes)));
 +	if (p == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +			"No memory.");
 +		return ARCHIVE_FATAL;
 +	}
 +	a->client.dataset = (struct archive_read_data_node *)p;
 +	for (i = a->client.nodes - 1; i > iindex && i > 0; i--) {
 +		a->client.dataset[i].data = a->client.dataset[i-1].data;
 +		a->client.dataset[i].begin_position = -1;
 +		a->client.dataset[i].total_size = -1;
 +	}
 +	a->client.dataset[iindex].data = client_data;
 +	a->client.dataset[iindex].begin_position = -1;
 +	a->client.dataset[iindex].total_size = -1;
 +	return ARCHIVE_OK;
 +}
 +
 +int
 +archive_read_append_callback_data(struct archive *_a, void *client_data)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	return archive_read_add_callback_data(_a, client_data, a->client.nodes);
 +}
 +
 +int
 +archive_read_prepend_callback_data(struct archive *_a, void *client_data)
 +{
 +	return archive_read_add_callback_data(_a, client_data, 0);
 +}
 +
 +int
 +archive_read_open1(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct archive_read_filter *filter, *tmp;
- 	int slot, e;
++	int slot, e = ARCHIVE_OK;
 +	unsigned int i;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "archive_read_open");
 +	archive_clear_error(&a->archive);
 +
 +	if (a->client.reader == NULL) {
 +		archive_set_error(&a->archive, EINVAL,
 +		    "No reader function provided to archive_read_open");
 +		a->archive.state = ARCHIVE_STATE_FATAL;
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Open data source. */
 +	if (a->client.opener != NULL) {
 +		e = (a->client.opener)(&a->archive, a->client.dataset[0].data);
 +		if (e != 0) {
 +			/* If the open failed, call the closer to clean up. */
 +			if (a->client.closer) {
 +				for (i = 0; i < a->client.nodes; i++)
 +					(a->client.closer)(&a->archive,
 +					    a->client.dataset[i].data);
 +			}
 +			return (e);
 +		}
 +	}
 +
 +	filter = calloc(1, sizeof(*filter));
 +	if (filter == NULL)
 +		return (ARCHIVE_FATAL);
 +	filter->bidder = NULL;
 +	filter->upstream = NULL;
 +	filter->archive = a;
 +	filter->data = a->client.dataset[0].data;
 +	filter->open = client_open_proxy;
 +	filter->read = client_read_proxy;
 +	filter->skip = client_skip_proxy;
 +	filter->seek = client_seek_proxy;
 +	filter->close = client_close_proxy;
 +	filter->sswitch = client_switch_proxy;
 +	filter->name = "none";
 +	filter->code = ARCHIVE_FILTER_NONE;
 +
 +	a->client.dataset[0].begin_position = 0;
 +	if (!a->filter || !a->bypass_filter_bidding)
 +	{
 +		a->filter = filter;
 +		/* Build out the input pipeline. */
 +		e = choose_filters(a);
 +		if (e < ARCHIVE_WARN) {
 +			a->archive.state = ARCHIVE_STATE_FATAL;
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +	else
 +	{
 +		/* Need to add "NONE" type filter at the end of the filter chain */
 +		tmp = a->filter;
 +		while (tmp->upstream)
 +			tmp = tmp->upstream;
 +		tmp->upstream = filter;
 +	}
 +
 +	if (!a->format)
 +	{
 +		slot = choose_format(a);
 +		if (slot < 0) {
 +			__archive_read_close_filters(a);
 +			a->archive.state = ARCHIVE_STATE_FATAL;
 +			return (ARCHIVE_FATAL);
 +		}
 +		a->format = &(a->formats[slot]);
 +	}
 +
 +	a->archive.state = ARCHIVE_STATE_HEADER;
 +
 +	/* Ensure libarchive starts from the first node in a multivolume set */
 +	client_switch_proxy(a->filter, 0);
 +	return (e);
 +}
 +
 +/*
 + * Allow each registered stream transform to bid on whether
 + * it wants to handle this stream.  Repeat until we've finished
 + * building the pipeline.
 + */
 +static int
 +choose_filters(struct archive_read *a)
 +{
- 	int number_bidders, i, bid, best_bid;
++	int number_bidders, i, bid, best_bid, n;
 +	struct archive_read_filter_bidder *bidder, *best_bidder;
 +	struct archive_read_filter *filter;
 +	ssize_t avail;
 +	int r;
 +
- 	for (;;) {
++	for (n = 0; n < 25; ++n) {
 +		number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
 +
 +		best_bid = 0;
 +		best_bidder = NULL;
 +
 +		bidder = a->bidders;
 +		for (i = 0; i < number_bidders; i++, bidder++) {
 +			if (bidder->bid != NULL) {
 +				bid = (bidder->bid)(bidder, a->filter);
 +				if (bid > best_bid) {
 +					best_bid = bid;
 +					best_bidder = bidder;
 +				}
 +			}
 +		}
 +
 +		/* If no bidder, we're done. */
 +		if (best_bidder == NULL) {
 +			/* Verify the filter by asking it for some data. */
 +			__archive_read_filter_ahead(a->filter, 1, &avail);
 +			if (avail < 0) {
 +				__archive_read_close_filters(a);
 +				__archive_read_free_filters(a);
 +				return (ARCHIVE_FATAL);
 +			}
 +			a->archive.compression_name = a->filter->name;
 +			a->archive.compression_code = a->filter->code;
 +			return (ARCHIVE_OK);
 +		}
 +
 +		filter
 +		    = (struct archive_read_filter *)calloc(1, sizeof(*filter));
 +		if (filter == NULL)
 +			return (ARCHIVE_FATAL);
 +		filter->bidder = best_bidder;
 +		filter->archive = a;
 +		filter->upstream = a->filter;
 +		a->filter = filter;
 +		r = (best_bidder->init)(a->filter);
 +		if (r != ARCHIVE_OK) {
 +			__archive_read_close_filters(a);
 +			__archive_read_free_filters(a);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
++	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++	    "Input requires too many filters for decoding");
++	return (ARCHIVE_FATAL);
 +}
 +
 +/*
 + * Read header of next entry.
 + */
 +static int
 +_archive_read_next_header2(struct archive *_a, struct archive_entry *entry)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	int r1 = ARCHIVE_OK, r2;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
 +	    "archive_read_next_header");
 +
 +	archive_entry_clear(entry);
 +	archive_clear_error(&a->archive);
 +
 +	/*
 +	 * If client didn't consume entire data, skip any remainder
 +	 * (This is especially important for GNU incremental directories.)
 +	 */
 +	if (a->archive.state == ARCHIVE_STATE_DATA) {
 +		r1 = archive_read_data_skip(&a->archive);
 +		if (r1 == ARCHIVE_EOF)
 +			archive_set_error(&a->archive, EIO,
 +			    "Premature end-of-file.");
 +		if (r1 == ARCHIVE_EOF || r1 == ARCHIVE_FATAL) {
 +			a->archive.state = ARCHIVE_STATE_FATAL;
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	/* Record start-of-header offset in uncompressed stream. */
 +	a->header_position = a->filter->position;
 +
 +	++_a->file_count;
 +	r2 = (a->format->read_header)(a, entry);
 +
 +	/*
 +	 * EOF and FATAL are persistent at this layer.  By
 +	 * modifying the state, we guarantee that future calls to
 +	 * read a header or read data will fail.
 +	 */
 +	switch (r2) {
 +	case ARCHIVE_EOF:
 +		a->archive.state = ARCHIVE_STATE_EOF;
 +		--_a->file_count;/* Revert a file counter. */
 +		break;
 +	case ARCHIVE_OK:
 +		a->archive.state = ARCHIVE_STATE_DATA;
 +		break;
 +	case ARCHIVE_WARN:
 +		a->archive.state = ARCHIVE_STATE_DATA;
 +		break;
 +	case ARCHIVE_RETRY:
 +		break;
 +	case ARCHIVE_FATAL:
 +		a->archive.state = ARCHIVE_STATE_FATAL;
 +		break;
 +	}
 +
- 	a->read_data_output_offset = 0;
- 	a->read_data_remaining = 0;
- 	a->read_data_is_posix_read = 0;
- 	a->read_data_requested = 0;
++	__archive_reset_read_data(&a->archive);
++
 +	a->data_start_node = a->client.cursor;
 +	/* EOF always wins; otherwise return the worst error. */
 +	return (r2 < r1 || r2 == ARCHIVE_EOF) ? r2 : r1;
 +}
 +
- int
++static int
 +_archive_read_next_header(struct archive *_a, struct archive_entry **entryp)
 +{
 +	int ret;
 +	struct archive_read *a = (struct archive_read *)_a;
 +	*entryp = NULL;
 +	ret = _archive_read_next_header2(_a, a->entry);
 +	*entryp = a->entry;
 +	return ret;
 +}
 +
 +/*
 + * Allow each registered format to bid on whether it wants to handle
 + * the next entry.  Return index of winning bidder.
 + */
 +static int
 +choose_format(struct archive_read *a)
 +{
 +	int slots;
 +	int i;
 +	int bid, best_bid;
 +	int best_bid_slot;
 +
 +	slots = sizeof(a->formats) / sizeof(a->formats[0]);
 +	best_bid = -1;
 +	best_bid_slot = -1;
 +
 +	/* Set up a->format for convenience of bidders. */
 +	a->format = &(a->formats[0]);
 +	for (i = 0; i < slots; i++, a->format++) {
 +		if (a->format->bid) {
 +			bid = (a->format->bid)(a, best_bid);
 +			if (bid == ARCHIVE_FATAL)
 +				return (ARCHIVE_FATAL);
 +			if (a->filter->position != 0)
 +				__archive_read_seek(a, 0, SEEK_SET);
 +			if ((bid > best_bid) || (best_bid_slot < 0)) {
 +				best_bid = bid;
 +				best_bid_slot = i;
 +			}
 +		}
 +	}
 +
 +	/*
 +	 * There were no bidders; this is a serious programmer error
 +	 * and demands a quick and definitive abort.
 +	 */
 +	if (best_bid_slot < 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "No formats registered");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * There were bidders, but no non-zero bids; this means we
 +	 * can't support this stream.
 +	 */
 +	if (best_bid < 1) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Unrecognized archive format");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	return (best_bid_slot);
 +}
 +
 +/*
 + * Return the file offset (within the uncompressed data stream) where
 + * the last header started.
 + */
 +int64_t
 +archive_read_header_position(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_ANY, "archive_read_header_position");
 +	return (a->header_position);
 +}
 +
 +/*
 + * Returns 1 if the archive contains at least one encrypted entry.
 + * If the archive format not support encryption at all
 + * ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED is returned.
 + * If for any other reason (e.g. not enough data read so far)
 + * we cannot say whether there are encrypted entries, then
 + * ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW is returned.
 + * In general, this function will return values below zero when the
 + * reader is uncertain or totally uncapable of encryption support.
 + * When this function returns 0 you can be sure that the reader
 + * supports encryption detection but no encrypted entries have
 + * been found yet.
 + *
 + * NOTE: If the metadata/header of an archive is also encrypted, you
 + * cannot rely on the number of encrypted entries. That is why this
 + * function does not return the number of encrypted entries but#
 + * just shows that there are some.
 + */
 +int
 +archive_read_has_encrypted_entries(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	int format_supports_encryption = archive_read_format_capabilities(_a)
 +			& (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA | ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
 +
 +	if (!_a || !format_supports_encryption) {
 +		/* Format in general doesn't support encryption */
 +		return ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED;
 +	}
 +
 +	/* A reader potentially has read enough data now. */
 +	if (a->format && a->format->has_encrypted_entries) {
 +		return (a->format->has_encrypted_entries)(a);
 +	}
 +
 +	/* For any other reason we cannot say how many entries are there. */
 +	return ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
 +}
 +
 +/*
 + * Returns a bitmask of capabilities that are supported by the archive format reader.
 + * If the reader has no special capabilities, ARCHIVE_READ_FORMAT_CAPS_NONE is returned.
 + */
 +int
 +archive_read_format_capabilities(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	if (a && a->format && a->format->format_capabilties) {
 +		return (a->format->format_capabilties)(a);
 +	}
 +	return ARCHIVE_READ_FORMAT_CAPS_NONE;
 +}
 +
 +/*
 + * Read data from an archive entry, using a read(2)-style interface.
 + * This is a convenience routine that just calls
 + * archive_read_data_block and copies the results into the client
 + * buffer, filling any gaps with zero bytes.  Clients using this
 + * API can be completely ignorant of sparse-file issues; sparse files
 + * will simply be padded with nulls.
 + *
 + * DO NOT intermingle calls to this function and archive_read_data_block
 + * to read a single entry body.
 + */
 +ssize_t
 +archive_read_data(struct archive *_a, void *buff, size_t s)
 +{
- 	struct archive_read *a = (struct archive_read *)_a;
++	struct archive *a = (struct archive *)_a;
 +	char	*dest;
 +	const void *read_buf;
 +	size_t	 bytes_read;
 +	size_t	 len;
 +	int	 r;
 +
 +	bytes_read = 0;
 +	dest = (char *)buff;
 +
 +	while (s > 0) {
 +		if (a->read_data_remaining == 0) {
 +			read_buf = a->read_data_block;
 +			a->read_data_is_posix_read = 1;
 +			a->read_data_requested = s;
- 			r = _archive_read_data_block(&a->archive, &read_buf,
++			r = archive_read_data_block(a, &read_buf,
 +			    &a->read_data_remaining, &a->read_data_offset);
 +			a->read_data_block = read_buf;
 +			if (r == ARCHIVE_EOF)
 +				return (bytes_read);
 +			/*
 +			 * Error codes are all negative, so the status
 +			 * return here cannot be confused with a valid
 +			 * byte count.  (ARCHIVE_OK is zero.)
 +			 */
 +			if (r < ARCHIVE_OK)
 +				return (r);
 +		}
 +
 +		if (a->read_data_offset < a->read_data_output_offset) {
- 			archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++			archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Encountered out-of-order sparse blocks");
 +			return (ARCHIVE_RETRY);
 +		}
 +
 +		/* Compute the amount of zero padding needed. */
 +		if (a->read_data_output_offset + (int64_t)s <
 +		    a->read_data_offset) {
 +			len = s;
 +		} else if (a->read_data_output_offset <
 +		    a->read_data_offset) {
 +			len = (size_t)(a->read_data_offset -
 +			    a->read_data_output_offset);
 +		} else
 +			len = 0;
 +
 +		/* Add zeroes. */
 +		memset(dest, 0, len);
 +		s -= len;
 +		a->read_data_output_offset += len;
 +		dest += len;
 +		bytes_read += len;
 +
 +		/* Copy data if there is any space left. */
 +		if (s > 0) {
 +			len = a->read_data_remaining;
 +			if (len > s)
 +				len = s;
 +			memcpy(dest, a->read_data_block, len);
 +			s -= len;
 +			a->read_data_block += len;
 +			a->read_data_remaining -= len;
 +			a->read_data_output_offset += len;
 +			a->read_data_offset += len;
 +			dest += len;
 +			bytes_read += len;
 +		}
 +	}
 +	a->read_data_is_posix_read = 0;
 +	a->read_data_requested = 0;
 +	return (bytes_read);
 +}
 +
 +/*
++ * Reset the read_data_* variables, used for starting a new entry.
++ */
++void __archive_reset_read_data(struct archive * a)
++{
++	a->read_data_output_offset = 0;
++	a->read_data_remaining = 0;
++	a->read_data_is_posix_read = 0;
++	a->read_data_requested = 0;
++
++   /* extra resets, from rar.c */
++   a->read_data_block = NULL;
++   a->read_data_offset = 0;
++}
++
++/*
 + * Skip over all remaining data in this entry.
 + */
 +int
 +archive_read_data_skip(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	int r;
 +	const void *buff;
 +	size_t size;
 +	int64_t offset;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA,
 +	    "archive_read_data_skip");
 +
 +	if (a->format->read_data_skip != NULL)
 +		r = (a->format->read_data_skip)(a);
 +	else {
 +		while ((r = archive_read_data_block(&a->archive,
 +			    &buff, &size, &offset))
 +		    == ARCHIVE_OK)
 +			;
 +	}
 +
 +	if (r == ARCHIVE_EOF)
 +		r = ARCHIVE_OK;
 +
 +	a->archive.state = ARCHIVE_STATE_HEADER;
 +	return (r);
 +}
 +
 +int64_t
 +archive_seek_data(struct archive *_a, int64_t offset, int whence)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA,
 +	    "archive_seek_data_block");
 +
 +	if (a->format->seek_data == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
 +		    "Internal error: "
 +		    "No format_seek_data_block function registered");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	return (a->format->seek_data)(a, offset, whence);
 +}
 +
 +/*
 + * Read the next block of entry data from the archive.
 + * This is a zero-copy interface; the client receives a pointer,
 + * size, and file offset of the next available block of data.
 + *
 + * Returns ARCHIVE_OK if the operation is successful, ARCHIVE_EOF if
 + * the end of entry is encountered.
 + */
 +static int
 +_archive_read_data_block(struct archive *_a,
 +    const void **buff, size_t *size, int64_t *offset)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA,
 +	    "archive_read_data_block");
 +
 +	if (a->format->read_data == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
 +		    "Internal error: "
- 		    "No format_read_data_block function registered");
++		    "No format->read_data function registered");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	return (a->format->read_data)(a, buff, size, offset);
 +}
 +
 +int
 +__archive_read_close_filters(struct archive_read *a)
 +{
 +	struct archive_read_filter *f = a->filter;
 +	int r = ARCHIVE_OK;
 +	/* Close each filter in the pipeline. */
 +	while (f != NULL) {
 +		struct archive_read_filter *t = f->upstream;
 +		if (!f->closed && f->close != NULL) {
 +			int r1 = (f->close)(f);
 +			f->closed = 1;
 +			if (r1 < r)
 +				r = r1;
 +		}
 +		free(f->buffer);
 +		f->buffer = NULL;
 +		f = t;
 +	}
 +	return r;
 +}
 +
 +void
 +__archive_read_free_filters(struct archive_read *a)
 +{
 +	while (a->filter != NULL) {
 +		struct archive_read_filter *t = a->filter->upstream;
 +		free(a->filter);
 +		a->filter = t;
 +	}
 +}
 +
 +/*
 + * return the count of # of filters in use
 + */
 +static int
 +_archive_filter_count(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct archive_read_filter *p = a->filter;
 +	int count = 0;
 +	while(p) {
 +		count++;
 +		p = p->upstream;
 +	}
 +	return count;
 +}
 +
 +/*
 + * Close the file and all I/O.
 + */
 +static int
 +_archive_read_close(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	int r = ARCHIVE_OK, r1 = ARCHIVE_OK;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_ANY | ARCHIVE_STATE_FATAL, "archive_read_close");
 +	if (a->archive.state == ARCHIVE_STATE_CLOSED)
 +		return (ARCHIVE_OK);
 +	archive_clear_error(&a->archive);
 +	a->archive.state = ARCHIVE_STATE_CLOSED;
 +
 +	/* TODO: Clean up the formatters. */
 +
 +	/* Release the filter objects. */
 +	r1 = __archive_read_close_filters(a);
 +	if (r1 < r)
 +		r = r1;
 +
 +	return (r);
 +}
 +
 +/*
 + * Release memory and other resources.
 + */
 +static int
 +_archive_read_free(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
++	struct archive_read_passphrase *p;
 +	int i, n;
 +	int slots;
 +	int r = ARCHIVE_OK;
 +
 +	if (_a == NULL)
 +		return (ARCHIVE_OK);
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_ANY | ARCHIVE_STATE_FATAL, "archive_read_free");
 +	if (a->archive.state != ARCHIVE_STATE_CLOSED
 +	    && a->archive.state != ARCHIVE_STATE_FATAL)
 +		r = archive_read_close(&a->archive);
 +
 +	/* Call cleanup functions registered by optional components. */
 +	if (a->cleanup_archive_extract != NULL)
 +		r = (a->cleanup_archive_extract)(a);
 +
 +	/* Cleanup format-specific data. */
 +	slots = sizeof(a->formats) / sizeof(a->formats[0]);
 +	for (i = 0; i < slots; i++) {
 +		a->format = &(a->formats[i]);
 +		if (a->formats[i].cleanup)
 +			(a->formats[i].cleanup)(a);
 +	}
 +
 +	/* Free the filters */
 +	__archive_read_free_filters(a);
 +
 +	/* Release the bidder objects. */
 +	n = sizeof(a->bidders)/sizeof(a->bidders[0]);
 +	for (i = 0; i < n; i++) {
 +		if (a->bidders[i].free != NULL) {
 +			int r1 = (a->bidders[i].free)(&a->bidders[i]);
 +			if (r1 < r)
 +				r = r1;
 +		}
 +	}
 +
++	/* Release passphrase list. */
++	p = a->passphrases.first;
++	while (p != NULL) {
++		struct archive_read_passphrase *np = p->next;
++
++		/* A passphrase should be cleaned. */
++		memset(p->passphrase, 0, strlen(p->passphrase));
++		free(p->passphrase);
++		free(p);
++		p = np;
++	}
++
 +	archive_string_free(&a->archive.error_string);
- 	if (a->entry)
- 		archive_entry_free(a->entry);
++	archive_entry_free(a->entry);
 +	a->archive.magic = 0;
 +	__archive_clean(&a->archive);
 +	free(a->client.dataset);
 +	free(a);
 +	return (r);
 +}
 +
 +static struct archive_read_filter *
 +get_filter(struct archive *_a, int n)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct archive_read_filter *f = a->filter;
 +	/* We use n == -1 for 'the last filter', which is always the
 +	 * client proxy. */
 +	if (n == -1 && f != NULL) {
 +		struct archive_read_filter *last = f;
 +		f = f->upstream;
 +		while (f != NULL) {
 +			last = f;
 +			f = f->upstream;
 +		}
 +		return (last);
 +	}
 +	if (n < 0)
 +		return NULL;
 +	while (n > 0 && f != NULL) {
 +		f = f->upstream;
 +		--n;
 +	}
 +	return (f);
 +}
 +
 +static int
 +_archive_filter_code(struct archive *_a, int n)
 +{
 +	struct archive_read_filter *f = get_filter(_a, n);
 +	return f == NULL ? -1 : f->code;
 +}
 +
 +static const char *
 +_archive_filter_name(struct archive *_a, int n)
 +{
 +	struct archive_read_filter *f = get_filter(_a, n);
 +	return f != NULL ? f->name : NULL;
 +}
 +
 +static int64_t
 +_archive_filter_bytes(struct archive *_a, int n)
 +{
 +	struct archive_read_filter *f = get_filter(_a, n);
 +	return f == NULL ? -1 : f->position;
 +}
 +
 +/*
 + * Used internally by read format handlers to register their bid and
 + * initialization functions.
 + */
 +int
 +__archive_read_register_format(struct archive_read *a,
 +    void *format_data,
 +    const char *name,
 +    int (*bid)(struct archive_read *, int),
 +    int (*options)(struct archive_read *, const char *, const char *),
 +    int (*read_header)(struct archive_read *, struct archive_entry *),
 +    int (*read_data)(struct archive_read *, const void **, size_t *, int64_t *),
 +    int (*read_data_skip)(struct archive_read *),
 +    int64_t (*seek_data)(struct archive_read *, int64_t, int),
 +    int (*cleanup)(struct archive_read *),
 +    int (*format_capabilities)(struct archive_read *),
 +    int (*has_encrypted_entries)(struct archive_read *))
 +{
 +	int i, number_slots;
 +
 +	archive_check_magic(&a->archive,
 +	    ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +	    "__archive_read_register_format");
 +
 +	number_slots = sizeof(a->formats) / sizeof(a->formats[0]);
 +
 +	for (i = 0; i < number_slots; i++) {
 +		if (a->formats[i].bid == bid)
 +			return (ARCHIVE_WARN); /* We've already installed */
 +		if (a->formats[i].bid == NULL) {
 +			a->formats[i].bid = bid;
 +			a->formats[i].options = options;
 +			a->formats[i].read_header = read_header;
 +			a->formats[i].read_data = read_data;
 +			a->formats[i].read_data_skip = read_data_skip;
 +			a->formats[i].seek_data = seek_data;
 +			a->formats[i].cleanup = cleanup;
 +			a->formats[i].data = format_data;
 +			a->formats[i].name = name;
 +			a->formats[i].format_capabilties = format_capabilities;
 +			a->formats[i].has_encrypted_entries = has_encrypted_entries;
 +			return (ARCHIVE_OK);
 +		}
 +	}
 +
 +	archive_set_error(&a->archive, ENOMEM,
 +	    "Not enough slots for format registration");
 +	return (ARCHIVE_FATAL);
 +}
 +
 +/*
 + * Used internally by decompression routines to register their bid and
 + * initialization functions.
 + */
 +int
 +__archive_read_get_bidder(struct archive_read *a,
 +    struct archive_read_filter_bidder **bidder)
 +{
 +	int i, number_slots;
 +
 +	number_slots = sizeof(a->bidders) / sizeof(a->bidders[0]);
 +
 +	for (i = 0; i < number_slots; i++) {
 +		if (a->bidders[i].bid == NULL) {
 +			memset(a->bidders + i, 0, sizeof(a->bidders[0]));
 +			*bidder = (a->bidders + i);
 +			return (ARCHIVE_OK);
 +		}
 +	}
 +
 +	archive_set_error(&a->archive, ENOMEM,
 +	    "Not enough slots for filter registration");
 +	return (ARCHIVE_FATAL);
 +}
 +
 +/*
 + * The next section implements the peek/consume internal I/O
 + * system used by archive readers.  This system allows simple
 + * read-ahead for consumers while preserving zero-copy operation
 + * most of the time.
 + *
 + * The two key operations:
 + *  * The read-ahead function returns a pointer to a block of data
 + *    that satisfies a minimum request.
 + *  * The consume function advances the file pointer.
 + *
 + * In the ideal case, filters generate blocks of data
 + * and __archive_read_ahead() just returns pointers directly into
 + * those blocks.  Then __archive_read_consume() just bumps those
 + * pointers.  Only if your request would span blocks does the I/O
 + * layer use a copy buffer to provide you with a contiguous block of
 + * data.
 + *
 + * A couple of useful idioms:
 + *  * "I just want some data."  Ask for 1 byte and pay attention to
 + *    the "number of bytes available" from __archive_read_ahead().
 + *    Consume whatever you actually use.
 + *  * "I want to output a large block of data."  As above, ask for 1 byte,
 + *    emit all that's available (up to whatever limit you have), consume
 + *    it all, then repeat until you're done.  This effectively means that
 + *    you're passing along the blocks that came from your provider.
 + *  * "I want to peek ahead by a large amount."  Ask for 4k or so, then
 + *    double and repeat until you get an error or have enough.  Note
 + *    that the I/O layer will likely end up expanding its copy buffer
 + *    to fit your request, so use this technique cautiously.  This
 + *    technique is used, for example, by some of the format tasting
 + *    code that has uncertain look-ahead needs.
 + */
 +
 +/*
 + * Looks ahead in the input stream:
 + *  * If 'avail' pointer is provided, that returns number of bytes available
 + *    in the current buffer, which may be much larger than requested.
 + *  * If end-of-file, *avail gets set to zero.
 + *  * If error, *avail gets error code.
 + *  * If request can be met, returns pointer to data.
 + *  * If minimum request cannot be met, returns NULL.
 + *
 + * Note: If you just want "some data", ask for 1 byte and pay attention
 + * to *avail, which will have the actual amount available.  If you
 + * know exactly how many bytes you need, just ask for that and treat
 + * a NULL return as an error.
 + *
 + * Important:  This does NOT move the file pointer.  See
 + * __archive_read_consume() below.
 + */
 +const void *
 +__archive_read_ahead(struct archive_read *a, size_t min, ssize_t *avail)
 +{
 +	return (__archive_read_filter_ahead(a->filter, min, avail));
 +}
 +
 +const void *
 +__archive_read_filter_ahead(struct archive_read_filter *filter,
 +    size_t min, ssize_t *avail)
 +{
 +	ssize_t bytes_read;
 +	size_t tocopy;
 +
 +	if (filter->fatal) {
 +		if (avail)
 +			*avail = ARCHIVE_FATAL;
 +		return (NULL);
 +	}
 +
 +	/*
 +	 * Keep pulling more data until we can satisfy the request.
 +	 */
 +	for (;;) {
 +
 +		/*
 +		 * If we can satisfy from the copy buffer (and the
 +		 * copy buffer isn't empty), we're done.  In particular,
 +		 * note that min == 0 is a perfectly well-defined
 +		 * request.
 +		 */
 +		if (filter->avail >= min && filter->avail > 0) {
 +			if (avail != NULL)
 +				*avail = filter->avail;
 +			return (filter->next);
 +		}
 +
 +		/*
 +		 * We can satisfy directly from client buffer if everything
 +		 * currently in the copy buffer is still in the client buffer.
 +		 */
 +		if (filter->client_total >= filter->client_avail + filter->avail
 +		    && filter->client_avail + filter->avail >= min) {
 +			/* "Roll back" to client buffer. */
 +			filter->client_avail += filter->avail;
 +			filter->client_next -= filter->avail;
 +			/* Copy buffer is now empty. */
 +			filter->avail = 0;
 +			filter->next = filter->buffer;
 +			/* Return data from client buffer. */
 +			if (avail != NULL)
 +				*avail = filter->client_avail;
 +			return (filter->client_next);
 +		}
 +
 +		/* Move data forward in copy buffer if necessary. */
 +		if (filter->next > filter->buffer &&
 +		    filter->next + min > filter->buffer + filter->buffer_size) {
 +			if (filter->avail > 0)
 +				memmove(filter->buffer, filter->next,
 +				    filter->avail);
 +			filter->next = filter->buffer;
 +		}
 +
 +		/* If we've used up the client data, get more. */
 +		if (filter->client_avail <= 0) {
 +			if (filter->end_of_file) {
 +				if (avail != NULL)
 +					*avail = 0;
 +				return (NULL);
 +			}
 +			bytes_read = (filter->read)(filter,
 +			    &filter->client_buff);
 +			if (bytes_read < 0) {		/* Read error. */
 +				filter->client_total = filter->client_avail = 0;
 +				filter->client_next =
 +				    filter->client_buff = NULL;
 +				filter->fatal = 1;
 +				if (avail != NULL)
 +					*avail = ARCHIVE_FATAL;
 +				return (NULL);
 +			}
 +			if (bytes_read == 0) {
 +				/* Check for another client object first */
 +				if (filter->archive->client.cursor !=
 +				      filter->archive->client.nodes - 1) {
 +					if (client_switch_proxy(filter,
 +					    filter->archive->client.cursor + 1)
 +					    == ARCHIVE_OK)
 +						continue;
 +				}
 +				/* Premature end-of-file. */
 +				filter->client_total = filter->client_avail = 0;
 +				filter->client_next =
 +				    filter->client_buff = NULL;
 +				filter->end_of_file = 1;
 +				/* Return whatever we do have. */
 +				if (avail != NULL)
 +					*avail = filter->avail;
 +				return (NULL);
 +			}
 +			filter->client_total = bytes_read;
 +			filter->client_avail = filter->client_total;
 +			filter->client_next = filter->client_buff;
 +		} else {
 +			/*
 +			 * We can't satisfy the request from the copy
 +			 * buffer or the existing client data, so we
 +			 * need to copy more client data over to the
 +			 * copy buffer.
 +			 */
 +
 +			/* Ensure the buffer is big enough. */
 +			if (min > filter->buffer_size) {
 +				size_t s, t;
 +				char *p;
 +
 +				/* Double the buffer; watch for overflow. */
 +				s = t = filter->buffer_size;
 +				if (s == 0)
 +					s = min;
 +				while (s < min) {
 +					t *= 2;
 +					if (t <= s) { /* Integer overflow! */
 +						archive_set_error(
 +						    &filter->archive->archive,
 +						    ENOMEM,
 +						    "Unable to allocate copy"
 +						    " buffer");
 +						filter->fatal = 1;
 +						if (avail != NULL)
 +							*avail = ARCHIVE_FATAL;
 +						return (NULL);
 +					}
 +					s = t;
 +				}
 +				/* Now s >= min, so allocate a new buffer. */
 +				p = (char *)malloc(s);
 +				if (p == NULL) {
 +					archive_set_error(
 +						&filter->archive->archive,
 +						ENOMEM,
 +					    "Unable to allocate copy buffer");
 +					filter->fatal = 1;
 +					if (avail != NULL)
 +						*avail = ARCHIVE_FATAL;
 +					return (NULL);
 +				}
 +				/* Move data into newly-enlarged buffer. */
 +				if (filter->avail > 0)
 +					memmove(p, filter->next, filter->avail);
 +				free(filter->buffer);
 +				filter->next = filter->buffer = p;
 +				filter->buffer_size = s;
 +			}
 +
 +			/* We can add client data to copy buffer. */
 +			/* First estimate: copy to fill rest of buffer. */
 +			tocopy = (filter->buffer + filter->buffer_size)
 +			    - (filter->next + filter->avail);
 +			/* Don't waste time buffering more than we need to. */
 +			if (tocopy + filter->avail > min)
 +				tocopy = min - filter->avail;
 +			/* Don't copy more than is available. */
 +			if (tocopy > filter->client_avail)
 +				tocopy = filter->client_avail;
 +
 +			memcpy(filter->next + filter->avail,
 +			    filter->client_next, tocopy);
 +			/* Remove this data from client buffer. */
 +			filter->client_next += tocopy;
 +			filter->client_avail -= tocopy;
 +			/* add it to copy buffer. */
 +			filter->avail += tocopy;
 +		}
 +	}
 +}
 +
 +/*
 + * Move the file pointer forward.
 + */
 +int64_t
 +__archive_read_consume(struct archive_read *a, int64_t request)
 +{
 +	return (__archive_read_filter_consume(a->filter, request));
 +}
 +
 +int64_t
 +__archive_read_filter_consume(struct archive_read_filter * filter,
 +    int64_t request)
 +{
 +	int64_t skipped;
 +
++	if (request < 0)
++		return ARCHIVE_FATAL;
 +	if (request == 0)
 +		return 0;
 +
 +	skipped = advance_file_pointer(filter, request);
 +	if (skipped == request)
 +		return (skipped);
 +	/* We hit EOF before we satisfied the skip request. */
 +	if (skipped < 0)  /* Map error code to 0 for error message below. */
 +		skipped = 0;
 +	archive_set_error(&filter->archive->archive,
 +	    ARCHIVE_ERRNO_MISC,
 +	    "Truncated input file (needed %jd bytes, only %jd available)",
 +	    (intmax_t)request, (intmax_t)skipped);
 +	return (ARCHIVE_FATAL);
 +}
 +
 +/*
 + * Advance the file pointer by the amount requested.
 + * Returns the amount actually advanced, which may be less than the
 + * request if EOF is encountered first.
 + * Returns a negative value if there's an I/O error.
 + */
 +static int64_t
 +advance_file_pointer(struct archive_read_filter *filter, int64_t request)
 +{
 +	int64_t bytes_skipped, total_bytes_skipped = 0;
 +	ssize_t bytes_read;
 +	size_t min;
 +
 +	if (filter->fatal)
 +		return (-1);
 +
 +	/* Use up the copy buffer first. */
 +	if (filter->avail > 0) {
 +		min = (size_t)minimum(request, (int64_t)filter->avail);
 +		filter->next += min;
 +		filter->avail -= min;
 +		request -= min;
 +		filter->position += min;
 +		total_bytes_skipped += min;
 +	}
 +
 +	/* Then use up the client buffer. */
 +	if (filter->client_avail > 0) {
 +		min = (size_t)minimum(request, (int64_t)filter->client_avail);
 +		filter->client_next += min;
 +		filter->client_avail -= min;
 +		request -= min;
 +		filter->position += min;
 +		total_bytes_skipped += min;
 +	}
 +	if (request == 0)
 +		return (total_bytes_skipped);
 +
 +	/* If there's an optimized skip function, use it. */
 +	if (filter->skip != NULL) {
 +		bytes_skipped = (filter->skip)(filter, request);
 +		if (bytes_skipped < 0) {	/* error */
 +			filter->fatal = 1;
 +			return (bytes_skipped);
 +		}
 +		filter->position += bytes_skipped;
 +		total_bytes_skipped += bytes_skipped;
 +		request -= bytes_skipped;
 +		if (request == 0)
 +			return (total_bytes_skipped);
 +	}
 +
 +	/* Use ordinary reads as necessary to complete the request. */
 +	for (;;) {
 +		bytes_read = (filter->read)(filter, &filter->client_buff);
 +		if (bytes_read < 0) {
 +			filter->client_buff = NULL;
 +			filter->fatal = 1;
 +			return (bytes_read);
 +		}
 +
 +		if (bytes_read == 0) {
 +			if (filter->archive->client.cursor !=
 +			      filter->archive->client.nodes - 1) {
 +				if (client_switch_proxy(filter,
 +				    filter->archive->client.cursor + 1)
 +				    == ARCHIVE_OK)
 +					continue;
 +			}
 +			filter->client_buff = NULL;
 +			filter->end_of_file = 1;
 +			return (total_bytes_skipped);
 +		}
 +
 +		if (bytes_read >= request) {
 +			filter->client_next =
 +			    ((const char *)filter->client_buff) + request;
 +			filter->client_avail = (size_t)(bytes_read - request);
 +			filter->client_total = bytes_read;
 +			total_bytes_skipped += request;
 +			filter->position += request;
 +			return (total_bytes_skipped);
 +		}
 +
 +		filter->position += bytes_read;
 +		total_bytes_skipped += bytes_read;
 +		request -= bytes_read;
 +	}
 +}
 +
 +/**
 + * Returns ARCHIVE_FAILED if seeking isn't supported.
 + */
 +int64_t
 +__archive_read_seek(struct archive_read *a, int64_t offset, int whence)
 +{
 +	return __archive_read_filter_seek(a->filter, offset, whence);
 +}
 +
 +int64_t
 +__archive_read_filter_seek(struct archive_read_filter *filter, int64_t offset,
 +    int whence)
 +{
 +	struct archive_read_client *client;
 +	int64_t r;
 +	unsigned int cursor;
 +
 +	if (filter->closed || filter->fatal)
 +		return (ARCHIVE_FATAL);
 +	if (filter->seek == NULL)
 +		return (ARCHIVE_FAILED);
 +
 +	client = &(filter->archive->client);
 +	switch (whence) {
 +	case SEEK_CUR:
 +		/* Adjust the offset and use SEEK_SET instead */
 +		offset += filter->position;			
 +	case SEEK_SET:
 +		cursor = 0;
 +		while (1)
 +		{
 +			if (client->dataset[cursor].begin_position < 0 ||
 +			    client->dataset[cursor].total_size < 0 ||
 +			    client->dataset[cursor].begin_position +
 +			      client->dataset[cursor].total_size - 1 > offset ||
 +			    cursor + 1 >= client->nodes)
 +				break;
 +			r = client->dataset[cursor].begin_position +
 +				client->dataset[cursor].total_size;
 +			client->dataset[++cursor].begin_position = r;
 +		}
 +		while (1) {
 +			r = client_switch_proxy(filter, cursor);
 +			if (r != ARCHIVE_OK)
 +				return r;
 +			if ((r = client_seek_proxy(filter, 0, SEEK_END)) < 0)
 +				return r;
 +			client->dataset[cursor].total_size = r;
 +			if (client->dataset[cursor].begin_position +
 +			    client->dataset[cursor].total_size - 1 > offset ||
 +			    cursor + 1 >= client->nodes)
 +				break;
 +			r = client->dataset[cursor].begin_position +
 +				client->dataset[cursor].total_size;
 +			client->dataset[++cursor].begin_position = r;
 +		}
 +		offset -= client->dataset[cursor].begin_position;
 +		if (offset < 0
 +		    || offset > client->dataset[cursor].total_size)
 +			return ARCHIVE_FATAL;
 +		if ((r = client_seek_proxy(filter, offset, SEEK_SET)) < 0)
 +			return r;
 +		break;
 +
 +	case SEEK_END:
 +		cursor = 0;
 +		while (1) {
 +			if (client->dataset[cursor].begin_position < 0 ||
 +			    client->dataset[cursor].total_size < 0 ||
 +			    cursor + 1 >= client->nodes)
 +				break;
 +			r = client->dataset[cursor].begin_position +
 +				client->dataset[cursor].total_size;
 +			client->dataset[++cursor].begin_position = r;
 +		}
 +		while (1) {
 +			r = client_switch_proxy(filter, cursor);
 +			if (r != ARCHIVE_OK)
 +				return r;
 +			if ((r = client_seek_proxy(filter, 0, SEEK_END)) < 0)
 +				return r;
 +			client->dataset[cursor].total_size = r;
 +			r = client->dataset[cursor].begin_position +
 +				client->dataset[cursor].total_size;
 +			if (cursor + 1 >= client->nodes)
 +				break;
 +			client->dataset[++cursor].begin_position = r;
 +		}
 +		while (1) {
 +			if (r + offset >=
 +			    client->dataset[cursor].begin_position)
 +				break;
 +			offset += client->dataset[cursor].total_size;
 +			if (cursor == 0)
 +				break;
 +			cursor--;
 +			r = client->dataset[cursor].begin_position +
 +				client->dataset[cursor].total_size;
 +		}
 +		offset = (r + offset) - client->dataset[cursor].begin_position;
 +		if ((r = client_switch_proxy(filter, cursor)) != ARCHIVE_OK)
 +			return r;
 +		r = client_seek_proxy(filter, offset, SEEK_SET);
 +		if (r < ARCHIVE_OK)
 +			return r;
 +		break;
 +
 +	default:
 +		return (ARCHIVE_FATAL);
 +	}
 +	r += client->dataset[cursor].begin_position;
 +
 +	if (r >= 0) {
 +		/*
 +		 * Ouch.  Clearing the buffer like this hurts, especially
 +		 * at bid time.  A lot of our efficiency at bid time comes
 +		 * from having bidders reuse the data we've already read.
 +		 *
 +		 * TODO: If the seek request is in data we already
 +		 * have, then don't call the seek callback.
 +		 *
 +		 * TODO: Zip seeks to end-of-file at bid time.  If
 +		 * other formats also start doing this, we may need to
 +		 * find a way for clients to fudge the seek offset to
 +		 * a block boundary.
 +		 *
 +		 * Hmmm... If whence was SEEK_END, we know the file
 +		 * size is (r - offset).  Can we use that to simplify
 +		 * the TODO items above?
 +		 */
 +		filter->avail = filter->client_avail = 0;
 +		filter->next = filter->buffer;
 +		filter->position = r;
 +		filter->end_of_file = 0;
 +	}
 +	return r;
 +}
diff --cc Utilities/cmlibarchive/libarchive/archive_read_add_passphrase.c
index 0000000,f67f1eb..f67f1eb
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_add_passphrase.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_add_passphrase.c
diff --cc Utilities/cmlibarchive/libarchive/archive_read_support_filter_lz4.c
index 0000000,db62cb3..db62cb3
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lz4.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lz4.c
diff --cc Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c
index 9ef2054,0000000..23c18c7
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c
@@@ -1,487 -1,0 +1,494 @@@
 +/*-
 + * Copyright (c) 2003-2007 Tim Kientzle
 + * Copyright (c) 2012 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +
 +__FBSDID("$FreeBSD$");
 +
 +#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
 +#endif
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_STRING_H
 +#include <string.h>
 +#endif
 +#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
 +#endif
 +#ifdef HAVE_LZO_LZOCONF_H
 +#include <lzo/lzoconf.h>
 +#endif
 +#ifdef HAVE_LZO_LZO1X_H
 +#include <lzo/lzo1x.h>
 +#endif
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h> /* for crc32 and adler32 */
 +#endif
 +
 +#include "archive.h"
 +#if !defined(HAVE_ZLIB_H) &&\
 +     defined(HAVE_LZO_LZOCONF_H) && defined(HAVE_LZO_LZO1X_H)
 +#include "archive_crc32.h"
 +#endif
 +#include "archive_endian.h"
 +#include "archive_private.h"
 +#include "archive_read_private.h"
 +
 +#ifndef HAVE_ZLIB_H
 +#define adler32	lzo_adler32
 +#endif
 +
 +#define LZOP_HEADER_MAGIC "\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a"
 +#define LZOP_HEADER_MAGIC_LEN 9
 +
 +#if defined(HAVE_LZO_LZOCONF_H) && defined(HAVE_LZO_LZO1X_H)
 +struct read_lzop {
 +	unsigned char	*out_block;
 +	size_t		 out_block_size;
 +	int64_t		 total_out;
 +	int		 flags;
 +	uint32_t	 compressed_cksum;
 +	uint32_t	 uncompressed_cksum;
 +	size_t		 compressed_size;
 +	size_t		 uncompressed_size;
 +	size_t		 unconsumed_bytes;
 +	char		 in_stream;
 +	char		 eof; /* True = found end of compressed data. */
 +};
 +
 +#define FILTER			0x0800
 +#define CRC32_HEADER		0x1000
 +#define EXTRA_FIELD		0x0040
 +#define ADLER32_UNCOMPRESSED	0x0001
 +#define ADLER32_COMPRESSED	0x0002
 +#define CRC32_UNCOMPRESSED	0x0100
 +#define CRC32_COMPRESSED	0x0200
 +#define MAX_BLOCK_SIZE		(64 * 1024 * 1024)
 +
 +static ssize_t  lzop_filter_read(struct archive_read_filter *, const void **);
 +static int	lzop_filter_close(struct archive_read_filter *);
 +#endif
 +
 +static int lzop_bidder_bid(struct archive_read_filter_bidder *,
 +    struct archive_read_filter *);
 +static int lzop_bidder_init(struct archive_read_filter *);
 +
 +int
 +archive_read_support_filter_lzop(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct archive_read_filter_bidder *reader;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_filter_lzop");
 +
 +	if (__archive_read_get_bidder(a, &reader) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	reader->data = NULL;
 +	reader->bid = lzop_bidder_bid;
 +	reader->init = lzop_bidder_init;
 +	reader->options = NULL;
 +	reader->free = NULL;
 +	/* Signal the extent of lzop support with the return value here. */
 +#if defined(HAVE_LZO_LZOCONF_H) && defined(HAVE_LZO_LZO1X_H)
 +	return (ARCHIVE_OK);
 +#else
 +	/* Return ARCHIVE_WARN since this always uses an external program. */
 +	archive_set_error(_a, ARCHIVE_ERRNO_MISC,
 +	    "Using external lzop program for lzop decompression");
 +	return (ARCHIVE_WARN);
 +#endif
 +}
 +
 +/*
 + * Bidder just verifies the header and returns the number of verified bits.
 + */
 +static int
 +lzop_bidder_bid(struct archive_read_filter_bidder *self,
 +    struct archive_read_filter *filter)
 +{
 +	const unsigned char *p;
 +	ssize_t avail;
 +
 +	(void)self; /* UNUSED */
 +
 +	p = __archive_read_filter_ahead(filter, LZOP_HEADER_MAGIC_LEN, &avail);
 +	if (p == NULL || avail == 0)
 +		return (0);
 +
 +	if (memcmp(p, LZOP_HEADER_MAGIC, LZOP_HEADER_MAGIC_LEN))
 +		return (0);
 +
 +	return (LZOP_HEADER_MAGIC_LEN * 8);
 +}
 +
 +#if !defined(HAVE_LZO_LZOCONF_H) || !defined(HAVE_LZO_LZO1X_H)
 +/*
 + * If we don't have the library on this system, we can't do the
 + * decompression directly.  We can, however, try to run "lzop -d"
 + * in case that's available.
 + */
 +static int
 +lzop_bidder_init(struct archive_read_filter *self)
 +{
 +	int r;
 +
 +	r = __archive_read_program(self, "lzop -d");
 +	/* Note: We set the format here even if __archive_read_program()
 +	 * above fails.  We do, after all, know what the format is
 +	 * even if we weren't able to read it. */
 +	self->code = ARCHIVE_FILTER_LZOP;
 +	self->name = "lzop";
 +	return (r);
 +}
 +#else
 +/*
 + * Initialize the filter object.
 + */
 +static int
 +lzop_bidder_init(struct archive_read_filter *self)
 +{
 +	struct read_lzop *state;
 +
 +	self->code = ARCHIVE_FILTER_LZOP;
 +	self->name = "lzop";
 +
 +	state = (struct read_lzop *)calloc(sizeof(*state), 1);
 +	if (state == NULL) {
 +		archive_set_error(&self->archive->archive, ENOMEM,
 +		    "Can't allocate data for lzop decompression");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	self->data = state;
 +	self->read = lzop_filter_read;
 +	self->skip = NULL; /* not supported */
 +	self->close = lzop_filter_close;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +consume_header(struct archive_read_filter *self)
 +{
 +	struct read_lzop *state = (struct read_lzop *)self->data;
 +	const unsigned char *p, *_p;
 +	unsigned checksum, flags, len, method, version;
 +
 +	/*
 +	 * Check LZOP magic code.
 +	 */
 +	p = __archive_read_filter_ahead(self->upstream,
 +		LZOP_HEADER_MAGIC_LEN, NULL);
 +	if (p == NULL)
 +		return (ARCHIVE_EOF);
 +
 +	if (memcmp(p, LZOP_HEADER_MAGIC, LZOP_HEADER_MAGIC_LEN))
 +		return (ARCHIVE_EOF);
 +	__archive_read_filter_consume(self->upstream,
 +	    LZOP_HEADER_MAGIC_LEN);
 +
 +	p = __archive_read_filter_ahead(self->upstream, 29, NULL);
 +	if (p == NULL)
 +		goto truncated;
 +	_p = p;
 +	version = archive_be16dec(p);
 +	p += 4;/* version(2 bytes) + library version(2 bytes) */
 +
 +	if (version >= 0x940) {
 +		unsigned reqversion = archive_be16dec(p); p += 2;
 +		if (reqversion < 0x900) {
 +			archive_set_error(&self->archive->archive,
 +			    ARCHIVE_ERRNO_MISC, "Invalid required version");
 +			return (ARCHIVE_FAILED);
 +		}
 +	}
 +
 +	method = *p++;
 +	if (method < 1 || method > 3) {
 +		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
 +		    "Unsupported method");
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	if (version >= 0x940) {
 +		unsigned level = *p++;
++#if 0
 +		unsigned default_level[] = {0, 3, 1, 9};
++#endif
 +		if (level == 0)
 +			/* Method is 1..3 here due to check above. */
++#if 0	/* Avoid an error Clang Static Analyzer claims
++	  "Value stored to 'level' is never read". */
 +			level = default_level[method];
++#else
++			;/* NOP */
++#endif
 +		else if (level > 9) {
 +			archive_set_error(&self->archive->archive,
 +			    ARCHIVE_ERRNO_MISC, "Invalid level");
 +			return (ARCHIVE_FAILED);
 +		}
 +	}
 +
 +	flags = archive_be32dec(p); p += 4;
 +
 +	if (flags & FILTER)
 +		p += 4; /* Skip filter */
 +	p += 4; /* Skip mode */
 +	if (version >= 0x940)
 +		p += 8; /* Skip mtime */
 +	else
 +		p += 4; /* Skip mtime */
 +	len = *p++; /* Read filename length */
 +	len += p - _p;
 +	/* Make sure we have all bytes we need to calculate checksum. */
 +	p = __archive_read_filter_ahead(self->upstream, len + 4, NULL);
 +	if (p == NULL)
 +		goto truncated;
 +	if (flags & CRC32_HEADER)
 +		checksum = crc32(crc32(0, NULL, 0), p, len);
 +	else
 +		checksum = adler32(adler32(0, NULL, 0), p, len);
 +	if (archive_be32dec(p + len) != checksum)
 +		goto corrupted;
 +	__archive_read_filter_consume(self->upstream, len + 4);
 +	if (flags & EXTRA_FIELD) {
 +		/* Skip extra field */
 +		p = __archive_read_filter_ahead(self->upstream, 4, NULL);
 +		if (p == NULL)
 +			goto truncated;
 +		len = archive_be32dec(p);
 +		__archive_read_filter_consume(self->upstream, len + 4 + 4);
 +	}
 +	state->flags = flags;
 +	state->in_stream = 1;
 +	return (ARCHIVE_OK);
 +truncated:
 +	archive_set_error(&self->archive->archive,
 +	    ARCHIVE_ERRNO_FILE_FORMAT, "Truncated lzop data");
 +	return (ARCHIVE_FAILED);
 +corrupted:
 +	archive_set_error(&self->archive->archive,
 +	    ARCHIVE_ERRNO_FILE_FORMAT, "Corrupted lzop header");
 +	return (ARCHIVE_FAILED);
 +}
 +
 +static int
 +consume_block_info(struct archive_read_filter *self)
 +{
 +	struct read_lzop *state = (struct read_lzop *)self->data;
 +	const unsigned char *p;
 +	unsigned flags = state->flags;
 +
 +	p = __archive_read_filter_ahead(self->upstream, 4, NULL);
 +	if (p == NULL)
 +		goto truncated;
 +	state->uncompressed_size = archive_be32dec(p);
 +	__archive_read_filter_consume(self->upstream, 4);
 +	if (state->uncompressed_size == 0)
 +		return (ARCHIVE_EOF);
 +	if (state->uncompressed_size > MAX_BLOCK_SIZE)
 +		goto corrupted;
 +
 +	p = __archive_read_filter_ahead(self->upstream, 4, NULL);
 +	if (p == NULL)
 +		goto truncated;
 +	state->compressed_size = archive_be32dec(p);
 +	__archive_read_filter_consume(self->upstream, 4);
 +	if (state->compressed_size > state->uncompressed_size)
 +		goto corrupted;
 +
 +	if (flags & (CRC32_UNCOMPRESSED | ADLER32_UNCOMPRESSED)) {
 +		p = __archive_read_filter_ahead(self->upstream, 4, NULL);
 +		if (p == NULL)
 +			goto truncated;
 +		state->compressed_cksum = state->uncompressed_cksum =
 +		    archive_be32dec(p);
 +		__archive_read_filter_consume(self->upstream, 4);
 +	}
 +	if ((flags & (CRC32_COMPRESSED | ADLER32_COMPRESSED)) &&
 +	    state->compressed_size < state->uncompressed_size) {
 +		p = __archive_read_filter_ahead(self->upstream, 4, NULL);
 +		if (p == NULL)
 +			goto truncated;
 +		state->compressed_cksum = archive_be32dec(p);
 +		__archive_read_filter_consume(self->upstream, 4);
 +	}
 +	return (ARCHIVE_OK);
 +truncated:
 +	archive_set_error(&self->archive->archive,
 +	    ARCHIVE_ERRNO_FILE_FORMAT, "Truncated lzop data");
 +	return (ARCHIVE_FAILED);
 +corrupted:
 +	archive_set_error(&self->archive->archive,
 +	    ARCHIVE_ERRNO_FILE_FORMAT, "Corrupted lzop header");
 +	return (ARCHIVE_FAILED);
 +}
 +
 +static ssize_t
 +lzop_filter_read(struct archive_read_filter *self, const void **p)
 +{
 +	struct read_lzop *state = (struct read_lzop *)self->data;
 +	const void *b;
 +	lzo_uint out_size;
 +	uint32_t cksum;
 +	int ret, r;
 +
 +	if (state->unconsumed_bytes) {
 +		__archive_read_filter_consume(self->upstream,
 +		    state->unconsumed_bytes);
 +		state->unconsumed_bytes = 0;
 +	}
 +	if (state->eof)
 +		return (0);
 +
 +	for (;;) {
 +		if (!state->in_stream) {
 +			ret = consume_header(self);
 +			if (ret < ARCHIVE_OK)
 +				return (ret);
 +			if (ret == ARCHIVE_EOF) {
 +				state->eof = 1;
 +				return (0);
 +			}
 +		}
 +		ret = consume_block_info(self);
 +		if (ret < ARCHIVE_OK)
 +			return (ret);
 +		if (ret == ARCHIVE_EOF)
 +			state->in_stream = 0;
 +		else
 +			break;
 +	}
 +
 +	if (state->out_block == NULL ||
 +	    state->out_block_size < state->uncompressed_size) {
 +		void *new_block;
 +
 +		new_block = realloc(state->out_block, state->uncompressed_size);
 +		if (new_block == NULL) {
 +			archive_set_error(&self->archive->archive, ENOMEM,
 +			    "Can't allocate data for lzop decompression");
 +			return (ARCHIVE_FATAL);
 +		}
 +		state->out_block = new_block;
 +		state->out_block_size = state->uncompressed_size;
 +	}
 +
 +	b = __archive_read_filter_ahead(self->upstream,
 +		state->compressed_size, NULL);
 +	if (b == NULL) {
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT, "Truncated lzop data");
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (state->flags & CRC32_COMPRESSED)
 +		cksum = crc32(crc32(0, NULL, 0), b, state->compressed_size);
 +	else if (state->flags & ADLER32_COMPRESSED)
 +		cksum = adler32(adler32(0, NULL, 0), b, state->compressed_size);
 +	else
 +		cksum = state->compressed_cksum;
 +	if (cksum != state->compressed_cksum) {
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_MISC, "Corrupted data");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * If the both uncompressed size and compressed size are the same,
 +	 * we do not decompress this block.
 +	 */
 +	if (state->uncompressed_size == state->compressed_size) {
 +		*p = b;
 +		state->total_out += state->compressed_size;
 +		state->unconsumed_bytes = state->compressed_size;
 +		return ((ssize_t)state->uncompressed_size);
 +	}
 +
 +	/*
 +	 * Drive lzo uncompresison.
 +	 */
 +	out_size = (lzo_uint)state->uncompressed_size;
 +	r = lzo1x_decompress_safe(b, (lzo_uint)state->compressed_size,
 +		state->out_block, &out_size, NULL);
 +	switch (r) {
 +	case LZO_E_OK:
 +		if (out_size == state->uncompressed_size)
 +			break;
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_MISC, "Corrupted data");
 +		return (ARCHIVE_FATAL);
 +	case LZO_E_OUT_OF_MEMORY:
 +		archive_set_error(&self->archive->archive, ENOMEM,
 +		    "lzop decompression failed: out of memory");
 +		return (ARCHIVE_FATAL);
 +	default:
 +		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
 +		    "lzop decompression failed: %d", r);
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	if (state->flags & CRC32_UNCOMPRESSED)
 +		cksum = crc32(crc32(0, NULL, 0), state->out_block,
 +		    state->uncompressed_size);
 +	else if (state->flags & ADLER32_UNCOMPRESSED)
 +		cksum = adler32(adler32(0, NULL, 0), state->out_block,
 +		    state->uncompressed_size);
 +	else
 +		cksum = state->uncompressed_cksum;
 +	if (cksum != state->uncompressed_cksum) {
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_MISC, "Corrupted data");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	__archive_read_filter_consume(self->upstream, state->compressed_size);
 +	*p = state->out_block;
 +	state->total_out += out_size;
 +	return ((ssize_t)out_size);
 +}
 +
 +/*
 + * Clean up the decompressor.
 + */
 +static int
 +lzop_filter_close(struct archive_read_filter *self)
 +{
 +	struct read_lzop *state = (struct read_lzop *)self->data;
 +
 +	free(state->out_block);
 +	free(state);
 +	return (ARCHIVE_OK);
 +}
 +
 +#endif
diff --cc Utilities/cmlibarchive/libarchive/archive_read_support_filter_xz.c
index a3ad67a,0000000..8f48273
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_xz.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_xz.c
@@@ -1,988 -1,0 +1,988 @@@
 +/*-
 + * Copyright (c) 2009-2011 Michihiro NAKAJIMA
 + * Copyright (c) 2003-2008 Tim Kientzle and Miklos Vajna
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +
 +__FBSDID("$FreeBSD$");
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#include <stdio.h>
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_STRING_H
 +#include <string.h>
 +#endif
 +#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
 +#endif
 +#if HAVE_LZMA_H
 +#include <cm_lzma.h>
 +#elif HAVE_LZMADEC_H
 +#include <lzmadec.h>
 +#endif
 +
 +#include "archive.h"
 +#include "archive_endian.h"
 +#include "archive_private.h"
 +#include "archive_read_private.h"
 +
 +#if HAVE_LZMA_H && HAVE_LIBLZMA
 +
 +struct private_data {
 +	lzma_stream	 stream;
 +	unsigned char	*out_block;
 +	size_t		 out_block_size;
 +	int64_t		 total_out;
 +	char		 eof; /* True = found end of compressed data. */
 +	char		 in_stream;
 +
 +	/* Following variables are used for lzip only. */
 +	char		 lzip_ver;
 +	uint32_t	 crc32;
 +	int64_t		 member_in;
 +	int64_t		 member_out;
 +};
 +
 +#if LZMA_VERSION_MAJOR >= 5
 +/* Effectively disable the limiter. */
 +#define LZMA_MEMLIMIT	UINT64_MAX
 +#else
 +/* NOTE: This needs to check memory size which running system has. */
 +#define LZMA_MEMLIMIT	(1U << 30)
 +#endif
 +
 +/* Combined lzip/lzma/xz filter */
 +static ssize_t	xz_filter_read(struct archive_read_filter *, const void **);
 +static int	xz_filter_close(struct archive_read_filter *);
 +static int	xz_lzma_bidder_init(struct archive_read_filter *);
 +
 +#elif HAVE_LZMADEC_H && HAVE_LIBLZMADEC
 +
 +struct private_data {
 +	lzmadec_stream	 stream;
 +	unsigned char	*out_block;
 +	size_t		 out_block_size;
 +	int64_t		 total_out;
 +	char		 eof; /* True = found end of compressed data. */
 +};
 +
 +/* Lzma-only filter */
 +static ssize_t	lzma_filter_read(struct archive_read_filter *, const void **);
 +static int	lzma_filter_close(struct archive_read_filter *);
 +#endif
 +
 +/*
 + * Note that we can detect xz and lzma compressed files even if we
 + * can't decompress them.  (In fact, we like detecting them because we
 + * can give better error messages.)  So the bid framework here gets
 + * compiled even if no lzma library is available.
 + */
 +static int	xz_bidder_bid(struct archive_read_filter_bidder *,
 +		    struct archive_read_filter *);
 +static int	xz_bidder_init(struct archive_read_filter *);
 +static int	lzma_bidder_bid(struct archive_read_filter_bidder *,
 +		    struct archive_read_filter *);
 +static int	lzma_bidder_init(struct archive_read_filter *);
 +static int	lzip_has_member(struct archive_read_filter *);
 +static int	lzip_bidder_bid(struct archive_read_filter_bidder *,
 +		    struct archive_read_filter *);
 +static int	lzip_bidder_init(struct archive_read_filter *);
 +
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +/* Deprecated; remove in libarchive 4.0 */
 +int
 +archive_read_support_compression_xz(struct archive *a)
 +{
 +	return archive_read_support_filter_xz(a);
 +}
 +#endif
 +
 +int
 +archive_read_support_filter_xz(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct archive_read_filter_bidder *bidder;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_filter_xz");
 +
 +	if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	bidder->data = NULL;
 +	bidder->name = "xz";
 +	bidder->bid = xz_bidder_bid;
 +	bidder->init = xz_bidder_init;
 +	bidder->options = NULL;
 +	bidder->free = NULL;
 +#if HAVE_LZMA_H && HAVE_LIBLZMA
 +	return (ARCHIVE_OK);
 +#else
 +	archive_set_error(_a, ARCHIVE_ERRNO_MISC,
 +	    "Using external xz program for xz decompression");
 +	return (ARCHIVE_WARN);
 +#endif
 +}
 +
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +int
 +archive_read_support_compression_lzma(struct archive *a)
 +{
 +	return archive_read_support_filter_lzma(a);
 +}
 +#endif
 +
 +int
 +archive_read_support_filter_lzma(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct archive_read_filter_bidder *bidder;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_filter_lzma");
 +
 +	if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	bidder->data = NULL;
 +	bidder->name = "lzma";
 +	bidder->bid = lzma_bidder_bid;
 +	bidder->init = lzma_bidder_init;
 +	bidder->options = NULL;
 +	bidder->free = NULL;
 +#if HAVE_LZMA_H && HAVE_LIBLZMA
 +	return (ARCHIVE_OK);
 +#elif HAVE_LZMADEC_H && HAVE_LIBLZMADEC
 +	return (ARCHIVE_OK);
 +#else
 +	archive_set_error(_a, ARCHIVE_ERRNO_MISC,
 +	    "Using external lzma program for lzma decompression");
 +	return (ARCHIVE_WARN);
 +#endif
 +}
 +
 +
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +int
 +archive_read_support_compression_lzip(struct archive *a)
 +{
 +	return archive_read_support_filter_lzip(a);
 +}
 +#endif
 +
 +int
 +archive_read_support_filter_lzip(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct archive_read_filter_bidder *bidder;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_filter_lzip");
 +
 +	if (__archive_read_get_bidder(a, &bidder) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	bidder->data = NULL;
 +	bidder->name = "lzip";
 +	bidder->bid = lzip_bidder_bid;
 +	bidder->init = lzip_bidder_init;
 +	bidder->options = NULL;
 +	bidder->free = NULL;
 +#if HAVE_LZMA_H && HAVE_LIBLZMA
 +	return (ARCHIVE_OK);
 +#else
 +	archive_set_error(_a, ARCHIVE_ERRNO_MISC,
 +	    "Using external lzip program for lzip decompression");
 +	return (ARCHIVE_WARN);
 +#endif
 +}
 +
 +/*
 + * Test whether we can handle this data.
 + */
 +static int
 +xz_bidder_bid(struct archive_read_filter_bidder *self,
 +    struct archive_read_filter *filter)
 +{
 +	const unsigned char *buffer;
 +	ssize_t avail;
 +
 +	(void)self; /* UNUSED */
 +
 +	buffer = __archive_read_filter_ahead(filter, 6, &avail);
 +	if (buffer == NULL)
 +		return (0);
 +
 +	/*
 +	 * Verify Header Magic Bytes : FD 37 7A 58 5A 00
 +	 */
 +	if (memcmp(buffer, "\xFD\x37\x7A\x58\x5A\x00", 6) != 0)
 +		return (0);
 +
 +	return (48);
 +}
 +
 +/*
 + * Test whether we can handle this data.
 + *
 + * <sigh> LZMA has a rather poor file signature.  Zeros do not
 + * make good signature bytes as a rule, and the only non-zero byte
 + * here is an ASCII character.  For example, an uncompressed tar
 + * archive whose first file is ']' would satisfy this check.  It may
 + * be necessary to exclude LZMA from compression_all() because of
 + * this.  Clients of libarchive would then have to explicitly enable
 + * LZMA checking instead of (or in addition to) compression_all() when
 + * they have other evidence (file name, command-line option) to go on.
 + */
 +static int
 +lzma_bidder_bid(struct archive_read_filter_bidder *self,
 +    struct archive_read_filter *filter)
 +{
 +	const unsigned char *buffer;
 +	ssize_t avail;
 +	uint32_t dicsize;
 +	uint64_t uncompressed_size;
 +	int bits_checked;
 +
 +	(void)self; /* UNUSED */
 +
 +	buffer = __archive_read_filter_ahead(filter, 14, &avail);
 +	if (buffer == NULL)
 +		return (0);
 +
 +	/* First byte of raw LZMA stream is commonly 0x5d.
 +	 * The first byte is a special number, which consists of
 +	 * three parameters of LZMA compression, a number of literal
 +	 * context bits(which is from 0 to 8, default is 3), a number
 +	 * of literal pos bits(which is from 0 to 4, default is 0),
 +	 * a number of pos bits(which is from 0 to 4, default is 2).
 +	 * The first byte is made by
 +	 * (pos bits * 5 + literal pos bit) * 9 + * literal contest bit,
 +	 * and so the default value in this field is
 +	 * (2 * 5 + 0) * 9 + 3 = 0x5d.
 +	 * lzma of LZMA SDK has options to change those parameters.
 +	 * It means a range of this field is from 0 to 224. And lzma of
 +	 * XZ Utils with option -e records 0x5e in this field. */
 +	/* NOTE: If this checking of the first byte increases false
 +	 * recognition, we should allow only 0x5d and 0x5e for the first
 +	 * byte of LZMA stream. */
 +	bits_checked = 0;
 +	if (buffer[0] > (4 * 5 + 4) * 9 + 8)
 +		return (0);
 +	/* Most likely value in the first byte of LZMA stream. */
 +	if (buffer[0] == 0x5d || buffer[0] == 0x5e)
 +		bits_checked += 8;
 +
 +	/* Sixth through fourteenth bytes are uncompressed size,
 +	 * stored in little-endian order. `-1' means uncompressed
 +	 * size is unknown and lzma of XZ Utils always records `-1'
 +	 * in this field. */
 +	uncompressed_size = archive_le64dec(buffer+5);
 +	if (uncompressed_size == (uint64_t)ARCHIVE_LITERAL_LL(-1))
 +		bits_checked += 64;
 +
 +	/* Second through fifth bytes are dictionary size, stored in
 +	 * little-endian order. The minimum dictionary size is
 +	 * 1 << 12(4KiB) which the lzma of LZMA SDK uses with option
 +	 * -d12 and the maxinam dictionary size is 1 << 27(128MiB)
 +	 * which the one uses with option -d27.
 +	 * NOTE: A comment of LZMA SDK source code says this dictionary
 +	 * range is from 1 << 12 to 1 << 30. */
 +	dicsize = archive_le32dec(buffer+1);
 +	switch (dicsize) {
 +	case 0x00001000:/* lzma of LZMA SDK option -d12. */
 +	case 0x00002000:/* lzma of LZMA SDK option -d13. */
 +	case 0x00004000:/* lzma of LZMA SDK option -d14. */
 +	case 0x00008000:/* lzma of LZMA SDK option -d15. */
 +	case 0x00010000:/* lzma of XZ Utils option -0 and -1.
 +			 * lzma of LZMA SDK option -d16. */
 +	case 0x00020000:/* lzma of LZMA SDK option -d17. */
 +	case 0x00040000:/* lzma of LZMA SDK option -d18. */
 +	case 0x00080000:/* lzma of XZ Utils option -2.
 +			 * lzma of LZMA SDK option -d19. */
 +	case 0x00100000:/* lzma of XZ Utils option -3.
 +			 * lzma of LZMA SDK option -d20. */
 +	case 0x00200000:/* lzma of XZ Utils option -4.
 +			 * lzma of LZMA SDK option -d21. */
 +	case 0x00400000:/* lzma of XZ Utils option -5.
 +			 * lzma of LZMA SDK option -d22. */
 +	case 0x00800000:/* lzma of XZ Utils option -6.
 +			 * lzma of LZMA SDK option -d23. */
 +	case 0x01000000:/* lzma of XZ Utils option -7.
 +			 * lzma of LZMA SDK option -d24. */
 +	case 0x02000000:/* lzma of XZ Utils option -8.
 +			 * lzma of LZMA SDK option -d25. */
 +	case 0x04000000:/* lzma of XZ Utils option -9.
 +			 * lzma of LZMA SDK option -d26. */
 +	case 0x08000000:/* lzma of LZMA SDK option -d27. */
 +		bits_checked += 32;
 +		break;
 +	default:
 +		/* If a memory usage for encoding was not enough on
 +		 * the platform where LZMA stream was made, lzma of
 +		 * XZ Utils automatically decreased the dictionary
 +		 * size to enough memory for encoding by 1Mi bytes
 +		 * (1 << 20).*/
 +		if (dicsize <= 0x03F00000 && dicsize >= 0x00300000 &&
 +		    (dicsize & ((1 << 20)-1)) == 0 &&
 +		    bits_checked == 8 + 64) {
 +			bits_checked += 32;
 +			break;
 +		}
 +		/* Otherwise dictionary size is unlikely. But it is
 +		 * possible that someone makes lzma stream with
 +		 * liblzma/LZMA SDK in one's dictionary size. */
 +		return (0);
 +	}
 +
 +	/* TODO: The above test is still very weak.  It would be
 +	 * good to do better. */
 +
 +	return (bits_checked);
 +}
 +
 +static int
 +lzip_has_member(struct archive_read_filter *filter)
 +{
 +	const unsigned char *buffer;
 +	ssize_t avail;
 +	int bits_checked;
 +	int log2dic;
 +
 +	buffer = __archive_read_filter_ahead(filter, 6, &avail);
 +	if (buffer == NULL)
 +		return (0);
 +
 +	/*
 +	 * Verify Header Magic Bytes : 4C 5A 49 50 (`LZIP')
 +	 */
 +	bits_checked = 0;
 +	if (memcmp(buffer, "LZIP", 4) != 0)
 +		return (0);
 +	bits_checked += 32;
 +
 +	/* A version number must be 0 or 1 */
 +	if (buffer[4] != 0 && buffer[4] != 1)
 +		return (0);
 +	bits_checked += 8;
 +
 +	/* Dictionary size. */
 +	log2dic = buffer[5] & 0x1f;
 +	if (log2dic < 12 || log2dic > 27)
 +		return (0);
 +	bits_checked += 8;
 +
 +	return (bits_checked);
 +}
 +
 +static int
 +lzip_bidder_bid(struct archive_read_filter_bidder *self,
 +    struct archive_read_filter *filter)
 +{
 +
 +	(void)self; /* UNUSED */
 +	return (lzip_has_member(filter));
 +}
 +
 +#if HAVE_LZMA_H && HAVE_LIBLZMA
 +
 +/*
 + * liblzma 4.999.7 and later support both lzma and xz streams.
 + */
 +static int
 +xz_bidder_init(struct archive_read_filter *self)
 +{
 +	self->code = ARCHIVE_FILTER_XZ;
 +	self->name = "xz";
 +	return (xz_lzma_bidder_init(self));
 +}
 +
 +static int
 +lzma_bidder_init(struct archive_read_filter *self)
 +{
 +	self->code = ARCHIVE_FILTER_LZMA;
 +	self->name = "lzma";
 +	return (xz_lzma_bidder_init(self));
 +}
 +
 +static int
 +lzip_bidder_init(struct archive_read_filter *self)
 +{
 +	self->code = ARCHIVE_FILTER_LZIP;
 +	self->name = "lzip";
 +	return (xz_lzma_bidder_init(self));
 +}
 +
 +/*
 + * Set an error code and choose an error message
 + */
 +static void
 +set_error(struct archive_read_filter *self, int ret)
 +{
 +
 +	switch (ret) {
 +	case LZMA_STREAM_END: /* Found end of stream. */
 +	case LZMA_OK: /* Decompressor made some progress. */
 +		break;
 +	case LZMA_MEM_ERROR:
 +		archive_set_error(&self->archive->archive, ENOMEM,
 +		    "Lzma library error: Cannot allocate memory");
 +		break;
 +	case LZMA_MEMLIMIT_ERROR:
 +		archive_set_error(&self->archive->archive, ENOMEM,
 +		    "Lzma library error: Out of memory");
 +		break;
 +	case LZMA_FORMAT_ERROR:
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma library error: format not recognized");
 +		break;
 +	case LZMA_OPTIONS_ERROR:
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma library error: Invalid options");
 +		break;
 +	case LZMA_DATA_ERROR:
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma library error: Corrupted input data");
 +		break;
 +	case LZMA_BUF_ERROR:
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma library error:  No progress is possible");
 +		break;
 +	default:
 +		/* Return an error. */
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma decompression failed:  Unknown error");
 +		break;
 +	}
 +}
 +
 +/*
 + * Setup the callbacks.
 + */
 +static int
 +xz_lzma_bidder_init(struct archive_read_filter *self)
 +{
 +	static const size_t out_block_size = 64 * 1024;
 +	void *out_block;
 +	struct private_data *state;
 +	int ret;
 +
 +	state = (struct private_data *)calloc(sizeof(*state), 1);
 +	out_block = (unsigned char *)malloc(out_block_size);
 +	if (state == NULL || out_block == NULL) {
 +		archive_set_error(&self->archive->archive, ENOMEM,
 +		    "Can't allocate data for xz decompression");
 +		free(out_block);
 +		free(state);
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	self->data = state;
 +	state->out_block_size = out_block_size;
 +	state->out_block = out_block;
 +	self->read = xz_filter_read;
 +	self->skip = NULL; /* not supported */
 +	self->close = xz_filter_close;
 +
 +	state->stream.avail_in = 0;
 +
 +	state->stream.next_out = state->out_block;
 +	state->stream.avail_out = state->out_block_size;
 +
 +	state->crc32 = 0;
 +	if (self->code == ARCHIVE_FILTER_LZIP) {
 +		/*
 +		 * We have to read a lzip header and use it to initialize
 +		 * compression library, thus we cannot initialize the
 +		 * library for lzip here.
 +		 */
 +		state->in_stream = 0;
 +		return (ARCHIVE_OK);
 +	} else
 +		state->in_stream = 1;
 +
 +	/* Initialize compression library. */
 +	if (self->code == ARCHIVE_FILTER_XZ)
 +		ret = lzma_stream_decoder(&(state->stream),
 +		    LZMA_MEMLIMIT,/* memlimit */
 +		    LZMA_CONCATENATED);
 +	else
 +		ret = lzma_alone_decoder(&(state->stream),
 +		    LZMA_MEMLIMIT);/* memlimit */
 +
 +	if (ret == LZMA_OK)
 +		return (ARCHIVE_OK);
 +
 +	/* Library setup failed: Choose an error message and clean up. */
 +	set_error(self, ret);
 +
 +	free(state->out_block);
 +	free(state);
 +	self->data = NULL;
 +	return (ARCHIVE_FATAL);
 +}
 +
 +static int
 +lzip_init(struct archive_read_filter *self)
 +{
 +	struct private_data *state;
 +	const unsigned char *h;
 +	lzma_filter filters[2];
 +	unsigned char props[5];
 +	ssize_t avail_in;
 +	uint32_t dicsize;
 +	int log2dic, ret;
 +
 +	state = (struct private_data *)self->data;
 +	h = __archive_read_filter_ahead(self->upstream, 6, &avail_in);
 +	if (h == NULL)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Get a version number. */
 +	state->lzip_ver = h[4];
 +
 +	/*
 +	 * Setup lzma property.
 +	 */
 +	props[0] = 0x5d;
 +
 +	/* Get dictionary size. */
 +	log2dic = h[5] & 0x1f;
 +	if (log2dic < 12 || log2dic > 27)
 +		return (ARCHIVE_FATAL);
 +	dicsize = 1U << log2dic;
 +	if (log2dic > 12)
 +		dicsize -= (dicsize / 16) * (h[5] >> 5);
 +	archive_le32enc(props+1, dicsize);
 +
 +	/* Consume lzip header. */
 +	__archive_read_filter_consume(self->upstream, 6);
 +	state->member_in = 6;
 +
 +	filters[0].id = LZMA_FILTER_LZMA1;
 +	filters[0].options = NULL;
 +	filters[1].id = LZMA_VLI_UNKNOWN;
 +	filters[1].options = NULL;
 +
 +	ret = lzma_properties_decode(&filters[0], NULL, props, sizeof(props));
 +	if (ret != LZMA_OK) {
 +		set_error(self, ret);
 +		return (ARCHIVE_FATAL);
 +	}
 +	ret = lzma_raw_decoder(&(state->stream), filters);
 +#if LZMA_VERSION < 50010000
 +	free(filters[0].options);
 +#endif
 +	if (ret != LZMA_OK) {
 +		set_error(self, ret);
 +		return (ARCHIVE_FATAL);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +lzip_tail(struct archive_read_filter *self)
 +{
 +	struct private_data *state;
 +	const unsigned char *f;
 +	ssize_t avail_in;
 +	int tail;
 +
 +	state = (struct private_data *)self->data;
 +	if (state->lzip_ver == 0)
 +		tail = 12;
 +	else
 +		tail = 20;
 +	f = __archive_read_filter_ahead(self->upstream, tail, &avail_in);
 +	if (f == NULL && avail_in < 0)
 +		return (ARCHIVE_FATAL);
- 	if (avail_in < tail) {
++	if (f == NULL || avail_in < tail) {
 +		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
 +		    "Lzip: Remaining data is less bytes");
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	/* Check the crc32 value of the uncompressed data of the current
 +	 * member */
 +	if (state->crc32 != archive_le32dec(f)) {
 +		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
 +		    "Lzip: CRC32 error");
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	/* Check the uncompressed size of the current member */
 +	if ((uint64_t)state->member_out != archive_le64dec(f + 4)) {
 +		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
 +		    "Lzip: Uncompressed size error");
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	/* Check the total size of the current member */
 +	if (state->lzip_ver == 1 &&
 +	    (uint64_t)state->member_in + tail != archive_le64dec(f + 12)) {
 +		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
 +		    "Lzip: Member size error");
 +		return (ARCHIVE_FAILED);
 +	}
 +	__archive_read_filter_consume(self->upstream, tail);
 +
 +	/* If current lzip data consists of multi member, try decompressing
 +	 * a next member. */
 +	if (lzip_has_member(self->upstream) != 0) {
 +		state->in_stream = 0;
 +		state->crc32 = 0;
 +		state->member_out = 0;
 +		state->member_in = 0;
 +		state->eof = 0;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Return the next block of decompressed data.
 + */
 +static ssize_t
 +xz_filter_read(struct archive_read_filter *self, const void **p)
 +{
 +	struct private_data *state;
 +	size_t decompressed;
 +	ssize_t avail_in;
 +	int ret;
 +
 +	state = (struct private_data *)self->data;
 +
 +	/* Empty our output buffer. */
 +	state->stream.next_out = state->out_block;
 +	state->stream.avail_out = state->out_block_size;
 +
 +	/* Try to fill the output buffer. */
 +	while (state->stream.avail_out > 0 && !state->eof) {
 +		if (!state->in_stream) {
 +			/*
 +			 * Initialize liblzma for lzip
 +			 */
 +			ret = lzip_init(self);
 +			if (ret != ARCHIVE_OK)
 +				return (ret);
 +			state->in_stream = 1;
 +		}
 +		state->stream.next_in =
 +		    __archive_read_filter_ahead(self->upstream, 1, &avail_in);
 +		if (state->stream.next_in == NULL && avail_in < 0) {
 +			archive_set_error(&self->archive->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "truncated input");
 +			return (ARCHIVE_FATAL);
 +		}
 +		state->stream.avail_in = avail_in;
 +
 +		/* Decompress as much as we can in one pass. */
 +		ret = lzma_code(&(state->stream),
 +		    (state->stream.avail_in == 0)? LZMA_FINISH: LZMA_RUN);
 +		switch (ret) {
 +		case LZMA_STREAM_END: /* Found end of stream. */
 +			state->eof = 1;
 +			/* FALL THROUGH */
 +		case LZMA_OK: /* Decompressor made some progress. */
 +			__archive_read_filter_consume(self->upstream,
 +			    avail_in - state->stream.avail_in);
 +			state->member_in +=
 +			    avail_in - state->stream.avail_in;
 +			break;
 +		default:
 +			set_error(self, ret);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	decompressed = state->stream.next_out - state->out_block;
 +	state->total_out += decompressed;
 +	state->member_out += decompressed;
 +	if (decompressed == 0)
 +		*p = NULL;
 +	else {
 +		*p = state->out_block;
 +		if (self->code == ARCHIVE_FILTER_LZIP) {
 +			state->crc32 = lzma_crc32(state->out_block,
 +			    decompressed, state->crc32);
 +			if (state->eof) {
 +				ret = lzip_tail(self);
 +				if (ret != ARCHIVE_OK)
 +					return (ret);
 +			}
 +		}
 +	}
 +	return (decompressed);
 +}
 +
 +/*
 + * Clean up the decompressor.
 + */
 +static int
 +xz_filter_close(struct archive_read_filter *self)
 +{
 +	struct private_data *state;
 +
 +	state = (struct private_data *)self->data;
 +	lzma_end(&(state->stream));
 +	free(state->out_block);
 +	free(state);
 +	return (ARCHIVE_OK);
 +}
 +
 +#else
 +
 +#if HAVE_LZMADEC_H && HAVE_LIBLZMADEC
 +
 +/*
 + * If we have the older liblzmadec library, then we can handle
 + * LZMA streams but not XZ streams.
 + */
 +
 +/*
 + * Setup the callbacks.
 + */
 +static int
 +lzma_bidder_init(struct archive_read_filter *self)
 +{
 +	static const size_t out_block_size = 64 * 1024;
 +	void *out_block;
 +	struct private_data *state;
 +	ssize_t ret, avail_in;
 +
 +	self->code = ARCHIVE_FILTER_LZMA;
 +	self->name = "lzma";
 +
 +	state = (struct private_data *)calloc(sizeof(*state), 1);
 +	out_block = (unsigned char *)malloc(out_block_size);
 +	if (state == NULL || out_block == NULL) {
 +		archive_set_error(&self->archive->archive, ENOMEM,
 +		    "Can't allocate data for lzma decompression");
 +		free(out_block);
 +		free(state);
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	self->data = state;
 +	state->out_block_size = out_block_size;
 +	state->out_block = out_block;
 +	self->read = lzma_filter_read;
 +	self->skip = NULL; /* not supported */
 +	self->close = lzma_filter_close;
 +
 +	/* Prime the lzma library with 18 bytes of input. */
 +	state->stream.next_in = (unsigned char *)(uintptr_t)
 +	    __archive_read_filter_ahead(self->upstream, 18, &avail_in);
 +	if (state->stream.next_in == NULL)
 +		return (ARCHIVE_FATAL);
 +	state->stream.avail_in = avail_in;
 +	state->stream.next_out = state->out_block;
 +	state->stream.avail_out = state->out_block_size;
 +
 +	/* Initialize compression library. */
 +	ret = lzmadec_init(&(state->stream));
 +	__archive_read_filter_consume(self->upstream,
 +	    avail_in - state->stream.avail_in);
 +	if (ret == LZMADEC_OK)
 +		return (ARCHIVE_OK);
 +
 +	/* Library setup failed: Clean up. */
 +	archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
 +	    "Internal error initializing lzma library");
 +
 +	/* Override the error message if we know what really went wrong. */
 +	switch (ret) {
 +	case LZMADEC_HEADER_ERROR:
 +		archive_set_error(&self->archive->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Internal error initializing compression library: "
 +		    "invalid header");
 +		break;
 +	case LZMADEC_MEM_ERROR:
 +		archive_set_error(&self->archive->archive, ENOMEM,
 +		    "Internal error initializing compression library: "
 +		    "out of memory");
 +		break;
 +	}
 +
 +	free(state->out_block);
 +	free(state);
 +	self->data = NULL;
 +	return (ARCHIVE_FATAL);
 +}
 +
 +/*
 + * Return the next block of decompressed data.
 + */
 +static ssize_t
 +lzma_filter_read(struct archive_read_filter *self, const void **p)
 +{
 +	struct private_data *state;
 +	size_t decompressed;
 +	ssize_t avail_in, ret;
 +
 +	state = (struct private_data *)self->data;
 +
 +	/* Empty our output buffer. */
 +	state->stream.next_out = state->out_block;
 +	state->stream.avail_out = state->out_block_size;
 +
 +	/* Try to fill the output buffer. */
 +	while (state->stream.avail_out > 0 && !state->eof) {
 +		state->stream.next_in = (unsigned char *)(uintptr_t)
 +		    __archive_read_filter_ahead(self->upstream, 1, &avail_in);
 +		if (state->stream.next_in == NULL && avail_in < 0) {
 +			archive_set_error(&self->archive->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "truncated lzma input");
 +			return (ARCHIVE_FATAL);
 +		}
 +		state->stream.avail_in = avail_in;
 +
 +		/* Decompress as much as we can in one pass. */
 +		ret = lzmadec_decode(&(state->stream), avail_in == 0);
 +		switch (ret) {
 +		case LZMADEC_STREAM_END: /* Found end of stream. */
 +			state->eof = 1;
 +			/* FALL THROUGH */
 +		case LZMADEC_OK: /* Decompressor made some progress. */
 +			__archive_read_filter_consume(self->upstream,
 +			    avail_in - state->stream.avail_in);
 +			break;
 +		case LZMADEC_BUF_ERROR: /* Insufficient input data? */
 +			archive_set_error(&self->archive->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Insufficient compressed data");
 +			return (ARCHIVE_FATAL);
 +		default:
 +			/* Return an error. */
 +			archive_set_error(&self->archive->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Lzma decompression failed");
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	decompressed = state->stream.next_out - state->out_block;
 +	state->total_out += decompressed;
 +	if (decompressed == 0)
 +		*p = NULL;
 +	else
 +		*p = state->out_block;
 +	return (decompressed);
 +}
 +
 +/*
 + * Clean up the decompressor.
 + */
 +static int
 +lzma_filter_close(struct archive_read_filter *self)
 +{
 +	struct private_data *state;
 +	int ret;
 +
 +	state = (struct private_data *)self->data;
 +	ret = ARCHIVE_OK;
 +	switch (lzmadec_end(&(state->stream))) {
 +	case LZMADEC_OK:
 +		break;
 +	default:
 +		archive_set_error(&(self->archive->archive),
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Failed to clean up %s compressor",
 +		    self->archive->archive.compression_name);
 +		ret = ARCHIVE_FATAL;
 +	}
 +
 +	free(state->out_block);
 +	free(state);
 +	return (ret);
 +}
 +
 +#else
 +
 +/*
 + *
 + * If we have no suitable library on this system, we can't actually do
 + * the decompression.  We can, however, still detect compressed
 + * archives and emit a useful message.
 + *
 + */
 +static int
 +lzma_bidder_init(struct archive_read_filter *self)
 +{
 +	int r;
 +
 +	r = __archive_read_program(self, "lzma -d -qq");
 +	/* Note: We set the format here even if __archive_read_program()
 +	 * above fails.  We do, after all, know what the format is
 +	 * even if we weren't able to read it. */
 +	self->code = ARCHIVE_FILTER_LZMA;
 +	self->name = "lzma";
 +	return (r);
 +}
 +
 +#endif /* HAVE_LZMADEC_H */
 +
 +
 +static int
 +xz_bidder_init(struct archive_read_filter *self)
 +{
 +	int r;
 +
 +	r = __archive_read_program(self, "xz -d -qq");
 +	/* Note: We set the format here even if __archive_read_program()
 +	 * above fails.  We do, after all, know what the format is
 +	 * even if we weren't able to read it. */
 +	self->code = ARCHIVE_FILTER_XZ;
 +	self->name = "xz";
 +	return (r);
 +}
 +
 +static int
 +lzip_bidder_init(struct archive_read_filter *self)
 +{
 +	int r;
 +
 +	r = __archive_read_program(self, "lzip -d -q");
 +	/* Note: We set the format here even if __archive_read_program()
 +	 * above fails.  We do, after all, know what the format is
 +	 * even if we weren't able to read it. */
 +	self->code = ARCHIVE_FILTER_LZIP;
 +	self->name = "lzip";
 +	return (r);
 +}
 +
 +
 +#endif /* HAVE_LZMA_H */
diff --cc Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c
index 47e0752,0000000..f045b8f
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c
@@@ -1,3862 -1,0 +1,3880 @@@
 +/*-
 + * Copyright (c) 2011 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD$");
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_BZLIB_H
 +#include <cm_bzlib.h>
 +#endif
 +#ifdef HAVE_LZMA_H
 +#include <cm_lzma.h>
 +#endif
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h>
 +#endif
 +
 +#include "archive.h"
 +#include "archive_entry.h"
 +#include "archive_entry_locale.h"
 +#include "archive_ppmd7_private.h"
 +#include "archive_private.h"
 +#include "archive_read_private.h"
 +#include "archive_endian.h"
 +
 +#ifndef HAVE_ZLIB_H
 +#include "archive_crc32.h"
 +#endif
 +
 +#define _7ZIP_SIGNATURE	"7z\xBC\xAF\x27\x1C"
 +#define SFX_MIN_ADDR	0x27000
 +#define SFX_MAX_ADDR	0x60000
 +
 +
 +/*
 + * Codec ID
 + */
 +#define _7Z_COPY	0
 +#define _7Z_LZMA	0x030101
 +#define _7Z_LZMA2	0x21
 +#define _7Z_DEFLATE	0x040108
 +#define _7Z_BZ2		0x040202
 +#define _7Z_PPMD	0x030401
 +#define _7Z_DELTA	0x03
 +#define _7Z_CRYPTO_MAIN_ZIP			0x06F10101 /* Main Zip crypto algo */
 +#define _7Z_CRYPTO_RAR_29			0x06F10303 /* Rar29 AES-128 + (modified SHA-1) */
 +#define _7Z_CRYPTO_AES_256_SHA_256	0x06F10701 /* AES-256 + SHA-256 */
 +
 +
 +#define _7Z_X86		0x03030103
 +#define _7Z_X86_BCJ2	0x0303011B
 +#define _7Z_POWERPC	0x03030205
 +#define _7Z_IA64	0x03030401
 +#define _7Z_ARM		0x03030501
 +#define _7Z_ARMTHUMB	0x03030701
 +#define _7Z_SPARC	0x03030805
 +
 +/*
 + * 7-Zip header property IDs.
 + */
 +#define kEnd			0x00
 +#define kHeader			0x01
 +#define kArchiveProperties	0x02
 +#define kAdditionalStreamsInfo	0x03
 +#define kMainStreamsInfo	0x04
 +#define kFilesInfo		0x05
 +#define kPackInfo		0x06
 +#define kUnPackInfo		0x07
 +#define kSubStreamsInfo		0x08
 +#define kSize			0x09
 +#define kCRC			0x0A
 +#define kFolder			0x0B
 +#define kCodersUnPackSize	0x0C
 +#define kNumUnPackStream	0x0D
 +#define kEmptyStream		0x0E
 +#define kEmptyFile		0x0F
 +#define kAnti			0x10
 +#define kName			0x11
 +#define kCTime			0x12
 +#define kATime			0x13
 +#define kMTime			0x14
 +#define kAttributes		0x15
 +#define kEncodedHeader		0x17
++#define kDummy			0x19
 +
 +struct _7z_digests {
 +	unsigned char	*defineds;
 +	uint32_t	*digests;
 +};
 +
 +
 +struct _7z_folder {
 +	uint64_t		 numCoders;
 +	struct _7z_coder {
 +		unsigned long	 codec;
 +		uint64_t	 numInStreams;
 +		uint64_t	 numOutStreams;
 +		uint64_t	 propertiesSize;
 +		unsigned char	*properties;
 +	} *coders;
 +	uint64_t		 numBindPairs;
 +	struct {
 +		uint64_t	 inIndex;
 +		uint64_t	 outIndex;
 +	} *bindPairs;
 +	uint64_t		 numPackedStreams;
 +	uint64_t		*packedStreams;
 +	uint64_t		 numInStreams;
 +	uint64_t		 numOutStreams;
 +	uint64_t		*unPackSize;
 +	unsigned char		 digest_defined;
 +	uint32_t		 digest;
 +	uint64_t		 numUnpackStreams;
 +	uint32_t		 packIndex;
 +	/* Unoperated bytes. */
 +	uint64_t		 skipped_bytes;
 +};
 +
 +struct _7z_coders_info {
 +	uint64_t		 numFolders;
 +	struct _7z_folder	*folders;
 +	uint64_t		 dataStreamIndex;
 +};
 +
 +struct _7z_pack_info {
 +	uint64_t		 pos;
 +	uint64_t		 numPackStreams;
 +	uint64_t		*sizes;
 +	struct _7z_digests	 digest;
 +	/* Calculated from pos and numPackStreams. */
 +	uint64_t		*positions;
 +};
 +
 +struct _7z_substream_info {
 +	size_t			 unpack_streams;
 +	uint64_t		*unpackSizes;
 +	unsigned char		*digestsDefined;
 +	uint32_t		*digests;
 +};
 +
 +struct _7z_stream_info {
 +	struct _7z_pack_info	 pi;
 +	struct _7z_coders_info	 ci;
 +	struct _7z_substream_info ss;
 +};
 +
 +struct _7z_header_info {
 +	uint64_t		 dataIndex;
 +
 +	unsigned char		*emptyStreamBools;
 +	unsigned char		*emptyFileBools;
 +	unsigned char		*antiBools;
 +	unsigned char		*attrBools;
 +};
 +
 +struct _7zip_entry {
 +	size_t			 name_len;
 +	unsigned char		*utf16name;
 +#if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG)
 +	const wchar_t		*wname;
 +#endif
 +	uint32_t		 folderIndex;
 +	uint32_t		 ssIndex;
 +	unsigned		 flg;
 +#define MTIME_IS_SET	(1<<0)
 +#define ATIME_IS_SET	(1<<1)
 +#define CTIME_IS_SET	(1<<2)
 +#define CRC32_IS_SET	(1<<3)
 +#define HAS_STREAM	(1<<4)
 +
 +	time_t			 mtime;
 +	time_t			 atime;
 +	time_t			 ctime;
 +	long			 mtime_ns;
 +	long			 atime_ns;
 +	long			 ctime_ns;
 +	uint32_t		 mode;
 +	uint32_t		 attr;
 +};
 +
 +struct _7zip {
 +	/* Structural information about the archive. */
 +	struct _7z_stream_info	 si;
 +
 +	int			 header_is_being_read;
 +	int			 header_is_encoded;
 +	uint64_t		 header_bytes_remaining;
 +	unsigned long		 header_crc32;
 +	/* Header offset to check that reading pointes of the file contens
 +	 * will not exceed the header. */
 +	uint64_t		 header_offset;
 +	/* Base offset of the archive file for a seek in case reading SFX. */
 +	uint64_t		 seek_base;
 +
 +	/* List of entries */
 +	size_t			 entries_remaining;
 +	uint64_t		 numFiles;
 +	struct _7zip_entry	*entries;
 +	struct _7zip_entry	*entry;
 +	unsigned char		*entry_names;
 +
 +	/* entry_bytes_remaining is the number of bytes we expect. */
 +	int64_t			 entry_offset;
 +	uint64_t		 entry_bytes_remaining;
 +
 +	/* Running CRC32 of the decompressed data */
 +	unsigned long		 entry_crc32;
 +
 +	/* Flags to mark progress of decompression. */
 +	char			 end_of_entry;
 +
 +	/* Uncompressed buffer control.  */
 +#define UBUFF_SIZE	(64 * 1024)
 +	unsigned char 		*uncompressed_buffer;
 +	unsigned char 		*uncompressed_buffer_pointer;
 +	size_t 			 uncompressed_buffer_size;
 +	size_t			 uncompressed_buffer_bytes_remaining;
 +
 +	/* Offset of the compressed data. */
 +	int64_t			 stream_offset;
 +
 +	/*
 +	 * Decompressing control data.
 +	 */
 +	unsigned		 folder_index;
 +	uint64_t		 folder_outbytes_remaining;
 +	unsigned		 pack_stream_index;
 +	unsigned		 pack_stream_remaining;
 +	uint64_t		 pack_stream_inbytes_remaining;
 +	size_t			 pack_stream_bytes_unconsumed;
 +
 +	/* The codec information of a folder. */
 +	unsigned long		 codec;
 +	unsigned long		 codec2;
 +
 +	/*
 +	 * Decompressor controllers.
 +	 */
 +	/* Decording LZMA1 and LZMA2 data. */
 +#ifdef HAVE_LZMA_H
 +	lzma_stream		 lzstream;
 +	int			 lzstream_valid;
 +#endif
 +	/* Decording bzip2 data. */
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +	bz_stream		 bzstream;
 +	int			 bzstream_valid;
 +#endif
 +	/* Decording deflate data. */
 +#ifdef HAVE_ZLIB_H
 +	z_stream		 stream;
 +	int			 stream_valid;
 +#endif
 +	/* Decording PPMd data. */
 +	int			 ppmd7_stat;
 +	CPpmd7			 ppmd7_context;
 +	CPpmd7z_RangeDec	 range_dec;
 +	IByteIn			 bytein;
 +	struct {
 +		const unsigned char	*next_in;
 +		int64_t			 avail_in;
 +		int64_t			 total_in;
 +		unsigned char		*next_out;
 +		int64_t			 avail_out;
 +		int64_t			 total_out;
 +		int			 overconsumed;
 +	} ppstream;
 +	int			 ppmd7_valid;
 +
 +	/* Decoding BCJ and BCJ2 data. */
 +	uint32_t		 bcj_state;
 +	size_t			 odd_bcj_size;
 +	unsigned char		 odd_bcj[4];
 +	/* Decoding BCJ data. */
 +	size_t			 bcj_prevPosT;
 +	uint32_t		 bcj_prevMask;
 +	uint32_t		 bcj_ip;
 +
 +	/* Decoding BCJ2 data. */
 +	size_t			 main_stream_bytes_remaining;
 +	unsigned char		*sub_stream_buff[3];
 +	size_t			 sub_stream_size[3];
 +	size_t			 sub_stream_bytes_remaining[3];
 +	unsigned char		*tmp_stream_buff;
 +	size_t			 tmp_stream_buff_size;
 +	size_t			 tmp_stream_bytes_avail;
 +	size_t			 tmp_stream_bytes_remaining;
 +#ifdef _LZMA_PROB32
 +#define CProb uint32_t
 +#else
 +#define CProb uint16_t
 +#endif
 +	CProb			 bcj2_p[256 + 2];
 +	uint8_t			 bcj2_prevByte;
 +	uint32_t		 bcj2_range;
 +	uint32_t		 bcj2_code;
 +	uint64_t		 bcj2_outPos;
 +
 +	/* Filename character-set conversion data. */
 +	struct archive_string_conv *sconv;
 +
 +	char			 format_name[64];
 +
 +	/* Custom value that is non-zero if this archive contains encrypted entries. */
 +	int			 has_encrypted_entries;
 +};
 +
++/* Maximum entry size. This limitation prevents reading intentional
++ * corrupted 7-zip files on assuming there are not so many entries in
++ * the files. */
++#define UMAX_ENTRY	ARCHIVE_LITERAL_ULL(100000000)
++
 +static int	archive_read_format_7zip_has_encrypted_entries(struct archive_read *);
 +static int	archive_read_support_format_7zip_capabilities(struct archive_read *a);
 +static int	archive_read_format_7zip_bid(struct archive_read *, int);
 +static int	archive_read_format_7zip_cleanup(struct archive_read *);
 +static int	archive_read_format_7zip_read_data(struct archive_read *,
 +		    const void **, size_t *, int64_t *);
 +static int	archive_read_format_7zip_read_data_skip(struct archive_read *);
 +static int	archive_read_format_7zip_read_header(struct archive_read *,
 +		    struct archive_entry *);
 +static int	check_7zip_header_in_sfx(const char *);
 +static unsigned long decode_codec_id(const unsigned char *, size_t);
 +static int	decode_encoded_header_info(struct archive_read *,
 +		    struct _7z_stream_info *);
 +static int	decompress(struct archive_read *, struct _7zip *,
 +		    void *, size_t *, const void *, size_t *);
 +static ssize_t	extract_pack_stream(struct archive_read *, size_t);
 +static void	fileTimeToUtc(uint64_t, time_t *, long *);
 +static uint64_t folder_uncompressed_size(struct _7z_folder *);
 +static void	free_CodersInfo(struct _7z_coders_info *);
 +static void	free_Digest(struct _7z_digests *);
 +static void	free_Folder(struct _7z_folder *);
 +static void	free_Header(struct _7z_header_info *);
 +static void	free_PackInfo(struct _7z_pack_info *);
 +static void	free_StreamsInfo(struct _7z_stream_info *);
 +static void	free_SubStreamsInfo(struct _7z_substream_info *);
 +static int	free_decompression(struct archive_read *, struct _7zip *);
 +static ssize_t	get_uncompressed_data(struct archive_read *, const void **,
 +		    size_t, size_t);
 +static const unsigned char * header_bytes(struct archive_read *, size_t);
 +static int	init_decompression(struct archive_read *, struct _7zip *,
 +		    const struct _7z_coder *, const struct _7z_coder *);
 +static int	parse_7zip_uint64(struct archive_read *, uint64_t *);
 +static int	read_Bools(struct archive_read *, unsigned char *, size_t);
 +static int	read_CodersInfo(struct archive_read *,
 +		    struct _7z_coders_info *);
 +static int	read_Digests(struct archive_read *, struct _7z_digests *,
 +		    size_t);
 +static int	read_Folder(struct archive_read *, struct _7z_folder *);
 +static int	read_Header(struct archive_read *, struct _7z_header_info *,
 +		    int);
 +static int	read_PackInfo(struct archive_read *, struct _7z_pack_info *);
 +static int	read_StreamsInfo(struct archive_read *,
 +		    struct _7z_stream_info *);
 +static int	read_SubStreamsInfo(struct archive_read *,
 +		    struct _7z_substream_info *, struct _7z_folder *, size_t);
 +static int	read_Times(struct archive_read *, struct _7z_header_info *,
 +		    int);
 +static void	read_consume(struct archive_read *);
 +static ssize_t	read_stream(struct archive_read *, const void **, size_t,
 +		    size_t);
 +static int	seek_pack(struct archive_read *);
 +static int64_t	skip_stream(struct archive_read *, size_t);
 +static int	skip_sfx(struct archive_read *, ssize_t);
 +static int	slurp_central_directory(struct archive_read *, struct _7zip *,
 +		    struct _7z_header_info *);
 +static int	setup_decode_folder(struct archive_read *, struct _7z_folder *,
 +		    int);
 +static void	x86_Init(struct _7zip *);
 +static size_t	x86_Convert(struct _7zip *, uint8_t *, size_t);
 +static ssize_t		Bcj2_Decode(struct _7zip *, uint8_t *, size_t);
 +
 +
 +int
 +archive_read_support_format_7zip(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct _7zip *zip;
 +	int r;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_format_7zip");
 +
 +	zip = calloc(1, sizeof(*zip));
 +	if (zip == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate 7zip data");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Until enough data has been read, we cannot tell about
 +	 * any encrypted entries yet.
 +	 */
 +	zip->has_encrypted_entries = ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
 +
 +
 +	r = __archive_read_register_format(a,
 +	    zip,
 +	    "7zip",
 +	    archive_read_format_7zip_bid,
 +	    NULL,
 +	    archive_read_format_7zip_read_header,
 +	    archive_read_format_7zip_read_data,
 +	    archive_read_format_7zip_read_data_skip,
 +	    NULL,
 +	    archive_read_format_7zip_cleanup,
 +	    archive_read_support_format_7zip_capabilities,
 +	    archive_read_format_7zip_has_encrypted_entries);
 +
 +	if (r != ARCHIVE_OK)
 +		free(zip);
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_read_support_format_7zip_capabilities(struct archive_read * a)
 +{
 +	(void)a; /* UNUSED */
 +	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA |
 +			ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
 +}
 +
 +
 +static int
 +archive_read_format_7zip_has_encrypted_entries(struct archive_read *_a)
 +{
 +	if (_a && _a->format) {
 +		struct _7zip * zip = (struct _7zip *)_a->format->data;
 +		if (zip) {
 +			return zip->has_encrypted_entries;
 +		}
 +	}
 +	return ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
 +}
 +
 +static int
 +archive_read_format_7zip_bid(struct archive_read *a, int best_bid)
 +{
 +	const char *p;
 +
 +	/* If someone has already bid more than 32, then avoid
 +	   trashing the look-ahead buffers with a seek. */
 +	if (best_bid > 32)
 +		return (-1);
 +
 +	if ((p = __archive_read_ahead(a, 6, NULL)) == NULL)
 +		return (0);
 +
 +	/* If first six bytes are the 7-Zip signature,
 +	 * return the bid right now. */
 +	if (memcmp(p, _7ZIP_SIGNATURE, 6) == 0)
 +		return (48);
 +
 +	/*
 +	 * It may a 7-Zip SFX archive file. If first two bytes are
 +	 * 'M' and 'Z' available on Windows or first four bytes are
 +	 * "\x7F\x45LF" available on posix like system, seek the 7-Zip
 +	 * signature. Although we will perform a seek when reading
 +	 * a header, what we do not use __archive_read_seek() here is
 +	 * due to a bidding performance.
 +	 */
 +	if ((p[0] == 'M' && p[1] == 'Z') || memcmp(p, "\x7F\x45LF", 4) == 0) {
 +		ssize_t offset = SFX_MIN_ADDR;
 +		ssize_t window = 4096;
 +		ssize_t bytes_avail;
 +		while (offset + window <= (SFX_MAX_ADDR)) {
 +			const char *buff = __archive_read_ahead(a,
 +					offset + window, &bytes_avail);
 +			if (buff == NULL) {
 +				/* Remaining bytes are less than window. */
 +				window >>= 1;
 +				if (window < 0x40)
 +					return (0);
 +				continue;
 +			}
 +			p = buff + offset;
 +			while (p + 32 < buff + bytes_avail) {
 +				int step = check_7zip_header_in_sfx(p);
 +				if (step == 0)
 +					return (48);
 +				p += step;
 +			}
 +			offset = p - buff;
 +		}
 +	}
 +	return (0);
 +}
 +
 +static int
 +check_7zip_header_in_sfx(const char *p)
 +{
 +	switch ((unsigned char)p[5]) {
 +	case 0x1C:
 +		if (memcmp(p, _7ZIP_SIGNATURE, 6) != 0)
 +			return (6);
 +		/*
 +		 * Test the CRC because its extraction code has 7-Zip
 +		 * Magic Code, so we should do this in order not to
 +		 * make a mis-detection.
 +		 */
 +		if (crc32(0, (const unsigned char *)p + 12, 20)
 +			!= archive_le32dec(p + 8))
 +			return (6);
 +		/* Hit the header! */
 +		return (0);
 +	case 0x37: return (5);
 +	case 0x7A: return (4);
 +	case 0xBC: return (3);
 +	case 0xAF: return (2);
 +	case 0x27: return (1);
 +	default: return (6);
 +	}
 +}
 +
 +static int
 +skip_sfx(struct archive_read *a, ssize_t bytes_avail)
 +{
 +	const void *h;
 +	const char *p, *q;
 +	size_t skip, offset;
 +	ssize_t bytes, window;
 +
 +	/*
 +	 * If bytes_avail > SFX_MIN_ADDR we do not have to call
 +	 * __archive_read_seek() at this time since we have
 +	 * alredy had enough data.
 +	 */
 +	if (bytes_avail > SFX_MIN_ADDR)
 +		__archive_read_consume(a, SFX_MIN_ADDR);
 +	else if (__archive_read_seek(a, SFX_MIN_ADDR, SEEK_SET) < 0)
 +		return (ARCHIVE_FATAL);
 +
 +	offset = 0;
 +	window = 1;
 +	while (offset + window <= SFX_MAX_ADDR - SFX_MIN_ADDR) {
 +		h = __archive_read_ahead(a, window, &bytes);
 +		if (h == NULL) {
 +			/* Remaining bytes are less than window. */
 +			window >>= 1;
 +			if (window < 0x40)
 +				goto fatal;
 +			continue;
 +		}
 +		if (bytes < 6) {
 +			/* This case might happen when window == 1. */
 +			window = 4096;
 +			continue;
 +		}
 +		p = (const char *)h;
 +		q = p + bytes;
 +
 +		/*
 +		 * Scan ahead until we find something that looks
 +		 * like the 7-Zip header.
 +		 */
 +		while (p + 32 < q) {
 +			int step = check_7zip_header_in_sfx(p);
 +			if (step == 0) {
 +				struct _7zip *zip =
 +				    (struct _7zip *)a->format->data;
 +				skip = p - (const char *)h;
 +				__archive_read_consume(a, skip);
 +				zip->seek_base = SFX_MIN_ADDR + offset + skip;
 +				return (ARCHIVE_OK);
 +			}
 +			p += step;
 +		}
 +		skip = p - (const char *)h;
 +		__archive_read_consume(a, skip);
 +		offset += skip;
 +		if (window == 1)
 +			window = 4096;
 +	}
 +fatal:
 +	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +	    "Couldn't find out 7-Zip header");
 +	return (ARCHIVE_FATAL);
 +}
 +
 +static int
 +archive_read_format_7zip_read_header(struct archive_read *a,
 +	struct archive_entry *entry)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	struct _7zip_entry *zip_entry;
 +	int r, ret = ARCHIVE_OK;
 +	struct _7z_folder *folder = 0;
 +	uint64_t fidx = 0;
 +
 +	/*
 +	 * It should be sufficient to call archive_read_next_header() for
 +	 * a reader to determine if an entry is encrypted or not. If the
 +	 * encryption of an entry is only detectable when calling
 +	 * archive_read_data(), so be it. We'll do the same check there
 +	 * as well.
 +	 */
 +	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
 +		zip->has_encrypted_entries = 0;
 +	}
 +
 +	a->archive.archive_format = ARCHIVE_FORMAT_7ZIP;
 +	if (a->archive.archive_format_name == NULL)
 +		a->archive.archive_format_name = "7-Zip";
 +
 +	if (zip->entries == NULL) {
 +		struct _7z_header_info header;
 +
 +		memset(&header, 0, sizeof(header));
 +		r = slurp_central_directory(a, zip, &header);
 +		free_Header(&header);
 +		if (r != ARCHIVE_OK)
 +			return (r);
 +		zip->entries_remaining = (size_t)zip->numFiles;
 +		zip->entry = zip->entries;
 +	} else {
 +		++zip->entry;
 +	}
 +	zip_entry = zip->entry;
 +
- 	if (zip->entries_remaining <= 0)
++	if (zip->entries_remaining <= 0 || zip_entry == NULL)
 +		return ARCHIVE_EOF;
 +	--zip->entries_remaining;
 +
 +	zip->entry_offset = 0;
 +	zip->end_of_entry = 0;
 +	zip->entry_crc32 = crc32(0, NULL, 0);
 +
 +	/* Setup a string conversion for a filename. */
 +	if (zip->sconv == NULL) {
 +		zip->sconv = archive_string_conversion_from_charset(
 +		    &a->archive, "UTF-16LE", 1);
 +		if (zip->sconv == NULL)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Figure out if the entry is encrypted by looking at the folder
 +	   that is associated to the current 7zip entry. If the folder
 +	   has a coder with a _7Z_CRYPTO codec then the folder is encrypted.
 +	   Hence the entry must also be encrypted. */
 +	if (zip_entry && zip_entry->folderIndex < zip->si.ci.numFolders) {
 +		folder = &(zip->si.ci.folders[zip_entry->folderIndex]);
 +		for (fidx=0; folder && fidx<folder->numCoders; fidx++) {
 +			switch(folder->coders[fidx].codec) {
 +				case _7Z_CRYPTO_MAIN_ZIP:
 +				case _7Z_CRYPTO_RAR_29:
 +				case _7Z_CRYPTO_AES_256_SHA_256: {
 +					archive_entry_set_is_data_encrypted(entry, 1);
 +					zip->has_encrypted_entries = 1;
 +					break;
 +				}
 +			}
 +		}
 +	}
 +
 +	/* Now that we've checked for encryption, if there were still no
 +	 * encrypted entries found we can say for sure that there are none.
 +	 */
 +	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
 +		zip->has_encrypted_entries = 0;
 +	}
 +
 +	if (archive_entry_copy_pathname_l(entry,
 +	    (const char *)zip_entry->utf16name,
 +	    zip_entry->name_len, zip->sconv) != 0) {
 +		if (errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Pathname");
 +			return (ARCHIVE_FATAL);
 +		}
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Pathname cannot be converted "
 +		    "from %s to current locale.",
 +		    archive_string_conversion_charset_name(zip->sconv));
 +		ret = ARCHIVE_WARN;
 +	}
 +
 +	/* Populate some additional entry fields: */
 +	archive_entry_set_mode(entry, zip_entry->mode);
 +	if (zip_entry->flg & MTIME_IS_SET)
 +		archive_entry_set_mtime(entry, zip_entry->mtime,
 +			zip_entry->mtime_ns);
 +	if (zip_entry->flg & CTIME_IS_SET)
 +		archive_entry_set_ctime(entry, zip_entry->ctime,
 +		    zip_entry->ctime_ns);
 +	if (zip_entry->flg & ATIME_IS_SET)
 +		archive_entry_set_atime(entry, zip_entry->atime,
 +		    zip_entry->atime_ns);
 +	if (zip_entry->ssIndex != (uint32_t)-1) {
 +		zip->entry_bytes_remaining =
 +		    zip->si.ss.unpackSizes[zip_entry->ssIndex];
 +		archive_entry_set_size(entry, zip->entry_bytes_remaining);
 +	} else {
 +		zip->entry_bytes_remaining = 0;
 +		archive_entry_set_size(entry, 0);
 +	}
 +
 +	/* If there's no body, force read_data() to return EOF immediately. */
 +	if (zip->entry_bytes_remaining < 1)
 +		zip->end_of_entry = 1;
 +
 +	if ((zip_entry->mode & AE_IFMT) == AE_IFLNK) {
 +		unsigned char *symname = NULL;
 +		size_t symsize = 0;
 +
 +		/*
 +		 * Symbolic-name is recorded as its contents. We have to
 +		 * read the contents at this time.
 +		 */
 +		while (zip->entry_bytes_remaining > 0) {
 +			const void *buff;
 +			unsigned char *mem;
 +			size_t size;
 +			int64_t offset;
 +
 +			r = archive_read_format_7zip_read_data(a, &buff,
 +				&size, &offset);
 +			if (r < ARCHIVE_WARN) {
 +				free(symname);
 +				return (r);
 +			}
 +			mem = realloc(symname, symsize + size + 1);
 +			if (mem == NULL) {
 +				free(symname);
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory for Symname");
 +				return (ARCHIVE_FATAL);
 +			}
 +			symname = mem;
 +			memcpy(symname+symsize, buff, size);
 +			symsize += size;
 +		}
 +		if (symsize == 0) {
 +			/* If there is no synname, handle it as a regular
 +			 * file. */
 +			zip_entry->mode &= ~AE_IFMT;
 +			zip_entry->mode |= AE_IFREG;
 +			archive_entry_set_mode(entry, zip_entry->mode);
 +		} else {
 +			symname[symsize] = '\0';
 +			archive_entry_copy_symlink(entry,
 +			    (const char *)symname);
 +		}
 +		free(symname);
 +		archive_entry_set_size(entry, 0);
 +	}
 +
 +	/* Set up a more descriptive format name. */
 +	sprintf(zip->format_name, "7-Zip");
 +	a->archive.archive_format_name = zip->format_name;
 +
 +	return (ret);
 +}
 +
 +static int
 +archive_read_format_7zip_read_data(struct archive_read *a,
 +    const void **buff, size_t *size, int64_t *offset)
 +{
 +	struct _7zip *zip;
 +	ssize_t bytes;
 +	int ret = ARCHIVE_OK;
 +
 +	zip = (struct _7zip *)(a->format->data);
 +
 +	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
 +		zip->has_encrypted_entries = 0;
 +	}
 +
 +	if (zip->pack_stream_bytes_unconsumed)
 +		read_consume(a);
 +
 +	*offset = zip->entry_offset;
 +	*size = 0;
 +	*buff = NULL;
 +	/*
 +	 * If we hit end-of-entry last time, clean up and return
 +	 * ARCHIVE_EOF this time.
 +	 */
 +	if (zip->end_of_entry)
 +		return (ARCHIVE_EOF);
 +
 +	bytes = read_stream(a, buff,
 +		(size_t)zip->entry_bytes_remaining, 0);
 +	if (bytes < 0)
 +		return ((int)bytes);
 +	if (bytes == 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated 7-Zip file body");
 +		return (ARCHIVE_FATAL);
 +	}
 +	zip->entry_bytes_remaining -= bytes;
 +	if (zip->entry_bytes_remaining == 0)
 +		zip->end_of_entry = 1;
 +
 +	/* Update checksum */
 +	if ((zip->entry->flg & CRC32_IS_SET) && bytes)
 +		zip->entry_crc32 = crc32(zip->entry_crc32, *buff,
 +		    (unsigned)bytes);
 +
 +	/* If we hit the end, swallow any end-of-data marker. */
 +	if (zip->end_of_entry) {
 +		/* Check computed CRC against file contents. */
 +		if ((zip->entry->flg & CRC32_IS_SET) &&
 +			zip->si.ss.digests[zip->entry->ssIndex] !=
 +		    zip->entry_crc32) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "7-Zip bad CRC: 0x%lx should be 0x%lx",
 +			    (unsigned long)zip->entry_crc32,
 +			    (unsigned long)zip->si.ss.digests[
 +			    		zip->entry->ssIndex]);
 +			ret = ARCHIVE_WARN;
 +		}
 +	}
 +
 +	*size = bytes;
 +	*offset = zip->entry_offset;
 +	zip->entry_offset += bytes;
 +
 +	return (ret);
 +}
 +
 +static int
 +archive_read_format_7zip_read_data_skip(struct archive_read *a)
 +{
 +	struct _7zip *zip;
 +	int64_t bytes_skipped;
 +
 +	zip = (struct _7zip *)(a->format->data);
 +
 +	if (zip->pack_stream_bytes_unconsumed)
 +		read_consume(a);
 +
 +	/* If we've already read to end of data, we're done. */
 +	if (zip->end_of_entry)
 +		return (ARCHIVE_OK);
 +
 +	/*
 +	 * If the length is at the beginning, we can skip the
 +	 * compressed data much more quickly.
 +	 */
 +	bytes_skipped = skip_stream(a, (size_t)zip->entry_bytes_remaining);
 +	if (bytes_skipped < 0)
 +		return (ARCHIVE_FATAL);
 +	zip->entry_bytes_remaining = 0;
 +
 +	/* This entry is finished and done. */
 +	zip->end_of_entry = 1;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_read_format_7zip_cleanup(struct archive_read *a)
 +{
 +	struct _7zip *zip;
 +
 +	zip = (struct _7zip *)(a->format->data);
 +	free_StreamsInfo(&(zip->si));
 +	free(zip->entries);
 +	free(zip->entry_names);
 +	free_decompression(a, zip);
 +	free(zip->uncompressed_buffer);
 +	free(zip->sub_stream_buff[0]);
 +	free(zip->sub_stream_buff[1]);
 +	free(zip->sub_stream_buff[2]);
 +	free(zip->tmp_stream_buff);
 +	free(zip);
 +	(a->format->data) = NULL;
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +read_consume(struct archive_read *a)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +
 +	if (zip->pack_stream_bytes_unconsumed) {
 +		__archive_read_consume(a, zip->pack_stream_bytes_unconsumed);
 +		zip->stream_offset += zip->pack_stream_bytes_unconsumed;
 +		zip->pack_stream_bytes_unconsumed = 0;
 +	}
 +}
 +
 +#ifdef HAVE_LZMA_H
 +
 +/*
 + * Set an error code and choose an error message for liblzma.
 + */
 +static void
 +set_error(struct archive_read *a, int ret)
 +{
 +
 +	switch (ret) {
 +	case LZMA_STREAM_END: /* Found end of stream. */
 +	case LZMA_OK: /* Decompressor made some progress. */
 +		break;
 +	case LZMA_MEM_ERROR:
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Lzma library error: Cannot allocate memory");
 +		break;
 +	case LZMA_MEMLIMIT_ERROR:
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Lzma library error: Out of memory");
 +		break;
 +	case LZMA_FORMAT_ERROR:
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma library error: format not recognized");
 +		break;
 +	case LZMA_OPTIONS_ERROR:
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma library error: Invalid options");
 +		break;
 +	case LZMA_DATA_ERROR:
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma library error: Corrupted input data");
 +		break;
 +	case LZMA_BUF_ERROR:
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma library error:  No progress is possible");
 +		break;
 +	default:
 +		/* Return an error. */
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "Lzma decompression failed:  Unknown error");
 +		break;
 +	}
 +}
 +
 +#endif
 +
 +static unsigned long
 +decode_codec_id(const unsigned char *codecId, size_t id_size)
 +{
 +	unsigned i;
 +	unsigned long id = 0;
 +
 +	for (i = 0; i < id_size; i++) {
 +		id <<= 8;
 +		id += codecId[i];
 +	}
 +	return (id);
 +}
 +
 +static void *
 +ppmd_alloc(void *p, size_t size)
 +{
 +	(void)p;
 +	return malloc(size);
 +}
 +static void
 +ppmd_free(void *p, void *address)
 +{
 +	(void)p;
 +	free(address);
 +}
 +static Byte
 +ppmd_read(void *p)
 +{
 +	struct archive_read *a = ((IByteIn*)p)->a;
 +	struct _7zip *zip = (struct _7zip *)(a->format->data);
 +	Byte b;
 +
 +	if (zip->ppstream.avail_in == 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated RAR file data");
 +		zip->ppstream.overconsumed = 1;
 +		return (0);
 +	}
 +	b = *zip->ppstream.next_in++;
 +	zip->ppstream.avail_in--;
 +	zip->ppstream.total_in++;
 +	return (b);
 +}
 +
 +static ISzAlloc g_szalloc = { ppmd_alloc, ppmd_free };
 +
 +static int
 +init_decompression(struct archive_read *a, struct _7zip *zip,
 +    const struct _7z_coder *coder1, const struct _7z_coder *coder2)
 +{
 +	int r;
 +
 +	zip->codec = coder1->codec;
 +	zip->codec2 = -1;
 +
 +	switch (zip->codec) {
 +	case _7Z_COPY:
 +	case _7Z_BZ2:
 +	case _7Z_DEFLATE:
 +	case _7Z_PPMD:
 +		if (coder2 != NULL) {
 +			if (coder2->codec != _7Z_X86 &&
 +			    coder2->codec != _7Z_X86_BCJ2) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Unsupported filter %lx for %lx",
 +				    coder2->codec, coder1->codec);
 +				return (ARCHIVE_FAILED);
 +			}
 +			zip->codec2 = coder2->codec;
 +			zip->bcj_state = 0;
 +			if (coder2->codec == _7Z_X86)
 +				x86_Init(zip);
 +		}
 +		break;
 +	default:
 +		break;
 +	}
 +
 +	switch (zip->codec) {
 +	case _7Z_COPY:
 +		break;
 +
 +	case _7Z_LZMA: case _7Z_LZMA2:
 +#ifdef HAVE_LZMA_H
 +#if LZMA_VERSION_MAJOR >= 5
 +/* Effectively disable the limiter. */
 +#define LZMA_MEMLIMIT   UINT64_MAX
 +#else
 +/* NOTE: This needs to check memory size which running system has. */
 +#define LZMA_MEMLIMIT   (1U << 30)
 +#endif
 +	{
 +		lzma_options_delta delta_opt;
 +		lzma_filter filters[LZMA_FILTERS_MAX];
 +#if LZMA_VERSION < 50010000
 +		lzma_filter *ff;
 +#endif
 +		int fi = 0;
 +
 +		if (zip->lzstream_valid) {
 +			lzma_end(&(zip->lzstream));
 +			zip->lzstream_valid = 0;
 +		}
 +
 +		/*
 +		 * NOTE: liblzma incompletely handle the BCJ+LZMA compressed
 +		 * data made by 7-Zip because 7-Zip does not add End-Of-
 +		 * Payload Marker(EOPM) at the end of LZMA compressed data,
 +		 * and so liblzma cannot know the end of the compressed data
 +		 * without EOPM. So consequently liblzma will not return last
 +		 * three or four bytes of uncompressed data because
 +		 * LZMA_FILTER_X86 filter does not handle input data if its
 +		 * data size is less than five bytes. If liblzma detect EOPM
 +		 * or know the uncompressed data size, liblzma will flush out
 +		 * the remaining that three or four bytes of uncompressed
 +		 * data. That is why we have to use our converting program
 +		 * for BCJ+LZMA. If we were able to tell the uncompressed
 +		 * size to liblzma when using lzma_raw_decoder() liblzma
 +		 * could correctly deal with BCJ+LZMA. But unfortunately
 +		 * there is no way to do that.
 +		 * Discussion about this can be found at XZ Utils forum.
 +		 */
 +		if (coder2 != NULL) {
 +			zip->codec2 = coder2->codec;
 +
 +			filters[fi].options = NULL;
 +			switch (zip->codec2) {
 +			case _7Z_X86:
 +				if (zip->codec == _7Z_LZMA2) {
 +					filters[fi].id = LZMA_FILTER_X86;
 +					fi++;
 +				} else
 +					/* Use our filter. */
 +					x86_Init(zip);
 +				break;
 +			case _7Z_X86_BCJ2:
 +				/* Use our filter. */
 +				zip->bcj_state = 0;
 +				break;
 +			case _7Z_DELTA:
 +				filters[fi].id = LZMA_FILTER_DELTA;
 +				memset(&delta_opt, 0, sizeof(delta_opt));
 +				delta_opt.type = LZMA_DELTA_TYPE_BYTE;
 +				delta_opt.dist = 1;
 +				filters[fi].options = &delta_opt;
 +				fi++;
 +				break;
 +			/* Following filters have not been tested yet. */
 +			case _7Z_POWERPC:
 +				filters[fi].id = LZMA_FILTER_POWERPC;
 +				fi++;
 +				break;
 +			case _7Z_IA64:
 +				filters[fi].id = LZMA_FILTER_IA64;
 +				fi++;
 +				break;
 +			case _7Z_ARM:
 +				filters[fi].id = LZMA_FILTER_ARM;
 +				fi++;
 +				break;
 +			case _7Z_ARMTHUMB:
 +				filters[fi].id = LZMA_FILTER_ARMTHUMB;
 +				fi++;
 +				break;
 +			case _7Z_SPARC:
 +				filters[fi].id = LZMA_FILTER_SPARC;
 +				fi++;
 +				break;
 +			default:
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Unexpected codec ID: %lX", zip->codec2);
 +				return (ARCHIVE_FAILED);
 +			}
 +		}
 +
 +		if (zip->codec == _7Z_LZMA2)
 +			filters[fi].id = LZMA_FILTER_LZMA2;
 +		else
 +			filters[fi].id = LZMA_FILTER_LZMA1;
 +		filters[fi].options = NULL;
 +#if LZMA_VERSION < 50010000
 +		ff = &filters[fi];
 +#endif
 +		r = lzma_properties_decode(&filters[fi], NULL,
 +		    coder1->properties, (size_t)coder1->propertiesSize);
 +		if (r != LZMA_OK) {
 +			set_error(a, r);
 +			return (ARCHIVE_FAILED);
 +		}
 +		fi++;
 +
 +		filters[fi].id = LZMA_VLI_UNKNOWN;
 +		filters[fi].options = NULL;
 +		r = lzma_raw_decoder(&(zip->lzstream), filters);
 +#if LZMA_VERSION < 50010000
 +		free(ff->options);
 +#endif
 +		if (r != LZMA_OK) {
 +			set_error(a, r);
 +			return (ARCHIVE_FAILED);
 +		}
 +		zip->lzstream_valid = 1;
 +		zip->lzstream.total_in = 0;
 +		zip->lzstream.total_out = 0;
 +		break;
 +	}
 +#else
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "LZMA codec is unsupported");
 +		return (ARCHIVE_FAILED);
 +#endif
 +	case _7Z_BZ2:
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +		if (zip->bzstream_valid) {
 +			BZ2_bzDecompressEnd(&(zip->bzstream));
 +			zip->bzstream_valid = 0;
 +		}
 +		r = BZ2_bzDecompressInit(&(zip->bzstream), 0, 0);
 +		if (r == BZ_MEM_ERROR)
 +			r = BZ2_bzDecompressInit(&(zip->bzstream), 0, 1);
 +		if (r != BZ_OK) {
 +			int err = ARCHIVE_ERRNO_MISC;
 +			const char *detail = NULL;
 +			switch (r) {
 +			case BZ_PARAM_ERROR:
 +				detail = "invalid setup parameter";
 +				break;
 +			case BZ_MEM_ERROR:
 +				err = ENOMEM;
 +				detail = "out of memory";
 +				break;
 +			case BZ_CONFIG_ERROR:
 +				detail = "mis-compiled library";
 +				break;
 +			}
 +			archive_set_error(&a->archive, err,
 +			    "Internal error initializing decompressor: %s",
 +			    detail != NULL ? detail : "??");
 +			zip->bzstream_valid = 0;
 +			return (ARCHIVE_FAILED);
 +		}
 +		zip->bzstream_valid = 1;
 +		zip->bzstream.total_in_lo32 = 0;
 +		zip->bzstream.total_in_hi32 = 0;
 +		zip->bzstream.total_out_lo32 = 0;
 +		zip->bzstream.total_out_hi32 = 0;
 +		break;
 +#else
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "BZ2 codec is unsupported");
 +		return (ARCHIVE_FAILED);
 +#endif
 +	case _7Z_DEFLATE:
 +#ifdef HAVE_ZLIB_H
 +		if (zip->stream_valid)
 +			r = inflateReset(&(zip->stream));
 +		else
 +			r = inflateInit2(&(zip->stream),
 +			    -15 /* Don't check for zlib header */);
 +		if (r != Z_OK) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Couldn't initialize zlib stream.");
 +			return (ARCHIVE_FAILED);
 +		}
 +		zip->stream_valid = 1;
 +		zip->stream.total_in = 0;
 +		zip->stream.total_out = 0;
 +		break;
 +#else
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "DEFLATE codec is unsupported");
 +		return (ARCHIVE_FAILED);
 +#endif
 +	case _7Z_PPMD:
 +	{
 +		unsigned order;
 +		uint32_t msize;
 +
 +		if (zip->ppmd7_valid) {
 +			__archive_ppmd7_functions.Ppmd7_Free(
 +			    &zip->ppmd7_context, &g_szalloc);
 +			zip->ppmd7_valid = 0;
 +		}
 +
 +		if (coder1->propertiesSize < 5) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Malformed PPMd parameter");
 +			return (ARCHIVE_FAILED);
 +		}
 +		order = coder1->properties[0];
 +		msize = archive_le32dec(&(coder1->properties[1]));
 +		if (order < PPMD7_MIN_ORDER || order > PPMD7_MAX_ORDER ||
 +		    msize < PPMD7_MIN_MEM_SIZE || msize > PPMD7_MAX_MEM_SIZE) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Malformed PPMd parameter");
 +			return (ARCHIVE_FAILED);
 +		}
 +		__archive_ppmd7_functions.Ppmd7_Construct(&zip->ppmd7_context);
 +		r = __archive_ppmd7_functions.Ppmd7_Alloc(
 +			&zip->ppmd7_context, msize, &g_szalloc);
 +		if (r == 0) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Coludn't allocate memory for PPMd");
 +			return (ARCHIVE_FATAL);
 +		}
 +		__archive_ppmd7_functions.Ppmd7_Init(
 +			&zip->ppmd7_context, order);
 +		__archive_ppmd7_functions.Ppmd7z_RangeDec_CreateVTable(
 +			&zip->range_dec);
 +		zip->ppmd7_valid = 1;
 +		zip->ppmd7_stat = 0;
 +		zip->ppstream.overconsumed = 0;
 +		zip->ppstream.total_in = 0;
 +		zip->ppstream.total_out = 0;
 +		break;
 +	}
 +	case _7Z_X86:
 +	case _7Z_X86_BCJ2:
 +	case _7Z_POWERPC:
 +	case _7Z_IA64:
 +	case _7Z_ARM:
 +	case _7Z_ARMTHUMB:
 +	case _7Z_SPARC:
 +	case _7Z_DELTA:
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Unexpected codec ID: %lX", zip->codec);
 +		return (ARCHIVE_FAILED);
 +	case _7Z_CRYPTO_MAIN_ZIP:
 +	case _7Z_CRYPTO_RAR_29:
 +	case _7Z_CRYPTO_AES_256_SHA_256:
 +		if (a->entry) {
 +			archive_entry_set_is_metadata_encrypted(a->entry, 1);
 +			archive_entry_set_is_data_encrypted(a->entry, 1);
 +			zip->has_encrypted_entries = 1;
 +		}
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Crypto codec not supported yet (ID: 0x%lX)", zip->codec);
 +		return (ARCHIVE_FAILED);
 +	default:
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Unknown codec ID: %lX", zip->codec);
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +decompress(struct archive_read *a, struct _7zip *zip,
 +    void *buff, size_t *outbytes, const void *b, size_t *used)
 +{
 +	const uint8_t *t_next_in;
 +	uint8_t *t_next_out;
 +	size_t o_avail_in, o_avail_out;
 +	size_t t_avail_in, t_avail_out;
 +	uint8_t *bcj2_next_out;
 +	size_t bcj2_avail_out;
 +	int r, ret = ARCHIVE_OK;
 +
 +	t_avail_in = o_avail_in = *used;
 +	t_avail_out = o_avail_out = *outbytes;
 +	t_next_in = b;
 +	t_next_out = buff;
 +
 +	if (zip->codec != _7Z_LZMA2 && zip->codec2 == _7Z_X86) {
 +		int i;
 +
 +		/* Do not copy out the BCJ remaining bytes when the output
 +		 * buffer size is less than five bytes. */
 +		if (o_avail_in != 0 && t_avail_out < 5 && zip->odd_bcj_size) {
 +			*used = 0;
 +			*outbytes = 0;
 +			return (ret);
 +		}
 +		for (i = 0; zip->odd_bcj_size > 0 && t_avail_out; i++) {
 +			*t_next_out++ = zip->odd_bcj[i];
 +			t_avail_out--;
 +			zip->odd_bcj_size--;
 +		}
 +		if (o_avail_in == 0 || t_avail_out == 0) {
 +			*used = o_avail_in - t_avail_in;
 +			*outbytes = o_avail_out - t_avail_out;
 +			if (o_avail_in == 0)
 +				ret = ARCHIVE_EOF;
 +			return (ret);
 +		}
 +	}
 +
 +	bcj2_next_out = t_next_out;
 +	bcj2_avail_out = t_avail_out;
 +	if (zip->codec2 == _7Z_X86_BCJ2) {
 +		/*
 +		 * Decord a remaining decompressed main stream for BCJ2.
 +		 */
 +		if (zip->tmp_stream_bytes_remaining) {
 +			ssize_t bytes;
 +			size_t remaining = zip->tmp_stream_bytes_remaining;
 +			bytes = Bcj2_Decode(zip, t_next_out, t_avail_out);
 +			if (bytes < 0) {
 +				archive_set_error(&(a->archive),
 +				    ARCHIVE_ERRNO_MISC,
 +				    "BCJ2 conversion Failed");
 +				return (ARCHIVE_FAILED);
 +			}
 +			zip->main_stream_bytes_remaining -=
 +			    remaining - zip->tmp_stream_bytes_remaining;
 +			t_avail_out -= bytes;
 +			if (o_avail_in == 0 || t_avail_out == 0) {
 +				*used = 0;
 +				*outbytes = o_avail_out - t_avail_out;
 +				if (o_avail_in == 0 &&
 +				    zip->tmp_stream_bytes_remaining)
 +					ret = ARCHIVE_EOF;
 +				return (ret);
 +			}
 +			t_next_out += bytes;
 +			bcj2_next_out = t_next_out;
 +			bcj2_avail_out = t_avail_out;
 +		}
 +		t_next_out = zip->tmp_stream_buff;
 +		t_avail_out = zip->tmp_stream_buff_size;
 +	}
 +
 +	switch (zip->codec) {
 +	case _7Z_COPY:
 +	{
 +		size_t bytes =
 +		    (t_avail_in > t_avail_out)?t_avail_out:t_avail_in;
 +
 +		memcpy(t_next_out, t_next_in, bytes);
 +		t_avail_in -= bytes;
 +		t_avail_out -= bytes;
 +		if (o_avail_in == 0)
 +			ret = ARCHIVE_EOF;
 +		break;
 +	}
 +#ifdef HAVE_LZMA_H
 +	case _7Z_LZMA: case _7Z_LZMA2:
 +		zip->lzstream.next_in = t_next_in;
 +		zip->lzstream.avail_in = t_avail_in;
 +		zip->lzstream.next_out = t_next_out;
 +		zip->lzstream.avail_out = t_avail_out;
 +
 +		r = lzma_code(&(zip->lzstream), LZMA_RUN);
 +		switch (r) {
 +		case LZMA_STREAM_END: /* Found end of stream. */
 +			lzma_end(&(zip->lzstream));
 +			zip->lzstream_valid = 0;
 +			ret = ARCHIVE_EOF;
 +			break;
 +		case LZMA_OK: /* Decompressor made some progress. */
 +			break;
 +		default:
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +				"Decompression failed(%d)",
 +			    r);
 +			return (ARCHIVE_FAILED);
 +		}
 +		t_avail_in = zip->lzstream.avail_in;
 +		t_avail_out = zip->lzstream.avail_out;
 +		break;
 +#endif
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +	case _7Z_BZ2:
 +		zip->bzstream.next_in = (char *)(uintptr_t)t_next_in;
 +		zip->bzstream.avail_in = t_avail_in;
 +		zip->bzstream.next_out = (char *)(uintptr_t)t_next_out;
 +		zip->bzstream.avail_out = t_avail_out;
 +		r = BZ2_bzDecompress(&(zip->bzstream));
 +		switch (r) {
 +		case BZ_STREAM_END: /* Found end of stream. */
 +			switch (BZ2_bzDecompressEnd(&(zip->bzstream))) {
 +			case BZ_OK:
 +				break;
 +			default:
 +				archive_set_error(&(a->archive),
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Failed to clean up decompressor");
 +				return (ARCHIVE_FAILED);
 +			}
 +			zip->bzstream_valid = 0;
 +			ret = ARCHIVE_EOF;
 +			break;
 +		case BZ_OK: /* Decompressor made some progress. */
 +			break;
 +		default:
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "bzip decompression failed");
 +			return (ARCHIVE_FAILED);
 +		}
 +		t_avail_in = zip->bzstream.avail_in;
 +		t_avail_out = zip->bzstream.avail_out;
 +		break;
 +#endif
 +#ifdef HAVE_ZLIB_H
 +	case _7Z_DEFLATE:
 +		zip->stream.next_in = (Bytef *)(uintptr_t)t_next_in;
 +		zip->stream.avail_in = (uInt)t_avail_in;
 +		zip->stream.next_out = t_next_out;
 +		zip->stream.avail_out = (uInt)t_avail_out;
 +		r = inflate(&(zip->stream), 0);
 +		switch (r) {
 +		case Z_STREAM_END: /* Found end of stream. */
 +			ret = ARCHIVE_EOF;
 +			break;
 +		case Z_OK: /* Decompressor made some progress.*/
 +			break;
 +		default:
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "File decompression failed (%d)", r);
 +			return (ARCHIVE_FAILED);
 +		}
 +		t_avail_in = zip->stream.avail_in;
 +		t_avail_out = zip->stream.avail_out;
 +		break;
 +#endif
 +	case _7Z_PPMD:
 +	{
 +		uint64_t flush_bytes;
 +
 +		if (!zip->ppmd7_valid || zip->ppmd7_stat < 0 ||
 +		    t_avail_out <= 0) {
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Decompression internal error");
 +			return (ARCHIVE_FAILED);
 +		}
 +		zip->ppstream.next_in = t_next_in;
 +		zip->ppstream.avail_in = t_avail_in;
 +		zip->ppstream.next_out = t_next_out;
 +		zip->ppstream.avail_out = t_avail_out;
 +		if (zip->ppmd7_stat == 0) {
 +			zip->bytein.a = a;
 +			zip->bytein.Read = &ppmd_read;
 +			zip->range_dec.Stream = &zip->bytein;
 +			r = __archive_ppmd7_functions.Ppmd7z_RangeDec_Init(
 +				&(zip->range_dec));
 +			if (r == 0) {
 +				zip->ppmd7_stat = -1;
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Failed to initialize PPMd range decorder");
 +				return (ARCHIVE_FAILED);
 +			}
 +			if (zip->ppstream.overconsumed) {
 +				zip->ppmd7_stat = -1;
 +				return (ARCHIVE_FAILED);
 +			}
 +			zip->ppmd7_stat = 1;
 +		}
 +
 +		if (t_avail_in == 0)
 +			/* XXX Flush out remaining decoded data XXX */
 +			flush_bytes = zip->folder_outbytes_remaining;
 +		else
 +			flush_bytes = 0;
 +
 +		do {
 +			int sym;
 +
 +			sym = __archive_ppmd7_functions.Ppmd7_DecodeSymbol(
 +				&(zip->ppmd7_context), &(zip->range_dec.p));
 +			if (sym < 0) {
 +				zip->ppmd7_stat = -1;
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_FILE_FORMAT,
 +				    "Failed to decode PPMd");
 +				return (ARCHIVE_FAILED);
 +			}
 +			if (zip->ppstream.overconsumed) {
 +				zip->ppmd7_stat = -1;
 +				return (ARCHIVE_FAILED);
 +			}
 +			*zip->ppstream.next_out++ = (unsigned char)sym;
 +			zip->ppstream.avail_out--;
 +			zip->ppstream.total_out++;
 +			if (flush_bytes)
 +				flush_bytes--;
 +		} while (zip->ppstream.avail_out &&
 +			(zip->ppstream.avail_in || flush_bytes));
 +
 +		t_avail_in = (size_t)zip->ppstream.avail_in;
 +		t_avail_out = (size_t)zip->ppstream.avail_out;
 +		break;
 +	}
 +	default:
 +		archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
 +		    "Decompression internal error");
 +		return (ARCHIVE_FAILED);
 +	}
 +	if (ret != ARCHIVE_OK && ret != ARCHIVE_EOF)
 +		return (ret);
 +
 +	*used = o_avail_in - t_avail_in;
 +	*outbytes = o_avail_out - t_avail_out;
 +
 +	/*
 +	 * Decord BCJ.
 +	 */
 +	if (zip->codec != _7Z_LZMA2 && zip->codec2 == _7Z_X86) {
 +		size_t l = x86_Convert(zip, buff, *outbytes);
 +		zip->odd_bcj_size = *outbytes - l;
 +		if (zip->odd_bcj_size > 0 && zip->odd_bcj_size <= 4 &&
 +		    o_avail_in && ret != ARCHIVE_EOF) {
 +			memcpy(zip->odd_bcj, ((unsigned char *)buff) + l,
 +			    zip->odd_bcj_size);
 +			*outbytes = l;
 +		} else
 +			zip->odd_bcj_size = 0;
 +	}
 +
 +	/*
 +	 * Decord BCJ2 with a decompressed main stream.
 +	 */
 +	if (zip->codec2 == _7Z_X86_BCJ2) {
 +		ssize_t bytes;
 +
 +		zip->tmp_stream_bytes_avail =
 +		    zip->tmp_stream_buff_size - t_avail_out;
 +		if (zip->tmp_stream_bytes_avail >
 +		      zip->main_stream_bytes_remaining)
 +			zip->tmp_stream_bytes_avail =
 +			    zip->main_stream_bytes_remaining;
 +		zip->tmp_stream_bytes_remaining = zip->tmp_stream_bytes_avail;
 +		bytes = Bcj2_Decode(zip, bcj2_next_out, bcj2_avail_out);
 +		if (bytes < 0) {
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC, "BCJ2 conversion Failed");
 +			return (ARCHIVE_FAILED);
 +		}
 +		zip->main_stream_bytes_remaining -=
 +		    zip->tmp_stream_bytes_avail
 +		      - zip->tmp_stream_bytes_remaining;
 +		bcj2_avail_out -= bytes;
 +		*outbytes = o_avail_out - bcj2_avail_out;
 +	}
 +
 +	return (ret);
 +}
 +
 +static int
 +free_decompression(struct archive_read *a, struct _7zip *zip)
 +{
 +	int r = ARCHIVE_OK;
 +
 +#if !defined(HAVE_ZLIB_H) &&\
 +	!(defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR))
 +	(void)a;/* UNUSED */
 +#endif
 +#ifdef HAVE_LZMA_H
 +	if (zip->lzstream_valid)
 +		lzma_end(&(zip->lzstream));
 +#endif
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +	if (zip->bzstream_valid) {
 +		if (BZ2_bzDecompressEnd(&(zip->bzstream)) != BZ_OK) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Failed to clean up bzip2 decompressor");
 +			r = ARCHIVE_FATAL;
 +		}
 +		zip->bzstream_valid = 0;
 +	}
 +#endif
 +#ifdef HAVE_ZLIB_H
 +	if (zip->stream_valid) {
 +		if (inflateEnd(&(zip->stream)) != Z_OK) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Failed to clean up zlib decompressor");
 +			r = ARCHIVE_FATAL;
 +		}
 +		zip->stream_valid = 0;
 +	}
 +#endif
 +	if (zip->ppmd7_valid) {
 +		__archive_ppmd7_functions.Ppmd7_Free(
 +			&zip->ppmd7_context, &g_szalloc);
 +		zip->ppmd7_valid = 0;
 +	}
 +	return (r);
 +}
 +
 +static int
 +parse_7zip_uint64(struct archive_read *a, uint64_t *val)
 +{
 +	const unsigned char *p;
 +	unsigned char avail, mask;
 +	int i;
 +
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		return (-1);
 +	avail = *p;
 +	mask = 0x80;
 +	*val = 0;
 +	for (i = 0; i < 8; i++) {
 +		if (avail & mask) {
 +			if ((p = header_bytes(a, 1)) == NULL)
 +				return (-1);
 +			*val |= ((uint64_t)*p) << (8 * i);
 +			mask >>= 1;
 +			continue;
 +		}
- 		*val += (avail & (mask -1)) << (8 * i);
++		*val += ((uint64_t)(avail & (mask -1))) << (8 * i);
 +		break;
 +	}
 +	return (0);
 +}
 +
 +static int
 +read_Bools(struct archive_read *a, unsigned char *data, size_t num)
 +{
 +	const unsigned char *p;
 +	unsigned i, mask = 0, avail = 0;
 +
 +	for (i = 0; i < num; i++) {
 +		if (mask == 0) {
 +			if ((p = header_bytes(a, 1)) == NULL)
 +				return (-1);
 +			avail = *p;
 +			mask = 0x80;
 +		}
 +		data[i] = (avail & mask)?1:0;
 +		mask >>= 1;
 +	}
 +	return (0);
 +}
 +
 +static void
 +free_Digest(struct _7z_digests *d)
 +{
 +	free(d->defineds);
 +	free(d->digests);
 +}
 +
 +static int
 +read_Digests(struct archive_read *a, struct _7z_digests *d, size_t num)
 +{
 +	const unsigned char *p;
 +	unsigned i;
 +
 +	if (num == 0)
 +		return (-1);
 +	memset(d, 0, sizeof(*d));
 +
 +	d->defineds = malloc(num);
 +	if (d->defineds == NULL)
 +		return (-1);
 +	/*
 +	 * Read Bools.
 +	 */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		return (-1);
 +	if (*p == 0) {
 +		if (read_Bools(a, d->defineds, num) < 0)
 +			return (-1);
 +	} else
 +		/* All are defined */
 +		memset(d->defineds, 1, num);
 +
 +	d->digests = calloc(num, sizeof(*d->digests));
 +	if (d->digests == NULL)
 +		return (-1);
 +	for (i = 0; i < num; i++) {
 +		if (d->defineds[i]) {
 +			if ((p = header_bytes(a, 4)) == NULL)
 +				return (-1);
 +			d->digests[i] = archive_le32dec(p);
 +		}
 +	}
 +
 +	return (0);
 +}
 +
 +static void
 +free_PackInfo(struct _7z_pack_info *pi)
 +{
 +	free(pi->sizes);
 +	free(pi->positions);
 +	free_Digest(&(pi->digest));
 +}
 +
 +static int
 +read_PackInfo(struct archive_read *a, struct _7z_pack_info *pi)
 +{
 +	const unsigned char *p;
 +	unsigned i;
 +
 +	memset(pi, 0, sizeof(*pi));
 +
 +	/*
 +	 * Read PackPos.
 +	 */
 +	if (parse_7zip_uint64(a, &(pi->pos)) < 0)
 +		return (-1);
 +
 +	/*
 +	 * Read NumPackStreams.
 +	 */
 +	if (parse_7zip_uint64(a, &(pi->numPackStreams)) < 0)
 +		return (-1);
 +	if (pi->numPackStreams == 0)
 +		return (-1);
- 	if (1000000 < pi->numPackStreams)
++	if (UMAX_ENTRY < pi->numPackStreams)
 +		return (-1);
 +
 +	/*
 +	 * Read PackSizes[num]
 +	 */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		return (-1);
 +	if (*p == kEnd)
 +		/* PackSizes[num] are not present. */
 +		return (0);
 +	if (*p != kSize)
 +		return (-1);
 +	pi->sizes = calloc((size_t)pi->numPackStreams, sizeof(uint64_t));
 +	pi->positions = calloc((size_t)pi->numPackStreams, sizeof(uint64_t));
 +	if (pi->sizes == NULL || pi->positions == NULL)
 +		return (-1);
 +
 +	for (i = 0; i < pi->numPackStreams; i++) {
 +		if (parse_7zip_uint64(a, &(pi->sizes[i])) < 0)
 +			return (-1);
 +	}
 +
 +	/*
 +	 * Read PackStreamDigests[num]
 +	 */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		return (-1);
 +	if (*p == kEnd) {
 +		/* PackStreamDigests[num] are not present. */
 +		pi->digest.defineds =
 +		    calloc((size_t)pi->numPackStreams, sizeof(*pi->digest.defineds));
 +		pi->digest.digests =
 +		    calloc((size_t)pi->numPackStreams, sizeof(*pi->digest.digests));
 +		if (pi->digest.defineds == NULL || pi->digest.digests == NULL)
 +			return (-1);
 +		return (0);
 +	}
 +
 +	if (*p != kSize)
 +		return (-1);
 +
 +	if (read_Digests(a, &(pi->digest), (size_t)pi->numPackStreams) < 0)
 +		return (-1);
 +
 +	/*
 +	 *  Must be marked by kEnd.
 +	 */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		return (-1);
 +	if (*p != kEnd)
 +		return (-1);
 +	return (0);
 +}
 +
 +static void
 +free_Folder(struct _7z_folder *f)
 +{
 +	unsigned i;
 +
 +	if (f->coders) {
 +		for (i = 0; i< f->numCoders; i++) {
 +			free(f->coders[i].properties);
 +		}
 +		free(f->coders);
 +	}
 +	free(f->bindPairs);
 +	free(f->packedStreams);
 +	free(f->unPackSize);
 +}
 +
 +static int
 +read_Folder(struct archive_read *a, struct _7z_folder *f)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	const unsigned char *p;
 +	uint64_t numInStreamsTotal = 0;
 +	uint64_t numOutStreamsTotal = 0;
 +	unsigned i;
 +
 +	memset(f, 0, sizeof(*f));
 +
 +	/*
 +	 * Read NumCoders.
 +	 */
 +	if (parse_7zip_uint64(a, &(f->numCoders)) < 0)
 +		return (-1);
 +	if (f->numCoders > 4)
 +		/* Too many coders. */
 +		return (-1);
 +
 +	f->coders = calloc((size_t)f->numCoders, sizeof(*f->coders));
 +	if (f->coders == NULL)
 +		return (-1);
 +	for (i = 0; i< f->numCoders; i++) {
 +		size_t codec_size;
 +		int simple, attr;
 +
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +		/*
 +		 * 0:3 CodecIdSize
 +		 * 4:  0 - IsSimple
 +		 *     1 - Is not Simple
 +		 * 5:  0 - No Attributes
 +		 *     1 - There are Attributes;
 +		 * 7:  Must be zero.
 +		 */
 +		codec_size = *p & 0xf;
 +		simple = (*p & 0x10)?0:1;
 +		attr = *p & 0x20;
 +		if (*p & 0x80)
 +			return (-1);/* Not supported. */
 +
 +		/*
 +		 * Read Decompression Method IDs.
 +		 */
 +		if ((p = header_bytes(a, codec_size)) == NULL)
 +			return (-1);
 +
 +		f->coders[i].codec = decode_codec_id(p, codec_size);
 +
 +		if (simple) {
 +			f->coders[i].numInStreams = 1;
 +			f->coders[i].numOutStreams = 1;
 +		} else {
 +			if (parse_7zip_uint64(
 +			    a, &(f->coders[i].numInStreams)) < 0)
 +				return (-1);
- 			if (1000000 < f->coders[i].numInStreams)
++			if (UMAX_ENTRY < f->coders[i].numInStreams)
 +				return (-1);
 +			if (parse_7zip_uint64(
 +			    a, &(f->coders[i].numOutStreams)) < 0)
 +				return (-1);
- 			if (1000000 < f->coders[i].numOutStreams)
++			if (UMAX_ENTRY < f->coders[i].numOutStreams)
 +				return (-1);
 +		}
 +
 +		if (attr) {
 +			if (parse_7zip_uint64(
 +			    a, &(f->coders[i].propertiesSize)) < 0)
 +				return (-1);
 +			if ((p = header_bytes(
 +			    a, (size_t)f->coders[i].propertiesSize)) == NULL)
 +				return (-1);
 +			f->coders[i].properties =
 +			    malloc((size_t)f->coders[i].propertiesSize);
 +			if (f->coders[i].properties == NULL)
 +				return (-1);
 +			memcpy(f->coders[i].properties, p,
 +			    (size_t)f->coders[i].propertiesSize);
 +		}
 +
 +		numInStreamsTotal += f->coders[i].numInStreams;
 +		numOutStreamsTotal += f->coders[i].numOutStreams;
 +	}
 +
 +	if (numOutStreamsTotal == 0 ||
 +	    numInStreamsTotal < numOutStreamsTotal-1)
 +		return (-1);
 +
 +	f->numBindPairs = numOutStreamsTotal - 1;
 +	if (zip->header_bytes_remaining < f->numBindPairs)
 +			return (-1);
 +	if (f->numBindPairs > 0) {
 +		f->bindPairs =
 +			calloc((size_t)f->numBindPairs, sizeof(*f->bindPairs));
 +		if (f->bindPairs == NULL)
 +			return (-1);
 +	} else
 +		f->bindPairs = NULL;
 +	for (i = 0; i < f->numBindPairs; i++) {
 +		if (parse_7zip_uint64(a, &(f->bindPairs[i].inIndex)) < 0)
 +			return (-1);
- 		if (1000000 < f->bindPairs[i].inIndex)
++		if (UMAX_ENTRY < f->bindPairs[i].inIndex)
 +			return (-1);
 +		if (parse_7zip_uint64(a, &(f->bindPairs[i].outIndex)) < 0)
 +			return (-1);
- 		if (1000000 < f->bindPairs[i].outIndex)
++		if (UMAX_ENTRY < f->bindPairs[i].outIndex)
 +			return (-1);
 +	}
 +
 +	f->numPackedStreams = numInStreamsTotal - f->numBindPairs;
 +	f->packedStreams =
 +	    calloc((size_t)f->numPackedStreams, sizeof(*f->packedStreams));
 +	if (f->packedStreams == NULL)
 +		return (-1);
 +	if (f->numPackedStreams == 1) {
 +		for (i = 0; i < numInStreamsTotal; i++) {
 +			unsigned j;
 +			for (j = 0; j < f->numBindPairs; j++) {
 +				if (f->bindPairs[j].inIndex == i)
 +					break;
 +			}
 +			if (j == f->numBindPairs)
 +				break;
 +		}
 +		if (i == numInStreamsTotal)
 +			return (-1);
 +		f->packedStreams[0] = i;
 +	} else {
 +		for (i = 0; i < f->numPackedStreams; i++) {
 +			if (parse_7zip_uint64(a, &(f->packedStreams[i])) < 0)
 +				return (-1);
- 			if (1000000 < f->packedStreams[i])
++			if (UMAX_ENTRY < f->packedStreams[i])
 +				return (-1);
 +		}
 +	}
 +	f->numInStreams = numInStreamsTotal;
 +	f->numOutStreams = numOutStreamsTotal;
 +
 +	return (0);
 +}
 +
 +static void
 +free_CodersInfo(struct _7z_coders_info *ci)
 +{
 +	unsigned i;
 +
 +	if (ci->folders) {
 +		for (i = 0; i < ci->numFolders; i++)
 +			free_Folder(&(ci->folders[i]));
 +		free(ci->folders);
 +	}
 +}
 +
 +static int
 +read_CodersInfo(struct archive_read *a, struct _7z_coders_info *ci)
 +{
 +	const unsigned char *p;
 +	struct _7z_digests digest;
 +	unsigned i;
 +
 +	memset(ci, 0, sizeof(*ci));
 +	memset(&digest, 0, sizeof(digest));
 +
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		goto failed;
 +	if (*p != kFolder)
 +		goto failed;
 +
 +	/*
 +	 * Read NumFolders.
 +	 */
 +	if (parse_7zip_uint64(a, &(ci->numFolders)) < 0)
 +		goto failed;
- 	if (1000000 < ci->numFolders)
- 			return (-1);
++	if (UMAX_ENTRY < ci->numFolders)
++		return (-1);
 +
 +	/*
 +	 * Read External.
 +	 */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		goto failed;
 +	switch (*p) {
 +	case 0:
 +		ci->folders =
 +			calloc((size_t)ci->numFolders, sizeof(*ci->folders));
 +		if (ci->folders == NULL)
 +			return (-1);
 +		for (i = 0; i < ci->numFolders; i++) {
 +			if (read_Folder(a, &(ci->folders[i])) < 0)
 +				goto failed;
 +		}
 +		break;
 +	case 1:
 +		if (parse_7zip_uint64(a, &(ci->dataStreamIndex)) < 0)
 +			return (-1);
- 		if (1000000 < ci->dataStreamIndex)
++		if (UMAX_ENTRY < ci->dataStreamIndex)
 +			return (-1);
++		if (ci->numFolders > 0) {
++			archive_set_error(&a->archive, -1,
++			    "Malformed 7-Zip archive");
++			goto failed;
++		}
 +		break;
++	default:
++		archive_set_error(&a->archive, -1,
++		    "Malformed 7-Zip archive");
++		goto failed;
 +	}
 +
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		goto failed;
 +	if (*p != kCodersUnPackSize)
 +		goto failed;
 +
 +	for (i = 0; i < ci->numFolders; i++) {
 +		struct _7z_folder *folder = &(ci->folders[i]);
 +		unsigned j;
 +
 +		folder->unPackSize =
 +		    calloc((size_t)folder->numOutStreams, sizeof(*folder->unPackSize));
 +		if (folder->unPackSize == NULL)
 +			goto failed;
 +		for (j = 0; j < folder->numOutStreams; j++) {
 +			if (parse_7zip_uint64(a, &(folder->unPackSize[j])) < 0)
 +				goto failed;
 +		}
 +	}
 +
 +	/*
 +	 * Read CRCs.
 +	 */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		goto failed;
 +	if (*p == kEnd)
 +		return (0);
 +	if (*p != kCRC)
 +		goto failed;
 +	if (read_Digests(a, &digest, (size_t)ci->numFolders) < 0)
 +		goto failed;
 +	for (i = 0; i < ci->numFolders; i++) {
 +		ci->folders[i].digest_defined = digest.defineds[i];
 +		ci->folders[i].digest = digest.digests[i];
 +	}
 +
 +	/*
 +	 *  Must be kEnd.
 +	 */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		goto failed;
 +	if (*p != kEnd)
 +		goto failed;
 +	free_Digest(&digest);
 +	return (0);
 +failed:
 +	free_Digest(&digest);
 +	return (-1);
 +}
 +
 +static uint64_t
 +folder_uncompressed_size(struct _7z_folder *f)
 +{
 +	int n = (int)f->numOutStreams;
 +	unsigned pairs = (unsigned)f->numBindPairs;
 +
 +	while (--n >= 0) {
 +		unsigned i;
 +		for (i = 0; i < pairs; i++) {
 +			if (f->bindPairs[i].outIndex == (uint64_t)n)
 +				break;
 +		}
 +		if (i >= pairs)
 +			return (f->unPackSize[n]);
 +	}
 +	return (0);
 +}
 +
 +static void
 +free_SubStreamsInfo(struct _7z_substream_info *ss)
 +{
 +	free(ss->unpackSizes);
 +	free(ss->digestsDefined);
 +	free(ss->digests);
 +}
 +
 +static int
 +read_SubStreamsInfo(struct archive_read *a, struct _7z_substream_info *ss,
 +    struct _7z_folder *f, size_t numFolders)
 +{
 +	const unsigned char *p;
 +	uint64_t *usizes;
 +	size_t unpack_streams;
 +	int type;
 +	unsigned i;
 +	uint32_t numDigests;
 +
 +	memset(ss, 0, sizeof(*ss));
 +
 +	for (i = 0; i < numFolders; i++)
 +		f[i].numUnpackStreams = 1;
 +
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		return (-1);
 +	type = *p;
 +
 +	if (type == kNumUnPackStream) {
 +		unpack_streams = 0;
 +		for (i = 0; i < numFolders; i++) {
 +			if (parse_7zip_uint64(a, &(f[i].numUnpackStreams)) < 0)
 +				return (-1);
- 			if (1000000 < f[i].numUnpackStreams)
++			if (UMAX_ENTRY < f[i].numUnpackStreams)
 +				return (-1);
 +			unpack_streams += (size_t)f[i].numUnpackStreams;
 +		}
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +		type = *p;
 +	} else
 +		unpack_streams = numFolders;
 +
 +	ss->unpack_streams = unpack_streams;
 +	if (unpack_streams) {
 +		ss->unpackSizes = calloc(unpack_streams,
 +		    sizeof(*ss->unpackSizes));
 +		ss->digestsDefined = calloc(unpack_streams,
 +		    sizeof(*ss->digestsDefined));
 +		ss->digests = calloc(unpack_streams,
 +		    sizeof(*ss->digests));
 +		if (ss->unpackSizes == NULL || ss->digestsDefined == NULL ||
 +		    ss->digests == NULL)
 +			return (-1);
 +	}
 +
 +	usizes = ss->unpackSizes;
 +	for (i = 0; i < numFolders; i++) {
 +		unsigned pack;
 +		uint64_t sum;
 +
 +		if (f[i].numUnpackStreams == 0)
 +			continue;
 +
 +		sum = 0;
 +		if (type == kSize) {
 +			for (pack = 1; pack < f[i].numUnpackStreams; pack++) {
 +				if (parse_7zip_uint64(a, usizes) < 0)
 +					return (-1);
 +				sum += *usizes++;
 +			}
 +		}
 +		*usizes++ = folder_uncompressed_size(&f[i]) - sum;
 +	}
 +
 +	if (type == kSize) {
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +		type = *p;
 +	}
 +
 +	for (i = 0; i < unpack_streams; i++) {
 +		ss->digestsDefined[i] = 0;
 +		ss->digests[i] = 0;
 +	}
 +
 +	numDigests = 0;
 +	for (i = 0; i < numFolders; i++) {
 +		if (f[i].numUnpackStreams != 1 || !f[i].digest_defined)
 +			numDigests += (uint32_t)f[i].numUnpackStreams;
 +	}
 +
 +	if (type == kCRC) {
 +		struct _7z_digests tmpDigests;
 +		unsigned char *digestsDefined = ss->digestsDefined;
 +		uint32_t * digests = ss->digests;
 +		int di = 0;
 +
 +		memset(&tmpDigests, 0, sizeof(tmpDigests));
 +		if (read_Digests(a, &(tmpDigests), numDigests) < 0) {
 +			free_Digest(&tmpDigests);
 +			return (-1);
 +		}
 +		for (i = 0; i < numFolders; i++) {
 +			if (f[i].numUnpackStreams == 1 && f[i].digest_defined) {
 +				*digestsDefined++ = 1;
 +				*digests++ = f[i].digest;
 +			} else {
 +				unsigned j;
 +
 +				for (j = 0; j < f[i].numUnpackStreams;
 +				    j++, di++) {
 +					*digestsDefined++ =
 +					    tmpDigests.defineds[di];
 +					*digests++ =
 +					    tmpDigests.digests[di];
 +				}
 +			}
 +		}
 +		free_Digest(&tmpDigests);
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +		type = *p;
 +	}
 +
 +	/*
 +	 *  Must be kEnd.
 +	 */
 +	if (type != kEnd)
 +		return (-1);
 +	return (0);
 +}
 +
 +static void
 +free_StreamsInfo(struct _7z_stream_info *si)
 +{
 +	free_PackInfo(&(si->pi));
 +	free_CodersInfo(&(si->ci));
 +	free_SubStreamsInfo(&(si->ss));
 +}
 +
 +static int
 +read_StreamsInfo(struct archive_read *a, struct _7z_stream_info *si)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	const unsigned char *p;
 +	unsigned i;
 +
 +	memset(si, 0, sizeof(*si));
 +
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		return (-1);
 +	if (*p == kPackInfo) {
 +		uint64_t packPos;
 +
 +		if (read_PackInfo(a, &(si->pi)) < 0)
 +			return (-1);
 +
 +		if (si->pi.positions == NULL || si->pi.sizes == NULL)
 +			return (-1);
 +		/*
 +		 * Calculate packed stream positions.
 +		 */
 +		packPos = si->pi.pos;
 +		for (i = 0; i < si->pi.numPackStreams; i++) {
 +			si->pi.positions[i] = packPos;
 +			packPos += si->pi.sizes[i];
 +			if (packPos > zip->header_offset)
 +				return (-1);
 +		}
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +	}
 +	if (*p == kUnPackInfo) {
 +		uint32_t packIndex;
 +		struct _7z_folder *f;
 +
 +		if (read_CodersInfo(a, &(si->ci)) < 0)
 +			return (-1);
 +
 +		/*
 +		 * Calculate packed stream indexes.
 +		 */
 +		packIndex = 0;
 +		f = si->ci.folders;
 +		for (i = 0; i < si->ci.numFolders; i++) {
 +			f[i].packIndex = packIndex;
 +			packIndex += (uint32_t)f[i].numPackedStreams;
 +			if (packIndex > si->pi.numPackStreams)
 +				return (-1);
 +		}
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +	}
 +
 +	if (*p == kSubStreamsInfo) {
 +		if (read_SubStreamsInfo(a, &(si->ss),
 +		    si->ci.folders, (size_t)si->ci.numFolders) < 0)
 +			return (-1);
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +	}
 +
 +	/*
 +	 *  Must be kEnd.
 +	 */
 +	if (*p != kEnd)
 +		return (-1);
 +	return (0);
 +}
 +
 +static void
 +free_Header(struct _7z_header_info *h)
 +{
 +	free(h->emptyStreamBools);
 +	free(h->emptyFileBools);
 +	free(h->antiBools);
 +	free(h->attrBools);
 +}
 +
 +static int
 +read_Header(struct archive_read *a, struct _7z_header_info *h,
 +    int check_header_id)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	const unsigned char *p;
 +	struct _7z_folder *folders;
 +	struct _7z_stream_info *si = &(zip->si);
 +	struct _7zip_entry *entries;
 +	uint32_t folderIndex, indexInFolder;
 +	unsigned i;
 +	int eindex, empty_streams, sindex;
 +
 +	if (check_header_id) {
 +		/*
 +		 * Read Header.
 +		 */
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +		if (*p != kHeader)
 +			return (-1);
 +	}
 +
 +	/*
 +	 * Read ArchiveProperties.
 +	 */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		return (-1);
 +	if (*p == kArchiveProperties) {
 +		for (;;) {
 +			uint64_t size;
 +			if ((p = header_bytes(a, 1)) == NULL)
 +				return (-1);
 +			if (*p == 0)
 +				break;
 +			if (parse_7zip_uint64(a, &size) < 0)
 +				return (-1);
 +		}
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +	}
 +
 +	/*
 +	 * Read MainStreamsInfo.
 +	 */
 +	if (*p == kMainStreamsInfo) {
 +		if (read_StreamsInfo(a, &(zip->si)) < 0)
 +			return (-1);
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +	}
 +	if (*p == kEnd)
 +		return (0);
 +
 +	/*
 +	 * Read FilesInfo.
 +	 */
 +	if (*p != kFilesInfo)
 +		return (-1);
 +
 +	if (parse_7zip_uint64(a, &(zip->numFiles)) < 0)
 +		return (-1);
- 	if (1000000 < zip->numFiles)
- 			return (-1);
++	if (UMAX_ENTRY < zip->numFiles)
++		return (-1);
 +
 +	zip->entries = calloc((size_t)zip->numFiles, sizeof(*zip->entries));
 +	if (zip->entries == NULL)
 +		return (-1);
 +	entries = zip->entries;
 +
 +	empty_streams = 0;
 +	for (;;) {
 +		int type;
 +		uint64_t size;
 +		size_t ll;
 +
 +		if ((p = header_bytes(a, 1)) == NULL)
 +			return (-1);
 +		type = *p;
 +		if (type == kEnd)
 +			break;
 +
 +		if (parse_7zip_uint64(a, &size) < 0)
 +			return (-1);
 +		if (zip->header_bytes_remaining < size)
 +			return (-1);
 +		ll = (size_t)size;
 +
 +		switch (type) {
 +		case kEmptyStream:
 +			h->emptyStreamBools = calloc((size_t)zip->numFiles,
 +			    sizeof(*h->emptyStreamBools));
 +			if (h->emptyStreamBools == NULL)
 +				return (-1);
 +			if (read_Bools(
 +			    a, h->emptyStreamBools, (size_t)zip->numFiles) < 0)
 +				return (-1);
 +			empty_streams = 0;
 +			for (i = 0; i < zip->numFiles; i++) {
 +				if (h->emptyStreamBools[i])
 +					empty_streams++;
 +			}
 +			break;
 +		case kEmptyFile:
 +			if (empty_streams <= 0) {
 +				/* Unexcepted sequence. Skip this. */
 +				if (header_bytes(a, ll) == NULL)
 +					return (-1);
 +				break;
 +			}
 +			h->emptyFileBools = calloc(empty_streams,
 +			    sizeof(*h->emptyFileBools));
 +			if (h->emptyFileBools == NULL)
 +				return (-1);
 +			if (read_Bools(a, h->emptyFileBools, empty_streams) < 0)
 +				return (-1);
 +			break;
 +		case kAnti:
 +			if (empty_streams <= 0) {
 +				/* Unexcepted sequence. Skip this. */
 +				if (header_bytes(a, ll) == NULL)
 +					return (-1);
 +				break;
 +			}
 +			h->antiBools = calloc(empty_streams,
 +			    sizeof(*h->antiBools));
 +			if (h->antiBools == NULL)
 +				return (-1);
 +			if (read_Bools(a, h->antiBools, empty_streams) < 0)
 +				return (-1);
 +			break;
 +		case kCTime:
 +		case kATime:
 +		case kMTime:
 +			if (read_Times(a, h, type) < 0)
 +				return (-1);
 +			break;
 +		case kName:
 +		{
 +			unsigned char *np;
 +			size_t nl, nb;
 +
 +			/* Skip one byte. */
 +			if ((p = header_bytes(a, 1)) == NULL)
 +				return (-1);
 +			ll--;
 +
 +			if ((ll & 1) || ll < zip->numFiles * 4)
 +				return (-1);
 +
 +			zip->entry_names = malloc(ll);
 +			if (zip->entry_names == NULL)
 +				return (-1);
 +			np = zip->entry_names;
 +			nb = ll;
 +			/*
 +			 * Copy whole file names.
 +			 * NOTE: This loop prevents from expanding
 +			 * the uncompressed buffer in order not to
 +			 * use extra memory resource.
 +			 */
 +			while (nb) {
 +				size_t b;
 +				if (nb > UBUFF_SIZE)
 +					b = UBUFF_SIZE;
 +				else
 +					b = nb;
 +				if ((p = header_bytes(a, b)) == NULL)
 +					return (-1);
 +				memcpy(np, p, b);
 +				np += b;
 +				nb -= b;
 +			}
 +			np = zip->entry_names;
 +			nl = ll;
 +
 +			for (i = 0; i < zip->numFiles; i++) {
 +				entries[i].utf16name = np;
 +#if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG)
 +				entries[i].wname = (wchar_t *)np;
 +#endif
 +
 +				/* Find a terminator. */
 +				while (nl >= 2 && (np[0] || np[1])) {
 +					np += 2;
 +					nl -= 2;
 +				}
 +				if (nl < 2)
 +					return (-1);/* Terminator not found */
 +				entries[i].name_len = np - entries[i].utf16name;
 +				np += 2;
 +				nl -= 2;
 +			}
 +			break;
 +		}
 +		case kAttributes:
 +		{
 +			int allAreDefined;
 +
 +			if ((p = header_bytes(a, 2)) == NULL)
 +				return (-1);
 +			allAreDefined = *p;
 +			h->attrBools = calloc((size_t)zip->numFiles,
 +			    sizeof(*h->attrBools));
 +			if (h->attrBools == NULL)
 +				return (-1);
 +			if (allAreDefined)
 +				memset(h->attrBools, 1, (size_t)zip->numFiles);
 +			else {
 +				if (read_Bools(a, h->attrBools,
 +				      (size_t)zip->numFiles) < 0)
 +					return (-1);
 +			}
 +			for (i = 0; i < zip->numFiles; i++) {
 +				if (h->attrBools[i]) {
 +					if ((p = header_bytes(a, 4)) == NULL)
 +						return (-1);
 +					entries[i].attr = archive_le32dec(p);
 +				}
 +			}
 +			break;
 +		}
++		case kDummy:
++			if (ll == 0)
++				break;
 +		default:
 +			if (header_bytes(a, ll) == NULL)
 +				return (-1);
 +			break;
 +		}
 +	}
 +
 +	/*
 +	 * Set up entry's attributes.
 +	 */
 +	folders = si->ci.folders;
 +	eindex = sindex = 0;
 +	folderIndex = indexInFolder = 0;
 +	for (i = 0; i < zip->numFiles; i++) {
 +		if (h->emptyStreamBools == NULL || h->emptyStreamBools[i] == 0)
 +			entries[i].flg |= HAS_STREAM;
 +		/* The high 16 bits of attributes is a posix file mode. */
 +		entries[i].mode = entries[i].attr >> 16;
 +		if (entries[i].flg & HAS_STREAM) {
 +			if ((size_t)sindex >= si->ss.unpack_streams)
 +				return (-1);
 +			if (entries[i].mode == 0)
 +				entries[i].mode = AE_IFREG | 0666;
 +			if (si->ss.digestsDefined[sindex])
 +				entries[i].flg |= CRC32_IS_SET;
 +			entries[i].ssIndex = sindex;
 +			sindex++;
 +		} else {
 +			int dir;
 +			if (h->emptyFileBools == NULL)
 +				dir = 1;
 +			else {
 +				if (h->emptyFileBools[eindex])
 +					dir = 0;
 +				else
 +					dir = 1;
 +				eindex++;
 +			}
 +			if (entries[i].mode == 0) {
 +				if (dir)
 +					entries[i].mode = AE_IFDIR | 0777;
 +				else
 +					entries[i].mode = AE_IFREG | 0666;
 +			} else if (dir &&
 +			    (entries[i].mode & AE_IFMT) != AE_IFDIR) {
 +				entries[i].mode &= ~AE_IFMT;
 +				entries[i].mode |= AE_IFDIR;
 +			}
 +			if ((entries[i].mode & AE_IFMT) == AE_IFDIR &&
 +			    entries[i].name_len >= 2 &&
 +			    (entries[i].utf16name[entries[i].name_len-2] != '/' ||
 +			     entries[i].utf16name[entries[i].name_len-1] != 0)) {
 +				entries[i].utf16name[entries[i].name_len] = '/';
 +				entries[i].utf16name[entries[i].name_len+1] = 0;
 +				entries[i].name_len += 2;
 +			}
 +			entries[i].ssIndex = -1;
 +		}
 +		if (entries[i].attr & 0x01)
 +			entries[i].mode &= ~0222;/* Read only. */
 +
 +		if ((entries[i].flg & HAS_STREAM) == 0 && indexInFolder == 0) {
 +			/*
 +			 * The entry is an empty file or a directory file,
 +			 * those both have no contents.
 +			 */
 +			entries[i].folderIndex = -1;
 +			continue;
 +		}
 +		if (indexInFolder == 0) {
 +			for (;;) {
 +				if (folderIndex >= si->ci.numFolders)
 +					return (-1);
 +				if (folders[folderIndex].numUnpackStreams)
 +					break;
 +				folderIndex++;
 +			}
 +		}
 +		entries[i].folderIndex = folderIndex;
 +		if ((entries[i].flg & HAS_STREAM) == 0)
 +			continue;
 +		indexInFolder++;
 +		if (indexInFolder >= folders[folderIndex].numUnpackStreams) {
 +			folderIndex++;
 +			indexInFolder = 0;
 +		}
 +	}
 +
 +	return (0);
 +}
 +
 +#define EPOC_TIME ARCHIVE_LITERAL_ULL(116444736000000000)
 +static void
 +fileTimeToUtc(uint64_t fileTime, time_t *timep, long *ns)
 +{
 +
 +	if (fileTime >= EPOC_TIME) {
 +		fileTime -= EPOC_TIME;
 +		/* milli seconds base */
 +		*timep = (time_t)(fileTime / 10000000);
 +		/* nano seconds base */
 +		*ns = (long)(fileTime % 10000000) * 100;
 +	} else {
 +		*timep = 0;
 +		*ns = 0;
 +	}
 +}
 +
 +static int
 +read_Times(struct archive_read *a, struct _7z_header_info *h, int type)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	const unsigned char *p;
 +	struct _7zip_entry *entries = zip->entries;
 +	unsigned char *timeBools;
 +	int allAreDefined;
 +	unsigned i;
 +
 +	timeBools = calloc((size_t)zip->numFiles, sizeof(*timeBools));
 +	if (timeBools == NULL)
 +		return (-1);
 +
 +	/* Read allAreDefined. */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		goto failed;
 +	allAreDefined = *p;
 +	if (allAreDefined)
 +		memset(timeBools, 1, (size_t)zip->numFiles);
 +	else {
 +		if (read_Bools(a, timeBools, (size_t)zip->numFiles) < 0)
 +			goto failed;
 +	}
 +
 +	/* Read external. */
 +	if ((p = header_bytes(a, 1)) == NULL)
 +		goto failed;
 +	if (*p) {
 +		if (parse_7zip_uint64(a, &(h->dataIndex)) < 0)
 +			goto failed;
- 		if (1000000 < h->dataIndex)
++		if (UMAX_ENTRY < h->dataIndex)
 +			goto failed;
 +	}
 +
 +	for (i = 0; i < zip->numFiles; i++) {
 +		if (!timeBools[i])
 +			continue;
 +		if ((p = header_bytes(a, 8)) == NULL)
 +			goto failed;
 +		switch (type) {
 +		case kCTime:
 +			fileTimeToUtc(archive_le64dec(p),
 +			    &(entries[i].ctime),
 +			    &(entries[i].ctime_ns));
 +			entries[i].flg |= CTIME_IS_SET;
 +			break;
 +		case kATime:
 +			fileTimeToUtc(archive_le64dec(p),
 +			    &(entries[i].atime),
 +			    &(entries[i].atime_ns));
 +			entries[i].flg |= ATIME_IS_SET;
 +			break;
 +		case kMTime:
 +			fileTimeToUtc(archive_le64dec(p),
 +			    &(entries[i].mtime),
 +			    &(entries[i].mtime_ns));
 +			entries[i].flg |= MTIME_IS_SET;
 +			break;
 +		}
 +	}
 +
 +	free(timeBools);
 +	return (0);
 +failed:
 +	free(timeBools);
 +	return (-1);
 +}
 +
 +static int
 +decode_encoded_header_info(struct archive_read *a, struct _7z_stream_info *si)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +
 +	errno = 0;
 +	if (read_StreamsInfo(a, si) < 0) {
 +		if (errno == ENOMEM)
 +			archive_set_error(&a->archive, -1,
 +			    "Couldn't allocate memory");
 +		else
 +			archive_set_error(&a->archive, -1,
 +			    "Malformed 7-Zip archive");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	if (si->pi.numPackStreams == 0 || si->ci.numFolders == 0) {
 +		archive_set_error(&a->archive, -1, "Malformed 7-Zip archive");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	if (zip->header_offset < si->pi.pos + si->pi.sizes[0] ||
 +	    (int64_t)(si->pi.pos + si->pi.sizes[0]) < 0 ||
 +	    si->pi.sizes[0] == 0 || (int64_t)si->pi.pos < 0) {
 +		archive_set_error(&a->archive, -1, "Malformed Header offset");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static const unsigned char *
 +header_bytes(struct archive_read *a, size_t rbytes)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	const unsigned char *p;
 +
 +	if (zip->header_bytes_remaining < rbytes)
 +		return (NULL);
 +	if (zip->pack_stream_bytes_unconsumed)
 +		read_consume(a);
 +
 +	if (zip->header_is_encoded == 0) {
 +		p = __archive_read_ahead(a, rbytes, NULL);
 +		if (p == NULL)
 +			return (NULL);
 +		zip->header_bytes_remaining -= rbytes;
 +		zip->pack_stream_bytes_unconsumed = rbytes;
 +	} else {
 +		const void *buff;
 +		ssize_t bytes;
 +
 +		bytes = read_stream(a, &buff, rbytes, rbytes);
 +		if (bytes <= 0)
 +			return (NULL);
 +		zip->header_bytes_remaining -= bytes;
 +		p = buff;
 +	}
 +
 +	/* Update checksum */
 +	zip->header_crc32 = crc32(zip->header_crc32, p, (unsigned)rbytes);
 +	return (p);
 +}
 +
 +static int
 +slurp_central_directory(struct archive_read *a, struct _7zip *zip,
 +    struct _7z_header_info *header)
 +{
 +	const unsigned char *p;
 +	uint64_t next_header_offset;
 +	uint64_t next_header_size;
 +	uint32_t next_header_crc;
 +	ssize_t bytes_avail;
 +	int check_header_crc, r;
 +
 +	if ((p = __archive_read_ahead(a, 32, &bytes_avail)) == NULL)
 +		return (ARCHIVE_FATAL);
 +
 +	if ((p[0] == 'M' && p[1] == 'Z') || memcmp(p, "\x7F\x45LF", 4) == 0) {
 +		/* This is an executable ? Must be self-extracting... */
 +		r = skip_sfx(a, bytes_avail);
 +		if (r < ARCHIVE_WARN)
 +			return (r);
 +		if ((p = __archive_read_ahead(a, 32, &bytes_avail)) == NULL)
 +			return (ARCHIVE_FATAL);
 +	}
 +	zip->seek_base += 32;
 +
 +	if (memcmp(p, _7ZIP_SIGNATURE, 6) != 0) {
 +		archive_set_error(&a->archive, -1, "Not 7-Zip archive file");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/* CRC check. */
 +	if (crc32(0, (const unsigned char *)p + 12, 20)
 +	    != archive_le32dec(p + 8)) {
 +		archive_set_error(&a->archive, -1, "Header CRC error");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	next_header_offset = archive_le64dec(p + 12);
 +	next_header_size = archive_le64dec(p + 20);
 +	next_header_crc = archive_le32dec(p + 28);
 +
 +	if (next_header_size == 0)
 +		/* There is no entry in an archive file. */
 +		return (ARCHIVE_EOF);
 +
 +	if (((int64_t)next_header_offset) < 0) {
 +		archive_set_error(&a->archive, -1, "Malformed 7-Zip archive");
 +		return (ARCHIVE_FATAL);
 +	}
 +	__archive_read_consume(a, 32);
 +	if (next_header_offset != 0) {
 +		if (bytes_avail >= (ssize_t)next_header_offset)
 +			__archive_read_consume(a, next_header_offset);
 +		else if (__archive_read_seek(a,
 +		    next_header_offset + zip->seek_base, SEEK_SET) < 0)
 +			return (ARCHIVE_FATAL);
 +	}
 +	zip->stream_offset = next_header_offset;
 +	zip->header_offset = next_header_offset;
 +	zip->header_bytes_remaining = next_header_size;
 +	zip->header_crc32 = 0;
 +	zip->header_is_encoded = 0;
 +	zip->header_is_being_read = 1;
 +	zip->has_encrypted_entries = 0;
 +	check_header_crc = 1;
 +
 +	if ((p = header_bytes(a, 1)) == NULL) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated 7-Zip file body");
 +		return (ARCHIVE_FATAL);
 +	}
 +	/* Parse ArchiveProperties. */
 +	switch (p[0]) {
 +	case kEncodedHeader:
 +		/*
 +		 * The archive has an encoded header and we have to decode it
 +		 * in order to parse the header correctly.
 +		 */
 +		r = decode_encoded_header_info(a, &(zip->si));
 +
 +		/* Check the EncodedHeader CRC.*/
 +		if (r == 0 && zip->header_crc32 != next_header_crc) {
 +			archive_set_error(&a->archive, -1,
 +			    "Damaged 7-Zip archive");
 +			r = -1;
 +		}
 +		if (r == 0) {
 +			if (zip->si.ci.folders[0].digest_defined)
 +				next_header_crc = zip->si.ci.folders[0].digest;
 +			else
 +				check_header_crc = 0;
 +			if (zip->pack_stream_bytes_unconsumed)
 +				read_consume(a);
 +			r = setup_decode_folder(a, zip->si.ci.folders, 1);
 +			if (r == 0) {
 +				zip->header_bytes_remaining =
 +					zip->folder_outbytes_remaining;
 +				r = seek_pack(a);
 +			}
 +		}
 +		/* Clean up StreamsInfo. */
 +		free_StreamsInfo(&(zip->si));
 +		memset(&(zip->si), 0, sizeof(zip->si));
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +		zip->header_is_encoded = 1;
 +		zip->header_crc32 = 0;
 +		/* FALL THROUGH */
 +	case kHeader:
 +		/*
 +		 * Parse the header.
 +		 */
 +		errno = 0;
 +		r = read_Header(a, header, zip->header_is_encoded);
 +		if (r < 0) {
 +			if (errno == ENOMEM)
 +				archive_set_error(&a->archive, -1,
 +				    "Couldn't allocate memory");
 +			else
 +				archive_set_error(&a->archive, -1,
 +				    "Damaged 7-Zip archive");
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		/*
 +		 *  Must be kEnd.
 +		 */
 +		if ((p = header_bytes(a, 1)) == NULL ||*p != kEnd) {
 +			archive_set_error(&a->archive, -1,
 +			    "Malformed 7-Zip archive");
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		/* Check the Header CRC.*/
 +		if (check_header_crc && zip->header_crc32 != next_header_crc) {
 +			archive_set_error(&a->archive, -1,
 +			    "Malformed 7-Zip archive");
 +			return (ARCHIVE_FATAL);
 +		}
 +		break;
 +	default:
 +		archive_set_error(&a->archive, -1,
 +		    "Unexpected Property ID = %X", p[0]);
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Clean up variables be used for decoding the archive header */
 +	zip->pack_stream_remaining = 0;
 +	zip->pack_stream_index = 0;
 +	zip->folder_outbytes_remaining = 0;
 +	zip->uncompressed_buffer_bytes_remaining = 0;
 +	zip->pack_stream_bytes_unconsumed = 0;
 +	zip->header_is_being_read = 0;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static ssize_t
 +get_uncompressed_data(struct archive_read *a, const void **buff, size_t size,
 +    size_t minimum)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	ssize_t bytes_avail;
 +
 +	if (zip->codec == _7Z_COPY && zip->codec2 == (unsigned long)-1) {
 +		/* Copy mode. */
 +
 +		/*
 +		 * Note: '1' here is a performance optimization.
 +		 * Recall that the decompression layer returns a count of
 +		 * available bytes; asking for more than that forces the
 +		 * decompressor to combine reads by copying data.
 +		 */
 +		*buff = __archive_read_ahead(a, 1, &bytes_avail);
 +		if (bytes_avail <= 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated 7-Zip file data");
 +			return (ARCHIVE_FATAL);
 +		}
 +		if ((size_t)bytes_avail >
 +		    zip->uncompressed_buffer_bytes_remaining)
 +			bytes_avail = (ssize_t)
 +			    zip->uncompressed_buffer_bytes_remaining;
 +		if ((size_t)bytes_avail > size)
 +			bytes_avail = (ssize_t)size;
 +
 +		zip->pack_stream_bytes_unconsumed = bytes_avail;
 +	} else if (zip->uncompressed_buffer_pointer == NULL) {
 +		/* Decompression has failed. */
 +		archive_set_error(&(a->archive),
 +		    ARCHIVE_ERRNO_MISC, "Damaged 7-Zip archive");
 +		return (ARCHIVE_FATAL);
 +	} else {
 +		/* Packed mode. */
 +		if (minimum > zip->uncompressed_buffer_bytes_remaining) {
 +			/*
 +			 * If remaining uncompressed data size is less than
 +			 * the minimum size, fill the buffer up to the
 +			 * minimum size.
 +			 */
 +			if (extract_pack_stream(a, minimum) < 0)
 +				return (ARCHIVE_FATAL);
 +		}
 +		if (size > zip->uncompressed_buffer_bytes_remaining)
 +			bytes_avail = (ssize_t)
 +			    zip->uncompressed_buffer_bytes_remaining;
 +		else
 +			bytes_avail = (ssize_t)size;
 +		*buff = zip->uncompressed_buffer_pointer;
 +		zip->uncompressed_buffer_pointer += bytes_avail;
 +	}
 +	zip->uncompressed_buffer_bytes_remaining -= bytes_avail;
 +	return (bytes_avail);
 +}
 +
 +static ssize_t
 +extract_pack_stream(struct archive_read *a, size_t minimum)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	ssize_t bytes_avail;
 +	int r;
 +
 +	if (zip->codec == _7Z_COPY && zip->codec2 == (unsigned long)-1) {
 +		if (minimum == 0)
 +			minimum = 1;
 +		if (__archive_read_ahead(a, minimum, &bytes_avail) == NULL
 +		    || bytes_avail <= 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated 7-Zip file body");
 +			return (ARCHIVE_FATAL);
 +		}
 +		if (bytes_avail > (ssize_t)zip->pack_stream_inbytes_remaining)
 +			bytes_avail = (ssize_t)zip->pack_stream_inbytes_remaining;
 +		zip->pack_stream_inbytes_remaining -= bytes_avail;
 +		if (bytes_avail > (ssize_t)zip->folder_outbytes_remaining)
 +			bytes_avail = (ssize_t)zip->folder_outbytes_remaining;
 +		zip->folder_outbytes_remaining -= bytes_avail;
 +		zip->uncompressed_buffer_bytes_remaining = bytes_avail;
 +		return (ARCHIVE_OK);
 +	}
 +
 +	/* If the buffer hasn't been allocated, allocate it now. */
 +	if (zip->uncompressed_buffer == NULL) {
 +		zip->uncompressed_buffer_size = UBUFF_SIZE;
 +		if (zip->uncompressed_buffer_size < minimum) {
 +			zip->uncompressed_buffer_size = minimum + 1023;
 +			zip->uncompressed_buffer_size &= ~0x3ff;
 +		}
 +		zip->uncompressed_buffer =
 +		    malloc(zip->uncompressed_buffer_size);
 +		if (zip->uncompressed_buffer == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "No memory for 7-Zip decompression");
 +			return (ARCHIVE_FATAL);
 +		}
 +		zip->uncompressed_buffer_bytes_remaining = 0;
 +	} else if (zip->uncompressed_buffer_size < minimum ||
 +	    zip->uncompressed_buffer_bytes_remaining < minimum) {
 +		/*
 +		 * Make sure the uncompressed buffer can have bytes
 +		 * at least `minimum' bytes.
 +		 * NOTE: This case happen when reading the header.
 +		 */
 +		size_t used;
 +		if (zip->uncompressed_buffer_pointer != 0)
 +			used = zip->uncompressed_buffer_pointer -
 +				zip->uncompressed_buffer;
 +		else
 +			used = 0;
 +		if (zip->uncompressed_buffer_size < minimum) {
 +			/*
 +			 * Expand the uncompressed buffer up to
 +			 * the minimum size.
 +			 */
 +			void *p;
 +			size_t new_size;
 +
 +			new_size = minimum + 1023;
 +			new_size &= ~0x3ff;
 +			p = realloc(zip->uncompressed_buffer, new_size);
 +			if (p == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "No memory for 7-Zip decompression");
 +				return (ARCHIVE_FATAL);
 +			}
 +			zip->uncompressed_buffer = (unsigned char *)p;
 +			zip->uncompressed_buffer_size = new_size;
 +		}
 +		/*
 +		 * Move unconsumed bytes to the head.
 +		 */
 +		if (used) {
 +			memmove(zip->uncompressed_buffer,
 +				zip->uncompressed_buffer + used,
 +				zip->uncompressed_buffer_bytes_remaining);
 +		}
 +	} else
 +		zip->uncompressed_buffer_bytes_remaining = 0;
 +	zip->uncompressed_buffer_pointer = NULL;
 +	for (;;) {
 +		size_t bytes_in, bytes_out;
 +		const void *buff_in;
 +		unsigned char *buff_out;
 +		int end_of_data;
 +
 +		/*
 +		 * Note: '1' here is a performance optimization.
 +		 * Recall that the decompression layer returns a count of
 +		 * available bytes; asking for more than that forces the
 +		 * decompressor to combine reads by copying data.
 +		 */
 +		buff_in = __archive_read_ahead(a, 1, &bytes_avail);
 +		if (bytes_avail <= 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated 7-Zip file body");
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		buff_out = zip->uncompressed_buffer
 +			+ zip->uncompressed_buffer_bytes_remaining;
 +		bytes_out = zip->uncompressed_buffer_size
 +			- zip->uncompressed_buffer_bytes_remaining;
 +		bytes_in = bytes_avail;
 +		if (bytes_in > zip->pack_stream_inbytes_remaining)
 +			bytes_in = (size_t)zip->pack_stream_inbytes_remaining;
 +		/* Drive decompression. */
 +		r = decompress(a, zip, buff_out, &bytes_out,
 +			buff_in, &bytes_in);
 +		switch (r) {
 +		case ARCHIVE_OK:
 +			end_of_data = 0;
 +			break;
 +		case ARCHIVE_EOF:
 +			end_of_data = 1;
 +			break;
 +		default:
 +			return (ARCHIVE_FATAL);
 +		}
 +		zip->pack_stream_inbytes_remaining -= bytes_in;
 +		if (bytes_out > zip->folder_outbytes_remaining)
 +			bytes_out = (size_t)zip->folder_outbytes_remaining;
 +		zip->folder_outbytes_remaining -= bytes_out;
 +		zip->uncompressed_buffer_bytes_remaining += bytes_out;
 +		zip->pack_stream_bytes_unconsumed = bytes_in;
 +
 +		/*
 +		 * Continue decompression until uncompressed_buffer is full.
 +		 */
 +		if (zip->uncompressed_buffer_bytes_remaining ==
 +		    zip->uncompressed_buffer_size)
 +			break;
 +		if (zip->codec2 == _7Z_X86 && zip->odd_bcj_size &&
 +		    zip->uncompressed_buffer_bytes_remaining + 5 >
 +		    zip->uncompressed_buffer_size)
 +			break;
 +		if (zip->pack_stream_inbytes_remaining == 0 &&
 +		    zip->folder_outbytes_remaining == 0)
 +			break;
 +		if (end_of_data || (bytes_in == 0 && bytes_out == 0)) {
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC, "Damaged 7-Zip archive");
 +			return (ARCHIVE_FATAL);
 +		}
 +		read_consume(a);
 +	}
 +	if (zip->uncompressed_buffer_bytes_remaining < minimum) {
 +		archive_set_error(&(a->archive),
 +		    ARCHIVE_ERRNO_MISC, "Damaged 7-Zip archive");
 +		return (ARCHIVE_FATAL);
 +	}
 +	zip->uncompressed_buffer_pointer = zip->uncompressed_buffer;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +seek_pack(struct archive_read *a)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	int64_t pack_offset;
 +
 +	if (zip->pack_stream_remaining <= 0) {
 +		archive_set_error(&(a->archive),
 +		    ARCHIVE_ERRNO_MISC, "Damaged 7-Zip archive");
 +		return (ARCHIVE_FATAL);
 +	}
 +	zip->pack_stream_inbytes_remaining =
 +	    zip->si.pi.sizes[zip->pack_stream_index];
 +	pack_offset = zip->si.pi.positions[zip->pack_stream_index];
 +	if (zip->stream_offset != pack_offset) {
 +		if (0 > __archive_read_seek(a, pack_offset + zip->seek_base,
 +		    SEEK_SET))
 +			return (ARCHIVE_FATAL);
 +		zip->stream_offset = pack_offset;
 +	}
 +	zip->pack_stream_index++;
 +	zip->pack_stream_remaining--;
 +	return (ARCHIVE_OK);
 +}
 +
 +static ssize_t
 +read_stream(struct archive_read *a, const void **buff, size_t size,
 +    size_t minimum)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	uint64_t skip_bytes = 0;
 +	ssize_t r;
 +
 +	if (zip->uncompressed_buffer_bytes_remaining == 0) {
 +		if (zip->pack_stream_inbytes_remaining > 0) {
 +			r = extract_pack_stream(a, 0);
 +			if (r < 0)
 +				return (r);
 +			return (get_uncompressed_data(a, buff, size, minimum));
 +		} else if (zip->folder_outbytes_remaining > 0) {
 +			/* Extract a remaining pack stream. */
 +			r = extract_pack_stream(a, 0);
 +			if (r < 0)
 +				return (r);
 +			return (get_uncompressed_data(a, buff, size, minimum));
 +		}
 +	} else
 +		return (get_uncompressed_data(a, buff, size, minimum));
 +
 +	/*
 +	 * Current pack stream has been consumed.
 +	 */
 +	if (zip->pack_stream_remaining == 0) {
 +		if (zip->header_is_being_read) {
 +			/* Invalid sequence. This might happen when
 +			 * reading a malformed archive. */
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC, "Malformed 7-Zip archive");
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		/*
 +		 * All current folder's pack streams have been
 +		 * consumed. Switch to next folder.
 +		 */
 +		if (zip->folder_index == 0 &&
 +		    (zip->si.ci.folders[zip->entry->folderIndex].skipped_bytes
 +		     || zip->folder_index != zip->entry->folderIndex)) {
 +			zip->folder_index = zip->entry->folderIndex;
 +			skip_bytes =
 +			    zip->si.ci.folders[zip->folder_index].skipped_bytes;
 +		}
 +
 +		if (zip->folder_index >= zip->si.ci.numFolders) {
 +			/*
 +			 * We have consumed all folders and its pack streams.
 +			 */
 +			*buff = NULL;
 +			return (0);
 +		}
 +		r = setup_decode_folder(a,
 +			&(zip->si.ci.folders[zip->folder_index]), 0);
 +		if (r != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +
 +		zip->folder_index++;
 +	}
 +
 +	/*
 +	 * Switch to next pack stream.
 +	 */
 +	r = seek_pack(a);
 +	if (r < 0)
 +		return (r);
 +
 +	/* Extract a new pack stream. */
 +	r = extract_pack_stream(a, 0);
 +	if (r < 0)
 +		return (r);
 +
 +	/*
 +	 * Skip the bytes we alrady has skipped in skip_stream().
 +	 */
 +	while (skip_bytes) {
 +		ssize_t skipped;
 +
 +		if (zip->uncompressed_buffer_bytes_remaining == 0) {
 +			if (zip->pack_stream_inbytes_remaining > 0) {
 +				r = extract_pack_stream(a, 0);
 +				if (r < 0)
 +					return (r);
 +			} else if (zip->folder_outbytes_remaining > 0) {
 +				/* Extract a remaining pack stream. */
 +				r = extract_pack_stream(a, 0);
 +				if (r < 0)
 +					return (r);
 +			} else {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_FILE_FORMAT,
 +				    "Truncated 7-Zip file body");
 +				return (ARCHIVE_FATAL);
 +			}
 +		}
 +		skipped = get_uncompressed_data(
 +			a, buff, (size_t)skip_bytes, 0);
 +		if (skipped < 0)
 +			return (skipped);
 +		skip_bytes -= skipped;
 +		if (zip->pack_stream_bytes_unconsumed)
 +			read_consume(a);
 +	}
 +
 +	return (get_uncompressed_data(a, buff, size, minimum));
 +}
 +
 +static int
 +setup_decode_folder(struct archive_read *a, struct _7z_folder *folder,
 +    int header)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	const struct _7z_coder *coder1, *coder2;
 +	const char *cname = (header)?"archive header":"file content";
 +	unsigned i;
 +	int r, found_bcj2 = 0;
 +
 +	/*
 +	 * Release the memory which the previous folder used for BCJ2.
 +	 */
 +	for (i = 0; i < 3; i++) {
 +		if (zip->sub_stream_buff[i] != NULL)
 +			free(zip->sub_stream_buff[i]);
 +		zip->sub_stream_buff[i] = NULL;
 +	}
 +
 +	/*
 +	 * Initialize a stream reader.
 +	 */
 +	zip->pack_stream_remaining = (unsigned)folder->numPackedStreams;
 +	zip->pack_stream_index = (unsigned)folder->packIndex;
 +	zip->folder_outbytes_remaining = folder_uncompressed_size(folder);
 +	zip->uncompressed_buffer_bytes_remaining = 0;
 +
 +	/*
 +	 * Check coder types.
 +	 */
 +	for (i = 0; i < folder->numCoders; i++) {
 +		switch(folder->coders[i].codec) {
 +			case _7Z_CRYPTO_MAIN_ZIP:
 +			case _7Z_CRYPTO_RAR_29:
 +			case _7Z_CRYPTO_AES_256_SHA_256: {
 +				/* For entry that is associated with this folder, mark
 +				   it as encrypted (data+metadata). */
 +				zip->has_encrypted_entries = 1;
 +				if (a->entry) {
 +					archive_entry_set_is_data_encrypted(a->entry, 1);
 +					archive_entry_set_is_metadata_encrypted(a->entry, 1);
 +				}
 +				archive_set_error(&(a->archive),
 +					ARCHIVE_ERRNO_MISC,
 +					"The %s is encrypted, "
 +					"but currently not supported", cname);
 +				return (ARCHIVE_FATAL);
 +			}
 +			case _7Z_X86_BCJ2: {
 +				found_bcj2++;
 +				break;
 +			}
 +		}
 +	}
 +	/* Now that we've checked for encryption, if there were still no
 +	 * encrypted entries found we can say for sure that there are none.
 +	 */
 +	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
 +		zip->has_encrypted_entries = 0;
 +	}
 +
 +	if ((folder->numCoders > 2 && !found_bcj2) || found_bcj2 > 1) {
 +		archive_set_error(&(a->archive),
 +		    ARCHIVE_ERRNO_MISC,
 +		    "The %s is encoded with many filters, "
 +		    "but currently not supported", cname);
 +		return (ARCHIVE_FATAL);
 +	}
 +	coder1 = &(folder->coders[0]);
 +	if (folder->numCoders == 2)
 +		coder2 = &(folder->coders[1]);
 +	else
 +		coder2 = NULL;
 +
 +	if (found_bcj2) {
 +		/*
 +		 * Preparation to decode BCJ2.
 +		 * Decoding BCJ2 requires four sources. Those are at least,
 +		 * as far as I know, two types of the storage form.
 +		 */
 +		const struct _7z_coder *fc = folder->coders;
 +		static const struct _7z_coder coder_copy = {0, 1, 1, 0, NULL};
 +		const struct _7z_coder *scoder[3] =
 +			{&coder_copy, &coder_copy, &coder_copy};
 +		const void *buff;
 +		ssize_t bytes;
 +		unsigned char *b[3] = {NULL, NULL, NULL};
 +		uint64_t sunpack[3] ={-1, -1, -1};
 +		size_t s[3] = {0, 0, 0};
 +		int idx[3] = {0, 1, 2};
 +
 +		if (folder->numCoders == 4 && fc[3].codec == _7Z_X86_BCJ2 &&
 +		    folder->numInStreams == 7 && folder->numOutStreams == 4 &&
 +		    zip->pack_stream_remaining == 4) {
 +			/* Source type 1 made by 7zr or 7z with -m options. */
 +			if (folder->bindPairs[0].inIndex == 5) {
 +				/* The form made by 7zr */
 +				idx[0] = 1; idx[1] = 2; idx[2] = 0;
 +				scoder[1] = &(fc[1]);
 +				scoder[2] = &(fc[0]);
 +				sunpack[1] = folder->unPackSize[1];
 +				sunpack[2] = folder->unPackSize[0];
 +				coder1 = &(fc[2]);
 +			} else {
 +				/*
 +				 * NOTE: Some patterns do not work.
 +				 * work:
 +				 *  7z a -m0=BCJ2 -m1=COPY -m2=COPY
 +				 *       -m3=(any)
 +				 *  7z a -m0=BCJ2 -m1=COPY -m2=(any)
 +				 *       -m3=COPY
 +				 *  7z a -m0=BCJ2 -m1=(any) -m2=COPY
 +				 *       -m3=COPY
 +				 * not work:
 +				 *  other patterns.
 +				 *
 +				 * We have to handle this like `pipe' or
 +				 * our libarchive7s filter frame work,
 +				 * decoding the BCJ2 main stream sequentially,
 +				 * m3 -> m2 -> m1 -> BCJ2.
 +				 *
 +				 */
 +				if (fc[0].codec == _7Z_COPY &&
 +				    fc[1].codec == _7Z_COPY)
 +					coder1 = &(folder->coders[2]);
 +				else if (fc[0].codec == _7Z_COPY &&
 +				    fc[2].codec == _7Z_COPY)
 +					coder1 = &(folder->coders[1]);
 +				else if (fc[1].codec == _7Z_COPY &&
 +				    fc[2].codec == _7Z_COPY)
 +					coder1 = &(folder->coders[0]);
 +				else {
 +					archive_set_error(&(a->archive),
 +					    ARCHIVE_ERRNO_MISC,
 +					    "Unsupported form of "
 +					    "BCJ2 streams");
 +					return (ARCHIVE_FATAL);
 +				}
 +			}
 +			coder2 = &(fc[3]);
 +			zip->main_stream_bytes_remaining =
 +				(size_t)folder->unPackSize[2];
 +		} else if (coder2 != NULL && coder2->codec == _7Z_X86_BCJ2 &&
 +		    zip->pack_stream_remaining == 4 &&
 +		    folder->numInStreams == 5 && folder->numOutStreams == 2) {
 +			/* Source type 0 made by 7z */
 +			zip->main_stream_bytes_remaining =
 +				(size_t)folder->unPackSize[0];
 +		} else {
 +			/* We got an unexpected form. */
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Unsupported form of BCJ2 streams");
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		/* Skip the main stream at this time. */
 +		if ((r = seek_pack(a)) < 0)
 +			return (r);
 +		zip->pack_stream_bytes_unconsumed =
 +		    (size_t)zip->pack_stream_inbytes_remaining;
 +		read_consume(a);
 +
 +		/* Read following three sub streams. */
 +		for (i = 0; i < 3; i++) {
 +			const struct _7z_coder *coder = scoder[i];
 +
 +			if ((r = seek_pack(a)) < 0) {
 +				free(b[0]); free(b[1]); free(b[2]);
 +				return (r);
 +			}
 +
 +			if (sunpack[i] == (uint64_t)-1)
 +				zip->folder_outbytes_remaining =
 +				    zip->pack_stream_inbytes_remaining;
 +			else
 +				zip->folder_outbytes_remaining = sunpack[i];
 +
 +			r = init_decompression(a, zip, coder, NULL);
 +			if (r != ARCHIVE_OK) {
 +				free(b[0]); free(b[1]); free(b[2]);
 +				return (ARCHIVE_FATAL);
 +			}
 +
 +			/* Allocate memory for the decorded data of a sub
 +			 * stream. */
 +			b[i] = malloc((size_t)zip->folder_outbytes_remaining);
 +			if (b[i] == NULL) {
 +				free(b[0]); free(b[1]); free(b[2]);
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "No memory for 7-Zip decompression");
 +				return (ARCHIVE_FATAL);
 +			}
 +
 +			/* Extract a sub stream. */
 +			while (zip->pack_stream_inbytes_remaining > 0) {
 +				r = (int)extract_pack_stream(a, 0);
 +				if (r < 0) {
 +					free(b[0]); free(b[1]); free(b[2]);
 +					return (r);
 +				}
 +				bytes = get_uncompressed_data(a, &buff,
 +				    zip->uncompressed_buffer_bytes_remaining,
 +				    0);
 +				if (bytes < 0) {
 +					free(b[0]); free(b[1]); free(b[2]);
 +					return ((int)bytes);
 +				}
 +				memcpy(b[i]+s[i], buff, bytes);
 +				s[i] += bytes;
 +				if (zip->pack_stream_bytes_unconsumed)
 +					read_consume(a);
 +			}
 +		}
 +
 +		/* Set the sub streams to the right place. */
 +		for (i = 0; i < 3; i++) {
 +			zip->sub_stream_buff[i] = b[idx[i]];
 +			zip->sub_stream_size[i] = s[idx[i]];
 +			zip->sub_stream_bytes_remaining[i] = s[idx[i]];
 +		}
 +
 +		/* Allocate memory used for decoded main stream bytes. */
 +		if (zip->tmp_stream_buff == NULL) {
 +			zip->tmp_stream_buff_size = 32 * 1024;
 +			zip->tmp_stream_buff =
 +			    malloc(zip->tmp_stream_buff_size);
 +			if (zip->tmp_stream_buff == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "No memory for 7-Zip decompression");
 +				return (ARCHIVE_FATAL);
 +			}
 +		}
 +		zip->tmp_stream_bytes_avail = 0;
 +		zip->tmp_stream_bytes_remaining = 0;
 +		zip->odd_bcj_size = 0;
 +		zip->bcj2_outPos = 0;
 +
 +		/*
 +		 * Reset a stream reader in order to read the main stream
 +		 * of BCJ2.
 +		 */
 +		zip->pack_stream_remaining = 1;
 +		zip->pack_stream_index = (unsigned)folder->packIndex;
 +		zip->folder_outbytes_remaining =
 +		    folder_uncompressed_size(folder);
 +		zip->uncompressed_buffer_bytes_remaining = 0;
 +	}
 +
 +	/*
 +	 * Initialize the decompressor for the new folder's pack streams.
 +	 */
 +	r = init_decompression(a, zip, coder1, coder2);
 +	if (r != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +	return (ARCHIVE_OK);
 +}
 +
 +static int64_t
 +skip_stream(struct archive_read *a, size_t skip_bytes)
 +{
 +	struct _7zip *zip = (struct _7zip *)a->format->data;
 +	const void *p;
 +	int64_t skipped_bytes;
 +	size_t bytes = skip_bytes;
 +
 +	if (zip->folder_index == 0) {
 +		/*
 +		 * Optimization for a list mode.
 +		 * Avoid unncecessary decoding operations.
 +		 */
 +		zip->si.ci.folders[zip->entry->folderIndex].skipped_bytes
 +		    += skip_bytes;
 +		return (skip_bytes);
 +	}
 +
 +	while (bytes) {
 +		skipped_bytes = read_stream(a, &p, bytes, 0);
 +		if (skipped_bytes < 0)
 +			return (skipped_bytes);
 +		if (skipped_bytes == 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated 7-Zip file body");
 +			return (ARCHIVE_FATAL);
 +		}
 +		bytes -= (size_t)skipped_bytes;
 +		if (zip->pack_stream_bytes_unconsumed)
 +			read_consume(a);
 +	}
 +	return (skip_bytes);
 +}
 +
 +/*
 + * Brought from LZMA SDK.
 + *
 + * Bra86.c -- Converter for x86 code (BCJ)
 + * 2008-10-04 : Igor Pavlov : Public domain
 + *
 + */
 +
 +#define Test86MSByte(b) ((b) == 0 || (b) == 0xFF)
 +
 +static void
 +x86_Init(struct _7zip *zip)
 +{
 +	zip->bcj_state = 0;
 +	zip->bcj_prevPosT = (size_t)0 - 1;
 +	zip->bcj_prevMask = 0;
 +	zip->bcj_ip = 5;
 +}
 +
 +static size_t
 +x86_Convert(struct _7zip *zip, uint8_t *data, size_t size)
 +{
 +	static const uint8_t kMaskToAllowedStatus[8] = {1, 1, 1, 0, 1, 0, 0, 0};
 +	static const uint8_t kMaskToBitNumber[8] = {0, 1, 2, 2, 3, 3, 3, 3};
 +	size_t bufferPos, prevPosT;
 +	uint32_t ip, prevMask;
 +
 +	if (size < 5)
 +		return 0;
 +
 +	bufferPos = 0;
 +	prevPosT = zip->bcj_prevPosT;
 +	prevMask = zip->bcj_prevMask;
 +	ip = zip->bcj_ip;
 +
 +	for (;;) {
 +		uint8_t *p = data + bufferPos;
 +		uint8_t *limit = data + size - 4;
 +
 +		for (; p < limit; p++)
 +			if ((*p & 0xFE) == 0xE8)
 +				break;
 +		bufferPos = (size_t)(p - data);
 +		if (p >= limit)
 +			break;
 +		prevPosT = bufferPos - prevPosT;
 +		if (prevPosT > 3)
 +			prevMask = 0;
 +		else {
 +			prevMask = (prevMask << ((int)prevPosT - 1)) & 0x7;
 +			if (prevMask != 0) {
 +				unsigned char b =
 +					p[4 - kMaskToBitNumber[prevMask]];
 +				if (!kMaskToAllowedStatus[prevMask] ||
 +				    Test86MSByte(b)) {
 +					prevPosT = bufferPos;
 +					prevMask = ((prevMask << 1) & 0x7) | 1;
 +					bufferPos++;
 +					continue;
 +				}
 +			}
 +		}
 +		prevPosT = bufferPos;
 +
 +		if (Test86MSByte(p[4])) {
 +			uint32_t src = ((uint32_t)p[4] << 24) |
 +				((uint32_t)p[3] << 16) | ((uint32_t)p[2] << 8) |
 +				((uint32_t)p[1]);
 +			uint32_t dest;
 +			for (;;) {
 +				uint8_t b;
 +				int b_index;
 +
 +				dest = src - (ip + (uint32_t)bufferPos);
 +				if (prevMask == 0)
 +					break;
 +				b_index = kMaskToBitNumber[prevMask] * 8;
 +				b = (uint8_t)(dest >> (24 - b_index));
 +				if (!Test86MSByte(b))
 +					break;
 +				src = dest ^ ((1 << (32 - b_index)) - 1);
 +			}
 +			p[4] = (uint8_t)(~(((dest >> 24) & 1) - 1));
 +			p[3] = (uint8_t)(dest >> 16);
 +			p[2] = (uint8_t)(dest >> 8);
 +			p[1] = (uint8_t)dest;
 +			bufferPos += 5;
 +		} else {
 +			prevMask = ((prevMask << 1) & 0x7) | 1;
 +			bufferPos++;
 +		}
 +	}
 +	zip->bcj_prevPosT = prevPosT;
 +	zip->bcj_prevMask = prevMask;
 +	zip->bcj_ip += (uint32_t)bufferPos;
 +	return (bufferPos);
 +}
 +
 +/*
 + * Brought from LZMA SDK.
 + *
 + * Bcj2.c -- Converter for x86 code (BCJ2)
 + * 2008-10-04 : Igor Pavlov : Public domain
 + *
 + */
 +
 +#define SZ_ERROR_DATA	 ARCHIVE_FAILED
 +
 +#define IsJcc(b0, b1) ((b0) == 0x0F && ((b1) & 0xF0) == 0x80)
 +#define IsJ(b0, b1) ((b1 & 0xFE) == 0xE8 || IsJcc(b0, b1))
 +
 +#define kNumTopBits 24
 +#define kTopValue ((uint32_t)1 << kNumTopBits)
 +
 +#define kNumBitModelTotalBits 11
 +#define kBitModelTotal (1 << kNumBitModelTotalBits)
 +#define kNumMoveBits 5
 +
 +#define RC_READ_BYTE (*buffer++)
 +#define RC_TEST { if (buffer == bufferLim) return SZ_ERROR_DATA; }
 +#define RC_INIT2 zip->bcj2_code = 0; zip->bcj2_range = 0xFFFFFFFF; \
 +  { int ii; for (ii = 0; ii < 5; ii++) { RC_TEST; zip->bcj2_code = (zip->bcj2_code << 8) | RC_READ_BYTE; }}
 +
 +#define NORMALIZE if (zip->bcj2_range < kTopValue) { RC_TEST; zip->bcj2_range <<= 8; zip->bcj2_code = (zip->bcj2_code << 8) | RC_READ_BYTE; }
 +
 +#define IF_BIT_0(p) ttt = *(p); bound = (zip->bcj2_range >> kNumBitModelTotalBits) * ttt; if (zip->bcj2_code < bound)
 +#define UPDATE_0(p) zip->bcj2_range = bound; *(p) = (CProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); NORMALIZE;
 +#define UPDATE_1(p) zip->bcj2_range -= bound; zip->bcj2_code -= bound; *(p) = (CProb)(ttt - (ttt >> kNumMoveBits)); NORMALIZE;
 +
 +static ssize_t
 +Bcj2_Decode(struct _7zip *zip, uint8_t *outBuf, size_t outSize)
 +{
 +	size_t inPos = 0, outPos = 0;
 +	const uint8_t *buf0, *buf1, *buf2, *buf3;
 +	size_t size0, size1, size2, size3;
 +	const uint8_t *buffer, *bufferLim;
 +	unsigned int i, j;
 +
 +	size0 = zip->tmp_stream_bytes_remaining;
 +	buf0 = zip->tmp_stream_buff + zip->tmp_stream_bytes_avail - size0;
 +	size1 = zip->sub_stream_bytes_remaining[0];
 +	buf1 = zip->sub_stream_buff[0] + zip->sub_stream_size[0] - size1;
 +	size2 = zip->sub_stream_bytes_remaining[1];
 +	buf2 = zip->sub_stream_buff[1] + zip->sub_stream_size[1] - size2;
 +	size3 = zip->sub_stream_bytes_remaining[2];
 +	buf3 = zip->sub_stream_buff[2] + zip->sub_stream_size[2] - size3;
 +
 +	buffer = buf3;
 +	bufferLim = buffer + size3;
 +
 +	if (zip->bcj_state == 0) {
 +		/*
 +		 * Initialize.
 +		 */
 +		zip->bcj2_prevByte = 0;
 +		for (i = 0;
 +		    i < sizeof(zip->bcj2_p) / sizeof(zip->bcj2_p[0]); i++)
 +			zip->bcj2_p[i] = kBitModelTotal >> 1;
 +		RC_INIT2;
 +		zip->bcj_state = 1;
 +	}
 +
 +	/*
 +	 * Gather the odd bytes of a previous call.
 +	 */
 +	for (i = 0; zip->odd_bcj_size > 0 && outPos < outSize; i++) {
 +		outBuf[outPos++] = zip->odd_bcj[i];
 +		zip->odd_bcj_size--;
 +	}
 +
 +	if (outSize == 0) {
 +		zip->bcj2_outPos += outPos;
 +		return (outPos);
 +	}
 +
 +	for (;;) {
 +		uint8_t b;
 +		CProb *prob;
 +		uint32_t bound;
 +		uint32_t ttt;
 +
 +		size_t limit = size0 - inPos;
 +		if (outSize - outPos < limit)
 +			limit = outSize - outPos;
 +
 +		if (zip->bcj_state == 1) {
 +			while (limit != 0) {
 +				uint8_t bb = buf0[inPos];
 +				outBuf[outPos++] = bb;
 +				if (IsJ(zip->bcj2_prevByte, bb)) {
 +					zip->bcj_state = 2;
 +					break;
 +				}
 +				inPos++;
 +				zip->bcj2_prevByte = bb;
 +				limit--;
 +			}
 +		}
 +
 +		if (limit == 0 || outPos == outSize)
 +			break;
 +		zip->bcj_state = 1;
 +
 +		b = buf0[inPos++];
 +
 +		if (b == 0xE8)
 +			prob = zip->bcj2_p + zip->bcj2_prevByte;
 +		else if (b == 0xE9)
 +			prob = zip->bcj2_p + 256;
 +		else
 +			prob = zip->bcj2_p + 257;
 +
 +		IF_BIT_0(prob) {
 +			UPDATE_0(prob)
 +			zip->bcj2_prevByte = b;
 +		} else {
 +			uint32_t dest;
 +			const uint8_t *v;
 +			uint8_t out[4];
 +
 +			UPDATE_1(prob)
 +			if (b == 0xE8) {
 +				v = buf1;
 +				if (size1 < 4)
 +					return SZ_ERROR_DATA;
 +				buf1 += 4;
 +				size1 -= 4;
 +			} else {
 +				v = buf2;
 +				if (size2 < 4)
 +					return SZ_ERROR_DATA;
 +				buf2 += 4;
 +				size2 -= 4;
 +			}
 +			dest = (((uint32_t)v[0] << 24) |
 +			    ((uint32_t)v[1] << 16) |
 +			    ((uint32_t)v[2] << 8) |
 +			    ((uint32_t)v[3])) -
 +			    ((uint32_t)zip->bcj2_outPos + (uint32_t)outPos + 4);
 +			out[0] = (uint8_t)dest;
 +			out[1] = (uint8_t)(dest >> 8);
 +			out[2] = (uint8_t)(dest >> 16);
 +			out[3] = zip->bcj2_prevByte = (uint8_t)(dest >> 24);
 +
 +			for (i = 0; i < 4 && outPos < outSize; i++)
 +				outBuf[outPos++] = out[i];
 +			if (i < 4) {
 +				/*
 +				 * Save odd bytes which we could not add into
 +				 * the output buffer because of out of space.
 +				 */
 +				zip->odd_bcj_size = 4 -i;
 +				for (; i < 4; i++) {
 +					j = i - 4 + (unsigned)zip->odd_bcj_size;
 +					zip->odd_bcj[j] = out[i];
 +				}
 +				break;
 +			}
 +		}
 +	}
 +	zip->tmp_stream_bytes_remaining -= inPos;
 +	zip->sub_stream_bytes_remaining[0] = size1;
 +	zip->sub_stream_bytes_remaining[1] = size2;
 +	zip->sub_stream_bytes_remaining[2] = bufferLim - buffer;
 +	zip->bcj2_outPos += outPos;
 +
 +	return ((ssize_t)outPos);
 +}
 +
diff --cc Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
index 2219e61,0000000..3628025
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
@@@ -1,3235 -1,0 +1,3263 @@@
 +/*-
 + * Copyright (c) 2003-2007 Tim Kientzle
 + * Copyright (c) 2009 Andreas Henriksson <andreas at fatal.se>
 + * Copyright (c) 2009-2012 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_iso9660.c 201246 2009-12-30 05:30:35Z kientzle $");
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +/* #include <stdint.h> */ /* See archive_platform.h */
 +#include <stdio.h>
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_STRING_H
 +#include <string.h>
 +#endif
 +#include <time.h>
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h>
 +#endif
 +
 +#include "archive.h"
 +#include "archive_endian.h"
 +#include "archive_entry.h"
 +#include "archive_entry_locale.h"
 +#include "archive_private.h"
 +#include "archive_read_private.h"
 +#include "archive_string.h"
 +
 +/*
 + * An overview of ISO 9660 format:
 + *
 + * Each disk is laid out as follows:
 + *   * 32k reserved for private use
 + *   * Volume descriptor table.  Each volume descriptor
 + *     is 2k and specifies basic format information.
 + *     The "Primary Volume Descriptor" (PVD) is defined by the
 + *     standard and should always be present; other volume
 + *     descriptors include various vendor-specific extensions.
 + *   * Files and directories.  Each file/dir is specified by
 + *     an "extent" (starting sector and length in bytes).
 + *     Dirs are just files with directory records packed one
 + *     after another.  The PVD contains a single dir entry
 + *     specifying the location of the root directory.  Everything
 + *     else follows from there.
 + *
 + * This module works by first reading the volume descriptors, then
 + * building a list of directory entries, sorted by starting
 + * sector.  At each step, I look for the earliest dir entry that
 + * hasn't yet been read, seek forward to that location and read
 + * that entry.  If it's a dir, I slurp in the new dir entries and
 + * add them to the heap; if it's a regular file, I return the
 + * corresponding archive_entry and wait for the client to request
 + * the file body.  This strategy allows us to read most compliant
 + * CDs with a single pass through the data, as required by libarchive.
 + */
 +#define	LOGICAL_BLOCK_SIZE	2048
 +#define	SYSTEM_AREA_BLOCK	16
 +
 +/* Structure of on-disk primary volume descriptor. */
 +#define PVD_type_offset 0
 +#define PVD_type_size 1
 +#define PVD_id_offset (PVD_type_offset + PVD_type_size)
 +#define PVD_id_size 5
 +#define PVD_version_offset (PVD_id_offset + PVD_id_size)
 +#define PVD_version_size 1
 +#define PVD_reserved1_offset (PVD_version_offset + PVD_version_size)
 +#define PVD_reserved1_size 1
 +#define PVD_system_id_offset (PVD_reserved1_offset + PVD_reserved1_size)
 +#define PVD_system_id_size 32
 +#define PVD_volume_id_offset (PVD_system_id_offset + PVD_system_id_size)
 +#define PVD_volume_id_size 32
 +#define PVD_reserved2_offset (PVD_volume_id_offset + PVD_volume_id_size)
 +#define PVD_reserved2_size 8
 +#define PVD_volume_space_size_offset (PVD_reserved2_offset + PVD_reserved2_size)
 +#define PVD_volume_space_size_size 8
 +#define PVD_reserved3_offset (PVD_volume_space_size_offset + PVD_volume_space_size_size)
 +#define PVD_reserved3_size 32
 +#define PVD_volume_set_size_offset (PVD_reserved3_offset + PVD_reserved3_size)
 +#define PVD_volume_set_size_size 4
 +#define PVD_volume_sequence_number_offset (PVD_volume_set_size_offset + PVD_volume_set_size_size)
 +#define PVD_volume_sequence_number_size 4
 +#define PVD_logical_block_size_offset (PVD_volume_sequence_number_offset + PVD_volume_sequence_number_size)
 +#define PVD_logical_block_size_size 4
 +#define PVD_path_table_size_offset (PVD_logical_block_size_offset + PVD_logical_block_size_size)
 +#define PVD_path_table_size_size 8
 +#define PVD_type_1_path_table_offset (PVD_path_table_size_offset + PVD_path_table_size_size)
 +#define PVD_type_1_path_table_size 4
 +#define PVD_opt_type_1_path_table_offset (PVD_type_1_path_table_offset + PVD_type_1_path_table_size)
 +#define PVD_opt_type_1_path_table_size 4
 +#define PVD_type_m_path_table_offset (PVD_opt_type_1_path_table_offset + PVD_opt_type_1_path_table_size)
 +#define PVD_type_m_path_table_size 4
 +#define PVD_opt_type_m_path_table_offset (PVD_type_m_path_table_offset + PVD_type_m_path_table_size)
 +#define PVD_opt_type_m_path_table_size 4
 +#define PVD_root_directory_record_offset (PVD_opt_type_m_path_table_offset + PVD_opt_type_m_path_table_size)
 +#define PVD_root_directory_record_size 34
 +#define PVD_volume_set_id_offset (PVD_root_directory_record_offset + PVD_root_directory_record_size)
 +#define PVD_volume_set_id_size 128
 +#define PVD_publisher_id_offset (PVD_volume_set_id_offset + PVD_volume_set_id_size)
 +#define PVD_publisher_id_size 128
 +#define PVD_preparer_id_offset (PVD_publisher_id_offset + PVD_publisher_id_size)
 +#define PVD_preparer_id_size 128
 +#define PVD_application_id_offset (PVD_preparer_id_offset + PVD_preparer_id_size)
 +#define PVD_application_id_size 128
 +#define PVD_copyright_file_id_offset (PVD_application_id_offset + PVD_application_id_size)
 +#define PVD_copyright_file_id_size 37
 +#define PVD_abstract_file_id_offset (PVD_copyright_file_id_offset + PVD_copyright_file_id_size)
 +#define PVD_abstract_file_id_size 37
 +#define PVD_bibliographic_file_id_offset (PVD_abstract_file_id_offset + PVD_abstract_file_id_size)
 +#define PVD_bibliographic_file_id_size 37
 +#define PVD_creation_date_offset (PVD_bibliographic_file_id_offset + PVD_bibliographic_file_id_size)
 +#define PVD_creation_date_size 17
 +#define PVD_modification_date_offset (PVD_creation_date_offset + PVD_creation_date_size)
 +#define PVD_modification_date_size 17
 +#define PVD_expiration_date_offset (PVD_modification_date_offset + PVD_modification_date_size)
 +#define PVD_expiration_date_size 17
 +#define PVD_effective_date_offset (PVD_expiration_date_offset + PVD_expiration_date_size)
 +#define PVD_effective_date_size 17
 +#define PVD_file_structure_version_offset (PVD_effective_date_offset + PVD_effective_date_size)
 +#define PVD_file_structure_version_size 1
 +#define PVD_reserved4_offset (PVD_file_structure_version_offset + PVD_file_structure_version_size)
 +#define PVD_reserved4_size 1
 +#define PVD_application_data_offset (PVD_reserved4_offset + PVD_reserved4_size)
 +#define PVD_application_data_size 512
 +#define PVD_reserved5_offset (PVD_application_data_offset + PVD_application_data_size)
 +#define PVD_reserved5_size (2048 - PVD_reserved5_offset)
 +
 +/* TODO: It would make future maintenance easier to just hardcode the
 + * above values.  In particular, ECMA119 states the offsets as part of
 + * the standard.  That would eliminate the need for the following check.*/
 +#if PVD_reserved5_offset != 1395
 +#error PVD offset and size definitions are wrong.
 +#endif
 +
 +
 +/* Structure of optional on-disk supplementary volume descriptor. */
 +#define SVD_type_offset 0
 +#define SVD_type_size 1
 +#define SVD_id_offset (SVD_type_offset + SVD_type_size)
 +#define SVD_id_size 5
 +#define SVD_version_offset (SVD_id_offset + SVD_id_size)
 +#define SVD_version_size 1
 +/* ... */
 +#define SVD_reserved1_offset	72
 +#define SVD_reserved1_size	8
 +#define SVD_volume_space_size_offset 80
 +#define SVD_volume_space_size_size 8
 +#define SVD_escape_sequences_offset (SVD_volume_space_size_offset + SVD_volume_space_size_size)
 +#define SVD_escape_sequences_size 32
 +/* ... */
 +#define SVD_logical_block_size_offset 128
 +#define SVD_logical_block_size_size 4
 +#define SVD_type_L_path_table_offset 140
 +#define SVD_type_M_path_table_offset 148
 +/* ... */
 +#define SVD_root_directory_record_offset 156
 +#define SVD_root_directory_record_size 34
 +#define SVD_file_structure_version_offset 881
 +#define SVD_reserved2_offset	882
 +#define SVD_reserved2_size	1
 +#define SVD_reserved3_offset	1395
 +#define SVD_reserved3_size	653
 +/* ... */
 +/* FIXME: validate correctness of last SVD entry offset. */
 +
 +/* Structure of an on-disk directory record. */
 +/* Note:  ISO9660 stores each multi-byte integer twice, once in
 + * each byte order.  The sizes here are the size of just one
 + * of the two integers.  (This is why the offset of a field isn't
 + * the same as the offset+size of the previous field.) */
 +#define DR_length_offset 0
 +#define DR_length_size 1
 +#define DR_ext_attr_length_offset 1
 +#define DR_ext_attr_length_size 1
 +#define DR_extent_offset 2
 +#define DR_extent_size 4
 +#define DR_size_offset 10
 +#define DR_size_size 4
 +#define DR_date_offset 18
 +#define DR_date_size 7
 +#define DR_flags_offset 25
 +#define DR_flags_size 1
 +#define DR_file_unit_size_offset 26
 +#define DR_file_unit_size_size 1
 +#define DR_interleave_offset 27
 +#define DR_interleave_size 1
 +#define DR_volume_sequence_number_offset 28
 +#define DR_volume_sequence_number_size 2
 +#define DR_name_len_offset 32
 +#define DR_name_len_size 1
 +#define DR_name_offset 33
 +
 +#ifdef HAVE_ZLIB_H
 +static const unsigned char zisofs_magic[8] = {
 +	0x37, 0xE4, 0x53, 0x96, 0xC9, 0xDB, 0xD6, 0x07
 +};
 +
 +struct zisofs {
 +	/* Set 1 if this file compressed by paged zlib */
 +	int		 pz;
 +	int		 pz_log2_bs; /* Log2 of block size */
 +	uint64_t	 pz_uncompressed_size;
 +
 +	int		 initialized;
 +	unsigned char	*uncompressed_buffer;
 +	size_t		 uncompressed_buffer_size;
 +
 +	uint32_t	 pz_offset;
 +	unsigned char	 header[16];
 +	size_t		 header_avail;
 +	int		 header_passed;
 +	unsigned char	*block_pointers;
 +	size_t		 block_pointers_alloc;
 +	size_t		 block_pointers_size;
 +	size_t		 block_pointers_avail;
 +	size_t		 block_off;
 +	uint32_t	 block_avail;
 +
 +	z_stream	 stream;
 +	int		 stream_valid;
 +};
 +#else
 +struct zisofs {
 +	/* Set 1 if this file compressed by paged zlib */
 +	int		 pz;
 +};
 +#endif
 +
 +struct content {
 +	uint64_t	 offset;/* Offset on disk.		*/
 +	uint64_t	 size;	/* File size in bytes.		*/
 +	struct content	*next;
 +};
 +
 +/* In-memory storage for a directory record. */
 +struct file_info {
 +	struct file_info	*use_next;
 +	struct file_info	*parent;
 +	struct file_info	*next;
 +	struct file_info	*re_next;
 +	int		 subdirs;
 +	uint64_t	 key;		/* Heap Key.			*/
 +	uint64_t	 offset;	/* Offset on disk.		*/
 +	uint64_t	 size;		/* File size in bytes.		*/
 +	uint32_t	 ce_offset;	/* Offset of CE.		*/
 +	uint32_t	 ce_size;	/* Size of CE.			*/
 +	char		 rr_moved;	/* Flag to rr_moved.		*/
 +	char		 rr_moved_has_re_only;
 +	char		 re;		/* Having RRIP "RE" extension.	*/
 +	char		 re_descendant;
 +	uint64_t	 cl_offset;	/* Having RRIP "CL" extension.	*/
 +	int		 birthtime_is_set;
 +	time_t		 birthtime;	/* File created time.		*/
 +	time_t		 mtime;		/* File last modified time.	*/
 +	time_t		 atime;		/* File last accessed time.	*/
 +	time_t		 ctime;		/* File attribute change time.	*/
 +	uint64_t	 rdev;		/* Device number.		*/
 +	mode_t		 mode;
 +	uid_t		 uid;
 +	gid_t		 gid;
 +	int64_t		 number;
 +	int		 nlinks;
 +	struct archive_string name; /* Pathname */
 +	unsigned char	*utf16be_name;
 +	size_t		 utf16be_bytes;
 +	char		 name_continues; /* Non-zero if name continues */
 +	struct archive_string symlink;
 +	char		 symlink_continues; /* Non-zero if link continues */
 +	/* Set 1 if this file compressed by paged zlib(zisofs) */
 +	int		 pz;
 +	int		 pz_log2_bs; /* Log2 of block size */
 +	uint64_t	 pz_uncompressed_size;
 +	/* Set 1 if this file is multi extent. */
 +	int		 multi_extent;
 +	struct {
 +		struct content	*first;
 +		struct content	**last;
 +	} contents;
 +	struct {
 +		struct file_info	*first;
 +		struct file_info	**last;
 +	} rede_files;
 +};
 +
 +struct heap_queue {
 +	struct file_info **files;
 +	int		 allocated;
 +	int		 used;
 +};
 +
 +struct iso9660 {
 +	int	magic;
 +#define ISO9660_MAGIC   0x96609660
 +
 +	int opt_support_joliet;
 +	int opt_support_rockridge;
 +
 +	struct archive_string pathname;
 +	char	seenRockridge;	/* Set true if RR extensions are used. */
 +	char	seenSUSP;	/* Set true if SUSP is beging used. */
 +	char	seenJoliet;
 +
 +	unsigned char	suspOffset;
 +	struct file_info *rr_moved;
 +	struct read_ce_queue {
 +		struct read_ce_req {
 +			uint64_t	 offset;/* Offset of CE on disk. */
 +			struct file_info *file;
 +		}		*reqs;
 +		int		 cnt;
 +		int		 allocated;
 +	}	read_ce_req;
 +
 +	int64_t		previous_number;
 +	struct archive_string previous_pathname;
 +
 +	struct file_info		*use_files;
 +	struct heap_queue		 pending_files;
 +	struct {
 +		struct file_info	*first;
 +		struct file_info	**last;
 +	}	cache_files;
 +	struct {
 +		struct file_info	*first;
 +		struct file_info	**last;
 +	}	re_files;
 +
 +	uint64_t current_position;
 +	ssize_t	logical_block_size;
 +	uint64_t volume_size; /* Total size of volume in bytes. */
 +	int32_t  volume_block;/* Total size of volume in logical blocks. */
 +
 +	struct vd {
 +		int		location;	/* Location of Extent.	*/
 +		uint32_t	size;
 +	} primary, joliet;
 +
 +	int64_t	entry_sparse_offset;
 +	int64_t	entry_bytes_remaining;
 +	size_t  entry_bytes_unconsumed;
 +	struct zisofs	 entry_zisofs;
 +	struct content	*entry_content;
 +	struct archive_string_conv *sconv_utf16be;
 +	/*
 +	 * Buffers for a full pathname in UTF-16BE in Joliet extensions.
 +	 */
 +#define UTF16_NAME_MAX	1024
 +	unsigned char *utf16be_path;
 +	size_t		 utf16be_path_len;
 +	unsigned char *utf16be_previous_path;
 +	size_t		 utf16be_previous_path_len;
 +	/* Null buufer used in bidder to improve its performance. */
 +	unsigned char	 null[2048];
 +};
 +
 +static int	archive_read_format_iso9660_bid(struct archive_read *, int);
 +static int	archive_read_format_iso9660_options(struct archive_read *,
 +		    const char *, const char *);
 +static int	archive_read_format_iso9660_cleanup(struct archive_read *);
 +static int	archive_read_format_iso9660_read_data(struct archive_read *,
 +		    const void **, size_t *, int64_t *);
 +static int	archive_read_format_iso9660_read_data_skip(struct archive_read *);
 +static int	archive_read_format_iso9660_read_header(struct archive_read *,
 +		    struct archive_entry *);
- static const char *build_pathname(struct archive_string *, struct file_info *);
++static const char *build_pathname(struct archive_string *, struct file_info *, int);
 +static int	build_pathname_utf16be(unsigned char *, size_t, size_t *,
 +		    struct file_info *);
 +#if DEBUG
 +static void	dump_isodirrec(FILE *, const unsigned char *isodirrec);
 +#endif
 +static time_t	time_from_tm(struct tm *);
 +static time_t	isodate17(const unsigned char *);
 +static time_t	isodate7(const unsigned char *);
 +static int	isBootRecord(struct iso9660 *, const unsigned char *);
 +static int	isVolumePartition(struct iso9660 *, const unsigned char *);
 +static int	isVDSetTerminator(struct iso9660 *, const unsigned char *);
 +static int	isJolietSVD(struct iso9660 *, const unsigned char *);
 +static int	isSVD(struct iso9660 *, const unsigned char *);
 +static int	isEVD(struct iso9660 *, const unsigned char *);
 +static int	isPVD(struct iso9660 *, const unsigned char *);
 +static int	next_cache_entry(struct archive_read *, struct iso9660 *,
 +		    struct file_info **);
 +static int	next_entry_seek(struct archive_read *, struct iso9660 *,
 +		    struct file_info **);
 +static struct file_info *
 +		parse_file_info(struct archive_read *a,
 +		    struct file_info *parent, const unsigned char *isodirrec);
 +static int	parse_rockridge(struct archive_read *a,
 +		    struct file_info *file, const unsigned char *start,
 +		    const unsigned char *end);
 +static int	register_CE(struct archive_read *a, int32_t location,
 +		    struct file_info *file);
 +static int	read_CE(struct archive_read *a, struct iso9660 *iso9660);
 +static void	parse_rockridge_NM1(struct file_info *,
 +		    const unsigned char *, int);
 +static void	parse_rockridge_SL1(struct file_info *,
 +		    const unsigned char *, int);
 +static void	parse_rockridge_TF1(struct file_info *,
 +		    const unsigned char *, int);
 +static void	parse_rockridge_ZF1(struct file_info *,
 +		    const unsigned char *, int);
 +static void	register_file(struct iso9660 *, struct file_info *);
 +static void	release_files(struct iso9660 *);
 +static unsigned	toi(const void *p, int n);
 +static inline void re_add_entry(struct iso9660 *, struct file_info *);
 +static inline struct file_info * re_get_entry(struct iso9660 *);
 +static inline int rede_add_entry(struct file_info *);
 +static inline struct file_info * rede_get_entry(struct file_info *);
 +static inline void cache_add_entry(struct iso9660 *iso9660,
 +		    struct file_info *file);
 +static inline struct file_info *cache_get_entry(struct iso9660 *iso9660);
 +static int	heap_add_entry(struct archive_read *a, struct heap_queue *heap,
 +		    struct file_info *file, uint64_t key);
 +static struct file_info *heap_get_entry(struct heap_queue *heap);
 +
 +#define add_entry(arch, iso9660, file)	\
 +	heap_add_entry(arch, &((iso9660)->pending_files), file, file->offset)
 +#define next_entry(iso9660)		\
 +	heap_get_entry(&((iso9660)->pending_files))
 +
 +int
 +archive_read_support_format_iso9660(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct iso9660 *iso9660;
 +	int r;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_format_iso9660");
 +
 +	iso9660 = (struct iso9660 *)calloc(1, sizeof(*iso9660));
 +	if (iso9660 == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate iso9660 data");
 +		return (ARCHIVE_FATAL);
 +	}
 +	iso9660->magic = ISO9660_MAGIC;
 +	iso9660->cache_files.first = NULL;
 +	iso9660->cache_files.last = &(iso9660->cache_files.first);
 +	iso9660->re_files.first = NULL;
 +	iso9660->re_files.last = &(iso9660->re_files.first);
 +	/* Enable to support Joliet extensions by default.	*/
 +	iso9660->opt_support_joliet = 1;
 +	/* Enable to support Rock Ridge extensions by default.	*/
 +	iso9660->opt_support_rockridge = 1;
 +
 +	r = __archive_read_register_format(a,
 +	    iso9660,
 +	    "iso9660",
 +	    archive_read_format_iso9660_bid,
 +	    archive_read_format_iso9660_options,
 +	    archive_read_format_iso9660_read_header,
 +	    archive_read_format_iso9660_read_data,
 +	    archive_read_format_iso9660_read_data_skip,
 +	    NULL,
 +	    archive_read_format_iso9660_cleanup,
 +	    NULL,
 +	    NULL);
 +
 +	if (r != ARCHIVE_OK) {
 +		free(iso9660);
 +		return (r);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +
 +static int
 +archive_read_format_iso9660_bid(struct archive_read *a, int best_bid)
 +{
 +	struct iso9660 *iso9660;
 +	ssize_t bytes_read;
 +	const unsigned char *p;
 +	int seenTerminator;
 +
 +	/* If there's already a better bid than we can ever
 +	   make, don't bother testing. */
 +	if (best_bid > 48)
 +		return (-1);
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +
 +	/*
 +	 * Skip the first 32k (reserved area) and get the first
 +	 * 8 sectors of the volume descriptor table.  Of course,
 +	 * if the I/O layer gives us more, we'll take it.
 +	 */
 +#define RESERVED_AREA	(SYSTEM_AREA_BLOCK * LOGICAL_BLOCK_SIZE)
 +	p = __archive_read_ahead(a,
 +	    RESERVED_AREA + 8 * LOGICAL_BLOCK_SIZE,
 +	    &bytes_read);
 +	if (p == NULL)
 +	    return (-1);
 +
 +	/* Skip the reserved area. */
 +	bytes_read -= RESERVED_AREA;
 +	p += RESERVED_AREA;
 +
 +	/* Check each volume descriptor. */
 +	seenTerminator = 0;
 +	for (; bytes_read > LOGICAL_BLOCK_SIZE;
 +	    bytes_read -= LOGICAL_BLOCK_SIZE, p += LOGICAL_BLOCK_SIZE) {
 +		/* Do not handle undefined Volume Descriptor Type. */
 +		if (p[0] >= 4 && p[0] <= 254)
 +			return (0);
 +		/* Standard Identifier must be "CD001" */
 +		if (memcmp(p + 1, "CD001", 5) != 0)
 +			return (0);
 +		if (isPVD(iso9660, p))
 +			continue;
 +		if (!iso9660->joliet.location) {
 +			if (isJolietSVD(iso9660, p))
 +				continue;
 +		}
 +		if (isBootRecord(iso9660, p))
 +			continue;
 +		if (isEVD(iso9660, p))
 +			continue;
 +		if (isSVD(iso9660, p))
 +			continue;
 +		if (isVolumePartition(iso9660, p))
 +			continue;
 +		if (isVDSetTerminator(iso9660, p)) {
 +			seenTerminator = 1;
 +			break;
 +		}
 +		return (0);
 +	}
 +	/*
 +	 * ISO 9660 format must have Primary Volume Descriptor and
 +	 * Volume Descriptor Set Terminator.
 +	 */
 +	if (seenTerminator && iso9660->primary.location > 16)
 +		return (48);
 +
 +	/* We didn't find a valid PVD; return a bid of zero. */
 +	return (0);
 +}
 +
 +static int
 +archive_read_format_iso9660_options(struct archive_read *a,
 +		const char *key, const char *val)
 +{
 +	struct iso9660 *iso9660;
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +
 +	if (strcmp(key, "joliet") == 0) {
 +		if (val == NULL || strcmp(val, "off") == 0 ||
 +				strcmp(val, "ignore") == 0 ||
 +				strcmp(val, "disable") == 0 ||
 +				strcmp(val, "0") == 0)
 +			iso9660->opt_support_joliet = 0;
 +		else
 +			iso9660->opt_support_joliet = 1;
 +		return (ARCHIVE_OK);
 +	}
 +	if (strcmp(key, "rockridge") == 0 ||
 +	    strcmp(key, "Rockridge") == 0) {
 +		iso9660->opt_support_rockridge = val != NULL;
 +		return (ARCHIVE_OK);
 +	}
 +
 +	/* Note: The "warn" return is just to inform the options
 +	 * supervisor that we didn't handle it.  It will generate
 +	 * a suitable error if no one used this option. */
 +	return (ARCHIVE_WARN);
 +}
 +
 +static int
 +isNull(struct iso9660 *iso9660, const unsigned char *h, unsigned offset,
 +unsigned bytes)
 +{
 +
 +	while (bytes >= sizeof(iso9660->null)) {
 +		if (!memcmp(iso9660->null, h + offset, sizeof(iso9660->null)))
 +			return (0);
 +		offset += sizeof(iso9660->null);
 +		bytes -= sizeof(iso9660->null);
 +	}
 +	if (bytes)
 +		return memcmp(iso9660->null, h + offset, bytes) == 0;
 +	else
 +		return (1);
 +}
 +
 +static int
 +isBootRecord(struct iso9660 *iso9660, const unsigned char *h)
 +{
 +	(void)iso9660; /* UNUSED */
 +
 +	/* Type of the Volume Descriptor Boot Record must be 0. */
 +	if (h[0] != 0)
 +		return (0);
 +
 +	/* Volume Descriptor Version must be 1. */
 +	if (h[6] != 1)
 +		return (0);
 +
 +	return (1);
 +}
 +
 +static int
 +isVolumePartition(struct iso9660 *iso9660, const unsigned char *h)
 +{
 +	int32_t location;
 +
 +	/* Type of the Volume Partition Descriptor must be 3. */
 +	if (h[0] != 3)
 +		return (0);
 +
 +	/* Volume Descriptor Version must be 1. */
 +	if (h[6] != 1)
 +		return (0);
 +	/* Unused Field */
 +	if (h[7] != 0)
 +		return (0);
 +
 +	location = archive_le32dec(h + 72);
 +	if (location <= SYSTEM_AREA_BLOCK ||
 +	    location >= iso9660->volume_block)
 +		return (0);
 +	if ((uint32_t)location != archive_be32dec(h + 76))
 +		return (0);
 +
 +	return (1);
 +}
 +
 +static int
 +isVDSetTerminator(struct iso9660 *iso9660, const unsigned char *h)
 +{
 +	(void)iso9660; /* UNUSED */
 +
 +	/* Type of the Volume Descriptor Set Terminator must be 255. */
 +	if (h[0] != 255)
 +		return (0);
 +
 +	/* Volume Descriptor Version must be 1. */
 +	if (h[6] != 1)
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (!isNull(iso9660, h, 7, 2048-7))
 +		return (0);
 +
 +	return (1);
 +}
 +
 +static int
 +isJolietSVD(struct iso9660 *iso9660, const unsigned char *h)
 +{
 +	const unsigned char *p;
 +	ssize_t logical_block_size;
 +	int32_t volume_block;
 +
 +	/* Check if current sector is a kind of Supplementary Volume
 +	 * Descriptor. */
 +	if (!isSVD(iso9660, h))
 +		return (0);
 +
 +	/* FIXME: do more validations according to joliet spec. */
 +
 +	/* check if this SVD contains joliet extension! */
 +	p = h + SVD_escape_sequences_offset;
 +	/* N.B. Joliet spec says p[1] == '\\', but.... */
 +	if (p[0] == '%' && p[1] == '/') {
 +		int level = 0;
 +
 +		if (p[2] == '@')
 +			level = 1;
 +		else if (p[2] == 'C')
 +			level = 2;
 +		else if (p[2] == 'E')
 +			level = 3;
 +		else /* not joliet */
 +			return (0);
 +
 +		iso9660->seenJoliet = level;
 +
 +	} else /* not joliet */
 +		return (0);
 +
 +	logical_block_size =
 +	    archive_le16dec(h + SVD_logical_block_size_offset);
 +	volume_block = archive_le32dec(h + SVD_volume_space_size_offset);
 +
 +	iso9660->logical_block_size = logical_block_size;
 +	iso9660->volume_block = volume_block;
 +	iso9660->volume_size = logical_block_size * (uint64_t)volume_block;
 +	/* Read Root Directory Record in Volume Descriptor. */
 +	p = h + SVD_root_directory_record_offset;
 +	iso9660->joliet.location = archive_le32dec(p + DR_extent_offset);
 +	iso9660->joliet.size = archive_le32dec(p + DR_size_offset);
 +
 +	return (48);
 +}
 +
 +static int
 +isSVD(struct iso9660 *iso9660, const unsigned char *h)
 +{
 +	const unsigned char *p;
 +	ssize_t logical_block_size;
 +	int32_t volume_block;
 +	int32_t location;
 +
 +	(void)iso9660; /* UNUSED */
 +
 +	/* Type 2 means it's a SVD. */
 +	if (h[SVD_type_offset] != 2)
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (!isNull(iso9660, h, SVD_reserved1_offset, SVD_reserved1_size))
 +		return (0);
 +	if (!isNull(iso9660, h, SVD_reserved2_offset, SVD_reserved2_size))
 +		return (0);
 +	if (!isNull(iso9660, h, SVD_reserved3_offset, SVD_reserved3_size))
 +		return (0);
 +
 +	/* File structure version must be 1 for ISO9660/ECMA119. */
 +	if (h[SVD_file_structure_version_offset] != 1)
 +		return (0);
 +
 +	logical_block_size =
 +	    archive_le16dec(h + SVD_logical_block_size_offset);
 +	if (logical_block_size <= 0)
 +		return (0);
 +
 +	volume_block = archive_le32dec(h + SVD_volume_space_size_offset);
 +	if (volume_block <= SYSTEM_AREA_BLOCK+4)
 +		return (0);
 +
 +	/* Location of Occurrence of Type L Path Table must be
 +	 * available location,
 +	 * >= SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */
 +	location = archive_le32dec(h+SVD_type_L_path_table_offset);
 +	if (location < SYSTEM_AREA_BLOCK+2 || location >= volume_block)
 +		return (0);
 +
 +	/* The Type M Path Table must be at a valid location (WinISO
 +	 * and probably other programs omit this, so we allow zero)
 +	 *
 +	 * >= SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */
 +	location = archive_be32dec(h+SVD_type_M_path_table_offset);
 +	if ((location > 0 && location < SYSTEM_AREA_BLOCK+2)
 +	    || location >= volume_block)
 +		return (0);
 +
 +	/* Read Root Directory Record in Volume Descriptor. */
 +	p = h + SVD_root_directory_record_offset;
 +	if (p[DR_length_offset] != 34)
 +		return (0);
 +
 +	return (48);
 +}
 +
 +static int
 +isEVD(struct iso9660 *iso9660, const unsigned char *h)
 +{
 +	const unsigned char *p;
 +	ssize_t logical_block_size;
 +	int32_t volume_block;
 +	int32_t location;
 +
 +	(void)iso9660; /* UNUSED */
 +
 +	/* Type of the Enhanced Volume Descriptor must be 2. */
 +	if (h[PVD_type_offset] != 2)
 +		return (0);
 +
 +	/* EVD version must be 2. */
 +	if (h[PVD_version_offset] != 2)
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (h[PVD_reserved1_offset] != 0)
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (!isNull(iso9660, h, PVD_reserved2_offset, PVD_reserved2_size))
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (!isNull(iso9660, h, PVD_reserved3_offset, PVD_reserved3_size))
 +		return (0);
 +
 +	/* Logical block size must be > 0. */
 +	/* I've looked at Ecma 119 and can't find any stronger
 +	 * restriction on this field. */
 +	logical_block_size =
 +	    archive_le16dec(h + PVD_logical_block_size_offset);
 +	if (logical_block_size <= 0)
 +		return (0);
 +
 +	volume_block =
 +	    archive_le32dec(h + PVD_volume_space_size_offset);
 +	if (volume_block <= SYSTEM_AREA_BLOCK+4)
 +		return (0);
 +
 +	/* File structure version must be 2 for ISO9660:1999. */
 +	if (h[PVD_file_structure_version_offset] != 2)
 +		return (0);
 +
 +	/* Location of Occurrence of Type L Path Table must be
 +	 * available location,
 +	 * >= SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */
 +	location = archive_le32dec(h+PVD_type_1_path_table_offset);
 +	if (location < SYSTEM_AREA_BLOCK+2 || location >= volume_block)
 +		return (0);
 +
 +	/* Location of Occurrence of Type M Path Table must be
 +	 * available location,
 +	 * >= SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */
 +	location = archive_be32dec(h+PVD_type_m_path_table_offset);
 +	if ((location > 0 && location < SYSTEM_AREA_BLOCK+2)
 +	    || location >= volume_block)
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (!isNull(iso9660, h, PVD_reserved4_offset, PVD_reserved4_size))
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (!isNull(iso9660, h, PVD_reserved5_offset, PVD_reserved5_size))
 +		return (0);
 +
 +	/* Read Root Directory Record in Volume Descriptor. */
 +	p = h + PVD_root_directory_record_offset;
 +	if (p[DR_length_offset] != 34)
 +		return (0);
 +
 +	return (48);
 +}
 +
 +static int
 +isPVD(struct iso9660 *iso9660, const unsigned char *h)
 +{
 +	const unsigned char *p;
 +	ssize_t logical_block_size;
 +	int32_t volume_block;
 +	int32_t location;
 +	int i;
 +
 +	/* Type of the Primary Volume Descriptor must be 1. */
 +	if (h[PVD_type_offset] != 1)
 +		return (0);
 +
 +	/* PVD version must be 1. */
 +	if (h[PVD_version_offset] != 1)
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (h[PVD_reserved1_offset] != 0)
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (!isNull(iso9660, h, PVD_reserved2_offset, PVD_reserved2_size))
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (!isNull(iso9660, h, PVD_reserved3_offset, PVD_reserved3_size))
 +		return (0);
 +
 +	/* Logical block size must be > 0. */
 +	/* I've looked at Ecma 119 and can't find any stronger
 +	 * restriction on this field. */
 +	logical_block_size =
 +	    archive_le16dec(h + PVD_logical_block_size_offset);
 +	if (logical_block_size <= 0)
 +		return (0);
 +
 +	volume_block = archive_le32dec(h + PVD_volume_space_size_offset);
 +	if (volume_block <= SYSTEM_AREA_BLOCK+4)
 +		return (0);
 +
 +	/* File structure version must be 1 for ISO9660/ECMA119. */
 +	if (h[PVD_file_structure_version_offset] != 1)
 +		return (0);
 +
 +	/* Location of Occurrence of Type L Path Table must be
 +	 * available location,
 +	 * > SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */
 +	location = archive_le32dec(h+PVD_type_1_path_table_offset);
 +	if (location < SYSTEM_AREA_BLOCK+2 || location >= volume_block)
 +		return (0);
 +
 +	/* The Type M Path Table must also be at a valid location
 +	 * (although ECMA 119 requires a Type M Path Table, WinISO and
 +	 * probably other programs omit it, so we permit a zero here)
 +	 *
 +	 * >= SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */
 +	location = archive_be32dec(h+PVD_type_m_path_table_offset);
 +	if ((location > 0 && location < SYSTEM_AREA_BLOCK+2)
 +	    || location >= volume_block)
 +		return (0);
 +
 +	/* Reserved field must be 0. */
 +	/* But accept NetBSD/FreeBSD "makefs" images with 0x20 here. */
 +	for (i = 0; i < PVD_reserved4_size; ++i)
 +		if (h[PVD_reserved4_offset + i] != 0
 +		    && h[PVD_reserved4_offset + i] != 0x20)
 +			return (0);
 +
 +	/* Reserved field must be 0. */
 +	if (!isNull(iso9660, h, PVD_reserved5_offset, PVD_reserved5_size))
 +		return (0);
 +
 +	/* XXX TODO: Check other values for sanity; reject more
 +	 * malformed PVDs. XXX */
 +
 +	/* Read Root Directory Record in Volume Descriptor. */
 +	p = h + PVD_root_directory_record_offset;
 +	if (p[DR_length_offset] != 34)
 +		return (0);
 +
 +	if (!iso9660->primary.location) {
 +		iso9660->logical_block_size = logical_block_size;
 +		iso9660->volume_block = volume_block;
 +		iso9660->volume_size =
 +		    logical_block_size * (uint64_t)volume_block;
 +		iso9660->primary.location =
 +		    archive_le32dec(p + DR_extent_offset);
 +		iso9660->primary.size = archive_le32dec(p + DR_size_offset);
 +	}
 +
 +	return (48);
 +}
 +
 +static int
 +read_children(struct archive_read *a, struct file_info *parent)
 +{
 +	struct iso9660 *iso9660;
 +	const unsigned char *b, *p;
 +	struct file_info *multi;
 +	size_t step, skip_size;
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +	/* flush any remaining bytes from the last round to ensure
 +	 * we're positioned */
 +	if (iso9660->entry_bytes_unconsumed) {
 +		__archive_read_consume(a, iso9660->entry_bytes_unconsumed);
 +		iso9660->entry_bytes_unconsumed = 0;
 +	}
 +	if (iso9660->current_position > parent->offset) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Ignoring out-of-order directory (%s) %jd > %jd",
 +		    parent->name.s,
 +		    (intmax_t)iso9660->current_position,
 +		    (intmax_t)parent->offset);
 +		return (ARCHIVE_WARN);
 +	}
 +	if (parent->offset + parent->size > iso9660->volume_size) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Directory is beyond end-of-media: %s",
 +		    parent->name.s);
 +		return (ARCHIVE_WARN);
 +	}
 +	if (iso9660->current_position < parent->offset) {
 +		int64_t skipsize;
 +
 +		skipsize = parent->offset - iso9660->current_position;
 +		skipsize = __archive_read_consume(a, skipsize);
 +		if (skipsize < 0)
 +			return ((int)skipsize);
 +		iso9660->current_position = parent->offset;
 +	}
 +
 +	step = (size_t)(((parent->size + iso9660->logical_block_size -1) /
 +	    iso9660->logical_block_size) * iso9660->logical_block_size);
 +	b = __archive_read_ahead(a, step, NULL);
 +	if (b == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Failed to read full block when scanning "
 +		    "ISO9660 directory list");
 +		return (ARCHIVE_FATAL);
 +	}
 +	iso9660->current_position += step;
 +	multi = NULL;
 +	skip_size = step;
 +	while (step) {
 +		p = b;
 +		b += iso9660->logical_block_size;
 +		step -= iso9660->logical_block_size;
 +		for (; *p != 0 && p < b && p + *p <= b; p += *p) {
 +			struct file_info *child;
 +
 +			/* N.B.: these special directory identifiers
 +			 * are 8 bit "values" even on a
 +			 * Joliet CD with UCS-2 (16bit) encoding.
 +			 */
 +
 +			/* Skip '.' entry. */
 +			if (*(p + DR_name_len_offset) == 1
 +			    && *(p + DR_name_offset) == '\0')
 +				continue;
 +			/* Skip '..' entry. */
 +			if (*(p + DR_name_len_offset) == 1
 +			    && *(p + DR_name_offset) == '\001')
 +				continue;
 +			child = parse_file_info(a, parent, p);
 +			if (child == NULL) {
 +				__archive_read_consume(a, skip_size);
 +				return (ARCHIVE_FATAL);
 +			}
 +			if (child->cl_offset == 0 &&
 +			    (child->multi_extent || multi != NULL)) {
 +				struct content *con;
 +
 +				if (multi == NULL) {
 +					multi = child;
 +					multi->contents.first = NULL;
 +					multi->contents.last =
 +					    &(multi->contents.first);
 +				}
 +				con = malloc(sizeof(struct content));
 +				if (con == NULL) {
 +					archive_set_error(
 +					    &a->archive, ENOMEM,
 +					    "No memory for multi extent");
 +					__archive_read_consume(a, skip_size);
 +					return (ARCHIVE_FATAL);
 +				}
 +				con->offset = child->offset;
 +				con->size = child->size;
 +				con->next = NULL;
 +				*multi->contents.last = con;
 +				multi->contents.last = &(con->next);
 +				if (multi == child) {
 +					if (add_entry(a, iso9660, child)
 +					    != ARCHIVE_OK)
 +						return (ARCHIVE_FATAL);
 +				} else {
 +					multi->size += child->size;
 +					if (!child->multi_extent)
 +						multi = NULL;
 +				}
 +			} else
 +				if (add_entry(a, iso9660, child) != ARCHIVE_OK)
 +					return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	__archive_read_consume(a, skip_size);
 +
 +	/* Read data which recorded by RRIP "CE" extension. */
 +	if (read_CE(a, iso9660) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +choose_volume(struct archive_read *a, struct iso9660 *iso9660)
 +{
 +	struct file_info *file;
 +	int64_t skipsize;
 +	struct vd *vd;
 +	const void *block;
 +	char seenJoliet;
 +
 +	vd = &(iso9660->primary);
 +	if (!iso9660->opt_support_joliet)
 +		iso9660->seenJoliet = 0;
 +	if (iso9660->seenJoliet &&
 +		vd->location > iso9660->joliet.location)
 +		/* This condition is unlikely; by way of caution. */
 +		vd = &(iso9660->joliet);
 +
 +	skipsize = LOGICAL_BLOCK_SIZE * vd->location;
 +	skipsize = __archive_read_consume(a, skipsize);
 +	if (skipsize < 0)
 +		return ((int)skipsize);
 +	iso9660->current_position = skipsize;
 +
 +	block = __archive_read_ahead(a, vd->size, NULL);
 +	if (block == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Failed to read full block when scanning "
 +		    "ISO9660 directory list");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * While reading Root Directory, flag seenJoliet must be zero to
 +	 * avoid converting special name 0x00(Current Directory) and
 +	 * next byte to UCS2.
 +	 */
 +	seenJoliet = iso9660->seenJoliet;/* Save flag. */
 +	iso9660->seenJoliet = 0;
 +	file = parse_file_info(a, NULL, block);
 +	if (file == NULL)
 +		return (ARCHIVE_FATAL);
 +	iso9660->seenJoliet = seenJoliet;
 +
 +	/*
 +	 * If the iso image has both RockRidge and Joliet, we preferentially
 +	 * use RockRidge Extensions rather than Joliet ones.
 +	 */
 +	if (vd == &(iso9660->primary) && iso9660->seenRockridge
 +	    && iso9660->seenJoliet)
 +		iso9660->seenJoliet = 0;
 +
 +	if (vd == &(iso9660->primary) && !iso9660->seenRockridge
 +	    && iso9660->seenJoliet) {
 +		/* Switch reading data from primary to joliet. */
 +		vd = &(iso9660->joliet);
 +		skipsize = LOGICAL_BLOCK_SIZE * vd->location;
 +		skipsize -= iso9660->current_position;
 +		skipsize = __archive_read_consume(a, skipsize);
 +		if (skipsize < 0)
 +			return ((int)skipsize);
 +		iso9660->current_position += skipsize;
 +
 +		block = __archive_read_ahead(a, vd->size, NULL);
 +		if (block == NULL) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Failed to read full block when scanning "
 +			    "ISO9660 directory list");
 +			return (ARCHIVE_FATAL);
 +		}
 +		iso9660->seenJoliet = 0;
 +		file = parse_file_info(a, NULL, block);
 +		if (file == NULL)
 +			return (ARCHIVE_FATAL);
 +		iso9660->seenJoliet = seenJoliet;
 +	}
 +
 +	/* Store the root directory in the pending list. */
 +	if (add_entry(a, iso9660, file) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +	if (iso9660->seenRockridge) {
 +		a->archive.archive_format = ARCHIVE_FORMAT_ISO9660_ROCKRIDGE;
 +		a->archive.archive_format_name =
 +		    "ISO9660 with Rockridge extensions";
 +	}
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_read_format_iso9660_read_header(struct archive_read *a,
 +    struct archive_entry *entry)
 +{
 +	struct iso9660 *iso9660;
 +	struct file_info *file;
 +	int r, rd_r = ARCHIVE_OK;
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +
 +	if (!a->archive.archive_format) {
 +		a->archive.archive_format = ARCHIVE_FORMAT_ISO9660;
 +		a->archive.archive_format_name = "ISO9660";
 +	}
 +
 +	if (iso9660->current_position == 0) {
 +		r = choose_volume(a, iso9660);
 +		if (r != ARCHIVE_OK)
 +			return (r);
 +	}
 +
 +	file = NULL;/* Eliminate a warning. */
 +	/* Get the next entry that appears after the current offset. */
 +	r = next_entry_seek(a, iso9660, &file);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +
 +	if (iso9660->seenJoliet) {
 +		/*
 +		 * Convert UTF-16BE of a filename to local locale MBS
 +		 * and store the result into a filename field.
 +		 */
 +		if (iso9660->sconv_utf16be == NULL) {
 +			iso9660->sconv_utf16be =
 +			    archive_string_conversion_from_charset(
 +				&(a->archive), "UTF-16BE", 1);
 +			if (iso9660->sconv_utf16be == NULL)
 +				/* Coundn't allocate memory */
 +				return (ARCHIVE_FATAL);
 +		}
 +		if (iso9660->utf16be_path == NULL) {
 +			iso9660->utf16be_path = malloc(UTF16_NAME_MAX);
 +			if (iso9660->utf16be_path == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "No memory");
 +				return (ARCHIVE_FATAL);
 +			}
 +		}
 +		if (iso9660->utf16be_previous_path == NULL) {
 +			iso9660->utf16be_previous_path = malloc(UTF16_NAME_MAX);
 +			if (iso9660->utf16be_previous_path == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "No memory");
 +				return (ARCHIVE_FATAL);
 +			}
 +		}
 +
 +		iso9660->utf16be_path_len = 0;
 +		if (build_pathname_utf16be(iso9660->utf16be_path,
 +		    UTF16_NAME_MAX, &(iso9660->utf16be_path_len), file) != 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Pathname is too long");
++			return (ARCHIVE_FATAL);
 +		}
 +
 +		r = archive_entry_copy_pathname_l(entry,
 +		    (const char *)iso9660->utf16be_path,
 +		    iso9660->utf16be_path_len,
 +		    iso9660->sconv_utf16be);
 +		if (r != 0) {
 +			if (errno == ENOMEM) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "No memory for Pathname");
 +				return (ARCHIVE_FATAL);
 +			}
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Pathname cannot be converted "
 +			    "from %s to current locale.",
 +			    archive_string_conversion_charset_name(
 +			      iso9660->sconv_utf16be));
 +
 +			rd_r = ARCHIVE_WARN;
 +		}
 +	} else {
- 		archive_string_empty(&iso9660->pathname);
- 		archive_entry_set_pathname(entry,
- 		    build_pathname(&iso9660->pathname, file));
++		const char *path = build_pathname(&iso9660->pathname, file, 0);
++		if (path == NULL) {
++			archive_set_error(&a->archive,
++			    ARCHIVE_ERRNO_FILE_FORMAT,
++			    "Pathname is too long");
++			return (ARCHIVE_FATAL);
++		} else {
++			archive_string_empty(&iso9660->pathname);
++			archive_entry_set_pathname(entry, path);
++		}
 +	}
 +
 +	iso9660->entry_bytes_remaining = file->size;
 +	/* Offset for sparse-file-aware clients. */
 +	iso9660->entry_sparse_offset = 0;
 +
 +	if (file->offset + file->size > iso9660->volume_size) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "File is beyond end-of-media: %s",
 +		    archive_entry_pathname(entry));
 +		iso9660->entry_bytes_remaining = 0;
 +		return (ARCHIVE_WARN);
 +	}
 +
 +	/* Set up the entry structure with information about this entry. */
 +	archive_entry_set_mode(entry, file->mode);
 +	archive_entry_set_uid(entry, file->uid);
 +	archive_entry_set_gid(entry, file->gid);
 +	archive_entry_set_nlink(entry, file->nlinks);
 +	if (file->birthtime_is_set)
 +		archive_entry_set_birthtime(entry, file->birthtime, 0);
 +	else
 +		archive_entry_unset_birthtime(entry);
 +	archive_entry_set_mtime(entry, file->mtime, 0);
 +	archive_entry_set_ctime(entry, file->ctime, 0);
 +	archive_entry_set_atime(entry, file->atime, 0);
 +	/* N.B.: Rock Ridge supports 64-bit device numbers. */
 +	archive_entry_set_rdev(entry, (dev_t)file->rdev);
 +	archive_entry_set_size(entry, iso9660->entry_bytes_remaining);
 +	if (file->symlink.s != NULL)
 +		archive_entry_copy_symlink(entry, file->symlink.s);
 +
 +	/* Note: If the input isn't seekable, we can't rewind to
 +	 * return the same body again, so if the next entry refers to
 +	 * the same data, we have to return it as a hardlink to the
 +	 * original entry. */
 +	if (file->number != -1 &&
 +	    file->number == iso9660->previous_number) {
 +		if (iso9660->seenJoliet) {
 +			r = archive_entry_copy_hardlink_l(entry,
 +			    (const char *)iso9660->utf16be_previous_path,
 +			    iso9660->utf16be_previous_path_len,
 +			    iso9660->sconv_utf16be);
 +			if (r != 0) {
 +				if (errno == ENOMEM) {
 +					archive_set_error(&a->archive, ENOMEM,
 +					    "No memory for Linkname");
 +					return (ARCHIVE_FATAL);
 +				}
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_FILE_FORMAT,
 +				    "Linkname cannot be converted "
 +				    "from %s to current locale.",
 +				    archive_string_conversion_charset_name(
 +				      iso9660->sconv_utf16be));
 +				rd_r = ARCHIVE_WARN;
 +			}
 +		} else
 +			archive_entry_set_hardlink(entry,
 +			    iso9660->previous_pathname.s);
 +		archive_entry_unset_size(entry);
 +		iso9660->entry_bytes_remaining = 0;
 +		return (rd_r);
 +	}
 +
 +	if ((file->mode & AE_IFMT) != AE_IFDIR &&
 +	    file->offset < iso9660->current_position) {
 +		int64_t r64;
 +
 +		r64 = __archive_read_seek(a, file->offset, SEEK_SET);
 +		if (r64 != (int64_t)file->offset) {
 +			/* We can't seek backwards to extract it, so issue
 +			 * a warning.  Note that this can only happen if
 +			 * this entry was added to the heap after we passed
 +			 * this offset, that is, only if the directory
 +			 * mentioning this entry is later than the body of
 +			 * the entry. Such layouts are very unusual; most
 +			 * ISO9660 writers lay out and record all directory
 +			 * information first, then store all file bodies. */
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Ignoring out-of-order file @%jx (%s) %jd < %jd",
 +			    (intmax_t)file->number,
 +			    iso9660->pathname.s,
 +			    (intmax_t)file->offset,
 +			    (intmax_t)iso9660->current_position);
 +			iso9660->entry_bytes_remaining = 0;
 +			return (ARCHIVE_WARN);
 +		}
 +		iso9660->current_position = (uint64_t)r64;
 +	}
 +
 +	/* Initialize zisofs variables. */
 +	iso9660->entry_zisofs.pz = file->pz;
 +	if (file->pz) {
 +#ifdef HAVE_ZLIB_H
 +		struct zisofs  *zisofs;
 +
 +		zisofs = &iso9660->entry_zisofs;
 +		zisofs->initialized = 0;
 +		zisofs->pz_log2_bs = file->pz_log2_bs;
 +		zisofs->pz_uncompressed_size = file->pz_uncompressed_size;
 +		zisofs->pz_offset = 0;
 +		zisofs->header_avail = 0;
 +		zisofs->header_passed = 0;
 +		zisofs->block_pointers_avail = 0;
 +#endif
 +		archive_entry_set_size(entry, file->pz_uncompressed_size);
 +	}
 +
 +	iso9660->previous_number = file->number;
 +	if (iso9660->seenJoliet) {
 +		memcpy(iso9660->utf16be_previous_path, iso9660->utf16be_path,
 +		    iso9660->utf16be_path_len);
 +		iso9660->utf16be_previous_path_len = iso9660->utf16be_path_len;
 +	} else
 +		archive_strcpy(
 +		    &iso9660->previous_pathname, iso9660->pathname.s);
 +
 +	/* Reset entry_bytes_remaining if the file is multi extent. */
 +	iso9660->entry_content = file->contents.first;
 +	if (iso9660->entry_content != NULL)
 +		iso9660->entry_bytes_remaining = iso9660->entry_content->size;
 +
 +	if (archive_entry_filetype(entry) == AE_IFDIR) {
 +		/* Overwrite nlinks by proper link number which is
 +		 * calculated from number of sub directories. */
 +		archive_entry_set_nlink(entry, 2 + file->subdirs);
 +		/* Directory data has been read completely. */
 +		iso9660->entry_bytes_remaining = 0;
 +	}
 +
 +	if (rd_r != ARCHIVE_OK)
 +		return (rd_r);
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_read_format_iso9660_read_data_skip(struct archive_read *a)
 +{
 +	/* Because read_next_header always does an explicit skip
 +	 * to the next entry, we don't need to do anything here. */
 +	(void)a; /* UNUSED */
 +	return (ARCHIVE_OK);
 +}
 +
 +#ifdef HAVE_ZLIB_H
 +
 +static int
 +zisofs_read_data(struct archive_read *a,
 +    const void **buff, size_t *size, int64_t *offset)
 +{
 +	struct iso9660 *iso9660;
 +	struct zisofs  *zisofs;
 +	const unsigned char *p;
 +	size_t avail;
 +	ssize_t bytes_read;
 +	size_t uncompressed_size;
 +	int r;
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +	zisofs = &iso9660->entry_zisofs;
 +
 +	p = __archive_read_ahead(a, 1, &bytes_read);
 +	if (bytes_read <= 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated zisofs file body");
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (bytes_read > iso9660->entry_bytes_remaining)
 +		bytes_read = (ssize_t)iso9660->entry_bytes_remaining;
 +	avail = bytes_read;
 +	uncompressed_size = 0;
 +
 +	if (!zisofs->initialized) {
 +		size_t ceil, xsize;
 +
 +		/* Allocate block pointers buffer. */
 +		ceil = (size_t)((zisofs->pz_uncompressed_size +
 +			(((int64_t)1) << zisofs->pz_log2_bs) - 1)
 +			>> zisofs->pz_log2_bs);
 +		xsize = (ceil + 1) * 4;
 +		if (zisofs->block_pointers_alloc < xsize) {
 +			size_t alloc;
 +
 +			if (zisofs->block_pointers != NULL)
 +				free(zisofs->block_pointers);
 +			alloc = ((xsize >> 10) + 1) << 10;
 +			zisofs->block_pointers = malloc(alloc);
 +			if (zisofs->block_pointers == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "No memory for zisofs decompression");
 +				return (ARCHIVE_FATAL);
 +			}
 +			zisofs->block_pointers_alloc = alloc;
 +		}
 +		zisofs->block_pointers_size = xsize;
 +
 +		/* Allocate uncompressed data buffer. */
 +		xsize = (size_t)1UL << zisofs->pz_log2_bs;
 +		if (zisofs->uncompressed_buffer_size < xsize) {
 +			if (zisofs->uncompressed_buffer != NULL)
 +				free(zisofs->uncompressed_buffer);
 +			zisofs->uncompressed_buffer = malloc(xsize);
 +			if (zisofs->uncompressed_buffer == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "No memory for zisofs decompression");
 +				return (ARCHIVE_FATAL);
 +			}
 +		}
 +		zisofs->uncompressed_buffer_size = xsize;
 +
 +		/*
 +		 * Read the file header, and check the magic code of zisofs.
 +		 */
 +		if (zisofs->header_avail < sizeof(zisofs->header)) {
 +			xsize = sizeof(zisofs->header) - zisofs->header_avail;
 +			if (avail < xsize)
 +				xsize = avail;
 +			memcpy(zisofs->header + zisofs->header_avail, p, xsize);
 +			zisofs->header_avail += xsize;
 +			avail -= xsize;
 +			p += xsize;
 +		}
 +		if (!zisofs->header_passed &&
 +		    zisofs->header_avail == sizeof(zisofs->header)) {
 +			int err = 0;
 +
 +			if (memcmp(zisofs->header, zisofs_magic,
 +			    sizeof(zisofs_magic)) != 0)
 +				err = 1;
 +			if (archive_le32dec(zisofs->header + 8)
 +			    != zisofs->pz_uncompressed_size)
 +				err = 1;
 +			if (zisofs->header[12] != 4)
 +				err = 1;
 +			if (zisofs->header[13] != zisofs->pz_log2_bs)
 +				err = 1;
 +			if (err) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_FILE_FORMAT,
 +				    "Illegal zisofs file body");
 +				return (ARCHIVE_FATAL);
 +			}
 +			zisofs->header_passed = 1;
 +		}
 +		/*
 +		 * Read block pointers.
 +		 */
 +		if (zisofs->header_passed &&
 +		    zisofs->block_pointers_avail < zisofs->block_pointers_size) {
 +			xsize = zisofs->block_pointers_size
 +			    - zisofs->block_pointers_avail;
 +			if (avail < xsize)
 +				xsize = avail;
 +			memcpy(zisofs->block_pointers
 +			    + zisofs->block_pointers_avail, p, xsize);
 +			zisofs->block_pointers_avail += xsize;
 +			avail -= xsize;
 +			p += xsize;
 +		    	if (zisofs->block_pointers_avail
 +			    == zisofs->block_pointers_size) {
 +				/* We've got all block pointers and initialize
 +				 * related variables.	*/
 +				zisofs->block_off = 0;
 +				zisofs->block_avail = 0;
 +				/* Complete a initialization */
 +				zisofs->initialized = 1;
 +			}
 +		}
 +
 +		if (!zisofs->initialized)
 +			goto next_data; /* We need more data. */
 +	}
 +
 +	/*
 +	 * Get block offsets from block pointers.
 +	 */
 +	if (zisofs->block_avail == 0) {
 +		uint32_t bst, bed;
 +
 +		if (zisofs->block_off + 4 >= zisofs->block_pointers_size) {
 +			/* There isn't a pair of offsets. */
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Illegal zisofs block pointers");
 +			return (ARCHIVE_FATAL);
 +		}
 +		bst = archive_le32dec(
 +		    zisofs->block_pointers + zisofs->block_off);
 +		if (bst != zisofs->pz_offset + (bytes_read - avail)) {
 +			/* TODO: Should we seek offset of current file
 +			 * by bst ? */
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Illegal zisofs block pointers(cannot seek)");
 +			return (ARCHIVE_FATAL);
 +		}
 +		bed = archive_le32dec(
 +		    zisofs->block_pointers + zisofs->block_off + 4);
 +		if (bed < bst) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Illegal zisofs block pointers");
 +			return (ARCHIVE_FATAL);
 +		}
 +		zisofs->block_avail = bed - bst;
 +		zisofs->block_off += 4;
 +
 +		/* Initialize compression library for new block. */
 +		if (zisofs->stream_valid)
 +			r = inflateReset(&zisofs->stream);
 +		else
 +			r = inflateInit(&zisofs->stream);
 +		if (r != Z_OK) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Can't initialize zisofs decompression.");
 +			return (ARCHIVE_FATAL);
 +		}
 +		zisofs->stream_valid = 1;
 +		zisofs->stream.total_in = 0;
 +		zisofs->stream.total_out = 0;
 +	}
 +
 +	/*
 +	 * Make uncompressed data.
 +	 */
 +	if (zisofs->block_avail == 0) {
 +		memset(zisofs->uncompressed_buffer, 0,
 +		    zisofs->uncompressed_buffer_size);
 +		uncompressed_size = zisofs->uncompressed_buffer_size;
 +	} else {
 +		zisofs->stream.next_in = (Bytef *)(uintptr_t)(const void *)p;
 +		if (avail > zisofs->block_avail)
 +			zisofs->stream.avail_in = zisofs->block_avail;
 +		else
 +			zisofs->stream.avail_in = (uInt)avail;
 +		zisofs->stream.next_out = zisofs->uncompressed_buffer;
 +		zisofs->stream.avail_out =
 +		    (uInt)zisofs->uncompressed_buffer_size;
 +
 +		r = inflate(&zisofs->stream, 0);
 +		switch (r) {
 +		case Z_OK: /* Decompressor made some progress.*/
 +		case Z_STREAM_END: /* Found end of stream. */
 +			break;
 +		default:
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "zisofs decompression failed (%d)", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		uncompressed_size =
 +		    zisofs->uncompressed_buffer_size - zisofs->stream.avail_out;
 +		avail -= zisofs->stream.next_in - p;
 +		zisofs->block_avail -= (uint32_t)(zisofs->stream.next_in - p);
 +	}
 +next_data:
 +	bytes_read -= avail;
 +	*buff = zisofs->uncompressed_buffer;
 +	*size = uncompressed_size;
 +	*offset = iso9660->entry_sparse_offset;
 +	iso9660->entry_sparse_offset += uncompressed_size;
 +	iso9660->entry_bytes_remaining -= bytes_read;
 +	iso9660->current_position += bytes_read;
 +	zisofs->pz_offset += (uint32_t)bytes_read;
 +	iso9660->entry_bytes_unconsumed += bytes_read;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +#else /* HAVE_ZLIB_H */
 +
 +static int
 +zisofs_read_data(struct archive_read *a,
 +    const void **buff, size_t *size, int64_t *offset)
 +{
 +
 +	(void)buff;/* UNUSED */
 +	(void)size;/* UNUSED */
 +	(void)offset;/* UNUSED */
 +	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +	    "zisofs is not supported on this platform.");
 +	return (ARCHIVE_FAILED);
 +}
 +
 +#endif /* HAVE_ZLIB_H */
 +
 +static int
 +archive_read_format_iso9660_read_data(struct archive_read *a,
 +    const void **buff, size_t *size, int64_t *offset)
 +{
 +	ssize_t bytes_read;
 +	struct iso9660 *iso9660;
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +
 +	if (iso9660->entry_bytes_unconsumed) {
 +		__archive_read_consume(a, iso9660->entry_bytes_unconsumed);
 +		iso9660->entry_bytes_unconsumed = 0;
 +	}
 +
 +	if (iso9660->entry_bytes_remaining <= 0) {
 +		if (iso9660->entry_content != NULL)
 +			iso9660->entry_content = iso9660->entry_content->next;
 +		if (iso9660->entry_content == NULL) {
 +			*buff = NULL;
 +			*size = 0;
 +			*offset = iso9660->entry_sparse_offset;
 +			return (ARCHIVE_EOF);
 +		}
 +		/* Seek forward to the start of the entry. */
 +		if (iso9660->current_position < iso9660->entry_content->offset) {
 +			int64_t step;
 +
 +			step = iso9660->entry_content->offset -
 +			    iso9660->current_position;
 +			step = __archive_read_consume(a, step);
 +			if (step < 0)
 +				return ((int)step);
 +			iso9660->current_position =
 +			    iso9660->entry_content->offset;
 +		}
 +		if (iso9660->entry_content->offset < iso9660->current_position) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Ignoring out-of-order file (%s) %jd < %jd",
 +			    iso9660->pathname.s,
 +			    (intmax_t)iso9660->entry_content->offset,
 +			    (intmax_t)iso9660->current_position);
 +			*buff = NULL;
 +			*size = 0;
 +			*offset = iso9660->entry_sparse_offset;
 +			return (ARCHIVE_WARN);
 +		}
 +		iso9660->entry_bytes_remaining = iso9660->entry_content->size;
 +	}
 +	if (iso9660->entry_zisofs.pz)
 +		return (zisofs_read_data(a, buff, size, offset));
 +
 +	*buff = __archive_read_ahead(a, 1, &bytes_read);
 +	if (bytes_read == 0)
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Truncated input file");
 +	if (*buff == NULL)
 +		return (ARCHIVE_FATAL);
 +	if (bytes_read > iso9660->entry_bytes_remaining)
 +		bytes_read = (ssize_t)iso9660->entry_bytes_remaining;
 +	*size = bytes_read;
 +	*offset = iso9660->entry_sparse_offset;
 +	iso9660->entry_sparse_offset += bytes_read;
 +	iso9660->entry_bytes_remaining -= bytes_read;
 +	iso9660->entry_bytes_unconsumed = bytes_read;
 +	iso9660->current_position += bytes_read;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_read_format_iso9660_cleanup(struct archive_read *a)
 +{
 +	struct iso9660 *iso9660;
 +	int r = ARCHIVE_OK;
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +	release_files(iso9660);
 +	free(iso9660->read_ce_req.reqs);
 +	archive_string_free(&iso9660->pathname);
 +	archive_string_free(&iso9660->previous_pathname);
 +	if (iso9660->pending_files.files)
 +		free(iso9660->pending_files.files);
 +#ifdef HAVE_ZLIB_H
 +	free(iso9660->entry_zisofs.uncompressed_buffer);
 +	free(iso9660->entry_zisofs.block_pointers);
 +	if (iso9660->entry_zisofs.stream_valid) {
 +		if (inflateEnd(&iso9660->entry_zisofs.stream) != Z_OK) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Failed to clean up zlib decompressor");
 +			r = ARCHIVE_FATAL;
 +		}
 +	}
 +#endif
 +	free(iso9660->utf16be_path);
 +	free(iso9660->utf16be_previous_path);
 +	free(iso9660);
 +	(a->format->data) = NULL;
 +	return (r);
 +}
 +
 +/*
 + * This routine parses a single ISO directory record, makes sense
 + * of any extensions, and stores the result in memory.
 + */
 +static struct file_info *
 +parse_file_info(struct archive_read *a, struct file_info *parent,
 +    const unsigned char *isodirrec)
 +{
 +	struct iso9660 *iso9660;
- 	struct file_info *file;
++	struct file_info *file, *filep;
 +	size_t name_len;
 +	const unsigned char *rr_start, *rr_end;
 +	const unsigned char *p;
 +	size_t dr_len;
- 	uint64_t fsize;
++	uint64_t fsize, offset;
 +	int32_t location;
 +	int flags;
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +
 +	dr_len = (size_t)isodirrec[DR_length_offset];
 +	name_len = (size_t)isodirrec[DR_name_len_offset];
 +	location = archive_le32dec(isodirrec + DR_extent_offset);
 +	fsize = toi(isodirrec + DR_size_offset, DR_size_size);
 +	/* Sanity check that dr_len needs at least 34. */
 +	if (dr_len < 34) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Invalid length of directory record");
 +		return (NULL);
 +	}
 +	/* Sanity check that name_len doesn't exceed dr_len. */
 +	if (dr_len - 33 < name_len || name_len == 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Invalid length of file identifier");
 +		return (NULL);
 +	}
 +	/* Sanity check that location doesn't exceed volume block.
 +	 * Don't check lower limit of location; it's possibility
 +	 * the location has negative value when file type is symbolic
 +	 * link or file size is zero. As far as I know latest mkisofs
 +	 * do that.
 +	 */
 +	if (location > 0 &&
 +	    (location + ((fsize + iso9660->logical_block_size -1)
 +	       / iso9660->logical_block_size))
 +			> (uint32_t)iso9660->volume_block) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Invalid location of extent of file");
 +		return (NULL);
 +	}
 +	/* Sanity check that location doesn't have a negative value
 +	 * when the file is not empty. it's too large. */
 +	if (fsize != 0 && location < 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Invalid location of extent of file");
 +		return (NULL);
 +	}
 +
++	/* Sanity check that this entry does not create a cycle. */
++	offset = iso9660->logical_block_size * (uint64_t)location;
++	for (filep = parent; filep != NULL; filep = filep->parent) {
++		if (filep->offset == offset) {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++			    "Directory structure contains loop");
++			return (NULL);
++		}
++	}
++
 +	/* Create a new file entry and copy data from the ISO dir record. */
 +	file = (struct file_info *)calloc(1, sizeof(*file));
 +	if (file == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "No memory for file entry");
 +		return (NULL);
 +	}
 +	file->parent = parent;
- 	file->offset = iso9660->logical_block_size * (uint64_t)location;
++	file->offset = offset;
 +	file->size = fsize;
 +	file->mtime = isodate7(isodirrec + DR_date_offset);
 +	file->ctime = file->atime = file->mtime;
 +	file->rede_files.first = NULL;
 +	file->rede_files.last = &(file->rede_files.first);
 +
 +	p = isodirrec + DR_name_offset;
 +	/* Rockridge extensions (if any) follow name.  Compute this
 +	 * before fidgeting the name_len below. */
 +	rr_start = p + name_len + (name_len & 1 ? 0 : 1);
 +	rr_end = isodirrec + dr_len;
 +
 +	if (iso9660->seenJoliet) {
 +		/* Joliet names are max 64 chars (128 bytes) according to spec,
 +		 * but genisoimage/mkisofs allows recording longer Joliet
 +		 * names which are 103 UCS2 characters(206 bytes) by their
 +		 * option '-joliet-long'.
 +		 */
 +		if (name_len > 206)
 +			name_len = 206;
 +		name_len &= ~1;
 +
 +		/* trim trailing first version and dot from filename.
 +		 *
 +		 * Remember we were in UTF-16BE land!
 +		 * SEPARATOR 1 (.) and SEPARATOR 2 (;) are both
 +		 * 16 bits big endian characters on Joliet.
 +		 *
 +		 * TODO: sanitize filename?
 +		 *       Joliet allows any UCS-2 char except:
 +		 *       *, /, :, ;, ? and \.
 +		 */
 +		/* Chop off trailing ';1' from files. */
 +		if (name_len > 4 && p[name_len-4] == 0 && p[name_len-3] == ';'
 +		    && p[name_len-2] == 0 && p[name_len-1] == '1')
 +			name_len -= 4;
 +#if 0 /* XXX: this somehow manages to strip of single-character file extensions, like '.c'. */
 +		/* Chop off trailing '.' from filenames. */
 +		if (name_len > 2 && p[name_len-2] == 0 && p[name_len-1] == '.')
 +			name_len -= 2;
 +#endif
 +		if ((file->utf16be_name = malloc(name_len)) == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "No memory for file name");
 +			return (NULL);
 +		}
 +		memcpy(file->utf16be_name, p, name_len);
 +		file->utf16be_bytes = name_len;
 +	} else {
 +		/* Chop off trailing ';1' from files. */
 +		if (name_len > 2 && p[name_len - 2] == ';' &&
 +				p[name_len - 1] == '1')
 +			name_len -= 2;
 +		/* Chop off trailing '.' from filenames. */
 +		if (name_len > 1 && p[name_len - 1] == '.')
 +			--name_len;
 +
 +		archive_strncpy(&file->name, (const char *)p, name_len);
 +	}
 +
 +	flags = isodirrec[DR_flags_offset];
 +	if (flags & 0x02)
 +		file->mode = AE_IFDIR | 0700;
 +	else
 +		file->mode = AE_IFREG | 0400;
 +	if (flags & 0x80)
 +		file->multi_extent = 1;
 +	else
 +		file->multi_extent = 0;
 +	/*
 +	 * Use a location for the file number, which is treated as an inode
 +	 * number to find out hardlink target. If Rockridge extensions is
 +	 * being used, the file number will be overwritten by FILE SERIAL
 +	 * NUMBER of RRIP "PX" extension.
 +	 * Note: Old mkisofs did not record that FILE SERIAL NUMBER
 +	 * in ISO images.
 +	 * Note2: xorriso set 0 to the location of a symlink file. 
 +	 */
 +	if (file->size == 0 && location >= 0) {
 +		/* If file->size is zero, its location points wrong place,
 +		 * and so we should not use it for the file number.
 +		 * When the location has negative value, it can be used
 +		 * for the file number.
 +		 */
 +		file->number = -1;
 +		/* Do not appear before any directory entries. */
 +		file->offset = -1;
 +	} else
 +		file->number = (int64_t)(uint32_t)location;
 +
 +	/* Rockridge extensions overwrite information from above. */
 +	if (iso9660->opt_support_rockridge) {
 +		if (parent == NULL && rr_end - rr_start >= 7) {
 +			p = rr_start;
 +			if (memcmp(p, "SP\x07\x01\xbe\xef", 6) == 0) {
 +				/*
 +				 * SP extension stores the suspOffset
 +				 * (Number of bytes to skip between
 +				 * filename and SUSP records.)
 +				 * It is mandatory by the SUSP standard
 +				 * (IEEE 1281).
 +				 *
 +				 * It allows SUSP to coexist with
 +				 * non-SUSP uses of the System
 +				 * Use Area by placing non-SUSP data
 +				 * before SUSP data.
 +				 *
 +				 * SP extension must be in the root
 +				 * directory entry, disable all SUSP
 +				 * processing if not found.
 +				 */
 +				iso9660->suspOffset = p[6];
 +				iso9660->seenSUSP = 1;
 +				rr_start += 7;
 +			}
 +		}
 +		if (iso9660->seenSUSP) {
 +			int r;
 +
 +			file->name_continues = 0;
 +			file->symlink_continues = 0;
 +			rr_start += iso9660->suspOffset;
 +			r = parse_rockridge(a, file, rr_start, rr_end);
 +			if (r != ARCHIVE_OK) {
 +				free(file);
 +				return (NULL);
 +			}
 +			/*
 +			 * A file size of symbolic link files in ISO images
 +			 * made by makefs is not zero and its location is
 +			 * the same as those of next regular file. That is
 +			 * the same as hard like file and it causes unexpected
 +			 * error. 
 +			 */
 +			if (file->size > 0 &&
 +			    (file->mode & AE_IFMT) == AE_IFLNK) {
 +				file->size = 0;
 +				file->number = -1;
 +				file->offset = -1;
 +			}
 +		} else
 +			/* If there isn't SUSP, disable parsing
 +			 * rock ridge extensions. */
 +			iso9660->opt_support_rockridge = 0;
 +	}
 +
 +	file->nlinks = 1;/* Reset nlink. we'll calculate it later. */
 +	/* Tell file's parent how many children that parent has. */
 +	if (parent != NULL && (flags & 0x02))
 +		parent->subdirs++;
 +
 +	if (iso9660->seenRockridge) {
 +		if (parent != NULL && parent->parent == NULL &&
 +		    (flags & 0x02) && iso9660->rr_moved == NULL &&
 +		    file->name.s &&
 +		    (strcmp(file->name.s, "rr_moved") == 0 ||
 +		     strcmp(file->name.s, ".rr_moved") == 0)) {
 +			iso9660->rr_moved = file;
 +			file->rr_moved = 1;
 +			file->rr_moved_has_re_only = 1;
 +			file->re = 0;
 +			parent->subdirs--;
 +		} else if (file->re) {
 +			/*
 +			 * Sanity check: file's parent is rr_moved.
 +			 */
 +			if (parent == NULL || parent->rr_moved == 0) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Invalid Rockridge RE");
 +				return (NULL);
 +			}
 +			/*
 +			 * Sanity check: file does not have "CL" extension.
 +			 */
 +			if (file->cl_offset) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Invalid Rockridge RE and CL");
 +				return (NULL);
 +			}
 +			/*
 +			 * Sanity check: The file type must be a directory.
 +			 */
 +			if ((flags & 0x02) == 0) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Invalid Rockridge RE");
 +				return (NULL);
 +			}
 +		} else if (parent != NULL && parent->rr_moved)
 +			file->rr_moved_has_re_only = 0;
 +		else if (parent != NULL && (flags & 0x02) &&
 +		    (parent->re || parent->re_descendant))
 +			file->re_descendant = 1;
 +		if (file->cl_offset) {
 +			struct file_info *r;
 +
 +			if (parent == NULL || parent->parent == NULL) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Invalid Rockridge CL");
 +				return (NULL);
 +			}
 +			/*
 +			 * Sanity check: The file type must be a regular file.
 +			 */
 +			if ((flags & 0x02) != 0) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Invalid Rockridge CL");
 +				return (NULL);
 +			}
 +			parent->subdirs++;
 +			/* Overwrite an offset and a number of this "CL" entry
 +			 * to appear before other dirs. "+1" to those is to
 +			 * make sure to appear after "RE" entry which this
 +			 * "CL" entry should be connected with. */
 +			file->offset = file->number = file->cl_offset + 1;
 +
 +			/*
 +			 * Sanity check: cl_offset does not point at its
 +			 * the parents or itself.
 +			 */
 +			for (r = parent; r; r = r->parent) {
 +				if (r->offset == file->cl_offset) {
 +					archive_set_error(&a->archive,
 +					    ARCHIVE_ERRNO_MISC,
 +					    "Invalid Rockridge CL");
 +					return (NULL);
 +				}
 +			}
 +			if (file->cl_offset == file->offset ||
 +			    parent->rr_moved) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Invalid Rockridge CL");
 +				return (NULL);
 +			}
 +		}
 +	}
 +
 +#if DEBUG
 +	/* DEBUGGING: Warn about attributes I don't yet fully support. */
 +	if ((flags & ~0x02) != 0) {
 +		fprintf(stderr, "\n ** Unrecognized flag: ");
 +		dump_isodirrec(stderr, isodirrec);
 +		fprintf(stderr, "\n");
 +	} else if (toi(isodirrec + DR_volume_sequence_number_offset, 2) != 1) {
 +		fprintf(stderr, "\n ** Unrecognized sequence number: ");
 +		dump_isodirrec(stderr, isodirrec);
 +		fprintf(stderr, "\n");
 +	} else if (*(isodirrec + DR_file_unit_size_offset) != 0) {
 +		fprintf(stderr, "\n ** Unexpected file unit size: ");
 +		dump_isodirrec(stderr, isodirrec);
 +		fprintf(stderr, "\n");
 +	} else if (*(isodirrec + DR_interleave_offset) != 0) {
 +		fprintf(stderr, "\n ** Unexpected interleave: ");
 +		dump_isodirrec(stderr, isodirrec);
 +		fprintf(stderr, "\n");
 +	} else if (*(isodirrec + DR_ext_attr_length_offset) != 0) {
 +		fprintf(stderr, "\n ** Unexpected extended attribute length: ");
 +		dump_isodirrec(stderr, isodirrec);
 +		fprintf(stderr, "\n");
 +	}
 +#endif
 +	register_file(iso9660, file);
 +	return (file);
 +}
 +
 +static int
 +parse_rockridge(struct archive_read *a, struct file_info *file,
 +    const unsigned char *p, const unsigned char *end)
 +{
 +	struct iso9660 *iso9660;
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +
 +	while (p + 4 <= end  /* Enough space for another entry. */
 +	    && p[0] >= 'A' && p[0] <= 'Z' /* Sanity-check 1st char of name. */
 +	    && p[1] >= 'A' && p[1] <= 'Z' /* Sanity-check 2nd char of name. */
 +	    && p[2] >= 4 /* Sanity-check length. */
 +	    && p + p[2] <= end) { /* Sanity-check length. */
 +		const unsigned char *data = p + 4;
 +		int data_length = p[2] - 4;
 +		int version = p[3];
 +
 +		switch(p[0]) {
 +		case 'C':
 +			if (p[1] == 'E') {
 +				if (version == 1 && data_length == 24) {
 +					/*
 +					 * CE extension comprises:
 +					 *   8 byte sector containing extension
 +					 *   8 byte offset w/in above sector
 +					 *   8 byte length of continuation
 +					 */
 +					int32_t location =
 +					    archive_le32dec(data);
 +					file->ce_offset =
 +					    archive_le32dec(data+8);
 +					file->ce_size =
 +					    archive_le32dec(data+16);
 +					if (register_CE(a, location, file)
 +					    != ARCHIVE_OK)
 +						return (ARCHIVE_FATAL);
 +				}
 +			}
 +			else if (p[1] == 'L') {
 +				if (version == 1 && data_length == 8) {
 +					file->cl_offset = (uint64_t)
 +					    iso9660->logical_block_size *
 +					    (uint64_t)archive_le32dec(data);
 +					iso9660->seenRockridge = 1;
 +				}
 +			}
 +			break;
 +		case 'N':
 +			if (p[1] == 'M') {
 +				if (version == 1) {
 +					parse_rockridge_NM1(file,
 +					    data, data_length);
 +					iso9660->seenRockridge = 1;
 +				}
 +			}
 +			break;
 +		case 'P':
 +			/*
 +			 * PD extension is padding;
 +			 * contents are always ignored.
 +			 *
 +			 * PL extension won't appear;
 +			 * contents are always ignored.
 +			 */
 +			if (p[1] == 'N') {
 +				if (version == 1 && data_length == 16) {
 +					file->rdev = toi(data,4);
 +					file->rdev <<= 32;
 +					file->rdev |= toi(data + 8, 4);
 +					iso9660->seenRockridge = 1;
 +				}
 +			}
 +			else if (p[1] == 'X') {
 +				/*
 +				 * PX extension comprises:
 +				 *   8 bytes for mode,
 +				 *   8 bytes for nlinks,
 +				 *   8 bytes for uid,
 +				 *   8 bytes for gid,
 +				 *   8 bytes for inode.
 +				 */
 +				if (version == 1) {
 +					if (data_length >= 8)
 +						file->mode
 +						    = toi(data, 4);
 +					if (data_length >= 16)
 +						file->nlinks
 +						    = toi(data + 8, 4);
 +					if (data_length >= 24)
 +						file->uid
 +						    = toi(data + 16, 4);
 +					if (data_length >= 32)
 +						file->gid
 +						    = toi(data + 24, 4);
 +					if (data_length >= 40)
 +						file->number
 +						    = toi(data + 32, 4);
 +					iso9660->seenRockridge = 1;
 +				}
 +			}
 +			break;
 +		case 'R':
 +			if (p[1] == 'E' && version == 1) {
 +				file->re = 1;
 +				iso9660->seenRockridge = 1;
 +			}
 +			else if (p[1] == 'R' && version == 1) {
 +				/*
 +				 * RR extension comprises:
 +				 *    one byte flag value
 +				 * This extension is obsolete,
 +				 * so contents are always ignored.
 +				 */
 +			}
 +			break;
 +		case 'S':
 +			if (p[1] == 'L') {
 +				if (version == 1) {
 +					parse_rockridge_SL1(file,
 +					    data, data_length);
 +					iso9660->seenRockridge = 1;
 +				}
 +			}
 +			else if (p[1] == 'T'
 +			    && data_length == 0 && version == 1) {
 +				/*
 +				 * ST extension marks end of this
 +				 * block of SUSP entries.
 +				 *
 +				 * It allows SUSP to coexist with
 +				 * non-SUSP uses of the System
 +				 * Use Area by placing non-SUSP data
 +				 * after SUSP data.
 +				 */
 +				iso9660->seenSUSP = 0;
 +				iso9660->seenRockridge = 0;
 +				return (ARCHIVE_OK);
 +			}
 +			break;
 +		case 'T':
 +			if (p[1] == 'F') {
 +				if (version == 1) {
 +					parse_rockridge_TF1(file,
 +					    data, data_length);
 +					iso9660->seenRockridge = 1;
 +				}
 +			}
 +			break;
 +		case 'Z':
 +			if (p[1] == 'F') {
 +				if (version == 1)
 +					parse_rockridge_ZF1(file,
 +					    data, data_length);
 +			}
 +			break;
 +		default:
 +			break;
 +		}
 +
 +		p += p[2];
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +register_CE(struct archive_read *a, int32_t location,
 +    struct file_info *file)
 +{
 +	struct iso9660 *iso9660;
 +	struct read_ce_queue *heap;
 +	struct read_ce_req *p;
 +	uint64_t offset, parent_offset;
 +	int hole, parent;
 +
 +	iso9660 = (struct iso9660 *)(a->format->data);
 +	offset = ((uint64_t)location) * (uint64_t)iso9660->logical_block_size;
 +	if (((file->mode & AE_IFMT) == AE_IFREG &&
 +	    offset >= file->offset) ||
 +	    offset < iso9660->current_position ||
 +	    (((uint64_t)file->ce_offset) + file->ce_size)
 +	      > (uint64_t)iso9660->logical_block_size ||
 +	    offset + file->ce_offset + file->ce_size
 +		  > iso9660->volume_size) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Invalid parameter in SUSP \"CE\" extension");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Expand our CE list as necessary. */
 +	heap = &(iso9660->read_ce_req);
 +	if (heap->cnt >= heap->allocated) {
 +		int new_size;
 +
 +		if (heap->allocated < 16)
 +			new_size = 16;
 +		else
 +			new_size = heap->allocated * 2;
 +		/* Overflow might keep us from growing the list. */
 +		if (new_size <= heap->allocated) {
 +			archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		p = calloc(new_size, sizeof(p[0]));
 +		if (p == NULL) {
 +			archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		if (heap->reqs != NULL) {
 +			memcpy(p, heap->reqs, heap->cnt * sizeof(*p));
 +			free(heap->reqs);
 +		}
 +		heap->reqs = p;
 +		heap->allocated = new_size;
 +	}
 +
 +	/*
 +	 * Start with hole at end, walk it up tree to find insertion point.
 +	 */
 +	hole = heap->cnt++;
 +	while (hole > 0) {
 +		parent = (hole - 1)/2;
 +		parent_offset = heap->reqs[parent].offset;
 +		if (offset >= parent_offset) {
 +			heap->reqs[hole].offset = offset;
 +			heap->reqs[hole].file = file;
 +			return (ARCHIVE_OK);
 +		}
 +		/* Move parent into hole <==> move hole up tree. */
 +		heap->reqs[hole] = heap->reqs[parent];
 +		hole = parent;
 +	}
 +	heap->reqs[0].offset = offset;
 +	heap->reqs[0].file = file;
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +next_CE(struct read_ce_queue *heap)
 +{
 +	uint64_t a_offset, b_offset, c_offset;
 +	int a, b, c;
 +	struct read_ce_req tmp;
 +
 +	if (heap->cnt < 1)
 +		return;
 +
 +	/*
 +	 * Move the last item in the heap to the root of the tree
 +	 */
 +	heap->reqs[0] = heap->reqs[--(heap->cnt)];
 +
 +	/*
 +	 * Rebalance the heap.
 +	 */
 +	a = 0; /* Starting element and its offset */
 +	a_offset = heap->reqs[a].offset;
 +	for (;;) {
 +		b = a + a + 1; /* First child */
 +		if (b >= heap->cnt)
 +			return;
 +		b_offset = heap->reqs[b].offset;
 +		c = b + 1; /* Use second child if it is smaller. */
 +		if (c < heap->cnt) {
 +			c_offset = heap->reqs[c].offset;
 +			if (c_offset < b_offset) {
 +				b = c;
 +				b_offset = c_offset;
 +			}
 +		}
 +		if (a_offset <= b_offset)
 +			return;
 +		tmp = heap->reqs[a];
 +		heap->reqs[a] = heap->reqs[b];
 +		heap->reqs[b] = tmp;
 +		a = b;
 +	}
 +}
 +
 +
 +static int
 +read_CE(struct archive_read *a, struct iso9660 *iso9660)
 +{
 +	struct read_ce_queue *heap;
 +	const unsigned char *b, *p, *end;
 +	struct file_info *file;
 +	size_t step;
 +	int r;
 +
 +	/* Read data which RRIP "CE" extension points. */
 +	heap = &(iso9660->read_ce_req);
 +	step = iso9660->logical_block_size;
 +	while (heap->cnt &&
 +	    heap->reqs[0].offset == iso9660->current_position) {
 +		b = __archive_read_ahead(a, step, NULL);
 +		if (b == NULL) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Failed to read full block when scanning "
 +			    "ISO9660 directory list");
 +			return (ARCHIVE_FATAL);
 +		}
 +		do {
 +			file = heap->reqs[0].file;
 +			if (file->ce_offset + file->ce_size > step) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_FILE_FORMAT,
 +				    "Malformed CE information");
 +				return (ARCHIVE_FATAL);
 +			}
 +			p = b + file->ce_offset;
 +			end = p + file->ce_size;
 +			next_CE(heap);
 +			r = parse_rockridge(a, file, p, end);
 +			if (r != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		} while (heap->cnt &&
 +		    heap->reqs[0].offset == iso9660->current_position);
 +		/* NOTE: Do not move this consume's code to fron of
 +		 * do-while loop. Registration of nested CE extension
 +		 * might cause error because of current position. */
 +		__archive_read_consume(a, step);
 +		iso9660->current_position += step;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +parse_rockridge_NM1(struct file_info *file,
 +		    const unsigned char *data, int data_length)
 +{
 +	if (!file->name_continues)
 +		archive_string_empty(&file->name);
 +	file->name_continues = 0;
 +	if (data_length < 1)
 +		return;
 +	/*
 +	 * NM version 1 extension comprises:
 +	 *   1 byte flag, value is one of:
 +	 *     = 0: remainder is name
 +	 *     = 1: remainder is name, next NM entry continues name
 +	 *     = 2: "."
 +	 *     = 4: ".."
 +	 *     = 32: Implementation specific
 +	 *     All other values are reserved.
 +	 */
 +	switch(data[0]) {
 +	case 0:
 +		if (data_length < 2)
 +			return;
 +		archive_strncat(&file->name,
 +		    (const char *)data + 1, data_length - 1);
 +		break;
 +	case 1:
 +		if (data_length < 2)
 +			return;
 +		archive_strncat(&file->name,
 +		    (const char *)data + 1, data_length - 1);
 +		file->name_continues = 1;
 +		break;
 +	case 2:
 +		archive_strcat(&file->name, ".");
 +		break;
 +	case 4:
 +		archive_strcat(&file->name, "..");
 +		break;
 +	default:
 +		return;
 +	}
 +
 +}
 +
 +static void
 +parse_rockridge_TF1(struct file_info *file, const unsigned char *data,
 +    int data_length)
 +{
 +	char flag;
 +	/*
 +	 * TF extension comprises:
 +	 *   one byte flag
 +	 *   create time (optional)
 +	 *   modify time (optional)
 +	 *   access time (optional)
 +	 *   attribute time (optional)
 +	 *  Time format and presence of fields
 +	 *  is controlled by flag bits.
 +	 */
 +	if (data_length < 1)
 +		return;
 +	flag = data[0];
 +	++data;
 +	--data_length;
 +	if (flag & 0x80) {
 +		/* Use 17-byte time format. */
 +		if ((flag & 1) && data_length >= 17) {
 +			/* Create time. */
 +			file->birthtime_is_set = 1;
 +			file->birthtime = isodate17(data);
 +			data += 17;
 +			data_length -= 17;
 +		}
 +		if ((flag & 2) && data_length >= 17) {
 +			/* Modify time. */
 +			file->mtime = isodate17(data);
 +			data += 17;
 +			data_length -= 17;
 +		}
 +		if ((flag & 4) && data_length >= 17) {
 +			/* Access time. */
 +			file->atime = isodate17(data);
 +			data += 17;
 +			data_length -= 17;
 +		}
 +		if ((flag & 8) && data_length >= 17) {
 +			/* Attribute change time. */
 +			file->ctime = isodate17(data);
 +		}
 +	} else {
 +		/* Use 7-byte time format. */
 +		if ((flag & 1) && data_length >= 7) {
 +			/* Create time. */
 +			file->birthtime_is_set = 1;
 +			file->birthtime = isodate7(data);
 +			data += 7;
 +			data_length -= 7;
 +		}
 +		if ((flag & 2) && data_length >= 7) {
 +			/* Modify time. */
 +			file->mtime = isodate7(data);
 +			data += 7;
 +			data_length -= 7;
 +		}
 +		if ((flag & 4) && data_length >= 7) {
 +			/* Access time. */
 +			file->atime = isodate7(data);
 +			data += 7;
 +			data_length -= 7;
 +		}
 +		if ((flag & 8) && data_length >= 7) {
 +			/* Attribute change time. */
 +			file->ctime = isodate7(data);
 +		}
 +	}
 +}
 +
 +static void
 +parse_rockridge_SL1(struct file_info *file, const unsigned char *data,
 +    int data_length)
 +{
 +	const char *separator = "";
 +
 +	if (!file->symlink_continues || file->symlink.length < 1)
 +		archive_string_empty(&file->symlink);
 +	file->symlink_continues = 0;
 +
 +	/*
 +	 * Defined flag values:
 +	 *  0: This is the last SL record for this symbolic link
 +	 *  1: this symbolic link field continues in next SL entry
 +	 *  All other values are reserved.
 +	 */
 +	if (data_length < 1)
 +		return;
 +	switch(*data) {
 +	case 0:
 +		break;
 +	case 1:
 +		file->symlink_continues = 1;
 +		break;
 +	default:
 +		return;
 +	}
 +	++data;  /* Skip flag byte. */
 +	--data_length;
 +
 +	/*
 +	 * SL extension body stores "components".
 +	 * Basically, this is a complicated way of storing
 +	 * a POSIX path.  It also interferes with using
 +	 * symlinks for storing non-path data. <sigh>
 +	 *
 +	 * Each component is 2 bytes (flag and length)
 +	 * possibly followed by name data.
 +	 */
 +	while (data_length >= 2) {
 +		unsigned char flag = *data++;
 +		unsigned char nlen = *data++;
 +		data_length -= 2;
 +
 +		archive_strcat(&file->symlink, separator);
 +		separator = "/";
 +
 +		switch(flag) {
 +		case 0: /* Usual case, this is text. */
 +			if (data_length < nlen)
 +				return;
 +			archive_strncat(&file->symlink,
 +			    (const char *)data, nlen);
 +			break;
 +		case 0x01: /* Text continues in next component. */
 +			if (data_length < nlen)
 +				return;
 +			archive_strncat(&file->symlink,
 +			    (const char *)data, nlen);
 +			separator = "";
 +			break;
 +		case 0x02: /* Current dir. */
 +			archive_strcat(&file->symlink, ".");
 +			break;
 +		case 0x04: /* Parent dir. */
 +			archive_strcat(&file->symlink, "..");
 +			break;
 +		case 0x08: /* Root of filesystem. */
 +			archive_strcat(&file->symlink, "/");
 +			separator = "";
 +			break;
 +		case 0x10: /* Undefined (historically "volume root" */
 +			archive_string_empty(&file->symlink);
 +			archive_strcat(&file->symlink, "ROOT");
 +			break;
 +		case 0x20: /* Undefined (historically "hostname") */
 +			archive_strcat(&file->symlink, "hostname");
 +			break;
 +		default:
 +			/* TODO: issue a warning ? */
 +			return;
 +		}
 +		data += nlen;
 +		data_length -= nlen;
 +	}
 +}
 +
 +static void
 +parse_rockridge_ZF1(struct file_info *file, const unsigned char *data,
 +    int data_length)
 +{
 +
 +	if (data[0] == 0x70 && data[1] == 0x7a && data_length == 12) {
 +		/* paged zlib */
 +		file->pz = 1;
 +		file->pz_log2_bs = data[3];
 +		file->pz_uncompressed_size = archive_le32dec(&data[4]);
 +	}
 +}
 +
 +static void
 +register_file(struct iso9660 *iso9660, struct file_info *file)
 +{
 +
 +	file->use_next = iso9660->use_files;
 +	iso9660->use_files = file;
 +}
 +
 +static void
 +release_files(struct iso9660 *iso9660)
 +{
 +	struct content *con, *connext;
 +	struct file_info *file;
 +
 +	file = iso9660->use_files;
 +	while (file != NULL) {
 +		struct file_info *next = file->use_next;
 +
 +		archive_string_free(&file->name);
 +		archive_string_free(&file->symlink);
 +		free(file->utf16be_name);
 +		con = file->contents.first;
 +		while (con != NULL) {
 +			connext = con->next;
 +			free(con);
 +			con = connext;
 +		}
 +		free(file);
 +		file = next;
 +	}
 +}
 +
 +static int
 +next_entry_seek(struct archive_read *a, struct iso9660 *iso9660,
 +    struct file_info **pfile)
 +{
 +	struct file_info *file;
 +	int r;
 +
 +	r = next_cache_entry(a, iso9660, pfile);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	file = *pfile;
 +
 +	/* Don't waste time seeking for zero-length bodies. */
 +	if (file->size == 0)
 +		file->offset = iso9660->current_position;
 +
 +	/* flush any remaining bytes from the last round to ensure
 +	 * we're positioned */
 +	if (iso9660->entry_bytes_unconsumed) {
 +		__archive_read_consume(a, iso9660->entry_bytes_unconsumed);
 +		iso9660->entry_bytes_unconsumed = 0;
 +	}
 +
 +	/* Seek forward to the start of the entry. */
 +	if (iso9660->current_position < file->offset) {
 +		int64_t step;
 +
 +		step = file->offset - iso9660->current_position;
 +		step = __archive_read_consume(a, step);
 +		if (step < 0)
 +			return ((int)step);
 +		iso9660->current_position = file->offset;
 +	}
 +
 +	/* We found body of file; handle it now. */
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +next_cache_entry(struct archive_read *a, struct iso9660 *iso9660,
 +    struct file_info **pfile)
 +{
 +	struct file_info *file;
 +	struct {
 +		struct file_info	*first;
 +		struct file_info	**last;
 +	}	empty_files;
 +	int64_t number;
 +	int count;
 +
 +	file = cache_get_entry(iso9660);
 +	if (file != NULL) {
 +		*pfile = file;
 +		return (ARCHIVE_OK);
 +	}
 +
 +	for (;;) {
 +		struct file_info *re, *d;
 +
 +		*pfile = file = next_entry(iso9660);
 +		if (file == NULL) {
 +			/*
 +			 * If directory entries all which are descendant of
 +			 * rr_moved are stil remaning, expose their. 
 +			 */
 +			if (iso9660->re_files.first != NULL && 
 +			    iso9660->rr_moved != NULL &&
 +			    iso9660->rr_moved->rr_moved_has_re_only)
 +				/* Expose "rr_moved" entry. */
 +				cache_add_entry(iso9660, iso9660->rr_moved);
 +			while ((re = re_get_entry(iso9660)) != NULL) {
 +				/* Expose its descendant dirs. */
 +				while ((d = rede_get_entry(re)) != NULL)
 +					cache_add_entry(iso9660, d);
 +			}
 +			if (iso9660->cache_files.first != NULL)
 +				return (next_cache_entry(a, iso9660, pfile));
 +			return (ARCHIVE_EOF);
 +		}
 +
 +		if (file->cl_offset) {
 +			struct file_info *first_re = NULL;
 +			int nexted_re = 0;
 +
 +			/*
 +			 * Find "RE" dir for the current file, which
 +			 * has "CL" flag.
 +			 */
 +			while ((re = re_get_entry(iso9660))
 +			    != first_re) {
 +				if (first_re == NULL)
 +					first_re = re;
 +				if (re->offset == file->cl_offset) {
 +					re->parent->subdirs--;
 +					re->parent = file->parent;
 +					re->re = 0;
 +					if (re->parent->re_descendant) {
 +						nexted_re = 1;
 +						re->re_descendant = 1;
 +						if (rede_add_entry(re) < 0)
 +							goto fatal_rr;
 +						/* Move a list of descendants
 +						 * to a new ancestor. */
 +						while ((d = rede_get_entry(
 +						    re)) != NULL)
 +							if (rede_add_entry(d)
 +							    < 0)
 +								goto fatal_rr;
 +						break;
 +					}
 +					/* Replace the current file
 +					 * with "RE" dir */
 +					*pfile = file = re;
 +					/* Expose its descendant */
 +					while ((d = rede_get_entry(
 +					    file)) != NULL)
 +						cache_add_entry(
 +						    iso9660, d);
 +					break;
 +				} else
 +					re_add_entry(iso9660, re);
 +			}
 +			if (nexted_re) {
 +				/*
 +				 * Do not expose this at this time
 +				 * because we have not gotten its full-path
 +				 * name yet.
 +				 */
 +				continue;
 +			}
 +		} else if ((file->mode & AE_IFMT) == AE_IFDIR) {
 +			int r;
 +
 +			/* Read file entries in this dir. */
 +			r = read_children(a, file);
 +			if (r != ARCHIVE_OK)
 +				return (r);
 +
 +			/*
 +			 * Handle a special dir of Rockridge extensions,
 +			 * "rr_moved".
 +			 */
 +			if (file->rr_moved) {
 +				/*
 +				 * If this has only the subdirectories which
 +				 * have "RE" flags, do not expose at this time.
 +				 */
 +				if (file->rr_moved_has_re_only)
 +					continue;
 +				/* Otherwise expose "rr_moved" entry. */
 +			} else if (file->re) {
 +				/*
 +				 * Do not expose this at this time
 +				 * because we have not gotten its full-path
 +				 * name yet.
 +				 */
 +				re_add_entry(iso9660, file);
 +				continue;
 +			} else if (file->re_descendant) {
 +				/*
 +				 * If the top level "RE" entry of this entry
 +				 * is not exposed, we, accordingly, should not
 +				 * expose this entry at this time because
 +				 * we cannot make its proper full-path name.
 +				 */
 +				if (rede_add_entry(file) == 0)
 +					continue;
 +				/* Otherwise we can expose this entry because
 +				 * it seems its top level "RE" has already been
 +				 * exposed. */
 +			}
 +		}
 +		break;
 +	}
 +
 +	if ((file->mode & AE_IFMT) != AE_IFREG || file->number == -1)
 +		return (ARCHIVE_OK);
 +
 +	count = 0;
 +	number = file->number;
 +	iso9660->cache_files.first = NULL;
 +	iso9660->cache_files.last = &(iso9660->cache_files.first);
 +	empty_files.first = NULL;
 +	empty_files.last = &empty_files.first;
 +	/* Collect files which has the same file serial number.
 +	 * Peek pending_files so that file which number is different
 +	 * is not put bak. */
 +	while (iso9660->pending_files.used > 0 &&
 +	    (iso9660->pending_files.files[0]->number == -1 ||
 +	     iso9660->pending_files.files[0]->number == number)) {
 +		if (file->number == -1) {
 +			/* This file has the same offset
 +			 * but it's wrong offset which empty files
 +			 * and symlink files have.
 +			 * NOTE: This wrong offse was recorded by
 +			 * old mkisofs utility. If ISO images is
 +			 * created by latest mkisofs, this does not
 +			 * happen.
 +			 */
 +			file->next = NULL;
 +			*empty_files.last = file;
 +			empty_files.last = &(file->next);
 +		} else {
 +			count++;
 +			cache_add_entry(iso9660, file);
 +		}
 +		file = next_entry(iso9660);
 +	}
 +
 +	if (count == 0) {
 +		*pfile = file;
 +		return ((file == NULL)?ARCHIVE_EOF:ARCHIVE_OK);
 +	}
 +	if (file->number == -1) {
 +		file->next = NULL;
 +		*empty_files.last = file;
 +		empty_files.last = &(file->next);
 +	} else {
 +		count++;
 +		cache_add_entry(iso9660, file);
 +	}
 +
 +	if (count > 1) {
 +		/* The count is the same as number of hardlink,
 +		 * so much so that each nlinks of files in cache_file
 +		 * is overwritten by value of the count.
 +		 */
 +		for (file = iso9660->cache_files.first;
 +		    file != NULL; file = file->next)
 +			file->nlinks = count;
 +	}
 +	/* If there are empty files, that files are added
 +	 * to the tail of the cache_files. */
 +	if (empty_files.first != NULL) {
 +		*iso9660->cache_files.last = empty_files.first;
 +		iso9660->cache_files.last = empty_files.last;
 +	}
 +	*pfile = cache_get_entry(iso9660);
 +	return ((*pfile == NULL)?ARCHIVE_EOF:ARCHIVE_OK);
 +
 +fatal_rr:
 +	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +	    "Failed to connect 'CL' pointer to 'RE' rr_moved pointer of "
 +	    "Rockridge extensions: current position = %jd, CL offset = %jd",
 +	    (intmax_t)iso9660->current_position, (intmax_t)file->cl_offset);
 +	return (ARCHIVE_FATAL);
 +}
 +
 +static inline void
 +re_add_entry(struct iso9660 *iso9660, struct file_info *file)
 +{
 +	file->re_next = NULL;
 +	*iso9660->re_files.last = file;
 +	iso9660->re_files.last = &(file->re_next);
 +}
 +
 +static inline struct file_info *
 +re_get_entry(struct iso9660 *iso9660)
 +{
 +	struct file_info *file;
 +
 +	if ((file = iso9660->re_files.first) != NULL) {
 +		iso9660->re_files.first = file->re_next;
 +		if (iso9660->re_files.first == NULL)
 +			iso9660->re_files.last =
 +			    &(iso9660->re_files.first);
 +	}
 +	return (file);
 +}
 +
 +static inline int
 +rede_add_entry(struct file_info *file)
 +{
 +	struct file_info *re;
 +
 +	/*
 +	 * Find "RE" entry.
 +	 */
 +	re = file->parent;
 +	while (re != NULL && !re->re)
 +		re = re->parent;
 +	if (re == NULL)
 +		return (-1);
 +
 +	file->re_next = NULL;
 +	*re->rede_files.last = file;
 +	re->rede_files.last = &(file->re_next);
 +	return (0);
 +}
 +
 +static inline struct file_info *
 +rede_get_entry(struct file_info *re)
 +{
 +	struct file_info *file;
 +
 +	if ((file = re->rede_files.first) != NULL) {
 +		re->rede_files.first = file->re_next;
 +		if (re->rede_files.first == NULL)
 +			re->rede_files.last =
 +			    &(re->rede_files.first);
 +	}
 +	return (file);
 +}
 +
 +static inline void
 +cache_add_entry(struct iso9660 *iso9660, struct file_info *file)
 +{
 +	file->next = NULL;
 +	*iso9660->cache_files.last = file;
 +	iso9660->cache_files.last = &(file->next);
 +}
 +
 +static inline struct file_info *
 +cache_get_entry(struct iso9660 *iso9660)
 +{
 +	struct file_info *file;
 +
 +	if ((file = iso9660->cache_files.first) != NULL) {
 +		iso9660->cache_files.first = file->next;
 +		if (iso9660->cache_files.first == NULL)
 +			iso9660->cache_files.last =
 +			    &(iso9660->cache_files.first);
 +	}
 +	return (file);
 +}
 +
 +static int
 +heap_add_entry(struct archive_read *a, struct heap_queue *heap,
 +    struct file_info *file, uint64_t key)
 +{
 +	uint64_t file_key, parent_key;
 +	int hole, parent;
 +
 +	/* Expand our pending files list as necessary. */
 +	if (heap->used >= heap->allocated) {
 +		struct file_info **new_pending_files;
 +		int new_size = heap->allocated * 2;
 +
 +		if (heap->allocated < 1024)
 +			new_size = 1024;
 +		/* Overflow might keep us from growing the list. */
 +		if (new_size <= heap->allocated) {
 +			archive_set_error(&a->archive,
 +			    ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		new_pending_files = (struct file_info **)
 +		    malloc(new_size * sizeof(new_pending_files[0]));
 +		if (new_pending_files == NULL) {
 +			archive_set_error(&a->archive,
 +			    ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		memcpy(new_pending_files, heap->files,
 +		    heap->allocated * sizeof(new_pending_files[0]));
 +		if (heap->files != NULL)
 +			free(heap->files);
 +		heap->files = new_pending_files;
 +		heap->allocated = new_size;
 +	}
 +
 +	file_key = file->key = key;
 +
 +	/*
 +	 * Start with hole at end, walk it up tree to find insertion point.
 +	 */
 +	hole = heap->used++;
 +	while (hole > 0) {
 +		parent = (hole - 1)/2;
 +		parent_key = heap->files[parent]->key;
 +		if (file_key >= parent_key) {
 +			heap->files[hole] = file;
 +			return (ARCHIVE_OK);
 +		}
 +		/* Move parent into hole <==> move hole up tree. */
 +		heap->files[hole] = heap->files[parent];
 +		hole = parent;
 +	}
 +	heap->files[0] = file;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static struct file_info *
 +heap_get_entry(struct heap_queue *heap)
 +{
 +	uint64_t a_key, b_key, c_key;
 +	int a, b, c;
 +	struct file_info *r, *tmp;
 +
 +	if (heap->used < 1)
 +		return (NULL);
 +
 +	/*
 +	 * The first file in the list is the earliest; we'll return this.
 +	 */
 +	r = heap->files[0];
 +
 +	/*
 +	 * Move the last item in the heap to the root of the tree
 +	 */
 +	heap->files[0] = heap->files[--(heap->used)];
 +
 +	/*
 +	 * Rebalance the heap.
 +	 */
 +	a = 0; /* Starting element and its heap key */
 +	a_key = heap->files[a]->key;
 +	for (;;) {
 +		b = a + a + 1; /* First child */
 +		if (b >= heap->used)
 +			return (r);
 +		b_key = heap->files[b]->key;
 +		c = b + 1; /* Use second child if it is smaller. */
 +		if (c < heap->used) {
 +			c_key = heap->files[c]->key;
 +			if (c_key < b_key) {
 +				b = c;
 +				b_key = c_key;
 +			}
 +		}
 +		if (a_key <= b_key)
 +			return (r);
 +		tmp = heap->files[a];
 +		heap->files[a] = heap->files[b];
 +		heap->files[b] = tmp;
 +		a = b;
 +	}
 +}
 +
 +static unsigned int
 +toi(const void *p, int n)
 +{
 +	const unsigned char *v = (const unsigned char *)p;
 +	if (n > 1)
 +		return v[0] + 256 * toi(v + 1, n - 1);
 +	if (n == 1)
 +		return v[0];
 +	return (0);
 +}
 +
 +static time_t
 +isodate7(const unsigned char *v)
 +{
 +	struct tm tm;
 +	int offset;
 +	time_t t;
 +
 +	memset(&tm, 0, sizeof(tm));
 +	tm.tm_year = v[0];
 +	tm.tm_mon = v[1] - 1;
 +	tm.tm_mday = v[2];
 +	tm.tm_hour = v[3];
 +	tm.tm_min = v[4];
 +	tm.tm_sec = v[5];
 +	/* v[6] is the signed timezone offset, in 1/4-hour increments. */
 +	offset = ((const signed char *)v)[6];
 +	if (offset > -48 && offset < 52) {
 +		tm.tm_hour -= offset / 4;
 +		tm.tm_min -= (offset % 4) * 15;
 +	}
 +	t = time_from_tm(&tm);
 +	if (t == (time_t)-1)
 +		return ((time_t)0);
 +	return (t);
 +}
 +
 +static time_t
 +isodate17(const unsigned char *v)
 +{
 +	struct tm tm;
 +	int offset;
 +	time_t t;
 +
 +	memset(&tm, 0, sizeof(tm));
 +	tm.tm_year = (v[0] - '0') * 1000 + (v[1] - '0') * 100
 +	    + (v[2] - '0') * 10 + (v[3] - '0')
 +	    - 1900;
 +	tm.tm_mon = (v[4] - '0') * 10 + (v[5] - '0');
 +	tm.tm_mday = (v[6] - '0') * 10 + (v[7] - '0');
 +	tm.tm_hour = (v[8] - '0') * 10 + (v[9] - '0');
 +	tm.tm_min = (v[10] - '0') * 10 + (v[11] - '0');
 +	tm.tm_sec = (v[12] - '0') * 10 + (v[13] - '0');
 +	/* v[16] is the signed timezone offset, in 1/4-hour increments. */
 +	offset = ((const signed char *)v)[16];
 +	if (offset > -48 && offset < 52) {
 +		tm.tm_hour -= offset / 4;
 +		tm.tm_min -= (offset % 4) * 15;
 +	}
 +	t = time_from_tm(&tm);
 +	if (t == (time_t)-1)
 +		return ((time_t)0);
 +	return (t);
 +}
 +
 +static time_t
 +time_from_tm(struct tm *t)
 +{
 +#if HAVE_TIMEGM
- 	/* Use platform timegm() if available. */
- 	return (timegm(t));
++        /* Use platform timegm() if available. */
++        return (timegm(t));
 +#elif HAVE__MKGMTIME64
- 	return (_mkgmtime64(t));
++        return (_mkgmtime64(t));
 +#else
- 	/* Else use direct calculation using POSIX assumptions. */
- 	/* First, fix up tm_yday based on the year/month/day. */
- 	if (mktime(t) == (time_t)-1)
- 		return ((time_t)-1);
- 	/* Then we can compute timegm() from first principles. */
- 	return (t->tm_sec + t->tm_min * 60 + t->tm_hour * 3600
- 	    + t->tm_yday * 86400 + (t->tm_year - 70) * 31536000
- 	    + ((t->tm_year - 69) / 4) * 86400 -
- 	    ((t->tm_year - 1) / 100) * 86400
- 	    + ((t->tm_year + 299) / 400) * 86400);
++        /* Else use direct calculation using POSIX assumptions. */
++        /* First, fix up tm_yday based on the year/month/day. */
++        if (mktime(t) == (time_t)-1)
++                return ((time_t)-1);
++        /* Then we can compute timegm() from first principles. */
++        return (t->tm_sec
++            + t->tm_min * 60
++            + t->tm_hour * 3600
++            + t->tm_yday * 86400
++            + (t->tm_year - 70) * 31536000
++            + ((t->tm_year - 69) / 4) * 86400
++            - ((t->tm_year - 1) / 100) * 86400
++            + ((t->tm_year + 299) / 400) * 86400);
 +#endif
 +}
 +
 +static const char *
- build_pathname(struct archive_string *as, struct file_info *file)
++build_pathname(struct archive_string *as, struct file_info *file, int depth)
 +{
++	// Plain ISO9660 only allows 8 dir levels; if we get
++	// to 1000, then something is very, very wrong.
++	if (depth > 1000) {
++		return NULL;
++	}
 +	if (file->parent != NULL && archive_strlen(&file->parent->name) > 0) {
- 		build_pathname(as, file->parent);
++		if (build_pathname(as, file->parent, depth + 1) == NULL) {
++			return NULL;
++		}
 +		archive_strcat(as, "/");
 +	}
 +	if (archive_strlen(&file->name) == 0)
 +		archive_strcat(as, ".");
 +	else
 +		archive_string_concat(as, &file->name);
 +	return (as->s);
 +}
 +
 +static int
 +build_pathname_utf16be(unsigned char *p, size_t max, size_t *len,
 +    struct file_info *file)
 +{
 +	if (file->parent != NULL && file->parent->utf16be_bytes > 0) {
 +		if (build_pathname_utf16be(p, max, len, file->parent) != 0)
 +			return (-1);
 +		p[*len] = 0;
 +		p[*len + 1] = '/';
 +		*len += 2;
 +	}
 +	if (file->utf16be_bytes == 0) {
 +		if (*len + 2 > max)
 +			return (-1);/* Path is too long! */
 +		p[*len] = 0;
 +		p[*len + 1] = '.';
 +		*len += 2;
 +	} else {
 +		if (*len + file->utf16be_bytes > max)
 +			return (-1);/* Path is too long! */
 +		memcpy(p + *len, file->utf16be_name, file->utf16be_bytes);
 +		*len += file->utf16be_bytes;
 +	}
 +	return (0);
 +}
 +
 +#if DEBUG
 +static void
 +dump_isodirrec(FILE *out, const unsigned char *isodirrec)
 +{
 +	fprintf(out, " l %d,",
 +	    toi(isodirrec + DR_length_offset, DR_length_size));
 +	fprintf(out, " a %d,",
 +	    toi(isodirrec + DR_ext_attr_length_offset, DR_ext_attr_length_size));
 +	fprintf(out, " ext 0x%x,",
 +	    toi(isodirrec + DR_extent_offset, DR_extent_size));
 +	fprintf(out, " s %d,",
 +	    toi(isodirrec + DR_size_offset, DR_extent_size));
 +	fprintf(out, " f 0x%x,",
 +	    toi(isodirrec + DR_flags_offset, DR_flags_size));
 +	fprintf(out, " u %d,",
 +	    toi(isodirrec + DR_file_unit_size_offset, DR_file_unit_size_size));
 +	fprintf(out, " ilv %d,",
 +	    toi(isodirrec + DR_interleave_offset, DR_interleave_size));
 +	fprintf(out, " seq %d,",
 +	    toi(isodirrec + DR_volume_sequence_number_offset,
 +		DR_volume_sequence_number_size));
 +	fprintf(out, " nl %d:",
 +	    toi(isodirrec + DR_name_len_offset, DR_name_len_size));
 +	fprintf(out, " `%.*s'",
 +	    toi(isodirrec + DR_name_len_offset, DR_name_len_size),
 +		isodirrec + DR_name_offset);
 +}
 +#endif
diff --cc Utilities/cmlibarchive/libarchive/archive_read_support_format_rar.c
index 4c56834,0000000..35ac7cf
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar.c
@@@ -1,2919 -1,0 +1,2929 @@@
 +/*-
 +* Copyright (c) 2003-2007 Tim Kientzle
 +* Copyright (c) 2011 Andres Mejia
 +* All rights reserved.
 +*
 +* Redistribution and use in source and binary forms, with or without
 +* modification, are permitted provided that the following conditions
 +* are met:
 +* 1. Redistributions of source code must retain the above copyright
 +*    notice, this list of conditions and the following disclaimer.
 +* 2. Redistributions in binary form must reproduce the above copyright
 +*    notice, this list of conditions and the following disclaimer in the
 +*    documentation and/or other materials provided with the distribution.
 +*
 +* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 +* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 +* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 +* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 +* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 +* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 +* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 +*/
 +
 +#include "archive_platform.h"
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#include <time.h>
 +#include <limits.h>
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h> /* crc32 */
 +#endif
 +
 +#include "archive.h"
 +#ifndef HAVE_ZLIB_H
 +#include "archive_crc32.h"
 +#endif
 +#include "archive_endian.h"
 +#include "archive_entry.h"
 +#include "archive_entry_locale.h"
 +#include "archive_ppmd7_private.h"
 +#include "archive_private.h"
 +#include "archive_read_private.h"
 +
 +/* RAR signature, also known as the mark header */
 +#define RAR_SIGNATURE "\x52\x61\x72\x21\x1A\x07\x00"
 +
 +/* Header types */
 +#define MARK_HEAD    0x72
 +#define MAIN_HEAD    0x73
 +#define FILE_HEAD    0x74
 +#define COMM_HEAD    0x75
 +#define AV_HEAD      0x76
 +#define SUB_HEAD     0x77
 +#define PROTECT_HEAD 0x78
 +#define SIGN_HEAD    0x79
 +#define NEWSUB_HEAD  0x7a
 +#define ENDARC_HEAD  0x7b
 +
 +/* Main Header Flags */
 +#define MHD_VOLUME       0x0001
 +#define MHD_COMMENT      0x0002
 +#define MHD_LOCK         0x0004
 +#define MHD_SOLID        0x0008
 +#define MHD_NEWNUMBERING 0x0010
 +#define MHD_AV           0x0020
 +#define MHD_PROTECT      0x0040
 +#define MHD_PASSWORD     0x0080
 +#define MHD_FIRSTVOLUME  0x0100
 +#define MHD_ENCRYPTVER   0x0200
 +
 +/* Flags common to all headers */
 +#define HD_MARKDELETION     0x4000
 +#define HD_ADD_SIZE_PRESENT 0x8000
 +
 +/* File Header Flags */
 +#define FHD_SPLIT_BEFORE 0x0001
 +#define FHD_SPLIT_AFTER  0x0002
 +#define FHD_PASSWORD     0x0004
 +#define FHD_COMMENT      0x0008
 +#define FHD_SOLID        0x0010
 +#define FHD_LARGE        0x0100
 +#define FHD_UNICODE      0x0200
 +#define FHD_SALT         0x0400
 +#define FHD_VERSION      0x0800
 +#define FHD_EXTTIME      0x1000
 +#define FHD_EXTFLAGS     0x2000
 +
 +/* File dictionary sizes */
 +#define DICTIONARY_SIZE_64   0x00
 +#define DICTIONARY_SIZE_128  0x20
 +#define DICTIONARY_SIZE_256  0x40
 +#define DICTIONARY_SIZE_512  0x60
 +#define DICTIONARY_SIZE_1024 0x80
 +#define DICTIONARY_SIZE_2048 0xA0
 +#define DICTIONARY_SIZE_4096 0xC0
 +#define FILE_IS_DIRECTORY    0xE0
 +#define DICTIONARY_MASK      FILE_IS_DIRECTORY
 +
 +/* OS Flags */
 +#define OS_MSDOS  0
 +#define OS_OS2    1
 +#define OS_WIN32  2
 +#define OS_UNIX   3
 +#define OS_MAC_OS 4
 +#define OS_BEOS   5
 +
 +/* Compression Methods */
 +#define COMPRESS_METHOD_STORE   0x30
 +/* LZSS */
 +#define COMPRESS_METHOD_FASTEST 0x31
 +#define COMPRESS_METHOD_FAST    0x32
 +#define COMPRESS_METHOD_NORMAL  0x33
 +/* PPMd Variant H */
 +#define COMPRESS_METHOD_GOOD    0x34
 +#define COMPRESS_METHOD_BEST    0x35
 +
 +#define CRC_POLYNOMIAL 0xEDB88320
 +
 +#define NS_UNIT 10000000
 +
 +#define DICTIONARY_MAX_SIZE 0x400000
 +
 +#define MAINCODE_SIZE      299
 +#define OFFSETCODE_SIZE    60
 +#define LOWOFFSETCODE_SIZE 17
 +#define LENGTHCODE_SIZE    28
 +#define HUFFMAN_TABLE_SIZE \
 +  MAINCODE_SIZE + OFFSETCODE_SIZE + LOWOFFSETCODE_SIZE + LENGTHCODE_SIZE
 +
 +#define MAX_SYMBOL_LENGTH 0xF
 +#define MAX_SYMBOLS       20
 +
 +/*
 + * Considering L1,L2 cache miss and a calling of write system-call,
 + * the best size of the output buffer(uncompressed buffer) is 128K.
 + * If the structure of extracting process is changed, this value
 + * might be researched again.
 + */
 +#define UNP_BUFFER_SIZE   (128 * 1024)
 +
 +/* Define this here for non-Windows platforms */
 +#if !((defined(__WIN32__) || defined(_WIN32) || defined(__WIN32)) && !defined(__CYGWIN__))
 +#define FILE_ATTRIBUTE_DIRECTORY 0x10
 +#endif
 +
 +/* Fields common to all headers */
 +struct rar_header
 +{
 +  char crc[2];
 +  char type;
 +  char flags[2];
 +  char size[2];
 +};
 +
 +/* Fields common to all file headers */
 +struct rar_file_header
 +{
 +  char pack_size[4];
 +  char unp_size[4];
 +  char host_os;
 +  char file_crc[4];
 +  char file_time[4];
 +  char unp_ver;
 +  char method;
 +  char name_size[2];
 +  char file_attr[4];
 +};
 +
 +struct huffman_tree_node
 +{
 +  int branches[2];
 +};
 +
 +struct huffman_table_entry
 +{
 +  unsigned int length;
 +  int value;
 +};
 +
 +struct huffman_code
 +{
 +  struct huffman_tree_node *tree;
 +  int numentries;
++  int numallocatedentries;
 +  int minlength;
 +  int maxlength;
 +  int tablesize;
 +  struct huffman_table_entry *table;
 +};
 +
 +struct lzss
 +{
 +  unsigned char *window;
 +  int mask;
 +  int64_t position;
 +};
 +
 +struct data_block_offsets
 +{
 +  int64_t header_size;
 +  int64_t start_offset;
 +  int64_t end_offset;
 +};
 +
 +struct rar
 +{
 +  /* Entries from main RAR header */
 +  unsigned main_flags;
 +  unsigned long file_crc;
 +  char reserved1[2];
 +  char reserved2[4];
 +  char encryptver;
 +
 +  /* File header entries */
 +  char compression_method;
 +  unsigned file_flags;
 +  int64_t packed_size;
 +  int64_t unp_size;
 +  time_t mtime;
 +  long mnsec;
 +  mode_t mode;
 +  char *filename;
 +  char *filename_save;
++  size_t filename_save_size;
 +  size_t filename_allocated;
 +
 +  /* File header optional entries */
 +  char salt[8];
 +  time_t atime;
 +  long ansec;
 +  time_t ctime;
 +  long cnsec;
 +  time_t arctime;
 +  long arcnsec;
 +
 +  /* Fields to help with tracking decompression of files. */
 +  int64_t bytes_unconsumed;
 +  int64_t bytes_remaining;
 +  int64_t bytes_uncopied;
 +  int64_t offset;
 +  int64_t offset_outgoing;
 +  int64_t offset_seek;
 +  char valid;
 +  unsigned int unp_offset;
 +  unsigned int unp_buffer_size;
 +  unsigned char *unp_buffer;
 +  unsigned int dictionary_size;
 +  char start_new_block;
 +  char entry_eof;
 +  unsigned long crc_calculated;
 +  int found_first_header;
 +  char has_endarc_header;
 +  struct data_block_offsets *dbo;
 +  unsigned int cursor;
 +  unsigned int nodes;
 +
 +  /* LZSS members */
 +  struct huffman_code maincode;
 +  struct huffman_code offsetcode;
 +  struct huffman_code lowoffsetcode;
 +  struct huffman_code lengthcode;
 +  unsigned char lengthtable[HUFFMAN_TABLE_SIZE];
 +  struct lzss lzss;
 +  char output_last_match;
 +  unsigned int lastlength;
 +  unsigned int lastoffset;
 +  unsigned int oldoffset[4];
 +  unsigned int lastlowoffset;
 +  unsigned int numlowoffsetrepeats;
 +  int64_t filterstart;
 +  char start_new_table;
 +
 +  /* PPMd Variant H members */
 +  char ppmd_valid;
 +  char ppmd_eod;
 +  char is_ppmd_block;
 +  int ppmd_escape;
 +  CPpmd7 ppmd7_context;
 +  CPpmd7z_RangeDec range_dec;
 +  IByteIn bytein;
 +
 +  /*
 +   * String conversion object.
 +   */
 +  int init_default_conversion;
 +  struct archive_string_conv *sconv_default;
 +  struct archive_string_conv *opt_sconv;
 +  struct archive_string_conv *sconv_utf8;
 +  struct archive_string_conv *sconv_utf16be;
 +
 +  /*
 +   * Bit stream reader.
 +   */
 +  struct rar_br {
 +#define CACHE_TYPE	uint64_t
 +#define CACHE_BITS	(8 * sizeof(CACHE_TYPE))
 +    /* Cache buffer. */
 +    CACHE_TYPE		 cache_buffer;
 +    /* Indicates how many bits avail in cache_buffer. */
 +    int			 cache_avail;
 +    ssize_t		 avail_in;
 +    const unsigned char *next_in;
 +  } br;
 +
 +  /*
 +   * Custom field to denote that this archive contains encrypted entries
 +   */
 +  int has_encrypted_entries;
 +};
 +
 +static int archive_read_support_format_rar_capabilities(struct archive_read *);
 +static int archive_read_format_rar_has_encrypted_entries(struct archive_read *);
 +static int archive_read_format_rar_bid(struct archive_read *, int);
 +static int archive_read_format_rar_options(struct archive_read *,
 +    const char *, const char *);
 +static int archive_read_format_rar_read_header(struct archive_read *,
 +    struct archive_entry *);
 +static int archive_read_format_rar_read_data(struct archive_read *,
 +    const void **, size_t *, int64_t *);
 +static int archive_read_format_rar_read_data_skip(struct archive_read *a);
 +static int64_t archive_read_format_rar_seek_data(struct archive_read *, int64_t,
 +    int);
 +static int archive_read_format_rar_cleanup(struct archive_read *);
 +
 +/* Support functions */
 +static int read_header(struct archive_read *, struct archive_entry *, char);
 +static time_t get_time(int);
 +static int read_exttime(const char *, struct rar *, const char *);
 +static int read_symlink_stored(struct archive_read *, struct archive_entry *,
 +                               struct archive_string_conv *);
 +static int read_data_stored(struct archive_read *, const void **, size_t *,
 +                            int64_t *);
 +static int read_data_compressed(struct archive_read *, const void **, size_t *,
 +                          int64_t *);
 +static int rar_br_preparation(struct archive_read *, struct rar_br *);
 +static int parse_codes(struct archive_read *);
 +static void free_codes(struct archive_read *);
 +static int read_next_symbol(struct archive_read *, struct huffman_code *);
 +static int create_code(struct archive_read *, struct huffman_code *,
 +                        unsigned char *, int, char);
 +static int add_value(struct archive_read *, struct huffman_code *, int, int,
 +                     int);
 +static int new_node(struct huffman_code *);
 +static int make_table(struct archive_read *, struct huffman_code *);
 +static int make_table_recurse(struct archive_read *, struct huffman_code *, int,
 +                              struct huffman_table_entry *, int, int);
 +static int64_t expand(struct archive_read *, int64_t);
 +static int copy_from_lzss_window(struct archive_read *, const void **,
 +                                   int64_t, int);
 +static const void *rar_read_ahead(struct archive_read *, size_t, ssize_t *);
 +
 +/*
 + * Bit stream reader.
 + */
 +/* Check that the cache buffer has enough bits. */
 +#define rar_br_has(br, n) ((br)->cache_avail >= n)
 +/* Get compressed data by bit. */
 +#define rar_br_bits(br, n)        \
 +  (((uint32_t)((br)->cache_buffer >>    \
 +    ((br)->cache_avail - (n)))) & cache_masks[n])
 +#define rar_br_bits_forced(br, n)     \
 +  (((uint32_t)((br)->cache_buffer <<    \
 +    ((n) - (br)->cache_avail))) & cache_masks[n])
 +/* Read ahead to make sure the cache buffer has enough compressed data we
 + * will use.
 + *  True  : completed, there is enough data in the cache buffer.
 + *  False : there is no data in the stream. */
 +#define rar_br_read_ahead(a, br, n) \
 +  ((rar_br_has(br, (n)) || rar_br_fillup(a, br)) || rar_br_has(br, (n)))
 +/* Notify how many bits we consumed. */
 +#define rar_br_consume(br, n) ((br)->cache_avail -= (n))
 +#define rar_br_consume_unalined_bits(br) ((br)->cache_avail &= ~7)
 +
 +static const uint32_t cache_masks[] = {
 +  0x00000000, 0x00000001, 0x00000003, 0x00000007,
 +  0x0000000F, 0x0000001F, 0x0000003F, 0x0000007F,
 +  0x000000FF, 0x000001FF, 0x000003FF, 0x000007FF,
 +  0x00000FFF, 0x00001FFF, 0x00003FFF, 0x00007FFF,
 +  0x0000FFFF, 0x0001FFFF, 0x0003FFFF, 0x0007FFFF,
 +  0x000FFFFF, 0x001FFFFF, 0x003FFFFF, 0x007FFFFF,
 +  0x00FFFFFF, 0x01FFFFFF, 0x03FFFFFF, 0x07FFFFFF,
 +  0x0FFFFFFF, 0x1FFFFFFF, 0x3FFFFFFF, 0x7FFFFFFF,
 +  0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
 +};
 +
 +/*
 + * Shift away used bits in the cache data and fill it up with following bits.
 + * Call this when cache buffer does not have enough bits you need.
 + *
 + * Returns 1 if the cache buffer is full.
 + * Returns 0 if the cache buffer is not full; input buffer is empty.
 + */
 +static int
 +rar_br_fillup(struct archive_read *a, struct rar_br *br)
 +{
 +  struct rar *rar = (struct rar *)(a->format->data);
 +  int n = CACHE_BITS - br->cache_avail;
 +
 +  for (;;) {
 +    switch (n >> 3) {
 +    case 8:
 +      if (br->avail_in >= 8) {
 +        br->cache_buffer =
 +            ((uint64_t)br->next_in[0]) << 56 |
 +            ((uint64_t)br->next_in[1]) << 48 |
 +            ((uint64_t)br->next_in[2]) << 40 |
 +            ((uint64_t)br->next_in[3]) << 32 |
 +            ((uint32_t)br->next_in[4]) << 24 |
 +            ((uint32_t)br->next_in[5]) << 16 |
 +            ((uint32_t)br->next_in[6]) << 8 |
 +             (uint32_t)br->next_in[7];
 +        br->next_in += 8;
 +        br->avail_in -= 8;
 +        br->cache_avail += 8 * 8;
 +        rar->bytes_unconsumed += 8;
 +        rar->bytes_remaining -= 8;
 +        return (1);
 +      }
 +      break;
 +    case 7:
 +      if (br->avail_in >= 7) {
 +        br->cache_buffer =
 +           (br->cache_buffer << 56) |
 +            ((uint64_t)br->next_in[0]) << 48 |
 +            ((uint64_t)br->next_in[1]) << 40 |
 +            ((uint64_t)br->next_in[2]) << 32 |
 +            ((uint32_t)br->next_in[3]) << 24 |
 +            ((uint32_t)br->next_in[4]) << 16 |
 +            ((uint32_t)br->next_in[5]) << 8 |
 +             (uint32_t)br->next_in[6];
 +        br->next_in += 7;
 +        br->avail_in -= 7;
 +        br->cache_avail += 7 * 8;
 +        rar->bytes_unconsumed += 7;
 +        rar->bytes_remaining -= 7;
 +        return (1);
 +      }
 +      break;
 +    case 6:
 +      if (br->avail_in >= 6) {
 +        br->cache_buffer =
 +           (br->cache_buffer << 48) |
 +            ((uint64_t)br->next_in[0]) << 40 |
 +            ((uint64_t)br->next_in[1]) << 32 |
 +            ((uint32_t)br->next_in[2]) << 24 |
 +            ((uint32_t)br->next_in[3]) << 16 |
 +            ((uint32_t)br->next_in[4]) << 8 |
 +             (uint32_t)br->next_in[5];
 +        br->next_in += 6;
 +        br->avail_in -= 6;
 +        br->cache_avail += 6 * 8;
 +        rar->bytes_unconsumed += 6;
 +        rar->bytes_remaining -= 6;
 +        return (1);
 +      }
 +      break;
 +    case 0:
 +      /* We have enough compressed data in
 +       * the cache buffer.*/
 +      return (1);
 +    default:
 +      break;
 +    }
 +    if (br->avail_in <= 0) {
 +
 +      if (rar->bytes_unconsumed > 0) {
 +        /* Consume as much as the decompressor
 +         * actually used. */
 +        __archive_read_consume(a, rar->bytes_unconsumed);
 +        rar->bytes_unconsumed = 0;
 +      }
 +      br->next_in = rar_read_ahead(a, 1, &(br->avail_in));
 +      if (br->next_in == NULL)
 +        return (0);
 +      if (br->avail_in == 0)
 +        return (0);
 +    }
 +    br->cache_buffer =
 +       (br->cache_buffer << 8) | *br->next_in++;
 +    br->avail_in--;
 +    br->cache_avail += 8;
 +    n -= 8;
 +    rar->bytes_unconsumed++;
 +    rar->bytes_remaining--;
 +  }
 +}
 +
 +static int
 +rar_br_preparation(struct archive_read *a, struct rar_br *br)
 +{
 +  struct rar *rar = (struct rar *)(a->format->data);
 +
 +  if (rar->bytes_remaining > 0) {
 +    br->next_in = rar_read_ahead(a, 1, &(br->avail_in));
 +    if (br->next_in == NULL) {
 +      archive_set_error(&a->archive,
 +          ARCHIVE_ERRNO_FILE_FORMAT,
 +          "Truncated RAR file data");
 +      return (ARCHIVE_FATAL);
 +    }
 +    if (br->cache_avail == 0)
 +      (void)rar_br_fillup(a, br);
 +  }
 +  return (ARCHIVE_OK);
 +}
 +
 +/* Find last bit set */
 +static inline int
 +rar_fls(unsigned int word)
 +{
 +  word |= (word >>  1);
 +  word |= (word >>  2);
 +  word |= (word >>  4);
 +  word |= (word >>  8);
 +  word |= (word >> 16);
 +  return word - (word >> 1);
 +}
 +
 +/* LZSS functions */
 +static inline int64_t
 +lzss_position(struct lzss *lzss)
 +{
 +  return lzss->position;
 +}
 +
 +static inline int
 +lzss_mask(struct lzss *lzss)
 +{
 +  return lzss->mask;
 +}
 +
 +static inline int
 +lzss_size(struct lzss *lzss)
 +{
 +  return lzss->mask + 1;
 +}
 +
 +static inline int
 +lzss_offset_for_position(struct lzss *lzss, int64_t pos)
 +{
 +  return (int)(pos & lzss->mask);
 +}
 +
 +static inline unsigned char *
 +lzss_pointer_for_position(struct lzss *lzss, int64_t pos)
 +{
 +  return &lzss->window[lzss_offset_for_position(lzss, pos)];
 +}
 +
 +static inline int
 +lzss_current_offset(struct lzss *lzss)
 +{
 +  return lzss_offset_for_position(lzss, lzss->position);
 +}
 +
 +static inline uint8_t *
 +lzss_current_pointer(struct lzss *lzss)
 +{
 +  return lzss_pointer_for_position(lzss, lzss->position);
 +}
 +
 +static inline void
 +lzss_emit_literal(struct rar *rar, uint8_t literal)
 +{
 +  *lzss_current_pointer(&rar->lzss) = literal;
 +  rar->lzss.position++;
 +}
 +
 +static inline void
 +lzss_emit_match(struct rar *rar, int offset, int length)
 +{
 +  int dstoffs = lzss_current_offset(&rar->lzss);
 +  int srcoffs = (dstoffs - offset) & lzss_mask(&rar->lzss);
 +  int l, li, remaining;
 +  unsigned char *d, *s;
 +
 +  remaining = length;
 +  while (remaining > 0) {
 +    l = remaining;
 +    if (dstoffs > srcoffs) {
 +      if (l > lzss_size(&rar->lzss) - dstoffs)
 +        l = lzss_size(&rar->lzss) - dstoffs;
 +    } else {
 +      if (l > lzss_size(&rar->lzss) - srcoffs)
 +        l = lzss_size(&rar->lzss) - srcoffs;
 +    }
 +    d = &(rar->lzss.window[dstoffs]);
 +    s = &(rar->lzss.window[srcoffs]);
 +    if ((dstoffs + l < srcoffs) || (srcoffs + l < dstoffs))
 +      memcpy(d, s, l);
 +    else {
 +      for (li = 0; li < l; li++)
 +        d[li] = s[li];
 +    }
 +    remaining -= l;
 +    dstoffs = (dstoffs + l) & lzss_mask(&(rar->lzss));
 +    srcoffs = (srcoffs + l) & lzss_mask(&(rar->lzss));
 +  }
 +  rar->lzss.position += length;
 +}
 +
 +static void *
 +ppmd_alloc(void *p, size_t size)
 +{
 +  (void)p;
 +  return malloc(size);
 +}
 +static void
 +ppmd_free(void *p, void *address)
 +{
 +  (void)p;
 +  free(address);
 +}
 +static ISzAlloc g_szalloc = { ppmd_alloc, ppmd_free };
 +
 +static Byte
 +ppmd_read(void *p)
 +{
 +  struct archive_read *a = ((IByteIn*)p)->a;
 +  struct rar *rar = (struct rar *)(a->format->data);
 +  struct rar_br *br = &(rar->br);
 +  Byte b;
 +  if (!rar_br_read_ahead(a, br, 8))
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Truncated RAR file data");
 +    rar->valid = 0;
 +    return 0;
 +  }
 +  b = rar_br_bits(br, 8);
 +  rar_br_consume(br, 8);
 +  return b;
 +}
 +
 +int
 +archive_read_support_format_rar(struct archive *_a)
 +{
 +  struct archive_read *a = (struct archive_read *)_a;
 +  struct rar *rar;
 +  int r;
 +
 +  archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 +                      "archive_read_support_format_rar");
 +
 +  rar = (struct rar *)malloc(sizeof(*rar));
 +  if (rar == NULL)
 +  {
 +    archive_set_error(&a->archive, ENOMEM, "Can't allocate rar data");
 +    return (ARCHIVE_FATAL);
 +  }
 +  memset(rar, 0, sizeof(*rar));
 +
 +	/*
 +	 * Until enough data has been read, we cannot tell about
 +	 * any encrypted entries yet.
 +	 */
 +	rar->has_encrypted_entries = ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
 +
 +  r = __archive_read_register_format(a,
 +                                     rar,
 +                                     "rar",
 +                                     archive_read_format_rar_bid,
 +                                     archive_read_format_rar_options,
 +                                     archive_read_format_rar_read_header,
 +                                     archive_read_format_rar_read_data,
 +                                     archive_read_format_rar_read_data_skip,
 +                                     archive_read_format_rar_seek_data,
 +                                     archive_read_format_rar_cleanup,
 +                                     archive_read_support_format_rar_capabilities,
 +                                     archive_read_format_rar_has_encrypted_entries);
 +
 +  if (r != ARCHIVE_OK)
 +    free(rar);
 +  return (r);
 +}
 +
 +static int
 +archive_read_support_format_rar_capabilities(struct archive_read * a)
 +{
 +	(void)a; /* UNUSED */
 +	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA
 +			| ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
 +}
 +
 +static int
 +archive_read_format_rar_has_encrypted_entries(struct archive_read *_a)
 +{
 +	if (_a && _a->format) {
 +		struct rar * rar = (struct rar *)_a->format->data;
 +		if (rar) {
 +			return rar->has_encrypted_entries;
 +		}
 +	}
 +	return ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
 +}
 +
 +
 +static int
 +archive_read_format_rar_bid(struct archive_read *a, int best_bid)
 +{
 +  const char *p;
 +
 +  /* If there's already a bid > 30, we'll never win. */
 +  if (best_bid > 30)
 +	  return (-1);
 +
 +  if ((p = __archive_read_ahead(a, 7, NULL)) == NULL)
 +    return (-1);
 +
 +  if (memcmp(p, RAR_SIGNATURE, 7) == 0)
 +    return (30);
 +
 +  if ((p[0] == 'M' && p[1] == 'Z') || memcmp(p, "\x7F\x45LF", 4) == 0) {
 +    /* This is a PE file */
 +    ssize_t offset = 0x10000;
 +    ssize_t window = 4096;
 +    ssize_t bytes_avail;
 +    while (offset + window <= (1024 * 128)) {
 +      const char *buff = __archive_read_ahead(a, offset + window, &bytes_avail);
 +      if (buff == NULL) {
 +        /* Remaining bytes are less than window. */
 +        window >>= 1;
 +        if (window < 0x40)
 +          return (0);
 +        continue;
 +      }
 +      p = buff + offset;
 +      while (p + 7 < buff + bytes_avail) {
 +        if (memcmp(p, RAR_SIGNATURE, 7) == 0)
 +          return (30);
 +        p += 0x10;
 +      }
 +      offset = p - buff;
 +    }
 +  }
 +  return (0);
 +}
 +
 +static int
 +skip_sfx(struct archive_read *a)
 +{
 +  const void *h;
 +  const char *p, *q;
 +  size_t skip, total;
 +  ssize_t bytes, window;
 +
 +  total = 0;
 +  window = 4096;
 +  while (total + window <= (1024 * 128)) {
 +    h = __archive_read_ahead(a, window, &bytes);
 +    if (h == NULL) {
 +      /* Remaining bytes are less than window. */
 +      window >>= 1;
 +      if (window < 0x40)
 +      	goto fatal;
 +      continue;
 +    }
 +    if (bytes < 0x40)
 +      goto fatal;
 +    p = h;
 +    q = p + bytes;
 +
 +    /*
 +     * Scan ahead until we find something that looks
 +     * like the RAR header.
 +     */
 +    while (p + 7 < q) {
 +      if (memcmp(p, RAR_SIGNATURE, 7) == 0) {
 +      	skip = p - (const char *)h;
 +      	__archive_read_consume(a, skip);
 +      	return (ARCHIVE_OK);
 +      }
 +      p += 0x10;
 +    }
 +    skip = p - (const char *)h;
 +    __archive_read_consume(a, skip);
 +	total += skip;
 +  }
 +fatal:
 +  archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +      "Couldn't find out RAR header");
 +  return (ARCHIVE_FATAL);
 +}
 +
 +static int
 +archive_read_format_rar_options(struct archive_read *a,
 +    const char *key, const char *val)
 +{
 +  struct rar *rar;
 +  int ret = ARCHIVE_FAILED;
 +
 +  rar = (struct rar *)(a->format->data);
 +  if (strcmp(key, "hdrcharset")  == 0) {
 +    if (val == NULL || val[0] == 0)
 +      archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +          "rar: hdrcharset option needs a character-set name");
 +    else {
 +      rar->opt_sconv =
 +          archive_string_conversion_from_charset(
 +              &a->archive, val, 0);
 +      if (rar->opt_sconv != NULL)
 +        ret = ARCHIVE_OK;
 +      else
 +        ret = ARCHIVE_FATAL;
 +    }
 +    return (ret);
 +  }
 +
 +  /* Note: The "warn" return is just to inform the options
 +   * supervisor that we didn't handle it.  It will generate
 +   * a suitable error if no one used this option. */
 +  return (ARCHIVE_WARN);
 +}
 +
 +static int
 +archive_read_format_rar_read_header(struct archive_read *a,
 +                                    struct archive_entry *entry)
 +{
 +  const void *h;
 +  const char *p;
 +  struct rar *rar;
 +  size_t skip;
 +  char head_type;
 +  int ret;
 +  unsigned flags;
 +
 +  a->archive.archive_format = ARCHIVE_FORMAT_RAR;
 +  if (a->archive.archive_format_name == NULL)
 +    a->archive.archive_format_name = "RAR";
 +
 +  rar = (struct rar *)(a->format->data);
 +
 +  /*
 +   * It should be sufficient to call archive_read_next_header() for
 +   * a reader to determine if an entry is encrypted or not. If the
 +   * encryption of an entry is only detectable when calling
 +   * archive_read_data(), so be it. We'll do the same check there
 +   * as well.
 +   */
 +  if (rar->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
 +	  rar->has_encrypted_entries = 0;
 +  }
 +
 +  /* RAR files can be generated without EOF headers, so return ARCHIVE_EOF if
 +  * this fails.
 +  */
 +  if ((h = __archive_read_ahead(a, 7, NULL)) == NULL)
 +    return (ARCHIVE_EOF);
 +
 +  p = h;
 +  if (rar->found_first_header == 0 &&
 +     ((p[0] == 'M' && p[1] == 'Z') || memcmp(p, "\x7F\x45LF", 4) == 0)) {
 +    /* This is an executable ? Must be self-extracting... */
 +    ret = skip_sfx(a);
 +    if (ret < ARCHIVE_WARN)
 +      return (ret);
 +  }
 +  rar->found_first_header = 1;
 +
 +  while (1)
 +  {
 +    unsigned long crc32_val;
 +
 +    if ((h = __archive_read_ahead(a, 7, NULL)) == NULL)
 +      return (ARCHIVE_FATAL);
 +    p = h;
 +
 +    head_type = p[2];
 +    switch(head_type)
 +    {
 +    case MARK_HEAD:
 +      if (memcmp(p, RAR_SIGNATURE, 7) != 0) {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +          "Invalid marker header");
 +        return (ARCHIVE_FATAL);
 +      }
 +      __archive_read_consume(a, 7);
 +      break;
 +
 +    case MAIN_HEAD:
 +      rar->main_flags = archive_le16dec(p + 3);
 +      skip = archive_le16dec(p + 5);
 +      if (skip < 7 + sizeof(rar->reserved1) + sizeof(rar->reserved2)) {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +          "Invalid header size");
 +        return (ARCHIVE_FATAL);
 +      }
 +      if ((h = __archive_read_ahead(a, skip, NULL)) == NULL)
 +        return (ARCHIVE_FATAL);
 +      p = h;
 +      memcpy(rar->reserved1, p + 7, sizeof(rar->reserved1));
 +      memcpy(rar->reserved2, p + 7 + sizeof(rar->reserved1),
 +             sizeof(rar->reserved2));
 +      if (rar->main_flags & MHD_ENCRYPTVER) {
 +        if (skip < 7 + sizeof(rar->reserved1) + sizeof(rar->reserved2)+1) {
 +          archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +            "Invalid header size");
 +          return (ARCHIVE_FATAL);
 +        }
 +        rar->encryptver = *(p + 7 + sizeof(rar->reserved1) +
 +                            sizeof(rar->reserved2));
 +      }
 +
 +      /* Main header is password encrytped, so we cannot read any
 +         file names or any other info about files from the header. */
 +      if (rar->main_flags & MHD_PASSWORD)
 +      {
 +        archive_entry_set_is_metadata_encrypted(entry, 1);
 +        archive_entry_set_is_data_encrypted(entry, 1);
 +        rar->has_encrypted_entries = 1;
 +         archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                          "RAR encryption support unavailable.");
 +        return (ARCHIVE_FATAL);
 +      }
 +
 +      crc32_val = crc32(0, (const unsigned char *)p + 2, (unsigned)skip - 2);
 +      if ((crc32_val & 0xffff) != archive_le16dec(p)) {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +          "Header CRC error");
 +        return (ARCHIVE_FATAL);
 +      }
 +      __archive_read_consume(a, skip);
 +      break;
 +
 +    case FILE_HEAD:
 +      return read_header(a, entry, head_type);
 +
 +    case COMM_HEAD:
 +    case AV_HEAD:
 +    case SUB_HEAD:
 +    case PROTECT_HEAD:
 +    case SIGN_HEAD:
 +    case ENDARC_HEAD:
 +      flags = archive_le16dec(p + 3);
 +      skip = archive_le16dec(p + 5);
 +      if (skip < 7) {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +          "Invalid header size");
 +        return (ARCHIVE_FATAL);
 +      }
 +      if (skip > 7) {
 +        if ((h = __archive_read_ahead(a, skip, NULL)) == NULL)
 +          return (ARCHIVE_FATAL);
 +        p = h;
 +      }
 +      if (flags & HD_ADD_SIZE_PRESENT)
 +      {
 +        if (skip < 7 + 4) {
 +          archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +            "Invalid header size");
 +          return (ARCHIVE_FATAL);
 +        }
 +        skip += archive_le32dec(p + 7);
 +        if ((h = __archive_read_ahead(a, skip, NULL)) == NULL)
 +          return (ARCHIVE_FATAL);
 +        p = h;
 +      }
 +
 +      crc32_val = crc32(0, (const unsigned char *)p + 2, (unsigned)skip - 2);
 +      if ((crc32_val & 0xffff) != archive_le16dec(p)) {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +          "Header CRC error");
 +        return (ARCHIVE_FATAL);
 +      }
 +      __archive_read_consume(a, skip);
 +      if (head_type == ENDARC_HEAD)
 +        return (ARCHIVE_EOF);
 +      break;
 +
 +    case NEWSUB_HEAD:
 +      if ((ret = read_header(a, entry, head_type)) < ARCHIVE_WARN)
 +        return ret;
 +      break;
 +
 +    default:
 +      archive_set_error(&a->archive,  ARCHIVE_ERRNO_FILE_FORMAT,
 +                        "Bad RAR file");
 +      return (ARCHIVE_FATAL);
 +    }
 +  }
 +}
 +
 +static int
 +archive_read_format_rar_read_data(struct archive_read *a, const void **buff,
 +                                  size_t *size, int64_t *offset)
 +{
 +  struct rar *rar = (struct rar *)(a->format->data);
 +  int ret;
 +
 +  if (rar->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
 +	  rar->has_encrypted_entries = 0;
 +  }
 +
 +  if (rar->bytes_unconsumed > 0) {
 +      /* Consume as much as the decompressor actually used. */
 +      __archive_read_consume(a, rar->bytes_unconsumed);
 +      rar->bytes_unconsumed = 0;
 +  }
 +
++  *buff = NULL;
 +  if (rar->entry_eof || rar->offset_seek >= rar->unp_size) {
-     *buff = NULL;
 +    *size = 0;
 +    *offset = rar->offset;
 +    if (*offset < rar->unp_size)
 +      *offset = rar->unp_size;
 +    return (ARCHIVE_EOF);
 +  }
 +
 +  switch (rar->compression_method)
 +  {
 +  case COMPRESS_METHOD_STORE:
 +    ret = read_data_stored(a, buff, size, offset);
 +    break;
 +
 +  case COMPRESS_METHOD_FASTEST:
 +  case COMPRESS_METHOD_FAST:
 +  case COMPRESS_METHOD_NORMAL:
 +  case COMPRESS_METHOD_GOOD:
 +  case COMPRESS_METHOD_BEST:
 +    ret = read_data_compressed(a, buff, size, offset);
 +    if (ret != ARCHIVE_OK && ret != ARCHIVE_WARN)
 +      __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context, &g_szalloc);
 +    break;
 +
 +  default:
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Unsupported compression method for RAR file.");
 +    ret = ARCHIVE_FATAL;
 +    break;
 +  }
 +  return (ret);
 +}
 +
 +static int
 +archive_read_format_rar_read_data_skip(struct archive_read *a)
 +{
 +  struct rar *rar;
 +  int64_t bytes_skipped;
 +  int ret;
 +
 +  rar = (struct rar *)(a->format->data);
 +
 +  if (rar->bytes_unconsumed > 0) {
 +      /* Consume as much as the decompressor actually used. */
 +      __archive_read_consume(a, rar->bytes_unconsumed);
 +      rar->bytes_unconsumed = 0;
 +  }
 +
 +  if (rar->bytes_remaining > 0) {
 +    bytes_skipped = __archive_read_consume(a, rar->bytes_remaining);
 +    if (bytes_skipped < 0)
 +      return (ARCHIVE_FATAL);
 +  }
 +
 +  /* Compressed data to skip must be read from each header in a multivolume
 +   * archive.
 +   */
 +  if (rar->main_flags & MHD_VOLUME && rar->file_flags & FHD_SPLIT_AFTER)
 +  {
 +    ret = archive_read_format_rar_read_header(a, a->entry);
 +    if (ret == (ARCHIVE_EOF))
 +      ret = archive_read_format_rar_read_header(a, a->entry);
 +    if (ret != (ARCHIVE_OK))
 +      return ret;
 +    return archive_read_format_rar_read_data_skip(a);
 +  }
 +
 +  return (ARCHIVE_OK);
 +}
 +
 +static int64_t
 +archive_read_format_rar_seek_data(struct archive_read *a, int64_t offset,
 +    int whence)
 +{
 +  int64_t client_offset, ret;
 +  unsigned int i;
 +  struct rar *rar = (struct rar *)(a->format->data);
 +
 +  if (rar->compression_method == COMPRESS_METHOD_STORE)
 +  {
 +    /* Modify the offset for use with SEEK_SET */
 +    switch (whence)
 +    {
 +      case SEEK_CUR:
 +        client_offset = rar->offset_seek;
 +        break;
 +      case SEEK_END:
 +        client_offset = rar->unp_size;
 +        break;
 +      case SEEK_SET:
 +      default:
 +        client_offset = 0;
 +    }
 +    client_offset += offset;
 +    if (client_offset < 0)
 +    {
 +      /* Can't seek past beginning of data block */
 +      return -1;
 +    }
 +    else if (client_offset > rar->unp_size)
 +    {
 +      /*
 +       * Set the returned offset but only seek to the end of
 +       * the data block.
 +       */
 +      rar->offset_seek = client_offset;
 +      client_offset = rar->unp_size;
 +    }
 +
 +    client_offset += rar->dbo[0].start_offset;
 +    i = 0;
 +    while (i < rar->cursor)
 +    {
 +      i++;
 +      client_offset += rar->dbo[i].start_offset - rar->dbo[i-1].end_offset;
 +    }
 +    if (rar->main_flags & MHD_VOLUME)
 +    {
 +      /* Find the appropriate offset among the multivolume archive */
 +      while (1)
 +      {
 +        if (client_offset < rar->dbo[rar->cursor].start_offset &&
 +          rar->file_flags & FHD_SPLIT_BEFORE)
 +        {
 +          /* Search backwards for the correct data block */
 +          if (rar->cursor == 0)
 +          {
 +            archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +              "Attempt to seek past beginning of RAR data block");
 +            return (ARCHIVE_FAILED);
 +          }
 +          rar->cursor--;
 +          client_offset -= rar->dbo[rar->cursor+1].start_offset -
 +            rar->dbo[rar->cursor].end_offset;
 +          if (client_offset < rar->dbo[rar->cursor].start_offset)
 +            continue;
 +          ret = __archive_read_seek(a, rar->dbo[rar->cursor].start_offset -
 +            rar->dbo[rar->cursor].header_size, SEEK_SET);
 +          if (ret < (ARCHIVE_OK))
 +            return ret;
 +          ret = archive_read_format_rar_read_header(a, a->entry);
 +          if (ret != (ARCHIVE_OK))
 +          {
 +            archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +              "Error during seek of RAR file");
 +            return (ARCHIVE_FAILED);
 +          }
 +          rar->cursor--;
 +          break;
 +        }
 +        else if (client_offset > rar->dbo[rar->cursor].end_offset &&
 +          rar->file_flags & FHD_SPLIT_AFTER)
 +        {
 +          /* Search forward for the correct data block */
 +          rar->cursor++;
 +          if (rar->cursor < rar->nodes &&
 +            client_offset > rar->dbo[rar->cursor].end_offset)
 +          {
 +            client_offset += rar->dbo[rar->cursor].start_offset -
 +              rar->dbo[rar->cursor-1].end_offset;
 +            continue;
 +          }
 +          rar->cursor--;
 +          ret = __archive_read_seek(a, rar->dbo[rar->cursor].end_offset,
 +                                    SEEK_SET);
 +          if (ret < (ARCHIVE_OK))
 +            return ret;
 +          ret = archive_read_format_rar_read_header(a, a->entry);
 +          if (ret == (ARCHIVE_EOF))
 +          {
 +            rar->has_endarc_header = 1;
 +            ret = archive_read_format_rar_read_header(a, a->entry);
 +          }
 +          if (ret != (ARCHIVE_OK))
 +          {
 +            archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +              "Error during seek of RAR file");
 +            return (ARCHIVE_FAILED);
 +          }
 +          client_offset += rar->dbo[rar->cursor].start_offset -
 +            rar->dbo[rar->cursor-1].end_offset;
 +          continue;
 +        }
 +        break;
 +      }
 +    }
 +
 +    ret = __archive_read_seek(a, client_offset, SEEK_SET);
 +    if (ret < (ARCHIVE_OK))
 +      return ret;
 +    rar->bytes_remaining = rar->dbo[rar->cursor].end_offset - ret;
 +    i = rar->cursor;
 +    while (i > 0)
 +    {
 +      i--;
 +      ret -= rar->dbo[i+1].start_offset - rar->dbo[i].end_offset;
 +    }
 +    ret -= rar->dbo[0].start_offset;
 +
 +    /* Always restart reading the file after a seek */
-     a->read_data_block = NULL;
-     a->read_data_offset = 0;
-     a->read_data_output_offset = 0;
-     a->read_data_remaining = 0;
++    __archive_reset_read_data(&a->archive);
++
 +    rar->bytes_unconsumed = 0;
 +    rar->offset = 0;
 +
 +    /*
 +     * If a seek past the end of file was requested, return the requested
 +     * offset.
 +     */
 +    if (ret == rar->unp_size && rar->offset_seek > rar->unp_size)
 +      return rar->offset_seek;
 +
 +    /* Return the new offset */
 +    rar->offset_seek = ret;
 +    return rar->offset_seek;
 +  }
 +  else
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +      "Seeking of compressed RAR files is unsupported");
 +  }
 +  return (ARCHIVE_FAILED);
 +}
 +
 +static int
 +archive_read_format_rar_cleanup(struct archive_read *a)
 +{
 +  struct rar *rar;
 +
 +  rar = (struct rar *)(a->format->data);
 +  free_codes(a);
 +  free(rar->filename);
 +  free(rar->filename_save);
 +  free(rar->dbo);
 +  free(rar->unp_buffer);
 +  free(rar->lzss.window);
 +  __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context, &g_szalloc);
 +  free(rar);
 +  (a->format->data) = NULL;
 +  return (ARCHIVE_OK);
 +}
 +
 +static int
 +read_header(struct archive_read *a, struct archive_entry *entry,
 +            char head_type)
 +{
 +  const void *h;
 +  const char *p, *endp;
 +  struct rar *rar;
 +  struct rar_header rar_header;
 +  struct rar_file_header file_header;
 +  int64_t header_size;
 +  unsigned filename_size, end;
 +  char *filename;
 +  char *strp;
 +  char packed_size[8];
 +  char unp_size[8];
 +  int ttime;
 +  struct archive_string_conv *sconv, *fn_sconv;
 +  unsigned long crc32_val;
 +  int ret = (ARCHIVE_OK), ret2;
 +
 +  rar = (struct rar *)(a->format->data);
 +
 +  /* Setup a string conversion object for non-rar-unicode filenames. */
 +  sconv = rar->opt_sconv;
 +  if (sconv == NULL) {
 +    if (!rar->init_default_conversion) {
 +      rar->sconv_default =
 +          archive_string_default_conversion_for_read(
 +            &(a->archive));
 +      rar->init_default_conversion = 1;
 +    }
 +    sconv = rar->sconv_default;
 +  }
 +
 +
 +  if ((h = __archive_read_ahead(a, 7, NULL)) == NULL)
 +    return (ARCHIVE_FATAL);
 +  p = h;
 +  memcpy(&rar_header, p, sizeof(rar_header));
 +  rar->file_flags = archive_le16dec(rar_header.flags);
 +  header_size = archive_le16dec(rar_header.size);
 +  if (header_size < (int64_t)sizeof(file_header) + 7) {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +      "Invalid header size");
 +    return (ARCHIVE_FATAL);
 +  }
 +  crc32_val = crc32(0, (const unsigned char *)p + 2, 7 - 2);
 +  __archive_read_consume(a, 7);
 +
 +  if (!(rar->file_flags & FHD_SOLID))
 +  {
 +    rar->compression_method = 0;
 +    rar->packed_size = 0;
 +    rar->unp_size = 0;
 +    rar->mtime = 0;
 +    rar->ctime = 0;
 +    rar->atime = 0;
 +    rar->arctime = 0;
 +    rar->mode = 0;
 +    memset(&rar->salt, 0, sizeof(rar->salt));
 +    rar->atime = 0;
 +    rar->ansec = 0;
 +    rar->ctime = 0;
 +    rar->cnsec = 0;
 +    rar->mtime = 0;
 +    rar->mnsec = 0;
 +    rar->arctime = 0;
 +    rar->arcnsec = 0;
 +  }
 +  else
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "RAR solid archive support unavailable.");
 +    return (ARCHIVE_FATAL);
 +  }
 +
 +  if ((h = __archive_read_ahead(a, (size_t)header_size - 7, NULL)) == NULL)
 +    return (ARCHIVE_FATAL);
 +
 +  /* File Header CRC check. */
 +  crc32_val = crc32(crc32_val, h, (unsigned)(header_size - 7));
 +  if ((crc32_val & 0xffff) != archive_le16dec(rar_header.crc)) {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +      "Header CRC error");
 +    return (ARCHIVE_FATAL);
 +  }
 +  /* If no CRC error, Go on parsing File Header. */
 +  p = h;
 +  endp = p + header_size - 7;
 +  memcpy(&file_header, p, sizeof(file_header));
 +  p += sizeof(file_header);
 +
 +  rar->compression_method = file_header.method;
 +
 +  ttime = archive_le32dec(file_header.file_time);
 +  rar->mtime = get_time(ttime);
 +
 +  rar->file_crc = archive_le32dec(file_header.file_crc);
 +
 +  if (rar->file_flags & FHD_PASSWORD)
 +  {
 +	archive_entry_set_is_data_encrypted(entry, 1);
 +	rar->has_encrypted_entries = 1;
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "RAR encryption support unavailable.");
 +    /* Since it is only the data part itself that is encrypted we can at least
 +       extract information about the currently processed entry and don't need
 +       to return ARCHIVE_FATAL here. */
 +    /*return (ARCHIVE_FATAL);*/
 +  }
 +
 +  if (rar->file_flags & FHD_LARGE)
 +  {
 +    memcpy(packed_size, file_header.pack_size, 4);
 +    memcpy(packed_size + 4, p, 4); /* High pack size */
 +    p += 4;
 +    memcpy(unp_size, file_header.unp_size, 4);
 +    memcpy(unp_size + 4, p, 4); /* High unpack size */
 +    p += 4;
 +    rar->packed_size = archive_le64dec(&packed_size);
 +    rar->unp_size = archive_le64dec(&unp_size);
 +  }
 +  else
 +  {
 +    rar->packed_size = archive_le32dec(file_header.pack_size);
 +    rar->unp_size = archive_le32dec(file_header.unp_size);
 +  }
 +
 +  if (rar->packed_size < 0 || rar->unp_size < 0)
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Invalid sizes specified.");
 +    return (ARCHIVE_FATAL);
 +  }
 +
 +  rar->bytes_remaining = rar->packed_size;
 +
 +  /* TODO: RARv3 subblocks contain comments. For now the complete block is
 +   * consumed at the end.
 +   */
 +  if (head_type == NEWSUB_HEAD) {
 +    size_t distance = p - (const char *)h;
 +    header_size += rar->packed_size;
 +    /* Make sure we have the extended data. */
 +    if ((h = __archive_read_ahead(a, (size_t)header_size - 7, NULL)) == NULL)
 +        return (ARCHIVE_FATAL);
 +    p = h;
 +    endp = p + header_size - 7;
 +    p += distance;
 +  }
 +
 +  filename_size = archive_le16dec(file_header.name_size);
 +  if (p + filename_size > endp) {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +      "Invalid filename size");
 +    return (ARCHIVE_FATAL);
 +  }
 +  if (rar->filename_allocated < filename_size * 2 + 2) {
 +    char *newptr;
 +    size_t newsize = filename_size * 2 + 2;
 +    newptr = realloc(rar->filename, newsize);
 +    if (newptr == NULL) {
 +      archive_set_error(&a->archive, ENOMEM,
 +                        "Couldn't allocate memory.");
 +      return (ARCHIVE_FATAL);
 +    }
 +    rar->filename = newptr;
 +    rar->filename_allocated = newsize;
 +  }
 +  filename = rar->filename;
 +  memcpy(filename, p, filename_size);
 +  filename[filename_size] = '\0';
 +  if (rar->file_flags & FHD_UNICODE)
 +  {
 +    if (filename_size != strlen(filename))
 +    {
 +      unsigned char highbyte, flagbits, flagbyte;
 +      unsigned fn_end, offset;
 +
 +      end = filename_size;
 +      fn_end = filename_size * 2;
 +      filename_size = 0;
 +      offset = (unsigned)strlen(filename) + 1;
 +      highbyte = *(p + offset++);
 +      flagbits = 0;
 +      flagbyte = 0;
 +      while (offset < end && filename_size < fn_end)
 +      {
 +        if (!flagbits)
 +        {
 +          flagbyte = *(p + offset++);
 +          flagbits = 8;
 +        }
 +
 +        flagbits -= 2;
 +        switch((flagbyte >> flagbits) & 3)
 +        {
 +          case 0:
 +            filename[filename_size++] = '\0';
 +            filename[filename_size++] = *(p + offset++);
 +            break;
 +          case 1:
 +            filename[filename_size++] = highbyte;
 +            filename[filename_size++] = *(p + offset++);
 +            break;
 +          case 2:
 +            filename[filename_size++] = *(p + offset + 1);
 +            filename[filename_size++] = *(p + offset);
 +            offset += 2;
 +            break;
 +          case 3:
 +          {
 +            char extra, high;
 +            uint8_t length = *(p + offset++);
 +
 +            if (length & 0x80) {
 +              extra = *(p + offset++);
 +              high = (char)highbyte;
 +            } else
 +              extra = high = 0;
 +            length = (length & 0x7f) + 2;
 +            while (length && filename_size < fn_end) {
 +              unsigned cp = filename_size >> 1;
 +              filename[filename_size++] = high;
 +              filename[filename_size++] = p[cp] + extra;
 +              length--;
 +            }
 +          }
 +          break;
 +        }
 +      }
 +      if (filename_size > fn_end) {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +          "Invalid filename");
 +        return (ARCHIVE_FATAL);
 +      }
 +      filename[filename_size++] = '\0';
 +      filename[filename_size++] = '\0';
 +
 +      /* Decoded unicode form is UTF-16BE, so we have to update a string
 +       * conversion object for it. */
 +      if (rar->sconv_utf16be == NULL) {
 +        rar->sconv_utf16be = archive_string_conversion_from_charset(
 +           &a->archive, "UTF-16BE", 1);
 +        if (rar->sconv_utf16be == NULL)
 +          return (ARCHIVE_FATAL);
 +      }
 +      fn_sconv = rar->sconv_utf16be;
 +
 +      strp = filename;
 +      while (memcmp(strp, "\x00\x00", 2))
 +      {
 +        if (!memcmp(strp, "\x00\\", 2))
 +          *(strp + 1) = '/';
 +        strp += 2;
 +      }
 +      p += offset;
 +    } else {
 +      /*
 +       * If FHD_UNICODE is set but no unicode data, this file name form
 +       * is UTF-8, so we have to update a string conversion object for
 +       * it accordingly.
 +       */
 +      if (rar->sconv_utf8 == NULL) {
 +        rar->sconv_utf8 = archive_string_conversion_from_charset(
 +           &a->archive, "UTF-8", 1);
 +        if (rar->sconv_utf8 == NULL)
 +          return (ARCHIVE_FATAL);
 +      }
 +      fn_sconv = rar->sconv_utf8;
 +      while ((strp = strchr(filename, '\\')) != NULL)
 +        *strp = '/';
 +      p += filename_size;
 +    }
 +  }
 +  else
 +  {
 +    fn_sconv = sconv;
 +    while ((strp = strchr(filename, '\\')) != NULL)
 +      *strp = '/';
 +    p += filename_size;
 +  }
 +
 +  /* Split file in multivolume RAR. No more need to process header. */
 +  if (rar->filename_save &&
++    filename_size == rar->filename_save_size &&
 +    !memcmp(rar->filename, rar->filename_save, filename_size + 1))
 +  {
 +    __archive_read_consume(a, header_size - 7);
 +    rar->cursor++;
 +    if (rar->cursor >= rar->nodes)
 +    {
 +      rar->nodes++;
 +      if ((rar->dbo =
 +        realloc(rar->dbo, sizeof(*rar->dbo) * rar->nodes)) == NULL)
 +      {
 +        archive_set_error(&a->archive, ENOMEM, "Couldn't allocate memory.");
 +        return (ARCHIVE_FATAL);
 +      }
 +      rar->dbo[rar->cursor].header_size = header_size;
 +      rar->dbo[rar->cursor].start_offset = -1;
 +      rar->dbo[rar->cursor].end_offset = -1;
 +    }
 +    if (rar->dbo[rar->cursor].start_offset < 0)
 +    {
 +      rar->dbo[rar->cursor].start_offset = a->filter->position;
 +      rar->dbo[rar->cursor].end_offset = rar->dbo[rar->cursor].start_offset +
 +        rar->packed_size;
 +    }
 +    return ret;
 +  }
 +
 +  rar->filename_save = (char*)realloc(rar->filename_save,
 +                                      filename_size + 1);
 +  memcpy(rar->filename_save, rar->filename, filename_size + 1);
++  rar->filename_save_size = filename_size;
 +
 +  /* Set info for seeking */
 +  free(rar->dbo);
 +  if ((rar->dbo = calloc(1, sizeof(*rar->dbo))) == NULL)
 +  {
 +    archive_set_error(&a->archive, ENOMEM, "Couldn't allocate memory.");
 +    return (ARCHIVE_FATAL);
 +  }
 +  rar->dbo[0].header_size = header_size;
 +  rar->dbo[0].start_offset = -1;
 +  rar->dbo[0].end_offset = -1;
 +  rar->cursor = 0;
 +  rar->nodes = 1;
 +
 +  if (rar->file_flags & FHD_SALT)
 +  {
 +    if (p + 8 > endp) {
 +      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +        "Invalid header size");
 +      return (ARCHIVE_FATAL);
 +    }
 +    memcpy(rar->salt, p, 8);
 +    p += 8;
 +  }
 +
 +  if (rar->file_flags & FHD_EXTTIME) {
 +    if (read_exttime(p, rar, endp) < 0) {
 +      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +        "Invalid header size");
 +      return (ARCHIVE_FATAL);
 +    }
 +  }
 +
 +  __archive_read_consume(a, header_size - 7);
 +  rar->dbo[0].start_offset = a->filter->position;
 +  rar->dbo[0].end_offset = rar->dbo[0].start_offset + rar->packed_size;
 +
 +  switch(file_header.host_os)
 +  {
 +  case OS_MSDOS:
 +  case OS_OS2:
 +  case OS_WIN32:
 +    rar->mode = archive_le32dec(file_header.file_attr);
 +    if (rar->mode & FILE_ATTRIBUTE_DIRECTORY)
 +      rar->mode = AE_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH;
 +    else
 +      rar->mode = AE_IFREG;
 +    rar->mode |= S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
 +    break;
 +
 +  case OS_UNIX:
 +  case OS_MAC_OS:
 +  case OS_BEOS:
 +    rar->mode = archive_le32dec(file_header.file_attr);
 +    break;
 +
 +  default:
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Unknown file attributes from RAR file's host OS");
 +    return (ARCHIVE_FATAL);
 +  }
 +
 +  rar->bytes_uncopied = rar->bytes_unconsumed = 0;
 +  rar->lzss.position = rar->offset = 0;
 +  rar->offset_seek = 0;
 +  rar->dictionary_size = 0;
 +  rar->offset_outgoing = 0;
 +  rar->br.cache_avail = 0;
 +  rar->br.avail_in = 0;
 +  rar->crc_calculated = 0;
 +  rar->entry_eof = 0;
 +  rar->valid = 1;
 +  rar->is_ppmd_block = 0;
 +  rar->start_new_table = 1;
 +  free(rar->unp_buffer);
 +  rar->unp_buffer = NULL;
 +  rar->unp_offset = 0;
 +  rar->unp_buffer_size = UNP_BUFFER_SIZE;
 +  memset(rar->lengthtable, 0, sizeof(rar->lengthtable));
 +  __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context, &g_szalloc);
 +  rar->ppmd_valid = rar->ppmd_eod = 0;
 +
 +  /* Don't set any archive entries for non-file header types */
 +  if (head_type == NEWSUB_HEAD)
 +    return ret;
 +
 +  archive_entry_set_mtime(entry, rar->mtime, rar->mnsec);
 +  archive_entry_set_ctime(entry, rar->ctime, rar->cnsec);
 +  archive_entry_set_atime(entry, rar->atime, rar->ansec);
 +  archive_entry_set_size(entry, rar->unp_size);
 +  archive_entry_set_mode(entry, rar->mode);
 +
 +  if (archive_entry_copy_pathname_l(entry, filename, filename_size, fn_sconv))
 +  {
 +    if (errno == ENOMEM)
 +    {
 +      archive_set_error(&a->archive, ENOMEM,
 +                        "Can't allocate memory for Pathname");
 +      return (ARCHIVE_FATAL);
 +    }
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Pathname cannot be converted from %s to current locale.",
 +                      archive_string_conversion_charset_name(fn_sconv));
 +    ret = (ARCHIVE_WARN);
 +  }
 +
 +  if (((rar->mode) & AE_IFMT) == AE_IFLNK)
 +  {
 +    /* Make sure a symbolic-link file does not have its body. */
 +    rar->bytes_remaining = 0;
 +    archive_entry_set_size(entry, 0);
 +
 +    /* Read a symbolic-link name. */
 +    if ((ret2 = read_symlink_stored(a, entry, sconv)) < (ARCHIVE_WARN))
 +      return ret2;
 +    if (ret > ret2)
 +      ret = ret2;
 +  }
 +
 +  if (rar->bytes_remaining == 0)
 +    rar->entry_eof = 1;
 +
 +  return ret;
 +}
 +
 +static time_t
 +get_time(int ttime)
 +{
 +  struct tm tm;
 +  tm.tm_sec = 2 * (ttime & 0x1f);
 +  tm.tm_min = (ttime >> 5) & 0x3f;
 +  tm.tm_hour = (ttime >> 11) & 0x1f;
 +  tm.tm_mday = (ttime >> 16) & 0x1f;
 +  tm.tm_mon = ((ttime >> 21) & 0x0f) - 1;
 +  tm.tm_year = ((ttime >> 25) & 0x7f) + 80;
 +  tm.tm_isdst = -1;
 +  return mktime(&tm);
 +}
 +
 +static int
 +read_exttime(const char *p, struct rar *rar, const char *endp)
 +{
 +  unsigned rmode, flags, rem, j, count;
 +  int ttime, i;
 +  struct tm *tm;
 +  time_t t;
 +  long nsec;
 +
 +  if (p + 2 > endp)
 +    return (-1);
 +  flags = archive_le16dec(p);
 +  p += 2;
 +
 +  for (i = 3; i >= 0; i--)
 +  {
 +    t = 0;
 +    if (i == 3)
 +      t = rar->mtime;
 +    rmode = flags >> i * 4;
 +    if (rmode & 8)
 +    {
 +      if (!t)
 +      {
 +        if (p + 4 > endp)
 +          return (-1);
 +        ttime = archive_le32dec(p);
 +        t = get_time(ttime);
 +        p += 4;
 +      }
 +      rem = 0;
 +      count = rmode & 3;
 +      if (p + count > endp)
 +        return (-1);
 +      for (j = 0; j < count; j++)
 +      {
 +        rem = ((*p) << 16) | (rem >> 8);
 +        p++;
 +      }
 +      tm = localtime(&t);
 +      nsec = tm->tm_sec + rem / NS_UNIT;
 +      if (rmode & 4)
 +      {
 +        tm->tm_sec++;
 +        t = mktime(tm);
 +      }
 +      if (i == 3)
 +      {
 +        rar->mtime = t;
 +        rar->mnsec = nsec;
 +      }
 +      else if (i == 2)
 +      {
 +        rar->ctime = t;
 +        rar->cnsec = nsec;
 +      }
 +      else if (i == 1)
 +      {
 +        rar->atime = t;
 +        rar->ansec = nsec;
 +      }
 +      else
 +      {
 +        rar->arctime = t;
 +        rar->arcnsec = nsec;
 +      }
 +    }
 +  }
 +  return (0);
 +}
 +
 +static int
 +read_symlink_stored(struct archive_read *a, struct archive_entry *entry,
 +                    struct archive_string_conv *sconv)
 +{
 +  const void *h;
 +  const char *p;
 +  struct rar *rar;
 +  int ret = (ARCHIVE_OK);
 +
 +  rar = (struct rar *)(a->format->data);
 +  if ((h = rar_read_ahead(a, (size_t)rar->packed_size, NULL)) == NULL)
 +    return (ARCHIVE_FATAL);
 +  p = h;
 +
 +  if (archive_entry_copy_symlink_l(entry,
 +      p, (size_t)rar->packed_size, sconv))
 +  {
 +    if (errno == ENOMEM)
 +    {
 +      archive_set_error(&a->archive, ENOMEM,
 +                        "Can't allocate memory for link");
 +      return (ARCHIVE_FATAL);
 +    }
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "link cannot be converted from %s to current locale.",
 +                      archive_string_conversion_charset_name(sconv));
 +    ret = (ARCHIVE_WARN);
 +  }
 +  __archive_read_consume(a, rar->packed_size);
 +  return ret;
 +}
 +
 +static int
 +read_data_stored(struct archive_read *a, const void **buff, size_t *size,
 +                 int64_t *offset)
 +{
 +  struct rar *rar;
 +  ssize_t bytes_avail;
 +
 +  rar = (struct rar *)(a->format->data);
 +  if (rar->bytes_remaining == 0 &&
 +    !(rar->main_flags & MHD_VOLUME && rar->file_flags & FHD_SPLIT_AFTER))
 +  {
 +    *buff = NULL;
 +    *size = 0;
 +    *offset = rar->offset;
 +    if (rar->file_crc != rar->crc_calculated) {
 +      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                        "File CRC error");
 +      return (ARCHIVE_FATAL);
 +    }
 +    rar->entry_eof = 1;
 +    return (ARCHIVE_EOF);
 +  }
 +
 +  *buff = rar_read_ahead(a, 1, &bytes_avail);
 +  if (bytes_avail <= 0)
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Truncated RAR file data");
 +    return (ARCHIVE_FATAL);
 +  }
 +
 +  *size = bytes_avail;
 +  *offset = rar->offset;
 +  rar->offset += bytes_avail;
 +  rar->offset_seek += bytes_avail;
 +  rar->bytes_remaining -= bytes_avail;
 +  rar->bytes_unconsumed = bytes_avail;
 +  /* Calculate File CRC. */
 +  rar->crc_calculated = crc32(rar->crc_calculated, *buff,
 +    (unsigned)bytes_avail);
 +  return (ARCHIVE_OK);
 +}
 +
 +static int
 +read_data_compressed(struct archive_read *a, const void **buff, size_t *size,
 +               int64_t *offset)
 +{
 +  struct rar *rar;
 +  int64_t start, end, actualend;
 +  size_t bs;
 +  int ret = (ARCHIVE_OK), sym, code, lzss_offset, length, i;
 +
 +  rar = (struct rar *)(a->format->data);
 +
 +  do {
 +    if (!rar->valid)
 +      return (ARCHIVE_FATAL);
 +    if (rar->ppmd_eod ||
 +       (rar->dictionary_size && rar->offset >= rar->unp_size))
 +    {
 +      if (rar->unp_offset > 0) {
 +        /*
 +         * We have unprocessed extracted data. write it out.
 +         */
 +        *buff = rar->unp_buffer;
 +        *size = rar->unp_offset;
 +        *offset = rar->offset_outgoing;
 +        rar->offset_outgoing += *size;
 +        /* Calculate File CRC. */
 +        rar->crc_calculated = crc32(rar->crc_calculated, *buff,
 +          (unsigned)*size);
 +        rar->unp_offset = 0;
 +        return (ARCHIVE_OK);
 +      }
 +      *buff = NULL;
 +      *size = 0;
 +      *offset = rar->offset;
 +      if (rar->file_crc != rar->crc_calculated) {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                          "File CRC error");
 +        return (ARCHIVE_FATAL);
 +      }
 +      rar->entry_eof = 1;
 +      return (ARCHIVE_EOF);
 +    }
 +
 +    if (!rar->is_ppmd_block && rar->dictionary_size && rar->bytes_uncopied > 0)
 +    {
 +      if (rar->bytes_uncopied > (rar->unp_buffer_size - rar->unp_offset))
 +        bs = rar->unp_buffer_size - rar->unp_offset;
 +      else
 +        bs = (size_t)rar->bytes_uncopied;
 +      ret = copy_from_lzss_window(a, buff, rar->offset, (int)bs);
 +      if (ret != ARCHIVE_OK)
 +        return (ret);
 +      rar->offset += bs;
 +      rar->bytes_uncopied -= bs;
 +      if (*buff != NULL) {
 +        rar->unp_offset = 0;
 +        *size = rar->unp_buffer_size;
 +        *offset = rar->offset_outgoing;
 +        rar->offset_outgoing += *size;
 +        /* Calculate File CRC. */
 +        rar->crc_calculated = crc32(rar->crc_calculated, *buff,
 +          (unsigned)*size);
 +        return (ret);
 +      }
 +      continue;
 +    }
 +
 +    if (!rar->br.next_in &&
 +      (ret = rar_br_preparation(a, &(rar->br))) < ARCHIVE_WARN)
 +      return (ret);
 +    if (rar->start_new_table && ((ret = parse_codes(a)) < (ARCHIVE_WARN)))
 +      return (ret);
 +
 +    if (rar->is_ppmd_block)
 +    {
 +      if ((sym = __archive_ppmd7_functions.Ppmd7_DecodeSymbol(
 +        &rar->ppmd7_context, &rar->range_dec.p)) < 0)
 +      {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                          "Invalid symbol");
 +        return (ARCHIVE_FATAL);
 +      }
 +      if(sym != rar->ppmd_escape)
 +      {
 +        lzss_emit_literal(rar, sym);
 +        rar->bytes_uncopied++;
 +      }
 +      else
 +      {
 +        if ((code = __archive_ppmd7_functions.Ppmd7_DecodeSymbol(
 +          &rar->ppmd7_context, &rar->range_dec.p)) < 0)
 +        {
 +          archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                            "Invalid symbol");
 +          return (ARCHIVE_FATAL);
 +        }
 +
 +        switch(code)
 +        {
 +          case 0:
 +            rar->start_new_table = 1;
 +            return read_data_compressed(a, buff, size, offset);
 +
 +          case 2:
 +            rar->ppmd_eod = 1;/* End Of ppmd Data. */
 +            continue;
 +
 +          case 3:
 +            archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +                              "Parsing filters is unsupported.");
 +            return (ARCHIVE_FAILED);
 +
 +          case 4:
 +            lzss_offset = 0;
 +            for (i = 2; i >= 0; i--)
 +            {
 +              if ((code = __archive_ppmd7_functions.Ppmd7_DecodeSymbol(
 +                &rar->ppmd7_context, &rar->range_dec.p)) < 0)
 +              {
 +                archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                                  "Invalid symbol");
 +                return (ARCHIVE_FATAL);
 +              }
 +              lzss_offset |= code << (i * 8);
 +            }
 +            if ((length = __archive_ppmd7_functions.Ppmd7_DecodeSymbol(
 +              &rar->ppmd7_context, &rar->range_dec.p)) < 0)
 +            {
 +              archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                                "Invalid symbol");
 +              return (ARCHIVE_FATAL);
 +            }
 +            lzss_emit_match(rar, lzss_offset + 2, length + 32);
 +            rar->bytes_uncopied += length + 32;
 +            break;
 +
 +          case 5:
 +            if ((length = __archive_ppmd7_functions.Ppmd7_DecodeSymbol(
 +              &rar->ppmd7_context, &rar->range_dec.p)) < 0)
 +            {
 +              archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                                "Invalid symbol");
 +              return (ARCHIVE_FATAL);
 +            }
 +            lzss_emit_match(rar, 1, length + 4);
 +            rar->bytes_uncopied += length + 4;
 +            break;
 +
 +         default:
 +           lzss_emit_literal(rar, sym);
 +           rar->bytes_uncopied++;
 +        }
 +      }
 +    }
 +    else
 +    {
 +      start = rar->offset;
 +      end = start + rar->dictionary_size;
 +      rar->filterstart = INT64_MAX;
 +
 +      if ((actualend = expand(a, end)) < 0)
 +        return ((int)actualend);
 +
 +      rar->bytes_uncopied = actualend - start;
 +      if (rar->bytes_uncopied == 0) {
 +          /* Broken RAR files cause this case.
 +          * NOTE: If this case were possible on a normal RAR file
 +          * we would find out where it was actually bad and
 +          * what we would do to solve it. */
 +          archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                            "Internal error extracting RAR file");
 +          return (ARCHIVE_FATAL);
 +      }
 +    }
 +    if (rar->bytes_uncopied > (rar->unp_buffer_size - rar->unp_offset))
 +      bs = rar->unp_buffer_size - rar->unp_offset;
 +    else
 +      bs = (size_t)rar->bytes_uncopied;
 +    ret = copy_from_lzss_window(a, buff, rar->offset, (int)bs);
 +    if (ret != ARCHIVE_OK)
 +      return (ret);
 +    rar->offset += bs;
 +    rar->bytes_uncopied -= bs;
 +    /*
 +     * If *buff is NULL, it means unp_buffer is not full.
 +     * So we have to continue extracting a RAR file.
 +     */
 +  } while (*buff == NULL);
 +
 +  rar->unp_offset = 0;
 +  *size = rar->unp_buffer_size;
 +  *offset = rar->offset_outgoing;
 +  rar->offset_outgoing += *size;
 +  /* Calculate File CRC. */
 +  rar->crc_calculated = crc32(rar->crc_calculated, *buff, (unsigned)*size);
 +  return ret;
 +}
 +
 +static int
 +parse_codes(struct archive_read *a)
 +{
 +  int i, j, val, n, r;
 +  unsigned char bitlengths[MAX_SYMBOLS], zerocount, ppmd_flags;
 +  unsigned int maxorder;
 +  struct huffman_code precode;
 +  struct rar *rar = (struct rar *)(a->format->data);
 +  struct rar_br *br = &(rar->br);
 +
 +  free_codes(a);
 +
 +  /* Skip to the next byte */
 +  rar_br_consume_unalined_bits(br);
 +
 +  /* PPMd block flag */
 +  if (!rar_br_read_ahead(a, br, 1))
 +    goto truncated_data;
 +  if ((rar->is_ppmd_block = rar_br_bits(br, 1)) != 0)
 +  {
 +    rar_br_consume(br, 1);
 +    if (!rar_br_read_ahead(a, br, 7))
 +      goto truncated_data;
 +    ppmd_flags = rar_br_bits(br, 7);
 +    rar_br_consume(br, 7);
 +
 +    /* Memory is allocated in MB */
 +    if (ppmd_flags & 0x20)
 +    {
 +      if (!rar_br_read_ahead(a, br, 8))
 +        goto truncated_data;
 +      rar->dictionary_size = (rar_br_bits(br, 8) + 1) << 20;
 +      rar_br_consume(br, 8);
 +    }
 +
 +    if (ppmd_flags & 0x40)
 +    {
 +      if (!rar_br_read_ahead(a, br, 8))
 +        goto truncated_data;
 +      rar->ppmd_escape = rar->ppmd7_context.InitEsc = rar_br_bits(br, 8);
 +      rar_br_consume(br, 8);
 +    }
 +    else
 +      rar->ppmd_escape = 2;
 +
 +    if (ppmd_flags & 0x20)
 +    {
 +      maxorder = (ppmd_flags & 0x1F) + 1;
 +      if(maxorder > 16)
 +        maxorder = 16 + (maxorder - 16) * 3;
 +
 +      if (maxorder == 1)
 +      {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                          "Truncated RAR file data");
 +        return (ARCHIVE_FATAL);
 +      }
 +
 +      /* Make sure ppmd7_contest is freed before Ppmd7_Construct
 +       * because reading a broken file cause this abnormal sequence. */
 +      __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context, &g_szalloc);
 +
 +      rar->bytein.a = a;
 +      rar->bytein.Read = &ppmd_read;
 +      __archive_ppmd7_functions.PpmdRAR_RangeDec_CreateVTable(&rar->range_dec);
 +      rar->range_dec.Stream = &rar->bytein;
 +      __archive_ppmd7_functions.Ppmd7_Construct(&rar->ppmd7_context);
 +
 +      if (!__archive_ppmd7_functions.Ppmd7_Alloc(&rar->ppmd7_context,
 +        rar->dictionary_size, &g_szalloc))
 +      {
 +        archive_set_error(&a->archive, ENOMEM,
 +                          "Out of memory");
 +        return (ARCHIVE_FATAL);
 +      }
 +      if (!__archive_ppmd7_functions.PpmdRAR_RangeDec_Init(&rar->range_dec))
 +      {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                          "Unable to initialize PPMd range decoder");
 +        return (ARCHIVE_FATAL);
 +      }
 +      __archive_ppmd7_functions.Ppmd7_Init(&rar->ppmd7_context, maxorder);
 +      rar->ppmd_valid = 1;
 +    }
 +    else
 +    {
 +      if (!rar->ppmd_valid) {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                          "Invalid PPMd sequence");
 +        return (ARCHIVE_FATAL);
 +      }
 +      if (!__archive_ppmd7_functions.PpmdRAR_RangeDec_Init(&rar->range_dec))
 +      {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                          "Unable to initialize PPMd range decoder");
 +        return (ARCHIVE_FATAL);
 +      }
 +    }
 +  }
 +  else
 +  {
 +    rar_br_consume(br, 1);
 +
 +    /* Keep existing table flag */
 +    if (!rar_br_read_ahead(a, br, 1))
 +      goto truncated_data;
 +    if (!rar_br_bits(br, 1))
 +      memset(rar->lengthtable, 0, sizeof(rar->lengthtable));
 +    rar_br_consume(br, 1);
 +
 +    memset(&bitlengths, 0, sizeof(bitlengths));
 +    for (i = 0; i < MAX_SYMBOLS;)
 +    {
 +      if (!rar_br_read_ahead(a, br, 4))
 +        goto truncated_data;
 +      bitlengths[i++] = rar_br_bits(br, 4);
 +      rar_br_consume(br, 4);
 +      if (bitlengths[i-1] == 0xF)
 +      {
 +        if (!rar_br_read_ahead(a, br, 4))
 +          goto truncated_data;
 +        zerocount = rar_br_bits(br, 4);
 +        rar_br_consume(br, 4);
 +        if (zerocount)
 +        {
 +          i--;
 +          for (j = 0; j < zerocount + 2 && i < MAX_SYMBOLS; j++)
 +            bitlengths[i++] = 0;
 +        }
 +      }
 +    }
 +
 +    memset(&precode, 0, sizeof(precode));
 +    r = create_code(a, &precode, bitlengths, MAX_SYMBOLS, MAX_SYMBOL_LENGTH);
 +    if (r != ARCHIVE_OK) {
 +      free(precode.tree);
 +      free(precode.table);
 +      return (r);
 +    }
 +
 +    for (i = 0; i < HUFFMAN_TABLE_SIZE;)
 +    {
 +      if ((val = read_next_symbol(a, &precode)) < 0) {
 +        free(precode.tree);
 +        free(precode.table);
 +        return (ARCHIVE_FATAL);
 +      }
 +      if (val < 16)
 +      {
 +        rar->lengthtable[i] = (rar->lengthtable[i] + val) & 0xF;
 +        i++;
 +      }
 +      else if (val < 18)
 +      {
 +        if (i == 0)
 +        {
 +          free(precode.tree);
 +          free(precode.table);
 +          archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                            "Internal error extracting RAR file.");
 +          return (ARCHIVE_FATAL);
 +        }
 +
 +        if(val == 16) {
 +          if (!rar_br_read_ahead(a, br, 3)) {
 +            free(precode.tree);
 +            free(precode.table);
 +            goto truncated_data;
 +          }
 +          n = rar_br_bits(br, 3) + 3;
 +          rar_br_consume(br, 3);
 +        } else {
 +          if (!rar_br_read_ahead(a, br, 7)) {
 +            free(precode.tree);
 +            free(precode.table);
 +            goto truncated_data;
 +          }
 +          n = rar_br_bits(br, 7) + 11;
 +          rar_br_consume(br, 7);
 +        }
 +
 +        for (j = 0; j < n && i < HUFFMAN_TABLE_SIZE; j++)
 +        {
 +          rar->lengthtable[i] = rar->lengthtable[i-1];
 +          i++;
 +        }
 +      }
 +      else
 +      {
 +        if(val == 18) {
 +          if (!rar_br_read_ahead(a, br, 3)) {
 +            free(precode.tree);
 +            free(precode.table);
 +            goto truncated_data;
 +          }
 +          n = rar_br_bits(br, 3) + 3;
 +          rar_br_consume(br, 3);
 +        } else {
 +          if (!rar_br_read_ahead(a, br, 7)) {
 +            free(precode.tree);
 +            free(precode.table);
 +            goto truncated_data;
 +          }
 +          n = rar_br_bits(br, 7) + 11;
 +          rar_br_consume(br, 7);
 +        }
 +
 +        for(j = 0; j < n && i < HUFFMAN_TABLE_SIZE; j++)
 +          rar->lengthtable[i++] = 0;
 +      }
 +    }
 +    free(precode.tree);
 +    free(precode.table);
 +
 +    r = create_code(a, &rar->maincode, &rar->lengthtable[0], MAINCODE_SIZE,
 +                MAX_SYMBOL_LENGTH);
 +    if (r != ARCHIVE_OK)
 +      return (r);
 +    r = create_code(a, &rar->offsetcode, &rar->lengthtable[MAINCODE_SIZE],
 +                OFFSETCODE_SIZE, MAX_SYMBOL_LENGTH);
 +    if (r != ARCHIVE_OK)
 +      return (r);
 +    r = create_code(a, &rar->lowoffsetcode,
 +                &rar->lengthtable[MAINCODE_SIZE + OFFSETCODE_SIZE],
 +                LOWOFFSETCODE_SIZE, MAX_SYMBOL_LENGTH);
 +    if (r != ARCHIVE_OK)
 +      return (r);
 +    r = create_code(a, &rar->lengthcode,
 +                &rar->lengthtable[MAINCODE_SIZE + OFFSETCODE_SIZE +
 +                LOWOFFSETCODE_SIZE], LENGTHCODE_SIZE, MAX_SYMBOL_LENGTH);
 +    if (r != ARCHIVE_OK)
 +      return (r);
 +  }
 +
 +  if (!rar->dictionary_size || !rar->lzss.window)
 +  {
 +    /* Seems as though dictionary sizes are not used. Even so, minimize
 +     * memory usage as much as possible.
 +     */
 +    void *new_window;
 +    unsigned int new_size;
 +
 +    if (rar->unp_size >= DICTIONARY_MAX_SIZE)
 +      new_size = DICTIONARY_MAX_SIZE;
 +    else
 +      new_size = rar_fls((unsigned int)rar->unp_size) << 1;
 +    new_window = realloc(rar->lzss.window, new_size);
 +    if (new_window == NULL) {
 +      archive_set_error(&a->archive, ENOMEM,
 +                        "Unable to allocate memory for uncompressed data.");
 +      return (ARCHIVE_FATAL);
 +    }
 +    rar->lzss.window = (unsigned char *)new_window;
 +    rar->dictionary_size = new_size;
 +    memset(rar->lzss.window, 0, rar->dictionary_size);
 +    rar->lzss.mask = rar->dictionary_size - 1;
 +  }
 +
 +  rar->start_new_table = 0;
 +  return (ARCHIVE_OK);
 +truncated_data:
 +  archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                    "Truncated RAR file data");
 +  rar->valid = 0;
 +  return (ARCHIVE_FATAL);
 +}
 +
 +static void
 +free_codes(struct archive_read *a)
 +{
 +  struct rar *rar = (struct rar *)(a->format->data);
 +  free(rar->maincode.tree);
 +  free(rar->offsetcode.tree);
 +  free(rar->lowoffsetcode.tree);
 +  free(rar->lengthcode.tree);
 +  free(rar->maincode.table);
 +  free(rar->offsetcode.table);
 +  free(rar->lowoffsetcode.table);
 +  free(rar->lengthcode.table);
 +  memset(&rar->maincode, 0, sizeof(rar->maincode));
 +  memset(&rar->offsetcode, 0, sizeof(rar->offsetcode));
 +  memset(&rar->lowoffsetcode, 0, sizeof(rar->lowoffsetcode));
 +  memset(&rar->lengthcode, 0, sizeof(rar->lengthcode));
 +}
 +
 +
 +static int
 +read_next_symbol(struct archive_read *a, struct huffman_code *code)
 +{
 +  unsigned char bit;
 +  unsigned int bits;
 +  int length, value, node;
 +  struct rar *rar;
 +  struct rar_br *br;
 +
 +  if (!code->table)
 +  {
 +    if (make_table(a, code) != (ARCHIVE_OK))
 +      return -1;
 +  }
 +
 +  rar = (struct rar *)(a->format->data);
 +  br = &(rar->br);
 +
 +  /* Look ahead (peek) at bits */
 +  if (!rar_br_read_ahead(a, br, code->tablesize)) {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Truncated RAR file data");
 +    rar->valid = 0;
 +    return -1;
 +  }
 +  bits = rar_br_bits(br, code->tablesize);
 +
 +  length = code->table[bits].length;
 +  value = code->table[bits].value;
 +
 +  if (length < 0)
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Invalid prefix code in bitstream");
 +    return -1;
 +  }
 +
 +  if (length <= code->tablesize)
 +  {
 +    /* Skip length bits */
 +    rar_br_consume(br, length);
 +    return value;
 +  }
 +
 +  /* Skip tablesize bits */
 +  rar_br_consume(br, code->tablesize);
 +
 +  node = value;
 +  while (!(code->tree[node].branches[0] ==
 +    code->tree[node].branches[1]))
 +  {
 +    if (!rar_br_read_ahead(a, br, 1)) {
 +      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                        "Truncated RAR file data");
 +      rar->valid = 0;
 +      return -1;
 +    }
 +    bit = rar_br_bits(br, 1);
 +    rar_br_consume(br, 1);
 +
 +    if (code->tree[node].branches[bit] < 0)
 +    {
 +      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                        "Invalid prefix code in bitstream");
 +      return -1;
 +    }
 +    node = code->tree[node].branches[bit];
 +  }
 +
 +  return code->tree[node].branches[0];
 +}
 +
 +static int
 +create_code(struct archive_read *a, struct huffman_code *code,
 +            unsigned char *lengths, int numsymbols, char maxlength)
 +{
 +  int i, j, codebits = 0, symbolsleft = numsymbols;
 +
++  code->numentries = 0;
++  code->numallocatedentries = 0;
 +  if (new_node(code) < 0) {
 +    archive_set_error(&a->archive, ENOMEM,
 +                      "Unable to allocate memory for node data.");
 +    return (ARCHIVE_FATAL);
 +  }
 +  code->numentries = 1;
 +  code->minlength = INT_MAX;
 +  code->maxlength = INT_MIN;
 +  codebits = 0;
 +  for(i = 1; i <= maxlength; i++)
 +  {
 +    for(j = 0; j < numsymbols; j++)
 +    {
 +      if (lengths[j] != i) continue;
 +      if (add_value(a, code, j, codebits, i) != ARCHIVE_OK)
 +        return (ARCHIVE_FATAL);
 +      codebits++;
 +      if (--symbolsleft <= 0) { break; break; }
 +    }
 +    codebits <<= 1;
 +  }
 +  return (ARCHIVE_OK);
 +}
 +
 +static int
 +add_value(struct archive_read *a, struct huffman_code *code, int value,
 +          int codebits, int length)
 +{
 +  int repeatpos, lastnode, bitpos, bit, repeatnode, nextnode;
 +
 +  free(code->table);
 +  code->table = NULL;
 +
 +  if(length > code->maxlength)
 +    code->maxlength = length;
 +  if(length < code->minlength)
 +    code->minlength = length;
 +
 +  repeatpos = -1;
 +  if (repeatpos == 0 || (repeatpos >= 0
 +    && (((codebits >> (repeatpos - 1)) & 3) == 0
 +    || ((codebits >> (repeatpos - 1)) & 3) == 3)))
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Invalid repeat position");
 +    return (ARCHIVE_FATAL);
 +  }
 +
 +  lastnode = 0;
 +  for (bitpos = length - 1; bitpos >= 0; bitpos--)
 +  {
 +    bit = (codebits >> bitpos) & 1;
 +
 +    /* Leaf node check */
 +    if (code->tree[lastnode].branches[0] ==
 +      code->tree[lastnode].branches[1])
 +    {
 +      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                        "Prefix found");
 +      return (ARCHIVE_FATAL);
 +    }
 +
 +    if (bitpos == repeatpos)
 +    {
 +      /* Open branch check */
 +      if (!(code->tree[lastnode].branches[bit] < 0))
 +      {
 +        archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                          "Invalid repeating code");
 +        return (ARCHIVE_FATAL);
 +      }
 +
 +      if ((repeatnode = new_node(code)) < 0) {
 +        archive_set_error(&a->archive, ENOMEM,
 +                          "Unable to allocate memory for node data.");
 +        return (ARCHIVE_FATAL);
 +      }
 +      if ((nextnode = new_node(code)) < 0) {
 +        archive_set_error(&a->archive, ENOMEM,
 +                          "Unable to allocate memory for node data.");
 +        return (ARCHIVE_FATAL);
 +      }
 +
 +      /* Set branches */
 +      code->tree[lastnode].branches[bit] = repeatnode;
 +      code->tree[repeatnode].branches[bit] = repeatnode;
 +      code->tree[repeatnode].branches[bit^1] = nextnode;
 +      lastnode = nextnode;
 +
 +      bitpos++; /* terminating bit already handled, skip it */
 +    }
 +    else
 +    {
 +      /* Open branch check */
 +      if (code->tree[lastnode].branches[bit] < 0)
 +      {
 +        if (new_node(code) < 0) {
 +          archive_set_error(&a->archive, ENOMEM,
 +                            "Unable to allocate memory for node data.");
 +          return (ARCHIVE_FATAL);
 +        }
 +        code->tree[lastnode].branches[bit] = code->numentries++;
 +      }
 +
 +      /* set to branch */
 +      lastnode = code->tree[lastnode].branches[bit];
 +    }
 +  }
 +
 +  if (!(code->tree[lastnode].branches[0] == -1
 +    && code->tree[lastnode].branches[1] == -2))
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Prefix found");
 +    return (ARCHIVE_FATAL);
 +  }
 +
 +  /* Set leaf value */
 +  code->tree[lastnode].branches[0] = value;
 +  code->tree[lastnode].branches[1] = value;
 +
 +  return (ARCHIVE_OK);
 +}
 +
 +static int
 +new_node(struct huffman_code *code)
 +{
 +  void *new_tree;
- 
-   new_tree = realloc(code->tree, (code->numentries + 1) * sizeof(*code->tree));
-   if (new_tree == NULL)
-     return (-1);
-   code->tree = (struct huffman_tree_node *)new_tree;
++  if (code->numallocatedentries == code->numentries) {
++    int new_num_entries = 256;
++    if (code->numentries > 0) {
++        new_num_entries = code->numentries * 2;
++    }
++    new_tree = realloc(code->tree, new_num_entries * sizeof(*code->tree));
++    if (new_tree == NULL)
++        return (-1);
++    code->tree = (struct huffman_tree_node *)new_tree;
++    code->numallocatedentries = new_num_entries;
++  }
 +  code->tree[code->numentries].branches[0] = -1;
 +  code->tree[code->numentries].branches[1] = -2;
 +  return 1;
 +}
 +
 +static int
 +make_table(struct archive_read *a, struct huffman_code *code)
 +{
 +  if (code->maxlength < code->minlength || code->maxlength > 10)
 +    code->tablesize = 10;
 +  else
 +    code->tablesize = code->maxlength;
 +
 +  code->table =
 +    (struct huffman_table_entry *)calloc(1, sizeof(*code->table)
 +    * ((size_t)1 << code->tablesize));
 +
 +  return make_table_recurse(a, code, 0, code->table, 0, code->tablesize);
 +}
 +
 +static int
 +make_table_recurse(struct archive_read *a, struct huffman_code *code, int node,
 +                   struct huffman_table_entry *table, int depth,
 +                   int maxdepth)
 +{
 +  int currtablesize, i, ret = (ARCHIVE_OK);
 +
 +  if (!code->tree)
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Huffman tree was not created.");
 +    return (ARCHIVE_FATAL);
 +  }
 +  if (node < 0 || node >= code->numentries)
 +  {
 +    archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                      "Invalid location to Huffman tree specified.");
 +    return (ARCHIVE_FATAL);
 +  }
 +
 +  currtablesize = 1 << (maxdepth - depth);
 +
 +  if (code->tree[node].branches[0] ==
 +    code->tree[node].branches[1])
 +  {
 +    for(i = 0; i < currtablesize; i++)
 +    {
 +      table[i].length = depth;
 +      table[i].value = code->tree[node].branches[0];
 +    }
 +  }
 +  else if (node < 0)
 +  {
 +    for(i = 0; i < currtablesize; i++)
 +      table[i].length = -1;
 +  }
 +  else
 +  {
 +    if(depth == maxdepth)
 +    {
 +      table[0].length = maxdepth + 1;
 +      table[0].value = node;
 +    }
 +    else
 +    {
 +      ret |= make_table_recurse(a, code, code->tree[node].branches[0], table,
 +                                depth + 1, maxdepth);
 +      ret |= make_table_recurse(a, code, code->tree[node].branches[1],
 +                         table + currtablesize / 2, depth + 1, maxdepth);
 +    }
 +  }
 +  return ret;
 +}
 +
 +static int64_t
 +expand(struct archive_read *a, int64_t end)
 +{
 +  static const unsigned char lengthbases[] =
 +    {   0,   1,   2,   3,   4,   5,   6,
 +        7,   8,  10,  12,  14,  16,  20,
 +       24,  28,  32,  40,  48,  56,  64,
 +       80,  96, 112, 128, 160, 192, 224 };
 +  static const unsigned char lengthbits[] =
 +    { 0, 0, 0, 0, 0, 0, 0,
 +      0, 1, 1, 1, 1, 2, 2,
 +      2, 2, 3, 3, 3, 3, 4,
 +      4, 4, 4, 5, 5, 5, 5 };
 +  static const unsigned int offsetbases[] =
 +    {       0,       1,       2,       3,       4,       6,
 +            8,      12,      16,      24,      32,      48,
 +           64,      96,     128,     192,     256,     384,
 +          512,     768,    1024,    1536,    2048,    3072,
 +         4096,    6144,    8192,   12288,   16384,   24576,
 +        32768,   49152,   65536,   98304,  131072,  196608,
 +       262144,  327680,  393216,  458752,  524288,  589824,
 +       655360,  720896,  786432,  851968,  917504,  983040,
 +      1048576, 1310720, 1572864, 1835008, 2097152, 2359296,
 +      2621440, 2883584, 3145728, 3407872, 3670016, 3932160 };
 +  static const unsigned char offsetbits[] =
 +    {  0,  0,  0,  0,  1,  1,  2,  2,  3,  3,  4,  4,
 +       5,  5,  6,  6,  7,  7,  8,  8,  9,  9, 10, 10,
 +      11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16,
 +      16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
 +      18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18 };
 +  static const unsigned char shortbases[] =
 +    { 0, 4, 8, 16, 32, 64, 128, 192 };
 +  static const unsigned char shortbits[] =
 +    { 2, 2, 3, 4, 5, 6, 6, 6 };
 +
 +  int symbol, offs, len, offsindex, lensymbol, i, offssymbol, lowoffsetsymbol;
 +  unsigned char newfile;
 +  struct rar *rar = (struct rar *)(a->format->data);
 +  struct rar_br *br = &(rar->br);
 +
 +  if (rar->filterstart < end)
 +    end = rar->filterstart;
 +
 +  while (1)
 +  {
 +    if (rar->output_last_match &&
 +      lzss_position(&rar->lzss) + rar->lastlength <= end)
 +    {
 +      lzss_emit_match(rar, rar->lastoffset, rar->lastlength);
 +      rar->output_last_match = 0;
 +    }
 +
 +    if(rar->is_ppmd_block || rar->output_last_match ||
 +      lzss_position(&rar->lzss) >= end)
 +      return lzss_position(&rar->lzss);
 +
 +    if ((symbol = read_next_symbol(a, &rar->maincode)) < 0)
 +      return (ARCHIVE_FATAL);
 +    rar->output_last_match = 0;
 +
 +    if (symbol < 256)
 +    {
 +      lzss_emit_literal(rar, symbol);
 +      continue;
 +    }
 +    else if (symbol == 256)
 +    {
 +      if (!rar_br_read_ahead(a, br, 1))
 +        goto truncated_data;
 +      newfile = !rar_br_bits(br, 1);
 +      rar_br_consume(br, 1);
 +
 +      if(newfile)
 +      {
 +        rar->start_new_block = 1;
 +        if (!rar_br_read_ahead(a, br, 1))
 +          goto truncated_data;
 +        rar->start_new_table = rar_br_bits(br, 1);
 +        rar_br_consume(br, 1);
 +        return lzss_position(&rar->lzss);
 +      }
 +      else
 +      {
 +        if (parse_codes(a) != ARCHIVE_OK)
 +          return (ARCHIVE_FATAL);
 +        continue;
 +      }
 +    }
 +    else if(symbol==257)
 +    {
 +      archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +                        "Parsing filters is unsupported.");
 +      return (ARCHIVE_FAILED);
 +    }
 +    else if(symbol==258)
 +    {
 +      if(rar->lastlength == 0)
 +        continue;
 +
 +      offs = rar->lastoffset;
 +      len = rar->lastlength;
 +    }
 +    else if (symbol <= 262)
 +    {
 +      offsindex = symbol - 259;
 +      offs = rar->oldoffset[offsindex];
 +
 +      if ((lensymbol = read_next_symbol(a, &rar->lengthcode)) < 0)
 +        goto bad_data;
 +      if (lensymbol > (int)(sizeof(lengthbases)/sizeof(lengthbases[0])))
 +        goto bad_data;
 +      if (lensymbol > (int)(sizeof(lengthbits)/sizeof(lengthbits[0])))
 +        goto bad_data;
 +      len = lengthbases[lensymbol] + 2;
 +      if (lengthbits[lensymbol] > 0) {
 +        if (!rar_br_read_ahead(a, br, lengthbits[lensymbol]))
 +          goto truncated_data;
 +        len += rar_br_bits(br, lengthbits[lensymbol]);
 +        rar_br_consume(br, lengthbits[lensymbol]);
 +      }
 +
 +      for (i = offsindex; i > 0; i--)
 +        rar->oldoffset[i] = rar->oldoffset[i-1];
 +      rar->oldoffset[0] = offs;
 +    }
 +    else if(symbol<=270)
 +    {
 +      offs = shortbases[symbol-263] + 1;
 +      if(shortbits[symbol-263] > 0) {
 +        if (!rar_br_read_ahead(a, br, shortbits[symbol-263]))
 +          goto truncated_data;
 +        offs += rar_br_bits(br, shortbits[symbol-263]);
 +        rar_br_consume(br, shortbits[symbol-263]);
 +      }
 +
 +      len = 2;
 +
 +      for(i = 3; i > 0; i--)
 +        rar->oldoffset[i] = rar->oldoffset[i-1];
 +      rar->oldoffset[0] = offs;
 +    }
 +    else
 +    {
 +      if (symbol-271 > (int)(sizeof(lengthbases)/sizeof(lengthbases[0])))
 +        goto bad_data;
 +      if (symbol-271 > (int)(sizeof(lengthbits)/sizeof(lengthbits[0])))
 +        goto bad_data;
 +      len = lengthbases[symbol-271]+3;
 +      if(lengthbits[symbol-271] > 0) {
 +        if (!rar_br_read_ahead(a, br, lengthbits[symbol-271]))
 +          goto truncated_data;
 +        len += rar_br_bits(br, lengthbits[symbol-271]);
 +        rar_br_consume(br, lengthbits[symbol-271]);
 +      }
 +
 +      if ((offssymbol = read_next_symbol(a, &rar->offsetcode)) < 0)
 +        goto bad_data;
 +      if (offssymbol > (int)(sizeof(offsetbases)/sizeof(offsetbases[0])))
 +        goto bad_data;
 +      if (offssymbol > (int)(sizeof(offsetbits)/sizeof(offsetbits[0])))
 +        goto bad_data;
 +      offs = offsetbases[offssymbol]+1;
 +      if(offsetbits[offssymbol] > 0)
 +      {
 +        if(offssymbol > 9)
 +        {
 +          if(offsetbits[offssymbol] > 4) {
 +            if (!rar_br_read_ahead(a, br, offsetbits[offssymbol] - 4))
 +              goto truncated_data;
 +            offs += rar_br_bits(br, offsetbits[offssymbol] - 4) << 4;
 +            rar_br_consume(br, offsetbits[offssymbol] - 4);
 +	  }
 +
 +          if(rar->numlowoffsetrepeats > 0)
 +          {
 +            rar->numlowoffsetrepeats--;
 +            offs += rar->lastlowoffset;
 +          }
 +          else
 +          {
 +            if ((lowoffsetsymbol =
 +              read_next_symbol(a, &rar->lowoffsetcode)) < 0)
 +              return (ARCHIVE_FATAL);
 +            if(lowoffsetsymbol == 16)
 +            {
 +              rar->numlowoffsetrepeats = 15;
 +              offs += rar->lastlowoffset;
 +            }
 +            else
 +            {
 +              offs += lowoffsetsymbol;
 +              rar->lastlowoffset = lowoffsetsymbol;
 +            }
 +          }
 +        }
 +        else {
 +          if (!rar_br_read_ahead(a, br, offsetbits[offssymbol]))
 +            goto truncated_data;
 +          offs += rar_br_bits(br, offsetbits[offssymbol]);
 +          rar_br_consume(br, offsetbits[offssymbol]);
 +        }
 +      }
 +
 +      if (offs >= 0x40000)
 +        len++;
 +      if (offs >= 0x2000)
 +        len++;
 +
 +      for(i = 3; i > 0; i--)
 +        rar->oldoffset[i] = rar->oldoffset[i-1];
 +      rar->oldoffset[0] = offs;
 +    }
 +
 +    rar->lastoffset = offs;
 +    rar->lastlength = len;
 +    rar->output_last_match = 1;
 +  }
 +truncated_data:
 +  archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                    "Truncated RAR file data");
 +  rar->valid = 0;
 +  return (ARCHIVE_FATAL);
 +bad_data:
 +  archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                    "Bad RAR file data");
 +  return (ARCHIVE_FATAL);
 +}
 +
 +static int
 +copy_from_lzss_window(struct archive_read *a, const void **buffer,
 +                        int64_t startpos, int length)
 +{
 +  int windowoffs, firstpart;
 +  struct rar *rar = (struct rar *)(a->format->data);
 +
 +  if (!rar->unp_buffer)
 +  {
 +    if ((rar->unp_buffer = malloc(rar->unp_buffer_size)) == NULL)
 +    {
 +      archive_set_error(&a->archive, ENOMEM,
 +                        "Unable to allocate memory for uncompressed data.");
 +      return (ARCHIVE_FATAL);
 +    }
 +  }
 +
 +  windowoffs = lzss_offset_for_position(&rar->lzss, startpos);
 +  if(windowoffs + length <= lzss_size(&rar->lzss))
 +    memcpy(&rar->unp_buffer[rar->unp_offset], &rar->lzss.window[windowoffs],
 +           length);
 +  else
 +  {
 +    firstpart = lzss_size(&rar->lzss) - windowoffs;
 +    if (firstpart < 0) {
 +      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +                        "Bad RAR file data");
 +      return (ARCHIVE_FATAL);
 +    }
 +    if (firstpart < length) {
 +      memcpy(&rar->unp_buffer[rar->unp_offset],
 +             &rar->lzss.window[windowoffs], firstpart);
 +      memcpy(&rar->unp_buffer[rar->unp_offset + firstpart],
 +             &rar->lzss.window[0], length - firstpart);
 +    } else
 +      memcpy(&rar->unp_buffer[rar->unp_offset],
 +             &rar->lzss.window[windowoffs], length);
 +  }
 +  rar->unp_offset += length;
 +  if (rar->unp_offset >= rar->unp_buffer_size)
 +    *buffer = rar->unp_buffer;
 +  else
 +    *buffer = NULL;
 +  return (ARCHIVE_OK);
 +}
 +
 +static const void *
 +rar_read_ahead(struct archive_read *a, size_t min, ssize_t *avail)
 +{
 +  struct rar *rar = (struct rar *)(a->format->data);
 +  const void *h = __archive_read_ahead(a, min, avail);
 +  int ret;
 +  if (avail)
 +  {
-     if (a->read_data_is_posix_read && *avail > (ssize_t)a->read_data_requested)
-       *avail = a->read_data_requested;
++    if (a->archive.read_data_is_posix_read && *avail > (ssize_t)a->archive.read_data_requested)
++      *avail = a->archive.read_data_requested;
 +    if (*avail > rar->bytes_remaining)
 +      *avail = (ssize_t)rar->bytes_remaining;
 +    if (*avail < 0)
 +      return NULL;
 +    else if (*avail == 0 && rar->main_flags & MHD_VOLUME &&
 +      rar->file_flags & FHD_SPLIT_AFTER)
 +    {
 +      ret = archive_read_format_rar_read_header(a, a->entry);
 +      if (ret == (ARCHIVE_EOF))
 +      {
 +        rar->has_endarc_header = 1;
 +        ret = archive_read_format_rar_read_header(a, a->entry);
 +      }
 +      if (ret != (ARCHIVE_OK))
 +        return NULL;
 +      return rar_read_ahead(a, min, avail);
 +    }
 +  }
 +  return h;
 +}
diff --cc Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
index 0000000,6bd15f6..6bd15f6
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
diff --cc Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c
index 68485d1,0000000..bbef99f
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c
@@@ -1,3337 -1,0 +1,3339 @@@
 +/*-
 + * Copyright (c) 2009 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD$");
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#if HAVE_LIBXML_XMLREADER_H
 +#include <libxml/xmlreader.h>
 +#elif HAVE_BSDXML_H
 +#include <bsdxml.h>
 +#elif HAVE_EXPAT_H
 +#include <expat.h>
 +#endif
 +#ifdef HAVE_BZLIB_H
 +#include <cm_bzlib.h>
 +#endif
 +#if HAVE_LZMA_H
 +#include <cm_lzma.h>
 +#elif HAVE_LZMADEC_H
 +#include <lzmadec.h>
 +#endif
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h>
 +#endif
 +
 +#include "archive.h"
- #include "archive_crypto_private.h"
++#include "archive_digest_private.h"
 +#include "archive_endian.h"
 +#include "archive_entry.h"
 +#include "archive_entry_locale.h"
 +#include "archive_private.h"
 +#include "archive_read_private.h"
 +
 +#if (!defined(HAVE_LIBXML_XMLREADER_H) && \
 +     !defined(HAVE_BSDXML_H) && !defined(HAVE_EXPAT_H)) ||\
 +	!defined(HAVE_ZLIB_H) || \
 +	!defined(ARCHIVE_HAS_MD5) || !defined(ARCHIVE_HAS_SHA1)
 +/*
 + * xar needs several external libraries.
 + *   o libxml2 or expat --- XML parser
 + *   o openssl or MD5/SHA1 hash function
 + *   o zlib
 + *   o bzlib2 (option)
 + *   o liblzma (option)
 + */
 +int
 +archive_read_support_format_xar(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_format_xar");
 +
 +	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +	    "Xar not supported on this platform");
 +	return (ARCHIVE_WARN);
 +}
 +
 +#else	/* Support xar format */
 +
 +/* #define DEBUG 1 */
 +/* #define DEBUG_PRINT_TOC 1 */
 +#if DEBUG_PRINT_TOC
 +#define PRINT_TOC(d, outbytes)	do {				\
 +	unsigned char *x = (unsigned char *)(uintptr_t)d;	\
 +	unsigned char c = x[outbytes-1];			\
 +	x[outbytes - 1] = 0;					\
 +	fprintf(stderr, "%s", x);				\
 +	fprintf(stderr, "%c", c);				\
 +	x[outbytes - 1] = c;					\
 +} while (0)
 +#else
 +#define PRINT_TOC(d, outbytes)
 +#endif
 +
 +#define HEADER_MAGIC	0x78617221
 +#define HEADER_SIZE	28
 +#define HEADER_VERSION	1
 +#define CKSUM_NONE	0
 +#define CKSUM_SHA1	1
 +#define CKSUM_MD5	2
 +
 +#define MD5_SIZE	16
 +#define SHA1_SIZE	20
 +#define MAX_SUM_SIZE	20
 +
 +enum enctype {
 +	NONE,
 +	GZIP,
 +	BZIP2,
 +	LZMA,
 +	XZ,
 +};
 +
 +struct chksumval {
 +	int			 alg;
 +	size_t			 len;
 +	unsigned char		 val[MAX_SUM_SIZE];
 +};
 +
 +struct chksumwork {
 +	int			 alg;
 +#ifdef ARCHIVE_HAS_MD5
 +	archive_md5_ctx		 md5ctx;
 +#endif
 +#ifdef ARCHIVE_HAS_SHA1
 +	archive_sha1_ctx	 sha1ctx;
 +#endif
 +};
 +
 +struct xattr {
 +	struct xattr		*next;
 +	struct archive_string	 name;
 +	uint64_t		 id;
 +	uint64_t		 length;
 +	uint64_t		 offset;
 +	uint64_t		 size;
 +	enum enctype		 encoding;
 +	struct chksumval	 a_sum;
 +	struct chksumval	 e_sum;
 +	struct archive_string	 fstype;
 +};
 +
 +struct xar_file {
 +	struct xar_file		*next;
 +	struct xar_file		*hdnext;
 +	struct xar_file		*parent;
 +	int			 subdirs;
 +
 +	unsigned int		 has;
 +#define HAS_DATA		0x00001
 +#define HAS_PATHNAME		0x00002
 +#define HAS_SYMLINK		0x00004
 +#define HAS_TIME		0x00008
 +#define HAS_UID			0x00010
 +#define HAS_GID			0x00020
 +#define HAS_MODE		0x00040
 +#define HAS_TYPE		0x00080
 +#define HAS_DEV			0x00100
 +#define HAS_DEVMAJOR		0x00200
 +#define HAS_DEVMINOR		0x00400
 +#define HAS_INO			0x00800
 +#define HAS_FFLAGS		0x01000
 +#define HAS_XATTR		0x02000
 +#define HAS_ACL			0x04000
 +
 +	uint64_t		 id;
 +	uint64_t		 length;
 +	uint64_t		 offset;
 +	uint64_t		 size;
 +	enum enctype		 encoding;
 +	struct chksumval	 a_sum;
 +	struct chksumval	 e_sum;
 +	struct archive_string	 pathname;
 +	struct archive_string	 symlink;
 +	time_t			 ctime;
 +	time_t			 mtime;
 +	time_t			 atime;
 +	struct archive_string	 uname;
 +	int64_t			 uid;
 +	struct archive_string	 gname;
 +	int64_t			 gid;
 +	mode_t			 mode;
 +	dev_t			 dev;
 +	dev_t			 devmajor;
 +	dev_t			 devminor;
 +	int64_t			 ino64;
 +	struct archive_string	 fflags_text;
 +	unsigned int		 link;
 +	unsigned int		 nlink;
 +	struct archive_string	 hardlink;
 +	struct xattr		*xattr_list;
 +};
 +
 +struct hdlink {
 +	struct hdlink		 *next;
 +
 +	unsigned int		 id;
 +	int			 cnt;
 +	struct xar_file		 *files;
 +};
 +
 +struct heap_queue {
 +	struct xar_file		**files;
 +	int			 allocated;
 +	int			 used;
 +};
 +
 +enum xmlstatus {
 +	INIT,
 +	XAR,
 +	TOC,
 +	TOC_CREATION_TIME,
 +	TOC_CHECKSUM,
 +	TOC_CHECKSUM_OFFSET,
 +	TOC_CHECKSUM_SIZE,
 +	TOC_FILE,
 +	FILE_DATA,
 +	FILE_DATA_LENGTH,
 +	FILE_DATA_OFFSET,
 +	FILE_DATA_SIZE,
 +	FILE_DATA_ENCODING,
 +	FILE_DATA_A_CHECKSUM,
 +	FILE_DATA_E_CHECKSUM,
 +	FILE_DATA_CONTENT,
 +	FILE_EA,
 +	FILE_EA_LENGTH,
 +	FILE_EA_OFFSET,
 +	FILE_EA_SIZE,
 +	FILE_EA_ENCODING,
 +	FILE_EA_A_CHECKSUM,
 +	FILE_EA_E_CHECKSUM,
 +	FILE_EA_NAME,
 +	FILE_EA_FSTYPE,
 +	FILE_CTIME,
 +	FILE_MTIME,
 +	FILE_ATIME,
 +	FILE_GROUP,
 +	FILE_GID,
 +	FILE_USER,
 +	FILE_UID,
 +	FILE_MODE,
 +	FILE_DEVICE,
 +	FILE_DEVICE_MAJOR,
 +	FILE_DEVICE_MINOR,
 +	FILE_DEVICENO,
 +	FILE_INODE,
 +	FILE_LINK,
 +	FILE_TYPE,
 +	FILE_NAME,
 +	FILE_ACL,
 +	FILE_ACL_DEFAULT,
 +	FILE_ACL_ACCESS,
 +	FILE_ACL_APPLEEXTENDED,
 +	/* BSD file flags. */
 +	FILE_FLAGS,
 +	FILE_FLAGS_USER_NODUMP,
 +	FILE_FLAGS_USER_IMMUTABLE,
 +	FILE_FLAGS_USER_APPEND,
 +	FILE_FLAGS_USER_OPAQUE,
 +	FILE_FLAGS_USER_NOUNLINK,
 +	FILE_FLAGS_SYS_ARCHIVED,
 +	FILE_FLAGS_SYS_IMMUTABLE,
 +	FILE_FLAGS_SYS_APPEND,
 +	FILE_FLAGS_SYS_NOUNLINK,
 +	FILE_FLAGS_SYS_SNAPSHOT,
 +	/* Linux file flags. */
 +	FILE_EXT2,
 +	FILE_EXT2_SecureDeletion,
 +	FILE_EXT2_Undelete,
 +	FILE_EXT2_Compress,
 +	FILE_EXT2_Synchronous,
 +	FILE_EXT2_Immutable,
 +	FILE_EXT2_AppendOnly,
 +	FILE_EXT2_NoDump,
 +	FILE_EXT2_NoAtime,
 +	FILE_EXT2_CompDirty,
 +	FILE_EXT2_CompBlock,
 +	FILE_EXT2_NoCompBlock,
 +	FILE_EXT2_CompError,
 +	FILE_EXT2_BTree,
 +	FILE_EXT2_HashIndexed,
 +	FILE_EXT2_iMagic,
 +	FILE_EXT2_Journaled,
 +	FILE_EXT2_NoTail,
 +	FILE_EXT2_DirSync,
 +	FILE_EXT2_TopDir,
 +	FILE_EXT2_Reserved,
 +	UNKNOWN,
 +};
 +
 +struct unknown_tag {
 +	struct unknown_tag	*next;
 +	struct archive_string	 name;
 +};
 +
 +struct xar {
 +	uint64_t		 offset; /* Current position in the file. */
 +	int64_t			 total;
 +	uint64_t		 h_base;
 +	int			 end_of_file;
 +#define OUTBUFF_SIZE	(1024 * 64)
 +	unsigned char		*outbuff;
 +
 +	enum xmlstatus		 xmlsts;
 +	enum xmlstatus		 xmlsts_unknown;
 +	struct unknown_tag	*unknowntags;
 +	int			 base64text;
 +
 +	/*
 +	 * TOC
 +	 */
 +	uint64_t		 toc_remaining;
 +	uint64_t		 toc_total;
 +	uint64_t		 toc_chksum_offset;
 +	uint64_t		 toc_chksum_size;
 +
 +	/*
 +	 * For Decoding data.
 +	 */
 +	enum enctype 		 rd_encoding;
 +	z_stream		 stream;
 +	int			 stream_valid;
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +	bz_stream		 bzstream;
 +	int			 bzstream_valid;
 +#endif
 +#if HAVE_LZMA_H && HAVE_LIBLZMA
 +	lzma_stream		 lzstream;
 +	int			 lzstream_valid;
 +#elif HAVE_LZMADEC_H && HAVE_LIBLZMADEC
 +	lzmadec_stream		 lzstream;
 +	int			 lzstream_valid;
 +#endif
 +	/*
 +	 * For Checksum data.
 +	 */
 +	struct chksumwork	 a_sumwrk;
 +	struct chksumwork	 e_sumwrk;
 +
 +	struct xar_file		*file;	/* current reading file. */
 +	struct xattr		*xattr; /* current reading extended attribute. */
 +	struct heap_queue	 file_queue;
 +	struct xar_file		*hdlink_orgs;
 +	struct hdlink		*hdlink_list;
 +
 +	int	 		 entry_init;
 +	uint64_t		 entry_total;
 +	uint64_t		 entry_remaining;
 +	size_t			 entry_unconsumed;
 +	uint64_t		 entry_size;
 +	enum enctype 		 entry_encoding;
 +	struct chksumval	 entry_a_sum;
 +	struct chksumval	 entry_e_sum;
 +
 +	struct archive_string_conv *sconv;
 +};
 +
 +struct xmlattr {
 +	struct xmlattr	*next;
 +	char		*name;
 +	char		*value;
 +};
 +
 +struct xmlattr_list {
 +	struct xmlattr	*first;
 +	struct xmlattr	**last;
 +};
 +
 +static int	xar_bid(struct archive_read *, int);
 +static int	xar_read_header(struct archive_read *,
 +		    struct archive_entry *);
 +static int	xar_read_data(struct archive_read *,
 +		    const void **, size_t *, int64_t *);
 +static int	xar_read_data_skip(struct archive_read *);
 +static int	xar_cleanup(struct archive_read *);
 +static int	move_reading_point(struct archive_read *, uint64_t);
 +static int	rd_contents_init(struct archive_read *,
 +		    enum enctype, int, int);
 +static int	rd_contents(struct archive_read *, const void **,
 +		    size_t *, size_t *, uint64_t);
 +static uint64_t	atol10(const char *, size_t);
 +static int64_t	atol8(const char *, size_t);
 +static size_t	atohex(unsigned char *, size_t, const char *, size_t);
 +static time_t	parse_time(const char *p, size_t n);
 +static int	heap_add_entry(struct archive_read *a,
 +    struct heap_queue *, struct xar_file *);
 +static struct xar_file *heap_get_entry(struct heap_queue *);
 +static int	add_link(struct archive_read *,
 +    struct xar *, struct xar_file *);
 +static void	checksum_init(struct archive_read *, int, int);
 +static void	checksum_update(struct archive_read *, const void *,
 +		    size_t, const void *, size_t);
 +static int	checksum_final(struct archive_read *, const void *,
 +		    size_t, const void *, size_t);
 +static int	decompression_init(struct archive_read *, enum enctype);
 +static int	decompress(struct archive_read *, const void **,
 +		    size_t *, const void *, size_t *);
 +static int	decompression_cleanup(struct archive_read *);
 +static void	xmlattr_cleanup(struct xmlattr_list *);
 +static int	file_new(struct archive_read *,
 +    struct xar *, struct xmlattr_list *);
 +static void	file_free(struct xar_file *);
 +static int	xattr_new(struct archive_read *,
 +    struct xar *, struct xmlattr_list *);
 +static void	xattr_free(struct xattr *);
 +static int	getencoding(struct xmlattr_list *);
 +static int	getsumalgorithm(struct xmlattr_list *);
 +static int	unknowntag_start(struct archive_read *,
 +    struct xar *, const char *);
 +static void	unknowntag_end(struct xar *, const char *);
 +static int	xml_start(struct archive_read *,
 +    const char *, struct xmlattr_list *);
 +static void	xml_end(void *, const char *);
 +static void	xml_data(void *, const char *, int);
 +static int	xml_parse_file_flags(struct xar *, const char *);
 +static int	xml_parse_file_ext2(struct xar *, const char *);
 +#if defined(HAVE_LIBXML_XMLREADER_H)
 +static int	xml2_xmlattr_setup(struct archive_read *,
 +    struct xmlattr_list *, xmlTextReaderPtr);
 +static int	xml2_read_cb(void *, char *, int);
 +static int	xml2_close_cb(void *);
 +static void	xml2_error_hdr(void *, const char *, xmlParserSeverities,
 +		    xmlTextReaderLocatorPtr);
 +static int	xml2_read_toc(struct archive_read *);
 +#elif defined(HAVE_BSDXML_H) || defined(HAVE_EXPAT_H)
 +struct expat_userData {
 +	int state;
 +	struct archive_read *archive;
 +};
 +static int	expat_xmlattr_setup(struct archive_read *,
 +    struct xmlattr_list *, const XML_Char **);
 +static void	expat_start_cb(void *, const XML_Char *, const XML_Char **);
 +static void	expat_end_cb(void *, const XML_Char *);
 +static void	expat_data_cb(void *, const XML_Char *, int);
 +static int	expat_read_toc(struct archive_read *);
 +#endif
 +
 +int
 +archive_read_support_format_xar(struct archive *_a)
 +{
 +	struct xar *xar;
 +	struct archive_read *a = (struct archive_read *)_a;
 +	int r;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_format_xar");
 +
 +	xar = (struct xar *)calloc(1, sizeof(*xar));
 +	if (xar == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate xar data");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	r = __archive_read_register_format(a,
 +	    xar,
 +	    "xar",
 +	    xar_bid,
 +	    NULL,
 +	    xar_read_header,
 +	    xar_read_data,
 +	    xar_read_data_skip,
 +	    NULL,
 +	    xar_cleanup,
 +	    NULL,
 +	    NULL);
 +	if (r != ARCHIVE_OK)
 +		free(xar);
 +	return (r);
 +}
 +
 +static int
 +xar_bid(struct archive_read *a, int best_bid)
 +{
 +	const unsigned char *b;
 +	int bid;
 +
 +	(void)best_bid; /* UNUSED */
 +
 +	b = __archive_read_ahead(a, HEADER_SIZE, NULL);
 +	if (b == NULL)
 +		return (-1);
 +
 +	bid = 0;
 +	/*
 +	 * Verify magic code
 +	 */
 +	if (archive_be32dec(b) != HEADER_MAGIC)
 +		return (0);
 +	bid += 32;
 +	/*
 +	 * Verify header size
 +	 */
 +	if (archive_be16dec(b+4) != HEADER_SIZE)
 +		return (0);
 +	bid += 16;
 +	/*
 +	 * Verify header version
 +	 */
 +	if (archive_be16dec(b+6) != HEADER_VERSION)
 +		return (0);
 +	bid += 16;
 +	/*
 +	 * Verify type of checksum
 +	 */
 +	switch (archive_be32dec(b+24)) {
 +	case CKSUM_NONE:
 +	case CKSUM_SHA1:
 +	case CKSUM_MD5:
 +		bid += 32;
 +		break;
 +	default:
 +		return (0);
 +	}
 +
 +	return (bid);
 +}
 +
 +static int
 +read_toc(struct archive_read *a)
 +{
 +	struct xar *xar;
 +	struct xar_file *file;
 +	const unsigned char *b;
 +	uint64_t toc_compressed_size;
 +	uint64_t toc_uncompressed_size;
 +	uint32_t toc_chksum_alg;
 +	ssize_t bytes;
 +	int r;
 +
 +	xar = (struct xar *)(a->format->data);
 +
 +	/*
 +	 * Read xar header.
 +	 */
 +	b = __archive_read_ahead(a, HEADER_SIZE, &bytes);
 +	if (bytes < 0)
 +		return ((int)bytes);
 +	if (bytes < HEADER_SIZE) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated archive header");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	if (archive_be32dec(b) != HEADER_MAGIC) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Invalid header magic");
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (archive_be16dec(b+6) != HEADER_VERSION) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Unsupported header version(%d)",
 +		    archive_be16dec(b+6));
 +		return (ARCHIVE_FATAL);
 +	}
 +	toc_compressed_size = archive_be64dec(b+8);
 +	xar->toc_remaining = toc_compressed_size;
 +	toc_uncompressed_size = archive_be64dec(b+16);
 +	toc_chksum_alg = archive_be32dec(b+24);
 +	__archive_read_consume(a, HEADER_SIZE);
 +	xar->offset += HEADER_SIZE;
 +	xar->toc_total = 0;
 +
 +	/*
 +	 * Read TOC(Table of Contents).
 +	 */
 +	/* Initialize reading contents. */
 +	r = move_reading_point(a, HEADER_SIZE);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	r = rd_contents_init(a, GZIP, toc_chksum_alg, CKSUM_NONE);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +
 +#ifdef HAVE_LIBXML_XMLREADER_H
 +	r = xml2_read_toc(a);
 +#elif defined(HAVE_BSDXML_H) || defined(HAVE_EXPAT_H)
 +	r = expat_read_toc(a);
 +#endif
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +
 +	/* Set 'The HEAP' base. */
 +	xar->h_base = xar->offset;
 +	if (xar->toc_total != toc_uncompressed_size) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "TOC uncompressed size error");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Checksum TOC
 +	 */
 +	if (toc_chksum_alg != CKSUM_NONE) {
 +		r = move_reading_point(a, xar->toc_chksum_offset);
 +		if (r != ARCHIVE_OK)
 +			return (r);
 +		b = __archive_read_ahead(a,
 +			(size_t)xar->toc_chksum_size, &bytes);
 +		if (bytes < 0)
 +			return ((int)bytes);
 +		if ((uint64_t)bytes < xar->toc_chksum_size) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated archive file");
 +			return (ARCHIVE_FATAL);
 +		}
 +		r = checksum_final(a, b,
 +			(size_t)xar->toc_chksum_size, NULL, 0);
 +		__archive_read_consume(a, xar->toc_chksum_size);
 +		xar->offset += xar->toc_chksum_size;
 +		if (r != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Connect hardlinked files.
 +	 */
 +	for (file = xar->hdlink_orgs; file != NULL; file = file->hdnext) {
 +		struct hdlink **hdlink;
 +
 +		for (hdlink = &(xar->hdlink_list); *hdlink != NULL;
 +		    hdlink = &((*hdlink)->next)) {
 +			if ((*hdlink)->id == file->id) {
 +				struct hdlink *hltmp;
 +				struct xar_file *f2;
 +				int nlink = (*hdlink)->cnt + 1;
 +
 +				file->nlink = nlink;
 +				for (f2 = (*hdlink)->files; f2 != NULL;
 +				    f2 = f2->hdnext) {
 +					f2->nlink = nlink;
 +					archive_string_copy(
 +					    &(f2->hardlink), &(file->pathname));
 +				}
 +				/* Remove resolved files from hdlist_list. */
 +				hltmp = *hdlink;
 +				*hdlink = hltmp->next;
 +				free(hltmp);
 +				break;
 +			}
 +		}
 +	}
 +	a->archive.archive_format = ARCHIVE_FORMAT_XAR;
 +	a->archive.archive_format_name = "xar";
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +xar_read_header(struct archive_read *a, struct archive_entry *entry)
 +{
 +	struct xar *xar;
 +	struct xar_file *file;
 +	struct xattr *xattr;
 +	int r;
 +
 +	xar = (struct xar *)(a->format->data);
 +	r = ARCHIVE_OK;
 +
 +	if (xar->offset == 0) {
 +		/* Create a character conversion object. */
 +		if (xar->sconv == NULL) {
 +			xar->sconv = archive_string_conversion_from_charset(
 +			    &(a->archive), "UTF-8", 1);
 +			if (xar->sconv == NULL)
 +				return (ARCHIVE_FATAL);
 +		}
 +
 +		/* Read TOC. */
 +		r = read_toc(a);
 +		if (r != ARCHIVE_OK)
 +			return (r);
 +	}
 +
 +	for (;;) {
 +		file = xar->file = heap_get_entry(&(xar->file_queue));
 +		if (file == NULL) {
 +			xar->end_of_file = 1;
 +			return (ARCHIVE_EOF);
 +		}
 +		if ((file->mode & AE_IFMT) != AE_IFDIR)
 +			break;
 +		if (file->has != (HAS_PATHNAME | HAS_TYPE))
 +			break;
 +		/*
 +		 * If a file type is a directory and it does not have
 +		 * any metadata, do not export.
 +		 */
 +		file_free(file);
 +	}
 +	archive_entry_set_atime(entry, file->atime, 0);
 +	archive_entry_set_ctime(entry, file->ctime, 0);
 +	archive_entry_set_mtime(entry, file->mtime, 0);
 +	archive_entry_set_gid(entry, file->gid);
 +	if (file->gname.length > 0 &&
 +	    archive_entry_copy_gname_l(entry, file->gname.s,
 +		archive_strlen(&(file->gname)), xar->sconv) != 0) {
 +		if (errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Gname");
 +			return (ARCHIVE_FATAL);
 +		}
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Gname cannot be converted from %s to current locale.",
 +		    archive_string_conversion_charset_name(xar->sconv));
 +		r = ARCHIVE_WARN;
 +	}
 +	archive_entry_set_uid(entry, file->uid);
 +	if (file->uname.length > 0 &&
 +	    archive_entry_copy_uname_l(entry, file->uname.s,
 +		archive_strlen(&(file->uname)), xar->sconv) != 0) {
 +		if (errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Uname");
 +			return (ARCHIVE_FATAL);
 +		}
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Uname cannot be converted from %s to current locale.",
 +		    archive_string_conversion_charset_name(xar->sconv));
 +		r = ARCHIVE_WARN;
 +	}
 +	archive_entry_set_mode(entry, file->mode);
 +	if (archive_entry_copy_pathname_l(entry, file->pathname.s,
 +	    archive_strlen(&(file->pathname)), xar->sconv) != 0) {
 +		if (errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Pathname");
 +			return (ARCHIVE_FATAL);
 +		}
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Pathname cannot be converted from %s to current locale.",
 +		    archive_string_conversion_charset_name(xar->sconv));
 +		r = ARCHIVE_WARN;
 +	}
 +
 +
 +	if (file->symlink.length > 0 &&
 +	    archive_entry_copy_symlink_l(entry, file->symlink.s,
 +		archive_strlen(&(file->symlink)), xar->sconv) != 0) {
 +		if (errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Linkname");
 +			return (ARCHIVE_FATAL);
 +		}
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Linkname cannot be converted from %s to current locale.",
 +		    archive_string_conversion_charset_name(xar->sconv));
 +		r = ARCHIVE_WARN;
 +	}
 +	/* Set proper nlink. */
 +	if ((file->mode & AE_IFMT) == AE_IFDIR)
 +		archive_entry_set_nlink(entry, file->subdirs + 2);
 +	else
 +		archive_entry_set_nlink(entry, file->nlink);
 +	archive_entry_set_size(entry, file->size);
 +	if (archive_strlen(&(file->hardlink)) > 0)
 +		archive_entry_set_hardlink(entry, file->hardlink.s);
 +	archive_entry_set_ino64(entry, file->ino64);
 +	if (file->has & HAS_DEV)
 +		archive_entry_set_dev(entry, file->dev);
 +	if (file->has & HAS_DEVMAJOR)
 +		archive_entry_set_devmajor(entry, file->devmajor);
 +	if (file->has & HAS_DEVMINOR)
 +		archive_entry_set_devminor(entry, file->devminor);
 +	if (archive_strlen(&(file->fflags_text)) > 0)
 +		archive_entry_copy_fflags_text(entry, file->fflags_text.s);
 +
 +	xar->entry_init = 1;
 +	xar->entry_total = 0;
 +	xar->entry_remaining = file->length;
 +	xar->entry_size = file->size;
 +	xar->entry_encoding = file->encoding;
 +	xar->entry_a_sum = file->a_sum;
 +	xar->entry_e_sum = file->e_sum;
 +	/*
 +	 * Read extended attributes.
 +	 */
 +	xattr = file->xattr_list;
 +	while (xattr != NULL) {
 +		const void *d;
 +		size_t outbytes, used;
 +
 +		r = move_reading_point(a, xattr->offset);
 +		if (r != ARCHIVE_OK)
 +			break;
 +		r = rd_contents_init(a, xattr->encoding,
 +		    xattr->a_sum.alg, xattr->e_sum.alg);
 +		if (r != ARCHIVE_OK)
 +			break;
 +		d = NULL;
 +		r = rd_contents(a, &d, &outbytes, &used, xattr->length);
 +		if (r != ARCHIVE_OK)
 +			break;
 +		if (outbytes != xattr->size) {
 +			archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
 +			    "Decompressed size error");
 +			r = ARCHIVE_FATAL;
 +			break;
 +		}
 +		r = checksum_final(a,
 +		    xattr->a_sum.val, xattr->a_sum.len,
 +		    xattr->e_sum.val, xattr->e_sum.len);
 +		if (r != ARCHIVE_OK)
 +			break;
 +		archive_entry_xattr_add_entry(entry,
 +		    xattr->name.s, d, outbytes);
 +		xattr = xattr->next;
 +	}
 +	if (r != ARCHIVE_OK) {
 +		file_free(file);
 +		return (r);
 +	}
 +
 +	if (xar->entry_remaining > 0)
 +		/* Move reading point to the beginning of current
 +		 * file contents. */
 +		r = move_reading_point(a, file->offset);
 +	else
 +		r = ARCHIVE_OK;
 +
 +	file_free(file);
 +	return (r);
 +}
 +
 +static int
 +xar_read_data(struct archive_read *a,
 +    const void **buff, size_t *size, int64_t *offset)
 +{
 +	struct xar *xar;
 +	size_t used;
 +	int r;
 +
 +	xar = (struct xar *)(a->format->data);
 +
 +	if (xar->entry_unconsumed) {
 +		__archive_read_consume(a, xar->entry_unconsumed);
 +		xar->entry_unconsumed = 0;
 +	}
 +
 +	if (xar->end_of_file || xar->entry_remaining <= 0) {
 +		r = ARCHIVE_EOF;
 +		goto abort_read_data;
 +	}
 +
 +	if (xar->entry_init) {
 +		r = rd_contents_init(a, xar->entry_encoding,
 +		    xar->entry_a_sum.alg, xar->entry_e_sum.alg);
 +		if (r != ARCHIVE_OK) {
 +			xar->entry_remaining = 0;
 +			return (r);
 +		}
 +		xar->entry_init = 0;
 +	}
 +
 +	*buff = NULL;
 +	r = rd_contents(a, buff, size, &used, xar->entry_remaining);
 +	if (r != ARCHIVE_OK)
 +		goto abort_read_data;
 +
 +	*offset = xar->entry_total;
 +	xar->entry_total += *size;
 +	xar->total += *size;
 +	xar->offset += used;
 +	xar->entry_remaining -= used;
 +	xar->entry_unconsumed = used;
 +
 +	if (xar->entry_remaining == 0) {
 +		if (xar->entry_total != xar->entry_size) {
 +			archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
 +			    "Decompressed size error");
 +			r = ARCHIVE_FATAL;
 +			goto abort_read_data;
 +		}
 +		r = checksum_final(a,
 +		    xar->entry_a_sum.val, xar->entry_a_sum.len,
 +		    xar->entry_e_sum.val, xar->entry_e_sum.len);
 +		if (r != ARCHIVE_OK)
 +			goto abort_read_data;
 +	}
 +
 +	return (ARCHIVE_OK);
 +abort_read_data:
 +	*buff = NULL;
 +	*size = 0;
 +	*offset = xar->total;
 +	return (r);
 +}
 +
 +static int
 +xar_read_data_skip(struct archive_read *a)
 +{
 +	struct xar *xar;
 +	int64_t bytes_skipped;
 +
 +	xar = (struct xar *)(a->format->data);
 +	if (xar->end_of_file)
 +		return (ARCHIVE_EOF);
 +	bytes_skipped = __archive_read_consume(a, xar->entry_remaining +
 +		xar->entry_unconsumed);
 +	if (bytes_skipped < 0)
 +		return (ARCHIVE_FATAL);
 +	xar->offset += bytes_skipped;
 +	xar->entry_unconsumed = 0;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +xar_cleanup(struct archive_read *a)
 +{
 +	struct xar *xar;
 +	struct hdlink *hdlink;
 +	int i;
 +	int r;
 +
 +	xar = (struct xar *)(a->format->data);
 +	r = decompression_cleanup(a);
 +	hdlink = xar->hdlink_list;
 +	while (hdlink != NULL) {
 +		struct hdlink *next = hdlink->next;
 +
 +		free(hdlink);
 +		hdlink = next;
 +	}
 +	for (i = 0; i < xar->file_queue.used; i++)
 +		file_free(xar->file_queue.files[i]);
 +	while (xar->unknowntags != NULL) {
 +		struct unknown_tag *tag;
 +
 +		tag = xar->unknowntags;
 +		xar->unknowntags = tag->next;
 +		archive_string_free(&(tag->name));
 +		free(tag);
 +	}
 +	free(xar->outbuff);
 +	free(xar);
 +	a->format->data = NULL;
 +	return (r);
 +}
 +
 +static int
 +move_reading_point(struct archive_read *a, uint64_t offset)
 +{
 +	struct xar *xar;
 +
 +	xar = (struct xar *)(a->format->data);
 +	if (xar->offset - xar->h_base != offset) {
 +		/* Seek forward to the start of file contents. */
 +		int64_t step;
 +
 +		step = offset - (xar->offset - xar->h_base);
 +		if (step > 0) {
 +			step = __archive_read_consume(a, step);
 +			if (step < 0)
 +				return ((int)step);
 +			xar->offset += step;
 +		} else {
 +			int64_t pos = __archive_read_seek(a, offset, SEEK_SET);
 +			if (pos == ARCHIVE_FAILED) {
 +				archive_set_error(&(a->archive),
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Cannot seek.");
 +				return (ARCHIVE_FAILED);
 +			}
 +			xar->offset = pos;
 +		}
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +rd_contents_init(struct archive_read *a, enum enctype encoding,
 +    int a_sum_alg, int e_sum_alg)
 +{
 +	int r;
 +
 +	/* Init decompress library. */
 +	if ((r = decompression_init(a, encoding)) != ARCHIVE_OK)
 +		return (r);
 +	/* Init checksum library. */
 +	checksum_init(a, a_sum_alg, e_sum_alg);
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +rd_contents(struct archive_read *a, const void **buff, size_t *size,
 +    size_t *used, uint64_t remaining)
 +{
 +	const unsigned char *b;
 +	ssize_t bytes;
 +
 +	/* Get whatever bytes are immediately available. */
 +	b = __archive_read_ahead(a, 1, &bytes);
 +	if (bytes < 0)
 +		return ((int)bytes);
 +	if (bytes == 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Truncated archive file");
 +		return (ARCHIVE_FATAL);
 +	}
 +	if ((uint64_t)bytes > remaining)
 +		bytes = (ssize_t)remaining;
 +
 +	/*
 +	 * Decompress contents of file.
 +	 */
 +	*used = bytes;
 +	if (decompress(a, buff, size, b, used) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/*
 +	 * Update checksum of a compressed data and a extracted data.
 +	 */
 +	checksum_update(a, b, *used, *buff, *size);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Note that this implementation does not (and should not!) obey
 + * locale settings; you cannot simply substitute strtol here, since
 + * it does obey locale.
 + */
 +
 +static uint64_t
 +atol10(const char *p, size_t char_cnt)
 +{
 +	uint64_t l;
 +	int digit;
 +
 +	l = 0;
 +	digit = *p - '0';
 +	while (digit >= 0 && digit < 10  && char_cnt-- > 0) {
 +		l = (l * 10) + digit;
 +		digit = *++p - '0';
 +	}
 +	return (l);
 +}
 +
 +static int64_t
 +atol8(const char *p, size_t char_cnt)
 +{
 +	int64_t l;
 +	int digit;
 +        
 +	l = 0;
 +	while (char_cnt-- > 0) {
 +		if (*p >= '0' && *p <= '7')
 +			digit = *p - '0';
 +		else
 +			break;
 +		p++;
 +		l <<= 3;
 +		l |= digit;
 +	}
 +	return (l);
 +}
 +
 +static size_t
 +atohex(unsigned char *b, size_t bsize, const char *p, size_t psize)
 +{
 +	size_t fbsize = bsize;
 +
 +	while (bsize && psize > 1) {
 +		unsigned char x;
 +
 +		if (p[0] >= 'a' && p[0] <= 'z')
 +			x = (p[0] - 'a' + 0x0a) << 4;
 +		else if (p[0] >= 'A' && p[0] <= 'Z')
 +			x = (p[0] - 'A' + 0x0a) << 4;
 +		else if (p[0] >= '0' && p[0] <= '9')
 +			x = (p[0] - '0') << 4;
 +		else
 +			return (-1);
 +		if (p[1] >= 'a' && p[1] <= 'z')
 +			x |= p[1] - 'a' + 0x0a;
 +		else if (p[1] >= 'A' && p[1] <= 'Z')
 +			x |= p[1] - 'A' + 0x0a;
 +		else if (p[1] >= '0' && p[1] <= '9')
 +			x |= p[1] - '0';
 +		else
 +			return (-1);
 +		
 +		*b++ = x;
 +		bsize--;
 +		p += 2;
 +		psize -= 2;
 +	}
 +	return (fbsize - bsize);
 +}
 +
 +static time_t
 +time_from_tm(struct tm *t)
 +{
 +#if HAVE_TIMEGM
- 	/* Use platform timegm() if available. */
- 	return (timegm(t));
++        /* Use platform timegm() if available. */
++        return (timegm(t));
 +#elif HAVE__MKGMTIME64
- 	return (_mkgmtime64(t));
++        return (_mkgmtime64(t));
 +#else
- 	/* Else use direct calculation using POSIX assumptions. */
- 	/* First, fix up tm_yday based on the year/month/day. */
- 	mktime(t);
- 	/* Then we can compute timegm() from first principles. */
- 	return (t->tm_sec + t->tm_min * 60 + t->tm_hour * 3600
- 	    + t->tm_yday * 86400 + (t->tm_year - 70) * 31536000
- 	    + ((t->tm_year - 69) / 4) * 86400 -
- 	    ((t->tm_year - 1) / 100) * 86400
- 	    + ((t->tm_year + 299) / 400) * 86400);
++        /* Else use direct calculation using POSIX assumptions. */
++        /* First, fix up tm_yday based on the year/month/day. */
++        mktime(t);
++        /* Then we can compute timegm() from first principles. */
++        return (t->tm_sec
++            + t->tm_min * 60
++            + t->tm_hour * 3600
++            + t->tm_yday * 86400
++            + (t->tm_year - 70) * 31536000
++            + ((t->tm_year - 69) / 4) * 86400
++            - ((t->tm_year - 1) / 100) * 86400
++            + ((t->tm_year + 299) / 400) * 86400);
 +#endif
 +}
 +
 +static time_t
 +parse_time(const char *p, size_t n)
 +{
 +	struct tm tm;
 +	time_t t = 0;
 +	int64_t data;
 +
 +	memset(&tm, 0, sizeof(tm));
 +	if (n != 20)
 +		return (t);
 +	data = atol10(p, 4);
 +	if (data < 1900)
 +		return (t);
 +	tm.tm_year = (int)data - 1900;
 +	p += 4;
 +	if (*p++ != '-')
 +		return (t);
 +	data = atol10(p, 2);
 +	if (data < 1 || data > 12)
 +		return (t);
 +	tm.tm_mon = (int)data -1;
 +	p += 2;
 +	if (*p++ != '-')
 +		return (t);
 +	data = atol10(p, 2);
 +	if (data < 1 || data > 31)
 +		return (t);
 +	tm.tm_mday = (int)data;
 +	p += 2;
 +	if (*p++ != 'T')
 +		return (t);
 +	data = atol10(p, 2);
 +	if (data < 0 || data > 23)
 +		return (t);
 +	tm.tm_hour = (int)data;
 +	p += 2;
 +	if (*p++ != ':')
 +		return (t);
 +	data = atol10(p, 2);
 +	if (data < 0 || data > 59)
 +		return (t);
 +	tm.tm_min = (int)data;
 +	p += 2;
 +	if (*p++ != ':')
 +		return (t);
 +	data = atol10(p, 2);
 +	if (data < 0 || data > 60)
 +		return (t);
 +	tm.tm_sec = (int)data;
 +#if 0
 +	p += 2;
 +	if (*p != 'Z')
 +		return (t);
 +#endif
 +
 +	t = time_from_tm(&tm);
 +
 +	return (t);
 +}
 +
 +static int
 +heap_add_entry(struct archive_read *a,
 +    struct heap_queue *heap, struct xar_file *file)
 +{
 +	uint64_t file_id, parent_id;
 +	int hole, parent;
 +
 +	/* Expand our pending files list as necessary. */
 +	if (heap->used >= heap->allocated) {
 +		struct xar_file **new_pending_files;
 +		int new_size = heap->allocated * 2;
 +
 +		if (heap->allocated < 1024)
 +			new_size = 1024;
 +		/* Overflow might keep us from growing the list. */
 +		if (new_size <= heap->allocated) {
 +			archive_set_error(&a->archive,
 +			    ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		new_pending_files = (struct xar_file **)
 +		    malloc(new_size * sizeof(new_pending_files[0]));
 +		if (new_pending_files == NULL) {
 +			archive_set_error(&a->archive,
 +			    ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		memcpy(new_pending_files, heap->files,
 +		    heap->allocated * sizeof(new_pending_files[0]));
 +		if (heap->files != NULL)
 +			free(heap->files);
 +		heap->files = new_pending_files;
 +		heap->allocated = new_size;
 +	}
 +
 +	file_id = file->id;
 +
 +	/*
 +	 * Start with hole at end, walk it up tree to find insertion point.
 +	 */
 +	hole = heap->used++;
 +	while (hole > 0) {
 +		parent = (hole - 1)/2;
 +		parent_id = heap->files[parent]->id;
 +		if (file_id >= parent_id) {
 +			heap->files[hole] = file;
 +			return (ARCHIVE_OK);
 +		}
 +		/* Move parent into hole <==> move hole up tree. */
 +		heap->files[hole] = heap->files[parent];
 +		hole = parent;
 +	}
 +	heap->files[0] = file;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static struct xar_file *
 +heap_get_entry(struct heap_queue *heap)
 +{
 +	uint64_t a_id, b_id, c_id;
 +	int a, b, c;
 +	struct xar_file *r, *tmp;
 +
 +	if (heap->used < 1)
 +		return (NULL);
 +
 +	/*
 +	 * The first file in the list is the earliest; we'll return this.
 +	 */
 +	r = heap->files[0];
 +
 +	/*
 +	 * Move the last item in the heap to the root of the tree
 +	 */
 +	heap->files[0] = heap->files[--(heap->used)];
 +
 +	/*
 +	 * Rebalance the heap.
 +	 */
 +	a = 0; /* Starting element and its heap key */
 +	a_id = heap->files[a]->id;
 +	for (;;) {
 +		b = a + a + 1; /* First child */
 +		if (b >= heap->used)
 +			return (r);
 +		b_id = heap->files[b]->id;
 +		c = b + 1; /* Use second child if it is smaller. */
 +		if (c < heap->used) {
 +			c_id = heap->files[c]->id;
 +			if (c_id < b_id) {
 +				b = c;
 +				b_id = c_id;
 +			}
 +		}
 +		if (a_id <= b_id)
 +			return (r);
 +		tmp = heap->files[a];
 +		heap->files[a] = heap->files[b];
 +		heap->files[b] = tmp;
 +		a = b;
 +	}
 +}
 +
 +static int
 +add_link(struct archive_read *a, struct xar *xar, struct xar_file *file)
 +{
 +	struct hdlink *hdlink;
 +
 +	for (hdlink = xar->hdlink_list; hdlink != NULL; hdlink = hdlink->next) {
 +		if (hdlink->id == file->link) {
 +			file->hdnext = hdlink->files;
 +			hdlink->cnt++;
 +			hdlink->files = file;
 +			return (ARCHIVE_OK);
 +		}
 +	}
 +	hdlink = malloc(sizeof(*hdlink));
 +	if (hdlink == NULL) {
 +		archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	file->hdnext = NULL;
 +	hdlink->id = file->link;
 +	hdlink->cnt = 1;
 +	hdlink->files = file;
 +	hdlink->next = xar->hdlink_list;
 +	xar->hdlink_list = hdlink;
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +_checksum_init(struct chksumwork *sumwrk, int sum_alg)
 +{
 +	sumwrk->alg = sum_alg;
 +	switch (sum_alg) {
 +	case CKSUM_NONE:
 +		break;
 +	case CKSUM_SHA1:
 +		archive_sha1_init(&(sumwrk->sha1ctx));
 +		break;
 +	case CKSUM_MD5:
 +		archive_md5_init(&(sumwrk->md5ctx));
 +		break;
 +	}
 +}
 +
 +static void
 +_checksum_update(struct chksumwork *sumwrk, const void *buff, size_t size)
 +{
 +
 +	switch (sumwrk->alg) {
 +	case CKSUM_NONE:
 +		break;
 +	case CKSUM_SHA1:
 +		archive_sha1_update(&(sumwrk->sha1ctx), buff, size);
 +		break;
 +	case CKSUM_MD5:
 +		archive_md5_update(&(sumwrk->md5ctx), buff, size);
 +		break;
 +	}
 +}
 +
 +static int
 +_checksum_final(struct chksumwork *sumwrk, const void *val, size_t len)
 +{
 +	unsigned char sum[MAX_SUM_SIZE];
 +	int r = ARCHIVE_OK;
 +
 +	switch (sumwrk->alg) {
 +	case CKSUM_NONE:
 +		break;
 +	case CKSUM_SHA1:
 +		archive_sha1_final(&(sumwrk->sha1ctx), sum);
 +		if (len != SHA1_SIZE ||
 +		    memcmp(val, sum, SHA1_SIZE) != 0)
 +			r = ARCHIVE_FAILED;
 +		break;
 +	case CKSUM_MD5:
 +		archive_md5_final(&(sumwrk->md5ctx), sum);
 +		if (len != MD5_SIZE ||
 +		    memcmp(val, sum, MD5_SIZE) != 0)
 +			r = ARCHIVE_FAILED;
 +		break;
 +	}
 +	return (r);
 +}
 +
 +static void
 +checksum_init(struct archive_read *a, int a_sum_alg, int e_sum_alg)
 +{
 +	struct xar *xar;
 +
 +	xar = (struct xar *)(a->format->data);
 +	_checksum_init(&(xar->a_sumwrk), a_sum_alg);
 +	_checksum_init(&(xar->e_sumwrk), e_sum_alg);
 +}
 +
 +static void
 +checksum_update(struct archive_read *a, const void *abuff, size_t asize,
 +    const void *ebuff, size_t esize)
 +{
 +	struct xar *xar;
 +
 +	xar = (struct xar *)(a->format->data);
 +	_checksum_update(&(xar->a_sumwrk), abuff, asize);
 +	_checksum_update(&(xar->e_sumwrk), ebuff, esize);
 +}
 +
 +static int
 +checksum_final(struct archive_read *a, const void *a_sum_val,
 +    size_t a_sum_len, const void *e_sum_val, size_t e_sum_len)
 +{
 +	struct xar *xar;
 +	int r;
 +
 +	xar = (struct xar *)(a->format->data);
 +	r = _checksum_final(&(xar->a_sumwrk), a_sum_val, a_sum_len);
 +	if (r == ARCHIVE_OK)
 +		r = _checksum_final(&(xar->e_sumwrk), e_sum_val, e_sum_len);
 +	if (r != ARCHIVE_OK)
 +		archive_set_error(&(a->archive), ARCHIVE_ERRNO_MISC,
 +		    "Sumcheck error");
 +	return (r);
 +}
 +
 +static int
 +decompression_init(struct archive_read *a, enum enctype encoding)
 +{
 +	struct xar *xar;
 +	const char *detail;
 +	int r;
 +
 +	xar = (struct xar *)(a->format->data);
 +	xar->rd_encoding = encoding;
 +	switch (encoding) {
 +	case NONE:
 +		break;
 +	case GZIP:
 +		if (xar->stream_valid)
 +			r = inflateReset(&(xar->stream));
 +		else
 +			r = inflateInit(&(xar->stream));
 +		if (r != Z_OK) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Couldn't initialize zlib stream.");
 +			return (ARCHIVE_FATAL);
 +		}
 +		xar->stream_valid = 1;
 +		xar->stream.total_in = 0;
 +		xar->stream.total_out = 0;
 +		break;
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +	case BZIP2:
 +		if (xar->bzstream_valid) {
 +			BZ2_bzDecompressEnd(&(xar->bzstream));
 +			xar->bzstream_valid = 0;
 +		}
 +		r = BZ2_bzDecompressInit(&(xar->bzstream), 0, 0);
 +		if (r == BZ_MEM_ERROR)
 +			r = BZ2_bzDecompressInit(&(xar->bzstream), 0, 1);
 +		if (r != BZ_OK) {
 +			int err = ARCHIVE_ERRNO_MISC;
 +			detail = NULL;
 +			switch (r) {
 +			case BZ_PARAM_ERROR:
 +				detail = "invalid setup parameter";
 +				break;
 +			case BZ_MEM_ERROR:
 +				err = ENOMEM;
 +				detail = "out of memory";
 +				break;
 +			case BZ_CONFIG_ERROR:
 +				detail = "mis-compiled library";
 +				break;
 +			}
 +			archive_set_error(&a->archive, err,
 +			    "Internal error initializing decompressor: %s",
 +			    detail == NULL ? "??" : detail);
 +			xar->bzstream_valid = 0;
 +			return (ARCHIVE_FATAL);
 +		}
 +		xar->bzstream_valid = 1;
 +		xar->bzstream.total_in_lo32 = 0;
 +		xar->bzstream.total_in_hi32 = 0;
 +		xar->bzstream.total_out_lo32 = 0;
 +		xar->bzstream.total_out_hi32 = 0;
 +		break;
 +#endif
 +#if defined(HAVE_LZMA_H) && defined(HAVE_LIBLZMA)
 +#if LZMA_VERSION_MAJOR >= 5
 +/* Effectively disable the limiter. */
 +#define LZMA_MEMLIMIT   UINT64_MAX
 +#else
 +/* NOTE: This needs to check memory size which running system has. */
 +#define LZMA_MEMLIMIT   (1U << 30)
 +#endif
 +	case XZ:
 +	case LZMA:
 +		if (xar->lzstream_valid) {
 +			lzma_end(&(xar->lzstream));
 +			xar->lzstream_valid = 0;
 +		}
 +		if (xar->entry_encoding == XZ)
 +			r = lzma_stream_decoder(&(xar->lzstream),
 +			    LZMA_MEMLIMIT,/* memlimit */
 +			    LZMA_CONCATENATED);
 +		else
 +			r = lzma_alone_decoder(&(xar->lzstream),
 +			    LZMA_MEMLIMIT);/* memlimit */
 +		if (r != LZMA_OK) {
 +			switch (r) {
 +			case LZMA_MEM_ERROR:
 +				archive_set_error(&a->archive,
 +				    ENOMEM,
 +				    "Internal error initializing "
 +				    "compression library: "
 +				    "Cannot allocate memory");
 +				break;
 +			case LZMA_OPTIONS_ERROR:
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Internal error initializing "
 +				    "compression library: "
 +				    "Invalid or unsupported options");
 +				break;
 +			default:
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Internal error initializing "
 +				    "lzma library");
 +				break;
 +			}
 +			return (ARCHIVE_FATAL);
 +		}
 +		xar->lzstream_valid = 1;
 +		xar->lzstream.total_in = 0;
 +		xar->lzstream.total_out = 0;
 +		break;
 +#elif defined(HAVE_LZMADEC_H) && defined(HAVE_LIBLZMADEC)
 +	case LZMA:
 +		if (xar->lzstream_valid)
 +			lzmadec_end(&(xar->lzstream));
 +		r = lzmadec_init(&(xar->lzstream));
 +		if (r != LZMADEC_OK) {
 +			switch (r) {
 +			case LZMADEC_HEADER_ERROR:
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Internal error initializing "
 +				    "compression library: "
 +				    "invalid header");
 +				break;
 +			case LZMADEC_MEM_ERROR:
 +				archive_set_error(&a->archive,
 +				    ENOMEM,
 +				    "Internal error initializing "
 +				    "compression library: "
 +				    "out of memory");
 +				break;
 +			}
 +			return (ARCHIVE_FATAL);
 +		}
 +		xar->lzstream_valid = 1;
 +		xar->lzstream.total_in = 0;
 +		xar->lzstream.total_out = 0;
 +		break;
 +#endif
 +	/*
 +	 * Unsupported compression.
 +	 */
 +	default:
 +#if !defined(HAVE_BZLIB_H) || !defined(BZ_CONFIG_ERROR)
 +	case BZIP2:
 +#endif
 +#if !defined(HAVE_LZMA_H) || !defined(HAVE_LIBLZMA)
 +#if !defined(HAVE_LZMADEC_H) || !defined(HAVE_LIBLZMADEC)
 +	case LZMA:
 +#endif
 +	case XZ:
 +#endif
 +		switch (xar->entry_encoding) {
 +		case BZIP2: detail = "bzip2"; break;
 +		case LZMA: detail = "lzma"; break;
 +		case XZ: detail = "xz"; break;
 +		default: detail = "??"; break;
 +		}
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "%s compression not supported on this platform",
 +		    detail);
 +		return (ARCHIVE_FAILED);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +decompress(struct archive_read *a, const void **buff, size_t *outbytes,
 +    const void *b, size_t *used)
 +{
 +	struct xar *xar;
 +	void *outbuff;
 +	size_t avail_in, avail_out;
 +	int r;
 +
 +	xar = (struct xar *)(a->format->data);
 +	avail_in = *used;
 +	outbuff = (void *)(uintptr_t)*buff;
 +	if (outbuff == NULL) {
 +		if (xar->outbuff == NULL) {
 +			xar->outbuff = malloc(OUTBUFF_SIZE);
 +			if (xar->outbuff == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Couldn't allocate memory for out buffer");
 +				return (ARCHIVE_FATAL);
 +			}
 +		}
 +		outbuff = xar->outbuff;
 +		*buff = outbuff;
 +		avail_out = OUTBUFF_SIZE;
 +	} else
 +		avail_out = *outbytes;
 +	switch (xar->rd_encoding) {
 +	case GZIP:
 +		xar->stream.next_in = (Bytef *)(uintptr_t)b;
 +		xar->stream.avail_in = avail_in;
 +		xar->stream.next_out = (unsigned char *)outbuff;
 +		xar->stream.avail_out = avail_out;
 +		r = inflate(&(xar->stream), 0);
 +		switch (r) {
 +		case Z_OK: /* Decompressor made some progress.*/
 +		case Z_STREAM_END: /* Found end of stream. */
 +			break;
 +		default:
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "File decompression failed (%d)", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		*used = avail_in - xar->stream.avail_in;
 +		*outbytes = avail_out - xar->stream.avail_out;
 +		break;
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +	case BZIP2:
 +		xar->bzstream.next_in = (char *)(uintptr_t)b;
 +		xar->bzstream.avail_in = avail_in;
 +		xar->bzstream.next_out = (char *)outbuff;
 +		xar->bzstream.avail_out = avail_out;
 +		r = BZ2_bzDecompress(&(xar->bzstream));
 +		switch (r) {
 +		case BZ_STREAM_END: /* Found end of stream. */
 +			switch (BZ2_bzDecompressEnd(&(xar->bzstream))) {
 +			case BZ_OK:
 +				break;
 +			default:
 +				archive_set_error(&(a->archive),
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Failed to clean up decompressor");
 +				return (ARCHIVE_FATAL);
 +			}
 +			xar->bzstream_valid = 0;
 +			/* FALLTHROUGH */
 +		case BZ_OK: /* Decompressor made some progress. */
 +			break;
 +		default:
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "bzip decompression failed");
 +			return (ARCHIVE_FATAL);
 +		}
 +		*used = avail_in - xar->bzstream.avail_in;
 +		*outbytes = avail_out - xar->bzstream.avail_out;
 +		break;
 +#endif
 +#if defined(HAVE_LZMA_H) && defined(HAVE_LIBLZMA)
 +	case LZMA:
 +	case XZ:
 +		xar->lzstream.next_in = b;
 +		xar->lzstream.avail_in = avail_in;
 +		xar->lzstream.next_out = (unsigned char *)outbuff;
 +		xar->lzstream.avail_out = avail_out;
 +		r = lzma_code(&(xar->lzstream), LZMA_RUN);
 +		switch (r) {
 +		case LZMA_STREAM_END: /* Found end of stream. */
 +			lzma_end(&(xar->lzstream));
 +			xar->lzstream_valid = 0;
 +			/* FALLTHROUGH */
 +		case LZMA_OK: /* Decompressor made some progress. */
 +			break;
 +		default:
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "%s decompression failed(%d)",
 +			    (xar->entry_encoding == XZ)?"xz":"lzma",
 +			    r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		*used = avail_in - xar->lzstream.avail_in;
 +		*outbytes = avail_out - xar->lzstream.avail_out;
 +		break;
 +#elif defined(HAVE_LZMADEC_H) && defined(HAVE_LIBLZMADEC)
 +	case LZMA:
 +		xar->lzstream.next_in = (unsigned char *)(uintptr_t)b;
 +		xar->lzstream.avail_in = avail_in;
 +		xar->lzstream.next_out = (unsigned char *)outbuff;
 +		xar->lzstream.avail_out = avail_out;
 +		r = lzmadec_decode(&(xar->lzstream), 0);
 +		switch (r) {
 +		case LZMADEC_STREAM_END: /* Found end of stream. */
 +			switch (lzmadec_end(&(xar->lzstream))) {
 +			case LZMADEC_OK:
 +				break;
 +			default:
 +				archive_set_error(&(a->archive),
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Failed to clean up lzmadec decompressor");
 +				return (ARCHIVE_FATAL);
 +			}
 +			xar->lzstream_valid = 0;
 +			/* FALLTHROUGH */
 +		case LZMADEC_OK: /* Decompressor made some progress. */
 +			break;
 +		default:
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "lzmadec decompression failed(%d)",
 +			    r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		*used = avail_in - xar->lzstream.avail_in;
 +		*outbytes = avail_out - xar->lzstream.avail_out;
 +		break;
 +#endif
 +#if !defined(HAVE_BZLIB_H) || !defined(BZ_CONFIG_ERROR)
 +	case BZIP2:
 +#endif
 +#if !defined(HAVE_LZMA_H) || !defined(HAVE_LIBLZMA)
 +#if !defined(HAVE_LZMADEC_H) || !defined(HAVE_LIBLZMADEC)
 +	case LZMA:
 +#endif
 +	case XZ:
 +#endif
 +	case NONE:
 +	default:
 +		if (outbuff == xar->outbuff) {
 +			*buff = b;
 +			*used = avail_in;
 +			*outbytes = avail_in;
 +		} else {
 +			if (avail_out > avail_in)
 +				avail_out = avail_in;
 +			memcpy(outbuff, b, avail_out);
 +			*used = avail_out;
 +			*outbytes = avail_out;
 +		}
 +		break;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +decompression_cleanup(struct archive_read *a)
 +{
 +	struct xar *xar;
 +	int r;
 +
 +	xar = (struct xar *)(a->format->data);
 +	r = ARCHIVE_OK;
 +	if (xar->stream_valid) {
 +		if (inflateEnd(&(xar->stream)) != Z_OK) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Failed to clean up zlib decompressor");
 +			r = ARCHIVE_FATAL;
 +		}
 +	}
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +	if (xar->bzstream_valid) {
 +		if (BZ2_bzDecompressEnd(&(xar->bzstream)) != BZ_OK) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Failed to clean up bzip2 decompressor");
 +			r = ARCHIVE_FATAL;
 +		}
 +	}
 +#endif
 +#if defined(HAVE_LZMA_H) && defined(HAVE_LIBLZMA)
 +	if (xar->lzstream_valid)
 +		lzma_end(&(xar->lzstream));
 +#elif defined(HAVE_LZMA_H) && defined(HAVE_LIBLZMA)
 +	if (xar->lzstream_valid) {
 +		if (lzmadec_end(&(xar->lzstream)) != LZMADEC_OK) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Failed to clean up lzmadec decompressor");
 +			r = ARCHIVE_FATAL;
 +		}
 +	}
 +#endif
 +	return (r);
 +}
 +
 +static void
 +xmlattr_cleanup(struct xmlattr_list *list)
 +{
 +	struct xmlattr *attr, *next;
 +
 +	attr = list->first;
 +	while (attr != NULL) {
 +		next = attr->next;
 +		free(attr->name);
 +		free(attr->value);
 +		free(attr);
 +		attr = next;
 +	}
 +	list->first = NULL;
 +	list->last = &(list->first);
 +}
 +
 +static int
 +file_new(struct archive_read *a, struct xar *xar, struct xmlattr_list *list)
 +{
 +	struct xar_file *file;
 +	struct xmlattr *attr;
 +
 +	file = calloc(1, sizeof(*file));
 +	if (file == NULL) {
 +		archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	file->parent = xar->file;
 +	file->mode = 0777 | AE_IFREG;
 +	file->atime = time(NULL);
 +	file->mtime = time(NULL);
 +	xar->file = file;
 +	xar->xattr = NULL;
 +	for (attr = list->first; attr != NULL; attr = attr->next) {
 +		if (strcmp(attr->name, "id") == 0)
 +			file->id = atol10(attr->value, strlen(attr->value));
 +	}
 +	file->nlink = 1;
 +	if (heap_add_entry(a, &(xar->file_queue), file) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +file_free(struct xar_file *file)
 +{
 +	struct xattr *xattr;
 +
 +	archive_string_free(&(file->pathname));
 +	archive_string_free(&(file->symlink));
 +	archive_string_free(&(file->uname));
 +	archive_string_free(&(file->gname));
 +	archive_string_free(&(file->hardlink));
 +	xattr = file->xattr_list;
 +	while (xattr != NULL) {
 +		struct xattr *next;
 +
 +		next = xattr->next;
 +		xattr_free(xattr);
 +		xattr = next;
 +	}
 +
 +	free(file);
 +}
 +
 +static int
 +xattr_new(struct archive_read *a, struct xar *xar, struct xmlattr_list *list)
 +{
 +	struct xattr *xattr, **nx;
 +	struct xmlattr *attr;
 +
 +	xattr = calloc(1, sizeof(*xattr));
 +	if (xattr == NULL) {
 +		archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	xar->xattr = xattr;
 +	for (attr = list->first; attr != NULL; attr = attr->next) {
 +		if (strcmp(attr->name, "id") == 0)
 +			xattr->id = atol10(attr->value, strlen(attr->value));
 +	}
 +	/* Chain to xattr list. */
 +	for (nx = &(xar->file->xattr_list);
 +	    *nx != NULL; nx = &((*nx)->next)) {
 +		if (xattr->id < (*nx)->id)
 +			break;
 +	}
 +	xattr->next = *nx;
 +	*nx = xattr;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +xattr_free(struct xattr *xattr)
 +{
 +	archive_string_free(&(xattr->name));
 +	free(xattr);
 +}
 +
 +static int
 +getencoding(struct xmlattr_list *list)
 +{
 +	struct xmlattr *attr;
 +	enum enctype encoding = NONE;
 +
 +	for (attr = list->first; attr != NULL; attr = attr->next) {
 +		if (strcmp(attr->name, "style") == 0) {
 +			if (strcmp(attr->value, "application/octet-stream") == 0)
 +				encoding = NONE;
 +			else if (strcmp(attr->value, "application/x-gzip") == 0)
 +				encoding = GZIP;
 +			else if (strcmp(attr->value, "application/x-bzip2") == 0)
 +				encoding = BZIP2;
 +			else if (strcmp(attr->value, "application/x-lzma") == 0)
 +				encoding = LZMA;
 +			else if (strcmp(attr->value, "application/x-xz") == 0)
 +				encoding = XZ;
 +		}
 +	}
 +	return (encoding);
 +}
 +
 +static int
 +getsumalgorithm(struct xmlattr_list *list)
 +{
 +	struct xmlattr *attr;
 +	int alg = CKSUM_NONE;
 +
 +	for (attr = list->first; attr != NULL; attr = attr->next) {
 +		if (strcmp(attr->name, "style") == 0) {
 +			const char *v = attr->value;
 +			if ((v[0] == 'S' || v[0] == 's') &&
 +			    (v[1] == 'H' || v[1] == 'h') &&
 +			    (v[2] == 'A' || v[2] == 'a') &&
 +			    v[3] == '1' && v[4] == '\0')
 +				alg = CKSUM_SHA1;
 +			if ((v[0] == 'M' || v[0] == 'm') &&
 +			    (v[1] == 'D' || v[1] == 'd') &&
 +			    v[2] == '5' && v[3] == '\0')
 +				alg = CKSUM_MD5;
 +		}
 +	}
 +	return (alg);
 +}
 +
 +static int
 +unknowntag_start(struct archive_read *a, struct xar *xar, const char *name)
 +{
 +	struct unknown_tag *tag;
 +
 +#if DEBUG
 +	fprintf(stderr, "unknowntag_start:%s\n", name);
 +#endif
 +	tag = malloc(sizeof(*tag));
 +	if (tag == NULL) {
 +		archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	tag->next = xar->unknowntags;
 +	archive_string_init(&(tag->name));
 +	archive_strcpy(&(tag->name), name);
 +	if (xar->unknowntags == NULL) {
 +		xar->xmlsts_unknown = xar->xmlsts;
 +		xar->xmlsts = UNKNOWN;
 +	}
 +	xar->unknowntags = tag;
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +unknowntag_end(struct xar *xar, const char *name)
 +{
 +	struct unknown_tag *tag;
 +
 +#if DEBUG
 +	fprintf(stderr, "unknowntag_end:%s\n", name);
 +#endif
 +	tag = xar->unknowntags;
 +	if (tag == NULL || name == NULL)
 +		return;
 +	if (strcmp(tag->name.s, name) == 0) {
 +		xar->unknowntags = tag->next;
 +		archive_string_free(&(tag->name));
 +		free(tag);
 +		if (xar->unknowntags == NULL)
 +			xar->xmlsts = xar->xmlsts_unknown;
 +	}
 +}
 +
 +static int
 +xml_start(struct archive_read *a, const char *name, struct xmlattr_list *list)
 +{
 +	struct xar *xar;
 +	struct xmlattr *attr;
 +
 +	xar = (struct xar *)(a->format->data);
 +
 +#if DEBUG
 +	fprintf(stderr, "xml_sta:[%s]\n", name);
 +	for (attr = list->first; attr != NULL; attr = attr->next)
 +		fprintf(stderr, "    attr:\"%s\"=\"%s\"\n",
 +		    attr->name, attr->value);
 +#endif
 +	xar->base64text = 0;
 +	switch (xar->xmlsts) {
 +	case INIT:
 +		if (strcmp(name, "xar") == 0)
 +			xar->xmlsts = XAR;
 +		else
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case XAR:
 +		if (strcmp(name, "toc") == 0)
 +			xar->xmlsts = TOC;
 +		else
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case TOC:
 +		if (strcmp(name, "creation-time") == 0)
 +			xar->xmlsts = TOC_CREATION_TIME;
 +		else if (strcmp(name, "checksum") == 0)
 +			xar->xmlsts = TOC_CHECKSUM;
 +		else if (strcmp(name, "file") == 0) {
 +			if (file_new(a, xar, list) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +			xar->xmlsts = TOC_FILE;
 +		}
 +		else
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case TOC_CHECKSUM:
 +		if (strcmp(name, "offset") == 0)
 +			xar->xmlsts = TOC_CHECKSUM_OFFSET;
 +		else if (strcmp(name, "size") == 0)
 +			xar->xmlsts = TOC_CHECKSUM_SIZE;
 +		else
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case TOC_FILE:
 +		if (strcmp(name, "file") == 0) {
 +			if (file_new(a, xar, list) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		}
 +		else if (strcmp(name, "data") == 0)
 +			xar->xmlsts = FILE_DATA;
 +		else if (strcmp(name, "ea") == 0) {
 +			if (xattr_new(a, xar, list) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +			xar->xmlsts = FILE_EA;
 +		}
 +		else if (strcmp(name, "ctime") == 0)
 +			xar->xmlsts = FILE_CTIME;
 +		else if (strcmp(name, "mtime") == 0)
 +			xar->xmlsts = FILE_MTIME;
 +		else if (strcmp(name, "atime") == 0)
 +			xar->xmlsts = FILE_ATIME;
 +		else if (strcmp(name, "group") == 0)
 +			xar->xmlsts = FILE_GROUP;
 +		else if (strcmp(name, "gid") == 0)
 +			xar->xmlsts = FILE_GID;
 +		else if (strcmp(name, "user") == 0)
 +			xar->xmlsts = FILE_USER;
 +		else if (strcmp(name, "uid") == 0)
 +			xar->xmlsts = FILE_UID;
 +		else if (strcmp(name, "mode") == 0)
 +			xar->xmlsts = FILE_MODE;
 +		else if (strcmp(name, "device") == 0)
 +			xar->xmlsts = FILE_DEVICE;
 +		else if (strcmp(name, "deviceno") == 0)
 +			xar->xmlsts = FILE_DEVICENO;
 +		else if (strcmp(name, "inode") == 0)
 +			xar->xmlsts = FILE_INODE;
 +		else if (strcmp(name, "link") == 0)
 +			xar->xmlsts = FILE_LINK;
 +		else if (strcmp(name, "type") == 0) {
 +			xar->xmlsts = FILE_TYPE;
 +			for (attr = list->first; attr != NULL;
 +			    attr = attr->next) {
 +				if (strcmp(attr->name, "link") != 0)
 +					continue;
 +				if (strcmp(attr->value, "original") == 0) {
 +					xar->file->hdnext = xar->hdlink_orgs;
 +					xar->hdlink_orgs = xar->file;
 +				} else {
 +					xar->file->link = (unsigned)atol10(attr->value,
 +					    strlen(attr->value));
 +					if (xar->file->link > 0)
 +						if (add_link(a, xar, xar->file) != ARCHIVE_OK) {
 +							return (ARCHIVE_FATAL);
 +						};
 +				}
 +			}
 +		}
 +		else if (strcmp(name, "name") == 0) {
 +			xar->xmlsts = FILE_NAME;
 +			for (attr = list->first; attr != NULL;
 +			    attr = attr->next) {
 +				if (strcmp(attr->name, "enctype") == 0 &&
 +				    strcmp(attr->value, "base64") == 0)
 +					xar->base64text = 1;
 +			}
 +		}
 +		else if (strcmp(name, "acl") == 0)
 +			xar->xmlsts = FILE_ACL;
 +		else if (strcmp(name, "flags") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		else if (strcmp(name, "ext2") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		else
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case FILE_DATA:
 +		if (strcmp(name, "length") == 0)
 +			xar->xmlsts = FILE_DATA_LENGTH;
 +		else if (strcmp(name, "offset") == 0)
 +			xar->xmlsts = FILE_DATA_OFFSET;
 +		else if (strcmp(name, "size") == 0)
 +			xar->xmlsts = FILE_DATA_SIZE;
 +		else if (strcmp(name, "encoding") == 0) {
 +			xar->xmlsts = FILE_DATA_ENCODING;
 +			xar->file->encoding = getencoding(list);
 +		}
 +		else if (strcmp(name, "archived-checksum") == 0) {
 +			xar->xmlsts = FILE_DATA_A_CHECKSUM;
 +			xar->file->a_sum.alg = getsumalgorithm(list);
 +		}
 +		else if (strcmp(name, "extracted-checksum") == 0) {
 +			xar->xmlsts = FILE_DATA_E_CHECKSUM;
 +			xar->file->e_sum.alg = getsumalgorithm(list);
 +		}
 +		else if (strcmp(name, "content") == 0)
 +			xar->xmlsts = FILE_DATA_CONTENT;
 +		else
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case FILE_DEVICE:
 +		if (strcmp(name, "major") == 0)
 +			xar->xmlsts = FILE_DEVICE_MAJOR;
 +		else if (strcmp(name, "minor") == 0)
 +			xar->xmlsts = FILE_DEVICE_MINOR;
 +		else
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case FILE_DATA_CONTENT:
 +		if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +		break;
 +	case FILE_EA:
 +		if (strcmp(name, "length") == 0)
 +			xar->xmlsts = FILE_EA_LENGTH;
 +		else if (strcmp(name, "offset") == 0)
 +			xar->xmlsts = FILE_EA_OFFSET;
 +		else if (strcmp(name, "size") == 0)
 +			xar->xmlsts = FILE_EA_SIZE;
 +		else if (strcmp(name, "encoding") == 0) {
 +			xar->xmlsts = FILE_EA_ENCODING;
 +			xar->xattr->encoding = getencoding(list);
 +		} else if (strcmp(name, "archived-checksum") == 0)
 +			xar->xmlsts = FILE_EA_A_CHECKSUM;
 +		else if (strcmp(name, "extracted-checksum") == 0)
 +			xar->xmlsts = FILE_EA_E_CHECKSUM;
 +		else if (strcmp(name, "name") == 0)
 +			xar->xmlsts = FILE_EA_NAME;
 +		else if (strcmp(name, "fstype") == 0)
 +			xar->xmlsts = FILE_EA_FSTYPE;
 +		else
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case FILE_ACL:
 +		if (strcmp(name, "appleextended") == 0)
 +			xar->xmlsts = FILE_ACL_APPLEEXTENDED;
 +		if (strcmp(name, "default") == 0)
 +			xar->xmlsts = FILE_ACL_DEFAULT;
 +		else if (strcmp(name, "access") == 0)
 +			xar->xmlsts = FILE_ACL_ACCESS;
 +		else
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case FILE_FLAGS:
 +		if (!xml_parse_file_flags(xar, name))
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case FILE_EXT2:
 +		if (!xml_parse_file_ext2(xar, name))
 +			if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		break;
 +	case TOC_CREATION_TIME:
 +	case TOC_CHECKSUM_OFFSET:
 +	case TOC_CHECKSUM_SIZE:
 +	case FILE_DATA_LENGTH:
 +	case FILE_DATA_OFFSET:
 +	case FILE_DATA_SIZE:
 +	case FILE_DATA_ENCODING:
 +	case FILE_DATA_A_CHECKSUM:
 +	case FILE_DATA_E_CHECKSUM:
 +	case FILE_EA_LENGTH:
 +	case FILE_EA_OFFSET:
 +	case FILE_EA_SIZE:
 +	case FILE_EA_ENCODING:
 +	case FILE_EA_A_CHECKSUM:
 +	case FILE_EA_E_CHECKSUM:
 +	case FILE_EA_NAME:
 +	case FILE_EA_FSTYPE:
 +	case FILE_CTIME:
 +	case FILE_MTIME:
 +	case FILE_ATIME:
 +	case FILE_GROUP:
 +	case FILE_GID:
 +	case FILE_USER:
 +	case FILE_UID:
 +	case FILE_INODE:
 +	case FILE_DEVICE_MAJOR:
 +	case FILE_DEVICE_MINOR:
 +	case FILE_DEVICENO:
 +	case FILE_MODE:
 +	case FILE_TYPE:
 +	case FILE_LINK:
 +	case FILE_NAME:
 +	case FILE_ACL_DEFAULT:
 +	case FILE_ACL_ACCESS:
 +	case FILE_ACL_APPLEEXTENDED:
 +	case FILE_FLAGS_USER_NODUMP:
 +	case FILE_FLAGS_USER_IMMUTABLE:
 +	case FILE_FLAGS_USER_APPEND:
 +	case FILE_FLAGS_USER_OPAQUE:
 +	case FILE_FLAGS_USER_NOUNLINK:
 +	case FILE_FLAGS_SYS_ARCHIVED:
 +	case FILE_FLAGS_SYS_IMMUTABLE:
 +	case FILE_FLAGS_SYS_APPEND:
 +	case FILE_FLAGS_SYS_NOUNLINK:
 +	case FILE_FLAGS_SYS_SNAPSHOT:
 +	case FILE_EXT2_SecureDeletion:
 +	case FILE_EXT2_Undelete:
 +	case FILE_EXT2_Compress:
 +	case FILE_EXT2_Synchronous:
 +	case FILE_EXT2_Immutable:
 +	case FILE_EXT2_AppendOnly:
 +	case FILE_EXT2_NoDump:
 +	case FILE_EXT2_NoAtime:
 +	case FILE_EXT2_CompDirty:
 +	case FILE_EXT2_CompBlock:
 +	case FILE_EXT2_NoCompBlock:
 +	case FILE_EXT2_CompError:
 +	case FILE_EXT2_BTree:
 +	case FILE_EXT2_HashIndexed:
 +	case FILE_EXT2_iMagic:
 +	case FILE_EXT2_Journaled:
 +	case FILE_EXT2_NoTail:
 +	case FILE_EXT2_DirSync:
 +	case FILE_EXT2_TopDir:
 +	case FILE_EXT2_Reserved:
 +	case UNKNOWN:
 +		if (unknowntag_start(a, xar, name) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +		break;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +xml_end(void *userData, const char *name)
 +{
 +	struct archive_read *a;
 +	struct xar *xar;
 +
 +	a = (struct archive_read *)userData;
 +	xar = (struct xar *)(a->format->data);
 +
 +#if DEBUG
 +	fprintf(stderr, "xml_end:[%s]\n", name);
 +#endif
 +	switch (xar->xmlsts) {
 +	case INIT:
 +		break;
 +	case XAR:
 +		if (strcmp(name, "xar") == 0)
 +			xar->xmlsts = INIT;
 +		break;
 +	case TOC:
 +		if (strcmp(name, "toc") == 0)
 +			xar->xmlsts = XAR;
 +		break;
 +	case TOC_CREATION_TIME:
 +		if (strcmp(name, "creation-time") == 0)
 +			xar->xmlsts = TOC;
 +		break;
 +	case TOC_CHECKSUM:
 +		if (strcmp(name, "checksum") == 0)
 +			xar->xmlsts = TOC;
 +		break;
 +	case TOC_CHECKSUM_OFFSET:
 +		if (strcmp(name, "offset") == 0)
 +			xar->xmlsts = TOC_CHECKSUM;
 +		break;
 +	case TOC_CHECKSUM_SIZE:
 +		if (strcmp(name, "size") == 0)
 +			xar->xmlsts = TOC_CHECKSUM;
 +		break;
 +	case TOC_FILE:
 +		if (strcmp(name, "file") == 0) {
 +			if (xar->file->parent != NULL &&
 +			    ((xar->file->mode & AE_IFMT) == AE_IFDIR))
 +				xar->file->parent->subdirs++;
 +			xar->file = xar->file->parent;
 +			if (xar->file == NULL)
 +				xar->xmlsts = TOC;
 +		}
 +		break;
 +	case FILE_DATA:
 +		if (strcmp(name, "data") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_DATA_LENGTH:
 +		if (strcmp(name, "length") == 0)
 +			xar->xmlsts = FILE_DATA;
 +		break;
 +	case FILE_DATA_OFFSET:
 +		if (strcmp(name, "offset") == 0)
 +			xar->xmlsts = FILE_DATA;
 +		break;
 +	case FILE_DATA_SIZE:
 +		if (strcmp(name, "size") == 0)
 +			xar->xmlsts = FILE_DATA;
 +		break;
 +	case FILE_DATA_ENCODING:
 +		if (strcmp(name, "encoding") == 0)
 +			xar->xmlsts = FILE_DATA;
 +		break;
 +	case FILE_DATA_A_CHECKSUM:
 +		if (strcmp(name, "archived-checksum") == 0)
 +			xar->xmlsts = FILE_DATA;
 +		break;
 +	case FILE_DATA_E_CHECKSUM:
 +		if (strcmp(name, "extracted-checksum") == 0)
 +			xar->xmlsts = FILE_DATA;
 +		break;
 +	case FILE_DATA_CONTENT:
 +		if (strcmp(name, "content") == 0)
 +			xar->xmlsts = FILE_DATA;
 +		break;
 +	case FILE_EA:
 +		if (strcmp(name, "ea") == 0) {
 +			xar->xmlsts = TOC_FILE;
 +			xar->xattr = NULL;
 +		}
 +		break;
 +	case FILE_EA_LENGTH:
 +		if (strcmp(name, "length") == 0)
 +			xar->xmlsts = FILE_EA;
 +		break;
 +	case FILE_EA_OFFSET:
 +		if (strcmp(name, "offset") == 0)
 +			xar->xmlsts = FILE_EA;
 +		break;
 +	case FILE_EA_SIZE:
 +		if (strcmp(name, "size") == 0)
 +			xar->xmlsts = FILE_EA;
 +		break;
 +	case FILE_EA_ENCODING:
 +		if (strcmp(name, "encoding") == 0)
 +			xar->xmlsts = FILE_EA;
 +		break;
 +	case FILE_EA_A_CHECKSUM:
 +		if (strcmp(name, "archived-checksum") == 0)
 +			xar->xmlsts = FILE_EA;
 +		break;
 +	case FILE_EA_E_CHECKSUM:
 +		if (strcmp(name, "extracted-checksum") == 0)
 +			xar->xmlsts = FILE_EA;
 +		break;
 +	case FILE_EA_NAME:
 +		if (strcmp(name, "name") == 0)
 +			xar->xmlsts = FILE_EA;
 +		break;
 +	case FILE_EA_FSTYPE:
 +		if (strcmp(name, "fstype") == 0)
 +			xar->xmlsts = FILE_EA;
 +		break;
 +	case FILE_CTIME:
 +		if (strcmp(name, "ctime") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_MTIME:
 +		if (strcmp(name, "mtime") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_ATIME:
 +		if (strcmp(name, "atime") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_GROUP:
 +		if (strcmp(name, "group") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_GID:
 +		if (strcmp(name, "gid") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_USER:
 +		if (strcmp(name, "user") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_UID:
 +		if (strcmp(name, "uid") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_MODE:
 +		if (strcmp(name, "mode") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_DEVICE:
 +		if (strcmp(name, "device") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_DEVICE_MAJOR:
 +		if (strcmp(name, "major") == 0)
 +			xar->xmlsts = FILE_DEVICE;
 +		break;
 +	case FILE_DEVICE_MINOR:
 +		if (strcmp(name, "minor") == 0)
 +			xar->xmlsts = FILE_DEVICE;
 +		break;
 +	case FILE_DEVICENO:
 +		if (strcmp(name, "deviceno") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_INODE:
 +		if (strcmp(name, "inode") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_LINK:
 +		if (strcmp(name, "link") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_TYPE:
 +		if (strcmp(name, "type") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_NAME:
 +		if (strcmp(name, "name") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_ACL:
 +		if (strcmp(name, "acl") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_ACL_DEFAULT:
 +		if (strcmp(name, "default") == 0)
 +			xar->xmlsts = FILE_ACL;
 +		break;
 +	case FILE_ACL_ACCESS:
 +		if (strcmp(name, "access") == 0)
 +			xar->xmlsts = FILE_ACL;
 +		break;
 +	case FILE_ACL_APPLEEXTENDED:
 +		if (strcmp(name, "appleextended") == 0)
 +			xar->xmlsts = FILE_ACL;
 +		break;
 +	case FILE_FLAGS:
 +		if (strcmp(name, "flags") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_FLAGS_USER_NODUMP:
 +		if (strcmp(name, "UserNoDump") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_FLAGS_USER_IMMUTABLE:
 +		if (strcmp(name, "UserImmutable") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_FLAGS_USER_APPEND:
 +		if (strcmp(name, "UserAppend") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_FLAGS_USER_OPAQUE:
 +		if (strcmp(name, "UserOpaque") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_FLAGS_USER_NOUNLINK:
 +		if (strcmp(name, "UserNoUnlink") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_FLAGS_SYS_ARCHIVED:
 +		if (strcmp(name, "SystemArchived") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_FLAGS_SYS_IMMUTABLE:
 +		if (strcmp(name, "SystemImmutable") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_FLAGS_SYS_APPEND:
 +		if (strcmp(name, "SystemAppend") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_FLAGS_SYS_NOUNLINK:
 +		if (strcmp(name, "SystemNoUnlink") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_FLAGS_SYS_SNAPSHOT:
 +		if (strcmp(name, "SystemSnapshot") == 0)
 +			xar->xmlsts = FILE_FLAGS;
 +		break;
 +	case FILE_EXT2:
 +		if (strcmp(name, "ext2") == 0)
 +			xar->xmlsts = TOC_FILE;
 +		break;
 +	case FILE_EXT2_SecureDeletion:
 +		if (strcmp(name, "SecureDeletion") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_Undelete:
 +		if (strcmp(name, "Undelete") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_Compress:
 +		if (strcmp(name, "Compress") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_Synchronous:
 +		if (strcmp(name, "Synchronous") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_Immutable:
 +		if (strcmp(name, "Immutable") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_AppendOnly:
 +		if (strcmp(name, "AppendOnly") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_NoDump:
 +		if (strcmp(name, "NoDump") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_NoAtime:
 +		if (strcmp(name, "NoAtime") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_CompDirty:
 +		if (strcmp(name, "CompDirty") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_CompBlock:
 +		if (strcmp(name, "CompBlock") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_NoCompBlock:
 +		if (strcmp(name, "NoCompBlock") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_CompError:
 +		if (strcmp(name, "CompError") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_BTree:
 +		if (strcmp(name, "BTree") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_HashIndexed:
 +		if (strcmp(name, "HashIndexed") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_iMagic:
 +		if (strcmp(name, "iMagic") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_Journaled:
 +		if (strcmp(name, "Journaled") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_NoTail:
 +		if (strcmp(name, "NoTail") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_DirSync:
 +		if (strcmp(name, "DirSync") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_TopDir:
 +		if (strcmp(name, "TopDir") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case FILE_EXT2_Reserved:
 +		if (strcmp(name, "Reserved") == 0)
 +			xar->xmlsts = FILE_EXT2;
 +		break;
 +	case UNKNOWN:
 +		unknowntag_end(xar, name);
 +		break;
 +	}
 +}
 +
 +static const int base64[256] = {
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* 00 - 0F */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* 10 - 1F */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, 62, -1, -1, -1, 63, /* 20 - 2F */
 +	52, 53, 54, 55, 56, 57, 58, 59,
 +	60, 61, -1, -1, -1, -1, -1, -1, /* 30 - 3F */
 +	-1,  0,  1,  2,  3,  4,  5,  6,
 +	 7,  8,  9, 10, 11, 12, 13, 14, /* 40 - 4F */
 +	15, 16, 17, 18, 19, 20, 21, 22,
 +	23, 24, 25, -1, -1, -1, -1, -1, /* 50 - 5F */
 +	-1, 26, 27, 28, 29, 30, 31, 32,
 +	33, 34, 35, 36, 37, 38, 39, 40, /* 60 - 6F */
 +	41, 42, 43, 44, 45, 46, 47, 48,
 +	49, 50, 51, -1, -1, -1, -1, -1, /* 70 - 7F */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* 80 - 8F */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* 90 - 9F */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* A0 - AF */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* B0 - BF */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* C0 - CF */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* D0 - DF */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* E0 - EF */
 +	-1, -1, -1, -1, -1, -1, -1, -1,
 +	-1, -1, -1, -1, -1, -1, -1, -1, /* F0 - FF */
 +};
 +
 +static void
 +strappend_base64(struct xar *xar,
 +    struct archive_string *as, const char *s, size_t l)
 +{
 +	unsigned char buff[256];
 +	unsigned char *out;
 +	const unsigned char *b;
 +	size_t len;
 +
 +	(void)xar; /* UNUSED */
 +	len = 0;
 +	out = buff;
 +	b = (const unsigned char *)s;
 +	while (l > 0) {
 +		int n = 0;
 +
 +		if (l > 0) {
 +			if (base64[b[0]] < 0 || base64[b[1]] < 0)
 +				break;
 +			n = base64[*b++] << 18;
 +			n |= base64[*b++] << 12;
 +			*out++ = n >> 16;
 +			len++;
 +			l -= 2;
 +		}
 +		if (l > 0) {
 +			if (base64[*b] < 0)
 +				break;
 +			n |= base64[*b++] << 6;
 +			*out++ = (n >> 8) & 0xFF;
 +			len++;
 +			--l;
 +		}
 +		if (l > 0) {
 +			if (base64[*b] < 0)
 +				break;
 +			n |= base64[*b++];
 +			*out++ = n & 0xFF;
 +			len++;
 +			--l;
 +		}
 +		if (len+3 >= sizeof(buff)) {
 +			archive_strncat(as, (const char *)buff, len);
 +			len = 0;
 +			out = buff;
 +		}
 +	}
 +	if (len > 0)
 +		archive_strncat(as, (const char *)buff, len);
 +}
 +
 +static void
 +xml_data(void *userData, const char *s, int len)
 +{
 +	struct archive_read *a;
 +	struct xar *xar;
 +
 +	a = (struct archive_read *)userData;
 +	xar = (struct xar *)(a->format->data);
 +
 +#if DEBUG
 +	{
 +		char buff[1024];
 +		if (len > sizeof(buff)-1)
 +			len = sizeof(buff)-1;
 +		memcpy(buff, s, len);
 +		buff[len] = 0;
 +		fprintf(stderr, "\tlen=%d:\"%s\"\n", len, buff);
 +	}
 +#endif
 +	switch (xar->xmlsts) {
 +	case TOC_CHECKSUM_OFFSET:
 +		xar->toc_chksum_offset = atol10(s, len);
 +		break;
 +	case TOC_CHECKSUM_SIZE:
 +		xar->toc_chksum_size = atol10(s, len);
 +		break;
 +	default:
 +		break;
 +	}
 +	if (xar->file == NULL)
 +		return;
 +
 +	switch (xar->xmlsts) {
 +	case FILE_NAME:
 +		if (xar->file->parent != NULL) {
 +			archive_string_concat(&(xar->file->pathname),
 +			    &(xar->file->parent->pathname));
 +			archive_strappend_char(&(xar->file->pathname), '/');
 +		}
 +		xar->file->has |= HAS_PATHNAME;
 +		if (xar->base64text) {
 +			strappend_base64(xar,
 +			    &(xar->file->pathname), s, len);
 +		} else
 +			archive_strncat(&(xar->file->pathname), s, len);
 +		break;
 +	case FILE_LINK:
 +		xar->file->has |= HAS_SYMLINK;
 +		archive_strncpy(&(xar->file->symlink), s, len);
 +		break;
 +	case FILE_TYPE:
 +		if (strncmp("file", s, len) == 0 ||
 +		    strncmp("hardlink", s, len) == 0)
 +			xar->file->mode =
 +			    (xar->file->mode & ~AE_IFMT) | AE_IFREG;
 +		if (strncmp("directory", s, len) == 0)
 +			xar->file->mode =
 +			    (xar->file->mode & ~AE_IFMT) | AE_IFDIR;
 +		if (strncmp("symlink", s, len) == 0)
 +			xar->file->mode =
 +			    (xar->file->mode & ~AE_IFMT) | AE_IFLNK;
 +		if (strncmp("character special", s, len) == 0)
 +			xar->file->mode =
 +			    (xar->file->mode & ~AE_IFMT) | AE_IFCHR;
 +		if (strncmp("block special", s, len) == 0)
 +			xar->file->mode =
 +			    (xar->file->mode & ~AE_IFMT) | AE_IFBLK;
 +		if (strncmp("socket", s, len) == 0)
 +			xar->file->mode =
 +			    (xar->file->mode & ~AE_IFMT) | AE_IFSOCK;
 +		if (strncmp("fifo", s, len) == 0)
 +			xar->file->mode =
 +			    (xar->file->mode & ~AE_IFMT) | AE_IFIFO;
 +		xar->file->has |= HAS_TYPE;
 +		break;
 +	case FILE_INODE:
 +		xar->file->has |= HAS_INO;
 +		xar->file->ino64 = atol10(s, len);
 +		break;
 +	case FILE_DEVICE_MAJOR:
 +		xar->file->has |= HAS_DEVMAJOR;
 +		xar->file->devmajor = (dev_t)atol10(s, len);
 +		break;
 +	case FILE_DEVICE_MINOR:
 +		xar->file->has |= HAS_DEVMINOR;
 +		xar->file->devminor = (dev_t)atol10(s, len);
 +		break;
 +	case FILE_DEVICENO:
 +		xar->file->has |= HAS_DEV;
 +		xar->file->dev = (dev_t)atol10(s, len);
 +		break;
 +	case FILE_MODE:
 +		xar->file->has |= HAS_MODE;
 +		xar->file->mode =
 +		    (xar->file->mode & AE_IFMT) |
 +		    ((mode_t)(atol8(s, len)) & ~AE_IFMT);
 +		break;
 +	case FILE_GROUP:
 +		xar->file->has |= HAS_GID;
 +		archive_strncpy(&(xar->file->gname), s, len);
 +		break;
 +	case FILE_GID:
 +		xar->file->has |= HAS_GID;
 +		xar->file->gid = atol10(s, len);
 +		break;
 +	case FILE_USER:
 +		xar->file->has |= HAS_UID;
 +		archive_strncpy(&(xar->file->uname), s, len);
 +		break;
 +	case FILE_UID:
 +		xar->file->has |= HAS_UID;
 +		xar->file->uid = atol10(s, len);
 +		break;
 +	case FILE_CTIME:
 +		xar->file->has |= HAS_TIME;
 +		xar->file->ctime = parse_time(s, len);
 +		break;
 +	case FILE_MTIME:
 +		xar->file->has |= HAS_TIME;
 +		xar->file->mtime = parse_time(s, len);
 +		break;
 +	case FILE_ATIME:
 +		xar->file->has |= HAS_TIME;
 +		xar->file->atime = parse_time(s, len);
 +		break;
 +	case FILE_DATA_LENGTH:
 +		xar->file->has |= HAS_DATA;
 +		xar->file->length = atol10(s, len);
 +		break;
 +	case FILE_DATA_OFFSET:
 +		xar->file->has |= HAS_DATA;
 +		xar->file->offset = atol10(s, len);
 +		break;
 +	case FILE_DATA_SIZE:
 +		xar->file->has |= HAS_DATA;
 +		xar->file->size = atol10(s, len);
 +		break;
 +	case FILE_DATA_A_CHECKSUM:
 +		xar->file->a_sum.len = atohex(xar->file->a_sum.val,
 +		    sizeof(xar->file->a_sum.val), s, len);
 +		break;
 +	case FILE_DATA_E_CHECKSUM:
 +		xar->file->e_sum.len = atohex(xar->file->e_sum.val,
 +		    sizeof(xar->file->e_sum.val), s, len);
 +		break;
 +	case FILE_EA_LENGTH:
 +		xar->file->has |= HAS_XATTR;
 +		xar->xattr->length = atol10(s, len);
 +		break;
 +	case FILE_EA_OFFSET:
 +		xar->file->has |= HAS_XATTR;
 +		xar->xattr->offset = atol10(s, len);
 +		break;
 +	case FILE_EA_SIZE:
 +		xar->file->has |= HAS_XATTR;
 +		xar->xattr->size = atol10(s, len);
 +		break;
 +	case FILE_EA_A_CHECKSUM:
 +		xar->file->has |= HAS_XATTR;
 +		xar->xattr->a_sum.len = atohex(xar->xattr->a_sum.val,
 +		    sizeof(xar->xattr->a_sum.val), s, len);
 +		break;
 +	case FILE_EA_E_CHECKSUM:
 +		xar->file->has |= HAS_XATTR;
 +		xar->xattr->e_sum.len = atohex(xar->xattr->e_sum.val,
 +		    sizeof(xar->xattr->e_sum.val), s, len);
 +		break;
 +	case FILE_EA_NAME:
 +		xar->file->has |= HAS_XATTR;
 +		archive_strncpy(&(xar->xattr->name), s, len);
 +		break;
 +	case FILE_EA_FSTYPE:
 +		xar->file->has |= HAS_XATTR;
 +		archive_strncpy(&(xar->xattr->fstype), s, len);
 +		break;
 +		break;
 +	case FILE_ACL_DEFAULT:
 +	case FILE_ACL_ACCESS:
 +	case FILE_ACL_APPLEEXTENDED:
 +		xar->file->has |= HAS_ACL;
 +		/* TODO */
 +		break;
 +	case INIT:
 +	case XAR:
 +	case TOC:
 +	case TOC_CREATION_TIME:
 +	case TOC_CHECKSUM:
 +	case TOC_CHECKSUM_OFFSET:
 +	case TOC_CHECKSUM_SIZE:
 +	case TOC_FILE:
 +	case FILE_DATA:
 +	case FILE_DATA_ENCODING:
 +	case FILE_DATA_CONTENT:
 +	case FILE_DEVICE:
 +	case FILE_EA:
 +	case FILE_EA_ENCODING:
 +	case FILE_ACL:
 +	case FILE_FLAGS:
 +	case FILE_FLAGS_USER_NODUMP:
 +	case FILE_FLAGS_USER_IMMUTABLE:
 +	case FILE_FLAGS_USER_APPEND:
 +	case FILE_FLAGS_USER_OPAQUE:
 +	case FILE_FLAGS_USER_NOUNLINK:
 +	case FILE_FLAGS_SYS_ARCHIVED:
 +	case FILE_FLAGS_SYS_IMMUTABLE:
 +	case FILE_FLAGS_SYS_APPEND:
 +	case FILE_FLAGS_SYS_NOUNLINK:
 +	case FILE_FLAGS_SYS_SNAPSHOT:
 +	case FILE_EXT2:
 +	case FILE_EXT2_SecureDeletion:
 +	case FILE_EXT2_Undelete:
 +	case FILE_EXT2_Compress:
 +	case FILE_EXT2_Synchronous:
 +	case FILE_EXT2_Immutable:
 +	case FILE_EXT2_AppendOnly:
 +	case FILE_EXT2_NoDump:
 +	case FILE_EXT2_NoAtime:
 +	case FILE_EXT2_CompDirty:
 +	case FILE_EXT2_CompBlock:
 +	case FILE_EXT2_NoCompBlock:
 +	case FILE_EXT2_CompError:
 +	case FILE_EXT2_BTree:
 +	case FILE_EXT2_HashIndexed:
 +	case FILE_EXT2_iMagic:
 +	case FILE_EXT2_Journaled:
 +	case FILE_EXT2_NoTail:
 +	case FILE_EXT2_DirSync:
 +	case FILE_EXT2_TopDir:
 +	case FILE_EXT2_Reserved:
 +	case UNKNOWN:
 +		break;
 +	}
 +}
 +
 +/*
 + * BSD file flags.
 + */
 +static int
 +xml_parse_file_flags(struct xar *xar, const char *name)
 +{
 +	const char *flag = NULL;
 +
 +	if (strcmp(name, "UserNoDump") == 0) {
 +		xar->xmlsts = FILE_FLAGS_USER_NODUMP;
 +		flag = "nodump";
 +	}
 +	else if (strcmp(name, "UserImmutable") == 0) {
 +		xar->xmlsts = FILE_FLAGS_USER_IMMUTABLE;
 +		flag = "uimmutable";
 +	}
 +	else if (strcmp(name, "UserAppend") == 0) {
 +		xar->xmlsts = FILE_FLAGS_USER_APPEND;
 +		flag = "uappend";
 +	}
 +	else if (strcmp(name, "UserOpaque") == 0) {
 +		xar->xmlsts = FILE_FLAGS_USER_OPAQUE;
 +		flag = "opaque";
 +	}
 +	else if (strcmp(name, "UserNoUnlink") == 0) {
 +		xar->xmlsts = FILE_FLAGS_USER_NOUNLINK;
 +		flag = "nouunlink";
 +	}
 +	else if (strcmp(name, "SystemArchived") == 0) {
 +		xar->xmlsts = FILE_FLAGS_SYS_ARCHIVED;
 +		flag = "archived";
 +	}
 +	else if (strcmp(name, "SystemImmutable") == 0) {
 +		xar->xmlsts = FILE_FLAGS_SYS_IMMUTABLE;
 +		flag = "simmutable";
 +	}
 +	else if (strcmp(name, "SystemAppend") == 0) {
 +		xar->xmlsts = FILE_FLAGS_SYS_APPEND;
 +		flag = "sappend";
 +	}
 +	else if (strcmp(name, "SystemNoUnlink") == 0) {
 +		xar->xmlsts = FILE_FLAGS_SYS_NOUNLINK;
 +		flag = "nosunlink";
 +	}
 +	else if (strcmp(name, "SystemSnapshot") == 0) {
 +		xar->xmlsts = FILE_FLAGS_SYS_SNAPSHOT;
 +		flag = "snapshot";
 +	}
 +
 +	if (flag == NULL)
 +		return (0);
 +	xar->file->has |= HAS_FFLAGS;
 +	if (archive_strlen(&(xar->file->fflags_text)) > 0)
 +		archive_strappend_char(&(xar->file->fflags_text), ',');
 +	archive_strcat(&(xar->file->fflags_text), flag);
 +	return (1);
 +}
 +
 +/*
 + * Linux file flags.
 + */
 +static int
 +xml_parse_file_ext2(struct xar *xar, const char *name)
 +{
 +	const char *flag = NULL;
 +
 +	if (strcmp(name, "SecureDeletion") == 0) {
 +		xar->xmlsts = FILE_EXT2_SecureDeletion;
 +		flag = "securedeletion";
 +	}
 +	else if (strcmp(name, "Undelete") == 0) {
 +		xar->xmlsts = FILE_EXT2_Undelete;
 +		flag = "nouunlink";
 +	}
 +	else if (strcmp(name, "Compress") == 0) {
 +		xar->xmlsts = FILE_EXT2_Compress;
 +		flag = "compress";
 +	}
 +	else if (strcmp(name, "Synchronous") == 0) {
 +		xar->xmlsts = FILE_EXT2_Synchronous;
 +		flag = "sync";
 +	}
 +	else if (strcmp(name, "Immutable") == 0) {
 +		xar->xmlsts = FILE_EXT2_Immutable;
 +		flag = "simmutable";
 +	}
 +	else if (strcmp(name, "AppendOnly") == 0) {
 +		xar->xmlsts = FILE_EXT2_AppendOnly;
 +		flag = "sappend";
 +	}
 +	else if (strcmp(name, "NoDump") == 0) {
 +		xar->xmlsts = FILE_EXT2_NoDump;
 +		flag = "nodump";
 +	}
 +	else if (strcmp(name, "NoAtime") == 0) {
 +		xar->xmlsts = FILE_EXT2_NoAtime;
 +		flag = "noatime";
 +	}
 +	else if (strcmp(name, "CompDirty") == 0) {
 +		xar->xmlsts = FILE_EXT2_CompDirty;
 +		flag = "compdirty";
 +	}
 +	else if (strcmp(name, "CompBlock") == 0) {
 +		xar->xmlsts = FILE_EXT2_CompBlock;
 +		flag = "comprblk";
 +	}
 +	else if (strcmp(name, "NoCompBlock") == 0) {
 +		xar->xmlsts = FILE_EXT2_NoCompBlock;
 +		flag = "nocomprblk";
 +	}
 +	else if (strcmp(name, "CompError") == 0) {
 +		xar->xmlsts = FILE_EXT2_CompError;
 +		flag = "comperr";
 +	}
 +	else if (strcmp(name, "BTree") == 0) {
 +		xar->xmlsts = FILE_EXT2_BTree;
 +		flag = "btree";
 +	}
 +	else if (strcmp(name, "HashIndexed") == 0) {
 +		xar->xmlsts = FILE_EXT2_HashIndexed;
 +		flag = "hashidx";
 +	}
 +	else if (strcmp(name, "iMagic") == 0) {
 +		xar->xmlsts = FILE_EXT2_iMagic;
 +		flag = "imagic";
 +	}
 +	else if (strcmp(name, "Journaled") == 0) {
 +		xar->xmlsts = FILE_EXT2_Journaled;
 +		flag = "journal";
 +	}
 +	else if (strcmp(name, "NoTail") == 0) {
 +		xar->xmlsts = FILE_EXT2_NoTail;
 +		flag = "notail";
 +	}
 +	else if (strcmp(name, "DirSync") == 0) {
 +		xar->xmlsts = FILE_EXT2_DirSync;
 +		flag = "dirsync";
 +	}
 +	else if (strcmp(name, "TopDir") == 0) {
 +		xar->xmlsts = FILE_EXT2_TopDir;
 +		flag = "topdir";
 +	}
 +	else if (strcmp(name, "Reserved") == 0) {
 +		xar->xmlsts = FILE_EXT2_Reserved;
 +		flag = "reserved";
 +	}
 +
 +	if (flag == NULL)
 +		return (0);
 +	if (archive_strlen(&(xar->file->fflags_text)) > 0)
 +		archive_strappend_char(&(xar->file->fflags_text), ',');
 +	archive_strcat(&(xar->file->fflags_text), flag);
 +	return (1);
 +}
 +
 +#ifdef HAVE_LIBXML_XMLREADER_H
 +
 +static int
 +xml2_xmlattr_setup(struct archive_read *a,
 +    struct xmlattr_list *list, xmlTextReaderPtr reader)
 +{
 +	struct xmlattr *attr;
 +	int r;
 +
 +	list->first = NULL;
 +	list->last = &(list->first);
 +	r = xmlTextReaderMoveToFirstAttribute(reader);
 +	while (r == 1) {
 +		attr = malloc(sizeof*(attr));
 +		if (attr == NULL) {
 +			archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		attr->name = strdup(
 +		    (const char *)xmlTextReaderConstLocalName(reader));
 +		if (attr->name == NULL) {
 +			free(attr);
 +			archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		attr->value = strdup(
 +		    (const char *)xmlTextReaderConstValue(reader));
 +		if (attr->value == NULL) {
 +			free(attr->name);
 +			free(attr);
 +			archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		attr->next = NULL;
 +		*list->last = attr;
 +		list->last = &(attr->next);
 +		r = xmlTextReaderMoveToNextAttribute(reader);
 +	}
 +	return (r);
 +}
 +
 +static int
 +xml2_read_cb(void *context, char *buffer, int len)
 +{
 +	struct archive_read *a;
 +	struct xar *xar;
 +	const void *d;
 +	size_t outbytes;
 +	size_t used;
 +	int r;
 +
 +	a = (struct archive_read *)context;
 +	xar = (struct xar *)(a->format->data);
 +
 +	if (xar->toc_remaining <= 0)
 +		return (0);
 +	d = buffer;
 +	outbytes = len;
 +	r = rd_contents(a, &d, &outbytes, &used, xar->toc_remaining);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	__archive_read_consume(a, used);
 +	xar->toc_remaining -= used;
 +	xar->offset += used;
 +	xar->toc_total += outbytes;
 +	PRINT_TOC(buffer, len);
 +
 +	return ((int)outbytes);
 +}
 +
 +static int
 +xml2_close_cb(void *context)
 +{
 +
 +	(void)context; /* UNUSED */
 +	return (0);
 +}
 +
 +static void
 +xml2_error_hdr(void *arg, const char *msg, xmlParserSeverities severity,
 +    xmlTextReaderLocatorPtr locator)
 +{
 +	struct archive_read *a;
 +
 +	(void)locator; /* UNUSED */
 +	a = (struct archive_read *)arg;
 +	switch (severity) {
 +	case XML_PARSER_SEVERITY_VALIDITY_WARNING:
 +	case XML_PARSER_SEVERITY_WARNING:
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "XML Parsing error: %s", msg);
 +		break;
 +	case XML_PARSER_SEVERITY_VALIDITY_ERROR:
 +	case XML_PARSER_SEVERITY_ERROR:
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "XML Parsing error: %s", msg);
 +		break;
 +	}
 +}
 +
 +static int
 +xml2_read_toc(struct archive_read *a)
 +{
 +	xmlTextReaderPtr reader;
 +	struct xmlattr_list list;
 +	int r;
 +
 +	reader = xmlReaderForIO(xml2_read_cb, xml2_close_cb, a, NULL, NULL, 0);
 +	if (reader == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Couldn't allocate memory for xml parser");
 +		return (ARCHIVE_FATAL);
 +	}
 +	xmlTextReaderSetErrorHandler(reader, xml2_error_hdr, a);
 +
 +	while ((r = xmlTextReaderRead(reader)) == 1) {
 +		const char *name, *value;
 +		int type, empty;
 +
 +		type = xmlTextReaderNodeType(reader);
 +		name = (const char *)xmlTextReaderConstLocalName(reader);
 +		switch (type) {
 +		case XML_READER_TYPE_ELEMENT:
 +			empty = xmlTextReaderIsEmptyElement(reader);
 +			r = xml2_xmlattr_setup(a, &list, reader);
- 			if (r != ARCHIVE_OK)
- 				return (r);
- 			r = xml_start(a, name, &list);
++			if (r == ARCHIVE_OK)
++				r = xml_start(a, name, &list);
 +			xmlattr_cleanup(&list);
 +			if (r != ARCHIVE_OK)
 +				return (r);
 +			if (empty)
 +				xml_end(a, name);
 +			break;
 +		case XML_READER_TYPE_END_ELEMENT:
 +			xml_end(a, name);
 +			break;
 +		case XML_READER_TYPE_TEXT:
 +			value = (const char *)xmlTextReaderConstValue(reader);
 +			xml_data(a, value, strlen(value));
 +			break;
 +		case XML_READER_TYPE_SIGNIFICANT_WHITESPACE:
 +		default:
 +			break;
 +		}
 +		if (r < 0)
 +			break;
 +	}
 +	xmlFreeTextReader(reader);
 +	xmlCleanupParser();
 +
 +	return ((r == 0)?ARCHIVE_OK:ARCHIVE_FATAL);
 +}
 +
 +#elif defined(HAVE_BSDXML_H) || defined(HAVE_EXPAT_H)
 +
 +static int
 +expat_xmlattr_setup(struct archive_read *a,
 +    struct xmlattr_list *list, const XML_Char **atts)
 +{
 +	struct xmlattr *attr;
 +	char *name, *value;
 +
 +	list->first = NULL;
 +	list->last = &(list->first);
 +	if (atts == NULL)
 +		return (ARCHIVE_OK);
 +	while (atts[0] != NULL && atts[1] != NULL) {
 +		attr = malloc(sizeof*(attr));
 +		name = strdup(atts[0]);
 +		value = strdup(atts[1]);
 +		if (attr == NULL || name == NULL || value == NULL) {
 +			archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		attr->name = name;
 +		attr->value = value;
 +		attr->next = NULL;
 +		*list->last = attr;
 +		list->last = &(attr->next);
 +		atts += 2;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +expat_start_cb(void *userData, const XML_Char *name, const XML_Char **atts)
 +{
 +	struct expat_userData *ud = (struct expat_userData *)userData;
 +	struct archive_read *a = ud->archive;
 +	struct xmlattr_list list;
 +	int r;
 +
 +	r = expat_xmlattr_setup(a, &list, atts);
 +	if (r == ARCHIVE_OK)
 +		r = xml_start(a, (const char *)name, &list);
 +	xmlattr_cleanup(&list);
 +	ud->state = r;
 +}
 +
 +static void
 +expat_end_cb(void *userData, const XML_Char *name)
 +{
 +	struct expat_userData *ud = (struct expat_userData *)userData;
 +
 +	xml_end(ud->archive, (const char *)name);
 +}
 +
 +static void
 +expat_data_cb(void *userData, const XML_Char *s, int len)
 +{
 +	struct expat_userData *ud = (struct expat_userData *)userData;
 +
 +	xml_data(ud->archive, s, len);
 +}
 +
 +static int
 +expat_read_toc(struct archive_read *a)
 +{
 +	struct xar *xar;
 +	XML_Parser parser;
 +	struct expat_userData ud;
 +
 +	ud.state = ARCHIVE_OK;
 +	ud.archive = a;
 +
 +	xar = (struct xar *)(a->format->data);
 +
 +	/* Initialize XML Parser library. */
 +	parser = XML_ParserCreate(NULL);
 +	if (parser == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Couldn't allocate memory for xml parser");
 +		return (ARCHIVE_FATAL);
 +	}
 +	XML_SetUserData(parser, &ud);
 +	XML_SetElementHandler(parser, expat_start_cb, expat_end_cb);
 +	XML_SetCharacterDataHandler(parser, expat_data_cb);
 +	xar->xmlsts = INIT;
 +
 +	while (xar->toc_remaining && ud.state == ARCHIVE_OK) {
 +		enum XML_Status xr;
 +		const void *d;
 +		size_t outbytes;
 +		size_t used;
 +		int r;
 +
 +		d = NULL;
 +		r = rd_contents(a, &d, &outbytes, &used, xar->toc_remaining);
 +		if (r != ARCHIVE_OK)
 +			return (r);
 +		xar->toc_remaining -= used;
 +		xar->offset += used;
 +		xar->toc_total += outbytes;
 +		PRINT_TOC(d, outbytes);
 +
 +		xr = XML_Parse(parser, d, outbytes, xar->toc_remaining == 0);
 +		__archive_read_consume(a, used);
 +		if (xr == XML_STATUS_ERROR) {
 +			XML_ParserFree(parser);
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "XML Parsing failed");
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +	XML_ParserFree(parser);
 +	return (ud.state);
 +}
 +#endif /* defined(HAVE_BSDXML_H) || defined(HAVE_EXPAT_H) */
 +
 +#endif /* Support xar format */
diff --cc Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
index 5ef2952,0000000..8065ec3
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
@@@ -1,2176 -1,0 +1,2992 @@@
 +/*-
 + * Copyright (c) 2004-2013 Tim Kientzle
-  * Copyright (c) 2011-2012 Michihiro NAKAJIMA
++ * Copyright (c) 2011-2012,2014 Michihiro NAKAJIMA
 + * Copyright (c) 2013 Konrad Kleine
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102 2009-12-28 03:11:36Z kientzle $");
 +
 +/*
 + * The definitive documentation of the Zip file format is:
 + *   http://www.pkware.com/documents/casestudies/APPNOTE.TXT
 + *
 + * The Info-Zip project has pioneered various extensions to better
 + * support Zip on Unix, including the 0x5455 "UT", 0x5855 "UX", 0x7855
 + * "Ux", and 0x7875 "ux" extensions for time and ownership
 + * information.
 + *
 + * History of this code: The streaming Zip reader was first added to
 + * libarchive in January 2005.  Support for seekable input sources was
 + * added in Nov 2011.
 + */
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h>
 +#endif
 +
 +#include "archive.h"
++#include "archive_digest_private.h"
++#include "archive_cryptor_private.h"
 +#include "archive_endian.h"
 +#include "archive_entry.h"
 +#include "archive_entry_locale.h"
++#include "archive_hmac_private.h"
 +#include "archive_private.h"
 +#include "archive_rb.h"
 +#include "archive_read_private.h"
 +
 +#ifndef HAVE_ZLIB_H
 +#include "archive_crc32.h"
 +#endif
 +
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +# define snprintf _snprintf
 +#endif
 +
 +struct zip_entry {
 +	struct archive_rb_node	node;
 +	struct zip_entry	*next;
 +	int64_t			local_header_offset;
 +	int64_t			compressed_size;
 +	int64_t			uncompressed_size;
 +	int64_t			gid;
 +	int64_t			uid;
 +	struct archive_string	rsrcname;
 +	time_t			mtime;
 +	time_t			atime;
 +	time_t			ctime;
 +	uint32_t		crc32;
 +	uint16_t		mode;
 +	uint16_t		zip_flags; /* From GP Flags Field */
 +	unsigned char		compression;
 +	unsigned char		system; /* From "version written by" */
 +	unsigned char		flags; /* Our extra markers. */
++	unsigned char		decdat;/* Used for Decryption check */
++
++	/* WinZip AES encryption extra field should be available
++	 * when compression is 99. */
++	struct {
++		/* Vendor version: AE-1 - 0x0001, AE-2 - 0x0002 */
++		unsigned	vendor;
++#define AES_VENDOR_AE_1	0x0001
++#define AES_VENDOR_AE_2	0x0002
++		/* AES encryption strength:
++		 * 1 - 128 bits, 2 - 192 bits, 2 - 256 bits. */
++		unsigned	strength;
++		/* Actual compression method. */
++		unsigned char	compression;
++	}			aes_extra;
++};
++
++struct trad_enc_ctx {
++	uint32_t	keys[3];
 +};
 +
 +/* Bits used in zip_flags. */
 +#define ZIP_ENCRYPTED	(1 << 0)
 +#define ZIP_LENGTH_AT_END	(1 << 3)
 +#define ZIP_STRONG_ENCRYPTED	(1 << 6)
 +#define ZIP_UTF8_NAME	(1 << 11)
 +/* See "7.2 Single Password Symmetric Encryption Method"
 +   in http://www.pkware.com/documents/casestudies/APPNOTE.TXT */
 +#define ZIP_CENTRAL_DIRECTORY_ENCRYPTED	(1 << 13)
 +
 +/* Bits used in flags. */
 +#define LA_USED_ZIP64	(1 << 0)
 +#define LA_FROM_CENTRAL_DIRECTORY (1 << 1)
 +
++/*
++ * See "WinZip - AES Encryption Information"
++ *     http://www.winzip.com/aes_info.htm
++ */
++/* Value used in compression method. */
++#define WINZIP_AES_ENCRYPTION	99
++/* Authentication code size. */
++#define AUTH_CODE_SIZE	10
++/**/
++#define MAX_DERIVED_KEY_BUF_SIZE	(AES_MAX_KEY_SIZE * 2 + 2)
++
 +struct zip {
 +	/* Structural information about the archive. */
- 	char			format_name[64];
++	struct archive_string	format_name;
 +	int64_t			central_directory_offset;
 +	size_t			central_directory_entries_total;
 +	size_t			central_directory_entries_on_this_disk;
 +	int			has_encrypted_entries;
 +
 +	/* List of entries (seekable Zip only) */
 +	struct zip_entry	*zip_entries;
 +	struct archive_rb_tree	tree;
 +	struct archive_rb_tree	tree_rsrc;
 +
 +	/* Bytes read but not yet consumed via __archive_read_consume() */
 +	size_t			unconsumed;
 +
 +	/* Information about entry we're currently reading. */
 +	struct zip_entry	*entry;
 +	int64_t			entry_bytes_remaining;
 +
 +	/* These count the number of bytes actually read for the entry. */
 +	int64_t			entry_compressed_bytes_read;
 +	int64_t			entry_uncompressed_bytes_read;
 +
 +	/* Running CRC32 of the decompressed data */
 +	unsigned long		entry_crc32;
- 	unsigned long		(*crc32func)(unsigned long, const void *, size_t);
++	unsigned long		(*crc32func)(unsigned long, const void *,
++				    size_t);
 +	char			ignore_crc32;
 +
 +	/* Flags to mark progress of decompression. */
 +	char			decompress_init;
 +	char			end_of_entry;
 +
 +#ifdef HAVE_ZLIB_H
 +	unsigned char 		*uncompressed_buffer;
 +	size_t 			uncompressed_buffer_size;
 +	z_stream		stream;
 +	char			stream_valid;
 +#endif
 +
 +	struct archive_string_conv *sconv;
 +	struct archive_string_conv *sconv_default;
 +	struct archive_string_conv *sconv_utf8;
 +	int			init_default_conversion;
 +	int			process_mac_extensions;
++
++	char			init_decryption;
++
++	/* Decryption buffer. */
++	unsigned char 		*decrypted_buffer;
++	unsigned char 		*decrypted_ptr;
++	size_t 			decrypted_buffer_size;
++	size_t 			decrypted_bytes_remaining;
++	size_t 			decrypted_unconsumed_bytes;
++
++	/* Traditional PKWARE decryption. */
++	struct trad_enc_ctx	tctx;
++	char			tctx_valid;
++
++	/* WinZip AES decyption. */
++	/* Contexts used for AES decryption. */
++	archive_crypto_ctx	cctx;
++	char			cctx_valid;
++	archive_hmac_sha1_ctx	hctx;
++	char			hctx_valid;
++
++	/* Strong encryption's decryption header information. */
++	unsigned		iv_size;
++	unsigned		alg_id;
++	unsigned		bit_len;
++	unsigned		flags;
++	unsigned		erd_size;
++	unsigned		v_size;
++	unsigned		v_crc32;
++	uint8_t			*iv;
++	uint8_t			*erd;
++	uint8_t			*v_data;
 +};
 +
 +/* Many systems define min or MIN, but not all. */
 +#define	zipmin(a,b) ((a) < (b) ? (a) : (b))
 +
 +/* ------------------------------------------------------------------------ */
 +
 +/*
++  Traditional PKWARE Decryption functions.
++ */
++
++static void
++trad_enc_update_keys(struct trad_enc_ctx *ctx, uint8_t c)
++{
++	uint8_t t;
++#define CRC32(c, b) (crc32(c ^ 0xffffffffUL, &b, 1) ^ 0xffffffffUL)
++
++	ctx->keys[0] = CRC32(ctx->keys[0], c);
++	ctx->keys[1] = (ctx->keys[1] + (ctx->keys[0] & 0xff)) * 134775813L + 1;
++	t = (ctx->keys[1] >> 24) & 0xff;
++	ctx->keys[2] = CRC32(ctx->keys[2], t);
++#undef CRC32
++}
++
++static uint8_t
++trad_enc_decypt_byte(struct trad_enc_ctx *ctx)
++{
++	unsigned temp = ctx->keys[2] | 2;
++	return (uint8_t)((temp * (temp ^ 1)) >> 8) & 0xff;
++}
++
++static void
++trad_enc_decrypt_update(struct trad_enc_ctx *ctx, const uint8_t *in,
++    size_t in_len, uint8_t *out, size_t out_len)
++{
++	unsigned i, max;
++
++	max = (unsigned)((in_len < out_len)? in_len: out_len);
++
++	for (i = 0; i < max; i++) {
++		uint8_t t = in[i] ^ trad_enc_decypt_byte(ctx);
++		out[i] = t;
++		trad_enc_update_keys(ctx, t);
++	}
++}
++
++static int
++trad_enc_init(struct trad_enc_ctx *ctx, const char *pw, size_t pw_len,
++    const uint8_t *key, size_t key_len, uint8_t *crcchk)
++{
++	uint8_t header[12];
++
++	if (key_len < 12) {
++		*crcchk = 0xff;
++		return -1;
++	}
++
++	ctx->keys[0] = 305419896L;
++	ctx->keys[1] = 591751049L;
++	ctx->keys[2] = 878082192L;
++
++	for (;pw_len; --pw_len)
++		trad_enc_update_keys(ctx, *pw++);
++
++	trad_enc_decrypt_update(ctx, key, 12, header, 12);
++	/* Return the last byte for CRC check. */
++	*crcchk = header[11];
++	return 0;
++}
++
++#if 0
++static void
++crypt_derive_key_sha1(const void *p, int size, unsigned char *key,
++    int key_size)
++{
++#define MD_SIZE 20
++	archive_sha1_ctx ctx;
++	unsigned char md1[MD_SIZE];
++	unsigned char md2[MD_SIZE * 2];
++	unsigned char mkb[64];
++	int i;
++
++	archive_sha1_init(&ctx);
++	archive_sha1_update(&ctx, p, size);
++	archive_sha1_final(&ctx, md1);
++
++	memset(mkb, 0x36, sizeof(mkb));
++	for (i = 0; i < MD_SIZE; i++)
++		mkb[i] ^= md1[i];
++	archive_sha1_init(&ctx);
++	archive_sha1_update(&ctx, mkb, sizeof(mkb));
++	archive_sha1_final(&ctx, md2);
++
++	memset(mkb, 0x5C, sizeof(mkb));
++	for (i = 0; i < MD_SIZE; i++)
++		mkb[i] ^= md1[i];
++	archive_sha1_init(&ctx);
++	archive_sha1_update(&ctx, mkb, sizeof(mkb));
++	archive_sha1_final(&ctx, md2 + MD_SIZE);
++
++	if (key_size > 32)
++		key_size = 32;
++	memcpy(key, md2, key_size);
++#undef MD_SIZE
++}
++#endif
++
++/*
 + * Common code for streaming or seeking modes.
 + *
 + * Includes code to read local file headers, decompress data
 + * from entry bodies, and common API.
 + */
 +
 +static unsigned long
 +real_crc32(unsigned long crc, const void *buff, size_t len)
 +{
- 	return crc32(crc, buff, len);
++	return crc32(crc, buff, (unsigned int)len);
 +}
 +
++/* Used by "ignorecrc32" option to speed up tests. */
 +static unsigned long
 +fake_crc32(unsigned long crc, const void *buff, size_t len)
 +{
 +	(void)crc; /* UNUSED */
 +	(void)buff; /* UNUSED */
 +	(void)len; /* UNUSED */
 +	return 0;
 +}
 +
 +static struct {
 +	int id;
 +	const char * name;
 +} compression_methods[] = {
 +	{0, "uncompressed"}, /* The file is stored (no compression) */
 +	{1, "shrinking"}, /* The file is Shrunk */
 +	{2, "reduced-1"}, /* The file is Reduced with compression factor 1 */
 +	{3, "reduced-2"}, /* The file is Reduced with compression factor 2 */
 +	{4, "reduced-3"}, /* The file is Reduced with compression factor 3 */
 +	{5, "reduced-4"}, /* The file is Reduced with compression factor 4 */
- 	{6, "imploded"}, /* The file is Imploded */
- 	{7, "reserved"}, /* Reserved for Tokenizing compression algorithm */
++	{6, "imploded"},  /* The file is Imploded */
++	{7, "reserved"},  /* Reserved for Tokenizing compression algorithm */
 +	{8, "deflation"}, /* The file is Deflated */
 +	{9, "deflation-64-bit"}, /* Enhanced Deflating using Deflate64(tm) */
- 	{10, "ibm-terse"}, /* PKWARE Data Compression Library Imploding (old IBM TERSE) */
++	{10, "ibm-terse"},/* PKWARE Data Compression Library Imploding
++			   * (old IBM TERSE) */
 +	{11, "reserved"}, /* Reserved by PKWARE */
- 	{12, "bzip"}, /* File is compressed using BZIP2 algorithm */
++	{12, "bzip"},     /* File is compressed using BZIP2 algorithm */
 +	{13, "reserved"}, /* Reserved by PKWARE */
- 	{14, "lzma"}, /* LZMA (EFS) */
++	{14, "lzma"},     /* LZMA (EFS) */
 +	{15, "reserved"}, /* Reserved by PKWARE */
 +	{16, "reserved"}, /* Reserved by PKWARE */
 +	{17, "reserved"}, /* Reserved by PKWARE */
 +	{18, "ibm-terse-new"}, /* File is compressed using IBM TERSE (new) */
- 	{19, "ibm-lz777"}, /* IBM LZ77 z Architecture (PFS) */
++	{19, "ibm-lz777"},/* IBM LZ77 z Architecture (PFS) */
 +	{97, "wav-pack"}, /* WavPack compressed data */
- 	{98, "ppmd-1"} /* PPMd version I, Rev 1 */
++	{98, "ppmd-1"},   /* PPMd version I, Rev 1 */
++	{99, "aes"}       /* WinZip AES encryption  */
 +};
 +
 +static const char *
 +compression_name(const int compression)
 +{
- 	static const int num_compression_methods = sizeof(compression_methods)/sizeof(compression_methods[0]);
++	static const int num_compression_methods =
++		sizeof(compression_methods)/sizeof(compression_methods[0]);
 +	int i=0;
++
 +	while(compression >= 0 && i < num_compression_methods) {
- 		if (compression_methods[i].id == compression) {
++		if (compression_methods[i].id == compression)
 +			return compression_methods[i].name;
- 		}
 +		i++;
 +	}
 +	return "??";
 +}
 +
 +/* Convert an MSDOS-style date/time into Unix-style time. */
 +static time_t
 +zip_time(const char *p)
 +{
 +	int msTime, msDate;
 +	struct tm ts;
 +
 +	msTime = (0xff & (unsigned)p[0]) + 256 * (0xff & (unsigned)p[1]);
 +	msDate = (0xff & (unsigned)p[2]) + 256 * (0xff & (unsigned)p[3]);
 +
 +	memset(&ts, 0, sizeof(ts));
 +	ts.tm_year = ((msDate >> 9) & 0x7f) + 80; /* Years since 1900. */
 +	ts.tm_mon = ((msDate >> 5) & 0x0f) - 1; /* Month number. */
 +	ts.tm_mday = msDate & 0x1f; /* Day of month. */
 +	ts.tm_hour = (msTime >> 11) & 0x1f;
 +	ts.tm_min = (msTime >> 5) & 0x3f;
 +	ts.tm_sec = (msTime << 1) & 0x3e;
 +	ts.tm_isdst = -1;
 +	return mktime(&ts);
 +}
 +
 +/*
 + * The extra data is stored as a list of
 + *	id1+size1+data1 + id2+size2+data2 ...
 + *  triplets.  id and size are 2 bytes each.
 + */
 +static void
 +process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 +{
 +	unsigned offset = 0;
 +
- 	while (offset < extra_length - 4)
- 	{
++	while (offset < extra_length - 4) {
 +		unsigned short headerid = archive_le16dec(p + offset);
 +		unsigned short datasize = archive_le16dec(p + offset + 2);
++
 +		offset += 4;
 +		if (offset + datasize > extra_length)
 +			break;
 +#ifdef DEBUG
- 		fprintf(stderr, "Header id 0x%x, length %d\n",
++		fprintf(stderr, "Header id 0x%04x, length %d\n",
 +		    headerid, datasize);
 +#endif
 +		switch (headerid) {
 +		case 0x0001:
 +			/* Zip64 extended information extra field. */
 +			zip_entry->flags |= LA_USED_ZIP64;
 +			if (zip_entry->uncompressed_size == 0xffffffff) {
 +				if (datasize < 8)
 +					break;
 +				zip_entry->uncompressed_size =
 +				    archive_le64dec(p + offset);
 +				offset += 8;
 +				datasize -= 8;
 +			}
 +			if (zip_entry->compressed_size == 0xffffffff) {
 +				if (datasize < 8)
 +					break;
 +				zip_entry->compressed_size =
 +				    archive_le64dec(p + offset);
 +				offset += 8;
 +				datasize -= 8;
 +			}
 +			if (zip_entry->local_header_offset == 0xffffffff) {
 +				if (datasize < 8)
 +					break;
 +				zip_entry->local_header_offset =
 +				    archive_le64dec(p + offset);
 +				offset += 8;
 +				datasize -= 8;
 +			}
 +			/* archive_le32dec(p + offset) gives disk
 +			 * on which file starts, but we don't handle
 +			 * multi-volume Zip files. */
 +			break;
++#ifdef DEBUG
++		case 0x0017:
++		{
++			/* Strong encryption field. */
++			if (archive_le16dec(p + offset) == 2) {
++				unsigned algId =
++					archive_le16dec(p + offset + 2);
++				unsigned bitLen =
++					archive_le16dec(p + offset + 4);
++				int	 flags =
++					archive_le16dec(p + offset + 6);
++				fprintf(stderr, "algId=0x%04x, bitLen=%u, "
++				    "flgas=%d\n", algId, bitLen,flags);
++			}
++			break;
++		}
++#endif
 +		case 0x5455:
 +		{
 +			/* Extended time field "UT". */
 +			int flags = p[offset];
 +			offset++;
 +			datasize--;
 +			/* Flag bits indicate which dates are present. */
 +			if (flags & 0x01)
 +			{
 +#ifdef DEBUG
 +				fprintf(stderr, "mtime: %lld -> %d\n",
 +				    (long long)zip_entry->mtime,
 +				    archive_le32dec(p + offset));
 +#endif
 +				if (datasize < 4)
 +					break;
 +				zip_entry->mtime = archive_le32dec(p + offset);
 +				offset += 4;
 +				datasize -= 4;
 +			}
 +			if (flags & 0x02)
 +			{
 +				if (datasize < 4)
 +					break;
 +				zip_entry->atime = archive_le32dec(p + offset);
 +				offset += 4;
 +				datasize -= 4;
 +			}
 +			if (flags & 0x04)
 +			{
 +				if (datasize < 4)
 +					break;
 +				zip_entry->ctime = archive_le32dec(p + offset);
 +				offset += 4;
 +				datasize -= 4;
 +			}
 +			break;
 +		}
 +		case 0x5855:
 +		{
 +			/* Info-ZIP Unix Extra Field (old version) "UX". */
 +			if (datasize >= 8) {
 +				zip_entry->atime = archive_le32dec(p + offset);
 +				zip_entry->mtime =
 +				    archive_le32dec(p + offset + 4);
 +			}
 +			if (datasize >= 12) {
 +				zip_entry->uid =
 +				    archive_le16dec(p + offset + 8);
 +				zip_entry->gid =
 +				    archive_le16dec(p + offset + 10);
 +			}
 +			break;
 +		}
- 		case 0x6c65:
++		case 0x6c78:
 +		{
- 			/* Experimental 'el' field */
++			/* Experimental 'xl' field */
 +			/*
 +			 * Introduced Dec 2013 to provide a way to
- 			 * include external file attributes in local file
- 			 * header.  This provides file type and permission
- 			 * information necessary to support full streaming
- 			 * extraction.  Currently being discussed with
- 			 * other Zip developers... subject to change.
++			 * include external file attributes (and other
++			 * fields that ordinarily appear only in
++			 * central directory) in local file header.
++			 * This provides file type and permission
++			 * information necessary to support full
++			 * streaming extraction.  Currently being
++			 * discussed with other Zip developers
++			 * ... subject to change.
++			 *
++			 * Format:
++			 *  The field starts with a bitmap that specifies
++			 *  which additional fields are included.  The
++			 *  bitmap is variable length and can be extended in
++			 *  the future.
++			 *
++			 *  n bytes - feature bitmap: first byte has low-order
++			 *    7 bits.  If high-order bit is set, a subsequent
++			 *    byte holds the next 7 bits, etc.
++			 *
++			 *  if bitmap & 1, 2 byte "version made by"
++			 *  if bitmap & 2, 2 byte "internal file attributes"
++			 *  if bitmap & 4, 4 byte "external file attributes"
++			 *  if bitmap * 7, 2 byte comment length + n byte comment
 +			 */
 +			int bitmap, bitmap_last;
 +
 +			if (datasize < 1)
 +				break;
 +			bitmap_last = bitmap = 0xff & p[offset];
 +			offset += 1;
 +			datasize -= 1;
 +
 +			/* We only support first 7 bits of bitmap; skip rest. */
 +			while ((bitmap_last & 0x80) != 0
 +			    && datasize >= 1) {
 +				bitmap_last = p[offset];
 +				offset += 1;
 +				datasize -= 1;
 +			}
 +
 +			if (bitmap & 1) {
- 				// 2 byte "version made by"
++				/* 2 byte "version made by" */
 +				if (datasize < 2)
 +					break;
 +				zip_entry->system
 +				    = archive_le16dec(p + offset) >> 8;
 +				offset += 2;
 +				datasize -= 2;
 +			}
 +			if (bitmap & 2) {
- 				// 2 byte "internal file attributes"
++				/* 2 byte "internal file attributes" */
 +				uint32_t internal_attributes;
 +				if (datasize < 2)
 +					break;
 +				internal_attributes
 +				    = archive_le16dec(p + offset);
- 				// Not used by libarchive at present.
++				/* Not used by libarchive at present. */
 +				(void)internal_attributes; /* UNUSED */
 +				offset += 2;
 +				datasize -= 2;
 +			}
 +			if (bitmap & 4) {
- 				// 4 byte "external file attributes"
++				/* 4 byte "external file attributes" */
 +				uint32_t external_attributes;
 +				if (datasize < 4)
 +					break;
 +				external_attributes
 +				    = archive_le32dec(p + offset);
 +				if (zip_entry->system == 3) {
 +					zip_entry->mode
 +					    = external_attributes >> 16;
 +				}
 +				offset += 4;
 +				datasize -= 4;
 +			}
 +			if (bitmap & 8) {
- 				// 2 byte comment length + comment
++				/* 2 byte comment length + comment */
 +				uint32_t comment_length;
 +				if (datasize < 2)
 +					break;
 +				comment_length
 +				    = archive_le16dec(p + offset);
 +				offset += 2;
 +				datasize -= 2;
 +
 +				if (datasize < comment_length)
 +					break;
- 				// Comment is not supported by libarchive
++				/* Comment is not supported by libarchive */
 +				offset += comment_length;
 +				datasize -= comment_length;
 +			}
 +			break;
 +		}
 +		case 0x7855:
 +			/* Info-ZIP Unix Extra Field (type 2) "Ux". */
 +#ifdef DEBUG
 +			fprintf(stderr, "uid %d gid %d\n",
 +			    archive_le16dec(p + offset),
 +			    archive_le16dec(p + offset + 2));
 +#endif
 +			if (datasize >= 2)
 +				zip_entry->uid = archive_le16dec(p + offset);
 +			if (datasize >= 4)
 +				zip_entry->gid =
 +				    archive_le16dec(p + offset + 2);
 +			break;
 +		case 0x7875:
 +		{
 +			/* Info-Zip Unix Extra Field (type 3) "ux". */
 +			int uidsize = 0, gidsize = 0;
 +
 +			/* TODO: support arbitrary uidsize/gidsize. */
 +			if (datasize >= 1 && p[offset] == 1) {/* version=1 */
 +				if (datasize >= 4) {
 +					/* get a uid size. */
- 					uidsize = p[offset+1];
++					uidsize = 0xff & (int)p[offset+1];
 +					if (uidsize == 2)
 +						zip_entry->uid =
 +						    archive_le16dec(
 +						        p + offset + 2);
 +					else if (uidsize == 4 && datasize >= 6)
 +						zip_entry->uid =
 +						    archive_le32dec(
 +						        p + offset + 2);
 +				}
 +				if (datasize >= (2 + uidsize + 3)) {
 +					/* get a gid size. */
- 					gidsize = p[offset+2+uidsize];
++					gidsize = 0xff & (int)p[offset+2+uidsize];
 +					if (gidsize == 2)
 +						zip_entry->gid =
 +						    archive_le16dec(
 +						        p+offset+2+uidsize+1);
 +					else if (gidsize == 4 &&
 +					    datasize >= (2 + uidsize + 5))
 +						zip_entry->gid =
 +						    archive_le32dec(
 +						        p+offset+2+uidsize+1);
 +				}
 +			}
 +			break;
 +		}
++		case 0x9901:
++			/* WinZIp AES extra data field. */
++			if (p[offset + 2] == 'A' && p[offset + 3] == 'E') {
++				/* Vendor version. */
++				zip_entry->aes_extra.vendor =
++				    archive_le16dec(p + offset);
++				/* AES encryption strength. */
++				zip_entry->aes_extra.strength = p[offset + 4];
++				/* Actual compression method. */
++				zip_entry->aes_extra.compression =
++				    p[offset + 5];
++			}
++			break;
 +		default:
 +			break;
 +		}
 +		offset += datasize;
 +	}
 +#ifdef DEBUG
 +	if (offset != extra_length)
 +	{
 +		fprintf(stderr,
 +		    "Extra data field contents do not match reported size!\n");
 +	}
 +#endif
 +}
 +
 +/*
 + * Assumes file pointer is at beginning of local file header.
 + */
 +static int
 +zip_read_local_file_header(struct archive_read *a, struct archive_entry *entry,
 +    struct zip *zip)
 +{
 +	const char *p;
 +	const void *h;
 +	const wchar_t *wp;
 +	const char *cp;
 +	size_t len, filename_length, extra_length;
 +	struct archive_string_conv *sconv;
 +	struct zip_entry *zip_entry = zip->entry;
 +	struct zip_entry zip_entry_central_dir;
 +	int ret = ARCHIVE_OK;
 +	char version;
 +
 +	/* Save a copy of the original for consistency checks. */
 +	zip_entry_central_dir = *zip_entry;
 +
 +	zip->decompress_init = 0;
 +	zip->end_of_entry = 0;
 +	zip->entry_uncompressed_bytes_read = 0;
 +	zip->entry_compressed_bytes_read = 0;
 +	zip->entry_crc32 = zip->crc32func(0, NULL, 0);
 +
 +	/* Setup default conversion. */
 +	if (zip->sconv == NULL && !zip->init_default_conversion) {
 +		zip->sconv_default =
 +		    archive_string_default_conversion_for_read(&(a->archive));
 +		zip->init_default_conversion = 1;
 +	}
 +
 +	if ((p = __archive_read_ahead(a, 30, NULL)) == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated ZIP file header");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	if (memcmp(p, "PK\003\004", 4) != 0) {
 +		archive_set_error(&a->archive, -1, "Damaged Zip archive");
 +		return ARCHIVE_FATAL;
 +	}
 +	version = p[4];
 +	zip_entry->system = p[5];
 +	zip_entry->zip_flags = archive_le16dec(p + 6);
 +	if (zip_entry->zip_flags & (ZIP_ENCRYPTED | ZIP_STRONG_ENCRYPTED)) {
 +		zip->has_encrypted_entries = 1;
 +		archive_entry_set_is_data_encrypted(entry, 1);
 +		if (zip_entry->zip_flags & ZIP_CENTRAL_DIRECTORY_ENCRYPTED &&
 +			zip_entry->zip_flags & ZIP_ENCRYPTED &&
 +			zip_entry->zip_flags & ZIP_STRONG_ENCRYPTED) {
 +			archive_entry_set_is_metadata_encrypted(entry, 1);
 +			return ARCHIVE_FATAL;
 +		}
 +	}
++	zip->init_decryption = (zip_entry->zip_flags & ZIP_ENCRYPTED);
 +	zip_entry->compression = (char)archive_le16dec(p + 8);
 +	zip_entry->mtime = zip_time(p + 10);
 +	zip_entry->crc32 = archive_le32dec(p + 14);
++	if (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
++		zip_entry->decdat = p[11];
++	else
++		zip_entry->decdat = p[17];
 +	zip_entry->compressed_size = archive_le32dec(p + 18);
 +	zip_entry->uncompressed_size = archive_le32dec(p + 22);
 +	filename_length = archive_le16dec(p + 26);
 +	extra_length = archive_le16dec(p + 28);
 +
 +	__archive_read_consume(a, 30);
 +
 +	/* Read the filename. */
 +	if ((h = __archive_read_ahead(a, filename_length, NULL)) == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated ZIP file header");
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (zip_entry->zip_flags & ZIP_UTF8_NAME) {
 +		/* The filename is stored to be UTF-8. */
 +		if (zip->sconv_utf8 == NULL) {
 +			zip->sconv_utf8 =
 +			    archive_string_conversion_from_charset(
 +				&a->archive, "UTF-8", 1);
 +			if (zip->sconv_utf8 == NULL)
 +				return (ARCHIVE_FATAL);
 +		}
 +		sconv = zip->sconv_utf8;
 +	} else if (zip->sconv != NULL)
 +		sconv = zip->sconv;
 +	else
 +		sconv = zip->sconv_default;
 +
 +	if (archive_entry_copy_pathname_l(entry,
 +	    h, filename_length, sconv) != 0) {
 +		if (errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Pathname");
 +			return (ARCHIVE_FATAL);
 +		}
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Pathname cannot be converted "
 +		    "from %s to current locale.",
 +		    archive_string_conversion_charset_name(sconv));
 +		ret = ARCHIVE_WARN;
 +	}
 +	__archive_read_consume(a, filename_length);
 +
 +	/* Work around a bug in Info-Zip: When reading from a pipe, it
 +	 * stats the pipe instead of synthesizing a file entry. */
 +	if ((zip_entry->mode & AE_IFMT) == AE_IFIFO) {
 +		zip_entry->mode &= ~ AE_IFMT;
 +		zip_entry->mode |= AE_IFREG;
 +	}
 +
 +	if ((zip_entry->mode & AE_IFMT) == 0) {
 +		/* Especially in streaming mode, we can end up
 +		   here without having seen proper mode information.
 +		   Guess from the filename. */
 +		wp = archive_entry_pathname_w(entry);
 +		if (wp != NULL) {
 +			len = wcslen(wp);
 +			if (len > 0 && wp[len - 1] == L'/')
 +				zip_entry->mode |= AE_IFDIR;
 +			else
 +				zip_entry->mode |= AE_IFREG;
 +		} else {
 +			cp = archive_entry_pathname(entry);
 +			len = (cp != NULL)?strlen(cp):0;
 +			if (len > 0 && cp[len - 1] == '/')
 +				zip_entry->mode |= AE_IFDIR;
 +			else
 +				zip_entry->mode |= AE_IFREG;
 +		}
 +		if (zip_entry->mode == AE_IFDIR) {
 +			zip_entry->mode |= 0775;
 +		} else if (zip_entry->mode == AE_IFREG) {
 +			zip_entry->mode |= 0664;
 +		}
 +	}
 +
 +	/* Read the extra data. */
 +	if ((h = __archive_read_ahead(a, extra_length, NULL)) == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated ZIP file header");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	process_extra(h, extra_length, zip_entry);
 +	__archive_read_consume(a, extra_length);
 +
 +	if (zip_entry->flags & LA_FROM_CENTRAL_DIRECTORY) {
 +		/* If this came from the central dir, it's size info
 +		 * is definitive, so ignore the length-at-end flag. */
 +		zip_entry->zip_flags &= ~ZIP_LENGTH_AT_END;
 +		/* If local header is missing a value, use the one from
 +		   the central directory.  If both have it, warn about
 +		   mismatches. */
 +		if (zip_entry->crc32 == 0) {
 +			zip_entry->crc32 = zip_entry_central_dir.crc32;
 +		} else if (!zip->ignore_crc32
 +		    && zip_entry->crc32 != zip_entry_central_dir.crc32) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Inconsistent CRC32 values");
 +			ret = ARCHIVE_WARN;
 +		}
 +		if (zip_entry->compressed_size == 0) {
 +			zip_entry->compressed_size
 +			    = zip_entry_central_dir.compressed_size;
 +		} else if (zip_entry->compressed_size
 +		    != zip_entry_central_dir.compressed_size) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Inconsistent compressed size: "
 +			    "%jd in central directory, %jd in local header",
 +			    (intmax_t)zip_entry_central_dir.compressed_size,
 +			    (intmax_t)zip_entry->compressed_size);
 +			ret = ARCHIVE_WARN;
 +		}
 +		if (zip_entry->uncompressed_size == 0) {
 +			zip_entry->uncompressed_size
 +			    = zip_entry_central_dir.uncompressed_size;
 +		} else if (zip_entry->uncompressed_size
 +		    != zip_entry_central_dir.uncompressed_size) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Inconsistent uncompressed size: "
 +			    "%jd in central directory, %jd in local header",
 +			    (intmax_t)zip_entry_central_dir.uncompressed_size,
 +			    (intmax_t)zip_entry->uncompressed_size);
 +			ret = ARCHIVE_WARN;
 +		}
 +	}
 +
 +	/* Populate some additional entry fields: */
 +	archive_entry_set_mode(entry, zip_entry->mode);
 +	archive_entry_set_uid(entry, zip_entry->uid);
 +	archive_entry_set_gid(entry, zip_entry->gid);
 +	archive_entry_set_mtime(entry, zip_entry->mtime, 0);
 +	archive_entry_set_ctime(entry, zip_entry->ctime, 0);
 +	archive_entry_set_atime(entry, zip_entry->atime, 0);
 +
 +	if ((zip->entry->mode & AE_IFMT) == AE_IFLNK) {
- 		size_t linkname_length = zip_entry->compressed_size;
++		size_t linkname_length;
++
++		if (zip_entry->compressed_size > 64 * 1024) {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "Zip file with oversized link entry");
++			return ARCHIVE_FATAL;
++		}
++
++		linkname_length = (size_t)zip_entry->compressed_size;
 +
 +		archive_entry_set_size(entry, 0);
 +		p = __archive_read_ahead(a, linkname_length, NULL);
 +		if (p == NULL) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Truncated Zip file");
 +			return ARCHIVE_FATAL;
 +		}
- 		if (__archive_read_consume(a, linkname_length) < 0) {
- 			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- 			    "Read error skipping symlink target name");
- 			return ARCHIVE_FATAL;
- 		}
 +
 +		sconv = zip->sconv;
 +		if (sconv == NULL && (zip->entry->zip_flags & ZIP_UTF8_NAME))
 +			sconv = zip->sconv_utf8;
 +		if (sconv == NULL)
 +			sconv = zip->sconv_default;
 +		if (archive_entry_copy_symlink_l(entry, p, linkname_length,
 +		    sconv) != 0) {
 +			if (errno != ENOMEM && sconv == zip->sconv_utf8 &&
 +			    (zip->entry->zip_flags & ZIP_UTF8_NAME))
 +			    archive_entry_copy_symlink_l(entry, p,
 +				linkname_length, NULL);
 +			if (errno == ENOMEM) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory for Symlink");
 +				return (ARCHIVE_FATAL);
 +			}
 +			/*
 +			 * Since there is no character-set regulation for
 +			 * symlink name, do not report the conversion error
 +			 * in an automatic conversion.
 +			 */
 +			if (sconv != zip->sconv_utf8 ||
 +			    (zip->entry->zip_flags & ZIP_UTF8_NAME) == 0) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_FILE_FORMAT,
 +				    "Symlink cannot be converted "
 +				    "from %s to current locale.",
 +				    archive_string_conversion_charset_name(
 +					sconv));
 +				ret = ARCHIVE_WARN;
 +			}
 +		}
 +		zip_entry->uncompressed_size = zip_entry->compressed_size = 0;
++
++		if (__archive_read_consume(a, linkname_length) < 0) {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "Read error skipping symlink target name");
++			return ARCHIVE_FATAL;
++		}
 +	} else if (0 == (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
 +	    || zip_entry->uncompressed_size > 0) {
 +		/* Set the size only if it's meaningful. */
 +		archive_entry_set_size(entry, zip_entry->uncompressed_size);
 +	}
 +	zip->entry_bytes_remaining = zip_entry->compressed_size;
 +
 +	/* If there's no body, force read_data() to return EOF immediately. */
 +	if (0 == (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
 +	    && zip->entry_bytes_remaining < 1)
 +		zip->end_of_entry = 1;
 +
 +	/* Set up a more descriptive format name. */
- 	snprintf(zip->format_name, sizeof(zip->format_name), "ZIP %d.%d (%s)",
++	archive_string_sprintf(&zip->format_name, "ZIP %d.%d (%s)",
 +	    version / 10, version % 10,
 +	    compression_name(zip->entry->compression));
- 	a->archive.archive_format_name = zip->format_name;
++	a->archive.archive_format_name = zip->format_name.s;
 +
 +	return (ret);
 +}
 +
++static int
++check_authentication_code(struct archive_read *a, const void *_p)
++{
++	struct zip *zip = (struct zip *)(a->format->data);
++
++	/* Check authentication code. */
++	if (zip->hctx_valid) {
++		const void *p;
++		uint8_t hmac[20];
++		size_t hmac_len = 20;
++		int cmp;
++
++		archive_hmac_sha1_final(&zip->hctx, hmac, &hmac_len);
++		if (_p == NULL) {
++			/* Read authentication code. */
++			p = __archive_read_ahead(a, AUTH_CODE_SIZE, NULL);
++			if (p == NULL) {
++				archive_set_error(&a->archive,
++				    ARCHIVE_ERRNO_FILE_FORMAT,
++				    "Truncated ZIP file data");
++				return (ARCHIVE_FATAL);
++			}
++		} else {
++			p = _p;
++		}
++		cmp = memcmp(hmac, p, AUTH_CODE_SIZE);
++		__archive_read_consume(a, AUTH_CODE_SIZE);
++		if (cmp != 0) {
++			archive_set_error(&a->archive,
++			    ARCHIVE_ERRNO_MISC,
++			    "ZIP bad Authentication code");
++			return (ARCHIVE_WARN);
++		}
++	}
++	return (ARCHIVE_OK);
++}
++
 +/*
 + * Read "uncompressed" data.  There are three cases:
 + *  1) We know the size of the data.  This is always true for the
 + * seeking reader (we've examined the Central Directory already).
 + *  2) ZIP_LENGTH_AT_END was set, but only the CRC was deferred.
 + * Info-ZIP seems to do this; we know the size but have to grab
 + * the CRC from the data descriptor afterwards.
 + *  3) We're streaming and ZIP_LENGTH_AT_END was specified and
 + * we have no size information.  In this case, we can do pretty
 + * well by watching for the data descriptor record.  The data
 + * descriptor is 16 bytes and includes a computed CRC that should
 + * provide a strong check.
 + *
 + * TODO: Technically, the PK\007\010 signature is optional.
 + * In the original spec, the data descriptor contained CRC
 + * and size fields but had no leading signature.  In practice,
 + * newer writers seem to provide the signature pretty consistently.
 + *
 + * For uncompressed data, the PK\007\010 marker seems essential
 + * to be sure we've actually seen the end of the entry.
 + *
 + * Returns ARCHIVE_OK if successful, ARCHIVE_FATAL otherwise, sets
 + * zip->end_of_entry if it consumes all of the data.
 + */
 +static int
 +zip_read_data_none(struct archive_read *a, const void **_buff,
 +    size_t *size, int64_t *offset)
 +{
 +	struct zip *zip;
 +	const char *buff;
 +	ssize_t bytes_avail;
++	int r;
 +
 +	(void)offset; /* UNUSED */
 +
 +	zip = (struct zip *)(a->format->data);
 +
 +	if (zip->entry->zip_flags & ZIP_LENGTH_AT_END) {
 +		const char *p;
++		ssize_t grabbing_bytes = 24;
 +
++		if (zip->hctx_valid)
++			grabbing_bytes += AUTH_CODE_SIZE;
 +		/* Grab at least 24 bytes. */
- 		buff = __archive_read_ahead(a, 24, &bytes_avail);
- 		if (bytes_avail < 24) {
++		buff = __archive_read_ahead(a, grabbing_bytes, &bytes_avail);
++		if (bytes_avail < grabbing_bytes) {
 +			/* Zip archives have end-of-archive markers
 +			   that are longer than this, so a failure to get at
 +			   least 24 bytes really does indicate a truncated
 +			   file. */
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated ZIP file data");
 +			return (ARCHIVE_FATAL);
 +		}
 +		/* Check for a complete PK\007\010 signature, followed
 +		 * by the correct 4-byte CRC. */
 +		p = buff;
++		if (zip->hctx_valid)
++			p += AUTH_CODE_SIZE;
 +		if (p[0] == 'P' && p[1] == 'K'
 +		    && p[2] == '\007' && p[3] == '\010'
 +		    && (archive_le32dec(p + 4) == zip->entry_crc32
- 			|| zip->ignore_crc32)) {
++			|| zip->ignore_crc32
++			|| (zip->hctx_valid
++			 && zip->entry->aes_extra.vendor == AES_VENDOR_AE_2))) {
 +			if (zip->entry->flags & LA_USED_ZIP64) {
 +				zip->entry->crc32 = archive_le32dec(p + 4);
- 				zip->entry->compressed_size = archive_le64dec(p + 8);
- 				zip->entry->uncompressed_size = archive_le64dec(p + 16);
++				zip->entry->compressed_size =
++					archive_le64dec(p + 8);
++				zip->entry->uncompressed_size =
++					archive_le64dec(p + 16);
 +				zip->unconsumed = 24;
 +			} else {
 +				zip->entry->crc32 = archive_le32dec(p + 4);
- 				zip->entry->compressed_size = archive_le32dec(p + 8);
- 				zip->entry->uncompressed_size = archive_le32dec(p + 12);
++				zip->entry->compressed_size =
++					archive_le32dec(p + 8);
++				zip->entry->uncompressed_size =
++					archive_le32dec(p + 12);
 +				zip->unconsumed = 16;
 +			}
++			if (zip->hctx_valid) {
++				r = check_authentication_code(a, buff);
++				if (r != ARCHIVE_OK)
++					return (r);
++			}
 +			zip->end_of_entry = 1;
 +			return (ARCHIVE_OK);
 +		}
 +		/* If not at EOF, ensure we consume at least one byte. */
 +		++p;
 +
 +		/* Scan forward until we see where a PK\007\010 signature
 +		 * might be. */
 +		/* Return bytes up until that point.  On the next call,
 +		 * the code above will verify the data descriptor. */
 +		while (p < buff + bytes_avail - 4) {
 +			if (p[3] == 'P') { p += 3; }
 +			else if (p[3] == 'K') { p += 2; }
 +			else if (p[3] == '\007') { p += 1; }
 +			else if (p[3] == '\010' && p[2] == '\007'
 +			    && p[1] == 'K' && p[0] == 'P') {
++				if (zip->hctx_valid)
++					p -= AUTH_CODE_SIZE;
 +				break;
 +			} else { p += 4; }
 +		}
 +		bytes_avail = p - buff;
 +	} else {
 +		if (zip->entry_bytes_remaining == 0) {
 +			zip->end_of_entry = 1;
++			if (zip->hctx_valid) {
++				r = check_authentication_code(a, NULL);
++				if (r != ARCHIVE_OK)
++					return (r);
++			}
 +			return (ARCHIVE_OK);
 +		}
 +		/* Grab a bunch of bytes. */
 +		buff = __archive_read_ahead(a, 1, &bytes_avail);
 +		if (bytes_avail <= 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated ZIP file data");
 +			return (ARCHIVE_FATAL);
 +		}
 +		if (bytes_avail > zip->entry_bytes_remaining)
 +			bytes_avail = (ssize_t)zip->entry_bytes_remaining;
 +	}
++	if (zip->tctx_valid || zip->cctx_valid) {
++		size_t dec_size = bytes_avail;
++
++		if (dec_size > zip->decrypted_buffer_size)
++			dec_size = zip->decrypted_buffer_size;
++		if (zip->tctx_valid) {
++			trad_enc_decrypt_update(&zip->tctx,
++			    (const uint8_t *)buff, dec_size,
++			    zip->decrypted_buffer, dec_size);
++		} else {
++			size_t dsize = dec_size;
++			archive_hmac_sha1_update(&zip->hctx,
++			    (const uint8_t *)buff, dec_size);
++			archive_decrypto_aes_ctr_update(&zip->cctx,
++			    (const uint8_t *)buff, dec_size,
++			    zip->decrypted_buffer, &dsize);
++		}
++		bytes_avail = dec_size;
++		buff = (const char *)zip->decrypted_buffer;
++	}
 +	*size = bytes_avail;
 +	zip->entry_bytes_remaining -= bytes_avail;
 +	zip->entry_uncompressed_bytes_read += bytes_avail;
 +	zip->entry_compressed_bytes_read += bytes_avail;
 +	zip->unconsumed += bytes_avail;
 +	*_buff = buff;
 +	return (ARCHIVE_OK);
 +}
 +
 +#ifdef HAVE_ZLIB_H
 +static int
 +zip_deflate_init(struct archive_read *a, struct zip *zip)
 +{
 +	int r;
 +
 +	/* If we haven't yet read any data, initialize the decompressor. */
 +	if (!zip->decompress_init) {
 +		if (zip->stream_valid)
 +			r = inflateReset(&zip->stream);
 +		else
 +			r = inflateInit2(&zip->stream,
 +			    -15 /* Don't check for zlib header */);
 +		if (r != Z_OK) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Can't initialize ZIP decompression.");
 +			return (ARCHIVE_FATAL);
 +		}
 +		/* Stream structure has been set up. */
 +		zip->stream_valid = 1;
 +		/* We've initialized decompression for this stream. */
 +		zip->decompress_init = 1;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +zip_read_data_deflate(struct archive_read *a, const void **buff,
 +    size_t *size, int64_t *offset)
 +{
 +	struct zip *zip;
 +	ssize_t bytes_avail;
- 	const void *compressed_buff;
++	const void *compressed_buff, *sp;
 +	int r;
 +
 +	(void)offset; /* UNUSED */
 +
 +	zip = (struct zip *)(a->format->data);
 +
 +	/* If the buffer hasn't been allocated, allocate it now. */
 +	if (zip->uncompressed_buffer == NULL) {
 +		zip->uncompressed_buffer_size = 256 * 1024;
 +		zip->uncompressed_buffer
 +		    = (unsigned char *)malloc(zip->uncompressed_buffer_size);
 +		if (zip->uncompressed_buffer == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "No memory for ZIP decompression");
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	r = zip_deflate_init(a, zip);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +
 +	/*
 +	 * Note: '1' here is a performance optimization.
 +	 * Recall that the decompression layer returns a count of
 +	 * available bytes; asking for more than that forces the
 +	 * decompressor to combine reads by copying data.
 +	 */
- 	compressed_buff = __archive_read_ahead(a, 1, &bytes_avail);
++	compressed_buff = sp = __archive_read_ahead(a, 1, &bytes_avail);
 +	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)
 +	    && bytes_avail > zip->entry_bytes_remaining) {
 +		bytes_avail = (ssize_t)zip->entry_bytes_remaining;
 +	}
 +	if (bytes_avail <= 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated ZIP file body");
 +		return (ARCHIVE_FATAL);
 +	}
 +
++	if (zip->tctx_valid || zip->cctx_valid) {
++		if (zip->decrypted_bytes_remaining < (size_t)bytes_avail) {
++			size_t buff_remaining = zip->decrypted_buffer_size
++			    - (zip->decrypted_ptr - zip->decrypted_buffer);
++
++			if (buff_remaining > (size_t)bytes_avail)
++				buff_remaining = (size_t)bytes_avail;
++
++			if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END) &&
++			      zip->entry_bytes_remaining > 0) {
++				if ((int64_t)(zip->decrypted_bytes_remaining
++				    + buff_remaining)
++				      > zip->entry_bytes_remaining) {
++					if (zip->entry_bytes_remaining <
++					      (int64_t)zip->decrypted_bytes_remaining)
++						buff_remaining = 0;
++					else
++						buff_remaining =
++						    (size_t)zip->entry_bytes_remaining
++						      - zip->decrypted_bytes_remaining;
++				}
++			}
++			if (buff_remaining > 0) {
++				if (zip->tctx_valid) {
++					trad_enc_decrypt_update(&zip->tctx,
++					    compressed_buff, buff_remaining,
++					    zip->decrypted_ptr
++					      + zip->decrypted_bytes_remaining,
++					    buff_remaining);
++				} else {
++					size_t dsize = buff_remaining;
++					archive_decrypto_aes_ctr_update(
++					    &zip->cctx,
++					    compressed_buff, buff_remaining,
++					    zip->decrypted_ptr
++					      + zip->decrypted_bytes_remaining,
++					    &dsize);
++				}
++				zip->decrypted_bytes_remaining += buff_remaining;
++			}
++		}
++		bytes_avail = zip->decrypted_bytes_remaining;
++		compressed_buff = (const char *)zip->decrypted_ptr;
++	}
++
 +	/*
 +	 * A bug in zlib.h: stream.next_in should be marked 'const'
 +	 * but isn't (the library never alters data through the
 +	 * next_in pointer, only reads it).  The result: this ugly
 +	 * cast to remove 'const'.
 +	 */
 +	zip->stream.next_in = (Bytef *)(uintptr_t)(const void *)compressed_buff;
 +	zip->stream.avail_in = (uInt)bytes_avail;
 +	zip->stream.total_in = 0;
 +	zip->stream.next_out = zip->uncompressed_buffer;
 +	zip->stream.avail_out = (uInt)zip->uncompressed_buffer_size;
 +	zip->stream.total_out = 0;
 +
 +	r = inflate(&zip->stream, 0);
 +	switch (r) {
 +	case Z_OK:
 +		break;
 +	case Z_STREAM_END:
 +		zip->end_of_entry = 1;
 +		break;
 +	case Z_MEM_ERROR:
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Out of memory for ZIP decompression");
 +		return (ARCHIVE_FATAL);
 +	default:
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "ZIP decompression failed (%d)", r);
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Consume as much as the compressor actually used. */
 +	bytes_avail = zip->stream.total_in;
++	if (zip->tctx_valid || zip->cctx_valid) {
++		zip->decrypted_bytes_remaining -= bytes_avail;
++		if (zip->decrypted_bytes_remaining == 0)
++			zip->decrypted_ptr = zip->decrypted_buffer;
++		else
++			zip->decrypted_ptr += bytes_avail;
++	}
++	/* Calculate compressed data as much as we used.*/
++	if (zip->hctx_valid)
++		archive_hmac_sha1_update(&zip->hctx, sp, bytes_avail);
 +	__archive_read_consume(a, bytes_avail);
 +	zip->entry_bytes_remaining -= bytes_avail;
 +	zip->entry_compressed_bytes_read += bytes_avail;
 +
 +	*size = zip->stream.total_out;
 +	zip->entry_uncompressed_bytes_read += zip->stream.total_out;
 +	*buff = zip->uncompressed_buffer;
 +
++	if (zip->end_of_entry && zip->hctx_valid) {
++		r = check_authentication_code(a, NULL);
++		if (r != ARCHIVE_OK)
++			return (r);
++	}
++
 +	if (zip->end_of_entry && (zip->entry->zip_flags & ZIP_LENGTH_AT_END)) {
 +		const char *p;
 +
 +		if (NULL == (p = __archive_read_ahead(a, 24, NULL))) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated ZIP end-of-file record");
 +			return (ARCHIVE_FATAL);
 +		}
 +		/* Consume the optional PK\007\010 marker. */
 +		if (p[0] == 'P' && p[1] == 'K' &&
 +		    p[2] == '\007' && p[3] == '\010') {
 +			p += 4;
 +			zip->unconsumed = 4;
 +		}
 +		if (zip->entry->flags & LA_USED_ZIP64) {
 +			zip->entry->crc32 = archive_le32dec(p);
 +			zip->entry->compressed_size = archive_le64dec(p + 4);
 +			zip->entry->uncompressed_size = archive_le64dec(p + 12);
 +			zip->unconsumed += 20;
 +		} else {
 +			zip->entry->crc32 = archive_le32dec(p);
 +			zip->entry->compressed_size = archive_le32dec(p + 4);
 +			zip->entry->uncompressed_size = archive_le32dec(p + 8);
 +			zip->unconsumed += 12;
 +		}
 +	}
 +
 +	return (ARCHIVE_OK);
 +}
 +#endif
 +
 +static int
++read_decryption_header(struct archive_read *a)
++{
++	struct zip *zip = (struct zip *)(a->format->data);
++	const char *p;
++	unsigned int remaining_size;
++	unsigned int ts;
++
++	/*
++	 * Read an initialization vector data field.
++	 */
++	p = __archive_read_ahead(a, 2, NULL);
++	if (p == NULL)
++		goto truncated;
++	ts = zip->iv_size;
++	zip->iv_size = archive_le16dec(p);
++	__archive_read_consume(a, 2);
++	if (ts < zip->iv_size) {
++		free(zip->iv);
++		zip->iv = NULL;
++	}
++	p = __archive_read_ahead(a, zip->iv_size, NULL);
++	if (p == NULL)
++		goto truncated;
++	if (zip->iv == NULL) {
++		zip->iv = malloc(zip->iv_size);
++		if (zip->iv == NULL)
++			goto nomem;
++	}
++	memcpy(zip->iv, p, zip->iv_size);
++	__archive_read_consume(a, zip->iv_size);
++
++	/*
++	 * Read a size of remaining decryption header field.
++	 */
++	p = __archive_read_ahead(a, 14, NULL);
++	if (p == NULL)
++		goto truncated;
++	remaining_size = archive_le32dec(p);
++	if (remaining_size < 16 || remaining_size > (1 << 18))
++		goto corrupted;
++
++	/* Check if format version is supported. */
++	if (archive_le16dec(p+4) != 3) {
++		archive_set_error(&a->archive,
++		    ARCHIVE_ERRNO_FILE_FORMAT,
++		    "Unsupported encryption format version: %u",
++		    archive_le16dec(p+4));
++		return (ARCHIVE_FAILED);
++	}
++
++	/*
++	 * Read an encryption algorithm field.
++	 */
++	zip->alg_id = archive_le16dec(p+6);
++	switch (zip->alg_id) {
++	case 0x6601:/* DES */
++	case 0x6602:/* RC2 */
++	case 0x6603:/* 3DES 168 */
++	case 0x6609:/* 3DES 112 */
++	case 0x660E:/* AES 128 */
++	case 0x660F:/* AES 192 */
++	case 0x6610:/* AES 256 */
++	case 0x6702:/* RC2 (version >= 5.2) */
++	case 0x6720:/* Blowfish */
++	case 0x6721:/* Twofish */
++	case 0x6801:/* RC4 */
++		/* Suuported encryption algorithm. */
++		break;
++	default:
++		archive_set_error(&a->archive,
++		    ARCHIVE_ERRNO_FILE_FORMAT,
++		    "Unknown encryption algorithm: %u", zip->alg_id);
++		return (ARCHIVE_FAILED);
++	}
++
++	/*
++	 * Read a bit length field.
++	 */
++	zip->bit_len = archive_le16dec(p+8);
++
++	/*
++	 * Read a flags field.
++	 */
++	zip->flags = archive_le16dec(p+10);
++	switch (zip->flags & 0xf000) {
++	case 0x0001: /* Password is required to decrypt. */
++	case 0x0002: /* Certificates only. */
++	case 0x0003: /* Password or certificate required to decrypt. */
++		break;
++	default:
++		archive_set_error(&a->archive,
++		    ARCHIVE_ERRNO_FILE_FORMAT,
++		    "Unknown encryption flag: %u", zip->flags);
++		return (ARCHIVE_FAILED);
++	}
++	if ((zip->flags & 0xf000) == 0 ||
++	    (zip->flags & 0xf000) == 0x4000) {
++		archive_set_error(&a->archive,
++		    ARCHIVE_ERRNO_FILE_FORMAT,
++		    "Unknown encryption flag: %u", zip->flags);
++		return (ARCHIVE_FAILED);
++	}
++
++	/*
++	 * Read an encrypted random data field.
++	 */
++	ts = zip->erd_size;
++	zip->erd_size = archive_le16dec(p+12);
++	__archive_read_consume(a, 14);
++	if ((zip->erd_size & 0xf) != 0 ||
++	    (zip->erd_size + 16) > remaining_size ||
++	    (zip->erd_size + 16) < zip->erd_size)
++		goto corrupted;
++
++	if (ts < zip->erd_size) {
++		free(zip->erd);
++		zip->erd = NULL;
++	}
++	p = __archive_read_ahead(a, zip->erd_size, NULL);
++	if (p == NULL)
++		goto truncated;
++	if (zip->erd == NULL) {
++		zip->erd = malloc(zip->erd_size);
++		if (zip->erd == NULL)
++			goto nomem;
++	}
++	memcpy(zip->erd, p, zip->erd_size);
++	__archive_read_consume(a, zip->erd_size);
++
++	/*
++	 * Read a reserved data field.
++	 */
++	p = __archive_read_ahead(a, 4, NULL);
++	if (p == NULL)
++		goto truncated;
++	/* Reserved data size should be zero. */
++	if (archive_le32dec(p) != 0)
++		goto corrupted;
++	__archive_read_consume(a, 4);
++
++	/*
++	 * Read a password validation data field.
++	 */
++	p = __archive_read_ahead(a, 2, NULL);
++	if (p == NULL)
++		goto truncated;
++	ts = zip->v_size;
++	zip->v_size = archive_le16dec(p);
++	__archive_read_consume(a, 2);
++	if ((zip->v_size & 0x0f) != 0 ||
++	    (zip->erd_size + zip->v_size + 16) > remaining_size ||
++	    (zip->erd_size + zip->v_size + 16) < (zip->erd_size + zip->v_size))
++		goto corrupted;
++	if (ts < zip->v_size) {
++		free(zip->v_data);
++		zip->v_data = NULL;
++	}
++	p = __archive_read_ahead(a, zip->v_size, NULL);
++	if (p == NULL)
++		goto truncated;
++	if (zip->v_data == NULL) {
++		zip->v_data = malloc(zip->v_size);
++		if (zip->v_data == NULL)
++			goto nomem;
++	}
++	memcpy(zip->v_data, p, zip->v_size);
++	__archive_read_consume(a, zip->v_size);
++
++	p = __archive_read_ahead(a, 4, NULL);
++	if (p == NULL)
++		goto truncated;
++	zip->v_crc32 = archive_le32dec(p);
++	__archive_read_consume(a, 4);
++
++	/*return (ARCHIVE_OK);
++	 * This is not fully implemnted yet.*/
++	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++	    "Encrypted file is unsupported");
++	return (ARCHIVE_FAILED);
++truncated:
++	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++	    "Truncated ZIP file data");
++	return (ARCHIVE_FATAL);
++corrupted:
++	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++	    "Corrupted ZIP file data");
++	return (ARCHIVE_FATAL);
++nomem:
++	archive_set_error(&a->archive, ENOMEM,
++	    "No memory for ZIP decryption");
++	return (ARCHIVE_FATAL);
++}
++
++static int
++zip_alloc_decryption_buffer(struct archive_read *a)
++{
++	struct zip *zip = (struct zip *)(a->format->data);
++	size_t bs = 256 * 1024;
++
++	if (zip->decrypted_buffer == NULL) {
++		zip->decrypted_buffer_size = bs;
++		zip->decrypted_buffer = malloc(bs);
++		if (zip->decrypted_buffer == NULL) {
++			archive_set_error(&a->archive, ENOMEM,
++			    "No memory for ZIP decryption");
++			return (ARCHIVE_FATAL);
++		}
++	}
++	zip->decrypted_ptr = zip->decrypted_buffer;
++	return (ARCHIVE_OK);
++}
++
++static int
++init_traditional_PKWARE_decryption(struct archive_read *a)
++{
++	struct zip *zip = (struct zip *)(a->format->data);
++	const void *p;
++	int retry;
++	int r;
++
++	if (zip->tctx_valid)
++		return (ARCHIVE_OK);
++
++	/*
++	   Read the 12 bytes encryption header stored at
++	   the start of the data area.
++	 */
++#define ENC_HEADER_SIZE	12
++	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)
++	    && zip->entry_bytes_remaining < ENC_HEADER_SIZE) {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++		    "Truncated Zip encrypted body: only %jd bytes available",
++		    (intmax_t)zip->entry_bytes_remaining);
++		return (ARCHIVE_FATAL);
++	}
++
++	p = __archive_read_ahead(a, ENC_HEADER_SIZE, NULL);
++	if (p == NULL) {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++		    "Truncated ZIP file data");
++		return (ARCHIVE_FATAL);
++	}
++
++	for (retry = 0;; retry++) {
++		const char *passphrase;
++		uint8_t crcchk;
++
++		passphrase = __archive_read_next_passphrase(a);
++		if (passphrase == NULL) {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    (retry > 0)?
++				"Incorrect passphrase":
++				"Passphrase required for this entry");
++			return (ARCHIVE_FAILED);
++		}
++
++		/*
++		 * Initialize ctx for Traditional PKWARE Decyption.
++		 */
++		r = trad_enc_init(&zip->tctx, passphrase, strlen(passphrase),
++			p, ENC_HEADER_SIZE, &crcchk);
++		if (r == 0 && crcchk == zip->entry->decdat)
++			break;/* The passphrase is OK. */
++		if (retry > 10000) {
++			/* Avoid infinity loop. */
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "Too many incorrect passphrases");
++			return (ARCHIVE_FAILED);
++		}
++	}
++
++	__archive_read_consume(a, ENC_HEADER_SIZE);
++	zip->tctx_valid = 1;
++	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)) {
++	    zip->entry_bytes_remaining -= ENC_HEADER_SIZE;
++	}
++	/*zip->entry_uncompressed_bytes_read += ENC_HEADER_SIZE;*/
++	zip->entry_compressed_bytes_read += ENC_HEADER_SIZE;
++	zip->decrypted_bytes_remaining = 0;
++
++	return (zip_alloc_decryption_buffer(a));
++#undef ENC_HEADER_SIZE
++}
++
++static int
++init_WinZip_AES_decryption(struct archive_read *a)
++{
++	struct zip *zip = (struct zip *)(a->format->data);
++	const void *p;
++	const uint8_t *pv;
++	size_t key_len, salt_len;
++	uint8_t derived_key[MAX_DERIVED_KEY_BUF_SIZE];
++	int retry;
++	int r;
++
++	if (zip->cctx_valid || zip->hctx_valid)
++		return (ARCHIVE_OK);
++
++	switch (zip->entry->aes_extra.strength) {
++	case 1: salt_len = 8;  key_len = 16; break;
++	case 2: salt_len = 12; key_len = 24; break;
++	case 3: salt_len = 16; key_len = 32; break;
++	default: goto corrupted;
++	}
++	p = __archive_read_ahead(a, salt_len + 2, NULL);
++	if (p == NULL)
++		goto truncated;
++
++	for (retry = 0;; retry++) {
++		const char *passphrase;
++
++		passphrase = __archive_read_next_passphrase(a);
++		if (passphrase == NULL) {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    (retry > 0)?
++				"Incorrect passphrase":
++				"Passphrase required for this entry");
++			return (ARCHIVE_FAILED);
++		}
++		memset(derived_key, 0, sizeof(derived_key));
++		r = archive_pbkdf2_sha1(passphrase, strlen(passphrase),
++		    p, salt_len, 1000, derived_key, key_len * 2 + 2);
++		if (r != 0) {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "Decryption is unsupported due to lack of "
++			    "crypto library");
++			return (ARCHIVE_FAILED);
++		}
++
++		/* Check password verification value. */
++		pv = ((const uint8_t *)p) + salt_len;
++		if (derived_key[key_len * 2] == pv[0] &&
++		    derived_key[key_len * 2 + 1] == pv[1])
++			break;/* The passphrase is OK. */
++		if (retry > 10000) {
++			/* Avoid infinity loop. */
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "Too many incorrect passphrases");
++			return (ARCHIVE_FAILED);
++		}
++	}
++
++	r = archive_decrypto_aes_ctr_init(&zip->cctx, derived_key, key_len);
++	if (r != 0) {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++		    "Decryption is unsupported due to lack of crypto library");
++		return (ARCHIVE_FAILED);
++	}
++	r = archive_hmac_sha1_init(&zip->hctx, derived_key + key_len, key_len);
++	if (r != 0) {
++		archive_decrypto_aes_ctr_release(&zip->cctx);
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++		    "Failed to initialize HMAC-SHA1");
++		return (ARCHIVE_FAILED);
++	}
++	zip->cctx_valid = zip->hctx_valid = 1;
++	__archive_read_consume(a, salt_len + 2);
++	zip->entry_bytes_remaining -= salt_len + 2 + AUTH_CODE_SIZE;
++	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)
++	    && zip->entry_bytes_remaining < 0)
++		goto corrupted;
++	zip->entry_compressed_bytes_read += salt_len + 2 + AUTH_CODE_SIZE;
++	zip->decrypted_bytes_remaining = 0;
++
++	zip->entry->compression = zip->entry->aes_extra.compression;
++	return (zip_alloc_decryption_buffer(a));
++
++truncated:
++	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++	    "Truncated ZIP file data");
++	return (ARCHIVE_FATAL);
++corrupted:
++	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++	    "Corrupted ZIP file data");
++	return (ARCHIVE_FATAL);
++}
++
++static int
 +archive_read_format_zip_read_data(struct archive_read *a,
 +    const void **buff, size_t *size, int64_t *offset)
 +{
 +	int r;
 +	struct zip *zip = (struct zip *)(a->format->data);
 +
- 	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
++	if (zip->has_encrypted_entries ==
++			ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
 +		zip->has_encrypted_entries = 0;
 +	}
 +
 +	*offset = zip->entry_uncompressed_bytes_read;
 +	*size = 0;
 +	*buff = NULL;
 +
 +	/* If we hit end-of-entry last time, return ARCHIVE_EOF. */
 +	if (zip->end_of_entry)
 +		return (ARCHIVE_EOF);
 +
 +	/* Return EOF immediately if this is a non-regular file. */
 +	if (AE_IFREG != (zip->entry->mode & AE_IFMT))
 +		return (ARCHIVE_EOF);
 +
- 	if (zip->entry->zip_flags & (ZIP_ENCRYPTED | ZIP_STRONG_ENCRYPTED)) {
- 		zip->has_encrypted_entries = 1;
- 		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
- 		    "Encrypted file is unsupported");
- 		return (ARCHIVE_FAILED);
- 	}
- 
 +	__archive_read_consume(a, zip->unconsumed);
 +	zip->unconsumed = 0;
 +
++	if (zip->init_decryption) {
++		zip->has_encrypted_entries = 1;
++		if (zip->entry->zip_flags & ZIP_STRONG_ENCRYPTED)
++			r = read_decryption_header(a);
++		else if (zip->entry->compression == WINZIP_AES_ENCRYPTION)
++			r = init_WinZip_AES_decryption(a);
++		else
++			r = init_traditional_PKWARE_decryption(a);
++		if (r != ARCHIVE_OK)
++			return (r);
++		zip->init_decryption = 0;
++	}
++
 +	switch(zip->entry->compression) {
 +	case 0:  /* No compression. */
 +		r =  zip_read_data_none(a, buff, size, offset);
 +		break;
 +#ifdef HAVE_ZLIB_H
 +	case 8: /* Deflate compression. */
 +		r =  zip_read_data_deflate(a, buff, size, offset);
 +		break;
 +#endif
 +	default: /* Unsupported compression. */
 +		/* Return a warning. */
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Unsupported ZIP compression method (%s)",
 +		    compression_name(zip->entry->compression));
 +		/* We can't decompress this entry, but we will
 +		 * be able to skip() it and try the next entry. */
 +		return (ARCHIVE_FAILED);
 +		break;
 +	}
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Update checksum */
 +	if (*size)
 +		zip->entry_crc32 = zip->crc32func(zip->entry_crc32, *buff,
 +		    (unsigned)*size);
 +	/* If we hit the end, swallow any end-of-data marker. */
 +	if (zip->end_of_entry) {
 +		/* Check file size, CRC against these values. */
 +		if (zip->entry->compressed_size !=
 +		    zip->entry_compressed_bytes_read) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "ZIP compressed data is wrong size "
 +			    "(read %jd, expected %jd)",
 +			    (intmax_t)zip->entry_compressed_bytes_read,
 +			    (intmax_t)zip->entry->compressed_size);
 +			return (ARCHIVE_WARN);
 +		}
 +		/* Size field only stores the lower 32 bits of the actual
 +		 * size. */
 +		if ((zip->entry->uncompressed_size & UINT32_MAX)
 +		    != (zip->entry_uncompressed_bytes_read & UINT32_MAX)) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "ZIP uncompressed data is wrong size "
 +			    "(read %jd, expected %jd)\n",
 +			    (intmax_t)zip->entry_uncompressed_bytes_read,
 +			    (intmax_t)zip->entry->uncompressed_size);
 +			return (ARCHIVE_WARN);
 +		}
 +		/* Check computed CRC against header */
- 		if (zip->entry->crc32 != zip->entry_crc32
++		if ((!zip->hctx_valid ||
++		      zip->entry->aes_extra.vendor != AES_VENDOR_AE_2) &&
++		   zip->entry->crc32 != zip->entry_crc32
 +		    && !zip->ignore_crc32) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "ZIP bad CRC: 0x%lx should be 0x%lx",
 +			    (unsigned long)zip->entry_crc32,
 +			    (unsigned long)zip->entry->crc32);
 +			return (ARCHIVE_WARN);
 +		}
 +	}
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_read_format_zip_cleanup(struct archive_read *a)
 +{
 +	struct zip *zip;
 +	struct zip_entry *zip_entry, *next_zip_entry;
 +
 +	zip = (struct zip *)(a->format->data);
 +#ifdef HAVE_ZLIB_H
 +	if (zip->stream_valid)
 +		inflateEnd(&zip->stream);
 +	free(zip->uncompressed_buffer);
 +#endif
 +	if (zip->zip_entries) {
 +		zip_entry = zip->zip_entries;
 +		while (zip_entry != NULL) {
 +			next_zip_entry = zip_entry->next;
 +			archive_string_free(&zip_entry->rsrcname);
 +			free(zip_entry);
 +			zip_entry = next_zip_entry;
 +		}
 +	}
++	free(zip->decrypted_buffer);
++	if (zip->cctx_valid)
++		archive_decrypto_aes_ctr_release(&zip->cctx);
++	if (zip->hctx_valid)
++		archive_hmac_sha1_cleanup(&zip->hctx);
++	free(zip->iv);
++	free(zip->erd);
++	free(zip->v_data);
++	archive_string_free(&zip->format_name);
 +	free(zip);
 +	(a->format->data) = NULL;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_read_format_zip_has_encrypted_entries(struct archive_read *_a)
 +{
 +	if (_a && _a->format) {
 +		struct zip * zip = (struct zip *)_a->format->data;
 +		if (zip) {
 +			return zip->has_encrypted_entries;
 +		}
 +	}
 +	return ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
 +}
 +
 +static int
 +archive_read_format_zip_options(struct archive_read *a,
 +    const char *key, const char *val)
 +{
 +	struct zip *zip;
 +	int ret = ARCHIVE_FAILED;
 +
 +	zip = (struct zip *)(a->format->data);
 +	if (strcmp(key, "compat-2x")  == 0) {
 +		/* Handle filenames as libarchive 2.x */
 +		zip->init_default_conversion = (val != NULL) ? 1 : 0;
 +		return (ARCHIVE_OK);
 +	} else if (strcmp(key, "hdrcharset")  == 0) {
 +		if (val == NULL || val[0] == 0)
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "zip: hdrcharset option needs a character-set name"
 +			);
 +		else {
 +			zip->sconv = archive_string_conversion_from_charset(
 +			    &a->archive, val, 0);
 +			if (zip->sconv != NULL) {
 +				if (strcmp(val, "UTF-8") == 0)
 +					zip->sconv_utf8 = zip->sconv;
 +				ret = ARCHIVE_OK;
 +			} else
 +				ret = ARCHIVE_FATAL;
 +		}
 +		return (ret);
 +	} else if (strcmp(key, "ignorecrc32") == 0) {
 +		/* Mostly useful for testing. */
 +		if (val == NULL || val[0] == 0) {
 +			zip->crc32func = real_crc32;
 +			zip->ignore_crc32 = 0;
 +		} else {
 +			zip->crc32func = fake_crc32;
 +			zip->ignore_crc32 = 1;
 +		}
 +		return (ARCHIVE_OK);
 +	} else if (strcmp(key, "mac-ext") == 0) {
 +		zip->process_mac_extensions = (val != NULL && val[0] != 0);
 +		return (ARCHIVE_OK);
 +	}
 +
 +	/* Note: The "warn" return is just to inform the options
 +	 * supervisor that we didn't handle it.  It will generate
 +	 * a suitable error if no one used this option. */
 +	return (ARCHIVE_WARN);
 +}
 +
 +int
 +archive_read_support_format_zip(struct archive *a)
 +{
 +	int r;
 +	r = archive_read_support_format_zip_streamable(a);
 +	if (r != ARCHIVE_OK)
 +		return r;
 +	return (archive_read_support_format_zip_seekable(a));
 +}
 +
 +/* ------------------------------------------------------------------------ */
 +
 +/*
 + * Streaming-mode support
 + */
 +
 +
 +static int
 +archive_read_support_format_zip_capabilities_streamable(struct archive_read * a)
 +{
 +	(void)a; /* UNUSED */
- 	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA | ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
++	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA |
++		ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
 +}
 +
 +static int
 +archive_read_format_zip_streamable_bid(struct archive_read *a, int best_bid)
 +{
 +	const char *p;
 +
 +	(void)best_bid; /* UNUSED */
 +
 +	if ((p = __archive_read_ahead(a, 4, NULL)) == NULL)
 +		return (-1);
 +
 +	/*
 +	 * Bid of 29 here comes from:
 +	 *  + 16 bits for "PK",
 +	 *  + next 16-bit field has 6 options so contributes
 +	 *    about 16 - log_2(6) ~= 16 - 2.6 ~= 13 bits
 +	 *
 +	 * So we've effectively verified ~29 total bits of check data.
 +	 */
 +	if (p[0] == 'P' && p[1] == 'K') {
 +		if ((p[2] == '\001' && p[3] == '\002')
 +		    || (p[2] == '\003' && p[3] == '\004')
 +		    || (p[2] == '\005' && p[3] == '\006')
 +		    || (p[2] == '\006' && p[3] == '\006')
 +		    || (p[2] == '\007' && p[3] == '\010')
 +		    || (p[2] == '0' && p[3] == '0'))
 +			return (29);
 +	}
 +
 +	/* TODO: It's worth looking ahead a little bit for a valid
 +	 * PK signature.  In particular, that would make it possible
 +	 * to read some UUEncoded SFX files or SFX files coming from
 +	 * a network socket. */
 +
 +	return (0);
 +}
 +
 +static int
 +archive_read_format_zip_streamable_read_header(struct archive_read *a,
 +    struct archive_entry *entry)
 +{
 +	struct zip *zip;
 +
 +	a->archive.archive_format = ARCHIVE_FORMAT_ZIP;
 +	if (a->archive.archive_format_name == NULL)
 +		a->archive.archive_format_name = "ZIP";
 +
 +	zip = (struct zip *)(a->format->data);
 +
 +	/*
 +	 * It should be sufficient to call archive_read_next_header() for
 +	 * a reader to determine if an entry is encrypted or not. If the
 +	 * encryption of an entry is only detectable when calling
 +	 * archive_read_data(), so be it. We'll do the same check there
 +	 * as well.
 +	 */
- 	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
++	if (zip->has_encrypted_entries ==
++			ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW)
 +		zip->has_encrypted_entries = 0;
- 	}
 +
 +	/* Make sure we have a zip_entry structure to use. */
 +	if (zip->zip_entries == NULL) {
 +		zip->zip_entries = malloc(sizeof(struct zip_entry));
 +		if (zip->zip_entries == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Out  of memory");
 +			return ARCHIVE_FATAL;
 +		}
 +	}
 +	zip->entry = zip->zip_entries;
 +	memset(zip->entry, 0, sizeof(struct zip_entry));
 +
++	if (zip->cctx_valid)
++		archive_decrypto_aes_ctr_release(&zip->cctx);
++	if (zip->hctx_valid)
++		archive_hmac_sha1_cleanup(&zip->hctx);
++	zip->tctx_valid = zip->cctx_valid = zip->hctx_valid = 0;
++	__archive_read_reset_passphrase(a);
++
 +	/* Search ahead for the next local file header. */
 +	__archive_read_consume(a, zip->unconsumed);
 +	zip->unconsumed = 0;
 +	for (;;) {
 +		int64_t skipped = 0;
 +		const char *p, *end;
 +		ssize_t bytes;
 +
 +		p = __archive_read_ahead(a, 4, &bytes);
 +		if (p == NULL)
 +			return (ARCHIVE_FATAL);
 +		end = p + bytes;
 +
 +		while (p + 4 <= end) {
 +			if (p[0] == 'P' && p[1] == 'K') {
 +				if (p[2] == '\003' && p[3] == '\004') {
 +					/* Regular file entry. */
 +					__archive_read_consume(a, skipped);
 +					return zip_read_local_file_header(a,
 +					    entry, zip);
 +				}
 +
 +                              /*
 +                               * TODO: We cannot restore permissions
 +                               * based only on the local file headers.
 +                               * Consider scanning the central
 +                               * directory and returning additional
 +                               * entries for at least directories.
 +                               * This would allow us to properly set
 +                               * directory permissions.
 +			       *
 +			       * This won't help us fix symlinks
 +			       * and may not help with regular file
 +			       * permissions, either.  <sigh>
 +                               */
 +                              if (p[2] == '\001' && p[3] == '\002') {
 +                                      return (ARCHIVE_EOF);
 +                              }
 +
 +                              /* End of central directory?  Must be an
 +                               * empty archive. */
 +                              if ((p[2] == '\005' && p[3] == '\006')
 +                                  || (p[2] == '\006' && p[3] == '\006'))
 +                                      return (ARCHIVE_EOF);
 +			}
 +			++p;
 +			++skipped;
 +		}
 +		__archive_read_consume(a, skipped);
 +	}
 +}
 +
 +static int
 +archive_read_format_zip_read_data_skip_streamable(struct archive_read *a)
 +{
 +	struct zip *zip;
 +	int64_t bytes_skipped;
 +
 +	zip = (struct zip *)(a->format->data);
 +	bytes_skipped = __archive_read_consume(a, zip->unconsumed);
 +	zip->unconsumed = 0;
 +	if (bytes_skipped < 0)
 +		return (ARCHIVE_FATAL);
 +
 +	/* If we've already read to end of data, we're done. */
 +	if (zip->end_of_entry)
 +		return (ARCHIVE_OK);
 +
 +	/* So we know we're streaming... */
 +	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)
 +	    || zip->entry->compressed_size > 0) {
 +		/* We know the compressed length, so we can just skip. */
- 		bytes_skipped = __archive_read_consume(a, zip->entry_bytes_remaining);
++		bytes_skipped = __archive_read_consume(a,
++					zip->entry_bytes_remaining);
 +		if (bytes_skipped < 0)
 +			return (ARCHIVE_FATAL);
 +		return (ARCHIVE_OK);
 +	}
 +
++	if (zip->init_decryption) {
++		int r;
++
++		zip->has_encrypted_entries = 1;
++		if (zip->entry->zip_flags & ZIP_STRONG_ENCRYPTED)
++			r = read_decryption_header(a);
++		else if (zip->entry->compression == WINZIP_AES_ENCRYPTION)
++			r = init_WinZip_AES_decryption(a);
++		else
++			r = init_traditional_PKWARE_decryption(a);
++		if (r != ARCHIVE_OK)
++			return (r);
++		zip->init_decryption = 0;
++	}
++
 +	/* We're streaming and we don't know the length. */
 +	/* If the body is compressed and we know the format, we can
 +	 * find an exact end-of-entry by decompressing it. */
 +	switch (zip->entry->compression) {
 +#ifdef HAVE_ZLIB_H
 +	case 8: /* Deflate compression. */
 +		while (!zip->end_of_entry) {
 +			int64_t offset = 0;
 +			const void *buff = NULL;
 +			size_t size = 0;
 +			int r;
 +			r =  zip_read_data_deflate(a, &buff, &size, &offset);
 +			if (r != ARCHIVE_OK)
 +				return (r);
 +		}
 +		return ARCHIVE_OK;
 +#endif
 +	default: /* Uncompressed or unknown. */
 +		/* Scan for a PK\007\010 signature. */
 +		for (;;) {
 +			const char *p, *buff;
 +			ssize_t bytes_avail;
 +			buff = __archive_read_ahead(a, 16, &bytes_avail);
 +			if (bytes_avail < 16) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_FILE_FORMAT,
 +				    "Truncated ZIP file data");
 +				return (ARCHIVE_FATAL);
 +			}
 +			p = buff;
 +			while (p <= buff + bytes_avail - 16) {
 +				if (p[3] == 'P') { p += 3; }
 +				else if (p[3] == 'K') { p += 2; }
 +				else if (p[3] == '\007') { p += 1; }
 +				else if (p[3] == '\010' && p[2] == '\007'
 +				    && p[1] == 'K' && p[0] == 'P') {
 +					if (zip->entry->flags & LA_USED_ZIP64)
- 						__archive_read_consume(a, p - buff + 24);
++						__archive_read_consume(a,
++						    p - buff + 24);
 +					else
- 						__archive_read_consume(a, p - buff + 16);
++						__archive_read_consume(a,
++						    p - buff + 16);
 +					return ARCHIVE_OK;
 +				} else { p += 4; }
 +			}
 +			__archive_read_consume(a, p - buff);
 +		}
 +	}
 +}
 +
 +int
 +archive_read_support_format_zip_streamable(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct zip *zip;
 +	int r;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_format_zip");
 +
- 	zip = (struct zip *)malloc(sizeof(*zip));
++	zip = (struct zip *)calloc(1, sizeof(*zip));
 +	if (zip == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate zip data");
 +		return (ARCHIVE_FATAL);
 +	}
- 	memset(zip, 0, sizeof(*zip));
 +
 +	/* Streamable reader doesn't support mac extensions. */
 +	zip->process_mac_extensions = 0;
 +
 +	/*
 +	 * Until enough data has been read, we cannot tell about
 +	 * any encrypted entries yet.
 +	 */
 +	zip->has_encrypted_entries = ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
 +	zip->crc32func = real_crc32;
 +
 +	r = __archive_read_register_format(a,
 +	    zip,
 +	    "zip",
 +	    archive_read_format_zip_streamable_bid,
 +	    archive_read_format_zip_options,
 +	    archive_read_format_zip_streamable_read_header,
 +	    archive_read_format_zip_read_data,
 +	    archive_read_format_zip_read_data_skip_streamable,
 +	    NULL,
 +	    archive_read_format_zip_cleanup,
 +	    archive_read_support_format_zip_capabilities_streamable,
 +	    archive_read_format_zip_has_encrypted_entries);
 +
 +	if (r != ARCHIVE_OK)
 +		free(zip);
 +	return (ARCHIVE_OK);
 +}
 +
 +/* ------------------------------------------------------------------------ */
 +
 +/*
 + * Seeking-mode support
 + */
 +
 +static int
 +archive_read_support_format_zip_capabilities_seekable(struct archive_read * a)
 +{
 +	(void)a; /* UNUSED */
- 	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA | ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
++	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA |
++		ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
 +}
 +
 +/*
 + * TODO: This is a performance sink because it forces the read core to
 + * drop buffered data from the start of file, which will then have to
 + * be re-read again if this bidder loses.
 + *
 + * We workaround this a little by passing in the best bid so far so
 + * that later bidders can do nothing if they know they'll never
 + * outbid.  But we can certainly do better...
 + */
 +static int
 +read_eocd(struct zip *zip, const char *p, int64_t current_offset)
 +{
 +	/* Sanity-check the EOCD we've found. */
 +
 +	/* This must be the first volume. */
 +	if (archive_le16dec(p + 4) != 0)
 +		return 0;
 +	/* Central directory must be on this volume. */
 +	if (archive_le16dec(p + 4) != archive_le16dec(p + 6))
 +		return 0;
 +	/* All central directory entries must be on this volume. */
 +	if (archive_le16dec(p + 10) != archive_le16dec(p + 8))
 +		return 0;
 +	/* Central directory can't extend beyond start of EOCD record. */
 +	if (archive_le32dec(p + 16) + archive_le32dec(p + 12)
 +	    > current_offset)
 +		return 0;
 +
 +	/* Save the central directory location for later use. */
 +	zip->central_directory_offset = archive_le32dec(p + 16);
 +
 +	/* This is just a tiny bit higher than the maximum
 +	   returned by the streaming Zip bidder.  This ensures
 +	   that the more accurate seeking Zip parser wins
 +	   whenever seek is available. */
 +	return 32;
 +}
 +
- static int
++/*
++ * Examine Zip64 EOCD locator:  If it's valid, store the information
++ * from it.
++ */
++static void
 +read_zip64_eocd(struct archive_read *a, struct zip *zip, const char *p)
 +{
 +	int64_t eocd64_offset;
 +	int64_t eocd64_size;
 +
 +	/* Sanity-check the locator record. */
 +
 +	/* Central dir must be on first volume. */
 +	if (archive_le32dec(p + 4) != 0)
- 		return 0;
++		return;
 +	/* Must be only a single volume. */
 +	if (archive_le32dec(p + 16) != 1)
- 		return 0;
++		return;
 +
 +	/* Find the Zip64 EOCD record. */
 +	eocd64_offset = archive_le64dec(p + 8);
 +	if (__archive_read_seek(a, eocd64_offset, SEEK_SET) < 0)
- 		return 0;
++		return;
 +	if ((p = __archive_read_ahead(a, 56, NULL)) == NULL)
- 		return 0;
++		return;
 +	/* Make sure we can read all of it. */
 +	eocd64_size = archive_le64dec(p + 4) + 12;
 +	if (eocd64_size < 56 || eocd64_size > 16384)
- 		return 0;
- 	if ((p = __archive_read_ahead(a, eocd64_size, NULL)) == NULL)
- 		return 0;
++		return;
++	if ((p = __archive_read_ahead(a, (size_t)eocd64_size, NULL)) == NULL)
++		return;
 +
 +	/* Sanity-check the EOCD64 */
 +	if (archive_le32dec(p + 16) != 0) /* Must be disk #0 */
- 		return 0;
++		return;
 +	if (archive_le32dec(p + 20) != 0) /* CD must be on disk #0 */
- 		return 0;
++		return;
 +	/* CD can't be split. */
 +	if (archive_le64dec(p + 24) != archive_le64dec(p + 32))
- 		return 0;
++		return;
 +
 +	/* Save the central directory offset for later use. */
 +	zip->central_directory_offset = archive_le64dec(p + 48);
- 
- 	return 32;
 +}
 +
 +static int
 +archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
 +{
 +	struct zip *zip = (struct zip *)a->format->data;
 +	int64_t file_size, current_offset;
 +	const char *p;
 +	int i, tail;
 +
 +	/* If someone has already bid more than 32, then avoid
 +	   trashing the look-ahead buffers with a seek. */
 +	if (best_bid > 32)
 +		return (-1);
 +
 +	file_size = __archive_read_seek(a, 0, SEEK_END);
 +	if (file_size <= 0)
 +		return 0;
 +
 +	/* Search last 16k of file for end-of-central-directory
- 	 * record (which starts with PK\005\006) or Zip64 locator
- 	 * record (which begins with PK\006\007) */
- 	tail = zipmin(1024 * 16, file_size);
++	 * record (which starts with PK\005\006) */
++	tail = (int)zipmin(1024 * 16, file_size);
 +	current_offset = __archive_read_seek(a, -tail, SEEK_END);
 +	if (current_offset < 0)
 +		return 0;
 +	if ((p = __archive_read_ahead(a, (size_t)tail, NULL)) == NULL)
 +		return 0;
- 	/* TODO: Rework this to search backwards from the end.  We
- 	 * normally expect the EOCD record to be at the very end, so
- 	 * that should be significantly faster.  Tricky part: Make
- 	 * sure we still prefer the Zip64 locator if it's present. */
- 	for (i = 0; i <= tail - 22;) {
- 		switch (p[i + 3]) {
- 		case 'P': i += 3; break;
- 		case 'K': i += 2; break;
- 		case 005: i += 1; break;
- 		case 006:
++	/* Boyer-Moore search backwards from the end, since we want
++	 * to match the last EOCD in the file (there can be more than
++	 * one if there is an uncompressed Zip archive as a member
++	 * within this Zip archive). */
++	for (i = tail - 22; i > 0;) {
++		switch (p[i]) {
++		case 'P':
 +			if (memcmp(p + i, "PK\005\006", 4) == 0) {
- 				int ret = read_eocd(zip, p + i, current_offset + i);
- 				if (ret > 0)
- 					return (ret);
- 			}
- 			i += 1; /* Look for PK\006\007 next */
- 			break;
- 		case 007:
- 			if (memcmp(p + i, "PK\006\007", 4) == 0) {
- 				int ret = read_zip64_eocd(a, zip, p + i);
- 				if (ret > 0)
++				int ret = read_eocd(zip, p + i,
++				    current_offset + i);
++				if (ret > 0) {
++					/* Zip64 EOCD locator precedes
++					 * regular EOCD if present. */
++					if (i >= 20
++					    && memcmp(p + i - 20, "PK\006\007", 4) == 0) {
++						read_zip64_eocd(a, zip, p + i - 20);
++					}
 +					return (ret);
++				}
 +			}
- 			i += 4;
++			i -= 4;
 +			break;
- 		default: i += 4; break;
++		case 'K': i -= 1; break;
++		case 005: i -= 2; break;
++		case 006: i -= 3; break;
++		default: i -= 4; break;
 +		}
 +	}
 +	return 0;
 +}
 +
 +/* The red-black trees are only used in seeking mode to manage
 + * the in-memory copy of the central directory. */
 +
 +static int
 +cmp_node(const struct archive_rb_node *n1, const struct archive_rb_node *n2)
 +{
 +	const struct zip_entry *e1 = (const struct zip_entry *)n1;
 +	const struct zip_entry *e2 = (const struct zip_entry *)n2;
 +
 +	if (e1->local_header_offset > e2->local_header_offset)
 +		return -1;
 +	if (e1->local_header_offset < e2->local_header_offset)
 +		return 1;
 +	return 0;
 +}
 +
 +static int
 +cmp_key(const struct archive_rb_node *n, const void *key)
 +{
 +	/* This function won't be called */
 +	(void)n; /* UNUSED */
 +	(void)key; /* UNUSED */
 +	return 1;
 +}
 +
 +static const struct archive_rb_tree_ops rb_ops = {
 +	&cmp_node, &cmp_key
 +};
 +
 +static int
 +rsrc_cmp_node(const struct archive_rb_node *n1,
 +    const struct archive_rb_node *n2)
 +{
 +	const struct zip_entry *e1 = (const struct zip_entry *)n1;
 +	const struct zip_entry *e2 = (const struct zip_entry *)n2;
 +
 +	return (strcmp(e2->rsrcname.s, e1->rsrcname.s));
 +}
 +
 +static int
 +rsrc_cmp_key(const struct archive_rb_node *n, const void *key)
 +{
 +	const struct zip_entry *e = (const struct zip_entry *)n;
 +	return (strcmp((const char *)key, e->rsrcname.s));
 +}
 +
 +static const struct archive_rb_tree_ops rb_rsrc_ops = {
 +	&rsrc_cmp_node, &rsrc_cmp_key
 +};
 +
 +static const char *
 +rsrc_basename(const char *name, size_t name_length)
 +{
 +	const char *s, *r;
 +
 +	r = s = name;
 +	for (;;) {
 +		s = memchr(s, '/', name_length - (s - name));
 +		if (s == NULL)
 +			break;
 +		r = ++s;
 +	}
 +	return (r);
 +}
 +
 +static void
 +expose_parent_dirs(struct zip *zip, const char *name, size_t name_length)
 +{
 +	struct archive_string str;
 +	struct zip_entry *dir;
 +	char *s;
 +
 +	archive_string_init(&str);
 +	archive_strncpy(&str, name, name_length);
 +	for (;;) {
 +		s = strrchr(str.s, '/');
 +		if (s == NULL)
 +			break;
 +		*s = '\0';
 +		/* Transfer the parent directory from zip->tree_rsrc RB
 +		 * tree to zip->tree RB tree to expose. */
 +		dir = (struct zip_entry *)
 +		    __archive_rb_tree_find_node(&zip->tree_rsrc, str.s);
 +		if (dir == NULL)
 +			break;
 +		__archive_rb_tree_remove_node(&zip->tree_rsrc, &dir->node);
 +		archive_string_free(&dir->rsrcname);
 +		__archive_rb_tree_insert_node(&zip->tree, &dir->node);
 +	}
 +	archive_string_free(&str);
 +}
 +
 +static int
 +slurp_central_directory(struct archive_read *a, struct zip *zip)
 +{
 +	ssize_t i;
 +	unsigned found;
 +	int64_t correction;
 +	ssize_t bytes_avail;
 +	const char *p;
 +
 +	/*
 +	 * Find the start of the central directory.  The end-of-CD
 +	 * record has our starting point, but there are lots of
 +	 * Zip archives which have had other data prepended to the
 +	 * file, which makes the recorded offsets all too small.
 +	 * So we search forward from the specified offset until we
 +	 * find the real start of the central directory.  Then we
 +	 * know the correction we need to apply to account for leading
 +	 * padding.
 +	 */
 +	if (__archive_read_seek(a, zip->central_directory_offset, SEEK_SET) < 0)
 +		return ARCHIVE_FATAL;
 +
 +	found = 0;
 +	while (!found) {
 +		if ((p = __archive_read_ahead(a, 20, &bytes_avail)) == NULL)
 +			return ARCHIVE_FATAL;
 +		for (found = 0, i = 0; !found && i < bytes_avail - 4;) {
 +			switch (p[i + 3]) {
 +			case 'P': i += 3; break;
 +			case 'K': i += 2; break;
 +			case 001: i += 1; break;
 +			case 002:
 +				if (memcmp(p + i, "PK\001\002", 4) == 0) {
 +					p += i;
 +					found = 1;
 +				} else
 +					i += 4;
 +				break;
 +			case 005: i += 1; break;
 +			case 006:
 +				if (memcmp(p + i, "PK\005\006", 4) == 0) {
 +					p += i;
 +					found = 1;
 +				} else if (memcmp(p + i, "PK\006\006", 4) == 0) {
 +					p += i;
 +					found = 1;
 +				} else
 +					i += 1;
 +				break;
 +			default: i += 4; break;
 +			}
 +		}
 +		__archive_read_consume(a, i);
 +	}
- 	correction = archive_filter_bytes(&a->archive, 0) - zip->central_directory_offset;
++	correction = archive_filter_bytes(&a->archive, 0)
++			- zip->central_directory_offset;
 +
 +	__archive_rb_tree_init(&zip->tree, &rb_ops);
 +	__archive_rb_tree_init(&zip->tree_rsrc, &rb_rsrc_ops);
 +
 +	zip->central_directory_entries_total = 0;
 +	while (1) {
 +		struct zip_entry *zip_entry;
 +		size_t filename_length, extra_length, comment_length;
 +		uint32_t external_attributes;
 +		const char *name, *r;
 +
 +		if ((p = __archive_read_ahead(a, 4, NULL)) == NULL)
 +			return ARCHIVE_FATAL;
 +		if (memcmp(p, "PK\006\006", 4) == 0
 +		    || memcmp(p, "PK\005\006", 4) == 0) {
 +			break;
 +		} else if (memcmp(p, "PK\001\002", 4) != 0) {
 +			archive_set_error(&a->archive,
 +			    -1, "Invalid central directory signature");
 +			return ARCHIVE_FATAL;
 +		}
 +		if ((p = __archive_read_ahead(a, 46, NULL)) == NULL)
 +			return ARCHIVE_FATAL;
 +
 +		zip_entry = calloc(1, sizeof(struct zip_entry));
 +		zip_entry->next = zip->zip_entries;
 +		zip_entry->flags |= LA_FROM_CENTRAL_DIRECTORY;
 +		zip->zip_entries = zip_entry;
 +		zip->central_directory_entries_total++;
 +
 +		/* version = p[4]; */
 +		zip_entry->system = p[5];
 +		/* version_required = archive_le16dec(p + 6); */
 +		zip_entry->zip_flags = archive_le16dec(p + 8);
- 		if (zip_entry->zip_flags & (ZIP_ENCRYPTED | ZIP_STRONG_ENCRYPTED)){
++		if (zip_entry->zip_flags
++		      & (ZIP_ENCRYPTED | ZIP_STRONG_ENCRYPTED)){
 +			zip->has_encrypted_entries = 1;
 +		}
 +		zip_entry->compression = (char)archive_le16dec(p + 10);
 +		zip_entry->mtime = zip_time(p + 12);
 +		zip_entry->crc32 = archive_le32dec(p + 16);
++		if (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
++			zip_entry->decdat = p[13];
++		else
++			zip_entry->decdat = p[19];
 +		zip_entry->compressed_size = archive_le32dec(p + 20);
 +		zip_entry->uncompressed_size = archive_le32dec(p + 24);
 +		filename_length = archive_le16dec(p + 28);
 +		extra_length = archive_le16dec(p + 30);
 +		comment_length = archive_le16dec(p + 32);
 +		/* disk_start = archive_le16dec(p + 34); */ /* Better be zero. */
 +		/* internal_attributes = archive_le16dec(p + 36); */ /* text bit */
 +		external_attributes = archive_le32dec(p + 38);
 +		zip_entry->local_header_offset =
 +		    archive_le32dec(p + 42) + correction;
 +
 +		/* If we can't guess the mode, leave it zero here;
 +		   when we read the local file header we might get
 +		   more information. */
 +		zip_entry->mode = 0;
 +		if (zip_entry->system == 3) {
 +			zip_entry->mode = external_attributes >> 16;
 +		}
 +
 +		/* We're done with the regular data; get the filename and
 +		 * extra data. */
 +		__archive_read_consume(a, 46);
- 		if ((p = __archive_read_ahead(a, filename_length + extra_length, NULL))
- 		    == NULL) {
- 			archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
++		p = __archive_read_ahead(a, filename_length + extra_length,
++			NULL);
++		if (p == NULL) {
++			archive_set_error(&a->archive,
++			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated ZIP file header");
 +			return ARCHIVE_FATAL;
 +		}
 +		process_extra(p + filename_length, extra_length, zip_entry);
 +
 +		/*
 +		 * Mac resource fork files are stored under the
 +		 * "__MACOSX/" directory, so we should check if
 +		 * it is.
 +		 */
 +		if (!zip->process_mac_extensions) {
 +			/* Treat every entry as a regular entry. */
 +			__archive_rb_tree_insert_node(&zip->tree,
 +			    &zip_entry->node);
 +		} else {
 +			name = p;
 +			r = rsrc_basename(name, filename_length);
 +			if (filename_length >= 9 &&
 +			    strncmp("__MACOSX/", name, 9) == 0) {
 +				/* If this file is not a resource fork nor
 +				 * a directory. We should treat it as a non
 +				 * resource fork file to expose it. */
 +				if (name[filename_length-1] != '/' &&
 +				    (r - name < 3 || r[0] != '.' || r[1] != '_')) {
- 					__archive_rb_tree_insert_node(&zip->tree,
- 					    &zip_entry->node);
++					__archive_rb_tree_insert_node(
++					    &zip->tree, &zip_entry->node);
 +					/* Expose its parent directories. */
- 					expose_parent_dirs(zip, name, filename_length);
++					expose_parent_dirs(zip, name,
++					    filename_length);
 +				} else {
 +					/* This file is a resource fork file or
 +					 * a directory. */
- 					archive_strncpy(&(zip_entry->rsrcname), name,
- 					    filename_length);
- 					__archive_rb_tree_insert_node(&zip->tree_rsrc,
- 					    &zip_entry->node);
++					archive_strncpy(&(zip_entry->rsrcname),
++					     name, filename_length);
++					__archive_rb_tree_insert_node(
++					    &zip->tree_rsrc, &zip_entry->node);
 +				}
 +			} else {
- 				/* Generate resource fork name to find its resource
- 				 * file at zip->tree_rsrc. */
- 				archive_strcpy(&(zip_entry->rsrcname), "__MACOSX/");
- 				archive_strncat(&(zip_entry->rsrcname), name, r - name);
++				/* Generate resource fork name to find its
++				 * resource file at zip->tree_rsrc. */
++				archive_strcpy(&(zip_entry->rsrcname),
++				    "__MACOSX/");
++				archive_strncat(&(zip_entry->rsrcname),
++				    name, r - name);
 +				archive_strcat(&(zip_entry->rsrcname), "._");
 +				archive_strncat(&(zip_entry->rsrcname),
- 				    name + (r - name), filename_length - (r - name));
++				    name + (r - name),
++				    filename_length - (r - name));
 +				/* Register an entry to RB tree to sort it by
 +				 * file offset. */
 +				__archive_rb_tree_insert_node(&zip->tree,
 +				    &zip_entry->node);
 +			}
 +		}
 +
 +		/* Skip the comment too ... */
 +		__archive_read_consume(a,
 +		    filename_length + extra_length + comment_length);
 +	}
 +
 +	return ARCHIVE_OK;
 +}
 +
 +static ssize_t
 +zip_get_local_file_header_size(struct archive_read *a, size_t extra)
 +{
 +	const char *p;
 +	ssize_t filename_length, extra_length;
 +
 +	if ((p = __archive_read_ahead(a, extra + 30, NULL)) == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Truncated ZIP file header");
 +		return (ARCHIVE_WARN);
 +	}
 +	p += extra;
 +
 +	if (memcmp(p, "PK\003\004", 4) != 0) {
 +		archive_set_error(&a->archive, -1, "Damaged Zip archive");
 +		return ARCHIVE_WARN;
 +	}
 +	filename_length = archive_le16dec(p + 26);
 +	extra_length = archive_le16dec(p + 28);
 +
 +	return (30 + filename_length + extra_length);
 +}
 +
 +static int
 +zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry,
 +    struct zip_entry *rsrc)
 +{
 +	struct zip *zip = (struct zip *)a->format->data;
 +	unsigned char *metadata, *mp;
 +	int64_t offset = archive_filter_bytes(&a->archive, 0);
 +	size_t remaining_bytes, metadata_bytes;
 +	ssize_t hsize;
 +	int ret = ARCHIVE_OK, eof;
 +
 +	switch(rsrc->compression) {
 +	case 0:  /* No compression. */
 +#ifdef HAVE_ZLIB_H
 +	case 8: /* Deflate compression. */
 +#endif
 +		break;
 +	default: /* Unsupported compression. */
 +		/* Return a warning. */
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Unsupported ZIP compression method (%s)",
 +		    compression_name(rsrc->compression));
 +		/* We can't decompress this entry, but we will
 +		 * be able to skip() it and try the next entry. */
 +		return (ARCHIVE_WARN);
 +	}
 +
 +	if (rsrc->uncompressed_size > (4 * 1024 * 1024)) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Mac metadata is too large: %jd > 4M bytes",
 +		    (intmax_t)rsrc->uncompressed_size);
 +		return (ARCHIVE_WARN);
 +	}
 +
 +	metadata = malloc((size_t)rsrc->uncompressed_size);
 +	if (metadata == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory for Mac metadata");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	if (offset < rsrc->local_header_offset)
 +		__archive_read_consume(a, rsrc->local_header_offset - offset);
 +	else if (offset != rsrc->local_header_offset) {
 +		__archive_read_seek(a, rsrc->local_header_offset, SEEK_SET);
 +	}
 +
 +	hsize = zip_get_local_file_header_size(a, 0);
 +	__archive_read_consume(a, hsize);
 +
 +	remaining_bytes = (size_t)rsrc->compressed_size;
 +	metadata_bytes = (size_t)rsrc->uncompressed_size;
 +	mp = metadata;
 +	eof = 0;
 +	while (!eof && remaining_bytes) {
 +		const unsigned char *p;
 +		ssize_t bytes_avail;
 +		size_t bytes_used;
 +
 +		p = __archive_read_ahead(a, 1, &bytes_avail);
 +		if (p == NULL) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Truncated ZIP file header");
 +			ret = ARCHIVE_WARN;
 +			goto exit_mac_metadata;
 +		}
 +		if ((size_t)bytes_avail > remaining_bytes)
 +			bytes_avail = remaining_bytes;
 +		switch(rsrc->compression) {
 +		case 0:  /* No compression. */
 +			memcpy(mp, p, bytes_avail);
 +			bytes_used = (size_t)bytes_avail;
 +			metadata_bytes -= bytes_used;
 +			mp += bytes_used;
 +			if (metadata_bytes == 0)
 +				eof = 1;
 +			break;
 +#ifdef HAVE_ZLIB_H
 +		case 8: /* Deflate compression. */
 +		{
 +			int r;
 +
 +			ret = zip_deflate_init(a, zip);
 +			if (ret != ARCHIVE_OK)
 +				goto exit_mac_metadata;
 +			zip->stream.next_in =
 +			    (Bytef *)(uintptr_t)(const void *)p;
 +			zip->stream.avail_in = (uInt)bytes_avail;
 +			zip->stream.total_in = 0;
 +			zip->stream.next_out = mp;
 +			zip->stream.avail_out = (uInt)metadata_bytes;
 +			zip->stream.total_out = 0;
 +
 +			r = inflate(&zip->stream, 0);
 +			switch (r) {
 +			case Z_OK:
 +				break;
 +			case Z_STREAM_END:
 +				eof = 1;
 +				break;
 +			case Z_MEM_ERROR:
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Out of memory for ZIP decompression");
 +				ret = ARCHIVE_FATAL;
 +				goto exit_mac_metadata;
 +			default:
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "ZIP decompression failed (%d)", r);
 +				ret = ARCHIVE_FATAL;
 +				goto exit_mac_metadata;
 +			}
 +			bytes_used = zip->stream.total_in;
 +			metadata_bytes -= zip->stream.total_out;
 +			mp += zip->stream.total_out;
 +			break;
 +		}
 +#endif
 +		default:
 +			bytes_used = 0;
 +			break;
 +		}
 +		__archive_read_consume(a, bytes_used);
 +		remaining_bytes -= bytes_used;
 +	}
 +	archive_entry_copy_mac_metadata(entry, metadata,
 +	    (size_t)rsrc->uncompressed_size - metadata_bytes);
 +
 +exit_mac_metadata:
 +	__archive_read_seek(a, offset, SEEK_SET);
 +	zip->decompress_init = 0;
 +	free(metadata);
 +	return (ret);
 +}
 +
 +static int
 +archive_read_format_zip_seekable_read_header(struct archive_read *a,
 +	struct archive_entry *entry)
 +{
 +	struct zip *zip = (struct zip *)a->format->data;
 +	struct zip_entry *rsrc;
 +	int64_t offset;
 +	int r, ret = ARCHIVE_OK;
 +
 +	/*
 +	 * It should be sufficient to call archive_read_next_header() for
 +	 * a reader to determine if an entry is encrypted or not. If the
 +	 * encryption of an entry is only detectable when calling
 +	 * archive_read_data(), so be it. We'll do the same check there
 +	 * as well.
 +	 */
- 	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
++	if (zip->has_encrypted_entries ==
++			ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW)
 +		zip->has_encrypted_entries = 0;
- 	}
 +
 +	a->archive.archive_format = ARCHIVE_FORMAT_ZIP;
 +	if (a->archive.archive_format_name == NULL)
 +		a->archive.archive_format_name = "ZIP";
 +
 +	if (zip->zip_entries == NULL) {
 +		r = slurp_central_directory(a, zip);
 +		if (r != ARCHIVE_OK)
 +			return r;
 +		/* Get first entry whose local header offset is lower than
 +		 * other entries in the archive file. */
 +		zip->entry =
 +		    (struct zip_entry *)ARCHIVE_RB_TREE_MIN(&zip->tree);
 +	} else if (zip->entry != NULL) {
 +		/* Get next entry in local header offset order. */
 +		zip->entry = (struct zip_entry *)__archive_rb_tree_iterate(
 +		    &zip->tree, &zip->entry->node, ARCHIVE_RB_DIR_RIGHT);
 +	}
 +
 +	if (zip->entry == NULL)
 +		return ARCHIVE_EOF;
 +
 +	if (zip->entry->rsrcname.s)
 +		rsrc = (struct zip_entry *)__archive_rb_tree_find_node(
 +		    &zip->tree_rsrc, zip->entry->rsrcname.s);
 +	else
 +		rsrc = NULL;
 +
++	if (zip->cctx_valid)
++		archive_decrypto_aes_ctr_release(&zip->cctx);
++	if (zip->hctx_valid)
++		archive_hmac_sha1_cleanup(&zip->hctx);
++	zip->tctx_valid = zip->cctx_valid = zip->hctx_valid = 0;
++	__archive_read_reset_passphrase(a);
++
 +	/* File entries are sorted by the header offset, we should mostly
 +	 * use __archive_read_consume to advance a read point to avoid redundant
 +	 * data reading.  */
 +	offset = archive_filter_bytes(&a->archive, 0);
 +	if (offset < zip->entry->local_header_offset)
 +		__archive_read_consume(a,
 +		    zip->entry->local_header_offset - offset);
 +	else if (offset != zip->entry->local_header_offset) {
- 		__archive_read_seek(a, zip->entry->local_header_offset, SEEK_SET);
++		__archive_read_seek(a, zip->entry->local_header_offset,
++		    SEEK_SET);
 +	}
 +	zip->unconsumed = 0;
 +	r = zip_read_local_file_header(a, entry, zip);
 +	if (r != ARCHIVE_OK)
 +		return r;
 +	if (rsrc) {
 +		int ret2 = zip_read_mac_metadata(a, entry, rsrc);
 +		if (ret2 < ret)
 +			ret = ret2;
 +	}
 +	return (ret);
 +}
 +
 +/*
 + * We're going to seek for the next header anyway, so we don't
 + * need to bother doing anything here.
 + */
 +static int
 +archive_read_format_zip_read_data_skip_seekable(struct archive_read *a)
 +{
 +	struct zip *zip;
 +	zip = (struct zip *)(a->format->data);
 +
 +	zip->unconsumed = 0;
 +	return (ARCHIVE_OK);
 +}
 +
 +int
 +archive_read_support_format_zip_seekable(struct archive *_a)
 +{
 +	struct archive_read *a = (struct archive_read *)_a;
 +	struct zip *zip;
 +	int r;
 +
 +	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_read_support_format_zip_seekable");
 +
- 	zip = (struct zip *)malloc(sizeof(*zip));
++	zip = (struct zip *)calloc(1, sizeof(*zip));
 +	if (zip == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate zip data");
 +		return (ARCHIVE_FATAL);
 +	}
- 	memset(zip, 0, sizeof(*zip));
 +
 +#ifdef HAVE_COPYFILE_H
 +	/* Set this by default on Mac OS. */
 +	zip->process_mac_extensions = 1;
 +#endif
 +
 +	/*
 +	 * Until enough data has been read, we cannot tell about
 +	 * any encrypted entries yet.
 +	 */
 +	zip->has_encrypted_entries = ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
 +	zip->crc32func = real_crc32;
 +
 +	r = __archive_read_register_format(a,
 +	    zip,
 +	    "zip",
 +	    archive_read_format_zip_seekable_bid,
 +	    archive_read_format_zip_options,
 +	    archive_read_format_zip_seekable_read_header,
 +	    archive_read_format_zip_read_data,
 +	    archive_read_format_zip_read_data_skip_seekable,
 +	    NULL,
 +	    archive_read_format_zip_cleanup,
 +	    archive_read_support_format_zip_capabilities_seekable,
 +	    archive_read_format_zip_has_encrypted_entries);
 +
 +	if (r != ARCHIVE_OK)
 +		free(zip);
 +	return (ARCHIVE_OK);
 +}
diff --cc Utilities/cmlibarchive/libarchive/archive_util.c
index d136498,0000000..5f31edf
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_util.c
+++ b/Utilities/cmlibarchive/libarchive/archive_util.c
@@@ -1,612 -1,0 +1,621 @@@
 +/*-
-  * Copyright (c) 2009-2012 Michihiro NAKAJIMA
++ * Copyright (c) 2009-2012,2014 Michihiro NAKAJIMA
 + * Copyright (c) 2003-2007 Tim Kientzle
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD: head/lib/libarchive/archive_util.c 201098 2009-12-28 02:58:14Z kientzle $");
 +
 +#ifdef HAVE_SYS_TYPES_H
 +#include <sys/types.h>
 +#endif
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_FCNTL_H
 +#include <fcntl.h>
 +#endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_STRING_H
 +#include <string.h>
 +#endif
 +#if defined(HAVE_WINCRYPT_H) && !defined(__CYGWIN__)
 +#include <wincrypt.h>
 +#endif
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h>
 +#endif
 +#ifdef HAVE_LZMA_H
 +#include <cm_lzma.h>
 +#endif
 +#ifdef HAVE_BZLIB_H
 +#include <cm_bzlib.h>
 +#endif
++#ifdef HAVE_LZ4_H
++#include <lz4.h>
++#endif
 +
 +#include "archive.h"
 +#include "archive_private.h"
++#include "archive_random_private.h"
 +#include "archive_string.h"
 +
 +#ifndef O_CLOEXEC
 +#define O_CLOEXEC	0
 +#endif
 +
 +static int archive_utility_string_sort_helper(char **, unsigned int);
 +
 +/* Generic initialization of 'struct archive' objects. */
 +int
 +__archive_clean(struct archive *a)
 +{
 +	archive_string_conversion_free(a);
 +	return (ARCHIVE_OK);
 +}
 +
 +int
 +archive_version_number(void)
 +{
 +	return (ARCHIVE_VERSION_NUMBER);
 +}
 +
 +const char *
 +archive_version_string(void)
 +{
 +	return (ARCHIVE_VERSION_STRING);
 +}
 +
 +const char *
 +archive_version_details(void)
 +{
 +	static struct archive_string str;
 +	static int init = 0;
 +
 +	if (!init) {
 +		archive_string_init(&str);
 +
 +		archive_strcat(&str, ARCHIVE_VERSION_STRING);
 +#ifdef HAVE_ZLIB_H
 +		archive_strcat(&str, " zlib/");
 +		archive_strcat(&str, ZLIB_VERSION);
 +#endif
 +#ifdef HAVE_LZMA_H
 +		archive_strcat(&str, " liblzma/");
 +		archive_strcat(&str, LZMA_VERSION_STRING);
 +#endif
 +#ifdef HAVE_BZLIB_H
 +		{
 +			const char *p = BZ2_bzlibVersion();
 +			const char *sep = strchr(p, ',');
 +			if (sep == NULL)
 +				sep = p + strlen(p);
 +			archive_strcat(&str, " bz2lib/");
 +			archive_strncat(&str, p, sep - p);
 +		}
 +#endif
- 	    }
++#if defined(HAVE_LZ4_H) && defined(HAVE_LIBLZ4)
++		archive_string_sprintf(&str, " liblz4/%d.%d.%d",
++		    LZ4_VERSION_MAJOR, LZ4_VERSION_MINOR, LZ4_VERSION_RELEASE);
++#endif
++	}
 +	return str.s;
 +}
 +
 +int
 +archive_errno(struct archive *a)
 +{
 +	return (a->archive_error_number);
 +}
 +
 +const char *
 +archive_error_string(struct archive *a)
 +{
 +
 +	if (a->error != NULL  &&  *a->error != '\0')
 +		return (a->error);
 +	else
 +		return (NULL);
 +}
 +
 +int
 +archive_file_count(struct archive *a)
 +{
 +	return (a->file_count);
 +}
 +
 +int
 +archive_format(struct archive *a)
 +{
 +	return (a->archive_format);
 +}
 +
 +const char *
 +archive_format_name(struct archive *a)
 +{
 +	return (a->archive_format_name);
 +}
 +
 +
 +int
 +archive_compression(struct archive *a)
 +{
 +	return archive_filter_code(a, 0);
 +}
 +
 +const char *
 +archive_compression_name(struct archive *a)
 +{
 +	return archive_filter_name(a, 0);
 +}
 +
 +
 +/*
 + * Return a count of the number of compressed bytes processed.
 + */
 +int64_t
 +archive_position_compressed(struct archive *a)
 +{
 +	return archive_filter_bytes(a, -1);
 +}
 +
 +/*
 + * Return a count of the number of uncompressed bytes processed.
 + */
 +int64_t
 +archive_position_uncompressed(struct archive *a)
 +{
 +	return archive_filter_bytes(a, 0);
 +}
 +
 +void
 +archive_clear_error(struct archive *a)
 +{
 +	archive_string_empty(&a->error_string);
 +	a->error = NULL;
 +	a->archive_error_number = 0;
 +}
 +
 +void
 +archive_set_error(struct archive *a, int error_number, const char *fmt, ...)
 +{
 +	va_list ap;
 +
 +	a->archive_error_number = error_number;
 +	if (fmt == NULL) {
 +		a->error = NULL;
 +		return;
 +	}
 +
 +	archive_string_empty(&(a->error_string));
 +	va_start(ap, fmt);
 +	archive_string_vsprintf(&(a->error_string), fmt, ap);
 +	va_end(ap);
 +	a->error = a->error_string.s;
 +}
 +
 +void
 +archive_copy_error(struct archive *dest, struct archive *src)
 +{
 +	dest->archive_error_number = src->archive_error_number;
 +
 +	archive_string_copy(&dest->error_string, &src->error_string);
 +	dest->error = dest->error_string.s;
 +}
 +
 +void
 +__archive_errx(int retvalue, const char *msg)
 +{
 +	static const char *msg1 = "Fatal Internal Error in libarchive: ";
 +	size_t s;
 +
 +	s = write(2, msg1, strlen(msg1));
 +	(void)s; /* UNUSED */
 +	s = write(2, msg, strlen(msg));
 +	(void)s; /* UNUSED */
 +	s = write(2, "\n", 1);
 +	(void)s; /* UNUSED */
 +	exit(retvalue);
 +}
 +
 +/*
 + * Create a temporary file
 + */
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +
 +/*
 + * Do not use Windows tmpfile() function.
 + * It will make a temporary file under the root directory
 + * and it'll cause permission error if a user who is
 + * non-Administrator creates temporary files.
 + * Also Windows version of mktemp family including _mktemp_s
 + * are not secure.
 + */
 +int
 +__archive_mktemp(const char *tmpdir)
 +{
 +	static const wchar_t *prefix = L"libarchive_";
 +	static const wchar_t *suffix = L"XXXXXXXXXX";
 +	static const wchar_t num[] = {
 +		L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7',
 +		L'8', L'9', L'A', L'B', L'C', L'D', L'E', L'F',
 +		L'G', L'H', L'I', L'J', L'K', L'L', L'M', L'N',
 +		L'O', L'P', L'Q', L'R', L'S', L'T', L'U', L'V',
 +		L'W', L'X', L'Y', L'Z', L'a', L'b', L'c', L'd',
 +		L'e', L'f', L'g', L'h', L'i', L'j', L'k', L'l',
 +		L'm', L'n', L'o', L'p', L'q', L'r', L's', L't',
 +		L'u', L'v', L'w', L'x', L'y', L'z'
 +	};
 +	HCRYPTPROV hProv;
 +	struct archive_wstring temp_name;
 +	wchar_t *ws;
 +	DWORD attr;
 +	wchar_t *xp, *ep;
 +	int fd;
 +
 +	hProv = (HCRYPTPROV)NULL;
 +	fd = -1;
 +	ws = NULL;
 +	archive_string_init(&temp_name);
 +
 +	/* Get a temporary directory. */
 +	if (tmpdir == NULL) {
 +		size_t l;
 +		wchar_t *tmp;
 +
 +		l = GetTempPathW(0, NULL);
 +		if (l == 0) {
 +			la_dosmaperr(GetLastError());
 +			goto exit_tmpfile;
 +		}
 +		tmp = malloc(l*sizeof(wchar_t));
 +		if (tmp == NULL) {
 +			errno = ENOMEM;
 +			goto exit_tmpfile;
 +		}
 +		GetTempPathW((DWORD)l, tmp);
 +		archive_wstrcpy(&temp_name, tmp);
 +		free(tmp);
 +	} else {
 +		if (archive_wstring_append_from_mbs(&temp_name, tmpdir,
 +		    strlen(tmpdir)) < 0)
 +			goto exit_tmpfile;
 +		if (temp_name.s[temp_name.length-1] != L'/')
 +			archive_wstrappend_wchar(&temp_name, L'/');
 +	}
 +
 +	/* Check if temp_name is a directory. */
 +	attr = GetFileAttributesW(temp_name.s);
 +	if (attr == (DWORD)-1) {
 +		if (GetLastError() != ERROR_FILE_NOT_FOUND) {
 +			la_dosmaperr(GetLastError());
 +			goto exit_tmpfile;
 +		}
 +		ws = __la_win_permissive_name_w(temp_name.s);
 +		if (ws == NULL) {
 +			errno = EINVAL;
 +			goto exit_tmpfile;
 +		}
 +		attr = GetFileAttributesW(ws);
 +		if (attr == (DWORD)-1) {
 +			la_dosmaperr(GetLastError());
 +			goto exit_tmpfile;
 +		}
 +	}
 +	if (!(attr & FILE_ATTRIBUTE_DIRECTORY)) {
 +		errno = ENOTDIR;
 +		goto exit_tmpfile;
 +	}
 +
 +	/*
 +	 * Create a temporary file.
 +	 */
 +	archive_wstrcat(&temp_name, prefix);
 +	archive_wstrcat(&temp_name, suffix);
 +	ep = temp_name.s + archive_strlen(&temp_name);
 +	xp = ep - wcslen(suffix);
 +
 +	if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
 +		CRYPT_VERIFYCONTEXT)) {
 +		la_dosmaperr(GetLastError());
 +		goto exit_tmpfile;
 +	}
 +
 +	for (;;) {
 +		wchar_t *p;
 +		HANDLE h;
 +
 +		/* Generate a random file name through CryptGenRandom(). */
 +		p = xp;
 +		if (!CryptGenRandom(hProv, (DWORD)(ep - p)*sizeof(wchar_t),
 +		    (BYTE*)p)) {
 +			la_dosmaperr(GetLastError());
 +			goto exit_tmpfile;
 +		}
 +		for (; p < ep; p++)
 +			*p = num[((DWORD)*p) % (sizeof(num)/sizeof(num[0]))];
 +
 +		free(ws);
 +		ws = __la_win_permissive_name_w(temp_name.s);
 +		if (ws == NULL) {
 +			errno = EINVAL;
 +			goto exit_tmpfile;
 +		}
 +		/* Specifies FILE_FLAG_DELETE_ON_CLOSE flag is to
 +		 * delete this temporary file immediately when this
 +		 * file closed. */
 +		h = CreateFileW(ws,
 +		    GENERIC_READ | GENERIC_WRITE | DELETE,
 +		    0,/* Not share */
 +		    NULL,
 +		    CREATE_NEW,/* Create a new file only */
 +		    FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE,
 +		    NULL);
 +		if (h == INVALID_HANDLE_VALUE) {
 +			/* The same file already exists. retry with
 +			 * a new filename. */
 +			if (GetLastError() == ERROR_FILE_EXISTS)
 +				continue;
 +			/* Otherwise, fail creation temporary file. */
 +			la_dosmaperr(GetLastError());
 +			goto exit_tmpfile;
 +		}
 +		fd = _open_osfhandle((intptr_t)h, _O_BINARY | _O_RDWR);
 +		if (fd == -1) {
 +			CloseHandle(h);
 +			goto exit_tmpfile;
 +		} else
 +			break;/* success! */
 +	}
 +exit_tmpfile:
 +	if (hProv != (HCRYPTPROV)NULL)
 +		CryptReleaseContext(hProv, 0);
 +	free(ws);
 +	archive_wstring_free(&temp_name);
 +	return (fd);
 +}
 +
 +#else
 +
 +static int
 +get_tempdir(struct archive_string *temppath)
 +{
 +	const char *tmp;
 +
 +	tmp = getenv("TMPDIR");
 +	if (tmp == NULL)
 +#ifdef _PATH_TMP
 +		tmp = _PATH_TMP;
 +#else
 +                tmp = "/tmp";
 +#endif
 +	archive_strcpy(temppath, tmp);
 +	if (temppath->s[temppath->length-1] != '/')
 +		archive_strappend_char(temppath, '/');
 +	return (ARCHIVE_OK);
 +}
 +
 +#if defined(HAVE_MKSTEMP)
 +
 +/*
 + * We can use mkstemp().
 + */
 +
 +int
 +__archive_mktemp(const char *tmpdir)
 +{
 +	struct archive_string temp_name;
 +	int fd = -1;
 +
 +	archive_string_init(&temp_name);
 +	if (tmpdir == NULL) {
 +		if (get_tempdir(&temp_name) != ARCHIVE_OK)
 +			goto exit_tmpfile;
 +	} else {
 +		archive_strcpy(&temp_name, tmpdir);
 +		if (temp_name.s[temp_name.length-1] != '/')
 +			archive_strappend_char(&temp_name, '/');
 +	}
 +	archive_strcat(&temp_name, "libarchive_XXXXXX");
 +	fd = mkstemp(temp_name.s);
 +	if (fd < 0)
 +		goto exit_tmpfile;
 +	__archive_ensure_cloexec_flag(fd);
 +	unlink(temp_name.s);
 +exit_tmpfile:
 +	archive_string_free(&temp_name);
 +	return (fd);
 +}
 +
 +#else
 +
 +/*
 + * We use a private routine.
 + */
 +
 +int
 +__archive_mktemp(const char *tmpdir)
 +{
 +        static const char num[] = {
 +		'0', '1', '2', '3', '4', '5', '6', '7',
 +		'8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
 +		'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
 +		'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
 +		'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
 +		'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
 +		'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
 +		'u', 'v', 'w', 'x', 'y', 'z'
 +        };
 +	struct archive_string temp_name;
 +	struct stat st;
 +	int fd;
 +	char *tp, *ep;
- 	unsigned seed;
 +
 +	fd = -1;
 +	archive_string_init(&temp_name);
 +	if (tmpdir == NULL) {
 +		if (get_tempdir(&temp_name) != ARCHIVE_OK)
 +			goto exit_tmpfile;
 +	} else
 +		archive_strcpy(&temp_name, tmpdir);
 +	if (temp_name.s[temp_name.length-1] == '/') {
 +		temp_name.s[temp_name.length-1] = '\0';
 +		temp_name.length --;
 +	}
 +	if (stat(temp_name.s, &st) < 0)
 +		goto exit_tmpfile;
 +	if (!S_ISDIR(st.st_mode)) {
 +		errno = ENOTDIR;
 +		goto exit_tmpfile;
 +	}
 +	archive_strcat(&temp_name, "/libarchive_");
 +	tp = temp_name.s + archive_strlen(&temp_name);
 +	archive_strcat(&temp_name, "XXXXXXXXXX");
 +	ep = temp_name.s + archive_strlen(&temp_name);
 +
- 	fd = open("/dev/random", O_RDONLY | O_CLOEXEC);
- 	__archive_ensure_cloexec_flag(fd);
- 	if (fd < 0)
- 		seed = time(NULL);
- 	else {
- 		if (read(fd, &seed, sizeof(seed)) < 0)
- 			seed = time(NULL);
- 		close(fd);
- 	}
 +	do {
 +		char *p;
 +
 +		p = tp;
- 		while (p < ep)
- 			*p++ = num[((unsigned)rand_r(&seed)) % sizeof(num)];
++		archive_random(p, ep - p);
++		while (p < ep) {
++			int d = *((unsigned char *)p) % sizeof(num);
++			*p++ = num[d];
++		}
 +		fd = open(temp_name.s, O_CREAT | O_EXCL | O_RDWR | O_CLOEXEC,
 +			  0600);
 +	} while (fd < 0 && errno == EEXIST);
 +	if (fd < 0)
 +		goto exit_tmpfile;
 +	__archive_ensure_cloexec_flag(fd);
 +	unlink(temp_name.s);
 +exit_tmpfile:
 +	archive_string_free(&temp_name);
 +	return (fd);
 +}
 +
 +#endif /* HAVE_MKSTEMP */
 +#endif /* !_WIN32 || __CYGWIN__ */
 +
 +/*
 + * Set FD_CLOEXEC flag to a file descriptor if it is not set.
 + * We have to set the flag if the platform does not provide O_CLOEXEC
 + * or F_DUPFD_CLOEXEC flags.
 + *
 + * Note: This function is absolutely called after creating a new file
 + * descriptor even if the platform seemingly provides O_CLOEXEC or
 + * F_DUPFD_CLOEXEC macros because it is possible that the platform
 + * merely declares those macros, especially Linux 2.6.18 - 2.6.24 do it.
 + */
 +void
 +__archive_ensure_cloexec_flag(int fd)
 +{
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +	(void)fd; /* UNSED */
 +#else
 +	int flags;
 +
 +	if (fd >= 0) {
 +		flags = fcntl(fd, F_GETFD);
 +		if (flags != -1 && (flags & FD_CLOEXEC) == 0)
 +			fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
 +	}
 +#endif
 +}
 +
 +/*
 + * Utility function to sort a group of strings using quicksort.
 + */
 +static int
 +archive_utility_string_sort_helper(char **strings, unsigned int n)
 +{
-   unsigned int i, lesser_count, greater_count;
-   char **lesser, **greater, **tmp, *pivot;
-   int retval1, retval2;
- 
-   /* A list of 0 or 1 elements is already sorted */
-   if (n <= 1)
-     return (ARCHIVE_OK);
- 
-   lesser_count = greater_count = 0;
-   lesser = greater = NULL;
-   pivot = strings[0];
-   for (i = 1; i < n; i++)
-   {
-     if (strcmp(strings[i], pivot) < 0)
-     {
-       lesser_count++;
-       tmp = (char **)realloc(lesser, lesser_count * sizeof(char *));
-       if (!tmp)
-         return (ARCHIVE_FATAL);
-       lesser = tmp;
-       lesser[lesser_count - 1] = strings[i];
-     }
-     else
-     {
-       greater_count++;
-       tmp = (char **)realloc(greater, greater_count * sizeof(char *));
-       if (!tmp)
-         return (ARCHIVE_FATAL);
-       greater = tmp;
-       greater[greater_count - 1] = strings[i];
-     }
-   }
- 
-   /* quicksort(lesser) */
-   retval1 = archive_utility_string_sort_helper(lesser, lesser_count);
-   for (i = 0; i < lesser_count; i++)
-     strings[i] = lesser[i];
-   free(lesser);
- 
-   /* pivot */
-   strings[lesser_count] = pivot;
- 
-   /* quicksort(greater) */
-   retval2 = archive_utility_string_sort_helper(greater, greater_count);
-   for (i = 0; i < greater_count; i++)
-     strings[lesser_count + 1 + i] = greater[i];
-   free(greater);
- 
-   return (retval1 < retval2) ? retval1 : retval2;
++	unsigned int i, lesser_count, greater_count;
++	char **lesser, **greater, **tmp, *pivot;
++	int retval1, retval2;
++
++	/* A list of 0 or 1 elements is already sorted */
++	if (n <= 1)
++		return (ARCHIVE_OK);
++
++	lesser_count = greater_count = 0;
++	lesser = greater = NULL;
++	pivot = strings[0];
++	for (i = 1; i < n; i++)
++	{
++		if (strcmp(strings[i], pivot) < 0)
++		{
++			lesser_count++;
++			tmp = (char **)realloc(lesser,
++				lesser_count * sizeof(char *));
++			if (!tmp) {
++				free(greater);
++				free(lesser);
++				return (ARCHIVE_FATAL);
++			}
++			lesser = tmp;
++			lesser[lesser_count - 1] = strings[i];
++		}
++		else
++		{
++			greater_count++;
++			tmp = (char **)realloc(greater,
++				greater_count * sizeof(char *));
++			if (!tmp) {
++				free(greater);
++				free(lesser);
++				return (ARCHIVE_FATAL);
++			}
++			greater = tmp;
++			greater[greater_count - 1] = strings[i];
++		}
++	}
++
++	/* quicksort(lesser) */
++	retval1 = archive_utility_string_sort_helper(lesser, lesser_count);
++	for (i = 0; i < lesser_count; i++)
++		strings[i] = lesser[i];
++	free(lesser);
++
++	/* pivot */
++	strings[lesser_count] = pivot;
++
++	/* quicksort(greater) */
++	retval2 = archive_utility_string_sort_helper(greater, greater_count);
++	for (i = 0; i < greater_count; i++)
++		strings[lesser_count + 1 + i] = greater[i];
++	free(greater);
++
++	return (retval1 < retval2) ? retval1 : retval2;
 +}
 +
 +int
 +archive_utility_string_sort(char **strings)
 +{
-   unsigned int size = 0;
-   while (strings[size] != NULL)
-     size++;
-   return archive_utility_string_sort_helper(strings, size);
++	  unsigned int size = 0;
++	  while (strings[size] != NULL)
++		size++;
++	  return archive_utility_string_sort_helper(strings, size);
 +}
diff --cc Utilities/cmlibarchive/libarchive/archive_windows.h
index dc2f241,0000000..7c31a16
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_windows.h
+++ b/Utilities/cmlibarchive/libarchive/archive_windows.h
@@@ -1,318 -1,0 +1,320 @@@
 +/*-
 + * Copyright (c) 2009-2011 Michihiro NAKAJIMA
 + * Copyright (c) 2003-2006 Tim Kientzle
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer
 + *    in this position and unchanged.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + *
 + * $FreeBSD$
 + */
 +
 +#ifndef __LIBARCHIVE_BUILD
 +#error This header is only to be used internally to libarchive.
 +#endif
 +
 +/*
 + * TODO: A lot of stuff in here isn't actually used by libarchive and
 + * can be trimmed out.  Note that this file is used by libarchive and
 + * libarchive_test but nowhere else.  (But note that it gets compiled
 + * with many different Windows environments, including MinGW, Visual
 + * Studio, and Cygwin.  Significant changes should be tested in all three.)
 + */
 +
 +/*
 + * TODO: Don't use off_t in here.  Use __int64 instead.  Note that
 + * Visual Studio and the Windows SDK define off_t as 32 bits; Win32's
 + * more modern file handling APIs all use __int64 instead of off_t.
 + */
 +
 +#ifndef LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED
 +#define	LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED
 +
 +/* Start of configuration for native Win32  */
 +#ifndef MINGW_HAS_SECURE_API
 +#define MINGW_HAS_SECURE_API 1
 +#endif
 +
 +#include <errno.h>
 +#define	set_errno(val)	((errno)=val)
 +#include <io.h>
 +#include <stdlib.h>   //brings in NULL
 +#if defined(HAVE_STDINT_H)
 +#include <stdint.h>
 +#endif
 +#include <stdio.h>
 +#include <fcntl.h>
 +#include <sys/stat.h>
 +#include <process.h>
 +#include <direct.h>
 +#if defined(__MINGW32__) && defined(HAVE_UNISTD_H)
 +/* Prevent build error from a type mismatch of ftruncate().
 + * This unistd.h defines it as ftruncate(int, off_t). */
 +#include <unistd.h>
 +#endif
 +#define NOCRYPT
 +#include <windows.h>
 +//#define	EFTYPE 7
 +
 +#if defined(_MSC_VER)
 +#pragma warning(push,1)
 +#pragma warning(disable:4142)   /* benign redefinition of type */
 +#pragma warning(disable:4761)   /* integral size mismatch in argument; conversion supplied */
 +#endif
 +#if defined(__BORLANDC__)
 +#pragma warn -8068	/* Constant out of range in comparison. */
 +#pragma warn -8072	/* Suspicious pointer arithmetic. */
 +#endif
 +
 +#ifndef NULL
 +#ifdef  __cplusplus
 +#define	NULL    0
 +#else
 +#define	NULL    ((void *)0)
 +#endif
 +#endif
 +
 +/* Alias the Windows _function to the POSIX equivalent. */
 +#define	close		_close
 +#define	fcntl(fd, cmd, flg)	/* No operation. */
 +#ifndef fileno
 +#define	fileno		_fileno
 +#endif
 +#ifdef fstat
 +#undef fstat
 +#endif
 +#define	fstat		__la_fstat
 +#if !defined(__BORLANDC__)
 +#ifdef lseek
 +#undef lseek
 +#endif
 +#define	lseek		_lseeki64
 +#else
 +#define	lseek		__la_lseek
 +#define __LA_LSEEK_NEEDED
 +#endif
 +#define	lstat		__la_stat
 +#define	open		__la_open
 +#define	read		__la_read
 +#if !defined(__BORLANDC__) && !defined(__WATCOMC__)
 +#define setmode		_setmode
 +#endif
 +#ifdef stat
 +#undef stat
 +#endif
 +#define	stat(path,stref)		__la_stat(path,stref)
 +#if !defined(__WATCOMC__)
 +#if !defined(__BORLANDC__)
 +#define	strdup		_strdup
 +#endif
 +#define	tzset		_tzset
 +#if !defined(__BORLANDC__)
 +#define	umask		_umask
 +#endif
 +#endif
 +#define	waitpid		__la_waitpid
 +#define	write		__la_write
 +
 +#if !defined(__WATCOMC__)
 +
 +#ifndef O_RDONLY
 +#define	O_RDONLY	_O_RDONLY
 +#define	O_WRONLY	_O_WRONLY
 +#define	O_TRUNC		_O_TRUNC
 +#define	O_CREAT		_O_CREAT
 +#define	O_EXCL		_O_EXCL
 +#define	O_BINARY	_O_BINARY
 +#endif
 +
 +#ifndef _S_IFIFO
 +  #define	_S_IFIFO        0010000   /* pipe */
 +#endif
 +#ifndef _S_IFCHR
 +  #define	_S_IFCHR        0020000   /* character special */
 +#endif
 +#ifndef _S_IFDIR
 +  #define	_S_IFDIR        0040000   /* directory */
 +#endif
 +#ifndef _S_IFBLK
 +  #define	_S_IFBLK        0060000   /* block special */
 +#endif
 +#ifndef _S_IFLNK
 +  #define	_S_IFLNK        0120000   /* symbolic link */
 +#endif
 +#ifndef _S_IFSOCK
 +  #define	_S_IFSOCK       0140000   /* socket */
 +#endif
 +#ifndef	_S_IFREG
 +  #define	_S_IFREG        0100000   /* regular */
 +#endif
 +#ifndef	_S_IFMT
 +  #define	_S_IFMT         0170000   /* file type mask */
 +#endif
 +
 +#ifndef S_IFIFO
 +#define	S_IFIFO     _S_IFIFO
 +#endif
 +//#define	S_IFCHR  _S_IFCHR
 +//#define	S_IFDIR  _S_IFDIR
 +#ifndef S_IFBLK
 +#define	S_IFBLK     _S_IFBLK
 +#endif
 +#ifndef S_IFLNK
 +#define	S_IFLNK     _S_IFLNK
 +#endif
 +#ifndef S_IFSOCK
 +#define	S_IFSOCK    _S_IFSOCK
 +#endif
 +//#define	S_IFREG  _S_IFREG
 +//#define	S_IFMT   _S_IFMT
 +
 +#ifndef S_ISBLK
 +#define	S_ISBLK(m)	(((m) & S_IFMT) == S_IFBLK)	/* block special */
 +#define	S_ISFIFO(m)	(((m) & S_IFMT) == S_IFIFO)	/* fifo or socket */
 +#define	S_ISCHR(m)	(((m) & S_IFMT) == S_IFCHR)	/* char special */
 +#define	S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)	/* directory */
 +#define	S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)	/* regular file */
 +#endif
 +
 +#define	S_ISLNK(m)  (((m) & S_IFMT) == S_IFLNK) /* Symbolic link */
 +#define	S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) /* Socket */
 +
 +#define	_S_ISUID        0004000   /* set user id on execution */
 +#define	_S_ISGID        0002000   /* set group id on execution */
 +#define	_S_ISVTX        0001000   /* save swapped text even after use */
 +
 +#define	S_ISUID        _S_ISUID
 +#define	S_ISGID        _S_ISGID
 +#define	S_ISVTX        _S_ISVTX
 +
 +#define	_S_IRWXU	     (_S_IREAD | _S_IWRITE | _S_IEXEC)
 +#define	_S_IXUSR	     _S_IEXEC  /* read permission, user */
 +#define	_S_IWUSR	     _S_IWRITE /* write permission, user */
 +#define	_S_IRUSR	     _S_IREAD  /* execute/search permission, user */
 +#define	_S_IRWXG        (_S_IRWXU >> 3)
 +#define	_S_IXGRP        (_S_IXUSR >> 3) /* read permission, group */
 +#define	_S_IWGRP        (_S_IWUSR >> 3) /* write permission, group */
 +#define	_S_IRGRP        (_S_IRUSR >> 3) /* execute/search permission, group */
 +#define	_S_IRWXO        (_S_IRWXG >> 3)
 +#define	_S_IXOTH        (_S_IXGRP >> 3) /* read permission, other */
 +#define	_S_IWOTH        (_S_IWGRP >> 3) /* write permission, other */
 +#define	_S_IROTH        (_S_IRGRP  >> 3) /* execute/search permission, other */
 +
 +#ifndef S_IRWXU
 +#define	S_IRWXU	     _S_IRWXU
 +#define	S_IXUSR	     _S_IXUSR
 +#define	S_IWUSR	     _S_IWUSR
 +#define	S_IRUSR	     _S_IRUSR
 +#endif
 +#define	S_IRWXG        _S_IRWXG
 +#define	S_IXGRP        _S_IXGRP
 +#define	S_IWGRP        _S_IWGRP
++#ifndef S_IRGRP
 +#define	S_IRGRP        _S_IRGRP
++#endif
 +#define	S_IRWXO        _S_IRWXO
 +#define	S_IXOTH        _S_IXOTH
 +#define	S_IWOTH        _S_IWOTH
 +#define	S_IROTH        _S_IROTH
 +
 +#endif
 +
 +#define	F_DUPFD	  	0	/* Duplicate file descriptor.  */
 +#define	F_GETFD		1	/* Get file descriptor flags.  */
 +#define	F_SETFD		2	/* Set file descriptor flags.  */
 +#define	F_GETFL		3	/* Get file status flags.  */
 +#define	F_SETFL		4	/* Set file status flags.  */
 +#define	F_GETOWN		5	/* Get owner (receiver of SIGIO).  */
 +#define	F_SETOWN		6	/* Set owner (receiver of SIGIO).  */
 +#define	F_GETLK		7	/* Get record locking info.  */
 +#define	F_SETLK		8	/* Set record locking info (non-blocking).  */
 +#define	F_SETLKW		9	/* Set record locking info (blocking).  */
 +
 +/* XXX missing */
 +#define	F_GETLK64	7	/* Get record locking info.  */
 +#define	F_SETLK64	8	/* Set record locking info (non-blocking).  */
 +#define	F_SETLKW64	9	/* Set record locking info (blocking).  */
 +
 +/* File descriptor flags used with F_GETFD and F_SETFD.  */
 +#define	FD_CLOEXEC	1	/* Close on exec.  */
 +
 +//NOT SURE IF O_NONBLOCK is OK here but at least the 0x0004 flag is not used by anything else...
 +#define	O_NONBLOCK 0x0004 /* Non-blocking I/O.  */
 +//#define	O_NDELAY   O_NONBLOCK
 +
 +/* Symbolic constants for the access() function */
 +#if !defined(F_OK)
 +    #define	R_OK    4       /*  Test for read permission    */
 +    #define	W_OK    2       /*  Test for write permission   */
 +    #define	X_OK    1       /*  Test for execute permission */
 +    #define	F_OK    0       /*  Test for existence of file  */
 +#endif
 +
 +
 +/* Replacement POSIX function */
 +extern int	 __la_fstat(int fd, struct stat *st);
 +extern int	 __la_lstat(const char *path, struct stat *st);
 +#if defined(__LA_LSEEK_NEEDED)
 +extern __int64	 __la_lseek(int fd, __int64 offset, int whence);
 +#endif
 +extern int	 __la_open(const char *path, int flags, ...);
 +extern ssize_t	 __la_read(int fd, void *buf, size_t nbytes);
 +extern int	 __la_stat(const char *path, struct stat *st);
 +extern pid_t	 __la_waitpid(HANDLE child, int *status, int option);
 +extern ssize_t	 __la_write(int fd, const void *buf, size_t nbytes);
 +
 +#define _stat64i32(path, st)	__la_stat(path, st)
 +#define _stat64(path, st)	__la_stat(path, st)
 +/* for status returned by la_waitpid */
 +#define WIFEXITED(sts)		((sts & 0x100) == 0)
 +#define WEXITSTATUS(sts)	(sts & 0x0FF)
 +
 +extern wchar_t *__la_win_permissive_name(const char *name);
 +extern wchar_t *__la_win_permissive_name_w(const wchar_t *wname);
 +extern void __la_dosmaperr(unsigned long e);
 +#define la_dosmaperr(e) __la_dosmaperr(e)
 +extern struct archive_entry *__la_win_entry_in_posix_pathseparator(
 +    struct archive_entry *);
 +
 +#if defined(HAVE_WCRTOMB) && defined(__BORLANDC__)
 +typedef int mbstate_t;
 +size_t wcrtomb(char *, wchar_t, mbstate_t *);
 +#endif
 +
 +#if defined(_MSC_VER) && _MSC_VER < 1300
 +WINBASEAPI BOOL WINAPI GetVolumePathNameW(
 +       LPCWSTR lpszFileName,
 +       LPWSTR lpszVolumePathName,
 +       DWORD cchBufferLength
 +       );
 +# if _WIN32_WINNT < 0x0500 /* windows.h not providing 0x500 API */
 +typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
 +       LARGE_INTEGER FileOffset;
 +       LARGE_INTEGER Length;
 +} FILE_ALLOCATED_RANGE_BUFFER, *PFILE_ALLOCATED_RANGE_BUFFER;
 +#  define FSCTL_SET_SPARSE \
 +     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_WRITE_DATA)
 +#  define FSCTL_QUERY_ALLOCATED_RANGES \
 +     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51,  METHOD_NEITHER, FILE_READ_DATA)
 +# endif
 +#endif
 +
 +#endif /* LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED */
diff --cc Utilities/cmlibarchive/libarchive/archive_write.c
index 8997193,0000000..e3fa335
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write.c
@@@ -1,725 -1,0 +1,736 @@@
 +/*-
 + * Copyright (c) 2003-2010 Tim Kientzle
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD: head/lib/libarchive/archive_write.c 201099 2009-12-28 03:03:00Z kientzle $");
 +
 +/*
 + * This file contains the "essential" portions of the write API, that
 + * is, stuff that will essentially always be used by any client that
 + * actually needs to write an archive.  Optional pieces have been, as
 + * far as possible, separated out into separate files to reduce
 + * needlessly bloating statically-linked clients.
 + */
 +
 +#ifdef HAVE_SYS_WAIT_H
 +#include <sys/wait.h>
 +#endif
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_LIMITS_H
 +#include <limits.h>
 +#endif
 +#include <stdio.h>
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_STRING_H
 +#include <string.h>
 +#endif
 +#include <time.h>
 +#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
 +#endif
 +
 +#include "archive.h"
 +#include "archive_entry.h"
 +#include "archive_private.h"
 +#include "archive_write_private.h"
 +
 +static struct archive_vtable *archive_write_vtable(void);
 +
 +static int	_archive_filter_code(struct archive *, int);
 +static const char *_archive_filter_name(struct archive *, int);
 +static int64_t	_archive_filter_bytes(struct archive *, int);
 +static int  _archive_write_filter_count(struct archive *);
 +static int	_archive_write_close(struct archive *);
 +static int	_archive_write_free(struct archive *);
 +static int	_archive_write_header(struct archive *, struct archive_entry *);
 +static int	_archive_write_finish_entry(struct archive *);
 +static ssize_t	_archive_write_data(struct archive *, const void *, size_t);
 +
 +struct archive_none {
 +	size_t buffer_size;
 +	size_t avail;
 +	char *buffer;
 +	char *next;
 +};
 +
 +static struct archive_vtable *
 +archive_write_vtable(void)
 +{
 +	static struct archive_vtable av;
 +	static int inited = 0;
 +
 +	if (!inited) {
 +		av.archive_close = _archive_write_close;
 +		av.archive_filter_bytes = _archive_filter_bytes;
 +		av.archive_filter_code = _archive_filter_code;
 +		av.archive_filter_name = _archive_filter_name;
 +		av.archive_filter_count = _archive_write_filter_count;
 +		av.archive_free = _archive_write_free;
 +		av.archive_write_header = _archive_write_header;
 +		av.archive_write_finish_entry = _archive_write_finish_entry;
 +		av.archive_write_data = _archive_write_data;
 +		inited = 1;
 +	}
 +	return (&av);
 +}
 +
 +/*
 + * Allocate, initialize and return an archive object.
 + */
 +struct archive *
 +archive_write_new(void)
 +{
 +	struct archive_write *a;
 +	unsigned char *nulls;
 +
 +	a = (struct archive_write *)malloc(sizeof(*a));
 +	if (a == NULL)
 +		return (NULL);
 +	memset(a, 0, sizeof(*a));
 +	a->archive.magic = ARCHIVE_WRITE_MAGIC;
 +	a->archive.state = ARCHIVE_STATE_NEW;
 +	a->archive.vtable = archive_write_vtable();
 +	/*
 +	 * The value 10240 here matches the traditional tar default,
 +	 * but is otherwise arbitrary.
 +	 * TODO: Set the default block size from the format selected.
 +	 */
 +	a->bytes_per_block = 10240;
 +	a->bytes_in_last_block = -1;	/* Default */
 +
 +	/* Initialize a block of nulls for padding purposes. */
 +	a->null_length = 1024;
 +	nulls = (unsigned char *)malloc(a->null_length);
 +	if (nulls == NULL) {
 +		free(a);
 +		return (NULL);
 +	}
 +	memset(nulls, 0, a->null_length);
 +	a->nulls = nulls;
 +	return (&a->archive);
 +}
 +
 +/*
 + * Set the block size.  Returns 0 if successful.
 + */
 +int
 +archive_write_set_bytes_per_block(struct archive *_a, int bytes_per_block)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_write_set_bytes_per_block");
 +	a->bytes_per_block = bytes_per_block;
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Get the current block size.  -1 if it has never been set.
 + */
 +int
 +archive_write_get_bytes_per_block(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_ANY, "archive_write_get_bytes_per_block");
 +	return (a->bytes_per_block);
 +}
 +
 +/*
 + * Set the size for the last block.
 + * Returns 0 if successful.
 + */
 +int
 +archive_write_set_bytes_in_last_block(struct archive *_a, int bytes)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_ANY, "archive_write_set_bytes_in_last_block");
 +	a->bytes_in_last_block = bytes;
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Return the value set above.  -1 indicates it has not been set.
 + */
 +int
 +archive_write_get_bytes_in_last_block(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_ANY, "archive_write_get_bytes_in_last_block");
 +	return (a->bytes_in_last_block);
 +}
 +
 +/*
 + * dev/ino of a file to be rejected.  Used to prevent adding
 + * an archive to itself recursively.
 + */
 +int
 +archive_write_set_skip_file(struct archive *_a, int64_t d, int64_t i)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_ANY, "archive_write_set_skip_file");
 +	a->skip_file_set = 1;
 +	a->skip_file_dev = d;
 +	a->skip_file_ino = i;
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Allocate and return the next filter structure.
 + */
 +struct archive_write_filter *
 +__archive_write_allocate_filter(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	struct archive_write_filter *f;
 +
 +	f = calloc(1, sizeof(*f));
 +	f->archive = _a;
 +	if (a->filter_first == NULL)
 +		a->filter_first = f;
 +	else
 +		a->filter_last->next_filter = f;
 +	a->filter_last = f;
 +	return f;
 +}
 +
 +/*
 + * Write data to a particular filter.
 + */
 +int
 +__archive_write_filter(struct archive_write_filter *f,
 +    const void *buff, size_t length)
 +{
 +	int r;
 +	if (length == 0)
 +		return(ARCHIVE_OK);
 +	if (f->write == NULL)
 +		/* If unset, a fatal error has already ocuured, so this filter
 +		 * didn't open. We cannot write anything. */
 +		return(ARCHIVE_FATAL);
 +	r = (f->write)(f, buff, length);
 +	f->bytes_written += length;
 +	return (r);
 +}
 +
 +/*
 + * Open a filter.
 + */
 +int
 +__archive_write_open_filter(struct archive_write_filter *f)
 +{
 +	if (f->open == NULL)
 +		return (ARCHIVE_OK);
 +	return (f->open)(f);
 +}
 +
 +/*
 + * Close a filter.
 + */
 +int
 +__archive_write_close_filter(struct archive_write_filter *f)
 +{
 +	if (f->close != NULL)
 +		return (f->close)(f);
 +	if (f->next_filter != NULL)
 +		return (__archive_write_close_filter(f->next_filter));
 +	return (ARCHIVE_OK);
 +}
 +
 +int
 +__archive_write_output(struct archive_write *a, const void *buff, size_t length)
 +{
 +	return (__archive_write_filter(a->filter_first, buff, length));
 +}
 +
 +int
 +__archive_write_nulls(struct archive_write *a, size_t length)
 +{
 +	if (length == 0)
 +		return (ARCHIVE_OK);
 +
 +	while (length > 0) {
 +		size_t to_write = length < a->null_length ? length : a->null_length;
 +		int r = __archive_write_output(a, a->nulls, to_write);
 +		if (r < ARCHIVE_OK)
 +			return (r);
 +		length -= to_write;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_write_client_open(struct archive_write_filter *f)
 +{
 +	struct archive_write *a = (struct archive_write *)f->archive;
 +	struct archive_none *state;
 +	void *buffer;
 +	size_t buffer_size;
 +
 +	f->bytes_per_block = archive_write_get_bytes_per_block(f->archive);
 +	f->bytes_in_last_block =
 +	    archive_write_get_bytes_in_last_block(f->archive);
 +	buffer_size = f->bytes_per_block;
 +
 +	state = (struct archive_none *)calloc(1, sizeof(*state));
 +	buffer = (char *)malloc(buffer_size);
 +	if (state == NULL || buffer == NULL) {
 +		free(state);
 +		free(buffer);
 +		archive_set_error(f->archive, ENOMEM,
 +		    "Can't allocate data for output buffering");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	state->buffer_size = buffer_size;
 +	state->buffer = buffer;
 +	state->next = state->buffer;
 +	state->avail = state->buffer_size;
 +	f->data = state;
 +
 +	if (a->client_opener == NULL)
 +		return (ARCHIVE_OK);
 +	return (a->client_opener(f->archive, a->client_data));
 +}
 +
 +static int
 +archive_write_client_write(struct archive_write_filter *f,
 +    const void *_buff, size_t length)
 +{
 +	struct archive_write *a = (struct archive_write *)f->archive;
 +        struct archive_none *state = (struct archive_none *)f->data;
 +	const char *buff = (const char *)_buff;
 +	ssize_t remaining, to_copy;
 +	ssize_t bytes_written;
 +
 +	remaining = length;
 +
 +	/*
 +	 * If there is no buffer for blocking, just pass the data
 +	 * straight through to the client write callback.  In
 +	 * particular, this supports "no write delay" operation for
 +	 * special applications.  Just set the block size to zero.
 +	 */
 +	if (state->buffer_size == 0) {
 +		while (remaining > 0) {
 +			bytes_written = (a->client_writer)(&a->archive,
 +			    a->client_data, buff, remaining);
 +			if (bytes_written <= 0)
 +				return (ARCHIVE_FATAL);
 +			remaining -= bytes_written;
 +			buff += bytes_written;
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +
 +	/* If the copy buffer isn't empty, try to fill it. */
 +	if (state->avail < state->buffer_size) {
 +		/* If buffer is not empty... */
 +		/* ... copy data into buffer ... */
 +		to_copy = ((size_t)remaining > state->avail) ?
 +			state->avail : (size_t)remaining;
 +		memcpy(state->next, buff, to_copy);
 +		state->next += to_copy;
 +		state->avail -= to_copy;
 +		buff += to_copy;
 +		remaining -= to_copy;
 +		/* ... if it's full, write it out. */
 +		if (state->avail == 0) {
 +			char *p = state->buffer;
 +			size_t to_write = state->buffer_size;
 +			while (to_write > 0) {
 +				bytes_written = (a->client_writer)(&a->archive,
 +				    a->client_data, p, to_write);
 +				if (bytes_written <= 0)
 +					return (ARCHIVE_FATAL);
 +				if ((size_t)bytes_written > to_write) {
 +					archive_set_error(&(a->archive),
 +					    -1, "write overrun");
 +					return (ARCHIVE_FATAL);
 +				}
 +				p += bytes_written;
 +				to_write -= bytes_written;
 +			}
 +			state->next = state->buffer;
 +			state->avail = state->buffer_size;
 +		}
 +	}
 +
 +	while ((size_t)remaining >= state->buffer_size) {
 +		/* Write out full blocks directly to client. */
 +		bytes_written = (a->client_writer)(&a->archive,
 +		    a->client_data, buff, state->buffer_size);
 +		if (bytes_written <= 0)
 +			return (ARCHIVE_FATAL);
 +		buff += bytes_written;
 +		remaining -= bytes_written;
 +	}
 +
 +	if (remaining > 0) {
 +		/* Copy last bit into copy buffer. */
 +		memcpy(state->next, buff, remaining);
 +		state->next += remaining;
 +		state->avail -= remaining;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_write_client_close(struct archive_write_filter *f)
 +{
 +	struct archive_write *a = (struct archive_write *)f->archive;
 +	struct archive_none *state = (struct archive_none *)f->data;
 +	ssize_t block_length;
 +	ssize_t target_block_length;
 +	ssize_t bytes_written;
 +	int ret = ARCHIVE_OK;
 +
 +	/* If there's pending data, pad and write the last block */
 +	if (state->next != state->buffer) {
 +		block_length = state->buffer_size - state->avail;
 +
 +		/* Tricky calculation to determine size of last block */
 +		if (a->bytes_in_last_block <= 0)
 +			/* Default or Zero: pad to full block */
 +			target_block_length = a->bytes_per_block;
 +		else
 +			/* Round to next multiple of bytes_in_last_block. */
 +			target_block_length = a->bytes_in_last_block *
 +			    ( (block_length + a->bytes_in_last_block - 1) /
 +			        a->bytes_in_last_block);
 +		if (target_block_length > a->bytes_per_block)
 +			target_block_length = a->bytes_per_block;
 +		if (block_length < target_block_length) {
 +			memset(state->next, 0,
 +			    target_block_length - block_length);
 +			block_length = target_block_length;
 +		}
 +		bytes_written = (a->client_writer)(&a->archive,
 +		    a->client_data, state->buffer, block_length);
 +		ret = bytes_written <= 0 ? ARCHIVE_FATAL : ARCHIVE_OK;
 +	}
 +	if (a->client_closer)
 +		(*a->client_closer)(&a->archive, a->client_data);
 +	free(state->buffer);
 +	free(state);
 +	/* Clear the close handler myself not to be called again. */
 +	f->close = NULL;
 +	a->client_data = NULL;
++	/* Clear passphrase. */
++	if (a->passphrase != NULL) {
++		memset(a->passphrase, 0, strlen(a->passphrase));
++		free(a->passphrase);
++		a->passphrase = NULL;
++	}
 +	return (ret);
 +}
 +
 +/*
 + * Open the archive using the current settings.
 + */
 +int
 +archive_write_open(struct archive *_a, void *client_data,
 +    archive_open_callback *opener, archive_write_callback *writer,
 +    archive_close_callback *closer)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	struct archive_write_filter *client_filter;
 +	int ret, r1;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_write_open");
 +	archive_clear_error(&a->archive);
 +
 +	a->client_writer = writer;
 +	a->client_opener = opener;
 +	a->client_closer = closer;
 +	a->client_data = client_data;
 +
 +	client_filter = __archive_write_allocate_filter(_a);
 +	client_filter->open = archive_write_client_open;
 +	client_filter->write = archive_write_client_write;
 +	client_filter->close = archive_write_client_close;
 +
 +	ret = __archive_write_open_filter(a->filter_first);
 +	if (ret < ARCHIVE_WARN) {
 +		r1 = __archive_write_close_filter(a->filter_first);
 +		return (r1 < ret ? r1 : ret);
 +	}
 +
 +	a->archive.state = ARCHIVE_STATE_HEADER;
 +	if (a->format_init)
 +		ret = (a->format_init)(a);
 +	return (ret);
 +}
 +
 +/*
 + * Close out the archive.
 + */
 +static int
 +_archive_write_close(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	int r = ARCHIVE_OK, r1 = ARCHIVE_OK;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_ANY | ARCHIVE_STATE_FATAL,
 +	    "archive_write_close");
 +	if (a->archive.state == ARCHIVE_STATE_NEW
 +	    || a->archive.state == ARCHIVE_STATE_CLOSED)
 +		return (ARCHIVE_OK); /* Okay to close() when not open. */
 +
 +	archive_clear_error(&a->archive);
 +
 +	/* Finish the last entry if a finish callback is specified */
 +	if (a->archive.state == ARCHIVE_STATE_DATA
 +	    && a->format_finish_entry != NULL)
 +		r = ((a->format_finish_entry)(a));
 +
 +	/* Finish off the archive. */
 +	/* TODO: have format closers invoke compression close. */
 +	if (a->format_close != NULL) {
 +		r1 = (a->format_close)(a);
 +		if (r1 < r)
 +			r = r1;
 +	}
 +
 +	/* Finish the compression and close the stream. */
 +	r1 = __archive_write_close_filter(a->filter_first);
 +	if (r1 < r)
 +		r = r1;
 +
 +	if (a->archive.state != ARCHIVE_STATE_FATAL)
 +		a->archive.state = ARCHIVE_STATE_CLOSED;
 +	return (r);
 +}
 +
 +static int
 +_archive_write_filter_count(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	struct archive_write_filter *p = a->filter_first;
 +	int count = 0;
 +	while(p) {
 +		count++;
 +		p = p->next_filter;
 +	}
 +	return count;
 +}
 +
 +void
 +__archive_write_filters_free(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	int r = ARCHIVE_OK, r1;
 +
 +	while (a->filter_first != NULL) {
 +		struct archive_write_filter *next
 +		    = a->filter_first->next_filter;
 +		if (a->filter_first->free != NULL) {
 +			r1 = (*a->filter_first->free)(a->filter_first);
 +			if (r > r1)
 +				r = r1;
 +		}
 +		free(a->filter_first);
 +		a->filter_first = next;
 +	}
 +	a->filter_last = NULL;
 +}
 +
 +/*
 + * Destroy the archive structure.
 + *
 + * Be careful: user might just call write_new and then write_free.
 + * Don't assume we actually wrote anything or performed any non-trivial
 + * initialization.
 + */
 +static int
 +_archive_write_free(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	int r = ARCHIVE_OK, r1;
 +
 +	if (_a == NULL)
 +		return (ARCHIVE_OK);
 +	/* It is okay to call free() in state FATAL. */
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_ANY | ARCHIVE_STATE_FATAL, "archive_write_free");
 +	if (a->archive.state != ARCHIVE_STATE_FATAL)
 +		r = archive_write_close(&a->archive);
 +
 +	/* Release format resources. */
 +	if (a->format_free != NULL) {
 +		r1 = (a->format_free)(a);
 +		if (r1 < r)
 +			r = r1;
 +	}
 +
 +	__archive_write_filters_free(_a);
 +
 +	/* Release various dynamic buffers. */
 +	free((void *)(uintptr_t)(const void *)a->nulls);
 +	archive_string_free(&a->archive.error_string);
++	if (a->passphrase != NULL) {
++		/* A passphrase should be cleaned. */
++		memset(a->passphrase, 0, strlen(a->passphrase));
++		free(a->passphrase);
++	}
 +	a->archive.magic = 0;
 +	__archive_clean(&a->archive);
 +	free(a);
 +	return (r);
 +}
 +
 +/*
 + * Write the appropriate header.
 + */
 +static int
 +_archive_write_header(struct archive *_a, struct archive_entry *entry)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	int ret, r2;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_DATA | ARCHIVE_STATE_HEADER, "archive_write_header");
 +	archive_clear_error(&a->archive);
 +
 +	if (a->format_write_header == NULL) {
 +		archive_set_error(&(a->archive), -1,
 +		    "Format must be set before you can write to an archive.");
 +		a->archive.state = ARCHIVE_STATE_FATAL;
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/* In particular, "retry" and "fatal" get returned immediately. */
 +	ret = archive_write_finish_entry(&a->archive);
 +	if (ret == ARCHIVE_FATAL) {
 +		a->archive.state = ARCHIVE_STATE_FATAL;
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (ret < ARCHIVE_OK && ret != ARCHIVE_WARN)
 +		return (ret);
 +
 +	if (a->skip_file_set &&
 +	    archive_entry_dev_is_set(entry) &&
 +	    archive_entry_ino_is_set(entry) &&
 +	    archive_entry_dev(entry) == (dev_t)a->skip_file_dev &&
 +	    archive_entry_ino64(entry) == a->skip_file_ino) {
 +		archive_set_error(&a->archive, 0,
 +		    "Can't add archive to itself");
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	/* Format and write header. */
 +	r2 = ((a->format_write_header)(a, entry));
 +	if (r2 == ARCHIVE_FAILED) {
 +		return (ARCHIVE_FAILED);
 +	}
 +	if (r2 == ARCHIVE_FATAL) {
 +		a->archive.state = ARCHIVE_STATE_FATAL;
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (r2 < ret)
 +		ret = r2;
 +
 +	a->archive.state = ARCHIVE_STATE_DATA;
 +	return (ret);
 +}
 +
 +static int
 +_archive_write_finish_entry(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	int ret = ARCHIVE_OK;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
 +	    "archive_write_finish_entry");
 +	if (a->archive.state & ARCHIVE_STATE_DATA
 +	    && a->format_finish_entry != NULL)
 +		ret = (a->format_finish_entry)(a);
 +	a->archive.state = ARCHIVE_STATE_HEADER;
 +	return (ret);
 +}
 +
 +/*
 + * Note that the compressor is responsible for blocking.
 + */
 +static ssize_t
 +_archive_write_data(struct archive *_a, const void *buff, size_t s)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	const size_t max_write = INT_MAX;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_DATA, "archive_write_data");
 +	/* In particular, this catches attempts to pass negative values. */
 +	if (s > max_write)
 +		s = max_write;
 +	archive_clear_error(&a->archive);
 +	return ((a->format_write_data)(a, buff, s));
 +}
 +
 +static struct archive_write_filter *
 +filter_lookup(struct archive *_a, int n)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	struct archive_write_filter *f = a->filter_first;
 +	if (n == -1)
 +		return a->filter_last;
 +	if (n < 0)
 +		return NULL;
 +	while (n > 0 && f != NULL) {
 +		f = f->next_filter;
 +		--n;
 +	}
 +	return f;
 +}
 +
 +static int
 +_archive_filter_code(struct archive *_a, int n)
 +{
 +	struct archive_write_filter *f = filter_lookup(_a, n);
 +	return f == NULL ? -1 : f->code;
 +}
 +
 +static const char *
 +_archive_filter_name(struct archive *_a, int n)
 +{
 +	struct archive_write_filter *f = filter_lookup(_a, n);
 +	return f != NULL ? f->name : NULL;
 +}
 +
 +static int64_t
 +_archive_filter_bytes(struct archive *_a, int n)
 +{
 +	struct archive_write_filter *f = filter_lookup(_a, n);
 +	return f == NULL ? -1 : f->bytes_written;
 +}
diff --cc Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
index 0000000,87b3f55..87b3f55
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
diff --cc Utilities/cmlibarchive/libarchive/archive_write_add_filter_xz.c
index a566732,0000000..4f849ce
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_xz.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_xz.c
@@@ -1,515 -1,0 +1,547 @@@
 +/*-
 + * Copyright (c) 2003-2010 Tim Kientzle
 + * Copyright (c) 2009-2012 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +
 +__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_xz.c 201108 2009-12-28 03:28:21Z kientzle $");
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_STRING_H
 +#include <string.h>
 +#endif
 +#include <time.h>
 +#ifdef HAVE_LZMA_H
 +#include <cm_lzma.h>
 +#endif
 +
 +#include "archive.h"
 +#include "archive_endian.h"
 +#include "archive_private.h"
 +#include "archive_write_private.h"
 +
 +#if ARCHIVE_VERSION_NUMBER < 4000000
 +int
 +archive_write_set_compression_lzip(struct archive *a)
 +{
 +	__archive_write_filters_free(a);
 +	return (archive_write_add_filter_lzip(a));
 +}
 +
 +int
 +archive_write_set_compression_lzma(struct archive *a)
 +{
 +	__archive_write_filters_free(a);
 +	return (archive_write_add_filter_lzma(a));
 +}
 +
 +int
 +archive_write_set_compression_xz(struct archive *a)
 +{
 +	__archive_write_filters_free(a);
 +	return (archive_write_add_filter_xz(a));
 +}
 +
 +#endif
 +
 +#ifndef HAVE_LZMA_H
 +int
 +archive_write_add_filter_xz(struct archive *a)
 +{
 +	archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +	    "xz compression not supported on this platform");
 +	return (ARCHIVE_FATAL);
 +}
 +
 +int
 +archive_write_add_filter_lzma(struct archive *a)
 +{
 +	archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +	    "lzma compression not supported on this platform");
 +	return (ARCHIVE_FATAL);
 +}
 +
 +int
 +archive_write_add_filter_lzip(struct archive *a)
 +{
 +	archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +	    "lzma compression not supported on this platform");
 +	return (ARCHIVE_FATAL);
 +}
 +#else
 +/* Don't compile this if we don't have liblzma. */
 +
 +struct private_data {
 +	int		 compression_level;
++	uint32_t	 threads;
 +	lzma_stream	 stream;
 +	lzma_filter	 lzmafilters[2];
 +	lzma_options_lzma lzma_opt;
 +	int64_t		 total_in;
 +	unsigned char	*compressed;
 +	size_t		 compressed_buffer_size;
 +	int64_t		 total_out;
 +	/* the CRC32 value of uncompressed data for lzip */
 +	uint32_t	 crc32;
 +};
 +
 +static int	archive_compressor_xz_options(struct archive_write_filter *,
 +		    const char *, const char *);
 +static int	archive_compressor_xz_open(struct archive_write_filter *);
 +static int	archive_compressor_xz_write(struct archive_write_filter *,
 +		    const void *, size_t);
 +static int	archive_compressor_xz_close(struct archive_write_filter *);
 +static int	archive_compressor_xz_free(struct archive_write_filter *);
 +static int	drive_compressor(struct archive_write_filter *,
 +		    struct private_data *, int finishing);
 +
 +struct option_value {
 +	uint32_t dict_size;
 +	uint32_t nice_len;
 +	lzma_match_finder mf;
 +};
 +static const struct option_value option_values[] = {
 +	{ 1 << 16, 32, LZMA_MF_HC3},
 +	{ 1 << 20, 32, LZMA_MF_HC3},
 +	{ 3 << 19, 32, LZMA_MF_HC4},
 +	{ 1 << 21, 32, LZMA_MF_BT4},
 +	{ 3 << 20, 32, LZMA_MF_BT4},
 +	{ 1 << 22, 32, LZMA_MF_BT4},
 +	{ 1 << 23, 64, LZMA_MF_BT4},
 +	{ 1 << 24, 64, LZMA_MF_BT4},
 +	{ 3 << 23, 64, LZMA_MF_BT4},
 +	{ 1 << 25, 64, LZMA_MF_BT4}
 +};
 +
 +static int
 +common_setup(struct archive_write_filter *f)
 +{
 +	struct private_data *data;
 +	struct archive_write *a = (struct archive_write *)f->archive;
 +	data = calloc(1, sizeof(*data));
 +	if (data == NULL) {
 +		archive_set_error(&a->archive, ENOMEM, "Out of memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	f->data = data;
 +	data->compression_level = LZMA_PRESET_DEFAULT;
++	data->threads = 1;
 +	f->open = &archive_compressor_xz_open;
 +	f->close = archive_compressor_xz_close;
 +	f->free = archive_compressor_xz_free;
 +	f->options = &archive_compressor_xz_options;
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Add an xz compression filter to this write handle.
 + */
 +int
 +archive_write_add_filter_xz(struct archive *_a)
 +{
 +	struct archive_write_filter *f;
 +	int r;
 +
 +	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_write_add_filter_xz");
 +	f = __archive_write_allocate_filter(_a);
 +	r = common_setup(f);
 +	if (r == ARCHIVE_OK) {
 +		f->code = ARCHIVE_FILTER_XZ;
 +		f->name = "xz";
 +	}
 +	return (r);
 +}
 +
 +/* LZMA is handled identically, we just need a different compression
 + * code set.  (The liblzma setup looks at the code to determine
 + * the one place that XZ and LZMA require different handling.) */
 +int
 +archive_write_add_filter_lzma(struct archive *_a)
 +{
 +	struct archive_write_filter *f;
 +	int r;
 +
 +	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_write_add_filter_lzma");
 +	f = __archive_write_allocate_filter(_a);
 +	r = common_setup(f);
 +	if (r == ARCHIVE_OK) {
 +		f->code = ARCHIVE_FILTER_LZMA;
 +		f->name = "lzma";
 +	}
 +	return (r);
 +}
 +
 +int
 +archive_write_add_filter_lzip(struct archive *_a)
 +{
 +	struct archive_write_filter *f;
 +	int r;
 +
 +	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_write_add_filter_lzip");
 +	f = __archive_write_allocate_filter(_a);
 +	r = common_setup(f);
 +	if (r == ARCHIVE_OK) {
 +		f->code = ARCHIVE_FILTER_LZIP;
 +		f->name = "lzip";
 +	}
 +	return (r);
 +}
 +
 +static int
 +archive_compressor_xz_init_stream(struct archive_write_filter *f,
 +    struct private_data *data)
 +{
 +	static const lzma_stream lzma_stream_init_data = LZMA_STREAM_INIT;
 +	int ret;
++#ifdef HAVE_LZMA_STREAM_ENCODER_MT
++	lzma_mt mt_options;
++#endif
 +
 +	data->stream = lzma_stream_init_data;
 +	data->stream.next_out = data->compressed;
 +	data->stream.avail_out = data->compressed_buffer_size;
- 	if (f->code == ARCHIVE_FILTER_XZ)
- 		ret = lzma_stream_encoder(&(data->stream),
- 		    data->lzmafilters, LZMA_CHECK_CRC64);
- 	else if (f->code == ARCHIVE_FILTER_LZMA)
++	if (f->code == ARCHIVE_FILTER_XZ) {
++#ifdef HAVE_LZMA_STREAM_ENCODER_MT
++		if (data->threads != 1) {
++			bzero(&mt_options, sizeof(mt_options));
++			mt_options.threads = data->threads;
++			mt_options.timeout = 300;
++			mt_options.filters = data->lzmafilters;
++			mt_options.check = LZMA_CHECK_CRC64;
++			ret = lzma_stream_encoder_mt(&(data->stream),
++			    &mt_options);
++		} else
++#endif
++			ret = lzma_stream_encoder(&(data->stream),
++			    data->lzmafilters, LZMA_CHECK_CRC64);
++	} else if (f->code == ARCHIVE_FILTER_LZMA) {
 +		ret = lzma_alone_encoder(&(data->stream), &data->lzma_opt);
- 	else {	/* ARCHIVE_FILTER_LZIP */
++	} else {	/* ARCHIVE_FILTER_LZIP */
 +		int dict_size = data->lzma_opt.dict_size;
 +		int ds, log2dic, wedges;
 +
 +		/* Calculate a coded dictionary size */
 +		if (dict_size < (1 << 12) || dict_size > (1 << 27)) {
 +			archive_set_error(f->archive, ARCHIVE_ERRNO_MISC,
- 			    "Unacceptable dictionary dize for lzip: %d",
++			    "Unacceptable dictionary size for lzip: %d",
 +			    dict_size);
 +			return (ARCHIVE_FATAL);
 +		}
 +		for (log2dic = 27; log2dic >= 12; log2dic--) {
 +			if (dict_size & (1 << log2dic))
 +				break;
 +		}
 +		if (dict_size > (1 << log2dic)) {
 +			log2dic++;
 +			wedges =
 +			    ((1 << log2dic) - dict_size) / (1 << (log2dic - 4));
 +		} else
 +			wedges = 0;
 +		ds = ((wedges << 5) & 0xe0) | (log2dic & 0x1f);
 +
 +		data->crc32 = 0;
 +		/* Make a header */
 +		data->compressed[0] = 0x4C;
 +		data->compressed[1] = 0x5A;
 +		data->compressed[2] = 0x49;
 +		data->compressed[3] = 0x50;
 +		data->compressed[4] = 1;/* Version */
 +		data->compressed[5] = (unsigned char)ds;
 +		data->stream.next_out += 6;
 +		data->stream.avail_out -= 6;
 +
 +		ret = lzma_raw_encoder(&(data->stream), data->lzmafilters);
 +	}
 +	if (ret == LZMA_OK)
 +		return (ARCHIVE_OK);
 +
 +	switch (ret) {
 +	case LZMA_MEM_ERROR:
 +		archive_set_error(f->archive, ENOMEM,
 +		    "Internal error initializing compression library: "
 +		    "Cannot allocate memory");
 +		break;
 +	default:
 +		archive_set_error(f->archive, ARCHIVE_ERRNO_MISC,
 +		    "Internal error initializing compression library: "
 +		    "It's a bug in liblzma");
 +		break;
 +	}
 +	return (ARCHIVE_FATAL);
 +}
 +
 +/*
 + * Setup callback.
 + */
 +static int
 +archive_compressor_xz_open(struct archive_write_filter *f)
 +{
 +	struct private_data *data = f->data;
 +	int ret;
 +
 +	ret = __archive_write_open_filter(f->next_filter);
 +	if (ret != ARCHIVE_OK)
 +		return (ret);
 +
 +	if (data->compressed == NULL) {
 +		size_t bs = 65536, bpb;
 +		if (f->archive->magic == ARCHIVE_WRITE_MAGIC) {
 +			/* Buffer size should be a multiple number of the of bytes
 +			 * per block for performance. */
 +			bpb = archive_write_get_bytes_per_block(f->archive);
 +			if (bpb > bs)
 +				bs = bpb;
 +			else if (bpb != 0)
 +				bs -= bs % bpb;
 +		}
 +		data->compressed_buffer_size = bs;
 +		data->compressed
 +		    = (unsigned char *)malloc(data->compressed_buffer_size);
 +		if (data->compressed == NULL) {
 +			archive_set_error(f->archive, ENOMEM,
 +			    "Can't allocate data for compression buffer");
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	f->write = archive_compressor_xz_write;
 +
 +	/* Initialize compression library. */
 +	if (f->code == ARCHIVE_FILTER_LZIP) {
 +		const struct option_value *val =
 +		    &option_values[data->compression_level];
 +
 +		data->lzma_opt.dict_size = val->dict_size;
 +		data->lzma_opt.preset_dict = NULL;
 +		data->lzma_opt.preset_dict_size = 0;
 +		data->lzma_opt.lc = LZMA_LC_DEFAULT;
 +		data->lzma_opt.lp = LZMA_LP_DEFAULT;
 +		data->lzma_opt.pb = LZMA_PB_DEFAULT;
 +		data->lzma_opt.mode =
 +		    data->compression_level<= 2? LZMA_MODE_FAST:LZMA_MODE_NORMAL;
 +		data->lzma_opt.nice_len = val->nice_len;
 +		data->lzma_opt.mf = val->mf;
 +		data->lzma_opt.depth = 0;
 +		data->lzmafilters[0].id = LZMA_FILTER_LZMA1;
 +		data->lzmafilters[0].options = &data->lzma_opt;
 +		data->lzmafilters[1].id = LZMA_VLI_UNKNOWN;/* Terminate */
 +	} else {
 +		if (lzma_lzma_preset(&data->lzma_opt, data->compression_level)) {
 +			archive_set_error(f->archive, ARCHIVE_ERRNO_MISC,
 +			    "Internal error initializing compression library");
 +		}
 +		data->lzmafilters[0].id = LZMA_FILTER_LZMA2;
 +		data->lzmafilters[0].options = &data->lzma_opt;
 +		data->lzmafilters[1].id = LZMA_VLI_UNKNOWN;/* Terminate */
 +	}
 +	ret = archive_compressor_xz_init_stream(f, data);
 +	if (ret == LZMA_OK) {
 +		f->data = data;
 +		return (0);
 +	}
 +	return (ARCHIVE_FATAL);
 +}
 +
 +/*
 + * Set write options.
 + */
 +static int
 +archive_compressor_xz_options(struct archive_write_filter *f,
 +    const char *key, const char *value)
 +{
 +	struct private_data *data = (struct private_data *)f->data;
 +
 +	if (strcmp(key, "compression-level") == 0) {
 +		if (value == NULL || !(value[0] >= '0' && value[0] <= '9') ||
 +		    value[1] != '\0')
 +			return (ARCHIVE_WARN);
 +		data->compression_level = value[0] - '0';
 +		if (data->compression_level > 6)
 +			data->compression_level = 6;
 +		return (ARCHIVE_OK);
++	} else if (strcmp(key, "threads") == 0) {
++		if (value == NULL)
++			return (ARCHIVE_WARN);
++		data->threads = (int)strtoul(value, NULL, 10);
++		if (data->threads == 0 && errno != 0) {
++			data->threads = 1;
++			return (ARCHIVE_WARN);
++		}
++		if (data->threads == 0) {
++#ifdef HAVE_LZMA_STREAM_ENCODER_MT
++			data->threads = lzma_cputhreads();
++#else
++			data->threads = 1;
++#endif
++		}
++		return (ARCHIVE_OK);
 +	}
 +
 +	/* Note: The "warn" return is just to inform the options
 +	 * supervisor that we didn't handle it.  It will generate
 +	 * a suitable error if no one used this option. */
 +	return (ARCHIVE_WARN);
 +}
 +
 +/*
 + * Write data to the compressed stream.
 + */
 +static int
 +archive_compressor_xz_write(struct archive_write_filter *f,
 +    const void *buff, size_t length)
 +{
 +	struct private_data *data = (struct private_data *)f->data;
 +	int ret;
 +
 +	/* Update statistics */
 +	data->total_in += length;
 +	if (f->code == ARCHIVE_FILTER_LZIP)
 +		data->crc32 = lzma_crc32(buff, length, data->crc32);
 +
 +	/* Compress input data to output buffer */
 +	data->stream.next_in = buff;
 +	data->stream.avail_in = length;
 +	if ((ret = drive_compressor(f, data, 0)) != ARCHIVE_OK)
 +		return (ret);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +
 +/*
 + * Finish the compression...
 + */
 +static int
 +archive_compressor_xz_close(struct archive_write_filter *f)
 +{
 +	struct private_data *data = (struct private_data *)f->data;
 +	int ret, r1;
 +
 +	ret = drive_compressor(f, data, 1);
 +	if (ret == ARCHIVE_OK) {
 +		data->total_out +=
 +		    data->compressed_buffer_size - data->stream.avail_out;
 +		ret = __archive_write_filter(f->next_filter,
 +		    data->compressed,
 +		    data->compressed_buffer_size - data->stream.avail_out);
 +		if (f->code == ARCHIVE_FILTER_LZIP && ret == ARCHIVE_OK) {
 +			archive_le32enc(data->compressed, data->crc32);
 +			archive_le64enc(data->compressed+4, data->total_in);
 +			archive_le64enc(data->compressed+12, data->total_out + 20);
 +			ret = __archive_write_filter(f->next_filter,
 +			    data->compressed, 20);
 +		}
 +	}
 +	lzma_end(&(data->stream));
 +	r1 = __archive_write_close_filter(f->next_filter);
 +	return (r1 < ret ? r1 : ret);
 +}
 +
 +static int
 +archive_compressor_xz_free(struct archive_write_filter *f)
 +{
 +	struct private_data *data = (struct private_data *)f->data;
 +	free(data->compressed);
 +	free(data);
 +	f->data = NULL;
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Utility function to push input data through compressor,
 + * writing full output blocks as necessary.
 + *
 + * Note that this handles both the regular write case (finishing ==
 + * false) and the end-of-archive case (finishing == true).
 + */
 +static int
 +drive_compressor(struct archive_write_filter *f,
 +    struct private_data *data, int finishing)
 +{
 +	int ret;
 +
 +	for (;;) {
 +		if (data->stream.avail_out == 0) {
 +			data->total_out += data->compressed_buffer_size;
 +			ret = __archive_write_filter(f->next_filter,
 +			    data->compressed,
 +			    data->compressed_buffer_size);
 +			if (ret != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +			data->stream.next_out = data->compressed;
 +			data->stream.avail_out = data->compressed_buffer_size;
 +		}
 +
 +		/* If there's nothing to do, we're done. */
 +		if (!finishing && data->stream.avail_in == 0)
 +			return (ARCHIVE_OK);
 +
 +		ret = lzma_code(&(data->stream),
 +		    finishing ? LZMA_FINISH : LZMA_RUN );
 +
 +		switch (ret) {
 +		case LZMA_OK:
 +			/* In non-finishing case, check if compressor
 +			 * consumed everything */
 +			if (!finishing && data->stream.avail_in == 0)
 +				return (ARCHIVE_OK);
 +			/* In finishing case, this return always means
 +			 * there's more work */
 +			break;
 +		case LZMA_STREAM_END:
 +			/* This return can only occur in finishing case. */
 +			if (finishing)
 +				return (ARCHIVE_OK);
 +			archive_set_error(f->archive, ARCHIVE_ERRNO_MISC,
 +			    "lzma compression data error");
 +			return (ARCHIVE_FATAL);
 +		case LZMA_MEMLIMIT_ERROR:
 +			archive_set_error(f->archive, ENOMEM,
 +			    "lzma compression error: "
 +			    "%ju MiB would have been needed",
 +			    (uintmax_t)((lzma_memusage(&(data->stream))
 +				    + 1024 * 1024 -1)
 +				/ (1024 * 1024)));
 +			return (ARCHIVE_FATAL);
 +		default:
 +			/* Any other return value indicates an error. */
 +			archive_set_error(f->archive, ARCHIVE_ERRNO_MISC,
 +			    "lzma compression failed:"
 +			    " lzma_code() call returned status %d",
 +			    ret);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +}
 +
 +#endif /* HAVE_LZMA_H */
diff --cc Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
index a3d350b,0000000..450ac75
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
@@@ -1,3824 -1,0 +1,3897 @@@
 +/*-
 + * Copyright (c) 2003-2010 Tim Kientzle
 + * Copyright (c) 2012 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer
 + *    in this position and unchanged.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD$");
 +
 +#if !defined(_WIN32) || defined(__CYGWIN__)
 +
 +#ifdef HAVE_SYS_TYPES_H
 +#include <sys/types.h>
 +#endif
 +#ifdef HAVE_SYS_ACL_H
 +#include <sys/acl.h>
 +#endif
 +#ifdef HAVE_SYS_EXTATTR_H
 +#include <sys/extattr.h>
 +#endif
 +#if defined(HAVE_SYS_XATTR_H)
 +#include <sys/xattr.h>
 +#elif defined(HAVE_ATTR_XATTR_H)
 +#include <attr/xattr.h>
 +#endif
 +#ifdef HAVE_SYS_EA_H
 +#include <sys/ea.h>
 +#endif
 +#ifdef HAVE_SYS_IOCTL_H
 +#include <sys/ioctl.h>
 +#endif
 +#ifdef HAVE_SYS_STAT_H
 +#include <sys/stat.h>
 +#endif
 +#ifdef HAVE_SYS_TIME_H
 +#include <sys/time.h>
 +#endif
 +#ifdef HAVE_SYS_UTIME_H
 +#include <sys/utime.h>
 +#endif
 +#ifdef HAVE_COPYFILE_H
 +#include <copyfile.h>
 +#endif
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_FCNTL_H
 +#include <fcntl.h>
 +#endif
 +#ifdef HAVE_GRP_H
 +#include <grp.h>
 +#endif
 +#ifdef HAVE_LANGINFO_H
 +#include <langinfo.h>
 +#endif
 +#ifdef HAVE_LINUX_FS_H
 +#include <linux/fs.h>	/* for Linux file flags */
 +#endif
 +/*
 + * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
 + * As the include guards don't agree, the order of include is important.
 + */
 +#ifdef HAVE_LINUX_EXT2_FS_H
 +#include <linux/ext2_fs.h>	/* for Linux file flags */
 +#endif
 +#if defined(HAVE_EXT2FS_EXT2_FS_H) && !defined(__CYGWIN__)
 +#include <ext2fs/ext2_fs.h>	/* Linux file flags, broken on Cygwin */
 +#endif
 +#ifdef HAVE_LIMITS_H
 +#include <limits.h>
 +#endif
 +#ifdef HAVE_PWD_H
 +#include <pwd.h>
 +#endif
 +#include <stdio.h>
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_STRING_H
 +#include <string.h>
 +#endif
 +#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
 +#endif
 +#ifdef HAVE_UTIME_H
 +#include <utime.h>
 +#endif
 +#ifdef F_GETTIMES /* Tru64 specific */
 +#include <sys/fcntl1.h>
 +#endif
 +
 +#if __APPLE__
 +#include <TargetConditionals.h>
 +#if TARGET_OS_MAC && !TARGET_OS_EMBEDDED && HAVE_QUARANTINE_H
 +#include <quarantine.h>
 +#define HAVE_QUARANTINE 1
 +#endif
 +#endif
 +
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h>
 +#endif
 +
 +/* TODO: Support Mac OS 'quarantine' feature.  This is really just a
 + * standard tag to mark files that have been downloaded as "tainted".
 + * On Mac OS, we should mark the extracted files as tainted if the
 + * archive being read was tainted.  Windows has a similar feature; we
 + * should investigate ways to support this generically. */
 +
 +#include "archive.h"
 +#include "archive_acl_private.h"
 +#include "archive_string.h"
 +#include "archive_endian.h"
 +#include "archive_entry.h"
 +#include "archive_private.h"
 +#include "archive_write_disk_private.h"
 +
 +#ifndef O_BINARY
 +#define O_BINARY 0
 +#endif
 +#ifndef O_CLOEXEC
 +#define O_CLOEXEC	0
 +#endif
 +
 +struct fixup_entry {
 +	struct fixup_entry	*next;
 +	struct archive_acl	 acl;
 +	mode_t			 mode;
 +	int64_t			 atime;
 +	int64_t                  birthtime;
 +	int64_t			 mtime;
 +	int64_t			 ctime;
 +	unsigned long		 atime_nanos;
 +	unsigned long            birthtime_nanos;
 +	unsigned long		 mtime_nanos;
 +	unsigned long		 ctime_nanos;
 +	unsigned long		 fflags_set;
 +	size_t			 mac_metadata_size;
 +	void			*mac_metadata;
 +	int			 fixup; /* bitmask of what needs fixing */
 +	char			*name;
 +};
 +
 +/*
 + * We use a bitmask to track which operations remain to be done for
 + * this file.  In particular, this helps us avoid unnecessary
 + * operations when it's possible to take care of one step as a
 + * side-effect of another.  For example, mkdir() can specify the mode
 + * for the newly-created object but symlink() cannot.  This means we
 + * can skip chmod() if mkdir() succeeded, but we must explicitly
 + * chmod() if we're trying to create a directory that already exists
 + * (mkdir() failed) or if we're restoring a symlink.  Similarly, we
 + * need to verify UID/GID before trying to restore SUID/SGID bits;
 + * that verification can occur explicitly through a stat() call or
 + * implicitly because of a successful chown() call.
 + */
 +#define	TODO_MODE_FORCE		0x40000000
 +#define	TODO_MODE_BASE		0x20000000
 +#define	TODO_SUID		0x10000000
 +#define	TODO_SUID_CHECK		0x08000000
 +#define	TODO_SGID		0x04000000
 +#define	TODO_SGID_CHECK		0x02000000
 +#define	TODO_APPLEDOUBLE	0x01000000
 +#define	TODO_MODE		(TODO_MODE_BASE|TODO_SUID|TODO_SGID)
 +#define	TODO_TIMES		ARCHIVE_EXTRACT_TIME
 +#define	TODO_OWNER		ARCHIVE_EXTRACT_OWNER
 +#define	TODO_FFLAGS		ARCHIVE_EXTRACT_FFLAGS
 +#define	TODO_ACLS		ARCHIVE_EXTRACT_ACL
 +#define	TODO_XATTR		ARCHIVE_EXTRACT_XATTR
 +#define	TODO_MAC_METADATA	ARCHIVE_EXTRACT_MAC_METADATA
 +#define	TODO_HFS_COMPRESSION	ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED
 +
 +struct archive_write_disk {
 +	struct archive	archive;
 +
 +	mode_t			 user_umask;
 +	struct fixup_entry	*fixup_list;
 +	struct fixup_entry	*current_fixup;
 +	int64_t			 user_uid;
 +	int			 skip_file_set;
 +	int64_t			 skip_file_dev;
 +	int64_t			 skip_file_ino;
 +	time_t			 start_time;
 +
 +	int64_t (*lookup_gid)(void *private, const char *gname, int64_t gid);
 +	void  (*cleanup_gid)(void *private);
 +	void			*lookup_gid_data;
 +	int64_t (*lookup_uid)(void *private, const char *uname, int64_t uid);
 +	void  (*cleanup_uid)(void *private);
 +	void			*lookup_uid_data;
 +
 +	/*
 +	 * Full path of last file to satisfy symlink checks.
 +	 */
 +	struct archive_string	path_safe;
 +
 +	/*
 +	 * Cached stat data from disk for the current entry.
 +	 * If this is valid, pst points to st.  Otherwise,
 +	 * pst is null.
 +	 */
 +	struct stat		 st;
 +	struct stat		*pst;
 +
 +	/* Information about the object being restored right now. */
 +	struct archive_entry	*entry; /* Entry being extracted. */
 +	char			*name; /* Name of entry, possibly edited. */
 +	struct archive_string	 _name_data; /* backing store for 'name' */
 +	/* Tasks remaining for this object. */
 +	int			 todo;
 +	/* Tasks deferred until end-of-archive. */
 +	int			 deferred;
 +	/* Options requested by the client. */
 +	int			 flags;
 +	/* Handle for the file we're restoring. */
 +	int			 fd;
 +	/* Current offset for writing data to the file. */
 +	int64_t			 offset;
 +	/* Last offset actually written to disk. */
 +	int64_t			 fd_offset;
 +	/* Total bytes actually written to files. */
 +	int64_t			 total_bytes_written;
 +	/* Maximum size of file, -1 if unknown. */
 +	int64_t			 filesize;
 +	/* Dir we were in before this restore; only for deep paths. */
 +	int			 restore_pwd;
 +	/* Mode we should use for this entry; affected by _PERM and umask. */
 +	mode_t			 mode;
 +	/* UID/GID to use in restoring this entry. */
 +	int64_t			 uid;
 +	int64_t			 gid;
 +	/*
 +	 * HFS+ Compression.
 +	 */
 +	/* Xattr "com.apple.decmpfs". */
 +	uint32_t		 decmpfs_attr_size;
 +	unsigned char		*decmpfs_header_p;
 +	/* ResourceFork set options used for fsetxattr. */
 +	int			 rsrc_xattr_options;
 +	/* Xattr "com.apple.ResourceFork". */
 +	unsigned char		*resource_fork;
 +	size_t			 resource_fork_allocated_size;
 +	unsigned int		 decmpfs_block_count;
 +	uint32_t		*decmpfs_block_info;
 +	/* Buffer for compressed data. */
 +	unsigned char		*compressed_buffer;
 +	size_t			 compressed_buffer_size;
 +	size_t			 compressed_buffer_remaining;
 +	/* The offset of the ResourceFork where compressed data will
 +	 * be placed. */
 +	uint32_t		 compressed_rsrc_position;
 +	uint32_t		 compressed_rsrc_position_v;
 +	/* Buffer for uncompressed data. */
 +	char			*uncompressed_buffer;
 +	size_t			 block_remaining_bytes;
 +	size_t			 file_remaining_bytes;
 +#ifdef HAVE_ZLIB_H
 +	z_stream		 stream;
 +	int			 stream_valid;
 +	int			 decmpfs_compression_level;
 +#endif
 +};
 +
 +/*
 + * Default mode for dirs created automatically (will be modified by umask).
 + * Note that POSIX specifies 0777 for implicitly-created dirs, "modified
 + * by the process' file creation mask."
 + */
 +#define	DEFAULT_DIR_MODE 0777
 +/*
 + * Dir modes are restored in two steps:  During the extraction, the permissions
 + * in the archive are modified to match the following limits.  During
 + * the post-extract fixup pass, the permissions from the archive are
 + * applied.
 + */
 +#define	MINIMUM_DIR_MODE 0700
 +#define	MAXIMUM_DIR_MODE 0775
 +
 +/*
 + * Maxinum uncompressed size of a decmpfs block.
 + */
 +#define MAX_DECMPFS_BLOCK_SIZE	(64 * 1024)
 +/*
 + * HFS+ compression type.
 + */
 +#define CMP_XATTR		3/* Compressed data in xattr. */
 +#define CMP_RESOURCE_FORK	4/* Compressed data in resource fork. */
 +/*
 + * HFS+ compression resource fork.
 + */
 +#define RSRC_H_SIZE	260	/* Base size of Resource fork header. */
 +#define RSRC_F_SIZE	50	/* Size of Resource fork footer. */
 +/* Size to write compressed data to resource fork. */
 +#define COMPRESSED_W_SIZE	(64 * 1024)
 +/* decmpfs difinitions. */
 +#define MAX_DECMPFS_XATTR_SIZE		3802
 +#ifndef DECMPFS_XATTR_NAME
 +#define DECMPFS_XATTR_NAME		"com.apple.decmpfs"
 +#endif
 +#define DECMPFS_MAGIC			0x636d7066
 +#define DECMPFS_COMPRESSION_MAGIC	0
 +#define DECMPFS_COMPRESSION_TYPE	4
 +#define DECMPFS_UNCOMPRESSED_SIZE	8
 +#define DECMPFS_HEADER_SIZE		16
 +
 +#define HFS_BLOCKS(s)	((s) >> 12)
 +
 +static int	check_symlinks(struct archive_write_disk *);
 +static int	create_filesystem_object(struct archive_write_disk *);
 +static struct fixup_entry *current_fixup(struct archive_write_disk *, const char *pathname);
 +#if defined(HAVE_FCHDIR) && defined(PATH_MAX)
 +static void	edit_deep_directories(struct archive_write_disk *ad);
 +#endif
 +static int	cleanup_pathname(struct archive_write_disk *);
 +static int	create_dir(struct archive_write_disk *, char *);
 +static int	create_parent_dir(struct archive_write_disk *, char *);
 +static ssize_t	hfs_write_data_block(struct archive_write_disk *,
 +		    const char *, size_t);
 +static int	fixup_appledouble(struct archive_write_disk *, const char *);
 +static int	older(struct stat *, struct archive_entry *);
 +static int	restore_entry(struct archive_write_disk *);
 +static int	set_mac_metadata(struct archive_write_disk *, const char *,
 +				 const void *, size_t);
 +static int	set_xattrs(struct archive_write_disk *);
++static int	clear_nochange_fflags(struct archive_write_disk *);
 +static int	set_fflags(struct archive_write_disk *);
 +static int	set_fflags_platform(struct archive_write_disk *, int fd,
 +		    const char *name, mode_t mode,
 +		    unsigned long fflags_set, unsigned long fflags_clear);
 +static int	set_ownership(struct archive_write_disk *);
 +static int	set_mode(struct archive_write_disk *, int mode);
 +static int	set_time(int, int, const char *, time_t, long, time_t, long);
 +static int	set_times(struct archive_write_disk *, int, int, const char *,
 +		    time_t, long, time_t, long, time_t, long, time_t, long);
 +static int	set_times_from_entry(struct archive_write_disk *);
 +static struct fixup_entry *sort_dir_list(struct fixup_entry *p);
 +static ssize_t	write_data_block(struct archive_write_disk *,
 +		    const char *, size_t);
 +
 +static struct archive_vtable *archive_write_disk_vtable(void);
 +
 +static int	_archive_write_disk_close(struct archive *);
 +static int	_archive_write_disk_free(struct archive *);
 +static int	_archive_write_disk_header(struct archive *, struct archive_entry *);
 +static int64_t	_archive_write_disk_filter_bytes(struct archive *, int);
 +static int	_archive_write_disk_finish_entry(struct archive *);
 +static ssize_t	_archive_write_disk_data(struct archive *, const void *, size_t);
 +static ssize_t	_archive_write_disk_data_block(struct archive *, const void *, size_t, int64_t);
 +
 +static int
 +lazy_stat(struct archive_write_disk *a)
 +{
 +	if (a->pst != NULL) {
 +		/* Already have stat() data available. */
 +		return (ARCHIVE_OK);
 +	}
 +#ifdef HAVE_FSTAT
 +	if (a->fd >= 0 && fstat(a->fd, &a->st) == 0) {
 +		a->pst = &a->st;
 +		return (ARCHIVE_OK);
 +	}
 +#endif
 +	/*
 +	 * XXX At this point, symlinks should not be hit, otherwise
 +	 * XXX a race occurred.  Do we want to check explicitly for that?
 +	 */
 +	if (lstat(a->name, &a->st) == 0) {
 +		a->pst = &a->st;
 +		return (ARCHIVE_OK);
 +	}
 +	archive_set_error(&a->archive, errno, "Couldn't stat file");
 +	return (ARCHIVE_WARN);
 +}
 +
 +static struct archive_vtable *
 +archive_write_disk_vtable(void)
 +{
 +	static struct archive_vtable av;
 +	static int inited = 0;
 +
 +	if (!inited) {
 +		av.archive_close = _archive_write_disk_close;
 +		av.archive_filter_bytes = _archive_write_disk_filter_bytes;
 +		av.archive_free = _archive_write_disk_free;
 +		av.archive_write_header = _archive_write_disk_header;
 +		av.archive_write_finish_entry
 +		    = _archive_write_disk_finish_entry;
 +		av.archive_write_data = _archive_write_disk_data;
 +		av.archive_write_data_block = _archive_write_disk_data_block;
 +		inited = 1;
 +	}
 +	return (&av);
 +}
 +
 +static int64_t
 +_archive_write_disk_filter_bytes(struct archive *_a, int n)
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +	(void)n; /* UNUSED */
 +	if (n == -1 || n == 0)
 +		return (a->total_bytes_written);
 +	return (-1);
 +}
 +
 +
 +int
 +archive_write_disk_set_options(struct archive *_a, int flags)
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +
 +	a->flags = flags;
 +	return (ARCHIVE_OK);
 +}
 +
 +
 +/*
 + * Extract this entry to disk.
 + *
 + * TODO: Validate hardlinks.  According to the standards, we're
 + * supposed to check each extracted hardlink and squawk if it refers
 + * to a file that we didn't restore.  I'm not entirely convinced this
 + * is a good idea, but more importantly: Is there any way to validate
 + * hardlinks without keeping a complete list of filenames from the
 + * entire archive?? Ugh.
 + *
 + */
 +static int
 +_archive_write_disk_header(struct archive *_a, struct archive_entry *entry)
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +	struct fixup_entry *fe;
 +	int ret, r;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
 +	    "archive_write_disk_header");
 +	archive_clear_error(&a->archive);
 +	if (a->archive.state & ARCHIVE_STATE_DATA) {
 +		r = _archive_write_disk_finish_entry(&a->archive);
 +		if (r == ARCHIVE_FATAL)
 +			return (r);
 +	}
 +
 +	/* Set up for this particular entry. */
 +	a->pst = NULL;
 +	a->current_fixup = NULL;
 +	a->deferred = 0;
 +	if (a->entry) {
 +		archive_entry_free(a->entry);
 +		a->entry = NULL;
 +	}
 +	a->entry = archive_entry_clone(entry);
 +	a->fd = -1;
 +	a->fd_offset = 0;
 +	a->offset = 0;
 +	a->restore_pwd = -1;
 +	a->uid = a->user_uid;
 +	a->mode = archive_entry_mode(a->entry);
 +	if (archive_entry_size_is_set(a->entry))
 +		a->filesize = archive_entry_size(a->entry);
 +	else
 +		a->filesize = -1;
 +	archive_strcpy(&(a->_name_data), archive_entry_pathname(a->entry));
 +	a->name = a->_name_data.s;
 +	archive_clear_error(&a->archive);
 +
 +	/*
 +	 * Clean up the requested path.  This is necessary for correct
 +	 * dir restores; the dir restore logic otherwise gets messed
 +	 * up by nonsense like "dir/.".
 +	 */
 +	ret = cleanup_pathname(a);
 +	if (ret != ARCHIVE_OK)
 +		return (ret);
 +
 +	/*
 +	 * Query the umask so we get predictable mode settings.
 +	 * This gets done on every call to _write_header in case the
 +	 * user edits their umask during the extraction for some
 +	 * reason.
 +	 */
 +	umask(a->user_umask = umask(0));
 +
 +	/* Figure out what we need to do for this entry. */
 +	a->todo = TODO_MODE_BASE;
 +	if (a->flags & ARCHIVE_EXTRACT_PERM) {
 +		a->todo |= TODO_MODE_FORCE; /* Be pushy about permissions. */
 +		/*
 +		 * SGID requires an extra "check" step because we
 +		 * cannot easily predict the GID that the system will
 +		 * assign.  (Different systems assign GIDs to files
 +		 * based on a variety of criteria, including process
 +		 * credentials and the gid of the enclosing
 +		 * directory.)  We can only restore the SGID bit if
 +		 * the file has the right GID, and we only know the
 +		 * GID if we either set it (see set_ownership) or if
 +		 * we've actually called stat() on the file after it
 +		 * was restored.  Since there are several places at
 +		 * which we might verify the GID, we need a TODO bit
 +		 * to keep track.
 +		 */
 +		if (a->mode & S_ISGID)
 +			a->todo |= TODO_SGID | TODO_SGID_CHECK;
 +		/*
 +		 * Verifying the SUID is simpler, but can still be
 +		 * done in multiple ways, hence the separate "check" bit.
 +		 */
 +		if (a->mode & S_ISUID)
 +			a->todo |= TODO_SUID | TODO_SUID_CHECK;
 +	} else {
 +		/*
 +		 * User didn't request full permissions, so don't
 +		 * restore SUID, SGID bits and obey umask.
 +		 */
 +		a->mode &= ~S_ISUID;
 +		a->mode &= ~S_ISGID;
 +		a->mode &= ~S_ISVTX;
 +		a->mode &= ~a->user_umask;
 +	}
 +	if (a->flags & ARCHIVE_EXTRACT_OWNER)
 +		a->todo |= TODO_OWNER;
 +	if (a->flags & ARCHIVE_EXTRACT_TIME)
 +		a->todo |= TODO_TIMES;
 +	if (a->flags & ARCHIVE_EXTRACT_ACL) {
 +		if (archive_entry_filetype(a->entry) == AE_IFDIR)
 +			a->deferred |= TODO_ACLS;
 +		else
 +			a->todo |= TODO_ACLS;
 +	}
 +	if (a->flags & ARCHIVE_EXTRACT_MAC_METADATA) {
 +		if (archive_entry_filetype(a->entry) == AE_IFDIR)
 +			a->deferred |= TODO_MAC_METADATA;
 +		else
 +			a->todo |= TODO_MAC_METADATA;
 +	}
 +#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_ZLIB_H)
 +	if ((a->flags & ARCHIVE_EXTRACT_NO_HFS_COMPRESSION) == 0) {
 +		unsigned long set, clear;
 +		archive_entry_fflags(a->entry, &set, &clear);
 +		if ((set & ~clear) & UF_COMPRESSED) {
 +			a->todo |= TODO_HFS_COMPRESSION;
 +			a->decmpfs_block_count = (unsigned)-1;
 +		}
 +	}
 +	if ((a->flags & ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED) != 0 &&
 +	    (a->mode & AE_IFMT) == AE_IFREG && a->filesize > 0) {
 +		a->todo |= TODO_HFS_COMPRESSION;
 +		a->decmpfs_block_count = (unsigned)-1;
 +	}
 +	{
 +		const char *p;
 +
 +		/* Check if the current file name is a type of the
 +		 * resource fork file. */
 +		p = strrchr(a->name, '/');
 +		if (p == NULL)
 +			p = a->name;
 +		else
 +			p++;
 +		if (p[0] == '.' && p[1] == '_') {
 +			/* Do not compress "._XXX" files. */
 +			a->todo &= ~TODO_HFS_COMPRESSION;
 +			if (a->filesize > 0)
 +				a->todo |= TODO_APPLEDOUBLE;
 +		}
 +	}
 +#endif
 +
 +	if (a->flags & ARCHIVE_EXTRACT_XATTR)
 +		a->todo |= TODO_XATTR;
 +	if (a->flags & ARCHIVE_EXTRACT_FFLAGS)
 +		a->todo |= TODO_FFLAGS;
 +	if (a->flags & ARCHIVE_EXTRACT_SECURE_SYMLINKS) {
 +		ret = check_symlinks(a);
 +		if (ret != ARCHIVE_OK)
 +			return (ret);
 +	}
 +#if defined(HAVE_FCHDIR) && defined(PATH_MAX)
 +	/* If path exceeds PATH_MAX, shorten the path. */
 +	edit_deep_directories(a);
 +#endif
 +
 +	ret = restore_entry(a);
 +
 +#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_ZLIB_H)
 +	/*
 +	 * Check if the filesystem the file is restoring on supports
 +	 * HFS+ Compression. If not, cancel HFS+ Compression.
 +	 */
 +	if (a->todo | TODO_HFS_COMPRESSION) {
 +		/*
 +		 * NOTE: UF_COMPRESSED is ignored even if the filesystem
 +		 * supports HFS+ Compression because the file should
 +		 * have at least an extended attriute "com.apple.decmpfs"
 +		 * before the flag is set to indicate that the file have
 +		 * been compressed. If hte filesystem does not support
 +		 * HFS+ Compression the system call will fail.
 +		 */
 +		if (a->fd < 0 || fchflags(a->fd, UF_COMPRESSED) != 0)
 +			a->todo &= ~TODO_HFS_COMPRESSION;
 +	}
 +#endif
 +
 +	/*
 +	 * TODO: There are rumours that some extended attributes must
 +	 * be restored before file data is written.  If this is true,
 +	 * then we either need to write all extended attributes both
 +	 * before and after restoring the data, or find some rule for
 +	 * determining which must go first and which last.  Due to the
 +	 * many ways people are using xattrs, this may prove to be an
 +	 * intractable problem.
 +	 */
 +
 +#ifdef HAVE_FCHDIR
 +	/* If we changed directory above, restore it here. */
 +	if (a->restore_pwd >= 0) {
 +		r = fchdir(a->restore_pwd);
 +		if (r != 0) {
 +			archive_set_error(&a->archive, errno, "chdir() failure");
 +			ret = ARCHIVE_FATAL;
 +		}
 +		close(a->restore_pwd);
 +		a->restore_pwd = -1;
 +	}
 +#endif
 +
 +	/*
 +	 * Fixup uses the unedited pathname from archive_entry_pathname(),
 +	 * because it is relative to the base dir and the edited path
 +	 * might be relative to some intermediate dir as a result of the
 +	 * deep restore logic.
 +	 */
 +	if (a->deferred & TODO_MODE) {
 +		fe = current_fixup(a, archive_entry_pathname(entry));
 +		if (fe == NULL)
 +			return (ARCHIVE_FATAL);
 +		fe->fixup |= TODO_MODE_BASE;
 +		fe->mode = a->mode;
 +	}
 +
 +	if ((a->deferred & TODO_TIMES)
 +		&& (archive_entry_mtime_is_set(entry)
 +		    || archive_entry_atime_is_set(entry))) {
 +		fe = current_fixup(a, archive_entry_pathname(entry));
 +		if (fe == NULL)
 +			return (ARCHIVE_FATAL);
 +		fe->mode = a->mode;
 +		fe->fixup |= TODO_TIMES;
 +		if (archive_entry_atime_is_set(entry)) {
 +			fe->atime = archive_entry_atime(entry);
 +			fe->atime_nanos = archive_entry_atime_nsec(entry);
 +		} else {
 +			/* If atime is unset, use start time. */
 +			fe->atime = a->start_time;
 +			fe->atime_nanos = 0;
 +		}
 +		if (archive_entry_mtime_is_set(entry)) {
 +			fe->mtime = archive_entry_mtime(entry);
 +			fe->mtime_nanos = archive_entry_mtime_nsec(entry);
 +		} else {
 +			/* If mtime is unset, use start time. */
 +			fe->mtime = a->start_time;
 +			fe->mtime_nanos = 0;
 +		}
 +		if (archive_entry_birthtime_is_set(entry)) {
 +			fe->birthtime = archive_entry_birthtime(entry);
 +			fe->birthtime_nanos = archive_entry_birthtime_nsec(entry);
 +		} else {
 +			/* If birthtime is unset, use mtime. */
 +			fe->birthtime = fe->mtime;
 +			fe->birthtime_nanos = fe->mtime_nanos;
 +		}
 +	}
 +
 +	if (a->deferred & TODO_ACLS) {
 +		fe = current_fixup(a, archive_entry_pathname(entry));
 +		if (fe == NULL)
 +			return (ARCHIVE_FATAL);
 +		fe->fixup |= TODO_ACLS;
 +		archive_acl_copy(&fe->acl, archive_entry_acl(entry));
 +	}
 +
 +	if (a->deferred & TODO_MAC_METADATA) {
 +		const void *metadata;
 +		size_t metadata_size;
 +		metadata = archive_entry_mac_metadata(a->entry, &metadata_size);
 +		if (metadata != NULL && metadata_size > 0) {
 +			fe = current_fixup(a, archive_entry_pathname(entry));
 +			if (fe == NULL)
 +				return (ARCHIVE_FATAL);
 +			fe->mac_metadata = malloc(metadata_size);
 +			if (fe->mac_metadata != NULL) {
 +				memcpy(fe->mac_metadata, metadata, metadata_size);
 +				fe->mac_metadata_size = metadata_size;
 +				fe->fixup |= TODO_MAC_METADATA;
 +			}
 +		}
 +	}
 +
 +	if (a->deferred & TODO_FFLAGS) {
 +		fe = current_fixup(a, archive_entry_pathname(entry));
 +		if (fe == NULL)
 +			return (ARCHIVE_FATAL);
 +		fe->fixup |= TODO_FFLAGS;
 +		/* TODO: Complete this.. defer fflags from below. */
 +	}
 +
 +	/* We've created the object and are ready to pour data into it. */
 +	if (ret >= ARCHIVE_WARN)
 +		a->archive.state = ARCHIVE_STATE_DATA;
 +	/*
 +	 * If it's not open, tell our client not to try writing.
 +	 * In particular, dirs, links, etc, don't get written to.
 +	 */
 +	if (a->fd < 0) {
 +		archive_entry_set_size(entry, 0);
 +		a->filesize = 0;
 +	}
 +
 +	return (ret);
 +}
 +
 +int
 +archive_write_disk_set_skip_file(struct archive *_a, int64_t d, int64_t i)
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_ANY, "archive_write_disk_set_skip_file");
 +	a->skip_file_set = 1;
 +	a->skip_file_dev = d;
 +	a->skip_file_ino = i;
 +	return (ARCHIVE_OK);
 +}
 +
 +static ssize_t
 +write_data_block(struct archive_write_disk *a, const char *buff, size_t size)
 +{
 +	uint64_t start_size = size;
 +	ssize_t bytes_written = 0;
 +	ssize_t block_size = 0, bytes_to_write;
 +
 +	if (size == 0)
 +		return (ARCHIVE_OK);
 +
 +	if (a->filesize == 0 || a->fd < 0) {
 +		archive_set_error(&a->archive, 0,
 +		    "Attempt to write to an empty file");
 +		return (ARCHIVE_WARN);
 +	}
 +
 +	if (a->flags & ARCHIVE_EXTRACT_SPARSE) {
 +#if HAVE_STRUCT_STAT_ST_BLKSIZE
 +		int r;
 +		if ((r = lazy_stat(a)) != ARCHIVE_OK)
 +			return (r);
 +		block_size = a->pst->st_blksize;
 +#else
 +		/* XXX TODO XXX Is there a more appropriate choice here ? */
 +		/* This needn't match the filesystem allocation size. */
 +		block_size = 16*1024;
 +#endif
 +	}
 +
 +	/* If this write would run beyond the file size, truncate it. */
 +	if (a->filesize >= 0 && (int64_t)(a->offset + size) > a->filesize)
 +		start_size = size = (size_t)(a->filesize - a->offset);
 +
 +	/* Write the data. */
 +	while (size > 0) {
 +		if (block_size == 0) {
 +			bytes_to_write = size;
 +		} else {
 +			/* We're sparsifying the file. */
 +			const char *p, *end;
 +			int64_t block_end;
 +
 +			/* Skip leading zero bytes. */
 +			for (p = buff, end = buff + size; p < end; ++p) {
 +				if (*p != '\0')
 +					break;
 +			}
 +			a->offset += p - buff;
 +			size -= p - buff;
 +			buff = p;
 +			if (size == 0)
 +				break;
 +
 +			/* Calculate next block boundary after offset. */
 +			block_end
 +			    = (a->offset / block_size + 1) * block_size;
 +
 +			/* If the adjusted write would cross block boundary,
 +			 * truncate it to the block boundary. */
 +			bytes_to_write = size;
 +			if (a->offset + bytes_to_write > block_end)
 +				bytes_to_write = block_end - a->offset;
 +		}
 +		/* Seek if necessary to the specified offset. */
 +		if (a->offset != a->fd_offset) {
 +			if (lseek(a->fd, a->offset, SEEK_SET) < 0) {
 +				archive_set_error(&a->archive, errno,
 +				    "Seek failed");
 +				return (ARCHIVE_FATAL);
 +			}
 +			a->fd_offset = a->offset;
 +		}
 +		bytes_written = write(a->fd, buff, bytes_to_write);
 +		if (bytes_written < 0) {
 +			archive_set_error(&a->archive, errno, "Write failed");
 +			return (ARCHIVE_WARN);
 +		}
 +		buff += bytes_written;
 +		size -= bytes_written;
 +		a->total_bytes_written += bytes_written;
 +		a->offset += bytes_written;
 +		a->fd_offset = a->offset;
 +	}
 +	return (start_size - size);
 +}
 +
 +#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_SYS_XATTR_H)\
 +	&& defined(HAVE_ZLIB_H)
 +
 +/*
 + * Set UF_COMPRESSED file flag.
 + * This have to be called after hfs_write_decmpfs() because if the
 + * file does not have "com.apple.decmpfs" xattr the flag is ignored.
 + */
 +static int
 +hfs_set_compressed_fflag(struct archive_write_disk *a)
 +{
 +	int r;
 +
 +	if ((r = lazy_stat(a)) != ARCHIVE_OK)
 +		return (r);
 +
 +	a->st.st_flags |= UF_COMPRESSED;
 +	if (fchflags(a->fd, a->st.st_flags) != 0) {
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to set UF_COMPRESSED file flag");
 +		return (ARCHIVE_WARN);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * HFS+ Compression decmpfs
 + *
 + *     +------------------------------+ +0
 + *     |      Magic(LE 4 bytes)       |
 + *     +------------------------------+
 + *     |      Type(LE 4 bytes)        |
 + *     +------------------------------+
 + *     | Uncompressed size(LE 8 bytes)|
 + *     +------------------------------+ +16
 + *     |                              |
 + *     |       Compressed data        |
 + *     |  (Placed only if Type == 3)  |
 + *     |                              |
 + *     +------------------------------+  +3802 = MAX_DECMPFS_XATTR_SIZE
 + *
 + *  Type is 3: decmpfs has compressed data.
 + *  Type is 4: Resource Fork has compressed data.
 + */
 +/*
 + * Write "com.apple.decmpfs"
 + */
 +static int
 +hfs_write_decmpfs(struct archive_write_disk *a)
 +{
 +	int r;
 +	uint32_t compression_type;
 +
 +	r = fsetxattr(a->fd, DECMPFS_XATTR_NAME, a->decmpfs_header_p,
 +	    a->decmpfs_attr_size, 0, 0);
 +	if (r < 0) {
 +		archive_set_error(&a->archive, errno,
 +		    "Cannot restore xattr:%s", DECMPFS_XATTR_NAME);
 +		compression_type = archive_le32dec(
 +		    &a->decmpfs_header_p[DECMPFS_COMPRESSION_TYPE]);
 +		if (compression_type == CMP_RESOURCE_FORK)
 +			fremovexattr(a->fd, XATTR_RESOURCEFORK_NAME,
 +			    XATTR_SHOWCOMPRESSION);
 +		return (ARCHIVE_WARN);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * HFS+ Compression Resource Fork
 + *
 + *     +-----------------------------+
 + *     |     Header(260 bytes)       |
 + *     +-----------------------------+
 + *     |   Block count(LE 4 bytes)   |
 + *     +-----------------------------+  --+
 + * +-- |     Offset (LE 4 bytes)     |    |
 + * |   | [distance from Block count] |    | Block 0
 + * |   +-----------------------------+    |
 + * |   | Compressed size(LE 4 bytes) |    |
 + * |   +-----------------------------+  --+
 + * |   |                             |
 + * |   |      ..................     |
 + * |   |                             |
 + * |   +-----------------------------+  --+
 + * |   |     Offset (LE 4 bytes)     |    |
 + * |   +-----------------------------+    | Block (Block count -1)
 + * |   | Compressed size(LE 4 bytes) |    |
 + * +-> +-----------------------------+  --+
 + *     |   Compressed data(n bytes)  |  Block 0
 + *     +-----------------------------+
 + *     |                             |
 + *     |      ..................     |
 + *     |                             |
 + *     +-----------------------------+
 + *     |   Compressed data(n bytes)  |  Block (Block count -1)
 + *     +-----------------------------+
 + *     |      Footer(50 bytes)       |
 + *     +-----------------------------+
 + *
 + */
 +/*
 + * Write the header of "com.apple.ResourceFork"
 + */
 +static int
 +hfs_write_resource_fork(struct archive_write_disk *a, unsigned char *buff,
 +    size_t bytes, uint32_t position)
 +{
 +	int ret;
 +
 +	ret = fsetxattr(a->fd, XATTR_RESOURCEFORK_NAME, buff, bytes,
 +	    position, a->rsrc_xattr_options);
 +	if (ret < 0) {
 +		archive_set_error(&a->archive, errno,
 +		    "Cannot restore xattr: %s at %u pos %u bytes",
 +		    XATTR_RESOURCEFORK_NAME,
 +		    (unsigned)position,
 +		    (unsigned)bytes);
 +		return (ARCHIVE_WARN);
 +	}
 +	a->rsrc_xattr_options &= ~XATTR_CREATE;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +hfs_write_compressed_data(struct archive_write_disk *a, size_t bytes_compressed)
 +{
 +	int ret;
 +
 +	ret = hfs_write_resource_fork(a, a->compressed_buffer,
 +	    bytes_compressed, a->compressed_rsrc_position);
 +	if (ret == ARCHIVE_OK)
 +		a->compressed_rsrc_position += bytes_compressed;
 +	return (ret);
 +}
 +
 +static int
 +hfs_write_resource_fork_header(struct archive_write_disk *a)
 +{
 +	unsigned char *buff;
 +	uint32_t rsrc_bytes;
 +	uint32_t rsrc_header_bytes;
 +
 +	/*
 +	 * Write resource fork header + block info.
 +	 */
 +	buff = a->resource_fork;
 +	rsrc_bytes = a->compressed_rsrc_position - RSRC_F_SIZE;
 +	rsrc_header_bytes =
 +		RSRC_H_SIZE +		/* Header base size. */
 +		4 +			/* Block count. */
 +		(a->decmpfs_block_count * 8);/* Block info */
 +	archive_be32enc(buff, 0x100);
 +	archive_be32enc(buff + 4, rsrc_bytes);
 +	archive_be32enc(buff + 8, rsrc_bytes - 256);
 +	archive_be32enc(buff + 12, 0x32);
 +	memset(buff + 16, 0, 240);
 +	archive_be32enc(buff + 256, rsrc_bytes - 260);
 +	return hfs_write_resource_fork(a, buff, rsrc_header_bytes, 0);
 +}
 +
 +static size_t
 +hfs_set_resource_fork_footer(unsigned char *buff, size_t buff_size)
 +{
 +	static const char rsrc_footer[RSRC_F_SIZE] = {
 +		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +		0x00, 0x1c, 0x00, 0x32, 0x00, 0x00, 'c',  'm',
 +		'p', 'f',   0x00, 0x00, 0x00, 0x0a, 0x00, 0x01,
 +		0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +		0x00, 0x00
 +	};
 +	if (buff_size < sizeof(rsrc_footer))
 +		return (0);
 +	memcpy(buff, rsrc_footer, sizeof(rsrc_footer));
 +	return (sizeof(rsrc_footer));
 +}
 +
 +static int
 +hfs_reset_compressor(struct archive_write_disk *a)
 +{
 +	int ret;
 +
 +	if (a->stream_valid)
 +		ret = deflateReset(&a->stream);
 +	else
 +		ret = deflateInit(&a->stream, a->decmpfs_compression_level);
 +
 +	if (ret != Z_OK) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Failed to initialize compressor");
 +		return (ARCHIVE_FATAL);
 +	} else
 +		a->stream_valid = 1;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +hfs_decompress(struct archive_write_disk *a)
 +{
 +	uint32_t *block_info;
 +	unsigned int block_count;
 +	uint32_t data_pos, data_size;
 +	ssize_t r;
 +	ssize_t bytes_written, bytes_to_write;
 +	unsigned char *b;
 +
 +	block_info = (uint32_t *)(a->resource_fork + RSRC_H_SIZE);
 +	block_count = archive_le32dec(block_info++);
 +	while (block_count--) {
 +		data_pos = RSRC_H_SIZE + archive_le32dec(block_info++);
 +		data_size = archive_le32dec(block_info++);
 +		r = fgetxattr(a->fd, XATTR_RESOURCEFORK_NAME,
 +		    a->compressed_buffer, data_size, data_pos, 0);
 +		if (r != data_size)  {
 +			archive_set_error(&a->archive,
 +			    (r < 0)?errno:ARCHIVE_ERRNO_MISC,
 +			    "Failed to read resource fork");
 +			return (ARCHIVE_WARN);
 +		}
 +		if (a->compressed_buffer[0] == 0xff) {
 +			bytes_to_write = data_size -1;
 +			b = a->compressed_buffer + 1;
 +		} else {
 +			uLong dest_len = MAX_DECMPFS_BLOCK_SIZE;
 +			int zr;
 +
 +			zr = uncompress((Bytef *)a->uncompressed_buffer,
 +			    &dest_len, a->compressed_buffer, data_size);
 +			if (zr != Z_OK) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Failed to decompress resource fork");
 +				return (ARCHIVE_WARN);
 +			}
 +			bytes_to_write = dest_len;
 +			b = (unsigned char *)a->uncompressed_buffer;
 +		}
 +		do {
 +			bytes_written = write(a->fd, b, bytes_to_write);
 +			if (bytes_written < 0) {
 +				archive_set_error(&a->archive, errno,
 +				    "Write failed");
 +				return (ARCHIVE_WARN);
 +			}
 +			bytes_to_write -= bytes_written;
 +			b += bytes_written;
 +		} while (bytes_to_write > 0);
 +	}
 +	r = fremovexattr(a->fd, XATTR_RESOURCEFORK_NAME, 0);
 +	if (r == -1)  {
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to remove resource fork");
 +		return (ARCHIVE_WARN);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +hfs_drive_compressor(struct archive_write_disk *a, const char *buff,
 +    size_t size)
 +{
 +	unsigned char *buffer_compressed;
 +	size_t bytes_compressed;
 +	size_t bytes_used;
 +	int ret;
 +
 +	ret = hfs_reset_compressor(a);
 +	if (ret != ARCHIVE_OK)
 +		return (ret);
 +
 +	if (a->compressed_buffer == NULL) {
 +		size_t block_size;
 +
 +		block_size = COMPRESSED_W_SIZE + RSRC_F_SIZE +
 +		    + compressBound(MAX_DECMPFS_BLOCK_SIZE);
 +		a->compressed_buffer = malloc(block_size);
 +		if (a->compressed_buffer == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Resource Fork");
 +			return (ARCHIVE_FATAL);
 +		}
 +		a->compressed_buffer_size = block_size;
 +		a->compressed_buffer_remaining = block_size;
 +	}
 +
 +	buffer_compressed = a->compressed_buffer +
 +	    a->compressed_buffer_size - a->compressed_buffer_remaining;
 +	a->stream.next_in = (Bytef *)(uintptr_t)(const void *)buff;
 +	a->stream.avail_in = size;
 +	a->stream.next_out = buffer_compressed;
 +	a->stream.avail_out = a->compressed_buffer_remaining;
 +	do {
 +		ret = deflate(&a->stream, Z_FINISH);
 +		switch (ret) {
 +		case Z_OK:
 +		case Z_STREAM_END:
 +			break;
 +		default:
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Failed to compress data");
 +			return (ARCHIVE_FAILED);
 +		}
 +	} while (ret == Z_OK);
 +	bytes_compressed = a->compressed_buffer_remaining - a->stream.avail_out;
 +
 +	/*
 +	 * If the compressed size is larger than the original size,
 +	 * throw away compressed data, use uncompressed data instead.
 +	 */
 +	if (bytes_compressed > size) {
 +		buffer_compressed[0] = 0xFF;/* uncompressed marker. */
 +		memcpy(buffer_compressed + 1, buff, size);
 +		bytes_compressed = size + 1;
 +	}
 +	a->compressed_buffer_remaining -= bytes_compressed;
 +
 +	/*
 +	 * If the compressed size is smaller than MAX_DECMPFS_XATTR_SIZE
 +	 * and the block count in the file is only one, store compressed
 +	 * data to decmpfs xattr instead of the resource fork.
 +	 */
 +	if (a->decmpfs_block_count == 1 &&
 +	    (a->decmpfs_attr_size + bytes_compressed)
 +	      <= MAX_DECMPFS_XATTR_SIZE) {
 +		archive_le32enc(&a->decmpfs_header_p[DECMPFS_COMPRESSION_TYPE],
 +		    CMP_XATTR);
 +		memcpy(a->decmpfs_header_p + DECMPFS_HEADER_SIZE,
 +		    buffer_compressed, bytes_compressed);
 +		a->decmpfs_attr_size += bytes_compressed;
 +		a->compressed_buffer_remaining = a->compressed_buffer_size;
 +		/*
 +		 * Finish HFS+ Compression.
 +		 * - Write the decmpfs xattr.
 +		 * - Set the UF_COMPRESSED file flag.
 +		 */
 +		ret = hfs_write_decmpfs(a);
 +		if (ret == ARCHIVE_OK)
 +			ret = hfs_set_compressed_fflag(a);
 +		return (ret);
 +	}
 +
 +	/* Update block info. */
 +	archive_le32enc(a->decmpfs_block_info++,
 +	    a->compressed_rsrc_position_v - RSRC_H_SIZE);
 +	archive_le32enc(a->decmpfs_block_info++, bytes_compressed);
 +	a->compressed_rsrc_position_v += bytes_compressed;
 +
 +	/*
 +	 * Write the compressed data to the resource fork.
 +	 */
 +	bytes_used = a->compressed_buffer_size - a->compressed_buffer_remaining;
 +	while (bytes_used >= COMPRESSED_W_SIZE) {
 +		ret = hfs_write_compressed_data(a, COMPRESSED_W_SIZE);
 +		if (ret != ARCHIVE_OK)
 +			return (ret);
 +		bytes_used -= COMPRESSED_W_SIZE;
 +		if (bytes_used > COMPRESSED_W_SIZE)
 +			memmove(a->compressed_buffer,
 +			    a->compressed_buffer + COMPRESSED_W_SIZE,
 +			    bytes_used);
 +		else
 +			memcpy(a->compressed_buffer,
 +			    a->compressed_buffer + COMPRESSED_W_SIZE,
 +			    bytes_used);
 +	}
 +	a->compressed_buffer_remaining = a->compressed_buffer_size - bytes_used;
 +
 +	/*
 +	 * If the current block is the last block, write the remaining
 +	 * compressed data and the resource fork footer.
 +	 */
 +	if (a->file_remaining_bytes == 0) {
 +		size_t rsrc_size;
 +		int64_t bk;
 +
 +		/* Append the resource footer. */
 +		rsrc_size = hfs_set_resource_fork_footer(
 +		    a->compressed_buffer + bytes_used,
 +		    a->compressed_buffer_remaining);
 +		ret = hfs_write_compressed_data(a, bytes_used + rsrc_size);
 +		a->compressed_buffer_remaining = a->compressed_buffer_size;
 +
 +		/* If the compressed size is not enouph smaller than
 +		 * the uncompressed size. cancel HFS+ compression.
 +		 * TODO: study a behavior of ditto utility and improve
 +		 * the condition to fall back into no HFS+ compression. */
 +		bk = HFS_BLOCKS(a->compressed_rsrc_position);
 +		bk += bk >> 7;
 +		if (bk > HFS_BLOCKS(a->filesize))
 +			return hfs_decompress(a);
 +		/*
 +		 * Write the resourcefork header.
 +		 */
 +		if (ret == ARCHIVE_OK)
 +			ret = hfs_write_resource_fork_header(a);
 +		/*
 +		 * Finish HFS+ Compression.
 +		 * - Write the decmpfs xattr.
 +		 * - Set the UF_COMPRESSED file flag.
 +		 */
 +		if (ret == ARCHIVE_OK)
 +			ret = hfs_write_decmpfs(a);
 +		if (ret == ARCHIVE_OK)
 +			ret = hfs_set_compressed_fflag(a);
 +	}
 +	return (ret);
 +}
 +
 +static ssize_t
 +hfs_write_decmpfs_block(struct archive_write_disk *a, const char *buff,
 +    size_t size)
 +{
 +	const char *buffer_to_write;
 +	size_t bytes_to_write;
 +	int ret;
 +
 +	if (a->decmpfs_block_count == (unsigned)-1) {
 +		void *new_block;
 +		size_t new_size;
 +		unsigned int block_count;
 +
 +		if (a->decmpfs_header_p == NULL) {
 +			new_block = malloc(MAX_DECMPFS_XATTR_SIZE
 +			    + sizeof(uint32_t));
 +			if (new_block == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory for decmpfs");
 +				return (ARCHIVE_FATAL);
 +			}
 +			a->decmpfs_header_p = new_block;
 +		}
 +		a->decmpfs_attr_size = DECMPFS_HEADER_SIZE;
 +		archive_le32enc(&a->decmpfs_header_p[DECMPFS_COMPRESSION_MAGIC],
 +		    DECMPFS_MAGIC);
 +		archive_le32enc(&a->decmpfs_header_p[DECMPFS_COMPRESSION_TYPE],
 +		    CMP_RESOURCE_FORK);
 +		archive_le64enc(&a->decmpfs_header_p[DECMPFS_UNCOMPRESSED_SIZE],
 +		    a->filesize);
 +
 +		/* Calculate a block count of the file. */
 +		block_count =
 +		    (a->filesize + MAX_DECMPFS_BLOCK_SIZE -1) /
 +			MAX_DECMPFS_BLOCK_SIZE;
 +		/*
 +		 * Allocate buffer for resource fork.
 +		 * Set up related pointers;
 +		 */
 +		new_size =
 +		    RSRC_H_SIZE + /* header */
 +		    4 + /* Block count */
 +		    (block_count * sizeof(uint32_t) * 2) +
 +		    RSRC_F_SIZE; /* footer */
 +		if (new_size > a->resource_fork_allocated_size) {
 +			new_block = realloc(a->resource_fork, new_size);
 +			if (new_block == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory for ResourceFork");
 +				return (ARCHIVE_FATAL);
 +			}
 +			a->resource_fork_allocated_size = new_size;
 +			a->resource_fork = new_block;
 +		}
 +
 +		/* Allocate uncompressed buffer */
 +		if (a->uncompressed_buffer == NULL) {
 +			new_block = malloc(MAX_DECMPFS_BLOCK_SIZE);
 +			if (new_block == NULL) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory for decmpfs");
 +				return (ARCHIVE_FATAL);
 +			}
 +			a->uncompressed_buffer = new_block;
 +		}
 +		a->block_remaining_bytes = MAX_DECMPFS_BLOCK_SIZE;
 +		a->file_remaining_bytes = a->filesize;
 +		a->compressed_buffer_remaining = a->compressed_buffer_size;
 +
 +		/*
 +		 * Set up a resource fork.
 +		 */
 +		a->rsrc_xattr_options = XATTR_CREATE;
 +		/* Get the position where we are going to set a bunch
 +		 * of block info. */
 +		a->decmpfs_block_info =
 +		    (uint32_t *)(a->resource_fork + RSRC_H_SIZE);
 +		/* Set the block count to the resource fork. */
 +		archive_le32enc(a->decmpfs_block_info++, block_count);
 +		/* Get the position where we are goint to set compressed
 +		 * data. */
 +		a->compressed_rsrc_position =
 +		    RSRC_H_SIZE + 4 + (block_count * 8);
 +		a->compressed_rsrc_position_v = a->compressed_rsrc_position;
 +		a->decmpfs_block_count = block_count;
 +	}
 +
 +	/* Ignore redundant bytes. */
 +	if (a->file_remaining_bytes == 0)
 +		return ((ssize_t)size);
 +
 +	/* Do not overrun a block size. */
 +	if (size > a->block_remaining_bytes)
 +		bytes_to_write = a->block_remaining_bytes;
 +	else
 +		bytes_to_write = size;
 +	/* Do not overrun the file size. */
 +	if (bytes_to_write > a->file_remaining_bytes)
 +		bytes_to_write = a->file_remaining_bytes;
 +
 +	/* For efficiency, if a copy length is full of the uncompressed
 +	 * buffer size, do not copy writing data to it. */
 +	if (bytes_to_write == MAX_DECMPFS_BLOCK_SIZE)
 +		buffer_to_write = buff;
 +	else {
 +		memcpy(a->uncompressed_buffer +
 +		    MAX_DECMPFS_BLOCK_SIZE - a->block_remaining_bytes,
 +		    buff, bytes_to_write);
 +		buffer_to_write = a->uncompressed_buffer;
 +	}
 +	a->block_remaining_bytes -= bytes_to_write;
 +	a->file_remaining_bytes -= bytes_to_write;
 +
 +	if (a->block_remaining_bytes == 0 || a->file_remaining_bytes == 0) {
 +		ret = hfs_drive_compressor(a, buffer_to_write,
 +		    MAX_DECMPFS_BLOCK_SIZE - a->block_remaining_bytes);
 +		if (ret < 0)
 +			return (ret);
 +		a->block_remaining_bytes = MAX_DECMPFS_BLOCK_SIZE;
 +	}
 +	/* Ignore redundant bytes. */
 +	if (a->file_remaining_bytes == 0)
 +		return ((ssize_t)size);
 +	return (bytes_to_write);
 +}
 +
 +static ssize_t
 +hfs_write_data_block(struct archive_write_disk *a, const char *buff,
 +    size_t size)
 +{
 +	uint64_t start_size = size;
 +	ssize_t bytes_written = 0;
 +	ssize_t bytes_to_write;
 +
 +	if (size == 0)
 +		return (ARCHIVE_OK);
 +
 +	if (a->filesize == 0 || a->fd < 0) {
 +		archive_set_error(&a->archive, 0,
 +		    "Attempt to write to an empty file");
 +		return (ARCHIVE_WARN);
 +	}
 +
 +	/* If this write would run beyond the file size, truncate it. */
 +	if (a->filesize >= 0 && (int64_t)(a->offset + size) > a->filesize)
 +		start_size = size = (size_t)(a->filesize - a->offset);
 +
 +	/* Write the data. */
 +	while (size > 0) {
 +		bytes_to_write = size;
 +		/* Seek if necessary to the specified offset. */
 +		if (a->offset < a->fd_offset) {
 +			/* Can't support backword move. */
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Seek failed");
 +			return (ARCHIVE_FATAL);
 +		} else if (a->offset > a->fd_offset) {
 +			int64_t skip = a->offset - a->fd_offset;
 +			char nullblock[1024];
 +
 +			memset(nullblock, 0, sizeof(nullblock));
 +			while (skip > 0) {
 +				if (skip > (int64_t)sizeof(nullblock))
 +					bytes_written = hfs_write_decmpfs_block(
 +					    a, nullblock, sizeof(nullblock));
 +				else
 +					bytes_written = hfs_write_decmpfs_block(
 +					    a, nullblock, skip);
 +				if (bytes_written < 0) {
 +					archive_set_error(&a->archive, errno,
 +					    "Write failed");
 +					return (ARCHIVE_WARN);
 +				}
 +				skip -= bytes_written;
 +			}
 +
 +			a->fd_offset = a->offset;
 +		}
 +		bytes_written =
 +		    hfs_write_decmpfs_block(a, buff, bytes_to_write);
 +		if (bytes_written < 0)
 +			return (bytes_written);
 +		buff += bytes_written;
 +		size -= bytes_written;
 +		a->total_bytes_written += bytes_written;
 +		a->offset += bytes_written;
 +		a->fd_offset = a->offset;
 +	}
 +	return (start_size - size);
 +}
 +#else
 +static ssize_t
 +hfs_write_data_block(struct archive_write_disk *a, const char *buff,
 +    size_t size)
 +{
 +	return (write_data_block(a, buff, size));
 +}
 +#endif
 +
 +static ssize_t
 +_archive_write_disk_data_block(struct archive *_a,
 +    const void *buff, size_t size, int64_t offset)
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +	ssize_t r;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_DATA, "archive_write_data_block");
 +
 +	a->offset = offset;
 +	if (a->todo & TODO_HFS_COMPRESSION)
 +		r = hfs_write_data_block(a, buff, size);
 +	else
 +		r = write_data_block(a, buff, size);
 +	if (r < ARCHIVE_OK)
 +		return (r);
 +	if ((size_t)r < size) {
 +		archive_set_error(&a->archive, 0,
- 		    "Write request too large");
++		    "Too much data: Truncating file at %ju bytes", (uintmax_t)a->filesize);
 +		return (ARCHIVE_WARN);
 +	}
++#if ARCHIVE_VERSION_NUMBER < 3999000
 +	return (ARCHIVE_OK);
++#else
++	return (size);
++#endif
 +}
 +
 +static ssize_t
 +_archive_write_disk_data(struct archive *_a, const void *buff, size_t size)
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_DATA, "archive_write_data");
 +
 +	if (a->todo & TODO_HFS_COMPRESSION)
 +		return (hfs_write_data_block(a, buff, size));
 +	return (write_data_block(a, buff, size));
 +}
 +
 +static int
 +_archive_write_disk_finish_entry(struct archive *_a)
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +	int ret = ARCHIVE_OK;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
 +	    "archive_write_finish_entry");
 +	if (a->archive.state & ARCHIVE_STATE_HEADER)
 +		return (ARCHIVE_OK);
 +	archive_clear_error(&a->archive);
 +
 +	/* Pad or truncate file to the right size. */
 +	if (a->fd < 0) {
 +		/* There's no file. */
 +	} else if (a->filesize < 0) {
 +		/* File size is unknown, so we can't set the size. */
 +	} else if (a->fd_offset == a->filesize) {
 +		/* Last write ended at exactly the filesize; we're done. */
 +		/* Hopefully, this is the common case. */
 +#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_ZLIB_H)
 +	} else if (a->todo & TODO_HFS_COMPRESSION) {
 +		char null_d[1024];
 +		ssize_t r;
 +
 +		if (a->file_remaining_bytes)
 +			memset(null_d, 0, sizeof(null_d));
 +		while (a->file_remaining_bytes) {
 +			if (a->file_remaining_bytes > sizeof(null_d))
 +				r = hfs_write_data_block(
 +				    a, null_d, sizeof(null_d));
 +			else
 +				r = hfs_write_data_block(
 +				    a, null_d, a->file_remaining_bytes);
 +			if (r < 0)
 +				return ((int)r);
 +		}
 +#endif
 +	} else {
 +#if HAVE_FTRUNCATE
 +		if (ftruncate(a->fd, a->filesize) == -1 &&
 +		    a->filesize == 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "File size could not be restored");
 +			return (ARCHIVE_FAILED);
 +		}
 +#endif
 +		/*
 +		 * Not all platforms implement the XSI option to
 +		 * extend files via ftruncate.  Stat() the file again
 +		 * to see what happened.
 +		 */
 +		a->pst = NULL;
 +		if ((ret = lazy_stat(a)) != ARCHIVE_OK)
 +			return (ret);
 +		/* We can use lseek()/write() to extend the file if
 +		 * ftruncate didn't work or isn't available. */
 +		if (a->st.st_size < a->filesize) {
 +			const char nul = '\0';
 +			if (lseek(a->fd, a->filesize - 1, SEEK_SET) < 0) {
 +				archive_set_error(&a->archive, errno,
 +				    "Seek failed");
 +				return (ARCHIVE_FATAL);
 +			}
 +			if (write(a->fd, &nul, 1) < 0) {
 +				archive_set_error(&a->archive, errno,
 +				    "Write to restore size failed");
 +				return (ARCHIVE_FATAL);
 +			}
 +			a->pst = NULL;
 +		}
 +	}
 +
 +	/* Restore metadata. */
 +
 +	/*
 +	 * This is specific to Mac OS X.
 +	 * If the current file is an AppleDouble file, it should be
 +	 * linked with the data fork file and remove it.
 +	 */
 +	if (a->todo & TODO_APPLEDOUBLE) {
 +		int r2 = fixup_appledouble(a, a->name);
 +		if (r2 == ARCHIVE_EOF) {
 +			/* The current file has been successfully linked
 +			 * with the data fork file and removed. So there
 +			 * is nothing to do on the current file.  */
 +			goto finish_metadata;
 +		}
 +		if (r2 < ret) ret = r2;
 +	}
 +
 +	/*
 +	 * Look up the "real" UID only if we're going to need it.
 +	 * TODO: the TODO_SGID condition can be dropped here, can't it?
 +	 */
 +	if (a->todo & (TODO_OWNER | TODO_SUID | TODO_SGID)) {
 +		a->uid = archive_write_disk_uid(&a->archive,
 +		    archive_entry_uname(a->entry),
 +		    archive_entry_uid(a->entry));
 +	}
 +	/* Look up the "real" GID only if we're going to need it. */
 +	/* TODO: the TODO_SUID condition can be dropped here, can't it? */
 +	if (a->todo & (TODO_OWNER | TODO_SGID | TODO_SUID)) {
 +		a->gid = archive_write_disk_gid(&a->archive,
 +		    archive_entry_gname(a->entry),
 +		    archive_entry_gid(a->entry));
 +	 }
 +
 +	/*
 +	 * Restore ownership before set_mode tries to restore suid/sgid
 +	 * bits.  If we set the owner, we know what it is and can skip
 +	 * a stat() call to examine the ownership of the file on disk.
 +	 */
 +	if (a->todo & TODO_OWNER) {
 +		int r2 = set_ownership(a);
 +		if (r2 < ret) ret = r2;
 +	}
 +
 +	/*
 +	 * set_mode must precede ACLs on systems such as Solaris and
 +	 * FreeBSD where setting the mode implicitly clears extended ACLs
 +	 */
 +	if (a->todo & TODO_MODE) {
 +		int r2 = set_mode(a, a->mode);
 +		if (r2 < ret) ret = r2;
 +	}
 +
 +	/*
 +	 * Security-related extended attributes (such as
 +	 * security.capability on Linux) have to be restored last,
 +	 * since they're implicitly removed by other file changes.
 +	 */
 +	if (a->todo & TODO_XATTR) {
 +		int r2 = set_xattrs(a);
 +		if (r2 < ret) ret = r2;
 +	}
 +
 +	/*
 +	 * Some flags prevent file modification; they must be restored after
 +	 * file contents are written.
 +	 */
 +	if (a->todo & TODO_FFLAGS) {
 +		int r2 = set_fflags(a);
 +		if (r2 < ret) ret = r2;
 +	}
 +
 +	/*
 +	 * Time must follow most other metadata;
 +	 * otherwise atime will get changed.
 +	 */
 +	if (a->todo & TODO_TIMES) {
 +		int r2 = set_times_from_entry(a);
 +		if (r2 < ret) ret = r2;
 +	}
 +
 +	/*
 +	 * Mac extended metadata includes ACLs.
 +	 */
 +	if (a->todo & TODO_MAC_METADATA) {
 +		const void *metadata;
 +		size_t metadata_size;
 +		metadata = archive_entry_mac_metadata(a->entry, &metadata_size);
 +		if (metadata != NULL && metadata_size > 0) {
 +			int r2 = set_mac_metadata(a, archive_entry_pathname(
 +			    a->entry), metadata, metadata_size);
 +			if (r2 < ret) ret = r2;
 +		}
 +	}
 +
 +	/*
 +	 * ACLs must be restored after timestamps because there are
 +	 * ACLs that prevent attribute changes (including time).
 +	 */
 +	if (a->todo & TODO_ACLS) {
 +		int r2 = archive_write_disk_set_acls(&a->archive, a->fd,
 +				  archive_entry_pathname(a->entry),
 +				  archive_entry_acl(a->entry));
 +		if (r2 < ret) ret = r2;
 +	}
 +
 +finish_metadata:
 +	/* If there's an fd, we can close it now. */
 +	if (a->fd >= 0) {
 +		close(a->fd);
 +		a->fd = -1;
 +	}
 +	/* If there's an entry, we can release it now. */
 +	if (a->entry) {
 +		archive_entry_free(a->entry);
 +		a->entry = NULL;
 +	}
 +	a->archive.state = ARCHIVE_STATE_HEADER;
 +	return (ret);
 +}
 +
 +int
 +archive_write_disk_set_group_lookup(struct archive *_a,
 +    void *private_data,
 +    int64_t (*lookup_gid)(void *private, const char *gname, int64_t gid),
 +    void (*cleanup_gid)(void *private))
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_ANY, "archive_write_disk_set_group_lookup");
 +
 +	if (a->cleanup_gid != NULL && a->lookup_gid_data != NULL)
 +		(a->cleanup_gid)(a->lookup_gid_data);
 +
 +	a->lookup_gid = lookup_gid;
 +	a->cleanup_gid = cleanup_gid;
 +	a->lookup_gid_data = private_data;
 +	return (ARCHIVE_OK);
 +}
 +
 +int
 +archive_write_disk_set_user_lookup(struct archive *_a,
 +    void *private_data,
 +    int64_t (*lookup_uid)(void *private, const char *uname, int64_t uid),
 +    void (*cleanup_uid)(void *private))
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_ANY, "archive_write_disk_set_user_lookup");
 +
 +	if (a->cleanup_uid != NULL && a->lookup_uid_data != NULL)
 +		(a->cleanup_uid)(a->lookup_uid_data);
 +
 +	a->lookup_uid = lookup_uid;
 +	a->cleanup_uid = cleanup_uid;
 +	a->lookup_uid_data = private_data;
 +	return (ARCHIVE_OK);
 +}
 +
 +int64_t
 +archive_write_disk_gid(struct archive *_a, const char *name, int64_t id)
 +{
 +       struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +       archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +           ARCHIVE_STATE_ANY, "archive_write_disk_gid");
 +       if (a->lookup_gid)
 +               return (a->lookup_gid)(a->lookup_gid_data, name, id);
 +       return (id);
 +}
 + 
 +int64_t
 +archive_write_disk_uid(struct archive *_a, const char *name, int64_t id)
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_ANY, "archive_write_disk_uid");
 +	if (a->lookup_uid)
 +		return (a->lookup_uid)(a->lookup_uid_data, name, id);
 +	return (id);
 +}
 +
 +/*
 + * Create a new archive_write_disk object and initialize it with global state.
 + */
 +struct archive *
 +archive_write_disk_new(void)
 +{
 +	struct archive_write_disk *a;
 +
 +	a = (struct archive_write_disk *)malloc(sizeof(*a));
 +	if (a == NULL)
 +		return (NULL);
 +	memset(a, 0, sizeof(*a));
 +	a->archive.magic = ARCHIVE_WRITE_DISK_MAGIC;
 +	/* We're ready to write a header immediately. */
 +	a->archive.state = ARCHIVE_STATE_HEADER;
 +	a->archive.vtable = archive_write_disk_vtable();
 +	a->start_time = time(NULL);
 +	/* Query and restore the umask. */
 +	umask(a->user_umask = umask(0));
 +#ifdef HAVE_GETEUID
 +	a->user_uid = geteuid();
 +#endif /* HAVE_GETEUID */
 +	if (archive_string_ensure(&a->path_safe, 512) == NULL) {
 +		free(a);
 +		return (NULL);
 +	}
 +#ifdef HAVE_ZLIB_H
 +	a->decmpfs_compression_level = 5;
 +#endif
 +	return (&a->archive);
 +}
 +
 +
 +/*
 + * If pathname is longer than PATH_MAX, chdir to a suitable
 + * intermediate dir and edit the path down to a shorter suffix.  Note
 + * that this routine never returns an error; if the chdir() attempt
 + * fails for any reason, we just go ahead with the long pathname.  The
 + * object creation is likely to fail, but any error will get handled
 + * at that time.
 + */
 +#if defined(HAVE_FCHDIR) && defined(PATH_MAX)
 +static void
 +edit_deep_directories(struct archive_write_disk *a)
 +{
 +	int ret;
 +	char *tail = a->name;
 +
 +	/* If path is short, avoid the open() below. */
 +	if (strlen(tail) <= PATH_MAX)
 +		return;
 +
 +	/* Try to record our starting dir. */
 +	a->restore_pwd = open(".", O_RDONLY | O_BINARY | O_CLOEXEC);
 +	__archive_ensure_cloexec_flag(a->restore_pwd);
 +	if (a->restore_pwd < 0)
 +		return;
 +
 +	/* As long as the path is too long... */
 +	while (strlen(tail) > PATH_MAX) {
 +		/* Locate a dir prefix shorter than PATH_MAX. */
 +		tail += PATH_MAX - 8;
 +		while (tail > a->name && *tail != '/')
 +			tail--;
 +		/* Exit if we find a too-long path component. */
 +		if (tail <= a->name)
 +			return;
 +		/* Create the intermediate dir and chdir to it. */
 +		*tail = '\0'; /* Terminate dir portion */
 +		ret = create_dir(a, a->name);
 +		if (ret == ARCHIVE_OK && chdir(a->name) != 0)
 +			ret = ARCHIVE_FAILED;
 +		*tail = '/'; /* Restore the / we removed. */
 +		if (ret != ARCHIVE_OK)
 +			return;
 +		tail++;
 +		/* The chdir() succeeded; we've now shortened the path. */
 +		a->name = tail;
 +	}
 +	return;
 +}
 +#endif
 +
 +/*
 + * The main restore function.
 + */
 +static int
 +restore_entry(struct archive_write_disk *a)
 +{
 +	int ret = ARCHIVE_OK, en;
 +
 +	if (a->flags & ARCHIVE_EXTRACT_UNLINK && !S_ISDIR(a->mode)) {
 +		/*
 +		 * TODO: Fix this.  Apparently, there are platforms
 +		 * that still allow root to hose the entire filesystem
 +		 * by unlinking a dir.  The S_ISDIR() test above
 +		 * prevents us from using unlink() here if the new
 +		 * object is a dir, but that doesn't mean the old
 +		 * object isn't a dir.
 +		 */
++		if (a->flags & ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS)
++			(void)clear_nochange_fflags(a);
 +		if (unlink(a->name) == 0) {
 +			/* We removed it, reset cached stat. */
 +			a->pst = NULL;
 +		} else if (errno == ENOENT) {
 +			/* File didn't exist, that's just as good. */
 +		} else if (rmdir(a->name) == 0) {
 +			/* It was a dir, but now it's gone. */
 +			a->pst = NULL;
 +		} else {
 +			/* We tried, but couldn't get rid of it. */
 +			archive_set_error(&a->archive, errno,
 +			    "Could not unlink");
 +			return(ARCHIVE_FAILED);
 +		}
 +	}
 +
 +	/* Try creating it first; if this fails, we'll try to recover. */
 +	en = create_filesystem_object(a);
 +
 +	if ((en == ENOTDIR || en == ENOENT)
 +	    && !(a->flags & ARCHIVE_EXTRACT_NO_AUTODIR)) {
 +		/* If the parent dir doesn't exist, try creating it. */
 +		create_parent_dir(a, a->name);
 +		/* Now try to create the object again. */
 +		en = create_filesystem_object(a);
 +	}
 +
++	if ((en == ENOENT) && (archive_entry_hardlink(a->entry) != NULL)) {
++		archive_set_error(&a->archive, en,
++		    "Hard-link target '%s' does not exist.",
++		    archive_entry_hardlink(a->entry));
++		return (ARCHIVE_FAILED);
++	}
++
 +	if ((en == EISDIR || en == EEXIST)
 +	    && (a->flags & ARCHIVE_EXTRACT_NO_OVERWRITE)) {
 +		/* If we're not overwriting, we're done. */
 +		archive_entry_unset_size(a->entry);
 +		return (ARCHIVE_OK);
 +	}
 +
 +	/*
 +	 * Some platforms return EISDIR if you call
 +	 * open(O_WRONLY | O_EXCL | O_CREAT) on a directory, some
 +	 * return EEXIST.  POSIX is ambiguous, requiring EISDIR
 +	 * for open(O_WRONLY) on a dir and EEXIST for open(O_EXCL | O_CREAT)
 +	 * on an existing item.
 +	 */
 +	if (en == EISDIR) {
 +		/* A dir is in the way of a non-dir, rmdir it. */
 +		if (rmdir(a->name) != 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Can't remove already-existing dir");
 +			return (ARCHIVE_FAILED);
 +		}
 +		a->pst = NULL;
 +		/* Try again. */
 +		en = create_filesystem_object(a);
 +	} else if (en == EEXIST) {
 +		/*
 +		 * We know something is in the way, but we don't know what;
 +		 * we need to find out before we go any further.
 +		 */
 +		int r = 0;
 +		/*
 +		 * The SECURE_SYMLINKS logic has already removed a
 +		 * symlink to a dir if the client wants that.  So
 +		 * follow the symlink if we're creating a dir.
 +		 */
 +		if (S_ISDIR(a->mode))
 +			r = stat(a->name, &a->st);
 +		/*
 +		 * If it's not a dir (or it's a broken symlink),
 +		 * then don't follow it.
 +		 */
 +		if (r != 0 || !S_ISDIR(a->mode))
 +			r = lstat(a->name, &a->st);
 +		if (r != 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Can't stat existing object");
 +			return (ARCHIVE_FAILED);
 +		}
 +
 +		/*
 +		 * NO_OVERWRITE_NEWER doesn't apply to directories.
 +		 */
 +		if ((a->flags & ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER)
 +		    &&  !S_ISDIR(a->st.st_mode)) {
 +			if (!older(&(a->st), a->entry)) {
 +				archive_entry_unset_size(a->entry);
 +				return (ARCHIVE_OK);
 +			}
 +		}
 +
 +		/* If it's our archive, we're done. */
 +		if (a->skip_file_set &&
 +		    a->st.st_dev == (dev_t)a->skip_file_dev &&
 +		    a->st.st_ino == (ino_t)a->skip_file_ino) {
 +			archive_set_error(&a->archive, 0,
 +			    "Refusing to overwrite archive");
 +			return (ARCHIVE_FAILED);
 +		}
 +
 +		if (!S_ISDIR(a->st.st_mode)) {
 +			/* A non-dir is in the way, unlink it. */
++			if (a->flags & ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS)
++				(void)clear_nochange_fflags(a);
 +			if (unlink(a->name) != 0) {
 +				archive_set_error(&a->archive, errno,
 +				    "Can't unlink already-existing object");
 +				return (ARCHIVE_FAILED);
 +			}
 +			a->pst = NULL;
 +			/* Try again. */
 +			en = create_filesystem_object(a);
 +		} else if (!S_ISDIR(a->mode)) {
 +			/* A dir is in the way of a non-dir, rmdir it. */
++			if (a->flags & ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS)
++				(void)clear_nochange_fflags(a);
 +			if (rmdir(a->name) != 0) {
 +				archive_set_error(&a->archive, errno,
 +				    "Can't replace existing directory with non-directory");
 +				return (ARCHIVE_FAILED);
 +			}
 +			/* Try again. */
 +			en = create_filesystem_object(a);
 +		} else {
 +			/*
 +			 * There's a dir in the way of a dir.  Don't
 +			 * waste time with rmdir()/mkdir(), just fix
 +			 * up the permissions on the existing dir.
 +			 * Note that we don't change perms on existing
 +			 * dirs unless _EXTRACT_PERM is specified.
 +			 */
 +			if ((a->mode != a->st.st_mode)
 +			    && (a->todo & TODO_MODE_FORCE))
 +				a->deferred |= (a->todo & TODO_MODE);
 +			/* Ownership doesn't need deferred fixup. */
 +			en = 0; /* Forget the EEXIST. */
 +		}
 +	}
 +
 +	if (en) {
 +		/* Everything failed; give up here. */
 +		archive_set_error(&a->archive, en, "Can't create '%s'",
 +		    a->name);
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	a->pst = NULL; /* Cached stat data no longer valid. */
 +	return (ret);
 +}
 +
 +/*
 + * Returns 0 if creation succeeds, or else returns errno value from
 + * the failed system call.   Note:  This function should only ever perform
 + * a single system call.
 + */
 +static int
 +create_filesystem_object(struct archive_write_disk *a)
 +{
 +	/* Create the entry. */
 +	const char *linkname;
 +	mode_t final_mode, mode;
 +	int r;
 +
 +	/* We identify hard/symlinks according to the link names. */
 +	/* Since link(2) and symlink(2) don't handle modes, we're done here. */
 +	linkname = archive_entry_hardlink(a->entry);
 +	if (linkname != NULL) {
 +#if !HAVE_LINK
 +		return (EPERM);
 +#else
 +		r = link(linkname, a->name) ? errno : 0;
 +		/*
 +		 * New cpio and pax formats allow hardlink entries
 +		 * to carry data, so we may have to open the file
 +		 * for hardlink entries.
 +		 *
 +		 * If the hardlink was successfully created and
 +		 * the archive doesn't have carry data for it,
 +		 * consider it to be non-authoritative for meta data.
 +		 * This is consistent with GNU tar and BSD pax.
 +		 * If the hardlink does carry data, let the last
 +		 * archive entry decide ownership.
 +		 */
 +		if (r == 0 && a->filesize <= 0) {
 +			a->todo = 0;
 +			a->deferred = 0;
 +		} else if (r == 0 && a->filesize > 0) {
 +			a->fd = open(a->name,
 +				     O_WRONLY | O_TRUNC | O_BINARY | O_CLOEXEC);
 +			__archive_ensure_cloexec_flag(a->fd);
 +			if (a->fd < 0)
 +				r = errno;
 +		}
 +		return (r);
 +#endif
 +	}
 +	linkname = archive_entry_symlink(a->entry);
 +	if (linkname != NULL) {
 +#if HAVE_SYMLINK
 +		return symlink(linkname, a->name) ? errno : 0;
 +#else
 +		return (EPERM);
 +#endif
 +	}
 +
 +	/*
 +	 * The remaining system calls all set permissions, so let's
 +	 * try to take advantage of that to avoid an extra chmod()
 +	 * call.  (Recall that umask is set to zero right now!)
 +	 */
 +
 +	/* Mode we want for the final restored object (w/o file type bits). */
 +	final_mode = a->mode & 07777;
 +	/*
 +	 * The mode that will actually be restored in this step.  Note
 +	 * that SUID, SGID, etc, require additional work to ensure
 +	 * security, so we never restore them at this point.
 +	 */
 +	mode = final_mode & 0777 & ~a->user_umask;
 +
 +	switch (a->mode & AE_IFMT) {
 +	default:
 +		/* POSIX requires that we fall through here. */
 +		/* FALLTHROUGH */
 +	case AE_IFREG:
 +		a->fd = open(a->name,
 +		    O_WRONLY | O_CREAT | O_EXCL | O_BINARY | O_CLOEXEC, mode);
 +		__archive_ensure_cloexec_flag(a->fd);
 +		r = (a->fd < 0);
 +		break;
 +	case AE_IFCHR:
 +#ifdef HAVE_MKNOD
 +		/* Note: we use AE_IFCHR for the case label, and
 +		 * S_IFCHR for the mknod() call.  This is correct.  */
 +		r = mknod(a->name, mode | S_IFCHR,
 +		    archive_entry_rdev(a->entry));
 +		break;
 +#else
 +		/* TODO: Find a better way to warn about our inability
 +		 * to restore a char device node. */
 +		return (EINVAL);
 +#endif /* HAVE_MKNOD */
 +	case AE_IFBLK:
 +#ifdef HAVE_MKNOD
 +		r = mknod(a->name, mode | S_IFBLK,
 +		    archive_entry_rdev(a->entry));
 +		break;
 +#else
 +		/* TODO: Find a better way to warn about our inability
 +		 * to restore a block device node. */
 +		return (EINVAL);
 +#endif /* HAVE_MKNOD */
 +	case AE_IFDIR:
 +		mode = (mode | MINIMUM_DIR_MODE) & MAXIMUM_DIR_MODE;
 +		r = mkdir(a->name, mode);
 +		if (r == 0) {
 +			/* Defer setting dir times. */
 +			a->deferred |= (a->todo & TODO_TIMES);
 +			a->todo &= ~TODO_TIMES;
 +			/* Never use an immediate chmod(). */
 +			/* We can't avoid the chmod() entirely if EXTRACT_PERM
 +			 * because of SysV SGID inheritance. */
 +			if ((mode != final_mode)
 +			    || (a->flags & ARCHIVE_EXTRACT_PERM))
 +				a->deferred |= (a->todo & TODO_MODE);
 +			a->todo &= ~TODO_MODE;
 +		}
 +		break;
 +	case AE_IFIFO:
 +#ifdef HAVE_MKFIFO
 +		r = mkfifo(a->name, mode);
 +		break;
 +#else
 +		/* TODO: Find a better way to warn about our inability
 +		 * to restore a fifo. */
 +		return (EINVAL);
 +#endif /* HAVE_MKFIFO */
 +	}
 +
 +	/* All the system calls above set errno on failure. */
 +	if (r)
 +		return (errno);
 +
 +	/* If we managed to set the final mode, we've avoided a chmod(). */
 +	if (mode == final_mode)
 +		a->todo &= ~TODO_MODE;
 +	return (0);
 +}
 +
 +/*
 + * Cleanup function for archive_extract.  Mostly, this involves processing
 + * the fixup list, which is used to address a number of problems:
 + *   * Dir permissions might prevent us from restoring a file in that
 + *     dir, so we restore the dir with minimum 0700 permissions first,
 + *     then correct the mode at the end.
 + *   * Similarly, the act of restoring a file touches the directory
 + *     and changes the timestamp on the dir, so we have to touch-up dir
 + *     timestamps at the end as well.
 + *   * Some file flags can interfere with the restore by, for example,
 + *     preventing the creation of hardlinks to those files.
 + *   * Mac OS extended metadata includes ACLs, so must be deferred on dirs.
 + *
 + * Note that tar/cpio do not require that archives be in a particular
 + * order; there is no way to know when the last file has been restored
 + * within a directory, so there's no way to optimize the memory usage
 + * here by fixing up the directory any earlier than the
 + * end-of-archive.
 + *
 + * XXX TODO: Directory ACLs should be restored here, for the same
 + * reason we set directory perms here. XXX
 + */
 +static int
 +_archive_write_disk_close(struct archive *_a)
 +{
 +	struct archive_write_disk *a = (struct archive_write_disk *)_a;
 +	struct fixup_entry *next, *p;
 +	int ret;
 +
 +	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
 +	    "archive_write_disk_close");
 +	ret = _archive_write_disk_finish_entry(&a->archive);
 +
 +	/* Sort dir list so directories are fixed up in depth-first order. */
 +	p = sort_dir_list(a->fixup_list);
 +
 +	while (p != NULL) {
 +		a->pst = NULL; /* Mark stat cache as out-of-date. */
 +		if (p->fixup & TODO_TIMES) {
 +			set_times(a, -1, p->mode, p->name,
 +			    p->atime, p->atime_nanos,
 +			    p->birthtime, p->birthtime_nanos,
 +			    p->mtime, p->mtime_nanos,
 +			    p->ctime, p->ctime_nanos);
 +		}
 +		if (p->fixup & TODO_MODE_BASE)
 +			chmod(p->name, p->mode);
 +		if (p->fixup & TODO_ACLS)
 +			archive_write_disk_set_acls(&a->archive,
 +						    -1, p->name, &p->acl);
 +		if (p->fixup & TODO_FFLAGS)
 +			set_fflags_platform(a, -1, p->name,
 +			    p->mode, p->fflags_set, 0);
 +		if (p->fixup & TODO_MAC_METADATA)
 +			set_mac_metadata(a, p->name, p->mac_metadata,
 +					 p->mac_metadata_size);
 +		next = p->next;
 +		archive_acl_clear(&p->acl);
 +		free(p->mac_metadata);
 +		free(p->name);
 +		free(p);
 +		p = next;
 +	}
 +	a->fixup_list = NULL;
 +	return (ret);
 +}
 +
 +static int
 +_archive_write_disk_free(struct archive *_a)
 +{
 +	struct archive_write_disk *a;
 +	int ret;
 +	if (_a == NULL)
 +		return (ARCHIVE_OK);
 +	archive_check_magic(_a, ARCHIVE_WRITE_DISK_MAGIC,
 +	    ARCHIVE_STATE_ANY | ARCHIVE_STATE_FATAL, "archive_write_disk_free");
 +	a = (struct archive_write_disk *)_a;
 +	ret = _archive_write_disk_close(&a->archive);
 +	archive_write_disk_set_group_lookup(&a->archive, NULL, NULL, NULL);
 +	archive_write_disk_set_user_lookup(&a->archive, NULL, NULL, NULL);
 +	if (a->entry)
 +		archive_entry_free(a->entry);
 +	archive_string_free(&a->_name_data);
 +	archive_string_free(&a->archive.error_string);
 +	archive_string_free(&a->path_safe);
 +	a->archive.magic = 0;
 +	__archive_clean(&a->archive);
 +	free(a->decmpfs_header_p);
 +	free(a->resource_fork);
 +	free(a->compressed_buffer);
 +	free(a->uncompressed_buffer);
 +#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_SYS_XATTR_H)\
 +	&& defined(HAVE_ZLIB_H)
 +	if (a->stream_valid) {
 +		switch (deflateEnd(&a->stream)) {
 +		case Z_OK:
 +			break;
 +		default:
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Failed to clean up compressor");
 +			ret = ARCHIVE_FATAL;
 +			break;
 +		}
 +	}
 +#endif
 +	free(a);
 +	return (ret);
 +}
 +
 +/*
 + * Simple O(n log n) merge sort to order the fixup list.  In
 + * particular, we want to restore dir timestamps depth-first.
 + */
 +static struct fixup_entry *
 +sort_dir_list(struct fixup_entry *p)
 +{
 +	struct fixup_entry *a, *b, *t;
 +
 +	if (p == NULL)
 +		return (NULL);
 +	/* A one-item list is already sorted. */
 +	if (p->next == NULL)
 +		return (p);
 +
 +	/* Step 1: split the list. */
 +	t = p;
 +	a = p->next->next;
 +	while (a != NULL) {
 +		/* Step a twice, t once. */
 +		a = a->next;
 +		if (a != NULL)
 +			a = a->next;
 +		t = t->next;
 +	}
 +	/* Now, t is at the mid-point, so break the list here. */
 +	b = t->next;
 +	t->next = NULL;
 +	a = p;
 +
 +	/* Step 2: Recursively sort the two sub-lists. */
 +	a = sort_dir_list(a);
 +	b = sort_dir_list(b);
 +
 +	/* Step 3: Merge the returned lists. */
 +	/* Pick the first element for the merged list. */
 +	if (strcmp(a->name, b->name) > 0) {
 +		t = p = a;
 +		a = a->next;
 +	} else {
 +		t = p = b;
 +		b = b->next;
 +	}
 +
 +	/* Always put the later element on the list first. */
 +	while (a != NULL && b != NULL) {
 +		if (strcmp(a->name, b->name) > 0) {
 +			t->next = a;
 +			a = a->next;
 +		} else {
 +			t->next = b;
 +			b = b->next;
 +		}
 +		t = t->next;
 +	}
 +
 +	/* Only one list is non-empty, so just splice it on. */
 +	if (a != NULL)
 +		t->next = a;
 +	if (b != NULL)
 +		t->next = b;
 +
 +	return (p);
 +}
 +
 +/*
 + * Returns a new, initialized fixup entry.
 + *
 + * TODO: Reduce the memory requirements for this list by using a tree
 + * structure rather than a simple list of names.
 + */
 +static struct fixup_entry *
 +new_fixup(struct archive_write_disk *a, const char *pathname)
 +{
 +	struct fixup_entry *fe;
 +
 +	fe = (struct fixup_entry *)calloc(1, sizeof(struct fixup_entry));
 +	if (fe == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory for a fixup");
 +		return (NULL);
 +	}
 +	fe->next = a->fixup_list;
 +	a->fixup_list = fe;
 +	fe->fixup = 0;
 +	fe->name = strdup(pathname);
 +	return (fe);
 +}
 +
 +/*
 + * Returns a fixup structure for the current entry.
 + */
 +static struct fixup_entry *
 +current_fixup(struct archive_write_disk *a, const char *pathname)
 +{
 +	if (a->current_fixup == NULL)
 +		a->current_fixup = new_fixup(a, pathname);
 +	return (a->current_fixup);
 +}
 +
 +/* TODO: Make this work. */
 +/*
 + * TODO: The deep-directory support bypasses this; disable deep directory
 + * support if we're doing symlink checks.
 + */
 +/*
 + * TODO: Someday, integrate this with the deep dir support; they both
 + * scan the path and both can be optimized by comparing against other
 + * recent paths.
 + */
 +/* TODO: Extend this to support symlinks on Windows Vista and later. */
 +static int
 +check_symlinks(struct archive_write_disk *a)
 +{
 +#if !defined(HAVE_LSTAT)
 +	/* Platform doesn't have lstat, so we can't look for symlinks. */
 +	(void)a; /* UNUSED */
 +	return (ARCHIVE_OK);
 +#else
 +	char *pn;
 +	char c;
 +	int r;
 +	struct stat st;
 +
 +	/*
 +	 * Guard against symlink tricks.  Reject any archive entry whose
 +	 * destination would be altered by a symlink.
 +	 */
 +	/* Whatever we checked last time doesn't need to be re-checked. */
 +	pn = a->name;
 +	if (archive_strlen(&(a->path_safe)) > 0) {
 +		char *p = a->path_safe.s;
 +		while ((*pn != '\0') && (*p == *pn))
 +			++p, ++pn;
 +	}
 +	c = pn[0];
 +	/* Keep going until we've checked the entire name. */
 +	while (pn[0] != '\0' && (pn[0] != '/' || pn[1] != '\0')) {
 +		/* Skip the next path element. */
 +		while (*pn != '\0' && *pn != '/')
 +			++pn;
 +		c = pn[0];
 +		pn[0] = '\0';
 +		/* Check that we haven't hit a symlink. */
 +		r = lstat(a->name, &st);
 +		if (r != 0) {
 +			/* We've hit a dir that doesn't exist; stop now. */
 +			if (errno == ENOENT)
 +				break;
 +		} else if (S_ISLNK(st.st_mode)) {
 +			if (c == '\0') {
 +				/*
 +				 * Last element is symlink; remove it
 +				 * so we can overwrite it with the
 +				 * item being extracted.
 +				 */
 +				if (unlink(a->name)) {
 +					archive_set_error(&a->archive, errno,
 +					    "Could not remove symlink %s",
 +					    a->name);
 +					pn[0] = c;
 +					return (ARCHIVE_FAILED);
 +				}
 +				a->pst = NULL;
 +				/*
 +				 * Even if we did remove it, a warning
 +				 * is in order.  The warning is silly,
 +				 * though, if we're just replacing one
 +				 * symlink with another symlink.
 +				 */
 +				if (!S_ISLNK(a->mode)) {
 +					archive_set_error(&a->archive, 0,
 +					    "Removing symlink %s",
 +					    a->name);
 +				}
 +				/* Symlink gone.  No more problem! */
 +				pn[0] = c;
 +				return (0);
 +			} else if (a->flags & ARCHIVE_EXTRACT_UNLINK) {
 +				/* User asked us to remove problems. */
 +				if (unlink(a->name) != 0) {
 +					archive_set_error(&a->archive, 0,
 +					    "Cannot remove intervening symlink %s",
 +					    a->name);
 +					pn[0] = c;
 +					return (ARCHIVE_FAILED);
 +				}
 +				a->pst = NULL;
 +			} else {
 +				archive_set_error(&a->archive, 0,
 +				    "Cannot extract through symlink %s",
 +				    a->name);
 +				pn[0] = c;
 +				return (ARCHIVE_FAILED);
 +			}
 +		}
 +	}
 +	pn[0] = c;
 +	/* We've checked and/or cleaned the whole path, so remember it. */
 +	archive_strcpy(&a->path_safe, a->name);
 +	return (ARCHIVE_OK);
 +#endif
 +}
 +
 +#if defined(__CYGWIN__)
 +/*
 + * 1. Convert a path separator from '\' to '/' .
 + *    We shouldn't check multibyte character directly because some
 + *    character-set have been using the '\' character for a part of
 + *    its multibyte character code.
 + * 2. Replace unusable characters in Windows with underscore('_').
 + * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx
 + */
 +static void
 +cleanup_pathname_win(struct archive_write_disk *a)
 +{
 +	wchar_t wc;
 +	char *p;
 +	size_t alen, l;
 +	int mb, complete, utf8;
 +
 +	alen = 0;
 +	mb = 0;
 +	complete = 1;
 +	utf8 = (strcmp(nl_langinfo(CODESET), "UTF-8") == 0)? 1: 0;
 +	for (p = a->name; *p != '\0'; p++) {
 +		++alen;
 +		if (*p == '\\') {
 +			/* If previous byte is smaller than 128,
 +			 * this is not second byte of multibyte characters,
 +			 * so we can replace '\' with '/'. */
 +			if (utf8 || !mb)
 +				*p = '/';
 +			else
 +				complete = 0;/* uncompleted. */
 +		} else if (*(unsigned char *)p > 127)
 +			mb = 1;
 +		else
 +			mb = 0;
 +		/* Rewrite the path name if its next character is unusable. */
 +		if (*p == ':' || *p == '*' || *p == '?' || *p == '"' ||
 +		    *p == '<' || *p == '>' || *p == '|')
 +			*p = '_';
 +	}
 +	if (complete)
 +		return;
 +
 +	/*
 +	 * Convert path separator in wide-character.
 +	 */
 +	p = a->name;
 +	while (*p != '\0' && alen) {
 +		l = mbtowc(&wc, p, alen);
 +		if (l == (size_t)-1) {
 +			while (*p != '\0') {
 +				if (*p == '\\')
 +					*p = '/';
 +				++p;
 +			}
 +			break;
 +		}
 +		if (l == 1 && wc == L'\\')
 +			*p = '/';
 +		p += l;
 +		alen -= l;
 +	}
 +}
 +#endif
 +
 +/*
 + * Canonicalize the pathname.  In particular, this strips duplicate
 + * '/' characters, '.' elements, and trailing '/'.  It also raises an
-  * error for an empty path, a trailing '..' or (if _SECURE_NODOTDOT is
-  * set) any '..' in the path.
++ * error for an empty path, a trailing '..', (if _SECURE_NODOTDOT is
++ * set) any '..' in the path or (if ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
++ * is set) if the path is absolute.
 + */
 +static int
 +cleanup_pathname(struct archive_write_disk *a)
 +{
 +	char *dest, *src;
 +	char separator = '\0';
 +
 +	dest = src = a->name;
 +	if (*src == '\0') {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Invalid empty pathname");
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +#if defined(__CYGWIN__)
 +	cleanup_pathname_win(a);
 +#endif
 +	/* Skip leading '/'. */
- 	if (*src == '/')
++	if (*src == '/') {
++		if (a->flags & ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS) {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			                  "Path is absolute");
++			return (ARCHIVE_FAILED);
++		}
++
 +		separator = *src++;
++	}
 +
 +	/* Scan the pathname one element at a time. */
 +	for (;;) {
 +		/* src points to first char after '/' */
 +		if (src[0] == '\0') {
 +			break;
 +		} else if (src[0] == '/') {
 +			/* Found '//', ignore second one. */
 +			src++;
 +			continue;
 +		} else if (src[0] == '.') {
 +			if (src[1] == '\0') {
 +				/* Ignore trailing '.' */
 +				break;
 +			} else if (src[1] == '/') {
 +				/* Skip './'. */
 +				src += 2;
 +				continue;
 +			} else if (src[1] == '.') {
 +				if (src[2] == '/' || src[2] == '\0') {
 +					/* Conditionally warn about '..' */
 +					if (a->flags & ARCHIVE_EXTRACT_SECURE_NODOTDOT) {
 +						archive_set_error(&a->archive,
 +						    ARCHIVE_ERRNO_MISC,
 +						    "Path contains '..'");
 +						return (ARCHIVE_FAILED);
 +					}
 +				}
 +				/*
 +				 * Note: Under no circumstances do we
 +				 * remove '..' elements.  In
 +				 * particular, restoring
 +				 * '/foo/../bar/' should create the
 +				 * 'foo' dir as a side-effect.
 +				 */
 +			}
 +		}
 +
 +		/* Copy current element, including leading '/'. */
 +		if (separator)
 +			*dest++ = '/';
 +		while (*src != '\0' && *src != '/') {
 +			*dest++ = *src++;
 +		}
 +
 +		if (*src == '\0')
 +			break;
 +
 +		/* Skip '/' separator. */
 +		separator = *src++;
 +	}
 +	/*
 +	 * We've just copied zero or more path elements, not including the
 +	 * final '/'.
 +	 */
 +	if (dest == a->name) {
 +		/*
 +		 * Nothing got copied.  The path must have been something
 +		 * like '.' or '/' or './' or '/././././/./'.
 +		 */
 +		if (separator)
 +			*dest++ = '/';
 +		else
 +			*dest++ = '.';
 +	}
 +	/* Terminate the result. */
 +	*dest = '\0';
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Create the parent directory of the specified path, assuming path
 + * is already in mutable storage.
 + */
 +static int
 +create_parent_dir(struct archive_write_disk *a, char *path)
 +{
 +	char *slash;
 +	int r;
 +
 +	/* Remove tail element to obtain parent name. */
 +	slash = strrchr(path, '/');
 +	if (slash == NULL)
 +		return (ARCHIVE_OK);
 +	*slash = '\0';
 +	r = create_dir(a, path);
 +	*slash = '/';
 +	return (r);
 +}
 +
 +/*
 + * Create the specified dir, recursing to create parents as necessary.
 + *
 + * Returns ARCHIVE_OK if the path exists when we're done here.
 + * Otherwise, returns ARCHIVE_FAILED.
 + * Assumes path is in mutable storage; path is unchanged on exit.
 + */
 +static int
 +create_dir(struct archive_write_disk *a, char *path)
 +{
 +	struct stat st;
 +	struct fixup_entry *le;
 +	char *slash, *base;
 +	mode_t mode_final, mode;
 +	int r;
 +
 +	/* Check for special names and just skip them. */
 +	slash = strrchr(path, '/');
 +	if (slash == NULL)
 +		base = path;
 +	else
 +		base = slash + 1;
 +
 +	if (base[0] == '\0' ||
 +	    (base[0] == '.' && base[1] == '\0') ||
 +	    (base[0] == '.' && base[1] == '.' && base[2] == '\0')) {
 +		/* Don't bother trying to create null path, '.', or '..'. */
 +		if (slash != NULL) {
 +			*slash = '\0';
 +			r = create_dir(a, path);
 +			*slash = '/';
 +			return (r);
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +
 +	/*
 +	 * Yes, this should be stat() and not lstat().  Using lstat()
 +	 * here loses the ability to extract through symlinks.  Also note
 +	 * that this should not use the a->st cache.
 +	 */
 +	if (stat(path, &st) == 0) {
 +		if (S_ISDIR(st.st_mode))
 +			return (ARCHIVE_OK);
 +		if ((a->flags & ARCHIVE_EXTRACT_NO_OVERWRITE)) {
 +			archive_set_error(&a->archive, EEXIST,
 +			    "Can't create directory '%s'", path);
 +			return (ARCHIVE_FAILED);
 +		}
 +		if (unlink(path) != 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Can't create directory '%s': "
 +			    "Conflicting file cannot be removed",
 +			    path);
 +			return (ARCHIVE_FAILED);
 +		}
 +	} else if (errno != ENOENT && errno != ENOTDIR) {
 +		/* Stat failed? */
 +		archive_set_error(&a->archive, errno, "Can't test directory '%s'", path);
 +		return (ARCHIVE_FAILED);
 +	} else if (slash != NULL) {
 +		*slash = '\0';
 +		r = create_dir(a, path);
 +		*slash = '/';
 +		if (r != ARCHIVE_OK)
 +			return (r);
 +	}
 +
 +	/*
 +	 * Mode we want for the final restored directory.  Per POSIX,
 +	 * implicitly-created dirs must be created obeying the umask.
 +	 * There's no mention whether this is different for privileged
 +	 * restores (which the rest of this code handles by pretending
 +	 * umask=0).  I've chosen here to always obey the user's umask for
 +	 * implicit dirs, even if _EXTRACT_PERM was specified.
 +	 */
 +	mode_final = DEFAULT_DIR_MODE & ~a->user_umask;
 +	/* Mode we want on disk during the restore process. */
 +	mode = mode_final;
 +	mode |= MINIMUM_DIR_MODE;
 +	mode &= MAXIMUM_DIR_MODE;
 +	if (mkdir(path, mode) == 0) {
 +		if (mode != mode_final) {
 +			le = new_fixup(a, path);
 +			if (le == NULL)
 +				return (ARCHIVE_FATAL);
 +			le->fixup |=TODO_MODE_BASE;
 +			le->mode = mode_final;
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +
 +	/*
 +	 * Without the following check, a/b/../b/c/d fails at the
 +	 * second visit to 'b', so 'd' can't be created.  Note that we
 +	 * don't add it to the fixup list here, as it's already been
 +	 * added.
 +	 */
 +	if (stat(path, &st) == 0 && S_ISDIR(st.st_mode))
 +		return (ARCHIVE_OK);
 +
 +	archive_set_error(&a->archive, errno, "Failed to create dir '%s'",
 +	    path);
 +	return (ARCHIVE_FAILED);
 +}
 +
 +/*
 + * Note: Although we can skip setting the user id if the desired user
 + * id matches the current user, we cannot skip setting the group, as
 + * many systems set the gid based on the containing directory.  So
 + * we have to perform a chown syscall if we want to set the SGID
 + * bit.  (The alternative is to stat() and then possibly chown(); it's
 + * more efficient to skip the stat() and just always chown().)  Note
 + * that a successful chown() here clears the TODO_SGID_CHECK bit, which
 + * allows set_mode to skip the stat() check for the GID.
 + */
 +static int
 +set_ownership(struct archive_write_disk *a)
 +{
 +#ifndef __CYGWIN__
 +/* unfortunately, on win32 there is no 'root' user with uid 0,
 +   so we just have to try the chown and see if it works */
 +
 +	/* If we know we can't change it, don't bother trying. */
 +	if (a->user_uid != 0  &&  a->user_uid != a->uid) {
 +		archive_set_error(&a->archive, errno,
 +		    "Can't set UID=%jd", (intmax_t)a->uid);
 +		return (ARCHIVE_WARN);
 +	}
 +#endif
 +
 +#ifdef HAVE_FCHOWN
 +	/* If we have an fd, we can avoid a race. */
 +	if (a->fd >= 0 && fchown(a->fd, a->uid, a->gid) == 0) {
 +		/* We've set owner and know uid/gid are correct. */
 +		a->todo &= ~(TODO_OWNER | TODO_SGID_CHECK | TODO_SUID_CHECK);
 +		return (ARCHIVE_OK);
 +	}
 +#endif
 +
 +	/* We prefer lchown() but will use chown() if that's all we have. */
 +	/* Of course, if we have neither, this will always fail. */
 +#ifdef HAVE_LCHOWN
 +	if (lchown(a->name, a->uid, a->gid) == 0) {
 +		/* We've set owner and know uid/gid are correct. */
 +		a->todo &= ~(TODO_OWNER | TODO_SGID_CHECK | TODO_SUID_CHECK);
 +		return (ARCHIVE_OK);
 +	}
 +#elif HAVE_CHOWN
 +	if (!S_ISLNK(a->mode) && chown(a->name, a->uid, a->gid) == 0) {
 +		/* We've set owner and know uid/gid are correct. */
 +		a->todo &= ~(TODO_OWNER | TODO_SGID_CHECK | TODO_SUID_CHECK);
 +		return (ARCHIVE_OK);
 +	}
 +#endif
 +
 +	archive_set_error(&a->archive, errno,
 +	    "Can't set user=%jd/group=%jd for %s",
 +	    (intmax_t)a->uid, (intmax_t)a->gid, a->name);
 +	return (ARCHIVE_WARN);
 +}
 +
 +/*
 + * Note: Returns 0 on success, non-zero on failure.
 + */
 +static int
 +set_time(int fd, int mode, const char *name,
 +    time_t atime, long atime_nsec,
 +    time_t mtime, long mtime_nsec)
 +{
 +	/* Select the best implementation for this platform. */
 +#if defined(HAVE_UTIMENSAT) && defined(HAVE_FUTIMENS)
 +	/*
 +	 * utimensat() and futimens() are defined in
 +	 * POSIX.1-2008. They support ns resolution and setting times
 +	 * on fds and symlinks.
 +	 */
 +	struct timespec ts[2];
 +	(void)mode; /* UNUSED */
 +	ts[0].tv_sec = atime;
 +	ts[0].tv_nsec = atime_nsec;
 +	ts[1].tv_sec = mtime;
 +	ts[1].tv_nsec = mtime_nsec;
 +	if (fd >= 0)
 +		return futimens(fd, ts);
 +	return utimensat(AT_FDCWD, name, ts, AT_SYMLINK_NOFOLLOW);
 +
 +#elif HAVE_UTIMES
 +	/*
 +	 * The utimes()-family functions support ?s-resolution and
 +	 * setting times fds and symlinks.  utimes() is documented as
 +	 * LEGACY by POSIX, futimes() and lutimes() are not described
 +	 * in POSIX.
 +	 */
 +	struct timeval times[2];
 +
 +	times[0].tv_sec = atime;
 +	times[0].tv_usec = atime_nsec / 1000;
 +	times[1].tv_sec = mtime;
 +	times[1].tv_usec = mtime_nsec / 1000;
 +
 +#ifdef HAVE_FUTIMES
 +	if (fd >= 0)
 +		return (futimes(fd, times));
 +#else
 +	(void)fd; /* UNUSED */
 +#endif
 +#ifdef HAVE_LUTIMES
 +	(void)mode; /* UNUSED */
 +	return (lutimes(name, times));
 +#else
 +	if (S_ISLNK(mode))
 +		return (0);
 +	return (utimes(name, times));
 +#endif
 +
 +#elif defined(HAVE_UTIME)
 +	/*
 +	 * utime() is POSIX-standard but only supports 1s resolution and
 +	 * does not support fds or symlinks.
 +	 */
 +	struct utimbuf times;
 +	(void)fd; /* UNUSED */
 +	(void)name; /* UNUSED */
 +	(void)atime_nsec; /* UNUSED */
 +	(void)mtime_nsec; /* UNUSED */
 +	times.actime = atime;
 +	times.modtime = mtime;
 +	if (S_ISLNK(mode))
 +		return (ARCHIVE_OK);
 +	return (utime(name, &times));
 +
 +#else
 +	/*
 +	 * We don't know how to set the time on this platform.
 +	 */
 +	(void)fd; /* UNUSED */
 +	(void)mode; /* UNUSED */
 +	(void)name; /* UNUSED */
 +	(void)atime_nsec; /* UNUSED */
 +	(void)mtime_nsec; /* UNUSED */
 +	return (ARCHIVE_WARN);
 +#endif
 +}
 +
 +#ifdef F_SETTIMES
 +static int
 +set_time_tru64(int fd, int mode, const char *name,
 +    time_t atime, long atime_nsec,
 +    time_t mtime, long mtime_nsec,
 +    time_t ctime, long ctime_nsec)
 +{
 +	struct attr_timbuf tstamp;
 +	tstamp.atime.tv_sec = atime;
 +	tstamp.mtime.tv_sec = mtime;
 +	tstamp.ctime.tv_sec = ctime;
 +#if defined (__hpux) && defined (__ia64)
 +	tstamp.atime.tv_nsec = atime_nsec;
 +	tstamp.mtime.tv_nsec = mtime_nsec;
 +	tstamp.ctime.tv_nsec = ctime_nsec;
 +#else
 +	tstamp.atime.tv_usec = atime_nsec / 1000;
 +	tstamp.mtime.tv_usec = mtime_nsec / 1000;
 +	tstamp.ctime.tv_usec = ctime_nsec / 1000;
 +#endif
 +	return (fcntl(fd,F_SETTIMES,&tstamp));
 +}
 +#endif /* F_SETTIMES */
 +
 +static int
 +set_times(struct archive_write_disk *a,
 +    int fd, int mode, const char *name,
 +    time_t atime, long atime_nanos,
 +    time_t birthtime, long birthtime_nanos,
 +    time_t mtime, long mtime_nanos,
 +    time_t cctime, long ctime_nanos)
 +{
 +	/* Note: set_time doesn't use libarchive return conventions!
 +	 * It uses syscall conventions.  So 0 here instead of ARCHIVE_OK. */
 +	int r1 = 0, r2 = 0;
 +
 +#ifdef F_SETTIMES
 +	 /*
 +	 * on Tru64 try own fcntl first which can restore even the
 +	 * ctime, fall back to default code path below if it fails
 +	 * or if we are not running as root
 +	 */
 +	if (a->user_uid == 0 &&
 +	    set_time_tru64(fd, mode, name,
 +			   atime, atime_nanos, mtime,
 +			   mtime_nanos, cctime, ctime_nanos) == 0) {
 +		return (ARCHIVE_OK);
 +	}
 +#else /* Tru64 */
 +	(void)cctime; /* UNUSED */
 +	(void)ctime_nanos; /* UNUSED */
 +#endif /* Tru64 */
 +
 +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME
 +	/*
 +	 * If you have struct stat.st_birthtime, we assume BSD
 +	 * birthtime semantics, in which {f,l,}utimes() updates
 +	 * birthtime to earliest mtime.  So we set the time twice,
 +	 * first using the birthtime, then using the mtime.  If
 +	 * birthtime == mtime, this isn't necessary, so we skip it.
 +	 * If birthtime > mtime, then this won't work, so we skip it.
 +	 */
 +	if (birthtime < mtime
 +	    || (birthtime == mtime && birthtime_nanos < mtime_nanos))
 +		r1 = set_time(fd, mode, name,
 +			      atime, atime_nanos,
 +			      birthtime, birthtime_nanos);
 +#else
 +	(void)birthtime; /* UNUSED */
 +	(void)birthtime_nanos; /* UNUSED */
 +#endif
 +	r2 = set_time(fd, mode, name,
 +		      atime, atime_nanos,
 +		      mtime, mtime_nanos);
 +	if (r1 != 0 || r2 != 0) {
 +		archive_set_error(&a->archive, errno,
 +				  "Can't restore time");
 +		return (ARCHIVE_WARN);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +set_times_from_entry(struct archive_write_disk *a)
 +{
 +	time_t atime, birthtime, mtime, cctime;
 +	long atime_nsec, birthtime_nsec, mtime_nsec, ctime_nsec;
 +
 +	/* Suitable defaults. */
 +	atime = birthtime = mtime = cctime = a->start_time;
 +	atime_nsec = birthtime_nsec = mtime_nsec = ctime_nsec = 0;
 +
 +	/* If no time was provided, we're done. */
 +	if (!archive_entry_atime_is_set(a->entry)
 +#if HAVE_STRUCT_STAT_ST_BIRTHTIME
 +	    && !archive_entry_birthtime_is_set(a->entry)
 +#endif
 +	    && !archive_entry_mtime_is_set(a->entry))
 +		return (ARCHIVE_OK);
 +
 +	if (archive_entry_atime_is_set(a->entry)) {
 +		atime = archive_entry_atime(a->entry);
 +		atime_nsec = archive_entry_atime_nsec(a->entry);
 +	}
 +	if (archive_entry_birthtime_is_set(a->entry)) {
 +		birthtime = archive_entry_birthtime(a->entry);
 +		birthtime_nsec = archive_entry_birthtime_nsec(a->entry);
 +	}
 +	if (archive_entry_mtime_is_set(a->entry)) {
 +		mtime = archive_entry_mtime(a->entry);
 +		mtime_nsec = archive_entry_mtime_nsec(a->entry);
 +	}
 +	if (archive_entry_ctime_is_set(a->entry)) {
 +		cctime = archive_entry_ctime(a->entry);
 +		ctime_nsec = archive_entry_ctime_nsec(a->entry);
 +	}
 +
 +	return set_times(a, a->fd, a->mode, a->name,
 +			 atime, atime_nsec,
 +			 birthtime, birthtime_nsec,
 +			 mtime, mtime_nsec,
 +			 cctime, ctime_nsec);
 +}
 +
 +static int
 +set_mode(struct archive_write_disk *a, int mode)
 +{
 +	int r = ARCHIVE_OK;
 +	mode &= 07777; /* Strip off file type bits. */
 +
 +	if (a->todo & TODO_SGID_CHECK) {
 +		/*
 +		 * If we don't know the GID is right, we must stat()
 +		 * to verify it.  We can't just check the GID of this
 +		 * process, since systems sometimes set GID from
 +		 * the enclosing dir or based on ACLs.
 +		 */
 +		if ((r = lazy_stat(a)) != ARCHIVE_OK)
 +			return (r);
 +		if (a->pst->st_gid != a->gid) {
 +			mode &= ~ S_ISGID;
 +			if (a->flags & ARCHIVE_EXTRACT_OWNER) {
 +				/*
 +				 * This is only an error if you
 +				 * requested owner restore.  If you
 +				 * didn't, we'll try to restore
 +				 * sgid/suid, but won't consider it a
 +				 * problem if we can't.
 +				 */
 +				archive_set_error(&a->archive, -1,
 +				    "Can't restore SGID bit");
 +				r = ARCHIVE_WARN;
 +			}
 +		}
 +		/* While we're here, double-check the UID. */
 +		if (a->pst->st_uid != a->uid
 +		    && (a->todo & TODO_SUID)) {
 +			mode &= ~ S_ISUID;
 +			if (a->flags & ARCHIVE_EXTRACT_OWNER) {
 +				archive_set_error(&a->archive, -1,
 +				    "Can't restore SUID bit");
 +				r = ARCHIVE_WARN;
 +			}
 +		}
 +		a->todo &= ~TODO_SGID_CHECK;
 +		a->todo &= ~TODO_SUID_CHECK;
 +	} else if (a->todo & TODO_SUID_CHECK) {
 +		/*
 +		 * If we don't know the UID is right, we can just check
 +		 * the user, since all systems set the file UID from
 +		 * the process UID.
 +		 */
 +		if (a->user_uid != a->uid) {
 +			mode &= ~ S_ISUID;
 +			if (a->flags & ARCHIVE_EXTRACT_OWNER) {
 +				archive_set_error(&a->archive, -1,
 +				    "Can't make file SUID");
 +				r = ARCHIVE_WARN;
 +			}
 +		}
 +		a->todo &= ~TODO_SUID_CHECK;
 +	}
 +
 +	if (S_ISLNK(a->mode)) {
 +#ifdef HAVE_LCHMOD
 +		/*
 +		 * If this is a symlink, use lchmod().  If the
 +		 * platform doesn't support lchmod(), just skip it.  A
 +		 * platform that doesn't provide a way to set
 +		 * permissions on symlinks probably ignores
 +		 * permissions on symlinks, so a failure here has no
 +		 * impact.
 +		 */
 +		if (lchmod(a->name, mode) != 0) {
- 			archive_set_error(&a->archive, errno,
- 			    "Can't set permissions to 0%o", (int)mode);
- 			r = ARCHIVE_WARN;
++			switch (errno) {
++			case ENOTSUP:
++			case ENOSYS:
++#if ENOTSUP != EOPNOTSUPP
++			case EOPNOTSUPP:
++#endif
++				/*
++				 * if lchmod is defined but the platform
++				 * doesn't support it, silently ignore
++				 * error
++				 */
++				break;
++			default:
++				archive_set_error(&a->archive, errno,
++				    "Can't set permissions to 0%o", (int)mode);
++				r = ARCHIVE_WARN;
++			}
 +		}
 +#endif
 +	} else if (!S_ISDIR(a->mode)) {
 +		/*
 +		 * If it's not a symlink and not a dir, then use
 +		 * fchmod() or chmod(), depending on whether we have
 +		 * an fd.  Dirs get their perms set during the
 +		 * post-extract fixup, which is handled elsewhere.
 +		 */
 +#ifdef HAVE_FCHMOD
 +		if (a->fd >= 0) {
 +			if (fchmod(a->fd, mode) != 0) {
 +				archive_set_error(&a->archive, errno,
 +				    "Can't set permissions to 0%o", (int)mode);
 +				r = ARCHIVE_WARN;
 +			}
 +		} else
 +#endif
 +			/* If this platform lacks fchmod(), then
 +			 * we'll just use chmod(). */
 +			if (chmod(a->name, mode) != 0) {
 +				archive_set_error(&a->archive, errno,
 +				    "Can't set permissions to 0%o", (int)mode);
 +				r = ARCHIVE_WARN;
 +			}
 +	}
 +	return (r);
 +}
 +
 +static int
 +set_fflags(struct archive_write_disk *a)
 +{
 +	struct fixup_entry *le;
 +	unsigned long	set, clear;
 +	int		r;
 +	int		critical_flags;
 +	mode_t		mode = archive_entry_mode(a->entry);
 +
 +	/*
 +	 * Make 'critical_flags' hold all file flags that can't be
 +	 * immediately restored.  For example, on BSD systems,
 +	 * SF_IMMUTABLE prevents hardlinks from being created, so
 +	 * should not be set until after any hardlinks are created.  To
 +	 * preserve some semblance of portability, this uses #ifdef
 +	 * extensively.  Ugly, but it works.
 +	 *
 +	 * Yes, Virginia, this does create a security race.  It's mitigated
 +	 * somewhat by the practice of creating dirs 0700 until the extract
 +	 * is done, but it would be nice if we could do more than that.
 +	 * People restoring critical file systems should be wary of
 +	 * other programs that might try to muck with files as they're
 +	 * being restored.
 +	 */
 +	/* Hopefully, the compiler will optimize this mess into a constant. */
 +	critical_flags = 0;
 +#ifdef SF_IMMUTABLE
 +	critical_flags |= SF_IMMUTABLE;
 +#endif
 +#ifdef UF_IMMUTABLE
 +	critical_flags |= UF_IMMUTABLE;
 +#endif
 +#ifdef SF_APPEND
 +	critical_flags |= SF_APPEND;
 +#endif
 +#ifdef UF_APPEND
 +	critical_flags |= UF_APPEND;
 +#endif
 +#ifdef EXT2_APPEND_FL
 +	critical_flags |= EXT2_APPEND_FL;
 +#endif
 +#ifdef EXT2_IMMUTABLE_FL
 +	critical_flags |= EXT2_IMMUTABLE_FL;
 +#endif
 +
 +	if (a->todo & TODO_FFLAGS) {
 +		archive_entry_fflags(a->entry, &set, &clear);
 +
 +		/*
 +		 * The first test encourages the compiler to eliminate
 +		 * all of this if it's not necessary.
 +		 */
 +		if ((critical_flags != 0)  &&  (set & critical_flags)) {
 +			le = current_fixup(a, a->name);
 +			if (le == NULL)
 +				return (ARCHIVE_FATAL);
 +			le->fixup |= TODO_FFLAGS;
 +			le->fflags_set = set;
 +			/* Store the mode if it's not already there. */
 +			if ((le->fixup & TODO_MODE) == 0)
 +				le->mode = mode;
 +		} else {
 +			r = set_fflags_platform(a, a->fd,
 +			    a->name, mode, set, clear);
 +			if (r != ARCHIVE_OK)
 +				return (r);
 +		}
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
++static int
++clear_nochange_fflags(struct archive_write_disk *a)
++{
++	int		nochange_flags;
++	mode_t		mode = archive_entry_mode(a->entry);
++
++	/* Hopefully, the compiler will optimize this mess into a constant. */
++	nochange_flags = 0;
++#ifdef SF_IMMUTABLE
++	nochange_flags |= SF_IMMUTABLE;
++#endif
++#ifdef UF_IMMUTABLE
++	nochange_flags |= UF_IMMUTABLE;
++#endif
++#ifdef SF_APPEND
++	nochange_flags |= SF_APPEND;
++#endif
++#ifdef UF_APPEND
++	nochange_flags |= UF_APPEND;
++#endif
++#ifdef EXT2_APPEND_FL
++	nochange_flags |= EXT2_APPEND_FL;
++#endif
++#ifdef EXT2_IMMUTABLE_FL
++	nochange_flags |= EXT2_IMMUTABLE_FL;
++#endif
++
++	return (set_fflags_platform(a, a->fd, a->name, mode, 0, nochange_flags));
++}
++
 +
 +#if ( defined(HAVE_LCHFLAGS) || defined(HAVE_CHFLAGS) || defined(HAVE_FCHFLAGS) ) && defined(HAVE_STRUCT_STAT_ST_FLAGS)
 +/*
 + * BSD reads flags using stat() and sets them with one of {f,l,}chflags()
 + */
 +static int
 +set_fflags_platform(struct archive_write_disk *a, int fd, const char *name,
 +    mode_t mode, unsigned long set, unsigned long clear)
 +{
 +	int r;
 +
 +	(void)mode; /* UNUSED */
 +	if (set == 0  && clear == 0)
 +		return (ARCHIVE_OK);
 +
 +	/*
 +	 * XXX Is the stat here really necessary?  Or can I just use
 +	 * the 'set' flags directly?  In particular, I'm not sure
 +	 * about the correct approach if we're overwriting an existing
 +	 * file that already has flags on it. XXX
 +	 */
 +	if ((r = lazy_stat(a)) != ARCHIVE_OK)
 +		return (r);
 +
 +	a->st.st_flags &= ~clear;
 +	a->st.st_flags |= set;
 +#ifdef HAVE_FCHFLAGS
 +	/* If platform has fchflags() and we were given an fd, use it. */
 +	if (fd >= 0 && fchflags(fd, a->st.st_flags) == 0)
 +		return (ARCHIVE_OK);
 +#endif
 +	/*
 +	 * If we can't use the fd to set the flags, we'll use the
 +	 * pathname to set flags.  We prefer lchflags() but will use
 +	 * chflags() if we must.
 +	 */
 +#ifdef HAVE_LCHFLAGS
 +	if (lchflags(name, a->st.st_flags) == 0)
 +		return (ARCHIVE_OK);
 +#elif defined(HAVE_CHFLAGS)
 +	if (S_ISLNK(a->st.st_mode)) {
 +		archive_set_error(&a->archive, errno,
 +		    "Can't set file flags on symlink.");
 +		return (ARCHIVE_WARN);
 +	}
 +	if (chflags(name, a->st.st_flags) == 0)
 +		return (ARCHIVE_OK);
 +#endif
 +	archive_set_error(&a->archive, errno,
 +	    "Failed to set file flags");
 +	return (ARCHIVE_WARN);
 +}
 +
 +#elif defined(EXT2_IOC_GETFLAGS) && defined(EXT2_IOC_SETFLAGS) && defined(HAVE_WORKING_EXT2_IOC_GETFLAGS)
 +/*
 + * Linux uses ioctl() to read and write file flags.
 + */
 +static int
 +set_fflags_platform(struct archive_write_disk *a, int fd, const char *name,
 +    mode_t mode, unsigned long set, unsigned long clear)
 +{
 +	int		 ret;
 +	int		 myfd = fd;
 +	int newflags, oldflags;
 +	int sf_mask = 0;
 +
 +	if (set == 0  && clear == 0)
 +		return (ARCHIVE_OK);
 +	/* Only regular files and dirs can have flags. */
 +	if (!S_ISREG(mode) && !S_ISDIR(mode))
 +		return (ARCHIVE_OK);
 +
 +	/* If we weren't given an fd, open it ourselves. */
 +	if (myfd < 0) {
 +		myfd = open(name, O_RDONLY | O_NONBLOCK | O_BINARY | O_CLOEXEC);
 +		__archive_ensure_cloexec_flag(myfd);
 +	}
 +	if (myfd < 0)
 +		return (ARCHIVE_OK);
 +
 +	/*
 +	 * Linux has no define for the flags that are only settable by
 +	 * the root user.  This code may seem a little complex, but
 +	 * there seem to be some Linux systems that lack these
 +	 * defines. (?)  The code below degrades reasonably gracefully
 +	 * if sf_mask is incomplete.
 +	 */
 +#ifdef EXT2_IMMUTABLE_FL
 +	sf_mask |= EXT2_IMMUTABLE_FL;
 +#endif
 +#ifdef EXT2_APPEND_FL
 +	sf_mask |= EXT2_APPEND_FL;
 +#endif
 +	/*
 +	 * XXX As above, this would be way simpler if we didn't have
 +	 * to read the current flags from disk. XXX
 +	 */
 +	ret = ARCHIVE_OK;
 +
 +	/* Read the current file flags. */
 +	if (ioctl(myfd, EXT2_IOC_GETFLAGS, &oldflags) < 0)
 +		goto fail;
 +
 +	/* Try setting the flags as given. */
 +	newflags = (oldflags & ~clear) | set;
 +	if (ioctl(myfd, EXT2_IOC_SETFLAGS, &newflags) >= 0)
 +		goto cleanup;
 +	if (errno != EPERM)
 +		goto fail;
 +
 +	/* If we couldn't set all the flags, try again with a subset. */
 +	newflags &= ~sf_mask;
 +	oldflags &= sf_mask;
 +	newflags |= oldflags;
 +	if (ioctl(myfd, EXT2_IOC_SETFLAGS, &newflags) >= 0)
 +		goto cleanup;
 +
 +	/* We couldn't set the flags, so report the failure. */
 +fail:
 +	archive_set_error(&a->archive, errno,
 +	    "Failed to set file flags");
 +	ret = ARCHIVE_WARN;
 +cleanup:
 +	if (fd < 0)
 +		close(myfd);
 +	return (ret);
 +}
 +
 +#else
 +
 +/*
 + * Of course, some systems have neither BSD chflags() nor Linux' flags
 + * support through ioctl().
 + */
 +static int
 +set_fflags_platform(struct archive_write_disk *a, int fd, const char *name,
 +    mode_t mode, unsigned long set, unsigned long clear)
 +{
 +	(void)a; /* UNUSED */
 +	(void)fd; /* UNUSED */
 +	(void)name; /* UNUSED */
 +	(void)mode; /* UNUSED */
 +	(void)set; /* UNUSED */
 +	(void)clear; /* UNUSED */
 +	return (ARCHIVE_OK);
 +}
 +
 +#endif /* __linux */
 +
 +#ifndef HAVE_COPYFILE_H
 +/* Default is to simply drop Mac extended metadata. */
 +static int
 +set_mac_metadata(struct archive_write_disk *a, const char *pathname,
 +		 const void *metadata, size_t metadata_size)
 +{
 +	(void)a; /* UNUSED */
 +	(void)pathname; /* UNUSED */
 +	(void)metadata; /* UNUSED */
 +	(void)metadata_size; /* UNUSED */
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +fixup_appledouble(struct archive_write_disk *a, const char *pathname)
 +{
 +	(void)a; /* UNUSED */
 +	(void)pathname; /* UNUSED */
 +	return (ARCHIVE_OK);
 +}
 +#else
 +
 +/*
 + * On Mac OS, we use copyfile() to unpack the metadata and
 + * apply it to the target file.
 + */
 +
 +#if defined(HAVE_SYS_XATTR_H)
 +static int
 +copy_xattrs(struct archive_write_disk *a, int tmpfd, int dffd)
 +{
 +	ssize_t xattr_size;
 +	char *xattr_names = NULL, *xattr_val = NULL;
 +	int ret = ARCHIVE_OK, xattr_i;
 +
 +	xattr_size = flistxattr(tmpfd, NULL, 0, 0);
 +	if (xattr_size == -1) {
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to read metadata(xattr)");
 +		ret = ARCHIVE_WARN;
 +		goto exit_xattr;
 +	}
 +	xattr_names = malloc(xattr_size);
 +	if (xattr_names == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory for metadata(xattr)");
 +		ret = ARCHIVE_FATAL;
 +		goto exit_xattr;
 +	}
 +	xattr_size = flistxattr(tmpfd, xattr_names, xattr_size, 0);
 +	if (xattr_size == -1) {
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to read metadata(xattr)");
 +		ret = ARCHIVE_WARN;
 +		goto exit_xattr;
 +	}
 +	for (xattr_i = 0; xattr_i < xattr_size;
 +	    xattr_i += strlen(xattr_names + xattr_i) + 1) {
++		char *xattr_val_saved;
 +		ssize_t s;
 +		int f;
 +
 +		s = fgetxattr(tmpfd, xattr_names + xattr_i, NULL, 0, 0, 0);
 +		if (s == -1) {
 +			archive_set_error(&a->archive, errno,
 +			    "Failed to get metadata(xattr)");
 +			ret = ARCHIVE_WARN;
 +			goto exit_xattr;
 +		}
++		xattr_val_saved = xattr_val;
 +		xattr_val = realloc(xattr_val, s);
 +		if (xattr_val == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Failed to get metadata(xattr)");
 +			ret = ARCHIVE_WARN;
++			free(xattr_val_saved);
 +			goto exit_xattr;
 +		}
 +		s = fgetxattr(tmpfd, xattr_names + xattr_i, xattr_val, s, 0, 0);
 +		if (s == -1) {
 +			archive_set_error(&a->archive, errno,
 +			    "Failed to get metadata(xattr)");
 +			ret = ARCHIVE_WARN;
 +			goto exit_xattr;
 +		}
 +		f = fsetxattr(dffd, xattr_names + xattr_i, xattr_val, s, 0, 0);
 +		if (f == -1) {
 +			archive_set_error(&a->archive, errno,
 +			    "Failed to get metadata(xattr)");
 +			ret = ARCHIVE_WARN;
 +			goto exit_xattr;
 +		}
 +	}
 +exit_xattr:
 +	free(xattr_names);
 +	free(xattr_val);
 +	return (ret);
 +}
 +#endif
 +
 +static int
 +copy_acls(struct archive_write_disk *a, int tmpfd, int dffd)
 +{
 +	acl_t acl, dfacl = NULL;
 +	int acl_r, ret = ARCHIVE_OK;
 +
 +	acl = acl_get_fd(tmpfd);
 +	if (acl == NULL) {
 +		if (errno == ENOENT)
 +			/* There are not any ACLs. */
 +			return (ret);
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to get metadata(acl)");
 +		ret = ARCHIVE_WARN;
 +		goto exit_acl;
 +	}
 +	dfacl = acl_dup(acl);
 +	acl_r = acl_set_fd(dffd, dfacl);
 +	if (acl_r == -1) {
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to get metadata(acl)");
 +		ret = ARCHIVE_WARN;
 +		goto exit_acl;
 +	}
 +exit_acl:
 +	if (acl)
 +		acl_free(acl);
 +	if (dfacl)
 +		acl_free(dfacl);
 +	return (ret);
 +}
 +
 +static int
 +create_tempdatafork(struct archive_write_disk *a, const char *pathname)
 +{
 +	struct archive_string tmpdatafork;
 +	int tmpfd;
 +
 +	archive_string_init(&tmpdatafork);
 +	archive_strcpy(&tmpdatafork, "tar.md.XXXXXX");
 +	tmpfd = mkstemp(tmpdatafork.s);
 +	if (tmpfd < 0) {
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to mkstemp");
 +		archive_string_free(&tmpdatafork);
 +		return (-1);
 +	}
 +	if (copyfile(pathname, tmpdatafork.s, 0,
 +	    COPYFILE_UNPACK | COPYFILE_NOFOLLOW
 +	    | COPYFILE_ACL | COPYFILE_XATTR) < 0) {
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to restore metadata");
 +		close(tmpfd);
 +		tmpfd = -1;
 +	}
 +	unlink(tmpdatafork.s);
 +	archive_string_free(&tmpdatafork);
 +	return (tmpfd);
 +}
 +
 +static int
 +copy_metadata(struct archive_write_disk *a, const char *metadata,
 +    const char *datafork, int datafork_compressed)
 +{
 +	int ret = ARCHIVE_OK;
 +
 +	if (datafork_compressed) {
 +		int dffd, tmpfd;
 +
 +		tmpfd = create_tempdatafork(a, metadata);
 +		if (tmpfd == -1)
 +			return (ARCHIVE_WARN);
 +
 +		/*
 +		 * Do not open the data fork compressed by HFS+ compression
 +		 * with at least a writing mode(O_RDWR or O_WRONLY). it
 +		 * makes the data fork uncompressed.
 +		 */
 +		dffd = open(datafork, 0);
 +		if (dffd == -1) {
 +			archive_set_error(&a->archive, errno,
 +			    "Failed to open the data fork for metadata");
 +			close(tmpfd);
 +			return (ARCHIVE_WARN);
 +		}
 +
 +#if defined(HAVE_SYS_XATTR_H)
 +		ret = copy_xattrs(a, tmpfd, dffd);
 +		if (ret == ARCHIVE_OK)
 +#endif
 +			ret = copy_acls(a, tmpfd, dffd);
 +		close(tmpfd);
 +		close(dffd);
 +	} else {
 +		if (copyfile(metadata, datafork, 0,
 +		    COPYFILE_UNPACK | COPYFILE_NOFOLLOW
 +		    | COPYFILE_ACL | COPYFILE_XATTR) < 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Failed to restore metadata");
 +			ret = ARCHIVE_WARN;
 +		}
 +	}
 +	return (ret);
 +}
 +
 +static int
 +set_mac_metadata(struct archive_write_disk *a, const char *pathname,
 +		 const void *metadata, size_t metadata_size)
 +{
 +	struct archive_string tmp;
 +	ssize_t written;
 +	int fd;
 +	int ret = ARCHIVE_OK;
 +
 +	/* This would be simpler if copyfile() could just accept the
 +	 * metadata as a block of memory; then we could sidestep this
 +	 * silly dance of writing the data to disk just so that
 +	 * copyfile() can read it back in again. */
 +	archive_string_init(&tmp);
 +	archive_strcpy(&tmp, pathname);
 +	archive_strcat(&tmp, ".XXXXXX");
 +	fd = mkstemp(tmp.s);
 +
 +	if (fd < 0) {
 +		archive_set_error(&a->archive, errno,
 +				  "Failed to restore metadata");
 +		archive_string_free(&tmp);
 +		return (ARCHIVE_WARN);
 +	}
 +	written = write(fd, metadata, metadata_size);
 +	close(fd);
 +	if ((size_t)written != metadata_size) {
 +		archive_set_error(&a->archive, errno,
 +				  "Failed to restore metadata");
 +		ret = ARCHIVE_WARN;
 +	} else {
 +		int compressed;
 +
 +#if defined(UF_COMPRESSED)
 +		if ((a->todo & TODO_HFS_COMPRESSION) != 0 &&
 +		    (ret = lazy_stat(a)) == ARCHIVE_OK)
 +			compressed = a->st.st_flags & UF_COMPRESSED;
 +		else
 +#endif
 +			compressed = 0;
 +		ret = copy_metadata(a, tmp.s, pathname, compressed);
 +	}
 +	unlink(tmp.s);
 +	archive_string_free(&tmp);
 +	return (ret);
 +}
 +
 +static int
 +fixup_appledouble(struct archive_write_disk *a, const char *pathname)
 +{
 +	char buff[8];
 +	struct stat st;
 +	const char *p;
 +	struct archive_string datafork;
 +	int fd = -1, ret = ARCHIVE_OK;
 +
 +	archive_string_init(&datafork);
 +	/* Check if the current file name is a type of the resource
 +	 * fork file. */
 +	p = strrchr(pathname, '/');
 +	if (p == NULL)
 +		p = pathname;
 +	else
 +		p++;
 +	if (p[0] != '.' || p[1] != '_')
 +		goto skip_appledouble;
 +
 +	/*
 +	 * Check if the data fork file exists.
 +	 *
 +	 * TODO: Check if this write disk object has handled it.
 +	 */
 +	archive_strncpy(&datafork, pathname, p - pathname);
 +	archive_strcat(&datafork, p + 2);
 +	if (lstat(datafork.s, &st) == -1 ||
 +	    (st.st_mode & AE_IFMT) != AE_IFREG)
 +		goto skip_appledouble;
 +
 +	/*
 +	 * Check if the file is in the AppleDouble form.
 +	 */
 +	fd = open(pathname, O_RDONLY | O_BINARY | O_CLOEXEC);
 +	__archive_ensure_cloexec_flag(fd);
 +	if (fd == -1) {
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to open a restoring file");
 +		ret = ARCHIVE_WARN;
 +		goto skip_appledouble;
 +	}
 +	if (read(fd, buff, 8) == -1) {
 +		archive_set_error(&a->archive, errno,
 +		    "Failed to read a restoring file");
 +		close(fd);
 +		ret = ARCHIVE_WARN;
 +		goto skip_appledouble;
 +	}
 +	close(fd);
 +	/* Check AppleDouble Magic Code. */
 +	if (archive_be32dec(buff) != 0x00051607)
 +		goto skip_appledouble;
 +	/* Check AppleDouble Version. */
 +	if (archive_be32dec(buff+4) != 0x00020000)
 +		goto skip_appledouble;
 +
 +	ret = copy_metadata(a, pathname, datafork.s,
 +#if defined(UF_COMPRESSED)
 +	    st.st_flags & UF_COMPRESSED);
 +#else
 +	    0);
 +#endif
 +	if (ret == ARCHIVE_OK) {
 +		unlink(pathname);
 +		ret = ARCHIVE_EOF;
 +	}
 +skip_appledouble:
 +	archive_string_free(&datafork);
 +	return (ret);
 +}
 +#endif
 +
 +#if HAVE_LSETXATTR || HAVE_LSETEA
 +/*
 + * Restore extended attributes -  Linux and AIX implementations:
 + * AIX' ea interface is syntaxwise identical to the Linux xattr interface.
 + */
 +static int
 +set_xattrs(struct archive_write_disk *a)
 +{
 +	struct archive_entry *entry = a->entry;
 +	static int warning_done = 0;
 +	int ret = ARCHIVE_OK;
 +	int i = archive_entry_xattr_reset(entry);
 +
 +	while (i--) {
 +		const char *name;
 +		const void *value;
 +		size_t size;
 +		archive_entry_xattr_next(entry, &name, &value, &size);
 +		if (name != NULL &&
 +				strncmp(name, "xfsroot.", 8) != 0 &&
 +				strncmp(name, "system.", 7) != 0) {
 +			int e;
 +#if HAVE_FSETXATTR
 +			if (a->fd >= 0)
 +				e = fsetxattr(a->fd, name, value, size, 0);
 +			else
 +#elif HAVE_FSETEA
 +			if (a->fd >= 0)
 +				e = fsetea(a->fd, name, value, size, 0);
 +			else
 +#endif
 +			{
 +#if HAVE_LSETXATTR
 +				e = lsetxattr(archive_entry_pathname(entry),
 +				    name, value, size, 0);
 +#elif HAVE_LSETEA
 +				e = lsetea(archive_entry_pathname(entry),
 +				    name, value, size, 0);
 +#endif
 +			}
 +			if (e == -1) {
 +				if (errno == ENOTSUP || errno == ENOSYS) {
 +					if (!warning_done) {
 +						warning_done = 1;
 +						archive_set_error(&a->archive, errno,
 +						    "Cannot restore extended "
 +						    "attributes on this file "
 +						    "system");
 +					}
 +				} else
 +					archive_set_error(&a->archive, errno,
 +					    "Failed to set extended attribute");
 +				ret = ARCHIVE_WARN;
 +			}
 +		} else {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Invalid extended attribute encountered");
 +			ret = ARCHIVE_WARN;
 +		}
 +	}
 +	return (ret);
 +}
 +#elif HAVE_EXTATTR_SET_FILE && HAVE_DECL_EXTATTR_NAMESPACE_USER
 +/*
 + * Restore extended attributes -  FreeBSD implementation
 + */
 +static int
 +set_xattrs(struct archive_write_disk *a)
 +{
 +	struct archive_entry *entry = a->entry;
 +	static int warning_done = 0;
 +	int ret = ARCHIVE_OK;
 +	int i = archive_entry_xattr_reset(entry);
 +
 +	while (i--) {
 +		const char *name;
 +		const void *value;
 +		size_t size;
 +		archive_entry_xattr_next(entry, &name, &value, &size);
 +		if (name != NULL) {
 +			int e;
 +			int namespace;
 +
 +			if (strncmp(name, "user.", 5) == 0) {
 +				/* "user." attributes go to user namespace */
 +				name += 5;
 +				namespace = EXTATTR_NAMESPACE_USER;
 +			} else {
 +				/* Warn about other extended attributes. */
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_FILE_FORMAT,
 +				    "Can't restore extended attribute ``%s''",
 +				    name);
 +				ret = ARCHIVE_WARN;
 +				continue;
 +			}
 +			errno = 0;
 +#if HAVE_EXTATTR_SET_FD
 +			if (a->fd >= 0)
 +				e = extattr_set_fd(a->fd, namespace, name, value, size);
 +			else
 +#endif
 +			/* TODO: should we use extattr_set_link() instead? */
 +			{
 +				e = extattr_set_file(archive_entry_pathname(entry),
 +				    namespace, name, value, size);
 +			}
 +			if (e != (int)size) {
 +				if (errno == ENOTSUP || errno == ENOSYS) {
 +					if (!warning_done) {
 +						warning_done = 1;
 +						archive_set_error(&a->archive, errno,
 +						    "Cannot restore extended "
 +						    "attributes on this file "
 +						    "system");
 +					}
 +				} else {
 +					archive_set_error(&a->archive, errno,
 +					    "Failed to set extended attribute");
 +				}
 +
 +				ret = ARCHIVE_WARN;
 +			}
 +		}
 +	}
 +	return (ret);
 +}
 +#else
 +/*
 + * Restore extended attributes - stub implementation for unsupported systems
 + */
 +static int
 +set_xattrs(struct archive_write_disk *a)
 +{
 +	static int warning_done = 0;
 +
 +	/* If there aren't any extended attributes, then it's okay not
 +	 * to extract them, otherwise, issue a single warning. */
 +	if (archive_entry_xattr_count(a->entry) != 0 && !warning_done) {
 +		warning_done = 1;
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Cannot restore extended attributes on this system");
 +		return (ARCHIVE_WARN);
 +	}
 +	/* Warning was already emitted; suppress further warnings. */
 +	return (ARCHIVE_OK);
 +}
 +#endif
 +
 +/*
 + * Test if file on disk is older than entry.
 + */
 +static int
 +older(struct stat *st, struct archive_entry *entry)
 +{
 +	/* First, test the seconds and return if we have a definite answer. */
 +	/* Definitely older. */
 +	if (st->st_mtime < archive_entry_mtime(entry))
 +		return (1);
 +	/* Definitely younger. */
 +	if (st->st_mtime > archive_entry_mtime(entry))
 +		return (0);
 +	/* If this platform supports fractional seconds, try those. */
 +#if HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC
 +	/* Definitely older. */
 +	if (st->st_mtimespec.tv_nsec < archive_entry_mtime_nsec(entry))
 +		return (1);
 +#elif HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
 +	/* Definitely older. */
 +	if (st->st_mtim.tv_nsec < archive_entry_mtime_nsec(entry))
 +		return (1);
 +#elif HAVE_STRUCT_STAT_ST_MTIME_N
 +	/* older. */
 +	if (st->st_mtime_n < archive_entry_mtime_nsec(entry))
 +		return (1);
 +#elif HAVE_STRUCT_STAT_ST_UMTIME
 +	/* older. */
 +	if (st->st_umtime * 1000 < archive_entry_mtime_nsec(entry))
 +		return (1);
 +#elif HAVE_STRUCT_STAT_ST_MTIME_USEC
 +	/* older. */
 +	if (st->st_mtime_usec * 1000 < archive_entry_mtime_nsec(entry))
 +		return (1);
 +#else
 +	/* This system doesn't have high-res timestamps. */
 +#endif
 +	/* Same age or newer, so not older. */
 +	return (0);
 +}
 +
 +#endif /* !_WIN32 || __CYGWIN__ */
 +
diff --cc Utilities/cmlibarchive/libarchive/archive_write_set_format_filter_by_ext.c
index 0000000,adec9b2..adec9b2
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_filter_by_ext.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_filter_by_ext.c
diff --cc Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
index e722625,0000000..576f4c2
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
@@@ -1,8148 -1,0 +1,8158 @@@
 +/*-
 + * Copyright (c) 2009-2012 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +
 +#ifdef HAVE_SYS_TYPES_H
 +#include <sys/types.h>
 +#endif
 +#ifdef HAVE_SYS_UTSNAME_H
 +#include <sys/utsname.h>
 +#endif
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_LIMITS_H
 +#include <limits.h>
 +#endif
 +#include <stdio.h>
 +#include <stdarg.h>
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#include <time.h>
 +#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
 +#endif
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h>
 +#endif
 +
 +#include "archive.h"
 +#include "archive_endian.h"
 +#include "archive_entry.h"
 +#include "archive_entry_locale.h"
 +#include "archive_private.h"
 +#include "archive_rb.h"
 +#include "archive_write_private.h"
 +
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +#define getuid()			0
 +#define getgid()			0
 +#endif
 +
 +/*#define DEBUG 1*/
 +#ifdef DEBUG
 +/* To compare to the ISO image file made by mkisofs. */
 +#define COMPAT_MKISOFS		1
 +#endif
 +
 +#define LOGICAL_BLOCK_BITS			11
 +#define LOGICAL_BLOCK_SIZE			2048
 +#define PATH_TABLE_BLOCK_SIZE			4096
 +
 +#define SYSTEM_AREA_BLOCK			16
 +#define PRIMARY_VOLUME_DESCRIPTOR_BLOCK 	1
 +#define SUPPLEMENTARY_VOLUME_DESCRIPTOR_BLOCK 	1
 +#define BOOT_RECORD_DESCRIPTOR_BLOCK	 	1
 +#define VOLUME_DESCRIPTOR_SET_TERMINATOR_BLOCK	1
 +#define NON_ISO_FILE_SYSTEM_INFORMATION_BLOCK	1
 +#define RRIP_ER_BLOCK				1
 +#define PADDING_BLOCK				150
 +
 +#define FD_1_2M_SIZE		(1024 * 1200)
 +#define FD_1_44M_SIZE		(1024 * 1440)
 +#define FD_2_88M_SIZE		(1024 * 2880)
 +#define MULTI_EXTENT_SIZE	(ARCHIVE_LITERAL_LL(1) << 32)	/* 4Gi bytes. */
 +#define MAX_DEPTH		8
 +#define RR_CE_SIZE		28		/* SUSP "CE" extension size */
 +
 +#define FILE_FLAG_EXISTENCE	0x01
 +#define FILE_FLAG_DIRECTORY	0x02
 +#define FILE_FLAG_ASSOCIATED	0x04
 +#define FILE_FLAG_RECORD	0x08
 +#define FILE_FLAG_PROTECTION	0x10
 +#define FILE_FLAG_MULTI_EXTENT	0x80
 +
 +static const char rrip_identifier[] =
 +	"RRIP_1991A";
 +static const char rrip_descriptor[] =
 +	"THE ROCK RIDGE INTERCHANGE PROTOCOL PROVIDES SUPPORT FOR "
 +	"POSIX FILE SYSTEM SEMANTICS";
 +static const char rrip_source[] =
 +	"PLEASE CONTACT DISC PUBLISHER FOR SPECIFICATION SOURCE.  "
 +	"SEE PUBLISHER IDENTIFIER IN PRIMARY VOLUME DESCRIPTOR FOR "
 +	"CONTACT INFORMATION.";
 +#define RRIP_ER_ID_SIZE		(sizeof(rrip_identifier)-1)
 +#define RRIP_ER_DSC_SIZE	(sizeof(rrip_descriptor)-1)
 +#define RRIP_ER_SRC_SIZE	(sizeof(rrip_source)-1)
 +#define RRIP_ER_SIZE		(8 + RRIP_ER_ID_SIZE + \
 +				RRIP_ER_DSC_SIZE + RRIP_ER_SRC_SIZE)
 +
 +static const unsigned char zisofs_magic[8] = {
 +	0x37, 0xE4, 0x53, 0x96, 0xC9, 0xDB, 0xD6, 0x07
 +};
 +
 +#define ZF_HEADER_SIZE	16	/* zisofs header size. */
 +#define ZF_LOG2_BS	15	/* log2 block size; 32K bytes. */
 +#define ZF_BLOCK_SIZE	(1UL << ZF_LOG2_BS)
 +
 +/*
 + * Manage extra records.
 + */
 +struct extr_rec {
 +	int		 location;
 +	int		 offset;
 +	unsigned char	 buf[LOGICAL_BLOCK_SIZE];
 +	struct extr_rec	*next;
 +};
 +
 +struct ctl_extr_rec {
 +	int		 use_extr;
 +	unsigned char	*bp;
 +	struct isoent	*isoent;
 +	unsigned char	*ce_ptr;
 +	int		 cur_len;
 +	int		 dr_len;
 +	int		 limit;
 +	int		 extr_off;
 +	int		 extr_loc;
 +};
 +#define DR_SAFETY	RR_CE_SIZE
 +#define DR_LIMIT	(254 - DR_SAFETY)
 +
 +/*
 + * The relation of struct isofile and isoent and archive_entry.
 + *
 + * Primary volume tree  --> struct isoent
 + *                                |
 + *                                v
 + *                          struct isofile --> archive_entry
 + *                                ^
 + *                                |
 + * Joliet volume tree   --> struct isoent
 + *
 + * struct isoent has specific information for volume.
 + */
 +
 +struct isofile {
 +	/* Used for managing struct isofile list. */
 +	struct isofile		*allnext;
 +	struct isofile		*datanext;
 +	/* Used for managing a hardlined struct isofile list. */
 +	struct isofile		*hlnext;
 +	struct isofile		*hardlink_target;
 +
 +	struct archive_entry	*entry;
 +
 +	/*
 +	 * Used for making a directory tree.
 +	 */
 +	struct archive_string	 parentdir;
 +	struct archive_string	 basename;
 +	struct archive_string	 basename_utf16;
 +	struct archive_string	 symlink;
 +	int			 dircnt;	/* The number of elements of
 +						 * its parent directory */
 +
 +	/*
 +	 * Used for a Directory Record.
 +	 */
 +	struct content {
 +		int64_t		 offset_of_temp;
 +		int64_t		 size;
 +		int		 blocks;
 +		uint32_t 	 location;
 +		/*
 +		 * One extent equals one content.
 +		 * If this entry has multi extent, `next' variable points
 +		 * next content data.
 +		 */
 +		struct content	*next;		/* next content	*/
 +	} content, *cur_content;
 +	int			 write_content;
 +
 +	enum {
 +		NO = 0,
 +		BOOT_CATALOG,
 +		BOOT_IMAGE
 +	} boot;
 +
 +	/*
 +	 * Used for a zisofs.
 +	 */
 +	struct {
 +		unsigned char	 header_size;
 +		unsigned char	 log2_bs;
 +		uint32_t	 uncompressed_size;
 +	} zisofs;
 +};
 +
 +struct isoent {
 +	/* Keep `rbnode' at the first member of struct isoent. */
 +	struct archive_rb_node	 rbnode;
 +
 +	struct isofile		*file;
 +
 +	struct isoent		*parent;
 +	/* A list of children.(use chnext) */
 +	struct {
 +		struct isoent	*first;
 +		struct isoent	**last;
 +		int		 cnt;
 +	}			 children;
 +	struct archive_rb_tree	 rbtree;
 +
 +	/* A list of sub directories.(use drnext) */
 +	struct {
 +		struct isoent	*first;
 +		struct isoent	**last;
 +		int		 cnt;
 +	}			 subdirs;
 +	/* A sorted list of sub directories. */
 +	struct isoent		**children_sorted;
 +	/* Used for managing struct isoent list. */
 +	struct isoent		*chnext;
 +	struct isoent		*drnext;
 +	struct isoent		*ptnext;
 +
 +	/*
 +	 * Used for making a Directory Record.
 +	 */
 +	int			 dir_number;
 +	struct {
 +		int		 vd;
 +		int		 self;
 +		int		 parent;
 +		int		 normal;
 +	}			 dr_len;
 +	uint32_t 		 dir_location;
 +	int			 dir_block;
 +
 +	/*
 +	 * Identifier:
 +	 *   on primary, ISO9660 file/directory name.
 +	 *   on joliet, UCS2 file/directory name.
 +	 * ext_off   : offset of identifier extension.
 +	 * ext_len   : length of identifier extension.
 +	 * id_len    : byte size of identifier.
 +	 *   on primary, this is ext_off + ext_len + version length.
 +	 *   on joliet, this is ext_off + ext_len.
 +	 * mb_len    : length of multibyte-character of identifier.
 +	 *   on primary, mb_len and id_len are always the same.
 +	 *   on joliet, mb_len and id_len are different.
 +	 */
 +	char			*identifier;
 +	int			 ext_off;
 +	int			 ext_len;
 +	int			 id_len;
 +	int			 mb_len;
 +
 +	/*
 +	 * Used for making a Rockridge extension.
 +	 * This is a part of Directory Records.
 +	 */
 +	struct isoent		*rr_parent;
 +	struct isoent		*rr_child;
 +
 +	/* Extra Record.(which we call in this source file)
 +	 * A maximum size of the Directory Record is 254.
 +	 * so, if generated RRIP data of a file cannot into a Directory
 +	 * Record because of its size, that surplus data relocate this
 +	 * Extra Record.
 +	 */
 +	struct {
 +		struct extr_rec	*first;
 +		struct extr_rec	**last;
 +		struct extr_rec	*current;
 +	}			 extr_rec_list;
 +
 +	int			 virtual:1;
 +	/* If set to one, this file type is a directory.
 +	 * A convenience flag to be used as
 +	 * "archive_entry_filetype(isoent->file->entry) == AE_IFDIR".
 +	 */
 +	int			 dir:1;
 +};
 +
 +struct hardlink {
 +	struct archive_rb_node	 rbnode;
 +	int			 nlink;
 +	struct {
 +		struct isofile	*first;
 +		struct isofile	**last;
 +	}			 file_list;
 +};
 +
 +/*
 + * ISO writer options
 + */
 +struct iso_option {
 +	/*
 +	 * Usage  : abstract-file=<value>
 +	 * Type   : string, max 37 bytes
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -abstract <value>
 +	 *
 +	 * Specifies Abstract Filename.
 +	 * This file shall be described in the Root Directory
 +	 * and containing a abstract statement.
 +	 */
 +	unsigned int	 abstract_file:1;
 +#define OPT_ABSTRACT_FILE_DEFAULT	0	/* Not specified */
 +#define ABSTRACT_FILE_SIZE		37
 +
 +	/*
 +	 * Usage  : application-id=<value>
 +	 * Type   : string, max 128 bytes
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -A/-appid <value>.
 +	 *
 +	 * Specifies Application Identifier.
 +	 * If the first byte is set to '_'(5F), the remaining
 +	 * bytes of this option shall specify an identifier
 +	 * for a file containing the identification of the
 +	 * application.
 +	 * This file shall be described in the Root Directory.
 +	 */
 +	unsigned int	 application_id:1;
 +#define OPT_APPLICATION_ID_DEFAULT	0	/* Use default identifier */
 +#define APPLICATION_IDENTIFIER_SIZE	128
 +
 +	/*
 +	 * Usage : !allow-vernum
 +	 * Type  : boolean
 +	 * Default: Enabled
 +	 *	  : Violates the ISO9660 standard if disable.
 +	 * COMPAT: mkisofs -N
 +	 *
 +	 * Allow filenames to use version numbers.
 +	 */
 +	unsigned int	 allow_vernum:1;
 +#define OPT_ALLOW_VERNUM_DEFAULT	1	/* Enabled */
 +
 +	/*
 +	 * Usage  : biblio-file=<value>
 +	 * Type   : string, max 37 bytes
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -biblio <value>
 +	 *
 +	 * Specifies Bibliographic Filename.
 +	 * This file shall be described in the Root Directory
 +	 * and containing bibliographic records.
 +	 */
 +	unsigned int	 biblio_file:1;
 +#define OPT_BIBLIO_FILE_DEFAULT		0	/* Not specified */
 +#define BIBLIO_FILE_SIZE		37
 +
 +	/*
 +	 * Usage  : boot=<value>
 +	 * Type   : string
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -b/-eltorito-boot <value>
 +	 *
 +	 * Specifies "El Torito" boot image file to make
 +	 * a bootable CD.
 +	 */
 +	unsigned int	 boot:1;
 +#define OPT_BOOT_DEFAULT		0	/* Not specified */
 +
 +	/*
 +	 * Usage  : boot-catalog=<value>
 +	 * Type   : string
 +	 * Default: "boot.catalog"
 +	 * COMPAT : mkisofs -c/-eltorito-catalog <value>
 +	 *
 +	 * Specifies a fullpath of El Torito boot catalog.
 +	 */
 +	unsigned int	 boot_catalog:1;
 +#define OPT_BOOT_CATALOG_DEFAULT	0	/* Not specified */
 +
 +	/*
 +	 * Usage  : boot-info-table
 +	 * Type   : boolean
 +	 * Default: Disabled
 +	 * COMPAT : mkisofs -boot-info-table
 +	 *
 +	 * Modify the boot image file specified by `boot'
 +	 * option; ISO writer stores boot file information
 +	 * into the boot file in ISO image at offset 8
 +	 * through offset 64.
 +	 */
 +	unsigned int	 boot_info_table:1;
 +#define OPT_BOOT_INFO_TABLE_DEFAULT	0	/* Disabled */
 +
 +	/*
 +	 * Usage  : boot-load-seg=<value>
 +	 * Type   : hexadecimal
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -boot-load-seg <value>
 +	 *
 +	 * Specifies a load segment for boot image.
 +	 * This is used with no-emulation mode.
 +	 */
 +	unsigned int	 boot_load_seg:1;
 +#define OPT_BOOT_LOAD_SEG_DEFAULT	0	/* Not specified */
 +
 +	/*
 +	 * Usage  : boot-load-size=<value>
 +	 * Type   : decimal
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -boot-load-size <value>
 +	 *
 +	 * Specifies a sector count for boot image.
 +	 * This is used with no-emulation mode.
 +	 */
 +	unsigned int	 boot_load_size:1;
 +#define OPT_BOOT_LOAD_SIZE_DEFAULT	0	/* Not specified */
 +
 +	/*
 +	 * Usage  : boot-type=<boot-media-type>
 +	 *        : 'no-emulation' : 'no emulation' image
 +	 *        :           'fd' : floppy disk image
 +	 *        :    'hard-disk' : hard disk image
 +	 * Type   : string
 +	 * Default: Auto detect
 +	 *        : We check a size of boot image;
 +	 *        : If ths size is just 1.22M/1.44M/2.88M,
 +	 *        : we assume boot_type is 'fd';
 +	 *        : otherwise boot_type is 'no-emulation'.
 +	 * COMPAT :
 +	 *    boot=no-emulation
 +	 *	mkisofs -no-emul-boot
 +	 *    boot=fd
 +	 *	This is a default on the mkisofs.
 +	 *    boot=hard-disk
 +	 *	mkisofs -hard-disk-boot
 +	 *
 +	 * Specifies a type of "El Torito" boot image.
 +	 */
 +	unsigned int	 boot_type:2;
 +#define OPT_BOOT_TYPE_AUTO		0	/* auto detect		  */
 +#define OPT_BOOT_TYPE_NO_EMU		1	/* ``no emulation'' image */
 +#define OPT_BOOT_TYPE_FD		2	/* floppy disk image	  */
 +#define OPT_BOOT_TYPE_HARD_DISK		3	/* hard disk image	  */
 +#define OPT_BOOT_TYPE_DEFAULT		OPT_BOOT_TYPE_AUTO
 +
 +	/*
 +	 * Usage  : compression-level=<value>
 +	 * Type   : decimal
 +	 * Default: Not specified
 +	 * COMPAT : NONE
 +	 *
 +	 * Specifies compression level for option zisofs=direct.
 +	 */
 +	unsigned int	 compression_level:1;
 +#define OPT_COMPRESSION_LEVEL_DEFAULT	0	/* Not specified */
 +
 +	/*
 +	 * Usage  : copyright-file=<value>
 +	 * Type   : string, max 37 bytes
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -copyright <value>
 +	 *
 +	 * Specifies Copyright Filename.
 +	 * This file shall be described in the Root Directory
 +	 * and containing a copyright statement.
 +	 */
 +	unsigned int	 copyright_file:1;
 +#define OPT_COPYRIGHT_FILE_DEFAULT	0	/* Not specified */
 +#define COPYRIGHT_FILE_SIZE		37
 +
 +	/*
 +	 * Usage  : gid=<value>
 +	 * Type   : decimal
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -gid <value>
 +	 *
 +	 * Specifies a group id to rewrite the group id of all files.
 +	 */
 +	unsigned int	 gid:1;
 +#define OPT_GID_DEFAULT			0	/* Not specified */
 +
 +	/*
 +	 * Usage  : iso-level=[1234]
 +	 * Type   : decimal
 +	 * Default: 1
 +	 * COMPAT : mkisofs -iso-level <value>
 +	 *
 +	 * Specifies ISO9600 Level.
 +	 * Level 1: [DEFAULT]
 +	 *   - limits each file size less than 4Gi bytes;
 +	 *   - a File Name shall not contain more than eight
 +	 *     d-characters or eight d1-characters;
 +	 *   - a File Name Extension shall not contain more than
 +	 *     three d-characters or three d1-characters;
 +	 *   - a Directory Identifier shall not contain more
 +	 *     than eight d-characters or eight d1-characters.
 +	 * Level 2:
 +	 *   - limits each file size less than 4Giga bytes;
 +	 *   - a File Name shall not contain more than thirty
 +	 *     d-characters or thirty d1-characters;
 +	 *   - a File Name Extension shall not contain more than
 +	 *     thirty d-characters or thirty d1-characters;
 +	 *   - a Directory Identifier shall not contain more
 +	 *     than thirty-one d-characters or thirty-one
 +	 *     d1-characters.
 +	 * Level 3:
 +	 *   - no limit of file size; use multi extent.
 +	 * Level 4:
 +	 *   - this level 4 simulates mkisofs option
 +	 *     '-iso-level 4';
 +	 *   - crate a enhanced volume as mkisofs doing;
 +	 *   - allow a File Name to have leading dot;
 +	 *   - allow a File Name to have all ASCII letters;
 +	 *   - allow a File Name to have multiple dots;
 +	 *   - allow more then 8 depths of directory trees;
 +	 *   - disable a version number to a File Name;
 +	 *   - disable a forced period to the tail of a File Name;
 +	 *   - the maxinum length of files and directories is raised to 193.
 +	 *     if rockridge option is disabled, raised to 207.
 +	 */
 +	unsigned int	 iso_level:3;
 +#define OPT_ISO_LEVEL_DEFAULT		1	/* ISO Level 1 */
 +
 +	/*
 +	 * Usage  : joliet[=long]
 +	 *        : !joliet
 +	 *        :   Do not generate Joliet Volume and Records.
 +	 *        : joliet [DEFAULT]
 +	 *        :   Generates Joliet Volume and Directory Records.
 +	 *        :   [COMPAT: mkisofs -J/-joliet]
 +	 *        : joliet=long
 +	 *        :   The joliet filenames are up to 103 Unicode
 +	 *        :   characters.
 +	 *        :   This option breaks the Joliet specification.
 +	 *        :   [COMPAT: mkisofs -J -joliet-long]
 +	 * Type   : boolean/string
 +	 * Default: Enabled
 +	 * COMPAT : mkisofs -J / -joliet-long
 +	 *
 +	 * Generates Joliet Volume and Directory Records.
 +	 */
 +	unsigned int	 joliet:2;
 +#define OPT_JOLIET_DISABLE		0	/* Not generate Joliet Records. */
 +#define OPT_JOLIET_ENABLE		1	/* Generate Joliet Records.  */
 +#define OPT_JOLIET_LONGNAME		2	/* Use long joliet filenames.*/
 +#define OPT_JOLIET_DEFAULT		OPT_JOLIET_ENABLE
 +
 +	/*
 +	 * Usage  : !limit-depth
 +	 * Type   : boolean
 +	 * Default: Enabled
 +	 *	  : Violates the ISO9660 standard if disable.
 +	 * COMPAT : mkisofs -D/-disable-deep-relocation
 +	 *
 +	 * The number of levels in hierarchy cannot exceed eight.
 +	 */
 +	unsigned int	 limit_depth:1;
 +#define OPT_LIMIT_DEPTH_DEFAULT		1	/* Enabled */
 +
 +	/*
 +	 * Usage  : !limit-dirs
 +	 * Type   : boolean
 +	 * Default: Enabled
 +	 *	  : Violates the ISO9660 standard if disable.
 +	 * COMPAT : mkisofs -no-limit-pathtables
 +	 *
 +	 * Limits the number of directories less than 65536 due
 +	 * to the size of the Parent Directory Number of Path
 +	 * Table.
 +	 */
 +	unsigned int	 limit_dirs:1;
 +#define OPT_LIMIT_DIRS_DEFAULT		1	/* Enabled */
 +
 +	/*
 +	 * Usage  : !pad
 +	 * Type   : boolean
 +	 * Default: Enabled
 +	 * COMPAT : -pad/-no-pad
 +	 *
 +	 * Pads the end of the ISO image by null of 300Ki bytes.
 +	 */
 +	unsigned int	 pad:1;
 +#define OPT_PAD_DEFAULT			1	/* Enabled */
 +
 +	/*
 +	 * Usage  : publisher=<value>
 +	 * Type   : string, max 128 bytes
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -publisher <value>
 +	 *
 +	 * Specifies Publisher Identifier.
 +	 * If the first byte is set to '_'(5F), the remaining
 +	 * bytes of this option shall specify an identifier
 +	 * for a file containing the identification of the user.
 +	 * This file shall be described in the Root Directory.
 +	 */
 +	unsigned int	 publisher:1;
 +#define OPT_PUBLISHER_DEFAULT		0	/* Not specified */
 +#define PUBLISHER_IDENTIFIER_SIZE	128
 +
 +	/*
 +	 * Usage  : rockridge
 +	 *        : !rockridge
 +	 *        :    disable to generate SUSP and RR records.
 +	 *        : rockridge
 +	 *        :    the same as 'rockridge=useful'.
 +	 *        : rockridge=strict
 +	 *        :    generate SUSP and RR records.
 +	 *        :    [COMPAT: mkisofs -R]
 +	 *        : rockridge=useful [DEFAULT]
 +	 *        :    generate SUSP and RR records.
 +	 *        :    [COMPAT: mkisofs -r]
 +	 *        :    NOTE  Our rockridge=useful option does not set a zero
 +	 *        :          to uid and gid, you should use application
 +	 *        :          option such as --gid,--gname,--uid and --uname
 +	 *        :          badtar options instead.
 +	 * Type   : boolean/string
 +	 * Default: Enabled as rockridge=useful
 +	 * COMPAT : mkisofs -r / -R
 +	 *
 +	 * Generates SUSP and RR records.
 +	 */
 +	unsigned int	 rr:2;
 +#define OPT_RR_DISABLED			0
 +#define OPT_RR_STRICT			1
 +#define OPT_RR_USEFUL			2
 +#define OPT_RR_DEFAULT			OPT_RR_USEFUL
 +
 +	/*
 +	 * Usage  : volume-id=<value>
 +	 * Type   : string, max 32 bytes
 +	 * Default: Not specified
 +	 * COMPAT : mkisofs -V <value>
 +	 *
 +	 * Specifies Volume Identifier.
 +	 */
 +	unsigned int	 volume_id:1;
 +#define OPT_VOLUME_ID_DEFAULT		0	/* Use default identifier */
 +#define VOLUME_IDENTIFIER_SIZE		32
 +
 +	/*
 +	 * Usage  : !zisofs [DEFAULT] 
 +	 *        :    Disable to generate RRIP 'ZF' extension.
 +	 *        : zisofs
 +	 *        :    Make files zisofs file and generate RRIP 'ZF'
 + 	 *        :    extension. So you do not need mkzftree utility
 +	 *        :    for making zisofs.
 +	 *        :    When the file size is less than one Logical Block
 +	 *        :    size, that file will not zisofs'ed since it does
 +	 *        :    reduece an ISO-image size.
 +	 *        :
 +	 *        :    When you specify option 'boot=<boot-image>', that
 +	 *        :    'boot-image' file won't be converted to zisofs file.
 +	 * Type   : boolean
 +	 * Default: Disabled
 +	 *
 +	 * Generates RRIP 'ZF' System Use Entry.
 +	 */
 +	unsigned int	 zisofs:1;
 +#define OPT_ZISOFS_DISABLED		0
 +#define OPT_ZISOFS_DIRECT		1
 +#define OPT_ZISOFS_DEFAULT		OPT_ZISOFS_DISABLED
 +
 +};
 +
 +struct iso9660 {
 +	/* The creation time of ISO image. */
 +	time_t			 birth_time;
 +	/* A file stream of a temporary file, which file contents
 +	 * save to until ISO iamge can be created. */
 +	int			 temp_fd;
 +
 +	struct isofile		*cur_file;
 +	struct isoent		*cur_dirent;
 +	struct archive_string	 cur_dirstr;
 +	uint64_t		 bytes_remaining;
 +	int			 need_multi_extent;
 +
 +	/* Temporary string buffer for Joliet extension. */ 
 +	struct archive_string	 utf16be;
 +	struct archive_string	 mbs;
 +
 +	struct archive_string_conv *sconv_to_utf16be;
 +	struct archive_string_conv *sconv_from_utf16be;
 +
 +	/* A list of all of struct isofile entries. */
 +	struct {
 +		struct isofile	*first;
 +		struct isofile	**last;
 +	}			 all_file_list;
 +
 +	/* A list of struct isofile entries which have its
 +	 * contents and are not a directory, a hardlined file
 +	 * and a symlink file. */
 +	struct {
 +		struct isofile	*first;
 +		struct isofile	**last;
 +	}			 data_file_list;
 +
 +	/* Used for managing to find hardlinking files. */
 +	struct archive_rb_tree	 hardlink_rbtree;
 +
 +	/* Used for making the Path Table Record. */
 +	struct vdd {
 +		/* the root of entry tree. */
 +		struct isoent	*rootent;
 +		enum vdd_type {
 +			VDD_PRIMARY,
 +			VDD_JOLIET,
 +			VDD_ENHANCED
 +		} vdd_type;
 +
 +		struct path_table {
 +			struct isoent		*first;
 +			struct isoent		**last;
 +			struct isoent		**sorted;
 +			int			 cnt;
 +		} *pathtbl;
 +		int				 max_depth;
 +
 +		int		 path_table_block;
 +		int		 path_table_size;
 +		int		 location_type_L_path_table;
 +		int		 location_type_M_path_table;
 +		int		 total_dir_block;
 +	} primary, joliet;
 +
 +	/* Used for making a Volume Descriptor. */
 +	int			 volume_space_size;
 +	int			 volume_sequence_number;
 +	int			 total_file_block;
 +	struct archive_string	 volume_identifier;
 +	struct archive_string	 publisher_identifier;
 +	struct archive_string	 data_preparer_identifier;
 +	struct archive_string	 application_identifier;
 +	struct archive_string	 copyright_file_identifier;
 +	struct archive_string	 abstract_file_identifier;
 +	struct archive_string	 bibliographic_file_identifier;
 +
 +	/* Used for making rockridge extensions. */
 +	int			 location_rrip_er;
 +
 +	/* Used for making zisofs. */
 +	struct {
 +		int		 detect_magic:1;
 +		int		 making:1;
 +		int		 allzero:1;
 +		unsigned char	 magic_buffer[64];
 +		int		 magic_cnt;
 +
 +#ifdef HAVE_ZLIB_H
 +		/*
 +		 * Copy a compressed file to iso9660.zisofs.temp_fd
 +		 * and also copy a uncompressed file(original file) to
 +		 * iso9660.temp_fd . If the number of logical block
 +		 * of the compressed file is less than the number of
 +		 * logical block of the uncompressed file, use it and
 +		 * remove the copy of the uncompressed file.
 +		 * but if not, we use uncompressed file and remove
 +		 * the copy of the compressed file.
 +		 */
 +		uint32_t	*block_pointers;
 +		size_t		 block_pointers_allocated;
 +		int		 block_pointers_cnt;
 +		int		 block_pointers_idx;
 +		int64_t		 total_size;
 +		int64_t		 block_offset;
 +
 +		z_stream	 stream;
 +		int		 stream_valid;
 +		int64_t		 remaining;
 +		int		 compression_level;
 +#endif
 +	} zisofs;
 +
 +	struct isoent		*directories_too_deep;
 +	int			 dircnt_max;
 +
 +	/* Write buffer. */
 +#define wb_buffmax()	(LOGICAL_BLOCK_SIZE * 32)
 +#define wb_remaining(a)	(((struct iso9660 *)(a)->format_data)->wbuff_remaining)
 +#define wb_offset(a)	(((struct iso9660 *)(a)->format_data)->wbuff_offset \
 +		+ wb_buffmax() - wb_remaining(a))
 +	unsigned char		 wbuff[LOGICAL_BLOCK_SIZE * 32];
 +	size_t			 wbuff_remaining;
 +	enum {
 +		WB_TO_STREAM,
 +		WB_TO_TEMP
 +	} 			 wbuff_type;
 +	int64_t			 wbuff_offset;
 +	int64_t			 wbuff_written;
 +	int64_t			 wbuff_tail;
 +
 +	/* 'El Torito' boot data. */
 +	struct {
 +		/* boot catalog file */
 +		struct archive_string	 catalog_filename;
 +		struct isoent		*catalog;
 +		/* boot image file */
 +		struct archive_string	 boot_filename;
 +		struct isoent		*boot;
 +
 +		unsigned char		 platform_id;
 +#define BOOT_PLATFORM_X86	0
 +#define BOOT_PLATFORM_PPC	1
 +#define BOOT_PLATFORM_MAC	2
 +		struct archive_string	 id;
 +		unsigned char		 media_type;
 +#define BOOT_MEDIA_NO_EMULATION		0
 +#define BOOT_MEDIA_1_2M_DISKETTE	1
 +#define BOOT_MEDIA_1_44M_DISKETTE	2
 +#define BOOT_MEDIA_2_88M_DISKETTE	3
 +#define BOOT_MEDIA_HARD_DISK		4
 +		unsigned char		 system_type;
 +		uint16_t		 boot_load_seg;
 +		uint16_t		 boot_load_size;
 +#define BOOT_LOAD_SIZE		4
 +	} el_torito;
 +
 +	struct iso_option	 opt;
 +};
 +
 +/*
 + * Types of Volume Descriptor
 + */
 +enum VD_type {
 +	VDT_BOOT_RECORD=0,	/* Boot Record Volume Descriptor 	*/
 +	VDT_PRIMARY=1,		/* Primary Volume Descriptor		*/
 +	VDT_SUPPLEMENTARY=2,	/* Supplementary Volume Descriptor	*/
 +	VDT_TERMINATOR=255	/* Volume Descriptor Set Terminator	*/
 +};
 +
 +/*
 + * Types of Directory Record
 + */
 +enum dir_rec_type {
 +	DIR_REC_VD,		/* Stored in Volume Descriptor.	*/
 +	DIR_REC_SELF,		/* Stored as Current Directory.	*/
 +	DIR_REC_PARENT,		/* Stored as Parent Directory.	*/
 +	DIR_REC_NORMAL 		/* Stored as Child.		*/
 +};
 +
 +/*
 + * Kinds of Volume Descriptor Character
 + */
 +enum vdc {
 +	VDC_STD,
 +	VDC_LOWERCASE,
 +	VDC_UCS2,
 +	VDC_UCS2_DIRECT
 +};
 +
 +/*
 + * IDentifier Resolver.
 + * Used for resolving duplicated filenames.
 + */
 +struct idr {
 +	struct idrent {
 +		struct archive_rb_node	rbnode;
 +		/* Used in wait_list. */
 +		struct idrent		*wnext;
 +		struct idrent		*avail;
 +
 +		struct isoent		*isoent;
 +		int			 weight;
 +		int			 noff;
 +		int			 rename_num;
 +	} *idrent_pool;
 +
 +	struct archive_rb_tree		 rbtree;
 +
 +	struct {
 +		struct idrent		*first;
 +		struct idrent		**last;
 +	} wait_list;
 +
 +	int				 pool_size;
 +	int				 pool_idx;
 +	int				 num_size;
 +	int				 null_size;
 +
 +	char				 char_map[0x80];
 +};
 +
 +enum char_type {
 +	A_CHAR,
 +	D_CHAR
 +};
 +
 +
 +static int	iso9660_options(struct archive_write *,
 +		    const char *, const char *);
 +static int	iso9660_write_header(struct archive_write *,
 +		    struct archive_entry *);
 +static ssize_t	iso9660_write_data(struct archive_write *,
 +		    const void *, size_t);
 +static int	iso9660_finish_entry(struct archive_write *);
 +static int	iso9660_close(struct archive_write *);
 +static int	iso9660_free(struct archive_write *);
 +
 +static void	get_system_identitier(char *, size_t);
 +static void	set_str(unsigned char *, const char *, size_t, char,
 +		    const char *);
 +static inline int joliet_allowed_char(unsigned char, unsigned char);
 +static int	set_str_utf16be(struct archive_write *, unsigned char *,
 +			const char *, size_t, uint16_t, enum vdc);
 +static int	set_str_a_characters_bp(struct archive_write *,
 +			unsigned char *, int, int, const char *, enum vdc);
 +static int	set_str_d_characters_bp(struct archive_write *,
 +			unsigned char *, int, int, const char *, enum  vdc);
 +static void	set_VD_bp(unsigned char *, enum VD_type, unsigned char);
 +static inline void set_unused_field_bp(unsigned char *, int, int);
 +
 +static unsigned char *extra_open_record(unsigned char *, int,
 +		    struct isoent *, struct ctl_extr_rec *);
 +static void	extra_close_record(struct ctl_extr_rec *, int);
 +static unsigned char * extra_next_record(struct ctl_extr_rec *, int);
 +static unsigned char *extra_get_record(struct isoent *, int *, int *, int *);
 +static void	extra_tell_used_size(struct ctl_extr_rec *, int);
 +static int	extra_setup_location(struct isoent *, int);
 +static int	set_directory_record_rr(unsigned char *, int,
 +		    struct isoent *, struct iso9660 *, enum dir_rec_type);
 +static int	set_directory_record(unsigned char *, size_t,
 +		    struct isoent *, struct iso9660 *, enum dir_rec_type,
 +		    enum vdd_type);
 +static inline int get_dir_rec_size(struct iso9660 *, struct isoent *,
 +		    enum dir_rec_type, enum vdd_type);
 +static inline unsigned char *wb_buffptr(struct archive_write *);
 +static int	wb_write_out(struct archive_write *);
 +static int	wb_consume(struct archive_write *, size_t);
 +#ifdef HAVE_ZLIB_H
 +static int	wb_set_offset(struct archive_write *, int64_t);
 +#endif
 +static int	write_null(struct archive_write *, size_t);
 +static int	write_VD_terminator(struct archive_write *);
 +static int	set_file_identifier(unsigned char *, int, int, enum vdc,
 +		    struct archive_write *, struct vdd *,
 +		    struct archive_string *, const char *, int,
 +		    enum char_type);
 +static int	write_VD(struct archive_write *, struct vdd *);
 +static int	write_VD_boot_record(struct archive_write *);
 +static int	write_information_block(struct archive_write *);
 +static int	write_path_table(struct archive_write *, int,
 +		    struct vdd *);
 +static int	write_directory_descriptors(struct archive_write *,
 +		    struct vdd *);
 +static int	write_file_descriptors(struct archive_write *);
 +static int	write_rr_ER(struct archive_write *);
 +static void	calculate_path_table_size(struct vdd *);
 +
 +static void	isofile_init_entry_list(struct iso9660 *);
 +static void	isofile_add_entry(struct iso9660 *, struct isofile *);
 +static void	isofile_free_all_entries(struct iso9660 *);
 +static void	isofile_init_entry_data_file_list(struct iso9660 *);
 +static void	isofile_add_data_file(struct iso9660 *, struct isofile *);
 +static struct isofile * isofile_new(struct archive_write *,
 +		    struct archive_entry *);
 +static void	isofile_free(struct isofile *);
 +static int	isofile_gen_utility_names(struct archive_write *,
 +		    struct isofile *);
 +static int	isofile_register_hardlink(struct archive_write *,
 +		    struct isofile *);
 +static void	isofile_connect_hardlink_files(struct iso9660 *);
 +static void	isofile_init_hardlinks(struct iso9660 *);
 +static void	isofile_free_hardlinks(struct iso9660 *);
 +
 +static struct isoent *isoent_new(struct isofile *);
 +static int	isoent_clone_tree(struct archive_write *,
 +		    struct isoent **, struct isoent *);
 +static void	_isoent_free(struct isoent *isoent);
 +static void	isoent_free_all(struct isoent *);
 +static struct isoent * isoent_create_virtual_dir(struct archive_write *,
 +		    struct iso9660 *, const char *);
 +static int	isoent_cmp_node(const struct archive_rb_node *,
 +		    const struct archive_rb_node *);
 +static int	isoent_cmp_key(const struct archive_rb_node *,
 +		    const void *);
 +static int	isoent_add_child_head(struct isoent *, struct isoent *);
 +static int	isoent_add_child_tail(struct isoent *, struct isoent *);
 +static void	isoent_remove_child(struct isoent *, struct isoent *);
 +static void	isoent_setup_directory_location(struct iso9660 *,
 +		    int, struct vdd *);
 +static void	isoent_setup_file_location(struct iso9660 *, int);
 +static int	get_path_component(char *, size_t, const char *);
 +static int	isoent_tree(struct archive_write *, struct isoent **);
 +static struct isoent *isoent_find_child(struct isoent *, const char *);
 +static struct isoent *isoent_find_entry(struct isoent *, const char *);
 +static void	idr_relaxed_filenames(char *);
 +static void	idr_init(struct iso9660 *, struct vdd *, struct idr *);
 +static void	idr_cleanup(struct idr *);
 +static int	idr_ensure_poolsize(struct archive_write *, struct idr *,
 +		    int);
 +static int	idr_start(struct archive_write *, struct idr *,
 +		    int, int, int, int, const struct archive_rb_tree_ops *);
 +static void	idr_register(struct idr *, struct isoent *, int,
 +		    int);
 +static void	idr_extend_identifier(struct idrent *, int, int);
 +static void	idr_resolve(struct idr *, void (*)(unsigned char *, int));
 +static void	idr_set_num(unsigned char *, int);
 +static void	idr_set_num_beutf16(unsigned char *, int);
 +static int	isoent_gen_iso9660_identifier(struct archive_write *,
 +		    struct isoent *, struct idr *);
 +static int	isoent_gen_joliet_identifier(struct archive_write *,
 +		    struct isoent *, struct idr *);
 +static int	isoent_cmp_iso9660_identifier(const struct isoent *,
 +		    const struct isoent *);
 +static int	isoent_cmp_node_iso9660(const struct archive_rb_node *,
 +		    const struct archive_rb_node *);
 +static int	isoent_cmp_key_iso9660(const struct archive_rb_node *,
 +		    const void *);
 +static int	isoent_cmp_joliet_identifier(const struct isoent *,
 +		    const struct isoent *);
 +static int	isoent_cmp_node_joliet(const struct archive_rb_node *,
 +		    const struct archive_rb_node *);
 +static int	isoent_cmp_key_joliet(const struct archive_rb_node *,
 +		    const void *);
 +static inline void path_table_add_entry(struct path_table *, struct isoent *);
 +static inline struct isoent * path_table_last_entry(struct path_table *);
 +static int	isoent_make_path_table(struct archive_write *);
 +static int	isoent_find_out_boot_file(struct archive_write *,
 +		    struct isoent *);
 +static int	isoent_create_boot_catalog(struct archive_write *,
 +		    struct isoent *);
 +static size_t	fd_boot_image_size(int);
 +static int	make_boot_catalog(struct archive_write *);
 +static int	setup_boot_information(struct archive_write *);
 +
 +static int	zisofs_init(struct archive_write *, struct isofile *);
 +static void	zisofs_detect_magic(struct archive_write *,
 +		    const void *, size_t);
 +static int	zisofs_write_to_temp(struct archive_write *,
 +		    const void *, size_t);
 +static int	zisofs_finish_entry(struct archive_write *);
 +static int	zisofs_rewind_boot_file(struct archive_write *);
 +static int	zisofs_free(struct archive_write *);
 +
 +int
 +archive_write_set_format_iso9660(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	struct iso9660 *iso9660;
 +
 +	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_write_set_format_iso9660");
 +
 +	/* If another format was already registered, unregister it. */
 +	if (a->format_free != NULL)
 +		(a->format_free)(a);
 +
 +	iso9660 = calloc(1, sizeof(*iso9660));
 +	if (iso9660 == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate iso9660 data");
 +		return (ARCHIVE_FATAL);
 +	}
 +	iso9660->birth_time = 0;
 +	iso9660->temp_fd = -1;
 +	iso9660->cur_file = NULL;
 +	iso9660->primary.max_depth = 0;
 +	iso9660->primary.vdd_type = VDD_PRIMARY;
 +	iso9660->primary.pathtbl = NULL;
 +	iso9660->joliet.rootent = NULL;
 +	iso9660->joliet.max_depth = 0;
 +	iso9660->joliet.vdd_type = VDD_JOLIET;
 +	iso9660->joliet.pathtbl = NULL;
 +	isofile_init_entry_list(iso9660);
 +	isofile_init_entry_data_file_list(iso9660);
 +	isofile_init_hardlinks(iso9660);
 +	iso9660->directories_too_deep = NULL;
 +	iso9660->dircnt_max = 1;
 +	iso9660->wbuff_remaining = wb_buffmax();
 +	iso9660->wbuff_type = WB_TO_TEMP;
 +	iso9660->wbuff_offset = 0;
 +	iso9660->wbuff_written = 0;
 +	iso9660->wbuff_tail = 0;
 +	archive_string_init(&(iso9660->utf16be));
 +	archive_string_init(&(iso9660->mbs));
 +
 +	/*
 +	 * Init Identifiers used for PVD and SVD.
 +	 */
 +	archive_string_init(&(iso9660->volume_identifier));
 +	archive_strcpy(&(iso9660->volume_identifier), "CDROM");
 +	archive_string_init(&(iso9660->publisher_identifier));
 +	archive_string_init(&(iso9660->data_preparer_identifier));
 +	archive_string_init(&(iso9660->application_identifier));
 +	archive_strcpy(&(iso9660->application_identifier),
 +	    archive_version_string());
 +	archive_string_init(&(iso9660->copyright_file_identifier));
 +	archive_string_init(&(iso9660->abstract_file_identifier));
 +	archive_string_init(&(iso9660->bibliographic_file_identifier));
 +
 +	/*
 +	 * Init El Torito bootable CD variables.
 +	 */
 +	archive_string_init(&(iso9660->el_torito.catalog_filename));
 +	iso9660->el_torito.catalog = NULL;
 +	/* Set default file name of boot catalog  */
 +	archive_strcpy(&(iso9660->el_torito.catalog_filename),
 +	    "boot.catalog");
 +	archive_string_init(&(iso9660->el_torito.boot_filename));
 +	iso9660->el_torito.boot = NULL;
 +	iso9660->el_torito.platform_id = BOOT_PLATFORM_X86;
 +	archive_string_init(&(iso9660->el_torito.id));
 +	iso9660->el_torito.boot_load_seg = 0;
 +	iso9660->el_torito.boot_load_size = BOOT_LOAD_SIZE;
 +
 +	/*
 +	 * Init zisofs variables.
 +	 */
 +#ifdef HAVE_ZLIB_H
 +	iso9660->zisofs.block_pointers = NULL;
 +	iso9660->zisofs.block_pointers_allocated = 0;
 +	iso9660->zisofs.stream_valid = 0;
 +	iso9660->zisofs.compression_level = 9;
 +	memset(&(iso9660->zisofs.stream), 0,
 +	    sizeof(iso9660->zisofs.stream));
 +#endif
 +
 +	/*
 +	 * Set default value of iso9660 options.
 +	 */
 +	iso9660->opt.abstract_file = OPT_ABSTRACT_FILE_DEFAULT;
 +	iso9660->opt.application_id = OPT_APPLICATION_ID_DEFAULT;
 +	iso9660->opt.allow_vernum = OPT_ALLOW_VERNUM_DEFAULT;
 +	iso9660->opt.biblio_file = OPT_BIBLIO_FILE_DEFAULT;
 +	iso9660->opt.boot = OPT_BOOT_DEFAULT;
 +	iso9660->opt.boot_catalog = OPT_BOOT_CATALOG_DEFAULT;
 +	iso9660->opt.boot_info_table = OPT_BOOT_INFO_TABLE_DEFAULT;
 +	iso9660->opt.boot_load_seg = OPT_BOOT_LOAD_SEG_DEFAULT;
 +	iso9660->opt.boot_load_size = OPT_BOOT_LOAD_SIZE_DEFAULT;
 +	iso9660->opt.boot_type = OPT_BOOT_TYPE_DEFAULT;
 +	iso9660->opt.compression_level = OPT_COMPRESSION_LEVEL_DEFAULT;
 +	iso9660->opt.copyright_file = OPT_COPYRIGHT_FILE_DEFAULT;
 +	iso9660->opt.iso_level = OPT_ISO_LEVEL_DEFAULT;
 +	iso9660->opt.joliet = OPT_JOLIET_DEFAULT;
 +	iso9660->opt.limit_depth = OPT_LIMIT_DEPTH_DEFAULT;
 +	iso9660->opt.limit_dirs = OPT_LIMIT_DIRS_DEFAULT;
 +	iso9660->opt.pad = OPT_PAD_DEFAULT;
 +	iso9660->opt.publisher = OPT_PUBLISHER_DEFAULT;
 +	iso9660->opt.rr = OPT_RR_DEFAULT;
 +	iso9660->opt.volume_id = OPT_VOLUME_ID_DEFAULT;
 +	iso9660->opt.zisofs = OPT_ZISOFS_DEFAULT;
 +
 +	/* Create the root directory. */
 +	iso9660->primary.rootent =
 +	    isoent_create_virtual_dir(a, iso9660, "");
 +	if (iso9660->primary.rootent == NULL) {
 +		free(iso9660);
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	iso9660->primary.rootent->parent = iso9660->primary.rootent;
 +	iso9660->cur_dirent = iso9660->primary.rootent;
 +	archive_string_init(&(iso9660->cur_dirstr));
 +	archive_string_ensure(&(iso9660->cur_dirstr), 1);
 +	iso9660->cur_dirstr.s[0] = 0;
 +	iso9660->sconv_to_utf16be = NULL;
 +	iso9660->sconv_from_utf16be = NULL;
 +
 +	a->format_data = iso9660;
 +	a->format_name = "iso9660";
 +	a->format_options = iso9660_options;
 +	a->format_write_header = iso9660_write_header;
 +	a->format_write_data = iso9660_write_data;
 +	a->format_finish_entry = iso9660_finish_entry;
 +	a->format_close = iso9660_close;
 +	a->format_free = iso9660_free;
 +	a->archive.archive_format = ARCHIVE_FORMAT_ISO9660;
 +	a->archive.archive_format_name = "ISO9660";
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +get_str_opt(struct archive_write *a, struct archive_string *s,
 +    size_t maxsize, const char *key, const char *value)
 +{
 +
 +	if (strlen(value) > maxsize) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Value is longer than %zu characters "
 +		    "for option ``%s''", maxsize, key);
 +		return (ARCHIVE_FATAL);
 +	}
 +	archive_strcpy(s, value);
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +get_num_opt(struct archive_write *a, int *num, int high, int low,
 +    const char *key, const char *value)
 +{
 +	const char *p = value;
 +	int data = 0;
 +	int neg = 0;
 +
 +	if (p == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Invalid value(empty) for option ``%s''", key);
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (*p == '-') {
 +		neg = 1;
 +		p++;
 +	}
 +	while (*p) {
 +		if (*p >= '0' && *p <= '9')
 +			data = data * 10 + *p - '0';
 +		else {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Invalid value for option ``%s''", key);
 +			return (ARCHIVE_FATAL);
 +		}
 +		if (data > high) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Invalid value(over %d) for "
 +			    "option ``%s''", high, key);
 +			return (ARCHIVE_FATAL);
 +		}
 +		if (data < low) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Invalid value(under %d) for "
 +			    "option ``%s''", low, key);
 +			return (ARCHIVE_FATAL);
 +		}
 +		p++;
 +	}
 +	if (neg)
 +		data *= -1;
 +	*num = data;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +iso9660_options(struct archive_write *a, const char *key, const char *value)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	const char *p;
 +	int r;
 +
 +	switch (key[0]) {
 +	case 'a':
 +		if (strcmp(key, "abstract-file") == 0) {
 +			r = get_str_opt(a,
 +			    &(iso9660->abstract_file_identifier),
 +			    ABSTRACT_FILE_SIZE, key, value);
 +			iso9660->opt.abstract_file = r == ARCHIVE_OK;
 +			return (r);
 +		}
 +		if (strcmp(key, "application-id") == 0) {
 +			r = get_str_opt(a,
 +			    &(iso9660->application_identifier),
 +			    APPLICATION_IDENTIFIER_SIZE, key, value);
 +			iso9660->opt.application_id = r == ARCHIVE_OK;
 +			return (r);
 +		}
 +		if (strcmp(key, "allow-vernum") == 0) {
 +			iso9660->opt.allow_vernum = value != NULL;
 +			return (ARCHIVE_OK);
 +		}
 +		break;
 +	case 'b':
 +		if (strcmp(key, "biblio-file") == 0) {
 +			r = get_str_opt(a,
 +			    &(iso9660->bibliographic_file_identifier),
 +			    BIBLIO_FILE_SIZE, key, value);
 +			iso9660->opt.biblio_file = r == ARCHIVE_OK;
 +			return (r);
 +		}
 +		if (strcmp(key, "boot") == 0) {
 +			if (value == NULL)
 +				iso9660->opt.boot = 0;
 +			else {
 +				iso9660->opt.boot = 1;
 +				archive_strcpy(
 +				    &(iso9660->el_torito.boot_filename),
 +				    value);
 +			}
 +			return (ARCHIVE_OK);
 +		}
 +		if (strcmp(key, "boot-catalog") == 0) {
 +			r = get_str_opt(a,
 +			    &(iso9660->el_torito.catalog_filename),
 +			    1024, key, value);
 +			iso9660->opt.boot_catalog = r == ARCHIVE_OK;
 +			return (r);
 +		}
 +		if (strcmp(key, "boot-info-table") == 0) {
 +			iso9660->opt.boot_info_table = value != NULL;
 +			return (ARCHIVE_OK);
 +		}
 +		if (strcmp(key, "boot-load-seg") == 0) {
 +			uint32_t seg;
 +
 +			iso9660->opt.boot_load_seg = 0;
 +			if (value == NULL)
 +				goto invalid_value;
 +			seg = 0;
 +			p = value;
 +			if (p[0] == '0' && (p[1] == 'x' || p[1] == 'X'))
 +				p += 2;
 +			while (*p) {
 +				if (seg)
 +					seg <<= 4;
 +				if (*p >= 'A' && *p <= 'F')
 +					seg += *p - 'A' + 0x0a;
 +				else if (*p >= 'a' && *p <= 'f')
 +					seg += *p - 'a' + 0x0a;
 +				else if (*p >= '0' && *p <= '9')
 +					seg += *p - '0';
 +				else
 +					goto invalid_value;
 +				if (seg > 0xffff) {
 +					archive_set_error(&a->archive,
 +					    ARCHIVE_ERRNO_MISC,
 +					    "Invalid value(over 0xffff) for "
 +					    "option ``%s''", key);
 +					return (ARCHIVE_FATAL);
 +				}
 +				p++;
 +			}
 +			iso9660->el_torito.boot_load_seg = (uint16_t)seg;
 +			iso9660->opt.boot_load_seg = 1;
 +			return (ARCHIVE_OK);
 +		}
 +		if (strcmp(key, "boot-load-size") == 0) {
 +			int num = 0;
 +			r = get_num_opt(a, &num, 0xffff, 1, key, value);
 +			iso9660->opt.boot_load_size = r == ARCHIVE_OK;
 +			if (r != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +			iso9660->el_torito.boot_load_size = (uint16_t)num;
 +			return (ARCHIVE_OK);
 +		}
 +		if (strcmp(key, "boot-type") == 0) {
 +			if (value == NULL)
 +				goto invalid_value;
 +			if (strcmp(value, "no-emulation") == 0)
 +				iso9660->opt.boot_type = OPT_BOOT_TYPE_NO_EMU;
 +			else if (strcmp(value, "fd") == 0)
 +				iso9660->opt.boot_type = OPT_BOOT_TYPE_FD;
 +			else if (strcmp(value, "hard-disk") == 0)
 +				iso9660->opt.boot_type = OPT_BOOT_TYPE_HARD_DISK;
 +			else
 +				goto invalid_value;
 +			return (ARCHIVE_OK);
 +		}
 +		break;
 +	case 'c':
 +		if (strcmp(key, "compression-level") == 0) {
 +#ifdef HAVE_ZLIB_H
 +			if (value == NULL ||
 +			    !(value[0] >= '0' && value[0] <= '9') ||
 +			    value[1] != '\0')
 +				goto invalid_value;
 +                	iso9660->zisofs.compression_level = value[0] - '0';
 +			iso9660->opt.compression_level = 1;
 +                	return (ARCHIVE_OK);
 +#else
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Option ``%s'' "
 +			    "is not supported on this platform.", key);
 +			return (ARCHIVE_FATAL);
 +#endif
 +		}
 +		if (strcmp(key, "copyright-file") == 0) {
 +			r = get_str_opt(a,
 +			    &(iso9660->copyright_file_identifier),
 +			    COPYRIGHT_FILE_SIZE, key, value);
 +			iso9660->opt.copyright_file = r == ARCHIVE_OK;
 +			return (r);
 +		}
 +#ifdef DEBUG
 +		/* Specifies Volume creation date and time;
 +		 * year(4),month(2),day(2),hour(2),minute(2),second(2).
 +		 * e.g. "20090929033757"
 +		 */
 +		if (strcmp(key, "creation") == 0) {
 +			struct tm tm;
 +			char buf[5];
 +
 +			p = value;
 +			if (p == NULL || strlen(p) < 14)
 +				goto invalid_value;
 +			memset(&tm, 0, sizeof(tm));
 +			memcpy(buf, p, 4); buf[4] = '\0'; p += 4;
 +			tm.tm_year = strtol(buf, NULL, 10) - 1900;
 +			memcpy(buf, p, 2); buf[2] = '\0'; p += 2;
 +			tm.tm_mon = strtol(buf, NULL, 10) - 1;
 +			memcpy(buf, p, 2); buf[2] = '\0'; p += 2;
 +			tm.tm_mday = strtol(buf, NULL, 10);
 +			memcpy(buf, p, 2); buf[2] = '\0'; p += 2;
 +			tm.tm_hour = strtol(buf, NULL, 10);
 +			memcpy(buf, p, 2); buf[2] = '\0'; p += 2;
 +			tm.tm_min = strtol(buf, NULL, 10);
 +			memcpy(buf, p, 2); buf[2] = '\0';
 +			tm.tm_sec = strtol(buf, NULL, 10);
 +			iso9660->birth_time = mktime(&tm);
 +			return (ARCHIVE_OK);
 +		}
 +#endif
 +		break;
 +	case 'i':
 +		if (strcmp(key, "iso-level") == 0) {
 +			if (value != NULL && value[1] == '\0' &&
 +			    (value[0] >= '1' && value[0] <= '4')) {
 +				iso9660->opt.iso_level = value[0]-'0';
 +				return (ARCHIVE_OK);
 +			}
 +			goto invalid_value;
 +		}
 +		break;
 +	case 'j':
 +		if (strcmp(key, "joliet") == 0) {
 +			if (value == NULL)
 +				iso9660->opt.joliet = OPT_JOLIET_DISABLE;
 +			else if (strcmp(value, "1") == 0)
 +				iso9660->opt.joliet = OPT_JOLIET_ENABLE;
 +			else if (strcmp(value, "long") == 0)
 +				iso9660->opt.joliet = OPT_JOLIET_LONGNAME;
 +			else
 +				goto invalid_value;
 +			return (ARCHIVE_OK);
 +		}
 +		break;
 +	case 'l':
 +		if (strcmp(key, "limit-depth") == 0) {
 +			iso9660->opt.limit_depth = value != NULL;
 +			return (ARCHIVE_OK);
 +		}
 +		if (strcmp(key, "limit-dirs") == 0) {
 +			iso9660->opt.limit_dirs = value != NULL;
 +			return (ARCHIVE_OK);
 +		}
 +		break;
 +	case 'p':
 +		if (strcmp(key, "pad") == 0) {
 +			iso9660->opt.pad = value != NULL;
 +			return (ARCHIVE_OK);
 +		}
 +		if (strcmp(key, "publisher") == 0) {
 +			r = get_str_opt(a,
 +			    &(iso9660->publisher_identifier),
 +			    PUBLISHER_IDENTIFIER_SIZE, key, value);
 +			iso9660->opt.publisher = r == ARCHIVE_OK;
 +			return (r);
 +		}
 +		break;
 +	case 'r':
 +		if (strcmp(key, "rockridge") == 0 ||
 +		    strcmp(key, "Rockridge") == 0) {
 +			if (value == NULL)
 +				iso9660->opt.rr = OPT_RR_DISABLED;
 +			else if (strcmp(value, "1") == 0)
 +				iso9660->opt.rr = OPT_RR_USEFUL;
 +			else if (strcmp(value, "strict") == 0)
 +				iso9660->opt.rr = OPT_RR_STRICT;
 +			else if (strcmp(value, "useful") == 0)
 +				iso9660->opt.rr = OPT_RR_USEFUL;
 +			else
 +				goto invalid_value;
 +			return (ARCHIVE_OK);
 +		}
 +		break;
 +	case 'v':
 +		if (strcmp(key, "volume-id") == 0) {
 +			r = get_str_opt(a, &(iso9660->volume_identifier),
 +			    VOLUME_IDENTIFIER_SIZE, key, value);
 +			iso9660->opt.volume_id = r == ARCHIVE_OK;
 +			return (r);
 +		}
 +		break;
 +	case 'z':
 +		if (strcmp(key, "zisofs") == 0) {
 +			if (value == NULL)
 +				iso9660->opt.zisofs = OPT_ZISOFS_DISABLED;
 +			else {
 +#ifdef HAVE_ZLIB_H
 +				iso9660->opt.zisofs = OPT_ZISOFS_DIRECT;
 +#else
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "``zisofs'' "
 +				    "is not supported on this platform.");
 +				return (ARCHIVE_FATAL);
 +#endif
 +			}
 +			return (ARCHIVE_OK);
 +		}
 +		break;
 +	}
 +
 +	/* Note: The "warn" return is just to inform the options
 +	 * supervisor that we didn't handle it.  It will generate
 +	 * a suitable error if no one used this option. */
 +	return (ARCHIVE_WARN);
 +
 +invalid_value:
 +	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +	    "Invalid value for option ``%s''", key);
 +	return (ARCHIVE_FAILED);
 +}
 +
 +static int
 +iso9660_write_header(struct archive_write *a, struct archive_entry *entry)
 +{
 +	struct iso9660 *iso9660;
 +	struct isofile *file;
 +	struct isoent *isoent;
 +	int r, ret = ARCHIVE_OK;
 +
 +	iso9660 = a->format_data;
 +
 +	iso9660->cur_file = NULL;
 +	iso9660->bytes_remaining = 0;
 +	iso9660->need_multi_extent = 0;
 +	if (archive_entry_filetype(entry) == AE_IFLNK
 +	    && iso9660->opt.rr == OPT_RR_DISABLED) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Ignore symlink file.");
 +		iso9660->cur_file = NULL;
 +		return (ARCHIVE_WARN);
 +	}
 +	if (archive_entry_filetype(entry) == AE_IFREG &&
 +	    archive_entry_size(entry) >= MULTI_EXTENT_SIZE) {
 +		if (iso9660->opt.iso_level < 3) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Ignore over %lld bytes file. "
 +			    "This file too large.",
 +			    MULTI_EXTENT_SIZE);
 +				iso9660->cur_file = NULL;
 +			return (ARCHIVE_WARN);
 +		}
 +		iso9660->need_multi_extent = 1;
 +	}
 +
 +	file = isofile_new(a, entry);
 +	if (file == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate data");
 +		return (ARCHIVE_FATAL);
 +	}
 +	r = isofile_gen_utility_names(a, file);
 +	if (r < ARCHIVE_WARN) {
 +		isofile_free(file);
 +		return (r);
 +	}
 +	else if (r < ret)
 +		ret = r;
 +
 +	/*
 +	 * Ignore a path which looks like the top of directory name
 +	 * since we have already made the root directory of an ISO image.
 +	 */
 +	if (archive_strlen(&(file->parentdir)) == 0 &&
 +	    archive_strlen(&(file->basename)) == 0) {
 +		isofile_free(file);
 +		return (r);
 +	}
 +
 +	isofile_add_entry(iso9660, file);
 +	isoent = isoent_new(file);
 +	if (isoent == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate data");
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (isoent->file->dircnt > iso9660->dircnt_max)
 +		iso9660->dircnt_max = isoent->file->dircnt;
 +
 +	/* Add the current file into tree */
 +	r = isoent_tree(a, &isoent);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +
 +	/* If there is the same file in tree and
 +	 * the current file is older than the file in tree.
 +	 * So we don't need the current file data anymore. */
 +	if (isoent->file != file)
 +		return (ARCHIVE_OK);
 +
 +	/* Non regular files contents are unneeded to be saved to
 +	 * temporary files. */
 +	if (archive_entry_filetype(file->entry) != AE_IFREG)
 +		return (ret);
 +
 +	/*
 +	 * Set the current file to cur_file to read its contents.
 +	 */
 +	iso9660->cur_file = file;
 +
 +	if (archive_entry_nlink(file->entry) > 1) {
 +		r = isofile_register_hardlink(a, file);
 +		if (r != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Prepare to save the contents of the file.
 +	 */
 +	if (iso9660->temp_fd < 0) {
 +		iso9660->temp_fd = __archive_mktemp(NULL);
 +		if (iso9660->temp_fd < 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Couldn't create temporary file");
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	/* Save an offset of current file in temporary file. */
 +	file->content.offset_of_temp = wb_offset(a);
 +	file->cur_content = &(file->content);
 +	r = zisofs_init(a, file);
 +	if (r < ret)
 +		ret = r;
 +	iso9660->bytes_remaining =  archive_entry_size(file->entry);
 +
 +	return (ret);
 +}
 +
 +static int
 +write_to_temp(struct archive_write *a, const void *buff, size_t s)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	ssize_t written;
 +	const unsigned char *b;
 +
 +	b = (const unsigned char *)buff;
 +	while (s) {
 +		written = write(iso9660->temp_fd, b, s);
 +		if (written < 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Can't write to temporary file");
 +			return (ARCHIVE_FATAL);
 +		}
 +		s -= written;
 +		b += written;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +wb_write_to_temp(struct archive_write *a, const void *buff, size_t s)
 +{
 +	const char *xp = buff;
 +	size_t xs = s;
 +
 +	/*
 +	 * If a written data size is big enough to use system-call
 +	 * and there is no waiting data, this calls write_to_temp() in
 +	 * order to reduce a extra memory copy.
 +	 */
 +	if (wb_remaining(a) == wb_buffmax() && s > (1024 * 16)) {
 +		struct iso9660 *iso9660 = (struct iso9660 *)a->format_data;
 +		xs = s % LOGICAL_BLOCK_SIZE;
 +		iso9660->wbuff_offset += s - xs;
 +		if (write_to_temp(a, buff, s - xs) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +		if (xs == 0)
 +			return (ARCHIVE_OK);
 +		xp += s - xs;
 +	}
 +
 +	while (xs) {
 +		size_t size = xs;
 +		if (size > wb_remaining(a))
 +			size = wb_remaining(a);
 +		memcpy(wb_buffptr(a), xp, size);
 +		if (wb_consume(a, size) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +		xs -= size;
 +		xp += size;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +wb_write_padding_to_temp(struct archive_write *a, int64_t csize)
 +{
 +	size_t ns;
 +	int ret;
 +
 +	ns = (size_t)(csize % LOGICAL_BLOCK_SIZE);
 +	if (ns != 0)
 +		ret = write_null(a, LOGICAL_BLOCK_SIZE - ns);
 +	else
 +		ret = ARCHIVE_OK;
 +	return (ret);
 +}
 +
 +static ssize_t
 +write_iso9660_data(struct archive_write *a, const void *buff, size_t s)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	size_t ws;
 +
 +	if (iso9660->temp_fd < 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Couldn't create temporary file");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	ws = s;
 +	if (iso9660->need_multi_extent &&
 +	    (iso9660->cur_file->cur_content->size + ws) >=
 +	      (MULTI_EXTENT_SIZE - LOGICAL_BLOCK_SIZE)) {
 +		struct content *con;
 +		size_t ts;
 +
 +		ts = (size_t)(MULTI_EXTENT_SIZE - LOGICAL_BLOCK_SIZE -
 +		    iso9660->cur_file->cur_content->size);
 +
 +		if (iso9660->zisofs.detect_magic)
 +			zisofs_detect_magic(a, buff, ts);
 +
 +		if (iso9660->zisofs.making) {
 +			if (zisofs_write_to_temp(a, buff, ts) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		} else {
 +			if (wb_write_to_temp(a, buff, ts) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +			iso9660->cur_file->cur_content->size += ts;
 +		}
 +
 +		/* Write padding. */
 +		if (wb_write_padding_to_temp(a,
 +		    iso9660->cur_file->cur_content->size) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +
 +		/* Compute the logical block number. */
 +		iso9660->cur_file->cur_content->blocks = (int)
 +		    ((iso9660->cur_file->cur_content->size
 +		     + LOGICAL_BLOCK_SIZE -1) >> LOGICAL_BLOCK_BITS);
 +
 +		/*
 +		 * Make next extent.
 +		 */
 +		ws -= ts;
 +		buff = (const void *)(((const unsigned char *)buff) + ts);
 +		/* Make a content for next extent. */
 +		con = calloc(1, sizeof(*con));
 +		if (con == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate content data");
 +			return (ARCHIVE_FATAL);
 +		}
 +		con->offset_of_temp = wb_offset(a);
 +		iso9660->cur_file->cur_content->next = con;
 +		iso9660->cur_file->cur_content = con;
 +#ifdef HAVE_ZLIB_H
 +		iso9660->zisofs.block_offset = 0;
 +#endif
 +	}
 +
 +	if (iso9660->zisofs.detect_magic)
 +		zisofs_detect_magic(a, buff, ws);
 +
 +	if (iso9660->zisofs.making) {
 +		if (zisofs_write_to_temp(a, buff, ws) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	} else {
 +		if (wb_write_to_temp(a, buff, ws) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +		iso9660->cur_file->cur_content->size += ws;
 +	}
 +
 +	return (s);
 +}
 +
 +static ssize_t
 +iso9660_write_data(struct archive_write *a, const void *buff, size_t s)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	ssize_t r;
 +
 +	if (iso9660->cur_file == NULL)
 +		return (0);
 +	if (archive_entry_filetype(iso9660->cur_file->entry) != AE_IFREG)
 +		return (0);
 +	if (s > iso9660->bytes_remaining)
 +		s = (size_t)iso9660->bytes_remaining;
 +	if (s == 0)
 +		return (0);
 +
 +	r = write_iso9660_data(a, buff, s);
 +	if (r > 0)
 +		iso9660->bytes_remaining -= r;
 +	return (r);
 +}
 +
 +static int
 +iso9660_finish_entry(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +
 +	if (iso9660->cur_file == NULL)
 +		return (ARCHIVE_OK);
 +	if (archive_entry_filetype(iso9660->cur_file->entry) != AE_IFREG)
 +		return (ARCHIVE_OK);
 +	if (iso9660->cur_file->content.size == 0)
 +		return (ARCHIVE_OK);
 +
 +	/* If there are unwritten data, write null data instead. */
 +	while (iso9660->bytes_remaining > 0) {
 +		size_t s;
 +
 +		s = (iso9660->bytes_remaining > a->null_length)?
 +		    a->null_length: (size_t)iso9660->bytes_remaining;
 +		if (write_iso9660_data(a, a->nulls, s) < 0)
 +			return (ARCHIVE_FATAL);
 +		iso9660->bytes_remaining -= s;
 +	}
 +
 +	if (iso9660->zisofs.making && zisofs_finish_entry(a) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Write padding. */
 +	if (wb_write_padding_to_temp(a, iso9660->cur_file->cur_content->size)
 +	    != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Compute the logical block number. */
 +	iso9660->cur_file->cur_content->blocks = (int)
 +	    ((iso9660->cur_file->cur_content->size
 +	     + LOGICAL_BLOCK_SIZE -1) >> LOGICAL_BLOCK_BITS);
 +
 +	/* Add the current file to data file list. */
 +	isofile_add_data_file(iso9660, iso9660->cur_file);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +iso9660_close(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660;
 +	int ret, blocks;
 +
 +	iso9660 = a->format_data;
 +
 +	/*
 +	 * Write remaining data out to the temporary file.
 +	 */
 +	if (wb_remaining(a) > 0) {
 +		ret = wb_write_out(a);
 +		if (ret < 0)
 +			return (ret);
 +	}
 +
 +	/*
 +	 * Preparations...
 +	 */
 +#ifdef DEBUG
 +	if (iso9660->birth_time == 0)
 +#endif
 +		time(&(iso9660->birth_time));
 +
 +	/*
 +	 * Prepare a bootable ISO image.
 +	 */
 +	if (iso9660->opt.boot) {
 +		/* Find out the boot file entry. */
 +		ret = isoent_find_out_boot_file(a, iso9660->primary.rootent);
 +		if (ret < 0)
 +			return (ret);
 +		/* Reconvert the boot file from zisofs'ed form to
 +		 * plain form. */
 +		ret = zisofs_rewind_boot_file(a);
 +		if (ret < 0)
 +			return (ret);
 +		/* Write remaining data out to the temporary file. */
 +		if (wb_remaining(a) > 0) {
 +			ret = wb_write_out(a);
 +			if (ret < 0)
 +				return (ret);
 +		}
 +		/* Create the boot catalog. */
 +		ret = isoent_create_boot_catalog(a, iso9660->primary.rootent);
 +		if (ret < 0)
 +			return (ret);
 +	}
 +
 +	/*
 +	 * Prepare joliet extensions.
 +	 */
 +	if (iso9660->opt.joliet) {
 +		/* Make a new tree for joliet. */
 +		ret = isoent_clone_tree(a, &(iso9660->joliet.rootent),
 +		    iso9660->primary.rootent);
 +		if (ret < 0)
 +			return (ret);
 +		/* Make sure we have UTF-16BE convertors.
 +		 * if there is no file entry, convertors are still
 +		 * uninitilized. */
 +		if (iso9660->sconv_to_utf16be == NULL) {
 +			iso9660->sconv_to_utf16be =
 +			    archive_string_conversion_to_charset(
 +				&(a->archive), "UTF-16BE", 1);
 +			if (iso9660->sconv_to_utf16be == NULL)
 +				/* Couldn't allocate memory */
 +				return (ARCHIVE_FATAL);
 +			iso9660->sconv_from_utf16be =
 +			    archive_string_conversion_from_charset(
 +				&(a->archive), "UTF-16BE", 1);
 +			if (iso9660->sconv_from_utf16be == NULL)
 +				/* Couldn't allocate memory */
 +				return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	/*
 +	 * Make Path Tables.
 +	 */
 +	ret = isoent_make_path_table(a);
 +	if (ret < 0)
 +		return (ret);
 +
 +	/*
 +	 * Calculate a total volume size and setup all locations of
 +	 * contents of an iso9660 image.
 +	 */
 +	blocks = SYSTEM_AREA_BLOCK
 +		+ PRIMARY_VOLUME_DESCRIPTOR_BLOCK
 +		+ VOLUME_DESCRIPTOR_SET_TERMINATOR_BLOCK
 +		+ NON_ISO_FILE_SYSTEM_INFORMATION_BLOCK;
 +	if (iso9660->opt.boot)
 +		blocks += BOOT_RECORD_DESCRIPTOR_BLOCK;
 +	if (iso9660->opt.joliet)
 +		blocks += SUPPLEMENTARY_VOLUME_DESCRIPTOR_BLOCK;
 +	if (iso9660->opt.iso_level == 4)
 +		blocks += SUPPLEMENTARY_VOLUME_DESCRIPTOR_BLOCK;
 +
 +	/* Setup the locations of Path Table. */
 +	iso9660->primary.location_type_L_path_table = blocks;
 +	blocks += iso9660->primary.path_table_block;
 +	iso9660->primary.location_type_M_path_table = blocks;
 +	blocks += iso9660->primary.path_table_block;
 +	if (iso9660->opt.joliet) {
 +		iso9660->joliet.location_type_L_path_table = blocks;
 +		blocks += iso9660->joliet.path_table_block;
 +		iso9660->joliet.location_type_M_path_table = blocks;
 +		blocks += iso9660->joliet.path_table_block;
 +	}
 +
 +	/* Setup the locations of directories. */
 +	isoent_setup_directory_location(iso9660, blocks,
 +	    &(iso9660->primary));
 +	blocks += iso9660->primary.total_dir_block;
 +	if (iso9660->opt.joliet) {
 +		isoent_setup_directory_location(iso9660, blocks,
 +		    &(iso9660->joliet));
 +		blocks += iso9660->joliet.total_dir_block;
 +	}
 +
 +	if (iso9660->opt.rr) {
 +		iso9660->location_rrip_er = blocks;
 +		blocks += RRIP_ER_BLOCK;
 +	}
 +
 +	/* Setup the locations of all file contents. */
 + 	isoent_setup_file_location(iso9660, blocks);
 +	blocks += iso9660->total_file_block;
 +	if (iso9660->opt.boot && iso9660->opt.boot_info_table) {
 +		ret = setup_boot_information(a);
 +		if (ret < 0)
 +			return (ret);
 +	}
 +
 +	/* Now we have a total volume size. */
 +	iso9660->volume_space_size = blocks;
 +	if (iso9660->opt.pad)
 +		iso9660->volume_space_size += PADDING_BLOCK;
 +	iso9660->volume_sequence_number = 1;
 +
 +
 +	/*
 +	 * Write an ISO 9660 image.
 +	 */
 +
 +	/* Switc to start using wbuff as file buffer. */
 +	iso9660->wbuff_remaining = wb_buffmax();
 +	iso9660->wbuff_type = WB_TO_STREAM;
 +	iso9660->wbuff_offset = 0;
 +	iso9660->wbuff_written = 0;
 +	iso9660->wbuff_tail = 0;
 +
 +	/* Write The System Area */
 +	ret = write_null(a, SYSTEM_AREA_BLOCK * LOGICAL_BLOCK_SIZE);
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Write Primary Volume Descriptor */
 +	ret = write_VD(a, &(iso9660->primary));
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	if (iso9660->opt.boot) {
 +		/* Write Boot Record Volume Descriptor */
 +		ret = write_VD_boot_record(a);
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	if (iso9660->opt.iso_level == 4) {
 +		/* Write Enhanced Volume Descriptor */
 +		iso9660->primary.vdd_type = VDD_ENHANCED;
 +		ret = write_VD(a, &(iso9660->primary));
 +		iso9660->primary.vdd_type = VDD_PRIMARY;
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	if (iso9660->opt.joliet) {
 +		ret = write_VD(a, &(iso9660->joliet));
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Write Volume Descriptor Set Terminator */
 +	ret = write_VD_terminator(a);
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Write Non-ISO File System Information */
 +	ret = write_information_block(a);
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Write Type L Path Table */
 +	ret = write_path_table(a, 0, &(iso9660->primary));
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Write Type M Path Table */
 +	ret = write_path_table(a, 1, &(iso9660->primary));
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	if (iso9660->opt.joliet) {
 +		/* Write Type L Path Table */
 +		ret = write_path_table(a, 0, &(iso9660->joliet));
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +
 +		/* Write Type M Path Table */
 +		ret = write_path_table(a, 1, &(iso9660->joliet));
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Write Directory Descriptors */
 +	ret = write_directory_descriptors(a, &(iso9660->primary));
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	if (iso9660->opt.joliet) {
 +		ret = write_directory_descriptors(a, &(iso9660->joliet));
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	if (iso9660->opt.rr) {
 +		/* Write Rockridge ER(Extensions Reference) */
 +		ret = write_rr_ER(a);
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Write File Descriptors */
 +	ret = write_file_descriptors(a);
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Write Padding  */
 +	if (iso9660->opt.pad) {
 +		ret = write_null(a, PADDING_BLOCK * LOGICAL_BLOCK_SIZE);
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	if (iso9660->directories_too_deep != NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "%s: Directories too deep.",
 +		    archive_entry_pathname(
 +			iso9660->directories_too_deep->file->entry));
 +		return (ARCHIVE_WARN);
 +	}
 +
 +	/* Write remaining data out. */
 +	ret = wb_write_out(a);
 +
 +	return (ret);
 +}
 +
 +static int
 +iso9660_free(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660;
 +	int i, ret;
 +
 +	iso9660 = a->format_data;
 +
 +	/* Close the temporary file. */
 +	if (iso9660->temp_fd >= 0)
 +		close(iso9660->temp_fd);
 +
 +	/* Free some stuff for zisofs operations. */
 +	ret = zisofs_free(a);
 +
 +	/* Remove directory entries in tree which includes file entries. */
 +	isoent_free_all(iso9660->primary.rootent);
 +	for (i = 0; i < iso9660->primary.max_depth; i++)
 +		free(iso9660->primary.pathtbl[i].sorted);
 +	free(iso9660->primary.pathtbl);
 +
 +	if (iso9660->opt.joliet) {
 +		isoent_free_all(iso9660->joliet.rootent);
 +		for (i = 0; i < iso9660->joliet.max_depth; i++)
 +			free(iso9660->joliet.pathtbl[i].sorted);
 +		free(iso9660->joliet.pathtbl);
 +	}
 +
 +	/* Remove isofile entries. */
 +	isofile_free_all_entries(iso9660);
 +	isofile_free_hardlinks(iso9660);
 +
 +	archive_string_free(&(iso9660->cur_dirstr));
 +	archive_string_free(&(iso9660->volume_identifier));
 +	archive_string_free(&(iso9660->publisher_identifier));
 +	archive_string_free(&(iso9660->data_preparer_identifier));
 +	archive_string_free(&(iso9660->application_identifier));
 +	archive_string_free(&(iso9660->copyright_file_identifier));
 +	archive_string_free(&(iso9660->abstract_file_identifier));
 +	archive_string_free(&(iso9660->bibliographic_file_identifier));
 +	archive_string_free(&(iso9660->el_torito.catalog_filename));
 +	archive_string_free(&(iso9660->el_torito.boot_filename));
 +	archive_string_free(&(iso9660->el_torito.id));
 +	archive_string_free(&(iso9660->utf16be));
 +	archive_string_free(&(iso9660->mbs));
 +
 +	free(iso9660);
 +	a->format_data = NULL;
 +
 +	return (ret);
 +}
 +
 +/*
 + * Get the System Identifier
 + */
 +static void
 +get_system_identitier(char *system_id, size_t size)
 +{
 +#if defined(HAVE_SYS_UTSNAME_H)
 +	struct utsname u;
 +
 +	uname(&u);
 +	strncpy(system_id, u.sysname, size-1);
 +	system_id[size-1] = '\0';
 +#elif defined(_WIN32) && !defined(__CYGWIN__)
 +	strncpy(system_id, "Windows", size-1);
 +	system_id[size-1] = '\0';
 +#else
 +#error no way to get the system identifier on your platform.
 +#endif
 +}
 +
 +static void
 +set_str(unsigned char *p, const char *s, size_t l, char f, const char *map)
 +{
 +	unsigned char c;
 +
 +	if (s == NULL)
 +		s = "";
 +	while ((c = *s++) != 0 && l > 0) {
 +		if (c >= 0x80 || map[c] == 0)
 +		 {
 +			/* illegal character */
 +			if (c >= 'a' && c <= 'z') {
 +				/* convert c from a-z to A-Z */
 +				c -= 0x20;
 +			} else
 +				c = 0x5f;
 +		}
 +		*p++ = c;
 +		l--;
 +	}
 +	/* If l isn't zero, fill p buffer by the character
 +	 * which indicated by f. */
 +	if (l > 0)
 +		memset(p , f, l);
 +}
 +
 +static inline int
 +joliet_allowed_char(unsigned char high, unsigned char low)
 +{
 +	int utf16 = (high << 8) | low;
 +
 +	if (utf16 <= 0x001F)
 +		return (0);
 +
 +	switch (utf16) {
 +	case 0x002A: /* '*' */
 +	case 0x002F: /* '/' */
 +	case 0x003A: /* ':' */
 +	case 0x003B: /* ';' */
 +	case 0x003F: /* '?' */
 +	case 0x005C: /* '\' */
 +		return (0);/* Not allowed. */
 +	}
 +	return (1);
 +}
 +
 +static int
 +set_str_utf16be(struct archive_write *a, unsigned char *p, const char *s,
 +    size_t l, uint16_t uf, enum vdc vdc)
 +{
 +	size_t size, i;
 +	int onepad;
 +
 +	if (s == NULL)
 +		s = "";
 +	if (l & 0x01) {
 +		onepad = 1;
 +		l &= ~1;
 +	} else
 +		onepad = 0;
 +	if (vdc == VDC_UCS2) {
 +		struct iso9660 *iso9660 = a->format_data;
 +		if (archive_strncpy_l(&iso9660->utf16be, s, strlen(s),
 +		    iso9660->sconv_to_utf16be) != 0 && errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for UTF-16BE");
 +			return (ARCHIVE_FATAL);
 +		}
 +		size = iso9660->utf16be.length;
 +		if (size > l)
 +			size = l;
 +		memcpy(p, iso9660->utf16be.s, size);
 +	} else {
 +		const uint16_t *u16 = (const uint16_t *)s;
 +
 +		size = 0;
 +		while (*u16++)
 +			size += 2;
 +		if (size > l)
 +			size = l;
 +		memcpy(p, s, size);
 +	}
 +	for (i = 0; i < size; i += 2, p += 2) {
 +		if (!joliet_allowed_char(p[0], p[1]))
 +			archive_be16enc(p, 0x005F);/* '_' */
 +	}
 +	l -= size;
 +	while (l > 0) {
 +		archive_be16enc(p, uf);
 +		p += 2;
 +		l -= 2;
 +	}
 +	if (onepad)
 +		*p = 0;
 +	return (ARCHIVE_OK);
 +}
 +
 +static const char a_characters_map[0x80] = {
 +/*  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F          */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 00-0F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 10-1F */
 +    1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 20-2F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 30-3F */
 +    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 40-4F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,/* 50-5F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 60-6F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 70-7F */
 +};
 +
 +static const char a1_characters_map[0x80] = {
 +/*  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F          */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 00-0F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 10-1F */
 +    1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 20-2F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 30-3F */
 +    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 40-4F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,/* 50-5F */
 +    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 60-6F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,/* 70-7F */
 +};
 +
 +static const char d_characters_map[0x80] = {
 +/*  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F          */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 00-0F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 10-1F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 20-2F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,/* 30-3F */
 +    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 40-4F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,/* 50-5F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 60-6F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 70-7F */
 +};
 +
 +static const char d1_characters_map[0x80] = {
 +/*  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F          */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 00-0F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 10-1F */
 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,/* 20-2F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0,/* 30-3F */
 +    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 40-4F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,/* 50-5F */
 +    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 60-6F */
 +    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,/* 70-7F */
 +};
 +
 +static int
 +set_str_a_characters_bp(struct archive_write *a, unsigned char *bp,
 +    int from, int to, const char *s, enum vdc vdc)
 +{
 +	int r;
 +
 +	switch (vdc) {
 +	case VDC_STD:
 +		set_str(bp+from, s, to - from + 1, 0x20,
 +		    a_characters_map);
 +		r = ARCHIVE_OK;
 +		break;
 +	case VDC_LOWERCASE:
 +		set_str(bp+from, s, to - from + 1, 0x20,
 +		    a1_characters_map);
 +		r = ARCHIVE_OK;
 +		break;
 +	case VDC_UCS2:
 +	case VDC_UCS2_DIRECT:
 +		r = set_str_utf16be(a, bp+from, s, to - from + 1,
 +		    0x0020, vdc);
 +		break;
 +	default:
 +		r = ARCHIVE_FATAL;
 +	}
 +	return (r);
 +}
 +
 +static int
 +set_str_d_characters_bp(struct archive_write *a, unsigned char *bp,
 +    int from, int to, const char *s, enum  vdc vdc)
 +{
 +	int r;
 +
 +	switch (vdc) {
 +	case VDC_STD:
 +		set_str(bp+from, s, to - from + 1, 0x20,
 +		    d_characters_map);
 +		r = ARCHIVE_OK;
 +		break;
 +	case VDC_LOWERCASE:
 +		set_str(bp+from, s, to - from + 1, 0x20,
 +		    d1_characters_map);
 +		r = ARCHIVE_OK;
 +		break;
 +	case VDC_UCS2:
 +	case VDC_UCS2_DIRECT:
 +		r = set_str_utf16be(a, bp+from, s, to - from + 1,
 +		    0x0020, vdc);
 +		break;
 +	default:
 +		r = ARCHIVE_FATAL;
 +	}
 +	return (r);
 +}
 +
 +static void
 +set_VD_bp(unsigned char *bp, enum VD_type type, unsigned char ver)
 +{
 +
 +	/* Volume Descriptor Type */
 +	bp[1] = (unsigned char)type;
 +	/* Standard Identifier */
 +	memcpy(bp + 2, "CD001", 5);
 +	/* Volume Descriptor Version */
 +	bp[7] = ver;
 +}
 +
 +static inline void
 +set_unused_field_bp(unsigned char *bp, int from, int to)
 +{
 +	memset(bp + from, 0, to - from + 1);
 +}
 +
 +/*
 + * 8-bit unsigned numerical values.
 + * ISO9660 Standard 7.1.1
 + */
 +static inline void
 +set_num_711(unsigned char *p, unsigned char value)
 +{
 +	*p = value;
 +}
 +
 +/*
 + * 8-bit signed numerical values.
 + * ISO9660 Standard 7.1.2
 + */
 +static inline void
 +set_num_712(unsigned char *p, char value)
 +{
 +	*((char *)p) = value;
 +}
 +
 +/*
 + * Least significant byte first.
 + * ISO9660 Standard 7.2.1
 + */
 +static inline void
 +set_num_721(unsigned char *p, uint16_t value)
 +{
 +	archive_le16enc(p, value);
 +}
 +
 +/*
 + * Most significant byte first.
 + * ISO9660 Standard 7.2.2
 + */
 +static inline void
 +set_num_722(unsigned char *p, uint16_t value)
 +{
 +	archive_be16enc(p, value);
 +}
 +
 +/*
 + * Both-byte orders.
 + * ISO9660 Standard 7.2.3
 + */
 +static void
 +set_num_723(unsigned char *p, uint16_t value)
 +{
 +	archive_le16enc(p, value);
 +	archive_be16enc(p+2, value);
 +}
 +
 +/*
 + * Least significant byte first.
 + * ISO9660 Standard 7.3.1
 + */
 +static inline void
 +set_num_731(unsigned char *p, uint32_t value)
 +{
 +	archive_le32enc(p, value);
 +}
 +
 +/*
 + * Most significant byte first.
 + * ISO9660 Standard 7.3.2
 + */
 +static inline void
 +set_num_732(unsigned char *p, uint32_t value)
 +{
 +	archive_be32enc(p, value);
 +}
 +
 +/*
 + * Both-byte orders.
 + * ISO9660 Standard 7.3.3
 + */
 +static inline void
 +set_num_733(unsigned char *p, uint32_t value)
 +{
 +	archive_le32enc(p, value);
 +	archive_be32enc(p+4, value);
 +}
 +
 +static void
 +set_digit(unsigned char *p, size_t s, int value)
 +{
 +
 +	while (s--) {
 +		p[s] = '0' + (value % 10);
 +		value /= 10;
 +	}
 +}
 +
 +#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
 +#define get_gmoffset(tm)	((tm)->tm_gmtoff)
 +#elif defined(HAVE_STRUCT_TM___TM_GMTOFF)
 +#define get_gmoffset(tm)	((tm)->__tm_gmtoff)
 +#else
 +static long
 +get_gmoffset(struct tm *tm)
 +{
 +	long offset;
 +
 +#if defined(HAVE__GET_TIMEZONE)
 +	_get_timezone(&offset);
 +#elif defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
 +	offset = _timezone;
 +#else
 +	offset = timezone;
 +#endif
 +	offset *= -1;
 +	if (tm->tm_isdst)
 +		offset += 3600;
 +	return (offset);
 +}
 +#endif
 +
 +static void
 +get_tmfromtime(struct tm *tm, time_t *t)
 +{
 +#if HAVE_LOCALTIME_R
 +	tzset();
 +	localtime_r(t, tm);
 +#elif HAVE__LOCALTIME64_S
 +	_localtime64_s(tm, t);
 +#else
 +	memcpy(tm, localtime(t), sizeof(*tm));
 +#endif
 +}
 +
 +/*
 + * Date and Time Format.
 + * ISO9660 Standard 8.4.26.1
 + */
 +static void
 +set_date_time(unsigned char *p, time_t t)
 +{
 +	struct tm tm;
 +
 +	get_tmfromtime(&tm, &t);
 +	set_digit(p, 4, tm.tm_year + 1900);
 +	set_digit(p+4, 2, tm.tm_mon + 1);
 +	set_digit(p+6, 2, tm.tm_mday);
 +	set_digit(p+8, 2, tm.tm_hour);
 +	set_digit(p+10, 2, tm.tm_min);
 +	set_digit(p+12, 2, tm.tm_sec);
 +	set_digit(p+14, 2, 0);
 +	set_num_712(p+16, (char)(get_gmoffset(&tm)/(60*15)));
 +}
 +
 +static void
 +set_date_time_null(unsigned char *p)
 +{
 +	memset(p, '0', 16);
 +	p[16] = 0;
 +}
 +
 +static void
 +set_time_915(unsigned char *p, time_t t)
 +{
 +	struct tm tm;
 +
 +	get_tmfromtime(&tm, &t);
 +	set_num_711(p+0, tm.tm_year);
 +	set_num_711(p+1, tm.tm_mon+1);
 +	set_num_711(p+2, tm.tm_mday);
 +	set_num_711(p+3, tm.tm_hour);
 +	set_num_711(p+4, tm.tm_min);
 +	set_num_711(p+5, tm.tm_sec);
 +	set_num_712(p+6, (char)(get_gmoffset(&tm)/(60*15)));
 +}
 +
 +
 +/*
 + * Write SUSP "CE" System Use Entry.
 + */
 +static int
 +set_SUSP_CE(unsigned char *p, int location, int offset, int size)
 +{
 +	unsigned char *bp = p -1;
 +	/*  Extend the System Use Area
 +	 *   "CE" Format:
 +	 *               len  ver
 +	 *    +----+----+----+----+-----------+-----------+
 +	 *    | 'C'| 'E'| 1C | 01 | LOCATION1 | LOCATION2 |
 +	 *    +----+----+----+----+-----------+-----------+
 +	 *    0    1    2    3    4          12          20
 +	 *    +-----------+
 +	 *    | LOCATION3 |
 +	 *    +-----------+
 +	 *   20          28
 +	 *   LOCATION1 : Location of Continuation of System Use Area.
 +	 *   LOCATION2 : Offset to Start of Continuation.
 +	 *   LOCATION3 : Length of the Continuation.
 +	 */
 +
 +	bp[1] = 'C';
 +	bp[2] = 'E';
 +	bp[3] = RR_CE_SIZE;	/* length	*/
 +	bp[4] = 1;		/* version	*/
 +	set_num_733(bp+5, location);
 +	set_num_733(bp+13, offset);
 +	set_num_733(bp+21, size);
 +	return (RR_CE_SIZE);
 +}
 +
 +/*
 + * The functions, which names are beginning with extra_, are used to
 + * control extra records.
 + * The maximum size of a Directory Record is 254. When a filename is
 + * very long, all of RRIP data of a file won't stored to the Directory
 + * Record and so remaining RRIP data store to an extra record instead.
 + */
 +static unsigned char *
 +extra_open_record(unsigned char *bp, int dr_len, struct isoent *isoent,
 +    struct ctl_extr_rec *ctl)
 +{
 +	ctl->bp = bp;
 +	if (bp != NULL)
 +		bp += dr_len;
 +	ctl->use_extr = 0;
 +	ctl->isoent = isoent;
 +	ctl->ce_ptr = NULL;
 +	ctl->cur_len = ctl->dr_len = dr_len;
 +	ctl->limit = DR_LIMIT;
 +
 +	return (bp);
 +}
 +
 +static void
 +extra_close_record(struct ctl_extr_rec *ctl, int ce_size)
 +{
 +	int padding = 0;
 +
 +	if (ce_size > 0)
 +		extra_tell_used_size(ctl, ce_size);
 +	/* Padding. */
 +	if (ctl->cur_len & 0x01) {
 +		ctl->cur_len++;
 +		if (ctl->bp != NULL)
 +			ctl->bp[ctl->cur_len] = 0;
 +		padding = 1;
 +	}
 +	if (ctl->use_extr) {
 +		if (ctl->ce_ptr != NULL)
 +			set_SUSP_CE(ctl->ce_ptr, ctl->extr_loc,
 +			    ctl->extr_off, ctl->cur_len - padding);
 +	} else
 +		ctl->dr_len = ctl->cur_len;
 +}
 +
 +#define extra_space(ctl)	((ctl)->limit - (ctl)->cur_len)
 +
 +static unsigned char *
 +extra_next_record(struct ctl_extr_rec *ctl, int length)
 +{
 +	int cur_len = ctl->cur_len;/* save cur_len */
 +
 +	/* Close the current extra record or Directory Record. */
 +	extra_close_record(ctl, RR_CE_SIZE);
 +
 +	/* Get a next extra record. */
 +	ctl->use_extr = 1;
 +	if (ctl->bp != NULL) {
 +		/* Storing data into an extra record. */
 +		unsigned char *p;
 +
 +		/* Save the pointer where a CE extension will be
 +		 * stored to. */
 +		ctl->ce_ptr = &ctl->bp[cur_len+1];
 +		p = extra_get_record(ctl->isoent,
 +		    &ctl->limit, &ctl->extr_off, &ctl->extr_loc);
 +		ctl->bp = p - 1;/* the base of bp offset is 1. */
 +	} else
 +		/* Calculating the size of an extra record. */
 +		(void)extra_get_record(ctl->isoent,
 +		    &ctl->limit, NULL, NULL);
 +	ctl->cur_len = 0;
 +	/* Check if an extra record is almost full.
 +	 * If so, get a next one. */
 +	if (extra_space(ctl) < length)
 +		(void)extra_next_record(ctl, length);
 +
 +	return (ctl->bp);
 +}
 +
 +static inline struct extr_rec *
 +extra_last_record(struct isoent *isoent)
 +{
 +	if (isoent->extr_rec_list.first == NULL)
 +		return (NULL);
 +	return ((struct extr_rec *)(void *)
 +		((char *)(isoent->extr_rec_list.last)
 +		    - offsetof(struct extr_rec, next)));
 +}
 +
 +static unsigned char *
 +extra_get_record(struct isoent *isoent, int *space, int *off, int *loc)
 +{
 +	struct extr_rec *rec;
 +
 +	isoent = isoent->parent;
 +	if (off != NULL) {
 +		/* Storing data into an extra record. */
 +		rec = isoent->extr_rec_list.current;
 +		if (DR_SAFETY > LOGICAL_BLOCK_SIZE - rec->offset)
 +			rec = rec->next;
 +	} else {
 +		/* Calculating the size of an extra record. */
 +		rec = extra_last_record(isoent);
 +		if (rec == NULL ||
 +		    DR_SAFETY > LOGICAL_BLOCK_SIZE - rec->offset) {
 +			rec = malloc(sizeof(*rec));
 +			if (rec == NULL)
 +				return (NULL);
 +			rec->location = 0;
 +			rec->offset = 0;
 +			/* Insert `rec` into the tail of isoent->extr_rec_list */
 +			rec->next = NULL;
++			/*
++			 * Note: testing isoent->extr_rec_list.last == NULL
++			 * here is really unneeded since it has been already
++			 * initialized at isoent_new function but Clang Static
++			 * Analyzer claims that it is dereference of null
++			 * pointer.
++			 */
++			if (isoent->extr_rec_list.last == NULL)
++				isoent->extr_rec_list.last =
++					&(isoent->extr_rec_list.first);
 +			*isoent->extr_rec_list.last = rec;
 +			isoent->extr_rec_list.last = &(rec->next);
 +		}
 +	}
 +	*space = LOGICAL_BLOCK_SIZE - rec->offset - DR_SAFETY;
 +	if (*space & 0x01)
 +		*space -= 1;/* Keep padding space. */
 +	if (off != NULL)
 +		*off = rec->offset;
 +	if (loc != NULL)
 +		*loc = rec->location;
 +	isoent->extr_rec_list.current = rec;
 +
 +	return (&rec->buf[rec->offset]);
 +}
 +
 +static void
 +extra_tell_used_size(struct ctl_extr_rec *ctl, int size)
 +{
 +	struct isoent *isoent;
 +	struct extr_rec *rec;
 +
 +	if (ctl->use_extr) {
 +		isoent = ctl->isoent->parent;
 +		rec = isoent->extr_rec_list.current;
 +		if (rec != NULL)
 +			rec->offset += size;
 +	}
 +	ctl->cur_len += size;
 +}
 +
 +static int
 +extra_setup_location(struct isoent *isoent, int location)
 +{
 +	struct extr_rec *rec;
 +	int cnt;
 +
 +	cnt = 0;
 +	rec = isoent->extr_rec_list.first;
 +	isoent->extr_rec_list.current = rec;
 +	while (rec) {
 +		cnt++;
 +		rec->location = location++;
 +		rec->offset = 0;
 +		rec = rec->next;
 +	}
 +	return (cnt);
 +}
 +
 +/*
 + * Create the RRIP entries.
 + */
 +static int
 +set_directory_record_rr(unsigned char *bp, int dr_len,
 +    struct isoent *isoent, struct iso9660 *iso9660, enum dir_rec_type t)
 +{
 +	/* Flags(BP 5) of the Rockridge "RR" System Use Field */
 +	unsigned char rr_flag;
 +#define RR_USE_PX	0x01
 +#define RR_USE_PN	0x02
 +#define RR_USE_SL	0x04
 +#define RR_USE_NM	0x08
 +#define RR_USE_CL	0x10
 +#define RR_USE_PL	0x20
 +#define RR_USE_RE	0x40
 +#define RR_USE_TF	0x80
 +	int length;
 +	struct ctl_extr_rec ctl;
 +	struct isoent *rr_parent, *pxent;
 +	struct isofile *file;
 +
 +	bp = extra_open_record(bp, dr_len, isoent, &ctl);
 +
 +	if (t == DIR_REC_PARENT) {
 +		rr_parent = isoent->rr_parent;
 +		pxent = isoent->parent;
 +		if (rr_parent != NULL)
 +			isoent = rr_parent;
 +		else
 +			isoent = isoent->parent;
 +	} else {
 +		rr_parent = NULL;
 +		pxent = isoent;
 +	}
 +	file = isoent->file;
 +
 +	if (t != DIR_REC_NORMAL) {
 +		rr_flag = RR_USE_PX | RR_USE_TF;
 +		if (rr_parent != NULL)
 +			rr_flag |= RR_USE_PL;
 +	} else {
 +		rr_flag = RR_USE_PX | RR_USE_NM | RR_USE_TF;
 +		if (archive_entry_filetype(file->entry) == AE_IFLNK)
 +			rr_flag |= RR_USE_SL;
 +		if (isoent->rr_parent != NULL)
 +			rr_flag |= RR_USE_RE;
 +		if (isoent->rr_child != NULL)
 +			rr_flag |= RR_USE_CL;
 +		if (archive_entry_filetype(file->entry) == AE_IFCHR ||
 +		    archive_entry_filetype(file->entry) == AE_IFBLK)
 +			rr_flag |= RR_USE_PN;
 +#ifdef COMPAT_MKISOFS
 +		/*
 +		 * mkisofs 2.01.01a63 records "RE" extension to
 +		 * the entry of "rr_moved" directory.
 +		 * I don't understand this behavior.
 +		 */
 +		if (isoent->virtual &&
 +		    isoent->parent == iso9660->primary.rootent &&
 +		    strcmp(isoent->file->basename.s, "rr_moved") == 0)
 +			rr_flag |= RR_USE_RE;
 +#endif
 +	}
 +
 +	/* Write "SP" System Use Entry. */
 +	if (t == DIR_REC_SELF && isoent == isoent->parent) {
 +		length = 7;
 +		if (bp != NULL) {
 +			bp[1] = 'S';
 +			bp[2] = 'P';
 +			bp[3] = length;
 +			bp[4] = 1;	/* version	*/
 +			bp[5] = 0xBE;  /* Check Byte	*/
 +			bp[6] = 0xEF;  /* Check Byte	*/
 +			bp[7] = 0;
 +			bp += length;
 +		}
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	/* Write "RR" System Use Entry. */
 +	length = 5;
 +	if (extra_space(&ctl) < length)
 +		bp = extra_next_record(&ctl, length);
 +	if (bp != NULL) {
 +		bp[1] = 'R';
 +		bp[2] = 'R';
 +		bp[3] = length;
 +		bp[4] = 1;	/* version */
 +		bp[5] = rr_flag;
 +		bp += length;
 +	}
 +	extra_tell_used_size(&ctl, length);
 +
 +	/* Write "NM" System Use Entry. */
 +	if (rr_flag & RR_USE_NM) {
 +		/*
 +		 *   "NM" Format:
 +		 *     e.g. a basename is 'foo'
 +		 *               len  ver  flg
 +		 *    +----+----+----+----+----+----+----+----+
 +		 *    | 'N'| 'M'| 08 | 01 | 00 | 'f'| 'o'| 'o'|
 +		 *    +----+----+----+----+----+----+----+----+
 +		 *    <----------------- len ----------------->
 +		 */
 +		size_t nmlen = file->basename.length;
 +		const char *nm = file->basename.s;
 +		size_t nmmax;
 +
 +		if (extra_space(&ctl) < 6)
 +			bp = extra_next_record(&ctl, 6);
 +		if (bp != NULL) {
 +			bp[1] = 'N';
 +			bp[2] = 'M';
 +			bp[4] = 1;	    /* version	*/
 +		}
 +		nmmax = extra_space(&ctl);
 +		if (nmmax > 0xff)
 +			nmmax = 0xff;
 +		while (nmlen + 5 > nmmax) {
 +			length = (int)nmmax;
 +			if (bp != NULL) {
 +				bp[3] = length;
 +				bp[5] = 0x01;/* Alternate Name continues
 +					       * in next "NM" field */
 +				memcpy(bp+6, nm, length - 5);
 +				bp += length;
 +			}
 +			nmlen -= length - 5;
 +			nm += length - 5;
 +			extra_tell_used_size(&ctl, length);
 +			if (extra_space(&ctl) < 6) {
 +				bp = extra_next_record(&ctl, 6);
 +				nmmax = extra_space(&ctl);
 +				if (nmmax > 0xff)
 +					nmmax = 0xff;
 +			}
 +			if (bp != NULL) {
 +				bp[1] = 'N';
 +				bp[2] = 'M';
 +				bp[4] = 1;    /* version */
 +			}
 +		}
 +		length = 5 + (int)nmlen;
 +		if (bp != NULL) {
 +			bp[3] = length;
 +			bp[5] = 0;
 +			memcpy(bp+6, nm, nmlen);
 +			bp += length;
 +		}
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	/* Write "PX" System Use Entry. */
 +	if (rr_flag & RR_USE_PX) {
 +		/*
 +		 *   "PX" Format:
 +		 *               len  ver
 +		 *    +----+----+----+----+-----------+-----------+
 +		 *    | 'P'| 'X'| 2C | 01 | FILE MODE |   LINKS   |
 +		 *    +----+----+----+----+-----------+-----------+
 +		 *    0    1    2    3    4          12          20
 +		 *    +-----------+-----------+------------------+
 +		 *    |  USER ID  | GROUP ID  |FILE SERIAL NUMBER|
 +		 *    +-----------+-----------+------------------+
 +		 *   20          28          36                 44
 +		 */
 +		length = 44;
 +		if (extra_space(&ctl) < length)
 +			bp = extra_next_record(&ctl, length);
 +		if (bp != NULL) {
 +			mode_t mode;
 +			int64_t uid;
 +			int64_t gid;
 +
 +			mode = archive_entry_mode(file->entry);
 +			uid = archive_entry_uid(file->entry);
 +			gid = archive_entry_gid(file->entry);
 +			if (iso9660->opt.rr == OPT_RR_USEFUL) {
 +				/*
 +				 * This action is simular mkisofs -r option
 +				 * but our rockridge=useful option does not
 +				 * set a zero to uid and gid.
 +				 */
 +				/* set all read bit ON */
 +				mode |= 0444;
 +#if !defined(_WIN32) && !defined(__CYGWIN__)
 +				if (mode & 0111)
 +#endif
 +					/* set all exec bit ON */
 +					mode |= 0111;
 +				/* clear all write bits. */
 +				mode &= ~0222;
 +				/* clear setuid,setgid,sticky bits. */
 +				mode &= ~07000;
 +			}
 +
 +			bp[1] = 'P';
 +			bp[2] = 'X';
 +			bp[3] = length;
 +			bp[4] = 1;	/* version	*/
 +			/* file mode */
 +			set_num_733(bp+5, mode);
 +			/* file links (stat.st_nlink) */
 +			set_num_733(bp+13,
 +			    archive_entry_nlink(file->entry));
 +			set_num_733(bp+21, (uint32_t)uid);
 +			set_num_733(bp+29, (uint32_t)gid);
 +			/* File Serial Number */
 +			if (pxent->dir)
 +				set_num_733(bp+37, pxent->dir_location);
 +			else if (file->hardlink_target != NULL)
 +				set_num_733(bp+37,
 +				    file->hardlink_target->cur_content->location);
 +			else
 +				set_num_733(bp+37,
 +				    file->cur_content->location);
 +			bp += length;
 +		}
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	/* Write "SL" System Use Entry. */
 +	if (rr_flag & RR_USE_SL) {
 +		/*
 +		 *   "SL" Format:
 +		 *     e.g. a symbolic name is 'foo/bar'
 +		 *               len  ver  flg
 +		 *    +----+----+----+----+----+------------+
 +		 *    | 'S'| 'L'| 0F | 01 | 00 | components |
 +		 *    +----+----+----+----+----+-----+------+
 +		 *    0    1    2    3    4    5  ...|...  15
 +		 *    <----------------- len --------+------>
 +		 *    components :                   |
 +		 *     cflg clen                     |
 +		 *    +----+----+----+----+----+     |
 +		 *    | 00 | 03 | 'f'| 'o'| 'o'| <---+
 +		 *    +----+----+----+----+----+     |
 +		 *    5    6    7    8    9   10     |
 +		 *     cflg clen                     |
 +		 *    +----+----+----+----+----+     |
 +		 *    | 00 | 03 | 'b'| 'a'| 'r'| <---+
 +		 *    +----+----+----+----+----+
 +		 *   10   11   12   13   14   15
 +		 *
 +	 	 *    - cflg : flag of componet
 +		 *    - clen : length of componet
 +		 */
 +		const char *sl;
 +		char sl_last;
 +
 +		if (extra_space(&ctl) < 7)
 +			bp = extra_next_record(&ctl, 7);
 +		sl = file->symlink.s;
 +		sl_last = '\0';
 +		if (bp != NULL) {
 +			bp[1] = 'S';
 +			bp[2] = 'L';
 +			bp[4] = 1;	/* version	*/
 +		}
 +		for (;;) {
 +			unsigned char *nc, *cf,  *cl, cldmy = 0;
 +			int sllen, slmax;
 +
 +			slmax = extra_space(&ctl);
 +			if (slmax > 0xff)
 +				slmax = 0xff;
 +			if (bp != NULL)
 +				nc = &bp[6];
 +			else
 +				nc = NULL;
 +			cf = cl = NULL;
 +			sllen = 0;
 +			while (*sl && sllen + 11 < slmax) {
 +				if (sl_last == '\0' && sl[0] == '/') {
 +					/*
 +					 *     flg  len
 +					 *    +----+----+
 +					 *    | 08 | 00 | ROOT component.
 +					 *    +----+----+ ("/")
 +					 *
 +				 	 * Root component has to appear
 +				 	 * at the first component only.
 +					 */
 +					if (nc != NULL) {
 +						cf = nc++;
 +						*cf = 0x08; /* ROOT */
 +						*nc++ = 0;
 +					}
 +					sllen += 2;
 +					sl++;
 +					sl_last = '/';
 +					cl = NULL;
 +					continue;
 +				}
 +				if (((sl_last == '\0' || sl_last == '/') &&
 +				      sl[0] == '.' && sl[1] == '.' &&
 +				     (sl[2] == '/' || sl[2] == '\0')) ||
 +				    (sl[0] == '/' &&
 +				      sl[1] == '.' && sl[2] == '.' &&
 +				     (sl[3] == '/' || sl[3] == '\0'))) {
 +					/*
 +					 *     flg  len
 +					 *    +----+----+
 +					 *    | 04 | 00 | PARENT component.
 +					 *    +----+----+ ("..")
 +					 */
 +					if (nc != NULL) {
 +						cf = nc++;
 +						*cf = 0x04; /* PARENT */
 +						*nc++ = 0;
 +					}
 +					sllen += 2;
 +					if (sl[0] == '/')
 +						sl += 3;/* skip "/.." */
 +					else
 +						sl += 2;/* skip ".." */
 +					sl_last = '.';
 +					cl = NULL;
 +					continue;
 +				}
 +				if (((sl_last == '\0' || sl_last == '/') &&
 +				      sl[0] == '.' &&
 +				     (sl[1] == '/' || sl[1] == '\0')) ||
 +				    (sl[0] == '/' && sl[1] == '.' &&
 +				     (sl[2] == '/' || sl[2] == '\0'))) {
 +					/*
 +					 *     flg  len
 +					 *    +----+----+
 +					 *    | 02 | 00 | CURREENT component.
 +					 *    +----+----+ (".")
 +					 */
 +					if (nc != NULL) {
 +						cf = nc++;
 +						*cf = 0x02; /* CURRENT */
 +						*nc++ = 0;
 +					}
 +					sllen += 2;
 +					if (sl[0] == '/')
 +						sl += 2;/* skip "/." */
 +					else
 +						sl ++;  /* skip "." */
 +					sl_last = '.';
 +					cl = NULL;
 +					continue;
 +				}
 +				if (sl[0] == '/' || cl == NULL) {
 +					if (nc != NULL) {
 +						cf = nc++;
 +						*cf = 0;
 +						cl = nc++;
 +						*cl = 0;
 +					} else
 +						cl = &cldmy;
 +					sllen += 2;
 +					if (sl[0] == '/') {
 +						sl_last = *sl++;
 +						continue;
 +					}
 +				}
 +				sl_last = *sl++;
 +				if (nc != NULL) {
 +					*nc++ = sl_last;
 +					(*cl) ++;
 +				}
 +				sllen++;
 +			}
 +			if (*sl) {
 +				length = 5 + sllen;
 +				if (bp != NULL) {
 +					/*
 +					 * Mark flg as CONTINUE component.
 +					 */
 +					*cf |= 0x01;
 +					/*
 +					 *               len  ver  flg
 +					 *    +----+----+----+----+----+-
 +					 *    | 'S'| 'L'| XX | 01 | 01 |
 +					 *    +----+----+----+----+----+-
 +					 *                           ^
 +					 *           continues in next "SL"
 +					 */
 +					bp[3] = length;
 +					bp[5] = 0x01;/* This Symbolic Link
 +						      * continues in next
 +						      * "SL" field */
 +					bp += length;
 +				}
 +				extra_tell_used_size(&ctl, length);
 +				if (extra_space(&ctl) < 11)
 +					bp = extra_next_record(&ctl, 11);
 +				if (bp != NULL) {
 +					/* Next 'SL' */
 +					bp[1] = 'S';
 +					bp[2] = 'L';
 +					bp[4] = 1;    /* version */
 +				}
 +			} else {
 +				length = 5 + sllen;
 +				if (bp != NULL) {
 +					bp[3] = length;
 +					bp[5] = 0;
 +					bp += length;
 +				}
 +				extra_tell_used_size(&ctl, length);
 +				break;
 +			}
 +		}
 +	}
 +
 +	/* Write "TF" System Use Entry. */
 +	if (rr_flag & RR_USE_TF) {
 +		/*
 +		 *   "TF" Format:
 +		 *               len  ver
 +		 *    +----+----+----+----+-----+-------------+
 +		 *    | 'T'| 'F'| XX | 01 |FLAGS| TIME STAMPS |
 +		 *    +----+----+----+----+-----+-------------+
 +		 *    0    1    2    3    4     5            XX
 +		 *    TIME STAMPS : ISO 9660 Standard 9.1.5.
 +		 *                  If TF_LONG_FORM FLAGS is set,
 +		 *                  use ISO9660 Standard 8.4.26.1.
 +		 */
 +#define TF_CREATION	0x01	/* Creation time recorded		*/
 +#define TF_MODIFY	0x02	/* Modification time recorded		*/
 +#define TF_ACCESS	0x04	/* Last Access time recorded		*/
 +#define TF_ATTRIBUTES	0x08	/* Last Attribute Change time recorded  */
 +#define TF_BACKUP	0x10	/* Last Backup time recorded		*/
 +#define TF_EXPIRATION	0x20	/* Expiration time recorded		*/
 +#define TF_EFFECTIVE	0x40	/* Effective time recorded		*/
 +#define TF_LONG_FORM	0x80	/* ISO 9660 17-byte time format used	*/
 +		unsigned char tf_flags;
 +
 +		length = 5;
 +		tf_flags = 0;
 +#ifndef COMPAT_MKISOFS
 +		if (archive_entry_birthtime_is_set(file->entry) &&
 +		    archive_entry_birthtime(file->entry) <=
 +		    archive_entry_mtime(file->entry)) {
 +			length += 7;
 +			tf_flags |= TF_CREATION;
 +		}
 +#endif
 +		if (archive_entry_mtime_is_set(file->entry)) {
 +			length += 7;
 +			tf_flags |= TF_MODIFY;
 +		}
 +		if (archive_entry_atime_is_set(file->entry)) {
 +			length += 7;
 +			tf_flags |= TF_ACCESS;
 +		}
 +		if (archive_entry_ctime_is_set(file->entry)) {
 +			length += 7;
 +			tf_flags |= TF_ATTRIBUTES;
 +		}
 +		if (extra_space(&ctl) < length)
 +			bp = extra_next_record(&ctl, length);
 +		if (bp != NULL) {
 +			bp[1] = 'T';
 +			bp[2] = 'F';
 +			bp[3] = length;
 +			bp[4] = 1;	/* version	*/
 +			bp[5] = tf_flags;
 +			bp += 5;
 +			/* Creation time */
 +			if (tf_flags & TF_CREATION) {
 +				set_time_915(bp+1,
 +				    archive_entry_birthtime(file->entry));
 +				bp += 7;
 +			}
 +			/* Modification time */
 +			if (tf_flags & TF_MODIFY) {
 +				set_time_915(bp+1,
 +				    archive_entry_mtime(file->entry));
 +				bp += 7;
 +			}
 +			/* Last Access time */
 +			if (tf_flags & TF_ACCESS) {
 +				set_time_915(bp+1,
 +				    archive_entry_atime(file->entry));
 +				bp += 7;
 +			}
 +			/* Last Attribute Change time */
 +			if (tf_flags & TF_ATTRIBUTES) {
 +				set_time_915(bp+1,
 +				    archive_entry_ctime(file->entry));
 +				bp += 7;
 +			}
 +		}
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	/* Write "RE" System Use Entry. */
 +	if (rr_flag & RR_USE_RE) {
 +		/*
 +		 *   "RE" Format:
 +		 *               len  ver
 +		 *    +----+----+----+----+
 +		 *    | 'R'| 'E'| 04 | 01 |
 +		 *    +----+----+----+----+
 +		 *    0    1    2    3    4
 +		 */
 +		length = 4;
 +		if (extra_space(&ctl) < length)
 +			bp = extra_next_record(&ctl, length);
 +		if (bp != NULL) {
 +			bp[1] = 'R';
 +			bp[2] = 'E';
 +			bp[3] = length;
 +			bp[4] = 1;	/* version	*/
 +			bp += length;
 +		}
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	/* Write "PL" System Use Entry. */
 +	if (rr_flag & RR_USE_PL) {
 +		/*
 +		 *   "PL" Format:
 +		 *               len  ver
 +		 *    +----+----+----+----+------------+
 +		 *    | 'P'| 'L'| 0C | 01 | *LOCATION  |
 +		 *    +----+----+----+----+------------+
 +		 *    0    1    2    3    4           12
 +		 *    *LOCATION: location of parent directory
 +		 */
 +		length = 12;
 +		if (extra_space(&ctl) < length)
 +			bp = extra_next_record(&ctl, length);
 +		if (bp != NULL) {
 +			bp[1] = 'P';
 +			bp[2] = 'L';
 +			bp[3] = length;
 +			bp[4] = 1;	/* version	*/
 +			set_num_733(bp + 5,
 +			    rr_parent->dir_location);
 +			bp += length;
 +		}
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	/* Write "CL" System Use Entry. */
 +	if (rr_flag & RR_USE_CL) {
 +		/*
 +		 *   "CL" Format:
 +		 *               len  ver
 +		 *    +----+----+----+----+------------+
 +		 *    | 'C'| 'L'| 0C | 01 | *LOCATION  |
 +		 *    +----+----+----+----+------------+
 +		 *    0    1    2    3    4           12
 +		 *    *LOCATION: location of child directory
 +		 */
 +		length = 12;
 +		if (extra_space(&ctl) < length)
 +			bp = extra_next_record(&ctl, length);
 +		if (bp != NULL) {
 +			bp[1] = 'C';
 +			bp[2] = 'L';
 +			bp[3] = length;
 +			bp[4] = 1;	/* version	*/
 +			set_num_733(bp + 5,
 +			    isoent->rr_child->dir_location);
 +			bp += length;
 +		}
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	/* Write "PN" System Use Entry. */
 +	if (rr_flag & RR_USE_PN) {
 +		/*
 +		 *   "PN" Format:
 +		 *               len  ver
 +		 *    +----+----+----+----+------------+------------+
 +		 *    | 'P'| 'N'| 14 | 01 | dev_t high | dev_t low  |
 +		 *    +----+----+----+----+------------+------------+
 +		 *    0    1    2    3    4           12           20
 +		 */
 +		length = 20;
 +		if (extra_space(&ctl) < length)
 +			bp = extra_next_record(&ctl, length);
 +		if (bp != NULL) {
 +			uint64_t dev;
 +
 +			bp[1] = 'P';
 +			bp[2] = 'N';
 +			bp[3] = length;
 +			bp[4] = 1;	/* version	*/
 +			dev = (uint64_t)archive_entry_rdev(file->entry);
 +			set_num_733(bp + 5, (uint32_t)(dev >> 32));
 +			set_num_733(bp + 13, (uint32_t)(dev & 0xFFFFFFFF));
 +			bp += length;
 +		}
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	/* Write "ZF" System Use Entry. */
 +	if (file->zisofs.header_size) {
 +		/*
 +		 *   "ZF" Format:
 +		 *               len  ver
 +		 *    +----+----+----+----+----+----+-------------+
 +		 *    | 'Z'| 'F'| 10 | 01 | 'p'| 'z'| Header Size |
 +		 *    +----+----+----+----+----+----+-------------+
 +		 *    0    1    2    3    4    5    6             7
 +		 *    +--------------------+-------------------+
 +		 *    | Log2 of block Size | Uncompressed Size |
 +		 *    +--------------------+-------------------+
 +		 *    7                    8                   16
 +		 */
 +		length = 16;
 +		if (extra_space(&ctl) < length)
 +			bp = extra_next_record(&ctl, length);
 +		if (bp != NULL) {
 +			bp[1] = 'Z';
 +			bp[2] = 'F';
 +			bp[3] = length;
 +			bp[4] = 1;	/* version	*/
 +			bp[5] = 'p';
 +			bp[6] = 'z';
 +			bp[7] = file->zisofs.header_size;
 +			bp[8] = file->zisofs.log2_bs;
 +			set_num_733(bp + 9, file->zisofs.uncompressed_size);
 +			bp += length;
 +		}
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	/* Write "CE" System Use Entry. */
 +	if (t == DIR_REC_SELF && isoent == isoent->parent) {
 +		length = RR_CE_SIZE;
 +		if (bp != NULL)
 +			set_SUSP_CE(bp+1, iso9660->location_rrip_er,
 +			    0, RRIP_ER_SIZE);
 +		extra_tell_used_size(&ctl, length);
 +	}
 +
 +	extra_close_record(&ctl, 0);
 +
 +	return (ctl.dr_len);
 +}
 +
 +/*
 + * Write data of a Directory Record or calculate writing bytes itself.
 + * If parameter `p' is NULL, calculates the size of writing data, which
 + * a Directory Record needs to write, then it saved and return
 + * the calculated size.
 + * Parameter `n' is a remaining size of buffer. when parameter `p' is
 + * not NULL, check whether that `n' is not less than the saved size.
 + * if that `n' is small, return zero.
 + *
 + * This format of the Directory Record is according to
 + * ISO9660 Standard 9.1
 + */
 +static int
 +set_directory_record(unsigned char *p, size_t n, struct isoent *isoent,
 +    struct iso9660 *iso9660, enum dir_rec_type t,
 +    enum vdd_type vdd_type)
 +{
 +	unsigned char *bp;
 +	size_t dr_len;
 +	size_t fi_len;
 +
 +	if (p != NULL) {
 +		/*
 +		 * Check whether a write buffer size is less than the
 +		 * saved size which is needed to write this Directory
 +		 * Record.
 +		 */
 +		switch (t) {
 +		case DIR_REC_VD:
 +			dr_len = isoent->dr_len.vd; break;
 +		case DIR_REC_SELF:
 +			dr_len = isoent->dr_len.self; break;
 +		case DIR_REC_PARENT:
 +			dr_len = isoent->dr_len.parent; break;
 +		case DIR_REC_NORMAL:
 +		default:
 +			dr_len = isoent->dr_len.normal; break;
 +		}
 +		if (dr_len > n)
 +			return (0);/* Needs more buffer size. */
 +	}
 +
 +	if (t == DIR_REC_NORMAL && isoent->identifier != NULL)
 +		fi_len = isoent->id_len;
 +	else
 +		fi_len = 1;
 +
 +	if (p != NULL) {
 +		struct isoent *xisoent;
 +		struct isofile *file;
 +		unsigned char flag;
 +
 +		if (t == DIR_REC_PARENT)
 +			xisoent = isoent->parent;
 +		else
 +			xisoent = isoent;
 +		file = isoent->file;
 +		if (file->hardlink_target != NULL)
 +			file = file->hardlink_target;
 +		/* Make a file flag. */
 +		if (xisoent->dir)
 +			flag = FILE_FLAG_DIRECTORY;
 +		else {
 +			if (file->cur_content->next != NULL)
 +				flag = FILE_FLAG_MULTI_EXTENT;
 +			else
 +				flag = 0;
 +		}
 +
 +		bp = p -1;
 +		/* Extended Attribute Record Length */
 +		set_num_711(bp+2, 0);
 +		/* Location of Extent */
 +		if (xisoent->dir)
 +			set_num_733(bp+3, xisoent->dir_location);
 +		else
 +			set_num_733(bp+3, file->cur_content->location);
 +		/* Data Length */
 +		if (xisoent->dir)
 +			set_num_733(bp+11,
 +			    xisoent->dir_block * LOGICAL_BLOCK_SIZE);
 +		else
 +			set_num_733(bp+11, (uint32_t)file->cur_content->size);
 +		/* Recording Date and Time */
 +		/* NOTE:
 +		 *  If a file type is symbolic link, you are seeing this
 +		 *  field value is different from a value mkisofs makes.
 +		 *  libarchive uses lstat to get this one, but it
 +		 *  seems mkisofs uses stat to get.
 +		 */
 +		set_time_915(bp+19,
 +		    archive_entry_mtime(xisoent->file->entry));
 +		/* File Flags */
 +		bp[26] = flag;
 +		/* File Unit Size */
 +		set_num_711(bp+27, 0);
 +		/* Interleave Gap Size */
 +		set_num_711(bp+28, 0);
 +		/* Volume Sequence Number */
 +		set_num_723(bp+29, iso9660->volume_sequence_number);
 +		/* Length of File Identifier */
 +		set_num_711(bp+33, (unsigned char)fi_len);
 +		/* File Identifier */
 +		switch (t) {
 +		case DIR_REC_VD:
 +		case DIR_REC_SELF:
 +			set_num_711(bp+34, 0);
 +			break;
 +		case DIR_REC_PARENT:
 +			set_num_711(bp+34, 1);
 +			break;
 +		case DIR_REC_NORMAL:
 +			if (isoent->identifier != NULL)
 +				memcpy(bp+34, isoent->identifier, fi_len);
 +			else
 +				set_num_711(bp+34, 0);
 +			break;
 +		}
 +	} else
 +		bp = NULL;
 +	dr_len = 33 + fi_len;
 +	/* Padding Field */
 +	if (dr_len & 0x01) {
 +		dr_len ++;
 +		if (p != NULL)
 +			bp[dr_len] = 0;
 +	}
 +
 +	/* Volume Descriptor does not record extension. */
 +	if (t == DIR_REC_VD) {
 +		if (p != NULL)
 +			/* Length of Directory Record */
 +			set_num_711(p, (unsigned char)dr_len);
 +		else
 +			isoent->dr_len.vd = (int)dr_len;
 +		return ((int)dr_len);
 +	}
 +
 +	/* Rockridge */
 +	if (iso9660->opt.rr && vdd_type != VDD_JOLIET)
 +		dr_len = set_directory_record_rr(bp, (int)dr_len,
 +		    isoent, iso9660, t);
 +
 +	if (p != NULL)
 +		/* Length of Directory Record */
 +		set_num_711(p, (unsigned char)dr_len);
 +	else {
 +		/*
 +		 * Save the size which is needed to write this
 +		 * Directory Record.
 +		 */
 +		switch (t) {
 +		case DIR_REC_VD:
 +			/* This case does not come, but compiler
 +			 * complains that DIR_REC_VD not handled
 +			 *  in switch ....  */
 +			break;
 +		case DIR_REC_SELF:
 +			isoent->dr_len.self = (int)dr_len; break;
 +		case DIR_REC_PARENT:
 +			isoent->dr_len.parent = (int)dr_len; break;
 +		case DIR_REC_NORMAL:
 +			isoent->dr_len.normal = (int)dr_len; break;
 +		}
 +	}
 +
 +	return ((int)dr_len);
 +}
 +
 +/*
 + * Calculate the size of a directory record.
 + */
 +static inline int
 +get_dir_rec_size(struct iso9660 *iso9660, struct isoent *isoent,
 +    enum dir_rec_type t, enum vdd_type vdd_type)
 +{
 +
 +	return (set_directory_record(NULL, SIZE_MAX,
 +	    isoent, iso9660, t, vdd_type));
 +}
 +
 +/*
 + * Manage to write ISO-image data with wbuff to reduce calling
 + * __archive_write_output() for performance.
 + */
 +
 +
 +static inline unsigned char *
 +wb_buffptr(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = (struct iso9660 *)a->format_data;
 +
 +	return (&(iso9660->wbuff[sizeof(iso9660->wbuff)
 +		- iso9660->wbuff_remaining]));
 +}
 +
 +static int
 +wb_write_out(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = (struct iso9660 *)a->format_data;
 +	size_t wsize, nw;
 +	int r;
 +
 +	wsize = sizeof(iso9660->wbuff) - iso9660->wbuff_remaining;
 +	nw = wsize % LOGICAL_BLOCK_SIZE;
 +	if (iso9660->wbuff_type == WB_TO_STREAM)
 +		r = __archive_write_output(a, iso9660->wbuff, wsize - nw);
 +	else
 +		r = write_to_temp(a, iso9660->wbuff, wsize - nw);
 +	/* Increase the offset. */
 +	iso9660->wbuff_offset += wsize - nw;
 +	if (iso9660->wbuff_offset > iso9660->wbuff_written)
 +		iso9660->wbuff_written = iso9660->wbuff_offset;
 +	iso9660->wbuff_remaining = sizeof(iso9660->wbuff);
 +	if (nw) {
 +		iso9660->wbuff_remaining -= nw;
 +		memmove(iso9660->wbuff, iso9660->wbuff + wsize - nw, nw);
 +	}
 +	return (r);
 +}
 +
 +static int
 +wb_consume(struct archive_write *a, size_t size)
 +{
 +	struct iso9660 *iso9660 = (struct iso9660 *)a->format_data;
 +
 +	if (size > iso9660->wbuff_remaining ||
 +	    iso9660->wbuff_remaining == 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Internal Programing error: iso9660:wb_consume()"
 +		    " size=%jd, wbuff_remaining=%jd",
 +		    (intmax_t)size, (intmax_t)iso9660->wbuff_remaining);
 +		return (ARCHIVE_FATAL);
 +	}
 +	iso9660->wbuff_remaining -= size;
 +	if (iso9660->wbuff_remaining < LOGICAL_BLOCK_SIZE)
 +		return (wb_write_out(a));
 +	return (ARCHIVE_OK);
 +}
 +
 +#ifdef HAVE_ZLIB_H
 +
 +static int
 +wb_set_offset(struct archive_write *a, int64_t off)
 +{
 +	struct iso9660 *iso9660 = (struct iso9660 *)a->format_data;
 +	int64_t used, ext_bytes;
 +
 +	if (iso9660->wbuff_type != WB_TO_TEMP) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Internal Programing error: iso9660:wb_set_offset()");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	used = sizeof(iso9660->wbuff) - iso9660->wbuff_remaining;
 +	if (iso9660->wbuff_offset + used > iso9660->wbuff_tail)
 +		iso9660->wbuff_tail = iso9660->wbuff_offset + used;
 +	if (iso9660->wbuff_offset < iso9660->wbuff_written) {
 +		if (used > 0 &&
 +		    write_to_temp(a, iso9660->wbuff, (size_t)used) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +		iso9660->wbuff_offset = iso9660->wbuff_written;
 +		lseek(iso9660->temp_fd, iso9660->wbuff_offset, SEEK_SET);
 +		iso9660->wbuff_remaining = sizeof(iso9660->wbuff);
 +		used = 0;
 +	}
 +	if (off < iso9660->wbuff_offset) {
 +		/*
 +		 * Write out waiting data.
 +		 */
 +		if (used > 0) {
 +			if (wb_write_out(a) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		}
 +		lseek(iso9660->temp_fd, off, SEEK_SET);
 +		iso9660->wbuff_offset = off;
 +		iso9660->wbuff_remaining = sizeof(iso9660->wbuff);
 +	} else if (off <= iso9660->wbuff_tail) {
 +		iso9660->wbuff_remaining = (size_t)
 +		    (sizeof(iso9660->wbuff) - (off - iso9660->wbuff_offset));
 +	} else {
 +		ext_bytes = off - iso9660->wbuff_tail;
 +		iso9660->wbuff_remaining = (size_t)(sizeof(iso9660->wbuff)
 +		   - (iso9660->wbuff_tail - iso9660->wbuff_offset));
 +		while (ext_bytes >= (int64_t)iso9660->wbuff_remaining) {
 +			if (write_null(a, (size_t)iso9660->wbuff_remaining)
 +			    != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +			ext_bytes -= iso9660->wbuff_remaining;
 +		}
 +		if (ext_bytes > 0) {
 +			if (write_null(a, (size_t)ext_bytes) != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		}
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +#endif /* HAVE_ZLIB_H */
 +
 +static int
 +write_null(struct archive_write *a, size_t size)
 +{
 +	size_t remaining;
 +	unsigned char *p, *old;
 +	int r;
 +
 +	remaining = wb_remaining(a);
 +	p = wb_buffptr(a);
 +	if (size <= remaining) {
 +		memset(p, 0, size);
 +		return (wb_consume(a, size));
 +	}
 +	memset(p, 0, remaining);
 +	r = wb_consume(a, remaining);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	size -= remaining;
 +	old = p;
 +	p = wb_buffptr(a);
 +	memset(p, 0, old - p);
 +	remaining = wb_remaining(a);
 +	while (size) {
 +		size_t wsize = size;
 +
 +		if (wsize > remaining)
 +			wsize = remaining;
 +		r = wb_consume(a, wsize);
 +		if (r != ARCHIVE_OK)
 +			return (r);
 +		size -= wsize;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Write Volume Descriptor Set Terminator
 + */
 +static int
 +write_VD_terminator(struct archive_write *a)
 +{
 +	unsigned char *bp;
 +
 +	bp = wb_buffptr(a) -1;
 +	set_VD_bp(bp, VDT_TERMINATOR, 1);
 +	set_unused_field_bp(bp, 8, LOGICAL_BLOCK_SIZE);
 +
 +	return (wb_consume(a, LOGICAL_BLOCK_SIZE));
 +}
 +
 +static int
 +set_file_identifier(unsigned char *bp, int from, int to, enum vdc vdc,
 +    struct archive_write *a, struct vdd *vdd, struct archive_string *id,
 +    const char *label, int leading_under, enum char_type char_type)
 +{
 +	char identifier[256];
 +	struct isoent *isoent;
 +	const char *ids;
 +	size_t len;
 +	int r;
 +
 +	if (id->length > 0 && leading_under && id->s[0] != '_') {
 +		if (char_type == A_CHAR)
 +			r = set_str_a_characters_bp(a, bp, from, to, id->s, vdc);
 +		else
 +			r = set_str_d_characters_bp(a, bp, from, to, id->s, vdc);
 +	} else if (id->length > 0) {
 +		ids = id->s;
 +		if (leading_under)
 +			ids++;
 +		isoent = isoent_find_entry(vdd->rootent, ids);
 +		if (isoent == NULL) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Not Found %s `%s'.",
 +			    label, ids);
 +			return (ARCHIVE_FATAL);
 +		}
 +		len = isoent->ext_off + isoent->ext_len;
 +		if (vdd->vdd_type == VDD_JOLIET) {
 +			if (len > sizeof(identifier)-2)
 +				len = sizeof(identifier)-2;
 +		} else {
 +			if (len > sizeof(identifier)-1)
 +				len = sizeof(identifier)-1;
 +		}
 +		memcpy(identifier, isoent->identifier, len);
 +		identifier[len] = '\0';
 +		if (vdd->vdd_type == VDD_JOLIET) {
 +			identifier[len+1] = 0;
 +			vdc = VDC_UCS2_DIRECT;
 +		}
 +		if (char_type == A_CHAR)
 +			r = set_str_a_characters_bp(a, bp, from, to,
 +			    identifier, vdc);
 +		else
 +			r = set_str_d_characters_bp(a, bp, from, to,
 +			    identifier, vdc);
 +	} else {
 +		if (char_type == A_CHAR)
 +			r = set_str_a_characters_bp(a, bp, from, to, NULL, vdc);
 +		else
 +			r = set_str_d_characters_bp(a, bp, from, to, NULL, vdc);
 +	}
 +	return (r);
 +}
 +
 +/*
 + * Write Primary/Supplementary Volume Descriptor
 + */
 +static int
 +write_VD(struct archive_write *a, struct vdd *vdd)
 +{
 +	struct iso9660 *iso9660;
 +	unsigned char *bp;
 +	uint16_t volume_set_size = 1;
 +	char identifier[256];
 +	enum VD_type vdt;
 +	enum vdc vdc;
 +	unsigned char vd_ver, fst_ver;
 +	int r;
 +
 +	iso9660 = a->format_data;
 +	switch (vdd->vdd_type) {
 +	case VDD_JOLIET:
 +		vdt = VDT_SUPPLEMENTARY;
 +		vd_ver = fst_ver = 1;
 +		vdc = VDC_UCS2;
 +		break;
 +	case VDD_ENHANCED:
 +		vdt = VDT_SUPPLEMENTARY;
 +		vd_ver = fst_ver = 2;
 +		vdc = VDC_LOWERCASE;
 +		break;
 +	case VDD_PRIMARY:
 +	default:
 +		vdt = VDT_PRIMARY;
 +		vd_ver = fst_ver = 1;
 +#ifdef COMPAT_MKISOFS
 +		vdc = VDC_LOWERCASE;
 +#else
 +		vdc = VDC_STD;
 +#endif
 +		break;
 +	}
 +
 +	bp = wb_buffptr(a) -1;
 +	/* Volume Descriptor Type */
 +	set_VD_bp(bp, vdt, vd_ver);
 +	/* Unused Field */
 +	set_unused_field_bp(bp, 8, 8);
 +	/* System Identifier */
 +	get_system_identitier(identifier, sizeof(identifier));
 +	r = set_str_a_characters_bp(a, bp, 9, 40, identifier, vdc);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Volume Identifier */
 +	r = set_str_d_characters_bp(a, bp, 41, 72,
 +	    iso9660->volume_identifier.s, vdc);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Unused Field */
 +	set_unused_field_bp(bp, 73, 80);
 +	/* Volume Space Size */
 +	set_num_733(bp+81, iso9660->volume_space_size);
 +	if (vdd->vdd_type == VDD_JOLIET) {
 +		/* Escape Sequences */
 +		bp[89] = 0x25;/* UCS-2 Level 3 */
 +		bp[90] = 0x2F;
 +		bp[91] = 0x45;
 +		memset(bp + 92, 0, 120 - 92 + 1);
 +	} else {
 +		/* Unused Field */
 +		set_unused_field_bp(bp, 89, 120);
 +	}
 +	/* Volume Set Size */
 +	set_num_723(bp+121, volume_set_size);
 +	/* Volume Sequence Number */
 +	set_num_723(bp+125, iso9660->volume_sequence_number);
 +	/* Logical Block Size */
 +	set_num_723(bp+129, LOGICAL_BLOCK_SIZE);
 +	/* Path Table Size */
 +	set_num_733(bp+133, vdd->path_table_size);
 +	/* Location of Occurrence of Type L Path Table */
 +	set_num_731(bp+141, vdd->location_type_L_path_table);
 +	/* Location of Optional Occurrence of Type L Path Table */
 +	set_num_731(bp+145, 0);
 +	/* Location of Occurrence of Type M Path Table */
 +	set_num_732(bp+149, vdd->location_type_M_path_table);
 +	/* Location of Optional Occurrence of Type M Path Table */
 +	set_num_732(bp+153, 0);
 +	/* Directory Record for Root Directory(BP 157 to 190) */
 +	set_directory_record(bp+157, 190-157+1, vdd->rootent,
 +	    iso9660, DIR_REC_VD, vdd->vdd_type);
 +	/* Volume Set Identifier */
 +	r = set_str_d_characters_bp(a, bp, 191, 318, "", vdc);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Publisher Identifier */
 +	r = set_file_identifier(bp, 319, 446, vdc, a, vdd,
 +	    &(iso9660->publisher_identifier),
 +	    "Publisher File", 1, A_CHAR);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Data Preparer Identifier */
 +	r = set_file_identifier(bp, 447, 574, vdc, a, vdd,
 +	    &(iso9660->data_preparer_identifier),
 +	    "Data Preparer File", 1, A_CHAR);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Application Identifier */
 +	r = set_file_identifier(bp, 575, 702, vdc, a, vdd,
 +	    &(iso9660->application_identifier),
 +	    "Application File", 1, A_CHAR);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Copyright File Identifier */
 +	r = set_file_identifier(bp, 703, 739, vdc, a, vdd,
 +	    &(iso9660->copyright_file_identifier),
 +	    "Copyright File", 0, D_CHAR);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Abstract File Identifier */
 +	r = set_file_identifier(bp, 740, 776, vdc, a, vdd,
 +	    &(iso9660->abstract_file_identifier),
 +	    "Abstract File", 0, D_CHAR);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Bibliongraphic File Identifier */
 +	r = set_file_identifier(bp, 777, 813, vdc, a, vdd,
 +	    &(iso9660->bibliographic_file_identifier),
 +	    "Bibliongraphic File", 0, D_CHAR);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* Volume Creation Date and Time */
 +	set_date_time(bp+814, iso9660->birth_time);
 +	/* Volume Modification Date and Time */
 +	set_date_time(bp+831, iso9660->birth_time);
 +	/* Volume Expiration Date and Time(obsolete) */
 +	set_date_time_null(bp+848);
 +	/* Volume Effective Date and Time */
 +	set_date_time(bp+865, iso9660->birth_time);
 +	/* File Structure Version */
 +	bp[882] = fst_ver;
 +	/* Reserved */
 +	bp[883] = 0;
 +	/* Application Use */
 +	memset(bp + 884, 0x20, 1395 - 884 + 1);
 +	/* Reserved */
 +	set_unused_field_bp(bp, 1396, LOGICAL_BLOCK_SIZE);
 +
 +	return (wb_consume(a, LOGICAL_BLOCK_SIZE));
 +}
 +
 +/*
 + * Write Boot Record Volume Descriptor
 + */
 +static int
 +write_VD_boot_record(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660;
 +	unsigned char *bp;
 +
 +	iso9660 = a->format_data;
 +	bp = wb_buffptr(a) -1;
 +	/* Volume Descriptor Type */
 +	set_VD_bp(bp, VDT_BOOT_RECORD, 1);
 +	/* Boot System Identifier */
 +	memcpy(bp+8, "EL TORITO SPECIFICATION", 23);
 +	set_unused_field_bp(bp, 8+23, 39);
 +	/* Unused */
 +	set_unused_field_bp(bp, 40, 71);
 +	/* Absolute pointer to first sector of Boot Catalog */
 +	set_num_731(bp+72,
 +	    iso9660->el_torito.catalog->file->content.location);
 +	/* Unused */
 +	set_unused_field_bp(bp, 76, LOGICAL_BLOCK_SIZE);
 +
 +	return (wb_consume(a, LOGICAL_BLOCK_SIZE));
 +}
 +
 +enum keytype {
 +	KEY_FLG,
 +	KEY_STR,
 +	KEY_INT,
 +	KEY_HEX
 +};
 +static void
 +set_option_info(struct archive_string *info, int *opt, const char *key,
 +    enum keytype type,  ...)
 +{
 +	va_list ap;
 +	char prefix;
 +	const char *s;
 +	int d;
 +
 +	prefix = (*opt==0)? ' ':',';
 +	va_start(ap, type);
 +	switch (type) {
 +	case KEY_FLG:
 +		d = va_arg(ap, int);
 +		archive_string_sprintf(info, "%c%s%s",
 +		    prefix, (d == 0)?"!":"", key);
 +		break;
 +	case KEY_STR:
 +		s = va_arg(ap, const char *);
 +		archive_string_sprintf(info, "%c%s=%s",
 +		    prefix, key, s);
 +		break;
 +	case KEY_INT:
 +		d = va_arg(ap, int);
 +		archive_string_sprintf(info, "%c%s=%d",
 +		    prefix, key, d);
 +		break;
 +	case KEY_HEX:
 +		d = va_arg(ap, int);
 +		archive_string_sprintf(info, "%c%s=%x",
 +		    prefix, key, d);
 +		break;
 +	}
 +	va_end(ap);
 +
 +	*opt = 1;
 +}
 +
 +/*
 + * Make Non-ISO File System Information
 + */
 +static int
 +write_information_block(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660;
 +	char buf[128];
 +	const char *v;
 +	int opt, r;
 +	struct archive_string info;
 +	size_t info_size = LOGICAL_BLOCK_SIZE *
 +			       NON_ISO_FILE_SYSTEM_INFORMATION_BLOCK;
 +
 +	iso9660 = (struct iso9660 *)a->format_data;
 +	if (info_size > wb_remaining(a)) {
 +		r = wb_write_out(a);
 +		if (r != ARCHIVE_OK)
 +			return (r);
 +	}
 +	archive_string_init(&info);
 +	if (archive_string_ensure(&info, info_size) == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	memset(info.s, 0, info_size);
 +	opt = 0;
 +#if defined(HAVE__CTIME64_S)
 +	_ctime64_s(buf, sizeof(buf), &(iso9660->birth_time));
 +#elif defined(HAVE_CTIME_R)
 +	ctime_r(&(iso9660->birth_time), buf);
 +#else
 +	strncpy(buf, ctime(&(iso9660->birth_time)), sizeof(buf)-1);
 +	buf[sizeof(buf)-1] = '\0';
 +#endif
 +	archive_string_sprintf(&info,
 +	    "INFO %s%s", buf, archive_version_string());
 +	if (iso9660->opt.abstract_file != OPT_ABSTRACT_FILE_DEFAULT)
 +		set_option_info(&info, &opt, "abstract-file",
 +		    KEY_STR, iso9660->abstract_file_identifier.s);
 +	if (iso9660->opt.application_id != OPT_APPLICATION_ID_DEFAULT)
 +		set_option_info(&info, &opt, "application-id",
 +		    KEY_STR, iso9660->application_identifier.s);
 +	if (iso9660->opt.allow_vernum != OPT_ALLOW_VERNUM_DEFAULT)
 +		set_option_info(&info, &opt, "allow-vernum",
 +		    KEY_FLG, iso9660->opt.allow_vernum);
 +	if (iso9660->opt.biblio_file != OPT_BIBLIO_FILE_DEFAULT)
 +		set_option_info(&info, &opt, "biblio-file",
 +		    KEY_STR, iso9660->bibliographic_file_identifier.s);
 +	if (iso9660->opt.boot != OPT_BOOT_DEFAULT)
 +		set_option_info(&info, &opt, "boot",
 +		    KEY_STR, iso9660->el_torito.boot_filename.s);
 +	if (iso9660->opt.boot_catalog != OPT_BOOT_CATALOG_DEFAULT)
 +		set_option_info(&info, &opt, "boot-catalog",
 +		    KEY_STR, iso9660->el_torito.catalog_filename.s);
 +	if (iso9660->opt.boot_info_table != OPT_BOOT_INFO_TABLE_DEFAULT)
 +		set_option_info(&info, &opt, "boot-info-table",
 +		    KEY_FLG, iso9660->opt.boot_info_table);
 +	if (iso9660->opt.boot_load_seg != OPT_BOOT_LOAD_SEG_DEFAULT)
 +		set_option_info(&info, &opt, "boot-load-seg",
 +		    KEY_HEX, iso9660->el_torito.boot_load_seg);
 +	if (iso9660->opt.boot_load_size != OPT_BOOT_LOAD_SIZE_DEFAULT)
 +		set_option_info(&info, &opt, "boot-load-size",
 +		    KEY_INT, iso9660->el_torito.boot_load_size);
 +	if (iso9660->opt.boot_type != OPT_BOOT_TYPE_DEFAULT) {
 +		v = "no-emulation";
 +		if (iso9660->opt.boot_type == OPT_BOOT_TYPE_FD)
 +			v = "fd";
 +		if (iso9660->opt.boot_type == OPT_BOOT_TYPE_HARD_DISK)
 +			v = "hard-disk";
 +		set_option_info(&info, &opt, "boot-type",
 +		    KEY_STR, v);
 +	}
 +#ifdef HAVE_ZLIB_H
 +	if (iso9660->opt.compression_level != OPT_COMPRESSION_LEVEL_DEFAULT)
 +		set_option_info(&info, &opt, "compression-level",
 +		    KEY_INT, iso9660->zisofs.compression_level);
 +#endif
 +	if (iso9660->opt.copyright_file != OPT_COPYRIGHT_FILE_DEFAULT)
 +		set_option_info(&info, &opt, "copyright-file",
 +		    KEY_STR, iso9660->copyright_file_identifier.s);
 +	if (iso9660->opt.iso_level != OPT_ISO_LEVEL_DEFAULT)
 +		set_option_info(&info, &opt, "iso-level",
 +		    KEY_INT, iso9660->opt.iso_level);
 +	if (iso9660->opt.joliet != OPT_JOLIET_DEFAULT) {
 +		if (iso9660->opt.joliet == OPT_JOLIET_LONGNAME)
 +			set_option_info(&info, &opt, "joliet",
 +			    KEY_STR, "long");
 +		else
 +			set_option_info(&info, &opt, "joliet",
 +			    KEY_FLG, iso9660->opt.joliet);
 +	}
 +	if (iso9660->opt.limit_depth != OPT_LIMIT_DEPTH_DEFAULT)
 +		set_option_info(&info, &opt, "limit-depth",
 +		    KEY_FLG, iso9660->opt.limit_depth);
 +	if (iso9660->opt.limit_dirs != OPT_LIMIT_DIRS_DEFAULT)
 +		set_option_info(&info, &opt, "limit-dirs",
 +		    KEY_FLG, iso9660->opt.limit_dirs);
 +	if (iso9660->opt.pad != OPT_PAD_DEFAULT)
 +		set_option_info(&info, &opt, "pad",
 +		    KEY_FLG, iso9660->opt.pad);
 +	if (iso9660->opt.publisher != OPT_PUBLISHER_DEFAULT)
 +		set_option_info(&info, &opt, "publisher",
 +		    KEY_STR, iso9660->publisher_identifier.s);
 +	if (iso9660->opt.rr != OPT_RR_DEFAULT) {
 +		if (iso9660->opt.rr == OPT_RR_DISABLED)
 +			set_option_info(&info, &opt, "rockridge",
 +			    KEY_FLG, iso9660->opt.rr);
 +		else if (iso9660->opt.rr == OPT_RR_STRICT)
 +			set_option_info(&info, &opt, "rockridge",
 +			    KEY_STR, "strict");
 +		else if (iso9660->opt.rr == OPT_RR_USEFUL)
 +			set_option_info(&info, &opt, "rockridge",
 +			    KEY_STR, "useful");
 +	}
 +	if (iso9660->opt.volume_id != OPT_VOLUME_ID_DEFAULT)
 +		set_option_info(&info, &opt, "volume-id",
 +		    KEY_STR, iso9660->volume_identifier.s);
 +	if (iso9660->opt.zisofs != OPT_ZISOFS_DEFAULT)
 +		set_option_info(&info, &opt, "zisofs",
 +		    KEY_FLG, iso9660->opt.zisofs);
 +
 +	memcpy(wb_buffptr(a), info.s, info_size);
 +	archive_string_free(&info);
 +	return (wb_consume(a, info_size));
 +}
 +
 +static int
 +write_rr_ER(struct archive_write *a)
 +{
 +	unsigned char *p;
 +
 +	p = wb_buffptr(a);
 +
 +	memset(p, 0, LOGICAL_BLOCK_SIZE);
 +	p[0] = 'E';
 +	p[1] = 'R';
 +	p[3] = 0x01;
 +	p[2] = RRIP_ER_SIZE;
 +	p[4] = RRIP_ER_ID_SIZE;
 +	p[5] = RRIP_ER_DSC_SIZE;
 +	p[6] = RRIP_ER_SRC_SIZE;
 +	p[7] = 0x01;
 +	memcpy(&p[8], rrip_identifier, p[4]);
 +	memcpy(&p[8+p[4]], rrip_descriptor, p[5]);
 +	memcpy(&p[8+p[4]+p[5]], rrip_source, p[6]);
 +
 +	return (wb_consume(a, LOGICAL_BLOCK_SIZE));
 +}
 +
 +static void
 +calculate_path_table_size(struct vdd *vdd)
 +{
 +	int depth, size;
 +	struct path_table *pt;
 +
 +	pt = vdd->pathtbl;
 +	size = 0;
 +	for (depth = 0; depth < vdd->max_depth; depth++) {
 +		struct isoent **ptbl;
 +		int i, cnt;
 +
 +		if ((cnt = pt[depth].cnt) == 0)
 +			break;
 +
 +		ptbl = pt[depth].sorted;
 +		for (i = 0; i < cnt; i++) {
 +			int len;
 +
 +			if (ptbl[i]->identifier == NULL)
 +				len = 1; /* root directory */
 +			else
 +				len = ptbl[i]->id_len;
 +			if (len & 0x01)
 +				len++; /* Padding Field */
 +			size += 8 + len;
 +		}
 +	}
 +	vdd->path_table_size = size;
 +	vdd->path_table_block =
 +	    ((size + PATH_TABLE_BLOCK_SIZE -1) /
 +	    PATH_TABLE_BLOCK_SIZE) *
 +	    (PATH_TABLE_BLOCK_SIZE / LOGICAL_BLOCK_SIZE);
 +}
 +
 +static int
 +_write_path_table(struct archive_write *a, int type_m, int depth,
 +    struct vdd *vdd)
 +{
 +	unsigned char *bp, *wb;
 +	struct isoent **ptbl;
 +	size_t wbremaining;
 +	int i, r, wsize;
 +
 +	if (vdd->pathtbl[depth].cnt == 0)
 +		return (0);
 +
 +	wsize = 0;
 +	wb = wb_buffptr(a);
 +	wbremaining = wb_remaining(a);
 +	bp = wb - 1;
 +	ptbl = vdd->pathtbl[depth].sorted;
 +	for (i = 0; i < vdd->pathtbl[depth].cnt; i++) {
 +		struct isoent *np;
 +		size_t len;
 +
 +		np = ptbl[i];
 +		if (np->identifier == NULL)
 +			len = 1; /* root directory */
 +		else
 +			len = np->id_len;
 +		if (wbremaining - ((bp+1) - wb) < (len + 1 + 8)) {
 +			r = wb_consume(a, (bp+1) - wb);
 +			if (r < 0)
 +				return (r);
 +			wb = wb_buffptr(a);
 +			wbremaining = wb_remaining(a);
 +			bp = wb -1;
 +		}
 +		/* Length of Directory Identifier */
 +		set_num_711(bp+1, (unsigned char)len);
 +		/* Extended Attribute Record Length */
 +		set_num_711(bp+2, 0);
 +		/* Location of Extent */
 +		if (type_m)
 +			set_num_732(bp+3, np->dir_location);
 +		else
 +			set_num_731(bp+3, np->dir_location);
 +		/* Parent Directory Number */
 +		if (type_m)
 +			set_num_722(bp+7, np->parent->dir_number);
 +		else
 +			set_num_721(bp+7, np->parent->dir_number);
 +		/* Directory Identifier */
 +		if (np->identifier == NULL)
 +			bp[9] = 0;
 +		else
 +			memcpy(&bp[9], np->identifier, len);
 +		if (len & 0x01) {
 +			/* Padding Field */
 +			bp[9+len] = 0;
 +			len++;
 +		}
 +		wsize += 8 + (int)len;
 +		bp += 8 + len;
 +	}
 +	if ((bp + 1) > wb) {
 +		r = wb_consume(a, (bp+1)-wb);
 +		if (r < 0)
 +			return (r);
 +	}
 +	return (wsize);
 +}
 +
 +static int
 +write_path_table(struct archive_write *a, int type_m, struct vdd *vdd)
 +{
 +	int depth, r;
 +	size_t path_table_size;
 +
 +	r = ARCHIVE_OK;
 +	path_table_size = 0;
 +	for (depth = 0; depth < vdd->max_depth; depth++) {
 +		r = _write_path_table(a, type_m, depth, vdd);
 +		if (r < 0)
 +			return (r);
 +		path_table_size += r;
 +	}
 +
 +	/* Write padding data. */
 +	path_table_size = path_table_size % PATH_TABLE_BLOCK_SIZE;
 +	if (path_table_size > 0)
 +		r = write_null(a, PATH_TABLE_BLOCK_SIZE - path_table_size);
 +	return (r);
 +}
 +
 +static int
 +calculate_directory_descriptors(struct iso9660 *iso9660, struct vdd *vdd,
 +    struct isoent *isoent, int depth)
 +{
 +	struct isoent **enttbl;
 +	int bs, block, i;
 +
 +	block = 1;
 +	bs = get_dir_rec_size(iso9660, isoent, DIR_REC_SELF, vdd->vdd_type);
 +	bs += get_dir_rec_size(iso9660, isoent, DIR_REC_PARENT, vdd->vdd_type);
 +
 +	if (isoent->children.cnt <= 0 || (vdd->vdd_type != VDD_JOLIET &&
 +	    !iso9660->opt.rr && depth + 1 >= vdd->max_depth))
 +		return (block);
 +
 +	enttbl = isoent->children_sorted;
 +	for (i = 0; i < isoent->children.cnt; i++) {
 +		struct isoent *np = enttbl[i];
 +		struct isofile *file;
 +
 +		file = np->file;
 +		if (file->hardlink_target != NULL)
 +			file = file->hardlink_target;
 +		file->cur_content = &(file->content);
 +		do {
 +			int dr_l;
 +
 +			dr_l = get_dir_rec_size(iso9660, np, DIR_REC_NORMAL,
 +			    vdd->vdd_type);
 +			if ((bs + dr_l) > LOGICAL_BLOCK_SIZE) {
 +				block ++;
 +				bs = dr_l;
 +			} else
 +				bs += dr_l;
 +			file->cur_content = file->cur_content->next;
 +		} while (file->cur_content != NULL);
 +	}
 +	return (block);
 +}
 +
 +static int
 +_write_directory_descriptors(struct archive_write *a, struct vdd *vdd,
 +    struct isoent *isoent, int depth)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isoent **enttbl;
 +	unsigned char *p, *wb;
 +	int i, r;
 +	int dr_l;
 +
 +	p = wb = wb_buffptr(a);
 +#define WD_REMAINING	(LOGICAL_BLOCK_SIZE - (p - wb))
 +	p += set_directory_record(p, WD_REMAINING, isoent,
 +	    iso9660, DIR_REC_SELF, vdd->vdd_type);
 +	p += set_directory_record(p, WD_REMAINING, isoent,
 +	    iso9660, DIR_REC_PARENT, vdd->vdd_type);
 +
 +	if (isoent->children.cnt <= 0 || (vdd->vdd_type != VDD_JOLIET &&
 +	    !iso9660->opt.rr && depth + 1 >= vdd->max_depth)) {
 +		memset(p, 0, WD_REMAINING);
 +		return (wb_consume(a, LOGICAL_BLOCK_SIZE));
 +	}
 +
 +	enttbl = isoent->children_sorted;
 +	for (i = 0; i < isoent->children.cnt; i++) {
 +		struct isoent *np = enttbl[i];
 +		struct isofile *file = np->file;
 +
 +		if (file->hardlink_target != NULL)
 +			file = file->hardlink_target;
 +		file->cur_content = &(file->content);
 +		do {
 +			dr_l = set_directory_record(p, WD_REMAINING,
 +			    np, iso9660, DIR_REC_NORMAL,
 +			    vdd->vdd_type);
 +			if (dr_l == 0) {
 +				memset(p, 0, WD_REMAINING);
 +				r = wb_consume(a, LOGICAL_BLOCK_SIZE);
 +				if (r < 0)
 +					return (r);
 +				p = wb = wb_buffptr(a);
 +				dr_l = set_directory_record(p,
 +				    WD_REMAINING, np, iso9660,
 +				    DIR_REC_NORMAL, vdd->vdd_type);
 +			}
 +			p += dr_l;
 +			file->cur_content = file->cur_content->next;
 +		} while (file->cur_content != NULL);
 +	}
 +	memset(p, 0, WD_REMAINING);
 +	return (wb_consume(a, LOGICAL_BLOCK_SIZE));
 +}
 +
 +static int
 +write_directory_descriptors(struct archive_write *a, struct vdd *vdd)
 +{
 +	struct isoent *np;
 +	int depth, r;
 +
 +	depth = 0;
 +	np = vdd->rootent;
 +	do {
 +		struct extr_rec *extr;
 +
 +		r = _write_directory_descriptors(a, vdd, np, depth);
 +		if (r < 0)
 +			return (r);
 +		if (vdd->vdd_type != VDD_JOLIET) {
 +			/*
 +			 * This extract record is used by SUSP,RRIP.
 +			 * Not for joliet.
 +			 */
 +			for (extr = np->extr_rec_list.first;
 +			    extr != NULL;
 +			    extr = extr->next) {
 +				unsigned char *wb;
 +
 +				wb = wb_buffptr(a);
 +				memcpy(wb, extr->buf, extr->offset);
 +				memset(wb + extr->offset, 0,
 +				    LOGICAL_BLOCK_SIZE - extr->offset);
 +				r = wb_consume(a, LOGICAL_BLOCK_SIZE);
 +				if (r < 0)
 +					return (r);
 +			}
 +		}
 +
 +		if (np->subdirs.first != NULL && depth + 1 < vdd->max_depth) {
 +			/* Enter to sub directories. */
 +			np = np->subdirs.first;
 +			depth++;
 +			continue;
 +		}
 +		while (np != np->parent) {
 +			if (np->drnext == NULL) {
 +				/* Return to the parent directory. */
 +				np = np->parent;
 +				depth--;
 +			} else {
 +				np = np->drnext;
 +				break;
 +			}
 +		}
 +	} while (np != np->parent);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Read file contents from the temporary file, and write it.
 + */
 +static int
 +write_file_contents(struct archive_write *a, int64_t offset, int64_t size)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	int r;
 +
 +	lseek(iso9660->temp_fd, offset, SEEK_SET);
 +
 +	while (size) {
 +		size_t rsize;
 +		ssize_t rs;
 +		unsigned char *wb;
 +
 +		wb = wb_buffptr(a);
 +		rsize = wb_remaining(a);
 +		if (rsize > (size_t)size)
 +			rsize = (size_t)size;
 +		rs = read(iso9660->temp_fd, wb, rsize);
 +		if (rs <= 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Can't read temporary file(%jd)", (intmax_t)rs);
 +			return (ARCHIVE_FATAL);
 +		}
 +		size -= rs;
 +		r = wb_consume(a, rs);
 +		if (r < 0)
 +			return (r);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +write_file_descriptors(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isofile *file;
 +	int64_t blocks, offset;
 +	int r;
 +
 +	blocks = 0;
 +	offset = 0;
 +
 +	/* Make the boot catalog contents, and write it. */
 +	if (iso9660->el_torito.catalog != NULL) {
 +		r = make_boot_catalog(a);
 +		if (r < 0)
 +			return (r);
 +	}
 +
 +	/* Write the boot file contents. */
 +	if (iso9660->el_torito.boot != NULL) {
 +		file = iso9660->el_torito.boot->file;
 +		blocks = file->content.blocks;
 +		offset = file->content.offset_of_temp;
 +		if (offset != 0) {
 +			r = write_file_contents(a, offset,
 +			    blocks << LOGICAL_BLOCK_BITS);
 +			if (r < 0)
 +				return (r);
 +			blocks = 0;
 +			offset = 0;
 +		}
 +	}
 +
 +	/* Write out all file contents. */
 +	for (file = iso9660->data_file_list.first;
 +	    file != NULL; file = file->datanext) {
 +
 +		if (!file->write_content)
 +			continue;
 +
 +		if ((offset + (blocks << LOGICAL_BLOCK_BITS)) <
 +		     file->content.offset_of_temp) {
 +			if (blocks > 0) {
 +				r = write_file_contents(a, offset,
 +				    blocks << LOGICAL_BLOCK_BITS);
 +				if (r < 0)
 +					return (r);
 +			}
 +			blocks = 0;
 +			offset = file->content.offset_of_temp;
 +		}
 +
 +		file->cur_content = &(file->content);
 +		do {
 +			blocks += file->cur_content->blocks;
 +			/* Next fragument */
 +			file->cur_content = file->cur_content->next;
 +		} while (file->cur_content != NULL);
 +	}
 +
 +	/* Flush out remaining blocks. */
 +	if (blocks > 0) {
 +		r = write_file_contents(a, offset,
 +		    blocks << LOGICAL_BLOCK_BITS);
 +		if (r < 0)
 +			return (r);
 +	}
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +isofile_init_entry_list(struct iso9660 *iso9660)
 +{
 +	iso9660->all_file_list.first = NULL;
 +	iso9660->all_file_list.last = &(iso9660->all_file_list.first);
 +}
 +
 +static void
 +isofile_add_entry(struct iso9660 *iso9660, struct isofile *file)
 +{
 +	file->allnext = NULL;
 +	*iso9660->all_file_list.last = file;
 +	iso9660->all_file_list.last = &(file->allnext);
 +}
 +
 +static void
 +isofile_free_all_entries(struct iso9660 *iso9660)
 +{
 +	struct isofile *file, *file_next;
 +
 +	file = iso9660->all_file_list.first;
 +	while (file != NULL) {
 +		file_next = file->allnext;
 +		isofile_free(file);
 +		file = file_next;
 +	}
 +}
 +
 +static void
 +isofile_init_entry_data_file_list(struct iso9660 *iso9660)
 +{
 +	iso9660->data_file_list.first = NULL;
 +	iso9660->data_file_list.last = &(iso9660->data_file_list.first);
 +}
 +
 +static void
 +isofile_add_data_file(struct iso9660 *iso9660, struct isofile *file)
 +{
 +	file->datanext = NULL;
 +	*iso9660->data_file_list.last = file;
 +	iso9660->data_file_list.last = &(file->datanext);
 +}
 +
 +
 +static struct isofile *
 +isofile_new(struct archive_write *a, struct archive_entry *entry)
 +{
 +	struct isofile *file;
 +
 +	file = calloc(1, sizeof(*file));
 +	if (file == NULL)
 +		return (NULL);
 +
 +	if (entry != NULL)
 +		file->entry = archive_entry_clone(entry);
 +	else
 +		file->entry = archive_entry_new2(&a->archive);
 +	if (file->entry == NULL) {
 +		free(file);
 +		return (NULL);
 +	}
 +	archive_string_init(&(file->parentdir));
 +	archive_string_init(&(file->basename));
 +	archive_string_init(&(file->basename_utf16));
 +	archive_string_init(&(file->symlink));
 +	file->cur_content = &(file->content);
 +
 +	return (file);
 +}
 +
 +static void
 +isofile_free(struct isofile *file)
 +{
 +	struct content *con, *tmp;
 +
 +	con = file->content.next;
 +	while (con != NULL) {
 +		tmp = con;
 +		con = con->next;
 +		free(tmp);
 +	}
 +	archive_entry_free(file->entry);
 +	archive_string_free(&(file->parentdir));
 +	archive_string_free(&(file->basename));
 +	archive_string_free(&(file->basename_utf16));
 +	archive_string_free(&(file->symlink));
 +	free(file);
 +}
 +
 +#if defined(_WIN32) || defined(__CYGWIN__)
 +static int
 +cleanup_backslash_1(char *p)
 +{
 +	int mb, dos;
 +
 +	mb = dos = 0;
 +	while (*p) {
 +		if (*(unsigned char *)p > 127)
 +			mb = 1;
 +		if (*p == '\\') {
 +			/* If we have not met any multi-byte characters,
 +			 * we can replace '\' with '/'. */
 +			if (!mb)
 +				*p = '/';
 +			dos = 1;
 +		}
 +		p++;
 +	}
 +	if (!mb || !dos)
 +		return (0);
 +	return (-1);
 +}
 +
 +static void
 +cleanup_backslash_2(wchar_t *p)
 +{
 +
 +	/* Convert a path-separator from '\' to  '/' */
 +	while (*p != L'\0') {
 +		if (*p == L'\\')
 +			*p = L'/';
 +		p++;
 +	}
 +}
 +#endif
 +
 +/*
 + * Generate a parent directory name and a base name from a pathname.
 + */
 +static int
 +isofile_gen_utility_names(struct archive_write *a, struct isofile *file)
 +{
 +	struct iso9660 *iso9660;
 +	const char *pathname;
 +	char *p, *dirname, *slash;
 +	size_t len;
 +	int ret = ARCHIVE_OK;
 +
 +	iso9660 = a->format_data;
 +
 +	archive_string_empty(&(file->parentdir));
 +	archive_string_empty(&(file->basename));
 +	archive_string_empty(&(file->basename_utf16));
 +	archive_string_empty(&(file->symlink));
 +
 +	pathname =  archive_entry_pathname(file->entry);
 +	if (pathname == NULL || pathname[0] == '\0') {/* virtual root */
 +		file->dircnt = 0;
 +		return (ret);
 +	}
 +
 +	/*
 +	 * Make a UTF-16BE basename if Joliet extension enabled.
 +	 */
 +	if (iso9660->opt.joliet) {
 +		const char *u16, *ulast;
 +		size_t u16len, ulen_last;
 +
 +		if (iso9660->sconv_to_utf16be == NULL) {
 +			iso9660->sconv_to_utf16be =
 +			    archive_string_conversion_to_charset(
 +				&(a->archive), "UTF-16BE", 1);
 +			if (iso9660->sconv_to_utf16be == NULL)
 +				/* Couldn't allocate memory */
 +				return (ARCHIVE_FATAL);
 +			iso9660->sconv_from_utf16be =
 +			    archive_string_conversion_from_charset(
 +				&(a->archive), "UTF-16BE", 1);
 +			if (iso9660->sconv_from_utf16be == NULL)
 +				/* Couldn't allocate memory */
 +				return (ARCHIVE_FATAL);
 +		}
 +
 +		/*
 +		 * Converte a filename to UTF-16BE.
 +		 */
 +		if (0 > archive_entry_pathname_l(file->entry, &u16, &u16len,
 +		    iso9660->sconv_to_utf16be)) {
 +			if (errno == ENOMEM) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory for UTF-16BE");
 +				return (ARCHIVE_FATAL);
 +			}
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "A filename cannot be converted to UTF-16BE;"
 +			    "You should disable making Joliet extension");
 +			ret = ARCHIVE_WARN;
 +		}
 +
 +		/*
 +		 * Make sure a path separator is not in the last;
 +		 * Remove trailing '/'.
 +		 */
 +		while (u16len >= 2) {
 +#if defined(_WIN32) || defined(__CYGWIN__)
 +			if (u16[u16len-2] == 0 &&
 +			    (u16[u16len-1] == '/' || u16[u16len-1] == '\\'))
 +#else
 +			if (u16[u16len-2] == 0 && u16[u16len-1] == '/')
 +#endif
 +			{
 +				u16len -= 2;
 +			} else
 +				break;
 +		}
 +
 +		/*
 +		 * Find a basename in UTF-16BE.
 +		 */
 +		ulast = u16;
 +		u16len >>= 1;
 +		ulen_last = u16len;
 +		while (u16len > 0) {
 +#if defined(_WIN32) || defined(__CYGWIN__)
 +			if (u16[0] == 0 && (u16[1] == '/' || u16[1] == '\\'))
 +#else
 +			if (u16[0] == 0 && u16[1] == '/')
 +#endif
 +			{
 +				ulast = u16 + 2;
 +				ulen_last = u16len -1;
 +			}
 +			u16 += 2;
 +			u16len --;
 +		}
 +		ulen_last <<= 1;
 +		if (archive_string_ensure(&(file->basename_utf16),
 +		    ulen_last) == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for UTF-16BE");
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		/*
 +		 * Set UTF-16BE basename.
 +		 */
 +		memcpy(file->basename_utf16.s, ulast, ulen_last);
 +		file->basename_utf16.length = ulen_last;
 +	}
 +
 +	archive_strcpy(&(file->parentdir), pathname);
 +#if defined(_WIN32) || defined(__CYGWIN__)
 +	/*
 +	 * Convert a path-separator from '\' to  '/'
 +	 */
 +	if (cleanup_backslash_1(file->parentdir.s) != 0) {
 +		const wchar_t *wp = archive_entry_pathname_w(file->entry);
 +		struct archive_wstring ws;
 +
 +		if (wp != NULL) {
 +			int r;
 +			archive_string_init(&ws);
 +			archive_wstrcpy(&ws, wp);
 +			cleanup_backslash_2(ws.s);
 +			archive_string_empty(&(file->parentdir));
 +			r = archive_string_append_from_wcs(&(file->parentdir),
 +			    ws.s, ws.length);
 +			archive_wstring_free(&ws);
 +			if (r < 0 && errno == ENOMEM) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory");
 +				return (ARCHIVE_FATAL);
 +			}
 +		}
 +	}
 +#endif
 +
 +	len = file->parentdir.length;
 +	p = dirname = file->parentdir.s;
 +
 +	/*
 +	 * Remove leading '/', '../' and './' elements
 +	 */
 +	while (*p) {
 +		if (p[0] == '/') {
 +			p++;
 +			len--;
 +		} else if (p[0] != '.')
 +			break;
 +		else if (p[1] == '.' && p[2] == '/') {
 +			p += 3;
 +			len -= 3;
 +		} else if (p[1] == '/' || (p[1] == '.' && p[2] == '\0')) {
 +			p += 2;
 +			len -= 2;
 +		} else if (p[1] == '\0') {
 +			p++;
 +			len--;
 +		} else
 +			break;
 +	}
 +	if (p != dirname) {
 +		memmove(dirname, p, len+1);
 +		p = dirname;
 +	}
 +	/*
 +	 * Remove "/","/." and "/.." elements from tail.
 +	 */
 +	while (len > 0) {
 +		size_t ll = len;
 +
 +		if (len > 0 && p[len-1] == '/') {
 +			p[len-1] = '\0';
 +			len--;
 +		}
 +		if (len > 1 && p[len-2] == '/' && p[len-1] == '.') {
 +			p[len-2] = '\0';
 +			len -= 2;
 +		}
 +		if (len > 2 && p[len-3] == '/' && p[len-2] == '.' &&
 +		    p[len-1] == '.') {
 +			p[len-3] = '\0';
 +			len -= 3;
 +		}
 +		if (ll == len)
 +			break;
 +	}
 +	while (*p) {
 +		if (p[0] == '/') {
 +			if (p[1] == '/')
 +				/* Convert '//' --> '/' */
 +				strcpy(p, p+1);
 +			else if (p[1] == '.' && p[2] == '/')
 +				/* Convert '/./' --> '/' */
 +				strcpy(p, p+2);
 +			else if (p[1] == '.' && p[2] == '.' && p[3] == '/') {
 +				/* Convert 'dir/dir1/../dir2/'
 +				 *     --> 'dir/dir2/'
 +				 */
 +				char *rp = p -1;
 +				while (rp >= dirname) {
 +					if (*rp == '/')
 +						break;
 +					--rp;
 +				}
 +				if (rp > dirname) {
 +					strcpy(rp, p+3);
 +					p = rp;
 +				} else {
 +					strcpy(dirname, p+4);
 +					p = dirname;
 +				}
 +			} else
 +				p++;
 +		} else
 +			p++;
 +	}
 +	p = dirname;
 +	len = strlen(p);
 +
 +	if (archive_entry_filetype(file->entry) == AE_IFLNK) {
 +		/* Convert symlink name too. */
 +		pathname = archive_entry_symlink(file->entry);
 +		archive_strcpy(&(file->symlink),  pathname);
 +#if defined(_WIN32) || defined(__CYGWIN__)
 +		/*
 +		 * Convert a path-separator from '\' to  '/'
 +		 */
 +		if (archive_strlen(&(file->symlink)) > 0 &&
 +		    cleanup_backslash_1(file->symlink.s) != 0) {
 +			const wchar_t *wp =
 +			    archive_entry_symlink_w(file->entry);
 +			struct archive_wstring ws;
 +
 +			if (wp != NULL) {
 +				int r;
 +				archive_string_init(&ws);
 +				archive_wstrcpy(&ws, wp);
 +				cleanup_backslash_2(ws.s);
 +				archive_string_empty(&(file->symlink));
 +				r = archive_string_append_from_wcs(
 +				    &(file->symlink),
 +				    ws.s, ws.length);
 +				archive_wstring_free(&ws);
 +				if (r < 0 && errno == ENOMEM) {
 +					archive_set_error(&a->archive, ENOMEM,
 +					    "Can't allocate memory");
 +					return (ARCHIVE_FATAL);
 +				}
 +			}
 +		}
 +#endif
 +	}
 +	/*
 +	 * - Count up directory elements.
 +	 * - Find out the position which points the last position of
 +	 *   path separator('/').
 +	 */
 +	slash = NULL;
 +	file->dircnt = 0;
 +	for (; *p != '\0'; p++)
 +		if (*p == '/') {
 +			slash = p;
 +			file->dircnt++;
 +		}
 +	if (slash == NULL) {
 +		/* The pathname doesn't have a parent directory. */
 +		file->parentdir.length = len;
 +		archive_string_copy(&(file->basename), &(file->parentdir));
 +		archive_string_empty(&(file->parentdir));
 +		*file->parentdir.s = '\0';
 +		return (ret);
 +	}
 +
 +	/* Make a basename from dirname and slash */
 +	*slash  = '\0';
 +	file->parentdir.length = slash - dirname;
 +	archive_strcpy(&(file->basename),  slash + 1);
 +	if (archive_entry_filetype(file->entry) == AE_IFDIR)
 +		file->dircnt ++;
 +	return (ret);
 +}
 +
 +/*
 + * Register a entry to get a hardlink target.
 + */
 +static int
 +isofile_register_hardlink(struct archive_write *a, struct isofile *file)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct hardlink *hl;
 +	const char *pathname;
 +
 +	archive_entry_set_nlink(file->entry, 1);
 +	pathname = archive_entry_hardlink(file->entry);
 +	if (pathname == NULL) {
 +		/* This `file` is a hardlink target. */
 +		hl = malloc(sizeof(*hl));
 +		if (hl == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		hl->nlink = 1;
 +		/* A hardlink target must be the first position. */
 +		file->hlnext = NULL;
 +		hl->file_list.first = file;
 +		hl->file_list.last = &(file->hlnext);
 +		__archive_rb_tree_insert_node(&(iso9660->hardlink_rbtree),
 +		    (struct archive_rb_node *)hl);
 +	} else {
 +		hl = (struct hardlink *)__archive_rb_tree_find_node(
 +		    &(iso9660->hardlink_rbtree), pathname);
 +		if (hl != NULL) {
 +			/* Insert `file` entry into the tail. */
 +			file->hlnext = NULL;
 +			*hl->file_list.last = file;
 +			hl->file_list.last = &(file->hlnext);
 +			hl->nlink++;
 +		}
 +		archive_entry_unset_size(file->entry);
 +	}
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Hardlinked files have to have the same location of extent.
 + * We have to find out hardlink target entries for the entries
 + * which have a hardlink target name.
 + */
 +static void
 +isofile_connect_hardlink_files(struct iso9660 *iso9660)
 +{
 +	struct archive_rb_node *n;
 +	struct hardlink *hl;
 +	struct isofile *target, *nf;
 +
 +	ARCHIVE_RB_TREE_FOREACH(n, &(iso9660->hardlink_rbtree)) {
 +		hl = (struct hardlink *)n;
 +
 +		/* The first entry must be a hardlink target. */
 +		target = hl->file_list.first;
 +		archive_entry_set_nlink(target->entry, hl->nlink);
 +		/* Set a hardlink target to reference entries. */
 +		for (nf = target->hlnext;
 +		    nf != NULL; nf = nf->hlnext) {
 +			nf->hardlink_target = target;
 +			archive_entry_set_nlink(nf->entry, hl->nlink);
 +		}
 +	}
 +}
 +
 +static int
 +isofile_hd_cmp_node(const struct archive_rb_node *n1,
 +    const struct archive_rb_node *n2)
 +{
 +	const struct hardlink *h1 = (const struct hardlink *)n1;
 +	const struct hardlink *h2 = (const struct hardlink *)n2;
 +
 +	return (strcmp(archive_entry_pathname(h1->file_list.first->entry),
 +		       archive_entry_pathname(h2->file_list.first->entry)));
 +}
 +
 +static int
 +isofile_hd_cmp_key(const struct archive_rb_node *n, const void *key)
 +{
 +	const struct hardlink *h = (const struct hardlink *)n;
 +
 +	return (strcmp(archive_entry_pathname(h->file_list.first->entry),
 +		       (const char *)key));
 +}
 +
 +static void
 +isofile_init_hardlinks(struct iso9660 *iso9660)
 +{
 +	static const struct archive_rb_tree_ops rb_ops = {
 +		isofile_hd_cmp_node, isofile_hd_cmp_key,
 +	};
 +
 +	__archive_rb_tree_init(&(iso9660->hardlink_rbtree), &rb_ops);
 +}
 +
 +static void
 +isofile_free_hardlinks(struct iso9660 *iso9660)
 +{
 +	struct archive_rb_node *n, *next;
 +
 +	for (n = ARCHIVE_RB_TREE_MIN(&(iso9660->hardlink_rbtree)); n;) {
 +		next = __archive_rb_tree_iterate(&(iso9660->hardlink_rbtree),
 +		    n, ARCHIVE_RB_DIR_RIGHT);
 +		free(n);
 +		n = next;
 +	}
 +}
 +
 +static struct isoent *
 +isoent_new(struct isofile *file)
 +{
 +	struct isoent *isoent;
 +	static const struct archive_rb_tree_ops rb_ops = {
 +		isoent_cmp_node, isoent_cmp_key,
 +	};
 +
 +	isoent = calloc(1, sizeof(*isoent));
 +	if (isoent == NULL)
 +		return (NULL);
 +	isoent->file = file;
 +	isoent->children.first = NULL;
 +	isoent->children.last = &(isoent->children.first);
 +	__archive_rb_tree_init(&(isoent->rbtree), &rb_ops);
 +	isoent->subdirs.first = NULL;
 +	isoent->subdirs.last = &(isoent->subdirs.first);
 +	isoent->extr_rec_list.first = NULL;
 +	isoent->extr_rec_list.last = &(isoent->extr_rec_list.first);
 +	isoent->extr_rec_list.current = NULL;
 +	if (archive_entry_filetype(file->entry) == AE_IFDIR)
 +		isoent->dir = 1;
 +
 +	return (isoent);
 +}
 +
 +static inline struct isoent *
 +isoent_clone(struct isoent *src)
 +{
 +	return (isoent_new(src->file));
 +}
 +
 +static void
 +_isoent_free(struct isoent *isoent)
 +{
 +	struct extr_rec *er, *er_next;
 +
 +	free(isoent->children_sorted);
 +	free(isoent->identifier);
 +	er = isoent->extr_rec_list.first;
 +	while (er != NULL) {
 +		er_next = er->next;
 +		free(er);
 +		er = er_next;
 +	}
 +	free(isoent);
 +}
 +
 +static void
 +isoent_free_all(struct isoent *isoent)
 +{
 +	struct isoent *np, *np_temp;
 +
 +	if (isoent == NULL)
 +		return;
 +	np = isoent;
 +	for (;;) {
 +		if (np->dir) {
 +			if (np->children.first != NULL) {
 +				/* Enter to sub directories. */
 +				np = np->children.first;
 +				continue;
 +			}
 +		}
 +		for (;;) {
 +			np_temp = np;
 +			if (np->chnext == NULL) {
 +				/* Return to the parent directory. */
 +				np = np->parent;
 +				_isoent_free(np_temp);
 +				if (np == np_temp)
 +					return;
 +			} else {
 +				np = np->chnext;
 +				_isoent_free(np_temp);
 +				break;
 +			}
 +		}
 +	}
 +}
 +
 +static struct isoent *
 +isoent_create_virtual_dir(struct archive_write *a, struct iso9660 *iso9660, const char *pathname)
 +{
 +	struct isofile *file;
 +	struct isoent *isoent;
 +
 +	file = isofile_new(a, NULL);
 +	if (file == NULL)
 +		return (NULL);
 +	archive_entry_set_pathname(file->entry, pathname);
 +	archive_entry_unset_mtime(file->entry);
 +	archive_entry_unset_atime(file->entry);
 +	archive_entry_unset_ctime(file->entry);
 +	archive_entry_set_uid(file->entry, getuid());
 +	archive_entry_set_gid(file->entry, getgid());
 +	archive_entry_set_mode(file->entry, 0555 | AE_IFDIR);
 +	archive_entry_set_nlink(file->entry, 2);
 +	if (isofile_gen_utility_names(a, file) < ARCHIVE_WARN) {
 +		isofile_free(file);
 +		return (NULL);
 +	}
 +	isofile_add_entry(iso9660, file);
 +
 +	isoent = isoent_new(file);
 +	if (isoent == NULL)
 +		return (NULL);
 +	isoent->dir = 1;
 +	isoent->virtual = 1;
 +
 +	return (isoent);
 +}
 +
 +static int
 +isoent_cmp_node(const struct archive_rb_node *n1,
 +    const struct archive_rb_node *n2)
 +{
 +	const struct isoent *e1 = (const struct isoent *)n1;
 +	const struct isoent *e2 = (const struct isoent *)n2;
 +
 +	return (strcmp(e1->file->basename.s, e2->file->basename.s));
 +}
 +
 +static int
 +isoent_cmp_key(const struct archive_rb_node *n, const void *key)
 +{
 +	const struct isoent *e = (const struct isoent *)n;
 +
 +	return (strcmp(e->file->basename.s, (const char *)key));
 +}
 +
 +static int
 +isoent_add_child_head(struct isoent *parent, struct isoent *child)
 +{
 +
 +	if (!__archive_rb_tree_insert_node(
 +	    &(parent->rbtree), (struct archive_rb_node *)child))
 +		return (0);
 +	if ((child->chnext = parent->children.first) == NULL)
 +		parent->children.last = &(child->chnext);
 +	parent->children.first = child;
 +	parent->children.cnt++;
 +	child->parent = parent;
 +
 +	/* Add a child to a sub-directory chain */
 +	if (child->dir) {
 +		if ((child->drnext = parent->subdirs.first) == NULL)
 +			parent->subdirs.last = &(child->drnext);
 +		parent->subdirs.first = child;
 +		parent->subdirs.cnt++;
 +		child->parent = parent;
 +	} else
 +		child->drnext = NULL;
 +	return (1);
 +}
 +
 +static int
 +isoent_add_child_tail(struct isoent *parent, struct isoent *child)
 +{
 +
 +	if (!__archive_rb_tree_insert_node(
 +	    &(parent->rbtree), (struct archive_rb_node *)child))
 +		return (0);
 +	child->chnext = NULL;
 +	*parent->children.last = child;
 +	parent->children.last = &(child->chnext);
 +	parent->children.cnt++;
 +	child->parent = parent;
 +
 +	/* Add a child to a sub-directory chain */
 +	child->drnext = NULL;
 +	if (child->dir) {
 +		*parent->subdirs.last = child;
 +		parent->subdirs.last = &(child->drnext);
 +		parent->subdirs.cnt++;
 +		child->parent = parent;
 +	}
 +	return (1);
 +}
 +
 +static void
 +isoent_remove_child(struct isoent *parent, struct isoent *child)
 +{
 +	struct isoent *ent;
 +
 +	/* Remove a child entry from children chain. */
 +	ent = parent->children.first;
 +	while (ent->chnext != child)
 +		ent = ent->chnext;
 +	if ((ent->chnext = ent->chnext->chnext) == NULL)
 +		parent->children.last = &(ent->chnext);
 +	parent->children.cnt--;
 +
 +	if (child->dir) {
 +		/* Remove a child entry from sub-directory chain. */
 +		ent = parent->subdirs.first;
 +		while (ent->drnext != child)
 +			ent = ent->drnext;
 +		if ((ent->drnext = ent->drnext->drnext) == NULL)
 +			parent->subdirs.last = &(ent->drnext);
 +		parent->subdirs.cnt--;
 +	}
 +
 +	__archive_rb_tree_remove_node(&(parent->rbtree),
 +	    (struct archive_rb_node *)child);
 +}
 +
 +static int
 +isoent_clone_tree(struct archive_write *a, struct isoent **nroot,
 +    struct isoent *root)
 +{
 +	struct isoent *np, *xroot, *newent;
 +
 +	np = root;
 +	xroot = NULL;
 +	do {
 +		newent = isoent_clone(np);
 +		if (newent == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		if (xroot == NULL) {
 +			*nroot = xroot = newent;
 +			newent->parent = xroot;
 +		} else
 +			isoent_add_child_tail(xroot, newent);
 +		if (np->dir && np->children.first != NULL) {
 +			/* Enter to sub directories. */
 +			np = np->children.first;
 +			xroot = newent;
 +			continue;
 +		}
 +		while (np != np->parent) {
 +			if (np->chnext == NULL) {
 +				/* Return to the parent directory. */
 +				np = np->parent;
 +				xroot = xroot->parent;
 +			} else {
 +				np = np->chnext;
 +				break;
 +			}
 +		}
 +	} while (np != np->parent);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Setup directory locations.
 + */
 +static void
 +isoent_setup_directory_location(struct iso9660 *iso9660, int location,
 +    struct vdd *vdd)
 +{
 +	struct isoent *np;
 +	int depth;
 +
 +	vdd->total_dir_block = 0;
 +	depth = 0;
 +	np = vdd->rootent;
 +	do {
 +		int block;
 +
 +		np->dir_block = calculate_directory_descriptors(
 +		    iso9660, vdd, np, depth);
 +		vdd->total_dir_block += np->dir_block;
 +		np->dir_location = location;
 +		location += np->dir_block;
 +		block = extra_setup_location(np, location);
 +		vdd->total_dir_block += block;
 +		location += block;
 +
 +		if (np->subdirs.first != NULL && depth + 1 < vdd->max_depth) {
 +			/* Enter to sub directories. */
 +			np = np->subdirs.first;
 +			depth++;
 +			continue;
 +		}
 +		while (np != np->parent) {
 +			if (np->drnext == NULL) {
 +				/* Return to the parent directory. */
 +				np = np->parent;
 +				depth--;
 +			} else {
 +				np = np->drnext;
 +				break;
 +			}
 +		}
 +	} while (np != np->parent);
 +}
 +
 +static void
 +_isoent_file_location(struct iso9660 *iso9660, struct isoent *isoent,
 +    int *symlocation)
 +{
 +	struct isoent **children;
 +	int n;
 +
 +	if (isoent->children.cnt == 0)
 +		return;
 +
 +	children = isoent->children_sorted;
 +	for (n = 0; n < isoent->children.cnt; n++) {
 +		struct isoent *np;
 +		struct isofile *file;
 +
 +		np = children[n];
 +		if (np->dir)
 +			continue;
 +		if (np == iso9660->el_torito.boot)
 +			continue;
 +		file = np->file;
 +		if (file->boot || file->hardlink_target != NULL)
 +			continue;
 +		if (archive_entry_filetype(file->entry) == AE_IFLNK ||
 +		    file->content.size == 0) {
 +			/*
 +			 * Do not point a valid location.
 +			 * Make sure entry is not hardlink file.
 +			 */
 +			file->content.location = (*symlocation)--;
 +			continue;
 +		}
 +
 +		file->write_content = 1;
 +	}
 +}
 +
 +/*
 + * Setup file locations.
 + */
 +static void
 +isoent_setup_file_location(struct iso9660 *iso9660, int location)
 +{
 +	struct isoent *isoent;
 +	struct isoent *np;
 +	struct isofile *file;
 +	size_t size;
 +	int block;
 +	int depth;
 +	int joliet;
 +	int symlocation;
 +	int total_block;
 +
 +	iso9660->total_file_block = 0;
 +	if ((isoent = iso9660->el_torito.catalog) != NULL) {
 +		isoent->file->content.location = location;
 +		block = (int)((archive_entry_size(isoent->file->entry) +
 +		    LOGICAL_BLOCK_SIZE -1) >> LOGICAL_BLOCK_BITS);
 +		location += block;
 +		iso9660->total_file_block += block;
 +	}
 +	if ((isoent = iso9660->el_torito.boot) != NULL) {
 +		isoent->file->content.location = location;
 +		size = fd_boot_image_size(iso9660->el_torito.media_type);
 +		if (size == 0)
 +			size = (size_t)archive_entry_size(isoent->file->entry);
 +		block = ((int)size + LOGICAL_BLOCK_SIZE -1)
 +		    >> LOGICAL_BLOCK_BITS;
 +		location += block;
 +		iso9660->total_file_block += block;
 +		isoent->file->content.blocks = block;
 +	}
 +
 +	depth = 0;
 +	symlocation = -16;
 +	if (!iso9660->opt.rr && iso9660->opt.joliet) {
 +		joliet = 1;
 +		np = iso9660->joliet.rootent;
 +	} else {
 +		joliet = 0;
 +		np = iso9660->primary.rootent;
 +	}
 +	do {
 +		_isoent_file_location(iso9660, np, &symlocation);
 +
 +		if (np->subdirs.first != NULL &&
 +		    (joliet ||
 +		    ((iso9660->opt.rr == OPT_RR_DISABLED &&
 +		      depth + 2 < iso9660->primary.max_depth) ||
 +		     (iso9660->opt.rr &&
 +		      depth + 1 < iso9660->primary.max_depth)))) {
 +			/* Enter to sub directories. */
 +			np = np->subdirs.first;
 +			depth++;
 +			continue;
 +		}
 +		while (np != np->parent) {
 +			if (np->drnext == NULL) {
 +				/* Return to the parent directory. */
 +				np = np->parent;
 +				depth--;
 +			} else {
 +				np = np->drnext;
 +				break;
 +			}
 +		}
 +	} while (np != np->parent);
 +
 +	total_block = 0;
 +	for (file = iso9660->data_file_list.first;
 +	    file != NULL; file = file->datanext) {
 +
 +		if (!file->write_content)
 +			continue;
 +
 +		file->cur_content = &(file->content);
 +		do {
 +			file->cur_content->location = location;
 +			location += file->cur_content->blocks;
 +			total_block += file->cur_content->blocks;
 +			/* Next fragument */
 +			file->cur_content = file->cur_content->next;
 +		} while (file->cur_content != NULL);
 +	}
 +	iso9660->total_file_block += total_block;
 +}
 +
 +static int
 +get_path_component(char *name, size_t n, const char *fn)
 +{
 +	char *p;
 +	size_t l;
 +
 +	p = strchr(fn, '/');
 +	if (p == NULL) {
 +		if ((l = strlen(fn)) == 0)
 +			return (0);
 +	} else
 +		l = p - fn;
 +	if (l > n -1)
 +		return (-1);
 +	memcpy(name, fn, l);
 +	name[l] = '\0';
 +
 +	return ((int)l);
 +}
 +
 +/*
 + * Add a new entry into the tree.
 + */
 +static int
 +isoent_tree(struct archive_write *a, struct isoent **isoentpp)
 +{
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +	char name[_MAX_FNAME];/* Included null terminator size. */
 +#elif defined(NAME_MAX) && NAME_MAX >= 255
 +	char name[NAME_MAX+1];
 +#else
 +	char name[256];
 +#endif
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isoent *dent, *isoent, *np;
 +	struct isofile *f1, *f2;
 +	const char *fn, *p;
 +	int l;
 +
 +	isoent = *isoentpp;
 +	dent = iso9660->primary.rootent;
 +	if (isoent->file->parentdir.length > 0)
 +		fn = p = isoent->file->parentdir.s;
 +	else
 +		fn = p = "";
 +
 +	/*
 +	 * If the path of the parent directory of `isoent' entry is
 +	 * the same as the path of `cur_dirent', add isoent to
 +	 * `cur_dirent'.
 +	 */
 +	if (archive_strlen(&(iso9660->cur_dirstr))
 +	      == archive_strlen(&(isoent->file->parentdir)) &&
 +	    strcmp(iso9660->cur_dirstr.s, fn) == 0) {
 +		if (!isoent_add_child_tail(iso9660->cur_dirent, isoent)) {
 +			np = (struct isoent *)__archive_rb_tree_find_node(
 +			    &(iso9660->cur_dirent->rbtree),
 +			    isoent->file->basename.s);
 +			goto same_entry;
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +
 +	for (;;) {
 +		l = get_path_component(name, sizeof(name), fn);
 +		if (l == 0) {
 +			np = NULL;
 +			break;
 +		}
 +		if (l < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "A name buffer is too small");
 +			_isoent_free(isoent);
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		np = isoent_find_child(dent, name);
 +		if (np == NULL || fn[0] == '\0')
 +			break;
 +
 +		/* Find next subdirectory. */
 +		if (!np->dir) {
 +			/* NOT Directory! */
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "`%s' is not directory, we cannot insert `%s' ",
 +			    archive_entry_pathname(np->file->entry),
 +			    archive_entry_pathname(isoent->file->entry));
 +			_isoent_free(isoent);
 +			*isoentpp = NULL;
 +			return (ARCHIVE_FAILED);
 +		}
 +		fn += l;
 +		if (fn[0] == '/')
 +			fn++;
 +		dent = np;
 +	}
 +	if (np == NULL) {
 +		/*
 +		 * Create virtual parent directories.
 +		 */
 +		while (fn[0] != '\0') {
 +			struct isoent *vp;
 +			struct archive_string as;
 +
 +			archive_string_init(&as);
 +			archive_strncat(&as, p, fn - p + l);
 +			if (as.s[as.length-1] == '/') {
 +				as.s[as.length-1] = '\0';
 +				as.length--;
 +			}
 +			vp = isoent_create_virtual_dir(a, iso9660, as.s);
 +			if (vp == NULL) {
 +				archive_string_free(&as);
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory");
 +				_isoent_free(isoent);
 +				*isoentpp = NULL;
 +				return (ARCHIVE_FATAL);
 +			}
 +			archive_string_free(&as);
 +
 +			if (vp->file->dircnt > iso9660->dircnt_max)
 +				iso9660->dircnt_max = vp->file->dircnt;
 +			isoent_add_child_tail(dent, vp);
 +			np = vp;
 +
 +			fn += l;
 +			if (fn[0] == '/')
 +				fn++;
 +			l = get_path_component(name, sizeof(name), fn);
 +			if (l < 0) {
 +				archive_string_free(&as);
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "A name buffer is too small");
 +				_isoent_free(isoent);
 +				*isoentpp = NULL;
 +				return (ARCHIVE_FATAL);
 +			}
 +			dent = np;
 +		}
 +
 +		/* Found out the parent directory where isoent can be
 +		 * inserted. */
 +		iso9660->cur_dirent = dent;
 +		archive_string_empty(&(iso9660->cur_dirstr));
 +		archive_string_ensure(&(iso9660->cur_dirstr),
 +		    archive_strlen(&(dent->file->parentdir)) +
 +		    archive_strlen(&(dent->file->basename)) + 2);
 +		if (archive_strlen(&(dent->file->parentdir)) +
 +		    archive_strlen(&(dent->file->basename)) == 0)
 +			iso9660->cur_dirstr.s[0] = 0;
 +		else {
 +			if (archive_strlen(&(dent->file->parentdir)) > 0) {
 +				archive_string_copy(&(iso9660->cur_dirstr),
 +				    &(dent->file->parentdir));
 +				archive_strappend_char(&(iso9660->cur_dirstr), '/');
 +			}
 +			archive_string_concat(&(iso9660->cur_dirstr),
 +			    &(dent->file->basename));
 +		}
 +
 +		if (!isoent_add_child_tail(dent, isoent)) {
 +			np = (struct isoent *)__archive_rb_tree_find_node(
 +			    &(dent->rbtree), isoent->file->basename.s);
 +			goto same_entry;
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +
 +same_entry:
 +	/*
 +	 * We have already has the entry the filename of which is
 +	 * the same.
 +	 */
 +	f1 = np->file;
 +	f2 = isoent->file;
 +
 +	/* If the file type of entries is different,
 +	 * we cannot handle it. */
 +	if (archive_entry_filetype(f1->entry) !=
 +	    archive_entry_filetype(f2->entry)) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Found duplicate entries `%s' and its file type is "
 +		    "different",
 +		    archive_entry_pathname(f1->entry));
 +		_isoent_free(isoent);
 +		*isoentpp = NULL;
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	/* Swap file entries. */
 +	np->file = f2;
 +	isoent->file = f1;
 +	np->virtual = 0;
 +
 +	_isoent_free(isoent);
 +	*isoentpp = np;
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Find a entry from `isoent'
 + */
 +static struct isoent *
 +isoent_find_child(struct isoent *isoent, const char *child_name)
 +{
 +	struct isoent *np;
 +
 +	np = (struct isoent *)__archive_rb_tree_find_node(
 +	    &(isoent->rbtree), child_name);
 +	return (np);
 +}
 +
 +/*
 + * Find a entry full-path of which is specified by `fn' parameter,
 + * in the tree.
 + */
 +static struct isoent *
 +isoent_find_entry(struct isoent *rootent, const char *fn)
 +{
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +	char name[_MAX_FNAME];/* Included null terminator size. */
 +#elif defined(NAME_MAX) && NAME_MAX >= 255
 +	char name[NAME_MAX+1];
 +#else
 +	char name[256];
 +#endif
 +	struct isoent *isoent, *np;
 +	int l;
 +
 +	isoent = rootent;
 +	np = NULL;
 +	for (;;) {
 +		l = get_path_component(name, sizeof(name), fn);
 +		if (l == 0)
 +			break;
 +		fn += l;
 +		if (fn[0] == '/')
 +			fn++;
 +
 +		np = isoent_find_child(isoent, name);
 +		if (np == NULL)
 +			break;
 +		if (fn[0] == '\0')
 +			break;/* We found out the entry */
 +
 +		/* Try sub directory. */
 +		isoent = np;
 +		np = NULL;
 +		if (!isoent->dir)
 +			break;/* Not directory */
 +	}
 +
 +	return (np);
 +}
 +
 +/*
 + * Following idr_* functions are used for resolving duplicated filenames
 + * and unreceivable filenames to generate ISO9660/Joliet Identifiers.
 + */
 +
 +static void
 +idr_relaxed_filenames(char *map)
 +{
 +	int i;
 +
 +	for (i = 0x21; i <= 0x2F; i++)
 +		map[i] = 1;
 +	for (i = 0x3A; i <= 0x41; i++)
 +		map[i] = 1;
 +	for (i = 0x5B; i <= 0x5E; i++)
 +		map[i] = 1;
 +	map[0x60] = 1;
 +	for (i = 0x7B; i <= 0x7E; i++)
 +		map[i] = 1;
 +}
 +
 +static void
 +idr_init(struct iso9660 *iso9660, struct vdd *vdd, struct idr *idr)
 +{
 +
 +	idr->idrent_pool = NULL;
 +	idr->pool_size = 0;
 +	if (vdd->vdd_type != VDD_JOLIET) {
 +		if (iso9660->opt.iso_level <= 3) {
 +			memcpy(idr->char_map, d_characters_map,
 +			    sizeof(idr->char_map));
 +		} else {
 +			memcpy(idr->char_map, d1_characters_map,
 +			    sizeof(idr->char_map));
 +			idr_relaxed_filenames(idr->char_map);
 +		}
 +	}
 +}
 +
 +static void
 +idr_cleanup(struct idr *idr)
 +{
 +	free(idr->idrent_pool);
 +}
 +
 +static int
 +idr_ensure_poolsize(struct archive_write *a, struct idr *idr,
 +    int cnt)
 +{
 +
 +	if (idr->pool_size < cnt) {
 +		void *p;
 +		const int bk = (1 << 7) - 1;
 +		int psize;
 +
 +		psize = (cnt + bk) & ~bk;
 +		p = realloc(idr->idrent_pool, sizeof(struct idrent) * psize);
 +		if (p == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		idr->idrent_pool = (struct idrent *)p;
 +		idr->pool_size = psize;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +idr_start(struct archive_write *a, struct idr *idr, int cnt, int ffmax,
 +    int num_size, int null_size, const struct archive_rb_tree_ops *rbt_ops)
 +{
 +	int r;
 +
 +	(void)ffmax; /* UNUSED */
 +
 +	r = idr_ensure_poolsize(a, idr, cnt);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	__archive_rb_tree_init(&(idr->rbtree), rbt_ops);
 +	idr->wait_list.first = NULL;
 +	idr->wait_list.last = &(idr->wait_list.first);
 +	idr->pool_idx = 0;
 +	idr->num_size = num_size;
 +	idr->null_size = null_size;
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +idr_register(struct idr *idr, struct isoent *isoent, int weight, int noff)
 +{
 +	struct idrent *idrent, *n;
 +
 +	idrent = &(idr->idrent_pool[idr->pool_idx++]);
 +	idrent->wnext = idrent->avail = NULL;
 +	idrent->isoent = isoent;
 +	idrent->weight = weight;
 +	idrent->noff = noff;
 +	idrent->rename_num = 0;
 +
 +	if (!__archive_rb_tree_insert_node(&(idr->rbtree), &(idrent->rbnode))) {
 +		n = (struct idrent *)__archive_rb_tree_find_node(
 +		    &(idr->rbtree), idrent->isoent);
 +		if (n != NULL) {
 +			/* this `idrent' needs to rename. */
 +			idrent->avail = n;
 +			*idr->wait_list.last = idrent;
 +			idr->wait_list.last = &(idrent->wnext);
 +		}
 +	}
 +}
 +
 +static void
 +idr_extend_identifier(struct idrent *wnp, int numsize, int nullsize)
 +{
 +	unsigned char *p;
 +	int wnp_ext_off;
 +
 +	wnp_ext_off = wnp->isoent->ext_off;
 +	if (wnp->noff + numsize != wnp_ext_off) {
 +		p = (unsigned char *)wnp->isoent->identifier;
 +		/* Extend the filename; foo.c --> foo___.c */
 +		memmove(p + wnp->noff + numsize, p + wnp_ext_off,
 +		    wnp->isoent->ext_len + nullsize);
 +		wnp->isoent->ext_off = wnp_ext_off = wnp->noff + numsize;
 +		wnp->isoent->id_len = wnp_ext_off + wnp->isoent->ext_len;
 +	}
 +}
 +
 +static void
 +idr_resolve(struct idr *idr, void (*fsetnum)(unsigned char *p, int num))
 +{
 +	struct idrent *n;
 +	unsigned char *p;
 +
 +	for (n = idr->wait_list.first; n != NULL; n = n->wnext) {
 +		idr_extend_identifier(n, idr->num_size, idr->null_size);
 +		p = (unsigned char *)n->isoent->identifier + n->noff;
 +		do {
 +			fsetnum(p, n->avail->rename_num++);
 +		} while (!__archive_rb_tree_insert_node(
 +		    &(idr->rbtree), &(n->rbnode)));
 +	}
 +}
 +
 +static void
 +idr_set_num(unsigned char *p, int num)
 +{
 +	static const char xdig[] = {
 +		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
 +		'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 +		'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
 +		'U', 'V', 'W', 'X', 'Y', 'Z'
 +	};
 +
 +	num %= sizeof(xdig) * sizeof(xdig) * sizeof(xdig);
 +	p[0] = xdig[(num / (sizeof(xdig) * sizeof(xdig)))];
 +	num %= sizeof(xdig) * sizeof(xdig);
 +	p[1] = xdig[ (num / sizeof(xdig))];
 +	num %= sizeof(xdig);
 +	p[2] = xdig[num];
 +}
 +
 +static void
 +idr_set_num_beutf16(unsigned char *p, int num)
 +{
 +	static const uint16_t xdig[] = {
 +		0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035,
 +		0x0036, 0x0037, 0x0038, 0x0039,
 +		0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046,
 +		0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C,
 +		0x004D, 0x004E, 0x004F, 0x0050, 0x0051, 0x0052,
 +		0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
 +		0x0059, 0x005A
 +	};
 +#define XDIG_CNT	(sizeof(xdig)/sizeof(xdig[0]))
 +
 +	num %= XDIG_CNT * XDIG_CNT * XDIG_CNT;
 +	archive_be16enc(p, xdig[(num / (XDIG_CNT * XDIG_CNT))]);
 +	num %= XDIG_CNT * XDIG_CNT;
 +	archive_be16enc(p+2, xdig[ (num / XDIG_CNT)]);
 +	num %= XDIG_CNT;
 +	archive_be16enc(p+4, xdig[num]);
 +}
 +
 +/*
 + * Generate ISO9660 Identifier.
 + */
 +static int
 +isoent_gen_iso9660_identifier(struct archive_write *a, struct isoent *isoent,
 +    struct idr *idr)
 +{
 +	struct iso9660 *iso9660;
 +	struct isoent *np;
 +	char *p;
 +	int l, r;
 +	const char *char_map;
 +	char allow_ldots, allow_multidot, allow_period, allow_vernum;
 +	int fnmax, ffmax, dnmax;
 +	static const struct archive_rb_tree_ops rb_ops = {
 +		isoent_cmp_node_iso9660, isoent_cmp_key_iso9660
 +	};
 +
 +	if (isoent->children.cnt == 0)
 +		return (0);
 +
 +	iso9660 = a->format_data;
 +	char_map = idr->char_map;
 +	if (iso9660->opt.iso_level <= 3) {
 +		allow_ldots = 0;
 +		allow_multidot = 0;
 +		allow_period = 1;
 +		allow_vernum = iso9660->opt.allow_vernum;
 +		if (iso9660->opt.iso_level == 1) {
 +			fnmax = 8;
 +			ffmax = 12;/* fnmax + '.' + 3 */
 +			dnmax = 8;
 +		} else {
 +			fnmax = 30;
 +			ffmax = 31;
 +			dnmax = 31;
 +		}
 +	} else {
 +		allow_ldots = allow_multidot = 1;
 +		allow_period = allow_vernum = 0;
 +		if (iso9660->opt.rr)
 +			/*
 +			 * MDR : The maximum size of Directory Record(254).
 +			 * DRL : A Directory Record Length(33).
 +			 * CE  : A size of SUSP CE System Use Entry(28).
 +			 * MDR - DRL - CE = 254 - 33 - 28 = 193.
 +			 */
 +			fnmax = ffmax = dnmax = 193;
 +		else
 +			/*
 +			 * XA  : CD-ROM XA System Use Extension
 +			 *       Information(14).
 +			 * MDR - DRL - XA = 254 - 33 -14 = 207.
 +			 */
 +			fnmax = ffmax = dnmax = 207;
 +	}
 +
 +	r = idr_start(a, idr, isoent->children.cnt, ffmax, 3, 1, &rb_ops);
 +	if (r < 0)
 +		return (r);
 +
 +	for (np = isoent->children.first; np != NULL; np = np->chnext) {
 +		char *dot, *xdot;
 +		int ext_off, noff, weight;
 +
 +		l = (int)np->file->basename.length;
 +		p = malloc(l+31+2+1);
 +		if (p == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		memcpy(p, np->file->basename.s, l);
 +		p[l] = '\0';
 +		np->identifier = p;
 +
 +		dot = xdot = NULL;
 +		if (!allow_ldots) {
 +			/*
 +			 * If there is a '.' character at the first byte,
 +			 * it has to be replaced by '_' character.
 +			 */
 +			if (*p == '.')
 +				*p++ = '_';
 +		}
 +		for (;*p; p++) {
 +			if (*p & 0x80) {
 +				*p = '_';
 +				continue;
 +			}
 +			if (char_map[(unsigned char)*p]) {
 +				/* if iso-level is '4', a character '.' is
 +				 * allowed by char_map. */
 +				if (*p == '.') {
 +					xdot = dot;
 +					dot = p;
 +				}
 +				continue;
 +			}
 +			if (*p >= 'a' && *p <= 'z') {
 +				*p -= 'a' - 'A';
 +				continue;
 +			}
 +			if (*p == '.') {
 +				xdot = dot;
 +				dot = p;
 +				if (allow_multidot)
 +					continue;
 +			}
 +			*p = '_';
 +		}
 +		p = np->identifier;
 +		weight = -1;
 +		if (dot == NULL) {
 +			int nammax;
 +
 +			if (np->dir)
 +				nammax = dnmax;
 +			else
 +				nammax = fnmax;
 +
 +			if (l > nammax) {
 +				p[nammax] = '\0';
 +				weight = nammax;
 +				ext_off = nammax;
 +			} else
 +				ext_off = l;
 +		} else {
 +			*dot = '.';
 +			ext_off = (int)(dot - p);
 +
 +			if (iso9660->opt.iso_level == 1) {
 +				if (dot - p <= 8) {
 +					if (strlen(dot) > 4) {
 +						/* A length of a file extension
 +						 * must be less than 4 */
 +						dot[4] = '\0';
 +						weight = 0;
 +					}
 +				} else {
 +					p[8] = dot[0];
 +					p[9] = dot[1];
 +					p[10] = dot[2];
 +					p[11] = dot[3];
 +					p[12] = '\0';
 +					weight = 8;
 +					ext_off = 8;
 +				}
 +			} else if (np->dir) {
 +				if (l > dnmax) {
 +					p[dnmax] = '\0';
 +					weight = dnmax;
 +					if (ext_off > dnmax)
 +						ext_off = dnmax;
 +				}
 +			} else if (l > ffmax) {
 +				int extlen = (int)strlen(dot);
 +				int xdoff;
 +
 +				if (xdot != NULL)
 +					xdoff = (int)(xdot - p);
 +				else
 +					xdoff = 0;
 +
 +				if (extlen > 1 && xdoff < fnmax-1) {
 +					int off;
 +
 +					if (extlen > ffmax)
 +						extlen = ffmax;
 +					off = ffmax - extlen;
 +					if (off == 0) {
 +						/* A dot('.')  character
 +						 * does't place to the first
 +						 * byte of identifier. */
 +						off ++;
 +						extlen --;
 +					}
 +					memmove(p+off, dot, extlen);
 +					p[ffmax] = '\0';
 +					ext_off = off;
 +					weight = off;
 +#ifdef COMPAT_MKISOFS
 +				} else if (xdoff >= fnmax-1) {
 +					/* Simulate a bug(?) of mkisofs. */
 +					p[fnmax-1] = '\0';
 +					ext_off = fnmax-1;
 +					weight = fnmax-1;
 +#endif
 +				} else {
 +					p[fnmax] = '\0';
 +					ext_off = fnmax;
 +					weight = fnmax;
 +				}
 +			}
 +		}
 +		/* Save an offset of a file name extension to sort files. */
 +		np->ext_off = ext_off;
 +		np->ext_len = (int)strlen(&p[ext_off]);
 +		np->id_len = l = ext_off + np->ext_len;
 +
 +		/* Make an offset of the number which is used to be set
 +		 * hexadecimal number to avoid duplicate identififier. */
 +		if (iso9660->opt.iso_level == 1) {
 +			if (ext_off >= 5)
 +				noff = 5;
 +			else
 +				noff = ext_off;
 +		} else {
 +			if (l == ffmax)
 +				noff = ext_off - 3;
 +			else if (l == ffmax-1)
 +				noff = ext_off - 2;
 +			else if (l == ffmax-2)
 +				noff = ext_off - 1;
 +			else
 +				noff = ext_off;
 +		}
 +		/* Register entry to the identifier resolver. */
 +		idr_register(idr, np, weight, noff);
 +	}
 +
 +	/* Resolve duplicate identifier. */
 +	idr_resolve(idr, idr_set_num);
 +
 +	/* Add a period and a version number to identifiers. */
 +	for (np = isoent->children.first; np != NULL; np = np->chnext) {
 +		if (!np->dir && np->rr_child == NULL) {
 +			p = np->identifier + np->ext_off + np->ext_len;
 +			if (np->ext_len == 0 && allow_period) {
 +				*p++ = '.';
 +				np->ext_len = 1;
 +			}
 +			if (np->ext_len == 1 && !allow_period) {
 +				*--p = '\0';
 +				np->ext_len = 0;
 +			}
 +			np->id_len = np->ext_off + np->ext_len;
 +			if (allow_vernum) {
 +				*p++ = ';';
 +				*p++ = '1';
 +				np->id_len += 2;
 +			}
 +			*p = '\0';
 +		} else
 +			np->id_len = np->ext_off + np->ext_len;
 +		np->mb_len = np->id_len;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Generate Joliet Identifier.
 + */
 +static int
 +isoent_gen_joliet_identifier(struct archive_write *a, struct isoent *isoent,
 +    struct idr *idr)
 +{
 +	struct iso9660 *iso9660;
 +	struct isoent *np;
 +	unsigned char *p;
 +	size_t l;
 +	int r;
 +	int ffmax, parent_len;
 +	static const struct archive_rb_tree_ops rb_ops = {
 +		isoent_cmp_node_joliet, isoent_cmp_key_joliet
 +	};
 +
 +	if (isoent->children.cnt == 0)
 +		return (0);
 +
 +	iso9660 = a->format_data;
 +	if (iso9660->opt.joliet == OPT_JOLIET_LONGNAME)
 +		ffmax = 206;
 +	else
 +		ffmax = 128;
 +
 +	r = idr_start(a, idr, isoent->children.cnt, ffmax, 6, 2, &rb_ops);
 +	if (r < 0)
 +		return (r);
 +
 +	parent_len = 1;
 +	for (np = isoent; np->parent != np; np = np->parent)
 +		parent_len += np->mb_len + 1;
 +
 +	for (np = isoent->children.first; np != NULL; np = np->chnext) {
 +		unsigned char *dot;
 +		int ext_off, noff, weight;
 +		size_t lt;
 +
 +		if ((int)(l = np->file->basename_utf16.length) > ffmax)
 +			l = ffmax;
 +
 +		p = malloc((l+1)*2);
 +		if (p == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		memcpy(p, np->file->basename_utf16.s, l);
 +		p[l] = 0;
 +		p[l+1] = 0;
 +
 +		np->identifier = (char *)p;
 +		lt = l;
 +		dot = p + l;
 +		weight = 0;
 +		while (lt > 0) {
 +			if (!joliet_allowed_char(p[0], p[1]))
 +				archive_be16enc(p, 0x005F); /* '_' */
 +			else if (p[0] == 0 && p[1] == 0x2E) /* '.' */
 +				dot = p;
 +			p += 2;
 +			lt -= 2;
 +		}
 +		ext_off = (int)(dot - (unsigned char *)np->identifier);
 +		np->ext_off = ext_off;
 +		np->ext_len = (int)l - ext_off;
 +		np->id_len = (int)l;
 +
 +		/*
 +		 * Get a length of MBS of a full-pathname.
 +		 */
 +		if ((int)np->file->basename_utf16.length > ffmax) {
 +			if (archive_strncpy_l(&iso9660->mbs,
 +			    (const char *)np->identifier, l,
 +				iso9660->sconv_from_utf16be) != 0 &&
 +			    errno == ENOMEM) {
 +				archive_set_error(&a->archive, errno,
 +				    "No memory");
 +				return (ARCHIVE_FATAL);
 +			}
 +			np->mb_len = (int)iso9660->mbs.length;
 +			if (np->mb_len != (int)np->file->basename.length)
 +				weight = np->mb_len;
 +		} else
 +			np->mb_len = (int)np->file->basename.length;
 +
 +		/* If a length of full-pathname is longer than 240 bytes,
 +		 * it violates Joliet extensions regulation. */
 +		if (parent_len + np->mb_len > 240) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "The regulation of Joliet extensions;"
 +			    " A length of a full-pathname of `%s' is "
 +			    "longer than 240 bytes, (p=%d, b=%d)",
 +			    archive_entry_pathname(np->file->entry),
 +			    (int)parent_len, (int)np->mb_len);
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		/* Make an offset of the number which is used to be set
 +		 * hexadecimal number to avoid duplicate identifier. */
 +		if ((int)l == ffmax)
 +			noff = ext_off - 6;
 +		else if ((int)l == ffmax-2)
 +			noff = ext_off - 4;
 +		else if ((int)l == ffmax-4)
 +			noff = ext_off - 2;
 +		else
 +			noff = ext_off;
 +		/* Register entry to the identifier resolver. */
 +		idr_register(idr, np, weight, noff);
 +	}
 +
 +	/* Resolve duplicate identifier with Joliet Volume. */
 +	idr_resolve(idr, idr_set_num_beutf16);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * This comparing rule is according to ISO9660 Standard 9.3
 + */
 +static int
 +isoent_cmp_iso9660_identifier(const struct isoent *p1, const struct isoent *p2)
 +{
 +	const char *s1, *s2;
 +	int cmp;
 +	int l;
 +
 +	s1 = p1->identifier;
 +	s2 = p2->identifier;
 +
 +	/* Compare File Name */
 +	l = p1->ext_off;
 +	if (l > p2->ext_off)
 +		l = p2->ext_off;
 +	cmp = memcmp(s1, s2, l);
 +	if (cmp != 0)
 +		return (cmp);
 +	if (p1->ext_off < p2->ext_off) {
 +		s2 += l;
 +		l = p2->ext_off - p1->ext_off;
 +		while (l--)
 +			if (0x20 != *s2++)
 +				return (0x20
 +				    - *(const unsigned char *)(s2 - 1));
 +	} else if (p1->ext_off > p2->ext_off) {
 +		s1 += l;
 +		l = p1->ext_off - p2->ext_off;
 +		while (l--)
 +			if (0x20 != *s1++)
 +				return (*(const unsigned char *)(s1 - 1)
 +				    - 0x20);
 +	}
 +	/* Compare File Name Extension */
 +	if (p1->ext_len == 0 && p2->ext_len == 0)
 +		return (0);
 +	if (p1->ext_len == 1 && p2->ext_len == 1)
 +		return (0);
 +	if (p1->ext_len <= 1)
 +		return (-1);
 +	if (p2->ext_len <= 1)
 +		return (1);
 +	l = p1->ext_len;
 +	if (l > p2->ext_len)
 +		l = p2->ext_len;
 +	s1 = p1->identifier + p1->ext_off;
 +	s2 = p2->identifier + p2->ext_off;
 +	if (l > 1) {
 +		cmp = memcmp(s1, s2, l);
 +		if (cmp != 0)
 +			return (cmp);
 +	}
 +	if (p1->ext_len < p2->ext_len) {
 +		s2 += l;
 +		l = p2->ext_len - p1->ext_len;
 +		while (l--)
 +			if (0x20 != *s2++)
 +				return (0x20
 +				    - *(const unsigned char *)(s2 - 1));
 +	} else if (p1->ext_len > p2->ext_len) {
 +		s1 += l;
 +		l = p1->ext_len - p2->ext_len;
 +		while (l--)
 +			if (0x20 != *s1++)
 +				return (*(const unsigned char *)(s1 - 1)
 +				    - 0x20);
 +	}
 +	/* Compare File Version Number */
 +	/* No operation. The File Version Number is always one. */
 +
 +	return (cmp);
 +}
 +
 +static int
 +isoent_cmp_node_iso9660(const struct archive_rb_node *n1,
 +    const struct archive_rb_node *n2)
 +{
 +	const struct idrent *e1 = (const struct idrent *)n1;
 +	const struct idrent *e2 = (const struct idrent *)n2;
 +
 +	return (isoent_cmp_iso9660_identifier(e2->isoent, e1->isoent));
 +}
 +
 +static int
 +isoent_cmp_key_iso9660(const struct archive_rb_node *node, const void *key)
 +{
 +	const struct isoent *isoent = (const struct isoent *)key;
 +	const struct idrent *idrent = (const struct idrent *)node;
 +
 +	return (isoent_cmp_iso9660_identifier(isoent, idrent->isoent));
 +}
 +
 +static int
 +isoent_cmp_joliet_identifier(const struct isoent *p1, const struct isoent *p2)
 +{
 +	const unsigned char *s1, *s2;
 +	int cmp;
 +	int l;
 +
 +	s1 = (const unsigned char *)p1->identifier;
 +	s2 = (const unsigned char *)p2->identifier;
 +
 +	/* Compare File Name */
 +	l = p1->ext_off;
 +	if (l > p2->ext_off)
 +		l = p2->ext_off;
 +	cmp = memcmp(s1, s2, l);
 +	if (cmp != 0)
 +		return (cmp);
 +	if (p1->ext_off < p2->ext_off) {
 +		s2 += l;
 +		l = p2->ext_off - p1->ext_off;
 +		while (l--)
 +			if (0 != *s2++)
 +				return (- *(const unsigned char *)(s2 - 1));
 +	} else if (p1->ext_off > p2->ext_off) {
 +		s1 += l;
 +		l = p1->ext_off - p2->ext_off;
 +		while (l--)
 +			if (0 != *s1++)
 +				return (*(const unsigned char *)(s1 - 1));
 +	}
 +	/* Compare File Name Extension */
 +	if (p1->ext_len == 0 && p2->ext_len == 0)
 +		return (0);
 +	if (p1->ext_len == 2 && p2->ext_len == 2)
 +		return (0);
 +	if (p1->ext_len <= 2)
 +		return (-1);
 +	if (p2->ext_len <= 2)
 +		return (1);
 +	l = p1->ext_len;
 +	if (l > p2->ext_len)
 +		l = p2->ext_len;
 +	s1 = (unsigned char *)(p1->identifier + p1->ext_off);
 +	s2 = (unsigned char *)(p2->identifier + p2->ext_off);
 +	if (l > 1) {
 +		cmp = memcmp(s1, s2, l);
 +		if (cmp != 0)
 +			return (cmp);
 +	}
 +	if (p1->ext_len < p2->ext_len) {
 +		s2 += l;
 +		l = p2->ext_len - p1->ext_len;
 +		while (l--)
 +			if (0 != *s2++)
 +				return (- *(const unsigned char *)(s2 - 1));
 +	} else if (p1->ext_len > p2->ext_len) {
 +		s1 += l;
 +		l = p1->ext_len - p2->ext_len;
 +		while (l--)
 +			if (0 != *s1++)
 +				return (*(const unsigned char *)(s1 - 1));
 +	}
 +	/* Compare File Version Number */
 +	/* No operation. The File Version Number is always one. */
 +
 +	return (cmp);
 +}
 +
 +static int
 +isoent_cmp_node_joliet(const struct archive_rb_node *n1,
 +    const struct archive_rb_node *n2)
 +{
 +	const struct idrent *e1 = (const struct idrent *)n1;
 +	const struct idrent *e2 = (const struct idrent *)n2;
 +
 +	return (isoent_cmp_joliet_identifier(e2->isoent, e1->isoent));
 +}
 +
 +static int
 +isoent_cmp_key_joliet(const struct archive_rb_node *node, const void *key)
 +{
 +	const struct isoent *isoent = (const struct isoent *)key;
 +	const struct idrent *idrent = (const struct idrent *)node;
 +
 +	return (isoent_cmp_joliet_identifier(isoent, idrent->isoent));
 +}
 +
 +static int
 +isoent_make_sorted_files(struct archive_write *a, struct isoent *isoent,
 +    struct idr *idr)
 +{
 +	struct archive_rb_node *rn;
 +	struct isoent **children;
 +
 +	children = malloc(isoent->children.cnt * sizeof(struct isoent *));
 +	if (children == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	isoent->children_sorted = children;
 +
 +	ARCHIVE_RB_TREE_FOREACH(rn, &(idr->rbtree)) {
 +		struct idrent *idrent = (struct idrent *)rn;
 +		*children ++ = idrent->isoent;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * - Generate ISO9660 and Joliet identifiers from basenames.
 + * - Sort files by each directory.
 + */
 +static int
 +isoent_traverse_tree(struct archive_write *a, struct vdd* vdd)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isoent *np;
 +	struct idr idr;
 +	int depth;
 +	int r;
 +	int (*genid)(struct archive_write *, struct isoent *, struct idr *);
 +
 +	idr_init(iso9660, vdd, &idr);
 +	np = vdd->rootent;
 +	depth = 0;
 +	if (vdd->vdd_type == VDD_JOLIET)
 +		genid = isoent_gen_joliet_identifier;
 +	else
 +		genid = isoent_gen_iso9660_identifier;
 +	do {
 +		if (np->virtual &&
 +		    !archive_entry_mtime_is_set(np->file->entry)) {
 +			/* Set properly times to virtual directory */
 +			archive_entry_set_mtime(np->file->entry,
 +			    iso9660->birth_time, 0);
 +			archive_entry_set_atime(np->file->entry,
 +			    iso9660->birth_time, 0);
 +			archive_entry_set_ctime(np->file->entry,
 +			    iso9660->birth_time, 0);
 +		}
 +		if (np->children.first != NULL) {
 +			if (vdd->vdd_type != VDD_JOLIET &&
 +			    !iso9660->opt.rr && depth + 1 >= vdd->max_depth) {
 +				if (np->children.cnt > 0)
 +					iso9660->directories_too_deep = np;
 +			} else {
 +				/* Generate Identifier */
 +				r = genid(a, np, &idr);
 +				if (r < 0)
 +					goto exit_traverse_tree;
 +				r = isoent_make_sorted_files(a, np, &idr);
 +				if (r < 0)
 +					goto exit_traverse_tree;
 +
 +				if (np->subdirs.first != NULL &&
 +				    depth + 1 < vdd->max_depth) {
 +					/* Enter to sub directories. */
 +					np = np->subdirs.first;
 +					depth++;
 +					continue;
 +				}
 +			}
 +		}
 +		while (np != np->parent) {
 +			if (np->drnext == NULL) {
 +				/* Return to the parent directory. */
 +				np = np->parent;
 +				depth--;
 +			} else {
 +				np = np->drnext;
 +				break;
 +			}
 +		}
 +	} while (np != np->parent);
 +
 +	r = ARCHIVE_OK;
 +exit_traverse_tree:
 +	idr_cleanup(&idr);
 +
 +	return (r);
 +}
 +
 +/*
 + * Collect directory entries into path_table by a directory depth.
 + */
 +static int
 +isoent_collect_dirs(struct vdd *vdd, struct isoent *rootent, int depth)
 +{
 +	struct isoent *np;
 +
 +	if (rootent == NULL)
 +		rootent = vdd->rootent;
 +	np = rootent;
 +	do {
 +		/* Register current directory to pathtable. */
 +		path_table_add_entry(&(vdd->pathtbl[depth]), np);
 +
 +		if (np->subdirs.first != NULL && depth + 1 < vdd->max_depth) {
 +			/* Enter to sub directories. */
 +			np = np->subdirs.first;
 +			depth++;
 +			continue;
 +		}
 +		while (np != rootent) {
 +			if (np->drnext == NULL) {
 +				/* Return to the parent directory. */
 +				np = np->parent;
 +				depth--;
 +			} else {
 +				np = np->drnext;
 +				break;
 +			}
 +		}
 +	} while (np != rootent);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * The entry whose number of levels in a directory hierarchy is
 + * large than eight relocate to rr_move directory.
 + */
 +static int
 +isoent_rr_move_dir(struct archive_write *a, struct isoent **rr_moved,
 +    struct isoent *curent, struct isoent **newent)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isoent *rrmoved, *mvent, *np;
 +
 +	if ((rrmoved = *rr_moved) == NULL) {
 +		struct isoent *rootent = iso9660->primary.rootent;
 +		/* There isn't rr_move entry.
 +		 * Create rr_move entry and insert it into the root entry.
 +		 */
 +		rrmoved = isoent_create_virtual_dir(a, iso9660, "rr_moved");
 +		if (rrmoved == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		/* Add "rr_moved" entry to the root entry. */
 +		isoent_add_child_head(rootent, rrmoved);
 +		archive_entry_set_nlink(rootent->file->entry,
 +		    archive_entry_nlink(rootent->file->entry) + 1);
 +		/* Register "rr_moved" entry to second level pathtable. */
 +		path_table_add_entry(&(iso9660->primary.pathtbl[1]), rrmoved);
 +		/* Save rr_moved. */
 +		*rr_moved = rrmoved;
 +	}
 +	/*
 +	 * Make a clone of curent which is going to be relocated
 +	 * to rr_moved.
 +	 */
 +	mvent = isoent_clone(curent);
 +	if (mvent == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	/* linking..  and use for creating "CL", "PL" and "RE" */
 +	mvent->rr_parent = curent->parent;
 +	curent->rr_child = mvent;
 +	/*
 +	 * Move subdirectories from the curent to mvent
 +	 */
 +	if (curent->children.first != NULL) {
 +		*mvent->children.last = curent->children.first;
 +		mvent->children.last = curent->children.last;
 +	}
 +	for (np = mvent->children.first; np != NULL; np = np->chnext)
 +		np->parent = mvent;
 +	mvent->children.cnt = curent->children.cnt;
 +	curent->children.cnt = 0;
 +	curent->children.first = NULL;
 +	curent->children.last = &curent->children.first;
 +
 +	if (curent->subdirs.first != NULL) {
 +		*mvent->subdirs.last = curent->subdirs.first;
 +		mvent->subdirs.last = curent->subdirs.last;
 +	}
 +	mvent->subdirs.cnt = curent->subdirs.cnt;
 +	curent->subdirs.cnt = 0;
 +	curent->subdirs.first = NULL;
 +	curent->subdirs.last = &curent->subdirs.first;
 +
 +	/*
 +	 * The mvent becomes a child of the rr_moved entry.
 +	 */
 +	isoent_add_child_tail(rrmoved, mvent);
 +	archive_entry_set_nlink(rrmoved->file->entry,
 +	    archive_entry_nlink(rrmoved->file->entry) + 1);
 +	/*
 +	 * This entry which relocated to the rr_moved directory
 +	 * has to set the flag as a file.
 +	 * See also RRIP 4.1.5.1 Description of the "CL" System Use Entry.
 +	 */
 +	curent->dir = 0;
 +
 +	*newent = mvent;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +isoent_rr_move(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct path_table *pt;
 +	struct isoent *rootent, *rr_moved;
 +	struct isoent *np, *last;
 +	int r;
 +
 +	pt = &(iso9660->primary.pathtbl[MAX_DEPTH-1]);
 +	/* Theare aren't level 8 directories reaching a deepr level. */
 +	if (pt->cnt == 0)
 +		return (ARCHIVE_OK);
 +
 +	rootent = iso9660->primary.rootent;
 +	/* If "rr_moved" directory is already existing,
 +	 * we have to use it. */
 +	rr_moved = isoent_find_child(rootent, "rr_moved");
 +	if (rr_moved != NULL &&
 +	    rr_moved != rootent->children.first) {
 +		/*
 +		 * It's necessary that rr_move is the first entry
 +		 * of the root.
 +		 */
 +		/* Remove "rr_moved" entry from children chain. */
 +		isoent_remove_child(rootent, rr_moved);
 +
 +		/* Add "rr_moved" entry into the head of children chain. */
 +		isoent_add_child_head(rootent, rr_moved);
 +	}
 +
 +	/*
 +	 * Check level 8 path_table.
 +	 * If find out sub directory entries, that entries move to rr_move.
 +	 */
 +	np = pt->first;
 +	while (np != NULL) {
 +		last = path_table_last_entry(pt);
 +		for (; np != NULL; np = np->ptnext) {
 +			struct isoent *mvent;
 +			struct isoent *newent;
 +
 +			if (!np->dir)
 +				continue;
 +			for (mvent = np->subdirs.first;
 +			    mvent != NULL; mvent = mvent->drnext) {
 +				r = isoent_rr_move_dir(a, &rr_moved,
 +				    mvent, &newent);
 +				if (r < 0)
 +					return (r);
 +				isoent_collect_dirs(&(iso9660->primary),
 +				    newent, 2);
 +			}
 +		}
 +		/* If new entries are added to level 8 path_talbe,
 +		 * its sub directory entries move to rr_move too.
 +		 */
 +		np = last->ptnext;
 +	}
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * This comparing rule is according to ISO9660 Standard 6.9.1
 + */
 +static int
 +_compare_path_table(const void *v1, const void *v2)
 +{
 +	const struct isoent *p1, *p2;
 +	const char *s1, *s2;
 +	int cmp, l;
 +
 +	p1 = *((const struct isoent **)(uintptr_t)v1);
 +	p2 = *((const struct isoent **)(uintptr_t)v2);
 +
 +	/* Compare parent directory number */
 +	cmp = p1->parent->dir_number - p2->parent->dir_number;
 +	if (cmp != 0)
 +		return (cmp);
 +
 +	/* Compare indetifier */
 +	s1 = p1->identifier;
 +	s2 = p2->identifier;
 +	l = p1->ext_off;
 +	if (l > p2->ext_off)
 +		l = p2->ext_off;
 +	cmp = strncmp(s1, s2, l);
 +	if (cmp != 0)
 +		return (cmp);
 +	if (p1->ext_off < p2->ext_off) {
 +		s2 += l;
 +		l = p2->ext_off - p1->ext_off;
 +		while (l--)
 +			if (0x20 != *s2++)
 +				return (0x20
 +				    - *(const unsigned char *)(s2 - 1));
 +	} else if (p1->ext_off > p2->ext_off) {
 +		s1 += l;
 +		l = p1->ext_off - p2->ext_off;
 +		while (l--)
 +			if (0x20 != *s1++)
 +				return (*(const unsigned char *)(s1 - 1)
 +				    - 0x20);
 +	}
 +	return (0);
 +}
 +
 +static int
 +_compare_path_table_joliet(const void *v1, const void *v2)
 +{
 +	const struct isoent *p1, *p2;
 +	const unsigned char *s1, *s2;
 +	int cmp, l;
 +
 +	p1 = *((const struct isoent **)(uintptr_t)v1);
 +	p2 = *((const struct isoent **)(uintptr_t)v2);
 +
 +	/* Compare parent directory number */
 +	cmp = p1->parent->dir_number - p2->parent->dir_number;
 +	if (cmp != 0)
 +		return (cmp);
 +
 +	/* Compare indetifier */
 +	s1 = (const unsigned char *)p1->identifier;
 +	s2 = (const unsigned char *)p2->identifier;
 +	l = p1->ext_off;
 +	if (l > p2->ext_off)
 +		l = p2->ext_off;
 +	cmp = memcmp(s1, s2, l);
 +	if (cmp != 0)
 +		return (cmp);
 +	if (p1->ext_off < p2->ext_off) {
 +		s2 += l;
 +		l = p2->ext_off - p1->ext_off;
 +		while (l--)
 +			if (0 != *s2++)
 +				return (- *(const unsigned char *)(s2 - 1));
 +	} else if (p1->ext_off > p2->ext_off) {
 +		s1 += l;
 +		l = p1->ext_off - p2->ext_off;
 +		while (l--)
 +			if (0 != *s1++)
 +				return (*(const unsigned char *)(s1 - 1));
 +	}
 +	return (0);
 +}
 +
 +static inline void
 +path_table_add_entry(struct path_table *pathtbl, struct isoent *ent)
 +{
 +	ent->ptnext = NULL;
 +	*pathtbl->last = ent;
 +	pathtbl->last = &(ent->ptnext);
 +	pathtbl->cnt ++;
 +}
 +
 +static inline struct isoent *
 +path_table_last_entry(struct path_table *pathtbl)
 +{
 +	if (pathtbl->first == NULL)
 +		return (NULL);
 +	return (((struct isoent *)(void *)
 +		((char *)(pathtbl->last) - offsetof(struct isoent, ptnext))));
 +}
 +
 +/*
 + * Sort directory entries in path_table
 + * and assign directory number to each entries.
 + */
 +static int
 +isoent_make_path_table_2(struct archive_write *a, struct vdd *vdd,
 +    int depth, int *dir_number)
 +{
 +	struct isoent *np;
 +	struct isoent **enttbl;
 +	struct path_table *pt;
 +	int i;
 +
 +	pt = &vdd->pathtbl[depth];
 +	if (pt->cnt == 0) {
 +		pt->sorted = NULL;
 +		return (ARCHIVE_OK);
 +	}
 +	enttbl = malloc(pt->cnt * sizeof(struct isoent *));
 +	if (enttbl == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	pt->sorted = enttbl;
 +	for (np = pt->first; np != NULL; np = np->ptnext)
 +		*enttbl ++ = np;
 +	enttbl = pt->sorted;
 +
 +	switch (vdd->vdd_type) {
 +	case VDD_PRIMARY:
 +	case VDD_ENHANCED:
 +#ifdef __COMPAR_FN_T
 +		qsort(enttbl, pt->cnt, sizeof(struct isoent *),
 +		    (__compar_fn_t)_compare_path_table);
 +#else
 +		qsort(enttbl, pt->cnt, sizeof(struct isoent *),
 +		    _compare_path_table);
 +#endif
 +		break;
 +	case VDD_JOLIET:
 +#ifdef __COMPAR_FN_T
 +		qsort(enttbl, pt->cnt, sizeof(struct isoent *),
 +		    (__compar_fn_t)_compare_path_table_joliet);
 +#else
 +		qsort(enttbl, pt->cnt, sizeof(struct isoent *),
 +		    _compare_path_table_joliet);
 +#endif
 +		break;
 +	}
 +	for (i = 0; i < pt->cnt; i++)
 +		enttbl[i]->dir_number = (*dir_number)++;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +isoent_alloc_path_table(struct archive_write *a, struct vdd *vdd,
 +    int max_depth)
 +{
 +	int i;
 +
 +	vdd->max_depth = max_depth;
 +	vdd->pathtbl = malloc(sizeof(*vdd->pathtbl) * vdd->max_depth);
 +	if (vdd->pathtbl == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	for (i = 0; i < vdd->max_depth; i++) {
 +		vdd->pathtbl[i].first = NULL;
 +		vdd->pathtbl[i].last = &(vdd->pathtbl[i].first);
 +		vdd->pathtbl[i].sorted = NULL;
 +		vdd->pathtbl[i].cnt = 0;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Make Path Tables
 + */
 +static int
 +isoent_make_path_table(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	int depth, r;
 +	int dir_number;
 +
 +	/*
 +	 * Init Path Table.
 +	 */
 +	if (iso9660->dircnt_max >= MAX_DEPTH &&
 +	    (!iso9660->opt.limit_depth || iso9660->opt.iso_level == 4))
 +		r = isoent_alloc_path_table(a, &(iso9660->primary),
 +		    iso9660->dircnt_max + 1);
 +	else
 +		/* The number of levels in the hierarchy cannot exceed
 +		 * eight. */
 +		r = isoent_alloc_path_table(a, &(iso9660->primary),
 +		    MAX_DEPTH);
 +	if (r < 0)
 +		return (r);
 +	if (iso9660->opt.joliet) {
 +		r = isoent_alloc_path_table(a, &(iso9660->joliet),
 +		    iso9660->dircnt_max + 1);
 +		if (r < 0)
 +			return (r);
 +	}
 +
 +	/* Step 0.
 +	 * - Collect directories for primary and joliet.
 +	 */
 +	isoent_collect_dirs(&(iso9660->primary), NULL, 0);
 +	if (iso9660->opt.joliet)
 +		isoent_collect_dirs(&(iso9660->joliet), NULL, 0);
 +	/*
 +	 * Rockridge; move deeper depth directories to rr_moved.
 +	 */
 +	if (iso9660->opt.rr) {
 +		r = isoent_rr_move(a);
 +		if (r < 0)
 +			return (r);
 +	}
 +
 + 	/* Update nlink. */
 +	isofile_connect_hardlink_files(iso9660);
 +
 +	/* Step 1.
 +	 * - Renew a value of the depth of that directories.
 +	 * - Resolve hardlinks.
 + 	 * - Convert pathnames to ISO9660 name or UCS2(joliet).
 +	 * - Sort files by each directory.
 +	 */
 +	r = isoent_traverse_tree(a, &(iso9660->primary));
 +	if (r < 0)
 +		return (r);
 +	if (iso9660->opt.joliet) {
 +		r = isoent_traverse_tree(a, &(iso9660->joliet));
 +		if (r < 0)
 +			return (r);
 +	}
 +
 +	/* Step 2.
 +	 * - Sort directories.
 +	 * - Assign all directory number.
 +	 */
 +	dir_number = 1;
 +	for (depth = 0; depth < iso9660->primary.max_depth; depth++) {
 +		r = isoent_make_path_table_2(a, &(iso9660->primary),
 +		    depth, &dir_number);
 +		if (r < 0)
 +			return (r);
 +	}
 +	if (iso9660->opt.joliet) {
 +		dir_number = 1;
 +		for (depth = 0; depth < iso9660->joliet.max_depth; depth++) {
 +			r = isoent_make_path_table_2(a, &(iso9660->joliet),
 +			    depth, &dir_number);
 +			if (r < 0)
 +				return (r);
 +		}
 +	}
 +	if (iso9660->opt.limit_dirs && dir_number > 0xffff) {
 +		/*
 +		 * Maximum number of directories is 65535(0xffff)
 +		 * doe to size(16bit) of Parent Directory Number of
 +		 * the Path Table.
 +		 * See also ISO9660 Standard 9.4.
 +		 */
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Too many directories(%d) over 65535.", dir_number);
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Get the size of the Path Table. */
 +	calculate_path_table_size(&(iso9660->primary));
 +	if (iso9660->opt.joliet)
 +		calculate_path_table_size(&(iso9660->joliet));
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +isoent_find_out_boot_file(struct archive_write *a, struct isoent *rootent)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +
 +	/* Find a isoent of the boot file. */
 +	iso9660->el_torito.boot = isoent_find_entry(rootent,
 +	    iso9660->el_torito.boot_filename.s);
 +	if (iso9660->el_torito.boot == NULL) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Can't find the boot image file ``%s''",
 +		    iso9660->el_torito.boot_filename.s);
 +		return (ARCHIVE_FATAL);
 +	}
 +	iso9660->el_torito.boot->file->boot = BOOT_IMAGE;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +isoent_create_boot_catalog(struct archive_write *a, struct isoent *rootent)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isofile *file;
 +	struct isoent *isoent;
 +	struct archive_entry *entry;
 +
 +	(void)rootent; /* UNUSED */
 +	/*
 +	 * Create the entry which is the "boot.catalog" file.
 +	 */
 +	file = isofile_new(a, NULL);
 +	if (file == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	archive_entry_set_pathname(file->entry,
 +	    iso9660->el_torito.catalog_filename.s);
 +	archive_entry_set_size(file->entry, LOGICAL_BLOCK_SIZE);
 +	archive_entry_set_mtime(file->entry, iso9660->birth_time, 0);
 +	archive_entry_set_atime(file->entry, iso9660->birth_time, 0);
 +	archive_entry_set_ctime(file->entry, iso9660->birth_time, 0);
 +	archive_entry_set_uid(file->entry, getuid());
 +	archive_entry_set_gid(file->entry, getgid());
 +	archive_entry_set_mode(file->entry, AE_IFREG | 0444);
 +	archive_entry_set_nlink(file->entry, 1);
 +
 +	if (isofile_gen_utility_names(a, file) < ARCHIVE_WARN) {
 +		isofile_free(file);
 +		return (ARCHIVE_FATAL);
 +	}
 +	file->boot = BOOT_CATALOG;
 +	file->content.size = LOGICAL_BLOCK_SIZE;
 +	isofile_add_entry(iso9660, file);
 +
 +	isoent = isoent_new(file);
 +	if (isoent == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	isoent->virtual = 1;
 +
 +	/* Add the "boot.catalog" entry into tree */
 +	if (isoent_tree(a, &isoent) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	iso9660->el_torito.catalog = isoent;
 +	/*
 +	 * Get a boot medai type.
 +	 */
 +	switch (iso9660->opt.boot_type) {
 +	default:
 +	case OPT_BOOT_TYPE_AUTO:
 +		/* Try detecting a media type of the boot image. */
 +		entry = iso9660->el_torito.boot->file->entry;
 +		if (archive_entry_size(entry) == FD_1_2M_SIZE)
 +			iso9660->el_torito.media_type =
 +			    BOOT_MEDIA_1_2M_DISKETTE;
 +		else if (archive_entry_size(entry) == FD_1_44M_SIZE)
 +			iso9660->el_torito.media_type =
 +			    BOOT_MEDIA_1_44M_DISKETTE;
 +		else if (archive_entry_size(entry) == FD_2_88M_SIZE)
 +			iso9660->el_torito.media_type =
 +			    BOOT_MEDIA_2_88M_DISKETTE;
 +		else
 +			/* We cannot decide whether the boot image is
 +			 * hard-disk. */
 +			iso9660->el_torito.media_type =
 +			    BOOT_MEDIA_NO_EMULATION;
 +		break;
 +	case OPT_BOOT_TYPE_NO_EMU:
 +		iso9660->el_torito.media_type = BOOT_MEDIA_NO_EMULATION;
 +		break;
 +	case OPT_BOOT_TYPE_HARD_DISK:
 +		iso9660->el_torito.media_type = BOOT_MEDIA_HARD_DISK;
 +		break;
 +	case OPT_BOOT_TYPE_FD:
 +		entry = iso9660->el_torito.boot->file->entry;
 +		if (archive_entry_size(entry) <= FD_1_2M_SIZE)
 +			iso9660->el_torito.media_type =
 +			    BOOT_MEDIA_1_2M_DISKETTE;
 +		else if (archive_entry_size(entry) <= FD_1_44M_SIZE)
 +			iso9660->el_torito.media_type =
 +			    BOOT_MEDIA_1_44M_DISKETTE;
 +		else if (archive_entry_size(entry) <= FD_2_88M_SIZE)
 +			iso9660->el_torito.media_type =
 +			    BOOT_MEDIA_2_88M_DISKETTE;
 +		else {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Boot image file(``%s'') size is too big "
 +			    "for fd type.",
 +			    iso9660->el_torito.boot_filename.s);
 +			return (ARCHIVE_FATAL);
 +		}
 +		break;
 +	}
 +
 +	/*
 +	 * Get a system type.
 +	 * TODO: `El Torito' specification says "A copy of byte 5 from the
 +	 *       Partition Table found in the boot image".
 +	 */
 +	iso9660->el_torito.system_type = 0;
 +
 +	/*
 +	 * Get an ID.
 +	 */
 +	if (iso9660->opt.publisher)
 +		archive_string_copy(&(iso9660->el_torito.id),
 +		    &(iso9660->publisher_identifier));
 +
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * If a media type is floppy, return its image size.
 + * otherwise return 0.
 + */
 +static size_t
 +fd_boot_image_size(int media_type)
 +{
 +	switch (media_type) {
 +	case BOOT_MEDIA_1_2M_DISKETTE:
 +		return (FD_1_2M_SIZE);
 +	case BOOT_MEDIA_1_44M_DISKETTE:
 +		return (FD_1_44M_SIZE);
 +	case BOOT_MEDIA_2_88M_DISKETTE:
 +		return (FD_2_88M_SIZE);
 +	default:
 +		return (0);
 +	}
 +}
 +
 +/*
 + * Make a boot catalog image data.
 + */
 +static int
 +make_boot_catalog(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	unsigned char *block;
 +	unsigned char *p;
 +	uint16_t sum, *wp;
 +
 +	block = wb_buffptr(a);
 +	memset(block, 0, LOGICAL_BLOCK_SIZE);
 +	p = block;
 +	/*
 +	 * Validation Entry
 +	 */
 +	/* Header ID */
 +	p[0] = 1;
 +	/* Platform ID */
 +	p[1] = iso9660->el_torito.platform_id;
 +	/* Reserved */
 +	p[2] = p[3] = 0;
 +	/* ID */
 +	if (archive_strlen(&(iso9660->el_torito.id)) > 0)
 +		strncpy((char *)p+4, iso9660->el_torito.id.s, 23);
 +	p[27] = 0;
 +	/* Checksum */
 +	p[28] = p[29] = 0;
 +	/* Key */
 +	p[30] = 0x55;
 +	p[31] = 0xAA;
 +
 +	sum = 0;
 +	wp = (uint16_t *)block;
 +	while (wp < (uint16_t *)&block[32])
 +		sum += archive_le16dec(wp++);
 +	set_num_721(&block[28], (~sum) + 1);
 +
 +	/*
 +	 * Initial/Default Entry
 +	 */
 +	p = &block[32];
 +	/* Boot Indicator */
 +	p[0] = 0x88;
 +	/* Boot media type */
 +	p[1] = iso9660->el_torito.media_type;
 +	/* Load Segment */
 +	if (iso9660->el_torito.media_type == BOOT_MEDIA_NO_EMULATION)
 +		set_num_721(&p[2], iso9660->el_torito.boot_load_seg);
 +	else
 +		set_num_721(&p[2], 0);
 +	/* System Type */
 +	p[4] = iso9660->el_torito.system_type;
 +	/* Unused */
 +	p[5] = 0;
 +	/* Sector Count */
 +	if (iso9660->el_torito.media_type == BOOT_MEDIA_NO_EMULATION)
 +		set_num_721(&p[6], iso9660->el_torito.boot_load_size);
 +	else
 +		set_num_721(&p[6], 1);
 +	/* Load RBA */
 +	set_num_731(&p[8],
 +	    iso9660->el_torito.boot->file->content.location);
 +	/* Unused */
 +	memset(&p[12], 0, 20);
 +
 +	return (wb_consume(a, LOGICAL_BLOCK_SIZE));
 +}
 +
 +static int
 +setup_boot_information(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isoent *np;
 +	int64_t size;
 +	uint32_t sum;
 +	unsigned char buff[4096];
 +
 +	np = iso9660->el_torito.boot;
 +	lseek(iso9660->temp_fd,
 +	    np->file->content.offset_of_temp + 64, SEEK_SET);
 +	size = archive_entry_size(np->file->entry) - 64;
 +	if (size <= 0) {
 +		archive_set_error(&a->archive, errno,
 +		    "Boot file(%jd) is too small", (intmax_t)size + 64);
 +		return (ARCHIVE_FATAL);
 +	}
 +	sum = 0;
 +	while (size > 0) {
 +		size_t rsize;
 +		ssize_t i, rs;
 +
 +		if (size > (int64_t)sizeof(buff))
 +			rsize = sizeof(buff);
 +		else
 +			rsize = (size_t)size;
 +
 +		rs = read(iso9660->temp_fd, buff, rsize);
 +		if (rs <= 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Can't read temporary file(%jd)",
 +			    (intmax_t)rs);
 +			return (ARCHIVE_FATAL);
 +		}
 +		for (i = 0; i < rs; i += 4)
 +			sum += archive_le32dec(buff + i);
 +		size -= rs;
 +	}
 +	/* Set the location of Primary Volume Descriptor. */
 +	set_num_731(buff, SYSTEM_AREA_BLOCK);
 +	/* Set the location of the boot file. */
 +	set_num_731(buff+4, np->file->content.location);
 +	/* Set the size of the boot file. */
 +	size = fd_boot_image_size(iso9660->el_torito.media_type);
 +	if (size == 0)
 +		size = archive_entry_size(np->file->entry);
 +	set_num_731(buff+8, (uint32_t)size);
 +	/* Set the sum of the boot file. */
 +	set_num_731(buff+12, sum);
 +	/* Clear reserved bytes. */
 +	memset(buff+16, 0, 40);
 +
 +	/* Overwrite the boot file. */
 +	lseek(iso9660->temp_fd,
 +	    np->file->content.offset_of_temp + 8, SEEK_SET);
 +	return (write_to_temp(a, buff, 56));
 +}
 +
 +#ifdef HAVE_ZLIB_H
 +
 +static int
 +zisofs_init_zstream(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	int r;
 +
 +	iso9660->zisofs.stream.next_in = NULL;
 +	iso9660->zisofs.stream.avail_in = 0;
 +	iso9660->zisofs.stream.total_in = 0;
 +	iso9660->zisofs.stream.total_out = 0;
 +	if (iso9660->zisofs.stream_valid)
 +		r = deflateReset(&(iso9660->zisofs.stream));
 +	else {
 +		r = deflateInit(&(iso9660->zisofs.stream),
 +		    iso9660->zisofs.compression_level);
 +		iso9660->zisofs.stream_valid = 1;
 +	}
 +	switch (r) {
 +	case Z_OK:
 +		break;
 +	default:
 +	case Z_STREAM_ERROR:
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Internal error initializing "
 +		    "compression library: invalid setup parameter");
 +		return (ARCHIVE_FATAL);
 +	case Z_MEM_ERROR:
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Internal error initializing "
 +		    "compression library");
 +		return (ARCHIVE_FATAL);
 +	case Z_VERSION_ERROR:
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Internal error initializing "
 +		    "compression library: invalid library version");
 +		return (ARCHIVE_FATAL);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +#endif /* HAVE_ZLIB_H */
 +
 +static int
 +zisofs_init(struct archive_write *a,  struct isofile *file)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +#ifdef HAVE_ZLIB_H
 +	uint64_t tsize;
 +	size_t _ceil, bpsize;
 +	int r;
 +#endif
 +
 +	iso9660->zisofs.detect_magic = 0;
 +	iso9660->zisofs.making = 0;
 +
 +	if (!iso9660->opt.rr || !iso9660->opt.zisofs)
 +		return (ARCHIVE_OK);
 +
 +	if (archive_entry_size(file->entry) >= 24 &&
 +	    archive_entry_size(file->entry) < MULTI_EXTENT_SIZE) {
 +		/* Acceptable file size for zisofs. */
 +		iso9660->zisofs.detect_magic = 1;
 +		iso9660->zisofs.magic_cnt = 0;
 +	}
 +	if (!iso9660->zisofs.detect_magic)
 +		return (ARCHIVE_OK);
 +
 +#ifdef HAVE_ZLIB_H
 +	/* The number of Logical Blocks which uncompressed data
 +	 * will use in iso-image file is the same as the number of
 +	 * Logical Blocks which zisofs(compressed) data will use
 +	 * in ISO-image file. It won't reduce iso-image file size. */
 +	if (archive_entry_size(file->entry) <= LOGICAL_BLOCK_SIZE)
 +		return (ARCHIVE_OK);
 +
 +	/* Initialize compression library */
 +	r = zisofs_init_zstream(a);
 +	if (r != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Mark file->zisofs to create RRIP 'ZF' Use Entry. */
 +	file->zisofs.header_size = ZF_HEADER_SIZE >> 2;
 +	file->zisofs.log2_bs = ZF_LOG2_BS;
 +	file->zisofs.uncompressed_size =
 +		(uint32_t)archive_entry_size(file->entry);
 +
 +	/* Calculate a size of Block Pointers of zisofs. */
 +	_ceil = (file->zisofs.uncompressed_size + ZF_BLOCK_SIZE -1)
 +		>> file->zisofs.log2_bs;
 +	iso9660->zisofs.block_pointers_cnt = (int)_ceil + 1;
 +	iso9660->zisofs.block_pointers_idx = 0;
 +
 +	/* Ensure a buffer size used for Block Pointers */
 +	bpsize = iso9660->zisofs.block_pointers_cnt *
 +	    sizeof(iso9660->zisofs.block_pointers[0]);
 +	if (iso9660->zisofs.block_pointers_allocated < bpsize) {
 +		free(iso9660->zisofs.block_pointers);
 +		iso9660->zisofs.block_pointers = malloc(bpsize);
 +		if (iso9660->zisofs.block_pointers == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate data");
 +			return (ARCHIVE_FATAL);
 +		}
 +		iso9660->zisofs.block_pointers_allocated = bpsize;
 +	}
 +
 +	/*
 +	 * Skip zisofs header and Block Pointers, which we will write
 +	 * after all compressed data of a file written to the temporary
 +	 * file.
 +	 */
 +	tsize = ZF_HEADER_SIZE + bpsize;
 +	if (write_null(a, (size_t)tsize) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/*
 +	 * Initialize some variables to make zisofs.
 +	 */
 +	archive_le32enc(&(iso9660->zisofs.block_pointers[0]),
 +		(uint32_t)tsize);
 +	iso9660->zisofs.remaining = file->zisofs.uncompressed_size;
 +	iso9660->zisofs.making = 1;
 +	iso9660->zisofs.allzero = 1;
 +	iso9660->zisofs.block_offset = tsize;
 +	iso9660->zisofs.total_size = tsize;
 +	iso9660->cur_file->cur_content->size = tsize;
 +#endif
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +zisofs_detect_magic(struct archive_write *a, const void *buff, size_t s)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isofile *file = iso9660->cur_file;
 +	const unsigned char *p, *endp;
 +	const unsigned char *magic_buff;
 +	uint32_t uncompressed_size;
 +	unsigned char header_size;
 +	unsigned char log2_bs;
 +	size_t _ceil, doff;
 +	uint32_t bst, bed;
 +	int magic_max;
 +	int64_t entry_size;
 +
 +	entry_size = archive_entry_size(file->entry);
 +	if ((int64_t)sizeof(iso9660->zisofs.magic_buffer) > entry_size)
 +		magic_max = (int)entry_size;
 +	else
 +		magic_max = sizeof(iso9660->zisofs.magic_buffer);
 +
 +	if (iso9660->zisofs.magic_cnt == 0 && s >= (size_t)magic_max)
 +		/* It's unnecessary we copy buffer. */
 +		magic_buff = buff;
 +	else {
 +		if (iso9660->zisofs.magic_cnt < magic_max) {
 +			size_t l;
 +
 +			l = sizeof(iso9660->zisofs.magic_buffer)
 +			    - iso9660->zisofs.magic_cnt;
 +			if (l > s)
 +				l = s;
 +			memcpy(iso9660->zisofs.magic_buffer
 +			    + iso9660->zisofs.magic_cnt, buff, l);
 +			iso9660->zisofs.magic_cnt += (int)l;
 +			if (iso9660->zisofs.magic_cnt < magic_max)
 +				return;
 +		}
 +		magic_buff = iso9660->zisofs.magic_buffer;
 +	}
 +	iso9660->zisofs.detect_magic = 0;
 +	p = magic_buff;
 +
 +	/* Check the magic code of zisofs. */
 +	if (memcmp(p, zisofs_magic, sizeof(zisofs_magic)) != 0)
 +		/* This is not zisofs file which made by mkzftree. */
 +		return;
 +	p += sizeof(zisofs_magic);
 +
 +	/* Read a zisofs header. */
 +	uncompressed_size = archive_le32dec(p);
 +	header_size = p[4];
 +	log2_bs = p[5];
 +	if (uncompressed_size < 24 || header_size != 4 ||
 +	    log2_bs > 30 || log2_bs < 7)
 +		return;/* Invalid or not supported header. */
 +
 +	/* Calculate a size of Block Pointers of zisofs. */
 +	_ceil = (uncompressed_size +
 +	        (ARCHIVE_LITERAL_LL(1) << log2_bs) -1) >> log2_bs;
 +	doff = (_ceil + 1) * 4 + 16;
 +	if (entry_size < (int64_t)doff)
 +		return;/* Invalid data. */
 +
 +	/* Check every Block Pointer has valid value. */
 +	p = magic_buff + 16;
 +	endp = magic_buff + magic_max;
 +	while (_ceil && p + 8 <= endp) {
 +		bst = archive_le32dec(p);
 +		if (bst != doff)
 +			return;/* Invalid data. */
 +		p += 4;
 +		bed = archive_le32dec(p);
 +		if (bed < bst || bed > entry_size)
 +			return;/* Invalid data. */
 +		doff += bed - bst;
 +		_ceil--;
 +	}
 +
 +	file->zisofs.uncompressed_size = uncompressed_size;
 +	file->zisofs.header_size = header_size;
 +	file->zisofs.log2_bs = log2_bs;
 +
 +	/* Disable making a zisofs image. */
 +	iso9660->zisofs.making = 0;
 +}
 +
 +#ifdef HAVE_ZLIB_H
 +
 +/*
 + * Compress data and write it to a temporary file.
 + */
 +static int
 +zisofs_write_to_temp(struct archive_write *a, const void *buff, size_t s)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isofile *file = iso9660->cur_file;
 +	const unsigned char *b;
 +	z_stream *zstrm;
 +	size_t avail, csize;
 +	int flush, r;
 +
 +	zstrm = &(iso9660->zisofs.stream);
 +	zstrm->next_out = wb_buffptr(a);
 +	zstrm->avail_out = (uInt)wb_remaining(a);
 +	b = (const unsigned char *)buff;
 +	do {
 +		avail = ZF_BLOCK_SIZE - zstrm->total_in;
 +		if (s < avail) {
 +			avail = s;
 +			flush = Z_NO_FLUSH;
 +		} else
 +			flush = Z_FINISH;
 +		iso9660->zisofs.remaining -= avail;
 +		if (iso9660->zisofs.remaining <= 0)
 +			flush = Z_FINISH;
 +
 +		zstrm->next_in = (Bytef *)(uintptr_t)(const void *)b;
 +		zstrm->avail_in = (uInt)avail;
 +
 +		/*
 +		 * Check if current data block are all zero.
 +		 */
 +		if (iso9660->zisofs.allzero) {
 +			const unsigned char *nonzero = b;
 +			const unsigned char *nonzeroend = b + avail;
 +
 +			while (nonzero < nonzeroend)
 +				if (*nonzero++) {
 +					iso9660->zisofs.allzero = 0;
 +					break;
 +				}
 +		}
 +		b += avail;
 +		s -= avail;
 +
 +		/*
 +		 * If current data block are all zero, we do not use
 +		 * compressed data.
 +		 */
 +		if (flush == Z_FINISH && iso9660->zisofs.allzero &&
 +		    avail + zstrm->total_in == ZF_BLOCK_SIZE) {
 +			if (iso9660->zisofs.block_offset !=
 +			    file->cur_content->size) {
 +				int64_t diff;
 +
 +				r = wb_set_offset(a,
 +				    file->cur_content->offset_of_temp +
 +				        iso9660->zisofs.block_offset);
 +				if (r != ARCHIVE_OK)
 +					return (r);
 +				diff = file->cur_content->size -
 +				    iso9660->zisofs.block_offset;
 +				file->cur_content->size -= diff;
 +				iso9660->zisofs.total_size -= diff;
 +			}
 +			zstrm->avail_in = 0;
 +		}
 +
 +		/*
 +		 * Compress file data.
 +		 */
 +		while (zstrm->avail_in > 0) {
 +			csize = zstrm->total_out;
 +			r = deflate(zstrm, flush);
 +			switch (r) {
 +			case Z_OK:
 +			case Z_STREAM_END:
 +				csize = zstrm->total_out - csize;
 +				if (wb_consume(a, csize) != ARCHIVE_OK)
 +					return (ARCHIVE_FATAL);
 +				iso9660->zisofs.total_size += csize;
 +				iso9660->cur_file->cur_content->size += csize;
 +				zstrm->next_out = wb_buffptr(a);
 +				zstrm->avail_out = (uInt)wb_remaining(a);
 +				break;
 +			default:
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "Compression failed:"
 +				    " deflate() call returned status %d",
 +				    r);
 +				return (ARCHIVE_FATAL);
 +			}
 +		}
 +
 +		if (flush == Z_FINISH) {
 +			/*
 +			 * Save the information of one zisofs block.
 +			 */
 +			iso9660->zisofs.block_pointers_idx ++;
 +			archive_le32enc(&(iso9660->zisofs.block_pointers[
 +			    iso9660->zisofs.block_pointers_idx]),
 +				(uint32_t)iso9660->zisofs.total_size);
 +			r = zisofs_init_zstream(a);
 +			if (r != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +			iso9660->zisofs.allzero = 1;
 +			iso9660->zisofs.block_offset = file->cur_content->size;
 +		}
 +	} while (s);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +zisofs_finish_entry(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isofile *file = iso9660->cur_file;
 +	unsigned char buff[16];
 +	size_t s;
 +	int64_t tail;
 +
 +	/* Direct temp file stream to zisofs temp file stream. */
 +	archive_entry_set_size(file->entry, iso9660->zisofs.total_size);
 +
 +	/*
 +	 * Save a file pointer which points the end of current zisofs data.
 +	 */
 +	tail = wb_offset(a);
 +
 +	/*
 +	 * Make a header.
 +	 *
 +	 * +-----------------+----------------+-----------------+
 +	 * | Header 16 bytes | Block Pointers | Compressed data |
 +	 * +-----------------+----------------+-----------------+
 +	 * 0                16               +X
 +	 * Block Pointers :
 +	 *   4 * (((Uncompressed file size + block_size -1) / block_size) + 1)
 +	 *
 +	 * Write zisofs header.
 +	 *    Magic number
 +	 * +----+----+----+----+----+----+----+----+
 +	 * | 37 | E4 | 53 | 96 | C9 | DB | D6 | 07 |
 +	 * +----+----+----+----+----+----+----+----+
 +	 * 0    1    2    3    4    5    6    7    8
 +	 *
 +	 * +------------------------+------------------+
 +	 * | Uncompressed file size | header_size >> 2 |
 +	 * +------------------------+------------------+
 +	 * 8                       12                 13
 +	 *
 +	 * +-----------------+----------------+
 +	 * | log2 block_size | Reserved(0000) |
 +	 * +-----------------+----------------+
 +	 * 13               14               16
 +	 */
 +	memcpy(buff, zisofs_magic, 8);
 +	set_num_731(buff+8, file->zisofs.uncompressed_size);
 +	buff[12] = file->zisofs.header_size;
 +	buff[13] = file->zisofs.log2_bs;
 +	buff[14] = buff[15] = 0;/* Reserved */
 +
 +	/* Move to the right position to write the header. */
 +	wb_set_offset(a, file->content.offset_of_temp);
 +
 +	/* Write the header. */
 +	if (wb_write_to_temp(a, buff, 16) != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/*
 +	 * Write zisofs Block Pointers.
 +	 */
 +	s = iso9660->zisofs.block_pointers_cnt *
 +	    sizeof(iso9660->zisofs.block_pointers[0]);
 +	if (wb_write_to_temp(a, iso9660->zisofs.block_pointers, s)
 +	    != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +
 +	/* Set a file pointer back to the end of the temporary file. */
 +	wb_set_offset(a, tail);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +zisofs_free(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	int ret = ARCHIVE_OK;
 +
 +	free(iso9660->zisofs.block_pointers);
 +	if (iso9660->zisofs.stream_valid &&
 +	    deflateEnd(&(iso9660->zisofs.stream)) != Z_OK) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Failed to clean up compressor");
 +		ret = ARCHIVE_FATAL;
 +	}
 +	iso9660->zisofs.block_pointers = NULL;
 +	iso9660->zisofs.stream_valid = 0;
 +	return (ret);
 +}
 +
 +struct zisofs_extract {
 +	int		 pz_log2_bs; /* Log2 of block size */
 +	uint64_t	 pz_uncompressed_size;
 +	size_t		 uncompressed_buffer_size;
 +
 +	int		 initialized:1;
 +	int		 header_passed:1;
 +
 +	uint32_t	 pz_offset;
 +	unsigned char	*block_pointers;
 +	size_t		 block_pointers_size;
 +	size_t		 block_pointers_avail;
 +	size_t		 block_off;
 +	uint32_t	 block_avail;
 +
 +	z_stream	 stream;
 +	int		 stream_valid;
 +};
 +
 +static ssize_t
 +zisofs_extract_init(struct archive_write *a, struct zisofs_extract *zisofs,
 +    const unsigned char *p, size_t bytes)
 +{
 +	size_t avail = bytes;
 +	size_t _ceil, xsize;
 +
 +	/* Allocate block pointers buffer. */
 +	_ceil = (size_t)((zisofs->pz_uncompressed_size +
 +		(((int64_t)1) << zisofs->pz_log2_bs) - 1)
 +		>> zisofs->pz_log2_bs);
 +	xsize = (_ceil + 1) * 4;
 +	if (zisofs->block_pointers == NULL) {
 +		size_t alloc = ((xsize >> 10) + 1) << 10;
 +		zisofs->block_pointers = malloc(alloc);
 +		if (zisofs->block_pointers == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "No memory for zisofs decompression");
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +	zisofs->block_pointers_size = xsize;
 +
 +	/* Allocate uncompressed data buffer. */
 +	zisofs->uncompressed_buffer_size = (size_t)1UL << zisofs->pz_log2_bs;
 +
 +	/*
 +	 * Read the file header, and check the magic code of zisofs.
 +	 */
 +	if (!zisofs->header_passed) {
 +		int err = 0;
 +		if (avail < 16) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Illegal zisofs file body");
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		if (memcmp(p, zisofs_magic, sizeof(zisofs_magic)) != 0)
 +			err = 1;
 +		else if (archive_le32dec(p + 8) != zisofs->pz_uncompressed_size)
 +			err = 1;
 +		else if (p[12] != 4 || p[13] != zisofs->pz_log2_bs)
 +			err = 1;
 +		if (err) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Illegal zisofs file body");
 +			return (ARCHIVE_FATAL);
 +		}
 +		avail -= 16;
 +		p += 16;
 +		zisofs->header_passed = 1;
 +	}
 +
 +	/*
 +	 * Read block pointers.
 +	 */
 +	if (zisofs->header_passed &&
 +	    zisofs->block_pointers_avail < zisofs->block_pointers_size) {
 +		xsize = zisofs->block_pointers_size
 +		    - zisofs->block_pointers_avail;
 +		if (avail < xsize)
 +			xsize = avail;
 +		memcpy(zisofs->block_pointers
 +		    + zisofs->block_pointers_avail, p, xsize);
 +		zisofs->block_pointers_avail += xsize;
 +		avail -= xsize;
 +	    	if (zisofs->block_pointers_avail
 +		    == zisofs->block_pointers_size) {
 +			/* We've got all block pointers and initialize
 +			 * related variables.	*/
 +			zisofs->block_off = 0;
 +			zisofs->block_avail = 0;
 +			/* Complete a initialization */
 +			zisofs->initialized = 1;
 +		}
 +	}
 +	return ((ssize_t)avail);
 +}
 +
 +static ssize_t
 +zisofs_extract(struct archive_write *a, struct zisofs_extract *zisofs,
 +    const unsigned char *p, size_t bytes)
 +{
 +	size_t avail;
 +	int r;
 +
 +	if (!zisofs->initialized) {
 +		ssize_t rs = zisofs_extract_init(a, zisofs, p, bytes);
 +		if (rs < 0)
 +			return (rs);
 +		if (!zisofs->initialized) {
 +			/* We need more data. */
 +			zisofs->pz_offset += (uint32_t)bytes;
 +			return (bytes);
 +		}
 +		avail = rs;
 +		p += bytes - avail;
 +	} else
 +		avail = bytes;
 +
 +	/*
 +	 * Get block offsets from block pointers.
 +	 */
 +	if (zisofs->block_avail == 0) {
 +		uint32_t bst, bed;
 +
 +		if (zisofs->block_off + 4 >= zisofs->block_pointers_size) {
 +			/* There isn't a pair of offsets. */
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Illegal zisofs block pointers");
 +			return (ARCHIVE_FATAL);
 +		}
 +		bst = archive_le32dec(
 +		    zisofs->block_pointers + zisofs->block_off);
 +		if (bst != zisofs->pz_offset + (bytes - avail)) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Illegal zisofs block pointers(cannot seek)");
 +			return (ARCHIVE_FATAL);
 +		}
 +		bed = archive_le32dec(
 +		    zisofs->block_pointers + zisofs->block_off + 4);
 +		if (bed < bst) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Illegal zisofs block pointers");
 +			return (ARCHIVE_FATAL);
 +		}
 +		zisofs->block_avail = bed - bst;
 +		zisofs->block_off += 4;
 +
 +		/* Initialize compression library for new block. */
 +		if (zisofs->stream_valid)
 +			r = inflateReset(&zisofs->stream);
 +		else
 +			r = inflateInit(&zisofs->stream);
 +		if (r != Z_OK) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Can't initialize zisofs decompression.");
 +			return (ARCHIVE_FATAL);
 +		}
 +		zisofs->stream_valid = 1;
 +		zisofs->stream.total_in = 0;
 +		zisofs->stream.total_out = 0;
 +	}
 +
 +	/*
 +	 * Make uncompressed data.
 +	 */
 +	if (zisofs->block_avail == 0) {
 +		/*
 +		 * It's basically 32K bytes NUL data.
 +		 */
 +		unsigned char *wb;
 +		size_t size, wsize;
 +
 +		size = zisofs->uncompressed_buffer_size;
 +		while (size) {
 +			wb = wb_buffptr(a);
 +			if (size > wb_remaining(a))
 +				wsize = wb_remaining(a);
 +			else
 +				wsize = size;
 +			memset(wb, 0, wsize);
 +			r = wb_consume(a, wsize);
 +			if (r < 0)
 +				return (r);
 +			size -= wsize;
 +		}
 +	} else {
 +		zisofs->stream.next_in = (Bytef *)(uintptr_t)(const void *)p;
 +		if (avail > zisofs->block_avail)
 +			zisofs->stream.avail_in = zisofs->block_avail;
 +		else
 +			zisofs->stream.avail_in = (uInt)avail;
 +		zisofs->stream.next_out = wb_buffptr(a);
 +		zisofs->stream.avail_out = (uInt)wb_remaining(a);
 +
 +		r = inflate(&zisofs->stream, 0);
 +		switch (r) {
 +		case Z_OK: /* Decompressor made some progress.*/
 +		case Z_STREAM_END: /* Found end of stream. */
 +			break;
 +		default:
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "zisofs decompression failed (%d)", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		avail -= zisofs->stream.next_in - p;
 +		zisofs->block_avail -= (uint32_t)(zisofs->stream.next_in - p);
 +		r = wb_consume(a, wb_remaining(a) - zisofs->stream.avail_out);
 +		if (r < 0)
 +			return (r);
 +	}
 +	zisofs->pz_offset += (uint32_t)bytes;
 +	return (bytes - avail);
 +}
 +
 +static int
 +zisofs_rewind_boot_file(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +	struct isofile *file;
 +	unsigned char *rbuff;
 +	ssize_t r;
 +	size_t remaining, rbuff_size;
 +	struct zisofs_extract zext;
 +	int64_t read_offset, write_offset, new_offset;
 +	int fd, ret = ARCHIVE_OK;
 +
 +	file = iso9660->el_torito.boot->file;
 +	/*
 +	 * There is nothing to do if this boot file does not have
 +	 * zisofs header.
 +	 */
 +	if (file->zisofs.header_size == 0)
 +		return (ARCHIVE_OK);
 +
 +	/*
 +	 * Uncompress the zisofs'ed file contents.
 +	 */
 +	memset(&zext, 0, sizeof(zext));
 +	zext.pz_uncompressed_size = file->zisofs.uncompressed_size;
 +	zext.pz_log2_bs = file->zisofs.log2_bs;
 +
 +	fd = iso9660->temp_fd;
 +	new_offset = wb_offset(a);
 +	read_offset = file->content.offset_of_temp;
 +	remaining = (size_t)file->content.size;
 +	if (remaining > 1024 * 32)
 +		rbuff_size = 1024 * 32;
 +	else
 +		rbuff_size = remaining;
 +
 +	rbuff = malloc(rbuff_size);
 +	if (rbuff == NULL) {
 +		archive_set_error(&a->archive, ENOMEM, "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	while (remaining) {
 +		size_t rsize;
 +		ssize_t rs;
 +
 +		/* Get the current file pointer. */
 +		write_offset = lseek(fd, 0, SEEK_CUR);
 +
 +		/* Change the file pointer to read. */
 +		lseek(fd, read_offset, SEEK_SET);
 +
 +		rsize = rbuff_size;
 +		if (rsize > remaining)
 +			rsize = remaining;
 +		rs = read(iso9660->temp_fd, rbuff, rsize);
 +		if (rs <= 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Can't read temporary file(%jd)", (intmax_t)rs);
 +			ret = ARCHIVE_FATAL;
 +			break;
 +		}
 +		remaining -= rs;
 +		read_offset += rs;
 +
 +		/* Put the file pointer back to write. */
 +		lseek(fd, write_offset, SEEK_SET);
 +
 +		r = zisofs_extract(a, &zext, rbuff, rs);
 +		if (r < 0) {
 +			ret = (int)r;
 +			break;
 +		}
 +	}
 +
 +	if (ret == ARCHIVE_OK) {
 +		/*
 +		 * Change the boot file content from zisofs'ed data
 +		 * to plain data.
 +		 */
 +		file->content.offset_of_temp = new_offset;
 +		file->content.size = file->zisofs.uncompressed_size;
 +		archive_entry_set_size(file->entry, file->content.size);
 +		/* Set to be no zisofs. */
 +		file->zisofs.header_size = 0;
 +		file->zisofs.log2_bs = 0;
 +		file->zisofs.uncompressed_size = 0;
 +		r = wb_write_padding_to_temp(a, file->content.size);
 +		if (r < 0)
 +			ret = ARCHIVE_FATAL;
 +	}
 +
 +	/*
 +	 * Free the resource we used in this function only.
 +	 */
 +	free(rbuff);
 +	free(zext.block_pointers);
 +	if (zext.stream_valid && inflateEnd(&(zext.stream)) != Z_OK) {
 +        	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Failed to clean up compressor");
 +		ret = ARCHIVE_FATAL;
 +	}
 +
 +	return (ret);
 +}
 +
 +#else
 +
 +static int
 +zisofs_write_to_temp(struct archive_write *a, const void *buff, size_t s)
 +{
 +	(void)buff; /* UNUSED */
 +	(void)s; /* UNUSED */
 +	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Programing error");
 +	return (ARCHIVE_FATAL);
 +}
 +
 +static int
 +zisofs_rewind_boot_file(struct archive_write *a)
 +{
 +	struct iso9660 *iso9660 = a->format_data;
 +
 +	if (iso9660->el_torito.boot->file->zisofs.header_size != 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "We cannot extract the zisofs imaged boot file;"
 +		    " this may not boot in being zisofs imaged");
 +		return (ARCHIVE_FAILED);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +zisofs_finish_entry(struct archive_write *a)
 +{
 +	(void)a; /* UNUSED */
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +zisofs_free(struct archive_write *a)
 +{
 +	(void)a; /* UNUSED */
 +	return (ARCHIVE_OK);
 +}
 +
 +#endif /* HAVE_ZLIB_H */
 +
diff --cc Utilities/cmlibarchive/libarchive/archive_write_set_format_mtree.c
index b0c8018,0000000..b686303
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_mtree.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_mtree.c
@@@ -1,2228 -1,0 +1,2228 @@@
 +/*-
 + * Copyright (c) 2008 Joerg Sonnenberger
 + * Copyright (c) 2009-2012 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_mtree.c 201171 2009-12-29 06:39:07Z kientzle $");
 +
 +#ifdef HAVE_SYS_TYPES_H
 +#include <sys/types.h>
 +#endif
 +#include <errno.h>
 +#include <stdlib.h>
 +#include <string.h>
 +
 +#include "archive.h"
- #include "archive_crypto_private.h"
++#include "archive_digest_private.h"
 +#include "archive_entry.h"
 +#include "archive_private.h"
 +#include "archive_rb.h"
 +#include "archive_string.h"
 +#include "archive_write_private.h"
 +
 +#define INDENTNAMELEN	15
 +#define MAXLINELEN	80
 +#define SET_KEYS	\
 +	(F_FLAGS | F_GID | F_GNAME | F_MODE | F_TYPE | F_UID | F_UNAME)
 +
 +struct attr_counter {
 +	struct attr_counter *prev;
 +	struct attr_counter *next;
 +	struct mtree_entry *m_entry;
 +	int count;
 +};
 +
 +struct att_counter_set {
 +	struct attr_counter *uid_list;
 +	struct attr_counter *gid_list;
 +	struct attr_counter *mode_list;
 +	struct attr_counter *flags_list;
 +};
 +
 +struct mtree_chain {
 +	struct mtree_entry *first;
 +	struct mtree_entry **last;
 +};
 +
 +/*
 + * The Data only for a directory file.
 + */
 +struct dir_info {
 +	struct archive_rb_tree rbtree;
 +	struct mtree_chain children;
 +	struct mtree_entry *chnext;
 +	int virtual;
 +};
 +
 +/*
 + * The Data only for a regular file.
 + */
 +struct reg_info {
 +	int compute_sum;
 +	uint32_t crc;
 +#ifdef ARCHIVE_HAS_MD5
 +	unsigned char buf_md5[16];
 +#endif
 +#ifdef ARCHIVE_HAS_RMD160
 +	unsigned char buf_rmd160[20];
 +#endif
 +#ifdef ARCHIVE_HAS_SHA1
 +	unsigned char buf_sha1[20];
 +#endif
 +#ifdef ARCHIVE_HAS_SHA256
 +	unsigned char buf_sha256[32];
 +#endif
 +#ifdef ARCHIVE_HAS_SHA384
 +	unsigned char buf_sha384[48];
 +#endif
 +#ifdef ARCHIVE_HAS_SHA512
 +	unsigned char buf_sha512[64];
 +#endif
 +};
 +
 +struct mtree_entry {
 +	struct archive_rb_node rbnode;
 +	struct mtree_entry *next;
 +	struct mtree_entry *parent;
 +	struct dir_info *dir_info;
 +	struct reg_info *reg_info;
 +
 +	struct archive_string parentdir;
 +	struct archive_string basename;
 +	struct archive_string pathname;
 +	struct archive_string symlink;
 +	struct archive_string uname;
 +	struct archive_string gname;
 +	struct archive_string fflags_text;
 +	unsigned int nlink;
 +	mode_t filetype;
 +	mode_t mode;
 +	int64_t size;
 +	int64_t uid;
 +	int64_t gid;
 +	time_t mtime;
 +	long mtime_nsec;
 +	unsigned long fflags_set;
 +	unsigned long fflags_clear;
 +	dev_t rdevmajor;
 +	dev_t rdevminor;
 +	dev_t devmajor;
 +	dev_t devminor;
 +	int64_t ino;
 +};
 +
 +struct mtree_writer {
 +	struct mtree_entry *mtree_entry;
 +	struct mtree_entry *root;
 +	struct mtree_entry *cur_dirent;
 +	struct archive_string cur_dirstr;
 +	struct mtree_chain file_list;
 +
 +	struct archive_string ebuf;
 +	struct archive_string buf;
 +	int first;
 +	uint64_t entry_bytes_remaining;
 +
 +	/*
 +	 * Set global value.
 +	 */
 +	struct {
 +		int		processing;
 +		mode_t		type;
 +		int		keys;
 +		int64_t		uid;
 +		int64_t		gid;
 +		mode_t		mode;
 +		unsigned long	fflags_set;
 +		unsigned long	fflags_clear;
 +	} set;
 +	struct att_counter_set	acs;
 +	int classic;
 +	int depth;
 +
 +	/* check sum */
 +	int compute_sum;
 +	uint32_t crc;
 +	uint64_t crc_len;
 +#ifdef ARCHIVE_HAS_MD5
 +	archive_md5_ctx md5ctx;
 +#endif
 +#ifdef ARCHIVE_HAS_RMD160
 +	archive_rmd160_ctx rmd160ctx;
 +#endif
 +#ifdef ARCHIVE_HAS_SHA1
 +	archive_sha1_ctx sha1ctx;
 +#endif
 +#ifdef ARCHIVE_HAS_SHA256
 +	archive_sha256_ctx sha256ctx;
 +#endif
 +#ifdef ARCHIVE_HAS_SHA384
 +	archive_sha384_ctx sha384ctx;
 +#endif
 +#ifdef ARCHIVE_HAS_SHA512
 +	archive_sha512_ctx sha512ctx;
 +#endif
 +	/* Keyword options */
 +	int keys;
 +#define	F_CKSUM		0x00000001		/* check sum */
 +#define	F_DEV		0x00000002		/* device type */
 +#define	F_DONE		0x00000004		/* directory done */
 +#define	F_FLAGS		0x00000008		/* file flags */
 +#define	F_GID		0x00000010		/* gid */
 +#define	F_GNAME		0x00000020		/* group name */
 +#define	F_IGN		0x00000040		/* ignore */
 +#define	F_MAGIC		0x00000080		/* name has magic chars */
 +#define	F_MD5		0x00000100		/* MD5 digest */
 +#define	F_MODE		0x00000200		/* mode */
 +#define	F_NLINK		0x00000400		/* number of links */
 +#define	F_NOCHANGE 	0x00000800		/* If owner/mode "wrong", do
 +						 * not change */
 +#define	F_OPT		0x00001000		/* existence optional */
 +#define	F_RMD160 	0x00002000		/* RIPEMD160 digest */
 +#define	F_SHA1		0x00004000		/* SHA-1 digest */
 +#define	F_SIZE		0x00008000		/* size */
 +#define	F_SLINK		0x00010000		/* symbolic link */
 +#define	F_TAGS		0x00020000		/* tags */
 +#define	F_TIME		0x00040000		/* modification time */
 +#define	F_TYPE		0x00080000		/* file type */
 +#define	F_UID		0x00100000		/* uid */
 +#define	F_UNAME		0x00200000		/* user name */
 +#define	F_VISIT		0x00400000		/* file visited */
 +#define	F_SHA256	0x00800000		/* SHA-256 digest */
 +#define	F_SHA384	0x01000000		/* SHA-384 digest */
 +#define	F_SHA512	0x02000000		/* SHA-512 digest */
 +#define	F_INO		0x04000000		/* inode number */
 +#define	F_RESDEV	0x08000000		/* device ID on which the
 +						 * entry resides */
 +
 +	/* Options */
 +	int dironly;		/* If it is set, ignore all files except
 +				 * directory files, like mtree(8) -d option. */
 +	int indent;		/* If it is set, indent output data. */
 +	int output_global_set;	/* If it is set, use /set keyword to set
 +				 * global values. When generating mtree
 +				 * classic format, it is set by default. */
 +};
 +
 +#define DEFAULT_KEYS	(F_DEV | F_FLAGS | F_GID | F_GNAME | F_SLINK | F_MODE\
 +			 | F_NLINK | F_SIZE | F_TIME | F_TYPE | F_UID\
 +			 | F_UNAME)
 +#define attr_counter_set_reset	attr_counter_set_free
 +
 +static void attr_counter_free(struct attr_counter **);
 +static int attr_counter_inc(struct attr_counter **, struct attr_counter *,
 +	struct attr_counter *, struct mtree_entry *);
 +static struct attr_counter * attr_counter_new(struct mtree_entry *,
 +	struct attr_counter *);
 +static int attr_counter_set_collect(struct mtree_writer *,
 +	struct mtree_entry *);
 +static void attr_counter_set_free(struct mtree_writer *);
 +static int get_global_set_keys(struct mtree_writer *, struct mtree_entry *);
 +static int mtree_entry_add_child_tail(struct mtree_entry *,
 +	struct mtree_entry *);
 +static int mtree_entry_create_virtual_dir(struct archive_write *, const char *,
 +	struct mtree_entry **);
 +static int mtree_entry_cmp_node(const struct archive_rb_node *,
 +	const struct archive_rb_node *);
 +static int mtree_entry_cmp_key(const struct archive_rb_node *, const void *);
 +static int mtree_entry_exchange_same_entry(struct archive_write *,
 +    struct mtree_entry *, struct mtree_entry *);
 +static void mtree_entry_free(struct mtree_entry *);
 +static int mtree_entry_new(struct archive_write *, struct archive_entry *,
 +	struct mtree_entry **);
 +static void mtree_entry_register_free(struct mtree_writer *);
 +static void mtree_entry_register_init(struct mtree_writer *);
 +static int mtree_entry_setup_filenames(struct archive_write *,
 +	struct mtree_entry *, struct archive_entry *);
 +static int mtree_entry_tree_add(struct archive_write *, struct mtree_entry **);
 +static void sum_init(struct mtree_writer *);
 +static void sum_update(struct mtree_writer *, const void *, size_t);
 +static void sum_final(struct mtree_writer *, struct reg_info *);
 +static void sum_write(struct archive_string *, struct reg_info *);
 +static int write_mtree_entry(struct archive_write *, struct mtree_entry *);
 +static int write_dot_dot_entry(struct archive_write *, struct mtree_entry *);
 +
 +#define	COMPUTE_CRC(var, ch)	(var) = (var) << 8 ^ crctab[(var) >> 24 ^ (ch)]
 +static const uint32_t crctab[] = {
 +	0x0,
 +	0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
 +	0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
 +	0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
 +	0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x5f15adac,
 +	0x5bd4b01b, 0x569796c2, 0x52568b75, 0x6a1936c8, 0x6ed82b7f,
 +	0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, 0x709f7b7a,
 +	0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
 +	0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58,
 +	0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033,
 +	0xa4ad16ea, 0xa06c0b5d, 0xd4326d90, 0xd0f37027, 0xddb056fe,
 +	0xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
 +	0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0xe13ef6f4,
 +	0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
 +	0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5,
 +	0x2ac12072, 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
 +	0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, 0x7897ab07,
 +	0x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, 0x6f52c06c,
 +	0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1,
 +	0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
 +	0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b,
 +	0xbb60adfc, 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698,
 +	0x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, 0x902b669d,
 +	0x94ea7b2a, 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
 +	0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, 0xc6bcf05f,
 +	0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
 +	0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80,
 +	0x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
 +	0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x5c007b8a,
 +	0x58c1663d, 0x558240e4, 0x51435d53, 0x251d3b9e, 0x21dc2629,
 +	0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, 0x3f9b762c,
 +	0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
 +	0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e,
 +	0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65,
 +	0xeba91bbc, 0xef68060b, 0xd727bbb6, 0xd3e6a601, 0xdea580d8,
 +	0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
 +	0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, 0xae3afba2,
 +	0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
 +	0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74,
 +	0x857130c3, 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
 +	0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, 0x7b827d21,
 +	0x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, 0x6c47164a,
 +	0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, 0x18197087,
 +	0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
 +	0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d,
 +	0x2056cd3a, 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce,
 +	0xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb,
 +	0xdbee767c, 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
 +	0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, 0x89b8fd09,
 +	0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
 +	0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf,
 +	0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
 +};
 +
 +static const unsigned char safe_char[256] = {
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 00 - 0F */
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 10 - 1F */
 +	/* !"$%&'()*+,-./  EXCLUSION:0x20( ) 0x23(#) */
 +	0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 20 - 2F */
 +	/* 0123456789:;<>?  EXCLUSION:0x3d(=) */
 +	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, /* 30 - 3F */
 +	/* @ABCDEFGHIJKLMNO */
 +	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 40 - 4F */
 +	/* PQRSTUVWXYZ[]^_ EXCLUSION:0x5c(\)  */
 +	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, /* 50 - 5F */
 +	/* `abcdefghijklmno */
 +	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 60 - 6F */
 +	/* pqrstuvwxyz{|}~ */
 +	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, /* 70 - 7F */
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80 - 8F */
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 90 - 9F */
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* A0 - AF */
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* B0 - BF */
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* C0 - CF */
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* D0 - DF */
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* E0 - EF */
 +	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* F0 - FF */
 +};
 +
 +static void
 +mtree_quote(struct archive_string *s, const char *str)
 +{
 +	const char *start;
 +	char buf[4];
 +	unsigned char c;
 +
 +	for (start = str; *str != '\0'; ++str) {
 +		if (safe_char[*(const unsigned char *)str])
 +			continue;
 +		if (start != str)
 +			archive_strncat(s, start, str - start);
 +		c = (unsigned char)*str;
 +		buf[0] = '\\';
 +		buf[1] = (c / 64) + '0';
 +		buf[2] = (c / 8 % 8) + '0';
 +		buf[3] = (c % 8) + '0';
 +		archive_strncat(s, buf, 4);
 +		start = str + 1;
 +	}
 +
 +	if (start != str)
 +		archive_strncat(s, start, str - start);
 +}
 +
 +/*
 + * Indent a line as mtree utility to be readable for people.
 + */
 +static void
 +mtree_indent(struct mtree_writer *mtree)
 +{
 +	int i, fn, nd, pd;
 +	const char *r, *s, *x;
 +
 +	if (mtree->classic) {
 +		if (mtree->indent) {
 +			nd = 0;
 +			pd = mtree->depth * 4;
 +		} else {
 +			nd = mtree->depth?4:0;
 +			pd = 0;
 +		}
 +	} else
 +		nd = pd = 0;
 +	fn = 1;
 +	s = r = mtree->ebuf.s;
 +	x = NULL;
 +	while (*r == ' ')
 +		r++;
 +	while ((r = strchr(r, ' ')) != NULL) {
 +		if (fn) {
 +			fn = 0;
 +			for (i = 0; i < nd + pd; i++)
 +				archive_strappend_char(&mtree->buf, ' ');
 +			archive_strncat(&mtree->buf, s, r - s);
 +			if (nd + (r -s) > INDENTNAMELEN) {
 +				archive_strncat(&mtree->buf, " \\\n", 3);
 +				for (i = 0; i < (INDENTNAMELEN + 1 + pd); i++)
 +					archive_strappend_char(&mtree->buf, ' ');
 +			} else {
 +				for (i = (int)(r -s + nd);
 +				    i < (INDENTNAMELEN + 1); i++)
 +					archive_strappend_char(&mtree->buf, ' ');
 +			}
 +			s = ++r;
 +			x = NULL;
 +			continue;
 +		}
 +		if (pd + (r - s) <= MAXLINELEN - 3 - INDENTNAMELEN)
 +			x = r++;
 +		else {
 +			if (x == NULL)
 +				x = r;
 +			archive_strncat(&mtree->buf, s, x - s);
 +			archive_strncat(&mtree->buf, " \\\n", 3);
 +			for (i = 0; i < (INDENTNAMELEN + 1 + pd); i++)
 +				archive_strappend_char(&mtree->buf, ' ');
 +			s = r = ++x;
 +			x = NULL;
 +		}
 +	}
 +	if (fn) {
 +		for (i = 0; i < nd + pd; i++)
 +			archive_strappend_char(&mtree->buf, ' ');
 +		archive_strcat(&mtree->buf, s);
 +		s += strlen(s);
 +	}
 +	if (x != NULL && pd + strlen(s) > MAXLINELEN - 3 - INDENTNAMELEN) {
 +		/* Last keyword is longer. */
 +		archive_strncat(&mtree->buf, s, x - s);
 +		archive_strncat(&mtree->buf, " \\\n", 3);
 +		for (i = 0; i < (INDENTNAMELEN + 1 + pd); i++)
 +			archive_strappend_char(&mtree->buf, ' ');
 +		s = ++x;
 +	}
 +	archive_strcat(&mtree->buf, s);
 +	archive_string_empty(&mtree->ebuf);
 +}
 +
 +/*
 + * Write /set keyword.
 + * Set most used value of uid,gid,mode and fflags, which are
 + * collected by attr_counter_set_collect() function.
 + */
 +static void
 +write_global(struct mtree_writer *mtree)
 +{
 +	struct archive_string setstr;
 +	struct archive_string unsetstr;
 +	struct att_counter_set *acs;
 +	int keys, oldkeys, effkeys;
 +
 +	archive_string_init(&setstr);
 +	archive_string_init(&unsetstr);
 +	keys = mtree->keys & SET_KEYS;
 +	oldkeys = mtree->set.keys;
 +	effkeys = keys;
 +	acs = &mtree->acs;
 +	if (mtree->set.processing) {
 +		/*
 +		 * Check if the global data needs updating.
 +		 */
 +		effkeys &= ~F_TYPE;
 +		if (acs->uid_list == NULL)
 +			effkeys &= ~(F_UNAME | F_UID);
 +		else if (oldkeys & (F_UNAME | F_UID)) {
 +			if (acs->uid_list->count < 2 ||
 +			    mtree->set.uid == acs->uid_list->m_entry->uid)
 +				effkeys &= ~(F_UNAME | F_UID);
 +		}
 +		if (acs->gid_list == NULL)
 +			effkeys &= ~(F_GNAME | F_GID);
 +		else if (oldkeys & (F_GNAME | F_GID)) {
 +			if (acs->gid_list->count < 2 ||
 +			    mtree->set.gid == acs->gid_list->m_entry->gid)
 +				effkeys &= ~(F_GNAME | F_GID);
 +		}
 +		if (acs->mode_list == NULL)
 +			effkeys &= ~F_MODE;
 +		else if (oldkeys & F_MODE) {
 +			if (acs->mode_list->count < 2 ||
 +			    mtree->set.mode == acs->mode_list->m_entry->mode)
 +				effkeys &= ~F_MODE;
 +		}
 +		if (acs->flags_list == NULL)
 +			effkeys &= ~F_FLAGS;
 +		else if ((oldkeys & F_FLAGS) != 0) {
 +			if (acs->flags_list->count < 2 ||
 +			    (acs->flags_list->m_entry->fflags_set ==
 +				mtree->set.fflags_set &&
 +			     acs->flags_list->m_entry->fflags_clear ==
 +				mtree->set.fflags_clear))
 +				effkeys &= ~F_FLAGS;
 +		}
 +	} else {
 +		if (acs->uid_list == NULL)
 +			keys &= ~(F_UNAME | F_UID);
 +		if (acs->gid_list == NULL)
 +			keys &= ~(F_GNAME | F_GID);
 +		if (acs->mode_list == NULL)
 +			keys &= ~F_MODE;
 +		if (acs->flags_list == NULL)
 +			keys &= ~F_FLAGS;
 +	}
 +	if ((keys & effkeys & F_TYPE) != 0) {
 +		if (mtree->dironly) {
 +			archive_strcat(&setstr, " type=dir");
 +			mtree->set.type = AE_IFDIR;
 +		} else {
 +			archive_strcat(&setstr, " type=file");
 +			mtree->set.type = AE_IFREG;
 +		}
 +	}
 +	if ((keys & effkeys & F_UNAME) != 0) {
 +		if (archive_strlen(&(acs->uid_list->m_entry->uname)) > 0) {
 +			archive_strcat(&setstr, " uname=");
 +			mtree_quote(&setstr, acs->uid_list->m_entry->uname.s);
 +		} else {
 +			keys &= ~F_UNAME;
 +			if ((oldkeys & F_UNAME) != 0)
 +				archive_strcat(&unsetstr, " uname");
 +		}
 +	}
 +	if ((keys & effkeys & F_UID) != 0) {
 +		mtree->set.uid = acs->uid_list->m_entry->uid;
 +		archive_string_sprintf(&setstr, " uid=%jd",
 +		    (intmax_t)mtree->set.uid);
 +	}
 +	if ((keys & effkeys & F_GNAME) != 0) {
 +		if (archive_strlen(&(acs->gid_list->m_entry->gname)) > 0) {
 +			archive_strcat(&setstr, " gname=");
 +			mtree_quote(&setstr, acs->gid_list->m_entry->gname.s);
 +		} else {
 +			keys &= ~F_GNAME;
 +			if ((oldkeys & F_GNAME) != 0)
 +				archive_strcat(&unsetstr, " gname");
 +		}
 +	}
 +	if ((keys & effkeys & F_GID) != 0) {
 +		mtree->set.gid = acs->gid_list->m_entry->gid;
 +		archive_string_sprintf(&setstr, " gid=%jd",
 +		    (intmax_t)mtree->set.gid);
 +	}
 +	if ((keys & effkeys & F_MODE) != 0) {
 +		mtree->set.mode = acs->mode_list->m_entry->mode;
 +		archive_string_sprintf(&setstr, " mode=%o",
 +		    (unsigned int)mtree->set.mode);
 +	}
 +	if ((keys & effkeys & F_FLAGS) != 0) {
 +		if (archive_strlen(
 +		    &(acs->flags_list->m_entry->fflags_text)) > 0) {
 +			archive_strcat(&setstr, " flags=");
 +			mtree_quote(&setstr,
 +			    acs->flags_list->m_entry->fflags_text.s);
 +			mtree->set.fflags_set =
 +			    acs->flags_list->m_entry->fflags_set;
 +			mtree->set.fflags_clear =
 +			    acs->flags_list->m_entry->fflags_clear;
 +		} else {
 +			keys &= ~F_FLAGS;
 +			if ((oldkeys & F_FLAGS) != 0)
 +				archive_strcat(&unsetstr, " flags");
 +		}
 +	}
 +	if (unsetstr.length > 0)
 +		archive_string_sprintf(&mtree->buf, "/unset%s\n", unsetstr.s);
 +	archive_string_free(&unsetstr);
 +	if (setstr.length > 0)
 +		archive_string_sprintf(&mtree->buf, "/set%s\n", setstr.s);
 +	archive_string_free(&setstr);
 +	mtree->set.keys = keys;
 +	mtree->set.processing = 1;
 +}
 +
 +static struct attr_counter *
 +attr_counter_new(struct mtree_entry *me, struct attr_counter *prev)
 +{
 +	struct attr_counter *ac;
 +
 +	ac = malloc(sizeof(*ac));
 +	if (ac != NULL) {
 +		ac->prev = prev;
 +		ac->next = NULL;
 +		ac->count = 1;
 +		ac->m_entry = me;
 +	}
 +	return (ac);
 +}
 +
 +static void
 +attr_counter_free(struct attr_counter **top)
 +{
 +	struct attr_counter *ac, *tac;
 +
 +	if (*top == NULL)
 +		return;
 +	ac = *top;
 +        while (ac != NULL) {
 +		tac = ac->next;
 +		free(ac);
 +		ac = tac;
 +	}
 +	*top = NULL;
 +}
 +
 +static int
 +attr_counter_inc(struct attr_counter **top, struct attr_counter *ac,
 +    struct attr_counter *last, struct mtree_entry *me)
 +{
 +	struct attr_counter *pac;
 +
 +	if (ac != NULL) {
 +		ac->count++;
 +		if (*top == ac || ac->prev->count >= ac->count)
 +			return (0);
 +		for (pac = ac->prev; pac; pac = pac->prev) {
 +			if (pac->count >= ac->count)
 +				break;
 +		}
 +		ac->prev->next = ac->next;
 +		if (ac->next != NULL)
 +			ac->next->prev = ac->prev;
 +		if (pac != NULL) {
 +			ac->prev = pac;
 +			ac->next = pac->next;
 +			pac->next = ac;
 +			if (ac->next != NULL)
 +				ac->next->prev = ac;
 +		} else {
 +			ac->prev = NULL;
 +			ac->next = *top;
 +			*top = ac;
 +			ac->next->prev = ac;
 +		}
- 	} else {
++	} else if (last != NULL) {
 +		ac = attr_counter_new(me, last);
 +		if (ac == NULL)
 +			return (-1);
 +		last->next = ac;
 +	}
 +	return (0);
 +}
 +
 +/*
 + * Tabulate uid,gid,mode and fflags of a entry in order to be used for /set.
 + */
 +static int
 +attr_counter_set_collect(struct mtree_writer *mtree, struct mtree_entry *me)
 +{
 +	struct attr_counter *ac, *last;
 +	struct att_counter_set *acs = &mtree->acs;
 +	int keys = mtree->keys;
 +
 +	if (keys & (F_UNAME | F_UID)) {
 +		if (acs->uid_list == NULL) {
 +			acs->uid_list = attr_counter_new(me, NULL);
 +			if (acs->uid_list == NULL)
 +				return (-1);
 +		} else {
 +			last = NULL;
 +			for (ac = acs->uid_list; ac; ac = ac->next) {
 +				if (ac->m_entry->uid == me->uid)
 +					break;
 +				last = ac;
 +			}
 +			if (attr_counter_inc(&acs->uid_list, ac, last, me) < 0)
 +				return (-1);
 +		}
 +	}
 +	if (keys & (F_GNAME | F_GID)) {
 +		if (acs->gid_list == NULL) {
 +			acs->gid_list = attr_counter_new(me, NULL);
 +			if (acs->gid_list == NULL)
 +				return (-1);
 +		} else {
 +			last = NULL;
 +			for (ac = acs->gid_list; ac; ac = ac->next) {
 +				if (ac->m_entry->gid == me->gid)
 +					break;
 +				last = ac;
 +			}
 +			if (attr_counter_inc(&acs->gid_list, ac, last, me) < 0)
 +				return (-1);
 +		}
 +	}
 +	if (keys & F_MODE) {
 +		if (acs->mode_list == NULL) {
 +			acs->mode_list = attr_counter_new(me, NULL);
 +			if (acs->mode_list == NULL)
 +				return (-1);
 +		} else {
 +			last = NULL;
 +			for (ac = acs->mode_list; ac; ac = ac->next) {
 +				if (ac->m_entry->mode == me->mode)
 +					break;
 +				last = ac;
 +			}
 +			if (attr_counter_inc(&acs->mode_list, ac, last, me) < 0)
 +				return (-1);
 +		}
 +	}
 +	if (keys & F_FLAGS) {
 +		if (acs->flags_list == NULL) {
 +			acs->flags_list = attr_counter_new(me, NULL);
 +			if (acs->flags_list == NULL)
 +				return (-1);
 +		} else {
 +			last = NULL;
 +			for (ac = acs->flags_list; ac; ac = ac->next) {
 +				if (ac->m_entry->fflags_set == me->fflags_set &&
 +				    ac->m_entry->fflags_clear ==
 +							me->fflags_clear)
 +					break;
 +				last = ac;
 +			}
 +			if (attr_counter_inc(&acs->flags_list, ac, last, me) < 0)
 +				return (-1);
 +		}
 +	}
 +
 +	return (0);
 +}
 +
 +static void
 +attr_counter_set_free(struct mtree_writer *mtree)
 +{
 +	struct att_counter_set *acs = &mtree->acs;
 +
 +	attr_counter_free(&acs->uid_list);
 +	attr_counter_free(&acs->gid_list);
 +	attr_counter_free(&acs->mode_list);
 +	attr_counter_free(&acs->flags_list);
 +}
 +
 +static int
 +get_global_set_keys(struct mtree_writer *mtree, struct mtree_entry *me)
 +{
 +	int keys;
 +
 +	keys = mtree->keys;
 +
 +	/*
 +	 * If a keyword has been set by /set, we do not need to
 +	 * output it.
 +	 */
 +	if (mtree->set.keys == 0)
 +		return (keys);/* /set is not used. */
 +
 +	if ((mtree->set.keys & (F_GNAME | F_GID)) != 0 &&
 +	     mtree->set.gid == me->gid)
 +		keys &= ~(F_GNAME | F_GID);
 +	if ((mtree->set.keys & (F_UNAME | F_UID)) != 0 &&
 +	     mtree->set.uid == me->uid)
 +		keys &= ~(F_UNAME | F_UID);
 +	if (mtree->set.keys & F_FLAGS) {
 +		if (mtree->set.fflags_set == me->fflags_set &&
 +		    mtree->set.fflags_clear == me->fflags_clear)
 +			keys &= ~F_FLAGS;
 +	}
 +	if ((mtree->set.keys & F_MODE) != 0 && mtree->set.mode == me->mode)
 +		keys &= ~F_MODE;
 +
 +	switch (me->filetype) {
 +	case AE_IFLNK: case AE_IFSOCK: case AE_IFCHR:
 +	case AE_IFBLK: case AE_IFIFO:
 +		break;
 +	case AE_IFDIR:
 +		if ((mtree->set.keys & F_TYPE) != 0 &&
 +		    mtree->set.type == AE_IFDIR)
 +			keys &= ~F_TYPE;
 +		break;
 +	case AE_IFREG:
 +	default:	/* Handle unknown file types as regular files. */
 +		if ((mtree->set.keys & F_TYPE) != 0 &&
 +		    mtree->set.type == AE_IFREG)
 +			keys &= ~F_TYPE;
 +		break;
 +	}
 +
 +	return (keys);
 +}
 +
 +static int
 +mtree_entry_new(struct archive_write *a, struct archive_entry *entry,
 +    struct mtree_entry **m_entry)
 +{
 +	struct mtree_entry *me;
 +	const char *s;
 +	int r;
 +	static const struct archive_rb_tree_ops rb_ops = {
 +		mtree_entry_cmp_node, mtree_entry_cmp_key
 +	};
 +
 +	me = calloc(1, sizeof(*me));
 +	if (me == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory for a mtree entry");
 +		*m_entry = NULL;
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	r = mtree_entry_setup_filenames(a, me, entry);
 +	if (r < ARCHIVE_WARN) {
 +		mtree_entry_free(me);
 +		*m_entry = NULL;
 +		return (r);
 +	}
 +
 +	if ((s = archive_entry_symlink(entry)) != NULL)
 +		archive_strcpy(&me->symlink, s);
 +	me->nlink = archive_entry_nlink(entry);
 +	me->filetype = archive_entry_filetype(entry);
 +	me->mode = archive_entry_mode(entry) & 07777;
 +	me->uid = archive_entry_uid(entry);
 +	me->gid = archive_entry_gid(entry);
 +	if ((s = archive_entry_uname(entry)) != NULL)
 +		archive_strcpy(&me->uname, s);
 +	if ((s = archive_entry_gname(entry)) != NULL)
 +		archive_strcpy(&me->gname, s);
 +	if ((s = archive_entry_fflags_text(entry)) != NULL)
 +		archive_strcpy(&me->fflags_text, s);
 +	archive_entry_fflags(entry, &me->fflags_set, &me->fflags_clear);
 +	me->mtime = archive_entry_mtime(entry);
 +	me->mtime_nsec = archive_entry_mtime_nsec(entry);
 +	me->rdevmajor = archive_entry_rdevmajor(entry);
 +	me->rdevminor = archive_entry_rdevminor(entry);
 +	me->devmajor = archive_entry_devmajor(entry);
 +	me->devminor = archive_entry_devminor(entry);
 +	me->ino = archive_entry_ino(entry);
 +	me->size = archive_entry_size(entry);
 +	if (me->filetype == AE_IFDIR) {
 +		me->dir_info = calloc(1, sizeof(*me->dir_info));
 +		if (me->dir_info == NULL) {
 +			mtree_entry_free(me);
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for a mtree entry");
 +			*m_entry = NULL;
 +			return (ARCHIVE_FATAL);
 +		}
 +		__archive_rb_tree_init(&me->dir_info->rbtree, &rb_ops);
 +		me->dir_info->children.first = NULL;
 +		me->dir_info->children.last = &(me->dir_info->children.first);
 +		me->dir_info->chnext = NULL;
 +	} else if (me->filetype == AE_IFREG) {
 +		me->reg_info = calloc(1, sizeof(*me->reg_info));
 +		if (me->reg_info == NULL) {
 +			mtree_entry_free(me);
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for a mtree entry");
 +			*m_entry = NULL;
 +			return (ARCHIVE_FATAL);
 +		}
 +		me->reg_info->compute_sum = 0;
 +	}
 +
 +	*m_entry = me;
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +mtree_entry_free(struct mtree_entry *me)
 +{
 +	archive_string_free(&me->parentdir);
 +	archive_string_free(&me->basename);
 +	archive_string_free(&me->pathname);
 +	archive_string_free(&me->symlink);
 +	archive_string_free(&me->uname);
 +	archive_string_free(&me->gname);
 +	archive_string_free(&me->fflags_text);
 +	free(me->dir_info);
 +	free(me->reg_info);
 +	free(me);
 +}
 +
 +static int
 +archive_write_mtree_header(struct archive_write *a,
 +    struct archive_entry *entry)
 +{
 +	struct mtree_writer *mtree= a->format_data;
 +	struct mtree_entry *mtree_entry;
 +	int r, r2;
 +
 +	if (mtree->first) {
 +		mtree->first = 0;
 +		archive_strcat(&mtree->buf, "#mtree\n");
 +		if ((mtree->keys & SET_KEYS) == 0)
 +			mtree->output_global_set = 0;/* Disabled. */
 +	}
 +
 +	mtree->entry_bytes_remaining = archive_entry_size(entry);
 +
 +	/* While directory only mode, we do not handle non directory files. */
 +	if (mtree->dironly && archive_entry_filetype(entry) != AE_IFDIR)
 +		return (ARCHIVE_OK);
 +
 +	r2 = mtree_entry_new(a, entry, &mtree_entry);
 +	if (r2 < ARCHIVE_WARN)
 +		return (r2);
 +	r = mtree_entry_tree_add(a, &mtree_entry);
 +	if (r < ARCHIVE_WARN) {
 +		mtree_entry_free(mtree_entry);
 +		return (r);
 +	}
 +	mtree->mtree_entry = mtree_entry;
 +
 +	/* If the current file is a regular file, we have to
 +	 * compute the sum of its content.
 +	 * Initialize a bunch of sum check context. */
 +	if (mtree_entry->reg_info)
 +		sum_init(mtree);
 +
 +	return (r2);
 +}
 +
 +static int
 +write_mtree_entry(struct archive_write *a, struct mtree_entry *me)
 +{
 +	struct mtree_writer *mtree = a->format_data;
 +	struct archive_string *str;
 +	int keys, ret;
 +
 +	if (me->dir_info) {
 +		if (mtree->classic) {
 +			/*
 +			 * Output a comment line to describe the full
 +			 * pathname of the entry as mtree utility does
 +			 * while generating classic format.
 +			 */
 +			if (!mtree->dironly)
 +				archive_strappend_char(&mtree->buf, '\n');
 +			if (me->parentdir.s)
 +				archive_string_sprintf(&mtree->buf,
 +				    "# %s/%s\n",
 +				    me->parentdir.s, me->basename.s);
 +			else
 +				archive_string_sprintf(&mtree->buf,
 +				    "# %s\n",
 +				    me->basename.s);
 +		}
 +		if (mtree->output_global_set)
 +			write_global(mtree);
 +	}
 +	archive_string_empty(&mtree->ebuf);
 +	str = (mtree->indent || mtree->classic)? &mtree->ebuf : &mtree->buf;
 +
 +	if (!mtree->classic && me->parentdir.s) {
 +		/*
 +		 * If generating format is not classic one(v1), output
 +		 * a full pathname.
 +		 */
 +		mtree_quote(str, me->parentdir.s);
 +		archive_strappend_char(str, '/');
 +	}
 +	mtree_quote(str, me->basename.s);
 +
 +	keys = get_global_set_keys(mtree, me);
 +	if ((keys & F_NLINK) != 0 &&
 +	    me->nlink != 1 && me->filetype != AE_IFDIR)
 +		archive_string_sprintf(str, " nlink=%u", me->nlink);
 +
 +	if ((keys & F_GNAME) != 0 && archive_strlen(&me->gname) > 0) {
 +		archive_strcat(str, " gname=");
 +		mtree_quote(str, me->gname.s);
 +	}
 +	if ((keys & F_UNAME) != 0 && archive_strlen(&me->uname) > 0) {
 +		archive_strcat(str, " uname=");
 +		mtree_quote(str, me->uname.s);
 +	}
 +	if ((keys & F_FLAGS) != 0) {
 +		if (archive_strlen(&me->fflags_text) > 0) {
 +			archive_strcat(str, " flags=");
 +			mtree_quote(str, me->fflags_text.s);
 +		} else if (mtree->set.processing &&
 +		    (mtree->set.keys & F_FLAGS) != 0)
 +			/* Overwrite the global parameter. */
 +			archive_strcat(str, " flags=none");
 +	}
 +	if ((keys & F_TIME) != 0)
 +		archive_string_sprintf(str, " time=%jd.%jd",
 +		    (intmax_t)me->mtime, (intmax_t)me->mtime_nsec);
 +	if ((keys & F_MODE) != 0)
 +		archive_string_sprintf(str, " mode=%o", (unsigned int)me->mode);
 +	if ((keys & F_GID) != 0)
 +		archive_string_sprintf(str, " gid=%jd", (intmax_t)me->gid);
 +	if ((keys & F_UID) != 0)
 +		archive_string_sprintf(str, " uid=%jd", (intmax_t)me->uid);
 +
 +	if ((keys & F_INO) != 0)
 +		archive_string_sprintf(str, " inode=%jd", (intmax_t)me->ino);
 +	if ((keys & F_RESDEV) != 0) {
 +		archive_string_sprintf(str,
 +		    " resdevice=native,%ju,%ju",
 +		    (uintmax_t)me->devmajor,
 +		    (uintmax_t)me->devminor);
 +	}
 +
 +	switch (me->filetype) {
 +	case AE_IFLNK:
 +		if ((keys & F_TYPE) != 0)
 +			archive_strcat(str, " type=link");
 +		if ((keys & F_SLINK) != 0) {
 +			archive_strcat(str, " link=");
 +			mtree_quote(str, me->symlink.s);
 +		}
 +		break;
 +	case AE_IFSOCK:
 +		if ((keys & F_TYPE) != 0)
 +			archive_strcat(str, " type=socket");
 +		break;
 +	case AE_IFCHR:
 +		if ((keys & F_TYPE) != 0)
 +			archive_strcat(str, " type=char");
 +		if ((keys & F_DEV) != 0) {
 +			archive_string_sprintf(str,
 +			    " device=native,%ju,%ju",
 +			    (uintmax_t)me->rdevmajor,
 +			    (uintmax_t)me->rdevminor);
 +		}
 +		break;
 +	case AE_IFBLK:
 +		if ((keys & F_TYPE) != 0)
 +			archive_strcat(str, " type=block");
 +		if ((keys & F_DEV) != 0) {
 +			archive_string_sprintf(str,
 +			    " device=native,%ju,%ju",
 +			    (uintmax_t)me->rdevmajor,
 +			    (uintmax_t)me->rdevminor);
 +		}
 +		break;
 +	case AE_IFDIR:
 +		if ((keys & F_TYPE) != 0)
 +			archive_strcat(str, " type=dir");
 +		break;
 +	case AE_IFIFO:
 +		if ((keys & F_TYPE) != 0)
 +			archive_strcat(str, " type=fifo");
 +		break;
 +	case AE_IFREG:
 +	default:	/* Handle unknown file types as regular files. */
 +		if ((keys & F_TYPE) != 0)
 +			archive_strcat(str, " type=file");
 +		if ((keys & F_SIZE) != 0)
 +			archive_string_sprintf(str, " size=%jd",
 +			    (intmax_t)me->size);
 +		break;
 +	}
 +
 +	/* Write a bunch of sum. */
 +	if (me->reg_info)
 +		sum_write(str, me->reg_info);
 +
 +	archive_strappend_char(str, '\n');
 +	if (mtree->indent || mtree->classic)
 +		mtree_indent(mtree);
 +
 +	if (mtree->buf.length > 32768) {
 +		ret = __archive_write_output(
 +			a, mtree->buf.s, mtree->buf.length);
 +		archive_string_empty(&mtree->buf);
 +	} else
 +		ret = ARCHIVE_OK;
 +	return (ret);
 +}
 +
 +static int
 +write_dot_dot_entry(struct archive_write *a, struct mtree_entry *n)
 +{
 +	struct mtree_writer *mtree = a->format_data;
 +	int ret;
 +
 +	if (n->parentdir.s) {
 +		if (mtree->indent) {
 +			int i, pd = mtree->depth * 4;
 +			for (i = 0; i < pd; i++)
 +				archive_strappend_char(&mtree->buf, ' ');
 +		}
 +		archive_string_sprintf(&mtree->buf, "# %s/%s\n",
 +			n->parentdir.s, n->basename.s);
 +	}
 +
 +	if (mtree->indent) {
 +		archive_string_empty(&mtree->ebuf);
 +		archive_strncat(&mtree->ebuf, "..\n\n", (mtree->dironly)?3:4);
 +		mtree_indent(mtree);
 +	} else
 +		archive_strncat(&mtree->buf, "..\n\n", (mtree->dironly)?3:4);
 +
 +	if (mtree->buf.length > 32768) {
 +		ret = __archive_write_output(
 +			a, mtree->buf.s, mtree->buf.length);
 +		archive_string_empty(&mtree->buf);
 +	} else
 +		ret = ARCHIVE_OK;
 +	return (ret);
 +}
 +
 +/*
 + * Write mtree entries saved at attr_counter_set_collect() function.
 + */
 +static int
 +write_mtree_entry_tree(struct archive_write *a)
 +{
 +	struct mtree_writer *mtree = a->format_data;
 +	struct mtree_entry *np = mtree->root;
 +	struct archive_rb_node *n;
 +	int ret;
 +
 +	do {
 +		if (mtree->output_global_set) {
 +			/*
 +			 * Collect attribute information to know which value
 +			 * is frequently used among the children.
 +			 */
 +			attr_counter_set_reset(mtree);
 +			ARCHIVE_RB_TREE_FOREACH(n, &(np->dir_info->rbtree)) {
 +				struct mtree_entry *e = (struct mtree_entry *)n;
 +				if (attr_counter_set_collect(mtree, e) < 0) {
 +					archive_set_error(&a->archive, ENOMEM,
 +					    "Can't allocate memory");
 +					return (ARCHIVE_FATAL);
 +				}
 +			}
 +		}
 +		if (!np->dir_info->virtual || mtree->classic) {
 +			ret = write_mtree_entry(a, np);
 +			if (ret != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		} else {
 +			/* Whenever output_global_set is enabled
 +			 * output global value(/set keywords)
 +			 * even if the directory entry is not allowed
 +			 * to be written because the global values
 +			 * can be used for the children. */
 +			if (mtree->output_global_set)
 +				write_global(mtree);
 +		}
 +		/*
 +		 * Output the attribute of all files except directory files.
 +		 */
 +		mtree->depth++;
 +		ARCHIVE_RB_TREE_FOREACH(n, &(np->dir_info->rbtree)) {
 +			struct mtree_entry *e = (struct mtree_entry *)n;
 +
 +			if (e->dir_info)
 +				mtree_entry_add_child_tail(np, e);
 +			else {
 +				ret = write_mtree_entry(a, e);
 +				if (ret != ARCHIVE_OK)
 +					return (ARCHIVE_FATAL);
 +			}
 +		}
 +		mtree->depth--;
 +
 +		if (np->dir_info->children.first != NULL) {
 +			/*
 +			 * Descend the tree.
 +			 */
 +			np = np->dir_info->children.first;
 +			if (mtree->indent)
 +				mtree->depth++;
 +			continue;
 +		} else if (mtree->classic) {
 +			/*
 +			 * While printing mtree classic, if there are not
 +			 * any directory files(except "." and "..") in the
 +			 * directory, output two dots ".." as returning
 +			 * the parent directory.
 +			 */
 +			ret = write_dot_dot_entry(a, np);
 +			if (ret != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +		}
 +
 +		while (np != np->parent) {
 +			if (np->dir_info->chnext == NULL) {
 +				/*
 +				 * Ascend the tree; go back to the parent.
 +				 */
 +				if (mtree->indent)
 +					mtree->depth--;
 +				if (mtree->classic) {
 +					ret = write_dot_dot_entry(a,
 +						np->parent);
 +					if (ret != ARCHIVE_OK)
 +						return (ARCHIVE_FATAL);
 +				}
 +				np = np->parent;
 +			} else {
 +				/*
 +				 * Switch to next mtree entry in the directory.
 +				 */
 +				np = np->dir_info->chnext;
 +				break;
 +			}
 +		}
 +	} while (np != np->parent); 
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_write_mtree_finish_entry(struct archive_write *a)
 +{
 +	struct mtree_writer *mtree = a->format_data;
 +	struct mtree_entry *me;
 +
 +	if ((me = mtree->mtree_entry) == NULL)
 +		return (ARCHIVE_OK);
 +	mtree->mtree_entry = NULL;
 +
 +	if (me->reg_info)
 +		sum_final(mtree, me->reg_info);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_write_mtree_close(struct archive_write *a)
 +{
 +	struct mtree_writer *mtree= a->format_data;
 +	int ret;
 +
 +	if (mtree->root != NULL) {
 +		ret = write_mtree_entry_tree(a);
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	archive_write_set_bytes_in_last_block(&a->archive, 1);
 +
 +	return __archive_write_output(a, mtree->buf.s, mtree->buf.length);
 +}
 +
 +static ssize_t
 +archive_write_mtree_data(struct archive_write *a, const void *buff, size_t n)
 +{
 +	struct mtree_writer *mtree= a->format_data;
 +
 +	if (n > mtree->entry_bytes_remaining)
 +		n = (size_t)mtree->entry_bytes_remaining;
 +	mtree->entry_bytes_remaining -= n;
 +
 +	/* We don't need to compute a regular file sum */
 +	if (mtree->mtree_entry == NULL)
 +		return (n);
 +
 +	if (mtree->mtree_entry->filetype == AE_IFREG)
 +		sum_update(mtree, buff, n);
 +
 +	return (n);
 +}
 +
 +static int
 +archive_write_mtree_free(struct archive_write *a)
 +{
 +	struct mtree_writer *mtree= a->format_data;
 +
 +	if (mtree == NULL)
 +		return (ARCHIVE_OK);
 +
 +	/* Make sure we dot not leave any entries. */
 +	mtree_entry_register_free(mtree);
 +	archive_string_free(&mtree->cur_dirstr);
 +	archive_string_free(&mtree->ebuf);
 +	archive_string_free(&mtree->buf);
 +	attr_counter_set_free(mtree);
 +	free(mtree);
 +	a->format_data = NULL;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_write_mtree_options(struct archive_write *a, const char *key,
 +    const char *value)
 +{
 +	struct mtree_writer *mtree= a->format_data;
 +	int keybit = 0;
 +
 +	switch (key[0]) {
 +	case 'a':
 +		if (strcmp(key, "all") == 0)
 +			keybit = ~0;
 +		break;
 +	case 'c':
 +		if (strcmp(key, "cksum") == 0)
 +			keybit = F_CKSUM;
 +		break;
 +	case 'd':
 +		if (strcmp(key, "device") == 0)
 +			keybit = F_DEV;
 +		else if (strcmp(key, "dironly") == 0) {
 +			mtree->dironly = (value != NULL)? 1: 0;
 +			return (ARCHIVE_OK);
 +		}
 +		break;
 +	case 'f':
 +		if (strcmp(key, "flags") == 0)
 +			keybit = F_FLAGS;
 +		break;
 +	case 'g':
 +		if (strcmp(key, "gid") == 0)
 +			keybit = F_GID;
 +		else if (strcmp(key, "gname") == 0)
 +			keybit = F_GNAME;
 +		break;
 +	case 'i':
 +		if (strcmp(key, "indent") == 0) {
 +			mtree->indent = (value != NULL)? 1: 0;
 +			return (ARCHIVE_OK);
 +		} else if (strcmp(key, "inode") == 0) {
 +			keybit = F_INO;
 +		}
 +		break;
 +	case 'l':
 +		if (strcmp(key, "link") == 0)
 +			keybit = F_SLINK;
 +		break;
 +	case 'm':
 +		if (strcmp(key, "md5") == 0 ||
 +		    strcmp(key, "md5digest") == 0)
 +			keybit = F_MD5;
 +		if (strcmp(key, "mode") == 0)
 +			keybit = F_MODE;
 +		break;
 +	case 'n':
 +		if (strcmp(key, "nlink") == 0)
 +			keybit = F_NLINK;
 +		break;
 +	case 'r':
 +		if (strcmp(key, "resdevice") == 0) {
 +			keybit = F_RESDEV;
 +		} else if (strcmp(key, "ripemd160digest") == 0 ||
 +		    strcmp(key, "rmd160") == 0 ||
 +		    strcmp(key, "rmd160digest") == 0)
 +			keybit = F_RMD160;
 +		break;
 +	case 's':
 +		if (strcmp(key, "sha1") == 0 ||
 +		    strcmp(key, "sha1digest") == 0)
 +			keybit = F_SHA1;
 +		if (strcmp(key, "sha256") == 0 ||
 +		    strcmp(key, "sha256digest") == 0)
 +			keybit = F_SHA256;
 +		if (strcmp(key, "sha384") == 0 ||
 +		    strcmp(key, "sha384digest") == 0)
 +			keybit = F_SHA384;
 +		if (strcmp(key, "sha512") == 0 ||
 +		    strcmp(key, "sha512digest") == 0)
 +			keybit = F_SHA512;
 +		if (strcmp(key, "size") == 0)
 +			keybit = F_SIZE;
 +		break;
 +	case 't':
 +		if (strcmp(key, "time") == 0)
 +			keybit = F_TIME;
 +		else if (strcmp(key, "type") == 0)
 +			keybit = F_TYPE;
 +		break;
 +	case 'u':
 +		if (strcmp(key, "uid") == 0)
 +			keybit = F_UID;
 +		else if (strcmp(key, "uname") == 0)
 +			keybit = F_UNAME;
 +		else if (strcmp(key, "use-set") == 0) {
 +			mtree->output_global_set = (value != NULL)? 1: 0;
 +			return (ARCHIVE_OK);
 +		}
 +		break;
 +	}
 +	if (keybit != 0) {
 +		if (value != NULL)
 +			mtree->keys |= keybit;
 +		else
 +			mtree->keys &= ~keybit;
 +		return (ARCHIVE_OK);
 +	}
 +
 +	/* Note: The "warn" return is just to inform the options
 +	 * supervisor that we didn't handle it.  It will generate
 +	 * a suitable error if no one used this option. */
 +	return (ARCHIVE_WARN);
 +}
 +
 +static int
 +archive_write_set_format_mtree_default(struct archive *_a, const char *fn)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	struct mtree_writer *mtree;
 +
 +	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW, fn);
 +
 +	if (a->format_free != NULL)
 +		(a->format_free)(a);
 +
 +	if ((mtree = calloc(1, sizeof(*mtree))) == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate mtree data");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	mtree->mtree_entry = NULL;
 +	mtree->first = 1;
 +	memset(&(mtree->set), 0, sizeof(mtree->set));
 +	mtree->keys = DEFAULT_KEYS;
 +	mtree->dironly = 0;
 +	mtree->indent = 0;
 +	archive_string_init(&mtree->ebuf);
 +	archive_string_init(&mtree->buf);
 +	mtree_entry_register_init(mtree);
 +	a->format_data = mtree;
 +	a->format_free = archive_write_mtree_free;
 +	a->format_name = "mtree";
 +	a->format_options = archive_write_mtree_options;
 +	a->format_write_header = archive_write_mtree_header;
 +	a->format_close = archive_write_mtree_close;
 +	a->format_write_data = archive_write_mtree_data;
 +	a->format_finish_entry = archive_write_mtree_finish_entry;
 +	a->archive.archive_format = ARCHIVE_FORMAT_MTREE;
 +	a->archive.archive_format_name = "mtree";
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +int
 +archive_write_set_format_mtree(struct archive *_a)
 +{
 +	return archive_write_set_format_mtree_default(_a,
 +		"archive_write_set_format_mtree");
 +}
 +
 +int
 +archive_write_set_format_mtree_classic(struct archive *_a)
 +{
 +	int r;
 +
 +	r = archive_write_set_format_mtree_default(_a,
 +		"archive_write_set_format_mtree_classic");
 +	if (r == ARCHIVE_OK) {
 +		struct archive_write *a = (struct archive_write *)_a;
 +		struct mtree_writer *mtree;
 +
 +		mtree = (struct mtree_writer *)a->format_data;
 +
 +		/* Set to output a mtree archive in classic format. */
 +		mtree->classic = 1;
 +		/* Basically, mtree classic format uses '/set' global
 +		 * value. */
 +		mtree->output_global_set = 1;
 +	}
 +	return (r);
 +}
 +
 +static void
 +sum_init(struct mtree_writer *mtree)
 +{
 +
 +	mtree->compute_sum = 0;
 +
 +	if (mtree->keys & F_CKSUM) {
 +		mtree->compute_sum |= F_CKSUM;
 +		mtree->crc = 0;
 +		mtree->crc_len = 0;
 +	}
 +#ifdef ARCHIVE_HAS_MD5
 +	if (mtree->keys & F_MD5) {
 +		if (archive_md5_init(&mtree->md5ctx) == ARCHIVE_OK)
 +			mtree->compute_sum |= F_MD5;
 +		else
 +			mtree->keys &= ~F_MD5;/* Not supported. */
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_RMD160
 +	if (mtree->keys & F_RMD160) {
 +		if (archive_rmd160_init(&mtree->rmd160ctx) == ARCHIVE_OK)
 +			mtree->compute_sum |= F_RMD160;
 +		else
 +			mtree->keys &= ~F_RMD160;/* Not supported. */
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_SHA1
 +	if (mtree->keys & F_SHA1) {
 +		if (archive_sha1_init(&mtree->sha1ctx) == ARCHIVE_OK)
 +			mtree->compute_sum |= F_SHA1;
 +		else
 +			mtree->keys &= ~F_SHA1;/* Not supported. */
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_SHA256
 +	if (mtree->keys & F_SHA256) {
 +		if (archive_sha256_init(&mtree->sha256ctx) == ARCHIVE_OK)
 +			mtree->compute_sum |= F_SHA256;
 +		else
 +			mtree->keys &= ~F_SHA256;/* Not supported. */
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_SHA384
 +	if (mtree->keys & F_SHA384) {
 +		if (archive_sha384_init(&mtree->sha384ctx) == ARCHIVE_OK)
 +			mtree->compute_sum |= F_SHA384;
 +		else
 +			mtree->keys &= ~F_SHA384;/* Not supported. */
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_SHA512
 +	if (mtree->keys & F_SHA512) {
 +		if (archive_sha512_init(&mtree->sha512ctx) == ARCHIVE_OK)
 +			mtree->compute_sum |= F_SHA512;
 +		else
 +			mtree->keys &= ~F_SHA512;/* Not supported. */
 +	}
 +#endif
 +}
 +
 +static void
 +sum_update(struct mtree_writer *mtree, const void *buff, size_t n)
 +{
 +	if (mtree->compute_sum & F_CKSUM) {
 +		/*
 +		 * Compute a POSIX 1003.2 checksum
 +		 */
 +		const unsigned char *p;
 +		size_t nn;
 +
 +		for (nn = n, p = buff; nn--; ++p)
 +			COMPUTE_CRC(mtree->crc, *p);
 +		mtree->crc_len += n;
 +	}
 +#ifdef ARCHIVE_HAS_MD5
 +	if (mtree->compute_sum & F_MD5)
 +		archive_md5_update(&mtree->md5ctx, buff, n);
 +#endif
 +#ifdef ARCHIVE_HAS_RMD160
 +	if (mtree->compute_sum & F_RMD160)
 +		archive_rmd160_update(&mtree->rmd160ctx, buff, n);
 +#endif
 +#ifdef ARCHIVE_HAS_SHA1
 +	if (mtree->compute_sum & F_SHA1)
 +		archive_sha1_update(&mtree->sha1ctx, buff, n);
 +#endif
 +#ifdef ARCHIVE_HAS_SHA256
 +	if (mtree->compute_sum & F_SHA256)
 +		archive_sha256_update(&mtree->sha256ctx, buff, n);
 +#endif
 +#ifdef ARCHIVE_HAS_SHA384
 +	if (mtree->compute_sum & F_SHA384)
 +		archive_sha384_update(&mtree->sha384ctx, buff, n);
 +#endif
 +#ifdef ARCHIVE_HAS_SHA512
 +	if (mtree->compute_sum & F_SHA512)
 +		archive_sha512_update(&mtree->sha512ctx, buff, n);
 +#endif
 +}
 +
 +static void
 +sum_final(struct mtree_writer *mtree, struct reg_info *reg)
 +{
 +
 +	if (mtree->compute_sum & F_CKSUM) {
 +		uint64_t len;
 +		/* Include the length of the file. */
 +		for (len = mtree->crc_len; len != 0; len >>= 8)
 +			COMPUTE_CRC(mtree->crc, len & 0xff);
 +		reg->crc = ~mtree->crc;
 +	}
 +#ifdef ARCHIVE_HAS_MD5
 +	if (mtree->compute_sum & F_MD5)
 +		archive_md5_final(&mtree->md5ctx, reg->buf_md5);
 +#endif
 +#ifdef ARCHIVE_HAS_RMD160
 +	if (mtree->compute_sum & F_RMD160)
 +		archive_rmd160_final(&mtree->rmd160ctx, reg->buf_rmd160);
 +#endif
 +#ifdef ARCHIVE_HAS_SHA1
 +	if (mtree->compute_sum & F_SHA1)
 +		archive_sha1_final(&mtree->sha1ctx, reg->buf_sha1);
 +#endif
 +#ifdef ARCHIVE_HAS_SHA256
 +	if (mtree->compute_sum & F_SHA256)
 +		archive_sha256_final(&mtree->sha256ctx, reg->buf_sha256);
 +#endif
 +#ifdef ARCHIVE_HAS_SHA384
 +	if (mtree->compute_sum & F_SHA384)
 +		archive_sha384_final(&mtree->sha384ctx, reg->buf_sha384);
 +#endif
 +#ifdef ARCHIVE_HAS_SHA512
 +	if (mtree->compute_sum & F_SHA512)
 +		archive_sha512_final(&mtree->sha512ctx, reg->buf_sha512);
 +#endif
 +	/* Save what types of sum are computed. */
 +	reg->compute_sum = mtree->compute_sum;
 +}
 +
 +#if defined(ARCHIVE_HAS_MD5) || defined(ARCHIVE_HAS_RMD160) || \
 +    defined(ARCHIVE_HAS_SHA1) || defined(ARCHIVE_HAS_SHA256) || \
 +    defined(ARCHIVE_HAS_SHA384) || defined(ARCHIVE_HAS_SHA512)
 +static void
 +strappend_bin(struct archive_string *s, const unsigned char *bin, int n)
 +{
 +	static const char hex[] = "0123456789abcdef";
 +	int i;
 +
 +	for (i = 0; i < n; i++) {
 +		archive_strappend_char(s, hex[bin[i] >> 4]);
 +		archive_strappend_char(s, hex[bin[i] & 0x0f]);
 +	}
 +}
 +#endif
 +
 +static void
 +sum_write(struct archive_string *str, struct reg_info *reg)
 +{
 +
 +	if (reg->compute_sum & F_CKSUM) {
 +		archive_string_sprintf(str, " cksum=%ju",
 +		    (uintmax_t)reg->crc);
 +	}
 +#ifdef ARCHIVE_HAS_MD5
 +	if (reg->compute_sum & F_MD5) {
 +		archive_strcat(str, " md5digest=");
 +		strappend_bin(str, reg->buf_md5, sizeof(reg->buf_md5));
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_RMD160
 +	if (reg->compute_sum & F_RMD160) {
 +		archive_strcat(str, " rmd160digest=");
 +		strappend_bin(str, reg->buf_rmd160, sizeof(reg->buf_rmd160));
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_SHA1
 +	if (reg->compute_sum & F_SHA1) {
 +		archive_strcat(str, " sha1digest=");
 +		strappend_bin(str, reg->buf_sha1, sizeof(reg->buf_sha1));
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_SHA256
 +	if (reg->compute_sum & F_SHA256) {
 +		archive_strcat(str, " sha256digest=");
 +		strappend_bin(str, reg->buf_sha256, sizeof(reg->buf_sha256));
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_SHA384
 +	if (reg->compute_sum & F_SHA384) {
 +		archive_strcat(str, " sha384digest=");
 +		strappend_bin(str, reg->buf_sha384, sizeof(reg->buf_sha384));
 +	}
 +#endif
 +#ifdef ARCHIVE_HAS_SHA512
 +	if (reg->compute_sum & F_SHA512) {
 +		archive_strcat(str, " sha512digest=");
 +		strappend_bin(str, reg->buf_sha512, sizeof(reg->buf_sha512));
 +	}
 +#endif
 +}
 +
 +static int
 +mtree_entry_cmp_node(const struct archive_rb_node *n1,
 +    const struct archive_rb_node *n2)
 +{
 +	const struct mtree_entry *e1 = (const struct mtree_entry *)n1;
 +	const struct mtree_entry *e2 = (const struct mtree_entry *)n2;
 +
 +	return (strcmp(e2->basename.s, e1->basename.s));
 +}
 +
 +static int
 +mtree_entry_cmp_key(const struct archive_rb_node *n, const void *key)
 +{
 +	const struct mtree_entry *e = (const struct mtree_entry *)n;
 +
 +	return (strcmp((const char *)key, e->basename.s));
 +}
 +
 +#if defined(_WIN32) || defined(__CYGWIN__)
 +static int
 +cleanup_backslash_1(char *p)
 +{
 +	int mb, dos;
 +
 +	mb = dos = 0;
 +	while (*p) {
 +		if (*(unsigned char *)p > 127)
 +			mb = 1;
 +		if (*p == '\\') {
 +			/* If we have not met any multi-byte characters,
 +			 * we can replace '\' with '/'. */
 +			if (!mb)
 +				*p = '/';
 +			dos = 1;
 +		}
 +		p++;
 +	}
 +	if (!mb || !dos)
 +		return (0);
 +	return (-1);
 +}
 +
 +static void
 +cleanup_backslash_2(wchar_t *p)
 +{
 +
 +	/* Convert a path-separator from '\' to  '/' */
 +	while (*p != L'\0') {
 +		if (*p == L'\\')
 +			*p = L'/';
 +		p++;
 +	}
 +}
 +#endif
 +
 +/*
 + * Generate a parent directory name and a base name from a pathname.
 + */
 +static int
 +mtree_entry_setup_filenames(struct archive_write *a, struct mtree_entry *file,
 +    struct archive_entry *entry)
 +{
 +	const char *pathname;
 +	char *p, *dirname, *slash;
 +	size_t len;
 +	int ret = ARCHIVE_OK;
 +
 +	archive_strcpy(&file->pathname, archive_entry_pathname(entry));
 +#if defined(_WIN32) || defined(__CYGWIN__)
 +	/*
 +	 * Convert a path-separator from '\' to  '/'
 +	 */
 +	if (cleanup_backslash_1(file->pathname.s) != 0) {
 +		const wchar_t *wp = archive_entry_pathname_w(entry);
 +		struct archive_wstring ws;
 +
 +		if (wp != NULL) {
 +			int r;
 +			archive_string_init(&ws);
 +			archive_wstrcpy(&ws, wp);
 +			cleanup_backslash_2(ws.s);
 +			archive_string_empty(&(file->pathname));
 +			r = archive_string_append_from_wcs(&(file->pathname),
 +			    ws.s, ws.length);
 +			archive_wstring_free(&ws);
 +			if (r < 0 && errno == ENOMEM) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory");
 +				return (ARCHIVE_FATAL);
 +			}
 +		}
 +	}
 +#else
 +	(void)a; /* UNUSED */
 +#endif
 +	pathname =  file->pathname.s;
 +	if (strcmp(pathname, ".") == 0) {
 +		archive_strcpy(&file->basename, ".");
 +		return (ARCHIVE_OK);
 +	}
 +
 +	archive_strcpy(&(file->parentdir), pathname);
 +
 +	len = file->parentdir.length;
 +	p = dirname = file->parentdir.s;
 +
 +	/*
 +	 * Remove leading '/' and '../' elements
 +	 */
 +	while (*p) {
 +		if (p[0] == '/') {
 +			p++;
 +			len--;
 +		} else if (p[0] != '.')
 +			break;
 +		else if (p[1] == '.' && p[2] == '/') {
 +			p += 3;
 +			len -= 3;
 +		} else
 +			break;
 +	}
 +	if (p != dirname) {
 +		memmove(dirname, p, len+1);
 +		p = dirname;
 +	}
 +	/*
 +	 * Remove "/","/." and "/.." elements from tail.
 +	 */
 +	while (len > 0) {
 +		size_t ll = len;
 +
 +		if (len > 0 && p[len-1] == '/') {
 +			p[len-1] = '\0';
 +			len--;
 +		}
 +		if (len > 1 && p[len-2] == '/' && p[len-1] == '.') {
 +			p[len-2] = '\0';
 +			len -= 2;
 +		}
 +		if (len > 2 && p[len-3] == '/' && p[len-2] == '.' &&
 +		    p[len-1] == '.') {
 +			p[len-3] = '\0';
 +			len -= 3;
 +		}
 +		if (ll == len)
 +			break;
 +	}
 +	while (*p) {
 +		if (p[0] == '/') {
 +			if (p[1] == '/')
 +				/* Convert '//' --> '/' */
 +				strcpy(p, p+1);
 +			else if (p[1] == '.' && p[2] == '/')
 +				/* Convert '/./' --> '/' */
 +				strcpy(p, p+2);
 +			else if (p[1] == '.' && p[2] == '.' && p[3] == '/') {
 +				/* Convert 'dir/dir1/../dir2/'
 +				 *     --> 'dir/dir2/'
 +				 */
 +				char *rp = p -1;
 +				while (rp >= dirname) {
 +					if (*rp == '/')
 +						break;
 +					--rp;
 +				}
 +				if (rp > dirname) {
 +					strcpy(rp, p+3);
 +					p = rp;
 +				} else {
 +					strcpy(dirname, p+4);
 +					p = dirname;
 +				}
 +			} else
 +				p++;
 +		} else
 +			p++;
 +	}
 +	p = dirname;
 +	len = strlen(p);
 +
 +	/*
 +	 * Add "./" prefiex.
 +	 * NOTE: If the pathname does not have a path separator, we have
 +	 * to add "./" to the head of the pathename because mtree reader
 +	 * will suppose that it is v1(a.k.a classic) mtree format and
 +	 * change the directory unexpectedly and so it will make a wrong
 +	 * path.
 +	 */
 +	if (strcmp(p, ".") != 0 && strncmp(p, "./", 2) != 0) {
 +		struct archive_string as;
 +		archive_string_init(&as);
 +		archive_strcpy(&as, "./");
 +		archive_strncat(&as, p, len);
 +		archive_string_empty(&file->parentdir);
 +		archive_string_concat(&file->parentdir, &as);
 +		archive_string_free(&as);
 +		p = file->parentdir.s;
 +		len = archive_strlen(&file->parentdir);
 +	}
 +
 +	/*
 +	 * Find out the position which points the last position of
 +	 * path separator('/').
 +	 */
 +	slash = NULL;
 +	for (; *p != '\0'; p++) {
 +		if (*p == '/')
 +			slash = p;
 +	}
 +	if (slash == NULL) {
 +		/* The pathname doesn't have a parent directory. */
 +		file->parentdir.length = len;
 +		archive_string_copy(&(file->basename), &(file->parentdir));
 +		archive_string_empty(&(file->parentdir));
 +		*file->parentdir.s = '\0';
 +		return (ret);
 +	}
 +
 +	/* Make a basename from file->parentdir.s and slash */
 +	*slash  = '\0';
 +	file->parentdir.length = slash - file->parentdir.s;
 +	archive_strcpy(&(file->basename),  slash + 1);
 +	return (ret);
 +}
 +
 +static int
 +mtree_entry_create_virtual_dir(struct archive_write *a, const char *pathname,
 +    struct mtree_entry **m_entry)
 +{
 +	struct archive_entry *entry;
 +	struct mtree_entry *file;
 +	int r;
 +
 +	entry = archive_entry_new();
 +	if (entry == NULL) {
 +		*m_entry = NULL;
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	archive_entry_copy_pathname(entry, pathname);
 +	archive_entry_set_mode(entry, AE_IFDIR | 0755);
 +	archive_entry_set_mtime(entry, time(NULL), 0);
 +
 +	r = mtree_entry_new(a, entry, &file);
 +	archive_entry_free(entry);
 +	if (r < ARCHIVE_WARN) {
 +		*m_entry = NULL;
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	file->dir_info->virtual = 1;
 +
 +	*m_entry = file;
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +mtree_entry_register_add(struct mtree_writer *mtree, struct mtree_entry *file)
 +{
 +        file->next = NULL;
 +        *mtree->file_list.last = file;
 +        mtree->file_list.last = &(file->next);
 +}
 +
 +static void
 +mtree_entry_register_init(struct mtree_writer *mtree)
 +{
 +	mtree->file_list.first = NULL;
 +	mtree->file_list.last = &(mtree->file_list.first);
 +}
 +
 +static void
 +mtree_entry_register_free(struct mtree_writer *mtree)
 +{
 +	struct mtree_entry *file, *file_next;
 +
 +	file = mtree->file_list.first;
 +	while (file != NULL) {
 +		file_next = file->next;
 +		mtree_entry_free(file);
 +		file = file_next;
 +	}
 +}
 +
 +static int
 +mtree_entry_add_child_tail(struct mtree_entry *parent,
 +    struct mtree_entry *child)
 +{
 +	child->dir_info->chnext = NULL;
 +	*parent->dir_info->children.last = child;
 +	parent->dir_info->children.last = &(child->dir_info->chnext);
 +	return (1);
 +}
 +
 +/*
 + * Find a entry from a parent entry with the name.
 + */
 +static struct mtree_entry *
 +mtree_entry_find_child(struct mtree_entry *parent, const char *child_name)
 +{
 +	struct mtree_entry *np;
 +
 +	if (parent == NULL)
 +		return (NULL);
 +	np = (struct mtree_entry *)__archive_rb_tree_find_node(
 +	    &(parent->dir_info->rbtree), child_name);
 +	return (np);
 +}
 +
 +static int
 +get_path_component(char *name, size_t n, const char *fn)
 +{
 +	char *p;
 +	size_t l;
 +
 +	p = strchr(fn, '/');
 +	if (p == NULL) {
 +		if ((l = strlen(fn)) == 0)
 +			return (0);
 +	} else
 +		l = p - fn;
 +	if (l > n -1)
 +		return (-1);
 +	memcpy(name, fn, l);
 +	name[l] = '\0';
 +
 +	return ((int)l);
 +}
 +
 +/*
 + * Add a new entry into the tree.
 + */
 +static int
 +mtree_entry_tree_add(struct archive_write *a, struct mtree_entry **filep)
 +{
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +	char name[_MAX_FNAME];/* Included null terminator size. */
 +#elif defined(NAME_MAX) && NAME_MAX >= 255
 +	char name[NAME_MAX+1];
 +#else
 +	char name[256];
 +#endif
 +	struct mtree_writer *mtree = (struct mtree_writer *)a->format_data;
 +	struct mtree_entry *dent, *file, *np;
 +	const char *fn, *p;
 +	int l, r;
 +
 +	file = *filep;
 +	if (file->parentdir.length == 0 && file->basename.length == 1 &&
 +	    file->basename.s[0] == '.') {
 +		file->parent = file;
 +		if (mtree->root != NULL) {
 +			np = mtree->root;
 +			goto same_entry;
 +		}
 +		mtree->root = file;
 +		mtree_entry_register_add(mtree, file);
 +		return (ARCHIVE_OK);
 +	}
 +
 +	if (file->parentdir.length == 0) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Internal programing error "
 +		    "in generating canonical name for %s",
 +		    file->pathname.s);
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	fn = p = file->parentdir.s;
 +
 +	/*
 +	 * If the path of the parent directory of `file' entry is
 +	 * the same as the path of `cur_dirent', add `file' entry to
 +	 * `cur_dirent'.
 +	 */
 +	if (archive_strlen(&(mtree->cur_dirstr))
 +	      == archive_strlen(&(file->parentdir)) &&
 +	    strcmp(mtree->cur_dirstr.s, fn) == 0) {
 +		if (!__archive_rb_tree_insert_node(
 +		    &(mtree->cur_dirent->dir_info->rbtree),
 +		    (struct archive_rb_node *)file)) {
 +			/* There is the same name in the tree. */
 +			np = (struct mtree_entry *)__archive_rb_tree_find_node(
 +			    &(mtree->cur_dirent->dir_info->rbtree),
 +			    file->basename.s);
 +			goto same_entry;
 +		}
 +		file->parent = mtree->cur_dirent;
 +		mtree_entry_register_add(mtree, file);
 +		return (ARCHIVE_OK);
 +	}
 +
 +	dent = mtree->root;
 +	for (;;) {
 +		l = get_path_component(name, sizeof(name), fn);
 +		if (l == 0) {
 +			np = NULL;
 +			break;
 +		}
 +		if (l < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "A name buffer is too small");
 +			return (ARCHIVE_FATAL);
 +		}
 +		if (l == 1 && name[0] == '.' && dent != NULL &&
 +		    dent == mtree->root) {
 +			fn += l;
 +			if (fn[0] == '/')
 +				fn++;
 +			continue;
 +		}
 +
 +		np = mtree_entry_find_child(dent, name);
 +		if (np == NULL || fn[0] == '\0')
 +			break;
 +
 +		/* Find next sub directory. */
 +		if (!np->dir_info) {
 +			/* NOT Directory! */
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "`%s' is not directory, we cannot insert `%s' ",
 +			    np->pathname.s, file->pathname.s);
 +			return (ARCHIVE_FAILED);
 +		}
 +		fn += l;
 +		if (fn[0] == '/')
 +			fn++;
 +		dent = np;
 +	}
 +	if (np == NULL) {
 +		/*
 +		 * Create virtual parent directories.
 +		 */
 +		while (fn[0] != '\0') {
 +			struct mtree_entry *vp;
 +			struct archive_string as;
 +
 +			archive_string_init(&as);
 +			archive_strncat(&as, p, fn - p + l);
 +			if (as.s[as.length-1] == '/') {
 +				as.s[as.length-1] = '\0';
 +				as.length--;
 +			}
 +			r = mtree_entry_create_virtual_dir(a, as.s, &vp);
 +			archive_string_free(&as);
 +			if (r < ARCHIVE_WARN)
 +				return (r);
 +
 +			if (strcmp(vp->pathname.s, ".") == 0) {
 +				vp->parent = vp;
 +				mtree->root = vp;
 +			} else {
 +				__archive_rb_tree_insert_node(
 +				    &(dent->dir_info->rbtree),
 +				    (struct archive_rb_node *)vp);
 +				vp->parent = dent;
 +			}
 +			mtree_entry_register_add(mtree, vp);
 +			np = vp;
 +
 +			fn += l;
 +			if (fn[0] == '/')
 +				fn++;
 +			l = get_path_component(name, sizeof(name), fn);
 +			if (l < 0) {
 +				archive_string_free(&as);
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "A name buffer is too small");
 +				return (ARCHIVE_FATAL);
 +			}
 +			dent = np;
 +		}
 +
 +		/* Found out the parent directory where `file' can be
 +		 * inserted. */
 +		mtree->cur_dirent = dent;
 +		archive_string_empty(&(mtree->cur_dirstr));
 +		archive_string_ensure(&(mtree->cur_dirstr),
 +		    archive_strlen(&(dent->parentdir)) +
 +		    archive_strlen(&(dent->basename)) + 2);
 +		if (archive_strlen(&(dent->parentdir)) +
 +		    archive_strlen(&(dent->basename)) == 0)
 +			mtree->cur_dirstr.s[0] = 0;
 +		else {
 +			if (archive_strlen(&(dent->parentdir)) > 0) {
 +				archive_string_copy(&(mtree->cur_dirstr),
 +				    &(dent->parentdir));
 +				archive_strappend_char(
 +				    &(mtree->cur_dirstr), '/');
 +			}
 +			archive_string_concat(&(mtree->cur_dirstr),
 +			    &(dent->basename));
 +		}
 +
 +		if (!__archive_rb_tree_insert_node(
 +		    &(dent->dir_info->rbtree),
 +		    (struct archive_rb_node *)file)) {
 +			np = (struct mtree_entry *)__archive_rb_tree_find_node(
 +			    &(dent->dir_info->rbtree), file->basename.s);
 +			goto same_entry;
 +		}
 +		file->parent = dent;
 +		mtree_entry_register_add(mtree, file);
 +		return (ARCHIVE_OK);
 +	}
 +
 +same_entry:
 +	/*
 +	 * We have already has the entry the filename of which is
 +	 * the same.
 +	 */
 +	r = mtree_entry_exchange_same_entry(a, np, file);
 +	if (r < ARCHIVE_WARN)
 +		return (r);
 +	if (np->dir_info)
 +		np->dir_info->virtual = 0;
 +	*filep = np;
 +	mtree_entry_free(file);
 +	return (ARCHIVE_WARN);
 +}
 +
 +static int
 +mtree_entry_exchange_same_entry(struct archive_write *a, struct mtree_entry *np,
 +    struct mtree_entry *file)
 +{
 +
 +	if ((np->mode & AE_IFMT) != (file->mode & AE_IFMT)) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Found duplicate entries `%s' and its file type is "
 +		    "different",
 +		    np->pathname.s);
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	/* Update the existent mtree entry's attributes by the new one's. */
 +	archive_string_empty(&np->symlink);
 +	archive_string_concat(&np->symlink, &file->symlink);
 +	archive_string_empty(&np->uname);
 +	archive_string_concat(&np->uname, &file->uname);
 +	archive_string_empty(&np->gname);
 +	archive_string_concat(&np->gname, &file->gname);
 +	archive_string_empty(&np->fflags_text);
 +	archive_string_concat(&np->fflags_text, &file->fflags_text);
 +	np->nlink = file->nlink;
 +	np->filetype = file->filetype;
 +	np->mode = file->mode;
 +	np->size = file->size;
 +	np->uid = file->uid;
 +	np->gid = file->gid;
 +	np->fflags_set = file->fflags_set;
 +	np->fflags_clear = file->fflags_clear;
 +	np->mtime = file->mtime;
 +	np->mtime_nsec = file->mtime_nsec;
 +	np->rdevmajor = file->rdevmajor;
 +	np->rdevminor = file->rdevminor;
 +	np->devmajor = file->devmajor;
 +	np->devminor = file->devminor;
 +	np->ino = file->ino;
 +
 +	return (ARCHIVE_WARN);
 +}
diff --cc Utilities/cmlibarchive/libarchive/archive_write_set_format_warc.c
index 0000000,80abc6f..80abc6f
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_warc.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_warc.c
diff --cc Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c
index 4cd2b9d,0000000..a47c53c
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c
@@@ -1,3181 -1,0 +1,3218 @@@
 +/*-
 + * Copyright (c) 2010-2012 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD$");
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_LIMITS_H
 +#include <limits.h>
 +#endif
 +#include <stdlib.h>
 +#if HAVE_LIBXML_XMLWRITER_H
 +#include <libxml/xmlwriter.h>
 +#endif
 +#ifdef HAVE_BZLIB_H
 +#include <cm_bzlib.h>
 +#endif
 +#if HAVE_LZMA_H
 +#include <cm_lzma.h>
 +#endif
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h>
 +#endif
 +
 +#include "archive.h"
- #include "archive_crypto_private.h"
++#include "archive_digest_private.h"
 +#include "archive_endian.h"
 +#include "archive_entry.h"
 +#include "archive_entry_locale.h"
 +#include "archive_private.h"
 +#include "archive_rb.h"
 +#include "archive_string.h"
 +#include "archive_write_private.h"
 +
 +/*
 + * Differences to xar utility.
 + * - Subdocument is not supported yet.
 + * - ACL is not supported yet.
 + * - When writing an XML element <link type="<file-type>">, <file-type>
 + *   which is a file type a symbolic link is referencing is always marked
 + *   as "broken". Xar utility uses stat(2) to get the file type, but, in
 + *   libarcive format writer, we should not use it; if it is needed, we
 + *   should get about it at archive_read_disk.c.
 + * - It is possible to appear both <flags> and <ext2> elements.
 + *   Xar utility generates <flags> on BSD platform and <ext2> on Linux
 + *   platform.
 + *
 + */
 +
 +#if !(defined(HAVE_LIBXML_XMLWRITER_H) && defined(LIBXML_VERSION) &&\
 +	LIBXML_VERSION >= 20703) ||\
 +	!defined(HAVE_ZLIB_H) || \
 +	!defined(ARCHIVE_HAS_MD5) || !defined(ARCHIVE_HAS_SHA1)
 +/*
 + * xar needs several external libraries.
 + *   o libxml2
 + *   o openssl or MD5/SHA1 hash function
 + *   o zlib
 + *   o bzlib2 (option)
 + *   o liblzma (option)
 + */
 +int
 +archive_write_set_format_xar(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +
 +	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +	    "Xar not supported on this platform");
 +	return (ARCHIVE_WARN);
 +}
 +
 +#else	/* Support xar format */
 +
 +/*#define DEBUG_PRINT_TOC		1 */
 +
 +#define BAD_CAST_CONST (const xmlChar *)
 +
 +#define HEADER_MAGIC	0x78617221
 +#define HEADER_SIZE	28
 +#define HEADER_VERSION	1
 +
 +enum sumalg {
 +	CKSUM_NONE = 0,
 +	CKSUM_SHA1 = 1,
 +	CKSUM_MD5 = 2
 +};
 +
 +#define MD5_SIZE	16
 +#define SHA1_SIZE	20
 +#define MAX_SUM_SIZE	20
 +#define MD5_NAME	"md5"
 +#define SHA1_NAME	"sha1"
-  
++
 +enum enctype {
 +	NONE,
 +	GZIP,
 +	BZIP2,
 +	LZMA,
 +	XZ,
 +};
 +
 +struct chksumwork {
 +	enum sumalg		 alg;
 +#ifdef ARCHIVE_HAS_MD5
 +	archive_md5_ctx		 md5ctx;
 +#endif
 +#ifdef ARCHIVE_HAS_SHA1
 +	archive_sha1_ctx	 sha1ctx;
 +#endif
 +};
 +
 +enum la_zaction {
 +	ARCHIVE_Z_FINISH,
 +	ARCHIVE_Z_RUN
 +};
 +
 +/*
 + * Universal zstream.
 + */
 +struct la_zstream {
 +	const unsigned char	*next_in;
 +	size_t			 avail_in;
 +	uint64_t		 total_in;
 +
 +	unsigned char		*next_out;
 +	size_t			 avail_out;
 +	uint64_t		 total_out;
 +
 +	int			 valid;
 +	void			*real_stream;
 +	int			 (*code) (struct archive *a,
 +				    struct la_zstream *lastrm,
 +				    enum la_zaction action);
 +	int			 (*end)(struct archive *a,
 +				    struct la_zstream *lastrm);
 +};
 +
 +struct chksumval {
 +	enum sumalg		 alg;
 +	size_t			 len;
 +	unsigned char		 val[MAX_SUM_SIZE];
 +};
 +
 +struct heap_data {
 +	int			 id;
 +	struct heap_data	*next;
 +	uint64_t		 temp_offset;
 +	uint64_t		 length;	/* archived size.	*/
 +	uint64_t		 size;		/* extracted size.	*/
 +	enum enctype		 compression;
 +	struct chksumval	 a_sum;		/* archived checksum.	*/
 +	struct chksumval	 e_sum;		/* extracted checksum.	*/
 +};
 +
 +struct file {
 +	struct archive_rb_node	 rbnode;
 +
 +	int			 id;
 +	struct archive_entry	*entry;
 +
 +	struct archive_rb_tree	 rbtree;
 +	struct file		*next;
 +	struct file		*chnext;
 +	struct file		*hlnext;
 +	/* For hardlinked files.
 +	 * Use only when archive_entry_nlink() > 1 */
 +	struct file		*hardlink_target;
 +	struct file		*parent;	/* parent directory entry */
 +	/*
 +	 * To manage sub directory files.
 +	 * We use 'chnext' a menber of struct file to chain.
 +	 */
 +	struct {
 +		struct file	*first;
 +		struct file	**last;
 +	}			 children;
 +
 +	/* For making a directory tree. */
 +        struct archive_string    parentdir;
 +        struct archive_string    basename;
 +        struct archive_string    symlink;
 +
 +	int			 ea_idx;
 +	struct {
 +		struct heap_data *first;
 +		struct heap_data **last;
 +	}			 xattr;
 +	struct heap_data	 data;
 +        struct archive_string    script;
 +
 +	int			 virtual:1;
 +	int			 dir:1;
 +};
 +
 +struct hardlink {
 +	struct archive_rb_node	 rbnode;
 +	int			 nlink;
 +	struct {
 +		struct file	*first;
 +		struct file	**last;
 +	}			 file_list;
 +};
 +
 +struct xar {
 +	int			 temp_fd;
 +	uint64_t		 temp_offset;
 +
 +	int			 file_idx;
 +	struct file		*root;
 +	struct file		*cur_dirent;
 +	struct archive_string	 cur_dirstr;
 +	struct file		*cur_file;
 +	uint64_t		 bytes_remaining;
 +	struct archive_string	 tstr;
 +	struct archive_string	 vstr;
 +
 +	enum sumalg		 opt_toc_sumalg;
 +	enum sumalg		 opt_sumalg;
 +	enum enctype		 opt_compression;
 +	int			 opt_compression_level;
++	uint32_t		 opt_threads;
 +
 +	struct chksumwork	 a_sumwrk;	/* archived checksum.	*/
 +	struct chksumwork	 e_sumwrk;	/* extracted checksum.	*/
 +	struct la_zstream	 stream;
 +	struct archive_string_conv *sconv;
 +	/*
 +	 * Compressed data buffer.
 +	 */
 +	unsigned char		 wbuff[1024 * 64];
 +	size_t			 wbuff_remaining;
 +
 +	struct heap_data	 toc;
 +	/*
 +	 * The list of all file entries is used to manage struct file
 +	 * objects.
 +	 * We use 'next' a menber of struct file to chain.
 +	 */
 +	struct {
 +		struct file	*first;
 +		struct file	**last;
 +	}			 file_list;
 +	/*
 +	 * The list of hard-linked file entries.
 +	 * We use 'hlnext' a menber of struct file to chain.
 +	 */
 +	struct archive_rb_tree	 hardlink_rbtree;
 +};
 +
 +static int	xar_options(struct archive_write *,
 +		    const char *, const char *);
 +static int	xar_write_header(struct archive_write *,
 +		    struct archive_entry *);
 +static ssize_t	xar_write_data(struct archive_write *,
 +		    const void *, size_t);
 +static int	xar_finish_entry(struct archive_write *);
 +static int	xar_close(struct archive_write *);
 +static int	xar_free(struct archive_write *);
 +
 +static struct file *file_new(struct archive_write *a, struct archive_entry *);
 +static void	file_free(struct file *);
 +static struct file *file_create_virtual_dir(struct archive_write *a, struct xar *,
 +		    const char *);
 +static int	file_add_child_tail(struct file *, struct file *);
 +static struct file *file_find_child(struct file *, const char *);
 +static int	file_gen_utility_names(struct archive_write *,
 +		    struct file *);
 +static int	get_path_component(char *, int, const char *);
 +static int	file_tree(struct archive_write *, struct file **);
 +static void	file_register(struct xar *, struct file *);
 +static void	file_init_register(struct xar *);
 +static void	file_free_register(struct xar *);
 +static int	file_register_hardlink(struct archive_write *,
 +		    struct file *);
 +static void	file_connect_hardlink_files(struct xar *);
 +static void	file_init_hardlinks(struct xar *);
 +static void	file_free_hardlinks(struct xar *);
 +
 +static void	checksum_init(struct chksumwork *, enum sumalg);
 +static void	checksum_update(struct chksumwork *, const void *, size_t);
 +static void	checksum_final(struct chksumwork *, struct chksumval *);
 +static int	compression_init_encoder_gzip(struct archive *,
 +		    struct la_zstream *, int, int);
 +static int	compression_code_gzip(struct archive *,
 +		    struct la_zstream *, enum la_zaction);
 +static int	compression_end_gzip(struct archive *, struct la_zstream *);
 +static int	compression_init_encoder_bzip2(struct archive *,
 +		    struct la_zstream *, int);
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +static int	compression_code_bzip2(struct archive *,
 +		    struct la_zstream *, enum la_zaction);
 +static int	compression_end_bzip2(struct archive *, struct la_zstream *);
 +#endif
 +static int	compression_init_encoder_lzma(struct archive *,
 +		    struct la_zstream *, int);
 +static int	compression_init_encoder_xz(struct archive *,
- 		    struct la_zstream *, int);
++		    struct la_zstream *, int, int);
 +#if defined(HAVE_LZMA_H)
 +static int	compression_code_lzma(struct archive *,
 +		    struct la_zstream *, enum la_zaction);
 +static int	compression_end_lzma(struct archive *, struct la_zstream *);
 +#endif
 +static int	xar_compression_init_encoder(struct archive_write *);
 +static int	compression_code(struct archive *,
 +		    struct la_zstream *, enum la_zaction);
 +static int	compression_end(struct archive *,
 +		    struct la_zstream *);
 +static int	save_xattrs(struct archive_write *, struct file *);
 +static int	getalgsize(enum sumalg);
 +static const char *getalgname(enum sumalg);
 +
 +int
 +archive_write_set_format_xar(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	struct xar *xar;
 +
 +	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_write_set_format_xar");
 +
 +	/* If another format was already registered, unregister it. */
 +	if (a->format_free != NULL)
 +		(a->format_free)(a);
 +
 +	xar = calloc(1, sizeof(*xar));
 +	if (xar == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate xar data");
 +		return (ARCHIVE_FATAL);
 +	}
 +	xar->temp_fd = -1;
 +	file_init_register(xar);
 +	file_init_hardlinks(xar);
 +	archive_string_init(&(xar->tstr));
 +	archive_string_init(&(xar->vstr));
 +
 +	/*
 +	 * Create the root directory.
 +	 */
 +	xar->root = file_create_virtual_dir(a, xar, "");
 +	if (xar->root == NULL) {
 +		free(xar);
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate xar data");
 +		return (ARCHIVE_FATAL);
 +	}
 +	xar->root->parent = xar->root;
 +	file_register(xar, xar->root);
 +	xar->cur_dirent = xar->root;
 +	archive_string_init(&(xar->cur_dirstr));
 +	archive_string_ensure(&(xar->cur_dirstr), 1);
 +	xar->cur_dirstr.s[0] = 0;
 +
 +	/*
 +	 * Initialize option.
 +	 */
 +	/* Set default checksum type. */
 +	xar->opt_toc_sumalg = CKSUM_SHA1;
 +	xar->opt_sumalg = CKSUM_SHA1;
- 	/* Set default compression type and level. */
++	/* Set default compression type, level, and number of threads. */
 +	xar->opt_compression = GZIP;
 +	xar->opt_compression_level = 6;
++	xar->opt_threads = 1;
 +
 +	a->format_data = xar;
 +
 +	a->format_name = "xar";
 +	a->format_options = xar_options;
 +	a->format_write_header = xar_write_header;
 +	a->format_write_data = xar_write_data;
 +	a->format_finish_entry = xar_finish_entry;
 +	a->format_close = xar_close;
 +	a->format_free = xar_free;
 +	a->archive.archive_format = ARCHIVE_FORMAT_XAR;
 +	a->archive.archive_format_name = "xar";
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +xar_options(struct archive_write *a, const char *key, const char *value)
 +{
 +	struct xar *xar;
 +
 +	xar = (struct xar *)a->format_data;
 +
 +	if (strcmp(key, "checksum") == 0) {
 +		if (value == NULL)
 +			xar->opt_sumalg = CKSUM_NONE;
 +		else if (strcmp(value, "sha1") == 0)
 +			xar->opt_sumalg = CKSUM_SHA1;
 +		else if (strcmp(value, "md5") == 0)
 +			xar->opt_sumalg = CKSUM_MD5;
 +		else {
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Unknown checksum name: `%s'",
 +			    value);
 +			return (ARCHIVE_FAILED);
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +	if (strcmp(key, "compression") == 0) {
 +		const char *name = NULL;
 +
 +		if (value == NULL)
 +			xar->opt_compression = NONE;
 +		else if (strcmp(value, "gzip") == 0)
 +			xar->opt_compression = GZIP;
 +		else if (strcmp(value, "bzip2") == 0)
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +			xar->opt_compression = BZIP2;
 +#else
 +			name = "bzip2";
 +#endif
 +		else if (strcmp(value, "lzma") == 0)
 +#if HAVE_LZMA_H
 +			xar->opt_compression = LZMA;
 +#else
 +			name = "lzma";
 +#endif
 +		else if (strcmp(value, "xz") == 0)
 +#if HAVE_LZMA_H
 +			xar->opt_compression = XZ;
 +#else
 +			name = "xz";
 +#endif
 +		else {
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Unknown compression name: `%s'",
 +			    value);
 +			return (ARCHIVE_FAILED);
 +		}
 +		if (name != NULL) {
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "`%s' compression not supported "
 +			    "on this platform",
 +			    name);
 +			return (ARCHIVE_FAILED);
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +	if (strcmp(key, "compression-level") == 0) {
 +		if (value == NULL ||
 +		    !(value[0] >= '0' && value[0] <= '9') ||
 +		    value[1] != '\0') {
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Illegal value `%s'",
 +			    value);
 +			return (ARCHIVE_FAILED);
 +		}
 +		xar->opt_compression_level = value[0] - '0';
 +		return (ARCHIVE_OK);
 +	}
 +	if (strcmp(key, "toc-checksum") == 0) {
 +		if (value == NULL)
 +			xar->opt_toc_sumalg = CKSUM_NONE;
 +		else if (strcmp(value, "sha1") == 0)
 +			xar->opt_toc_sumalg = CKSUM_SHA1;
 +		else if (strcmp(value, "md5") == 0)
 +			xar->opt_toc_sumalg = CKSUM_MD5;
 +		else {
 +			archive_set_error(&(a->archive),
 +			    ARCHIVE_ERRNO_MISC,
 +			    "Unknown checksum name: `%s'",
 +			    value);
 +			return (ARCHIVE_FAILED);
 +		}
 +		return (ARCHIVE_OK);
 +	}
++	if (strcmp(key, "threads") == 0) {
++		if (value == NULL)
++			return (ARCHIVE_FAILED);
++		xar->opt_threads = (int)strtoul(value, NULL, 10);
++		if (xar->opt_threads == 0 && errno != 0) {
++			xar->opt_threads = 1;
++			archive_set_error(&(a->archive),
++			    ARCHIVE_ERRNO_MISC,
++			    "Illegal value `%s'",
++			    value);
++			return (ARCHIVE_FAILED);
++		}
++		if (xar->opt_threads == 0) {
++#ifdef HAVE_LZMA_STREAM_ENCODER_MT
++			xar->opt_threads = lzma_cputhreads();
++#else
++			xar->opt_threads = 1;
++#endif
++		}
++	}
 +
 +	/* Note: The "warn" return is just to inform the options
 +	 * supervisor that we didn't handle it.  It will generate
 +	 * a suitable error if no one used this option. */
 +	return (ARCHIVE_WARN);
 +}
 +
 +static int
 +xar_write_header(struct archive_write *a, struct archive_entry *entry)
 +{
 +	struct xar *xar;
 +	struct file *file;
 +	struct archive_entry *file_entry;
 +	int r, r2;
 +
 +	xar = (struct xar *)a->format_data;
 +	xar->cur_file = NULL;
 +	xar->bytes_remaining = 0;
 +
 +	if (xar->sconv == NULL) {
 +		xar->sconv = archive_string_conversion_to_charset(
 +		    &a->archive, "UTF-8", 1);
 +		if (xar->sconv == NULL)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	file = file_new(a, entry);
 +	if (file == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate data");
 +		return (ARCHIVE_FATAL);
 +	}
 +	r2 = file_gen_utility_names(a, file);
 +	if (r2 < ARCHIVE_WARN)
 +		return (r2);
 +
 +	/*
 +	 * Ignore a path which looks like the top of directory name
 +	 * since we have already made the root directory of an Xar archive.
 +	 */
 +	if (archive_strlen(&(file->parentdir)) == 0 &&
 +	    archive_strlen(&(file->basename)) == 0) {
 +		file_free(file);
 +		return (r2);
 +	}
 +
 +	/* Add entry into tree */
 +	file_entry = file->entry;
 +	r = file_tree(a, &file);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/* There is the same file in tree and
 +	 * the current file is older than the file in tree.
 +	 * So we don't need the current file data anymore. */
 +	if (file->entry != file_entry)
 +		return (r2);
 +	if (file->id == 0)
 +		file_register(xar, file);
 +
 +	/* A virtual file, which is a directory, does not have
 +	 * any contents and we won't store it into a archive
 +	 * file other than its name. */
 +	if (file->virtual)
 +		return (r2);
 +
 +	/*
 +	 * Prepare to save the contents of the file.
 +	 */
 +	if (xar->temp_fd == -1) {
 +		int algsize;
 +		xar->temp_offset = 0;
 +		xar->temp_fd = __archive_mktemp(NULL);
 +		if (xar->temp_fd < 0) {
 +			archive_set_error(&a->archive, errno,
 +			    "Couldn't create temporary file");
 +			return (ARCHIVE_FATAL);
 +		}
 +		algsize = getalgsize(xar->opt_toc_sumalg);
 +		if (algsize > 0) {
 +			if (lseek(xar->temp_fd, algsize, SEEK_SET) < 0) {
 +				archive_set_error(&(a->archive), errno,
 +				    "lseek failed");
 +				return (ARCHIVE_FATAL);
 +			}
 +			xar->temp_offset = algsize;
 +		}
 +	}
 +
 +	if (archive_entry_hardlink(file->entry) == NULL) {
 +		r = save_xattrs(a, file);
 +		if (r != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Non regular files contents are unneeded to be saved to
 +	 * a temporary file. */
 +	if (archive_entry_filetype(file->entry) != AE_IFREG)
 +		return (r2);
 +
 +	/*
 +	 * Set the current file to cur_file to read its contents.
 +	 */
 +	xar->cur_file = file;
 +
 +	if (archive_entry_nlink(file->entry) > 1) {
 +		r = file_register_hardlink(a, file);
 +		if (r != ARCHIVE_OK)
 +			return (r);
 +		if (archive_entry_hardlink(file->entry) != NULL) {
 +			archive_entry_unset_size(file->entry);
 +			return (r2);
 +		}
 +	}
 +
 +	/* Save a offset of current file in temporary file. */
 +	file->data.temp_offset = xar->temp_offset;
 +	file->data.size = archive_entry_size(file->entry);
 +	file->data.compression = xar->opt_compression;
 +	xar->bytes_remaining = archive_entry_size(file->entry);
 +	checksum_init(&(xar->a_sumwrk), xar->opt_sumalg);
 +	checksum_init(&(xar->e_sumwrk), xar->opt_sumalg);
 +	r = xar_compression_init_encoder(a);
 +
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	else
 +		return (r2);
 +}
 +
 +static int
 +write_to_temp(struct archive_write *a, const void *buff, size_t s)
 +{
 +	struct xar *xar;
 +	const unsigned char *p;
 +	ssize_t ws;
 +
 +	xar = (struct xar *)a->format_data;
 +	p = (const unsigned char *)buff;
 +	while (s) {
 +		ws = write(xar->temp_fd, p, s);
 +		if (ws < 0) {
 +			archive_set_error(&(a->archive), errno,
 +			    "fwrite function failed");
 +			return (ARCHIVE_FATAL);
 +		}
 +		s -= ws;
 +		p += ws;
 +		xar->temp_offset += ws;
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static ssize_t
 +xar_write_data(struct archive_write *a, const void *buff, size_t s)
 +{
 +	struct xar *xar;
 +	enum la_zaction run;
 +	size_t size, rsize;
 +	int r;
 +
 +	xar = (struct xar *)a->format_data;
 +
 +	if (s > xar->bytes_remaining)
 +		s = (size_t)xar->bytes_remaining;
 +	if (s == 0 || xar->cur_file == NULL)
 +		return (0);
 +	if (xar->cur_file->data.compression == NONE) {
 +		checksum_update(&(xar->e_sumwrk), buff, s);
 +		checksum_update(&(xar->a_sumwrk), buff, s);
 +		size = rsize = s;
 +	} else {
 +		xar->stream.next_in = (const unsigned char *)buff;
 +		xar->stream.avail_in = s;
 +		if (xar->bytes_remaining > s)
 +			run = ARCHIVE_Z_RUN;
 +		else
 +			run = ARCHIVE_Z_FINISH;
 +		/* Compress file data. */
 +		r = compression_code(&(a->archive), &(xar->stream), run);
 +		if (r != ARCHIVE_OK && r != ARCHIVE_EOF)
 +			return (ARCHIVE_FATAL);
 +		rsize = s - xar->stream.avail_in;
 +		checksum_update(&(xar->e_sumwrk), buff, rsize);
 +		size = sizeof(xar->wbuff) - xar->stream.avail_out;
 +		checksum_update(&(xar->a_sumwrk), xar->wbuff, size);
 +	}
 +#if !defined(_WIN32) || defined(__CYGWIN__)
 +	if (xar->bytes_remaining ==
 +	    (uint64_t)archive_entry_size(xar->cur_file->entry)) {
 +		/*
 +		 * Get the path of a shell script if so.
 +		 */
 +		const unsigned char *b = (const unsigned char *)buff;
 +
 +		archive_string_empty(&(xar->cur_file->script));
 +		if (rsize > 2 && b[0] == '#' && b[1] == '!') {
 +			size_t i, end, off;
 +
 +			off = 2;
 +			if (b[off] == ' ')
 +				off++;
 +#ifdef PATH_MAX
 +			if ((rsize - off) > PATH_MAX)
 +				end = off + PATH_MAX;
 +			else
 +#endif
 +				end = rsize;
 +			/* Find the end of a script path. */
 +			for (i = off; i < end && b[i] != '\0' &&
 +			    b[i] != '\n' && b[i] != '\r' &&
 +			    b[i] != ' ' && b[i] != '\t'; i++)
 +				;
 +			archive_strncpy(&(xar->cur_file->script), b + off,
 +			    i - off);
 +		}
 +	}
 +#endif
 +
 +	if (xar->cur_file->data.compression == NONE) {
 +		if (write_to_temp(a, buff, size) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	} else {
 +		if (write_to_temp(a, xar->wbuff, size) != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +	xar->bytes_remaining -= rsize;
 +	xar->cur_file->data.length += size;
 +
 +	return (rsize);
 +}
 +
 +static int
 +xar_finish_entry(struct archive_write *a)
 +{
 +	struct xar *xar;
 +	struct file *file;
 +	size_t s;
 +	ssize_t w;
 +
 +	xar = (struct xar *)a->format_data;
 +	if (xar->cur_file == NULL)
 +		return (ARCHIVE_OK);
 +
 +	while (xar->bytes_remaining > 0) {
 +		s = (size_t)xar->bytes_remaining;
 +		if (s > a->null_length)
 +			s = a->null_length;
 +		w = xar_write_data(a, a->nulls, s);
 +		if (w > 0)
 +			xar->bytes_remaining -= w;
 +		else
 +			return (w);
 +	}
 +	file = xar->cur_file;
 +	checksum_final(&(xar->e_sumwrk), &(file->data.e_sum));
 +	checksum_final(&(xar->a_sumwrk), &(file->data.a_sum));
 +	xar->cur_file = NULL;
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +xmlwrite_string_attr(struct archive_write *a, xmlTextWriterPtr writer,
 +	const char *key, const char *value,
 +	const char *attrkey, const char *attrvalue)
 +{
 +	int r;
 +
 +	r = xmlTextWriterStartElement(writer, BAD_CAST_CONST(key));
 +	if (r < 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlTextWriterStartElement() failed: %d", r);
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (attrkey != NULL && attrvalue != NULL) {
 +		r = xmlTextWriterWriteAttribute(writer,
 +		    BAD_CAST_CONST(attrkey), BAD_CAST_CONST(attrvalue));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterWriteAttribute() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +	if (value != NULL) {
 +		r = xmlTextWriterWriteString(writer, BAD_CAST_CONST(value));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterWriteString() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +	r = xmlTextWriterEndElement(writer);
 +	if (r < 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlTextWriterEndElement() failed: %d", r);
 +		return (ARCHIVE_FATAL);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +xmlwrite_string(struct archive_write *a, xmlTextWriterPtr writer,
 +	const char *key, const char *value)
 +{
 +	int r;
 +
 +	if (value == NULL)
 +		return (ARCHIVE_OK);
- 	
++
 +	r = xmlTextWriterStartElement(writer, BAD_CAST_CONST(key));
 +	if (r < 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlTextWriterStartElement() failed: %d", r);
 +		return (ARCHIVE_FATAL);
 +	}
 +	if (value != NULL) {
 +		r = xmlTextWriterWriteString(writer, BAD_CAST_CONST(value));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterWriteString() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +	r = xmlTextWriterEndElement(writer);
 +	if (r < 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlTextWriterEndElement() failed: %d", r);
 +		return (ARCHIVE_FATAL);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +xmlwrite_fstring(struct archive_write *a, xmlTextWriterPtr writer,
 +	const char *key, const char *fmt, ...)
 +{
 +	struct xar *xar;
 +	va_list ap;
 +
 +	xar = (struct xar *)a->format_data;
 +	va_start(ap, fmt);
 +	archive_string_empty(&xar->vstr);
 +	archive_string_vsprintf(&xar->vstr, fmt, ap);
 +	va_end(ap);
 +	return (xmlwrite_string(a, writer, key, xar->vstr.s));
 +}
 +
 +static int
 +xmlwrite_time(struct archive_write *a, xmlTextWriterPtr writer,
 +	const char *key, time_t t, int z)
 +{
 +	char timestr[100];
 +	struct tm tm;
 +
 +#if defined(HAVE_GMTIME_R)
 +	gmtime_r(&t, &tm);
 +#elif defined(HAVE__GMTIME64_S)
 +	_gmtime64_s(&tm, &t);
 +#else
 +	memcpy(&tm, gmtime(&t), sizeof(tm));
 +#endif
 +	memset(&timestr, 0, sizeof(timestr));
 +	/* Do not use %F and %T for portability. */
 +	strftime(timestr, sizeof(timestr), "%Y-%m-%dT%H:%M:%S", &tm);
 +	if (z)
 +		strcat(timestr, "Z");
 +	return (xmlwrite_string(a, writer, key, timestr));
 +}
 +
 +static int
 +xmlwrite_mode(struct archive_write *a, xmlTextWriterPtr writer,
 +	const char *key, mode_t mode)
 +{
 +	char ms[5];
 +
 +	ms[0] = '0';
 +	ms[1] = '0' + ((mode >> 6) & 07);
 +	ms[2] = '0' + ((mode >> 3) & 07);
 +	ms[3] = '0' + (mode & 07);
 +	ms[4] = '\0';
 +
 +	return (xmlwrite_string(a, writer, key, ms));
 +}
 +
 +static int
 +xmlwrite_sum(struct archive_write *a, xmlTextWriterPtr writer,
 +	const char *key, struct chksumval *sum)
 +{
 +	const char *algname;
 +	int algsize;
 +	char buff[MAX_SUM_SIZE*2 + 1];
 +	char *p;
 +	unsigned char *s;
 +	int i, r;
 +
 +	if (sum->len > 0) {
 +		algname = getalgname(sum->alg);
 +		algsize = getalgsize(sum->alg);
 +		if (algname != NULL) {
 +			const char *hex = "0123456789abcdef";
 +			p = buff;
 +			s = sum->val;
 +			for (i = 0; i < algsize; i++) {
 +				*p++ = hex[(*s >> 4)];
 +				*p++ = hex[(*s & 0x0f)];
 +				s++;
 +			}
 +			*p = '\0';
 +			r = xmlwrite_string_attr(a, writer,
 +			    key, buff,
 +			    "style", algname);
 +			if (r < 0)
 +				return (ARCHIVE_FATAL);
 +		}
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +xmlwrite_heap(struct archive_write *a, xmlTextWriterPtr writer,
 +	struct heap_data *heap)
 +{
 +	const char *encname;
 +	int r;
 +
 +	r = xmlwrite_fstring(a, writer, "length", "%ju", heap->length);
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +	r = xmlwrite_fstring(a, writer, "offset", "%ju", heap->temp_offset);
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +	r = xmlwrite_fstring(a, writer, "size", "%ju", heap->size);
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +	switch (heap->compression) {
 +	case GZIP:
 +		encname = "application/x-gzip"; break;
 +	case BZIP2:
 +		encname = "application/x-bzip2"; break;
 +	case LZMA:
 +		encname = "application/x-lzma"; break;
 +	case XZ:
 +		encname = "application/x-xz"; break;
 +	default:
 +		encname = "application/octet-stream"; break;
 +	}
 +	r = xmlwrite_string_attr(a, writer, "encoding", NULL,
 +	    "style", encname);
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +	r = xmlwrite_sum(a, writer, "archived-checksum", &(heap->a_sum));
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +	r = xmlwrite_sum(a, writer, "extracted-checksum", &(heap->e_sum));
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * xar utility records fflags as following xml elements:
 + *   <flags>
 + *     <UserNoDump/>
 + *     .....
 + *   </flags>
 + * or
 + *   <ext2>
 + *     <NoDump/>
 + *     .....
 + *   </ext2>
 + * If xar is running on BSD platform, records <flags>..</flags>;
 + * if xar is running on linux platform, records <ext2>..</ext2>;
 + * otherwise does not record.
 + *
 + * Our implements records both <flags> and <ext2> if it's necessary.
 + */
 +static int
 +make_fflags_entry(struct archive_write *a, xmlTextWriterPtr writer,
 +    const char *element, const char *fflags_text)
 +{
 +	static const struct flagentry {
 +		const char	*name;
 +		const char	*xarname;
 +	}
 +	flagbsd[] = {
 +		{ "sappnd",	"SystemAppend"},
 +		{ "sappend",	"SystemAppend"},
 +		{ "arch",	"SystemArchived"},
 +		{ "archived",	"SystemArchived"},
 +		{ "schg",	"SystemImmutable"},
 +		{ "schange",	"SystemImmutable"},
 +		{ "simmutable",	"SystemImmutable"},
 +		{ "nosunlnk",	"SystemNoUnlink"},
 +		{ "nosunlink",	"SystemNoUnlink"},
 +		{ "snapshot",	"SystemSnapshot"},
 +		{ "uappnd",	"UserAppend"},
 +		{ "uappend",	"UserAppend"},
 +		{ "uchg",	"UserImmutable"},
 +		{ "uchange",	"UserImmutable"},
 +		{ "uimmutable",	"UserImmutable"},
 +		{ "nodump",	"UserNoDump"},
 +		{ "noopaque",	"UserOpaque"},
 +		{ "nouunlnk",	"UserNoUnlink"},
 +		{ "nouunlink",	"UserNoUnlink"},
 +		{ NULL, NULL}
 +	},
 +	flagext2[] = {
 +		{ "sappnd",	"AppendOnly"},
 +		{ "sappend",	"AppendOnly"},
 +		{ "schg",	"Immutable"},
 +		{ "schange",	"Immutable"},
 +		{ "simmutable",	"Immutable"},
 +		{ "nodump",	"NoDump"},
 +		{ "nouunlnk",	"Undelete"},
 +		{ "nouunlink",	"Undelete"},
 +		{ "btree",	"BTree"},
 +		{ "comperr",	"CompError"},
 +		{ "compress",	"Compress"},
 +		{ "noatime",	"NoAtime"},
 +		{ "compdirty",	"CompDirty"},
 +		{ "comprblk",	"CompBlock"},
 +		{ "dirsync",	"DirSync"},
 +		{ "hashidx",	"HashIndexed"},
 +		{ "imagic",	"iMagic"},
 +		{ "journal",	"Journaled"},
 +		{ "securedeletion",	"SecureDeletion"},
 +		{ "sync",	"Synchronous"},
 +		{ "notail",	"NoTail"},
 +		{ "topdir",	"TopDir"},
 +		{ "reserved",	"Reserved"},
 +		{ NULL, NULL}
 +	};
 +	const struct flagentry *fe, *flagentry;
 +#define FLAGENTRY_MAXSIZE ((sizeof(flagbsd)+sizeof(flagext2))/sizeof(flagbsd))
 +	const struct flagentry *avail[FLAGENTRY_MAXSIZE];
 +	const char *p;
 +	int i, n, r;
 +
 +	if (strcmp(element, "ext2") == 0)
 +		flagentry = flagext2;
 +	else
 +		flagentry = flagbsd;
 +	n = 0;
 +	p = fflags_text;
 +	do {
 +		const char *cp;
 +
 +		cp = strchr(p, ',');
 +		if (cp == NULL)
 +			cp = p + strlen(p);
 +
 +		for (fe = flagentry; fe->name != NULL; fe++) {
 +			if (fe->name[cp - p] != '\0'
 +			    || p[0] != fe->name[0])
 +				continue;
 +			if (strncmp(p, fe->name, cp - p) == 0) {
 +				avail[n++] = fe;
 +				break;
 +			}
 +		}
 +		if (*cp == ',')
 +			p = cp + 1;
 +		else
 +			p = NULL;
 +	} while (p != NULL);
 +
 +	if (n > 0) {
 +		r = xmlTextWriterStartElement(writer, BAD_CAST_CONST(element));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterStartElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		for (i = 0; i < n; i++) {
 +			r = xmlwrite_string(a, writer,
 +			    avail[i]->xarname, NULL);
 +			if (r != ARCHIVE_OK)
 +				return (r);
 +		}
 +
 +		r = xmlTextWriterEndElement(writer);
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterEndElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +make_file_entry(struct archive_write *a, xmlTextWriterPtr writer,
 +    struct file *file)
 +{
 +	struct xar *xar;
 +	const char *filetype, *filelink, *fflags;
 +	struct archive_string linkto;
 +	struct heap_data *heap;
 +	unsigned char *tmp;
 +	const char *p;
 +	size_t len;
 +	int r, r2, l, ll;
 +
 +	xar = (struct xar *)a->format_data;
 +	r2 = ARCHIVE_OK;
 +
 +	/*
 +	 * Make a file name entry, "<name>".
 +	 */
 +	l = ll = archive_strlen(&(file->basename));
 +	tmp = malloc(l);
 +	if (tmp == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate memory");
 +		return (ARCHIVE_FATAL);
 +	}
 +	r = UTF8Toisolat1(tmp, &l, BAD_CAST(file->basename.s), &ll);
 +	free(tmp);
 +	if (r < 0) {
 +		r = xmlTextWriterStartElement(writer, BAD_CAST("name"));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterStartElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		r = xmlTextWriterWriteAttribute(writer,
 +		    BAD_CAST("enctype"), BAD_CAST("base64"));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterWriteAttribute() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		r = xmlTextWriterWriteBase64(writer, file->basename.s,
 +		    0, archive_strlen(&(file->basename)));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterWriteBase64() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		r = xmlTextWriterEndElement(writer);
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterEndElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +	} else {
 +		r = xmlwrite_string(a, writer, "name", file->basename.s);
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Make a file type entry, "<type>".
 +	 */
 +	filelink = NULL;
 +	archive_string_init(&linkto);
 +	switch (archive_entry_filetype(file->entry)) {
 +	case AE_IFDIR:
 +		filetype = "directory"; break;
 +	case AE_IFLNK:
 +		filetype = "symlink"; break;
 +	case AE_IFCHR:
 +		filetype = "character special"; break;
 +	case AE_IFBLK:
 +		filetype = "block special"; break;
 +	case AE_IFSOCK:
 +		filetype = "socket"; break;
 +	case AE_IFIFO:
 +		filetype = "fifo"; break;
 +	case AE_IFREG:
 +	default:
 +		if (file->hardlink_target != NULL) {
 +			filetype = "hardlink";
 +			filelink = "link";
 +			if (file->hardlink_target == file)
 +				archive_strcpy(&linkto, "original");
 +			else
 +				archive_string_sprintf(&linkto, "%d",
 +				    file->hardlink_target->id);
 +		} else
 +			filetype = "file";
 +		break;
 +	}
 +	r = xmlwrite_string_attr(a, writer, "type", filetype,
 +	    filelink, linkto.s);
 +	archive_string_free(&linkto);
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +
 +	/*
 +	 * On a virtual directory, we record "name" and "type" only.
 +	 */
 +	if (file->virtual)
 +		return (ARCHIVE_OK);
 +
 +	switch (archive_entry_filetype(file->entry)) {
 +	case AE_IFLNK:
 +		/*
 +		 * xar utility has checked a file type, which
 +		 * a symblic-link file has referenced.
 +		 * For example:
 +		 *   <link type="directory">../ref/</link>
 +		 *   The symlink target file is "../ref/" and its
 +		 *   file type is a directory.
 +		 *
 +		 *   <link type="file">../f</link>
 +		 *   The symlink target file is "../f" and its
 +		 *   file type is a regular file.
 +		 *
 +		 * But our implemention cannot do it, and then we
 +		 * always record that a attribute "type" is "borken",
 +		 * for example:
 +		 *   <link type="broken">foo/bar</link>
 +		 *   It means "foo/bar" is not reachable.
 +		 */
 +		r = xmlwrite_string_attr(a, writer, "link",
 +		    file->symlink.s,
 +		    "type", "broken");
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +		break;
 +	case AE_IFCHR:
 +	case AE_IFBLK:
 +		r = xmlTextWriterStartElement(writer, BAD_CAST("device"));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterStartElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		r = xmlwrite_fstring(a, writer, "major",
 +		    "%d", archive_entry_rdevmajor(file->entry));
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +		r = xmlwrite_fstring(a, writer, "minor",
 +		    "%d", archive_entry_rdevminor(file->entry));
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +		r = xmlTextWriterEndElement(writer);
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterEndElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		break;
 +	default:
 +		break;
 +	}
 +
 +	/*
 +	 * Make a inode entry, "<inode>".
 +	 */
 +	r = xmlwrite_fstring(a, writer, "inode",
 +	    "%jd", archive_entry_ino64(file->entry));
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +	if (archive_entry_dev(file->entry) != 0) {
 +		r = xmlwrite_fstring(a, writer, "deviceno",
 +		    "%d", archive_entry_dev(file->entry));
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Make a file mode entry, "<mode>".
 +	 */
 +	r = xmlwrite_mode(a, writer, "mode",
 +	    archive_entry_mode(file->entry));
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +
 +	/*
 +	 * Make a user entry, "<uid>" and "<user>.
 +	 */
 +	r = xmlwrite_fstring(a, writer, "uid",
 +	    "%d", archive_entry_uid(file->entry));
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +	r = archive_entry_uname_l(file->entry, &p, &len, xar->sconv);
 +	if (r != 0) {
 +		if (errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Uname");
 +			return (ARCHIVE_FATAL);
 +		}
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Can't translate uname '%s' to UTF-8",
 +		    archive_entry_uname(file->entry));
 +		r2 = ARCHIVE_WARN;
 +	}
 +	if (len > 0) {
 +		r = xmlwrite_string(a, writer, "user", p);
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Make a group entry, "<gid>" and "<group>.
 +	 */
 +	r = xmlwrite_fstring(a, writer, "gid",
 +	    "%d", archive_entry_gid(file->entry));
 +	if (r < 0)
 +		return (ARCHIVE_FATAL);
 +	r = archive_entry_gname_l(file->entry, &p, &len, xar->sconv);
 +	if (r != 0) {
 +		if (errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Gname");
 +			return (ARCHIVE_FATAL);
 +		}
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Can't translate gname '%s' to UTF-8",
 +		    archive_entry_gname(file->entry));
 +		r2 = ARCHIVE_WARN;
 +	}
 +	if (len > 0) {
 +		r = xmlwrite_string(a, writer, "group", p);
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Make a ctime entry, "<ctime>".
 +	 */
 +	if (archive_entry_ctime_is_set(file->entry)) {
 +		r = xmlwrite_time(a, writer, "ctime",
 +		    archive_entry_ctime(file->entry), 1);
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Make a mtime entry, "<mtime>".
 +	 */
 +	if (archive_entry_mtime_is_set(file->entry)) {
 +		r = xmlwrite_time(a, writer, "mtime",
 +		    archive_entry_mtime(file->entry), 1);
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Make a atime entry, "<atime>".
 +	 */
 +	if (archive_entry_atime_is_set(file->entry)) {
 +		r = xmlwrite_time(a, writer, "atime",
 +		    archive_entry_atime(file->entry), 1);
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/*
 +	 * Make fflags entries, "<flags>" and "<ext2>".
 +	 */
 +	fflags = archive_entry_fflags_text(file->entry);
 +	if (fflags != NULL) {
 +		r = make_fflags_entry(a, writer, "flags", fflags);
 +		if (r < 0)
 +			return (r);
 +		r = make_fflags_entry(a, writer, "ext2", fflags);
 +		if (r < 0)
 +			return (r);
 +	}
 +
 +	/*
 +	 * Make extended attribute entries, "<ea>".
 +	 */
 +	archive_entry_xattr_reset(file->entry);
 +	for (heap = file->xattr.first; heap != NULL; heap = heap->next) {
 +		const char *name;
 +		const void *value;
 +		size_t size;
 +
 +		archive_entry_xattr_next(file->entry,
 +		    &name, &value, &size);
 +		r = xmlTextWriterStartElement(writer, BAD_CAST("ea"));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterStartElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		r = xmlTextWriterWriteFormatAttribute(writer,
 +		    BAD_CAST("id"), "%d", heap->id);
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterWriteAttribute() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +		r = xmlwrite_heap(a, writer, heap);
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +		r = xmlwrite_string(a, writer, "name", name);
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +
 +		r = xmlTextWriterEndElement(writer);
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterEndElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	/*
 +	 * Make a file data entry, "<data>".
 +	 */
 +	if (file->data.length > 0) {
 +		r = xmlTextWriterStartElement(writer, BAD_CAST("data"));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterStartElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		r = xmlwrite_heap(a, writer, &(file->data));
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +
 +		r = xmlTextWriterEndElement(writer);
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterEndElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	if (archive_strlen(&file->script) > 0) {
 +		r = xmlTextWriterStartElement(writer, BAD_CAST("content"));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterStartElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		r = xmlwrite_string(a, writer,
 +		    "interpreter", file->script.s);
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +
 +		r = xmlwrite_string(a, writer, "type", "script");
 +		if (r < 0)
 +			return (ARCHIVE_FATAL);
 +
 +		r = xmlTextWriterEndElement(writer);
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterEndElement() failed: %d", r);
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +
 +	return (r2);
 +}
 +
 +/*
 + * Make the TOC
 + */
 +static int
 +make_toc(struct archive_write *a)
 +{
 +	struct xar *xar;
 +	struct file *np;
 +	xmlBufferPtr bp;
 +	xmlTextWriterPtr writer;
 +	int algsize;
 +	int r, ret;
 +
 +	xar = (struct xar *)a->format_data;
 +
 +	ret = ARCHIVE_FATAL;
 +
 +	/*
 +	 * Initialize xml writer.
 +	 */
 +	writer = NULL;
 +	bp = xmlBufferCreate();
 +	if (bp == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "xmlBufferCreate() "
 +		    "couldn't create xml buffer");
 +		goto exit_toc;
 +	}
 +	writer = xmlNewTextWriterMemory(bp, 0);
 +	if (writer == NULL) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlNewTextWriterMemory() "
 +		    "couldn't create xml writer");
 +		goto exit_toc;
 +	}
 +	r = xmlTextWriterStartDocument(writer, "1.0", "UTF-8", NULL);
 +	if (r < 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlTextWriterStartDocument() failed: %d", r);
 +		goto exit_toc;
 +	}
 +	r = xmlTextWriterSetIndent(writer, 4);
 +	if (r < 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlTextWriterSetIndent() failed: %d", r);
 +		goto exit_toc;
 +	}
 +
 +	/*
 +	 * Start recoding TOC
 +	 */
 +	r = xmlTextWriterStartElement(writer, BAD_CAST("xar"));
 +	if (r < 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlTextWriterStartElement() failed: %d", r);
 +		goto exit_toc;
 +	}
 +	r = xmlTextWriterStartElement(writer, BAD_CAST("toc"));
 +	if (r < 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlTextWriterStartDocument() failed: %d", r);
 +		goto exit_toc;
 +	}
 +
 +	/*
 +	 * Record the creation time of the archive file.
 +	 */
 +	r = xmlwrite_time(a, writer, "creation-time", time(NULL), 0);
 +	if (r < 0)
 +		goto exit_toc;
 +
 +	/*
 +	 * Record the checksum value of TOC
 +	 */
 +	algsize = getalgsize(xar->opt_toc_sumalg);
 +	if (algsize) {
 +		/*
 +		 * Record TOC checksum
 +		 */
 +		r = xmlTextWriterStartElement(writer, BAD_CAST("checksum"));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterStartElement() failed: %d", r);
 +			goto exit_toc;
 +		}
 +		r = xmlTextWriterWriteAttribute(writer, BAD_CAST("style"),
 +		    BAD_CAST_CONST(getalgname(xar->opt_toc_sumalg)));
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterWriteAttribute() failed: %d", r);
 +			goto exit_toc;
 +		}
 +
 +		/*
 +		 * Record the offset of the value of checksum of TOC
 +		 */
 +		r = xmlwrite_string(a, writer, "offset", "0");
 +		if (r < 0)
 +			goto exit_toc;
 +
 +		/*
 +		 * Record the size of the value of checksum of TOC
 +		 */
 +		r = xmlwrite_fstring(a, writer, "size", "%d", algsize);
 +		if (r < 0)
 +			goto exit_toc;
 +
 +		r = xmlTextWriterEndElement(writer);
 +		if (r < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "xmlTextWriterEndElement() failed: %d", r);
 +			goto exit_toc;
 +		}
 +	}
 +
 +	np = xar->root;
 +	do {
 +		if (np != np->parent) {
 +			r = make_file_entry(a, writer, np);
 +			if (r != ARCHIVE_OK)
 +				goto exit_toc;
 +		}
 +
 +		if (np->dir && np->children.first != NULL) {
 +			/* Enter to sub directories. */
 +			np = np->children.first;
 +			r = xmlTextWriterStartElement(writer,
 +			    BAD_CAST("file"));
 +			if (r < 0) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "xmlTextWriterStartElement() "
 +				    "failed: %d", r);
 +				goto exit_toc;
 +			}
 +			r = xmlTextWriterWriteFormatAttribute(
 +			    writer, BAD_CAST("id"), "%d", np->id);
 +			if (r < 0) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "xmlTextWriterWriteAttribute() "
 +				    "failed: %d", r);
 +				goto exit_toc;
 +			}
 +			continue;
 +		}
 +		while (np != np->parent) {
 +			r = xmlTextWriterEndElement(writer);
 +			if (r < 0) {
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "xmlTextWriterEndElement() "
 +				    "failed: %d", r);
 +				goto exit_toc;
 +			}
 +			if (np->chnext == NULL) {
 +				/* Return to the parent directory. */
 +				np = np->parent;
 +			} else {
 +				np = np->chnext;
 +				r = xmlTextWriterStartElement(writer,
 +				    BAD_CAST("file"));
 +				if (r < 0) {
 +					archive_set_error(&a->archive,
 +					    ARCHIVE_ERRNO_MISC,
 +					    "xmlTextWriterStartElement() "
 +					    "failed: %d", r);
 +					goto exit_toc;
 +				}
 +				r = xmlTextWriterWriteFormatAttribute(
 +				    writer, BAD_CAST("id"), "%d", np->id);
 +				if (r < 0) {
 +					archive_set_error(&a->archive,
 +					    ARCHIVE_ERRNO_MISC,
 +					    "xmlTextWriterWriteAttribute() "
 +					    "failed: %d", r);
 +					goto exit_toc;
 +				}
 +				break;
 +			}
 +		}
 +	} while (np != np->parent);
 +
 +	r = xmlTextWriterEndDocument(writer);
 +	if (r < 0) {
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_MISC,
 +		    "xmlTextWriterEndDocument() failed: %d", r);
 +		goto exit_toc;
 +	}
 +#if DEBUG_PRINT_TOC
 +	fprintf(stderr, "\n---TOC-- %d bytes --\n%s\n",
 +	    strlen((const char *)bp->content), bp->content);
 +#endif
 +
 +	/*
 +	 * Compress the TOC and calculate the sum of the TOC.
 +	 */
 +	xar->toc.temp_offset = xar->temp_offset;
 +	xar->toc.size = bp->use;
 +	checksum_init(&(xar->a_sumwrk), xar->opt_toc_sumalg);
 +
 +	r = compression_init_encoder_gzip(&(a->archive),
 +	    &(xar->stream), 6, 1);
 +	if (r != ARCHIVE_OK)
 +		goto exit_toc;
 +	xar->stream.next_in = bp->content;
 +	xar->stream.avail_in = bp->use;
 +	xar->stream.total_in = 0;
 +	xar->stream.next_out = xar->wbuff;
 +	xar->stream.avail_out = sizeof(xar->wbuff);
 +	xar->stream.total_out = 0;
 +	for (;;) {
 +		size_t size;
 +
 +		r = compression_code(&(a->archive),
 +		    &(xar->stream), ARCHIVE_Z_FINISH);
 +		if (r != ARCHIVE_OK && r != ARCHIVE_EOF)
 +			goto exit_toc;
 +		size = sizeof(xar->wbuff) - xar->stream.avail_out;
 +		checksum_update(&(xar->a_sumwrk), xar->wbuff, size);
 +		if (write_to_temp(a, xar->wbuff, size) != ARCHIVE_OK)
 +			goto exit_toc;
 +		if (r == ARCHIVE_EOF)
 +			break;
 +		xar->stream.next_out = xar->wbuff;
 +		xar->stream.avail_out = sizeof(xar->wbuff);
 +	}
 +	r = compression_end(&(a->archive), &(xar->stream));
 +	if (r != ARCHIVE_OK)
 +		goto exit_toc;
 +	xar->toc.length = xar->stream.total_out;
 +	xar->toc.compression = GZIP;
 +	checksum_final(&(xar->a_sumwrk), &(xar->toc.a_sum));
 +
 +	ret = ARCHIVE_OK;
 +exit_toc:
 +	if (writer)
 +		xmlFreeTextWriter(writer);
 +	if (bp)
 +		xmlBufferFree(bp);
 +
 +	return (ret);
 +}
 +
 +static int
 +flush_wbuff(struct archive_write *a)
 +{
 +	struct xar *xar;
 +	int r;
 +	size_t s;
 +
 +	xar = (struct xar *)a->format_data;
 +	s = sizeof(xar->wbuff) - xar->wbuff_remaining;
 +	r = __archive_write_output(a, xar->wbuff, s);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	xar->wbuff_remaining = sizeof(xar->wbuff);
 +	return (r);
 +}
 +
 +static int
 +copy_out(struct archive_write *a, uint64_t offset, uint64_t length)
 +{
 +	struct xar *xar;
 +	int r;
 +
 +	xar = (struct xar *)a->format_data;
 +	if (lseek(xar->temp_fd, offset, SEEK_SET) < 0) {
 +		archive_set_error(&(a->archive), errno, "lseek failed");
 +		return (ARCHIVE_FATAL);
 +	}
 +	while (length) {
 +		size_t rsize;
 +		ssize_t rs;
 +		unsigned char *wb;
 +
 +		if (length > xar->wbuff_remaining)
 +			rsize = xar->wbuff_remaining;
 +		else
 +			rsize = (size_t)length;
 +		wb = xar->wbuff + (sizeof(xar->wbuff) - xar->wbuff_remaining);
 +		rs = read(xar->temp_fd, wb, rsize);
 +		if (rs < 0) {
 +			archive_set_error(&(a->archive), errno,
 +			    "Can't read temporary file(%jd)",
 +			    (intmax_t)rs);
 +			return (ARCHIVE_FATAL);
 +		}
 +		if (rs == 0) {
 +			archive_set_error(&(a->archive), 0,
 +			    "Truncated xar archive");
 +			return (ARCHIVE_FATAL);
 +		}
 +		xar->wbuff_remaining -= rs;
 +		length -= rs;
 +		if (xar->wbuff_remaining == 0) {
 +			r = flush_wbuff(a);
 +			if (r != ARCHIVE_OK)
 +				return (r);
 +		}
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +xar_close(struct archive_write *a)
 +{
 +	struct xar *xar;
 +	unsigned char *wb;
 +	uint64_t length;
 +	int r;
 +
 +	xar = (struct xar *)a->format_data;
 +
 +	/* Empty! */
 +	if (xar->root->children.first == NULL)
 +		return (ARCHIVE_OK);
 +
 +	/* Save the length of all file extended attributes and contents. */
 +	length = xar->temp_offset;
 +
 +	/* Connect hardlinked files */
 +	file_connect_hardlink_files(xar);
 +
 +	/* Make the TOC */
 +	r = make_toc(a);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	/*
 +	 * Make the xar header on wbuff(write buffer).
 +	 */
 +	wb = xar->wbuff;
 +	xar->wbuff_remaining = sizeof(xar->wbuff);
 +	archive_be32enc(&wb[0], HEADER_MAGIC);
 +	archive_be16enc(&wb[4], HEADER_SIZE);
 +	archive_be16enc(&wb[6], HEADER_VERSION);
 +	archive_be64enc(&wb[8], xar->toc.length);
 +	archive_be64enc(&wb[16], xar->toc.size);
 +	archive_be32enc(&wb[24], xar->toc.a_sum.alg);
 +	xar->wbuff_remaining -= HEADER_SIZE;
 +
 +	/*
 +	 * Write the TOC
 +	 */
 +	r = copy_out(a, xar->toc.temp_offset, xar->toc.length);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +
 +	/* Write the checksum value of the TOC. */
 +	if (xar->toc.a_sum.len) {
 +		if (xar->wbuff_remaining < xar->toc.a_sum.len) {
 +			r = flush_wbuff(a);
 +			if (r != ARCHIVE_OK)
 +				return (r);
 +		}
 +		wb = xar->wbuff + (sizeof(xar->wbuff) - xar->wbuff_remaining);
 +		memcpy(wb, xar->toc.a_sum.val, xar->toc.a_sum.len);
 +		xar->wbuff_remaining -= xar->toc.a_sum.len;
 +	}
 +
 +	/*
 +	 * Write all file extended attributes and contents.
 +	 */
 +	r = copy_out(a, xar->toc.a_sum.len, length);
 +	if (r != ARCHIVE_OK)
 +		return (r);
 +	r = flush_wbuff(a);
 +	return (r);
 +}
 +
 +static int
 +xar_free(struct archive_write *a)
 +{
 +	struct xar *xar;
 +
 +	xar = (struct xar *)a->format_data;
 +	archive_string_free(&(xar->cur_dirstr));
 +	archive_string_free(&(xar->tstr));
 +	archive_string_free(&(xar->vstr));
 +	file_free_hardlinks(xar);
 +	file_free_register(xar);
 +	compression_end(&(a->archive), &(xar->stream));
 +	free(xar);
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +file_cmp_node(const struct archive_rb_node *n1,
 +    const struct archive_rb_node *n2)
 +{
 +	const struct file *f1 = (const struct file *)n1;
 +	const struct file *f2 = (const struct file *)n2;
 +
 +	return (strcmp(f1->basename.s, f2->basename.s));
 +}
-         
++
 +static int
 +file_cmp_key(const struct archive_rb_node *n, const void *key)
 +{
 +	const struct file *f = (const struct file *)n;
 +
 +	return (strcmp(f->basename.s, (const char *)key));
 +}
 +
 +static struct file *
 +file_new(struct archive_write *a, struct archive_entry *entry)
 +{
 +	struct file *file;
 +	static const struct archive_rb_tree_ops rb_ops = {
 +		file_cmp_node, file_cmp_key
 +	};
 +
 +	file = calloc(1, sizeof(*file));
 +	if (file == NULL)
 +		return (NULL);
 +
 +	if (entry != NULL)
 +		file->entry = archive_entry_clone(entry);
 +	else
 +		file->entry = archive_entry_new2(&a->archive);
 +	if (file->entry == NULL) {
 +		free(file);
 +		return (NULL);
 +	}
 +	__archive_rb_tree_init(&(file->rbtree), &rb_ops);
 +	file->children.first = NULL;
 +	file->children.last = &(file->children.first);
 +	file->xattr.first = NULL;
 +	file->xattr.last = &(file->xattr.first);
 +	archive_string_init(&(file->parentdir));
 +	archive_string_init(&(file->basename));
 +	archive_string_init(&(file->symlink));
 +	archive_string_init(&(file->script));
 +	if (entry != NULL && archive_entry_filetype(entry) == AE_IFDIR)
 +		file->dir = 1;
 +
 +	return (file);
 +}
 +
 +static void
 +file_free(struct file *file)
 +{
 +	struct heap_data *heap, *next_heap;
 +
 +	heap = file->xattr.first;
 +	while (heap != NULL) {
 +		next_heap = heap->next;
 +		free(heap);
 +		heap = next_heap;
 +	}
 +	archive_string_free(&(file->parentdir));
 +	archive_string_free(&(file->basename));
 +	archive_string_free(&(file->symlink));
 +	archive_string_free(&(file->script));
 +	free(file);
 +}
 +
 +static struct file *
 +file_create_virtual_dir(struct archive_write *a, struct xar *xar,
 +    const char *pathname)
 +{
 +	struct file *file;
 +
 +	(void)xar; /* UNUSED */
 +
 +	file = file_new(a, NULL);
 +	if (file == NULL)
 +		return (NULL);
 +	archive_entry_set_pathname(file->entry, pathname);
 +	archive_entry_set_mode(file->entry, 0555 | AE_IFDIR);
 +
 +	file->dir = 1;
 +	file->virtual = 1;
 +
 +	return (file);
 +}
 +
 +static int
 +file_add_child_tail(struct file *parent, struct file *child)
 +{
 +	if (!__archive_rb_tree_insert_node(
 +	    &(parent->rbtree), (struct archive_rb_node *)child))
 +		return (0);
 +	child->chnext = NULL;
 +	*parent->children.last = child;
 +	parent->children.last = &(child->chnext);
 +	child->parent = parent;
 +	return (1);
 +}
 +
 +/*
 + * Find a entry from `parent'
 + */
 +static struct file *
 +file_find_child(struct file *parent, const char *child_name)
 +{
 +	struct file *np;
 +
 +	np = (struct file *)__archive_rb_tree_find_node(
 +	    &(parent->rbtree), child_name);
 +	return (np);
 +}
 +
 +#if defined(_WIN32) || defined(__CYGWIN__)
 +static void
 +cleanup_backslash(char *utf8, size_t len)
 +{
 +
 +	/* Convert a path-separator from '\' to  '/' */
 +	while (*utf8 != '\0' && len) {
 +		if (*utf8 == '\\')
 +			*utf8 = '/';
 +		++utf8;
 +		--len;
 +	}
 +}
 +#else
 +#define cleanup_backslash(p, len)	/* nop */
 +#endif
 +
 +/*
 + * Generate a parent directory name and a base name from a pathname.
 + */
 +static int
 +file_gen_utility_names(struct archive_write *a, struct file *file)
 +{
 +	struct xar *xar;
 +	const char *pp;
 +	char *p, *dirname, *slash;
 +	size_t len;
 +	int r = ARCHIVE_OK;
 +
 +	xar = (struct xar *)a->format_data;
 +	archive_string_empty(&(file->parentdir));
 +	archive_string_empty(&(file->basename));
 +	archive_string_empty(&(file->symlink));
 +
 +	if (file->parent == file)/* virtual root */
 +		return (ARCHIVE_OK);
 +
 +	if (archive_entry_pathname_l(file->entry, &pp, &len, xar->sconv)
 +	    != 0) {
 +		if (errno == ENOMEM) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for Pathname");
 +			return (ARCHIVE_FATAL);
 +		}
 +		archive_set_error(&a->archive,
 +		    ARCHIVE_ERRNO_FILE_FORMAT,
 +		    "Can't translate pathname '%s' to UTF-8",
 +		    archive_entry_pathname(file->entry));
 +		r = ARCHIVE_WARN;
 +	}
 +	archive_strncpy(&(file->parentdir), pp, len);
 +	len = file->parentdir.length;
 +	p = dirname = file->parentdir.s;
 +	/*
 +	 * Convert a path-separator from '\' to  '/'
 +	 */
 +	cleanup_backslash(p, len);
 +
 +	/*
 +	 * Remove leading '/', '../' and './' elements
 +	 */
 +	while (*p) {
 +		if (p[0] == '/') {
 +			p++;
 +			len--;
 +		} else if (p[0] != '.')
 +			break;
 +		else if (p[1] == '.' && p[2] == '/') {
 +			p += 3;
 +			len -= 3;
 +		} else if (p[1] == '/' || (p[1] == '.' && p[2] == '\0')) {
 +			p += 2;
 +			len -= 2;
 +		} else if (p[1] == '\0') {
 +			p++;
 +			len--;
 +		} else
 +			break;
 +	}
 +	if (p != dirname) {
 +		memmove(dirname, p, len+1);
 +		p = dirname;
 +	}
 +	/*
 +	 * Remove "/","/." and "/.." elements from tail.
 +	 */
 +	while (len > 0) {
 +		size_t ll = len;
 +
 +		if (len > 0 && p[len-1] == '/') {
 +			p[len-1] = '\0';
 +			len--;
 +		}
 +		if (len > 1 && p[len-2] == '/' && p[len-1] == '.') {
 +			p[len-2] = '\0';
 +			len -= 2;
 +		}
 +		if (len > 2 && p[len-3] == '/' && p[len-2] == '.' &&
 +		    p[len-1] == '.') {
 +			p[len-3] = '\0';
 +			len -= 3;
 +		}
 +		if (ll == len)
 +			break;
 +	}
 +	while (*p) {
 +		if (p[0] == '/') {
 +			if (p[1] == '/')
 +				/* Convert '//' --> '/' */
 +				strcpy(p, p+1);
 +			else if (p[1] == '.' && p[2] == '/')
 +				/* Convert '/./' --> '/' */
 +				strcpy(p, p+2);
 +			else if (p[1] == '.' && p[2] == '.' && p[3] == '/') {
 +				/* Convert 'dir/dir1/../dir2/'
 +				 *     --> 'dir/dir2/'
 +				 */
 +				char *rp = p -1;
 +				while (rp >= dirname) {
 +					if (*rp == '/')
 +						break;
 +					--rp;
 +				}
 +				if (rp > dirname) {
 +					strcpy(rp, p+3);
 +					p = rp;
 +				} else {
 +					strcpy(dirname, p+4);
 +					p = dirname;
 +				}
 +			} else
 +				p++;
 +		} else
 +			p++;
 +	}
 +	p = dirname;
 +	len = strlen(p);
 +
 +	if (archive_entry_filetype(file->entry) == AE_IFLNK) {
 +		size_t len2;
 +		/* Convert symlink name too. */
 +		if (archive_entry_symlink_l(file->entry, &pp, &len2,
 +		    xar->sconv) != 0) {
 +			if (errno == ENOMEM) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory for Linkname");
 +				return (ARCHIVE_FATAL);
 +			}
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Can't translate symlink '%s' to UTF-8",
 +			    archive_entry_symlink(file->entry));
 +			r = ARCHIVE_WARN;
 +		}
 +		archive_strncpy(&(file->symlink), pp, len2);
 +		cleanup_backslash(file->symlink.s, file->symlink.length);
 +	}
 +	/*
 +	 * - Count up directory elements.
 +	 * - Find out the position which points the last position of
 +	 *   path separator('/').
 +	 */
 +	slash = NULL;
 +	for (; *p != '\0'; p++)
 +		if (*p == '/')
 +			slash = p;
 +	if (slash == NULL) {
 +		/* The pathname doesn't have a parent directory. */
 +		file->parentdir.length = len;
 +		archive_string_copy(&(file->basename), &(file->parentdir));
 +		archive_string_empty(&(file->parentdir));
- 		file->parentdir.s = '\0';
++		*file->parentdir.s = '\0';
 +		return (r);
 +	}
 +
 +	/* Make a basename from dirname and slash */
 +	*slash  = '\0';
 +	file->parentdir.length = slash - dirname;
 +	archive_strcpy(&(file->basename),  slash + 1);
 +	return (r);
 +}
 +
 +static int
 +get_path_component(char *name, int n, const char *fn)
 +{
 +	char *p;
 +	int l;
 +
 +	p = strchr(fn, '/');
 +	if (p == NULL) {
 +		if ((l = strlen(fn)) == 0)
 +			return (0);
 +	} else
 +		l = p - fn;
 +	if (l > n -1)
 +		return (-1);
 +	memcpy(name, fn, l);
 +	name[l] = '\0';
 +
 +	return (l);
 +}
 +
 +/*
 + * Add a new entry into the tree.
 + */
 +static int
 +file_tree(struct archive_write *a, struct file **filepp)
 +{
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +	char name[_MAX_FNAME];/* Included null terminator size. */
 +#elif defined(NAME_MAX) && NAME_MAX >= 255
 +	char name[NAME_MAX+1];
 +#else
 +	char name[256];
 +#endif
 +	struct xar *xar = (struct xar *)a->format_data;
 +	struct file *dent, *file, *np;
 +	struct archive_entry *ent;
 +	const char *fn, *p;
 +	int l;
 +
 +	file = *filepp;
 +	dent = xar->root;
 +	if (file->parentdir.length > 0)
 +		fn = p = file->parentdir.s;
 +	else
 +		fn = p = "";
 +
 +	/*
 +	 * If the path of the parent directory of `file' entry is
 +	 * the same as the path of `cur_dirent', add isoent to
 +	 * `cur_dirent'.
 +	 */
 +	if (archive_strlen(&(xar->cur_dirstr))
 +	      == archive_strlen(&(file->parentdir)) &&
 +	    strcmp(xar->cur_dirstr.s, fn) == 0) {
 +		if (!file_add_child_tail(xar->cur_dirent, file)) {
 +			np = (struct file *)__archive_rb_tree_find_node(
 +			    &(xar->cur_dirent->rbtree),
 +			    file->basename.s);
 +			goto same_entry;
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +
 +	for (;;) {
 +		l = get_path_component(name, sizeof(name), fn);
 +		if (l == 0) {
 +			np = NULL;
 +			break;
 +		}
 +		if (l < 0) {
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "A name buffer is too small");
 +			file_free(file);
 +			*filepp = NULL;
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		np = file_find_child(dent, name);
 +		if (np == NULL || fn[0] == '\0')
 +			break;
 +
 +		/* Find next subdirectory. */
 +		if (!np->dir) {
 +			/* NOT Directory! */
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_MISC,
 +			    "`%s' is not directory, we cannot insert `%s' ",
 +			    archive_entry_pathname(np->entry),
 +			    archive_entry_pathname(file->entry));
 +			file_free(file);
 +			*filepp = NULL;
 +			return (ARCHIVE_FAILED);
 +		}
 +		fn += l;
 +		if (fn[0] == '/')
 +			fn++;
 +		dent = np;
 +	}
 +	if (np == NULL) {
 +		/*
 +		 * Create virtual parent directories.
 +		 */
 +		while (fn[0] != '\0') {
 +			struct file *vp;
 +			struct archive_string as;
 +
 +			archive_string_init(&as);
 +			archive_strncat(&as, p, fn - p + l);
 +			if (as.s[as.length-1] == '/') {
 +				as.s[as.length-1] = '\0';
 +				as.length--;
 +			}
 +			vp = file_create_virtual_dir(a, xar, as.s);
 +			if (vp == NULL) {
 +				archive_string_free(&as);
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory");
 +				file_free(file);
 +				*filepp = NULL;
 +				return (ARCHIVE_FATAL);
 +			}
 +			archive_string_free(&as);
 +			if (file_gen_utility_names(a, vp) <= ARCHIVE_FAILED)
 +				return (ARCHIVE_FATAL);
 +			file_add_child_tail(dent, vp);
 +			file_register(xar, vp);
 +			np = vp;
 +
 +			fn += l;
 +			if (fn[0] == '/')
 +				fn++;
 +			l = get_path_component(name, sizeof(name), fn);
 +			if (l < 0) {
 +				archive_string_free(&as);
 +				archive_set_error(&a->archive,
 +				    ARCHIVE_ERRNO_MISC,
 +				    "A name buffer is too small");
 +				file_free(file);
 +				*filepp = NULL;
 +				return (ARCHIVE_FATAL);
 +			}
 +			dent = np;
 +		}
 +
 +		/* Found out the parent directory where isoent can be
 +		 * inserted. */
 +		xar->cur_dirent = dent;
 +		archive_string_empty(&(xar->cur_dirstr));
 +		archive_string_ensure(&(xar->cur_dirstr),
 +		    archive_strlen(&(dent->parentdir)) +
 +		    archive_strlen(&(dent->basename)) + 2);
 +		if (archive_strlen(&(dent->parentdir)) +
 +		    archive_strlen(&(dent->basename)) == 0)
 +			xar->cur_dirstr.s[0] = 0;
 +		else {
 +			if (archive_strlen(&(dent->parentdir)) > 0) {
 +				archive_string_copy(&(xar->cur_dirstr),
 +				    &(dent->parentdir));
 +				archive_strappend_char(&(xar->cur_dirstr), '/');
 +			}
 +			archive_string_concat(&(xar->cur_dirstr),
 +			    &(dent->basename));
 +		}
 +
 +		if (!file_add_child_tail(dent, file)) {
 +			np = (struct file *)__archive_rb_tree_find_node(
 +			    &(dent->rbtree), file->basename.s);
 +			goto same_entry;
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +
 +same_entry:
 +	/*
 +	 * We have already has the entry the filename of which is
 +	 * the same.
 +	 */
 +	if (archive_entry_filetype(np->entry) !=
 +	    archive_entry_filetype(file->entry)) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Found duplicate entries `%s' and its file type is "
 +		    "different",
 +		    archive_entry_pathname(np->entry));
 +		file_free(file);
 +		*filepp = NULL;
 +		return (ARCHIVE_FAILED);
 +	}
 +
 +	/* Swap files. */
 +	ent = np->entry;
 +	np->entry = file->entry;
 +	file->entry = ent;
 +	np->virtual = 0;
 +
 +	file_free(file);
 +	*filepp = np;
 +	return (ARCHIVE_OK);
 +}
 +
 +static void
 +file_register(struct xar *xar, struct file *file)
 +{
 +	file->id = xar->file_idx++;
 +        file->next = NULL;
 +        *xar->file_list.last = file;
 +        xar->file_list.last = &(file->next);
 +}
 +
 +static void
 +file_init_register(struct xar *xar)
 +{
 +	xar->file_list.first = NULL;
 +	xar->file_list.last = &(xar->file_list.first);
 +}
 +
 +static void
 +file_free_register(struct xar *xar)
 +{
 +	struct file *file, *file_next;
 +
 +	file = xar->file_list.first;
 +	while (file != NULL) {
 +		file_next = file->next;
 +		file_free(file);
 +		file = file_next;
 +	}
 +}
 +
 +/*
 + * Register entry to get a hardlink target.
 + */
 +static int
 +file_register_hardlink(struct archive_write *a, struct file *file)
 +{
 +	struct xar *xar = (struct xar *)a->format_data;
 +	struct hardlink *hl;
 +	const char *pathname;
 +
 +	archive_entry_set_nlink(file->entry, 1);
 +	pathname = archive_entry_hardlink(file->entry);
 +	if (pathname == NULL) {
 +		/* This `file` is a hardlink target. */
 +		hl = malloc(sizeof(*hl));
 +		if (hl == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory");
 +			return (ARCHIVE_FATAL);
 +		}
 +		hl->nlink = 1;
 +		/* A hardlink target must be the first position. */
 +		file->hlnext = NULL;
 +		hl->file_list.first = file;
 +		hl->file_list.last = &(file->hlnext);
 +		__archive_rb_tree_insert_node(&(xar->hardlink_rbtree),
 +		    (struct archive_rb_node *)hl);
 +	} else {
 +		hl = (struct hardlink *)__archive_rb_tree_find_node(
 +		    &(xar->hardlink_rbtree), pathname);
 +		if (hl != NULL) {
 +			/* Insert `file` entry into the tail. */
 +			file->hlnext = NULL;
 +			*hl->file_list.last = file;
 +			hl->file_list.last = &(file->hlnext);
 +			hl->nlink++;
 +		}
 +		archive_entry_unset_size(file->entry);
 +	}
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +/*
 + * Hardlinked files have to have the same location of extent.
 + * We have to find out hardlink target entries for entries which
 + * have a hardlink target name.
 + */
 +static void
 +file_connect_hardlink_files(struct xar *xar)
 +{
 +	struct archive_rb_node *n;
 +	struct hardlink *hl;
 +	struct file *target, *nf;
 +
 +	ARCHIVE_RB_TREE_FOREACH(n, &(xar->hardlink_rbtree)) {
 +		hl = (struct hardlink *)n;
 +
 +		/* The first entry must be a hardlink target. */
 +		target = hl->file_list.first;
 +		archive_entry_set_nlink(target->entry, hl->nlink);
 +		if (hl->nlink > 1)
 +			/* It means this file is a hardlink
 +			 * targe itself. */
 +			target->hardlink_target = target;
 +		for (nf = target->hlnext;
 +		    nf != NULL; nf = nf->hlnext) {
 +			nf->hardlink_target = target;
 +			archive_entry_set_nlink(nf->entry, hl->nlink);
 +		}
 +	}
 +}
 +
 +static int
 +file_hd_cmp_node(const struct archive_rb_node *n1,
 +    const struct archive_rb_node *n2)
 +{
 +	const struct hardlink *h1 = (const struct hardlink *)n1;
 +	const struct hardlink *h2 = (const struct hardlink *)n2;
 +
 +	return (strcmp(archive_entry_pathname(h1->file_list.first->entry),
 +		       archive_entry_pathname(h2->file_list.first->entry)));
 +}
 +
 +static int
 +file_hd_cmp_key(const struct archive_rb_node *n, const void *key)
 +{
 +	const struct hardlink *h = (const struct hardlink *)n;
 +
 +	return (strcmp(archive_entry_pathname(h->file_list.first->entry),
 +		       (const char *)key));
 +}
 +
 +
 +static void
 +file_init_hardlinks(struct xar *xar)
 +{
 +	static const struct archive_rb_tree_ops rb_ops = {
 +		file_hd_cmp_node, file_hd_cmp_key,
 +	};
-  
++
 +	__archive_rb_tree_init(&(xar->hardlink_rbtree), &rb_ops);
 +}
 +
 +static void
 +file_free_hardlinks(struct xar *xar)
 +{
 +	struct archive_rb_node *n, *next;
 +
 +	for (n = ARCHIVE_RB_TREE_MIN(&(xar->hardlink_rbtree)); n;) {
 +		next = __archive_rb_tree_iterate(&(xar->hardlink_rbtree),
 +		    n, ARCHIVE_RB_DIR_RIGHT);
 +		free(n);
 +		n = next;
 +	}
 +}
 +
 +static void
 +checksum_init(struct chksumwork *sumwrk, enum sumalg sum_alg)
 +{
 +	sumwrk->alg = sum_alg;
 +	switch (sum_alg) {
 +	case CKSUM_NONE:
 +		break;
 +	case CKSUM_SHA1:
 +		archive_sha1_init(&(sumwrk->sha1ctx));
 +		break;
 +	case CKSUM_MD5:
 +		archive_md5_init(&(sumwrk->md5ctx));
 +		break;
 +	}
 +}
 +
 +static void
 +checksum_update(struct chksumwork *sumwrk, const void *buff, size_t size)
 +{
 +
 +	switch (sumwrk->alg) {
 +	case CKSUM_NONE:
 +		break;
 +	case CKSUM_SHA1:
 +		archive_sha1_update(&(sumwrk->sha1ctx), buff, size);
 +		break;
 +	case CKSUM_MD5:
 +		archive_md5_update(&(sumwrk->md5ctx), buff, size);
 +		break;
 +	}
 +}
 +
 +static void
 +checksum_final(struct chksumwork *sumwrk, struct chksumval *sumval)
 +{
 +
 +	switch (sumwrk->alg) {
 +	case CKSUM_NONE:
 +		sumval->len = 0;
 +		break;
 +	case CKSUM_SHA1:
 +		archive_sha1_final(&(sumwrk->sha1ctx), sumval->val);
 +		sumval->len = SHA1_SIZE;
 +		break;
 +	case CKSUM_MD5:
 +		archive_md5_final(&(sumwrk->md5ctx), sumval->val);
 +		sumval->len = MD5_SIZE;
 +		break;
 +	}
 +	sumval->alg = sumwrk->alg;
 +}
 +
 +#if !defined(HAVE_BZLIB_H) || !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H)
 +static int
 +compression_unsupported_encoder(struct archive *a,
 +    struct la_zstream *lastrm, const char *name)
 +{
 +
 +	archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +	    "%s compression not supported on this platform", name);
 +	lastrm->valid = 0;
 +	lastrm->real_stream = NULL;
 +	return (ARCHIVE_FAILED);
 +}
 +#endif
 +
 +static int
 +compression_init_encoder_gzip(struct archive *a,
 +    struct la_zstream *lastrm, int level, int withheader)
 +{
 +	z_stream *strm;
 +
 +	if (lastrm->valid)
 +		compression_end(a, lastrm);
 +	strm = calloc(1, sizeof(*strm));
 +	if (strm == NULL) {
 +		archive_set_error(a, ENOMEM,
 +		    "Can't allocate memory for gzip stream");
 +		return (ARCHIVE_FATAL);
 +	}
 +	/* zlib.h is not const-correct, so we need this one bit
 +	 * of ugly hackery to convert a const * pointer to
 +	 * a non-const pointer. */
 +	strm->next_in = (Bytef *)(uintptr_t)(const void *)lastrm->next_in;
 +	strm->avail_in = lastrm->avail_in;
 +	strm->total_in = (uLong)lastrm->total_in;
 +	strm->next_out = lastrm->next_out;
 +	strm->avail_out = lastrm->avail_out;
 +	strm->total_out = (uLong)lastrm->total_out;
 +	if (deflateInit2(strm, level, Z_DEFLATED,
 +	    (withheader)?15:-15,
 +	    8, Z_DEFAULT_STRATEGY) != Z_OK) {
 +		free(strm);
 +		lastrm->real_stream = NULL;
 +		archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +		    "Internal error initializing compression library");
 +		return (ARCHIVE_FATAL);
 +	}
 +	lastrm->real_stream = strm;
 +	lastrm->valid = 1;
 +	lastrm->code = compression_code_gzip;
 +	lastrm->end = compression_end_gzip;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +compression_code_gzip(struct archive *a,
 +    struct la_zstream *lastrm, enum la_zaction action)
 +{
 +	z_stream *strm;
 +	int r;
 +
 +	strm = (z_stream *)lastrm->real_stream;
 +	/* zlib.h is not const-correct, so we need this one bit
 +	 * of ugly hackery to convert a const * pointer to
 +	 * a non-const pointer. */
 +	strm->next_in = (Bytef *)(uintptr_t)(const void *)lastrm->next_in;
 +	strm->avail_in = lastrm->avail_in;
 +	strm->total_in = (uLong)lastrm->total_in;
 +	strm->next_out = lastrm->next_out;
 +	strm->avail_out = lastrm->avail_out;
 +	strm->total_out = (uLong)lastrm->total_out;
 +	r = deflate(strm,
 +	    (action == ARCHIVE_Z_FINISH)? Z_FINISH: Z_NO_FLUSH);
 +	lastrm->next_in = strm->next_in;
 +	lastrm->avail_in = strm->avail_in;
 +	lastrm->total_in = strm->total_in;
 +	lastrm->next_out = strm->next_out;
 +	lastrm->avail_out = strm->avail_out;
 +	lastrm->total_out = strm->total_out;
 +	switch (r) {
 +	case Z_OK:
 +		return (ARCHIVE_OK);
 +	case Z_STREAM_END:
 +		return (ARCHIVE_EOF);
 +	default:
 +		archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +		    "GZip compression failed:"
 +		    " deflate() call returned status %d", r);
 +		return (ARCHIVE_FATAL);
 +	}
 +}
 +
 +static int
 +compression_end_gzip(struct archive *a, struct la_zstream *lastrm)
 +{
 +	z_stream *strm;
 +	int r;
 +
 +	strm = (z_stream *)lastrm->real_stream;
 +	r = deflateEnd(strm);
 +	free(strm);
 +	lastrm->real_stream = NULL;
 +	lastrm->valid = 0;
 +	if (r != Z_OK) {
 +		archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +		    "Failed to clean up compressor");
 +		return (ARCHIVE_FATAL);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 +static int
 +compression_init_encoder_bzip2(struct archive *a,
 +    struct la_zstream *lastrm, int level)
 +{
 +	bz_stream *strm;
 +
 +	if (lastrm->valid)
 +		compression_end(a, lastrm);
 +	strm = calloc(1, sizeof(*strm));
 +	if (strm == NULL) {
 +		archive_set_error(a, ENOMEM,
 +		    "Can't allocate memory for bzip2 stream");
 +		return (ARCHIVE_FATAL);
 +	}
 +	/* bzlib.h is not const-correct, so we need this one bit
 +	 * of ugly hackery to convert a const * pointer to
 +	 * a non-const pointer. */
 +	strm->next_in = (char *)(uintptr_t)(const void *)lastrm->next_in;
 +	strm->avail_in = lastrm->avail_in;
 +	strm->total_in_lo32 = (uint32_t)(lastrm->total_in & 0xffffffff);
 +	strm->total_in_hi32 = (uint32_t)(lastrm->total_in >> 32);
 +	strm->next_out = (char *)lastrm->next_out;
 +	strm->avail_out = lastrm->avail_out;
 +	strm->total_out_lo32 = (uint32_t)(lastrm->total_out & 0xffffffff);
 +	strm->total_out_hi32 = (uint32_t)(lastrm->total_out >> 32);
 +	if (BZ2_bzCompressInit(strm, level, 0, 30) != BZ_OK) {
 +		free(strm);
 +		lastrm->real_stream = NULL;
 +		archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +		    "Internal error initializing compression library");
 +		return (ARCHIVE_FATAL);
 +	}
 +	lastrm->real_stream = strm;
 +	lastrm->valid = 1;
 +	lastrm->code = compression_code_bzip2;
 +	lastrm->end = compression_end_bzip2;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +compression_code_bzip2(struct archive *a,
 +    struct la_zstream *lastrm, enum la_zaction action)
 +{
 +	bz_stream *strm;
 +	int r;
 +
 +	strm = (bz_stream *)lastrm->real_stream;
 +	/* bzlib.h is not const-correct, so we need this one bit
 +	 * of ugly hackery to convert a const * pointer to
 +	 * a non-const pointer. */
 +	strm->next_in = (char *)(uintptr_t)(const void *)lastrm->next_in;
 +	strm->avail_in = lastrm->avail_in;
 +	strm->total_in_lo32 = (uint32_t)(lastrm->total_in & 0xffffffff);
 +	strm->total_in_hi32 = (uint32_t)(lastrm->total_in >> 32);
 +	strm->next_out = (char *)lastrm->next_out;
 +	strm->avail_out = lastrm->avail_out;
 +	strm->total_out_lo32 = (uint32_t)(lastrm->total_out & 0xffffffff);
 +	strm->total_out_hi32 = (uint32_t)(lastrm->total_out >> 32);
 +	r = BZ2_bzCompress(strm,
 +	    (action == ARCHIVE_Z_FINISH)? BZ_FINISH: BZ_RUN);
 +	lastrm->next_in = (const unsigned char *)strm->next_in;
 +	lastrm->avail_in = strm->avail_in;
 +	lastrm->total_in =
 +	    (((uint64_t)(uint32_t)strm->total_in_hi32) << 32)
 +	    + (uint64_t)(uint32_t)strm->total_in_lo32;
 +	lastrm->next_out = (unsigned char *)strm->next_out;
 +	lastrm->avail_out = strm->avail_out;
 +	lastrm->total_out =
 +	    (((uint64_t)(uint32_t)strm->total_out_hi32) << 32)
 +	    + (uint64_t)(uint32_t)strm->total_out_lo32;
 +	switch (r) {
 +	case BZ_RUN_OK:     /* Non-finishing */
 +	case BZ_FINISH_OK:  /* Finishing: There's more work to do */
 +		return (ARCHIVE_OK);
 +	case BZ_STREAM_END: /* Finishing: all done */
 +		/* Only occurs in finishing case */
 +		return (ARCHIVE_EOF);
 +	default:
 +		/* Any other return value indicates an error */
 +		archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +		    "Bzip2 compression failed:"
 +		    " BZ2_bzCompress() call returned status %d", r);
 +		return (ARCHIVE_FATAL);
 +	}
 +}
 +
 +static int
 +compression_end_bzip2(struct archive *a, struct la_zstream *lastrm)
 +{
 +	bz_stream *strm;
 +	int r;
 +
 +	strm = (bz_stream *)lastrm->real_stream;
 +	r = BZ2_bzCompressEnd(strm);
 +	free(strm);
 +	lastrm->real_stream = NULL;
 +	lastrm->valid = 0;
 +	if (r != BZ_OK) {
 +		archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +		    "Failed to clean up compressor");
 +		return (ARCHIVE_FATAL);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +#else
 +static int
 +compression_init_encoder_bzip2(struct archive *a,
 +    struct la_zstream *lastrm, int level)
 +{
 +
 +	(void) level; /* UNUSED */
 +	if (lastrm->valid)
 +		compression_end(a, lastrm);
 +	return (compression_unsupported_encoder(a, lastrm, "bzip2"));
 +}
 +#endif
 +
 +#if defined(HAVE_LZMA_H)
 +static int
 +compression_init_encoder_lzma(struct archive *a,
 +    struct la_zstream *lastrm, int level)
 +{
 +	static const lzma_stream lzma_init_data = LZMA_STREAM_INIT;
 +	lzma_stream *strm;
 +	lzma_options_lzma lzma_opt;
 +	int r;
 +
 +	if (lastrm->valid)
 +		compression_end(a, lastrm);
 +	if (lzma_lzma_preset(&lzma_opt, level)) {
 +		lastrm->real_stream = NULL;
 +		archive_set_error(a, ENOMEM,
 +		    "Internal error initializing compression library");
 +		return (ARCHIVE_FATAL);
 +	}
 +	strm = calloc(1, sizeof(*strm));
 +	if (strm == NULL) {
 +		archive_set_error(a, ENOMEM,
 +		    "Can't allocate memory for lzma stream");
 +		return (ARCHIVE_FATAL);
 +	}
 +	*strm = lzma_init_data;
 +	r = lzma_alone_encoder(strm, &lzma_opt);
 +	switch (r) {
 +	case LZMA_OK:
 +		lastrm->real_stream = strm;
 +		lastrm->valid = 1;
 +		lastrm->code = compression_code_lzma;
 +		lastrm->end = compression_end_lzma;
 +		r = ARCHIVE_OK;
 +		break;
 +	case LZMA_MEM_ERROR:
 +		free(strm);
 +		lastrm->real_stream = NULL;
 +		archive_set_error(a, ENOMEM,
 +		    "Internal error initializing compression library: "
 +		    "Cannot allocate memory");
 +		r =  ARCHIVE_FATAL;
 +		break;
 +        default:
 +		free(strm);
 +		lastrm->real_stream = NULL;
 +		archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +		    "Internal error initializing compression library: "
 +		    "It's a bug in liblzma");
 +		r =  ARCHIVE_FATAL;
 +		break;
 +	}
 +	return (r);
 +}
 +
 +static int
 +compression_init_encoder_xz(struct archive *a,
-     struct la_zstream *lastrm, int level)
++    struct la_zstream *lastrm, int level, int threads)
 +{
 +	static const lzma_stream lzma_init_data = LZMA_STREAM_INIT;
 +	lzma_stream *strm;
 +	lzma_filter *lzmafilters;
 +	lzma_options_lzma lzma_opt;
 +	int r;
++#ifdef HAVE_LZMA_STREAM_ENCODER_MT
++	lzma_mt mt_options;
++#endif
++
++	(void)threads; /* UNUSED (if multi-threaded LZMA library not avail) */
 +
 +	if (lastrm->valid)
 +		compression_end(a, lastrm);
 +	strm = calloc(1, sizeof(*strm) + sizeof(*lzmafilters) * 2);
 +	if (strm == NULL) {
 +		archive_set_error(a, ENOMEM,
 +		    "Can't allocate memory for xz stream");
 +		return (ARCHIVE_FATAL);
 +	}
 +	lzmafilters = (lzma_filter *)(strm+1);
 +	if (level > 6)
 +		level = 6;
 +	if (lzma_lzma_preset(&lzma_opt, level)) {
 +		free(strm);
 +		lastrm->real_stream = NULL;
 +		archive_set_error(a, ENOMEM,
 +		    "Internal error initializing compression library");
 +		return (ARCHIVE_FATAL);
 +	}
 +	lzmafilters[0].id = LZMA_FILTER_LZMA2;
 +	lzmafilters[0].options = &lzma_opt;
 +	lzmafilters[1].id = LZMA_VLI_UNKNOWN;/* Terminate */
 +
 +	*strm = lzma_init_data;
- 	r = lzma_stream_encoder(strm, lzmafilters, LZMA_CHECK_CRC64);
++#ifdef HAVE_LZMA_STREAM_ENCODER_MT
++	if (threads > 1) {
++		bzero(&mt_options, sizeof(mt_options));
++		mt_options.threads = threads;
++		mt_options.timeout = 300;
++		mt_options.filters = lzmafilters;
++		mt_options.check = LZMA_CHECK_CRC64;
++		r = lzma_stream_encoder_mt(strm, &mt_options);
++	} else
++#endif
++		r = lzma_stream_encoder(strm, lzmafilters, LZMA_CHECK_CRC64);
 +	switch (r) {
 +	case LZMA_OK:
 +		lastrm->real_stream = strm;
 +		lastrm->valid = 1;
 +		lastrm->code = compression_code_lzma;
 +		lastrm->end = compression_end_lzma;
 +		r = ARCHIVE_OK;
 +		break;
 +	case LZMA_MEM_ERROR:
 +		free(strm);
 +		lastrm->real_stream = NULL;
 +		archive_set_error(a, ENOMEM,
 +		    "Internal error initializing compression library: "
 +		    "Cannot allocate memory");
 +		r =  ARCHIVE_FATAL;
 +		break;
 +        default:
 +		free(strm);
 +		lastrm->real_stream = NULL;
 +		archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +		    "Internal error initializing compression library: "
 +		    "It's a bug in liblzma");
 +		r =  ARCHIVE_FATAL;
 +		break;
 +	}
 +	return (r);
 +}
 +
 +static int
 +compression_code_lzma(struct archive *a,
 +    struct la_zstream *lastrm, enum la_zaction action)
 +{
 +	lzma_stream *strm;
 +	int r;
 +
 +	strm = (lzma_stream *)lastrm->real_stream;
 +	strm->next_in = lastrm->next_in;
 +	strm->avail_in = lastrm->avail_in;
 +	strm->total_in = lastrm->total_in;
 +	strm->next_out = lastrm->next_out;
 +	strm->avail_out = lastrm->avail_out;
 +	strm->total_out = lastrm->total_out;
 +	r = lzma_code(strm,
 +	    (action == ARCHIVE_Z_FINISH)? LZMA_FINISH: LZMA_RUN);
 +	lastrm->next_in = strm->next_in;
 +	lastrm->avail_in = strm->avail_in;
 +	lastrm->total_in = strm->total_in;
 +	lastrm->next_out = strm->next_out;
 +	lastrm->avail_out = strm->avail_out;
 +	lastrm->total_out = strm->total_out;
 +	switch (r) {
 +	case LZMA_OK:
 +		/* Non-finishing case */
 +		return (ARCHIVE_OK);
 +	case LZMA_STREAM_END:
 +		/* This return can only occur in finishing case. */
 +		return (ARCHIVE_EOF);
 +	case LZMA_MEMLIMIT_ERROR:
 +		archive_set_error(a, ENOMEM,
 +		    "lzma compression error:"
 +		    " %ju MiB would have been needed",
 +		    (uintmax_t)((lzma_memusage(strm) + 1024 * 1024 -1)
 +			/ (1024 * 1024)));
 +		return (ARCHIVE_FATAL);
 +	default:
 +		/* Any other return value indicates an error */
 +		archive_set_error(a, ARCHIVE_ERRNO_MISC,
 +		    "lzma compression failed:"
 +		    " lzma_code() call returned status %d", r);
 +		return (ARCHIVE_FATAL);
 +	}
 +}
 +
 +static int
 +compression_end_lzma(struct archive *a, struct la_zstream *lastrm)
 +{
 +	lzma_stream *strm;
 +
 +	(void)a; /* UNUSED */
 +	strm = (lzma_stream *)lastrm->real_stream;
 +	lzma_end(strm);
 +	free(strm);
 +	lastrm->valid = 0;
 +	lastrm->real_stream = NULL;
 +	return (ARCHIVE_OK);
 +}
 +#else
 +static int
 +compression_init_encoder_lzma(struct archive *a,
 +    struct la_zstream *lastrm, int level)
 +{
 +
 +	(void) level; /* UNUSED */
 +	if (lastrm->valid)
 +		compression_end(a, lastrm);
 +	return (compression_unsupported_encoder(a, lastrm, "lzma"));
 +}
 +static int
 +compression_init_encoder_xz(struct archive *a,
-     struct la_zstream *lastrm, int level)
++    struct la_zstream *lastrm, int level, int threads)
 +{
 +
 +	(void) level; /* UNUSED */
++	(void) threads; /* UNUSED */
 +	if (lastrm->valid)
 +		compression_end(a, lastrm);
 +	return (compression_unsupported_encoder(a, lastrm, "xz"));
 +}
 +#endif
 +
 +static int
 +xar_compression_init_encoder(struct archive_write *a)
 +{
 +	struct xar *xar;
 +	int r;
 +
 +	xar = (struct xar *)a->format_data;
 +	switch (xar->opt_compression) {
 +	case GZIP:
 +		r = compression_init_encoder_gzip(
 +		    &(a->archive), &(xar->stream),
 +		    xar->opt_compression_level, 1);
 +		break;
 +	case BZIP2:
 +		r = compression_init_encoder_bzip2(
 +		    &(a->archive), &(xar->stream),
 +		    xar->opt_compression_level);
 +		break;
 +	case LZMA:
 +		r = compression_init_encoder_lzma(
 +		    &(a->archive), &(xar->stream),
 +		    xar->opt_compression_level);
 +		break;
 +	case XZ:
 +		r = compression_init_encoder_xz(
 +		    &(a->archive), &(xar->stream),
- 		    xar->opt_compression_level);
++		    xar->opt_compression_level, xar->opt_threads);
 +		break;
 +	default:
 +		r = ARCHIVE_OK;
 +		break;
 +	}
 +	if (r == ARCHIVE_OK) {
 +		xar->stream.total_in = 0;
 +		xar->stream.next_out = xar->wbuff;
 +		xar->stream.avail_out = sizeof(xar->wbuff);
 +		xar->stream.total_out = 0;
 +	}
 +
 +	return (r);
 +}
 +
 +static int
 +compression_code(struct archive *a, struct la_zstream *lastrm,
 +    enum la_zaction action)
 +{
 +	if (lastrm->valid)
 +		return (lastrm->code(a, lastrm, action));
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +compression_end(struct archive *a, struct la_zstream *lastrm)
 +{
 +	if (lastrm->valid)
 +		return (lastrm->end(a, lastrm));
 +	return (ARCHIVE_OK);
 +}
 +
 +
 +static int
 +save_xattrs(struct archive_write *a, struct file *file)
 +{
 +	struct xar *xar;
 +	const char *name;
 +	const void *value;
 +	struct heap_data *heap;
 +	size_t size;
 +	int count, r;
 +
 +	xar = (struct xar *)a->format_data;
 +	count = archive_entry_xattr_reset(file->entry);
 +	if (count == 0)
 +		return (ARCHIVE_OK);
 +	while (count--) {
 +		archive_entry_xattr_next(file->entry,
 +		    &name, &value, &size);
 +		checksum_init(&(xar->a_sumwrk), xar->opt_sumalg);
 +		checksum_init(&(xar->e_sumwrk), xar->opt_sumalg);
 +
 +		heap = calloc(1, sizeof(*heap));
 +		if (heap == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't allocate memory for xattr");
 +			return (ARCHIVE_FATAL);
 +		}
 +		heap->id = file->ea_idx++;
 +		heap->temp_offset = xar->temp_offset;
 +		heap->size = size;/* save a extracted size */
 +		heap->compression = xar->opt_compression;
 +		/* Get a extracted sumcheck value. */
 +		checksum_update(&(xar->e_sumwrk), value, size);
 +		checksum_final(&(xar->e_sumwrk), &(heap->e_sum));
 +
 +		/*
 +		 * Not compression to xattr is simple way.
 +		 */
 +		if (heap->compression == NONE) {
 +			checksum_update(&(xar->a_sumwrk), value, size);
 +			checksum_final(&(xar->a_sumwrk), &(heap->a_sum));
 +			if (write_to_temp(a, value, size)
 +			    != ARCHIVE_OK) {
 +				free(heap);
 +				return (ARCHIVE_FATAL);
 +			}
 +			heap->length = size;
 +			/* Add heap to the tail of file->xattr. */
 +			heap->next = NULL;
 +			*file->xattr.last = heap;
 +			file->xattr.last = &(heap->next);
 +			/* Next xattr */
 +			continue;
 +		}
 +
 +		/*
 +		 * Init compression library.
 +		 */
 +		r = xar_compression_init_encoder(a);
 +		if (r != ARCHIVE_OK) {
 +			free(heap);
 +			return (ARCHIVE_FATAL);
 +		}
 +
 +		xar->stream.next_in = (const unsigned char *)value;
 +		xar->stream.avail_in = size;
 +		for (;;) {
 +			r = compression_code(&(a->archive),
 +			    &(xar->stream), ARCHIVE_Z_FINISH);
 +			if (r != ARCHIVE_OK && r != ARCHIVE_EOF) {
 +				free(heap);
 +				return (ARCHIVE_FATAL);
 +			}
 +			size = sizeof(xar->wbuff) - xar->stream.avail_out;
 +			checksum_update(&(xar->a_sumwrk),
 +			    xar->wbuff, size);
 +			if (write_to_temp(a, xar->wbuff, size)
 +			    != ARCHIVE_OK)
 +				return (ARCHIVE_FATAL);
 +			if (r == ARCHIVE_OK) {
 +				xar->stream.next_out = xar->wbuff;
 +				xar->stream.avail_out = sizeof(xar->wbuff);
 +			} else {
 +				checksum_final(&(xar->a_sumwrk),
 +				    &(heap->a_sum));
 +				heap->length = xar->stream.total_out;
 +				/* Add heap to the tail of file->xattr. */
 +				heap->next = NULL;
 +				*file->xattr.last = heap;
 +				file->xattr.last = &(heap->next);
 +				break;
 +			}
 +		}
 +		/* Clean up compression library. */
 +		r = compression_end(&(a->archive), &(xar->stream));
 +		if (r != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +getalgsize(enum sumalg sumalg)
 +{
 +	switch (sumalg) {
 +	default:
 +	case CKSUM_NONE:
 +		return (0);
 +	case CKSUM_SHA1:
 +		return (SHA1_SIZE);
 +	case CKSUM_MD5:
 +		return (MD5_SIZE);
 +	}
 +}
 +
 +static const char *
 +getalgname(enum sumalg sumalg)
 +{
 +	switch (sumalg) {
 +	default:
 +	case CKSUM_NONE:
 +		return (NULL);
 +	case CKSUM_SHA1:
 +		return (SHA1_NAME);
 +	case CKSUM_MD5:
 +		return (MD5_NAME);
 +	}
 +}
 +
 +#endif /* Support xar format */
- 
diff --cc Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c
index 3b07e35,0000000..0636f46
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c
@@@ -1,1126 -1,0 +1,1680 @@@
 +/*-
 + * Copyright (c) 2008 Anselm Strauss
 + * Copyright (c) 2009 Joerg Sonnenberger
-  * Copyright (c) 2011-2012 Michihiro NAKAJIMA
++ * Copyright (c) 2011-2012,2014 Michihiro NAKAJIMA
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + */
 +
 +/*
 + * Development supported by Google Summer of Code 2008.
 + */
 +
 +#include "archive_platform.h"
 +__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_zip.c 201168 2009-12-29 06:15:32Z kientzle $");
 +
 +#ifdef HAVE_ERRNO_H
 +#include <errno.h>
 +#endif
 +#ifdef HAVE_LANGINFO_H
 +#include <langinfo.h>
 +#endif
 +#ifdef HAVE_STDLIB_H
 +#include <stdlib.h>
 +#endif
 +#ifdef HAVE_STRING_H
 +#include <string.h>
 +#endif
 +#ifdef HAVE_ZLIB_H
 +#include <cm_zlib.h>
 +#endif
 +
 +#include "archive.h"
++#include "archive_cryptor_private.h"
 +#include "archive_endian.h"
 +#include "archive_entry.h"
 +#include "archive_entry_locale.h"
++#include "archive_hmac_private.h"
 +#include "archive_private.h"
++#include "archive_random_private.h"
 +#include "archive_write_private.h"
 +
 +#ifndef HAVE_ZLIB_H
 +#include "archive_crc32.h"
 +#endif
 +
++#define ZIP_ENTRY_FLAG_ENCRYPTED	(1<<0)
 +#define ZIP_ENTRY_FLAG_LENGTH_AT_END	(1<<3)
 +#define ZIP_ENTRY_FLAG_UTF8_NAME	(1 << 11)
 +
- 
 +enum compression {
 +	COMPRESSION_UNSPECIFIED = -1,
 +	COMPRESSION_STORE = 0,
 +	COMPRESSION_DEFLATE = 8
 +};
 +
 +#ifdef HAVE_ZLIB_H
 +#define COMPRESSION_DEFAULT	COMPRESSION_DEFLATE
 +#else
 +#define COMPRESSION_DEFAULT	COMPRESSION_STORE
 +#endif
 +
++enum encryption {
++	ENCRYPTION_NONE	= 0,
++	ENCRYPTION_TRADITIONAL, /* Traditional PKWARE encryption. */
++	ENCRYPTION_WINZIP_AES128, /* WinZIP AES-128 encryption. */
++	ENCRYPTION_WINZIP_AES256, /* WinZIP AES-256 encryption. */
++};
++
++#define TRAD_HEADER_SIZE	12
++/*
++ * See "WinZip - AES Encryption Information"
++ *     http://www.winzip.com/aes_info.htm
++ */
++/* Value used in compression method. */
++#define WINZIP_AES_ENCRYPTION	99
++/* A WinZip AES header size which is stored at the beginning of
++ * file contents. */
++#define WINZIP_AES128_HEADER_SIZE	(8 + 2)
++#define WINZIP_AES256_HEADER_SIZE	(16 + 2)
++/* AES vendor version. */
++#define AES_VENDOR_AE_1 0x0001
++#define AES_VENDOR_AE_2 0x0002
++/* Authentication code size. */
++#define AUTH_CODE_SIZE		10
++/**/
++#define MAX_DERIVED_KEY_BUF_SIZE (AES_MAX_KEY_SIZE * 2 + 2)
++
 +struct cd_segment {
 +	struct cd_segment *next;
 +	size_t buff_size;
 +	unsigned char *buff;
 +	unsigned char *p;
 +};
 +
- /* Bits used to enable/disable certain experimental features. */
- #define	EXPERIMENT_LA 1
- #define	EXPERIMENTS_ALL 0xffff
++struct trad_enc_ctx {
++	uint32_t keys[3];
++};
 +
 +struct zip {
 +
 +	int64_t entry_offset;
 +	int64_t entry_compressed_size;
 +	int64_t entry_uncompressed_size;
 +	int64_t entry_compressed_written;
 +	int64_t entry_uncompressed_written;
 +	int64_t entry_uncompressed_limit;
 +	struct archive_entry *entry;
 +	uint32_t entry_crc32;
 +	enum compression entry_compression;
++	enum encryption  entry_encryption;
 +	int entry_flags;
 +	int entry_uses_zip64;
 +	int experiments;
++	struct trad_enc_ctx tctx;
++	char tctx_valid;
++	unsigned char trad_chkdat;
++	unsigned aes_vendor;
++	archive_crypto_ctx cctx;
++	char cctx_valid;
++	archive_hmac_sha1_ctx hctx;
++	char hctx_valid;
 +
 +	unsigned char *file_header;
 +	size_t file_header_extra_offset;
 +	unsigned long (*crc32func)(unsigned long crc, const void *buff, size_t len);
 +
 +	struct cd_segment *central_directory;
 +	struct cd_segment *central_directory_last;
 +	size_t central_directory_bytes;
 +	size_t central_directory_entries;
 +
 +	int64_t written_bytes; /* Overall position in file. */
 +
 +	struct archive_string_conv *opt_sconv;
 +	struct archive_string_conv *sconv_default;
 +	enum compression requested_compression;
++	int deflate_compression_level;
 +	int init_default_conversion;
++	enum encryption  encryption_type;
 +
 +#define ZIP_FLAG_AVOID_ZIP64 1
 +#define ZIP_FLAG_FORCE_ZIP64 2
- #define ZIP_FLAG_EXPERIMENT_EL 4
++#define ZIP_FLAG_EXPERIMENT_xl 4
 +	int flags;
 +
 +#ifdef HAVE_ZLIB_H
 +	z_stream stream;
++#endif
 +	size_t len_buf;
 +	unsigned char *buf;
- #endif
 +};
 +
 +/* Don't call this min or MIN, since those are already defined
 +   on lots of platforms (but not all). */
 +#define zipmin(a, b) ((a) > (b) ? (b) : (a))
 +
 +static ssize_t archive_write_zip_data(struct archive_write *,
 +		   const void *buff, size_t s);
 +static int archive_write_zip_close(struct archive_write *);
 +static int archive_write_zip_free(struct archive_write *);
 +static int archive_write_zip_finish_entry(struct archive_write *);
 +static int archive_write_zip_header(struct archive_write *,
 +	      struct archive_entry *);
 +static int archive_write_zip_options(struct archive_write *,
 +	      const char *, const char *);
 +static unsigned int dos_time(const time_t);
 +static size_t path_length(struct archive_entry *);
 +static int write_path(struct archive_entry *, struct archive_write *);
 +static void copy_path(struct archive_entry *, unsigned char *);
 +static struct archive_string_conv *get_sconv(struct archive_write *, struct zip *);
++static int trad_enc_init(struct trad_enc_ctx *, const char *, size_t);
++static unsigned trad_enc_encrypt_update(struct trad_enc_ctx *, const uint8_t *,
++    size_t, uint8_t *, size_t);
++static int init_traditional_pkware_encryption(struct archive_write *);
++static int is_traditional_pkware_encryption_supported(void);
++static int init_winzip_aes_encryption(struct archive_write *);
++static int is_winzip_aes_encryption_supported(int encryption);
 +
 +static unsigned char *
 +cd_alloc(struct zip *zip, size_t length)
 +{
 +	unsigned char *p;
 +
 +	if (zip->central_directory == NULL
 +	    || (zip->central_directory_last->p + length
 +		> zip->central_directory_last->buff + zip->central_directory_last->buff_size)) {
 +		struct cd_segment *segment = calloc(1, sizeof(*segment));
 +		if (segment == NULL)
 +			return NULL;
 +		segment->buff_size = 64 * 1024;
 +		segment->buff = malloc(segment->buff_size);
 +		if (segment->buff == NULL) {
 +			free(segment);
 +			return NULL;
 +		}
 +		segment->p = segment->buff;
 +
 +		if (zip->central_directory == NULL) {
 +			zip->central_directory
 +			    = zip->central_directory_last
 +			    = segment;
 +		} else {
 +			zip->central_directory_last->next = segment;
 +			zip->central_directory_last = segment;
 +		}
 +	}
 +
 +	p = zip->central_directory_last->p;
 +	zip->central_directory_last->p += length;
 +	zip->central_directory_bytes += length;
 +	return (p);
 +}
 +
 +static unsigned long
 +real_crc32(unsigned long crc, const void *buff, size_t len)
 +{
- 	return crc32(crc, buff, len);
++	return crc32(crc, buff, (unsigned int)len);
 +}
 +
 +static unsigned long
 +fake_crc32(unsigned long crc, const void *buff, size_t len)
 +{
 +	(void)crc; /* UNUSED */
 +	(void)buff; /* UNUSED */
 +	(void)len; /* UNUSED */
 +	return 0;
 +}
 +
 +static int
 +archive_write_zip_options(struct archive_write *a, const char *key,
 +    const char *val)
 +{
 +	struct zip *zip = a->format_data;
 +	int ret = ARCHIVE_FAILED;
 +
 +	if (strcmp(key, "compression") == 0) {
 +		/*
 +		 * Set compression to use on all future entries.
 +		 * This only affects regular files.
 +		 */
 +		if (val == NULL || val[0] == 0) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "%s: compression option needs a compression name",
 +			    a->format_name);
 +		} else if (strcmp(val, "deflate") == 0) {
 +#ifdef HAVE_ZLIB_H
 +			zip->requested_compression = COMPRESSION_DEFLATE;
 +			ret = ARCHIVE_OK;
 +#else
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "deflate compression not supported");
 +#endif
 +		} else if (strcmp(val, "store") == 0) {
 +			zip->requested_compression = COMPRESSION_STORE;
 +			ret = ARCHIVE_OK;
 +		}
 +		return (ret);
++	} else if (strcmp(key, "compression-level") == 0) {
++		if (val == NULL || !(val[0] >= '0' && val[0] <= '9') || val[1] != '\0') {
++			return ARCHIVE_WARN;
++		}
++
++		if (val[0] == '0') {
++			zip->requested_compression = COMPRESSION_STORE;
++			return ARCHIVE_OK;
++		} else {
++#ifdef HAVE_ZLIB_H
++			zip->requested_compression = COMPRESSION_DEFLATE;
++			zip->deflate_compression_level = val[0] - '0';
++			return ARCHIVE_OK;
++#else
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "deflate compression not supported");
++#endif
++		}
++	} else if (strcmp(key, "encryption") == 0) {
++		if (val == NULL) {
++			zip->encryption_type = ENCRYPTION_NONE;
++			ret = ARCHIVE_OK;
++		} else if (val[0] == '1' || strcmp(val, "traditional") == 0
++		    || strcmp(val, "zipcrypt") == 0
++		    || strcmp(val, "ZipCrypt") == 0) {
++			if (is_traditional_pkware_encryption_supported()) {
++				zip->encryption_type = ENCRYPTION_TRADITIONAL;
++				ret = ARCHIVE_OK;
++			} else {
++				archive_set_error(&a->archive,
++				    ARCHIVE_ERRNO_MISC,
++				    "encryption not supported");
++			}
++		} else if (strcmp(val, "aes128") == 0) {
++			if (is_winzip_aes_encryption_supported(
++			    ENCRYPTION_WINZIP_AES128)) {
++				zip->encryption_type = ENCRYPTION_WINZIP_AES128;
++				ret = ARCHIVE_OK;
++			} else {
++				archive_set_error(&a->archive,
++				    ARCHIVE_ERRNO_MISC,
++				    "encryption not supported");
++			}
++		} else if (strcmp(val, "aes256") == 0) {
++			if (is_winzip_aes_encryption_supported(
++			    ENCRYPTION_WINZIP_AES256)) {
++				zip->encryption_type = ENCRYPTION_WINZIP_AES256;
++				ret = ARCHIVE_OK;
++			} else {
++				archive_set_error(&a->archive,
++				    ARCHIVE_ERRNO_MISC,
++				    "encryption not supported");
++			}
++		} else {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			    "%s: unknown encryption '%s'",
++			    a->format_name, val);
++		}
++		return (ret);
 +	} else if (strcmp(key, "experimental") == 0) {
 +		if (val == NULL || val[0] == 0) {
- 			zip->flags &= ~ ZIP_FLAG_EXPERIMENT_EL;
++			zip->flags &= ~ ZIP_FLAG_EXPERIMENT_xl;
 +		} else {
- 			zip->flags |= ZIP_FLAG_EXPERIMENT_EL;
++			zip->flags |= ZIP_FLAG_EXPERIMENT_xl;
 +		}
 +		return (ARCHIVE_OK);
 +	} else if (strcmp(key, "fakecrc32") == 0) {
 +		/*
 +		 * FOR TESTING ONLY:  disable CRC calculation to speed up
 +		 * certain complex tests.
 +		 */
 +		if (val == NULL || val[0] == 0) {
 +			zip->crc32func = real_crc32;
 +		} else {
 +			zip->crc32func = fake_crc32;
 +		}
 +		return (ARCHIVE_OK);
 +	} else if (strcmp(key, "hdrcharset")  == 0) {
 +		/*
 +		 * Set the character set used in translating filenames.
 +		 */
 +		if (val == NULL || val[0] == 0) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "%s: hdrcharset option needs a character-set name",
 +			    a->format_name);
 +		} else {
 +			zip->opt_sconv = archive_string_conversion_to_charset(
 +			    &a->archive, val, 0);
 +			if (zip->opt_sconv != NULL)
 +				ret = ARCHIVE_OK;
 +			else
 +				ret = ARCHIVE_FATAL;
 +		}
 +		return (ret);
 +	} else if (strcmp(key, "zip64") == 0) {
 +		/*
 +		 * Bias decisions about Zip64: force them to be
 +		 * generated in certain cases where they are not
 +		 * forbidden or avoid them in certain cases where they
 +		 * are not strictly required.
 +		 */
 +		if (val != NULL && *val != '\0') {
 +			zip->flags |= ZIP_FLAG_FORCE_ZIP64;
 +			zip->flags &= ~ZIP_FLAG_AVOID_ZIP64;
 +		} else {
 +			zip->flags &= ~ZIP_FLAG_FORCE_ZIP64;
 +			zip->flags |= ZIP_FLAG_AVOID_ZIP64;
 +		}
 +		return (ARCHIVE_OK);
 +	}
 +
 +	/* Note: The "warn" return is just to inform the options
 +	 * supervisor that we didn't handle it.  It will generate
 +	 * a suitable error if no one used this option. */
 +	return (ARCHIVE_WARN);
 +}
 +
 +int
 +archive_write_zip_set_compression_deflate(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	int ret = ARCHIVE_FAILED;
 +
 +	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
 +		ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
 +		"archive_write_zip_set_compression_deflate");
 +	if (a->archive.archive_format != ARCHIVE_FORMAT_ZIP) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		"Can only use archive_write_zip_set_compression_deflate"
 +		" with zip format");
 +		ret = ARCHIVE_FATAL;
 +	} else {
 +#ifdef HAVE_ZLIB_H
 +		struct zip *zip = a->format_data;
 +		zip->requested_compression = COMPRESSION_DEFLATE;
 +		ret = ARCHIVE_OK;
 +#else
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			"deflate compression not supported");
 +		ret = ARCHIVE_FAILED;
 +#endif
 +	}
 +	return (ret);
 +}
 +
 +int
 +archive_write_zip_set_compression_store(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	struct zip *zip = a->format_data;
 +	int ret = ARCHIVE_FAILED;
 +
 +	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
 +		ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
 +		"archive_write_zip_set_compression_deflate");
 +	if (a->archive.archive_format != ARCHIVE_FORMAT_ZIP) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			"Can only use archive_write_zip_set_compression_store"
 +			" with zip format");
 +		ret = ARCHIVE_FATAL;
 +	} else {
 +		zip->requested_compression = COMPRESSION_STORE;
 +		ret = ARCHIVE_OK;
 +	}
 +	return (ret);
 +}
 +
 +int
 +archive_write_set_format_zip(struct archive *_a)
 +{
 +	struct archive_write *a = (struct archive_write *)_a;
 +	struct zip *zip;
 +
 +	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
 +	    ARCHIVE_STATE_NEW, "archive_write_set_format_zip");
 +
 +	/* If another format was already registered, unregister it. */
 +	if (a->format_free != NULL)
 +		(a->format_free)(a);
 +
 +	zip = (struct zip *) calloc(1, sizeof(*zip));
 +	if (zip == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate zip data");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	/* "Unspecified" lets us choose the appropriate compression. */
 +	zip->requested_compression = COMPRESSION_UNSPECIFIED;
++#ifdef HAVE_ZLIB_H
++	zip->deflate_compression_level = Z_DEFAULT_COMPRESSION;
++#endif
 +	zip->crc32func = real_crc32;
 +
- #ifdef HAVE_ZLIB_H
++	/* A buffer used for both compression and encryption. */
 +	zip->len_buf = 65536;
 +	zip->buf = malloc(zip->len_buf);
 +	if (zip->buf == NULL) {
 +		free(zip);
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate compression buffer");
 +		return (ARCHIVE_FATAL);
 +	}
- #endif
 +
 +	a->format_data = zip;
 +	a->format_name = "zip";
 +	a->format_options = archive_write_zip_options;
 +	a->format_write_header = archive_write_zip_header;
 +	a->format_write_data = archive_write_zip_data;
 +	a->format_finish_entry = archive_write_zip_finish_entry;
 +	a->format_close = archive_write_zip_close;
 +	a->format_free = archive_write_zip_free;
 +	a->archive.archive_format = ARCHIVE_FORMAT_ZIP;
 +	a->archive.archive_format_name = "ZIP";
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +is_all_ascii(const char *p)
 +{
 +	const unsigned char *pp = (const unsigned char *)p;
 +
 +	while (*pp) {
 +		if (*pp++ > 127)
 +			return (0);
 +	}
 +	return (1);
 +}
 +
 +static int
 +archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 +{
 +	unsigned char local_header[32];
- 	unsigned char local_extra[128];
++	unsigned char local_extra[144];
 +	struct zip *zip = a->format_data;
 +	unsigned char *e;
 +	unsigned char *cd_extra;
 +	size_t filename_length;
 +	const char *slink = NULL;
 +	size_t slink_size = 0;
 +	struct archive_string_conv *sconv = get_sconv(a, zip);
 +	int ret, ret2 = ARCHIVE_OK;
- 	int64_t size;
 +	mode_t type;
 +	int version_needed = 10;
 +
 +	/* Ignore types of entries that we don't support. */
 +	type = archive_entry_filetype(entry);
 +	if (type != AE_IFREG && type != AE_IFDIR && type != AE_IFLNK) {
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Filetype not supported");
 +		return ARCHIVE_FAILED;
 +	};
 +
 +	/* If we're not using Zip64, reject large files. */
 +	if (zip->flags & ZIP_FLAG_AVOID_ZIP64) {
 +		/* Reject entries over 4GB. */
 +		if (archive_entry_size_is_set(entry)
- 		    && (archive_entry_size(entry) > 0xffffffff)) {
++		    && (archive_entry_size(entry) >
++			ARCHIVE_LITERAL_LL(0xffffffff))) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Files > 4GB require Zip64 extensions");
 +			return ARCHIVE_FAILED;
 +		}
 +		/* Reject entries if archive is > 4GB. */
- 		if (zip->written_bytes > 0xffffffff) {
++		if (zip->written_bytes > ARCHIVE_LITERAL_LL(0xffffffff)) {
 +			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +			    "Archives > 4GB require Zip64 extensions");
 +			return ARCHIVE_FAILED;
 +		}
 +	}
 +
 +	/* Only regular files can have size > 0. */
 +	if (type != AE_IFREG)
 +		archive_entry_set_size(entry, 0);
 +
 +
 +	/* Reset information from last entry. */
 +	zip->entry_offset = zip->written_bytes;
 +	zip->entry_uncompressed_limit = INT64_MAX;
 +	zip->entry_compressed_size = 0;
 +	zip->entry_uncompressed_size = 0;
 +	zip->entry_compressed_written = 0;
 +	zip->entry_uncompressed_written = 0;
 +	zip->entry_flags = 0;
 +	zip->entry_uses_zip64 = 0;
 +	zip->entry_crc32 = zip->crc32func(0, NULL, 0);
++	zip->entry_encryption = 0;
 +	if (zip->entry != NULL) {
 +		archive_entry_free(zip->entry);
 +		zip->entry = NULL;
 +	}
 +
++	if (zip->cctx_valid)
++		archive_encrypto_aes_ctr_release(&zip->cctx);
++	if (zip->hctx_valid)
++		archive_hmac_sha1_cleanup(&zip->hctx);
++	zip->tctx_valid = zip->cctx_valid = zip->hctx_valid = 0;
++
++	if (type == AE_IFREG
++		    &&(!archive_entry_size_is_set(entry)
++			|| archive_entry_size(entry) > 0)) {
++		switch (zip->encryption_type) {
++		case ENCRYPTION_TRADITIONAL:
++		case ENCRYPTION_WINZIP_AES128:
++		case ENCRYPTION_WINZIP_AES256:
++			zip->entry_flags |= ZIP_ENTRY_FLAG_ENCRYPTED;
++			zip->entry_encryption = zip->encryption_type;
++			break;
++		default:
++			break;
++		}
++	}
++
++
 +#if defined(_WIN32) && !defined(__CYGWIN__)
 +	/* Make sure the path separators in pahtname, hardlink and symlink
 +	 * are all slash '/', not the Windows path separator '\'. */
 +	zip->entry = __la_win_entry_in_posix_pathseparator(entry);
 +	if (zip->entry == entry)
 +		zip->entry = archive_entry_clone(entry);
 +#else
 +	zip->entry = archive_entry_clone(entry);
 +#endif
 +	if (zip->entry == NULL) {
 +		archive_set_error(&a->archive, ENOMEM,
 +		    "Can't allocate zip header data");
 +		return (ARCHIVE_FATAL);
 +	}
 +
 +	if (sconv != NULL) {
 +		const char *p;
 +		size_t len;
 +
 +		if (archive_entry_pathname_l(entry, &p, &len, sconv) != 0) {
 +			if (errno == ENOMEM) {
 +				archive_set_error(&a->archive, ENOMEM,
 +				    "Can't allocate memory for Pathname");
 +				return (ARCHIVE_FATAL);
 +			}
 +			archive_set_error(&a->archive,
 +			    ARCHIVE_ERRNO_FILE_FORMAT,
 +			    "Can't translate Pathname '%s' to %s",
 +			    archive_entry_pathname(entry),
 +			    archive_string_conversion_charset_name(sconv));
 +			ret2 = ARCHIVE_WARN;
 +		}
 +		if (len > 0)
 +			archive_entry_set_pathname(zip->entry, p);
 +
 +		/*
 +		 * There is no standard for symlink handling; we convert
 +		 * it using the same character-set translation that we use
 +		 * for filename.
 +		 */
 +		if (type == AE_IFLNK) {
 +			if (archive_entry_symlink_l(entry, &p, &len, sconv)) {
 +				if (errno == ENOMEM) {
 +					archive_set_error(&a->archive, ENOMEM,
 +					    "Can't allocate memory "
 +					    " for Symlink");
 +					return (ARCHIVE_FATAL);
 +				}
 +				/* No error if we can't convert. */
 +			} else if (len > 0)
 +				archive_entry_set_symlink(zip->entry, p);
 +		}
 +	}
 +
 +	/* If filename isn't ASCII and we can use UTF-8, set the UTF-8 flag. */
 +	if (!is_all_ascii(archive_entry_pathname(zip->entry))) {
 +		if (zip->opt_sconv != NULL) {
 +			if (strcmp(archive_string_conversion_charset_name(
 +					zip->opt_sconv), "UTF-8") == 0)
 +				zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME;
 +#if HAVE_NL_LANGINFO
 +		} else if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) {
 +			zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME;
 +#endif
 +		}
 +	}
 +	filename_length = path_length(zip->entry);
 +
 +	/* Determine appropriate compression and size for this entry. */
 +	if (type == AE_IFLNK) {
 +		slink = archive_entry_symlink(zip->entry);
 +		if (slink != NULL)
 +			slink_size = strlen(slink);
 +		else
 +			slink_size = 0;
 +		zip->entry_uncompressed_limit = slink_size;
 +		zip->entry_compressed_size = slink_size;
 +		zip->entry_uncompressed_size = slink_size;
 +		zip->entry_crc32 = zip->crc32func(zip->entry_crc32,
 +		    (const unsigned char *)slink, slink_size);
 +		zip->entry_compression = COMPRESSION_STORE;
 +		version_needed = 20;
 +	} else if (type != AE_IFREG) {
 +		zip->entry_compression = COMPRESSION_STORE;
 +		zip->entry_uncompressed_limit = 0;
- 		size = 0;
 +		version_needed = 20;
 +	} else if (archive_entry_size_is_set(zip->entry)) {
- 		size = archive_entry_size(zip->entry);
++		int64_t size = archive_entry_size(zip->entry);
++		int64_t additional_size = 0;
++
 +		zip->entry_uncompressed_limit = size;
 +		zip->entry_compression = zip->requested_compression;
 +		if (zip->entry_compression == COMPRESSION_UNSPECIFIED) {
 +			zip->entry_compression = COMPRESSION_DEFAULT;
 +		}
 +		if (zip->entry_compression == COMPRESSION_STORE) {
 +			zip->entry_compressed_size = size;
 +			zip->entry_uncompressed_size = size;
 +			version_needed = 10;
 +		} else {
 +			zip->entry_uncompressed_size = size;
 +			version_needed = 20;
 +		}
- 		if ((zip->flags & ZIP_FLAG_FORCE_ZIP64) /* User asked. */
- 		    || (zip->entry_uncompressed_size > ARCHIVE_LITERAL_LL(0xffffffff))) { /* Large entry. */
++
++		if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
++			switch (zip->entry_encryption) {
++			case ENCRYPTION_TRADITIONAL:
++				additional_size = TRAD_HEADER_SIZE;
++				version_needed = 20;
++				break;
++			case ENCRYPTION_WINZIP_AES128:
++				additional_size = WINZIP_AES128_HEADER_SIZE
++				    + AUTH_CODE_SIZE;
++				version_needed = 20;
++				break;
++			case ENCRYPTION_WINZIP_AES256:
++				additional_size = WINZIP_AES256_HEADER_SIZE
++				    + AUTH_CODE_SIZE;
++				version_needed = 20;
++				break;
++			default:
++				break;
++			}
++			if (zip->entry_compression == COMPRESSION_STORE)
++				zip->entry_compressed_size += additional_size;
++		}
++
++		/*
++		 * Set Zip64 extension in any of the following cases
++		 * (this was suggested by discussion on info-zip-dev
++		 * mailing list):
++		 *  = Zip64 is being forced by user
++		 *  = File is over 4GiB uncompressed
++		 *    (including encryption header, if any)
++		 *  = File is close to 4GiB and is being compressed
++		 *    (compression might make file larger)
++		 */
++		if ((zip->flags & ZIP_FLAG_FORCE_ZIP64)
++		    || (zip->entry_uncompressed_size + additional_size >
++			ARCHIVE_LITERAL_LL(0xffffffff))
++		    || (zip->entry_uncompressed_size >
++			ARCHIVE_LITERAL_LL(0xff000000)
++			&& zip->entry_compression != COMPRESSION_STORE)) {
 +			zip->entry_uses_zip64 = 1;
 +			version_needed = 45;
 +		}
 +
 +		/* We may know the size, but never the CRC. */
 +		zip->entry_flags |= ZIP_ENTRY_FLAG_LENGTH_AT_END;
 +	} else {
- 		/* Prefer deflate if it's available, because deflate
- 		 * has a clear end-of-data marker that makes
- 		 * length-at-end more reliable. */
++		/* We don't know the size.  In this case, we prefer
++		 * deflate (it has a clear end-of-data marker which
++		 * makes length-at-end more reliable) and will
++		 * enable Zip64 extensions unless we're told not to.
++		 */
 +		zip->entry_compression = COMPRESSION_DEFAULT;
 +		zip->entry_flags |= ZIP_ENTRY_FLAG_LENGTH_AT_END;
 +		if ((zip->flags & ZIP_FLAG_AVOID_ZIP64) == 0) {
 +			zip->entry_uses_zip64 = 1;
 +			version_needed = 45;
 +		} else if (zip->entry_compression == COMPRESSION_STORE) {
 +			version_needed = 10;
 +		} else {
 +			version_needed = 20;
 +		}
++
++		if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
++			switch (zip->entry_encryption) {
++			case ENCRYPTION_TRADITIONAL:
++			case ENCRYPTION_WINZIP_AES128:
++			case ENCRYPTION_WINZIP_AES256:
++				if (version_needed < 20)
++					version_needed = 20;
++				break;
++			default:
++				break;
++			}
++		}
 +	}
 +
 +	/* Format the local header. */
 +	memset(local_header, 0, sizeof(local_header));
 +	memcpy(local_header, "PK\003\004", 4);
 +	archive_le16enc(local_header + 4, version_needed);
 +	archive_le16enc(local_header + 6, zip->entry_flags);
- 	archive_le16enc(local_header + 8, zip->entry_compression);
- 	archive_le32enc(local_header + 10, dos_time(archive_entry_mtime(zip->entry)));
++	if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
++	    || zip->entry_encryption == ENCRYPTION_WINZIP_AES256)
++		archive_le16enc(local_header + 8, WINZIP_AES_ENCRYPTION);
++	else
++		archive_le16enc(local_header + 8, zip->entry_compression);
++	archive_le32enc(local_header + 10,
++		dos_time(archive_entry_mtime(zip->entry)));
 +	archive_le32enc(local_header + 14, zip->entry_crc32);
 +	if (zip->entry_uses_zip64) {
 +		/* Zip64 data in the local header "must" include both
 +		 * compressed and uncompressed sizes AND those fields
 +		 * are included only if these are 0xffffffff;
 +		 * THEREFORE these must be set this way, even if we
 +		 * know one of them is smaller. */
 +		archive_le32enc(local_header + 18, ARCHIVE_LITERAL_LL(0xffffffff));
 +		archive_le32enc(local_header + 22, ARCHIVE_LITERAL_LL(0xffffffff));
 +	} else {
- 		archive_le32enc(local_header + 18, zip->entry_compressed_size);
- 		archive_le32enc(local_header + 22, zip->entry_uncompressed_size);
++		archive_le32enc(local_header + 18, (uint32_t)zip->entry_compressed_size);
++		archive_le32enc(local_header + 22, (uint32_t)zip->entry_uncompressed_size);
++	}
++	archive_le16enc(local_header + 26, (uint16_t)filename_length);
++
++	if (zip->entry_encryption == ENCRYPTION_TRADITIONAL) {
++		if (zip->entry_flags & ZIP_ENTRY_FLAG_LENGTH_AT_END)
++			zip->trad_chkdat = local_header[11];
++		else
++			zip->trad_chkdat = local_header[17];
 +	}
- 	archive_le16enc(local_header + 26, filename_length);
 +
 +	/* Format as much of central directory file header as we can: */
 +	zip->file_header = cd_alloc(zip, 46);
 +	/* If (zip->file_header == NULL) XXXX */
 +	++zip->central_directory_entries;
 +	memset(zip->file_header, 0, 46);
 +	memcpy(zip->file_header, "PK\001\002", 4);
 +	/* "Made by PKZip 2.0 on Unix." */
 +	archive_le16enc(zip->file_header + 4, 3 * 256 + version_needed);
 +	archive_le16enc(zip->file_header + 6, version_needed);
 +	archive_le16enc(zip->file_header + 8, zip->entry_flags);
- 	archive_le16enc(zip->file_header + 10, zip->entry_compression);
- 	archive_le32enc(zip->file_header + 12, dos_time(archive_entry_mtime(zip->entry)));
- 	archive_le16enc(zip->file_header + 28, filename_length);
++	if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
++	    || zip->entry_encryption == ENCRYPTION_WINZIP_AES256)
++		archive_le16enc(zip->file_header + 10, WINZIP_AES_ENCRYPTION);
++	else
++		archive_le16enc(zip->file_header + 10, zip->entry_compression);
++	archive_le32enc(zip->file_header + 12,
++		dos_time(archive_entry_mtime(zip->entry)));
++	archive_le16enc(zip->file_header + 28, (uint16_t)filename_length);
 +	/* Following Info-Zip, store mode in the "external attributes" field. */
 +	archive_le32enc(zip->file_header + 38,
 +	    ((uint32_t)archive_entry_mode(zip->entry)) << 16);
 +	e = cd_alloc(zip, filename_length);
 +	/* If (e == NULL) XXXX */
 +	copy_path(zip->entry, e);
 +
 +	/* Format extra data. */
 +	memset(local_extra, 0, sizeof(local_extra));
 +	e = local_extra;
 +
 +	/* First, extra blocks that are the same between
 +	 * the local file header and the central directory.
 +	 * We format them once and then duplicate them. */
 +
 +	/* UT timestamp, length depends on what timestamps are set. */
 +	memcpy(e, "UT", 2);
 +	archive_le16enc(e + 2,
 +	    1
 +	    + (archive_entry_mtime_is_set(entry) ? 4 : 0)
 +	    + (archive_entry_atime_is_set(entry) ? 4 : 0)
 +	    + (archive_entry_ctime_is_set(entry) ? 4 : 0));
 +	e += 4;
 +	*e++ =
 +	    (archive_entry_mtime_is_set(entry) ? 1 : 0)
 +	    | (archive_entry_atime_is_set(entry) ? 2 : 0)
 +	    | (archive_entry_ctime_is_set(entry) ? 4 : 0);
 +	if (archive_entry_mtime_is_set(entry)) {
 +		archive_le32enc(e, (uint32_t)archive_entry_mtime(entry));
 +		e += 4;
 +	}
 +	if (archive_entry_atime_is_set(entry)) {
 +		archive_le32enc(e, (uint32_t)archive_entry_atime(entry));
 +		e += 4;
 +	}
 +	if (archive_entry_ctime_is_set(entry)) {
 +		archive_le32enc(e, (uint32_t)archive_entry_ctime(entry));
 +		e += 4;
 +	}
 +
 +	/* ux Unix extra data, length 11, version 1 */
 +	/* TODO: If uid < 64k, use 2 bytes, ditto for gid. */
 +	memcpy(e, "ux\013\000\001", 5);
 +	e += 5;
 +	*e++ = 4; /* Length of following UID */
 +	archive_le32enc(e, (uint32_t)archive_entry_uid(entry));
 +	e += 4;
 +	*e++ = 4; /* Length of following GID */
 +	archive_le32enc(e, (uint32_t)archive_entry_gid(entry));
 +	e += 4;
 +
- 	/* Copy UT and ux into central directory as well. */
++	/* AES extra data field: WinZIP AES information, ID=0x9901 */
++	if ((zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED)
++	    && (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
++	        || zip->entry_encryption == ENCRYPTION_WINZIP_AES256)) {
++
++		memcpy(e, "\001\231\007\000\001\000AE", 8);
++		/* AES vendoer version AE-2 does not store a CRC.
++		 * WinZip 11 uses AE-1, which does store the CRC,
++		 * but it does not store the CRC when the file size
++		 * is less than 20 bytes. So we simulate what
++		 * WinZip 11 does.
++		 * NOTE: WinZip 9.0 and 10.0 uses AE-2 by default. */
++		if (archive_entry_size_is_set(zip->entry)
++		    && archive_entry_size(zip->entry) < 20) {
++			archive_le16enc(e+4, AES_VENDOR_AE_2);
++			zip->aes_vendor = AES_VENDOR_AE_2;/* no CRC. */
++		} else
++			zip->aes_vendor = AES_VENDOR_AE_1;
++		e += 8;
++		/* AES encryption strength. */
++		*e++ = (zip->entry_encryption == ENCRYPTION_WINZIP_AES128)?1:3;
++		/* Actual compression method. */
++		archive_le16enc(e, zip->entry_compression);
++		e += 2;
++	}
++
++	/* Copy UT ,ux, and AES-extra into central directory as well. */
 +	zip->file_header_extra_offset = zip->central_directory_bytes;
 +	cd_extra = cd_alloc(zip, e - local_extra);
 +	memcpy(cd_extra, local_extra, e - local_extra);
 +
 +	/*
 +	 * Following extra blocks vary between local header and
 +	 * central directory. These are the local header versions.
 +	 * Central directory versions get formatted in
 +	 * archive_write_zip_finish_entry() below.
 +	 */
 +
 +	/* "[Zip64 entry] in the local header MUST include BOTH
 +	 * original [uncompressed] and compressed size fields." */
 +	if (zip->entry_uses_zip64) {
 +		unsigned char *zip64_start = e;
 +		memcpy(e, "\001\000\020\000", 4);
 +		e += 4;
 +		archive_le64enc(e, zip->entry_uncompressed_size);
 +		e += 8;
 +		archive_le64enc(e, zip->entry_compressed_size);
 +		e += 8;
- 		archive_le16enc(zip64_start + 2, e - (zip64_start + 4));
++		archive_le16enc(zip64_start + 2, (uint16_t)(e - (zip64_start + 4)));
 +	}
 +
- 	if (zip->flags & ZIP_FLAG_EXPERIMENT_EL) {
- 		/* Experimental 'el' extension to improve streaming. */
++	if (zip->flags & ZIP_FLAG_EXPERIMENT_xl) {
++		/* Experimental 'xl' extension to improve streaming. */
 +		unsigned char *external_info = e;
 +		int included = 7;
- 		memcpy(e, "el\000\000", 4); // 0x6c65 + 2-byte length
++		memcpy(e, "xl\000\000", 4); // 0x6c65 + 2-byte length
 +		e += 4;
 +		e[0] = included; /* bitmap of included fields */
 +		e += 1;
 +		if (included & 1) {
 +			archive_le16enc(e, /* "Version created by" */
 +			    3 * 256 + version_needed);
 +			e += 2;
 +		}
 +		if (included & 2) {
 +			archive_le16enc(e, 0); /* internal file attributes */
 +			e += 2;
 +		}
 +		if (included & 4) {
 +			archive_le32enc(e,  /* external file attributes */
 +			    ((uint32_t)archive_entry_mode(zip->entry)) << 16);
 +			e += 4;
 +		}
 +		if (included & 8) {
 +			// Libarchive does not currently support file comments.
 +		}
- 		archive_le16enc(external_info + 2, e - (external_info + 4));
++		archive_le16enc(external_info + 2, (uint16_t)(e - (external_info + 4)));
 +	}
 +
 +	/* Update local header with size of extra data and write it all out: */
- 	archive_le16enc(local_header + 28, e - local_extra);
++	archive_le16enc(local_header + 28, (uint16_t)(e - local_extra));
 +
 +	ret = __archive_write_output(a, local_header, 30);
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +	zip->written_bytes += 30;
 +
 +	ret = write_path(zip->entry, a);
 +	if (ret <= ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +	zip->written_bytes += ret;
 +
 +	ret = __archive_write_output(a, local_extra, e - local_extra);
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +	zip->written_bytes += e - local_extra;
 +
 +	/* For symlinks, write the body now. */
 +	if (slink != NULL) {
 +		ret = __archive_write_output(a, slink, slink_size);
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +		zip->entry_compressed_written += slink_size;
 +		zip->entry_uncompressed_written += slink_size;
 +		zip->written_bytes += slink_size;
 +	}
 +
 +#ifdef HAVE_ZLIB_H
 +	if (zip->entry_compression == COMPRESSION_DEFLATE) {
 +		zip->stream.zalloc = Z_NULL;
 +		zip->stream.zfree = Z_NULL;
 +		zip->stream.opaque = Z_NULL;
 +		zip->stream.next_out = zip->buf;
 +		zip->stream.avail_out = (uInt)zip->len_buf;
- 		if (deflateInit2(&zip->stream, Z_DEFAULT_COMPRESSION,
++		if (deflateInit2(&zip->stream, zip->deflate_compression_level,
 +		    Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
 +			archive_set_error(&a->archive, ENOMEM,
 +			    "Can't init deflate compressor");
 +			return (ARCHIVE_FATAL);
 +		}
 +	}
 +#endif
 +
 +	return (ret2);
 +}
 +
 +static ssize_t
 +archive_write_zip_data(struct archive_write *a, const void *buff, size_t s)
 +{
 +	int ret;
 +	struct zip *zip = a->format_data;
 +
 +	if ((int64_t)s > zip->entry_uncompressed_limit)
 +		s = (size_t)zip->entry_uncompressed_limit;
 +	zip->entry_uncompressed_written += s;
 +
 +	if (s == 0) return 0;
 +
++	if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
++		switch (zip->entry_encryption) {
++		case ENCRYPTION_TRADITIONAL:
++			/* Initialize traditoinal PKWARE encryption context. */
++			if (!zip->tctx_valid) {
++				ret = init_traditional_pkware_encryption(a);
++				if (ret != ARCHIVE_OK)
++					return (ret);
++				zip->tctx_valid = 1;
++			}
++			break;
++		case ENCRYPTION_WINZIP_AES128:
++		case ENCRYPTION_WINZIP_AES256:
++			if (!zip->cctx_valid) {
++				ret = init_winzip_aes_encryption(a);
++				if (ret != ARCHIVE_OK)
++					return (ret);
++				zip->cctx_valid = zip->hctx_valid = 1;
++			}
++			break;
++		default:
++			break;
++		}
++	}
++
 +	switch (zip->entry_compression) {
 +	case COMPRESSION_STORE:
- 		ret = __archive_write_output(a, buff, s);
- 		if (ret != ARCHIVE_OK)
- 			return (ret);
- 		zip->written_bytes += s;
- 		zip->entry_compressed_written += s;
++		if (zip->tctx_valid || zip->cctx_valid) {
++			const uint8_t *rb = (const uint8_t *)buff;
++			const uint8_t * const re = rb + s;
++
++			while (rb < re) {
++				size_t l;
++
++				if (zip->tctx_valid) {
++					l = trad_enc_encrypt_update(&zip->tctx,
++					    rb, re - rb,
++					    zip->buf, zip->len_buf);
++				} else {
++					l = zip->len_buf;
++					ret = archive_encrypto_aes_ctr_update(
++					    &zip->cctx,
++					    rb, re - rb, zip->buf, &l);
++					if (ret < 0) {
++						archive_set_error(&a->archive,
++						    ARCHIVE_ERRNO_MISC,
++						    "Failed to encrypt file");
++						return (ARCHIVE_FAILED);
++					}
++					archive_hmac_sha1_update(&zip->hctx,
++					    zip->buf, l);
++				}
++				ret = __archive_write_output(a, zip->buf, l);
++				if (ret != ARCHIVE_OK)
++					return (ret);
++				zip->entry_compressed_written += l;
++				zip->written_bytes += l;
++				rb += l;
++			}
++		} else {
++			ret = __archive_write_output(a, buff, s);
++			if (ret != ARCHIVE_OK)
++				return (ret);
++			zip->written_bytes += s;
++			zip->entry_compressed_written += s;
++		}
 +		break;
 +#if HAVE_ZLIB_H
 +	case COMPRESSION_DEFLATE:
 +		zip->stream.next_in = (unsigned char*)(uintptr_t)buff;
 +		zip->stream.avail_in = (uInt)s;
 +		do {
 +			ret = deflate(&zip->stream, Z_NO_FLUSH);
 +			if (ret == Z_STREAM_ERROR)
 +				return (ARCHIVE_FATAL);
 +			if (zip->stream.avail_out == 0) {
++				if (zip->tctx_valid) {
++					trad_enc_encrypt_update(&zip->tctx,
++					    zip->buf, zip->len_buf,
++					    zip->buf, zip->len_buf);
++				} else if (zip->cctx_valid) {
++					size_t outl = zip->len_buf;
++					ret = archive_encrypto_aes_ctr_update(
++					    &zip->cctx,
++					    zip->buf, zip->len_buf,
++					    zip->buf, &outl);
++					if (ret < 0) {
++						archive_set_error(&a->archive,
++						    ARCHIVE_ERRNO_MISC,
++						    "Failed to encrypt file");
++						return (ARCHIVE_FAILED);
++					}
++					archive_hmac_sha1_update(&zip->hctx,
++					    zip->buf, zip->len_buf);
++				}
 +				ret = __archive_write_output(a, zip->buf,
 +					zip->len_buf);
 +				if (ret != ARCHIVE_OK)
 +					return (ret);
 +				zip->entry_compressed_written += zip->len_buf;
 +				zip->written_bytes += zip->len_buf;
 +				zip->stream.next_out = zip->buf;
 +				zip->stream.avail_out = (uInt)zip->len_buf;
 +			}
 +		} while (zip->stream.avail_in != 0);
 +		break;
 +#endif
 +
 +	default:
 +		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 +		    "Invalid ZIP compression type");
 +		return ARCHIVE_FATAL;
 +	}
 +
 +	zip->entry_uncompressed_limit -= s;
- 	zip->entry_crc32 = zip->crc32func(zip->entry_crc32, buff, (unsigned)s);
++	if (!zip->cctx_valid || zip->aes_vendor != AES_VENDOR_AE_2)
++		zip->entry_crc32 =
++		    zip->crc32func(zip->entry_crc32, buff, (unsigned)s);
 +	return (s);
 +
 +}
 +
 +static int
 +archive_write_zip_finish_entry(struct archive_write *a)
 +{
 +	struct zip *zip = a->format_data;
 +	int ret;
 +
 +#if HAVE_ZLIB_H
 +	if (zip->entry_compression == COMPRESSION_DEFLATE) {
 +		for (;;) {
 +			size_t remainder;
++
 +			ret = deflate(&zip->stream, Z_FINISH);
 +			if (ret == Z_STREAM_ERROR)
 +				return (ARCHIVE_FATAL);
 +			remainder = zip->len_buf - zip->stream.avail_out;
++			if (zip->tctx_valid) {
++				trad_enc_encrypt_update(&zip->tctx,
++				    zip->buf, remainder, zip->buf, remainder);
++			} else if (zip->cctx_valid) {
++				size_t outl = remainder;
++				ret = archive_encrypto_aes_ctr_update(
++				    &zip->cctx, zip->buf, remainder,
++				    zip->buf, &outl);
++				if (ret < 0) {
++					archive_set_error(&a->archive,
++					    ARCHIVE_ERRNO_MISC,
++					    "Failed to encrypt file");
++					return (ARCHIVE_FAILED);
++				}
++				archive_hmac_sha1_update(&zip->hctx,
++				    zip->buf, remainder);
++			}
 +			ret = __archive_write_output(a, zip->buf, remainder);
 +			if (ret != ARCHIVE_OK)
 +				return (ret);
 +			zip->entry_compressed_written += remainder;
 +			zip->written_bytes += remainder;
 +			zip->stream.next_out = zip->buf;
 +			if (zip->stream.avail_out != 0)
 +				break;
 +			zip->stream.avail_out = (uInt)zip->len_buf;
 +		}
 +		deflateEnd(&zip->stream);
 +	}
 +#endif
++	if (zip->hctx_valid) {
++		uint8_t hmac[20];
++		size_t hmac_len = 20;
++
++		archive_hmac_sha1_final(&zip->hctx, hmac, &hmac_len);
++		ret = __archive_write_output(a, hmac, AUTH_CODE_SIZE);
++		if (ret != ARCHIVE_OK)
++			return (ret);
++		zip->entry_compressed_written += AUTH_CODE_SIZE;
++		zip->written_bytes += AUTH_CODE_SIZE;
++	}
 +
 +	/* Write trailing data descriptor. */
 +	if ((zip->entry_flags & ZIP_ENTRY_FLAG_LENGTH_AT_END) != 0) {
 +		char d[24];
 +		memcpy(d, "PK\007\010", 4);
- 		archive_le32enc(d + 4, zip->entry_crc32);
++		if (zip->cctx_valid && zip->aes_vendor == AES_VENDOR_AE_2)
++			archive_le32enc(d + 4, 0);/* no CRC.*/
++		else
++			archive_le32enc(d + 4, zip->entry_crc32);
 +		if (zip->entry_uses_zip64) {
- 			archive_le64enc(d + 8, (uint64_t)zip->entry_compressed_written);
- 			archive_le64enc(d + 16, (uint64_t)zip->entry_uncompressed_written);
++			archive_le64enc(d + 8,
++				(uint64_t)zip->entry_compressed_written);
++			archive_le64enc(d + 16,
++				(uint64_t)zip->entry_uncompressed_written);
 +			ret = __archive_write_output(a, d, 24);
 +			zip->written_bytes += 24;
 +		} else {
- 			archive_le32enc(d + 8, (uint32_t)zip->entry_compressed_written);
- 			archive_le32enc(d + 12, (uint32_t)zip->entry_uncompressed_written);
++			archive_le32enc(d + 8,
++				(uint32_t)zip->entry_compressed_written);
++			archive_le32enc(d + 12,
++				(uint32_t)zip->entry_uncompressed_written);
 +			ret = __archive_write_output(a, d, 16);
 +			zip->written_bytes += 16;
 +		}
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +	}
 +
 +	/* Append Zip64 extra data to central directory information. */
 +	if (zip->entry_compressed_written > ARCHIVE_LITERAL_LL(0xffffffff)
 +	    || zip->entry_uncompressed_written > ARCHIVE_LITERAL_LL(0xffffffff)
 +	    || zip->entry_offset > ARCHIVE_LITERAL_LL(0xffffffff)) {
 +		unsigned char zip64[32];
 +		unsigned char *z = zip64, *zd;
 +		memcpy(z, "\001\000\000\000", 4);
 +		z += 4;
 +		if (zip->entry_uncompressed_written >= ARCHIVE_LITERAL_LL(0xffffffff)) {
 +			archive_le64enc(z, zip->entry_uncompressed_written);
 +			z += 8;
 +		}
 +		if (zip->entry_compressed_written >= ARCHIVE_LITERAL_LL(0xffffffff)) {
 +			archive_le64enc(z, zip->entry_compressed_written);
 +			z += 8;
 +		}
 +		if (zip->entry_offset >= ARCHIVE_LITERAL_LL(0xffffffff)) {
 +			archive_le64enc(z, zip->entry_offset);
 +			z += 8;
 +		}
- 		archive_le16enc(zip64 + 2, z - (zip64 + 4));
++		archive_le16enc(zip64 + 2, (uint16_t)(z - (zip64 + 4)));
 +		zd = cd_alloc(zip, z - zip64);
 +		if (zd == NULL) {
 +			archive_set_error(&a->archive, ENOMEM,
 +				"Can't allocate zip data");
 +			return (ARCHIVE_FATAL);
 +		}
 +		memcpy(zd, zip64, z - zip64);
 +		/* Zip64 means version needs to be set to at least 4.5 */
 +		if (archive_le16dec(zip->file_header + 6) < 45)
 +			archive_le16enc(zip->file_header + 6, 45);
 +	}
 +
 +	/* Fix up central directory file header. */
- 	archive_le32enc(zip->file_header + 16, zip->entry_crc32);
++	if (zip->cctx_valid && zip->aes_vendor == AES_VENDOR_AE_2)
++		archive_le32enc(zip->file_header + 16, 0);/* no CRC.*/
++	else
++		archive_le32enc(zip->file_header + 16, zip->entry_crc32);
 +	archive_le32enc(zip->file_header + 20,
- 	    zipmin(zip->entry_compressed_written, ARCHIVE_LITERAL_LL(0xffffffff)));
++		(uint32_t)zipmin(zip->entry_compressed_written,
++				 ARCHIVE_LITERAL_LL(0xffffffff)));
 +	archive_le32enc(zip->file_header + 24,
- 	    zipmin(zip->entry_uncompressed_written, ARCHIVE_LITERAL_LL(0xffffffff)));
++		(uint32_t)zipmin(zip->entry_uncompressed_written,
++				 ARCHIVE_LITERAL_LL(0xffffffff)));
 +	archive_le16enc(zip->file_header + 30,
- 	    zip->central_directory_bytes - zip->file_header_extra_offset);
++	    (uint16_t)(zip->central_directory_bytes - zip->file_header_extra_offset));
 +	archive_le32enc(zip->file_header + 42,
- 	    zipmin(zip->entry_offset, ARCHIVE_LITERAL_LL(0xffffffff)));
++		(uint32_t)zipmin(zip->entry_offset,
++				 ARCHIVE_LITERAL_LL(0xffffffff)));
 +
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_write_zip_close(struct archive_write *a)
 +{
 +	uint8_t buff[64];
 +	int64_t offset_start, offset_end;
 +	struct zip *zip = a->format_data;
 +	struct cd_segment *segment;
 +	int ret;
 +
 +	offset_start = zip->written_bytes;
 +	segment = zip->central_directory;
 +	while (segment != NULL) {
 +		ret = __archive_write_output(a,
 +		    segment->buff, segment->p - segment->buff);
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +		zip->written_bytes += segment->p - segment->buff;
 +		segment = segment->next;
 +	}
 +	offset_end = zip->written_bytes;
 +
 +	/* If central dir info is too large, write Zip64 end-of-cd */
 +	if (offset_end - offset_start > ARCHIVE_LITERAL_LL(0xffffffff)
 +	    || offset_start > ARCHIVE_LITERAL_LL(0xffffffff)
 +	    || zip->central_directory_entries > 0xffffUL
 +	    || (zip->flags & ZIP_FLAG_FORCE_ZIP64)) {
 +	  /* Zip64 end-of-cd record */
 +	  memset(buff, 0, 56);
 +	  memcpy(buff, "PK\006\006", 4);
 +	  archive_le64enc(buff + 4, 44);
 +	  archive_le16enc(buff + 12, 45);
 +	  archive_le16enc(buff + 14, 45);
 +	  /* This is disk 0 of 0. */
 +	  archive_le64enc(buff + 24, zip->central_directory_entries);
 +	  archive_le64enc(buff + 32, zip->central_directory_entries);
 +	  archive_le64enc(buff + 40, offset_end - offset_start);
 +	  archive_le64enc(buff + 48, offset_start);
 +	  ret = __archive_write_output(a, buff, 56);
 +	  if (ret != ARCHIVE_OK)
 +		  return (ARCHIVE_FATAL);
 +	  zip->written_bytes += 56;
 +
 +	  /* Zip64 end-of-cd locator record. */
 +	  memset(buff, 0, 20);
 +	  memcpy(buff, "PK\006\007", 4);
 +	  archive_le32enc(buff + 4, 0);
 +	  archive_le64enc(buff + 8, offset_end);
 +	  archive_le32enc(buff + 16, 1);
 +	  ret = __archive_write_output(a, buff, 20);
 +	  if (ret != ARCHIVE_OK)
 +		  return (ARCHIVE_FATAL);
 +	  zip->written_bytes += 20;
 +
 +	}
 +
 +	/* Format and write end of central directory. */
 +	memset(buff, 0, sizeof(buff));
 +	memcpy(buff, "PK\005\006", 4);
- 	archive_le16enc(buff + 8, zipmin(0xffffU, zip->central_directory_entries));
- 	archive_le16enc(buff + 10, zipmin(0xffffU, zip->central_directory_entries));
- 	archive_le32enc(buff + 12, (uint32_t)zipmin(ARCHIVE_LITERAL_LL(0xffffffff), (offset_end - offset_start)));
- 	archive_le32enc(buff + 16, (uint32_t)zipmin(ARCHIVE_LITERAL_LL(0xffffffff), offset_start));
++	archive_le16enc(buff + 8, (uint16_t)zipmin(0xffffU,
++		zip->central_directory_entries));
++	archive_le16enc(buff + 10, (uint16_t)zipmin(0xffffU,
++		zip->central_directory_entries));
++	archive_le32enc(buff + 12,
++		(uint32_t)zipmin(ARCHIVE_LITERAL_LL(0xffffffff),
++				 (offset_end - offset_start)));
++	archive_le32enc(buff + 16,
++		(uint32_t)zipmin(ARCHIVE_LITERAL_LL(0xffffffff),
++				 offset_start));
 +	ret = __archive_write_output(a, buff, 22);
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +	zip->written_bytes += 22;
 +	return (ARCHIVE_OK);
 +}
 +
 +static int
 +archive_write_zip_free(struct archive_write *a)
 +{
 +	struct zip *zip;
 +	struct cd_segment *segment;
 +
 +	zip = a->format_data;
 +	while (zip->central_directory != NULL) {
 +		segment = zip->central_directory;
 +		zip->central_directory = segment->next;
 +		free(segment->buff);
 +		free(segment);
 +	}
- #ifdef HAVE_ZLIB_H
 +	free(zip->buf);
- #endif
 +	archive_entry_free(zip->entry);
++	if (zip->cctx_valid)
++		archive_encrypto_aes_ctr_release(&zip->cctx);
++	if (zip->hctx_valid)
++		archive_hmac_sha1_cleanup(&zip->hctx);
 +	/* TODO: Free opt_sconv, sconv_default */
 +
 +	free(zip);
 +	a->format_data = NULL;
 +	return (ARCHIVE_OK);
 +}
 +
 +/* Convert into MSDOS-style date/time. */
 +static unsigned int
 +dos_time(const time_t unix_time)
 +{
 +	struct tm *t;
 +	unsigned int dt;
 +
 +	/* This will not preserve time when creating/extracting the archive
 +	 * on two systems with different time zones. */
 +	t = localtime(&unix_time);
 +
 +	/* MSDOS-style date/time is only between 1980-01-01 and 2107-12-31 */
 +	if (t->tm_year < 1980 - 1900)
 +		/* Set minimum date/time '1980-01-01 00:00:00'. */
 +		dt = 0x00210000U;
 +	else if (t->tm_year > 2107 - 1900)
 +		/* Set maximum date/time '2107-12-31 23:59:58'. */
 +		dt = 0xff9fbf7dU;
 +	else {
 +		dt = 0;
 +		dt += ((t->tm_year - 80) & 0x7f) << 9;
 +		dt += ((t->tm_mon + 1) & 0x0f) << 5;
 +		dt += (t->tm_mday & 0x1f);
 +		dt <<= 16;
 +		dt += (t->tm_hour & 0x1f) << 11;
 +		dt += (t->tm_min & 0x3f) << 5;
 +		dt += (t->tm_sec & 0x3e) >> 1; /* Only counting every 2 seconds. */
 +	}
 +	return dt;
 +}
 +
 +static size_t
 +path_length(struct archive_entry *entry)
 +{
 +	mode_t type;
 +	const char *path;
 +
 +	type = archive_entry_filetype(entry);
 +	path = archive_entry_pathname(entry);
 +
 +	if (path == NULL)
 +		return (0);
 +	if (type == AE_IFDIR &&
 +	    (path[0] == '\0' || path[strlen(path) - 1] != '/')) {
 +		return strlen(path) + 1;
 +	} else {
 +		return strlen(path);
 +	}
 +}
 +
 +static int
 +write_path(struct archive_entry *entry, struct archive_write *archive)
 +{
 +	int ret;
 +	const char *path;
 +	mode_t type;
 +	size_t written_bytes;
 +
 +	path = archive_entry_pathname(entry);
 +	type = archive_entry_filetype(entry);
 +	written_bytes = 0;
 +
 +	ret = __archive_write_output(archive, path, strlen(path));
 +	if (ret != ARCHIVE_OK)
 +		return (ARCHIVE_FATAL);
 +	written_bytes += strlen(path);
 +
 +	/* Folders are recognized by a trailing slash. */
 +	if ((type == AE_IFDIR) & (path[strlen(path) - 1] != '/')) {
 +		ret = __archive_write_output(archive, "/", 1);
 +		if (ret != ARCHIVE_OK)
 +			return (ARCHIVE_FATAL);
 +		written_bytes += 1;
 +	}
 +
 +	return ((int)written_bytes);
 +}
 +
 +static void
 +copy_path(struct archive_entry *entry, unsigned char *p)
 +{
 +	const char *path;
 +	size_t pathlen;
 +	mode_t type;
 +
 +	path = archive_entry_pathname(entry);
 +	pathlen = strlen(path);
 +	type = archive_entry_filetype(entry);
 +
 +	memcpy(p, path, pathlen);
 +
 +	/* Folders are recognized by a trailing slash. */
 +	if ((type == AE_IFDIR) & (path[pathlen - 1] != '/')) {
 +		p[pathlen] = '/';
 +		p[pathlen + 1] = '\0';
 +	}
 +}
 +
 +
 +static struct archive_string_conv *
 +get_sconv(struct archive_write *a, struct zip *zip)
 +{
 +	if (zip->opt_sconv != NULL)
 +		return (zip->opt_sconv);
 +
 +	if (!zip->init_default_conversion) {
 +		zip->sconv_default =
 +		    archive_string_default_conversion_for_write(&(a->archive));
 +		zip->init_default_conversion = 1;
 +	}
 +	return (zip->sconv_default);
 +}
++
++/*
++  Traditional PKWARE Decryption functions.
++ */
++
++static void
++trad_enc_update_keys(struct trad_enc_ctx *ctx, uint8_t c)
++{
++	uint8_t t;
++#define CRC32(c, b) (crc32(c ^ 0xffffffffUL, &b, 1) ^ 0xffffffffUL)
++
++	ctx->keys[0] = CRC32(ctx->keys[0], c);
++	ctx->keys[1] = (ctx->keys[1] + (ctx->keys[0] & 0xff)) * 134775813L + 1;
++	t = (ctx->keys[1] >> 24) & 0xff;
++	ctx->keys[2] = CRC32(ctx->keys[2], t);
++#undef CRC32
++}
++
++static uint8_t
++trad_enc_decypt_byte(struct trad_enc_ctx *ctx)
++{
++	unsigned temp = ctx->keys[2] | 2;
++	return (uint8_t)((temp * (temp ^ 1)) >> 8) & 0xff;
++}
++
++static unsigned
++trad_enc_encrypt_update(struct trad_enc_ctx *ctx, const uint8_t *in,
++    size_t in_len, uint8_t *out, size_t out_len)
++{
++	unsigned i, max;
++
++	max = (unsigned)((in_len < out_len)? in_len: out_len);
++
++	for (i = 0; i < max; i++) {
++		uint8_t t = in[i];
++		out[i] = t ^ trad_enc_decypt_byte(ctx);
++		trad_enc_update_keys(ctx, t);
++	}
++	return i;
++}
++
++static int
++trad_enc_init(struct trad_enc_ctx *ctx, const char *pw, size_t pw_len)
++{
++
++	ctx->keys[0] = 305419896L;
++	ctx->keys[1] = 591751049L;
++	ctx->keys[2] = 878082192L;
++
++	for (;pw_len; --pw_len)
++		trad_enc_update_keys(ctx, *pw++);
++	return 0;
++}
++
++static int
++is_traditional_pkware_encryption_supported(void)
++{
++	uint8_t key[TRAD_HEADER_SIZE];
++
++	if (archive_random(key, sizeof(key)-1) != ARCHIVE_OK)
++		return (0);
++	return (1);
++}
++
++static int
++init_traditional_pkware_encryption(struct archive_write *a)
++{
++	struct zip *zip = a->format_data;
++	const char *passphrase;
++	uint8_t key[TRAD_HEADER_SIZE];
++	uint8_t key_encrypted[TRAD_HEADER_SIZE];
++	int ret;
++
++	passphrase = __archive_write_get_passphrase(a);
++	if (passphrase == NULL) {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++		    "Encryption needs passphrase");
++		return ARCHIVE_FAILED;
++	}
++	if (archive_random(key, sizeof(key)-1) != ARCHIVE_OK) {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++		    "Can't generate random number for encryption");
++		return ARCHIVE_FATAL;
++	}
++	trad_enc_init(&zip->tctx, passphrase, strlen(passphrase));
++	/* Set the last key code which will be used as a check code
++	 * for verifying passphrase in decryption. */
++	key[TRAD_HEADER_SIZE-1] = zip->trad_chkdat;
++	trad_enc_encrypt_update(&zip->tctx, key, TRAD_HEADER_SIZE,
++	    key_encrypted, TRAD_HEADER_SIZE);
++	/* Write encrypted keys in the top of the file content. */
++	ret = __archive_write_output(a, key_encrypted, TRAD_HEADER_SIZE);
++	if (ret != ARCHIVE_OK)
++		return (ret);
++	zip->written_bytes += TRAD_HEADER_SIZE;
++	zip->entry_compressed_written += TRAD_HEADER_SIZE;
++	return (ret);
++}
++
++static int
++init_winzip_aes_encryption(struct archive_write *a)
++{
++	struct zip *zip = a->format_data;
++	const char *passphrase;
++	size_t key_len, salt_len;
++	uint8_t salt[16 + 2];
++	uint8_t derived_key[MAX_DERIVED_KEY_BUF_SIZE];
++	int ret;
++
++	passphrase = __archive_write_get_passphrase(a);
++	if (passphrase == NULL) {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++		    "Encryption needs passphrase");
++		return (ARCHIVE_FAILED);
++	}
++	if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128) {
++		salt_len = 8;
++		key_len = 16;
++	} else {
++		/* AES 256 */
++		salt_len = 16;
++		key_len = 32;
++	}
++	if (archive_random(salt, salt_len) != ARCHIVE_OK) {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++		    "Can't generate random number for encryption");
++		return (ARCHIVE_FATAL);
++	}
++	archive_pbkdf2_sha1(passphrase, strlen(passphrase),
++	    salt, salt_len, 1000, derived_key, key_len * 2 + 2);
++
++	ret = archive_encrypto_aes_ctr_init(&zip->cctx, derived_key, key_len);
++	if (ret != 0) {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++		    "Decryption is unsupported due to lack of crypto library");
++		return (ARCHIVE_FAILED);
++	}
++	ret = archive_hmac_sha1_init(&zip->hctx, derived_key + key_len,
++	    key_len);
++	if (ret != 0) {
++		archive_encrypto_aes_ctr_release(&zip->cctx);
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++		    "Failed to initialize HMAC-SHA1");
++		return (ARCHIVE_FAILED);
++        }
++
++	/* Set a passowrd verification value after the 'salt'. */
++	salt[salt_len] = derived_key[key_len * 2];
++	salt[salt_len + 1] = derived_key[key_len * 2 + 1];
++
++	/* Write encrypted keys in the top of the file content. */
++	ret = __archive_write_output(a, salt, salt_len + 2);
++	if (ret != ARCHIVE_OK)
++		return (ret);
++	zip->written_bytes += salt_len + 2;
++	zip->entry_compressed_written += salt_len + 2;
++
++	return (ARCHIVE_OK);
++}
++
++static int
++is_winzip_aes_encryption_supported(int encryption)
++{
++	size_t key_len, salt_len;
++	uint8_t salt[16 + 2];
++	uint8_t derived_key[MAX_DERIVED_KEY_BUF_SIZE];
++	archive_crypto_ctx cctx;
++	archive_hmac_sha1_ctx hctx;
++	int ret;
++
++	if (encryption == ENCRYPTION_WINZIP_AES128) {
++		salt_len = 8;
++		key_len = 16;
++	} else {
++		/* AES 256 */
++		salt_len = 16;
++		key_len = 32;
++	}
++	if (archive_random(salt, salt_len) != ARCHIVE_OK)
++		return (0);
++	ret = archive_pbkdf2_sha1("p", 1, salt, salt_len, 1000,
++	    derived_key, key_len * 2 + 2);
++	if (ret != 0)
++		return (0);
++
++	ret = archive_encrypto_aes_ctr_init(&cctx, derived_key, key_len);
++	if (ret != 0)
++		return (0);
++	ret = archive_hmac_sha1_init(&hctx, derived_key + key_len,
++	    key_len);
++	archive_encrypto_aes_ctr_release(&cctx);
++	if (ret != 0)
++		return (0);
++	archive_hmac_sha1_cleanup(&hctx);
++	return (1);
++}
diff --cc Utilities/cmlibarchive/libarchive/archive_write_set_options.3
index f8fb039,0000000..a2f4b57
mode 100644,000000..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_options.3
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_options.3
@@@ -1,437 -1,0 +1,479 @@@
 +.\" Copyright (c) 2003-2010 Tim Kientzle
 +.\" All rights reserved.
 +.\"
 +.\" Redistribution and use in source and binary forms, with or without
 +.\" modification, are permitted provided that the following conditions
 +.\" are met:
 +.\" 1. Redistributions of source code must retain the above copyright
 +.\"    notice, this list of conditions and the following disclaimer.
 +.\" 2. Redistributions in binary form must reproduce the above copyright
 +.\"    notice, this list of conditions and the following disclaimer in the
 +.\"    documentation and/or other materials provided with the distribution.
 +.\"
 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 +.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 +.\" SUCH DAMAGE.
 +.\"
 +.\" $FreeBSD$
 +.\"
 +.Dd February 2, 2012
 +.Dt ARCHIVE_WRITE_OPTIONS 3
 +.Os
 +.Sh NAME
 +.Nm archive_write_set_filter_option ,
 +.Nm archive_write_set_format_option ,
 +.Nm archive_write_set_option ,
 +.Nm archive_write_set_options
 +.Nd functions controlling options for reading archives
 +.Sh LIBRARY
 +Streaming Archive Library (libarchive, -larchive)
 +.Sh SYNOPSIS
 +.Ft int
 +.Fo archive_write_set_filter_option
 +.Fa "struct archive *"
 +.Fa "const char *module"
 +.Fa "const char *option"
 +.Fa "const char *value"
 +.Fc
 +.Ft int
 +.Fo archive_write_set_format_option
 +.Fa "struct archive *"
 +.Fa "const char *module"
 +.Fa "const char *option"
 +.Fa "const char *value"
 +.Fc
 +.Ft int
 +.Fo archive_write_set_option
 +.Fa "struct archive *"
 +.Fa "const char *module"
 +.Fa "const char *option"
 +.Fa "const char *value"
 +.Fc
 +.Ft int
 +.Fo archive_write_set_options
 +.Fa "struct archive *"
 +.Fa "const char *options"
 +.Fc
 +.Sh DESCRIPTION
 +These functions provide a way for libarchive clients to configure
 +specific write modules.
 +.Bl -tag -width indent
 +.It Xo
 +.Fn archive_write_set_filter_option ,
 +.Fn archive_write_set_format_option
 +.Xc
 +Specifies an option that will be passed to currently-registered
 +filters (including decompression filters) or format readers.
 +.Pp
 +If
 +.Ar option
 +and
 +.Ar value
 +are both
 +.Dv NULL ,
 +these functions will do nothing and
 +.Cm ARCHIVE_OK
 +will be returned.
 +If
 +.Ar option
 +is
 +.Dv NULL
 +but
 +.Ar value
 +is not, these functions will do nothing and
 +.Cm ARCHIVE_FAILED
 +will be returned.
 +.Pp
 +If
 +.Ar module
 +is not
 +.Dv NULL ,
 +.Ar option
 +and
 +.Ar value
 +will be provided to the filter or reader named
 +.Ar module .
 +The return value will be that of the module.
 +If there is no such module,
 +.Cm ARCHIVE_FAILED
 +will be returned.
 +.Pp
 +If
 +.Ar module
 +is
 +.Dv NULL ,
 +.Ar option
 +and
 +.Ar value
 +will be provided to every registered module.
 +If any module returns
 +.Cm ARCHIVE_FATAL ,
 +this value will be returned immediately.
 +Otherwise,
 +.Cm ARCHIVE_OK
 +will be returned if any module accepts the option, and
 +.Cm ARCHIVE_FAILED
 +in all other cases.
 +.\"
 +.It Xo
 +.Fn archive_write_set_option
 +.Xc
 +Calls
 +.Fn archive_write_set_format_option ,
 +then
 +.Fn archive_write_set_filter_option .
 +If either function returns
 +.Cm ARCHIVE_FATAL ,
 +.Cm ARCHIVE_FATAL
 +will be returned
 +immediately.
 +Otherwise, greater of the two values will be returned.
 +.\"
 +.It Xo
 +.Fn archive_write_set_options
 +.Xc
 +.Ar options
 +is a comma-separated list of options.
 +If
 +.Ar options
 +is
 +.Dv NULL
 +or empty,
 +.Cm ARCHIVE_OK
 +will be returned immediately.
 +.Pp
 +Individual options have one of the following forms:
 +.Bl -tag -compact -width indent
 +.It Ar option=value
 +The option/value pair will be provided to every module.
 +Modules that do not accept an option with this name will ignore it.
 +.It Ar option
 +The option will be provided to every module with a value of
 +.Dq 1 .
 +.It Ar !option
 +The option will be provided to every module with a NULL value.
 +.It Ar module:option=value , Ar module:option , Ar module:!option
 +As above, but the corresponding option and value will be provided
 +only to modules whose name matches
 +.Ar module .
 +.El
 +.El
 +.\"
 +.Sh OPTIONS
 +.Bl -tag -compact -width indent
 +.It Filter gzip
 +.Bl -tag -compact -width indent
 +.It Cm compression-level
 +The value is interpreted as a decimal integer specifying the
 +gzip compression level.
 +.El
 +.It Filter xz
 +.Bl -tag -compact -width indent
 +.It Cm compression-level
 +The value is interpreted as a decimal integer specifying the
 +compression level.
 +.El
 +.It Format mtree
 +.Bl -tag -compact -width indent
 +.It Cm cksum , Cm device , Cm flags , Cm gid , Cm gname , Cm indent , Cm link , Cm md5 , Cm mode , Cm nlink , Cm rmd160 , Cm sha1 , Cm sha256 , Cm sha384 , Cm sha512 , Cm size , Cm time , Cm uid , Cm uname
 +Enable a particular keyword in the mtree output.
 +Prefix with an exclamation mark to disable the corresponding keyword.
 +The default is equivalent to
 +.Dq device, flags, gid, gname, link, mode, nlink, size, time, type, uid, uname .
 +.It Cm all
 +Enables all of the above keywords.
 +.It Cm use-set
 +Enables generation of
 +.Cm /set
 +lines that specify default values for the following files and/or directories.
 +.It Cm indent
 +XXX needs explanation XXX
 +.El
 +.It Format iso9660 - volume metadata
 +These options are used to set standard ISO9660 metadata.
 +.Bl -tag -compact -width indent
 +.It Cm abstract-file Ns = Ns Ar filename
 +The file with the specified name will be identified in the ISO9660 metadata
 +as holding the abstract for this volume.  Default: none.
 +.It Cm application-id Ns = Ns Ar filename
 +The file with the specified name will be identified in the ISO9660 metadata
 +as holding the application identifier for this volume.  Default: none.
 +.It Cm biblio-file Ns = Ns Ar filename
 +The file with the specified name will be identified in the ISO9660 metadata
 +as holding the bibliography for this volume.  Default: none.
 +.It Cm copyright-file Ns = Ns Ar filename
 +The file with the specified name will be identified in the ISO9660 metadata
 +as holding the copyright for this volume.  Default: none.
 +.It Cm publisher Ns = Ns Ar filename
 +The file with the specified name will be identified in the ISO9660 metadata
 +as holding the publisher information for this volume.  Default: none.
 +.It Cm volume-id Ns = Ns Ar string
 +The specified string will be used as the Volume Identifier in the ISO9660 metadata.
 +It is limited to 32 bytes. Default: none.
 +.El
 +.It Format iso9660 - boot support
 +These options are used to make an ISO9660 image that can be directly
 +booted on various systems.
 +.Bl -tag -compact -width indent
 +.It Cm boot Ns = Ns Ar filename
 +The file matching this name will be used as the El Torito boot image file.
 +.It Cm boot-catalog Ns = Ns Ar name
 +The name that will be used for the El Torito boot catalog.
 +Default:
 +.Ar boot.catalog
 +.It Cm boot-info-table
 +The boot image file provided by the
 +.Cm boot Ns = Ns Ar filename
 +option will be edited with appropriate boot information in bytes 8 through 64.
 +Default: disabled
 +.It Cm boot-load-seg Ns = Ns Ar hexadecimal-number
 +The load segment for a no-emulation boot image.
 +.It Cm boot-load-size Ns = Ns Ar decimal-number
 +The number of "virtual" 512-byte sectors to be loaded from a no-emulation boot image.
 +Some very old BIOSes can only load very small images, setting this
 +value to 4 will often allow such BIOSes to load the first part of
 +the boot image (which will then need to be intelligent enough to
 +load the rest of itself).
 +This should not be needed unless you are trying to support systems with very old BIOSes.
 +This defaults to the full size of the image.
 +.It Cm boot-type Ns = Ns Ar value
 +Specifies the boot semantics used by the El Torito boot image:
 +If the
 +.Ar value
 +is
 +.Cm fd ,
 +then the boot image is assumed to be a bootable floppy image.
 +If the
 +.Ar value
 +is
 +.Cm hd ,
 +then the boot image is assumed to be a bootable hard disk image.
 +If the
 +.Ar value
 +is
 +.Cm no-emulation ,
 +the boot image is used without floppy or hard disk emulation.
 +If the boot image is exactly 1.2MB, 1.44MB, or 2.88MB, then
 +the default is
 +.Cm fd ,
 +otherwise the default is
 +.Cm no-emulation.
 +.El
 +.It Format iso9660 - filename and size extensions
 +Various extensions to the base ISO9660 format.
 +.Bl -tag -compact -width indent
 +.It Cm allow-ldots
 +If enabled, allows filenames to begin with a leading period.
 +If disabled, filenames that begin with a leading period will have
 +that period replaced by an underscore character in the standard ISO9660
 +namespace.
 +This does not impact names stored in the Rockridge or Joliet extension area.
 +Default: disabled.
 +.It Cm allow-lowercase
 +If enabled, allows filenames to contain lowercase characters.
 +If disabled, filenames will be forced to uppercase.
 +This does not impact names stored in the Rockridge or Joliet extension area.
 +Default: disabled.
 +.It Cm allow-multidot
 +If enabled, allows filenames to contain multiple period characters, in violation of the ISO9660 specification.
 +If disabled, additional periods will be converted to underscore characters.
 +This does not impact names stored in the Rockridge or Joliet extension area.
 +Default: disabled.
 +.It Cm allow-period
 +If enabled, allows filenames to contain trailing period characters, in violation of the ISO9660 specification.
 +If disabled,trailing periods will be converted to underscore characters.
 +This does not impact names stored in the Rockridge or Joliet extension area.
 +Default: disabled.
 +.It Cm allow-pvd-lowercase
 +If enabled, the Primary Volume Descriptor may contain lowercase ASCII characters, in violation of the ISO9660 specification.
 +If disabled, characters will be converted to uppercase ASCII.
 +Default: disabled.
 +.It Cm allow-sharp-tilde
 +If enabled, sharp and tilde characters will be permitted in filenames, in violation if the ISO9660 specification.
 +If disabled, such characters will be converted to underscore characters.
 +Default: disabled.
 +.It Cm allow-vernum
 +If enabled, version numbers will be included with files.
 +If disabled, version numbers will be suppressed, in violation of the ISO9660 standard.
 +This does not impact names stored in the Rockridge or Joliet extension area.
 +Default: enabled.
 +.It Cm iso-level
 +This enables support for file size and file name extensions in the
 +core ISO9660 area.
 +The name extensions specified here do not affect the names stored in the Rockridge or Joliet extension areas.
 +.Bl -tag -compact -width indent
 +.It Cm iso-level=1
 +The most compliant form of ISO9660 image.
 +Filenames are limited to 8.3 uppercase format,
 +directory names are limited to 8 uppercase characters,
 +files are limited to 4 GiB,
 +the complete ISO9660 image cannot exceed 4 GiB.
 +.It Cm iso-level=2
 +Filenames are limited to 30 uppercase characters with a 30-character extension,
 +directory names are limited to 30 characters,
 +files are limited to 4 GiB.
 +.It Cm iso-level=3
 +As with
 +.Cm iso-level=2 ,
 +except that files may exceed 4 GiB.
 +.It Cm iso-level=4
 +As with
 +.Cm iso-level=3 ,
 +except that filenames may be up to 193 characters
 +and may include arbitrary 8-bit characters.
 +.El
 +.It Cm joliet
 +Microsoft's Joliet extensions store a completely separate set of directory information about each file.
 +In particular, this information includes Unicode filenames of up to 255 characters.
 +Default: enabled.
 +.It Cm limit-depth
 +If enabled, libarchive will use directory relocation records to ensure that
 +no pathname exceeds the ISO9660 limit of 8 directory levels.
 +If disabled, no relocation will occur.
 +Default: enabled.
 +.It Cm limit-dirs
 +If enabled, libarchive will cause an error if there are more than
 +65536 directories.
 +If disabled, there is no limit on the number of directories.
 +Default: enabled
 +.It Cm pad
 +If enabled, 300 kiB of zero bytes will be appended to the end of the archive.
 +Default: enabled
 +.It Cm relaxed-filenames
 +If enabled, all 7-bit ASCII characters are permitted in filenames
 +(except lowercase characters unless
 +.Cm allow-lowercase
 +is also specified).
 +This violates ISO9660 standards.
 +This does not impact names stored in the Rockridge or Joliet extension area.
 +Default: disabled.
 +.It Cm rockridge
 +The Rockridge extensions store an additional set of POSIX-style file
 +information with each file, including mtime, atime, ctime, permissions,
 +and long filenames with arbitrary 8-bit characters.
 +These extensions also support symbolic links and other POSIX file types.
 +Default: enabled.
 +.El
 +.It Format iso9660 - zisofs support
 +The zisofs extensions permit each file to be independently compressed
 +using a gzip-compatible compression.
 +This can provide significant size savings, but requires the reading
 +system to have support for these extensions.
 +These extensions are disabled by default.
 +.Bl -tag -compact -width indent
 +.It Cm compression-level Ns = Ns number
 +The compression level used by the deflate compressor.
 +Ranges from 0 (least effort) to 9 (most effort).
 +Default: 6
 +.It Cm zisofs
 +Synonym for
 +.Cm zisofs=direct .
 +.It Cm zisofs=direct
 +Compress each file in the archive.
 +Unlike
 +.Cm zisofs=indirect ,
 +this is handled entirely within libarchive and does not require a
 +separate utility.
 +For best results, libarchive tests each file and will store
 +the file uncompressed if the compression does not actually save any space.
 +In particular, files under 2k will never be compressed.
 +Note that boot image files are never compressed.
 +.It Cm zisofs=indirect
 +Recognizes files that have already been compressed with the
 +.Cm mkzftree
 +utility and sets up the necessary file metadata so that
 +readers will correctly identify these as zisofs-compressed files.
 +.It Cm zisofs-exclude Ns = Ns Ar filename
 +Specifies a filename that should not be compressed when using
 +.Cm zisofs=direct .
 +This option can be provided multiple times to suppress compression
 +on many files.
 +.El
++.It Format zip
++.Bl -tag -compact -width indent
++.It Cm compression
++The value is either
++.Dq store
++or
++.Dq deflate
++to indicate how the following entries should be compressed.
++Note that this setting is ignored for directories, symbolic links,
++and other special entries.
++.It Cm experimental
++This boolean option enables or disables experimental Zip features
++that may not be compatible with other Zip implementations.
++.It Cm fakecrc32
++This boolean option disables CRC calculations.
++All CRC fields are set to zero.
++It should not be used except for testing purposes.
++.It Cm hdrcharset
++This sets the character set used for filenames.
++.It Cm zip64
++Zip64 extensions provide additional file size information
++for entries larger than 4 GiB.
++They also provide extended file offset and archive size information
++when archives exceed 4 GiB.
++By default, the Zip writer selectively enables these extensions only as needed.
++In particular, if the file size is unknown, the Zip writer will
++include Zip64 extensions to guard against the possibility that the
++file might be larger than 4 GiB.
++.Pp
++Setting this boolean option will force the writer to use Zip64 extensions
++even for small files that would not otherwise require them.
++This is primarily useful for testing.
++.Pp
++Disabling this option with
++.Cm !zip64
++will force the Zip writer to avoid Zip64 extensions:
++It will reject files with size greater than 4 GiB,
++it will reject any new entries once the total archive size reaches 4 GiB,
++and it will not use Zip64 extensions for files with unknown size.
++In particular, this can improve compatibility when generating archives
++where the entry sizes are not known in advance.
++.El
 +.El
 +.Sh EXAMPLES
 +The following example creates an archive write handle to
 +create a gzip-compressed ISO9660 format image.
 +The two options here specify that the ISO9660 archive will use
 +.Ar kernel.img
 +as the boot image for El Torito booting, and that the gzip
 +compressor should use the maximum compression level.
 +.Bd -literal -offset indent
 +a = archive_write_new();
 +archive_write_add_filter_gzip(a);
 +archive_write_set_format_iso9660(a);
 +archive_write_set_options(a, "boot=kernel.img,compression=9");
 +archive_write_open_filename(a, filename, blocksize);
 +.Ed
 +.\"
 +.Sh ERRORS
 +Detailed error codes and textual descriptions are available from the
 +.Fn archive_errno
 +and
 +.Fn archive_error_string
 +functions.
 +.\"
 +.Sh SEE ALSO
 +.Xr tar 1 ,
 +.Xr libarchive 3 ,
 +.Xr archive_read_set_options 3 ,
 +.Xr archive_write 3
 +.Sh HISTORY
 +The
 +.Nm libarchive
 +library first appeared in
 +.Fx 5.3 .
 +.Sh AUTHORS
 +.An -nosplit
 +The options support for libarchive was originally implemented by
 +.An Michihiro NAKAJIMA .
 +.Sh BUGS
diff --cc Utilities/cmlibarchive/libarchive/archive_write_set_passphrase.c
index 0000000,710ecba..710ecba
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_passphrase.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_passphrase.c
diff --cc Utilities/cmlibarchive/libarchive/xxhash.c
index 0000000,f7647a5..f7647a5
mode 000000,100644..100644
--- a/Utilities/cmlibarchive/libarchive/xxhash.c
+++ b/Utilities/cmlibarchive/libarchive/xxhash.c

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a8c7bc2c649781d1163c1966245a45e0fb829ba
commit 1a8c7bc2c649781d1163c1966245a45e0fb829ba
Author:     LibArchive Upstream <libarchive-discuss at googlegroups.com>
AuthorDate: Wed Oct 21 01:47:34 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 09:37:00 2015 -0400

    libarchive 3.1.2-601-g3bfe5f1 (reduced)
    
    Extract upstream libarchive using the following shell code.
    
    url=git://github.com/libarchive/libarchive.git &&
    v=3.1.2-601-g3bfe5f1 &&
    r=3bfe5f1 &&
    paths="
      CMakeLists.txt
      COPYING
      CTestConfig.cmake
      build/cmake
      build/pkgconfig
      build/utils
      build/version
      libarchive/*.*
    " &&
    mkdir libarchive-$v-g$r-reduced &&
    git clone $url libarchive-git &&
    date=$(cd libarchive-git && git log -n 1 --format='%cd' $r) &&
    (cd libarchive-git && git archive --format=tar $r -- $paths) |
    (cd libarchive-$v-g$r-reduced && tar xv) &&
    fromdos libarchive-$v-g$r-reduced/build/cmake/Find*.cmake &&
    echo "g$r date: $date"

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bfb7f3..5d9e6ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
 #
 PROJECT(libarchive C)
 #
@@ -35,6 +35,9 @@ ENDIF(NOT "${CMAKE_BUILD_TYPE}"
 # On MacOS, prefer MacPorts libraries to system libraries.
 # I haven't come up with a compelling argument for this to be conditional.
 list(APPEND CMAKE_PREFIX_PATH /opt/local)
+# Enable @rpath in the install name.
+# detail in "cmake  --help-policy CMP0042"
+SET(CMAKE_MACOSX_RPATH ON)
 
 #
 # Version - read from 'version' file.
@@ -85,7 +88,7 @@ SET(CMAKE_REQUIRED_FLAGS)
 # Especially for early development, we want to be a little
 # aggressive about diagnosing build problems; this can get
 # relaxed somewhat in final shipping versions.
-IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
   SET(CMAKE_REQUIRED_FLAGS "-Wall -Wformat -Wformat-security")
   #################################################################
   # Set compile flags for all build types.
@@ -93,12 +96,14 @@ IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
   #################################################################
   # Set compile flags for debug build.
   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -Wextra -Wunused")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wmissing-prototypes")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wcast-qual")
-ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
-IF ("CMAKE_C_COMPILER_ID" MATCHES "^Clang$")
+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
+IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
   SET(CMAKE_REQUIRED_FLAGS "-Wall -Wformat -Wformat-security")
   #################################################################
   # Set compile flags for all build types.
@@ -107,11 +112,13 @@ IF ("CMAKE_C_COMPILER_ID" MATCHES "^Clang$")
   # Set compile flags for debug build.
   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -Wextra -Wunused")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wmissing-prototypes")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wcast-qual")
-ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^Clang$")
+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
 IF (MSVC)
   #################################################################
   # Set compile flags for debug build.
@@ -161,9 +168,12 @@ OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
 OPTION(ENABLE_LZMA "Enable the use of the system found LZMA library if found" ON)
 OPTION(ENABLE_ZLIB "Enable the use of the system found ZLIB library if found" ON)
 OPTION(ENABLE_BZip2 "Enable the use of the system found BZip2 library if found" ON)
+OPTION(ENABLE_LIBXML2 "Enable the use of the system found libxml2 library if found" ON)
 OPTION(ENABLE_EXPAT "Enable the use of the system found EXPAT library if found" ON)
 OPTION(ENABLE_PCREPOSIX "Enable the use of the system found PCREPOSIX library if found" ON)
 OPTION(ENABLE_LibGCC "Enable the use of the system found LibGCC library if found" ON)
+# CNG is used for encrypt/decrypt Zip archives on Windows.
+OPTION(ENABLE_CNG "Enable the use of CNG(Crypto Next Generation)" ON)
 
 OPTION(ENABLE_TAR "Enable tar building" ON)
 OPTION(ENABLE_TAR_SHARED "Enable dynamic build of tar" FALSE)
@@ -176,6 +186,7 @@ OPTION(ENABLE_ACL "Enable ACL support" ON)
 OPTION(ENABLE_ICONV "Enable iconv support" ON)
 OPTION(ENABLE_TEST "Enable unit and regression tests" ON)
 OPTION(ENABLE_COVERAGE "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)" FALSE)
+OPTION(ENABLE_INSTALL "Enable installing of libraries" ON)
 
 SET(POSIX_REGEX_LIB "AUTO" CACHE STRING "Choose what library should provide POSIX regular expression support")
 SET(ENABLE_SAFESEH "AUTO" CACHE STRING "Enable use of /SAFESEH linker flag (MSVC only)")
@@ -466,6 +477,33 @@ IF(LZO2_FOUND)
 ENDIF(LZO2_FOUND)
 MARK_AS_ADVANCED(CLEAR LZO2_INCLUDE_DIR)
 MARK_AS_ADVANCED(CLEAR LZO2_LIBRARY)
+#
+# Find LZ4
+#
+IF (LZ4_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(LZ4_FIND_QUIETLY TRUE)
+ENDIF (LZ4_INCLUDE_DIR)
+
+FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
+FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
+IF(LZ4_FOUND)
+  SET(HAVE_LIBLZ4 1)
+  SET(HAVE_LZ4_H 1)
+  CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
+  SET(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIR})
+  CHECK_INCLUDE_FILES("lz4hc.h" HAVE_LZ4HC_H)
+  CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
+  INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR})
+  LIST(APPEND ADDITIONAL_LIBS ${LZ4_LIBRARY})
+  #
+  # TODO: test for static library.
+  #
+ENDIF(LZ4_FOUND)
+MARK_AS_ADVANCED(CLEAR LZ4_INCLUDE_DIR)
+MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY)
 
 #
 # Check headers
@@ -511,7 +549,9 @@ LA_CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
 LA_CHECK_INCLUDE_FILE("paths.h" HAVE_PATHS_H)
 LA_CHECK_INCLUDE_FILE("poll.h" HAVE_POLL_H)
 LA_CHECK_INCLUDE_FILE("process.h" HAVE_PROCESS_H)
+LA_CHECK_INCLUDE_FILE("pthread.h" HAVE_PTHREAD_H)
 LA_CHECK_INCLUDE_FILE("pwd.h" HAVE_PWD_H)
+LA_CHECK_INCLUDE_FILE("readpassphrase.h" HAVE_READPASSPHRASE_H)
 LA_CHECK_INCLUDE_FILE("regex.h" HAVE_REGEX_H)
 LA_CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
 LA_CHECK_INCLUDE_FILE("spawn.h" HAVE_SPAWN_H)
@@ -542,6 +582,11 @@ LA_CHECK_INCLUDE_FILE("utime.h" HAVE_UTIME_H)
 LA_CHECK_INCLUDE_FILE("wchar.h" HAVE_WCHAR_H)
 LA_CHECK_INCLUDE_FILE("wctype.h" HAVE_WCTYPE_H)
 LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
+IF(ENABLE_CNG)
+  LA_CHECK_INCLUDE_FILE("Bcrypt.h" HAVE_BCRYPT_H)
+ELSE(ENABLE_CNG)
+  UNSET(HAVE_BCRYPT_H CACHE)
+ENDIF(ENABLE_CNG)
 # Following files need windwos.h, so we should test it after windows.h test.
 LA_CHECK_INCLUDE_FILE("wincrypt.h" HAVE_WINCRYPT_H)
 LA_CHECK_INCLUDE_FILE("winioctl.h" HAVE_WINIOCTL_H)
@@ -573,6 +618,7 @@ IF(ENABLE_NETTLE)
     SET(HAVE_NETTLE_SHA_H 1)
     INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR})
     LIST(APPEND ADDITIONAL_LIBS ${NETTLE_LIBRARIES})
+    LA_CHECK_INCLUDE_FILE("nettle/pbkdf2.h" HAVE_NETTLE_PBKDF2_H)
   ENDIF(NETTLE_FOUND)
   MARK_AS_ADVANCED(CLEAR NETTLE_INCLUDE_DIR)
   MARK_AS_ADVANCED(CLEAR NETTLE_LIBRARIES)
@@ -584,6 +630,9 @@ ENDIF(ENABLE_NETTLE)
 #
 IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
   FIND_PACKAGE(OpenSSL)
+  IF(OPENSSL_FOUND)
+    SET(HAVE_LIBCRYPTO 1)
+  ENDIF(OPENSSL_FOUND)
 ELSE()
   SET(OPENSSL_FOUND FALSE) # Override cached value
 ENDIF()
@@ -602,7 +651,7 @@ ENDIF(NOT OPENSSL_FOUND)
 
 #
 # How to prove that CRYPTO functions, which have several names on various
-# platforms, just see if archive_crypto.c can compile and link against
+# platforms, just see if archive_digest.c can compile and link against
 # required libraries.
 #
 MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
@@ -641,7 +690,7 @@ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
       ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h)
 	FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h"
 	     CONFDEFS_H)
-	FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_crypto.c"
+	FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_digest.c"
 	     ARCHIVE_CRYPTO_C)
 
 	SET(SOURCE "${CONFDEFS_H}
@@ -791,14 +840,16 @@ ENDMACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
 MACRO(CHECK_ICONV LIB TRY_ICONV_CONST)
   IF(NOT HAVE_ICONV)
     CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
-    IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+    IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+        CMAKE_C_COMPILER_ID MATCHES "^Clang$")
       #
       # During checking iconv proto type, we should use -Werror to avoid the
       # success of iconv detection with a warnig which success is a miss
       # detection. So this needs for all build mode(even it's a release mode).
       #
       SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
-    ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+    ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+           CMAKE_C_COMPILER_ID MATCHES "^Clang$")
     IF (MSVC)
       # NOTE: /WX option is the same as gcc's -Werror option.
       SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} /WX")
@@ -919,8 +970,12 @@ ENDIF(ENABLE_ICONV)
 
 #
 # Find Libxml2
-FIND_PACKAGE(LibXml2)
 #
+IF(ENABLE_LIBXML2)
+  FIND_PACKAGE(LibXml2)
+ELSE()
+  SET(LIBXML2_FOUND FALSE)
+ENDIF()
 IF(LIBXML2_FOUND)
   CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
   INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
@@ -945,7 +1000,11 @@ ELSE(LIBXML2_FOUND)
   #
   # Find Expat
   #
-  FIND_PACKAGE(EXPAT)
+  IF(ENABLE_EXPAT)
+    FIND_PACKAGE(EXPAT)
+  ELSE()
+    SET(EXPAT_FOUND FALSE)
+  ENDIF()
   IF(EXPAT_FOUND)
     CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
     INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
@@ -1076,15 +1135,18 @@ ENDIF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX
 # Check functions
 #
 CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
-IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+    CMAKE_C_COMPILER_ID MATCHES "^Clang$")
   #
   # During checking functions, we should use -fno-builtin to avoid the
   # failure of function detection which failure is an error "conflicting
   # types for built-in function" caused by using -Werror option.
   #
   SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-builtin")
-ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+       CMAKE_C_COMPILER_ID MATCHES "^Clang$")
 CHECK_SYMBOL_EXISTS(_CrtSetReportMode "crtdbg.h" HAVE__CrtSetReportMode)
+CHECK_FUNCTION_EXISTS_GLIBC(arc4random_buf HAVE_ARC4RANDOM_BUF)
 CHECK_FUNCTION_EXISTS_GLIBC(chflags HAVE_CHFLAGS)
 CHECK_FUNCTION_EXISTS_GLIBC(chown HAVE_CHOWN)
 CHECK_FUNCTION_EXISTS_GLIBC(chroot HAVE_CHROOT)
@@ -1132,6 +1194,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(pipe HAVE_PIPE)
 CHECK_FUNCTION_EXISTS_GLIBC(poll HAVE_POLL)
 CHECK_FUNCTION_EXISTS_GLIBC(posix_spawnp HAVE_POSIX_SPAWNP)
 CHECK_FUNCTION_EXISTS_GLIBC(readlink HAVE_READLINK)
+CHECK_FUNCTION_EXISTS_GLIBC(readpassphrase HAVE_READPASSPHRASE)
 CHECK_FUNCTION_EXISTS_GLIBC(select HAVE_SELECT)
 CHECK_FUNCTION_EXISTS_GLIBC(setenv HAVE_SETENV)
 CHECK_FUNCTION_EXISTS_GLIBC(setlocale HAVE_SETLOCALE)
@@ -1170,6 +1233,7 @@ CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
 CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
 CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
 CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
+CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
 
 CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 
@@ -1539,12 +1603,6 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 INCLUDE(CreatePkgConfigFile)
 
 #
-# Expose ADDITIONAL_LIBS for projects using libarchive as a subdirectory
-# and linking against archive_static.
-#
-set(LIBARCHIVE_ADDITIONAL_LIBS ${ADDITIONAL_LIBS} CACHE INTERNAL "libarchive dependencies")
-
-#
 # Register installation of PDF documents.
 #
 IF(WIN32 AND NOT CYGWIN)
diff --git a/COPYING b/COPYING
index b258806..93952b7 100644
--- a/COPYING
+++ b/COPYING
@@ -17,12 +17,11 @@ the actual statements in the files are controlling.
   files for details:
    libarchive/archive_entry.c
    libarchive/archive_read_support_filter_compress.c
-   libarchive/archive_write_set_filter_compress.c
+   libarchive/archive_write_add_filter_compress.c
    libarchive/mtree.5
-   tar/matching.c
 
 * The following source files are in the public domain:
-   tar/getdate.c
+   libarchive/archive_getdate.c
 
 * The build files---including Makefiles, configure scripts,
   and auxiliary scripts used as part of the compile process---have
diff --git a/build/cmake/CreatePkgConfigFile.cmake b/build/cmake/CreatePkgConfigFile.cmake
index f96bbef..fc8529a 100644
--- a/build/cmake/CreatePkgConfigFile.cmake
+++ b/build/cmake/CreatePkgConfigFile.cmake
@@ -27,5 +27,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/pkgconfig/libarchive.pc.in
 		${CMAKE_CURRENT_SOURCE_DIR}/build/pkgconfig/libarchive.pc
 		@ONLY)
 # And install it, of course ;).
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/build/pkgconfig/libarchive.pc
-	DESTINATION "lib/pkgconfig")
+IF(ENABLE_INSTALL)
+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/build/pkgconfig/libarchive.pc
+          DESTINATION "lib/pkgconfig")
+ENDIF()
diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 179ffa7..a42a7c5 100644
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -63,7 +63,7 @@ typedef long long int64_t;
  * Similarly for int32_t
  */
 #if !defined(HAVE_INT32_T) && SIZE_OF_INT == 4
-typedef long int32_t;
+typedef int int32_t;
 #define HAVE_INT32_T
 #endif
 
@@ -328,9 +328,15 @@ typedef uint64_t uintmax_t;
 /* True for systems with POSIX ACL support */
 #cmakedefine HAVE_ACL_USER 1
 
+/* Define to 1 if you have the `arc4random_buf' function. */
+#cmakedefine HAVE_ARC4RANDOM_BUF 1
+
 /* Define to 1 if you have the <attr/xattr.h> header file. */
 #cmakedefine HAVE_ATTR_XATTR_H 1
 
+/* Define to 1 if you have the <Bcrypt.h> header file. */
+#cmakedefine HAVE_BCRYPT_H 1
+
 /* Define to 1 if you have the <bsdxml.h> header file. */
 #cmakedefine HAVE_BSDXML_H 1
 
@@ -579,12 +585,21 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `bz2' library (-lbz2). */
 #cmakedefine HAVE_LIBBZ2 1
 
+/* Define to 1 if you have the `charset' library (-lcharset). */
+#cmakedefine HAVE_LIBCHARSET 1
+
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#cmakedefine HAVE_LIBCRYPTO 1
+
 /* Define to 1 if you have the `expat' library (-lexpat). */
 #cmakedefine HAVE_LIBEXPAT 1
 
 /* Define to 1 if you have the `gcc' library (-lgcc). */
 #cmakedefine HAVE_LIBGCC 1
 
+/* Define to 1 if you have the `lz4' library (-llz4). */
+#cmakedefine HAVE_LIBLZ4 1
+
 /* Define to 1 if you have the `lzma' library (-llzma). */
 #cmakedefine HAVE_LIBLZMA 1
 
@@ -676,6 +691,12 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `lutimes' function. */
 #cmakedefine HAVE_LUTIMES 1
 
+/* Define to 1 if you have the <lz4hc.h> header file. */
+#cmakedefine HAVE_LZ4HC_H 1
+
+/* Define to 1 if you have the <lz4.h> header file. */
+#cmakedefine HAVE_LZ4_H 1
+
 /* Define to 1 if you have the <lzmadec.h> header file. */
 #cmakedefine HAVE_LZMADEC_H 1
 
@@ -715,6 +736,9 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <nettle/md5.h> header file. */
 #cmakedefine HAVE_NETTLE_MD5_H 1
 
+/* Define to 1 if you have the <nettle/pbkdf2.h> header file. */
+#cmakedefine HAVE_NETTLE_PBKDF2_H 1
+
 /* Define to 1 if you have the <nettle/ripemd160.h> header file. */
 #cmakedefine HAVE_NETTLE_RIPEMD160_H 1
 
@@ -736,6 +760,9 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `pipe' function. */
 #cmakedefine HAVE_PIPE 1
 
+/* Define to 1 if you have the `PKCS5_PBKDF2_HMAC_SHA1' function. */
+#cmakedefine HAVE_PKCS5_PBKDF2_HMAC_SHA1 1
+
 /* Define to 1 if you have the `poll' function. */
 #cmakedefine HAVE_POLL 1
 
@@ -748,6 +775,9 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <process.h> header file. */
 #cmakedefine HAVE_PROCESS_H 1
 
+/* Define to 1 if you have the <pthread.h> header file. */
+#cmakedefine HAVE_PTHREAD_H 1
+
 /* Define to 1 if you have the <pwd.h> header file. */
 #cmakedefine HAVE_PWD_H 1
 
@@ -760,6 +790,12 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `readlinkat' function. */
 #cmakedefine HAVE_READLINKAT 1
 
+/* Define to 1 if you have the `readpassphrase' function. */
+#cmakedefine HAVE_READPASSPHRASE 1
+
+/* Define to 1 if you have the <readpassphrase.h> header file. */
+#cmakedefine HAVE_READPASSPHRASE_H 1
+
 /* Define to 1 if you have the <regex.h> header file. */
 #cmakedefine HAVE_REGEX_H 1
 
@@ -1015,6 +1051,9 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `wmemcpy' function. */
 #cmakedefine HAVE_WMEMCPY 1
 
+/* Define to 1 if you have the `wmemmove' function. */
+#cmakedefine HAVE_WMEMMOVE 1
+
 /* Define to 1 if you have a working EXT2_IOC_GETFLAGS */
 #cmakedefine HAVE_WORKING_EXT2_IOC_GETFLAGS 1
 
diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
index 4a0c15d..f427e97 100644
--- a/libarchive/CMakeLists.txt
+++ b/libarchive/CMakeLists.txt
@@ -18,8 +18,10 @@ SET(libarchive_SOURCES
   archive_cmdline.c
   archive_cmdline_private.h
   archive_crc32.h
-  archive_crypto.c
-  archive_crypto_private.h
+  archive_cryptor.c
+  archive_cryptor_private.h
+  archive_digest.c
+  archive_digest_private.h
   archive_endian.h
   archive_entry.c
   archive_entry.h
@@ -32,6 +34,8 @@ SET(libarchive_SOURCES
   archive_entry_strmode.c
   archive_entry_xattr.c
   archive_getdate.c
+  archive_hmac.c
+  archive_hmac_private.h
   archive_match.c
   archive_options.c
   archive_options_private.h
@@ -44,9 +48,12 @@ SET(libarchive_SOURCES
   archive_ppmd7.c
   archive_ppmd7_private.h
   archive_private.h
+  archive_random.c
+  archive_random_private.h
   archive_rb.c
   archive_rb.h
   archive_read.c
+  archive_read_add_passphrase.c
   archive_read_append_filter.c
   archive_read_data_into_fd.c
   archive_read_disk_entry_from_file.c
@@ -68,6 +75,7 @@ SET(libarchive_SOURCES
   archive_read_support_filter_gzip.c
   archive_read_support_filter_grzip.c
   archive_read_support_filter_lrzip.c
+  archive_read_support_filter_lz4.c
   archive_read_support_filter_lzop.c
   archive_read_support_filter_none.c
   archive_read_support_filter_program.c
@@ -87,6 +95,7 @@ SET(libarchive_SOURCES
   archive_read_support_format_rar.c
   archive_read_support_format_raw.c
   archive_read_support_format_tar.c
+  archive_read_support_format_warc.c
   archive_read_support_format_xar.c
   archive_read_support_format_zip.c
   archive_string.c
@@ -113,6 +122,7 @@ SET(libarchive_SOURCES
   archive_write_add_filter_grzip.c
   archive_write_add_filter_gzip.c
   archive_write_add_filter_lrzip.c
+  archive_write_add_filter_lz4.c
   archive_write_add_filter_lzop.c
   archive_write_add_filter_none.c
   archive_write_add_filter_program.c
@@ -124,6 +134,7 @@ SET(libarchive_SOURCES
   archive_write_set_format_by_name.c
   archive_write_set_format_cpio.c
   archive_write_set_format_cpio_newc.c
+  archive_write_set_format_filter_by_ext.c
   archive_write_set_format_gnutar.c
   archive_write_set_format_iso9660.c
   archive_write_set_format_mtree.c
@@ -132,11 +143,15 @@ SET(libarchive_SOURCES
   archive_write_set_format_shar.c
   archive_write_set_format_ustar.c
   archive_write_set_format_v7tar.c
+  archive_write_set_format_warc.c
   archive_write_set_format_xar.c
   archive_write_set_format_zip.c
   archive_write_set_options.c
+  archive_write_set_passphrase.c
+  archive_xxhash.h
   filter_fork_posix.c
   filter_fork.h
+  xxhash.c
 )
 
 # Man pages
@@ -149,12 +164,14 @@ SET(libarchive_MANS
   archive_entry_stat.3
   archive_entry_time.3
   archive_read.3
+  archive_read_add_passphrase.3
   archive_read_disk.3
   archive_read_set_options.3
   archive_util.3
   archive_write.3
   archive_write_disk.3
   archive_write_set_options.3
+  archive_write_set_passphrase.3
   cpio.5
   libarchive.3
   libarchive_internals.3
@@ -179,6 +196,7 @@ SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
 
 # archive_static is a static library
 ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
+TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
 SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
   LIBARCHIVE_STATIC)
 # On Posix systems, libarchive.so and libarchive.a can co-exist.
@@ -186,12 +204,14 @@ IF(NOT WIN32 OR CYGWIN)
   SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
 ENDIF(NOT WIN32 OR CYGWIN)
 
-# How to install the libraries
-INSTALL(TARGETS archive archive_static
-        RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib)
-INSTALL_MAN(${libarchive_MANS})
-INSTALL(FILES ${include_HEADERS} DESTINATION include)
+IF(ENABLE_INSTALL)
+  # How to install the libraries
+  INSTALL(TARGETS archive archive_static
+          RUNTIME DESTINATION bin
+          LIBRARY DESTINATION lib
+          ARCHIVE DESTINATION lib)
+  INSTALL_MAN(${libarchive_MANS})
+  INSTALL(FILES ${include_HEADERS} DESTINATION include)
+ENDIF()
 
 add_subdirectory(test)
diff --git a/libarchive/archive.h b/libarchive/archive.h
index e90cb49..d3ff9b0 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -45,25 +45,44 @@
 # include <inttypes.h>
 #endif
 
-/* Get appropriate definitions of standard POSIX-style types. */
-/* These should match the types used in 'struct stat' */
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
-# define	__LA_INT64_T	__int64
-# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
-#  define	__LA_SSIZE_T	ssize_t
-# elif defined(_WIN64)
-#  define	__LA_SSIZE_T	__int64
-# else
-#  define	__LA_SSIZE_T	long
+/* Get appropriate definitions of 64-bit integer */
+#if !defined(__LA_INT64_T_DEFINED)
+/* Older code relied on the __LA_INT64_T macro; after 4.0 we'll switch to the typedef exclusively. */
+# if ARCHIVE_VERSION_NUMBER < 4000000
+#define __LA_INT64_T la_int64_t
 # endif
-#else
+#define __LA_INT64_T_DEFINED
+# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
+typedef __int64 la_int64_t;
+# else
 # include <unistd.h>  /* ssize_t */
-# if defined(_SCO_DS)
-#  define	__LA_INT64_T	long long
+#  if defined(_SCO_DS)
+typedef long long la_int64_t;
+#  else
+typedef int64_t la_int64_t;
+#  endif
+# endif
+#endif
+
+/* The la_ssize_t should match the type used in 'struct stat' */
+#if !defined(__LA_SSIZE_T_DEFINED)
+/* Older code relied on the __LA_SSIZE_T macro; after 4.0 we'll switch to the typedef exclusively. */
+# if ARCHIVE_VERSION_NUMBER < 4000000
+#define __LA_SSIZE_T la_ssize_t
+# endif
+#define __LA_SSIZE_T_DEFINED
+# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
+#  if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
+typedef ssize_t la_ssize_t;
+#  elif defined(_WIN64)
+typedef __int64 la_ssize_t;
+#  else
+typedef long la_ssize_t;
+#  endif
 # else
-#  define	__LA_INT64_T	int64_t
+# include <unistd.h>  /* ssize_t */
+typedef ssize_t la_ssize_t;
 # endif
-# define	__LA_SSIZE_T	ssize_t
 #endif
 
 /*
@@ -130,11 +149,16 @@ __LA_DECL int		archive_version_number(void);
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_STRING "libarchive 3.1.2"
+#define	ARCHIVE_VERSION_ONLY_STRING "3.1.2"
+#define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 __LA_DECL const char *	archive_version_string(void);
 
 /*
  * Detailed textual name/version of the library and its dependencies.
+ * This has the form:
+ *    "libarchive x.y.z zlib/a.b.c liblzma/d.e.f ... etc ..."
+ * the list of libraries described here will vary depending on how
+ * libarchive was compiled.
  */
 __LA_DECL const char *	archive_version_details(void);
 
@@ -178,7 +202,7 @@ struct archive_entry;
  */
 
 /* Returns pointer and size of next block of data from archive. */
-typedef __LA_SSIZE_T	archive_read_callback(struct archive *,
+typedef la_ssize_t	archive_read_callback(struct archive *,
 			    void *_client_data, const void **_buffer);
 
 /* Skips at most request bytes from archive and returns the skipped amount.
@@ -186,18 +210,18 @@ typedef __LA_SSIZE_T	archive_read_callback(struct archive *,
  * If you do skip fewer bytes than requested, libarchive will invoke your
  * read callback and discard data as necessary to make up the full skip.
  */
-typedef __LA_INT64_T	archive_skip_callback(struct archive *,
-			    void *_client_data, __LA_INT64_T request);
+typedef la_int64_t	archive_skip_callback(struct archive *,
+			    void *_client_data, la_int64_t request);
 
 /* Seeks to specified location in the file and returns the position.
  * Whence values are SEEK_SET, SEEK_CUR, SEEK_END from stdio.h.
  * Return ARCHIVE_FATAL if the seek fails for any reason.
  */
-typedef __LA_INT64_T	archive_seek_callback(struct archive *,
-    void *_client_data, __LA_INT64_T offset, int whence);
+typedef la_int64_t	archive_seek_callback(struct archive *,
+    void *_client_data, la_int64_t offset, int whence);
 
 /* Returns size actually written, zero on EOF, -1 on error. */
-typedef __LA_SSIZE_T	archive_write_callback(struct archive *,
+typedef la_ssize_t	archive_write_callback(struct archive *,
 			    void *_client_data,
 			    const void *_buffer, size_t _length);
 
@@ -213,6 +237,13 @@ typedef int archive_switch_callback(struct archive *, void *_client_data1,
 			    void *_client_data2);
 
 /*
+ * Returns a passphrase used for encryption or decryption, NULL on nothing
+ * to do and give it up.
+ */
+typedef const char *archive_passphrase_callback(struct archive *,
+			    void *_client_data);
+
+/*
  * Codes to identify various stream filters.
  */
 #define	ARCHIVE_FILTER_NONE	0
@@ -228,6 +259,7 @@ typedef int archive_switch_callback(struct archive *, void *_client_data1,
 #define	ARCHIVE_FILTER_LRZIP	10
 #define	ARCHIVE_FILTER_LZOP	11
 #define	ARCHIVE_FILTER_GRZIP	12
+#define	ARCHIVE_FILTER_LZ4	13
 
 #if ARCHIVE_VERSION_NUMBER < 4000000
 #define	ARCHIVE_COMPRESSION_NONE	ARCHIVE_FILTER_NONE
@@ -289,6 +321,7 @@ typedef int archive_switch_callback(struct archive *, void *_client_data1,
 #define	ARCHIVE_FORMAT_CAB			0xC0000
 #define	ARCHIVE_FORMAT_RAR			0xD0000
 #define	ARCHIVE_FORMAT_7ZIP			0xE0000
+#define	ARCHIVE_FORMAT_WARC			0xF0000
 
 /*
  * Codes returned by archive_read_format_capabilities().
@@ -371,6 +404,7 @@ __LA_DECL int archive_read_support_filter_compress(struct archive *);
 __LA_DECL int archive_read_support_filter_gzip(struct archive *);
 __LA_DECL int archive_read_support_filter_grzip(struct archive *);
 __LA_DECL int archive_read_support_filter_lrzip(struct archive *);
+__LA_DECL int archive_read_support_filter_lz4(struct archive *);
 __LA_DECL int archive_read_support_filter_lzip(struct archive *);
 __LA_DECL int archive_read_support_filter_lzma(struct archive *);
 __LA_DECL int archive_read_support_filter_lzop(struct archive *);
@@ -398,6 +432,7 @@ __LA_DECL int archive_read_support_format_mtree(struct archive *);
 __LA_DECL int archive_read_support_format_rar(struct archive *);
 __LA_DECL int archive_read_support_format_raw(struct archive *);
 __LA_DECL int archive_read_support_format_tar(struct archive *);
+__LA_DECL int archive_read_support_format_warc(struct archive *);
 __LA_DECL int archive_read_support_format_xar(struct archive *);
 /* archive_read_support_format_zip() enables both streamable and seekable
  * zip readers. */
@@ -478,9 +513,9 @@ __LA_DECL int archive_read_open_file(struct archive *,
 		     const char *_filename, size_t _block_size) __LA_DEPRECATED;
 /* Read an archive that's stored in memory. */
 __LA_DECL int archive_read_open_memory(struct archive *,
-		     void * buff, size_t size);
+		     const void * buff, size_t size);
 /* A more involved version that is only used for internal testing. */
-__LA_DECL int archive_read_open_memory2(struct archive *a, void *buff,
+__LA_DECL int archive_read_open_memory2(struct archive *a, const void *buff,
 		     size_t size, size_t read_size);
 /* Read an archive that's already open, using the file descriptor. */
 __LA_DECL int archive_read_open_fd(struct archive *, int _fd,
@@ -501,7 +536,7 @@ __LA_DECL int archive_read_next_header2(struct archive *,
  * Retrieve the byte offset in UNCOMPRESSED data where last-read
  * header started.
  */
-__LA_DECL __LA_INT64_T		 archive_read_header_position(struct archive *);
+__LA_DECL la_int64_t		 archive_read_header_position(struct archive *);
 
 /*
  * Returns 1 if the archive contains at least one encrypted entry.
@@ -530,11 +565,11 @@ __LA_DECL int	archive_read_has_encrypted_entries(struct archive *);
 __LA_DECL int		 archive_read_format_capabilities(struct archive *);
 
 /* Read data from the body of an entry.  Similar to read(2). */
-__LA_DECL __LA_SSIZE_T		 archive_read_data(struct archive *,
+__LA_DECL la_ssize_t		 archive_read_data(struct archive *,
 				    void *, size_t);
 
 /* Seek within the body of an entry.  Similar to lseek(2). */
-__LA_DECL __LA_INT64_T archive_seek_data(struct archive *, __LA_INT64_T, int);
+__LA_DECL la_int64_t archive_seek_data(struct archive *, la_int64_t, int);
 
 /*
  * A zero-copy version of archive_read_data that also exposes the file offset
@@ -543,7 +578,7 @@ __LA_DECL __LA_INT64_T archive_seek_data(struct archive *, __LA_INT64_T, int);
  * be strictly increasing and that returned blocks will not overlap.
  */
 __LA_DECL int archive_read_data_block(struct archive *a,
-		    const void **buff, size_t *size, __LA_INT64_T *offset);
+		    const void **buff, size_t *size, la_int64_t *offset);
 
 /*-
  * Some convenience functions that are built on archive_read_data:
@@ -573,6 +608,14 @@ __LA_DECL int archive_read_set_option(struct archive *_a,
 __LA_DECL int archive_read_set_options(struct archive *_a,
 			    const char *opts);
 
+/*
+ * Add a decryption passphrase.
+ */
+__LA_DECL int archive_read_add_passphrase(struct archive *, const char *);
+__LA_DECL int archive_read_set_passphrase_callback(struct archive *,
+			    void *client_data, archive_passphrase_callback *);
+
+
 /*-
  * Convenience function to recreate the current entry (whose header
  * has just been read) on disk.
@@ -625,6 +668,10 @@ __LA_DECL int archive_read_set_options(struct archive *_a,
 /* Default: Do not use HFS+ compression if it was not compressed. */
 /* This has no effect except on Mac OS v10.6 or later. */
 #define	ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED	(0x8000)
+/* Default: Do not reject entries with absolute paths */
+#define ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS (0x10000)
+/* Default: Do not clear no-change flags when unlinking object */
+#define	ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS	(0x20000)
 
 __LA_DECL int archive_read_extract(struct archive *, struct archive_entry *,
 		     int flags);
@@ -636,7 +683,7 @@ __LA_DECL void	 archive_read_extract_set_progress_callback(struct archive *,
 /* Record the dev/ino of a file that will not be written.  This is
  * generally set to the dev/ino of the archive being read. */
 __LA_DECL void		archive_read_extract_set_skip_file(struct archive *,
-		     __LA_INT64_T, __LA_INT64_T);
+		     la_int64_t, la_int64_t);
 
 /* Close the file and release most resources. */
 __LA_DECL int		 archive_read_close(struct archive *);
@@ -675,7 +722,7 @@ __LA_DECL int archive_write_get_bytes_in_last_block(struct archive *);
 /* The dev/ino of a file that won't be archived.  This is used
  * to avoid recursively adding an archive to itself. */
 __LA_DECL int archive_write_set_skip_file(struct archive *,
-    __LA_INT64_T, __LA_INT64_T);
+    la_int64_t, la_int64_t);
 
 #if ARCHIVE_VERSION_NUMBER < 4000000
 __LA_DECL int archive_write_set_compression_bzip2(struct archive *)
@@ -706,6 +753,7 @@ __LA_DECL int archive_write_add_filter_compress(struct archive *);
 __LA_DECL int archive_write_add_filter_grzip(struct archive *);
 __LA_DECL int archive_write_add_filter_gzip(struct archive *);
 __LA_DECL int archive_write_add_filter_lrzip(struct archive *);
+__LA_DECL int archive_write_add_filter_lz4(struct archive *);
 __LA_DECL int archive_write_add_filter_lzip(struct archive *);
 __LA_DECL int archive_write_add_filter_lzma(struct archive *);
 __LA_DECL int archive_write_add_filter_lzop(struct archive *);
@@ -738,8 +786,11 @@ __LA_DECL int archive_write_set_format_shar(struct archive *);
 __LA_DECL int archive_write_set_format_shar_dump(struct archive *);
 __LA_DECL int archive_write_set_format_ustar(struct archive *);
 __LA_DECL int archive_write_set_format_v7tar(struct archive *);
+__LA_DECL int archive_write_set_format_warc(struct archive *);
 __LA_DECL int archive_write_set_format_xar(struct archive *);
 __LA_DECL int archive_write_set_format_zip(struct archive *);
+__LA_DECL int archive_write_set_format_filter_by_ext(struct archive *a, const char *filename);
+__LA_DECL int archive_write_set_format_filter_by_ext_def(struct archive *a, const char *filename, const char * def_ext);
 __LA_DECL int archive_write_zip_set_compression_deflate(struct archive *);
 __LA_DECL int archive_write_zip_set_compression_store(struct archive *);
 __LA_DECL int archive_write_open(struct archive *, void *,
@@ -764,12 +815,12 @@ __LA_DECL int archive_write_open_memory(struct archive *,
  */
 __LA_DECL int archive_write_header(struct archive *,
 		     struct archive_entry *);
-__LA_DECL __LA_SSIZE_T	archive_write_data(struct archive *,
+__LA_DECL la_ssize_t	archive_write_data(struct archive *,
 			    const void *, size_t);
 
 /* This interface is currently only available for archive_write_disk handles.  */
-__LA_DECL __LA_SSIZE_T	 archive_write_data_block(struct archive *,
-				    const void *, size_t, __LA_INT64_T);
+__LA_DECL la_ssize_t	 archive_write_data_block(struct archive *,
+				    const void *, size_t, la_int64_t);
 
 __LA_DECL int		 archive_write_finish_entry(struct archive *);
 __LA_DECL int		 archive_write_close(struct archive *);
@@ -804,6 +855,13 @@ __LA_DECL int archive_write_set_option(struct archive *_a,
 __LA_DECL int archive_write_set_options(struct archive *_a,
 			    const char *opts);
 
+/*
+ * Set a encryption passphrase.
+ */
+__LA_DECL int archive_write_set_passphrase(struct archive *_a, const char *p);
+__LA_DECL int archive_write_set_passphrase_callback(struct archive *,
+			    void *client_data, archive_passphrase_callback *);
+
 /*-
  * ARCHIVE_WRITE_DISK API
  *
@@ -823,7 +881,7 @@ __LA_DECL int archive_write_set_options(struct archive *_a,
 __LA_DECL struct archive	*archive_write_disk_new(void);
 /* This file will not be overwritten. */
 __LA_DECL int archive_write_disk_set_skip_file(struct archive *,
-    __LA_INT64_T, __LA_INT64_T);
+    la_int64_t, la_int64_t);
 /* Set flags to control how the next item gets created.
  * This accepts a bitmask of ARCHIVE_EXTRACT_XXX flags defined above. */
 __LA_DECL int		 archive_write_disk_set_options(struct archive *,
@@ -853,14 +911,14 @@ __LA_DECL int	 archive_write_disk_set_standard_lookup(struct archive *);
  */
 __LA_DECL int archive_write_disk_set_group_lookup(struct archive *,
     void * /* private_data */,
-    __LA_INT64_T (*)(void *, const char *, __LA_INT64_T),
+    la_int64_t (*)(void *, const char *, la_int64_t),
     void (* /* cleanup */)(void *));
 __LA_DECL int archive_write_disk_set_user_lookup(struct archive *,
     void * /* private_data */,
-    __LA_INT64_T (*)(void *, const char *, __LA_INT64_T),
+    la_int64_t (*)(void *, const char *, la_int64_t),
     void (* /* cleanup */)(void *));
-__LA_DECL __LA_INT64_T archive_write_disk_gid(struct archive *, const char *, __LA_INT64_T);
-__LA_DECL __LA_INT64_T archive_write_disk_uid(struct archive *, const char *, __LA_INT64_T);
+__LA_DECL la_int64_t archive_write_disk_gid(struct archive *, const char *, la_int64_t);
+__LA_DECL la_int64_t archive_write_disk_uid(struct archive *, const char *, la_int64_t);
 
 /*
  * ARCHIVE_READ_DISK API
@@ -881,19 +939,19 @@ __LA_DECL int archive_read_disk_entry_from_file(struct archive *,
     struct archive_entry *, int /* fd */, const struct stat *);
 /* Look up gname for gid or uname for uid. */
 /* Default implementations are very, very stupid. */
-__LA_DECL const char *archive_read_disk_gname(struct archive *, __LA_INT64_T);
-__LA_DECL const char *archive_read_disk_uname(struct archive *, __LA_INT64_T);
+__LA_DECL const char *archive_read_disk_gname(struct archive *, la_int64_t);
+__LA_DECL const char *archive_read_disk_uname(struct archive *, la_int64_t);
 /* "Standard" implementation uses getpwuid_r, getgrgid_r and caches the
  * results for performance. */
 __LA_DECL int	archive_read_disk_set_standard_lookup(struct archive *);
 /* You can install your own lookups if you like. */
 __LA_DECL int	archive_read_disk_set_gname_lookup(struct archive *,
     void * /* private_data */,
-    const char *(* /* lookup_fn */)(void *, __LA_INT64_T),
+    const char *(* /* lookup_fn */)(void *, la_int64_t),
     void (* /* cleanup_fn */)(void *));
 __LA_DECL int	archive_read_disk_set_uname_lookup(struct archive *,
     void * /* private_data */,
-    const char *(* /* lookup_fn */)(void *, __LA_INT64_T),
+    const char *(* /* lookup_fn */)(void *, la_int64_t),
     void (* /* cleanup_fn */)(void *));
 /* Start traversal. */
 __LA_DECL int	archive_read_disk_open(struct archive *, const char *);
@@ -923,8 +981,10 @@ __LA_DECL int  archive_read_disk_set_atime_restored(struct archive *);
 /* Default: Skip a mac resource fork file whose prefix is "._" because of
  * using copyfile. */
 #define	ARCHIVE_READDISK_MAC_COPYFILE		(0x0004)
-/* Default: Do not traverse mount points. */
+/* Default: Traverse mount points. */
 #define	ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS	(0x0008)
+/* Default: Xattrs are read from disk. */
+#define	ARCHIVE_READDISK_NO_XATTR		(0x0010)
 
 __LA_DECL int  archive_read_disk_set_behavior(struct archive *,
 		    int flags);
@@ -957,7 +1017,7 @@ __LA_DECL int	archive_free(struct archive *);
  * last filter, which is always the pseudo-filter that wraps the
  * client callbacks. */
 __LA_DECL int		 archive_filter_count(struct archive *);
-__LA_DECL __LA_INT64_T	 archive_filter_bytes(struct archive *, int);
+__LA_DECL la_int64_t	 archive_filter_bytes(struct archive *, int);
 __LA_DECL int		 archive_filter_code(struct archive *, int);
 __LA_DECL const char *	 archive_filter_name(struct archive *, int);
 
@@ -965,10 +1025,10 @@ __LA_DECL const char *	 archive_filter_name(struct archive *, int);
 /* These don't properly handle multiple filters, so are deprecated and
  * will eventually be removed. */
 /* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, -1); */
-__LA_DECL __LA_INT64_T	 archive_position_compressed(struct archive *)
+__LA_DECL la_int64_t	 archive_position_compressed(struct archive *)
 				__LA_DEPRECATED;
 /* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, 0); */
-__LA_DECL __LA_INT64_T	 archive_position_uncompressed(struct archive *)
+__LA_DECL la_int64_t	 archive_position_uncompressed(struct archive *)
 				__LA_DEPRECATED;
 /* As of libarchive 3.0, this is an alias for archive_filter_name(a, 0); */
 __LA_DECL const char	*archive_compression_name(struct archive *)
@@ -1084,8 +1144,8 @@ __LA_DECL int	archive_match_exclude_entry(struct archive *,
 __LA_DECL int	archive_match_owner_excluded(struct archive *,
 		    struct archive_entry *);
 /* Add inclusion uid, gid, uname and gname. */
-__LA_DECL int	archive_match_include_uid(struct archive *, __LA_INT64_T);
-__LA_DECL int	archive_match_include_gid(struct archive *, __LA_INT64_T);
+__LA_DECL int	archive_match_include_uid(struct archive *, la_int64_t);
+__LA_DECL int	archive_match_include_gid(struct archive *, la_int64_t);
 __LA_DECL int	archive_match_include_uname(struct archive *, const char *);
 __LA_DECL int	archive_match_include_uname_w(struct archive *,
 		    const wchar_t *);
@@ -1104,9 +1164,4 @@ __LA_DECL int archive_utility_string_sort(char **);
 /* These are meaningless outside of this header. */
 #undef __LA_DECL
 
-/* These need to remain defined because they're used in the
- * callback type definitions.  XXX Fix this.  This is ugly. XXX */
-/* #undef __LA_INT64_T */
-/* #undef __LA_SSIZE_T */
-
 #endif /* !ARCHIVE_H_INCLUDED */
diff --git a/libarchive/archive_cryptor.c b/libarchive/archive_cryptor.c
new file mode 100644
index 0000000..9b01df8
--- /dev/null
+++ b/libarchive/archive_cryptor.c
@@ -0,0 +1,432 @@
+/*-
+* Copyright (c) 2014 Michihiro NAKAJIMA
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "archive_platform.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include "archive.h"
+#include "archive_cryptor_private.h"
+
+#ifdef __APPLE__
+
+static int
+pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
+    size_t salt_len, unsigned rounds, uint8_t *derived_key,
+    size_t derived_key_len)
+{
+	CCKeyDerivationPBKDF(kCCPBKDF2, (const char *)pw,
+	    pw_len, salt, salt_len, kCCPRFHmacAlgSHA1, rounds,
+	    derived_key, derived_key_len);
+	return 0;
+}
+
+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
+#ifdef _MSC_VER
+#pragma comment(lib, "Bcrypt.lib")
+#endif
+
+static int
+pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
+	size_t salt_len, unsigned rounds, uint8_t *derived_key,
+	size_t derived_key_len)
+{
+	NTSTATUS status;
+	BCRYPT_ALG_HANDLE hAlg;
+
+	status = BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_SHA1_ALGORITHM,
+		MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG);
+	if (!BCRYPT_SUCCESS(status))
+		return -1;
+
+	status = BCryptDeriveKeyPBKDF2(hAlg,
+		(PUCHAR)(uintptr_t)pw, (ULONG)pw_len,
+		(PUCHAR)(uintptr_t)salt, (ULONG)salt_len, rounds,
+		(PUCHAR)derived_key, (ULONG)derived_key_len, 0);
+
+	BCryptCloseAlgorithmProvider(hAlg, 0);
+
+	return (BCRYPT_SUCCESS(status)) ? 0: -1;
+}
+
+#elif defined(HAVE_LIBNETTLE) && defined(HAVE_NETTLE_PBKDF2_H)
+
+static int
+pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
+    size_t salt_len, unsigned rounds, uint8_t *derived_key,
+    size_t derived_key_len) {
+	pbkdf2_hmac_sha1((unsigned)pw_len, (const uint8_t *)pw, rounds,
+	    salt_len, salt, derived_key_len, derived_key);
+	return 0;
+}
+
+#elif defined(HAVE_LIBCRYPTO) && defined(HAVE_PKCS5_PBKDF2_HMAC_SHA1)
+
+static int
+pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
+    size_t salt_len, unsigned rounds, uint8_t *derived_key,
+    size_t derived_key_len) {
+
+	PKCS5_PBKDF2_HMAC_SHA1(pw, pw_len, salt, salt_len, rounds,
+	    derived_key_len, derived_key);
+	return 0;
+}
+
+#else
+
+/* Stub */
+static int
+pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
+    size_t salt_len, unsigned rounds, uint8_t *derived_key,
+    size_t derived_key_len) {
+	(void)pw; /* UNUSED */
+	(void)pw_len; /* UNUSED */
+	(void)salt; /* UNUSED */
+	(void)salt_len; /* UNUSED */
+	(void)rounds; /* UNUSED */
+	(void)derived_key; /* UNUSED */
+	(void)derived_key_len; /* UNUSED */
+	return -1; /* UNSUPPORTED */
+}
+
+#endif
+
+#ifdef __APPLE__
+
+static int
+aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+	CCCryptorStatus r;
+
+	ctx->key_len = key_len;
+	memcpy(ctx->key, key, key_len);
+	memset(ctx->nonce, 0, sizeof(ctx->nonce));
+	ctx->encr_pos = AES_BLOCK_SIZE;
+	r = CCCryptorCreateWithMode(kCCEncrypt, kCCModeECB, kCCAlgorithmAES,
+	    ccNoPadding, NULL, key, key_len, NULL, 0, 0, 0, &ctx->ctx);
+	return (r == kCCSuccess)? 0: -1;
+}
+
+static int
+aes_ctr_encrypt_counter(archive_crypto_ctx *ctx)
+{
+	CCCryptorRef ref = ctx->ctx;
+	CCCryptorStatus r;
+
+	r = CCCryptorReset(ref, NULL);
+	if (r != kCCSuccess)
+		return -1;
+	r = CCCryptorUpdate(ref, ctx->nonce, AES_BLOCK_SIZE, ctx->encr_buf,
+	    AES_BLOCK_SIZE, NULL);
+	return (r == kCCSuccess)? 0: -1;
+}
+
+static int
+aes_ctr_release(archive_crypto_ctx *ctx)
+{
+	memset(ctx->key, 0, ctx->key_len);
+	memset(ctx->nonce, 0, sizeof(ctx->nonce));
+	return 0;
+}
+
+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
+
+static int
+aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+	BCRYPT_ALG_HANDLE hAlg;
+	BCRYPT_KEY_HANDLE hKey;
+	DWORD keyObj_len, aes_key_len;
+	PBYTE keyObj;
+	ULONG result;
+	NTSTATUS status;
+	BCRYPT_KEY_LENGTHS_STRUCT key_lengths;
+
+	ctx->hAlg = NULL;
+	ctx->hKey = NULL;
+	ctx->keyObj = NULL;
+	switch (key_len) {
+	case 16: aes_key_len = 128; break;
+	case 24: aes_key_len = 192; break;
+	case 32: aes_key_len = 256; break;
+	default: return -1;
+	}
+	status = BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_AES_ALGORITHM,
+		MS_PRIMITIVE_PROVIDER, 0);
+	if (!BCRYPT_SUCCESS(status))
+		return -1;
+	status = BCryptGetProperty(hAlg, BCRYPT_KEY_LENGTHS, (PUCHAR)&key_lengths,
+		sizeof(key_lengths), &result, 0);
+	if (!BCRYPT_SUCCESS(status)) {
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+		return -1;
+	}
+	if (key_lengths.dwMinLength > aes_key_len
+		|| key_lengths.dwMaxLength < aes_key_len) {
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+		return -1;
+	}
+	status = BCryptGetProperty(hAlg, BCRYPT_OBJECT_LENGTH, (PUCHAR)&keyObj_len,
+		sizeof(keyObj_len), &result, 0);
+	if (!BCRYPT_SUCCESS(status)) {
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+		return -1;
+	}
+	keyObj = (PBYTE)HeapAlloc(GetProcessHeap(), 0, keyObj_len);
+	if (keyObj == NULL) {
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+		return -1;
+	}
+	status = BCryptSetProperty(hAlg, BCRYPT_CHAINING_MODE,
+		(PUCHAR)BCRYPT_CHAIN_MODE_ECB, sizeof(BCRYPT_CHAIN_MODE_ECB), 0);
+	if (!BCRYPT_SUCCESS(status)) {
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+		HeapFree(GetProcessHeap(), 0, keyObj);
+		return -1;
+	}
+	status = BCryptGenerateSymmetricKey(hAlg, &hKey,
+		keyObj, keyObj_len,
+		(PUCHAR)(uintptr_t)key, (ULONG)key_len, 0);
+	if (!BCRYPT_SUCCESS(status)) {
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+		HeapFree(GetProcessHeap(), 0, keyObj);
+		return -1;
+	}
+
+	ctx->hAlg = hAlg;
+	ctx->hKey = hKey;
+	ctx->keyObj = keyObj;
+	ctx->keyObj_len = keyObj_len;
+	ctx->encr_pos = AES_BLOCK_SIZE;
+
+	return 0;
+}
+
+static int
+aes_ctr_encrypt_counter(archive_crypto_ctx *ctx)
+{
+	NTSTATUS status;
+	ULONG result;
+
+	status = BCryptEncrypt(ctx->hKey, (PUCHAR)ctx->nonce, AES_BLOCK_SIZE,
+		NULL, NULL, 0, (PUCHAR)ctx->encr_buf, AES_BLOCK_SIZE,
+		&result, 0);
+	return BCRYPT_SUCCESS(status) ? 0 : -1;
+}
+
+static int
+aes_ctr_release(archive_crypto_ctx *ctx)
+{
+
+	if (ctx->hAlg != NULL) {
+		BCryptCloseAlgorithmProvider(ctx->hAlg, 0);
+		ctx->hAlg = NULL;
+		BCryptDestroyKey(ctx->hKey);
+		ctx->hKey = NULL;
+		HeapFree(GetProcessHeap(), 0, ctx->keyObj);
+		ctx->keyObj = NULL;
+	}
+	memset(ctx, 0, sizeof(*ctx));
+	return 0;
+}
+
+#elif defined(HAVE_LIBNETTLE)
+
+static int
+aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+	ctx->key_len = key_len;
+	memcpy(ctx->key, key, key_len);
+	memset(ctx->nonce, 0, sizeof(ctx->nonce));
+	ctx->encr_pos = AES_BLOCK_SIZE;
+	memset(&ctx->ctx, 0, sizeof(ctx->ctx));
+	return 0;
+}
+
+static int
+aes_ctr_encrypt_counter(archive_crypto_ctx *ctx)
+{
+	aes_set_encrypt_key(&ctx->ctx, ctx->key_len, ctx->key);
+	aes_encrypt(&ctx->ctx, AES_BLOCK_SIZE, ctx->encr_buf, ctx->nonce);
+	return 0;
+}
+
+static int
+aes_ctr_release(archive_crypto_ctx *ctx)
+{
+	memset(ctx, 0, sizeof(*ctx));
+	return 0;
+}
+
+#elif defined(HAVE_LIBCRYPTO)
+
+static int
+aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+
+	switch (key_len) {
+	case 16: ctx->type = EVP_aes_128_ecb(); break;
+	case 24: ctx->type = EVP_aes_192_ecb(); break;
+	case 32: ctx->type = EVP_aes_256_ecb(); break;
+	default: ctx->type = NULL; return -1;
+	}
+
+	ctx->key_len = key_len;
+	memcpy(ctx->key, key, key_len);
+	memset(ctx->nonce, 0, sizeof(ctx->nonce));
+	ctx->encr_pos = AES_BLOCK_SIZE;
+	EVP_CIPHER_CTX_init(&ctx->ctx);
+	return 0;
+}
+
+static int
+aes_ctr_encrypt_counter(archive_crypto_ctx *ctx)
+{
+	int outl = 0;
+	int r;
+
+	r = EVP_EncryptInit_ex(&ctx->ctx, ctx->type, NULL, ctx->key, NULL);
+	if (r == 0)
+		return -1;
+	r = EVP_EncryptUpdate(&ctx->ctx, ctx->encr_buf, &outl, ctx->nonce,
+	    AES_BLOCK_SIZE);
+	if (r == 0 || outl != AES_BLOCK_SIZE)
+		return -1;
+	return 0;
+}
+
+static int
+aes_ctr_release(archive_crypto_ctx *ctx)
+{
+	EVP_CIPHER_CTX_cleanup(&ctx->ctx);
+	memset(ctx->key, 0, ctx->key_len);
+	memset(ctx->nonce, 0, sizeof(ctx->nonce));
+	return 0;
+}
+
+#else
+
+#define ARCHIVE_CRYPTOR_STUB
+/* Stub */
+static int
+aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+	(void)ctx; /* UNUSED */
+	(void)key; /* UNUSED */
+	(void)key_len; /* UNUSED */
+	return -1;
+}
+
+static int
+aes_ctr_encrypt_counter(archive_crypto_ctx *ctx)
+{
+	(void)ctx; /* UNUSED */
+	return -1;
+}
+
+static int
+aes_ctr_release(archive_crypto_ctx *ctx)
+{
+	(void)ctx; /* UNUSED */
+	return 0;
+}
+
+#endif
+
+#ifdef ARCHIVE_CRYPTOR_STUB
+static int
+aes_ctr_update(archive_crypto_ctx *ctx, const uint8_t * const in,
+    size_t in_len, uint8_t * const out, size_t *out_len)
+{
+	(void)ctx; /* UNUSED */
+	(void)in; /* UNUSED */
+	(void)in_len; /* UNUSED */
+	(void)out; /* UNUSED */
+	(void)out_len; /* UNUSED */
+	aes_ctr_encrypt_counter(ctx); /* UNUSED */ /* Fix unused function warning */
+	return -1;
+}
+
+#else
+static void
+aes_ctr_increase_counter(archive_crypto_ctx *ctx)
+{
+	uint8_t *const nonce = ctx->nonce;
+	int j;
+
+	for (j = 0; j < 8; j++) {
+		if (++nonce[j])
+			break;
+	}
+}
+
+static int
+aes_ctr_update(archive_crypto_ctx *ctx, const uint8_t * const in,
+    size_t in_len, uint8_t * const out, size_t *out_len)
+{
+	uint8_t *const ebuf = ctx->encr_buf;
+	unsigned pos = ctx->encr_pos;
+	unsigned max = (unsigned)((in_len < *out_len)? in_len: *out_len);
+	unsigned i;
+
+	for (i = 0; i < max; ) {
+		if (pos == AES_BLOCK_SIZE) {
+			aes_ctr_increase_counter(ctx);
+			if (aes_ctr_encrypt_counter(ctx) != 0)
+				return -1;
+			while (max -i >= AES_BLOCK_SIZE) {
+				for (pos = 0; pos < AES_BLOCK_SIZE; pos++)
+					out[i+pos] = in[i+pos] ^ ebuf[pos];
+				i += AES_BLOCK_SIZE;
+				aes_ctr_increase_counter(ctx);
+				if (aes_ctr_encrypt_counter(ctx) != 0)
+					return -1;
+			}
+			pos = 0;
+			if (i >= max)
+				break;
+		}
+		out[i] = in[i] ^ ebuf[pos++];
+		i++;
+	}
+	ctx->encr_pos = pos;
+	*out_len = i;
+
+	return 0;
+}
+#endif /* ARCHIVE_CRYPTOR_STUB */
+
+
+const struct archive_cryptor __archive_cryptor =
+{
+  &pbkdf2_sha1,
+  &aes_ctr_init,
+  &aes_ctr_update,
+  &aes_ctr_release,
+  &aes_ctr_init,
+  &aes_ctr_update,
+  &aes_ctr_release,
+};
diff --git a/libarchive/archive_cryptor_private.h b/libarchive/archive_cryptor_private.h
new file mode 100644
index 0000000..b62ec0c
--- /dev/null
+++ b/libarchive/archive_cryptor_private.h
@@ -0,0 +1,145 @@
+/*-
+* Copyright (c) 2014 Michihiro NAKAJIMA
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
+#endif
+
+#ifndef ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED
+#define ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED
+
+#ifdef __APPLE__
+#include <CommonCrypto/CommonCryptor.h>
+#include <CommonCrypto/CommonKeyDerivation.h>
+#define AES_BLOCK_SIZE	16
+#define AES_MAX_KEY_SIZE kCCKeySizeAES256
+
+typedef struct {
+	CCCryptorRef	ctx;
+	uint8_t		key[AES_MAX_KEY_SIZE];
+	unsigned	key_len;
+	uint8_t		nonce[AES_BLOCK_SIZE];
+	uint8_t		encr_buf[AES_BLOCK_SIZE];
+	unsigned	encr_pos;
+} archive_crypto_ctx;
+
+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
+#include <Bcrypt.h>
+
+/* Common in other bcrypt implementations, but missing from VS2008. */
+#ifndef BCRYPT_SUCCESS
+#define BCRYPT_SUCCESS(r) ((NTSTATUS)(r) == STATUS_SUCCESS)
+#endif
+
+#define AES_MAX_KEY_SIZE 32
+#define AES_BLOCK_SIZE 16
+typedef struct {
+	BCRYPT_ALG_HANDLE hAlg;
+	BCRYPT_KEY_HANDLE hKey;
+	PBYTE		keyObj;
+	DWORD		keyObj_len;
+	uint8_t		nonce[AES_BLOCK_SIZE];
+	uint8_t		encr_buf[AES_BLOCK_SIZE];
+	unsigned	encr_pos;
+} archive_crypto_ctx;
+
+#elif defined(HAVE_LIBNETTLE)
+#if defined(HAVE_NETTLE_PBKDF2_H)
+#include <nettle/pbkdf2.h>
+#endif
+#include <nettle/aes.h>
+
+typedef struct {
+	struct aes_ctx	ctx;
+	uint8_t		key[AES_MAX_KEY_SIZE];
+	unsigned	key_len;
+	uint8_t		nonce[AES_BLOCK_SIZE];
+	uint8_t		encr_buf[AES_BLOCK_SIZE];
+	unsigned	encr_pos;
+} archive_crypto_ctx;
+
+#elif defined(HAVE_LIBCRYPTO)
+#include <openssl/evp.h>
+#define AES_BLOCK_SIZE	16
+#define AES_MAX_KEY_SIZE 32
+
+typedef struct {
+	EVP_CIPHER_CTX	ctx;
+	const EVP_CIPHER *type;
+	uint8_t		key[AES_MAX_KEY_SIZE];
+	unsigned	key_len;
+	uint8_t		nonce[AES_BLOCK_SIZE];
+	uint8_t		encr_buf[AES_BLOCK_SIZE];
+	unsigned	encr_pos;
+} archive_crypto_ctx;
+
+#else
+
+#define AES_BLOCK_SIZE	16
+#define AES_MAX_KEY_SIZE 32
+typedef int archive_crypto_ctx;
+
+#endif
+
+/* defines */
+#define archive_pbkdf2_sha1(pw, pw_len, salt, salt_len, rounds, dk, dk_len)\
+  __archive_cryptor.pbkdf2sha1(pw, pw_len, salt, salt_len, rounds, dk, dk_len)
+
+#define archive_decrypto_aes_ctr_init(ctx, key, key_len) \
+  __archive_cryptor.decrypto_aes_ctr_init(ctx, key, key_len)
+#define archive_decrypto_aes_ctr_update(ctx, in, in_len, out, out_len) \
+  __archive_cryptor.decrypto_aes_ctr_update(ctx, in, in_len, out, out_len)
+#define archive_decrypto_aes_ctr_release(ctx) \
+  __archive_cryptor.decrypto_aes_ctr_release(ctx)
+
+#define archive_encrypto_aes_ctr_init(ctx, key, key_len) \
+  __archive_cryptor.encrypto_aes_ctr_init(ctx, key, key_len)
+#define archive_encrypto_aes_ctr_update(ctx, in, in_len, out, out_len) \
+  __archive_cryptor.encrypto_aes_ctr_update(ctx, in, in_len, out, out_len)
+#define archive_encrypto_aes_ctr_release(ctx) \
+  __archive_cryptor.encrypto_aes_ctr_release(ctx)
+
+/* Minimal interface to cryptographic functionality for internal use in
+ * libarchive */
+struct archive_cryptor
+{
+  /* PKCS5 PBKDF2 HMAC-SHA1 */
+  int (*pbkdf2sha1)(const char *pw, size_t pw_len, const uint8_t *salt,
+    size_t salt_len, unsigned rounds, uint8_t *derived_key,
+    size_t derived_key_len);
+  /* AES CTR mode(little endian version) */
+  int (*decrypto_aes_ctr_init)(archive_crypto_ctx *, const uint8_t *, size_t);
+  int (*decrypto_aes_ctr_update)(archive_crypto_ctx *, const uint8_t *,
+    size_t, uint8_t *, size_t *);
+  int (*decrypto_aes_ctr_release)(archive_crypto_ctx *);
+  int (*encrypto_aes_ctr_init)(archive_crypto_ctx *, const uint8_t *, size_t);
+  int (*encrypto_aes_ctr_update)(archive_crypto_ctx *, const uint8_t *,
+    size_t, uint8_t *, size_t *);
+  int (*encrypto_aes_ctr_release)(archive_crypto_ctx *);
+};
+
+extern const struct archive_cryptor __archive_cryptor;
+
+#endif
diff --git a/libarchive/archive_crypto.c b/libarchive/archive_digest.c
similarity index 99%
rename from libarchive/archive_crypto.c
rename to libarchive/archive_digest.c
index 85aba3a..f009d31 100644
--- a/libarchive/archive_crypto.c
+++ b/libarchive/archive_digest.c
@@ -28,7 +28,7 @@
 #include "archive_platform.h"
 
 #include "archive.h"
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 
 /* In particular, force the configure probe to break if it tries
  * to test a combination of OpenSSL and libmd. */
@@ -1216,8 +1216,8 @@ __archive_stub_sha512final(archive_sha512_ctx *ctx, void *md)
 
 #endif
 
-/* NOTE: Crypto functions are set based on availability and by the following
- * order of preference.
+/* NOTE: Message Digest functions are set based on availability and by the
+ * following order of preference.
  * 1. libc
  * 2. libc2
  * 3. libc3
@@ -1227,7 +1227,7 @@ __archive_stub_sha512final(archive_sha512_ctx *ctx, void *md)
  * 7. libmd
  * 8. Windows API
  */
-const struct archive_crypto __archive_crypto =
+const struct archive_digest __archive_digest =
 {
 /* MD5 */
 #if defined(ARCHIVE_CRYPTO_MD5_LIBC)
@@ -1412,7 +1412,7 @@ const struct archive_crypto __archive_crypto =
 #elif defined(ARCHIVE_CRYPTO_SHA512_NETTLE)
   &__archive_nettle_sha512init,
   &__archive_nettle_sha512update,
-  &__archive_nettle_sha512final,
+  &__archive_nettle_sha512final
 #elif defined(ARCHIVE_CRYPTO_SHA512_OPENSSL)
   &__archive_openssl_sha512init,
   &__archive_openssl_sha512update,
diff --git a/libarchive/archive_crypto_private.h b/libarchive/archive_digest_private.h
similarity index 93%
rename from libarchive/archive_crypto_private.h
rename to libarchive/archive_digest_private.h
index f8b1fb3..77fad58 100644
--- a/libarchive/archive_crypto_private.h
+++ b/libarchive/archive_digest_private.h
@@ -264,11 +264,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_MD5
 #endif
 #define archive_md5_init(ctx)\
-  __archive_crypto.md5init(ctx)
+  __archive_digest.md5init(ctx)
 #define archive_md5_final(ctx, md)\
-  __archive_crypto.md5final(ctx, md)
+  __archive_digest.md5final(ctx, md)
 #define archive_md5_update(ctx, buf, n)\
-  __archive_crypto.md5update(ctx, buf, n)
+  __archive_digest.md5update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_RMD160_LIBC) ||\
   defined(ARCHIVE_CRYPTO_RMD160_NETTLE) ||\
@@ -276,11 +276,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_RMD160
 #endif
 #define archive_rmd160_init(ctx)\
-  __archive_crypto.rmd160init(ctx)
+  __archive_digest.rmd160init(ctx)
 #define archive_rmd160_final(ctx, md)\
-  __archive_crypto.rmd160final(ctx, md)
+  __archive_digest.rmd160final(ctx, md)
 #define archive_rmd160_update(ctx, buf, n)\
-  __archive_crypto.rmd160update(ctx, buf, n)
+  __archive_digest.rmd160update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_SHA1_LIBC) ||\
   defined(ARCHIVE_CRYPTO_SHA1_LIBMD) ||	\
@@ -291,11 +291,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_SHA1
 #endif
 #define archive_sha1_init(ctx)\
-  __archive_crypto.sha1init(ctx)
+  __archive_digest.sha1init(ctx)
 #define archive_sha1_final(ctx, md)\
-  __archive_crypto.sha1final(ctx, md)
+  __archive_digest.sha1final(ctx, md)
 #define archive_sha1_update(ctx, buf, n)\
-  __archive_crypto.sha1update(ctx, buf, n)
+  __archive_digest.sha1update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_SHA256_LIBC) ||\
   defined(ARCHIVE_CRYPTO_SHA256_LIBC2) ||\
@@ -308,11 +308,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_SHA256
 #endif
 #define archive_sha256_init(ctx)\
-  __archive_crypto.sha256init(ctx)
+  __archive_digest.sha256init(ctx)
 #define archive_sha256_final(ctx, md)\
-  __archive_crypto.sha256final(ctx, md)
+  __archive_digest.sha256final(ctx, md)
 #define archive_sha256_update(ctx, buf, n)\
-  __archive_crypto.sha256update(ctx, buf, n)
+  __archive_digest.sha256update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_SHA384_LIBC) ||\
   defined(ARCHIVE_CRYPTO_SHA384_LIBC2) ||\
@@ -324,11 +324,11 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_SHA384
 #endif
 #define archive_sha384_init(ctx)\
-  __archive_crypto.sha384init(ctx)
+  __archive_digest.sha384init(ctx)
 #define archive_sha384_final(ctx, md)\
-  __archive_crypto.sha384final(ctx, md)
+  __archive_digest.sha384final(ctx, md)
 #define archive_sha384_update(ctx, buf, n)\
-  __archive_crypto.sha384update(ctx, buf, n)
+  __archive_digest.sha384update(ctx, buf, n)
 
 #if defined(ARCHIVE_CRYPTO_SHA512_LIBC) ||\
   defined(ARCHIVE_CRYPTO_SHA512_LIBC2) ||\
@@ -341,14 +341,14 @@ typedef unsigned char archive_sha512_ctx;
 #define ARCHIVE_HAS_SHA512
 #endif
 #define archive_sha512_init(ctx)\
-  __archive_crypto.sha512init(ctx)
+  __archive_digest.sha512init(ctx)
 #define archive_sha512_final(ctx, md)\
-  __archive_crypto.sha512final(ctx, md)
+  __archive_digest.sha512final(ctx, md)
 #define archive_sha512_update(ctx, buf, n)\
-  __archive_crypto.sha512update(ctx, buf, n)
+  __archive_digest.sha512update(ctx, buf, n)
 
-/* Minimal interface to crypto functionality for internal use in libarchive */
-struct archive_crypto
+/* Minimal interface to digest functionality for internal use in libarchive */
+struct archive_digest
 {
   /* Message Digest */
   int (*md5init)(archive_md5_ctx *ctx);
@@ -371,6 +371,6 @@ struct archive_crypto
   int (*sha512final)(archive_sha512_ctx *, void *);
 };
 
-extern const struct archive_crypto __archive_crypto;
+extern const struct archive_digest __archive_digest;
 
 #endif
diff --git a/libarchive/archive_entry.3 b/libarchive/archive_entry.3
index f77f385..f5e22af 100644
--- a/libarchive/archive_entry.3
+++ b/libarchive/archive_entry.3
@@ -131,11 +131,11 @@ be discarded in favor of the new data.
 .\" .Sh RETURN VALUES
 .\" .Sh ERRORS
 .Sh SEE ALSO
-.Xr archive 3 ,
 .Xr archive_entry_acl 3 ,
 .Xr archive_entry_paths 3 ,
 .Xr archive_entry_perms 3 ,
 .Xr archive_entry_time 3
+.Xr libarchive 3 ,
 .Sh HISTORY
 The
 .Nm libarchive
diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c
index 293c701..4ac1966 100644
--- a/libarchive/archive_entry.c
+++ b/libarchive/archive_entry.c
@@ -418,6 +418,18 @@ archive_entry_gname(struct archive_entry *entry)
 	return (NULL);
 }
 
+const char *
+archive_entry_gname_utf8(struct archive_entry *entry)
+{
+	const char *p;
+	if (archive_mstring_get_utf8(entry->archive, &entry->ae_gname, &p) == 0)
+		return (p);
+	if (errno == ENOMEM)
+		__archive_errx(1, "No memory");
+	return (NULL);
+}
+
+
 const wchar_t *
 archive_entry_gname_w(struct archive_entry *entry)
 {
@@ -450,6 +462,20 @@ archive_entry_hardlink(struct archive_entry *entry)
 	return (NULL);
 }
 
+const char *
+archive_entry_hardlink_utf8(struct archive_entry *entry)
+{
+	const char *p;
+	if ((entry->ae_set & AE_SET_HARDLINK) == 0)
+		return (NULL);
+	if (archive_mstring_get_utf8(
+	    entry->archive, &entry->ae_hardlink, &p) == 0)
+		return (p);
+	if (errno == ENOMEM)
+		__archive_errx(1, "No memory");
+	return (NULL);
+}
+
 const wchar_t *
 archive_entry_hardlink_w(struct archive_entry *entry)
 {
@@ -536,6 +562,18 @@ archive_entry_pathname(struct archive_entry *entry)
 	return (NULL);
 }
 
+const char *
+archive_entry_pathname_utf8(struct archive_entry *entry)
+{
+	const char *p;
+	if (archive_mstring_get_utf8(
+	    entry->archive, &entry->ae_pathname, &p) == 0)
+		return (p);
+	if (errno == ENOMEM)
+		__archive_errx(1, "No memory");
+	return (NULL);
+}
+
 const wchar_t *
 archive_entry_pathname_w(struct archive_entry *entry)
 {
@@ -637,6 +675,20 @@ archive_entry_symlink(struct archive_entry *entry)
 	return (NULL);
 }
 
+const char *
+archive_entry_symlink_utf8(struct archive_entry *entry)
+{
+	const char *p;
+	if ((entry->ae_set & AE_SET_SYMLINK) == 0)
+		return (NULL);
+	if (archive_mstring_get_utf8(
+	    entry->archive, &entry->ae_symlink, &p) == 0)
+		return (p);
+	if (errno == ENOMEM)
+		__archive_errx(1, "No memory");
+	return (NULL);
+}
+
 const wchar_t *
 archive_entry_symlink_w(struct archive_entry *entry)
 {
@@ -680,6 +732,17 @@ archive_entry_uname(struct archive_entry *entry)
 	return (NULL);
 }
 
+const char *
+archive_entry_uname_utf8(struct archive_entry *entry)
+{
+	const char *p;
+	if (archive_mstring_get_utf8(entry->archive, &entry->ae_uname, &p) == 0)
+		return (p);
+	if (errno == ENOMEM)
+		__archive_errx(1, "No memory");
+	return (NULL);
+}
+
 const wchar_t *
 archive_entry_uname_w(struct archive_entry *entry)
 {
@@ -769,6 +832,12 @@ archive_entry_set_gname(struct archive_entry *entry, const char *name)
 }
 
 void
+archive_entry_set_gname_utf8(struct archive_entry *entry, const char *name)
+{
+	archive_mstring_copy_utf8(&entry->ae_gname, name);
+}
+
+void
 archive_entry_copy_gname(struct archive_entry *entry, const char *name)
 {
 	archive_mstring_copy_mbs(&entry->ae_gname, name);
@@ -825,6 +894,16 @@ archive_entry_set_hardlink(struct archive_entry *entry, const char *target)
 }
 
 void
+archive_entry_set_hardlink_utf8(struct archive_entry *entry, const char *target)
+{
+	archive_mstring_copy_utf8(&entry->ae_hardlink, target);
+	if (target != NULL)
+		entry->ae_set |= AE_SET_HARDLINK;
+	else
+		entry->ae_set &= ~AE_SET_HARDLINK;
+}
+
+void
 archive_entry_copy_hardlink(struct archive_entry *entry, const char *target)
 {
 	archive_mstring_copy_mbs(&entry->ae_hardlink, target);
@@ -962,6 +1041,15 @@ archive_entry_set_link(struct archive_entry *entry, const char *target)
 		archive_mstring_copy_mbs(&entry->ae_hardlink, target);
 }
 
+void
+archive_entry_set_link_utf8(struct archive_entry *entry, const char *target)
+{
+	if (entry->ae_set & AE_SET_SYMLINK)
+		archive_mstring_copy_utf8(&entry->ae_symlink, target);
+	else
+		archive_mstring_copy_utf8(&entry->ae_hardlink, target);
+}
+
 /* Set symlink if symlink is already set, else set hardlink. */
 void
 archive_entry_copy_link(struct archive_entry *entry, const char *target)
@@ -1052,6 +1140,12 @@ archive_entry_set_pathname(struct archive_entry *entry, const char *name)
 }
 
 void
+archive_entry_set_pathname_utf8(struct archive_entry *entry, const char *name)
+{
+	archive_mstring_copy_utf8(&entry->ae_pathname, name);
+}
+
+void
 archive_entry_copy_pathname(struct archive_entry *entry, const char *name)
 {
 	archive_mstring_copy_mbs(&entry->ae_pathname, name);
@@ -1152,6 +1246,16 @@ archive_entry_set_symlink(struct archive_entry *entry, const char *linkname)
 }
 
 void
+archive_entry_set_symlink_utf8(struct archive_entry *entry, const char *linkname)
+{
+	archive_mstring_copy_utf8(&entry->ae_symlink, linkname);
+	if (linkname != NULL)
+		entry->ae_set |= AE_SET_SYMLINK;
+	else
+		entry->ae_set &= ~AE_SET_SYMLINK;
+}
+
+void
 archive_entry_copy_symlink(struct archive_entry *entry, const char *linkname)
 {
 	archive_mstring_copy_mbs(&entry->ae_symlink, linkname);
@@ -1215,6 +1319,12 @@ archive_entry_set_uname(struct archive_entry *entry, const char *name)
 }
 
 void
+archive_entry_set_uname_utf8(struct archive_entry *entry, const char *name)
+{
+	archive_mstring_copy_utf8(&entry->ae_uname, name);
+}
+
+void
 archive_entry_copy_uname(struct archive_entry *entry, const char *name)
 {
 	archive_mstring_copy_mbs(&entry->ae_uname, name);
@@ -1629,19 +1739,23 @@ ae_strtofflags(const char *s, unsigned long *setp, unsigned long *clrp)
 	while (*start == '\t'  ||  *start == ' '  ||  *start == ',')
 		start++;
 	while (*start != '\0') {
+		size_t length;
 		/* Locate end of token. */
 		end = start;
 		while (*end != '\0'  &&  *end != '\t'  &&
 		    *end != ' '  &&  *end != ',')
 			end++;
+		length = end - start;
 		for (flag = flags; flag->name != NULL; flag++) {
-			if (memcmp(start, flag->name, end - start) == 0) {
+			size_t flag_length = strlen(flag->name);
+			if (length == flag_length
+			    && memcmp(start, flag->name, length) == 0) {
 				/* Matched "noXXXX", so reverse the sense. */
 				clear |= flag->set;
 				set |= flag->clear;
 				break;
-			} else if (memcmp(start, flag->name + 2, end - start)
-			    == 0) {
+			} else if (length == flag_length - 2
+			    && memcmp(start, flag->name + 2, length) == 0) {
 				/* Matched "XXXX", so don't reverse. */
 				set |= flag->set;
 				clear |= flag->clear;
@@ -1693,19 +1807,23 @@ ae_wcstofflags(const wchar_t *s, unsigned long *setp, unsigned long *clrp)
 	while (*start == L'\t'  ||  *start == L' '  ||  *start == L',')
 		start++;
 	while (*start != L'\0') {
+		size_t length;
 		/* Locate end of token. */
 		end = start;
 		while (*end != L'\0'  &&  *end != L'\t'  &&
 		    *end != L' '  &&  *end != L',')
 			end++;
+		length = end - start;
 		for (flag = flags; flag->wname != NULL; flag++) {
-			if (wmemcmp(start, flag->wname, end - start) == 0) {
+			size_t flag_length = wcslen(flag->wname);
+			if (length == flag_length
+			    && wmemcmp(start, flag->wname, length) == 0) {
 				/* Matched "noXXXX", so reverse the sense. */
 				clear |= flag->set;
 				set |= flag->clear;
 				break;
-			} else if (wmemcmp(start, flag->wname + 2, end - start)
-			    == 0) {
+			} else if (length == flag_length - 2
+			    && wmemcmp(start, flag->wname + 2, length) == 0) {
 				/* Matched "XXXX", so don't reverse. */
 				set |= flag->set;
 				clear |= flag->clear;
diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index dfba11b..996d60f 100644
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -43,15 +43,25 @@
 #include <stddef.h>  /* for wchar_t */
 #include <time.h>
 
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <windows.h>
+#endif
+
 /* Get a suitable 64-bit integer type. */
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
-# define	__LA_INT64_T	__int64
-#else
-#include <unistd.h>
-# if defined(_SCO_DS)
-#  define	__LA_INT64_T	long long
+#if !defined(__LA_INT64_T_DEFINED)
+# if ARCHIVE_VERSION_NUMBER < 4000000
+#define __LA_INT64_T la_int64_t
+# endif
+#define __LA_INT64_T_DEFINED
+# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
+typedef __int64 la_int64_t;
 # else
-#  define	__LA_INT64_T	int64_t
+#include <unistd.h>
+#  if defined(_SCO_DS)
+typedef long long la_int64_t;
+#  else
+typedef int64_t la_int64_t;
+#  endif
 # endif
 #endif
 
@@ -202,13 +212,15 @@ __LA_DECL void		 archive_entry_fflags(struct archive_entry *,
 			    unsigned long * /* set */,
 			    unsigned long * /* clear */);
 __LA_DECL const char	*archive_entry_fflags_text(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_gid(struct archive_entry *);
+__LA_DECL la_int64_t	 archive_entry_gid(struct archive_entry *);
 __LA_DECL const char	*archive_entry_gname(struct archive_entry *);
+__LA_DECL const char	*archive_entry_gname_utf8(struct archive_entry *);
 __LA_DECL const wchar_t	*archive_entry_gname_w(struct archive_entry *);
 __LA_DECL const char	*archive_entry_hardlink(struct archive_entry *);
+__LA_DECL const char	*archive_entry_hardlink_utf8(struct archive_entry *);
 __LA_DECL const wchar_t	*archive_entry_hardlink_w(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_ino(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_ino64(struct archive_entry *);
+__LA_DECL la_int64_t	 archive_entry_ino(struct archive_entry *);
+__LA_DECL la_int64_t	 archive_entry_ino64(struct archive_entry *);
 __LA_DECL int		 archive_entry_ino_is_set(struct archive_entry *);
 __LA_DECL __LA_MODE_T	 archive_entry_mode(struct archive_entry *);
 __LA_DECL time_t	 archive_entry_mtime(struct archive_entry *);
@@ -216,6 +228,7 @@ __LA_DECL long		 archive_entry_mtime_nsec(struct archive_entry *);
 __LA_DECL int		 archive_entry_mtime_is_set(struct archive_entry *);
 __LA_DECL unsigned int	 archive_entry_nlink(struct archive_entry *);
 __LA_DECL const char	*archive_entry_pathname(struct archive_entry *);
+__LA_DECL const char	*archive_entry_pathname_utf8(struct archive_entry *);
 __LA_DECL const wchar_t	*archive_entry_pathname_w(struct archive_entry *);
 __LA_DECL __LA_MODE_T	 archive_entry_perm(struct archive_entry *);
 __LA_DECL dev_t		 archive_entry_rdev(struct archive_entry *);
@@ -223,13 +236,15 @@ __LA_DECL dev_t		 archive_entry_rdevmajor(struct archive_entry *);
 __LA_DECL dev_t		 archive_entry_rdevminor(struct archive_entry *);
 __LA_DECL const char	*archive_entry_sourcepath(struct archive_entry *);
 __LA_DECL const wchar_t	*archive_entry_sourcepath_w(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_size(struct archive_entry *);
+__LA_DECL la_int64_t	 archive_entry_size(struct archive_entry *);
 __LA_DECL int		 archive_entry_size_is_set(struct archive_entry *);
 __LA_DECL const char	*archive_entry_strmode(struct archive_entry *);
 __LA_DECL const char	*archive_entry_symlink(struct archive_entry *);
+__LA_DECL const char	*archive_entry_symlink_utf8(struct archive_entry *);
 __LA_DECL const wchar_t	*archive_entry_symlink_w(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_uid(struct archive_entry *);
+__LA_DECL la_int64_t	 archive_entry_uid(struct archive_entry *);
 __LA_DECL const char	*archive_entry_uname(struct archive_entry *);
+__LA_DECL const char	*archive_entry_uname_utf8(struct archive_entry *);
 __LA_DECL const wchar_t	*archive_entry_uname_w(struct archive_entry *);
 __LA_DECL int archive_entry_is_data_encrypted(struct archive_entry *);
 __LA_DECL int archive_entry_is_metadata_encrypted(struct archive_entry *);
@@ -265,18 +280,21 @@ __LA_DECL const char *archive_entry_copy_fflags_text(struct archive_entry *,
 	    const char *);
 __LA_DECL const wchar_t *archive_entry_copy_fflags_text_w(struct archive_entry *,
 	    const wchar_t *);
-__LA_DECL void	archive_entry_set_gid(struct archive_entry *, __LA_INT64_T);
+__LA_DECL void	archive_entry_set_gid(struct archive_entry *, la_int64_t);
 __LA_DECL void	archive_entry_set_gname(struct archive_entry *, const char *);
+__LA_DECL void	archive_entry_set_gname_utf8(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_gname(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_gname_w(struct archive_entry *, const wchar_t *);
 __LA_DECL int	archive_entry_update_gname_utf8(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_set_hardlink(struct archive_entry *, const char *);
+__LA_DECL void	archive_entry_set_hardlink_utf8(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_hardlink(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *);
 __LA_DECL int	archive_entry_update_hardlink_utf8(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_set_ino(struct archive_entry *, __LA_INT64_T);
-__LA_DECL void	archive_entry_set_ino64(struct archive_entry *, __LA_INT64_T);
+__LA_DECL void	archive_entry_set_ino(struct archive_entry *, la_int64_t);
+__LA_DECL void	archive_entry_set_ino64(struct archive_entry *, la_int64_t);
 __LA_DECL void	archive_entry_set_link(struct archive_entry *, const char *);
+__LA_DECL void	archive_entry_set_link_utf8(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_link(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_link_w(struct archive_entry *, const wchar_t *);
 __LA_DECL int	archive_entry_update_link_utf8(struct archive_entry *, const char *);
@@ -285,6 +303,7 @@ __LA_DECL void	archive_entry_set_mtime(struct archive_entry *, time_t, long);
 __LA_DECL void  archive_entry_unset_mtime(struct archive_entry *);
 __LA_DECL void	archive_entry_set_nlink(struct archive_entry *, unsigned int);
 __LA_DECL void	archive_entry_set_pathname(struct archive_entry *, const char *);
+__LA_DECL void	archive_entry_set_pathname_utf8(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_pathname(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_pathname_w(struct archive_entry *, const wchar_t *);
 __LA_DECL int	archive_entry_update_pathname_utf8(struct archive_entry *, const char *);
@@ -292,16 +311,18 @@ __LA_DECL void	archive_entry_set_perm(struct archive_entry *, __LA_MODE_T);
 __LA_DECL void	archive_entry_set_rdev(struct archive_entry *, dev_t);
 __LA_DECL void	archive_entry_set_rdevmajor(struct archive_entry *, dev_t);
 __LA_DECL void	archive_entry_set_rdevminor(struct archive_entry *, dev_t);
-__LA_DECL void	archive_entry_set_size(struct archive_entry *, __LA_INT64_T);
+__LA_DECL void	archive_entry_set_size(struct archive_entry *, la_int64_t);
 __LA_DECL void	archive_entry_unset_size(struct archive_entry *);
 __LA_DECL void	archive_entry_copy_sourcepath(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_sourcepath_w(struct archive_entry *, const wchar_t *);
 __LA_DECL void	archive_entry_set_symlink(struct archive_entry *, const char *);
+__LA_DECL void	archive_entry_set_symlink_utf8(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_symlink(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *);
 __LA_DECL int	archive_entry_update_symlink_utf8(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_set_uid(struct archive_entry *, __LA_INT64_T);
+__LA_DECL void	archive_entry_set_uid(struct archive_entry *, la_int64_t);
 __LA_DECL void	archive_entry_set_uname(struct archive_entry *, const char *);
+__LA_DECL void	archive_entry_set_uname_utf8(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_uname(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_copy_uname_w(struct archive_entry *, const wchar_t *);
 __LA_DECL int	archive_entry_update_uname_utf8(struct archive_entry *, const char *);
@@ -515,7 +536,7 @@ __LA_DECL int	archive_entry_xattr_next(struct archive_entry *,
 
 __LA_DECL void	 archive_entry_sparse_clear(struct archive_entry *);
 __LA_DECL void	 archive_entry_sparse_add_entry(struct archive_entry *,
-	    __LA_INT64_T /* offset */, __LA_INT64_T /* length */);
+	    la_int64_t /* offset */, la_int64_t /* length */);
 
 /*
  * To retrieve the xattr list, first "reset", then repeatedly ask for the
@@ -525,7 +546,7 @@ __LA_DECL void	 archive_entry_sparse_add_entry(struct archive_entry *,
 __LA_DECL int	archive_entry_sparse_count(struct archive_entry *);
 __LA_DECL int	archive_entry_sparse_reset(struct archive_entry *);
 __LA_DECL int	archive_entry_sparse_next(struct archive_entry *,
-	    __LA_INT64_T * /* offset */, __LA_INT64_T * /* length */);
+	    la_int64_t * /* offset */, la_int64_t * /* length */);
 
 /*
  * Utility to match up hardlinks.
diff --git a/libarchive/archive_entry_acl.3 b/libarchive/archive_entry_acl.3
index f5c3377..5aff996 100644
--- a/libarchive/archive_entry_acl.3
+++ b/libarchive/archive_entry_acl.3
@@ -226,8 +226,8 @@ The returned long string is valid until the next call to
 or
 .Fn archive_entry_acl_text_w .
 .Sh SEE ALSO
-.Xr archive 3 ,
 .Xr archive_entry 3
+.Xr libarchive 3 ,
 .Sh BUGS
 .Dv ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID
 and
diff --git a/libarchive/archive_entry_paths.3 b/libarchive/archive_entry_paths.3
index 51c8b8c..fd22cf7 100644
--- a/libarchive/archive_entry_paths.3
+++ b/libarchive/archive_entry_paths.3
@@ -149,5 +149,5 @@ It doesn't have a corresponding get accessor function.
 is an alias for 
 .Fn archive_entry_copy_XXX .
 .Sh SEE ALSO
-.Xr archive 3 ,
 .Xr archive_entry 3
+.Xr libarchive 3 ,
diff --git a/libarchive/archive_entry_perms.3 b/libarchive/archive_entry_perms.3
index 5b7b5d9..340c5ea 100644
--- a/libarchive/archive_entry_perms.3
+++ b/libarchive/archive_entry_perms.3
@@ -194,11 +194,11 @@ every name that is recognized.
 .Xr strtofflags 3 ,
 which stops parsing at the first unrecognized name.)
 .Sh SEE ALSO
-.Xr archive 3 ,
 .Xr archive_entry 3 ,
 .Xr archive_entry_acl 3 ,
 .Xr archive_read_disk 3 ,
 .Xr archive_write_disk 3
+.Xr libarchive 3 ,
 .Sh BUGS
 The platform types
 .Vt uid_t
diff --git a/libarchive/archive_entry_stat.3 b/libarchive/archive_entry_stat.3
index 84a4ea1..26611e4 100644
--- a/libarchive/archive_entry_stat.3
+++ b/libarchive/archive_entry_stat.3
@@ -226,7 +226,7 @@ and
 are used by
 .Xr archive_entry_linkify 3
 to find hardlinks.
-The pair of device and inode is suppossed to identify hardlinked files.
+The pair of device and inode is supposed to identify hardlinked files.
 .Pp
 The device major and minor number can be obtained independently using
 .Fn archive_entry_devmajor
@@ -267,8 +267,8 @@ platforms.
 Some archive formats use the combined form, while other formats use
 the split form.
 .Sh SEE ALSO
-.Xr archive 3 ,
 .Xr archive_entry_acl 3 ,
 .Xr archive_entry_perms 3 ,
 .Xr archive_entry_time 3 ,
+.Xr libarchive 3 ,
 .Xr stat 2
diff --git a/libarchive/archive_entry_time.3 b/libarchive/archive_entry_time.3
index 17c658a..1864521 100644
--- a/libarchive/archive_entry_time.3
+++ b/libarchive/archive_entry_time.3
@@ -113,8 +113,8 @@ The current state can be queried using
 .Fn XXX_is_set .
 Unset time fields have a second and nanosecond field of 0.
 .Sh SEE ALSO
-.Xr archive 3 ,
 .Xr archive_entry 3
+.Xr libarchive 3 ,
 .Sh HISTORY
 The
 .Nm libarchive
diff --git a/libarchive/archive_entry_xattr.c b/libarchive/archive_entry_xattr.c
index a3efe7c..05eb90f 100644
--- a/libarchive/archive_entry_xattr.c
+++ b/libarchive/archive_entry_xattr.c
@@ -98,7 +98,10 @@ archive_entry_xattr_add_entry(struct archive_entry *entry,
 		/* XXX Error XXX */
 		return;
 
-	xp->name = strdup(name);
+	if ((xp->name = strdup(name)) == NULL)
+		/* XXX Error XXX */
+		return;
+
 	if ((xp->value = malloc(size)) != NULL) {
 		memcpy(xp->value, value, size);
 		xp->size = size;
diff --git a/libarchive/archive_hmac.c b/libarchive/archive_hmac.c
new file mode 100644
index 0000000..898853b
--- /dev/null
+++ b/libarchive/archive_hmac.c
@@ -0,0 +1,234 @@
+/*-
+* Copyright (c) 2014 Michihiro NAKAJIMA
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "archive_platform.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include "archive.h"
+#include "archive_hmac_private.h"
+
+#ifdef __APPLE__
+
+static int
+__hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+	CCHmacInit(ctx, kCCHmacAlgSHA1, key, key_len);
+	return 0;
+}
+
+static void
+__hmac_sha1_update(archive_hmac_sha1_ctx *ctx, const uint8_t *data,
+    size_t data_len)
+{
+	CCHmacUpdate(ctx, data, data_len);
+}
+
+static void
+__hmac_sha1_final(archive_hmac_sha1_ctx *ctx, uint8_t *out, size_t *out_len)
+{
+	CCHmacFinal(ctx, out);
+	*out_len = 20;
+}
+
+static void
+__hmac_sha1_cleanup(archive_hmac_sha1_ctx *ctx)
+{
+	memset(ctx, 0, sizeof(*ctx));
+}
+
+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
+
+static int
+__hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+	BCRYPT_ALG_HANDLE hAlg;
+	BCRYPT_HASH_HANDLE hHash;
+	DWORD hash_len;
+	PBYTE hash;
+	ULONG result;
+	NTSTATUS status;
+
+	ctx->hAlg = NULL;
+	status = BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_SHA1_ALGORITHM,
+		MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG);
+	if (!BCRYPT_SUCCESS(status))
+		return -1;
+	status = BCryptGetProperty(hAlg, BCRYPT_HASH_LENGTH, (PUCHAR)&hash_len,
+		sizeof(hash_len), &result, 0);
+	if (!BCRYPT_SUCCESS(status)) {
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+		return -1;
+	}
+	hash = (PBYTE)HeapAlloc(GetProcessHeap(), 0, hash_len);
+	if (hash == NULL) {
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+		return -1;
+	}
+	status = BCryptCreateHash(hAlg, &hHash, NULL, 0,
+		(PUCHAR)key, (ULONG)key_len, BCRYPT_HASH_REUSABLE_FLAG);
+	if (!BCRYPT_SUCCESS(status)) {
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+		HeapFree(GetProcessHeap(), 0, hash);
+		return -1;
+	}
+
+	ctx->hAlg = hAlg;
+	ctx->hHash = hHash;
+	ctx->hash_len = hash_len;
+	ctx->hash = hash;
+
+	return 0;
+}
+
+static void
+__hmac_sha1_update(archive_hmac_sha1_ctx *ctx, const uint8_t *data,
+	size_t data_len)
+{
+	BCryptHashData(ctx->hHash, (PUCHAR)(uintptr_t)data, (ULONG)data_len, 0);
+}
+
+static void
+__hmac_sha1_final(archive_hmac_sha1_ctx *ctx, uint8_t *out, size_t *out_len)
+{
+	BCryptFinishHash(ctx->hHash, ctx->hash, ctx->hash_len, 0);
+	if (ctx->hash_len == *out_len)
+		memcpy(out, ctx->hash, *out_len);
+}
+
+static void
+__hmac_sha1_cleanup(archive_hmac_sha1_ctx *ctx)
+{
+	if (ctx->hAlg != NULL) {
+		BCryptCloseAlgorithmProvider(ctx->hAlg, 0);
+		HeapFree(GetProcessHeap(), 0, ctx->hash);
+		ctx->hAlg = NULL;
+	}
+}
+
+#elif defined(HAVE_LIBNETTLE)
+
+static int
+__hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+	hmac_sha1_set_key(ctx, key_len, key);
+	return 0;
+}
+
+static void
+__hmac_sha1_update(archive_hmac_sha1_ctx *ctx, const uint8_t *data,
+    size_t data_len)
+{
+	hmac_sha1_update(ctx, data_len, data);
+}
+
+static void
+__hmac_sha1_final(archive_hmac_sha1_ctx *ctx, uint8_t *out, size_t *out_len)
+{
+	hmac_sha1_digest(ctx, (unsigned)*out_len, out);
+}
+
+static void
+__hmac_sha1_cleanup(archive_hmac_sha1_ctx *ctx)
+{
+	memset(ctx, 0, sizeof(*ctx));
+}
+
+#elif defined(HAVE_LIBCRYPTO)
+
+static int
+__hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+	HMAC_CTX_init(ctx);
+	HMAC_Init(ctx, key, key_len, EVP_sha1());
+	return 0;
+}
+
+static void
+__hmac_sha1_update(archive_hmac_sha1_ctx *ctx, const uint8_t *data,
+    size_t data_len)
+{
+	HMAC_Update(ctx, data, data_len);
+}
+
+static void
+__hmac_sha1_final(archive_hmac_sha1_ctx *ctx, uint8_t *out, size_t *out_len)
+{
+	unsigned int len = (unsigned int)*out_len;
+	HMAC_Final(ctx, out, &len);
+	*out_len = len;
+}
+
+static void
+__hmac_sha1_cleanup(archive_hmac_sha1_ctx *ctx)
+{
+	HMAC_CTX_cleanup(ctx);
+	memset(ctx, 0, sizeof(*ctx));
+}
+
+#else
+
+/* Stub */
+static int
+__hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
+{
+	(void)ctx;/* UNUSED */
+	(void)key;/* UNUSED */
+	(void)key_len;/* UNUSED */
+	return -1;
+}
+
+static void
+__hmac_sha1_update(archive_hmac_sha1_ctx *ctx, const uint8_t *data,
+    size_t data_len)
+{
+	(void)ctx;/* UNUSED */
+	(void)data;/* UNUSED */
+	(void)data_len;/* UNUSED */
+}
+
+static void
+__hmac_sha1_final(archive_hmac_sha1_ctx *ctx, uint8_t *out, size_t *out_len)
+{
+	(void)ctx;/* UNUSED */
+	(void)out;/* UNUSED */
+	(void)out_len;/* UNUSED */
+}
+
+static void
+__hmac_sha1_cleanup(archive_hmac_sha1_ctx *ctx)
+{
+	(void)ctx;/* UNUSED */
+}
+
+#endif
+
+const struct archive_hmac __archive_hmac = {
+	&__hmac_sha1_init,
+	&__hmac_sha1_update,
+	&__hmac_sha1_final,
+	&__hmac_sha1_cleanup,
+};
diff --git a/libarchive/archive_hmac_private.h b/libarchive/archive_hmac_private.h
new file mode 100644
index 0000000..3e48bc3
--- /dev/null
+++ b/libarchive/archive_hmac_private.h
@@ -0,0 +1,88 @@
+/*-
+* Copyright (c) 2014 Michihiro NAKAJIMA
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
+#endif
+
+#ifndef ARCHIVE_HMAC_PRIVATE_H_INCLUDED
+#define ARCHIVE_HMAC_PRIVATE_H_INCLUDED
+
+#ifdef __APPLE__
+#include <CommonCrypto/CommonHMAC.h>
+
+typedef	CCHmacContext archive_hmac_sha1_ctx;
+
+#elif defined(_WIN32) && !defined(__CYGWIN__)
+#include <bcrypt.h>
+
+typedef struct {
+	BCRYPT_ALG_HANDLE	hAlg;
+	BCRYPT_HASH_HANDLE	hHash;
+	DWORD				hash_len;
+	PBYTE				hash;
+
+} archive_hmac_sha1_ctx;
+
+#elif defined(HAVE_LIBNETTLE)
+#include <nettle/hmac.h>
+
+typedef	struct hmac_sha1_ctx archive_hmac_sha1_ctx;
+
+#elif defined(HAVE_LIBCRYPTO)
+#include <openssl/hmac.h>
+
+typedef	HMAC_CTX archive_hmac_sha1_ctx;
+
+#else
+
+typedef int archive_hmac_sha1_ctx;
+
+#endif
+
+
+/* HMAC */
+#define archive_hmac_sha1_init(ctx, key, key_len)\
+	__archive_hmac.__hmac_sha1_init(ctx, key, key_len)
+#define archive_hmac_sha1_update(ctx, data, data_len)\
+	__archive_hmac.__hmac_sha1_update(ctx, data, data_len)
+#define archive_hmac_sha1_final(ctx, out, out_len)\
+  	__archive_hmac.__hmac_sha1_final(ctx, out, out_len)
+#define archive_hmac_sha1_cleanup(ctx)\
+	__archive_hmac.__hmac_sha1_cleanup(ctx)
+
+
+struct archive_hmac {
+	/* HMAC */
+	int (*__hmac_sha1_init)(archive_hmac_sha1_ctx *, const uint8_t *,
+		size_t);
+	void (*__hmac_sha1_update)(archive_hmac_sha1_ctx *, const uint8_t *,
+		size_t);
+	void (*__hmac_sha1_final)(archive_hmac_sha1_ctx *, uint8_t *, size_t *);
+	void (*__hmac_sha1_cleanup)(archive_hmac_sha1_ctx *);
+};
+
+extern const struct archive_hmac __archive_hmac;
+#endif /* ARCHIVE_HMAC_PRIVATE_H_INCLUDED */
diff --git a/libarchive/archive_match.c b/libarchive/archive_match.c
index 6fb8644..74aaacb 100644
--- a/libarchive/archive_match.c
+++ b/libarchive/archive_match.c
@@ -580,6 +580,7 @@ add_pattern_from_file(struct archive_match *a, struct match_list *mlist,
 		return (ARCHIVE_FATAL);
 	}
 	r = archive_read_support_format_raw(ar);
+	r = archive_read_support_format_empty(ar);
 	if (r != ARCHIVE_OK) {
 		archive_copy_error(&(a->archive), ar);
 		archive_read_free(ar);
@@ -596,9 +597,13 @@ add_pattern_from_file(struct archive_match *a, struct match_list *mlist,
 	}
 	r = archive_read_next_header(ar, &ae);
 	if (r != ARCHIVE_OK) {
-		archive_copy_error(&(a->archive), ar);
 		archive_read_free(ar);
-		return (r);
+		if (r == ARCHIVE_EOF) {
+			return (ARCHIVE_OK);
+		} else {
+			archive_copy_error(&(a->archive), ar);
+			return (r);
+		}
 	}
 
 	archive_string_init(&as);
diff --git a/libarchive/archive_pathmatch.c b/libarchive/archive_pathmatch.c
index 505252a..619e2b6 100644
--- a/libarchive/archive_pathmatch.c
+++ b/libarchive/archive_pathmatch.c
@@ -394,8 +394,8 @@ __archive_pathmatch(const char *p, const char *s, int flags)
 	if (*p == '/' && *s != '/')
 		return (0);
 
-	/* Certain patterns and file names anchor implicitly. */
-	if (*p == '*' || *p == '/' || *p == '/') {
+	/* Certain patterns anchor implicitly. */
+	if (*p == '*' || *p == '/') {
 		while (*p == '/')
 			++p;
 		while (*s == '/')
@@ -434,8 +434,8 @@ __archive_pathmatch_w(const wchar_t *p, const wchar_t *s, int flags)
 	if (*p == L'/' && *s != L'/')
 		return (0);
 
-	/* Certain patterns and file names anchor implicitly. */
-	if (*p == L'*' || *p == L'/' || *p == L'/') {
+	/* Certain patterns anchor implicitly. */
+	if (*p == L'*' || *p == L'/') {
 		while (*p == L'/')
 			++p;
 		while (*s == L'/')
diff --git a/libarchive/archive_private.h b/libarchive/archive_private.h
index 30d472f..4b4be97 100644
--- a/libarchive/archive_private.h
+++ b/libarchive/archive_private.h
@@ -119,6 +119,23 @@ struct archive {
 	unsigned current_codepage; /* Current ACP(ANSI CodePage). */
 	unsigned current_oemcp; /* Current OEMCP(OEM CodePage). */
 	struct archive_string_conv *sconv;
+
+	/*
+	 * Used by archive_read_data() to track blocks and copy
+	 * data to client buffers, filling gaps with zero bytes.
+	 */
+	const char	 *read_data_block;
+	int64_t		  read_data_offset;
+	int64_t		  read_data_output_offset;
+	size_t		  read_data_remaining;
+
+	/*
+	 * Used by formats/filters to determine the amount of data
+	 * requested from a call to archive_read_data(). This is only
+	 * useful when the format/filter has seek support.
+	 */
+	char		  read_data_is_posix_read;
+	size_t		  read_data_requested;
 };
 
 /* Check magic value and state; return(ARCHIVE_FATAL) if it isn't valid. */
@@ -139,6 +156,8 @@ int	__archive_mktemp(const char *tmpdir);
 
 int	__archive_clean(struct archive *);
 
+void __archive_reset_read_data(struct archive *);
+
 #define	err_combine(a,b)	((a) < (b) ? (a) : (b))
 
 #if defined(__BORLANDC__) || (defined(_MSC_VER) &&  _MSC_VER <= 1300)
diff --git a/libarchive/archive_random.c b/libarchive/archive_random.c
new file mode 100644
index 0000000..57c49d5
--- /dev/null
+++ b/libarchive/archive_random.c
@@ -0,0 +1,266 @@
+/*-
+ * Copyright (c) 2014 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+__FBSDID("$FreeBSD$");
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#if !defined(HAVE_ARC4RANDOM_BUF) && (!defined(_WIN32) || defined(__CYGWIN__))
+
+#ifdef HAVE_FCNTL
+#include <fcntl.h>
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+
+static void arc4random_buf(void *, size_t);
+
+#endif /* HAVE_ARC4RANDOM_BUF */
+
+#include "archive.h"
+#include "archive_random_private.h"
+
+#if defined(HAVE_WINCRYPT_H) && !defined(__CYGWIN__)
+#include <wincrypt.h>
+#endif
+
+/*
+ * Random number generator function.
+ * This simply calls arc4random_buf function if the platform provides it.
+ */
+
+int
+archive_random(void *buf, size_t nbytes)
+{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+	HCRYPTPROV hProv;
+	BOOL success;
+
+	success = CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
+	    CRYPT_VERIFYCONTEXT);
+	if (!success && GetLastError() == NTE_BAD_KEYSET) {
+		success = CryptAcquireContext(&hProv, NULL, NULL,
+		    PROV_RSA_FULL, CRYPT_NEWKEYSET);
+	}
+	if (success) {
+		success = CryptGenRandom(hProv, (DWORD)nbytes, (BYTE*)buf);
+		CryptReleaseContext(hProv, 0);
+		if (success)
+			return ARCHIVE_OK;
+	}
+	/* TODO: Does this case really happen? */
+	return ARCHIVE_FAILED;
+#else
+	arc4random_buf(buf, nbytes);
+	return ARCHIVE_OK;
+#endif
+}
+
+#if !defined(HAVE_ARC4RANDOM_BUF) && (!defined(_WIN32) || defined(__CYGWIN__))
+
+/*	$OpenBSD: arc4random.c,v 1.24 2013/06/11 16:59:50 deraadt Exp $	*/
+/*
+ * Copyright (c) 1996, David Mazieres <dm at uun.org>
+ * Copyright (c) 2008, Damien Miller <djm at openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Arc4 random number generator for OpenBSD.
+ *
+ * This code is derived from section 17.1 of Applied Cryptography,
+ * second edition, which describes a stream cipher allegedly
+ * compatible with RSA Labs "RC4" cipher (the actual description of
+ * which is a trade secret).  The same algorithm is used as a stream
+ * cipher called "arcfour" in Tatu Ylonen's ssh package.
+ *
+ * RC4 is a registered trademark of RSA Laboratories.
+ */
+
+#ifdef __GNUC__
+#define inline __inline
+#else				/* !__GNUC__ */
+#define inline
+#endif				/* !__GNUC__ */
+
+struct arc4_stream {
+	u_int8_t i;
+	u_int8_t j;
+	u_int8_t s[256];
+};
+
+static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
+
+#define	RANDOMDEV	"/dev/urandom"
+#define	KEYSIZE		128
+#ifdef HAVE_PTHREAD_H
+#define	_ARC4_LOCK()	pthread_mutex_lock(&arc4random_mtx);
+#define	_ARC4_UNLOCK()  pthread_mutex_unlock(&arc4random_mtx);
+#else
+#define	_ARC4_LOCK()
+#define	_ARC4_UNLOCK()
+#endif
+
+static int rs_initialized;
+static struct arc4_stream rs;
+static pid_t arc4_stir_pid;
+static int arc4_count;
+
+static inline u_int8_t arc4_getbyte(void);
+static void arc4_stir(void);
+
+static inline void
+arc4_init(void)
+{
+	int     n;
+
+	for (n = 0; n < 256; n++)
+		rs.s[n] = n;
+	rs.i = 0;
+	rs.j = 0;
+}
+
+static inline void
+arc4_addrandom(u_char *dat, int datlen)
+{
+	int     n;
+	u_int8_t si;
+
+	rs.i--;
+	for (n = 0; n < 256; n++) {
+		rs.i = (rs.i + 1);
+		si = rs.s[rs.i];
+		rs.j = (rs.j + si + dat[n % datlen]);
+		rs.s[rs.i] = rs.s[rs.j];
+		rs.s[rs.j] = si;
+	}
+	rs.j = rs.i;
+}
+
+static void
+arc4_stir(void)
+{
+	int done, fd, i;
+	struct {
+		struct timeval	tv;
+		pid_t		pid;
+		u_char	 	rnd[KEYSIZE];
+	} rdat;
+
+	if (!rs_initialized) {
+		arc4_init();
+		rs_initialized = 1;
+	}
+	done = 0;
+	fd = open(RANDOMDEV, O_RDONLY | O_CLOEXEC, 0);
+	if (fd >= 0) {
+		if (read(fd, &rdat, KEYSIZE) == KEYSIZE)
+			done = 1;
+		(void)close(fd);
+	}
+	if (!done) {
+		(void)gettimeofday(&rdat.tv, NULL);
+		rdat.pid = getpid();
+		/* We'll just take whatever was on the stack too... */
+	}
+
+	arc4_addrandom((u_char *)&rdat, KEYSIZE);
+
+	/*
+	 * Discard early keystream, as per recommendations in:
+	 * "(Not So) Random Shuffles of RC4" by Ilya Mironov.
+	 */
+	for (i = 0; i < 1024; i++)
+		(void)arc4_getbyte();
+	arc4_count = 1600000;
+}
+
+static void
+arc4_stir_if_needed(void)
+{
+	pid_t pid = getpid();
+
+	if (arc4_count <= 0 || !rs_initialized || arc4_stir_pid != pid) {
+		arc4_stir_pid = pid;
+		arc4_stir();
+	}
+}
+
+static inline u_int8_t
+arc4_getbyte(void)
+{
+	u_int8_t si, sj;
+
+	rs.i = (rs.i + 1);
+	si = rs.s[rs.i];
+	rs.j = (rs.j + si);
+	sj = rs.s[rs.j];
+	rs.s[rs.i] = sj;
+	rs.s[rs.j] = si;
+	return (rs.s[(si + sj) & 0xff]);
+}
+
+static void
+arc4random_buf(void *_buf, size_t n)
+{
+	u_char *buf = (u_char *)_buf;
+	_ARC4_LOCK();
+	arc4_stir_if_needed();
+	while (n--) {
+		if (--arc4_count <= 0)
+			arc4_stir();
+		buf[n] = arc4_getbyte();
+	}
+	_ARC4_UNLOCK();
+}
+
+#endif /* !HAVE_ARC4RANDOM_BUF */
diff --git a/libarchive/archive_write_add_filter.c b/libarchive/archive_random_private.h
similarity index 50%
copy from libarchive/archive_write_add_filter.c
copy to libarchive/archive_random_private.h
index 81dd683..c414779 100644
--- a/libarchive/archive_write_add_filter.c
+++ b/libarchive/archive_random_private.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012 Ondrej Holy
+ * Copyright (c) 2014 Michihiro NAKAJIMA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,48 +23,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
 #endif
 
-#include "archive.h"
-#include "archive_private.h"
-
-/* A table that maps filter codes to functions. */
-static
-struct { int code; int (*setter)(struct archive *); } codes[] =
-{
-	{ ARCHIVE_FILTER_NONE,		archive_write_add_filter_none },
-	{ ARCHIVE_FILTER_GZIP,		archive_write_add_filter_gzip },
-	{ ARCHIVE_FILTER_BZIP2,		archive_write_add_filter_bzip2 },
-	{ ARCHIVE_FILTER_COMPRESS,	archive_write_add_filter_compress },
-	{ ARCHIVE_FILTER_GRZIP,		archive_write_add_filter_grzip },
-	{ ARCHIVE_FILTER_LRZIP,		archive_write_add_filter_lrzip },
-	{ ARCHIVE_FILTER_LZIP,		archive_write_add_filter_lzip },
-	{ ARCHIVE_FILTER_LZMA,		archive_write_add_filter_lzma },
-	{ ARCHIVE_FILTER_LZOP,		archive_write_add_filter_lzip },
-	{ ARCHIVE_FILTER_UU,		archive_write_add_filter_uuencode },
-	{ ARCHIVE_FILTER_XZ,		archive_write_add_filter_xz },
-	{ -1,			NULL }
-};
-
-int
-archive_write_add_filter(struct archive *a, int code)
-{
-	int i;
+#ifndef ARCHIVE_RANDOM_PRIVATE_H_INCLUDED
+#define ARCHIVE_RANDOM_PRIVATE_H_INCLUDED
 
-	for (i = 0; codes[i].code != -1; i++) {
-		if (code == codes[i].code)
-			return ((codes[i].setter)(a));
-	}
+/* Random number generator. */
+int archive_random(void *buf, size_t nbytes);
 
-	archive_set_error(a, EINVAL, "No such filter");
-	return (ARCHIVE_FATAL);
-}
+#endif /* ARCHIVE_RANDOM_PRIVATE_H_INCLUDED */
diff --git a/libarchive/archive_read.3 b/libarchive/archive_read.3
index a29cc1e..d37e732 100644
--- a/libarchive/archive_read.3
+++ b/libarchive/archive_read.3
@@ -130,7 +130,7 @@ which provides a slightly more efficient interface.
 You may prefer to use the higher-level
 .Fn archive_read_data_skip ,
 which reads and discards the data for this entry,
-.Fn archive_read_data_to_file ,
+.Fn archive_read_data_into_fd ,
 which copies the data to the provided file descriptor, or
 .Fn archive_read_extract ,
 which recreates the specified entry on disk and copies data
@@ -186,7 +186,7 @@ list_archive(const char *name)
   free(mydata);
 }
 
-ssize_t
+la_ssize_t
 myread(struct archive *a, void *client_data, const void **buff)
 {
   struct mydata *mydata = client_data;
diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index c9f28b8..41842d4 100644
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -101,16 +101,17 @@ archive_read_new(void)
 {
 	struct archive_read *a;
 
-	a = (struct archive_read *)malloc(sizeof(*a));
+	a = (struct archive_read *)calloc(1, sizeof(*a));
 	if (a == NULL)
 		return (NULL);
-	memset(a, 0, sizeof(*a));
 	a->archive.magic = ARCHIVE_READ_MAGIC;
 
 	a->archive.state = ARCHIVE_STATE_NEW;
 	a->entry = archive_entry_new2(&a->archive);
 	a->archive.vtable = archive_read_vtable();
 
+	a->passphrases.last = &a->passphrases.first;
+
 	return (&a->archive);
 }
 
@@ -194,10 +195,12 @@ client_skip_proxy(struct archive_read_filter *self, int64_t request)
 				ask = skip_limit;
 			get = (self->archive->client.skipper)
 				(&self->archive->archive, self->data, ask);
-			if (get == 0)
+			total += get;
+			if (get == 0 || get == request)
 				return (total);
+			if (get > request)
+				return ARCHIVE_FATAL;
 			request -= get;
-			total += get;
 		}
 	} else if (self->archive->client.seeker != NULL
 		&& request > 64 * 1024) {
@@ -230,8 +233,11 @@ client_seek_proxy(struct archive_read_filter *self, int64_t offset, int whence)
 	 * other libarchive code that assumes a successful forward
 	 * seek means it can also seek backwards.
 	 */
-	if (self->archive->client.seeker == NULL)
+	if (self->archive->client.seeker == NULL) {
+		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
+		    "Current client reader does not support seeking a device");
 		return (ARCHIVE_FAILED);
+	}
 	return (self->archive->client.seeker)(&self->archive->archive,
 	    self->data, offset, whence);
 }
@@ -454,7 +460,7 @@ archive_read_open1(struct archive *_a)
 {
 	struct archive_read *a = (struct archive_read *)_a;
 	struct archive_read_filter *filter, *tmp;
-	int slot, e;
+	int slot, e = ARCHIVE_OK;
 	unsigned int i;
 
 	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
@@ -544,13 +550,13 @@ archive_read_open1(struct archive *_a)
 static int
 choose_filters(struct archive_read *a)
 {
-	int number_bidders, i, bid, best_bid;
+	int number_bidders, i, bid, best_bid, n;
 	struct archive_read_filter_bidder *bidder, *best_bidder;
 	struct archive_read_filter *filter;
 	ssize_t avail;
 	int r;
 
-	for (;;) {
+	for (n = 0; n < 25; ++n) {
 		number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
 
 		best_bid = 0;
@@ -596,6 +602,9 @@ choose_filters(struct archive_read *a)
 			return (ARCHIVE_FATAL);
 		}
 	}
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+	    "Input requires too many filters for decoding");
+	return (ARCHIVE_FATAL);
 }
 
 /*
@@ -658,16 +667,14 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry)
 		break;
 	}
 
-	a->read_data_output_offset = 0;
-	a->read_data_remaining = 0;
-	a->read_data_is_posix_read = 0;
-	a->read_data_requested = 0;
+	__archive_reset_read_data(&a->archive);
+
 	a->data_start_node = a->client.cursor;
 	/* EOF always wins; otherwise return the worst error. */
 	return (r2 < r1 || r2 == ARCHIVE_EOF) ? r2 : r1;
 }
 
-int
+static int
 _archive_read_next_header(struct archive *_a, struct archive_entry **entryp)
 {
 	int ret;
@@ -813,7 +820,7 @@ archive_read_format_capabilities(struct archive *_a)
 ssize_t
 archive_read_data(struct archive *_a, void *buff, size_t s)
 {
-	struct archive_read *a = (struct archive_read *)_a;
+	struct archive *a = (struct archive *)_a;
 	char	*dest;
 	const void *read_buf;
 	size_t	 bytes_read;
@@ -828,7 +835,7 @@ archive_read_data(struct archive *_a, void *buff, size_t s)
 			read_buf = a->read_data_block;
 			a->read_data_is_posix_read = 1;
 			a->read_data_requested = s;
-			r = _archive_read_data_block(&a->archive, &read_buf,
+			r = archive_read_data_block(a, &read_buf,
 			    &a->read_data_remaining, &a->read_data_offset);
 			a->read_data_block = read_buf;
 			if (r == ARCHIVE_EOF)
@@ -843,7 +850,7 @@ archive_read_data(struct archive *_a, void *buff, size_t s)
 		}
 
 		if (a->read_data_offset < a->read_data_output_offset) {
-			archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+			archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
 			    "Encountered out-of-order sparse blocks");
 			return (ARCHIVE_RETRY);
 		}
@@ -887,6 +894,21 @@ archive_read_data(struct archive *_a, void *buff, size_t s)
 }
 
 /*
+ * Reset the read_data_* variables, used for starting a new entry.
+ */
+void __archive_reset_read_data(struct archive * a)
+{
+	a->read_data_output_offset = 0;
+	a->read_data_remaining = 0;
+	a->read_data_is_posix_read = 0;
+	a->read_data_requested = 0;
+
+   /* extra resets, from rar.c */
+   a->read_data_block = NULL;
+   a->read_data_offset = 0;
+}
+
+/*
  * Skip over all remaining data in this entry.
  */
 int
@@ -953,7 +975,7 @@ _archive_read_data_block(struct archive *_a,
 	if (a->format->read_data == NULL) {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
 		    "Internal error: "
-		    "No format_read_data_block function registered");
+		    "No format->read_data function registered");
 		return (ARCHIVE_FATAL);
 	}
 
@@ -1040,6 +1062,7 @@ static int
 _archive_read_free(struct archive *_a)
 {
 	struct archive_read *a = (struct archive_read *)_a;
+	struct archive_read_passphrase *p;
 	int i, n;
 	int slots;
 	int r = ARCHIVE_OK;
@@ -1077,9 +1100,20 @@ _archive_read_free(struct archive *_a)
 		}
 	}
 
+	/* Release passphrase list. */
+	p = a->passphrases.first;
+	while (p != NULL) {
+		struct archive_read_passphrase *np = p->next;
+
+		/* A passphrase should be cleaned. */
+		memset(p->passphrase, 0, strlen(p->passphrase));
+		free(p->passphrase);
+		free(p);
+		p = np;
+	}
+
 	archive_string_free(&a->archive.error_string);
-	if (a->entry)
-		archive_entry_free(a->entry);
+	archive_entry_free(a->entry);
 	a->archive.magic = 0;
 	__archive_clean(&a->archive);
 	free(a->client.dataset);
@@ -1451,6 +1485,8 @@ __archive_read_filter_consume(struct archive_read_filter * filter,
 {
 	int64_t skipped;
 
+	if (request < 0)
+		return ARCHIVE_FATAL;
 	if (request == 0)
 		return 0;
 
diff --git a/libarchive/archive_write_data.3 b/libarchive/archive_read_add_passphrase.3
similarity index 59%
copy from libarchive/archive_write_data.3
copy to libarchive/archive_read_add_passphrase.3
index cfd5cd5..8b242ea 100644
--- a/libarchive/archive_write_data.3
+++ b/libarchive/archive_read_add_passphrase.3
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2003-2011 Tim Kientzle
+.\" Copyright (c) 2014 Michihiro NAKAJIMA
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,39 +24,51 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 2, 2012
-.Dt ARCHIVE_WRITE_DATA 3
+.Dd September 14, 2014
+.Dt ARCHIVE_READ_ADD_PASSPHRASE 3
 .Os
 .Sh NAME
-.Nm archive_write_data
-.Nd functions for creating archives
+.Nm archive_read_add_passphrase ,
+.Nm archive_read_set_passphrase_callback
+.Nd functions for reading encrypted archives
 .Sh LIBRARY
 Streaming Archive Library (libarchive, -larchive)
 .Sh SYNOPSIS
 .In archive.h
-.Ft ssize_t
-.Fn archive_write_data "struct archive *" "const void *" "size_t"
+.Ft int
+.Fo archive_read_add_passphrase
+.Fa "struct archive *"
+.Fa "const char *passphrase"
+.Fc
+.Ft int
+.Fo archive_read_set_passphrase_callback
+.Fa "struct archive *"
+.Fa "void *client_data"
+.Fa "archive_passphrase_callback *"
+.Fc
 .Sh DESCRIPTION
-Write data corresponding to the header just written.
-.\" .Sh EXAMPLE
-.\"
-.Sh RETURN VALUES
-This function returns the number of bytes actually written, or
-.Li -1
-on error.
-.\"
-.Sh ERRORS
-Detailed error codes and textual descriptions are available from the
-.Fn archive_errno
-and
-.Fn archive_error_string
-functions.
-.\"
+.Bl -tag -width indent
+.It Fn archive_read_add_passphrase
+Register passphrases for reading an encryption archive.
+If
+.Ar passphrase
+is
+.Dv NULL
+or empty, this function will do nothing and
+.Cm ARCHIVE_FAILED
+will be returned.
+Otherwise,
+.Cm ARCHIVE_OK
+will be returned. 
+.It Fn archive_read_set_passphrase_callback
+Register callback function that will be invoked to get a passphrase 
+for decrption after trying all passphrases registered by the
+.Fn archive_read_add_passphrase
+function failed.
+.El
+.\" .Sh ERRORS
 .Sh SEE ALSO
 .Xr tar 1 ,
 .Xr libarchive 3 ,
-.Xr archive_write_finish_entry 3 ,
-.Xr archive_write_set_options 3 ,
-.Xr cpio 5 ,
-.Xr mtree 5 ,
-.Xr tar 5
+.Xr archive_read 3 ,
+.Xr archive_read_set_options 3
diff --git a/libarchive/archive_read_add_passphrase.c b/libarchive/archive_read_add_passphrase.c
new file mode 100644
index 0000000..f67f1eb
--- /dev/null
+++ b/libarchive/archive_read_add_passphrase.c
@@ -0,0 +1,186 @@
+/*-
+ * Copyright (c) 2014 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+__FBSDID("$FreeBSD$");
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include "archive_read_private.h"
+
+static void
+add_passphrase_to_tail(struct archive_read *a,
+    struct archive_read_passphrase *p)
+{
+	*a->passphrases.last = p;
+	a->passphrases.last = &p->next;
+	p->next = NULL;
+}
+
+static struct archive_read_passphrase *
+remove_passphrases_from_head(struct archive_read *a)
+{
+	struct archive_read_passphrase *p;
+
+	p = a->passphrases.first;
+	if (p != NULL)
+		a->passphrases.first = p->next;
+	return (p);
+}
+
+static void
+insert_passphrase_to_head(struct archive_read *a,
+    struct archive_read_passphrase *p)
+{
+	p->next = a->passphrases.first;
+	a->passphrases.first = p;
+}
+
+static struct archive_read_passphrase *
+new_read_passphrase(struct archive_read *a, const char *passphrase)
+{
+	struct archive_read_passphrase *p;
+
+	p = malloc(sizeof(*p));
+	if (p == NULL) {
+		archive_set_error(&a->archive, ENOMEM,
+		    "Can't allocate memory");
+		return (NULL);
+	}
+	p->passphrase = strdup(passphrase);
+	if (p->passphrase == NULL) {
+		free(p);
+		archive_set_error(&a->archive, ENOMEM,
+		    "Can't allocate memory");
+		return (NULL);
+	}
+	return (p);
+}
+
+int
+archive_read_add_passphrase(struct archive *_a, const char *passphrase)
+{
+	struct archive_read *a = (struct archive_read *)_a;
+	struct archive_read_passphrase *p;
+
+	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
+		"archive_read_add_passphrase");
+
+	if (passphrase == NULL || passphrase[0] == '\0') {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Empty passphrase is unacceptable");
+		return (ARCHIVE_FAILED);
+	}
+
+	p = new_read_passphrase(a, passphrase);
+	if (p == NULL)
+		return (ARCHIVE_FATAL);
+	add_passphrase_to_tail(a, p);
+
+	return (ARCHIVE_OK);
+}
+
+int
+archive_read_set_passphrase_callback(struct archive *_a, void *client_data,
+    archive_passphrase_callback *cb)
+{
+	struct archive_read *a = (struct archive_read *)_a;
+
+	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
+		"archive_read_set_passphrase_callback");
+
+	a->passphrases.callback = cb;
+	a->passphrases.client_data = client_data;
+	return (ARCHIVE_OK);
+}
+
+/*
+ * Call this in advance when you start to get a passphrase for decryption
+ * for a entry.
+ */
+void
+__archive_read_reset_passphrase(struct archive_read *a)
+{
+
+	a->passphrases.candiate = -1;
+}
+
+/*
+ * Get a passphrase for decryption.
+ */
+const char *
+__archive_read_next_passphrase(struct archive_read *a)
+{
+	struct archive_read_passphrase *p;
+	const char *passphrase;
+
+	if (a->passphrases.candiate < 0) {
+		/* Count out how many passphrases we have. */
+		int cnt = 0;
+
+		for (p = a->passphrases.first; p != NULL; p = p->next)
+			cnt++;
+		a->passphrases.candiate = cnt;
+		p = a->passphrases.first;
+	} else if (a->passphrases.candiate > 1) {
+		/* Rotate a passphrase list. */
+		a->passphrases.candiate--;
+		p = remove_passphrases_from_head(a);
+		add_passphrase_to_tail(a, p);
+		/* Pick a new passphrase candiate up. */
+		p = a->passphrases.first;
+	} else if (a->passphrases.candiate == 1) {
+		/* This case is that all cadiates failed to decryption. */
+		a->passphrases.candiate = 0;
+		if (a->passphrases.first->next != NULL) {
+			/* Rotate a passphrase list. */
+			p = remove_passphrases_from_head(a);
+			add_passphrase_to_tail(a, p);
+		}
+		p = NULL;
+	} else  /* There is no passphrase candaite. */
+		p = NULL;
+
+	if (p != NULL)
+		passphrase = p->passphrase;
+	else if (a->passphrases.callback != NULL) {
+		/* Get a passphrase through a call-back function
+		 * since we tried all passphrases out or we don't
+		 * have it. */
+		passphrase = a->passphrases.callback(&a->archive,
+		    a->passphrases.client_data);
+		if (passphrase != NULL) {
+			p = new_read_passphrase(a, passphrase);
+			if (p == NULL)
+				return (NULL);
+			insert_passphrase_to_head(a, p);
+			a->passphrases.candiate = 1;
+		}
+	} else
+		passphrase = NULL;
+
+	return (passphrase);
+}
diff --git a/libarchive/archive_read_append_filter.c b/libarchive/archive_read_append_filter.c
index 017d7c6..3a0d4d6 100644
--- a/libarchive/archive_read_append_filter.c
+++ b/libarchive/archive_read_append_filter.c
@@ -43,7 +43,7 @@ archive_read_append_filter(struct archive *_a, int code)
   struct archive_read_filter *filter;
   struct archive_read *a = (struct archive_read *)_a;
 
-  r1 = r2 = (ARCHIVE_OK);
+  r2 = (ARCHIVE_OK);
   switch (code)
   {
     case ARCHIVE_FILTER_NONE:
@@ -85,6 +85,10 @@ archive_read_append_filter(struct archive *_a, int code)
       strcpy(str, "rpm");
       r1 = archive_read_support_filter_rpm(_a);
       break;
+    case ARCHIVE_FILTER_LZ4:
+      strcpy(str, "lz4");
+      r1 = archive_read_support_filter_lz4(_a);
+      break;
     case ARCHIVE_FILTER_LZIP:
       strcpy(str, "lzip");
       r1 = archive_read_support_filter_lzip(_a);
diff --git a/libarchive/archive_read_data.3 b/libarchive/archive_read_data.3
index bf0578c..c1bc15d 100644
--- a/libarchive/archive_read_data.3
+++ b/libarchive/archive_read_data.3
@@ -37,7 +37,7 @@
 Streaming Archive Library (libarchive, -larchive)
 .Sh SYNOPSIS
 .In archive.h
-.Ft ssize_t
+.Ft la_ssize_t
 .Fn archive_read_data "struct archive *" "void *buff" "size_t len"
 .Ft int
 .Fo archive_read_data_block
diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index e81cbec..38303aa 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -251,9 +251,11 @@ archive_read_disk_entry_from_file(struct archive *_a,
 #endif /* HAVE_READLINK || HAVE_READLINKAT */
 
 	r = setup_acls(a, entry, &fd);
-	r1 = setup_xattrs(a, entry, &fd);
-	if (r1 < r)
-		r = r1;
+	if (!a->suppress_xattr) {
+		r1 = setup_xattrs(a, entry, &fd);
+		if (r1 < r)
+			r = r1;
+	}
 	if (a->enable_copyfile) {
 		r1 = setup_mac_metadata(a, entry, &fd);
 		if (r1 < r)
diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 94eb5e7..f480539 100644
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -356,6 +356,8 @@ static int	_archive_read_free(struct archive *);
 static int	_archive_read_close(struct archive *);
 static int	_archive_read_data_block(struct archive *,
 		    const void **, size_t *, int64_t *);
+static int	_archive_read_next_header(struct archive *,
+		    struct archive_entry **);
 static int	_archive_read_next_header2(struct archive *,
 		    struct archive_entry *);
 static const char *trivial_lookup_gname(void *, int64_t gid);
@@ -377,6 +379,7 @@ archive_read_disk_vtable(void)
 		av.archive_free = _archive_read_free;
 		av.archive_close = _archive_read_close;
 		av.archive_read_data_block = _archive_read_data_block;
+		av.archive_read_next_header = _archive_read_next_header;
 		av.archive_read_next_header2 = _archive_read_next_header2;
 		inited = 1;
 	}
@@ -459,6 +462,7 @@ archive_read_disk_new(void)
 	a->archive.magic = ARCHIVE_READ_DISK_MAGIC;
 	a->archive.state = ARCHIVE_STATE_NEW;
 	a->archive.vtable = archive_read_disk_vtable();
+	a->entry = archive_entry_new2(&a->archive);
 	a->lookup_uname = trivial_lookup_uname;
 	a->lookup_gname = trivial_lookup_gname;
 	a->enable_copyfile = 1;
@@ -491,6 +495,7 @@ _archive_read_free(struct archive *_a)
 	if (a->cleanup_uname != NULL && a->lookup_uname_data != NULL)
 		(a->cleanup_uname)(a->lookup_uname_data);
 	archive_string_free(&a->archive.error_string);
+	archive_entry_free(a->entry);
 	a->archive.magic = 0;
 	__archive_clean(&a->archive);
 	free(a);
@@ -609,6 +614,10 @@ archive_read_disk_set_behavior(struct archive *_a, int flags)
 		a->traverse_mount_points = 0;
 	else
 		a->traverse_mount_points = 1;
+	if (flags & ARCHIVE_READDISK_NO_XATTR)
+		a->suppress_xattr = 1;
+	else
+		a->suppress_xattr = 0;
 	return (r);
 }
 
@@ -974,7 +983,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
 		t->initial_filesystem_id = t->current_filesystem_id;
 	if (!a->traverse_mount_points) {
 		if (t->initial_filesystem_id != t->current_filesystem_id)
-			return (ARCHIVE_RETRY);
+			descend = 0;
 	}
 	t->descend = descend;
 
@@ -1081,6 +1090,17 @@ next_entry(struct archive_read_disk *a, struct tree *t,
 }
 
 static int
+_archive_read_next_header(struct archive *_a, struct archive_entry **entryp)
+{
+	int ret;
+	struct archive_read_disk *a = (struct archive_read_disk *)_a;
+	*entryp = NULL;
+	ret = _archive_read_next_header2(_a, a->entry);
+	*entryp = a->entry;
+	return ret;
+}
+
+static int
 _archive_read_next_header2(struct archive *_a, struct archive_entry *entry)
 {
 	struct archive_read_disk *a = (struct archive_read_disk *)_a;
@@ -1148,6 +1168,7 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry)
 		break;
 	}
 
+	__archive_reset_read_data(&a->archive);
 	return (r);
 }
 
diff --git a/libarchive/archive_read_disk_private.h b/libarchive/archive_read_disk_private.h
index e5af16b..2569321 100644
--- a/libarchive/archive_read_disk_private.h
+++ b/libarchive/archive_read_disk_private.h
@@ -39,6 +39,9 @@ struct archive_entry;
 struct archive_read_disk {
 	struct archive	archive;
 
+	/* Reused by archive_read_next_header() */
+	struct archive_entry *entry;
+
 	/*
 	 * Symlink mode is one of 'L'ogical, 'P'hysical, or 'H'ybrid,
 	 * following an old BSD convention.  'L' follows all symlinks,
@@ -68,6 +71,8 @@ struct archive_read_disk {
 	int		 enable_copyfile;
 	/* Set 1 if users request to traverse mount points. */
 	int		 traverse_mount_points;
+	/* Set 1 if users want to suppress xattr information. */
+	int		 suppress_xattr;
 
 	const char * (*lookup_gname)(void *private, int64_t gid);
 	void	(*cleanup_gname)(void *private);
diff --git a/libarchive/archive_read_disk_set_standard_lookup.c b/libarchive/archive_read_disk_set_standard_lookup.c
index 3bc52c7..d6b2d55 100644
--- a/libarchive/archive_read_disk_set_standard_lookup.c
+++ b/libarchive/archive_read_disk_set_standard_lookup.c
@@ -83,7 +83,7 @@ static const char *	lookup_uname_helper(struct name_cache *, id_t uid);
  * a simple cache to accelerate such lookups---into the archive_read_disk
  * object.  This is in a separate file because getpwuid()/getgrgid()
  * can pull in a LOT of library code (including NIS/LDAP functions, which
- * pull in DNS resolveers, etc).  This can easily top 500kB, which makes
+ * pull in DNS resolvers, etc).  This can easily top 500kB, which makes
  * it inappropriate for some space-constrained applications.
  *
  * Applications that are size-sensitive may want to just use the
diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
index 5c0f366..53bd4b8 100644
--- a/libarchive/archive_read_disk_windows.c
+++ b/libarchive/archive_read_disk_windows.c
@@ -288,6 +288,8 @@ static int	_archive_read_free(struct archive *);
 static int	_archive_read_close(struct archive *);
 static int	_archive_read_data_block(struct archive *,
 		    const void **, size_t *, int64_t *);
+static int	_archive_read_next_header(struct archive *,
+		    struct archive_entry **);
 static int	_archive_read_next_header2(struct archive *,
 		    struct archive_entry *);
 static const char *trivial_lookup_gname(void *, int64_t gid);
@@ -310,6 +312,7 @@ archive_read_disk_vtable(void)
 		av.archive_free = _archive_read_free;
 		av.archive_close = _archive_read_close;
 		av.archive_read_data_block = _archive_read_data_block;
+		av.archive_read_next_header = _archive_read_next_header;
 		av.archive_read_next_header2 = _archive_read_next_header2;
 		inited = 1;
 	}
@@ -393,6 +396,7 @@ archive_read_disk_new(void)
 	a->archive.magic = ARCHIVE_READ_DISK_MAGIC;
 	a->archive.state = ARCHIVE_STATE_NEW;
 	a->archive.vtable = archive_read_disk_vtable();
+	a->entry = archive_entry_new2(&a->archive);
 	a->lookup_uname = trivial_lookup_uname;
 	a->lookup_gname = trivial_lookup_gname;
 	a->enable_copyfile = 1;
@@ -422,6 +426,7 @@ _archive_read_free(struct archive *_a)
 	if (a->cleanup_uname != NULL && a->lookup_uname_data != NULL)
 		(a->cleanup_uname)(a->lookup_uname_data);
 	archive_string_free(&a->archive.error_string);
+	archive_entry_free(a->entry);
 	a->archive.magic = 0;
 	free(a);
 	return (r);
@@ -945,6 +950,17 @@ next_entry(struct archive_read_disk *a, struct tree *t,
 }
 
 static int
+_archive_read_next_header(struct archive *_a, struct archive_entry **entryp)
+{
+       int ret;
+       struct archive_read_disk *a = (struct archive_read_disk *)_a;
+       *entryp = NULL;
+       ret = _archive_read_next_header2(_a, a->entry);
+       *entryp = a->entry;
+       return ret;
+}
+
+static int
 _archive_read_next_header2(struct archive *_a, struct archive_entry *entry)
 {
 	struct archive_read_disk *a = (struct archive_read_disk *)_a;
@@ -1000,6 +1016,7 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry)
 		break;
 	}
 
+	__archive_reset_read_data(&a->archive);
 	return (r);
 }
 
@@ -1851,8 +1868,6 @@ entry_copy_bhfi(struct archive_entry *entry, const wchar_t *path,
 				break;
 			case L'C': case L'c':
 				if (((p[2] == L'M' || p[2] == L'm' ) &&
-				    (p[3] == L'D' || p[3] == L'd' )) ||
-				    ((p[2] == L'M' || p[2] == L'm' ) &&
 				    (p[3] == L'D' || p[3] == L'd' )))
 					mode |= S_IXUSR | S_IXGRP | S_IXOTH;
 				break;
diff --git a/libarchive/archive_read_extract.c b/libarchive/archive_read_extract.c
index ce76a6c..b7973fa 100644
--- a/libarchive/archive_read_extract.c
+++ b/libarchive/archive_read_extract.c
@@ -35,8 +35,6 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.61 2008/05/26
 #include "archive_private.h"
 #include "archive_read_private.h"
 
-static int	archive_read_extract_cleanup(struct archive_read *);
-
 int
 archive_read_extract(struct archive *_a, struct archive_entry *entry, int flags)
 {
@@ -55,23 +53,8 @@ archive_read_extract(struct archive *_a, struct archive_entry *entry, int flags)
 			return (ARCHIVE_FATAL);
 		}
 		archive_write_disk_set_standard_lookup(extract->ad);
-		a->cleanup_archive_extract = archive_read_extract_cleanup;
 	}
 
 	archive_write_disk_set_options(extract->ad, flags);
 	return (archive_read_extract2(&a->archive, entry, extract->ad));
 }
-
-/*
- * Cleanup function for archive_extract.
- */
-static int
-archive_read_extract_cleanup(struct archive_read *a)
-{
-	int ret = ARCHIVE_OK;
-
-	ret = archive_write_free(a->extract->ad);
-	free(a->extract);
-	a->extract = NULL;
-	return (ret);
-}
diff --git a/libarchive/archive_read_extract2.c b/libarchive/archive_read_extract2.c
index 3c65e80..7b2c126 100644
--- a/libarchive/archive_read_extract2.c
+++ b/libarchive/archive_read_extract2.c
@@ -42,6 +42,8 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.61 2008/05/26
 #include "archive_read_private.h"
 
 static int	copy_data(struct archive *ar, struct archive *aw);
+static int	archive_read_extract_cleanup(struct archive_read *);
+
 
 /* Retrieve an extract object without initialising the associated
  * archive_write_disk object.
@@ -56,10 +58,27 @@ __archive_read_get_extract(struct archive_read *a)
 			return (NULL);
 		}
 		memset(a->extract, 0, sizeof(*a->extract));
+		a->cleanup_archive_extract = archive_read_extract_cleanup;
 	}
 	return (a->extract);
 }
 
+/*
+ * Cleanup function for archive_extract.
+ */
+static int
+archive_read_extract_cleanup(struct archive_read *a)
+{
+	int ret = ARCHIVE_OK;
+
+	if (a->extract->ad != NULL) {
+		ret = archive_write_free(a->extract->ad);
+	}
+	free(a->extract);
+	a->extract = NULL;
+	return (ret);
+}
+
 int
 archive_read_extract2(struct archive *_a, struct archive_entry *entry,
     struct archive *ad)
@@ -125,7 +144,7 @@ copy_data(struct archive *ar, struct archive *aw)
 		r = (int)archive_write_data_block(aw, buff, size, offset);
 		if (r < ARCHIVE_WARN)
 			r = ARCHIVE_WARN;
-		if (r != ARCHIVE_OK) {
+		if (r < ARCHIVE_OK) {
 			archive_set_error(ar, archive_errno(aw),
 			    "%s", archive_error_string(aw));
 			return (r);
diff --git a/libarchive/archive_read_filter.3 b/libarchive/archive_read_filter.3
index 8761127..47effac 100644
--- a/libarchive/archive_read_filter.3
+++ b/libarchive/archive_read_filter.3
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 2, 2012
+.Dd August 14, 2014
 .Dt ARCHIVE_READ_FILTER 3
 .Os
 .Sh NAME
@@ -32,8 +32,11 @@
 .Nm archive_read_support_filter_bzip2 ,
 .Nm archive_read_support_filter_compress ,
 .Nm archive_read_support_filter_gzip ,
+.Nm archive_read_support_filter_lz4 ,
 .Nm archive_read_support_filter_lzma ,
 .Nm archive_read_support_filter_none ,
+.Nm archive_read_support_filter_rpm ,
+.Nm archive_read_support_filter_uu ,
 .Nm archive_read_support_filter_xz ,
 .Nm archive_read_support_filter_program ,
 .Nm archive_read_support_filter_program_signature
@@ -52,10 +55,18 @@ Streaming Archive Library (libarchive, -larchive)
 .Ft int
 .Fn archive_read_support_filter_gzip "struct archive *"
 .Ft int
+.Fn archive_read_support_filter_lz4 "struct archive *"
+.Ft int
 .Fn archive_read_support_filter_lzma "struct archive *"
 .Ft int
+.Fn archive_read_support_filter_lzop "struct archive *"
+.Ft int
 .Fn archive_read_support_filter_none "struct archive *"
 .Ft int
+.Fn archive_read_support_filter_rpm "struct archive *"
+.Ft int
+.Fn archive_read_support_filter_uu "struct archive *"
+.Ft int
 .Fn archive_read_support_filter_xz "struct archive *"
 .Ft int
 .Fo archive_read_support_filter_program
@@ -76,8 +87,12 @@ Streaming Archive Library (libarchive, -larchive)
 .Fn archive_read_support_filter_bzip2 ,
 .Fn archive_read_support_filter_compress ,
 .Fn archive_read_support_filter_gzip ,
+.Fn archive_read_support_filter_lz4 ,
 .Fn archive_read_support_filter_lzma ,
+.Fn archive_read_support_filter_lzop ,
 .Fn archive_read_support_filter_none ,
+.Fn archive_read_support_filter_rpm ,
+.Fn archive_read_support_filter_uu ,
 .Fn archive_read_support_filter_xz
 .Xc
 Enables auto-detection code and decompression support for the
diff --git a/libarchive/archive_read_open.3 b/libarchive/archive_read_open.3
index 30a740b..4d8272c 100644
--- a/libarchive/archive_read_open.3
+++ b/libarchive/archive_read_open.3
@@ -130,14 +130,14 @@ objects can be found in the overview manual page for
 The callback functions must match the following prototypes:
 .Bl -item -offset indent
 .It
-.Ft typedef ssize_t
+.Ft typedef la_ssize_t
 .Fo archive_read_callback
 .Fa "struct archive *"
 .Fa "void *client_data"
 .Fa "const void **buffer"
 .Fc
 .It
-.Ft typedef off_t
+.Ft typedef la_int64_t
 .Fo archive_skip_callback
 .Fa "struct archive *"
 .Fa "void *client_data"
diff --git a/libarchive/archive_read_open_fd.c b/libarchive/archive_read_open_fd.c
index e0f95bf..f59cd07 100644
--- a/libarchive/archive_read_open_fd.c
+++ b/libarchive/archive_read_open_fd.c
@@ -59,6 +59,7 @@ struct read_fd_data {
 
 static int	file_close(struct archive *, void *);
 static ssize_t	file_read(struct archive *, void *, const void **buff);
+static int64_t	file_seek(struct archive *, void *, int64_t request, int);
 static int64_t	file_skip(struct archive *, void *, int64_t request);
 
 int
@@ -102,6 +103,7 @@ archive_read_open_fd(struct archive *a, int fd, size_t block_size)
 
 	archive_read_set_read_callback(a, file_read);
 	archive_read_set_skip_callback(a, file_skip);
+	archive_read_set_seek_callback(a, file_seek);
 	archive_read_set_close_callback(a, file_close);
 	archive_read_set_callback_data(a, mine);
 	return (archive_read_open1(a));
@@ -170,6 +172,33 @@ file_skip(struct archive *a, void *client_data, int64_t request)
 	return (-1);
 }
 
+/*
+ * TODO: Store the offset and use it in the read callback.
+ */
+static int64_t
+file_seek(struct archive *a, void *client_data, int64_t request, int whence)
+{
+	struct read_fd_data *mine = (struct read_fd_data *)client_data;
+	int64_t r;
+
+	/* We use off_t here because lseek() is declared that way. */
+	/* See above for notes about when off_t is less than 64 bits. */
+	r = lseek(mine->fd, request, whence);
+	if (r >= 0)
+		return r;
+
+	if (errno == ESPIPE) {
+		archive_set_error(a, errno,
+		    "A file descriptor(%d) is not seekable(PIPE)", mine->fd);
+		return (ARCHIVE_FAILED);
+	} else {
+		/* If the input is corrupted or truncated, fail. */
+		archive_set_error(a, errno,
+		    "Error seeking in a file descriptor(%d)", mine->fd);
+		return (ARCHIVE_FATAL);
+	}
+}
+
 static int
 file_close(struct archive *a, void *client_data)
 {
diff --git a/libarchive/archive_read_open_memory.c b/libarchive/archive_read_open_memory.c
index bcc7d6f..ff935a7 100644
--- a/libarchive/archive_read_open_memory.c
+++ b/libarchive/archive_read_open_memory.c
@@ -41,9 +41,9 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.6 2007/07/
  */
 
 struct read_memory_data {
-	unsigned char	*start;
-	unsigned char	*p;
-	unsigned char	*end;
+	const unsigned char	*start;
+	const unsigned char	*p;
+	const unsigned char	*end;
 	ssize_t	 read_size;
 };
 
@@ -54,7 +54,7 @@ static int64_t	memory_read_skip(struct archive *, void *, int64_t request);
 static ssize_t	memory_read(struct archive *, void *, const void **buff);
 
 int
-archive_read_open_memory(struct archive *a, void *buff, size_t size)
+archive_read_open_memory(struct archive *a, const void *buff, size_t size)
 {
 	return archive_read_open_memory2(a, buff, size, size);
 }
@@ -65,7 +65,7 @@ archive_read_open_memory(struct archive *a, void *buff, size_t size)
  * test harnesses can exercise block operations inside the library.
  */
 int
-archive_read_open_memory2(struct archive *a, void *buff,
+archive_read_open_memory2(struct archive *a, const void *buff,
     size_t size, size_t read_size)
 {
 	struct read_memory_data *mine;
@@ -76,7 +76,7 @@ archive_read_open_memory2(struct archive *a, void *buff,
 		return (ARCHIVE_FATAL);
 	}
 	memset(mine, 0, sizeof(*mine));
-	mine->start = mine->p = (unsigned char *)buff;
+	mine->start = mine->p = (const unsigned char *)buff;
 	mine->end = mine->start + size;
 	mine->read_size = read_size;
 	archive_read_set_open_callback(a, memory_read_open);
diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h
index 27e203b..9b61a53 100644
--- a/libarchive/archive_read_private.h
+++ b/libarchive/archive_read_private.h
@@ -26,8 +26,10 @@
  */
 
 #ifndef __LIBARCHIVE_BUILD
+#ifndef __LIBARCHIVE_TEST
 #error This header is only to be used internally to libarchive.
 #endif
+#endif
 
 #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED
 #define	ARCHIVE_READ_PRIVATE_H_INCLUDED
@@ -141,6 +143,10 @@ struct archive_read_client {
 	int64_t position;
 	struct archive_read_data_node *dataset;
 };
+struct archive_read_passphrase {
+	char	*passphrase;
+	struct archive_read_passphrase *next;
+};
 
 struct archive_read_extract {
 	struct archive *ad; /* archive_write_disk object */
@@ -160,28 +166,11 @@ struct archive_read {
 	int64_t		  skip_file_dev;
 	int64_t		  skip_file_ino;
 
-	/*
-	 * Used by archive_read_data() to track blocks and copy
-	 * data to client buffers, filling gaps with zero bytes.
-	 */
-	const char	 *read_data_block;
-	int64_t		  read_data_offset;
-	int64_t		  read_data_output_offset;
-	size_t		  read_data_remaining;
-
-	/*
-	 * Used by formats/filters to determine the amount of data
-	 * requested from a call to archive_read_data(). This is only
-	 * useful when the format/filter has seek support.
-	 */
-	char		  read_data_is_posix_read;
-	size_t		  read_data_requested;
-
 	/* Callbacks to open/read/write/close client archive streams. */
 	struct archive_read_client client;
 
 	/* Registered filter bidders. */
-	struct archive_read_filter_bidder bidders[14];
+	struct archive_read_filter_bidder bidders[16];
 
 	/* Last filter in chain */
 	struct archive_read_filter *filter;
@@ -225,6 +214,17 @@ struct archive_read {
 	 */
 	struct archive_read_extract		*extract;
 	int			(*cleanup_archive_extract)(struct archive_read *);
+
+	/*
+	 * Decryption passphrase.
+	 */
+	struct {
+		struct archive_read_passphrase *first;
+		struct archive_read_passphrase **last;
+		int candiate;
+		archive_passphrase_callback *callback;
+		void *client_data;
+	}		passphrases;
 };
 
 int	__archive_read_register_format(struct archive_read *a,
@@ -254,4 +254,11 @@ int __archive_read_program(struct archive_read_filter *, const char *);
 void __archive_read_free_filters(struct archive_read *);
 int  __archive_read_close_filters(struct archive_read *);
 struct archive_read_extract *__archive_read_get_extract(struct archive_read *);
+
+
+/*
+ * Get a decryption passphrase.
+ */
+void __archive_read_reset_passphrase(struct archive_read *a);
+const char * __archive_read_next_passphrase(struct archive_read *a);
 #endif
diff --git a/libarchive/archive_read_set_options.c b/libarchive/archive_read_set_options.c
index 46678b1..2e2eea6 100644
--- a/libarchive/archive_read_set_options.c
+++ b/libarchive/archive_read_set_options.c
@@ -76,14 +76,13 @@ archive_set_format_option(struct archive *_a, const char *m, const char *o,
     const char *v)
 {
 	struct archive_read *a = (struct archive_read *)_a;
-	struct archive_format_descriptor *format;
 	size_t i;
 	int r, rv = ARCHIVE_WARN, matched_modules = 0;
 
 	for (i = 0; i < sizeof(a->formats)/sizeof(a->formats[0]); i++) {
-		format = &a->formats[i];
-		if (format == NULL || format->options == NULL ||
-		    format->name == NULL)
+		struct archive_format_descriptor *format = &a->formats[i];
+
+		if (format->options == NULL || format->name == NULL)
 			/* This format does not support option. */
 			continue;
 		if (m != NULL) {
diff --git a/libarchive/archive_read_support_filter_all.c b/libarchive/archive_read_support_filter_all.c
index b778cfb..68c53de 100644
--- a/libarchive/archive_read_support_filter_all.c
+++ b/libarchive/archive_read_support_filter_all.c
@@ -69,6 +69,8 @@ archive_read_support_filter_all(struct archive *a)
 	archive_read_support_filter_lzop(a);
 	/* The decode code always uses "grzip -d" command-line. */
 	archive_read_support_filter_grzip(a);
+	/* Lz4 falls back to "lz4 -d" command-line program. */
+	archive_read_support_filter_lz4(a);
 
 	/* Note: We always return ARCHIVE_OK here, even if some of the
 	 * above return ARCHIVE_WARN.  The intent here is to enable
diff --git a/libarchive/archive_read_support_filter_compress.c b/libarchive/archive_read_support_filter_compress.c
index 3f5d1f3..e05132d 100644
--- a/libarchive/archive_read_support_filter_compress.c
+++ b/libarchive/archive_read_support_filter_compress.c
@@ -185,19 +185,22 @@ compress_bidder_bid(struct archive_read_filter_bidder *self,
 
 	(void)self; /* UNUSED */
 
-	buffer = __archive_read_filter_ahead(filter, 2, &avail);
+	/* Shortest valid compress file is 3 bytes. */
+	buffer = __archive_read_filter_ahead(filter, 3, &avail);
 
 	if (buffer == NULL)
 		return (0);
 
 	bits_checked = 0;
+	/* First two bytes are the magic value */
 	if (buffer[0] != 0x1F || buffer[1] != 0x9D)
 		return (0);
-	bits_checked += 16;
-
-	/*
-	 * TODO: Verify more.
-	 */
+	/* Third byte holds compression parameters. */
+	if (buffer[2] & 0x20) /* Reserved bit, must be zero. */
+		return (0);
+	if (buffer[2] & 0x40) /* Reserved bit, must be zero. */
+		return (0);
+	bits_checked += 18;
 
 	return (bits_checked);
 }
@@ -239,7 +242,13 @@ compress_bidder_init(struct archive_read_filter *self)
 	(void)getbits(self, 8); /* Skip first signature byte. */
 	(void)getbits(self, 8); /* Skip second signature byte. */
 
+	/* Get compression parameters. */
 	code = getbits(self, 8);
+	if ((code & 0x1f) > 16) {
+		archive_set_error(&self->archive->archive, -1,
+		    "Invalid compressed data");
+		return (ARCHIVE_FATAL);
+	}
 	state->maxcode_bits = code & 0x1f;
 	state->maxcode = (1 << state->maxcode_bits);
 	state->use_reset_code = code & 0x80;
@@ -368,7 +377,8 @@ next_code(struct archive_read_filter *self)
 		return (next_code(self));
 	}
 
-	if (code > state->free_ent) {
+	if (code > state->free_ent
+	    || (code == state->free_ent && state->oldcode < 0)) {
 		/* An invalid code is a fatal error. */
 		archive_set_error(&(self->archive->archive), -1,
 		    "Invalid compressed data");
diff --git a/libarchive/archive_read_support_filter_lz4.c b/libarchive/archive_read_support_filter_lz4.c
new file mode 100644
index 0000000..db62cb3
--- /dev/null
+++ b/libarchive/archive_read_support_filter_lz4.c
@@ -0,0 +1,728 @@
+/*-
+ * Copyright (c) 2014 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+
+__FBSDID("$FreeBSD$");
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_LZ4_H
+#include <lz4.h>
+#endif
+
+#include "archive.h"
+#include "archive_endian.h"
+#include "archive_private.h"
+#include "archive_read_private.h"
+#include "archive_xxhash.h"
+
+#define LZ4_MAGICNUMBER		0x184d2204
+#define LZ4_SKIPPABLED		0x184d2a50
+#define LZ4_LEGACY		0x184c2102
+
+#if defined(HAVE_LIBLZ4)
+struct private_data {
+	enum {  SELECT_STREAM,
+		READ_DEFAULT_STREAM,
+		READ_DEFAULT_BLOCK,
+		READ_LEGACY_STREAM,
+		READ_LEGACY_BLOCK,
+	}		stage;
+	struct {
+		unsigned block_independence:1;
+		unsigned block_checksum:3;
+		unsigned stream_size:1;
+		unsigned stream_checksum:1;
+		unsigned preset_dictionary:1;
+		int	 block_maximum_size;
+	} flags;
+	int64_t		 stream_size;
+	uint32_t	 dict_id;
+	char		*out_block;
+	size_t		 out_block_size;
+
+	/* Bytes read but not yet consumed via __archive_read_consume() */
+	size_t		 unconsumed;
+	size_t		 decoded_size;
+	void		*xxh32_state;
+
+	char		 valid; /* True = decompressor is initialized */
+	char		 eof; /* True = found end of compressed data. */
+};
+
+#define LEGACY_BLOCK_SIZE	(8 * 1024 * 1024)
+
+/* Lz4 filter */
+static ssize_t	lz4_filter_read(struct archive_read_filter *, const void **);
+static int	lz4_filter_close(struct archive_read_filter *);
+#endif
+
+/*
+ * Note that we can detect lz4 archives even if we can't decompress
+ * them.  (In fact, we like detecting them because we can give better
+ * error messages.)  So the bid framework here gets compiled even
+ * if liblz4 is unavailable.
+ */
+static int	lz4_reader_bid(struct archive_read_filter_bidder *, struct archive_read_filter *);
+static int	lz4_reader_init(struct archive_read_filter *);
+static int	lz4_reader_free(struct archive_read_filter_bidder *);
+#if defined(HAVE_LIBLZ4)
+static ssize_t  lz4_filter_read_default_stream(struct archive_read_filter *,
+		    const void **);
+static ssize_t  lz4_filter_read_legacy_stream(struct archive_read_filter *,
+		    const void **);
+#endif
+
+int
+archive_read_support_filter_lz4(struct archive *_a)
+{
+	struct archive_read *a = (struct archive_read *)_a;
+	struct archive_read_filter_bidder *reader;
+
+	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
+	    ARCHIVE_STATE_NEW, "archive_read_support_filter_lz4");
+
+	if (__archive_read_get_bidder(a, &reader) != ARCHIVE_OK)
+		return (ARCHIVE_FATAL);
+
+	reader->data = NULL;
+	reader->name = "lz4";
+	reader->bid = lz4_reader_bid;
+	reader->init = lz4_reader_init;
+	reader->options = NULL;
+	reader->free = lz4_reader_free;
+#if defined(HAVE_LIBLZ4)
+	return (ARCHIVE_OK);
+#else
+	archive_set_error(_a, ARCHIVE_ERRNO_MISC,
+	    "Using external lz4 program");
+	return (ARCHIVE_WARN);
+#endif
+}
+
+static int
+lz4_reader_free(struct archive_read_filter_bidder *self){
+	(void)self; /* UNUSED */
+	return (ARCHIVE_OK);
+}
+
+/*
+ * Test whether we can handle this data.
+ *
+ * This logic returns zero if any part of the signature fails.  It
+ * also tries to Do The Right Thing if a very short buffer prevents us
+ * from verifying as much as we would like.
+ */
+static int
+lz4_reader_bid(struct archive_read_filter_bidder *self,
+    struct archive_read_filter *filter)
+{
+	const unsigned char *buffer;
+	ssize_t avail;
+	int bits_checked;
+	uint32_t number;
+
+	(void)self; /* UNUSED */
+
+	/* Minimal lz4 archive is 11 bytes. */
+	buffer = __archive_read_filter_ahead(filter, 11, &avail);
+	if (buffer == NULL)
+		return (0);
+
+	/* First four bytes must be LZ4 magic numbers. */
+	bits_checked = 0;
+	if ((number = archive_le32dec(buffer)) == LZ4_MAGICNUMBER) {
+		unsigned char flag, BD;
+
+		bits_checked += 32;
+		/* Next follows a stream descriptor. */
+		/* Descriptor Flags. */
+		flag = buffer[4];
+		/* A version number must be "01". */
+		if (((flag & 0xc0) >> 6) != 1)
+			return (0);
+		/* A reserved bit must be "0". */
+		if (flag & 2)
+			return (0);
+		bits_checked += 8;
+		BD = buffer[5];
+		/* A block maximum size shuld be more than 3. */
+		if (((BD & 0x70) >> 4) < 4)
+			return (0);
+		/* Reserved bits must be "0". */
+		if (BD & ~0x70)
+			return (0);
+		bits_checked += 8;
+	} else if (number == LZ4_LEGACY) {
+		bits_checked += 32;
+	}
+	
+	return (bits_checked);
+}
+
+#if !defined(HAVE_LIBLZ4)
+
+/*
+ * If we don't have the library on this system, we can't actually do the
+ * decompression.  We can, however, still detect compressed archives
+ * and emit a useful message.
+ */
+static int
+lz4_reader_init(struct archive_read_filter *self)
+{
+	int r;
+
+	r = __archive_read_program(self, "lz4 -d -q");
+	/* Note: We set the format here even if __archive_read_program()
+	 * above fails.  We do, after all, know what the format is
+	 * even if we weren't able to read it. */
+	self->code = ARCHIVE_FILTER_LZ4;
+	self->name = "lz4";
+	return (r);
+}
+
+
+#else
+
+/*
+ * Setup the callbacks.
+ */
+static int
+lz4_reader_init(struct archive_read_filter *self)
+{
+	struct private_data *state;
+
+	self->code = ARCHIVE_FILTER_LZ4;
+	self->name = "lz4";
+
+	state = (struct private_data *)calloc(sizeof(*state), 1);
+	if (state == NULL) {
+		archive_set_error(&self->archive->archive, ENOMEM,
+		    "Can't allocate data for lz4 decompression");
+		return (ARCHIVE_FATAL);
+	}
+
+	self->data = state;
+	state->stage = SELECT_STREAM;
+	self->read = lz4_filter_read;
+	self->skip = NULL; /* not supported */
+	self->close = lz4_filter_close;
+
+	return (ARCHIVE_OK);
+}
+
+static int
+lz4_allocate_out_block(struct archive_read_filter *self)
+{
+	struct private_data *state = (struct private_data *)self->data;
+	size_t out_block_size = state->flags.block_maximum_size;
+	void *out_block;
+
+	if (!state->flags.block_independence)
+		out_block_size += 64 * 1024;
+	if (state->out_block_size < out_block_size) {
+		free(state->out_block);
+		out_block = (unsigned char *)malloc(out_block_size);
+		state->out_block_size = out_block_size;
+		if (out_block == NULL) {
+			archive_set_error(&self->archive->archive, ENOMEM,
+			    "Can't allocate data for lz4 decompression");
+			return (ARCHIVE_FATAL);
+		}
+		state->out_block = out_block;
+	}
+	if (!state->flags.block_independence)
+		memset(state->out_block, 0, 64 * 1024);
+	return (ARCHIVE_OK);
+}
+
+static int
+lz4_allocate_out_block_for_legacy(struct archive_read_filter *self)
+{
+	struct private_data *state = (struct private_data *)self->data;
+	size_t out_block_size = LEGACY_BLOCK_SIZE;
+	void *out_block;
+
+	if (state->out_block_size < out_block_size) {
+		free(state->out_block);
+		out_block = (unsigned char *)malloc(out_block_size);
+		state->out_block_size = out_block_size;
+		if (out_block == NULL) {
+			archive_set_error(&self->archive->archive, ENOMEM,
+			    "Can't allocate data for lz4 decompression");
+			return (ARCHIVE_FATAL);
+		}
+		state->out_block = out_block;
+	}
+	return (ARCHIVE_OK);
+}
+
+/*
+ * Return the next block of decompressed data.
+ */
+static ssize_t
+lz4_filter_read(struct archive_read_filter *self, const void **p)
+{
+	struct private_data *state = (struct private_data *)self->data;
+	ssize_t ret;
+
+	if (state->eof) {
+		*p = NULL;
+		return (0);
+	}
+
+	__archive_read_filter_consume(self->upstream, state->unconsumed);
+	state->unconsumed = 0;
+
+	switch (state->stage) {
+	case SELECT_STREAM:
+		break;
+	case READ_DEFAULT_STREAM:
+	case READ_LEGACY_STREAM:
+		/* Reading a lz4 stream already failed. */
+		archive_set_error(&self->archive->archive,
+		    ARCHIVE_ERRNO_MISC, "Invalid sequence.");
+		return (ARCHIVE_FATAL);
+	case READ_DEFAULT_BLOCK:
+		ret = lz4_filter_read_default_stream(self, p);
+		if (ret != 0 || state->stage != SELECT_STREAM)
+			return ret;
+		break;
+	case READ_LEGACY_BLOCK:
+		ret = lz4_filter_read_legacy_stream(self, p);
+		if (ret != 0 || state->stage != SELECT_STREAM)
+			return ret;
+		break;
+	default:
+		archive_set_error(&self->archive->archive,
+		    ARCHIVE_ERRNO_MISC, "Program error.");
+		return (ARCHIVE_FATAL);
+		break;
+	}
+
+	while (state->stage == SELECT_STREAM) {
+		const char *read_buf;
+
+		/* Read a magic number. */
+		read_buf = __archive_read_filter_ahead(self->upstream, 4,
+				NULL);
+		if (read_buf == NULL) {
+			state->eof = 1;
+			*p = NULL;
+			return (0);
+		}
+		uint32_t number = archive_le32dec(read_buf);
+		__archive_read_filter_consume(self->upstream, 4);
+		if (number == LZ4_MAGICNUMBER)
+			return lz4_filter_read_default_stream(self, p);
+		else if (number == LZ4_LEGACY)
+			return lz4_filter_read_legacy_stream(self, p);
+		else if ((number & ~0xF) == LZ4_SKIPPABLED) {
+			read_buf = __archive_read_filter_ahead(
+				self->upstream, 4, NULL);
+			if (read_buf == NULL) {
+				archive_set_error(
+				    &self->archive->archive,
+		    		    ARCHIVE_ERRNO_MISC,
+				    "Malformed lz4 data");
+				return (ARCHIVE_FATAL);
+			}
+			uint32_t skip_bytes = archive_le32dec(read_buf);
+			__archive_read_filter_consume(self->upstream,
+				4 + skip_bytes);
+		} else {
+			/* Ignore following unrecognized data. */
+			state->eof = 1;
+			*p = NULL;
+			return (0);
+		}
+	}
+	state->eof = 1;
+	*p = NULL;
+	return (0);
+}
+
+static int
+lz4_filter_read_descriptor(struct archive_read_filter *self)
+{
+	struct private_data *state = (struct private_data *)self->data;
+	const char *read_buf;
+	ssize_t bytes_remaining;
+	ssize_t descriptor_bytes;
+	unsigned char flag, bd;
+	unsigned int chsum, chsum_verifier;
+
+	/* Make sure we have 2 bytes for flags. */
+	read_buf = __archive_read_filter_ahead(self->upstream, 2,
+	    &bytes_remaining);
+	if (read_buf == NULL) {
+		archive_set_error(&self->archive->archive,
+		    ARCHIVE_ERRNO_MISC,
+		    "truncated lz4 input");
+		return (ARCHIVE_FATAL);
+	}
+
+	/*
+	   Parse flags.
+	 */
+	flag = (unsigned char)read_buf[0];
+	/* Verify version number. */
+	if ((flag & 0xc0) != 1<<6)
+		goto malformed_error;
+	/* A reserved bit must be zero. */
+	if (flag & 0x02)
+		goto malformed_error;
+	state->flags.block_independence = (flag & 0x20) != 0;
+	state->flags.block_checksum = (flag & 0x10)?4:0;
+	state->flags.stream_size = (flag & 0x08) != 0;
+	state->flags.stream_checksum = (flag & 0x04) != 0;
+	state->flags.preset_dictionary = (flag & 0x01) != 0;
+
+	/* BD */
+	bd = (unsigned char)read_buf[1];
+	/* Reserved bits must be zero. */
+	if (bd & 0x8f)
+		goto malformed_error;
+	/* Get a maxinum block size. */
+	switch (read_buf[1] >> 4) {
+	case 4: /* 64 KB */
+		state->flags.block_maximum_size = 64 * 1024;
+		break;
+	case 5: /* 256 KB */
+		state->flags.block_maximum_size = 256 * 1024;
+		break;
+	case 6: /* 1 MB */
+		state->flags.block_maximum_size = 1024 * 1024;
+		break;
+	case 7: /* 4 MB */
+		state->flags.block_maximum_size = 4 * 1024 * 1024;
+		break;
+	default:
+		goto malformed_error;
+	}
+
+	/* Read the whole descriptor in a stream block. */
+	descriptor_bytes = 3;
+	if (state->flags.stream_size)
+		descriptor_bytes += 8;
+	if (state->flags.preset_dictionary)
+		descriptor_bytes += 4;
+	if (bytes_remaining < descriptor_bytes) {
+		read_buf = __archive_read_filter_ahead(self->upstream,
+		    descriptor_bytes, &bytes_remaining);
+		if (read_buf == NULL) {
+			archive_set_error(&self->archive->archive,
+			    ARCHIVE_ERRNO_MISC,
+			    "truncated lz4 input");
+			return (ARCHIVE_FATAL);
+		}
+	}
+	/* Check if a descriptor is corrupted */
+	chsum = __archive_xxhash.XXH32(read_buf, (int)descriptor_bytes -1, 0);
+	chsum = (chsum >> 8) & 0xff;
+	chsum_verifier = read_buf[descriptor_bytes-1] & 0xff;
+	if (chsum != chsum_verifier)
+		goto malformed_error;
+
+	__archive_read_filter_consume(self->upstream, descriptor_bytes);
+
+	/* Make sure we have an enough buffer for uncompressed data. */
+	if (lz4_allocate_out_block(self) != ARCHIVE_OK)
+		return (ARCHIVE_FATAL);
+	if (state->flags.stream_checksum)
+		state->xxh32_state = __archive_xxhash.XXH32_init(0);
+
+	state->decoded_size = 0;
+	/* Success */
+	return (ARCHIVE_OK);
+malformed_error:
+	archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
+	    "malformed lz4 data");
+	return (ARCHIVE_FATAL);
+}
+
+static ssize_t
+lz4_filter_read_data_block(struct archive_read_filter *self, const void **p)
+{
+	struct private_data *state = (struct private_data *)self->data;
+	ssize_t compressed_size;
+	const char *read_buf;
+	ssize_t bytes_remaining;
+	int checksum_size;
+	ssize_t uncompressed_size;
+	size_t prefix64k;
+
+	*p = NULL;
+
+	/* Make sure we have 4 bytes for a block size. */
+	read_buf = __archive_read_filter_ahead(self->upstream, 4,
+	    &bytes_remaining);
+	if (read_buf == NULL)
+		goto truncated_error;
+	compressed_size = archive_le32dec(read_buf);
+	if ((compressed_size & ~(1 << 31)) > state->flags.block_maximum_size)
+		goto malformed_error;
+	/* A compressed size == 0 means the end of stream blocks. */
+	if (compressed_size == 0) {
+		__archive_read_filter_consume(self->upstream, 4);
+		return 0;
+	}
+
+	checksum_size = state->flags.block_checksum;
+	/* Check if the block is uncompressed. */
+	if (compressed_size & (1 << 31)) {
+		compressed_size &= ~(1 << 31);
+		uncompressed_size = compressed_size;
+	} else
+		uncompressed_size = 0;/* Unknown yet. */
+
+	/*
+	  Unfortunately, lz4 decompression API requires a whole block
+	  for its decompression speed, so we read a whole block and allocate
+	  a huge buffer used for decoded data.
+	*/
+	read_buf = __archive_read_filter_ahead(self->upstream,
+	    4 + compressed_size + checksum_size, &bytes_remaining);
+	if (read_buf == NULL)
+		goto truncated_error;
+
+	/* Optional process, checking a block sum. */
+	if (checksum_size) {
+		unsigned int chsum = __archive_xxhash.XXH32(
+			read_buf + 4, (int)compressed_size, 0);
+		unsigned int chsum_block =
+		    archive_le32dec(read_buf + 4 + compressed_size);
+		if (chsum != chsum_block)
+			goto malformed_error;
+	}
+
+
+	/* If the block is uncompressed, there is nothing to do. */
+	if (uncompressed_size) {
+		/* Prepare a prefix 64k block for next block. */
+		if (!state->flags.block_independence) {
+			prefix64k = 64 * 1024;
+			if (uncompressed_size < (ssize_t)prefix64k) {
+				memcpy(state->out_block
+					+ prefix64k - uncompressed_size,
+				    read_buf + 4,
+				    uncompressed_size);
+				memset(state->out_block, 0,
+				    prefix64k - uncompressed_size);
+			} else {
+				memcpy(state->out_block,
+				    read_buf + 4
+					+ uncompressed_size - prefix64k,
+				    prefix64k);
+			}
+			state->decoded_size = 0;
+		}
+		state->unconsumed = 4 + uncompressed_size + checksum_size;
+		*p = read_buf + 4;
+		return uncompressed_size;
+	}
+
+	/*
+	   Decompress a block data.
+	 */
+	if (state->flags.block_independence) {
+		prefix64k = 0;
+		uncompressed_size = LZ4_decompress_safe(read_buf + 4,
+		    state->out_block, (int)compressed_size,
+		    state->flags.block_maximum_size);
+	} else {
+		prefix64k = 64 * 1024;
+		if (state->decoded_size) {
+			if (state->decoded_size < prefix64k) {
+				memmove(state->out_block
+					+ prefix64k - state->decoded_size,
+				    state->out_block + prefix64k,
+				    state->decoded_size);
+				memset(state->out_block, 0,
+				    prefix64k - state->decoded_size);
+			} else {
+				memmove(state->out_block,
+				    state->out_block + state->decoded_size,
+				    prefix64k);
+			}
+		}
+		uncompressed_size = LZ4_decompress_safe_withPrefix64k(
+		    read_buf + 4,
+		    state->out_block + prefix64k, (int)compressed_size,
+		    state->flags.block_maximum_size);
+	}
+
+	/* Check if an error happend in decompression process. */
+	if (uncompressed_size < 0) {
+		archive_set_error(&(self->archive->archive),
+		    ARCHIVE_ERRNO_MISC, "lz4 decompression failed");
+		return (ARCHIVE_FATAL);
+	}
+
+	state->unconsumed = 4 + compressed_size + checksum_size;
+	*p = state->out_block + prefix64k;
+	state->decoded_size = uncompressed_size;
+	return uncompressed_size;
+
+malformed_error:
+	archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
+	    "malformed lz4 data");
+	return (ARCHIVE_FATAL);
+truncated_error:
+	archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
+	    "truncated lz4 input");
+	return (ARCHIVE_FATAL);
+}
+
+static ssize_t
+lz4_filter_read_default_stream(struct archive_read_filter *self, const void **p)
+{
+	struct private_data *state = (struct private_data *)self->data;
+	const char *read_buf;
+	ssize_t bytes_remaining;
+	ssize_t ret;
+
+	if (state->stage == SELECT_STREAM) {
+		state->stage = READ_DEFAULT_STREAM;
+		/* First, read a desciprtor. */
+		if((ret = lz4_filter_read_descriptor(self)) != ARCHIVE_OK)
+			return (ret);
+		state->stage = READ_DEFAULT_BLOCK;
+	}
+	/* Decompress a block. */
+	ret = lz4_filter_read_data_block(self, p);
+
+	/* If the end of block is detected, change the filter status
+	   to read next stream. */
+	if (ret == 0 && *p == NULL)
+		state->stage = SELECT_STREAM;
+
+	/* Optional process, checking a stream sum. */
+	if (state->flags.stream_checksum) {
+		if (state->stage == SELECT_STREAM) {
+			unsigned int checksum;
+			unsigned int checksum_stream;
+			read_buf = __archive_read_filter_ahead(self->upstream,
+			    4, &bytes_remaining);
+			if (read_buf == NULL) {
+				archive_set_error(&self->archive->archive,
+				    ARCHIVE_ERRNO_MISC, "truncated lz4 input");
+				return (ARCHIVE_FATAL);
+			}
+			checksum = archive_le32dec(read_buf);
+			__archive_read_filter_consume(self->upstream, 4);
+			checksum_stream = __archive_xxhash.XXH32_digest(
+			    state->xxh32_state);
+			state->xxh32_state = NULL;
+			if (checksum != checksum_stream) {
+				archive_set_error(&self->archive->archive,
+				    ARCHIVE_ERRNO_MISC,
+				    "lz4 stream cheksum error");
+				return (ARCHIVE_FATAL);
+			}
+		} else if (ret > 0)
+			__archive_xxhash.XXH32_update(state->xxh32_state,
+			    *p, (int)ret);
+	}
+	return (ret);
+}
+
+static ssize_t
+lz4_filter_read_legacy_stream(struct archive_read_filter *self, const void **p)
+{
+	struct private_data *state = (struct private_data *)self->data;
+	int compressed;
+	const char *read_buf;
+	ssize_t ret;
+
+	*p = NULL;
+	ret = lz4_allocate_out_block_for_legacy(self);
+	if (ret != ARCHIVE_OK)
+		return ret;
+
+	/* Make sure we have 4 bytes for a block size. */
+	read_buf = __archive_read_filter_ahead(self->upstream, 4, NULL);
+	if (read_buf == NULL) {
+		if (state->stage == SELECT_STREAM) {
+			state->stage = READ_LEGACY_STREAM;
+			archive_set_error(&self->archive->archive,
+			    ARCHIVE_ERRNO_MISC,
+			    "truncated lz4 input");
+			return (ARCHIVE_FATAL);
+		}
+		state->stage = SELECT_STREAM;
+		return 0;
+	}
+	state->stage = READ_LEGACY_BLOCK;
+	compressed = archive_le32dec(read_buf);
+	if (compressed > LZ4_COMPRESSBOUND(LEGACY_BLOCK_SIZE)) {
+		state->stage = SELECT_STREAM;
+		return 0;
+	}
+
+	/* Make sure we have a whole block. */
+	read_buf = __archive_read_filter_ahead(self->upstream,
+	    4 + compressed, NULL);
+	ret = LZ4_decompress_safe(read_buf + 4, state->out_block,
+	    compressed, (int)state->out_block_size);
+	if (ret < 0) {
+		archive_set_error(&(self->archive->archive),
+		    ARCHIVE_ERRNO_MISC, "lz4 decompression failed");
+		return (ARCHIVE_FATAL);
+	}
+	*p = state->out_block;
+	state->unconsumed = 4 + compressed;
+	return ret;
+}
+
+/*
+ * Clean up the decompressor.
+ */
+static int
+lz4_filter_close(struct archive_read_filter *self)
+{
+	struct private_data *state;
+	int ret = ARCHIVE_OK;
+
+	state = (struct private_data *)self->data;
+	free(state->xxh32_state);
+	free(state->out_block);
+	free(state);
+	return (ret);
+}
+
+#endif /* HAVE_LIBLZ4 */
diff --git a/libarchive/archive_read_support_filter_lzop.c b/libarchive/archive_read_support_filter_lzop.c
index f8d04bd..44ac996 100644
--- a/libarchive/archive_read_support_filter_lzop.c
+++ b/libarchive/archive_read_support_filter_lzop.c
@@ -242,10 +242,17 @@ consume_header(struct archive_read_filter *self)
 
 	if (version >= 0x940) {
 		unsigned level = *p++;
+#if 0
 		unsigned default_level[] = {0, 3, 1, 9};
+#endif
 		if (level == 0)
 			/* Method is 1..3 here due to check above. */
+#if 0	/* Avoid an error Clang Static Analyzer claims
+	  "Value stored to 'level' is never read". */
 			level = default_level[method];
+#else
+			;/* NOP */
+#endif
 		else if (level > 9) {
 			archive_set_error(&self->archive->archive,
 			    ARCHIVE_ERRNO_MISC, "Invalid level");
diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c
index 471771b..787a619 100644
--- a/libarchive/archive_read_support_filter_uu.c
+++ b/libarchive/archive_read_support_filter_uu.c
@@ -509,7 +509,7 @@ read_more:
 			return (ARCHIVE_FATAL);
 		}
 		llen = len;
-		if (nl == 0) {
+		if ((nl == 0) && (uudecode->state != ST_UUEND)) {
 			/*
 			 * Save remaining data which does not contain
 			 * NL('\n','\r').
@@ -527,6 +527,7 @@ read_more:
 				    self->upstream, ravail);
 				goto read_more;
 			}
+			used += len;
 			break;
 		}
 		switch (uudecode->state) {
diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c
index 7bda263..4e0a95f 100644
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -627,7 +627,7 @@ lzip_tail(struct archive_read_filter *self)
 	f = __archive_read_filter_ahead(self->upstream, tail, &avail_in);
 	if (f == NULL && avail_in < 0)
 		return (ARCHIVE_FATAL);
-	if (avail_in < tail) {
+	if (f == NULL || avail_in < tail) {
 		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
 		    "Lzip: Remaining data is less bytes");
 		return (ARCHIVE_FAILED);
diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
index c69d873..8dc5607 100644
--- a/libarchive/archive_read_support_format_7zip.c
+++ b/libarchive/archive_read_support_format_7zip.c
@@ -108,6 +108,7 @@ __FBSDID("$FreeBSD$");
 #define kMTime			0x14
 #define kAttributes		0x15
 #define kEncodedHeader		0x17
+#define kDummy			0x19
 
 struct _7z_digests {
 	unsigned char	*defineds;
@@ -331,6 +332,11 @@ struct _7zip {
 	int			 has_encrypted_entries;
 };
 
+/* Maximum entry size. This limitation prevents reading intentional
+ * corrupted 7-zip files on assuming there are not so many entries in
+ * the files. */
+#define UMAX_ENTRY	ARCHIVE_LITERAL_ULL(100000000)
+
 static int	archive_read_format_7zip_has_encrypted_entries(struct archive_read *);
 static int	archive_read_support_format_7zip_capabilities(struct archive_read *a);
 static int	archive_read_format_7zip_bid(struct archive_read *, int);
@@ -640,7 +646,7 @@ archive_read_format_7zip_read_header(struct archive_read *a,
 	}
 	zip_entry = zip->entry;
 
-	if (zip->entries_remaining <= 0)
+	if (zip->entries_remaining <= 0 || zip_entry == NULL)
 		return ARCHIVE_EOF;
 	--zip->entries_remaining;
 
@@ -1663,7 +1669,7 @@ parse_7zip_uint64(struct archive_read *a, uint64_t *val)
 			mask >>= 1;
 			continue;
 		}
-		*val += (avail & (mask -1)) << (8 * i);
+		*val += ((uint64_t)(avail & (mask -1))) << (8 * i);
 		break;
 	}
 	return (0);
@@ -1763,7 +1769,7 @@ read_PackInfo(struct archive_read *a, struct _7z_pack_info *pi)
 		return (-1);
 	if (pi->numPackStreams == 0)
 		return (-1);
-	if (1000000 < pi->numPackStreams)
+	if (UMAX_ENTRY < pi->numPackStreams)
 		return (-1);
 
 	/*
@@ -1892,12 +1898,12 @@ read_Folder(struct archive_read *a, struct _7z_folder *f)
 			if (parse_7zip_uint64(
 			    a, &(f->coders[i].numInStreams)) < 0)
 				return (-1);
-			if (1000000 < f->coders[i].numInStreams)
+			if (UMAX_ENTRY < f->coders[i].numInStreams)
 				return (-1);
 			if (parse_7zip_uint64(
 			    a, &(f->coders[i].numOutStreams)) < 0)
 				return (-1);
-			if (1000000 < f->coders[i].numOutStreams)
+			if (UMAX_ENTRY < f->coders[i].numOutStreams)
 				return (-1);
 		}
 
@@ -1937,11 +1943,11 @@ read_Folder(struct archive_read *a, struct _7z_folder *f)
 	for (i = 0; i < f->numBindPairs; i++) {
 		if (parse_7zip_uint64(a, &(f->bindPairs[i].inIndex)) < 0)
 			return (-1);
-		if (1000000 < f->bindPairs[i].inIndex)
+		if (UMAX_ENTRY < f->bindPairs[i].inIndex)
 			return (-1);
 		if (parse_7zip_uint64(a, &(f->bindPairs[i].outIndex)) < 0)
 			return (-1);
-		if (1000000 < f->bindPairs[i].outIndex)
+		if (UMAX_ENTRY < f->bindPairs[i].outIndex)
 			return (-1);
 	}
 
@@ -1967,7 +1973,7 @@ read_Folder(struct archive_read *a, struct _7z_folder *f)
 		for (i = 0; i < f->numPackedStreams; i++) {
 			if (parse_7zip_uint64(a, &(f->packedStreams[i])) < 0)
 				return (-1);
-			if (1000000 < f->packedStreams[i])
+			if (UMAX_ENTRY < f->packedStreams[i])
 				return (-1);
 		}
 	}
@@ -2009,8 +2015,8 @@ read_CodersInfo(struct archive_read *a, struct _7z_coders_info *ci)
 	 */
 	if (parse_7zip_uint64(a, &(ci->numFolders)) < 0)
 		goto failed;
-	if (1000000 < ci->numFolders)
-			return (-1);
+	if (UMAX_ENTRY < ci->numFolders)
+		return (-1);
 
 	/*
 	 * Read External.
@@ -2031,9 +2037,18 @@ read_CodersInfo(struct archive_read *a, struct _7z_coders_info *ci)
 	case 1:
 		if (parse_7zip_uint64(a, &(ci->dataStreamIndex)) < 0)
 			return (-1);
-		if (1000000 < ci->dataStreamIndex)
+		if (UMAX_ENTRY < ci->dataStreamIndex)
 			return (-1);
+		if (ci->numFolders > 0) {
+			archive_set_error(&a->archive, -1,
+			    "Malformed 7-Zip archive");
+			goto failed;
+		}
 		break;
+	default:
+		archive_set_error(&a->archive, -1,
+		    "Malformed 7-Zip archive");
+		goto failed;
 	}
 
 	if ((p = header_bytes(a, 1)) == NULL)
@@ -2136,7 +2151,7 @@ read_SubStreamsInfo(struct archive_read *a, struct _7z_substream_info *ss,
 		for (i = 0; i < numFolders; i++) {
 			if (parse_7zip_uint64(a, &(f[i].numUnpackStreams)) < 0)
 				return (-1);
-			if (1000000 < f[i].numUnpackStreams)
+			if (UMAX_ENTRY < f[i].numUnpackStreams)
 				return (-1);
 			unpack_streams += (size_t)f[i].numUnpackStreams;
 		}
@@ -2385,8 +2400,8 @@ read_Header(struct archive_read *a, struct _7z_header_info *h,
 
 	if (parse_7zip_uint64(a, &(zip->numFiles)) < 0)
 		return (-1);
-	if (1000000 < zip->numFiles)
-			return (-1);
+	if (UMAX_ENTRY < zip->numFiles)
+		return (-1);
 
 	zip->entries = calloc((size_t)zip->numFiles, sizeof(*zip->entries));
 	if (zip->entries == NULL)
@@ -2545,6 +2560,9 @@ read_Header(struct archive_read *a, struct _7z_header_info *h,
 			}
 			break;
 		}
+		case kDummy:
+			if (ll == 0)
+				break;
 		default:
 			if (header_bytes(a, ll) == NULL)
 				return (-1);
@@ -2684,7 +2702,7 @@ read_Times(struct archive_read *a, struct _7z_header_info *h, int type)
 	if (*p) {
 		if (parse_7zip_uint64(a, &(h->dataIndex)) < 0)
 			goto failed;
-		if (1000000 < h->dataIndex)
+		if (UMAX_ENTRY < h->dataIndex)
 			goto failed;
 	}
 
diff --git a/libarchive/archive_read_support_format_all.c b/libarchive/archive_read_support_format_all.c
index 53fe6fa..2127ebd3 100644
--- a/libarchive/archive_read_support_format_all.c
+++ b/libarchive/archive_read_support_format_all.c
@@ -61,6 +61,7 @@ archive_read_support_format_all(struct archive *a)
 	archive_read_support_format_mtree(a);
 	archive_read_support_format_tar(a);
 	archive_read_support_format_xar(a);
+	archive_read_support_format_warc(a);
 
 	/*
 	 * Install expensive bidders last.  By doing them last, we
diff --git a/libarchive/archive_read_support_format_ar.c b/libarchive/archive_read_support_format_ar.c
index 82756c9..4b5b66b 100644
--- a/libarchive/archive_read_support_format_ar.c
+++ b/libarchive/archive_read_support_format_ar.c
@@ -180,7 +180,7 @@ _ar_read_header(struct archive_read *a, struct archive_entry *entry,
 	if (strncmp(h + AR_fmag_offset, "`\n", 2) != 0) {
 		archive_set_error(&a->archive, EINVAL,
 		    "Incorrect file header signature");
-		return (ARCHIVE_WARN);
+		return (ARCHIVE_FATAL);
 	}
 
 	/* Copy filename into work buffer. */
@@ -239,8 +239,15 @@ _ar_read_header(struct archive_read *a, struct archive_entry *entry,
 	 * and are not terminated in '/', so we don't trim anything
 	 * that starts with '/'.)
 	 */
-	if (filename[0] != '/' && *p == '/')
+	if (filename[0] != '/' && p > filename && *p == '/') {
 		*p = '\0';
+	}
+
+	if (p < filename) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Found entry with empty filename");
+		return (ARCHIVE_FATAL);
+	}
 
 	/*
 	 * '//' is the GNU filename table.
@@ -262,12 +269,12 @@ _ar_read_header(struct archive_read *a, struct archive_entry *entry,
 		if (entry_size == 0) {
 			archive_set_error(&a->archive, EINVAL,
 			    "Invalid string table");
-			return (ARCHIVE_WARN);
+			return (ARCHIVE_FATAL);
 		}
 		if (ar->strtab != NULL) {
 			archive_set_error(&a->archive, EINVAL,
 			    "More than one string tables exist");
-			return (ARCHIVE_WARN);
+			return (ARCHIVE_FATAL);
 		}
 
 		/* Read the filename table into memory. */
@@ -311,11 +318,11 @@ _ar_read_header(struct archive_read *a, struct archive_entry *entry,
 		 */
 		if (ar->strtab == NULL || number > ar->strtab_size) {
 			archive_set_error(&a->archive, EINVAL,
-			    "Can't find long filename for entry");
+			    "Can't find long filename for GNU/SVR4 archive entry");
 			archive_entry_copy_pathname(entry, filename);
 			/* Parse the time, owner, mode, size fields. */
 			ar_parse_common_header(ar, entry, h);
-			return (ARCHIVE_WARN);
+			return (ARCHIVE_FATAL);
 		}
 
 		archive_entry_copy_pathname(entry, &ar->strtab[(size_t)number]);
@@ -573,7 +580,7 @@ bad_string_table:
 	    "Invalid string table");
 	free(ar->strtab);
 	ar->strtab = NULL;
-	return (ARCHIVE_WARN);
+	return (ARCHIVE_FATAL);
 }
 
 static uint64_t
diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c
index 0b69689..c2ca85b 100644
--- a/libarchive/archive_read_support_format_cpio.c
+++ b/libarchive/archive_read_support_format_cpio.c
@@ -198,7 +198,7 @@ static int	archive_read_format_cpio_read_data(struct archive_read *,
 static int	archive_read_format_cpio_read_header(struct archive_read *,
 		    struct archive_entry *);
 static int	archive_read_format_cpio_skip(struct archive_read *);
-static int	be4(const unsigned char *);
+static int64_t	be4(const unsigned char *);
 static int	find_odc_header(struct archive_read *);
 static int	find_newc_header(struct archive_read *);
 static int	header_bin_be(struct archive_read *, struct cpio *,
@@ -213,7 +213,7 @@ static int	header_afiol(struct archive_read *, struct cpio *,
 		    struct archive_entry *, size_t *, size_t *);
 static int	is_octal(const char *, size_t);
 static int	is_hex(const char *, size_t);
-static int	le4(const unsigned char *);
+static int64_t	le4(const unsigned char *);
 static int	record_hardlink(struct archive_read *a,
 		    struct cpio *cpio, struct archive_entry *entry);
 
@@ -866,8 +866,11 @@ header_bin_le(struct archive_read *a, struct cpio *cpio,
 
 	/* Read fixed-size portion of header. */
 	h = __archive_read_ahead(a, bin_header_size, NULL);
-	if (h == NULL)
+	if (h == NULL) {
+	    archive_set_error(&a->archive, 0,
+		"End of file trying to read next cpio header");
 	    return (ARCHIVE_FATAL);
+	}
 
 	/* Parse out binary fields. */
 	header = (const unsigned char *)h;
@@ -902,8 +905,11 @@ header_bin_be(struct archive_read *a, struct cpio *cpio,
 
 	/* Read fixed-size portion of header. */
 	h = __archive_read_ahead(a, bin_header_size, NULL);
-	if (h == NULL)
+	if (h == NULL) {
+	    archive_set_error(&a->archive, 0,
+		"End of file trying to read next cpio header");
 	    return (ARCHIVE_FATAL);
+	}
 
 	/* Parse out binary fields. */
 	header = (const unsigned char *)h;
@@ -946,17 +952,17 @@ archive_read_format_cpio_cleanup(struct archive_read *a)
 	return (ARCHIVE_OK);
 }
 
-static int
+static int64_t
 le4(const unsigned char *p)
 {
-	return ((p[0]<<16) + (p[1]<<24) + (p[2]<<0) + (p[3]<<8));
+	return ((p[0] << 16) + (((int64_t)p[1]) << 24) + (p[2] << 0) + (p[3] << 8));
 }
 
 
-static int
+static int64_t
 be4(const unsigned char *p)
 {
-	return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) + (p[3]));
+	return ((((int64_t)p[0]) << 24) + (p[1] << 16) + (p[2] << 8) + (p[3]));
 }
 
 /*
diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 86d07fe..6934cee 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -387,7 +387,7 @@ static int	archive_read_format_iso9660_read_data(struct archive_read *,
 static int	archive_read_format_iso9660_read_data_skip(struct archive_read *);
 static int	archive_read_format_iso9660_read_header(struct archive_read *,
 		    struct archive_entry *);
-static const char *build_pathname(struct archive_string *, struct file_info *);
+static const char *build_pathname(struct archive_string *, struct file_info *, int);
 static int	build_pathname_utf16be(unsigned char *, size_t, size_t *,
 		    struct file_info *);
 #if DEBUG
@@ -1225,6 +1225,7 @@ archive_read_format_iso9660_read_header(struct archive_read *a,
 			archive_set_error(&a->archive,
 			    ARCHIVE_ERRNO_FILE_FORMAT,
 			    "Pathname is too long");
+			return (ARCHIVE_FATAL);
 		}
 
 		r = archive_entry_copy_pathname_l(entry,
@@ -1247,9 +1248,16 @@ archive_read_format_iso9660_read_header(struct archive_read *a,
 			rd_r = ARCHIVE_WARN;
 		}
 	} else {
-		archive_string_empty(&iso9660->pathname);
-		archive_entry_set_pathname(entry,
-		    build_pathname(&iso9660->pathname, file));
+		const char *path = build_pathname(&iso9660->pathname, file, 0);
+		if (path == NULL) {
+			archive_set_error(&a->archive,
+			    ARCHIVE_ERRNO_FILE_FORMAT,
+			    "Pathname is too long");
+			return (ARCHIVE_FATAL);
+		} else {
+			archive_string_empty(&iso9660->pathname);
+			archive_entry_set_pathname(entry, path);
+		}
 	}
 
 	iso9660->entry_bytes_remaining = file->size;
@@ -1744,12 +1752,12 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
     const unsigned char *isodirrec)
 {
 	struct iso9660 *iso9660;
-	struct file_info *file;
+	struct file_info *file, *filep;
 	size_t name_len;
 	const unsigned char *rr_start, *rr_end;
 	const unsigned char *p;
 	size_t dr_len;
-	uint64_t fsize;
+	uint64_t fsize, offset;
 	int32_t location;
 	int flags;
 
@@ -1793,6 +1801,16 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
 		return (NULL);
 	}
 
+	/* Sanity check that this entry does not create a cycle. */
+	offset = iso9660->logical_block_size * (uint64_t)location;
+	for (filep = parent; filep != NULL; filep = filep->parent) {
+		if (filep->offset == offset) {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+			    "Directory structure contains loop");
+			return (NULL);
+		}
+	}
+
 	/* Create a new file entry and copy data from the ISO dir record. */
 	file = (struct file_info *)calloc(1, sizeof(*file));
 	if (file == NULL) {
@@ -1801,7 +1819,7 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
 		return (NULL);
 	}
 	file->parent = parent;
-	file->offset = iso9660->logical_block_size * (uint64_t)location;
+	file->offset = offset;
 	file->size = fsize;
 	file->mtime = isodate7(isodirrec + DR_date_offset);
 	file->ctime = file->atime = file->mtime;
@@ -3147,29 +3165,39 @@ static time_t
 time_from_tm(struct tm *t)
 {
 #if HAVE_TIMEGM
-	/* Use platform timegm() if available. */
-	return (timegm(t));
+        /* Use platform timegm() if available. */
+        return (timegm(t));
 #elif HAVE__MKGMTIME64
-	return (_mkgmtime64(t));
+        return (_mkgmtime64(t));
 #else
-	/* Else use direct calculation using POSIX assumptions. */
-	/* First, fix up tm_yday based on the year/month/day. */
-	if (mktime(t) == (time_t)-1)
-		return ((time_t)-1);
-	/* Then we can compute timegm() from first principles. */
-	return (t->tm_sec + t->tm_min * 60 + t->tm_hour * 3600
-	    + t->tm_yday * 86400 + (t->tm_year - 70) * 31536000
-	    + ((t->tm_year - 69) / 4) * 86400 -
-	    ((t->tm_year - 1) / 100) * 86400
-	    + ((t->tm_year + 299) / 400) * 86400);
+        /* Else use direct calculation using POSIX assumptions. */
+        /* First, fix up tm_yday based on the year/month/day. */
+        if (mktime(t) == (time_t)-1)
+                return ((time_t)-1);
+        /* Then we can compute timegm() from first principles. */
+        return (t->tm_sec
+            + t->tm_min * 60
+            + t->tm_hour * 3600
+            + t->tm_yday * 86400
+            + (t->tm_year - 70) * 31536000
+            + ((t->tm_year - 69) / 4) * 86400
+            - ((t->tm_year - 1) / 100) * 86400
+            + ((t->tm_year + 299) / 400) * 86400);
 #endif
 }
 
 static const char *
-build_pathname(struct archive_string *as, struct file_info *file)
+build_pathname(struct archive_string *as, struct file_info *file, int depth)
 {
+	// Plain ISO9660 only allows 8 dir levels; if we get
+	// to 1000, then something is very, very wrong.
+	if (depth > 1000) {
+		return NULL;
+	}
 	if (file->parent != NULL && archive_strlen(&file->parent->name) > 0) {
-		build_pathname(as, file->parent);
+		if (build_pathname(as, file->parent, depth + 1) == NULL) {
+			return NULL;
+		}
 		archive_strcat(as, "/");
 	}
 	if (archive_strlen(&file->name) == 0)
diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
index b88731a..f8e01af 100644
--- a/libarchive/archive_read_support_format_lha.c
+++ b/libarchive/archive_read_support_format_lha.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008-2012 Michihiro NAKAJIMA
+ * Copyright (c) 2008-2014 Michihiro NAKAJIMA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -82,9 +82,6 @@ struct lzh_dec {
 	/* The length how many bytes we can copy decoded code from
 	 * the window. */
 	int     		 copy_len;
-	/* The remaining bytes that we have not copied decoded data from
-	 * the window to an output buffer. */
-	int			 w_remaining;
 
 	/*
 	 * Bit stream reader.
@@ -140,10 +137,10 @@ struct lzh_dec {
 
 struct lzh_stream {
 	const unsigned char	*next_in;
-	int64_t			 avail_in;
+	int			 avail_in;
 	int64_t			 total_in;
-	unsigned char		*next_out;
-	int64_t			 avail_out;
+	const unsigned char	*ref_ptr;
+	int			 avail_out;
 	int64_t			 total_out;
 	struct lzh_dec		*ds;
 };
@@ -198,9 +195,6 @@ struct lha {
 	char			 end_of_entry_cleanup;
 	char			 entry_is_compressed;
 
-	unsigned char		*uncompressed_buffer;
-	size_t			 uncompressed_buffer_size;
-
 	char			 format_name[64];
 
 	struct lzh_stream	 strm;
@@ -214,41 +208,6 @@ struct lha {
 #define H_LEVEL_OFFSET	20	/* Header Level.  */
 #define H_SIZE		22	/* Minimum header size. */
 
-static const uint16_t crc16tbl[256] = {
-	0x0000,0xC0C1,0xC181,0x0140,0xC301,0x03C0,0x0280,0xC241,
-	0xC601,0x06C0,0x0780,0xC741,0x0500,0xC5C1,0xC481,0x0440,
-	0xCC01,0x0CC0,0x0D80,0xCD41,0x0F00,0xCFC1,0xCE81,0x0E40,
-	0x0A00,0xCAC1,0xCB81,0x0B40,0xC901,0x09C0,0x0880,0xC841,
-	0xD801,0x18C0,0x1980,0xD941,0x1B00,0xDBC1,0xDA81,0x1A40,
-	0x1E00,0xDEC1,0xDF81,0x1F40,0xDD01,0x1DC0,0x1C80,0xDC41,
-	0x1400,0xD4C1,0xD581,0x1540,0xD701,0x17C0,0x1680,0xD641,
-	0xD201,0x12C0,0x1380,0xD341,0x1100,0xD1C1,0xD081,0x1040,
-	0xF001,0x30C0,0x3180,0xF141,0x3300,0xF3C1,0xF281,0x3240,
-	0x3600,0xF6C1,0xF781,0x3740,0xF501,0x35C0,0x3480,0xF441,
-	0x3C00,0xFCC1,0xFD81,0x3D40,0xFF01,0x3FC0,0x3E80,0xFE41,
-	0xFA01,0x3AC0,0x3B80,0xFB41,0x3900,0xF9C1,0xF881,0x3840,
-	0x2800,0xE8C1,0xE981,0x2940,0xEB01,0x2BC0,0x2A80,0xEA41,
-	0xEE01,0x2EC0,0x2F80,0xEF41,0x2D00,0xEDC1,0xEC81,0x2C40,
-	0xE401,0x24C0,0x2580,0xE541,0x2700,0xE7C1,0xE681,0x2640,
-	0x2200,0xE2C1,0xE381,0x2340,0xE101,0x21C0,0x2080,0xE041,
-	0xA001,0x60C0,0x6180,0xA141,0x6300,0xA3C1,0xA281,0x6240,
-	0x6600,0xA6C1,0xA781,0x6740,0xA501,0x65C0,0x6480,0xA441,
-	0x6C00,0xACC1,0xAD81,0x6D40,0xAF01,0x6FC0,0x6E80,0xAE41,
-	0xAA01,0x6AC0,0x6B80,0xAB41,0x6900,0xA9C1,0xA881,0x6840,
-	0x7800,0xB8C1,0xB981,0x7940,0xBB01,0x7BC0,0x7A80,0xBA41,
-	0xBE01,0x7EC0,0x7F80,0xBF41,0x7D00,0xBDC1,0xBC81,0x7C40,
-	0xB401,0x74C0,0x7580,0xB541,0x7700,0xB7C1,0xB681,0x7640,
-	0x7200,0xB2C1,0xB381,0x7340,0xB101,0x71C0,0x7080,0xB041,
-	0x5000,0x90C1,0x9181,0x5140,0x9301,0x53C0,0x5280,0x9241,
-	0x9601,0x56C0,0x5780,0x9741,0x5500,0x95C1,0x9481,0x5440,
-	0x9C01,0x5CC0,0x5D80,0x9D41,0x5F00,0x9FC1,0x9E81,0x5E40,
-	0x5A00,0x9AC1,0x9B81,0x5B40,0x9901,0x59C0,0x5880,0x9841,
-	0x8801,0x48C0,0x4980,0x8941,0x4B00,0x8BC1,0x8A81,0x4A40,
-	0x4E00,0x8EC1,0x8F81,0x4F40,0x8D01,0x4DC0,0x4C80,0x8C41,
-	0x4400,0x84C1,0x8581,0x4540,0x8701,0x47C0,0x4680,0x8641,
-	0x8201,0x42C0,0x4380,0x8341,0x4100,0x81C1,0x8081,0x4040
-};
-
 static int      archive_read_format_lha_bid(struct archive_read *, int);
 static int      archive_read_format_lha_options(struct archive_read *,
 		    const char *, const char *);
@@ -279,6 +238,7 @@ static int	lha_read_data_none(struct archive_read *, const void **,
 		    size_t *, int64_t *);
 static int	lha_read_data_lzh(struct archive_read *, const void **,
 		    size_t *, int64_t *);
+static void	lha_crc16_init(void);
 static uint16_t lha_crc16(uint16_t, const void *, size_t);
 static int	lzh_decode_init(struct lzh_stream *, const char *);
 static void	lzh_decode_free(struct lzh_stream *);
@@ -520,6 +480,8 @@ archive_read_format_lha_read_header(struct archive_read *a,
 	const char *signature;
 	int err;
 	
+	lha_crc16_init();
+
 	a->archive.archive_format = ARCHIVE_FORMAT_LHA;
 	if (a->archive.archive_format_name == NULL)
 		a->archive.archive_format_name = "lha";
@@ -1232,13 +1194,15 @@ lha_read_file_extended_header(struct archive_read *a, struct lha *lha,
 				archive_string_empty(&lha->filename);
 				break;
 			}
+			if (extdheader[0] == '\0')
+				goto invalid;
 			archive_strncpy(&lha->filename,
 			    (const char *)extdheader, datasize);
 			break;
 		case EXT_DIRECTORY:
-			if (datasize == 0)
+			if (datasize == 0 || extdheader[0] == '\0')
 				/* no directory name data. exit this case. */
-				break;
+				goto invalid;
 
 			archive_strncpy(&lha->dirname,
 		  	    (const char *)extdheader, datasize);
@@ -1378,6 +1342,26 @@ invalid:
 }
 
 static int
+lha_end_of_entry(struct archive_read *a)
+{
+	struct lha *lha = (struct lha *)(a->format->data);
+	int r = ARCHIVE_EOF;
+
+	if (!lha->end_of_entry_cleanup) {
+		if ((lha->setflag & CRC_IS_SET) &&
+		    lha->crc != lha->entry_crc_calculated) {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    "LHa data CRC error");
+			r = ARCHIVE_WARN;
+		}
+
+		/* End-of-entry cleanup done. */
+		lha->end_of_entry_cleanup = 1;
+	}
+	return (r);
+}
+
+static int
 archive_read_format_lha_read_data(struct archive_read *a,
     const void **buff, size_t *size, int64_t *offset)
 {
@@ -1390,22 +1374,10 @@ archive_read_format_lha_read_data(struct archive_read *a,
 		lha->entry_unconsumed = 0;
 	}
 	if (lha->end_of_entry) {
-		if (!lha->end_of_entry_cleanup) {
-			if ((lha->setflag & CRC_IS_SET) &&
-			    lha->crc != lha->entry_crc_calculated) {
-				archive_set_error(&a->archive,
-				    ARCHIVE_ERRNO_MISC,
-				    "LHa data CRC error");
-				return (ARCHIVE_WARN);
-			}
-
-			/* End-of-entry cleanup done. */
-			lha->end_of_entry_cleanup = 1;
-		}
 		*offset = lha->entry_offset;
 		*size = 0;
 		*buff = NULL;
-		return (ARCHIVE_EOF);
+		return (lha_end_of_entry(a));
 	}
 
 	if (lha->entry_is_compressed)
@@ -1477,18 +1449,6 @@ lha_read_data_lzh(struct archive_read *a, const void **buff,
 	ssize_t bytes_avail;
 	int r;
 
-	/* If the buffer hasn't been allocated, allocate it now. */
-	if (lha->uncompressed_buffer == NULL) {
-		lha->uncompressed_buffer_size = 64 * 1024;
-		lha->uncompressed_buffer
-		    = (unsigned char *)malloc(lha->uncompressed_buffer_size);
-		if (lha->uncompressed_buffer == NULL) {
-			archive_set_error(&a->archive, ENOMEM,
-			    "No memory for lzh decompression");
-			return (ARCHIVE_FATAL);
-		}
-	}
-
 	/* If we haven't yet read any data, initialize the decompressor. */
 	if (!lha->decompress_init) {
 		r = lzh_decode_init(&(lha->strm), lha->method);
@@ -1534,12 +1494,9 @@ lha_read_data_lzh(struct archive_read *a, const void **buff,
 	if (bytes_avail > lha->entry_bytes_remaining)
 		bytes_avail = (ssize_t)lha->entry_bytes_remaining;
 
-	lha->strm.avail_in = bytes_avail;
+	lha->strm.avail_in = (int)bytes_avail;
 	lha->strm.total_in = 0;
-	if (lha->strm.avail_out == 0) {
-		lha->strm.next_out = lha->uncompressed_buffer;
-		lha->strm.avail_out = lha->uncompressed_buffer_size;
-	}
+	lha->strm.avail_out = 0;
 
 	r = lzh_decode(&(lha->strm), bytes_avail == lha->entry_bytes_remaining);
 	switch (r) {
@@ -1556,10 +1513,10 @@ lha_read_data_lzh(struct archive_read *a, const void **buff,
 	lha->entry_unconsumed = lha->strm.total_in;
 	lha->entry_bytes_remaining -= lha->strm.total_in;
 
-	if (lha->strm.avail_out == 0 || lha->end_of_entry) {
+	if (lha->strm.avail_out) {
 		*offset = lha->entry_offset;
-		*size = lha->strm.next_out - lha->uncompressed_buffer;
-		*buff = lha->uncompressed_buffer;
+		*size = lha->strm.avail_out;
+		*buff = lha->strm.ref_ptr;
 		lha->entry_crc_calculated =
 		    lha_crc16(lha->entry_crc_calculated, *buff, *size);
 		lha->entry_offset += *size;
@@ -1567,6 +1524,8 @@ lha_read_data_lzh(struct archive_read *a, const void **buff,
 		*offset = lha->entry_offset;
 		*size = 0;
 		*buff = NULL;
+		if (lha->end_of_entry)
+			return (lha_end_of_entry(a));
 	}
 	return (ARCHIVE_OK);
 }
@@ -1611,7 +1570,6 @@ archive_read_format_lha_cleanup(struct archive_read *a)
 	struct lha *lha = (struct lha *)(a->format->data);
 
 	lzh_decode_free(&(lha->strm));
-	free(lha->uncompressed_buffer);
 	archive_string_free(&(lha->dirname));
 	archive_string_free(&(lha->filename));
 	archive_string_free(&(lha->uname));
@@ -1702,50 +1660,87 @@ lha_calcsum(unsigned char sum, const void *pp, int offset, size_t size)
 	return (sum);
 }
 
-#define CRC16(crc, v)	do {	\
-	(crc) = crc16tbl[((crc) ^ v) & 0xFF] ^ ((crc) >> 8);	\
-} while (0)
+static uint16_t crc16tbl[2][256];
+static void
+lha_crc16_init(void)
+{
+	unsigned int i;
+	static int crc16init = 0;
+
+	if (crc16init)
+		return;
+	crc16init = 1;
+
+	for (i = 0; i < 256; i++) {
+		unsigned int j;
+		uint16_t crc = (uint16_t)i;
+		for (j = 8; j; j--)
+			crc = (crc >> 1) ^ ((crc & 1) * 0xA001);
+		crc16tbl[0][i] = crc;
+	}
+
+	for (i = 0; i < 256; i++) {
+		crc16tbl[1][i] = (crc16tbl[0][i] >> 8)
+			^ crc16tbl[0][crc16tbl[0][i] & 0xff];
+	}
+}
 
 static uint16_t
 lha_crc16(uint16_t crc, const void *pp, size_t len)
 {
-	const unsigned char *buff = (const unsigned char *)pp;
-
-	while (len >= 8) {
-		CRC16(crc, *buff++); CRC16(crc, *buff++);
-		CRC16(crc, *buff++); CRC16(crc, *buff++);
-		CRC16(crc, *buff++); CRC16(crc, *buff++);
-		CRC16(crc, *buff++); CRC16(crc, *buff++);
-		len -= 8;
+	const unsigned char *p = (const unsigned char *)pp;
+	const uint16_t *buff;
+	const union {
+		uint32_t i;
+		char c[4];
+	} u = { 0x01020304 };
+
+	if (len == 0)
+		return crc;
+
+	/* Process unaligned address. */
+	if (((uintptr_t)p) & (uintptr_t)0x1) {
+		crc = (crc >> 8) ^ crc16tbl[0][(crc ^ *p++) & 0xff];
+		len--;
 	}
-	switch (len) {
-	case 7:
-		CRC16(crc, *buff++);
-		/* FALL THROUGH */
-	case 6:
-		CRC16(crc, *buff++);
-		/* FALL THROUGH */
-	case 5:
-		CRC16(crc, *buff++);
-		/* FALL THROUGH */
-	case 4:
-		CRC16(crc, *buff++);
-		/* FALL THROUGH */
-	case 3:
-		CRC16(crc, *buff++);
-		/* FALL THROUGH */
-	case 2:
-		CRC16(crc, *buff++);
-		/* FALL THROUGH */
-	case 1:
-		CRC16(crc, *buff);
-		/* FALL THROUGH */
-	case 0:
-		break;
+	buff = (const uint16_t *)p;
+	/*
+	 * Modern C compiler such as GCC does not unroll automatically yet
+	 * without unrolling pragma, and Clang is so. So we should
+	 * unroll this loop for its performance.
+	 */
+	for (;len >= 8; len -= 8) {
+		/* This if statement expects compiler optimization will
+		 * remove the stament which will not be executed. */
+#ifdef _MSC_VER  /* Visual Studio */
+#  define bswap16(x) _byteswap_ushort(x)
+#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8) \
+      || defined(__clang__)
+#  define bswap16(x) __builtin_bswap16(x)
+#else
+#  define bswap16(x) ((((x) >> 8) & 0xff) | ((x) << 8))
+#endif
+#define CRC16W	do { 	\
+		if(u.c[0] == 1) { /* Big endian */		\
+			crc ^= bswap16(*buff); buff++;		\
+		} else						\
+			crc ^= *buff++;				\
+		crc = crc16tbl[1][crc & 0xff] ^ crc16tbl[0][crc >> 8];\
+} while (0)
+		CRC16W;
+		CRC16W;
+		CRC16W;
+		CRC16W;
+#undef CRC16W
+#undef bswap16
 	}
-	return (crc);
-}
 
+	p = (const unsigned char *)buff;
+	for (;len; len--) {
+		crc = (crc >> 8) ^ crc16tbl[0][(crc ^ *p++) & 0xff];
+	}
+	return crc;
+}
 
 /*
  * Initialize LZHUF decoder.
@@ -1784,18 +1779,18 @@ lzh_decode_init(struct lzh_stream *strm, const char *method)
 		return (ARCHIVE_FAILED);/* Not supported. */
 	}
 	ds->error = ARCHIVE_FATAL;
-	w_size = ds->w_size;
-	ds->w_size = 1U << w_bits;
+	/* Expand a window size up to 128 KiB for decompressing process
+	 * performance whatever its original window size is. */
+	ds->w_size = 1U << 17;
 	ds->w_mask = ds->w_size -1;
-	if (ds->w_buff == NULL || w_size != ds->w_size) {
-		free(ds->w_buff);
+	if (ds->w_buff == NULL) {
 		ds->w_buff = malloc(ds->w_size);
 		if (ds->w_buff == NULL)
 			return (ARCHIVE_FATAL);
 	}
-	memset(ds->w_buff, 0x20, ds->w_size);
+	w_size = 1U << w_bits;
+	memset(ds->w_buff + ds->w_size - w_size, 0x20, w_size);
 	ds->w_pos = 0;
-	ds->w_remaining = 0;
 	ds->state = 0;
 	ds->pos_pt_len_size = w_bits + 1;
 	ds->pos_pt_len_bits = (w_bits == 15 || w_bits == 16)? 5: 4;
@@ -1882,9 +1877,10 @@ lzh_br_fillup(struct lzh_stream *strm, struct lzh_br *br)
 	int n = CACHE_BITS - br->cache_avail;
 
 	for (;;) {
-		switch (n >> 3) {
-		case 8:
-			if (strm->avail_in >= 8) {
+		const int x = n >> 3;
+		if (strm->avail_in >= x) {
+			switch (x) {
+			case 8:
 				br->cache_buffer =
 				    ((uint64_t)strm->next_in[0]) << 56 |
 				    ((uint64_t)strm->next_in[1]) << 48 |
@@ -1898,10 +1894,7 @@ lzh_br_fillup(struct lzh_stream *strm, struct lzh_br *br)
 				strm->avail_in -= 8;
 				br->cache_avail += 8 * 8;
 				return (1);
-			}
-			break;
-		case 7:
-			if (strm->avail_in >= 7) {
+			case 7:
 				br->cache_buffer =
 		 		   (br->cache_buffer << 56) |
 				    ((uint64_t)strm->next_in[0]) << 48 |
@@ -1915,10 +1908,7 @@ lzh_br_fillup(struct lzh_stream *strm, struct lzh_br *br)
 				strm->avail_in -= 7;
 				br->cache_avail += 7 * 8;
 				return (1);
-			}
-			break;
-		case 6:
-			if (strm->avail_in >= 6) {
+			case 6:
 				br->cache_buffer =
 		 		   (br->cache_buffer << 48) |
 				    ((uint64_t)strm->next_in[0]) << 40 |
@@ -1931,14 +1921,13 @@ lzh_br_fillup(struct lzh_stream *strm, struct lzh_br *br)
 				strm->avail_in -= 6;
 				br->cache_avail += 6 * 8;
 				return (1);
+			case 0:
+				/* We have enough compressed data in
+				 * the cache buffer.*/
+				return (1);
+			default:
+				break;
 			}
-			break;
-		case 0:
-			/* We have enough compressed data in
-			 * the cache buffer.*/ 
-			return (1);
-		default:
-			break;
 		}
 		if (strm->avail_in == 0) {
 			/* There is not enough compressed data to fill up the
@@ -1993,7 +1982,7 @@ static int
 lzh_decode(struct lzh_stream *strm, int last)
 {
 	struct lzh_dec *ds = strm->ds;
-	int64_t avail_in;
+	int avail_in;
 	int r;
 
 	if (ds->error)
@@ -2010,35 +1999,12 @@ lzh_decode(struct lzh_stream *strm, int last)
 	return (r);
 }
 
-static int
-lzh_copy_from_window(struct lzh_stream *strm, struct lzh_dec *ds)
+static void
+lzh_emit_window(struct lzh_stream *strm, size_t s)
 {
-	size_t copy_bytes;
-
-	if (ds->w_remaining == 0 && ds->w_pos > 0) {
-		if (ds->w_pos - ds->copy_pos <= strm->avail_out)
-			copy_bytes = ds->w_pos - ds->copy_pos;
-		else
-			copy_bytes = (size_t)strm->avail_out;
-		memcpy(strm->next_out,
-		    ds->w_buff + ds->copy_pos, copy_bytes);
-		ds->copy_pos += (int)copy_bytes;
-	} else {
-		if (ds->w_remaining <= strm->avail_out)
-			copy_bytes = ds->w_remaining;
-		else
-			copy_bytes = (size_t)strm->avail_out;
-		memcpy(strm->next_out,
-		    ds->w_buff + ds->w_size - ds->w_remaining, copy_bytes);
-		ds->w_remaining -= (int)copy_bytes;
-	}
-	strm->next_out += copy_bytes;
-	strm->avail_out -= copy_bytes;
-	strm->total_out += copy_bytes;
-	if (strm->avail_out == 0)
-		return (0);
-	else
-		return (1);
+	strm->ref_ptr = strm->ds->w_buff;
+	strm->avail_out = (int)s;
+	strm->total_out += s;
 }
 
 static int
@@ -2073,8 +2039,9 @@ lzh_read_blocks(struct lzh_stream *strm, int last)
 					goto failed;
 				}
 				if (ds->w_pos > 0) {
-					if (!lzh_copy_from_window(strm, ds))
-						return (ARCHIVE_OK);
+					lzh_emit_window(strm, ds->w_pos);
+					ds->w_pos = 0;
+					return (ARCHIVE_OK);
 				}
 				/* End of compressed data; we have completely
 				 * handled all compressed data. */
@@ -2291,10 +2258,6 @@ lzh_decode_blocks(struct lzh_stream *strm, int last)
 	int lt_max_bits = lt->max_bits, pt_max_bits = pt->max_bits;
 	int state = ds->state;
 
-	if (ds->w_remaining > 0) {
-		if (!lzh_copy_from_window(strm, ds))
-			goto next_data;
-	}
 	for (;;) {
 		switch (state) {
 		case ST_GET_LITERAL:
@@ -2349,9 +2312,8 @@ lzh_decode_blocks(struct lzh_stream *strm, int last)
 				w_buff[w_pos] = c;
 				if (++w_pos >= w_size) {
 					w_pos = 0;
-					ds->w_remaining = w_size;
-					if (!lzh_copy_from_window(strm, ds))
-						goto next_data;
+					lzh_emit_window(strm, w_size);
+					goto next_data;
 				}
 			}
 			/* 'c' is the length of a match pattern we have
@@ -2429,25 +2391,26 @@ lzh_decode_blocks(struct lzh_stream *strm, int last)
 
 					d = w_buff + w_pos;
 					s = w_buff + copy_pos;
-					for (li = 0; li < l; li++)
+					for (li = 0; li < l-1;) {
+						d[li] = s[li];li++;
+						d[li] = s[li];li++;
+					}
+					if (li < l)
 						d[li] = s[li];
 				}
-				w_pos = (w_pos + l) & w_mask;
-				if (w_pos == 0) {
-					ds->w_remaining = w_size;
-					if (!lzh_copy_from_window(strm, ds)) {
-						if (copy_len <= l)
-							state = ST_GET_LITERAL;
-						else {
-							state = ST_COPY_DATA;
-							ds->copy_len =
-							    copy_len - l;
-							ds->copy_pos =
-							    (copy_pos + l)
-							    & w_mask;
-						}
-						goto next_data;
+				w_pos += l;
+				if (w_pos == w_size) {
+					w_pos = 0;
+					lzh_emit_window(strm, w_size);
+					if (copy_len <= l)
+						state = ST_GET_LITERAL;
+					else {
+						state = ST_COPY_DATA;
+						ds->copy_len = copy_len - l;
+						ds->copy_pos =
+						    (copy_pos + l) & w_mask;
 					}
+					goto next_data;
 				}
 				if (copy_len <= l)
 					/* A copy of current pattern ended. */
@@ -2507,14 +2470,80 @@ lzh_huffman_free(struct huffman *hf)
 	free(hf->tree);
 }
 
+static char bitlen_tbl[0x400] = {
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+	 9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+	 9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+	 9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+	 9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+	 9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+	 9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+	 9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+	 9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+	10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+	10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+	10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+	10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+	11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+	11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+	12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+	13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 16,  0
+};
 static int
 lzh_read_pt_bitlen(struct lzh_stream *strm, int start, int end)
 {
 	struct lzh_dec *ds = strm->ds;
-	struct lzh_br * br = &(ds->br);
+	struct lzh_br *br = &(ds->br);
 	int c, i;
 
-	for (i = start; i < end;) {
+	for (i = start; i < end; ) {
 		/*
 		 *  bit pattern     the number we need
 		 *     000           ->  0
@@ -2530,17 +2559,13 @@ lzh_read_pt_bitlen(struct lzh_stream *strm, int start, int end)
 		if (!lzh_br_read_ahead(strm, br, 3))
 			return (i);
 		if ((c = lzh_br_bits(br, 3)) == 7) {
-			int d;
 			if (!lzh_br_read_ahead(strm, br, 13))
 				return (i);
-			d = lzh_br_bits(br, 13);
-			while (d & 0x200) {
-				c++;
-				d <<= 1;
-			}
-			if (c > 16)
+			c = bitlen_tbl[lzh_br_bits(br, 13) & 0x3FF];
+			if (c)
+				lzh_br_consume(br, c - 3);
+			else
 				return (-1);/* Invalid data. */
-			lzh_br_consume(br, c - 3);
 		} else
 			lzh_br_consume(br, 3);
 		ds->pt.bitlen[i++] = c;
@@ -2603,7 +2628,7 @@ lzh_make_huffman_table(struct huffman *hf)
 		}
 	}
 	if (maxbits > HTBL_BITS) {
-		int htbl_max;
+		unsigned htbl_max;
 		uint16_t *p;
 
 		diffbits = maxbits - HTBL_BITS;
@@ -2647,8 +2672,40 @@ lzh_make_huffman_table(struct huffman *hf)
 				return (0);/* Invalid */
 			/* Update the table */
 			p = &(tbl[ptn]);
-			while (--cnt >= 0)
-				p[cnt] = (uint16_t)i;
+			if (cnt > 7) {
+				uint16_t *pc;
+
+				cnt -= 8;
+				pc = &p[cnt];
+				pc[0] = (uint16_t)i;
+				pc[1] = (uint16_t)i;
+				pc[2] = (uint16_t)i;
+				pc[3] = (uint16_t)i;
+				pc[4] = (uint16_t)i;
+				pc[5] = (uint16_t)i;
+				pc[6] = (uint16_t)i;
+				pc[7] = (uint16_t)i;
+				if (cnt > 7) {
+					cnt -= 8;
+					memcpy(&p[cnt], pc,
+						8 * sizeof(uint16_t));
+					pc = &p[cnt];
+					while (cnt > 15) {
+						cnt -= 16;
+						memcpy(&p[cnt], pc,
+							16 * sizeof(uint16_t));
+					}
+				}
+				if (cnt)
+					memcpy(p, pc, cnt * sizeof(uint16_t));
+			} else {
+				while (cnt > 1) {
+					p[--cnt] = (uint16_t)i;
+					p[--cnt] = (uint16_t)i;
+				}
+				if (cnt)
+					p[--cnt] = (uint16_t)i;
+			}
 			continue;
 		}
 
@@ -2742,7 +2799,7 @@ lzh_decode_huffman(struct huffman *hf, unsigned rbits)
 	 * If it fails, search a huffman tree for.
 	 */
 	c = hf->tbl[rbits >> hf->shift_bits];
-	if (c < hf->len_avail)
+	if (c < hf->len_avail || hf->len_avail == 0)
 		return (c);
 	/* This bit pattern needs to be found out at a huffman tree. */
 	return (lzh_decode_huffman_tree(hf, rbits, c));
diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
index d82d4c1..b5f8e30 100644
--- a/libarchive/archive_read_support_format_mtree.c
+++ b/libarchive/archive_read_support_format_mtree.c
@@ -139,16 +139,19 @@ get_time_t_max(void)
 #if defined(TIME_T_MAX)
 	return TIME_T_MAX;
 #else
-	static time_t t;
-	time_t a;
-	if (t == 0) {
-		a = 1;
-		while (a > t) {
-			t = a;
-			a = a * 2 + 1;
-		}
+	/* ISO C allows time_t to be a floating-point type,
+	   but POSIX requires an integer type.  The following
+	   should work on any system that follows the POSIX
+	   conventions. */
+	if (((time_t)0) < ((time_t)-1)) {
+		/* Time_t is unsigned */
+		return (~(time_t)0);
+	} else {
+		/* Time_t is signed. */
+		const uintmax_t max_unsigned_time_t = (uintmax_t)(~(time_t)0);
+		const uintmax_t max_signed_time_t = max_unsigned_time_t >> 1;
+		return (time_t)max_signed_time_t;
 	}
-	return t;
 #endif
 }
 
@@ -158,20 +161,16 @@ get_time_t_min(void)
 #if defined(TIME_T_MIN)
 	return TIME_T_MIN;
 #else
-	/* 't' will hold the minimum value, which will be zero (if
-	 * time_t is unsigned) or -2^n (if time_t is signed). */
-	static int computed;
-	static time_t t;
-	time_t a;
-	if (computed == 0) {
-		a = (time_t)-1;
-		while (a < t) {
-			t = a;
-			a = a * 2;
-		}			
-		computed = 1;
+	if (((time_t)0) < ((time_t)-1)) {
+		/* Time_t is unsigned */
+		return (time_t)0;
+	} else {
+		/* Time_t is signed. */
+		const uintmax_t max_unsigned_time_t = (uintmax_t)(~(time_t)0);
+		const uintmax_t max_signed_time_t = max_unsigned_time_t >> 1;
+		const intmax_t min_signed_time_t = (intmax_t)~max_signed_time_t;
+		return (time_t)min_signed_time_t;
 	}
-	return t;
 #endif
 }
 
@@ -532,32 +531,34 @@ bid_entry(const char *p, ssize_t len, ssize_t nl, int *last_is_path)
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* E0 - EF */
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* F0 - FF */
 	};
-	ssize_t ll = len;
+	ssize_t ll;
 	const char *pp = p;
+	const char * const pp_end = pp + len;
 
 	*last_is_path = 0;
 	/*
 	 * Skip the path-name which is quoted.
 	 */
-	while (ll > 0 && *pp != ' ' &&*pp != '\t' && *pp != '\r' &&
-	    *pp != '\n') {
+	for (;pp < pp_end; ++pp) {
 		if (!safe_char[*(const unsigned char *)pp]) {
-			f = 0;
+			if (*pp != ' ' && *pp != '\t' && *pp != '\r'
+			    && *pp != '\n')
+				f = 0;
 			break;
 		}
-		++pp;
-		--ll;
-		++f;
+		f = 1;
 	}
+	ll = pp_end - pp;
+
 	/* If a path-name was not found at the first, try to check
-	 * a mtree format ``NetBSD's mtree -D'' creates, which
-	 * places the path-name at the last. */
+	 * a mtree format(a.k.a form D) ``NetBSD's mtree -D'' creates,
+	 * which places the path-name at the last. */
 	if (f == 0) {
 		const char *pb = p + len - nl;
 		int name_len = 0;
 		int slash;
 
-		/* Do not accept multi lines for form D. */
+		/* The form D accepts only a single line for an entry. */
 		if (pb-2 >= p &&
 		    pb[-1] == '\\' && (pb[-2] == ' ' || pb[-2] == '\t'))
 			return (-1);
@@ -1056,7 +1057,8 @@ read_header(struct archive_read *a, struct archive_entry *entry)
 		}
 		if (!mtree->this_entry->used) {
 			use_next = 0;
-			r = parse_file(a, entry, mtree, mtree->this_entry, &use_next);
+			r = parse_file(a, entry, mtree, mtree->this_entry,
+				&use_next);
 			if (use_next == 0)
 				return (r);
 		}
@@ -1151,8 +1153,8 @@ parse_file(struct archive_read *a, struct archive_entry *entry,
 			mtree->fd = open(path, O_RDONLY | O_BINARY | O_CLOEXEC);
 			__archive_ensure_cloexec_flag(mtree->fd);
 			if (mtree->fd == -1 &&
-					(errno != ENOENT ||
-					 archive_strlen(&mtree->contents_name) > 0)) {
+				(errno != ENOENT ||
+				 archive_strlen(&mtree->contents_name) > 0)) {
 				archive_set_error(&a->archive, errno,
 						"Can't open %s", path);
 				r = ARCHIVE_WARN;
@@ -1175,76 +1177,79 @@ parse_file(struct archive_read *a, struct archive_entry *entry,
 		}
 
 		/*
-		 * Check for a mismatch between the type in the specification and
-		 * the type of the contents object on disk.
+		 * Check for a mismatch between the type in the specification
+		 * and the type of the contents object on disk.
 		 */
 		if (st != NULL) {
-			if (
-					((st->st_mode & S_IFMT) == S_IFREG &&
-					 archive_entry_filetype(entry) == AE_IFREG)
+			if (((st->st_mode & S_IFMT) == S_IFREG &&
+			      archive_entry_filetype(entry) == AE_IFREG)
 #ifdef S_IFLNK
-					|| ((st->st_mode & S_IFMT) == S_IFLNK &&
-						archive_entry_filetype(entry) == AE_IFLNK)
+			  ||((st->st_mode & S_IFMT) == S_IFLNK &&
+			      archive_entry_filetype(entry) == AE_IFLNK)
 #endif
 #ifdef S_IFSOCK
-					|| ((st->st_mode & S_IFSOCK) == S_IFSOCK &&
-						archive_entry_filetype(entry) == AE_IFSOCK)
+			  ||((st->st_mode & S_IFSOCK) == S_IFSOCK &&
+			      archive_entry_filetype(entry) == AE_IFSOCK)
 #endif
 #ifdef S_IFCHR
-					|| ((st->st_mode & S_IFMT) == S_IFCHR &&
-						archive_entry_filetype(entry) == AE_IFCHR)
+			  ||((st->st_mode & S_IFMT) == S_IFCHR &&
+			      archive_entry_filetype(entry) == AE_IFCHR)
 #endif
 #ifdef S_IFBLK
-					|| ((st->st_mode & S_IFMT) == S_IFBLK &&
-						archive_entry_filetype(entry) == AE_IFBLK)
+			  ||((st->st_mode & S_IFMT) == S_IFBLK &&
+			      archive_entry_filetype(entry) == AE_IFBLK)
 #endif
-					|| ((st->st_mode & S_IFMT) == S_IFDIR &&
-						archive_entry_filetype(entry) == AE_IFDIR)
+			  ||((st->st_mode & S_IFMT) == S_IFDIR &&
+			      archive_entry_filetype(entry) == AE_IFDIR)
 #ifdef S_IFIFO
-					|| ((st->st_mode & S_IFMT) == S_IFIFO &&
-							archive_entry_filetype(entry) == AE_IFIFO)
+			  ||((st->st_mode & S_IFMT) == S_IFIFO &&
+			      archive_entry_filetype(entry) == AE_IFIFO)
 #endif
-					) {
-						/* Types match. */
-					} else {
-						/* Types don't match; bail out gracefully. */
-						if (mtree->fd >= 0)
-							close(mtree->fd);
-						mtree->fd = -1;
-						if (parsed_kws & MTREE_HAS_OPTIONAL) {
-							/* It's not an error for an optional entry
-							   to not match disk. */
-							*use_next = 1;
-						} else if (r == ARCHIVE_OK) {
-							archive_set_error(&a->archive,
-									ARCHIVE_ERRNO_MISC,
-									"mtree specification has different type for %s",
-									archive_entry_pathname(entry));
-							r = ARCHIVE_WARN;
-						}
-						return r;
-					}
+			) {
+				/* Types match. */
+			} else {
+				/* Types don't match; bail out gracefully. */
+				if (mtree->fd >= 0)
+					close(mtree->fd);
+				mtree->fd = -1;
+				if (parsed_kws & MTREE_HAS_OPTIONAL) {
+					/* It's not an error for an optional
+					 * entry to not match disk. */
+					*use_next = 1;
+				} else if (r == ARCHIVE_OK) {
+					archive_set_error(&a->archive,
+					    ARCHIVE_ERRNO_MISC,
+					    "mtree specification has different"
+					    " type for %s",
+					    archive_entry_pathname(entry));
+					r = ARCHIVE_WARN;
+				}
+				return (r);
+			}
 		}
 
 		/*
-		 * If there is a contents file on disk, pick some of the metadata
-		 * from that file.  For most of these, we only set it from the contents
-		 * if it wasn't already parsed from the specification.
+		 * If there is a contents file on disk, pick some of the
+		 * metadata from that file.  For most of these, we only
+		 * set it from the contents if it wasn't already parsed
+		 * from the specification.
 		 */
 		if (st != NULL) {
 			if (((parsed_kws & MTREE_HAS_DEVICE) == 0 ||
-						(parsed_kws & MTREE_HAS_NOCHANGE) != 0) &&
-					(archive_entry_filetype(entry) == AE_IFCHR ||
-					 archive_entry_filetype(entry) == AE_IFBLK))
+				(parsed_kws & MTREE_HAS_NOCHANGE) != 0) &&
+				(archive_entry_filetype(entry) == AE_IFCHR ||
+				 archive_entry_filetype(entry) == AE_IFBLK))
 				archive_entry_set_rdev(entry, st->st_rdev);
-			if ((parsed_kws & (MTREE_HAS_GID | MTREE_HAS_GNAME)) == 0 ||
-					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+			if ((parsed_kws & (MTREE_HAS_GID | MTREE_HAS_GNAME))
+				== 0 ||
+			    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
 				archive_entry_set_gid(entry, st->st_gid);
-			if ((parsed_kws & (MTREE_HAS_UID | MTREE_HAS_UNAME)) == 0 ||
-					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+			if ((parsed_kws & (MTREE_HAS_UID | MTREE_HAS_UNAME))
+				== 0 ||
+			    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
 				archive_entry_set_uid(entry, st->st_uid);
 			if ((parsed_kws & MTREE_HAS_MTIME) == 0 ||
-					(parsed_kws & MTREE_HAS_NOCHANGE) != 0) {
+			    (parsed_kws & MTREE_HAS_NOCHANGE) != 0) {
 #if HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC
 				archive_entry_set_mtime(entry, st->st_mtime,
 						st->st_mtimespec.tv_nsec);
@@ -1265,23 +1270,24 @@ parse_file(struct archive_read *a, struct archive_entry *entry,
 #endif
 			}
 			if ((parsed_kws & MTREE_HAS_NLINK) == 0 ||
-					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+			    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
 				archive_entry_set_nlink(entry, st->st_nlink);
 			if ((parsed_kws & MTREE_HAS_PERM) == 0 ||
-					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+			    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
 				archive_entry_set_perm(entry, st->st_mode);
 			if ((parsed_kws & MTREE_HAS_SIZE) == 0 ||
-					(parsed_kws & MTREE_HAS_NOCHANGE) != 0)
+			    (parsed_kws & MTREE_HAS_NOCHANGE) != 0)
 				archive_entry_set_size(entry, st->st_size);
 			archive_entry_set_ino(entry, st->st_ino);
 			archive_entry_set_dev(entry, st->st_dev);
 
-			archive_entry_linkify(mtree->resolver, &entry, &sparse_entry);
+			archive_entry_linkify(mtree->resolver, &entry,
+				&sparse_entry);
 		} else if (parsed_kws & MTREE_HAS_OPTIONAL) {
 			/*
 			 * Couldn't open the entry, stat it or the on-disk type
-			 * didn't match.  If this entry is optional, just ignore it
-			 * and read the next header entry.
+			 * didn't match.  If this entry is optional, just
+			 * ignore it and read the next header entry.
 			 */
 			*use_next = 1;
 			return ARCHIVE_OK;
@@ -1370,7 +1376,7 @@ parse_device(dev_t *pdev, struct archive *a, char *val)
 				    "Missing number");
 				return ARCHIVE_WARN;
 			}
-			numbers[argc++] = mtree_atol(&p);
+			numbers[argc++] = (unsigned long)mtree_atol(&p);
 			if (argc > MAX_PACK_ARGS) {
 				archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
 				    "Too many arguments");
@@ -1583,32 +1589,38 @@ parse_keyword(struct archive_read *a, struct mtree *mtree,
 				}
 			case 'c':
 				if (strcmp(val, "char") == 0) {
-					archive_entry_set_filetype(entry, AE_IFCHR);
+					archive_entry_set_filetype(entry,
+						AE_IFCHR);
 					break;
 				}
 			case 'd':
 				if (strcmp(val, "dir") == 0) {
-					archive_entry_set_filetype(entry, AE_IFDIR);
+					archive_entry_set_filetype(entry,
+						AE_IFDIR);
 					break;
 				}
 			case 'f':
 				if (strcmp(val, "fifo") == 0) {
-					archive_entry_set_filetype(entry, AE_IFIFO);
+					archive_entry_set_filetype(entry,
+						AE_IFIFO);
 					break;
 				}
 				if (strcmp(val, "file") == 0) {
-					archive_entry_set_filetype(entry, AE_IFREG);
+					archive_entry_set_filetype(entry,
+						AE_IFREG);
 					break;
 				}
 			case 'l':
 				if (strcmp(val, "link") == 0) {
-					archive_entry_set_filetype(entry, AE_IFLNK);
+					archive_entry_set_filetype(entry,
+						AE_IFLNK);
 					break;
 				}
 			default:
 				archive_set_error(&a->archive,
 				    ARCHIVE_ERRNO_FILE_FORMAT,
-				    "Unrecognized file type \"%s\"; assuming \"file\"", val);
+				    "Unrecognized file type \"%s\"; "
+				    "assuming \"file\"", val);
 				archive_entry_set_filetype(entry, AE_IFREG);
 				return (ARCHIVE_WARN);
 			}
@@ -1635,7 +1647,8 @@ parse_keyword(struct archive_read *a, struct mtree *mtree,
 }
 
 static int
-read_data(struct archive_read *a, const void **buff, size_t *size, int64_t *offset)
+read_data(struct archive_read *a, const void **buff, size_t *size,
+    int64_t *offset)
 {
 	size_t bytes_to_read;
 	ssize_t bytes_read;
@@ -1761,6 +1774,10 @@ parse_escapes(char *src, struct mtree_entry *mentry)
 				c = '\v';
 				++src;
 				break;
+			case '\\':
+				c = '\\';
+				++src;
+				break;
 			}
 		}
 		*dest++ = c;
@@ -1898,14 +1915,14 @@ mtree_atol(char **p)
  * point to first character of line.
  */
 static ssize_t
-readline(struct archive_read *a, struct mtree *mtree, char **start, ssize_t limit)
+readline(struct archive_read *a, struct mtree *mtree, char **start,
+    ssize_t limit)
 {
 	ssize_t bytes_read;
 	ssize_t total_size = 0;
 	ssize_t find_off = 0;
 	const void *t;
-	const char *s;
-	void *p;
+	void *nl;
 	char *u;
 
 	/* Accumulate line in a line buffer. */
@@ -1916,11 +1933,10 @@ readline(struct archive_read *a, struct mtree *mtree, char **start, ssize_t limi
 			return (0);
 		if (bytes_read < 0)
 			return (ARCHIVE_FATAL);
-		s = t;  /* Start of line? */
-		p = memchr(t, '\n', bytes_read);
-		/* If we found '\n', trim the read. */
-		if (p != NULL) {
-			bytes_read = 1 + ((const char *)p) - s;
+		nl = memchr(t, '\n', bytes_read);
+		/* If we found '\n', trim the read to end exactly there. */
+		if (nl != NULL) {
+			bytes_read = ((const char *)nl) - ((const char *)t) + 1;
 		}
 		if (total_size + bytes_read + 1 > limit) {
 			archive_set_error(&a->archive,
@@ -1934,38 +1950,34 @@ readline(struct archive_read *a, struct mtree *mtree, char **start, ssize_t limi
 			    "Can't allocate working buffer");
 			return (ARCHIVE_FATAL);
 		}
+		/* Append new bytes to string. */
 		memcpy(mtree->line.s + total_size, t, bytes_read);
 		__archive_read_consume(a, bytes_read);
 		total_size += bytes_read;
-		/* Null terminate. */
 		mtree->line.s[total_size] = '\0';
-		/* If we found an unescaped '\n', clean up and return. */
+
 		for (u = mtree->line.s + find_off; *u; ++u) {
 			if (u[0] == '\n') {
+				/* Ends with unescaped newline. */
 				*start = mtree->line.s;
 				return total_size;
-			}
-			if (u[0] == '#') {
-				if (p == NULL)
+			} else if (u[0] == '#') {
+				/* Ends with comment sequence #...\n */
+				if (nl == NULL) {
+					/* But we've not found the \n yet */
 					break;
-				*start = mtree->line.s;
-				return total_size;
-			}
-			if (u[0] != '\\')
-				continue;
-			if (u[1] == '\\') {
-				++u;
-				continue;
-			}
-			if (u[1] == '\n') {
-				memmove(u, u + 1,
-				    total_size - (u - mtree->line.s) + 1);
-				--total_size;
-				++u;
-				break;
+				}
+			} else if (u[0] == '\\') {
+				if (u[1] == '\n') {
+					/* Trim escaped newline. */
+					total_size -= 2;
+					mtree->line.s[total_size] = '\0';
+					break;
+				} else if (u[1] != '\0') {
+					/* Skip the two-char escape sequence */
+					++u;
+				}
 			}
-			if (u[1] == '\0')
-				break;
 		}
 		find_off = u - mtree->line.s;
 	}
diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
index ae302a6..88979bb 100644
--- a/libarchive/archive_read_support_format_rar.c
+++ b/libarchive/archive_read_support_format_rar.c
@@ -186,6 +186,7 @@ struct huffman_code
 {
   struct huffman_tree_node *tree;
   int numentries;
+  int numallocatedentries;
   int minlength;
   int maxlength;
   int tablesize;
@@ -225,6 +226,7 @@ struct rar
   mode_t mode;
   char *filename;
   char *filename_save;
+  size_t filename_save_size;
   size_t filename_allocated;
 
   /* File header optional entries */
@@ -1000,8 +1002,8 @@ archive_read_format_rar_read_data(struct archive_read *a, const void **buff,
       rar->bytes_unconsumed = 0;
   }
 
+  *buff = NULL;
   if (rar->entry_eof || rar->offset_seek >= rar->unp_size) {
-    *buff = NULL;
     *size = 0;
     *offset = rar->offset;
     if (*offset < rar->unp_size)
@@ -1201,10 +1203,8 @@ archive_read_format_rar_seek_data(struct archive_read *a, int64_t offset,
     ret -= rar->dbo[0].start_offset;
 
     /* Always restart reading the file after a seek */
-    a->read_data_block = NULL;
-    a->read_data_offset = 0;
-    a->read_data_output_offset = 0;
-    a->read_data_remaining = 0;
+    __archive_reset_read_data(&a->archive);
+
     rar->bytes_unconsumed = 0;
     rar->offset = 0;
 
@@ -1530,6 +1530,7 @@ read_header(struct archive_read *a, struct archive_entry *entry,
 
   /* Split file in multivolume RAR. No more need to process header. */
   if (rar->filename_save &&
+    filename_size == rar->filename_save_size &&
     !memcmp(rar->filename, rar->filename_save, filename_size + 1))
   {
     __archive_read_consume(a, header_size - 7);
@@ -1559,6 +1560,7 @@ read_header(struct archive_read *a, struct archive_entry *entry,
   rar->filename_save = (char*)realloc(rar->filename_save,
                                       filename_size + 1);
   memcpy(rar->filename_save, rar->filename, filename_size + 1);
+  rar->filename_save_size = filename_size;
 
   /* Set info for seeking */
   free(rar->dbo);
@@ -2406,6 +2408,8 @@ create_code(struct archive_read *a, struct huffman_code *code,
 {
   int i, j, codebits = 0, symbolsleft = numsymbols;
 
+  code->numentries = 0;
+  code->numallocatedentries = 0;
   if (new_node(code) < 0) {
     archive_set_error(&a->archive, ENOMEM,
                       "Unable to allocate memory for node data.");
@@ -2534,11 +2538,17 @@ static int
 new_node(struct huffman_code *code)
 {
   void *new_tree;
-
-  new_tree = realloc(code->tree, (code->numentries + 1) * sizeof(*code->tree));
-  if (new_tree == NULL)
-    return (-1);
-  code->tree = (struct huffman_tree_node *)new_tree;
+  if (code->numallocatedentries == code->numentries) {
+    int new_num_entries = 256;
+    if (code->numentries > 0) {
+        new_num_entries = code->numentries * 2;
+    }
+    new_tree = realloc(code->tree, new_num_entries * sizeof(*code->tree));
+    if (new_tree == NULL)
+        return (-1);
+    code->tree = (struct huffman_tree_node *)new_tree;
+    code->numallocatedentries = new_num_entries;
+  }
   code->tree[code->numentries].branches[0] = -1;
   code->tree[code->numentries].branches[1] = -2;
   return 1;
@@ -2895,8 +2905,8 @@ rar_read_ahead(struct archive_read *a, size_t min, ssize_t *avail)
   int ret;
   if (avail)
   {
-    if (a->read_data_is_posix_read && *avail > (ssize_t)a->read_data_requested)
-      *avail = a->read_data_requested;
+    if (a->archive.read_data_is_posix_read && *avail > (ssize_t)a->archive.read_data_requested)
+      *avail = a->archive.read_data_requested;
     if (*avail > rar->bytes_remaining)
       *avail = (ssize_t)rar->bytes_remaining;
     if (*avail < 0)
diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index 734424d..01d85cf 100644
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -456,6 +456,7 @@ archive_read_format_tar_read_header(struct archive_read *a,
 	static int default_dev;
 	struct tar *tar;
 	const char *p;
+	const wchar_t *wp;
 	int r;
 	size_t l, unconsumed = 0;
 
@@ -506,27 +507,22 @@ archive_read_format_tar_read_header(struct archive_read *a,
 		}
 	}
 
-	if (r == ARCHIVE_OK) {
+	if (r == ARCHIVE_OK && archive_entry_filetype(entry) == AE_IFREG) {
 		/*
 		 * "Regular" entry with trailing '/' is really
 		 * directory: This is needed for certain old tar
 		 * variants and even for some broken newer ones.
 		 */
-		const wchar_t *wp;
-		wp = archive_entry_pathname_w(entry);
-		if (wp != NULL) {
+		if ((wp = archive_entry_pathname_w(entry)) != NULL) {
 			l = wcslen(wp);
-			if (archive_entry_filetype(entry) == AE_IFREG
-			    && wp[l-1] == L'/')
+			if (l > 0 && wp[l - 1] == L'/') {
 				archive_entry_set_filetype(entry, AE_IFDIR);
-		} else {
-			p = archive_entry_pathname(entry);
-			if (p == NULL)
-				return (ARCHIVE_FAILED);
+			}
+		} else if ((p = archive_entry_pathname(entry)) != NULL) {
 			l = strlen(p);
-			if (archive_entry_filetype(entry) == AE_IFREG
-			    && p[l-1] == '/')
+			if (l > 0 && p[l - 1] == '/') {
 				archive_entry_set_filetype(entry, AE_IFDIR);
+			}
 		}
 	}
 	return (r);
@@ -599,13 +595,27 @@ static int
 archive_read_format_tar_skip(struct archive_read *a)
 {
 	int64_t bytes_skipped;
+	int64_t request;
+	struct sparse_block *p;
 	struct tar* tar;
 
 	tar = (struct tar *)(a->format->data);
 
-	bytes_skipped = __archive_read_consume(a,
-	    tar->entry_bytes_remaining + tar->entry_padding +
-	    tar->entry_bytes_unconsumed);
+	/* Do not consume the hole of a sparse file. */
+	request = 0;
+	for (p = tar->sparse_list; p != NULL; p = p->next) {
+		if (!p->hole) {
+			if (p->remaining >= INT64_MAX - request) {
+				return ARCHIVE_FATAL;
+			}
+			request += p->remaining;
+		}
+	}
+	if (request > tar->entry_bytes_remaining)
+		request = tar->entry_bytes_remaining;
+	request += tar->entry_padding + tar->entry_bytes_unconsumed;
+
+	bytes_skipped = __archive_read_consume(a, request);
 	if (bytes_skipped < 0)
 		return (ARCHIVE_FATAL);
 
@@ -2117,6 +2127,10 @@ gnu_add_sparse_entry(struct archive_read *a, struct tar *tar,
 	else
 		tar->sparse_list = p;
 	tar->sparse_last = p;
+	if (remaining < 0 || offset < 0) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Malformed sparse map data");
+		return (ARCHIVE_FATAL);
+	}
 	p->offset = offset;
 	p->remaining = remaining;
 	return (ARCHIVE_OK);
diff --git a/libarchive/archive_read_support_format_warc.c b/libarchive/archive_read_support_format_warc.c
new file mode 100644
index 0000000..6bd15f6
--- /dev/null
+++ b/libarchive/archive_read_support_format_warc.c
@@ -0,0 +1,794 @@
+/*-
+ * Copyright (c) 2014 Sebastian Freundt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+__FBSDID("$FreeBSD$");
+
+/**
+ * WARC is standardised by ISO TC46/SC4/WG12 and currently available as
+ * ISO 28500:2009.
+ * For the purposes of this file we used the final draft from:
+ * http://bibnum.bnf.fr/warc/WARC_ISO_28500_version1_latestdraft.pdf
+ *
+ * Todo:
+ * [ ] real-world warcs can contain resources at endpoints ending in /
+ *     e.g. http://bibnum.bnf.fr/warc/
+ *     if you're lucky their response contains a Content-Location: header
+ *     pointing to a unix-compliant filename, in the example above it's
+ *     Content-Location: http://bibnum.bnf.fr/warc/index.html
+ *     however, that's not mandated and github for example doesn't follow
+ *     this convention.
+ *     We need a set of archive options to control what to do with
+ *     entries like these, at the moment care is taken to skip them.
+ *
+ **/
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
+#include "archive.h"
+#include "archive_entry.h"
+#include "archive_private.h"
+#include "archive_read_private.h"
+
+typedef enum {
+	WT_NONE,
+	/* warcinfo */
+	WT_INFO,
+	/* metadata */
+	WT_META,
+	/* resource */
+	WT_RSRC,
+	/* request, unsupported */
+	WT_REQ,
+	/* response, unsupported */
+	WT_RSP,
+	/* revisit, unsupported */
+	WT_RVIS,
+	/* conversion, unsupported */
+	WT_CONV,
+	/* continutation, unsupported at the moment */
+	WT_CONT,
+	/* invalid type */
+	LAST_WT
+} warc_type_t;
+
+typedef struct {
+	size_t len;
+	const char *str;
+} warc_string_t;
+
+typedef struct {
+	size_t len;
+	char *str;
+} warc_strbuf_t;
+
+struct warc_s {
+	/* content length ahead */
+	size_t cntlen;
+	/* and how much we've processed so far */
+	size_t cntoff;
+	/* and how much we need to consume between calls */
+	size_t unconsumed;
+
+	/* string pool */
+	warc_strbuf_t pool;
+	/* previous version */
+	unsigned int pver;
+	/* stringified format name */
+	struct archive_string sver;
+};
+
+static int _warc_bid(struct archive_read *a, int);
+static int _warc_cleanup(struct archive_read *a);
+static int _warc_read(struct archive_read*, const void**, size_t*, int64_t*);
+static int _warc_skip(struct archive_read *a);
+static int _warc_rdhdr(struct archive_read *a, struct archive_entry *e);
+
+/* private routines */
+static unsigned int _warc_rdver(const char buf[10], size_t bsz);
+static unsigned int _warc_rdtyp(const char *buf, size_t bsz);
+static warc_string_t _warc_rduri(const char *buf, size_t bsz);
+static ssize_t _warc_rdlen(const char *buf, size_t bsz);
+static time_t _warc_rdrtm(const char *buf, size_t bsz);
+static time_t _warc_rdmtm(const char *buf, size_t bsz);
+static const char *_warc_find_eoh(const char *buf, size_t bsz);
+
+

+int
+archive_read_support_format_warc(struct archive *_a)
+{
+	struct archive_read *a = (struct archive_read *)_a;
+	struct warc_s *w;
+	int r;
+
+	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
+	    ARCHIVE_STATE_NEW, "archive_read_support_format_warc");
+
+	if ((w = malloc(sizeof(*w))) == NULL) {
+		archive_set_error(&a->archive, ENOMEM,
+		    "Can't allocate warc data");
+		return (ARCHIVE_FATAL);
+	}
+	memset(w, 0, sizeof(*w));
+
+	r = __archive_read_register_format(
+		a, w, "warc",
+		_warc_bid, NULL, _warc_rdhdr, _warc_read,
+		_warc_skip, NULL, _warc_cleanup, NULL, NULL);
+
+	if (r != ARCHIVE_OK) {
+		free(w);
+		return (r);
+	}
+	return (ARCHIVE_OK);
+}
+
+static int
+_warc_cleanup(struct archive_read *a)
+{
+	struct warc_s *w = a->format->data;
+
+	if (w->pool.len > 0U) {
+		free(w->pool.str);
+	}
+	archive_string_free(&w->sver);
+	free(w);
+	a->format->data = NULL;
+	return (ARCHIVE_OK);
+}
+
+static int
+_warc_bid(struct archive_read *a, int best_bid)
+{
+	const char *hdr;
+	ssize_t nrd;
+	unsigned int ver;
+
+	(void)best_bid; /* UNUSED */
+
+	/* check first line of file, it should be a record already */
+	if ((hdr = __archive_read_ahead(a, 12U, &nrd)) == NULL) {
+		/* no idea what to do */
+		return -1;
+	} else if (nrd < 12) {
+		/* nah, not for us, our magic cookie is at least 12 bytes */
+		return -1;
+	}
+
+	/* otherwise snarf the record's version number */
+	ver = _warc_rdver(hdr, nrd);
+	if (ver == 0U || ver > 10000U) {
+		/* oh oh oh, best not to wager ... */
+		return -1;
+	}
+
+	/* otherwise be confident */
+	return (64);
+}
+
+static int
+_warc_rdhdr(struct archive_read *a, struct archive_entry *entry)
+{
+#define HDR_PROBE_LEN		(12U)
+	struct warc_s *w = a->format->data;
+	unsigned int ver;
+	const char *buf;
+	ssize_t nrd;
+	const char *eoh;
+	/* for the file name, saves some strndup()'ing */
+	warc_string_t fnam;
+	/* warc record type, not that we really use it a lot */
+	warc_type_t ftyp;
+	/* content-length+error monad */
+	ssize_t cntlen;
+	/* record time is the WARC-Date time we reinterpret it as ctime */
+	time_t rtime;
+	/* mtime is the Last-Modified time which will be the entry's mtime */
+	time_t mtime;
+
+start_over:
+	/* just use read_ahead() they keep track of unconsumed
+	 * bits and bobs for us; no need to put an extra shift in
+	 * and reproduce that functionality here */
+	buf = __archive_read_ahead(a, HDR_PROBE_LEN, &nrd);
+
+	if (nrd < 0) {
+		/* no good */
+		archive_set_error(
+			&a->archive, ARCHIVE_ERRNO_MISC,
+			"Bad record header");
+		return (ARCHIVE_FATAL);
+	} else if (buf == NULL) {
+		/* there should be room for at least WARC/bla\r\n
+		 * must be EOF therefore */
+		return (ARCHIVE_EOF);
+	}
+ 	/* looks good so far, try and find the end of the header now */
+	eoh = _warc_find_eoh(buf, nrd);
+	if (eoh == NULL) {
+		/* still no good, the header end might be beyond the
+		 * probe we've requested, but then again who'd cram
+		 * so much stuff into the header *and* be 28500-compliant */
+		archive_set_error(
+			&a->archive, ARCHIVE_ERRNO_MISC,
+			"Bad record header");
+		return (ARCHIVE_FATAL);
+	} else if ((ver = _warc_rdver(buf, eoh - buf)) > 10000U) {
+		/* nawww, I wish they promised backward compatibility
+		 * anyhoo, in their infinite wisdom the 28500 guys might
+		 * come up with something we can't possibly handle so
+		 * best end things here */
+		archive_set_error(
+			&a->archive, ARCHIVE_ERRNO_MISC,
+			"Unsupported record version");
+		return (ARCHIVE_FATAL);
+	} else if ((cntlen = _warc_rdlen(buf, eoh - buf)) < 0) {
+		/* nightmare!  the specs say content-length is mandatory
+		 * so I don't feel overly bad stopping the reader here */
+		archive_set_error(
+			&a->archive, EINVAL,
+			"Bad content length");
+		return (ARCHIVE_FATAL);
+	} else if ((rtime = _warc_rdrtm(buf, eoh - buf)) == (time_t)-1) {
+		/* record time is mandatory as per WARC/1.0,
+		 * so just barf here, fast and loud */
+		archive_set_error(
+			&a->archive, EINVAL,
+			"Bad record time");
+		return (ARCHIVE_FATAL);
+	}
+
+	/* let the world know we're a WARC archive */
+	a->archive.archive_format = ARCHIVE_FORMAT_WARC;
+	if (ver != w->pver) {
+		/* stringify this entry's version */
+		archive_string_sprintf(&w->sver,
+			"WARC/%u.%u", ver / 10000, ver % 10000);
+		/* remember the version */
+		w->pver = ver;
+	}
+	/* start off with the type */
+	ftyp = _warc_rdtyp(buf, eoh - buf);
+	/* and let future calls know about the content */
+	w->cntlen = cntlen;
+	w->cntoff = 0U;
+	mtime = 0;/* Avoid compiling error on some platform. */
+
+	switch (ftyp) {
+	case WT_RSRC:
+	case WT_RSP:
+		/* only try and read the filename in the cases that are
+		 * guaranteed to have one */
+		fnam = _warc_rduri(buf, eoh - buf);
+		/* check the last character in the URI to avoid creating
+		 * directory endpoints as files, see Todo above */
+		if (fnam.len == 0 || fnam.str[fnam.len - 1] == '/') {
+			/* break here for now */
+			fnam.len = 0U;
+			fnam.str = NULL;
+			break;
+		}
+		/* bang to our string pool, so we save a
+		 * malloc()+free() roundtrip */
+		if (fnam.len + 1U > w->pool.len) {
+			w->pool.len = ((fnam.len + 64U) / 64U) * 64U;
+			w->pool.str = realloc(w->pool.str, w->pool.len);
+		}
+		memcpy(w->pool.str, fnam.str, fnam.len);
+		w->pool.str[fnam.len] = '\0';
+		/* let noone else know about the pool, it's a secret, shhh */
+		fnam.str = w->pool.str;
+
+		/* snarf mtime or deduce from rtime
+		 * this is a custom header added by our writer, it's quite
+		 * hard to believe anyone else would go through with it
+		 * (apart from being part of some http responses of course) */
+		if ((mtime = _warc_rdmtm(buf, eoh - buf)) == (time_t)-1) {
+			mtime = rtime;
+		}
+		break;
+	default:
+		fnam.len = 0U;
+		fnam.str = NULL;
+		break;
+	}
+
+	/* now eat some of those delicious buffer bits */
+	__archive_read_consume(a, eoh - buf);
+
+	switch (ftyp) {
+	case WT_RSRC:
+	case WT_RSP:
+		if (fnam.len > 0U) {
+			/* populate entry object */
+			archive_entry_set_filetype(entry, AE_IFREG);
+			archive_entry_copy_pathname(entry, fnam.str);
+			archive_entry_set_size(entry, cntlen);
+			archive_entry_set_perm(entry, 0644);
+			/* rtime is the new ctime, mtime stays mtime */
+			archive_entry_set_ctime(entry, rtime, 0L);
+			archive_entry_set_mtime(entry, mtime, 0L);
+			break;
+		}
+		/* FALLTHROUGH */
+	default:
+		/* consume the content and start over */
+		_warc_skip(a);
+		goto start_over;
+	}
+	return (ARCHIVE_OK);
+}
+
+static int
+_warc_read(struct archive_read *a, const void **buf, size_t *bsz, int64_t *off)
+{
+	struct warc_s *w = a->format->data;
+	const char *rab;
+	ssize_t nrd;
+
+	if (w->cntoff >= w->cntlen) {
+	eof:
+		/* it's our lucky day, no work, we can leave early */
+		*buf = NULL;
+		*bsz = 0U;
+		*off = w->cntoff + 4U/*for \r\n\r\n separator*/;
+		w->unconsumed = 0U;
+		return (ARCHIVE_EOF);
+	}
+
+	rab = __archive_read_ahead(a, 1U, &nrd);
+	if (nrd < 0) {
+		*bsz = 0U;
+		/* big catastrophe */
+		return (int)nrd;
+	} else if (nrd == 0) {
+		goto eof;
+	} else if ((size_t)nrd > w->cntlen - w->cntoff) {
+		/* clamp to content-length */
+		nrd = w->cntlen - w->cntoff;
+	}
+	*off = w->cntoff;
+	*bsz = nrd;
+	*buf = rab;
+
+	w->cntoff += nrd;
+	w->unconsumed = (size_t)nrd;
+	return (ARCHIVE_OK);
+}
+
+static int
+_warc_skip(struct archive_read *a)
+{
+	struct warc_s *w = a->format->data;
+
+	__archive_read_consume(a, w->cntlen + 4U/*\r\n\r\n separator*/);
+	w->cntlen = 0U;
+	w->cntoff = 0U;
+	return (ARCHIVE_OK);
+}
+
+

+/* private routines */
+static void*
+deconst(const void *c)
+{
+	return (char *)0x1 + (((const char *)c) - (const char *)0x1);
+}
+
+static char*
+xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz)
+{
+	const char *const eoh = hay + hz;
+	const char *const eon = ndl + nz;
+	const char *hp;
+	const char *np;
+	const char *cand;
+	unsigned int hsum;
+	unsigned int nsum;
+	unsigned int eqp;
+
+	/* trivial checks first
+         * a 0-sized needle is defined to be found anywhere in haystack
+         * then run strchr() to find a candidate in HAYSTACK (i.e. a portion
+         * that happens to begin with *NEEDLE) */
+	if (nz == 0UL) {
+		return deconst(hay);
+	} else if ((hay = memchr(hay, *ndl, hz)) == NULL) {
+		/* trivial */
+		return NULL;
+	}
+
+	/* First characters of haystack and needle are the same now. Both are
+	 * guaranteed to be at least one character long.  Now computes the sum
+	 * of characters values of needle together with the sum of the first
+	 * needle_len characters of haystack. */
+	for (hp = hay + 1U, np = ndl + 1U, hsum = *hay, nsum = *hay, eqp = 1U;
+	     hp < eoh && np < eon;
+	     hsum ^= *hp, nsum ^= *np, eqp &= *hp == *np, hp++, np++);
+
+	/* HP now references the (NZ + 1)-th character. */
+	if (np < eon) {
+		/* haystack is smaller than needle, :O */
+		return NULL;
+	} else if (eqp) {
+		/* found a match */
+		return deconst(hay);
+	}
+
+	/* now loop through the rest of haystack,
+	 * updating the sum iteratively */
+	for (cand = hay; hp < eoh; hp++) {
+		hsum ^= *cand++;
+		hsum ^= *hp;
+
+		/* Since the sum of the characters is already known to be
+		 * equal at that point, it is enough to check just NZ - 1
+		 * characters for equality,
+		 * also CAND is by design < HP, so no need for range checks */
+		if (hsum == nsum && memcmp(cand, ndl, nz - 1U) == 0) {
+			return deconst(cand);
+		}
+	}
+	return NULL;
+}
+
+static int
+strtoi_lim(const char *str, const char **ep, int llim, int ulim)
+{
+	int res = 0;
+	const char *sp;
+	/* we keep track of the number of digits via rulim */
+	int rulim;
+
+	for (sp = str, rulim = ulim > 10 ? ulim : 10;
+	     res * 10 <= ulim && rulim && *sp >= '0' && *sp <= '9';
+	     sp++, rulim /= 10) {
+		res *= 10;
+		res += *sp - '0';
+	}
+	if (sp == str) {
+		res = -1;
+	} else if (res < llim || res > ulim) {
+		res = -2;
+	}
+	*ep = (const char*)sp;
+	return res;
+}
+
+static time_t
+time_from_tm(struct tm *t)
+{
+#if HAVE_TIMEGM
+        /* Use platform timegm() if available. */
+        return (timegm(t));
+#elif HAVE__MKGMTIME64
+        return (_mkgmtime64(t));
+#else
+        /* Else use direct calculation using POSIX assumptions. */
+        /* First, fix up tm_yday based on the year/month/day. */
+        if (mktime(t) == (time_t)-1)
+                return ((time_t)-1);
+        /* Then we can compute timegm() from first principles. */
+        return (t->tm_sec
+            + t->tm_min * 60
+            + t->tm_hour * 3600
+            + t->tm_yday * 86400
+            + (t->tm_year - 70) * 31536000
+            + ((t->tm_year - 69) / 4) * 86400
+            - ((t->tm_year - 1) / 100) * 86400
+            + ((t->tm_year + 299) / 400) * 86400);
+#endif
+}
+
+static time_t
+xstrpisotime(const char *s, char **endptr)
+{
+/** like strptime() but strictly for ISO 8601 Zulu strings */
+	struct tm tm;
+	time_t res = (time_t)-1;
+
+	/* make sure tm is clean */
+	memset(&tm, 0, sizeof(tm));
+
+	/* as a courtesy to our callers, and since this is a non-standard
+	 * routine, we skip leading whitespace */
+	for (; isspace(*s); s++);
+
+	/* read year */
+	if ((tm.tm_year = strtoi_lim(s, &s, 1583, 4095)) < 0 || *s++ != '-') {
+		goto out;
+	}
+	/* read month */
+	if ((tm.tm_mon = strtoi_lim(s, &s, 1, 12)) < 0 || *s++ != '-') {
+		goto out;
+	}
+	/* read day-of-month */
+	if ((tm.tm_mday = strtoi_lim(s, &s, 1, 31)) < 0 || *s++ != 'T') {
+		goto out;
+	}
+	/* read hour */
+	if ((tm.tm_hour = strtoi_lim(s, &s, 0, 23)) < 0 || *s++ != ':') {
+		goto out;
+	}
+	/* read minute */
+	if ((tm.tm_min = strtoi_lim(s, &s, 0, 59)) < 0 || *s++ != ':') {
+		goto out;
+	}
+	/* read second */
+	if ((tm.tm_sec = strtoi_lim(s, &s, 0, 60)) < 0 || *s++ != 'Z') {
+		goto out;
+	}
+
+	/* massage TM to fulfill some of POSIX' contraints */
+	tm.tm_year -= 1900;
+	tm.tm_mon--;
+
+	/* now convert our custom tm struct to a unix stamp using UTC */
+	res = time_from_tm(&tm);
+
+out:
+	if (endptr != NULL) {
+		*endptr = deconst(s);
+	}
+	return res;
+}
+
+static unsigned int
+_warc_rdver(const char buf[10], size_t bsz)
+{
+	static const char magic[] = "WARC/";
+	unsigned int ver;
+
+	(void)bsz; /* UNUSED */
+
+	if (memcmp(buf, magic, sizeof(magic) - 1U) != 0) {
+		/* nope */
+		return 99999U;
+	}
+	/* looks good so far, read the version number for a laugh */
+	buf += sizeof(magic) - 1U;
+	/* most common case gets a quick-check here */
+	if (memcmp(buf, "1.0\r\n", 5U) == 0) {
+		ver = 10000U;
+	} else {
+		switch (*buf) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+			if (buf[1U] == '.') {
+				char *on;
+
+				/* set up major version */
+				ver = (buf[0U] - '0') * 10000U;
+				/* minor version, anyone? */
+				ver += (strtol(buf + 2U, &on, 10)) * 100U;
+				/* don't parse anything else */
+				if (on > buf + 2U) {
+					break;
+				}
+			}
+			/* FALLTHROUGH */
+		case '9':
+		default:
+			/* just make the version ridiculously high */
+			ver = 999999U;
+			break;
+		}
+	}
+	return ver;
+}
+
+static unsigned int
+_warc_rdtyp(const char *buf, size_t bsz)
+{
+	static const char _key[] = "\r\nWARC-Type:";
+	const char *const eob = buf + bsz;
+	const char *val;
+
+	if ((val = xmemmem(buf, bsz, _key, sizeof(_key) - 1U)) == NULL) {
+		/* no bother */
+		return WT_NONE;
+	}
+	/* overread whitespace */
+	for (val += sizeof(_key) - 1U; val < eob && isspace(*val); val++);
+
+	if (val + 8U > eob) {
+		;
+	} else if (memcmp(val, "resource", 8U) == 0) {
+		return WT_RSRC;
+	} else if (memcmp(val, "warcinfo", 8U) == 0) {
+		return WT_INFO;
+	} else if (memcmp(val, "metadata", 8U) == 0) {
+		return WT_META;
+	} else if (memcmp(val, "request", 7U) == 0) {
+		return WT_REQ;
+	} else if (memcmp(val, "response", 8U) == 0) {
+		return WT_RSP;
+	} else if (memcmp(val, "conversi", 8U) == 0) {
+		return WT_CONV;
+	} else if (memcmp(val, "continua", 8U) == 0) {
+		return WT_CONT;
+	}
+	return WT_NONE;
+}
+
+static warc_string_t
+_warc_rduri(const char *buf, size_t bsz)
+{
+	static const char _key[] = "\r\nWARC-Target-URI:";
+	const char *const eob = buf + bsz;
+	const char *val;
+	const char *uri;
+	const char *eol;
+	warc_string_t res = {0U, NULL};
+
+	if ((val = xmemmem(buf, bsz, _key, sizeof(_key) - 1U)) == NULL) {
+		/* no bother */
+		return res;
+	}
+	/* overread whitespace */
+	for (val += sizeof(_key) - 1U; val < eob && isspace(*val); val++);
+
+	/* overread URL designators */
+	if ((uri = xmemmem(val, eob - val, "://", 3U)) == NULL) {
+		/* not touching that! */
+		return res;
+	} else if ((eol = memchr(uri, '\n', eob - uri)) == NULL) {
+		/* no end of line? :O */
+		return res;
+	}
+
+	/* massage uri to point to after :// */
+	uri += 3U;
+	/* also massage eol to point to the first whitespace
+	 * after the last non-whitespace character before
+	 * the end of the line */
+	for (; eol > uri && isspace(eol[-1]); eol--);
+
+	/* now then, inspect the URI */
+	if (memcmp(val, "file", 4U) == 0) {
+		/* perfect, nothing left to do here */
+
+	} else if (memcmp(val, "http", 4U) == 0 ||
+		   memcmp(val, "ftp", 3U) == 0) {
+		/* overread domain, and the first / */
+		while (uri < eol && *uri++ != '/');
+	} else {
+		/* not sure what to do? best to bugger off */
+		return res;
+	}
+	res.str = uri;
+	res.len = eol - uri;
+	return res;
+}
+
+static ssize_t
+_warc_rdlen(const char *buf, size_t bsz)
+{
+	static const char _key[] = "\r\nContent-Length:";
+	const char *val;
+	char *on = NULL;
+	long int len;
+
+	if ((val = xmemmem(buf, bsz, _key, sizeof(_key) - 1U)) == NULL) {
+		/* no bother */
+		return -1;
+	}
+
+	/* strtol kindly overreads whitespace for us, so use that */
+	val += sizeof(_key) - 1U;
+	len = strtol(val, &on, 10);
+	if (on == NULL || !isspace(*on)) {
+		/* hm, can we trust that number?  Best not. */
+		return -1;
+	}
+	return (size_t)len;
+}
+
+static time_t
+_warc_rdrtm(const char *buf, size_t bsz)
+{
+	static const char _key[] = "\r\nWARC-Date:";
+	const char *val;
+	char *on = NULL;
+	time_t res;
+
+	if ((val = xmemmem(buf, bsz, _key, sizeof(_key) - 1U)) == NULL) {
+		/* no bother */
+		return (time_t)-1;
+	}
+
+	/* xstrpisotime() kindly overreads whitespace for us, so use that */
+	val += sizeof(_key) - 1U;
+	res = xstrpisotime(val, &on);
+	if (on == NULL || !isspace(*on)) {
+		/* hm, can we trust that number?  Best not. */
+		return (time_t)-1;
+	}
+	return res;
+}
+
+static time_t
+_warc_rdmtm(const char *buf, size_t bsz)
+{
+	static const char _key[] = "\r\nLast-Modified:";
+	const char *val;
+	char *on = NULL;
+	time_t res;
+
+	if ((val = xmemmem(buf, bsz, _key, sizeof(_key) - 1U)) == NULL) {
+		/* no bother */
+		return (time_t)-1;
+	}
+
+	/* xstrpisotime() kindly overreads whitespace for us, so use that */
+	val += sizeof(_key) - 1U;
+	res = xstrpisotime(val, &on);
+	if (on == NULL || !isspace(*on)) {
+		/* hm, can we trust that number?  Best not. */
+		return (time_t)-1;
+	}
+	return res;
+}
+
+static const char*
+_warc_find_eoh(const char *buf, size_t bsz)
+{
+	static const char _marker[] = "\r\n\r\n";
+	const char *hit = xmemmem(buf, bsz, _marker, sizeof(_marker) - 1U);
+
+	if (hit != NULL) {
+		hit += sizeof(_marker) - 1U;
+	}
+	return hit;
+}
+
+/* archive_read_support_format_warc.c ends here */
diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
index b0f5352..19c1b78 100644
--- a/libarchive/archive_read_support_format_xar.c
+++ b/libarchive/archive_read_support_format_xar.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include "archive.h"
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 #include "archive_endian.h"
 #include "archive_entry.h"
 #include "archive_entry_locale.h"
@@ -1107,20 +1107,23 @@ static time_t
 time_from_tm(struct tm *t)
 {
 #if HAVE_TIMEGM
-	/* Use platform timegm() if available. */
-	return (timegm(t));
+        /* Use platform timegm() if available. */
+        return (timegm(t));
 #elif HAVE__MKGMTIME64
-	return (_mkgmtime64(t));
+        return (_mkgmtime64(t));
 #else
-	/* Else use direct calculation using POSIX assumptions. */
-	/* First, fix up tm_yday based on the year/month/day. */
-	mktime(t);
-	/* Then we can compute timegm() from first principles. */
-	return (t->tm_sec + t->tm_min * 60 + t->tm_hour * 3600
-	    + t->tm_yday * 86400 + (t->tm_year - 70) * 31536000
-	    + ((t->tm_year - 69) / 4) * 86400 -
-	    ((t->tm_year - 1) / 100) * 86400
-	    + ((t->tm_year + 299) / 400) * 86400);
+        /* Else use direct calculation using POSIX assumptions. */
+        /* First, fix up tm_yday based on the year/month/day. */
+        mktime(t);
+        /* Then we can compute timegm() from first principles. */
+        return (t->tm_sec
+            + t->tm_min * 60
+            + t->tm_hour * 3600
+            + t->tm_yday * 86400
+            + (t->tm_year - 70) * 31536000
+            + ((t->tm_year - 69) / 4) * 86400
+            - ((t->tm_year - 1) / 100) * 86400
+            + ((t->tm_year + 299) / 400) * 86400);
 #endif
 }
 
@@ -3189,9 +3192,8 @@ xml2_read_toc(struct archive_read *a)
 		case XML_READER_TYPE_ELEMENT:
 			empty = xmlTextReaderIsEmptyElement(reader);
 			r = xml2_xmlattr_setup(a, &list, reader);
-			if (r != ARCHIVE_OK)
-				return (r);
-			r = xml_start(a, name, &list);
+			if (r == ARCHIVE_OK)
+				r = xml_start(a, name, &list);
 			xmlattr_cleanup(&list);
 			if (r != ARCHIVE_OK)
 				return (r);
diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index dbe245e..c0b47c8 100644
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2004-2013 Tim Kientzle
- * Copyright (c) 2011-2012 Michihiro NAKAJIMA
+ * Copyright (c) 2011-2012,2014 Michihiro NAKAJIMA
  * Copyright (c) 2013 Konrad Kleine
  * All rights reserved.
  *
@@ -53,9 +53,12 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102
 #endif
 
 #include "archive.h"
+#include "archive_digest_private.h"
+#include "archive_cryptor_private.h"
 #include "archive_endian.h"
 #include "archive_entry.h"
 #include "archive_entry_locale.h"
+#include "archive_hmac_private.h"
 #include "archive_private.h"
 #include "archive_rb.h"
 #include "archive_read_private.h"
@@ -82,6 +85,25 @@ struct zip_entry {
 	unsigned char		compression;
 	unsigned char		system; /* From "version written by" */
 	unsigned char		flags; /* Our extra markers. */
+	unsigned char		decdat;/* Used for Decryption check */
+
+	/* WinZip AES encryption extra field should be available
+	 * when compression is 99. */
+	struct {
+		/* Vendor version: AE-1 - 0x0001, AE-2 - 0x0002 */
+		unsigned	vendor;
+#define AES_VENDOR_AE_1	0x0001
+#define AES_VENDOR_AE_2	0x0002
+		/* AES encryption strength:
+		 * 1 - 128 bits, 2 - 192 bits, 2 - 256 bits. */
+		unsigned	strength;
+		/* Actual compression method. */
+		unsigned char	compression;
+	}			aes_extra;
+};
+
+struct trad_enc_ctx {
+	uint32_t	keys[3];
 };
 
 /* Bits used in zip_flags. */
@@ -97,9 +119,20 @@ struct zip_entry {
 #define LA_USED_ZIP64	(1 << 0)
 #define LA_FROM_CENTRAL_DIRECTORY (1 << 1)
 
+/*
+ * See "WinZip - AES Encryption Information"
+ *     http://www.winzip.com/aes_info.htm
+ */
+/* Value used in compression method. */
+#define WINZIP_AES_ENCRYPTION	99
+/* Authentication code size. */
+#define AUTH_CODE_SIZE	10
+/**/
+#define MAX_DERIVED_KEY_BUF_SIZE	(AES_MAX_KEY_SIZE * 2 + 2)
+
 struct zip {
 	/* Structural information about the archive. */
-	char			format_name[64];
+	struct archive_string	format_name;
 	int64_t			central_directory_offset;
 	size_t			central_directory_entries_total;
 	size_t			central_directory_entries_on_this_disk;
@@ -123,7 +156,8 @@ struct zip {
 
 	/* Running CRC32 of the decompressed data */
 	unsigned long		entry_crc32;
-	unsigned long		(*crc32func)(unsigned long, const void *, size_t);
+	unsigned long		(*crc32func)(unsigned long, const void *,
+				    size_t);
 	char			ignore_crc32;
 
 	/* Flags to mark progress of decompression. */
@@ -142,6 +176,38 @@ struct zip {
 	struct archive_string_conv *sconv_utf8;
 	int			init_default_conversion;
 	int			process_mac_extensions;
+
+	char			init_decryption;
+
+	/* Decryption buffer. */
+	unsigned char 		*decrypted_buffer;
+	unsigned char 		*decrypted_ptr;
+	size_t 			decrypted_buffer_size;
+	size_t 			decrypted_bytes_remaining;
+	size_t 			decrypted_unconsumed_bytes;
+
+	/* Traditional PKWARE decryption. */
+	struct trad_enc_ctx	tctx;
+	char			tctx_valid;
+
+	/* WinZip AES decyption. */
+	/* Contexts used for AES decryption. */
+	archive_crypto_ctx	cctx;
+	char			cctx_valid;
+	archive_hmac_sha1_ctx	hctx;
+	char			hctx_valid;
+
+	/* Strong encryption's decryption header information. */
+	unsigned		iv_size;
+	unsigned		alg_id;
+	unsigned		bit_len;
+	unsigned		flags;
+	unsigned		erd_size;
+	unsigned		v_size;
+	unsigned		v_crc32;
+	uint8_t			*iv;
+	uint8_t			*erd;
+	uint8_t			*v_data;
 };
 
 /* Many systems define min or MIN, but not all. */
@@ -150,6 +216,106 @@ struct zip {
 /* ------------------------------------------------------------------------ */
 
 /*
+  Traditional PKWARE Decryption functions.
+ */
+
+static void
+trad_enc_update_keys(struct trad_enc_ctx *ctx, uint8_t c)
+{
+	uint8_t t;
+#define CRC32(c, b) (crc32(c ^ 0xffffffffUL, &b, 1) ^ 0xffffffffUL)
+
+	ctx->keys[0] = CRC32(ctx->keys[0], c);
+	ctx->keys[1] = (ctx->keys[1] + (ctx->keys[0] & 0xff)) * 134775813L + 1;
+	t = (ctx->keys[1] >> 24) & 0xff;
+	ctx->keys[2] = CRC32(ctx->keys[2], t);
+#undef CRC32
+}
+
+static uint8_t
+trad_enc_decypt_byte(struct trad_enc_ctx *ctx)
+{
+	unsigned temp = ctx->keys[2] | 2;
+	return (uint8_t)((temp * (temp ^ 1)) >> 8) & 0xff;
+}
+
+static void
+trad_enc_decrypt_update(struct trad_enc_ctx *ctx, const uint8_t *in,
+    size_t in_len, uint8_t *out, size_t out_len)
+{
+	unsigned i, max;
+
+	max = (unsigned)((in_len < out_len)? in_len: out_len);
+
+	for (i = 0; i < max; i++) {
+		uint8_t t = in[i] ^ trad_enc_decypt_byte(ctx);
+		out[i] = t;
+		trad_enc_update_keys(ctx, t);
+	}
+}
+
+static int
+trad_enc_init(struct trad_enc_ctx *ctx, const char *pw, size_t pw_len,
+    const uint8_t *key, size_t key_len, uint8_t *crcchk)
+{
+	uint8_t header[12];
+
+	if (key_len < 12) {
+		*crcchk = 0xff;
+		return -1;
+	}
+
+	ctx->keys[0] = 305419896L;
+	ctx->keys[1] = 591751049L;
+	ctx->keys[2] = 878082192L;
+
+	for (;pw_len; --pw_len)
+		trad_enc_update_keys(ctx, *pw++);
+
+	trad_enc_decrypt_update(ctx, key, 12, header, 12);
+	/* Return the last byte for CRC check. */
+	*crcchk = header[11];
+	return 0;
+}
+
+#if 0
+static void
+crypt_derive_key_sha1(const void *p, int size, unsigned char *key,
+    int key_size)
+{
+#define MD_SIZE 20
+	archive_sha1_ctx ctx;
+	unsigned char md1[MD_SIZE];
+	unsigned char md2[MD_SIZE * 2];
+	unsigned char mkb[64];
+	int i;
+
+	archive_sha1_init(&ctx);
+	archive_sha1_update(&ctx, p, size);
+	archive_sha1_final(&ctx, md1);
+
+	memset(mkb, 0x36, sizeof(mkb));
+	for (i = 0; i < MD_SIZE; i++)
+		mkb[i] ^= md1[i];
+	archive_sha1_init(&ctx);
+	archive_sha1_update(&ctx, mkb, sizeof(mkb));
+	archive_sha1_final(&ctx, md2);
+
+	memset(mkb, 0x5C, sizeof(mkb));
+	for (i = 0; i < MD_SIZE; i++)
+		mkb[i] ^= md1[i];
+	archive_sha1_init(&ctx);
+	archive_sha1_update(&ctx, mkb, sizeof(mkb));
+	archive_sha1_final(&ctx, md2 + MD_SIZE);
+
+	if (key_size > 32)
+		key_size = 32;
+	memcpy(key, md2, key_size);
+#undef MD_SIZE
+}
+#endif
+
+/*
  * Common code for streaming or seeking modes.
  *
  * Includes code to read local file headers, decompress data
@@ -159,9 +325,10 @@ struct zip {
 static unsigned long
 real_crc32(unsigned long crc, const void *buff, size_t len)
 {
-	return crc32(crc, buff, len);
+	return crc32(crc, buff, (unsigned int)len);
 }
 
+/* Used by "ignorecrc32" option to speed up tests. */
 static unsigned long
 fake_crc32(unsigned long crc, const void *buff, size_t len)
 {
@@ -181,33 +348,36 @@ static struct {
 	{3, "reduced-2"}, /* The file is Reduced with compression factor 2 */
 	{4, "reduced-3"}, /* The file is Reduced with compression factor 3 */
 	{5, "reduced-4"}, /* The file is Reduced with compression factor 4 */
-	{6, "imploded"}, /* The file is Imploded */
-	{7, "reserved"}, /* Reserved for Tokenizing compression algorithm */
+	{6, "imploded"},  /* The file is Imploded */
+	{7, "reserved"},  /* Reserved for Tokenizing compression algorithm */
 	{8, "deflation"}, /* The file is Deflated */
 	{9, "deflation-64-bit"}, /* Enhanced Deflating using Deflate64(tm) */
-	{10, "ibm-terse"}, /* PKWARE Data Compression Library Imploding (old IBM TERSE) */
+	{10, "ibm-terse"},/* PKWARE Data Compression Library Imploding
+			   * (old IBM TERSE) */
 	{11, "reserved"}, /* Reserved by PKWARE */
-	{12, "bzip"}, /* File is compressed using BZIP2 algorithm */
+	{12, "bzip"},     /* File is compressed using BZIP2 algorithm */
 	{13, "reserved"}, /* Reserved by PKWARE */
-	{14, "lzma"}, /* LZMA (EFS) */
+	{14, "lzma"},     /* LZMA (EFS) */
 	{15, "reserved"}, /* Reserved by PKWARE */
 	{16, "reserved"}, /* Reserved by PKWARE */
 	{17, "reserved"}, /* Reserved by PKWARE */
 	{18, "ibm-terse-new"}, /* File is compressed using IBM TERSE (new) */
-	{19, "ibm-lz777"}, /* IBM LZ77 z Architecture (PFS) */
+	{19, "ibm-lz777"},/* IBM LZ77 z Architecture (PFS) */
 	{97, "wav-pack"}, /* WavPack compressed data */
-	{98, "ppmd-1"} /* PPMd version I, Rev 1 */
+	{98, "ppmd-1"},   /* PPMd version I, Rev 1 */
+	{99, "aes"}       /* WinZip AES encryption  */
 };
 
 static const char *
 compression_name(const int compression)
 {
-	static const int num_compression_methods = sizeof(compression_methods)/sizeof(compression_methods[0]);
+	static const int num_compression_methods =
+		sizeof(compression_methods)/sizeof(compression_methods[0]);
 	int i=0;
+
 	while(compression >= 0 && i < num_compression_methods) {
-		if (compression_methods[i].id == compression) {
+		if (compression_methods[i].id == compression)
 			return compression_methods[i].name;
-		}
 		i++;
 	}
 	return "??";
@@ -244,15 +414,15 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 {
 	unsigned offset = 0;
 
-	while (offset < extra_length - 4)
-	{
+	while (offset < extra_length - 4) {
 		unsigned short headerid = archive_le16dec(p + offset);
 		unsigned short datasize = archive_le16dec(p + offset + 2);
+
 		offset += 4;
 		if (offset + datasize > extra_length)
 			break;
 #ifdef DEBUG
-		fprintf(stderr, "Header id 0x%x, length %d\n",
+		fprintf(stderr, "Header id 0x%04x, length %d\n",
 		    headerid, datasize);
 #endif
 		switch (headerid) {
@@ -287,6 +457,23 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 			 * on which file starts, but we don't handle
 			 * multi-volume Zip files. */
 			break;
+#ifdef DEBUG
+		case 0x0017:
+		{
+			/* Strong encryption field. */
+			if (archive_le16dec(p + offset) == 2) {
+				unsigned algId =
+					archive_le16dec(p + offset + 2);
+				unsigned bitLen =
+					archive_le16dec(p + offset + 4);
+				int	 flags =
+					archive_le16dec(p + offset + 6);
+				fprintf(stderr, "algId=0x%04x, bitLen=%u, "
+				    "flgas=%d\n", algId, bitLen,flags);
+			}
+			break;
+		}
+#endif
 		case 0x5455:
 		{
 			/* Extended time field "UT". */
@@ -341,16 +528,34 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 			}
 			break;
 		}
-		case 0x6c65:
+		case 0x6c78:
 		{
-			/* Experimental 'el' field */
+			/* Experimental 'xl' field */
 			/*
 			 * Introduced Dec 2013 to provide a way to
-			 * include external file attributes in local file
-			 * header.  This provides file type and permission
-			 * information necessary to support full streaming
-			 * extraction.  Currently being discussed with
-			 * other Zip developers... subject to change.
+			 * include external file attributes (and other
+			 * fields that ordinarily appear only in
+			 * central directory) in local file header.
+			 * This provides file type and permission
+			 * information necessary to support full
+			 * streaming extraction.  Currently being
+			 * discussed with other Zip developers
+			 * ... subject to change.
+			 *
+			 * Format:
+			 *  The field starts with a bitmap that specifies
+			 *  which additional fields are included.  The
+			 *  bitmap is variable length and can be extended in
+			 *  the future.
+			 *
+			 *  n bytes - feature bitmap: first byte has low-order
+			 *    7 bits.  If high-order bit is set, a subsequent
+			 *    byte holds the next 7 bits, etc.
+			 *
+			 *  if bitmap & 1, 2 byte "version made by"
+			 *  if bitmap & 2, 2 byte "internal file attributes"
+			 *  if bitmap & 4, 4 byte "external file attributes"
+			 *  if bitmap * 7, 2 byte comment length + n byte comment
 			 */
 			int bitmap, bitmap_last;
 
@@ -369,7 +574,7 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 			}
 
 			if (bitmap & 1) {
-				// 2 byte "version made by"
+				/* 2 byte "version made by" */
 				if (datasize < 2)
 					break;
 				zip_entry->system
@@ -378,19 +583,19 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 				datasize -= 2;
 			}
 			if (bitmap & 2) {
-				// 2 byte "internal file attributes"
+				/* 2 byte "internal file attributes" */
 				uint32_t internal_attributes;
 				if (datasize < 2)
 					break;
 				internal_attributes
 				    = archive_le16dec(p + offset);
-				// Not used by libarchive at present.
+				/* Not used by libarchive at present. */
 				(void)internal_attributes; /* UNUSED */
 				offset += 2;
 				datasize -= 2;
 			}
 			if (bitmap & 4) {
-				// 4 byte "external file attributes"
+				/* 4 byte "external file attributes" */
 				uint32_t external_attributes;
 				if (datasize < 4)
 					break;
@@ -404,7 +609,7 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 				datasize -= 4;
 			}
 			if (bitmap & 8) {
-				// 2 byte comment length + comment
+				/* 2 byte comment length + comment */
 				uint32_t comment_length;
 				if (datasize < 2)
 					break;
@@ -415,7 +620,7 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 
 				if (datasize < comment_length)
 					break;
-				// Comment is not supported by libarchive
+				/* Comment is not supported by libarchive */
 				offset += comment_length;
 				datasize -= comment_length;
 			}
@@ -443,7 +648,7 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 			if (datasize >= 1 && p[offset] == 1) {/* version=1 */
 				if (datasize >= 4) {
 					/* get a uid size. */
-					uidsize = p[offset+1];
+					uidsize = 0xff & (int)p[offset+1];
 					if (uidsize == 2)
 						zip_entry->uid =
 						    archive_le16dec(
@@ -455,7 +660,7 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 				}
 				if (datasize >= (2 + uidsize + 3)) {
 					/* get a gid size. */
-					gidsize = p[offset+2+uidsize];
+					gidsize = 0xff & (int)p[offset+2+uidsize];
 					if (gidsize == 2)
 						zip_entry->gid =
 						    archive_le16dec(
@@ -469,6 +674,19 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
 			}
 			break;
 		}
+		case 0x9901:
+			/* WinZIp AES extra data field. */
+			if (p[offset + 2] == 'A' && p[offset + 3] == 'E') {
+				/* Vendor version. */
+				zip_entry->aes_extra.vendor =
+				    archive_le16dec(p + offset);
+				/* AES encryption strength. */
+				zip_entry->aes_extra.strength = p[offset + 4];
+				/* Actual compression method. */
+				zip_entry->aes_extra.compression =
+				    p[offset + 5];
+			}
+			break;
 		default:
 			break;
 		}
@@ -540,9 +758,14 @@ zip_read_local_file_header(struct archive_read *a, struct archive_entry *entry,
 			return ARCHIVE_FATAL;
 		}
 	}
+	zip->init_decryption = (zip_entry->zip_flags & ZIP_ENCRYPTED);
 	zip_entry->compression = (char)archive_le16dec(p + 8);
 	zip_entry->mtime = zip_time(p + 10);
 	zip_entry->crc32 = archive_le32dec(p + 14);
+	if (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
+		zip_entry->decdat = p[11];
+	else
+		zip_entry->decdat = p[17];
 	zip_entry->compressed_size = archive_le32dec(p + 18);
 	zip_entry->uncompressed_size = archive_le32dec(p + 22);
 	filename_length = archive_le16dec(p + 26);
@@ -683,7 +906,15 @@ zip_read_local_file_header(struct archive_read *a, struct archive_entry *entry,
 	archive_entry_set_atime(entry, zip_entry->atime, 0);
 
 	if ((zip->entry->mode & AE_IFMT) == AE_IFLNK) {
-		size_t linkname_length = zip_entry->compressed_size;
+		size_t linkname_length;
+
+		if (zip_entry->compressed_size > 64 * 1024) {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    "Zip file with oversized link entry");
+			return ARCHIVE_FATAL;
+		}
+
+		linkname_length = (size_t)zip_entry->compressed_size;
 
 		archive_entry_set_size(entry, 0);
 		p = __archive_read_ahead(a, linkname_length, NULL);
@@ -692,11 +923,6 @@ zip_read_local_file_header(struct archive_read *a, struct archive_entry *entry,
 			    "Truncated Zip file");
 			return ARCHIVE_FATAL;
 		}
-		if (__archive_read_consume(a, linkname_length) < 0) {
-			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-			    "Read error skipping symlink target name");
-			return ARCHIVE_FATAL;
-		}
 
 		sconv = zip->sconv;
 		if (sconv == NULL && (zip->entry->zip_flags & ZIP_UTF8_NAME))
@@ -731,6 +957,12 @@ zip_read_local_file_header(struct archive_read *a, struct archive_entry *entry,
 			}
 		}
 		zip_entry->uncompressed_size = zip_entry->compressed_size = 0;
+
+		if (__archive_read_consume(a, linkname_length) < 0) {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    "Read error skipping symlink target name");
+			return ARCHIVE_FATAL;
+		}
 	} else if (0 == (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
 	    || zip_entry->uncompressed_size > 0) {
 		/* Set the size only if it's meaningful. */
@@ -744,14 +976,51 @@ zip_read_local_file_header(struct archive_read *a, struct archive_entry *entry,
 		zip->end_of_entry = 1;
 
 	/* Set up a more descriptive format name. */
-	snprintf(zip->format_name, sizeof(zip->format_name), "ZIP %d.%d (%s)",
+	archive_string_sprintf(&zip->format_name, "ZIP %d.%d (%s)",
 	    version / 10, version % 10,
 	    compression_name(zip->entry->compression));
-	a->archive.archive_format_name = zip->format_name;
+	a->archive.archive_format_name = zip->format_name.s;
 
 	return (ret);
 }
 
+static int
+check_authentication_code(struct archive_read *a, const void *_p)
+{
+	struct zip *zip = (struct zip *)(a->format->data);
+
+	/* Check authentication code. */
+	if (zip->hctx_valid) {
+		const void *p;
+		uint8_t hmac[20];
+		size_t hmac_len = 20;
+		int cmp;
+
+		archive_hmac_sha1_final(&zip->hctx, hmac, &hmac_len);
+		if (_p == NULL) {
+			/* Read authentication code. */
+			p = __archive_read_ahead(a, AUTH_CODE_SIZE, NULL);
+			if (p == NULL) {
+				archive_set_error(&a->archive,
+				    ARCHIVE_ERRNO_FILE_FORMAT,
+				    "Truncated ZIP file data");
+				return (ARCHIVE_FATAL);
+			}
+		} else {
+			p = _p;
+		}
+		cmp = memcmp(hmac, p, AUTH_CODE_SIZE);
+		__archive_read_consume(a, AUTH_CODE_SIZE);
+		if (cmp != 0) {
+			archive_set_error(&a->archive,
+			    ARCHIVE_ERRNO_MISC,
+			    "ZIP bad Authentication code");
+			return (ARCHIVE_WARN);
+		}
+	}
+	return (ARCHIVE_OK);
+}
+
 /*
  * Read "uncompressed" data.  There are three cases:
  *  1) We know the size of the data.  This is always true for the
@@ -783,6 +1052,7 @@ zip_read_data_none(struct archive_read *a, const void **_buff,
 	struct zip *zip;
 	const char *buff;
 	ssize_t bytes_avail;
+	int r;
 
 	(void)offset; /* UNUSED */
 
@@ -790,10 +1060,13 @@ zip_read_data_none(struct archive_read *a, const void **_buff,
 
 	if (zip->entry->zip_flags & ZIP_LENGTH_AT_END) {
 		const char *p;
+		ssize_t grabbing_bytes = 24;
 
+		if (zip->hctx_valid)
+			grabbing_bytes += AUTH_CODE_SIZE;
 		/* Grab at least 24 bytes. */
-		buff = __archive_read_ahead(a, 24, &bytes_avail);
-		if (bytes_avail < 24) {
+		buff = __archive_read_ahead(a, grabbing_bytes, &bytes_avail);
+		if (bytes_avail < grabbing_bytes) {
 			/* Zip archives have end-of-archive markers
 			   that are longer than this, so a failure to get at
 			   least 24 bytes really does indicate a truncated
@@ -806,21 +1079,34 @@ zip_read_data_none(struct archive_read *a, const void **_buff,
 		/* Check for a complete PK\007\010 signature, followed
 		 * by the correct 4-byte CRC. */
 		p = buff;
+		if (zip->hctx_valid)
+			p += AUTH_CODE_SIZE;
 		if (p[0] == 'P' && p[1] == 'K'
 		    && p[2] == '\007' && p[3] == '\010'
 		    && (archive_le32dec(p + 4) == zip->entry_crc32
-			|| zip->ignore_crc32)) {
+			|| zip->ignore_crc32
+			|| (zip->hctx_valid
+			 && zip->entry->aes_extra.vendor == AES_VENDOR_AE_2))) {
 			if (zip->entry->flags & LA_USED_ZIP64) {
 				zip->entry->crc32 = archive_le32dec(p + 4);
-				zip->entry->compressed_size = archive_le64dec(p + 8);
-				zip->entry->uncompressed_size = archive_le64dec(p + 16);
+				zip->entry->compressed_size =
+					archive_le64dec(p + 8);
+				zip->entry->uncompressed_size =
+					archive_le64dec(p + 16);
 				zip->unconsumed = 24;
 			} else {
 				zip->entry->crc32 = archive_le32dec(p + 4);
-				zip->entry->compressed_size = archive_le32dec(p + 8);
-				zip->entry->uncompressed_size = archive_le32dec(p + 12);
+				zip->entry->compressed_size =
+					archive_le32dec(p + 8);
+				zip->entry->uncompressed_size =
+					archive_le32dec(p + 12);
 				zip->unconsumed = 16;
 			}
+			if (zip->hctx_valid) {
+				r = check_authentication_code(a, buff);
+				if (r != ARCHIVE_OK)
+					return (r);
+			}
 			zip->end_of_entry = 1;
 			return (ARCHIVE_OK);
 		}
@@ -837,6 +1123,8 @@ zip_read_data_none(struct archive_read *a, const void **_buff,
 			else if (p[3] == '\007') { p += 1; }
 			else if (p[3] == '\010' && p[2] == '\007'
 			    && p[1] == 'K' && p[0] == 'P') {
+				if (zip->hctx_valid)
+					p -= AUTH_CODE_SIZE;
 				break;
 			} else { p += 4; }
 		}
@@ -844,6 +1132,11 @@ zip_read_data_none(struct archive_read *a, const void **_buff,
 	} else {
 		if (zip->entry_bytes_remaining == 0) {
 			zip->end_of_entry = 1;
+			if (zip->hctx_valid) {
+				r = check_authentication_code(a, NULL);
+				if (r != ARCHIVE_OK)
+					return (r);
+			}
 			return (ARCHIVE_OK);
 		}
 		/* Grab a bunch of bytes. */
@@ -857,6 +1150,26 @@ zip_read_data_none(struct archive_read *a, const void **_buff,
 		if (bytes_avail > zip->entry_bytes_remaining)
 			bytes_avail = (ssize_t)zip->entry_bytes_remaining;
 	}
+	if (zip->tctx_valid || zip->cctx_valid) {
+		size_t dec_size = bytes_avail;
+
+		if (dec_size > zip->decrypted_buffer_size)
+			dec_size = zip->decrypted_buffer_size;
+		if (zip->tctx_valid) {
+			trad_enc_decrypt_update(&zip->tctx,
+			    (const uint8_t *)buff, dec_size,
+			    zip->decrypted_buffer, dec_size);
+		} else {
+			size_t dsize = dec_size;
+			archive_hmac_sha1_update(&zip->hctx,
+			    (const uint8_t *)buff, dec_size);
+			archive_decrypto_aes_ctr_update(&zip->cctx,
+			    (const uint8_t *)buff, dec_size,
+			    zip->decrypted_buffer, &dsize);
+		}
+		bytes_avail = dec_size;
+		buff = (const char *)zip->decrypted_buffer;
+	}
 	*size = bytes_avail;
 	zip->entry_bytes_remaining -= bytes_avail;
 	zip->entry_uncompressed_bytes_read += bytes_avail;
@@ -898,7 +1211,7 @@ zip_read_data_deflate(struct archive_read *a, const void **buff,
 {
 	struct zip *zip;
 	ssize_t bytes_avail;
-	const void *compressed_buff;
+	const void *compressed_buff, *sp;
 	int r;
 
 	(void)offset; /* UNUSED */
@@ -927,7 +1240,7 @@ zip_read_data_deflate(struct archive_read *a, const void **buff,
 	 * available bytes; asking for more than that forces the
 	 * decompressor to combine reads by copying data.
 	 */
-	compressed_buff = __archive_read_ahead(a, 1, &bytes_avail);
+	compressed_buff = sp = __archive_read_ahead(a, 1, &bytes_avail);
 	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)
 	    && bytes_avail > zip->entry_bytes_remaining) {
 		bytes_avail = (ssize_t)zip->entry_bytes_remaining;
@@ -938,6 +1251,51 @@ zip_read_data_deflate(struct archive_read *a, const void **buff,
 		return (ARCHIVE_FATAL);
 	}
 
+	if (zip->tctx_valid || zip->cctx_valid) {
+		if (zip->decrypted_bytes_remaining < (size_t)bytes_avail) {
+			size_t buff_remaining = zip->decrypted_buffer_size
+			    - (zip->decrypted_ptr - zip->decrypted_buffer);
+
+			if (buff_remaining > (size_t)bytes_avail)
+				buff_remaining = (size_t)bytes_avail;
+
+			if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END) &&
+			      zip->entry_bytes_remaining > 0) {
+				if ((int64_t)(zip->decrypted_bytes_remaining
+				    + buff_remaining)
+				      > zip->entry_bytes_remaining) {
+					if (zip->entry_bytes_remaining <
+					      (int64_t)zip->decrypted_bytes_remaining)
+						buff_remaining = 0;
+					else
+						buff_remaining =
+						    (size_t)zip->entry_bytes_remaining
+						      - zip->decrypted_bytes_remaining;
+				}
+			}
+			if (buff_remaining > 0) {
+				if (zip->tctx_valid) {
+					trad_enc_decrypt_update(&zip->tctx,
+					    compressed_buff, buff_remaining,
+					    zip->decrypted_ptr
+					      + zip->decrypted_bytes_remaining,
+					    buff_remaining);
+				} else {
+					size_t dsize = buff_remaining;
+					archive_decrypto_aes_ctr_update(
+					    &zip->cctx,
+					    compressed_buff, buff_remaining,
+					    zip->decrypted_ptr
+					      + zip->decrypted_bytes_remaining,
+					    &dsize);
+				}
+				zip->decrypted_bytes_remaining += buff_remaining;
+			}
+		}
+		bytes_avail = zip->decrypted_bytes_remaining;
+		compressed_buff = (const char *)zip->decrypted_ptr;
+	}
+
 	/*
 	 * A bug in zlib.h: stream.next_in should be marked 'const'
 	 * but isn't (the library never alters data through the
@@ -970,6 +1328,16 @@ zip_read_data_deflate(struct archive_read *a, const void **buff,
 
 	/* Consume as much as the compressor actually used. */
 	bytes_avail = zip->stream.total_in;
+	if (zip->tctx_valid || zip->cctx_valid) {
+		zip->decrypted_bytes_remaining -= bytes_avail;
+		if (zip->decrypted_bytes_remaining == 0)
+			zip->decrypted_ptr = zip->decrypted_buffer;
+		else
+			zip->decrypted_ptr += bytes_avail;
+	}
+	/* Calculate compressed data as much as we used.*/
+	if (zip->hctx_valid)
+		archive_hmac_sha1_update(&zip->hctx, sp, bytes_avail);
 	__archive_read_consume(a, bytes_avail);
 	zip->entry_bytes_remaining -= bytes_avail;
 	zip->entry_compressed_bytes_read += bytes_avail;
@@ -978,6 +1346,12 @@ zip_read_data_deflate(struct archive_read *a, const void **buff,
 	zip->entry_uncompressed_bytes_read += zip->stream.total_out;
 	*buff = zip->uncompressed_buffer;
 
+	if (zip->end_of_entry && zip->hctx_valid) {
+		r = check_authentication_code(a, NULL);
+		if (r != ARCHIVE_OK)
+			return (r);
+	}
+
 	if (zip->end_of_entry && (zip->entry->zip_flags & ZIP_LENGTH_AT_END)) {
 		const char *p;
 
@@ -1011,13 +1385,392 @@ zip_read_data_deflate(struct archive_read *a, const void **buff,
 #endif
 
 static int
+read_decryption_header(struct archive_read *a)
+{
+	struct zip *zip = (struct zip *)(a->format->data);
+	const char *p;
+	unsigned int remaining_size;
+	unsigned int ts;
+
+	/*
+	 * Read an initialization vector data field.
+	 */
+	p = __archive_read_ahead(a, 2, NULL);
+	if (p == NULL)
+		goto truncated;
+	ts = zip->iv_size;
+	zip->iv_size = archive_le16dec(p);
+	__archive_read_consume(a, 2);
+	if (ts < zip->iv_size) {
+		free(zip->iv);
+		zip->iv = NULL;
+	}
+	p = __archive_read_ahead(a, zip->iv_size, NULL);
+	if (p == NULL)
+		goto truncated;
+	if (zip->iv == NULL) {
+		zip->iv = malloc(zip->iv_size);
+		if (zip->iv == NULL)
+			goto nomem;
+	}
+	memcpy(zip->iv, p, zip->iv_size);
+	__archive_read_consume(a, zip->iv_size);
+
+	/*
+	 * Read a size of remaining decryption header field.
+	 */
+	p = __archive_read_ahead(a, 14, NULL);
+	if (p == NULL)
+		goto truncated;
+	remaining_size = archive_le32dec(p);
+	if (remaining_size < 16 || remaining_size > (1 << 18))
+		goto corrupted;
+
+	/* Check if format version is supported. */
+	if (archive_le16dec(p+4) != 3) {
+		archive_set_error(&a->archive,
+		    ARCHIVE_ERRNO_FILE_FORMAT,
+		    "Unsupported encryption format version: %u",
+		    archive_le16dec(p+4));
+		return (ARCHIVE_FAILED);
+	}
+
+	/*
+	 * Read an encryption algorithm field.
+	 */
+	zip->alg_id = archive_le16dec(p+6);
+	switch (zip->alg_id) {
+	case 0x6601:/* DES */
+	case 0x6602:/* RC2 */
+	case 0x6603:/* 3DES 168 */
+	case 0x6609:/* 3DES 112 */
+	case 0x660E:/* AES 128 */
+	case 0x660F:/* AES 192 */
+	case 0x6610:/* AES 256 */
+	case 0x6702:/* RC2 (version >= 5.2) */
+	case 0x6720:/* Blowfish */
+	case 0x6721:/* Twofish */
+	case 0x6801:/* RC4 */
+		/* Suuported encryption algorithm. */
+		break;
+	default:
+		archive_set_error(&a->archive,
+		    ARCHIVE_ERRNO_FILE_FORMAT,
+		    "Unknown encryption algorithm: %u", zip->alg_id);
+		return (ARCHIVE_FAILED);
+	}
+
+	/*
+	 * Read a bit length field.
+	 */
+	zip->bit_len = archive_le16dec(p+8);
+
+	/*
+	 * Read a flags field.
+	 */
+	zip->flags = archive_le16dec(p+10);
+	switch (zip->flags & 0xf000) {
+	case 0x0001: /* Password is required to decrypt. */
+	case 0x0002: /* Certificates only. */
+	case 0x0003: /* Password or certificate required to decrypt. */
+		break;
+	default:
+		archive_set_error(&a->archive,
+		    ARCHIVE_ERRNO_FILE_FORMAT,
+		    "Unknown encryption flag: %u", zip->flags);
+		return (ARCHIVE_FAILED);
+	}
+	if ((zip->flags & 0xf000) == 0 ||
+	    (zip->flags & 0xf000) == 0x4000) {
+		archive_set_error(&a->archive,
+		    ARCHIVE_ERRNO_FILE_FORMAT,
+		    "Unknown encryption flag: %u", zip->flags);
+		return (ARCHIVE_FAILED);
+	}
+
+	/*
+	 * Read an encrypted random data field.
+	 */
+	ts = zip->erd_size;
+	zip->erd_size = archive_le16dec(p+12);
+	__archive_read_consume(a, 14);
+	if ((zip->erd_size & 0xf) != 0 ||
+	    (zip->erd_size + 16) > remaining_size ||
+	    (zip->erd_size + 16) < zip->erd_size)
+		goto corrupted;
+
+	if (ts < zip->erd_size) {
+		free(zip->erd);
+		zip->erd = NULL;
+	}
+	p = __archive_read_ahead(a, zip->erd_size, NULL);
+	if (p == NULL)
+		goto truncated;
+	if (zip->erd == NULL) {
+		zip->erd = malloc(zip->erd_size);
+		if (zip->erd == NULL)
+			goto nomem;
+	}
+	memcpy(zip->erd, p, zip->erd_size);
+	__archive_read_consume(a, zip->erd_size);
+
+	/*
+	 * Read a reserved data field.
+	 */
+	p = __archive_read_ahead(a, 4, NULL);
+	if (p == NULL)
+		goto truncated;
+	/* Reserved data size should be zero. */
+	if (archive_le32dec(p) != 0)
+		goto corrupted;
+	__archive_read_consume(a, 4);
+
+	/*
+	 * Read a password validation data field.
+	 */
+	p = __archive_read_ahead(a, 2, NULL);
+	if (p == NULL)
+		goto truncated;
+	ts = zip->v_size;
+	zip->v_size = archive_le16dec(p);
+	__archive_read_consume(a, 2);
+	if ((zip->v_size & 0x0f) != 0 ||
+	    (zip->erd_size + zip->v_size + 16) > remaining_size ||
+	    (zip->erd_size + zip->v_size + 16) < (zip->erd_size + zip->v_size))
+		goto corrupted;
+	if (ts < zip->v_size) {
+		free(zip->v_data);
+		zip->v_data = NULL;
+	}
+	p = __archive_read_ahead(a, zip->v_size, NULL);
+	if (p == NULL)
+		goto truncated;
+	if (zip->v_data == NULL) {
+		zip->v_data = malloc(zip->v_size);
+		if (zip->v_data == NULL)
+			goto nomem;
+	}
+	memcpy(zip->v_data, p, zip->v_size);
+	__archive_read_consume(a, zip->v_size);
+
+	p = __archive_read_ahead(a, 4, NULL);
+	if (p == NULL)
+		goto truncated;
+	zip->v_crc32 = archive_le32dec(p);
+	__archive_read_consume(a, 4);
+
+	/*return (ARCHIVE_OK);
+	 * This is not fully implemnted yet.*/
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+	    "Encrypted file is unsupported");
+	return (ARCHIVE_FAILED);
+truncated:
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+	    "Truncated ZIP file data");
+	return (ARCHIVE_FATAL);
+corrupted:
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+	    "Corrupted ZIP file data");
+	return (ARCHIVE_FATAL);
+nomem:
+	archive_set_error(&a->archive, ENOMEM,
+	    "No memory for ZIP decryption");
+	return (ARCHIVE_FATAL);
+}
+
+static int
+zip_alloc_decryption_buffer(struct archive_read *a)
+{
+	struct zip *zip = (struct zip *)(a->format->data);
+	size_t bs = 256 * 1024;
+
+	if (zip->decrypted_buffer == NULL) {
+		zip->decrypted_buffer_size = bs;
+		zip->decrypted_buffer = malloc(bs);
+		if (zip->decrypted_buffer == NULL) {
+			archive_set_error(&a->archive, ENOMEM,
+			    "No memory for ZIP decryption");
+			return (ARCHIVE_FATAL);
+		}
+	}
+	zip->decrypted_ptr = zip->decrypted_buffer;
+	return (ARCHIVE_OK);
+}
+
+static int
+init_traditional_PKWARE_decryption(struct archive_read *a)
+{
+	struct zip *zip = (struct zip *)(a->format->data);
+	const void *p;
+	int retry;
+	int r;
+
+	if (zip->tctx_valid)
+		return (ARCHIVE_OK);
+
+	/*
+	   Read the 12 bytes encryption header stored at
+	   the start of the data area.
+	 */
+#define ENC_HEADER_SIZE	12
+	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)
+	    && zip->entry_bytes_remaining < ENC_HEADER_SIZE) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+		    "Truncated Zip encrypted body: only %jd bytes available",
+		    (intmax_t)zip->entry_bytes_remaining);
+		return (ARCHIVE_FATAL);
+	}
+
+	p = __archive_read_ahead(a, ENC_HEADER_SIZE, NULL);
+	if (p == NULL) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+		    "Truncated ZIP file data");
+		return (ARCHIVE_FATAL);
+	}
+
+	for (retry = 0;; retry++) {
+		const char *passphrase;
+		uint8_t crcchk;
+
+		passphrase = __archive_read_next_passphrase(a);
+		if (passphrase == NULL) {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    (retry > 0)?
+				"Incorrect passphrase":
+				"Passphrase required for this entry");
+			return (ARCHIVE_FAILED);
+		}
+
+		/*
+		 * Initialize ctx for Traditional PKWARE Decyption.
+		 */
+		r = trad_enc_init(&zip->tctx, passphrase, strlen(passphrase),
+			p, ENC_HEADER_SIZE, &crcchk);
+		if (r == 0 && crcchk == zip->entry->decdat)
+			break;/* The passphrase is OK. */
+		if (retry > 10000) {
+			/* Avoid infinity loop. */
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    "Too many incorrect passphrases");
+			return (ARCHIVE_FAILED);
+		}
+	}
+
+	__archive_read_consume(a, ENC_HEADER_SIZE);
+	zip->tctx_valid = 1;
+	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)) {
+	    zip->entry_bytes_remaining -= ENC_HEADER_SIZE;
+	}
+	/*zip->entry_uncompressed_bytes_read += ENC_HEADER_SIZE;*/
+	zip->entry_compressed_bytes_read += ENC_HEADER_SIZE;
+	zip->decrypted_bytes_remaining = 0;
+
+	return (zip_alloc_decryption_buffer(a));
+#undef ENC_HEADER_SIZE
+}
+
+static int
+init_WinZip_AES_decryption(struct archive_read *a)
+{
+	struct zip *zip = (struct zip *)(a->format->data);
+	const void *p;
+	const uint8_t *pv;
+	size_t key_len, salt_len;
+	uint8_t derived_key[MAX_DERIVED_KEY_BUF_SIZE];
+	int retry;
+	int r;
+
+	if (zip->cctx_valid || zip->hctx_valid)
+		return (ARCHIVE_OK);
+
+	switch (zip->entry->aes_extra.strength) {
+	case 1: salt_len = 8;  key_len = 16; break;
+	case 2: salt_len = 12; key_len = 24; break;
+	case 3: salt_len = 16; key_len = 32; break;
+	default: goto corrupted;
+	}
+	p = __archive_read_ahead(a, salt_len + 2, NULL);
+	if (p == NULL)
+		goto truncated;
+
+	for (retry = 0;; retry++) {
+		const char *passphrase;
+
+		passphrase = __archive_read_next_passphrase(a);
+		if (passphrase == NULL) {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    (retry > 0)?
+				"Incorrect passphrase":
+				"Passphrase required for this entry");
+			return (ARCHIVE_FAILED);
+		}
+		memset(derived_key, 0, sizeof(derived_key));
+		r = archive_pbkdf2_sha1(passphrase, strlen(passphrase),
+		    p, salt_len, 1000, derived_key, key_len * 2 + 2);
+		if (r != 0) {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    "Decryption is unsupported due to lack of "
+			    "crypto library");
+			return (ARCHIVE_FAILED);
+		}
+
+		/* Check password verification value. */
+		pv = ((const uint8_t *)p) + salt_len;
+		if (derived_key[key_len * 2] == pv[0] &&
+		    derived_key[key_len * 2 + 1] == pv[1])
+			break;/* The passphrase is OK. */
+		if (retry > 10000) {
+			/* Avoid infinity loop. */
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    "Too many incorrect passphrases");
+			return (ARCHIVE_FAILED);
+		}
+	}
+
+	r = archive_decrypto_aes_ctr_init(&zip->cctx, derived_key, key_len);
+	if (r != 0) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Decryption is unsupported due to lack of crypto library");
+		return (ARCHIVE_FAILED);
+	}
+	r = archive_hmac_sha1_init(&zip->hctx, derived_key + key_len, key_len);
+	if (r != 0) {
+		archive_decrypto_aes_ctr_release(&zip->cctx);
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Failed to initialize HMAC-SHA1");
+		return (ARCHIVE_FAILED);
+	}
+	zip->cctx_valid = zip->hctx_valid = 1;
+	__archive_read_consume(a, salt_len + 2);
+	zip->entry_bytes_remaining -= salt_len + 2 + AUTH_CODE_SIZE;
+	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)
+	    && zip->entry_bytes_remaining < 0)
+		goto corrupted;
+	zip->entry_compressed_bytes_read += salt_len + 2 + AUTH_CODE_SIZE;
+	zip->decrypted_bytes_remaining = 0;
+
+	zip->entry->compression = zip->entry->aes_extra.compression;
+	return (zip_alloc_decryption_buffer(a));
+
+truncated:
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+	    "Truncated ZIP file data");
+	return (ARCHIVE_FATAL);
+corrupted:
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+	    "Corrupted ZIP file data");
+	return (ARCHIVE_FATAL);
+}
+
+static int
 archive_read_format_zip_read_data(struct archive_read *a,
     const void **buff, size_t *size, int64_t *offset)
 {
 	int r;
 	struct zip *zip = (struct zip *)(a->format->data);
 
-	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
+	if (zip->has_encrypted_entries ==
+			ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
 		zip->has_encrypted_entries = 0;
 	}
 
@@ -1033,16 +1786,22 @@ archive_read_format_zip_read_data(struct archive_read *a,
 	if (AE_IFREG != (zip->entry->mode & AE_IFMT))
 		return (ARCHIVE_EOF);
 
-	if (zip->entry->zip_flags & (ZIP_ENCRYPTED | ZIP_STRONG_ENCRYPTED)) {
-		zip->has_encrypted_entries = 1;
-		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
-		    "Encrypted file is unsupported");
-		return (ARCHIVE_FAILED);
-	}
-
 	__archive_read_consume(a, zip->unconsumed);
 	zip->unconsumed = 0;
 
+	if (zip->init_decryption) {
+		zip->has_encrypted_entries = 1;
+		if (zip->entry->zip_flags & ZIP_STRONG_ENCRYPTED)
+			r = read_decryption_header(a);
+		else if (zip->entry->compression == WINZIP_AES_ENCRYPTION)
+			r = init_WinZip_AES_decryption(a);
+		else
+			r = init_traditional_PKWARE_decryption(a);
+		if (r != ARCHIVE_OK)
+			return (r);
+		zip->init_decryption = 0;
+	}
+
 	switch(zip->entry->compression) {
 	case 0:  /* No compression. */
 		r =  zip_read_data_none(a, buff, size, offset);
@@ -1092,7 +1851,9 @@ archive_read_format_zip_read_data(struct archive_read *a,
 			return (ARCHIVE_WARN);
 		}
 		/* Check computed CRC against header */
-		if (zip->entry->crc32 != zip->entry_crc32
+		if ((!zip->hctx_valid ||
+		      zip->entry->aes_extra.vendor != AES_VENDOR_AE_2) &&
+		   zip->entry->crc32 != zip->entry_crc32
 		    && !zip->ignore_crc32) {
 			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 			    "ZIP bad CRC: 0x%lx should be 0x%lx",
@@ -1126,6 +1887,15 @@ archive_read_format_zip_cleanup(struct archive_read *a)
 			zip_entry = next_zip_entry;
 		}
 	}
+	free(zip->decrypted_buffer);
+	if (zip->cctx_valid)
+		archive_decrypto_aes_ctr_release(&zip->cctx);
+	if (zip->hctx_valid)
+		archive_hmac_sha1_cleanup(&zip->hctx);
+	free(zip->iv);
+	free(zip->erd);
+	free(zip->v_data);
+	archive_string_free(&zip->format_name);
 	free(zip);
 	(a->format->data) = NULL;
 	return (ARCHIVE_OK);
@@ -1213,7 +1983,8 @@ static int
 archive_read_support_format_zip_capabilities_streamable(struct archive_read * a)
 {
 	(void)a; /* UNUSED */
-	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA | ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
+	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA |
+		ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
 }
 
 static int
@@ -1271,9 +2042,9 @@ archive_read_format_zip_streamable_read_header(struct archive_read *a,
 	 * archive_read_data(), so be it. We'll do the same check there
 	 * as well.
 	 */
-	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
+	if (zip->has_encrypted_entries ==
+			ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW)
 		zip->has_encrypted_entries = 0;
-	}
 
 	/* Make sure we have a zip_entry structure to use. */
 	if (zip->zip_entries == NULL) {
@@ -1287,6 +2058,13 @@ archive_read_format_zip_streamable_read_header(struct archive_read *a,
 	zip->entry = zip->zip_entries;
 	memset(zip->entry, 0, sizeof(struct zip_entry));
 
+	if (zip->cctx_valid)
+		archive_decrypto_aes_ctr_release(&zip->cctx);
+	if (zip->hctx_valid)
+		archive_hmac_sha1_cleanup(&zip->hctx);
+	zip->tctx_valid = zip->cctx_valid = zip->hctx_valid = 0;
+	__archive_read_reset_passphrase(a);
+
 	/* Search ahead for the next local file header. */
 	__archive_read_consume(a, zip->unconsumed);
 	zip->unconsumed = 0;
@@ -1359,12 +2137,28 @@ archive_read_format_zip_read_data_skip_streamable(struct archive_read *a)
 	if (0 == (zip->entry->zip_flags & ZIP_LENGTH_AT_END)
 	    || zip->entry->compressed_size > 0) {
 		/* We know the compressed length, so we can just skip. */
-		bytes_skipped = __archive_read_consume(a, zip->entry_bytes_remaining);
+		bytes_skipped = __archive_read_consume(a,
+					zip->entry_bytes_remaining);
 		if (bytes_skipped < 0)
 			return (ARCHIVE_FATAL);
 		return (ARCHIVE_OK);
 	}
 
+	if (zip->init_decryption) {
+		int r;
+
+		zip->has_encrypted_entries = 1;
+		if (zip->entry->zip_flags & ZIP_STRONG_ENCRYPTED)
+			r = read_decryption_header(a);
+		else if (zip->entry->compression == WINZIP_AES_ENCRYPTION)
+			r = init_WinZip_AES_decryption(a);
+		else
+			r = init_traditional_PKWARE_decryption(a);
+		if (r != ARCHIVE_OK)
+			return (r);
+		zip->init_decryption = 0;
+	}
+
 	/* We're streaming and we don't know the length. */
 	/* If the body is compressed and we know the format, we can
 	 * find an exact end-of-entry by decompressing it. */
@@ -1402,9 +2196,11 @@ archive_read_format_zip_read_data_skip_streamable(struct archive_read *a)
 				else if (p[3] == '\010' && p[2] == '\007'
 				    && p[1] == 'K' && p[0] == 'P') {
 					if (zip->entry->flags & LA_USED_ZIP64)
-						__archive_read_consume(a, p - buff + 24);
+						__archive_read_consume(a,
+						    p - buff + 24);
 					else
-						__archive_read_consume(a, p - buff + 16);
+						__archive_read_consume(a,
+						    p - buff + 16);
 					return ARCHIVE_OK;
 				} else { p += 4; }
 			}
@@ -1423,13 +2219,12 @@ archive_read_support_format_zip_streamable(struct archive *_a)
 	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 	    ARCHIVE_STATE_NEW, "archive_read_support_format_zip");
 
-	zip = (struct zip *)malloc(sizeof(*zip));
+	zip = (struct zip *)calloc(1, sizeof(*zip));
 	if (zip == NULL) {
 		archive_set_error(&a->archive, ENOMEM,
 		    "Can't allocate zip data");
 		return (ARCHIVE_FATAL);
 	}
-	memset(zip, 0, sizeof(*zip));
 
 	/* Streamable reader doesn't support mac extensions. */
 	zip->process_mac_extensions = 0;
@@ -1469,7 +2264,8 @@ static int
 archive_read_support_format_zip_capabilities_seekable(struct archive_read * a)
 {
 	(void)a; /* UNUSED */
-	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA | ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
+	return (ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_DATA |
+		ARCHIVE_READ_FORMAT_CAPS_ENCRYPT_METADATA);
 }
 
 /*
@@ -1510,7 +2306,11 @@ read_eocd(struct zip *zip, const char *p, int64_t current_offset)
 	return 32;
 }
 
-static int
+/*
+ * Examine Zip64 EOCD locator:  If it's valid, store the information
+ * from it.
+ */
+static void
 read_zip64_eocd(struct archive_read *a, struct zip *zip, const char *p)
 {
 	int64_t eocd64_offset;
@@ -1520,37 +2320,35 @@ read_zip64_eocd(struct archive_read *a, struct zip *zip, const char *p)
 
 	/* Central dir must be on first volume. */
 	if (archive_le32dec(p + 4) != 0)
-		return 0;
+		return;
 	/* Must be only a single volume. */
 	if (archive_le32dec(p + 16) != 1)
-		return 0;
+		return;
 
 	/* Find the Zip64 EOCD record. */
 	eocd64_offset = archive_le64dec(p + 8);
 	if (__archive_read_seek(a, eocd64_offset, SEEK_SET) < 0)
-		return 0;
+		return;
 	if ((p = __archive_read_ahead(a, 56, NULL)) == NULL)
-		return 0;
+		return;
 	/* Make sure we can read all of it. */
 	eocd64_size = archive_le64dec(p + 4) + 12;
 	if (eocd64_size < 56 || eocd64_size > 16384)
-		return 0;
-	if ((p = __archive_read_ahead(a, eocd64_size, NULL)) == NULL)
-		return 0;
+		return;
+	if ((p = __archive_read_ahead(a, (size_t)eocd64_size, NULL)) == NULL)
+		return;
 
 	/* Sanity-check the EOCD64 */
 	if (archive_le32dec(p + 16) != 0) /* Must be disk #0 */
-		return 0;
+		return;
 	if (archive_le32dec(p + 20) != 0) /* CD must be on disk #0 */
-		return 0;
+		return;
 	/* CD can't be split. */
 	if (archive_le64dec(p + 24) != archive_le64dec(p + 32))
-		return 0;
+		return;
 
 	/* Save the central directory offset for later use. */
 	zip->central_directory_offset = archive_le64dec(p + 48);
-
-	return 32;
 }
 
 static int
@@ -1571,40 +2369,39 @@ archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
 		return 0;
 
 	/* Search last 16k of file for end-of-central-directory
-	 * record (which starts with PK\005\006) or Zip64 locator
-	 * record (which begins with PK\006\007) */
-	tail = zipmin(1024 * 16, file_size);
+	 * record (which starts with PK\005\006) */
+	tail = (int)zipmin(1024 * 16, file_size);
 	current_offset = __archive_read_seek(a, -tail, SEEK_END);
 	if (current_offset < 0)
 		return 0;
 	if ((p = __archive_read_ahead(a, (size_t)tail, NULL)) == NULL)
 		return 0;
-	/* TODO: Rework this to search backwards from the end.  We
-	 * normally expect the EOCD record to be at the very end, so
-	 * that should be significantly faster.  Tricky part: Make
-	 * sure we still prefer the Zip64 locator if it's present. */
-	for (i = 0; i <= tail - 22;) {
-		switch (p[i + 3]) {
-		case 'P': i += 3; break;
-		case 'K': i += 2; break;
-		case 005: i += 1; break;
-		case 006:
+	/* Boyer-Moore search backwards from the end, since we want
+	 * to match the last EOCD in the file (there can be more than
+	 * one if there is an uncompressed Zip archive as a member
+	 * within this Zip archive). */
+	for (i = tail - 22; i > 0;) {
+		switch (p[i]) {
+		case 'P':
 			if (memcmp(p + i, "PK\005\006", 4) == 0) {
-				int ret = read_eocd(zip, p + i, current_offset + i);
-				if (ret > 0)
-					return (ret);
-			}
-			i += 1; /* Look for PK\006\007 next */
-			break;
-		case 007:
-			if (memcmp(p + i, "PK\006\007", 4) == 0) {
-				int ret = read_zip64_eocd(a, zip, p + i);
-				if (ret > 0)
+				int ret = read_eocd(zip, p + i,
+				    current_offset + i);
+				if (ret > 0) {
+					/* Zip64 EOCD locator precedes
+					 * regular EOCD if present. */
+					if (i >= 20
+					    && memcmp(p + i - 20, "PK\006\007", 4) == 0) {
+						read_zip64_eocd(a, zip, p + i - 20);
+					}
 					return (ret);
+				}
 			}
-			i += 4;
+			i -= 4;
 			break;
-		default: i += 4; break;
+		case 'K': i -= 1; break;
+		case 005: i -= 2; break;
+		case 006: i -= 3; break;
+		default: i -= 4; break;
 		}
 	}
 	return 0;
@@ -1756,7 +2553,8 @@ slurp_central_directory(struct archive_read *a, struct zip *zip)
 		}
 		__archive_read_consume(a, i);
 	}
-	correction = archive_filter_bytes(&a->archive, 0) - zip->central_directory_offset;
+	correction = archive_filter_bytes(&a->archive, 0)
+			- zip->central_directory_offset;
 
 	__archive_rb_tree_init(&zip->tree, &rb_ops);
 	__archive_rb_tree_init(&zip->tree_rsrc, &rb_rsrc_ops);
@@ -1791,12 +2589,17 @@ slurp_central_directory(struct archive_read *a, struct zip *zip)
 		zip_entry->system = p[5];
 		/* version_required = archive_le16dec(p + 6); */
 		zip_entry->zip_flags = archive_le16dec(p + 8);
-		if (zip_entry->zip_flags & (ZIP_ENCRYPTED | ZIP_STRONG_ENCRYPTED)){
+		if (zip_entry->zip_flags
+		      & (ZIP_ENCRYPTED | ZIP_STRONG_ENCRYPTED)){
 			zip->has_encrypted_entries = 1;
 		}
 		zip_entry->compression = (char)archive_le16dec(p + 10);
 		zip_entry->mtime = zip_time(p + 12);
 		zip_entry->crc32 = archive_le32dec(p + 16);
+		if (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
+			zip_entry->decdat = p[13];
+		else
+			zip_entry->decdat = p[19];
 		zip_entry->compressed_size = archive_le32dec(p + 20);
 		zip_entry->uncompressed_size = archive_le32dec(p + 24);
 		filename_length = archive_le16dec(p + 28);
@@ -1819,9 +2622,11 @@ slurp_central_directory(struct archive_read *a, struct zip *zip)
 		/* We're done with the regular data; get the filename and
 		 * extra data. */
 		__archive_read_consume(a, 46);
-		if ((p = __archive_read_ahead(a, filename_length + extra_length, NULL))
-		    == NULL) {
-			archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+		p = __archive_read_ahead(a, filename_length + extra_length,
+			NULL);
+		if (p == NULL) {
+			archive_set_error(&a->archive,
+			    ARCHIVE_ERRNO_FILE_FORMAT,
 			    "Truncated ZIP file header");
 			return ARCHIVE_FATAL;
 		}
@@ -1846,26 +2651,30 @@ slurp_central_directory(struct archive_read *a, struct zip *zip)
 				 * resource fork file to expose it. */
 				if (name[filename_length-1] != '/' &&
 				    (r - name < 3 || r[0] != '.' || r[1] != '_')) {
-					__archive_rb_tree_insert_node(&zip->tree,
-					    &zip_entry->node);
+					__archive_rb_tree_insert_node(
+					    &zip->tree, &zip_entry->node);
 					/* Expose its parent directories. */
-					expose_parent_dirs(zip, name, filename_length);
+					expose_parent_dirs(zip, name,
+					    filename_length);
 				} else {
 					/* This file is a resource fork file or
 					 * a directory. */
-					archive_strncpy(&(zip_entry->rsrcname), name,
-					    filename_length);
-					__archive_rb_tree_insert_node(&zip->tree_rsrc,
-					    &zip_entry->node);
+					archive_strncpy(&(zip_entry->rsrcname),
+					     name, filename_length);
+					__archive_rb_tree_insert_node(
+					    &zip->tree_rsrc, &zip_entry->node);
 				}
 			} else {
-				/* Generate resource fork name to find its resource
-				 * file at zip->tree_rsrc. */
-				archive_strcpy(&(zip_entry->rsrcname), "__MACOSX/");
-				archive_strncat(&(zip_entry->rsrcname), name, r - name);
+				/* Generate resource fork name to find its
+				 * resource file at zip->tree_rsrc. */
+				archive_strcpy(&(zip_entry->rsrcname),
+				    "__MACOSX/");
+				archive_strncat(&(zip_entry->rsrcname),
+				    name, r - name);
 				archive_strcat(&(zip_entry->rsrcname), "._");
 				archive_strncat(&(zip_entry->rsrcname),
-				    name + (r - name), filename_length - (r - name));
+				    name + (r - name),
+				    filename_length - (r - name));
 				/* Register an entry to RB tree to sort it by
 				 * file offset. */
 				__archive_rb_tree_insert_node(&zip->tree,
@@ -2056,9 +2865,9 @@ archive_read_format_zip_seekable_read_header(struct archive_read *a,
 	 * archive_read_data(), so be it. We'll do the same check there
 	 * as well.
 	 */
-	if (zip->has_encrypted_entries == ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW) {
+	if (zip->has_encrypted_entries ==
+			ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW)
 		zip->has_encrypted_entries = 0;
-	}
 
 	a->archive.archive_format = ARCHIVE_FORMAT_ZIP;
 	if (a->archive.archive_format_name == NULL)
@@ -2087,6 +2896,13 @@ archive_read_format_zip_seekable_read_header(struct archive_read *a,
 	else
 		rsrc = NULL;
 
+	if (zip->cctx_valid)
+		archive_decrypto_aes_ctr_release(&zip->cctx);
+	if (zip->hctx_valid)
+		archive_hmac_sha1_cleanup(&zip->hctx);
+	zip->tctx_valid = zip->cctx_valid = zip->hctx_valid = 0;
+	__archive_read_reset_passphrase(a);
+
 	/* File entries are sorted by the header offset, we should mostly
 	 * use __archive_read_consume to advance a read point to avoid redundant
 	 * data reading.  */
@@ -2095,7 +2911,8 @@ archive_read_format_zip_seekable_read_header(struct archive_read *a,
 		__archive_read_consume(a,
 		    zip->entry->local_header_offset - offset);
 	else if (offset != zip->entry->local_header_offset) {
-		__archive_read_seek(a, zip->entry->local_header_offset, SEEK_SET);
+		__archive_read_seek(a, zip->entry->local_header_offset,
+		    SEEK_SET);
 	}
 	zip->unconsumed = 0;
 	r = zip_read_local_file_header(a, entry, zip);
@@ -2133,13 +2950,12 @@ archive_read_support_format_zip_seekable(struct archive *_a)
 	archive_check_magic(_a, ARCHIVE_READ_MAGIC,
 	    ARCHIVE_STATE_NEW, "archive_read_support_format_zip_seekable");
 
-	zip = (struct zip *)malloc(sizeof(*zip));
+	zip = (struct zip *)calloc(1, sizeof(*zip));
 	if (zip == NULL) {
 		archive_set_error(&a->archive, ENOMEM,
 		    "Can't allocate zip data");
 		return (ARCHIVE_FATAL);
 	}
-	memset(zip, 0, sizeof(*zip));
 
 #ifdef HAVE_COPYFILE_H
 	/* Set this by default on Mac OS. */
diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 87f9288..3d4be82 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -71,6 +71,10 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_string.c 201095 2009-12-28 02:33
 #define wmemcpy(a,b,i)  (wchar_t *)memcpy((a), (b), (i) * sizeof(wchar_t))
 #endif
 
+#if !defined(HAVE_WMEMMOVE) && !defined(wmemmove)
+#define wmemmove(a,b,i)  (wchar_t *)memmove((a), (b), (i) * sizeof(wchar_t))
+#endif
+
 struct archive_string_conv {
 	struct archive_string_conv	*next;
 	char				*from_charset;
@@ -127,12 +131,7 @@ struct archive_string_conv {
 #define UNICODE_MAX		0x10FFFF
 #define UNICODE_R_CHAR		0xFFFD	/* Replacement character. */
 /* Set U+FFFD(Replacement character) in UTF-8. */
-#define UTF8_SET_R_CHAR(outp) do {		\
-			(outp)[0] = 0xef;	\
-			(outp)[1] = 0xbf;	\
-			(outp)[2] = 0xbd;	\
-} while (0)
-#define UTF8_R_CHAR_SIZE	3
+static const char utf8_replacement_char[] = {0xef, 0xbf, 0xbd};
 
 static struct archive_string_conv *find_sconv_object(struct archive *,
 	const char *, const char *);
@@ -203,7 +202,7 @@ archive_string_append(struct archive_string *as, const char *p, size_t s)
 {
 	if (archive_string_ensure(as, as->length + s + 1) == NULL)
 		return (NULL);
-	memcpy(as->s + as->length, p, s);
+	memmove(as->s + as->length, p, s);
 	as->length += s;
 	as->s[as->length] = 0;
 	return (as);
@@ -214,7 +213,7 @@ archive_wstring_append(struct archive_wstring *as, const wchar_t *p, size_t s)
 {
 	if (archive_wstring_ensure(as, as->length + s + 1) == NULL)
 		return (NULL);
-	wmemcpy(as->s + as->length, p, s);
+	wmemmove(as->s + as->length, p, s);
 	as->length += s;
 	as->s[as->length] = 0;
 	return (as);
@@ -2037,7 +2036,7 @@ iconv_strncat_in_locale(struct archive_string *as, const void *_p,
 			if (sc->flag & (SCONV_TO_UTF8 | SCONV_TO_UTF16)) {
 				size_t rbytes;
 				if (sc->flag & SCONV_TO_UTF8)
-					rbytes = UTF8_R_CHAR_SIZE;
+					rbytes = sizeof(utf8_replacement_char);
 				else
 					rbytes = 2;
 
@@ -2053,7 +2052,7 @@ iconv_strncat_in_locale(struct archive_string *as, const void *_p,
 					    - as->length - to_size;
 				}
 				if (sc->flag & SCONV_TO_UTF8)
-					UTF8_SET_R_CHAR(outp);
+					memcpy(outp, utf8_replacement_char, sizeof(utf8_replacement_char));
 				else if (sc->flag & SCONV_TO_UTF16BE)
 					archive_be16enc(outp, UNICODE_R_CHAR);
 				else
@@ -2202,9 +2201,7 @@ best_effort_strncat_in_locale(struct archive_string *as, const void *_p,
     size_t length, struct archive_string_conv *sc)
 {
 	size_t remaining;
-	char *otp;
 	const uint8_t *itp;
-	size_t avail;
 	int return_value = 0; /* success */
 
 	/*
@@ -2223,46 +2220,25 @@ best_effort_strncat_in_locale(struct archive_string *as, const void *_p,
 	 * byte sequence 0xEF 0xBD 0xBD, which are code point U+FFFD,
 	 * a Replacement Character in Unicode.
 	 */
-	if (archive_string_ensure(as, as->length + length + 1) == NULL)
-		return (-1);
 
 	remaining = length;
 	itp = (const uint8_t *)_p;
-	otp = as->s + as->length;
-	avail = as->buffer_length - as->length -1;
 	while (*itp && remaining > 0) {
-		if (*itp > 127 && (sc->flag & SCONV_TO_UTF8)) {
-			if (avail < UTF8_R_CHAR_SIZE) {
-				as->length = otp - as->s;
-				if (NULL == archive_string_ensure(as,
-				    as->buffer_length + remaining +
-				    UTF8_R_CHAR_SIZE))
-					return (-1);
-				otp = as->s + as->length;
-				avail = as->buffer_length - as->length -1;
+		if (*itp > 127) {
+			// Non-ASCII: Substitute with suitable replacement
+			if (sc->flag & SCONV_TO_UTF8) {
+				if (archive_string_append(as, utf8_replacement_char, sizeof(utf8_replacement_char)) == NULL) {
+					__archive_errx(1, "Out of memory");
+				}
+			} else {
+				archive_strappend_char(as, '?');
 			}
-			/*
-		 	 * When coping a string in UTF-8, unknown character
-			 * should be U+FFFD (replacement character).
-			 */
-			UTF8_SET_R_CHAR(otp);
-			otp += UTF8_R_CHAR_SIZE;
-			avail -= UTF8_R_CHAR_SIZE;
-			itp++;
-			remaining--;
-			return_value = -1;
-		} else if (*itp > 127) {
-			*otp++ = '?';
-			itp++;
-			remaining--;
 			return_value = -1;
 		} else {
-			*otp++ = (char)*itp++;
-			remaining--;
+			archive_strappend_char(as, *itp);
 		}
+		++itp;
 	}
-	as->length = otp - as->s;
-	as->s[as->length] = '\0';
 	return (return_value);
 }
 
@@ -2488,6 +2464,9 @@ unicode_to_utf8(char *p, size_t remaining, uint32_t uc)
 {
 	char *_p = p;
 
+	/* Invalid Unicode char maps to Replacement character */
+	if (uc > UNICODE_MAX)
+		uc = UNICODE_R_CHAR;
 	/* Translate code point to UTF8 */
 	if (uc <= 0x7f) {
 		if (remaining == 0)
@@ -2504,22 +2483,13 @@ unicode_to_utf8(char *p, size_t remaining, uint32_t uc)
 		*p++ = 0xe0 | ((uc >> 12) & 0x0f);
 		*p++ = 0x80 | ((uc >> 6) & 0x3f);
 		*p++ = 0x80 | (uc & 0x3f);
-	} else if (uc <= UNICODE_MAX) {
+	} else {
 		if (remaining < 4)
 			return (0);
 		*p++ = 0xf0 | ((uc >> 18) & 0x07);
 		*p++ = 0x80 | ((uc >> 12) & 0x3f);
 		*p++ = 0x80 | ((uc >> 6) & 0x3f);
 		*p++ = 0x80 | (uc & 0x3f);
-	} else {
-		/*
-		 * Undescribed code point should be U+FFFD
-		 * (replacement character).
-		 */
-		if (remaining < UTF8_R_CHAR_SIZE)
-			return (0);
-		UTF8_SET_R_CHAR(p);
-		p += UTF8_R_CHAR_SIZE;
 	}
 	return (p - _p);
 }
@@ -3887,7 +3857,7 @@ archive_mstring_get_utf8(struct archive *a, struct archive_mstring *aes,
 		sc = archive_string_conversion_to_charset(a, "UTF-8", 1);
 		if (sc == NULL)
 			return (-1);/* Couldn't allocate memory for sc. */
-		r = archive_strncpy_l(&(aes->aes_mbs), aes->aes_mbs.s,
+		r = archive_strncpy_l(&(aes->aes_utf8), aes->aes_mbs.s,
 		    aes->aes_mbs.length, sc);
 		if (a == NULL)
 			free_sconv_object(sc);
@@ -4062,6 +4032,19 @@ archive_mstring_copy_wcs(struct archive_mstring *aes, const wchar_t *wcs)
 }
 
 int
+archive_mstring_copy_utf8(struct archive_mstring *aes, const char *utf8)
+{
+  if (utf8 == NULL) {
+    aes->aes_set = 0;
+  }
+  aes->aes_set = AES_SET_UTF8;
+  archive_string_empty(&(aes->aes_mbs));
+  archive_string_empty(&(aes->aes_wcs));
+  archive_strncpy(&(aes->aes_utf8), utf8, strlen(utf8));
+  return (int)strlen(utf8);
+}
+
+int
 archive_mstring_copy_wcs_len(struct archive_mstring *aes, const wchar_t *wcs,
     size_t len)
 {
diff --git a/libarchive/archive_util.c b/libarchive/archive_util.c
index 3d92566..ea14d4d 100644
--- a/libarchive/archive_util.c
+++ b/libarchive/archive_util.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2009-2012 Michihiro NAKAJIMA
+ * Copyright (c) 2009-2012,2014 Michihiro NAKAJIMA
  * Copyright (c) 2003-2007 Tim Kientzle
  * All rights reserved.
  *
@@ -54,9 +54,13 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_util.c 201098 2009-12-28 02:58:1
 #ifdef HAVE_BZLIB_H
 #include <bzlib.h>
 #endif
+#ifdef HAVE_LZ4_H
+#include <lz4.h>
+#endif
 
 #include "archive.h"
 #include "archive_private.h"
+#include "archive_random_private.h"
 #include "archive_string.h"
 
 #ifndef O_CLOEXEC
@@ -113,7 +117,11 @@ archive_version_details(void)
 			archive_strncat(&str, p, sep - p);
 		}
 #endif
-	    }
+#if defined(HAVE_LZ4_H) && defined(HAVE_LIBLZ4)
+		archive_string_sprintf(&str, " liblz4/%d.%d.%d",
+		    LZ4_VERSION_MAJOR, LZ4_VERSION_MINOR, LZ4_VERSION_RELEASE);
+#endif
+	}
 	return str.s;
 }
 
@@ -249,6 +257,8 @@ __archive_errx(int retvalue, const char *msg)
 int
 __archive_mktemp(const char *tmpdir)
 {
+	static const wchar_t *prefix = L"libarchive_";
+	static const wchar_t *suffix = L"XXXXXXXXXX";
 	static const wchar_t num[] = {
 		L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7',
 		L'8', L'9', L'A', L'B', L'C', L'D', L'E', L'F',
@@ -323,10 +333,10 @@ __archive_mktemp(const char *tmpdir)
 	/*
 	 * Create a temporary file.
 	 */
-	archive_wstrcat(&temp_name, L"libarchive_");
-	xp = temp_name.s + archive_strlen(&temp_name);
-	archive_wstrcat(&temp_name, L"XXXXXXXXXX");
+	archive_wstrcat(&temp_name, prefix);
+	archive_wstrcat(&temp_name, suffix);
 	ep = temp_name.s + archive_strlen(&temp_name);
+	xp = ep - wcslen(suffix);
 
 	if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
 		CRYPT_VERIFYCONTEXT)) {
@@ -463,7 +473,6 @@ __archive_mktemp(const char *tmpdir)
 	struct stat st;
 	int fd;
 	char *tp, *ep;
-	unsigned seed;
 
 	fd = -1;
 	archive_string_init(&temp_name);
@@ -487,21 +496,15 @@ __archive_mktemp(const char *tmpdir)
 	archive_strcat(&temp_name, "XXXXXXXXXX");
 	ep = temp_name.s + archive_strlen(&temp_name);
 
-	fd = open("/dev/random", O_RDONLY | O_CLOEXEC);
-	__archive_ensure_cloexec_flag(fd);
-	if (fd < 0)
-		seed = time(NULL);
-	else {
-		if (read(fd, &seed, sizeof(seed)) < 0)
-			seed = time(NULL);
-		close(fd);
-	}
 	do {
 		char *p;
 
 		p = tp;
-		while (p < ep)
-			*p++ = num[((unsigned)rand_r(&seed)) % sizeof(num)];
+		archive_random(p, ep - p);
+		while (p < ep) {
+			int d = *((unsigned char *)p) % sizeof(num);
+			*p++ = num[d];
+		}
 		fd = open(temp_name.s, O_CREAT | O_EXCL | O_RDWR | O_CLOEXEC,
 			  0600);
 	} while (fd < 0 && errno == EEXIST);
@@ -549,62 +552,70 @@ __archive_ensure_cloexec_flag(int fd)
 static int
 archive_utility_string_sort_helper(char **strings, unsigned int n)
 {
-  unsigned int i, lesser_count, greater_count;
-  char **lesser, **greater, **tmp, *pivot;
-  int retval1, retval2;
-
-  /* A list of 0 or 1 elements is already sorted */
-  if (n <= 1)
-    return (ARCHIVE_OK);
-
-  lesser_count = greater_count = 0;
-  lesser = greater = NULL;
-  pivot = strings[0];
-  for (i = 1; i < n; i++)
-  {
-    if (strcmp(strings[i], pivot) < 0)
-    {
-      lesser_count++;
-      tmp = (char **)realloc(lesser, lesser_count * sizeof(char *));
-      if (!tmp)
-        return (ARCHIVE_FATAL);
-      lesser = tmp;
-      lesser[lesser_count - 1] = strings[i];
-    }
-    else
-    {
-      greater_count++;
-      tmp = (char **)realloc(greater, greater_count * sizeof(char *));
-      if (!tmp)
-        return (ARCHIVE_FATAL);
-      greater = tmp;
-      greater[greater_count - 1] = strings[i];
-    }
-  }
-
-  /* quicksort(lesser) */
-  retval1 = archive_utility_string_sort_helper(lesser, lesser_count);
-  for (i = 0; i < lesser_count; i++)
-    strings[i] = lesser[i];
-  free(lesser);
-
-  /* pivot */
-  strings[lesser_count] = pivot;
-
-  /* quicksort(greater) */
-  retval2 = archive_utility_string_sort_helper(greater, greater_count);
-  for (i = 0; i < greater_count; i++)
-    strings[lesser_count + 1 + i] = greater[i];
-  free(greater);
-
-  return (retval1 < retval2) ? retval1 : retval2;
+	unsigned int i, lesser_count, greater_count;
+	char **lesser, **greater, **tmp, *pivot;
+	int retval1, retval2;
+
+	/* A list of 0 or 1 elements is already sorted */
+	if (n <= 1)
+		return (ARCHIVE_OK);
+
+	lesser_count = greater_count = 0;
+	lesser = greater = NULL;
+	pivot = strings[0];
+	for (i = 1; i < n; i++)
+	{
+		if (strcmp(strings[i], pivot) < 0)
+		{
+			lesser_count++;
+			tmp = (char **)realloc(lesser,
+				lesser_count * sizeof(char *));
+			if (!tmp) {
+				free(greater);
+				free(lesser);
+				return (ARCHIVE_FATAL);
+			}
+			lesser = tmp;
+			lesser[lesser_count - 1] = strings[i];
+		}
+		else
+		{
+			greater_count++;
+			tmp = (char **)realloc(greater,
+				greater_count * sizeof(char *));
+			if (!tmp) {
+				free(greater);
+				free(lesser);
+				return (ARCHIVE_FATAL);
+			}
+			greater = tmp;
+			greater[greater_count - 1] = strings[i];
+		}
+	}
+
+	/* quicksort(lesser) */
+	retval1 = archive_utility_string_sort_helper(lesser, lesser_count);
+	for (i = 0; i < lesser_count; i++)
+		strings[i] = lesser[i];
+	free(lesser);
+
+	/* pivot */
+	strings[lesser_count] = pivot;
+
+	/* quicksort(greater) */
+	retval2 = archive_utility_string_sort_helper(greater, greater_count);
+	for (i = 0; i < greater_count; i++)
+		strings[lesser_count + 1 + i] = greater[i];
+	free(greater);
+
+	return (retval1 < retval2) ? retval1 : retval2;
 }
 
 int
 archive_utility_string_sort(char **strings)
 {
-  unsigned int size = 0;
-  while (strings[size] != NULL)
-    size++;
-  return archive_utility_string_sort_helper(strings, size);
+	  unsigned int size = 0;
+	  while (strings[size] != NULL)
+		size++;
+	  return archive_utility_string_sort_helper(strings, size);
 }
diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 63947c8..8cf1c56 100644
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -221,7 +221,9 @@
 #define	S_IRWXG        _S_IRWXG
 #define	S_IXGRP        _S_IXGRP
 #define	S_IWGRP        _S_IWGRP
+#ifndef S_IRGRP
 #define	S_IRGRP        _S_IRGRP
+#endif
 #define	S_IRWXO        _S_IRWXO
 #define	S_IXOTH        _S_IXOTH
 #define	S_IWOTH        _S_IWOTH
diff --git a/libarchive/archive_write.3 b/libarchive/archive_write.3
index 228bc2c..376d71d 100644
--- a/libarchive/archive_write.3
+++ b/libarchive/archive_write.3
@@ -155,7 +155,7 @@ myopen(struct archive *a, void *client_data)
     return (ARCHIVE_FATAL);
 }
 
-ssize_t
+la_ssize_t
 mywrite(struct archive *a, void *client_data, const void *buff, size_t n)
 {
   struct mydata *mydata = client_data;
@@ -186,8 +186,13 @@ write_archive(const char *outname, const char **filename)
 
   a = archive_write_new();
   mydata->name = outname;
-  archive_write_add_filter_gzip(a);
-  archive_write_set_format_ustar(a);
+  /* Set archive format and filter according to output file extension.
+   * If it fails, set default format. Platform depended function.
+   * See supported formats in archive_write_set_format_filter_by_ext.c */
+  if (archive_write_set_format_filter_by_ext(a, outname) != ARCHIVE_OK)  {
+    archive_write_add_filter_gzip(a);
+    archive_write_set_format_ustar(a);
+  }  
   archive_write_open(a, mydata, myopen, mywrite, myclose);
   while (*filename) {
     stat(*filename, &st);
@@ -197,7 +202,7 @@ write_archive(const char *outname, const char **filename)
     archive_write_header(a, entry);
     if ((fd = open(*filename, O_RDONLY)) != -1) {
       len = read(fd, buff, sizeof(buff));
-      while ( len > 0 ) {
+      while (len > 0) {
         archive_write_data(a, buff, len);
         len = read(fd, buff, sizeof(buff));
       }
@@ -213,7 +218,7 @@ int main(int argc, const char **argv)
 {
   const char *outname;
   argv++;
-  outname = argv++;
+  outname = *argv++;
   write_archive(outname, argv);
   return 0;
 }
diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
index 90212bc..9f707f0 100644
--- a/libarchive/archive_write.c
+++ b/libarchive/archive_write.c
@@ -444,6 +444,12 @@ archive_write_client_close(struct archive_write_filter *f)
 	/* Clear the close handler myself not to be called again. */
 	f->close = NULL;
 	a->client_data = NULL;
+	/* Clear passphrase. */
+	if (a->passphrase != NULL) {
+		memset(a->passphrase, 0, strlen(a->passphrase));
+		free(a->passphrase);
+		a->passphrase = NULL;
+	}
 	return (ret);
 }
 
@@ -592,6 +598,11 @@ _archive_write_free(struct archive *_a)
 	/* Release various dynamic buffers. */
 	free((void *)(uintptr_t)(const void *)a->nulls);
 	archive_string_free(&a->archive.error_string);
+	if (a->passphrase != NULL) {
+		/* A passphrase should be cleaned. */
+		memset(a->passphrase, 0, strlen(a->passphrase));
+		free(a->passphrase);
+	}
 	a->archive.magic = 0;
 	__archive_clean(&a->archive);
 	free(a);
diff --git a/libarchive/archive_write_add_filter.c b/libarchive/archive_write_add_filter.c
index 81dd683..ad5dc83 100644
--- a/libarchive/archive_write_add_filter.c
+++ b/libarchive/archive_write_add_filter.c
@@ -47,6 +47,7 @@ struct { int code; int (*setter)(struct archive *); } codes[] =
 	{ ARCHIVE_FILTER_COMPRESS,	archive_write_add_filter_compress },
 	{ ARCHIVE_FILTER_GRZIP,		archive_write_add_filter_grzip },
 	{ ARCHIVE_FILTER_LRZIP,		archive_write_add_filter_lrzip },
+	{ ARCHIVE_FILTER_LZ4,		archive_write_add_filter_lz4 },
 	{ ARCHIVE_FILTER_LZIP,		archive_write_add_filter_lzip },
 	{ ARCHIVE_FILTER_LZMA,		archive_write_add_filter_lzma },
 	{ ARCHIVE_FILTER_LZOP,		archive_write_add_filter_lzip },
diff --git a/libarchive/archive_write_add_filter_by_name.c b/libarchive/archive_write_add_filter_by_name.c
index e4cba4a..eac4011 100644
--- a/libarchive/archive_write_add_filter_by_name.c
+++ b/libarchive/archive_write_add_filter_by_name.c
@@ -51,6 +51,7 @@ struct { const char *name; int (*setter)(struct archive *); } names[] =
 	{ "grzip",		archive_write_add_filter_grzip },
 	{ "gzip",		archive_write_add_filter_gzip },
 	{ "lrzip",		archive_write_add_filter_lrzip },
+	{ "lz4",		archive_write_add_filter_lz4 },
 	{ "lzip",		archive_write_add_filter_lzip },
 	{ "lzma",		archive_write_add_filter_lzma },
 	{ "lzop",		archive_write_add_filter_lzop },
diff --git a/libarchive/archive_write_add_filter_lz4.c b/libarchive/archive_write_add_filter_lz4.c
new file mode 100644
index 0000000..87b3f55
--- /dev/null
+++ b/libarchive/archive_write_add_filter_lz4.c
@@ -0,0 +1,646 @@
+/*-
+ * Copyright (c) 2014 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+
+__FBSDID("$FreeBSD$");
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_LZ4_H
+#include <lz4.h>
+#endif
+#ifdef HAVE_LZ4HC_H
+#include <lz4hc.h>
+#endif
+
+#include "archive.h"
+#include "archive_endian.h"
+#include "archive_private.h"
+#include "archive_write_private.h"
+#include "archive_xxhash.h"
+
+#define LZ4_MAGICNUMBER	0x184d2204
+
+struct private_data {
+	int		 compression_level;
+	uint8_t		 header_written:1;
+	uint8_t		 version_number:1;
+	uint8_t		 block_independence:1;
+	uint8_t		 block_checksum:1;
+	uint8_t		 stream_size:1;
+	uint8_t		 stream_checksum:1;
+	uint8_t		 preset_dictionary:1;
+	uint8_t		 block_maximum_size:3;
+#if defined(HAVE_LIBLZ4) && LZ4_VERSION_MAJOR >= 1 && LZ4_VERSION_MINOR >= 2
+	int64_t		 total_in;
+	char		*out;
+	char		*out_buffer;
+	size_t		 out_buffer_size;
+	size_t		 out_block_size;
+	char		*in;
+	char		*in_buffer_allocated;
+	char		*in_buffer;
+	size_t		 in_buffer_size;
+	size_t		 block_size;
+
+	void		*xxh32_state;
+	void		*lz4_stream;
+#else
+	struct archive_write_program_data *pdata;
+#endif
+};
+
+static int archive_filter_lz4_close(struct archive_write_filter *);
+static int archive_filter_lz4_free(struct archive_write_filter *);
+static int archive_filter_lz4_open(struct archive_write_filter *);
+static int archive_filter_lz4_options(struct archive_write_filter *,
+		    const char *, const char *);
+static int archive_filter_lz4_write(struct archive_write_filter *,
+		    const void *, size_t);
+
+/*
+ * Add a lz4 compression filter to this write handle.
+ */
+int
+archive_write_add_filter_lz4(struct archive *_a)
+{
+	struct archive_write *a = (struct archive_write *)_a;
+	struct archive_write_filter *f = __archive_write_allocate_filter(_a);
+	struct private_data *data;
+
+	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
+	    ARCHIVE_STATE_NEW, "archive_write_add_filter_lz4");
+
+	data = calloc(1, sizeof(*data));
+	if (data == NULL) {
+		archive_set_error(&a->archive, ENOMEM, "Out of memory");
+		return (ARCHIVE_FATAL);
+	}
+
+	/*
+	 * Setup default settings.
+	 */
+	data->compression_level = 1;
+	data->version_number = 0x01;
+	data->block_independence = 1;
+	data->block_checksum = 0;
+	data->stream_size = 0;
+	data->stream_checksum = 1;
+	data->preset_dictionary = 0;
+	data->block_maximum_size = 7;
+
+	/*
+	 * Setup a filter setting.
+	 */
+	f->data = data;
+	f->options = &archive_filter_lz4_options;
+	f->close = &archive_filter_lz4_close;
+	f->free = &archive_filter_lz4_free;
+	f->open = &archive_filter_lz4_open;
+	f->code = ARCHIVE_FILTER_LZ4;
+	f->name = "lz4";
+#if defined(HAVE_LIBLZ4) && LZ4_VERSION_MAJOR >= 1 && LZ4_VERSION_MINOR >= 2
+	return (ARCHIVE_OK);
+#else
+	/*
+	 * We don't have lz4 library, and execute external lz4 program
+	 * instead.
+	 */
+	data->pdata = __archive_write_program_allocate();
+	if (data->pdata == NULL) {
+		free(data);
+		archive_set_error(&a->archive, ENOMEM, "Out of memory");
+		return (ARCHIVE_FATAL);
+	}
+	data->compression_level = 0;
+	archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+	    "Using external lz4 program");
+	return (ARCHIVE_WARN);
+#endif
+}
+
+/*
+ * Set write options.
+ */
+static int
+archive_filter_lz4_options(struct archive_write_filter *f,
+    const char *key, const char *value)
+{
+	struct private_data *data = (struct private_data *)f->data;
+
+	if (strcmp(key, "compression-level") == 0) {
+		if (value == NULL || !(value[0] >= '1' && value[0] <= '9') ||
+		    value[1] != '\0')
+			return (ARCHIVE_WARN);
+		data->compression_level = value[0] - '0';
+		return (ARCHIVE_OK);
+	}
+	if (strcmp(key, "stream-checksum") == 0) {
+		data->stream_checksum = value != NULL;
+		return (ARCHIVE_OK);
+	}
+	if (strcmp(key, "block-checksum") == 0) {
+		data->block_checksum = value != NULL;
+		return (ARCHIVE_OK);
+	}
+	if (strcmp(key, "block-size") == 0) {
+		if (value == NULL || !(value[0] >= '4' && value[0] <= '7') ||
+		    value[1] != '\0')
+			return (ARCHIVE_WARN);
+		data->block_maximum_size = value[0] - '0';
+		return (ARCHIVE_OK);
+	}
+	if (strcmp(key, "block-dependence") == 0) {
+		data->block_independence = value == NULL;
+		return (ARCHIVE_OK);
+	}
+
+	/* Note: The "warn" return is just to inform the options
+	 * supervisor that we didn't handle it.  It will generate
+	 * a suitable error if no one used this option. */
+	return (ARCHIVE_WARN);
+}
+
+#if defined(HAVE_LIBLZ4) && LZ4_VERSION_MAJOR >= 1 && LZ4_VERSION_MINOR >= 2
+/* Don't compile this if we don't have liblz4. */
+
+static int drive_compressor(struct archive_write_filter *, const char *,
+    size_t);
+static int drive_compressor_independence(struct archive_write_filter *,
+    const char *, size_t);
+static int drive_compressor_dependence(struct archive_write_filter *,
+    const char *, size_t);
+static int lz4_write_stream_descriptor(struct archive_write_filter *);
+static ssize_t lz4_write_one_block(struct archive_write_filter *, const char *,
+    size_t);
+
+
+/*
+ * Setup callback.
+ */
+static int
+archive_filter_lz4_open(struct archive_write_filter *f)
+{
+	struct private_data *data = (struct private_data *)f->data;
+	int ret;
+	size_t required_size;
+	static size_t bkmap[] = { 64 * 1024, 256 * 1024, 1 * 1024 * 1024,
+			   4 * 1024 * 1024 };
+	size_t pre_block_size;
+
+	ret = __archive_write_open_filter(f->next_filter);
+	if (ret != 0)
+		return (ret);
+
+	if (data->block_maximum_size < 4)
+		data->block_size = bkmap[0];
+	else
+		data->block_size = bkmap[data->block_maximum_size - 4];
+
+	required_size = 4 + 15 + 4 + data->block_size + 4 + 4;
+	if (data->out_buffer_size < required_size) {
+		size_t bs = required_size, bpb;
+		free(data->out_buffer);
+		if (f->archive->magic == ARCHIVE_WRITE_MAGIC) {
+			/* Buffer size should be a multiple number of
+			 * the of bytes per block for performance. */
+			bpb = archive_write_get_bytes_per_block(f->archive);
+			if (bpb > bs)
+				bs = bpb;
+			else if (bpb != 0) {
+				bs += bpb;
+				bs -= bs % bpb;
+			}
+		}
+		data->out_block_size = bs;
+		bs += required_size;
+		data->out_buffer = malloc(bs);
+		data->out = data->out_buffer;
+		data->out_buffer_size = bs;
+	}
+
+	pre_block_size = (data->block_independence)? 0: 64 * 1024;
+	if (data->in_buffer_size < data->block_size + pre_block_size) {
+		free(data->in_buffer_allocated);
+		data->in_buffer_size = data->block_size;
+		data->in_buffer_allocated =
+		    malloc(data->in_buffer_size + pre_block_size);
+		data->in_buffer = data->in_buffer_allocated + pre_block_size;
+		if (!data->block_independence && data->compression_level >= 3)
+		    data->in_buffer = data->in_buffer_allocated;
+		data->in = data->in_buffer;
+		data->in_buffer_size = data->block_size;
+	}
+
+	if (data->out_buffer == NULL || data->in_buffer_allocated == NULL) {
+		archive_set_error(f->archive, ENOMEM,
+		    "Can't allocate data for compression buffer");
+		return (ARCHIVE_FATAL);
+	}
+
+	f->write = archive_filter_lz4_write;
+
+	return (ARCHIVE_OK);
+}
+
+/*
+ * Write data to the out stream.
+ *
+ * Returns ARCHIVE_OK if all data written, error otherwise.
+ */
+static int
+archive_filter_lz4_write(struct archive_write_filter *f,
+    const void *buff, size_t length)
+{
+	struct private_data *data = (struct private_data *)f->data;
+	int ret = ARCHIVE_OK;
+	const char *p;
+	size_t remaining;
+	ssize_t size;
+
+	/* If we haven't written a stream descriptor, we have to do it first. */
+	if (!data->header_written) {
+		ret = lz4_write_stream_descriptor(f);
+		if (ret != ARCHIVE_OK)
+			return (ret);
+		data->header_written = 1;
+	}
+
+	/* Update statistics */
+	data->total_in += length;
+
+	p = (const char *)buff;
+	remaining = length;
+	while (remaining) {
+		size_t l;
+		/* Compress input data to output buffer */
+		size = lz4_write_one_block(f, p, remaining);
+		if (size < ARCHIVE_OK)
+			return (ARCHIVE_FATAL);
+		l = data->out - data->out_buffer;
+		if (l >= data->out_block_size) {
+			ret = __archive_write_filter(f->next_filter,
+			    data->out_buffer, data->out_block_size);
+			l -= data->out_block_size;
+			memcpy(data->out_buffer,
+			    data->out_buffer + data->out_block_size, l);
+			data->out = data->out_buffer + l;
+			if (ret < ARCHIVE_WARN)
+				break;
+		}
+		p += size;
+		remaining -= size;
+	}
+
+	return (ret);
+}
+
+/*
+ * Finish the compression.
+ */
+static int
+archive_filter_lz4_close(struct archive_write_filter *f)
+{
+	struct private_data *data = (struct private_data *)f->data;
+	int ret, r1;
+
+	/* Finish compression cycle. */
+	ret = (int)lz4_write_one_block(f, NULL, 0);
+	if (ret >= 0) {
+		/*
+		 * Write the last block and the end of the stream data.
+		 */
+
+		/* Write End Of Stream. */
+		memset(data->out, 0, 4); data->out += 4;
+		/* Write Stream checksum if needed. */
+		if (data->stream_checksum) {
+			unsigned int checksum;
+			checksum = __archive_xxhash.XXH32_digest(
+					data->xxh32_state);
+			data->xxh32_state = NULL;
+			archive_le32enc(data->out, checksum);
+			data->out += 4;
+		}
+		ret = __archive_write_filter(f->next_filter,
+			    data->out_buffer, data->out - data->out_buffer);
+	}
+
+	r1 = __archive_write_close_filter(f->next_filter);
+	return (r1 < ret ? r1 : ret);
+}
+
+static int
+archive_filter_lz4_free(struct archive_write_filter *f)
+{
+	struct private_data *data = (struct private_data *)f->data;
+
+	if (data->lz4_stream != NULL) {
+		if (data->compression_level < 3)
+#if LZ4_VERSION_MINOR >= 3
+			LZ4_freeStream(data->lz4_stream);
+#else
+			LZ4_free(data->lz4_stream);
+#endif
+		else
+			LZ4_freeHC(data->lz4_stream);
+	}
+	free(data->out_buffer);
+	free(data->in_buffer_allocated);
+	free(data->xxh32_state);
+	free(data);
+	f->data = NULL;
+	return (ARCHIVE_OK);
+}
+
+static int
+lz4_write_stream_descriptor(struct archive_write_filter *f)
+{
+	struct private_data *data = (struct private_data *)f->data;
+	uint8_t *sd;
+
+	sd = (uint8_t *)data->out;
+	/* Write Magic Number. */
+	archive_le32enc(&sd[0], LZ4_MAGICNUMBER);
+	/* FLG */
+	sd[4] = (data->version_number << 6)
+	      | (data->block_independence << 5)
+	      | (data->block_checksum << 4)
+	      | (data->stream_size << 3)
+	      | (data->stream_checksum << 2)
+	      | (data->preset_dictionary << 0);
+	/* BD */
+	sd[5] = (data->block_maximum_size << 4);
+	sd[6] = (__archive_xxhash.XXH32(&sd[4], 2, 0) >> 8) & 0xff;
+	data->out += 7;
+	if (data->stream_checksum)
+		data->xxh32_state = __archive_xxhash.XXH32_init(0);
+	else
+		data->xxh32_state = NULL;
+	return (ARCHIVE_OK);
+}
+
+static ssize_t
+lz4_write_one_block(struct archive_write_filter *f, const char *p,
+    size_t length)
+{
+	struct private_data *data = (struct private_data *)f->data;
+	ssize_t r;
+
+	if (p == NULL) {
+		/* Compress remaining uncompressed data. */
+		if (data->in_buffer == data->in)
+			return 0;
+		else {
+			size_t l = data->in - data->in_buffer;
+			r = drive_compressor(f, data->in_buffer, l);
+			if (r == ARCHIVE_OK)
+				r = (ssize_t)l;
+		}
+	} else if ((data->block_independence || data->compression_level < 3) &&
+	    data->in_buffer == data->in && length >= data->block_size) {
+		r = drive_compressor(f, p, data->block_size);
+		if (r == ARCHIVE_OK)
+			r = (ssize_t)data->block_size;
+	} else {
+		size_t remaining_size = data->in_buffer_size -
+			(data->in - data->in_buffer);
+		size_t l = (remaining_size > length)? length: remaining_size;
+		memcpy(data->in, p, l);
+		data->in += l;
+		if (l == remaining_size) {
+			r = drive_compressor(f, data->in_buffer,
+			    data->block_size);
+			if (r == ARCHIVE_OK)
+				r = (ssize_t)l;
+			data->in = data->in_buffer;
+		} else
+			r = (ssize_t)l;
+	}
+
+	return (r);
+}
+
+
+/*
+ * Utility function to push input data through compressor, writing
+ * full output blocks as necessary.
+ *
+ * Note that this handles both the regular write case (finishing ==
+ * false) and the end-of-archive case (finishing == true).
+ */
+static int
+drive_compressor(struct archive_write_filter *f, const char *p, size_t length)
+{
+	struct private_data *data = (struct private_data *)f->data;
+
+	if (data->stream_checksum)
+		__archive_xxhash.XXH32_update(data->xxh32_state,
+			p, (int)length);
+	if (data->block_independence)
+		return drive_compressor_independence(f, p, length);
+	else
+		return drive_compressor_dependence(f, p, length);
+}
+
+static int
+drive_compressor_independence(struct archive_write_filter *f, const char *p,
+    size_t length)
+{
+	struct private_data *data = (struct private_data *)f->data;
+	unsigned int outsize;
+
+	if (data->compression_level < 4)
+		outsize = LZ4_compress_limitedOutput(p, data->out + 4,
+		    (int)length, (int)data->block_size);
+	else
+		outsize = LZ4_compressHC2_limitedOutput(p, data->out + 4,
+		    (int)length, (int)data->block_size,
+		    data->compression_level);
+
+	if (outsize) {
+		/* The buffer is compressed. */
+		archive_le32enc(data->out, outsize);
+		data->out += 4;
+	} else {
+		/* The buffer is not compressed. The commpressed size was
+		 * bigger than its uncompressed size. */
+		archive_le32enc(data->out, length | 0x80000000);
+		data->out += 4;
+		memcpy(data->out, p, length);
+		outsize = length;
+	}
+	data->out += outsize;
+	if (data->block_checksum) {
+		unsigned int checksum =
+		    __archive_xxhash.XXH32(data->out - outsize, outsize, 0);
+		archive_le32enc(data->out, checksum);
+		data->out += 4;
+	}
+	return (ARCHIVE_OK);
+}
+
+static int
+drive_compressor_dependence(struct archive_write_filter *f, const char *p,
+    size_t length)
+{
+	struct private_data *data = (struct private_data *)f->data;
+	int outsize;
+
+	if (data->compression_level < 3) {
+		if (data->lz4_stream == NULL) {
+			data->lz4_stream = LZ4_createStream();
+			if (data->lz4_stream == NULL) {
+				archive_set_error(f->archive, ENOMEM,
+				    "Can't allocate data for compression"
+				    " buffer");
+				return (ARCHIVE_FATAL);
+			}
+		}
+		outsize = LZ4_compress_limitedOutput_continue(
+		    data->lz4_stream, p, data->out + 4, (int)length,
+		    (int)data->block_size);
+	} else {
+		if (data->lz4_stream == NULL) {
+			data->lz4_stream =
+			    LZ4_createHC(data->in_buffer_allocated);
+			if (data->lz4_stream == NULL) {
+				archive_set_error(f->archive, ENOMEM,
+				    "Can't allocate data for compression"
+				    " buffer");
+				return (ARCHIVE_FATAL);
+			}
+		}
+		outsize = LZ4_compressHC2_limitedOutput_continue(
+		    data->lz4_stream, p, data->out + 4, (int)length,
+		    (int)data->block_size, data->compression_level);
+	}
+
+	if (outsize) {
+		/* The buffer is compressed. */
+		archive_le32enc(data->out, outsize);
+		data->out += 4;
+	} else {
+		/* The buffer is not compressed. The commpressed size was
+		 * bigger than its uncompressed size. */
+		archive_le32enc(data->out, length | 0x80000000);
+		data->out += 4;
+		memcpy(data->out, p, length);
+		outsize = length;
+	}
+	data->out += outsize;
+	if (data->block_checksum) {
+		unsigned int checksum =
+		    __archive_xxhash.XXH32(data->out - outsize, outsize, 0);
+		archive_le32enc(data->out, checksum);
+		data->out += 4;
+	}
+
+	if (length == data->block_size) {
+#define DICT_SIZE	(64 * 1024)
+		if (data->compression_level < 3)
+			LZ4_saveDict(data->lz4_stream,
+			    data->in_buffer_allocated, DICT_SIZE);
+		else {
+			LZ4_slideInputBufferHC(data->lz4_stream);
+			data->in_buffer = data->in_buffer_allocated + DICT_SIZE;
+		}
+#undef DICT_SIZE
+	}
+	return (ARCHIVE_OK);
+}
+
+#else /* HAVE_LIBLZ4 */
+
+static int
+archive_filter_lz4_open(struct archive_write_filter *f)
+{
+	struct private_data *data = (struct private_data *)f->data;
+	struct archive_string as;
+	int r;
+
+	archive_string_init(&as);
+	archive_strcpy(&as, "lz4 -z -q -q");
+
+	/* Specify a compression level. */
+	if (data->compression_level > 0) {
+		archive_strcat(&as, " -");
+		archive_strappend_char(&as, '0' + data->compression_level);
+	}
+	/* Specify a block size. */
+	archive_strcat(&as, " -B");
+	archive_strappend_char(&as, '0' + data->block_maximum_size);
+
+	if (data->block_checksum)
+		archive_strcat(&as, " -BX");
+	if (data->stream_checksum == 0)
+		archive_strcat(&as, " -Sx");
+	if (data->block_independence == 0)
+		archive_strcat(&as, " -BD");
+
+	f->write = archive_filter_lz4_write;
+
+	r = __archive_write_program_open(f, data->pdata, as.s);
+	archive_string_free(&as);
+	return (r);
+}
+
+static int
+archive_filter_lz4_write(struct archive_write_filter *f, const void *buff,
+    size_t length)
+{
+	struct private_data *data = (struct private_data *)f->data;
+
+	return __archive_write_program_write(f, data->pdata, buff, length);
+}
+
+static int
+archive_filter_lz4_close(struct archive_write_filter *f)
+{
+	struct private_data *data = (struct private_data *)f->data;
+
+	return __archive_write_program_close(f, data->pdata);
+}
+
+static int
+archive_filter_lz4_free(struct archive_write_filter *f)
+{
+	struct private_data *data = (struct private_data *)f->data;
+
+	__archive_write_program_free(data->pdata);
+	free(data);
+	return (ARCHIVE_OK);
+}
+
+#endif /* HAVE_LIBLZ4 */
diff --git a/libarchive/archive_write_add_filter_xz.c b/libarchive/archive_write_add_filter_xz.c
index fa73311..46a6c38 100644
--- a/libarchive/archive_write_add_filter_xz.c
+++ b/libarchive/archive_write_add_filter_xz.c
@@ -100,6 +100,7 @@ archive_write_add_filter_lzip(struct archive *a)
 
 struct private_data {
 	int		 compression_level;
+	uint32_t	 threads;
 	lzma_stream	 stream;
 	lzma_filter	 lzmafilters[2];
 	lzma_options_lzma lzma_opt;
@@ -151,6 +152,7 @@ common_setup(struct archive_write_filter *f)
 	}
 	f->data = data;
 	data->compression_level = LZMA_PRESET_DEFAULT;
+	data->threads = 1;
 	f->open = &archive_compressor_xz_open;
 	f->close = archive_compressor_xz_close;
 	f->free = archive_compressor_xz_free;
@@ -221,23 +223,37 @@ archive_compressor_xz_init_stream(struct archive_write_filter *f,
 {
 	static const lzma_stream lzma_stream_init_data = LZMA_STREAM_INIT;
 	int ret;
+#ifdef HAVE_LZMA_STREAM_ENCODER_MT
+	lzma_mt mt_options;
+#endif
 
 	data->stream = lzma_stream_init_data;
 	data->stream.next_out = data->compressed;
 	data->stream.avail_out = data->compressed_buffer_size;
-	if (f->code == ARCHIVE_FILTER_XZ)
-		ret = lzma_stream_encoder(&(data->stream),
-		    data->lzmafilters, LZMA_CHECK_CRC64);
-	else if (f->code == ARCHIVE_FILTER_LZMA)
+	if (f->code == ARCHIVE_FILTER_XZ) {
+#ifdef HAVE_LZMA_STREAM_ENCODER_MT
+		if (data->threads != 1) {
+			bzero(&mt_options, sizeof(mt_options));
+			mt_options.threads = data->threads;
+			mt_options.timeout = 300;
+			mt_options.filters = data->lzmafilters;
+			mt_options.check = LZMA_CHECK_CRC64;
+			ret = lzma_stream_encoder_mt(&(data->stream),
+			    &mt_options);
+		} else
+#endif
+			ret = lzma_stream_encoder(&(data->stream),
+			    data->lzmafilters, LZMA_CHECK_CRC64);
+	} else if (f->code == ARCHIVE_FILTER_LZMA) {
 		ret = lzma_alone_encoder(&(data->stream), &data->lzma_opt);
-	else {	/* ARCHIVE_FILTER_LZIP */
+	} else {	/* ARCHIVE_FILTER_LZIP */
 		int dict_size = data->lzma_opt.dict_size;
 		int ds, log2dic, wedges;
 
 		/* Calculate a coded dictionary size */
 		if (dict_size < (1 << 12) || dict_size > (1 << 27)) {
 			archive_set_error(f->archive, ARCHIVE_ERRNO_MISC,
-			    "Unacceptable dictionary dize for lzip: %d",
+			    "Unacceptable dictionary size for lzip: %d",
 			    dict_size);
 			return (ARCHIVE_FATAL);
 		}
@@ -373,6 +389,22 @@ archive_compressor_xz_options(struct archive_write_filter *f,
 		if (data->compression_level > 6)
 			data->compression_level = 6;
 		return (ARCHIVE_OK);
+	} else if (strcmp(key, "threads") == 0) {
+		if (value == NULL)
+			return (ARCHIVE_WARN);
+		data->threads = (int)strtoul(value, NULL, 10);
+		if (data->threads == 0 && errno != 0) {
+			data->threads = 1;
+			return (ARCHIVE_WARN);
+		}
+		if (data->threads == 0) {
+#ifdef HAVE_LZMA_STREAM_ENCODER_MT
+			data->threads = lzma_cputhreads();
+#else
+			data->threads = 1;
+#endif
+		}
+		return (ARCHIVE_OK);
 	}
 
 	/* Note: The "warn" return is just to inform the options
diff --git a/libarchive/archive_write_data.3 b/libarchive/archive_write_data.3
index cfd5cd5..0cdd25f 100644
--- a/libarchive/archive_write_data.3
+++ b/libarchive/archive_write_data.3
@@ -34,7 +34,7 @@
 Streaming Archive Library (libarchive, -larchive)
 .Sh SYNOPSIS
 .In archive.h
-.Ft ssize_t
+.Ft la_ssize_t
 .Fn archive_write_data "struct archive *" "const void *" "size_t"
 .Sh DESCRIPTION
 Write data corresponding to the header just written.
@@ -42,8 +42,7 @@ Write data corresponding to the header just written.
 .\"
 .Sh RETURN VALUES
 This function returns the number of bytes actually written, or
-.Li -1
-on error.
+a negative error code on error.
 .\"
 .Sh ERRORS
 Detailed error codes and textual descriptions are available from the
@@ -52,6 +51,15 @@ and
 .Fn archive_error_string
 functions.
 .\"
+.Sh BUGS
+In libarchive 3.x, this function sometimes returns
+zero on success instead of returning the number of bytes written.
+Specifically, this occurs when writing to an
+.Vt archive_write_disk
+handle.
+Clients should treat any value less than zero as an error
+and consider any non-negative value as success.
+.\"
 .Sh SEE ALSO
 .Xr tar 1 ,
 .Xr libarchive 3 ,
diff --git a/libarchive/archive_write_disk.3 b/libarchive/archive_write_disk.3
index fa925cc..ba6c970 100644
--- a/libarchive/archive_write_disk.3
+++ b/libarchive/archive_write_disk.3
@@ -70,9 +70,9 @@ Streaming Archive Library (libarchive, -larchive)
 .Fc
 .Ft int
 .Fn archive_write_header "struct archive *" "struct archive_entry *"
-.Ft ssize_t
+.Ft la_ssize_t
 .Fn archive_write_data "struct archive *" "const void *" "size_t"
-.Ft ssize_t
+.Ft la_ssize_t
 .Fn archive_write_data_block "struct archive *" "const void *" "size_t size" "int64_t offset"
 .Ft int
 .Fn archive_write_finish_entry "struct archive *"
@@ -177,10 +177,16 @@ The default is to not refuse such paths.
 Note that paths ending in
 .Pa ..
 always cause an error, regardless of this flag.
+.It Cm ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
+Refuse to extract an absolute path.
+The default is to not refuse such paths.
 .It Cm ARCHIVE_EXTRACT_SPARSE
 Scan data for blocks of NUL bytes and try to recreate them with holes.
 This results in sparse files, independent of whether the archive format
 supports or uses them.
+.It Cm ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS
+Before removing a file system object prior to replacing it, clear
+platform-specific file flags which might prevent its removal.
 .El
 .It Xo
 .Fn archive_write_disk_set_group_lookup ,
diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index 1fac4ce..0fc6193 100644
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -343,6 +343,7 @@ static int	restore_entry(struct archive_write_disk *);
 static int	set_mac_metadata(struct archive_write_disk *, const char *,
 				 const void *, size_t);
 static int	set_xattrs(struct archive_write_disk *);
+static int	clear_nochange_fflags(struct archive_write_disk *);
 static int	set_fflags(struct archive_write_disk *);
 static int	set_fflags_platform(struct archive_write_disk *, int fd,
 		    const char *name, mode_t mode,
@@ -1467,10 +1468,14 @@ _archive_write_disk_data_block(struct archive *_a,
 		return (r);
 	if ((size_t)r < size) {
 		archive_set_error(&a->archive, 0,
-		    "Write request too large");
+		    "Too much data: Truncating file at %ju bytes", (uintmax_t)a->filesize);
 		return (ARCHIVE_WARN);
 	}
+#if ARCHIVE_VERSION_NUMBER < 3999000
 	return (ARCHIVE_OK);
+#else
+	return (size);
+#endif
 }
 
 static ssize_t
@@ -1842,6 +1847,8 @@ restore_entry(struct archive_write_disk *a)
 		 * object is a dir, but that doesn't mean the old
 		 * object isn't a dir.
 		 */
+		if (a->flags & ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS)
+			(void)clear_nochange_fflags(a);
 		if (unlink(a->name) == 0) {
 			/* We removed it, reset cached stat. */
 			a->pst = NULL;
@@ -1869,6 +1876,13 @@ restore_entry(struct archive_write_disk *a)
 		en = create_filesystem_object(a);
 	}
 
+	if ((en == ENOENT) && (archive_entry_hardlink(a->entry) != NULL)) {
+		archive_set_error(&a->archive, en,
+		    "Hard-link target '%s' does not exist.",
+		    archive_entry_hardlink(a->entry));
+		return (ARCHIVE_FAILED);
+	}
+
 	if ((en == EISDIR || en == EEXIST)
 	    && (a->flags & ARCHIVE_EXTRACT_NO_OVERWRITE)) {
 		/* If we're not overwriting, we're done. */
@@ -1940,6 +1954,8 @@ restore_entry(struct archive_write_disk *a)
 
 		if (!S_ISDIR(a->st.st_mode)) {
 			/* A non-dir is in the way, unlink it. */
+			if (a->flags & ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS)
+				(void)clear_nochange_fflags(a);
 			if (unlink(a->name) != 0) {
 				archive_set_error(&a->archive, errno,
 				    "Can't unlink already-existing object");
@@ -1950,6 +1966,8 @@ restore_entry(struct archive_write_disk *a)
 			en = create_filesystem_object(a);
 		} else if (!S_ISDIR(a->mode)) {
 			/* A dir is in the way of a non-dir, rmdir it. */
+			if (a->flags & ARCHIVE_EXTRACT_CLEAR_NOCHANGE_FFLAGS)
+				(void)clear_nochange_fflags(a);
 			if (rmdir(a->name) != 0) {
 				archive_set_error(&a->archive, errno,
 				    "Can't replace existing directory with non-directory");
@@ -2505,8 +2523,9 @@ cleanup_pathname_win(struct archive_write_disk *a)
 /*
  * Canonicalize the pathname.  In particular, this strips duplicate
  * '/' characters, '.' elements, and trailing '/'.  It also raises an
- * error for an empty path, a trailing '..' or (if _SECURE_NODOTDOT is
- * set) any '..' in the path.
+ * error for an empty path, a trailing '..', (if _SECURE_NODOTDOT is
+ * set) any '..' in the path or (if ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
+ * is set) if the path is absolute.
  */
 static int
 cleanup_pathname(struct archive_write_disk *a)
@@ -2525,8 +2544,15 @@ cleanup_pathname(struct archive_write_disk *a)
 	cleanup_pathname_win(a);
 #endif
 	/* Skip leading '/'. */
-	if (*src == '/')
+	if (*src == '/') {
+		if (a->flags & ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS) {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			                  "Path is absolute");
+			return (ARCHIVE_FAILED);
+		}
+
 		separator = *src++;
+	}
 
 	/* Scan the pathname one element at a time. */
 	for (;;) {
@@ -2862,7 +2888,7 @@ set_time(int fd, int mode, const char *name,
 #endif
 }
 
-#ifdef F_SETTIMES /* Tru64 */
+#ifdef F_SETTIMES
 static int
 set_time_tru64(int fd, int mode, const char *name,
     time_t atime, long atime_nsec,
@@ -2870,19 +2896,21 @@ set_time_tru64(int fd, int mode, const char *name,
     time_t ctime, long ctime_nsec)
 {
 	struct attr_timbuf tstamp;
-	struct timeval times[3];
-	times[0].tv_sec = atime;
-	times[0].tv_usec = atime_nsec / 1000;
-	times[1].tv_sec = mtime;
-	times[1].tv_usec = mtime_nsec / 1000;
-	times[2].tv_sec = ctime;
-	times[2].tv_usec = ctime_nsec / 1000;
-	tstamp.atime = times[0];
-	tstamp.mtime = times[1];
-	tstamp.ctime = times[2];
+	tstamp.atime.tv_sec = atime;
+	tstamp.mtime.tv_sec = mtime;
+	tstamp.ctime.tv_sec = ctime;
+#if defined (__hpux) && defined (__ia64)
+	tstamp.atime.tv_nsec = atime_nsec;
+	tstamp.mtime.tv_nsec = mtime_nsec;
+	tstamp.ctime.tv_nsec = ctime_nsec;
+#else
+	tstamp.atime.tv_usec = atime_nsec / 1000;
+	tstamp.mtime.tv_usec = mtime_nsec / 1000;
+	tstamp.ctime.tv_usec = ctime_nsec / 1000;
+#endif
 	return (fcntl(fd,F_SETTIMES,&tstamp));
 }
-#endif /* Tru64 */
+#endif /* F_SETTIMES */
 
 static int
 set_times(struct archive_write_disk *a,
@@ -3054,9 +3082,23 @@ set_mode(struct archive_write_disk *a, int mode)
 		 * impact.
 		 */
 		if (lchmod(a->name, mode) != 0) {
-			archive_set_error(&a->archive, errno,
-			    "Can't set permissions to 0%o", (int)mode);
-			r = ARCHIVE_WARN;
+			switch (errno) {
+			case ENOTSUP:
+			case ENOSYS:
+#if ENOTSUP != EOPNOTSUPP
+			case EOPNOTSUPP:
+#endif
+				/*
+				 * if lchmod is defined but the platform
+				 * doesn't support it, silently ignore
+				 * error
+				 */
+				break;
+			default:
+				archive_set_error(&a->archive, errno,
+				    "Can't set permissions to 0%o", (int)mode);
+				r = ARCHIVE_WARN;
+			}
 		}
 #endif
 	} else if (!S_ISDIR(a->mode)) {
@@ -3157,6 +3199,36 @@ set_fflags(struct archive_write_disk *a)
 	return (ARCHIVE_OK);
 }
 
+static int
+clear_nochange_fflags(struct archive_write_disk *a)
+{
+	int		nochange_flags;
+	mode_t		mode = archive_entry_mode(a->entry);
+
+	/* Hopefully, the compiler will optimize this mess into a constant. */
+	nochange_flags = 0;
+#ifdef SF_IMMUTABLE
+	nochange_flags |= SF_IMMUTABLE;
+#endif
+#ifdef UF_IMMUTABLE
+	nochange_flags |= UF_IMMUTABLE;
+#endif
+#ifdef SF_APPEND
+	nochange_flags |= SF_APPEND;
+#endif
+#ifdef UF_APPEND
+	nochange_flags |= UF_APPEND;
+#endif
+#ifdef EXT2_APPEND_FL
+	nochange_flags |= EXT2_APPEND_FL;
+#endif
+#ifdef EXT2_IMMUTABLE_FL
+	nochange_flags |= EXT2_IMMUTABLE_FL;
+#endif
+
+	return (set_fflags_platform(a, a->fd, a->name, mode, 0, nochange_flags));
+}
+
 
 #if ( defined(HAVE_LCHFLAGS) || defined(HAVE_CHFLAGS) || defined(HAVE_FCHFLAGS) ) && defined(HAVE_STRUCT_STAT_ST_FLAGS)
 /*
@@ -3364,6 +3436,7 @@ copy_xattrs(struct archive_write_disk *a, int tmpfd, int dffd)
 	}
 	for (xattr_i = 0; xattr_i < xattr_size;
 	    xattr_i += strlen(xattr_names + xattr_i) + 1) {
+		char *xattr_val_saved;
 		ssize_t s;
 		int f;
 
@@ -3374,11 +3447,13 @@ copy_xattrs(struct archive_write_disk *a, int tmpfd, int dffd)
 			ret = ARCHIVE_WARN;
 			goto exit_xattr;
 		}
+		xattr_val_saved = xattr_val;
 		xattr_val = realloc(xattr_val, s);
 		if (xattr_val == NULL) {
 			archive_set_error(&a->archive, ENOMEM,
 			    "Failed to get metadata(xattr)");
 			ret = ARCHIVE_WARN;
+			free(xattr_val_saved);
 			goto exit_xattr;
 		}
 		s = fgetxattr(tmpfd, xattr_names + xattr_i, xattr_val, s, 0, 0);
diff --git a/libarchive/archive_write_disk_set_standard_lookup.c b/libarchive/archive_write_disk_set_standard_lookup.c
index e79008e..3b868fb 100644
--- a/libarchive/archive_write_disk_set_standard_lookup.c
+++ b/libarchive/archive_write_disk_set_standard_lookup.c
@@ -67,7 +67,7 @@ static void	cleanup(void *);
  * a simple cache to accelerate such lookups---into the archive_write_disk
  * object.  This is in a separate file because getpwnam()/getgrnam()
  * can pull in a LOT of library code (including NIS/LDAP functions, which
- * pull in DNS resolveers, etc).  This can easily top 500kB, which makes
+ * pull in DNS resolvers, etc).  This can easily top 500kB, which makes
  * it inappropriate for some space-constrained applications.
  *
  * Applications that are size-sensitive may want to just use the
@@ -86,6 +86,11 @@ archive_write_disk_set_standard_lookup(struct archive *a)
 {
 	struct bucket *ucache = malloc(cache_size * sizeof(struct bucket));
 	struct bucket *gcache = malloc(cache_size * sizeof(struct bucket));
+	if (ucache == NULL || gcache == NULL) {
+		free(ucache);
+		free(gcache);
+		return (ARCHIVE_FATAL);
+	}
 	memset(ucache, 0, cache_size * sizeof(struct bucket));
 	memset(gcache, 0, cache_size * sizeof(struct bucket));
 	archive_write_disk_set_group_lookup(a, gcache, lookup_gid, cleanup);
diff --git a/libarchive/archive_write_disk_windows.c b/libarchive/archive_write_disk_windows.c
index ed62009..800aa89 100644
--- a/libarchive/archive_write_disk_windows.c
+++ b/libarchive/archive_write_disk_windows.c
@@ -330,8 +330,6 @@ file_information(struct archive_write_disk *a, wchar_t *path,
 				break;
 			case L'C': case L'c':
 				if (((p[2] == L'M' || p[2] == L'm' ) &&
-				    (p[3] == L'D' || p[3] == L'd' )) ||
-				    ((p[2] == L'M' || p[2] == L'm' ) &&
 				    (p[3] == L'D' || p[3] == L'd' )))
 					*mode |= S_IXUSR | S_IXGRP | S_IXOTH;
 				break;
@@ -1011,7 +1009,11 @@ _archive_write_disk_data_block(struct archive *_a,
 		    "Write request too large");
 		return (ARCHIVE_WARN);
 	}
+#if ARCHIVE_VERSION_NUMBER < 3999000
 	return (ARCHIVE_OK);
+#else
+	return (size);
+#endif
 }
 
 static ssize_t
diff --git a/libarchive/archive_write_filter.3 b/libarchive/archive_write_filter.3
index 3ca248b..83bd2c6 100644
--- a/libarchive/archive_write_filter.3
+++ b/libarchive/archive_write_filter.3
@@ -24,46 +24,62 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 2, 2012
+.Dd August 14, 2014
 .Dt ARCHIVE_WRITE_FILTER 3
 .Os
 .Sh NAME
+.Nm archive_write_add_filter_b64encode ,
 .Nm archive_write_add_filter_bzip2 ,
 .Nm archive_write_add_filter_compress ,
 .Nm archive_write_add_filter_gzip ,
+.Nm archive_write_add_filter_lz4 ,
 .Nm archive_write_add_filter_lzip ,
 .Nm archive_write_add_filter_lzma ,
+.Nm archive_write_add_filter_lzop ,
 .Nm archive_write_add_filter_none ,
 .Nm archive_write_add_filter_program ,
+.Nm archive_write_add_filter_uuencode ,
 .Nm archive_write_add_filter_xz
 .Sh LIBRARY
 Streaming Archive Library (libarchive, -larchive)
 .Sh SYNOPSIS
 .In archive.h
 .Ft int
+.Fn archive_write_add_filter_b64encode "struct archive *"
+.Ft int
 .Fn archive_write_add_filter_bzip2 "struct archive *"
 .Ft int
 .Fn archive_write_add_filter_compress "struct archive *"
 .Ft int
 .Fn archive_write_add_filter_gzip "struct archive *"
 .Ft int
+.Fn archive_write_add_filter_lz4 "struct archive *"
+.Ft int
 .Fn archive_write_add_filter_lzip "struct archive *"
 .Ft int
 .Fn archive_write_add_filter_lzma "struct archive *"
 .Ft int
+.Fn archive_write_add_filter_lzop "struct archive *"
+.Ft int
 .Fn archive_write_add_filter_none "struct archive *"
 .Ft int
 .Fn archive_write_add_filter_program "struct archive *" "const char * cmd"
 .Ft int
+.Fn archive_write_add_filter_uuencode "struct archive *"
+.Ft int
 .Fn archive_write_add_filter_xz "struct archive *"
 .Sh DESCRIPTION
 .Bl -tag -width indent
 .It Xo
+.Fn archive_write_add_filter_b64encode ,
 .Fn archive_write_add_filter_bzip2 ,
 .Fn archive_write_add_filter_compress ,
 .Fn archive_write_add_filter_gzip ,
+.Fn archive_write_add_filter_lz4 ,
 .Fn archive_write_add_filter_lzip ,
 .Fn archive_write_add_filter_lzma ,
+.Fn archive_write_add_filter_lzop ,
+.Fn archive_write_add_filter_uuencode ,
 .Fn archive_write_add_filter_xz ,
 .Xc
 The resulting archive will be compressed as specified.
diff --git a/libarchive/archive_write_finish_entry.3 b/libarchive/archive_write_finish_entry.3
index d881c80..c5ef69e 100644
--- a/libarchive/archive_write_finish_entry.3
+++ b/libarchive/archive_write_finish_entry.3
@@ -41,7 +41,7 @@ Close out the entry just written.
 In particular, this writes out the final padding required by some formats.
 Ordinarily, clients never need to call this, as it
 is called automatically by
-.Fn archive_write_next_header
+.Fn archive_write_header
 and
 .Fn archive_write_close
 as needed.
diff --git a/libarchive/archive_write_format.3 b/libarchive/archive_write_format.3
index 39d3006..4bd1163 100644
--- a/libarchive/archive_write_format.3
+++ b/libarchive/archive_write_format.3
@@ -34,7 +34,9 @@
 .Nm archive_write_set_format_raw ,
 .Nm archive_write_set_format_shar ,
 .Nm archive_write_set_format_shar_dump ,
-.Nm archive_write_set_format_ustar
+.Nm archive_write_set_format_ustar ,
+.Nm archive_write_set_format_filter_by_ext ,
+.Nm archive_write_set_format_filter_by_ext_def
 .Nd functions for creating archives
 .Sh LIBRARY
 Streaming Archive Library (libarchive, -larchive)
@@ -54,6 +56,10 @@ Streaming Archive Library (libarchive, -larchive)
 .Fn archive_write_set_format_shar_dump "struct archive *"
 .Ft int
 .Fn archive_write_set_format_ustar "struct archive *"
+.Ft int
+.Fn archive_write_set_format_filter_by_ext "struct archive *" "const char *"
+.Ft int
+.Fn archive_write_set_format_filter_by_ext_def "struct archive *" "const char *" "const char *"
 .Sh DESCRIPTION
 These functions set the format that will be used for the archive.
 .Pp
@@ -79,6 +85,14 @@ filenames, linknames, uids, sizes, etc.
 is the library default; this is the same as pax format, but suppresses
 the pax extended header for most normal files.
 In most cases, this will result in ordinary ustar archives.
+.Bl -tag -width indent
+.It Xo
+.Fn archive_write_set_format_filter_by_ext ,
+.Fn archive_write_set_format_filter_by_ext_def
+.Xc
+Format and filter for archive can be set automatically, based on output file name extension.
+The functions are platform dependent.
+Supported extensions: .7z, .zip, .jar, .cpio, .iso, .a, .ar, .tar, .tgz, .tar.gz, .tar.bz2, .tar.xz
 .\"
 .Sh RETURN VALUES
 These functions return
diff --git a/libarchive/archive_write_open.3 b/libarchive/archive_write_open.3
index 4037248..a52959b 100644
--- a/libarchive/archive_write_open.3
+++ b/libarchive/archive_write_open.3
@@ -154,7 +154,7 @@ to register an error code and message and return
 .Cm ARCHIVE_FATAL .
 .Bl -item -offset indent
 .It
-.Ft typedef ssize_t
+.Ft typedef la_ssize_t
 .Fo archive_write_callback
 .Fa "struct archive *"
 .Fa "void *client_data"
diff --git a/libarchive/archive_write_open_filename.c b/libarchive/archive_write_open_filename.c
index 196b770..66e0dfe 100644
--- a/libarchive/archive_write_open_filename.c
+++ b/libarchive/archive_write_open_filename.c
@@ -243,7 +243,10 @@ file_close(struct archive *a, void *client_data)
 	struct write_file_data	*mine = (struct write_file_data *)client_data;
 
 	(void)a; /* UNUSED */
-	close(mine->fd);
+
+	if (mine->fd >= 0)
+		close(mine->fd);
+
 	archive_mstring_clean(&mine->filename);
 	free(mine);
 	return (ARCHIVE_OK);
diff --git a/libarchive/archive_write_private.h b/libarchive/archive_write_private.h
index e600d54..0c3cc0c 100644
--- a/libarchive/archive_write_private.h
+++ b/libarchive/archive_write_private.h
@@ -26,8 +26,10 @@
  */
 
 #ifndef __LIBARCHIVE_BUILD
+#ifndef __LIBARCHIVE_TEST
 #error This header is only to be used internally to libarchive.
 #endif
+#endif
 
 #ifndef ARCHIVE_WRITE_PRIVATE_H_INCLUDED
 #define	ARCHIVE_WRITE_PRIVATE_H_INCLUDED
@@ -116,6 +118,14 @@ struct archive_write {
 		    const void *buff, size_t);
 	int	(*format_close)(struct archive_write *);
 	int	(*format_free)(struct archive_write *);
+
+
+	/*
+	 * Encryption passphrase.
+	 */
+	char		*passphrase;
+	archive_passphrase_callback *passphrase_callback;
+	void		*passphrase_client_data;
 };
 
 /*
@@ -142,4 +152,9 @@ int	__archive_write_program_close(struct archive_write_filter *,
 	    struct archive_write_program_data *);
 int	__archive_write_program_write(struct archive_write_filter *,
 	    struct archive_write_program_data *, const void *, size_t);
+
+/*
+ * Get a encryption passphrase.
+ */
+const char * __archive_write_get_passphrase(struct archive_write *a);
 #endif
diff --git a/libarchive/archive_write_set_format.c b/libarchive/archive_write_set_format.c
index 9055753..744302d 100644
--- a/libarchive/archive_write_set_format.c
+++ b/libarchive/archive_write_set_format.c
@@ -57,6 +57,7 @@ struct { int code; int (*setter)(struct archive *); } codes[] =
 	{ ARCHIVE_FORMAT_TAR_PAX_RESTRICTED,
 				archive_write_set_format_pax_restricted },
 	{ ARCHIVE_FORMAT_TAR_USTAR,	archive_write_set_format_ustar },
+	{ ARCHIVE_FORMAT_WARC,		archive_write_set_format_warc },
 	{ ARCHIVE_FORMAT_XAR,		archive_write_set_format_xar },
 	{ ARCHIVE_FORMAT_ZIP,		archive_write_set_format_zip },
 	{ 0,		NULL }
diff --git a/libarchive/archive_write_set_format_by_name.c b/libarchive/archive_write_set_format_by_name.c
index 4f3ce7d..a2ce7c6 100644
--- a/libarchive/archive_write_set_format_by_name.c
+++ b/libarchive/archive_write_set_format_by_name.c
@@ -70,6 +70,7 @@ struct { const char *name; int (*setter)(struct archive *); } names[] =
 	{ "ustar",	archive_write_set_format_ustar },
 	{ "v7tar",	archive_write_set_format_v7tar },
 	{ "v7",		archive_write_set_format_v7tar },
+	{ "warc",	archive_write_set_format_warc },
 	{ "xar",	archive_write_set_format_xar },
 	{ "zip",	archive_write_set_format_zip },
 	{ NULL,		NULL }
diff --git a/libarchive/archive_write_set_format_filter_by_ext.c b/libarchive/archive_write_set_format_filter_by_ext.c
new file mode 100644
index 0000000..adec9b2
--- /dev/null
+++ b/libarchive/archive_write_set_format_filter_by_ext.c
@@ -0,0 +1,142 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * Copyright (c) 2015 Okhotnikov Kirill
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_by_name.c 201168 2009-12-29 06:15:32Z kientzle $");
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "archive.h"
+#include "archive_private.h"
+
+/* A table that maps names to functions. */
+static
+struct { const char *name; int (*format)(struct archive *); int (*filter)(struct archive *);  } names[] =
+{
+	{ ".7z",	archive_write_set_format_7zip,            archive_write_add_filter_none},
+	{ ".zip",	archive_write_set_format_zip,             archive_write_add_filter_none},
+	{ ".jar",	archive_write_set_format_zip,             archive_write_add_filter_none},
+	{ ".cpio",	archive_write_set_format_cpio,            archive_write_add_filter_none},
+	{ ".iso",	archive_write_set_format_iso9660,         archive_write_add_filter_none},
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
+	{ ".a",	        archive_write_set_format_ar_bsd,          archive_write_add_filter_none},
+	{ ".ar",	archive_write_set_format_ar_bsd,          archive_write_add_filter_none},
+#else         
+	{ ".a",	        archive_write_set_format_ar_svr4,         archive_write_add_filter_none},
+	{ ".ar",	archive_write_set_format_ar_svr4,         archive_write_add_filter_none},
+#endif        
+	{ ".tar",	archive_write_set_format_pax_restricted,  archive_write_add_filter_none},
+	{ ".tgz",	archive_write_set_format_pax_restricted,  archive_write_add_filter_gzip},
+	{ ".tar.gz",	archive_write_set_format_pax_restricted,  archive_write_add_filter_gzip},
+	{ ".tar.bz2",	archive_write_set_format_pax_restricted,  archive_write_add_filter_bzip2},
+	{ ".tar.xz",	archive_write_set_format_pax_restricted,  archive_write_add_filter_xz},
+	{ NULL,		NULL,                             NULL }
+};
+
+static 
+int cmpsuff(const char *str, const char *suffix)
+{
+  size_t length_str, length_suffix;
+
+  if ((str == NULL) || (suffix == NULL))
+    return -1;
+
+  length_str = strlen(str);
+  length_suffix = strlen(suffix);
+
+  if (length_str >= length_suffix) {
+    return strcmp(str + (length_str - length_suffix), suffix);
+  } else {
+    return -1;
+  }
+}
+
+static int get_array_index(const char *name)
+{
+  int i;
+
+  for (i = 0; names[i].name != NULL; i++) 
+  {
+    if (cmpsuff(name, names[i].name) == 0)
+      return i;
+  }    
+  return -1;
+  
+}
+
+int
+archive_write_set_format_filter_by_ext(struct archive *a, const char *filename)
+{
+  int names_index = get_array_index(filename);
+  
+  if (names_index >= 0)
+  {  
+    int format_state = (names[names_index].format)(a);
+    if (format_state == ARCHIVE_OK)
+      return ((names[names_index].filter)(a));
+    else
+      return format_state;
+  }    
+
+  archive_set_error(a, EINVAL, "No such format '%s'", filename);
+  a->state = ARCHIVE_STATE_FATAL;
+  return (ARCHIVE_FATAL);
+}
+
+int
+archive_write_set_format_filter_by_ext_def(struct archive *a, const char *filename, const char * def_ext)
+{
+  int names_index = get_array_index(filename);
+  
+  if (names_index < 0)
+    names_index = get_array_index(def_ext);
+  
+  if (names_index >= 0)
+  {  
+    int format_state = (names[names_index].format)(a);
+    if (format_state == ARCHIVE_OK)
+      return ((names[names_index].filter)(a));
+    else
+      return format_state;
+  }    
+
+  archive_set_error(a, EINVAL, "No such format '%s'", filename);
+  a->state = ARCHIVE_STATE_FATAL;
+  return (ARCHIVE_FATAL);
+}
+
+
+
+
diff --git a/libarchive/archive_write_set_format_gnutar.c b/libarchive/archive_write_set_format_gnutar.c
index 13942c1..647079d 100644
--- a/libarchive/archive_write_set_format_gnutar.c
+++ b/libarchive/archive_write_set_format_gnutar.c
@@ -644,18 +644,18 @@ archive_format_gnutar_header(struct archive_write *a, char h[512],
 	format_octal(archive_entry_mode(entry) & 07777,
 	    h + GNUTAR_mode_offset, GNUTAR_mode_size);
 
-	/* TODO: How does GNU tar handle large UIDs? */
-	if (format_octal(archive_entry_uid(entry),
-	    h + GNUTAR_uid_offset, GNUTAR_uid_size)) {
+	/* GNU tar supports base-256 here, so should never overflow. */
+	if (format_number(archive_entry_uid(entry), h + GNUTAR_uid_offset,
+		GNUTAR_uid_size, GNUTAR_uid_max_size)) {
 		archive_set_error(&a->archive, ERANGE,
 		    "Numeric user ID %jd too large",
 		    (intmax_t)archive_entry_uid(entry));
 		ret = ARCHIVE_FAILED;
 	}
 
-	/* TODO: How does GNU tar handle large GIDs? */
-	if (format_octal(archive_entry_gid(entry),
-	    h + GNUTAR_gid_offset, GNUTAR_gid_size)) {
+	/* GNU tar supports base-256 here, so should never overflow. */
+	if (format_number(archive_entry_gid(entry), h + GNUTAR_gid_offset,
+		GNUTAR_gid_size, GNUTAR_gid_max_size)) {
 		archive_set_error(&a->archive, ERANGE,
 		    "Numeric group ID %jd too large",
 		    (intmax_t)archive_entry_gid(entry));
diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 5913702..016f60f 100644
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -2719,6 +2719,16 @@ extra_get_record(struct isoent *isoent, int *space, int *off, int *loc)
 			rec->offset = 0;
 			/* Insert `rec` into the tail of isoent->extr_rec_list */
 			rec->next = NULL;
+			/*
+			 * Note: testing isoent->extr_rec_list.last == NULL
+			 * here is really unneeded since it has been already
+			 * initialized at isoent_new function but Clang Static
+			 * Analyzer claims that it is dereference of null
+			 * pointer.
+			 */
+			if (isoent->extr_rec_list.last == NULL)
+				isoent->extr_rec_list.last =
+					&(isoent->extr_rec_list.first);
 			*isoent->extr_rec_list.last = rec;
 			isoent->extr_rec_list.last = &(rec->next);
 		}
diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 4d343ea..1692395 100644
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_mtree.c 201171
 #include <string.h>
 
 #include "archive.h"
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 #include "archive_entry.h"
 #include "archive_private.h"
 #include "archive_rb.h"
@@ -639,7 +639,7 @@ attr_counter_inc(struct attr_counter **top, struct attr_counter *ac,
 			*top = ac;
 			ac->next->prev = ac;
 		}
-	} else {
+	} else if (last != NULL) {
 		ac = attr_counter_new(me, last);
 		if (ac == NULL)
 			return (-1);
diff --git a/libarchive/archive_write_set_format_warc.c b/libarchive/archive_write_set_format_warc.c
new file mode 100644
index 0000000..80abc6f
--- /dev/null
+++ b/libarchive/archive_write_set_format_warc.c
@@ -0,0 +1,439 @@
+/*-
+ * Copyright (c) 2014 Sebastian Freundt
+ * Author: Sebastian Freundt  <devel at fresse.org>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+__FBSDID("$FreeBSD$");
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
+#include "archive.h"
+#include "archive_entry.h"
+#include "archive_entry_locale.h"
+#include "archive_private.h"
+#include "archive_random_private.h"
+#include "archive_write_private.h"
+
+struct warc_s {
+	unsigned int omit_warcinfo:1;
+
+	time_t now;
+	mode_t typ;
+	unsigned int rng;
+	/* populated size */
+	uint64_t populz;
+};
+
+static const char warcinfo[] =
+    "software: libarchive/" ARCHIVE_VERSION_ONLY_STRING "\r\n"
+    "format: WARC file version 1.0\r\n";
+
+typedef enum {
+	WT_NONE,
+	/* warcinfo */
+	WT_INFO,
+	/* metadata */
+	WT_META,
+	/* resource */
+	WT_RSRC,
+	/* request, unsupported */
+	WT_REQ,
+	/* response, unsupported */
+	WT_RSP,
+	/* revisit, unsupported */
+	WT_RVIS,
+	/* conversion, unsupported */
+	WT_CONV,
+	/* continutation, unsupported at the moment */
+	WT_CONT,
+	/* invalid type */
+	LAST_WT
+} warc_type_t;
+
+typedef struct {
+	warc_type_t type;
+	const char *tgturi;
+	const char *recid;
+	time_t rtime;
+	time_t mtime;
+	const char *cnttyp;
+	uint64_t cntlen;
+} warc_essential_hdr_t;
+
+typedef struct {
+	unsigned int u[4U];
+} warc_uuid_t;
+
+static int _warc_options(struct archive_write*, const char *key, const char *v);
+static int _warc_header(struct archive_write *a, struct archive_entry *entry);
+static ssize_t _warc_data(struct archive_write *a, const void *buf, size_t sz);
+static int _warc_finish_entry(struct archive_write *a);
+static int _warc_close(struct archive_write *a);
+static int _warc_free(struct archive_write *a);
+
+/* private routines */
+static ssize_t _popul_ehdr(struct archive_string *t, size_t z, warc_essential_hdr_t);
+static int _gen_uuid(warc_uuid_t *tgt);
+
+

+/*
+ * Set output format to ISO 28500 (aka WARC) format.
+ */
+int
+archive_write_set_format_warc(struct archive *_a)
+{
+	struct archive_write *a = (struct archive_write *)_a;
+	struct warc_s *w;
+
+	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
+	    ARCHIVE_STATE_NEW, "archive_write_set_format_warc");
+
+	/* If another format was already registered, unregister it. */
+	if (a->format_free != NULL) {
+		(a->format_free)(a);
+	}
+
+	w = malloc(sizeof(*w));
+	if (w == NULL) {
+		archive_set_error(&a->archive, ENOMEM,
+		    "Can't allocate warc data");
+		return (ARCHIVE_FATAL);
+	}
+	/* by default we're emitting a file wide header */
+	w->omit_warcinfo = 0U;
+	/* obtain current time for date fields */
+	w->now = time(NULL);
+	/* reset file type info */
+	w->typ = 0;
+	/* also initialise our rng */
+	w->rng = (unsigned int)w->now;
+
+	a->format_data = w;
+	a->format_name = "WARC/1.0";
+	a->format_options = _warc_options;
+	a->format_write_header = _warc_header;
+	a->format_write_data = _warc_data;
+	a->format_close = _warc_close;
+	a->format_free = _warc_free;
+	a->format_finish_entry = _warc_finish_entry;
+	a->archive.archive_format = ARCHIVE_FORMAT_WARC;
+	a->archive.archive_format_name = "WARC/1.0";
+	return (ARCHIVE_OK);
+}
+
+

+/* archive methods */
+static int
+_warc_options(struct archive_write *a, const char *key, const char *val)
+{
+	struct warc_s *w = a->format_data;
+
+	if (strcmp(key, "omit-warcinfo") == 0) {
+		if (val == NULL || strcmp(val, "true") == 0) {
+			/* great */
+			w->omit_warcinfo = 1U;
+			return (ARCHIVE_OK);
+		}
+	}
+
+	/* Note: The "warn" return is just to inform the options
+	 * supervisor that we didn't handle it.  It will generate
+	 * a suitable error if no one used this option. */
+	return (ARCHIVE_WARN);
+}
+
+static int
+_warc_header(struct archive_write *a, struct archive_entry *entry)
+{
+	struct warc_s *w = a->format_data;
+	struct archive_string hdr;
+#define MAX_HDR_SIZE 512
+
+	/* check whether warcinfo record needs outputting */
+	if (!w->omit_warcinfo) {
+		warc_essential_hdr_t wi = {
+			WT_INFO,
+			/*uri*/NULL,
+			/*urn*/NULL,
+			/*rtm*/w->now,
+			/*mtm*/w->now,
+			/*cty*/"application/warc-fields",
+			/*len*/sizeof(warcinfo) - 1U,
+		};
+		ssize_t r;
+
+		archive_string_init(&hdr);
+		r = _popul_ehdr(&hdr, MAX_HDR_SIZE, wi);
+		if (r >= 0) {
+			/* jackpot! */
+			/* now also use HDR buffer for the actual warcinfo */
+			archive_strncat(&hdr, warcinfo, sizeof(warcinfo) -1);
+
+			/* append end-of-record indicator */
+			archive_strncat(&hdr, "\r\n\r\n", 4);
+
+			/* write to output stream */
+			__archive_write_output(a, hdr.s, archive_strlen(&hdr));
+		}
+		/* indicate we're done with file header writing */
+		w->omit_warcinfo = 1U;
+		archive_string_free(&hdr);
+	}
+
+	if (archive_entry_pathname(entry) == NULL) {
+		archive_set_error(&a->archive, EINVAL,
+		    "Invalid filename");
+		return (ARCHIVE_WARN);
+	}
+
+	w->typ = archive_entry_filetype(entry);
+	w->populz = 0U;
+	if (w->typ == AE_IFREG) {
+		warc_essential_hdr_t rh = {
+			WT_RSRC,
+			/*uri*/archive_entry_pathname(entry),
+			/*urn*/NULL,
+			/*rtm*/w->now,
+			/*mtm*/archive_entry_mtime(entry),
+			/*cty*/NULL,
+			/*len*/(size_t)archive_entry_size(entry),
+		};
+		ssize_t r;
+
+		archive_string_init(&hdr);
+		r = _popul_ehdr(&hdr, MAX_HDR_SIZE, rh);
+		if (r < 0) {
+			/* don't bother */
+			archive_set_error(
+				&a->archive,
+				ARCHIVE_ERRNO_FILE_FORMAT,
+				"cannot archive file");
+			return (ARCHIVE_WARN);
+		}
+		/* otherwise append to output stream */
+		__archive_write_output(a, hdr.s, r);
+		/* and let subsequent calls to _data() know about the size */
+		w->populz = rh.cntlen;
+		archive_string_free(&hdr);
+		return (ARCHIVE_OK);
+	}
+	/* just resort to erroring as per Tim's advice */
+	archive_set_error(
+		&a->archive,
+		ARCHIVE_ERRNO_FILE_FORMAT,
+		"WARC can only process regular files");
+	return (ARCHIVE_FAILED);
+}
+
+static ssize_t
+_warc_data(struct archive_write *a, const void *buf, size_t len)
+{
+	struct warc_s *w = a->format_data;
+
+	if (w->typ == AE_IFREG) {
+		int rc;
+
+		/* never write more bytes than announced */
+		if (len > w->populz) {
+			len = (size_t)w->populz;
+		}
+
+		/* now then, out we put the whole shebang */
+		rc = __archive_write_output(a, buf, len);
+		if (rc != ARCHIVE_OK) {
+			return rc;
+		}
+	}
+	return len;
+}
+
+static int
+_warc_finish_entry(struct archive_write *a)
+{
+	static const char _eor[] = "\r\n\r\n";
+	struct warc_s *w = a->format_data;
+
+	if (w->typ == AE_IFREG) {
+		int rc = __archive_write_output(a, _eor, sizeof(_eor) - 1U);
+
+		if (rc != ARCHIVE_OK) {
+			return rc;
+		}
+	}
+	/* reset type info */
+	w->typ = 0;
+	return (ARCHIVE_OK);
+}
+
+static int
+_warc_close(struct archive_write *a)
+{
+	(void)a; /* UNUSED */
+	return (ARCHIVE_OK);
+}
+
+static int
+_warc_free(struct archive_write *a)
+{
+	struct warc_s *w = a->format_data;
+
+	free(w);
+	a->format_data = NULL;
+	return (ARCHIVE_OK);
+}
+
+

+/* private routines */
+static void
+xstrftime(struct archive_string *as, const char *fmt, time_t t)
+{
+/** like strftime(3) but for time_t objects */
+	struct tm *rt;
+#if defined(HAVE_GMTIME_R) || defined(HAVE__GMTIME64_S)
+	struct tm time;
+#endif
+	char strtime[100];
+	size_t len;
+
+#ifdef HAVE_GMTIME_R
+	if ((rt = gmtime_r(&t, &time)) == NULL)
+		return;
+#elif defined(HAVE__GMTIME64_S)
+	_gmtime64_s(&time, &t);
+#else
+	if ((rt = gmtime(&t)) == NULL)
+		return;
+#endif
+	/* leave the hard yacker to our role model strftime() */
+	len = strftime(strtime, sizeof(strtime)-1, fmt, rt);
+	archive_strncat(as, strtime, len);
+}
+
+static ssize_t
+_popul_ehdr(struct archive_string *tgt, size_t tsz, warc_essential_hdr_t hdr)
+{
+	static const char _ver[] = "WARC/1.0\r\n";
+	static const char *_typ[LAST_WT] = {
+		NULL, "warcinfo", "metadata", "resource", NULL
+	};
+	char std_uuid[48U];
+
+	if (hdr.type == WT_NONE || hdr.type > WT_RSRC) {
+		/* brilliant, how exactly did we get here? */
+		return -1;
+	}
+
+	archive_strcpy(tgt, _ver);
+
+	archive_string_sprintf(tgt, "WARC-Type: %s\r\n", _typ[hdr.type]);
+
+	if (hdr.tgturi != NULL) {
+		/* check if there's a xyz:// */
+		static const char _uri[] = "";
+		static const char _fil[] = "file://";
+		const char *u;
+		char *chk = strchr(hdr.tgturi, ':');
+
+		if (chk != NULL && chk[1U] == '/' && chk[2U] == '/') {
+			/* yep, it's definitely a URI */
+			u = _uri;
+		} else {
+			/* hm, best to prepend file:// then */
+			u = _fil;
+		}
+		archive_string_sprintf(tgt,
+			"WARC-Target-URI: %s%s\r\n", u, hdr.tgturi);
+	}
+
+	/* record time is usually when the http is sent off,
+	 * just treat the archive writing as such for a moment */
+	xstrftime(tgt, "WARC-Date: %Y-%m-%dT%H:%M:%SZ\r\n", hdr.rtime);
+
+	/* while we're at it, record the mtime */
+	xstrftime(tgt, "Last-Modified: %Y-%m-%dT%H:%M:%SZ\r\n", hdr.mtime);
+
+	if (hdr.recid == NULL) {
+		/* generate one, grrrr */
+		warc_uuid_t u;
+
+		_gen_uuid(&u);
+		/* Unfortunately, archive_string_sprintf does not
+		 * handle the minimum number following '%'.
+		 * So we have to use snprintf function here instead
+		 * of archive_string_snprintf function. */
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#define snprintf _snprintf
+#endif
+		snprintf(
+			std_uuid, sizeof(std_uuid),
+			"<urn:uuid:%08x-%04x-%04x-%04x-%04x%08x>",
+			u.u[0U],
+			u.u[1U] >> 16U, u.u[1U] & 0xffffU,
+			u.u[2U] >> 16U, u.u[2U] & 0xffffU,
+			u.u[3U]);
+		hdr.recid = std_uuid;
+	}
+
+	/* record-id is mandatory, fingers crossed we won't fail */
+	archive_string_sprintf(tgt, "WARC-Record-ID: %s\r\n", hdr.recid);
+
+	if (hdr.cnttyp != NULL) {
+		archive_string_sprintf(tgt, "Content-Type: %s\r\n", hdr.cnttyp);
+	}
+
+	/* next one is mandatory */
+	archive_string_sprintf(tgt, "Content-Length: %ju\r\n", (uintmax_t)hdr.cntlen);
+	/**/
+	archive_strncat(tgt, "\r\n", 2);
+
+	return (archive_strlen(tgt) >= tsz)? -1: (ssize_t)archive_strlen(tgt);
+}
+
+static int
+_gen_uuid(warc_uuid_t *tgt)
+{
+	archive_random(tgt->u, sizeof(tgt->u));
+	/* obey uuid version 4 rules */
+	tgt->u[1U] &= 0xffff0fffU;
+	tgt->u[1U] |= 0x4000U;
+	tgt->u[2U] &= 0x3fffffffU;
+	tgt->u[2U] |= 0x80000000U;
+	return 0;
+}
+
+/* archive_write_set_format_warc.c ends here */
diff --git a/libarchive/archive_write_set_format_xar.c b/libarchive/archive_write_set_format_xar.c
index 79667e5..4538bef 100644
--- a/libarchive/archive_write_set_format_xar.c
+++ b/libarchive/archive_write_set_format_xar.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include "archive.h"
-#include "archive_crypto_private.h"
+#include "archive_digest_private.h"
 #include "archive_endian.h"
 #include "archive_entry.h"
 #include "archive_entry_locale.h"
@@ -114,7 +114,7 @@ enum sumalg {
 #define MAX_SUM_SIZE	20
 #define MD5_NAME	"md5"
 #define SHA1_NAME	"sha1"
- 
+
 enum enctype {
 	NONE,
 	GZIP,
@@ -242,6 +242,7 @@ struct xar {
 	enum sumalg		 opt_sumalg;
 	enum enctype		 opt_compression;
 	int			 opt_compression_level;
+	uint32_t		 opt_threads;
 
 	struct chksumwork	 a_sumwrk;	/* archived checksum.	*/
 	struct chksumwork	 e_sumwrk;	/* extracted checksum.	*/
@@ -317,7 +318,7 @@ static int	compression_end_bzip2(struct archive *, struct la_zstream *);
 static int	compression_init_encoder_lzma(struct archive *,
 		    struct la_zstream *, int);
 static int	compression_init_encoder_xz(struct archive *,
-		    struct la_zstream *, int);
+		    struct la_zstream *, int, int);
 #if defined(HAVE_LZMA_H)
 static int	compression_code_lzma(struct archive *,
 		    struct la_zstream *, enum la_zaction);
@@ -380,9 +381,10 @@ archive_write_set_format_xar(struct archive *_a)
 	/* Set default checksum type. */
 	xar->opt_toc_sumalg = CKSUM_SHA1;
 	xar->opt_sumalg = CKSUM_SHA1;
-	/* Set default compression type and level. */
+	/* Set default compression type, level, and number of threads. */
 	xar->opt_compression = GZIP;
 	xar->opt_compression_level = 6;
+	xar->opt_threads = 1;
 
 	a->format_data = xar;
 
@@ -493,6 +495,26 @@ xar_options(struct archive_write *a, const char *key, const char *value)
 		}
 		return (ARCHIVE_OK);
 	}
+	if (strcmp(key, "threads") == 0) {
+		if (value == NULL)
+			return (ARCHIVE_FAILED);
+		xar->opt_threads = (int)strtoul(value, NULL, 10);
+		if (xar->opt_threads == 0 && errno != 0) {
+			xar->opt_threads = 1;
+			archive_set_error(&(a->archive),
+			    ARCHIVE_ERRNO_MISC,
+			    "Illegal value `%s'",
+			    value);
+			return (ARCHIVE_FAILED);
+		}
+		if (xar->opt_threads == 0) {
+#ifdef HAVE_LZMA_STREAM_ENCODER_MT
+			xar->opt_threads = lzma_cputhreads();
+#else
+			xar->opt_threads = 1;
+#endif
+		}
+	}
 
 	/* Note: The "warn" return is just to inform the options
 	 * supervisor that we didn't handle it.  It will generate
@@ -805,7 +827,7 @@ xmlwrite_string(struct archive_write *a, xmlTextWriterPtr writer,
 
 	if (value == NULL)
 		return (ARCHIVE_OK);
-	
+
 	r = xmlTextWriterStartElement(writer, BAD_CAST_CONST(key));
 	if (r < 0) {
 		archive_set_error(&a->archive,
@@ -1875,7 +1897,7 @@ file_cmp_node(const struct archive_rb_node *n1,
 
 	return (strcmp(f1->basename.s, f2->basename.s));
 }
-        
+
 static int
 file_cmp_key(const struct archive_rb_node *n, const void *key)
 {
@@ -2154,7 +2176,7 @@ file_gen_utility_names(struct archive_write *a, struct file *file)
 		file->parentdir.length = len;
 		archive_string_copy(&(file->basename), &(file->parentdir));
 		archive_string_empty(&(file->parentdir));
-		file->parentdir.s = '\0';
+		*file->parentdir.s = '\0';
 		return (r);
 	}
 
@@ -2494,7 +2516,7 @@ file_init_hardlinks(struct xar *xar)
 	static const struct archive_rb_tree_ops rb_ops = {
 		file_hd_cmp_node, file_hd_cmp_key,
 	};
- 
+
 	__archive_rb_tree_init(&(xar->hardlink_rbtree), &rb_ops);
 }
 
@@ -2848,13 +2870,18 @@ compression_init_encoder_lzma(struct archive *a,
 
 static int
 compression_init_encoder_xz(struct archive *a,
-    struct la_zstream *lastrm, int level)
+    struct la_zstream *lastrm, int level, int threads)
 {
 	static const lzma_stream lzma_init_data = LZMA_STREAM_INIT;
 	lzma_stream *strm;
 	lzma_filter *lzmafilters;
 	lzma_options_lzma lzma_opt;
 	int r;
+#ifdef HAVE_LZMA_STREAM_ENCODER_MT
+	lzma_mt mt_options;
+#endif
+
+	(void)threads; /* UNUSED (if multi-threaded LZMA library not avail) */
 
 	if (lastrm->valid)
 		compression_end(a, lastrm);
@@ -2879,7 +2906,17 @@ compression_init_encoder_xz(struct archive *a,
 	lzmafilters[1].id = LZMA_VLI_UNKNOWN;/* Terminate */
 
 	*strm = lzma_init_data;
-	r = lzma_stream_encoder(strm, lzmafilters, LZMA_CHECK_CRC64);
+#ifdef HAVE_LZMA_STREAM_ENCODER_MT
+	if (threads > 1) {
+		bzero(&mt_options, sizeof(mt_options));
+		mt_options.threads = threads;
+		mt_options.timeout = 300;
+		mt_options.filters = lzmafilters;
+		mt_options.check = LZMA_CHECK_CRC64;
+		r = lzma_stream_encoder_mt(strm, &mt_options);
+	} else
+#endif
+		r = lzma_stream_encoder(strm, lzmafilters, LZMA_CHECK_CRC64);
 	switch (r) {
 	case LZMA_OK:
 		lastrm->real_stream = strm;
@@ -2979,10 +3016,11 @@ compression_init_encoder_lzma(struct archive *a,
 }
 static int
 compression_init_encoder_xz(struct archive *a,
-    struct la_zstream *lastrm, int level)
+    struct la_zstream *lastrm, int level, int threads)
 {
 
 	(void) level; /* UNUSED */
+	(void) threads; /* UNUSED */
 	if (lastrm->valid)
 		compression_end(a, lastrm);
 	return (compression_unsupported_encoder(a, lastrm, "xz"));
@@ -3015,7 +3053,7 @@ xar_compression_init_encoder(struct archive_write *a)
 	case XZ:
 		r = compression_init_encoder_xz(
 		    &(a->archive), &(xar->stream),
-		    xar->opt_compression_level);
+		    xar->opt_compression_level, xar->opt_threads);
 		break;
 	default:
 		r = ARCHIVE_OK;
@@ -3178,4 +3216,3 @@ getalgname(enum sumalg sumalg)
 }
 
 #endif /* Support xar format */
-
diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index 6ecf468..975a468 100644
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2008 Anselm Strauss
  * Copyright (c) 2009 Joerg Sonnenberger
- * Copyright (c) 2011-2012 Michihiro NAKAJIMA
+ * Copyright (c) 2011-2012,2014 Michihiro NAKAJIMA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,20 +49,23 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_zip.c 201168 20
 #endif
 
 #include "archive.h"
+#include "archive_cryptor_private.h"
 #include "archive_endian.h"
 #include "archive_entry.h"
 #include "archive_entry_locale.h"
+#include "archive_hmac_private.h"
 #include "archive_private.h"
+#include "archive_random_private.h"
 #include "archive_write_private.h"
 
 #ifndef HAVE_ZLIB_H
 #include "archive_crc32.h"
 #endif
 
+#define ZIP_ENTRY_FLAG_ENCRYPTED	(1<<0)
 #define ZIP_ENTRY_FLAG_LENGTH_AT_END	(1<<3)
 #define ZIP_ENTRY_FLAG_UTF8_NAME	(1 << 11)
 
-
 enum compression {
 	COMPRESSION_UNSPECIFIED = -1,
 	COMPRESSION_STORE = 0,
@@ -75,6 +78,32 @@ enum compression {
 #define COMPRESSION_DEFAULT	COMPRESSION_STORE
 #endif
 
+enum encryption {
+	ENCRYPTION_NONE	= 0,
+	ENCRYPTION_TRADITIONAL, /* Traditional PKWARE encryption. */
+	ENCRYPTION_WINZIP_AES128, /* WinZIP AES-128 encryption. */
+	ENCRYPTION_WINZIP_AES256, /* WinZIP AES-256 encryption. */
+};
+
+#define TRAD_HEADER_SIZE	12
+/*
+ * See "WinZip - AES Encryption Information"
+ *     http://www.winzip.com/aes_info.htm
+ */
+/* Value used in compression method. */
+#define WINZIP_AES_ENCRYPTION	99
+/* A WinZip AES header size which is stored at the beginning of
+ * file contents. */
+#define WINZIP_AES128_HEADER_SIZE	(8 + 2)
+#define WINZIP_AES256_HEADER_SIZE	(16 + 2)
+/* AES vendor version. */
+#define AES_VENDOR_AE_1 0x0001
+#define AES_VENDOR_AE_2 0x0002
+/* Authentication code size. */
+#define AUTH_CODE_SIZE		10
+/**/
+#define MAX_DERIVED_KEY_BUF_SIZE (AES_MAX_KEY_SIZE * 2 + 2)
+
 struct cd_segment {
 	struct cd_segment *next;
 	size_t buff_size;
@@ -82,9 +111,9 @@ struct cd_segment {
 	unsigned char *p;
 };
 
-/* Bits used to enable/disable certain experimental features. */
-#define	EXPERIMENT_LA 1
-#define	EXPERIMENTS_ALL 0xffff
+struct trad_enc_ctx {
+	uint32_t keys[3];
+};
 
 struct zip {
 
@@ -97,9 +126,18 @@ struct zip {
 	struct archive_entry *entry;
 	uint32_t entry_crc32;
 	enum compression entry_compression;
+	enum encryption  entry_encryption;
 	int entry_flags;
 	int entry_uses_zip64;
 	int experiments;
+	struct trad_enc_ctx tctx;
+	char tctx_valid;
+	unsigned char trad_chkdat;
+	unsigned aes_vendor;
+	archive_crypto_ctx cctx;
+	char cctx_valid;
+	archive_hmac_sha1_ctx hctx;
+	char hctx_valid;
 
 	unsigned char *file_header;
 	size_t file_header_extra_offset;
@@ -115,18 +153,20 @@ struct zip {
 	struct archive_string_conv *opt_sconv;
 	struct archive_string_conv *sconv_default;
 	enum compression requested_compression;
+	int deflate_compression_level;
 	int init_default_conversion;
+	enum encryption  encryption_type;
 
 #define ZIP_FLAG_AVOID_ZIP64 1
 #define ZIP_FLAG_FORCE_ZIP64 2
-#define ZIP_FLAG_EXPERIMENT_EL 4
+#define ZIP_FLAG_EXPERIMENT_xl 4
 	int flags;
 
 #ifdef HAVE_ZLIB_H
 	z_stream stream;
+#endif
 	size_t len_buf;
 	unsigned char *buf;
-#endif
 };
 
 /* Don't call this min or MIN, since those are already defined
@@ -147,6 +187,13 @@ static size_t path_length(struct archive_entry *);
 static int write_path(struct archive_entry *, struct archive_write *);
 static void copy_path(struct archive_entry *, unsigned char *);
 static struct archive_string_conv *get_sconv(struct archive_write *, struct zip *);
+static int trad_enc_init(struct trad_enc_ctx *, const char *, size_t);
+static unsigned trad_enc_encrypt_update(struct trad_enc_ctx *, const uint8_t *,
+    size_t, uint8_t *, size_t);
+static int init_traditional_pkware_encryption(struct archive_write *);
+static int is_traditional_pkware_encryption_supported(void);
+static int init_winzip_aes_encryption(struct archive_write *);
+static int is_winzip_aes_encryption_supported(int encryption);
 
 static unsigned char *
 cd_alloc(struct zip *zip, size_t length)
@@ -186,7 +233,7 @@ cd_alloc(struct zip *zip, size_t length)
 static unsigned long
 real_crc32(unsigned long crc, const void *buff, size_t len)
 {
-	return crc32(crc, buff, len);
+	return crc32(crc, buff, (unsigned int)len);
 }
 
 static unsigned long
@@ -227,11 +274,70 @@ archive_write_zip_options(struct archive_write *a, const char *key,
 			ret = ARCHIVE_OK;
 		}
 		return (ret);
+	} else if (strcmp(key, "compression-level") == 0) {
+		if (val == NULL || !(val[0] >= '0' && val[0] <= '9') || val[1] != '\0') {
+			return ARCHIVE_WARN;
+		}
+
+		if (val[0] == '0') {
+			zip->requested_compression = COMPRESSION_STORE;
+			return ARCHIVE_OK;
+		} else {
+#ifdef HAVE_ZLIB_H
+			zip->requested_compression = COMPRESSION_DEFLATE;
+			zip->deflate_compression_level = val[0] - '0';
+			return ARCHIVE_OK;
+#else
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    "deflate compression not supported");
+#endif
+		}
+	} else if (strcmp(key, "encryption") == 0) {
+		if (val == NULL) {
+			zip->encryption_type = ENCRYPTION_NONE;
+			ret = ARCHIVE_OK;
+		} else if (val[0] == '1' || strcmp(val, "traditional") == 0
+		    || strcmp(val, "zipcrypt") == 0
+		    || strcmp(val, "ZipCrypt") == 0) {
+			if (is_traditional_pkware_encryption_supported()) {
+				zip->encryption_type = ENCRYPTION_TRADITIONAL;
+				ret = ARCHIVE_OK;
+			} else {
+				archive_set_error(&a->archive,
+				    ARCHIVE_ERRNO_MISC,
+				    "encryption not supported");
+			}
+		} else if (strcmp(val, "aes128") == 0) {
+			if (is_winzip_aes_encryption_supported(
+			    ENCRYPTION_WINZIP_AES128)) {
+				zip->encryption_type = ENCRYPTION_WINZIP_AES128;
+				ret = ARCHIVE_OK;
+			} else {
+				archive_set_error(&a->archive,
+				    ARCHIVE_ERRNO_MISC,
+				    "encryption not supported");
+			}
+		} else if (strcmp(val, "aes256") == 0) {
+			if (is_winzip_aes_encryption_supported(
+			    ENCRYPTION_WINZIP_AES256)) {
+				zip->encryption_type = ENCRYPTION_WINZIP_AES256;
+				ret = ARCHIVE_OK;
+			} else {
+				archive_set_error(&a->archive,
+				    ARCHIVE_ERRNO_MISC,
+				    "encryption not supported");
+			}
+		} else {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			    "%s: unknown encryption '%s'",
+			    a->format_name, val);
+		}
+		return (ret);
 	} else if (strcmp(key, "experimental") == 0) {
 		if (val == NULL || val[0] == 0) {
-			zip->flags &= ~ ZIP_FLAG_EXPERIMENT_EL;
+			zip->flags &= ~ ZIP_FLAG_EXPERIMENT_xl;
 		} else {
-			zip->flags |= ZIP_FLAG_EXPERIMENT_EL;
+			zip->flags |= ZIP_FLAG_EXPERIMENT_xl;
 		}
 		return (ARCHIVE_OK);
 	} else if (strcmp(key, "fakecrc32") == 0) {
@@ -357,9 +463,12 @@ archive_write_set_format_zip(struct archive *_a)
 
 	/* "Unspecified" lets us choose the appropriate compression. */
 	zip->requested_compression = COMPRESSION_UNSPECIFIED;
+#ifdef HAVE_ZLIB_H
+	zip->deflate_compression_level = Z_DEFAULT_COMPRESSION;
+#endif
 	zip->crc32func = real_crc32;
 
-#ifdef HAVE_ZLIB_H
+	/* A buffer used for both compression and encryption. */
 	zip->len_buf = 65536;
 	zip->buf = malloc(zip->len_buf);
 	if (zip->buf == NULL) {
@@ -368,7 +477,6 @@ archive_write_set_format_zip(struct archive *_a)
 		    "Can't allocate compression buffer");
 		return (ARCHIVE_FATAL);
 	}
-#endif
 
 	a->format_data = zip;
 	a->format_name = "zip";
@@ -400,7 +508,7 @@ static int
 archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 {
 	unsigned char local_header[32];
-	unsigned char local_extra[128];
+	unsigned char local_extra[144];
 	struct zip *zip = a->format_data;
 	unsigned char *e;
 	unsigned char *cd_extra;
@@ -409,7 +517,6 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 	size_t slink_size = 0;
 	struct archive_string_conv *sconv = get_sconv(a, zip);
 	int ret, ret2 = ARCHIVE_OK;
-	int64_t size;
 	mode_t type;
 	int version_needed = 10;
 
@@ -453,11 +560,34 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 	zip->entry_flags = 0;
 	zip->entry_uses_zip64 = 0;
 	zip->entry_crc32 = zip->crc32func(0, NULL, 0);
+	zip->entry_encryption = 0;
 	if (zip->entry != NULL) {
 		archive_entry_free(zip->entry);
 		zip->entry = NULL;
 	}
 
+	if (zip->cctx_valid)
+		archive_encrypto_aes_ctr_release(&zip->cctx);
+	if (zip->hctx_valid)
+		archive_hmac_sha1_cleanup(&zip->hctx);
+	zip->tctx_valid = zip->cctx_valid = zip->hctx_valid = 0;
+
+	if (type == AE_IFREG
+		    &&(!archive_entry_size_is_set(entry)
+			|| archive_entry_size(entry) > 0)) {
+		switch (zip->encryption_type) {
+		case ENCRYPTION_TRADITIONAL:
+		case ENCRYPTION_WINZIP_AES128:
+		case ENCRYPTION_WINZIP_AES256:
+			zip->entry_flags |= ZIP_ENTRY_FLAG_ENCRYPTED;
+			zip->entry_encryption = zip->encryption_type;
+			break;
+		default:
+			break;
+		}
+	}
+
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
 	/* Make sure the path separators in pahtname, hardlink and symlink
 	 * are all slash '/', not the Windows path separator '\'. */
@@ -543,10 +673,11 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 	} else if (type != AE_IFREG) {
 		zip->entry_compression = COMPRESSION_STORE;
 		zip->entry_uncompressed_limit = 0;
-		size = 0;
 		version_needed = 20;
 	} else if (archive_entry_size_is_set(zip->entry)) {
-		size = archive_entry_size(zip->entry);
+		int64_t size = archive_entry_size(zip->entry);
+		int64_t additional_size = 0;
+
 		zip->entry_uncompressed_limit = size;
 		zip->entry_compression = zip->requested_compression;
 		if (zip->entry_compression == COMPRESSION_UNSPECIFIED) {
@@ -560,8 +691,44 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 			zip->entry_uncompressed_size = size;
 			version_needed = 20;
 		}
-		if ((zip->flags & ZIP_FLAG_FORCE_ZIP64) /* User asked. */
-		    || (zip->entry_uncompressed_size > 0xffffffffLL)) { /* Large entry. */
+
+		if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
+			switch (zip->entry_encryption) {
+			case ENCRYPTION_TRADITIONAL:
+				additional_size = TRAD_HEADER_SIZE;
+				version_needed = 20;
+				break;
+			case ENCRYPTION_WINZIP_AES128:
+				additional_size = WINZIP_AES128_HEADER_SIZE
+				    + AUTH_CODE_SIZE;
+				version_needed = 20;
+				break;
+			case ENCRYPTION_WINZIP_AES256:
+				additional_size = WINZIP_AES256_HEADER_SIZE
+				    + AUTH_CODE_SIZE;
+				version_needed = 20;
+				break;
+			default:
+				break;
+			}
+			if (zip->entry_compression == COMPRESSION_STORE)
+				zip->entry_compressed_size += additional_size;
+		}
+
+		/*
+		 * Set Zip64 extension in any of the following cases
+		 * (this was suggested by discussion on info-zip-dev
+		 * mailing list):
+		 *  = Zip64 is being forced by user
+		 *  = File is over 4GiB uncompressed
+		 *    (including encryption header, if any)
+		 *  = File is close to 4GiB and is being compressed
+		 *    (compression might make file larger)
+		 */
+		if ((zip->flags & ZIP_FLAG_FORCE_ZIP64)
+		    || (zip->entry_uncompressed_size + additional_size > 0xffffffffLL)
+		    || (zip->entry_uncompressed_size > 0xff000000LL
+			&& zip->entry_compression != COMPRESSION_STORE)) {
 			zip->entry_uses_zip64 = 1;
 			version_needed = 45;
 		}
@@ -569,9 +736,11 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 		/* We may know the size, but never the CRC. */
 		zip->entry_flags |= ZIP_ENTRY_FLAG_LENGTH_AT_END;
 	} else {
-		/* Prefer deflate if it's available, because deflate
-		 * has a clear end-of-data marker that makes
-		 * length-at-end more reliable. */
+		/* We don't know the size.  In this case, we prefer
+		 * deflate (it has a clear end-of-data marker which
+		 * makes length-at-end more reliable) and will
+		 * enable Zip64 extensions unless we're told not to.
+		 */
 		zip->entry_compression = COMPRESSION_DEFAULT;
 		zip->entry_flags |= ZIP_ENTRY_FLAG_LENGTH_AT_END;
 		if ((zip->flags & ZIP_FLAG_AVOID_ZIP64) == 0) {
@@ -582,6 +751,19 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 		} else {
 			version_needed = 20;
 		}
+
+		if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
+			switch (zip->entry_encryption) {
+			case ENCRYPTION_TRADITIONAL:
+			case ENCRYPTION_WINZIP_AES128:
+			case ENCRYPTION_WINZIP_AES256:
+				if (version_needed < 20)
+					version_needed = 20;
+				break;
+			default:
+				break;
+			}
+		}
 	}
 
 	/* Format the local header. */
@@ -589,8 +771,13 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 	memcpy(local_header, "PK\003\004", 4);
 	archive_le16enc(local_header + 4, version_needed);
 	archive_le16enc(local_header + 6, zip->entry_flags);
-	archive_le16enc(local_header + 8, zip->entry_compression);
-	archive_le32enc(local_header + 10, dos_time(archive_entry_mtime(zip->entry)));
+	if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
+	    || zip->entry_encryption == ENCRYPTION_WINZIP_AES256)
+		archive_le16enc(local_header + 8, WINZIP_AES_ENCRYPTION);
+	else
+		archive_le16enc(local_header + 8, zip->entry_compression);
+	archive_le32enc(local_header + 10,
+		dos_time(archive_entry_mtime(zip->entry)));
 	archive_le32enc(local_header + 14, zip->entry_crc32);
 	if (zip->entry_uses_zip64) {
 		/* Zip64 data in the local header "must" include both
@@ -601,10 +788,17 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 		archive_le32enc(local_header + 18, 0xffffffffLL);
 		archive_le32enc(local_header + 22, 0xffffffffLL);
 	} else {
-		archive_le32enc(local_header + 18, zip->entry_compressed_size);
-		archive_le32enc(local_header + 22, zip->entry_uncompressed_size);
+		archive_le32enc(local_header + 18, (uint32_t)zip->entry_compressed_size);
+		archive_le32enc(local_header + 22, (uint32_t)zip->entry_uncompressed_size);
+	}
+	archive_le16enc(local_header + 26, (uint16_t)filename_length);
+
+	if (zip->entry_encryption == ENCRYPTION_TRADITIONAL) {
+		if (zip->entry_flags & ZIP_ENTRY_FLAG_LENGTH_AT_END)
+			zip->trad_chkdat = local_header[11];
+		else
+			zip->trad_chkdat = local_header[17];
 	}
-	archive_le16enc(local_header + 26, filename_length);
 
 	/* Format as much of central directory file header as we can: */
 	zip->file_header = cd_alloc(zip, 46);
@@ -616,9 +810,14 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 	archive_le16enc(zip->file_header + 4, 3 * 256 + version_needed);
 	archive_le16enc(zip->file_header + 6, version_needed);
 	archive_le16enc(zip->file_header + 8, zip->entry_flags);
-	archive_le16enc(zip->file_header + 10, zip->entry_compression);
-	archive_le32enc(zip->file_header + 12, dos_time(archive_entry_mtime(zip->entry)));
-	archive_le16enc(zip->file_header + 28, filename_length);
+	if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
+	    || zip->entry_encryption == ENCRYPTION_WINZIP_AES256)
+		archive_le16enc(zip->file_header + 10, WINZIP_AES_ENCRYPTION);
+	else
+		archive_le16enc(zip->file_header + 10, zip->entry_compression);
+	archive_le32enc(zip->file_header + 12,
+		dos_time(archive_entry_mtime(zip->entry)));
+	archive_le16enc(zip->file_header + 28, (uint16_t)filename_length);
 	/* Following Info-Zip, store mode in the "external attributes" field. */
 	archive_le32enc(zip->file_header + 38,
 	    archive_entry_mode(zip->entry) << 16);
@@ -670,7 +869,33 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 	archive_le32enc(e, (uint32_t)archive_entry_gid(entry));
 	e += 4;
 
-	/* Copy UT and ux into central directory as well. */
+	/* AES extra data field: WinZIP AES information, ID=0x9901 */
+	if ((zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED)
+	    && (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
+	        || zip->entry_encryption == ENCRYPTION_WINZIP_AES256)) {
+
+		memcpy(e, "\001\231\007\000\001\000AE", 8);
+		/* AES vendoer version AE-2 does not store a CRC.
+		 * WinZip 11 uses AE-1, which does store the CRC,
+		 * but it does not store the CRC when the file size
+		 * is less than 20 bytes. So we simulate what
+		 * WinZip 11 does.
+		 * NOTE: WinZip 9.0 and 10.0 uses AE-2 by default. */
+		if (archive_entry_size_is_set(zip->entry)
+		    && archive_entry_size(zip->entry) < 20) {
+			archive_le16enc(e+4, AES_VENDOR_AE_2);
+			zip->aes_vendor = AES_VENDOR_AE_2;/* no CRC. */
+		} else
+			zip->aes_vendor = AES_VENDOR_AE_1;
+		e += 8;
+		/* AES encryption strength. */
+		*e++ = (zip->entry_encryption == ENCRYPTION_WINZIP_AES128)?1:3;
+		/* Actual compression method. */
+		archive_le16enc(e, zip->entry_compression);
+		e += 2;
+	}
+
+	/* Copy UT ,ux, and AES-extra into central directory as well. */
 	zip->file_header_extra_offset = zip->central_directory_bytes;
 	cd_extra = cd_alloc(zip, e - local_extra);
 	memcpy(cd_extra, local_extra, e - local_extra);
@@ -692,14 +917,14 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 		e += 8;
 		archive_le64enc(e, zip->entry_compressed_size);
 		e += 8;
-		archive_le16enc(zip64_start + 2, e - (zip64_start + 4));
+		archive_le16enc(zip64_start + 2, (uint16_t)(e - (zip64_start + 4)));
 	}
 
-	if (zip->flags & ZIP_FLAG_EXPERIMENT_EL) {
-		/* Experimental 'el' extension to improve streaming. */
+	if (zip->flags & ZIP_FLAG_EXPERIMENT_xl) {
+		/* Experimental 'xl' extension to improve streaming. */
 		unsigned char *external_info = e;
 		int included = 7;
-		memcpy(e, "el\000\000", 4); // 0x6c65 + 2-byte length
+		memcpy(e, "xl\000\000", 4); // 0x6c65 + 2-byte length
 		e += 4;
 		e[0] = included; /* bitmap of included fields */
 		e += 1;
@@ -720,11 +945,11 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 		if (included & 8) {
 			// Libarchive does not currently support file comments.
 		}
-		archive_le16enc(external_info + 2, e - (external_info + 4));
+		archive_le16enc(external_info + 2, (uint16_t)(e - (external_info + 4)));
 	}
 
 	/* Update local header with size of extra data and write it all out: */
-	archive_le16enc(local_header + 28, e - local_extra);
+	archive_le16enc(local_header + 28, (uint16_t)(e - local_extra));
 
 	ret = __archive_write_output(a, local_header, 30);
 	if (ret != ARCHIVE_OK)
@@ -758,7 +983,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 		zip->stream.opaque = Z_NULL;
 		zip->stream.next_out = zip->buf;
 		zip->stream.avail_out = (uInt)zip->len_buf;
-		if (deflateInit2(&zip->stream, Z_DEFAULT_COMPRESSION,
+		if (deflateInit2(&zip->stream, zip->deflate_compression_level,
 		    Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
 			archive_set_error(&a->archive, ENOMEM,
 			    "Can't init deflate compressor");
@@ -782,13 +1007,72 @@ archive_write_zip_data(struct archive_write *a, const void *buff, size_t s)
 
 	if (s == 0) return 0;
 
+	if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
+		switch (zip->entry_encryption) {
+		case ENCRYPTION_TRADITIONAL:
+			/* Initialize traditoinal PKWARE encryption context. */
+			if (!zip->tctx_valid) {
+				ret = init_traditional_pkware_encryption(a);
+				if (ret != ARCHIVE_OK)
+					return (ret);
+				zip->tctx_valid = 1;
+			}
+			break;
+		case ENCRYPTION_WINZIP_AES128:
+		case ENCRYPTION_WINZIP_AES256:
+			if (!zip->cctx_valid) {
+				ret = init_winzip_aes_encryption(a);
+				if (ret != ARCHIVE_OK)
+					return (ret);
+				zip->cctx_valid = zip->hctx_valid = 1;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
 	switch (zip->entry_compression) {
 	case COMPRESSION_STORE:
-		ret = __archive_write_output(a, buff, s);
-		if (ret != ARCHIVE_OK)
-			return (ret);
-		zip->written_bytes += s;
-		zip->entry_compressed_written += s;
+		if (zip->tctx_valid || zip->cctx_valid) {
+			const uint8_t *rb = (const uint8_t *)buff;
+			const uint8_t * const re = rb + s;
+
+			while (rb < re) {
+				size_t l;
+
+				if (zip->tctx_valid) {
+					l = trad_enc_encrypt_update(&zip->tctx,
+					    rb, re - rb,
+					    zip->buf, zip->len_buf);
+				} else {
+					l = zip->len_buf;
+					ret = archive_encrypto_aes_ctr_update(
+					    &zip->cctx,
+					    rb, re - rb, zip->buf, &l);
+					if (ret < 0) {
+						archive_set_error(&a->archive,
+						    ARCHIVE_ERRNO_MISC,
+						    "Failed to encrypt file");
+						return (ARCHIVE_FAILED);
+					}
+					archive_hmac_sha1_update(&zip->hctx,
+					    zip->buf, l);
+				}
+				ret = __archive_write_output(a, zip->buf, l);
+				if (ret != ARCHIVE_OK)
+					return (ret);
+				zip->entry_compressed_written += l;
+				zip->written_bytes += l;
+				rb += l;
+			}
+		} else {
+			ret = __archive_write_output(a, buff, s);
+			if (ret != ARCHIVE_OK)
+				return (ret);
+			zip->written_bytes += s;
+			zip->entry_compressed_written += s;
+		}
 		break;
 #if HAVE_ZLIB_H
 	case COMPRESSION_DEFLATE:
@@ -799,6 +1083,25 @@ archive_write_zip_data(struct archive_write *a, const void *buff, size_t s)
 			if (ret == Z_STREAM_ERROR)
 				return (ARCHIVE_FATAL);
 			if (zip->stream.avail_out == 0) {
+				if (zip->tctx_valid) {
+					trad_enc_encrypt_update(&zip->tctx,
+					    zip->buf, zip->len_buf,
+					    zip->buf, zip->len_buf);
+				} else if (zip->cctx_valid) {
+					size_t outl = zip->len_buf;
+					ret = archive_encrypto_aes_ctr_update(
+					    &zip->cctx,
+					    zip->buf, zip->len_buf,
+					    zip->buf, &outl);
+					if (ret < 0) {
+						archive_set_error(&a->archive,
+						    ARCHIVE_ERRNO_MISC,
+						    "Failed to encrypt file");
+						return (ARCHIVE_FAILED);
+					}
+					archive_hmac_sha1_update(&zip->hctx,
+					    zip->buf, zip->len_buf);
+				}
 				ret = __archive_write_output(a, zip->buf,
 					zip->len_buf);
 				if (ret != ARCHIVE_OK)
@@ -819,7 +1122,9 @@ archive_write_zip_data(struct archive_write *a, const void *buff, size_t s)
 	}
 
 	zip->entry_uncompressed_limit -= s;
-	zip->entry_crc32 = zip->crc32func(zip->entry_crc32, buff, (unsigned)s);
+	if (!zip->cctx_valid || zip->aes_vendor != AES_VENDOR_AE_2)
+		zip->entry_crc32 =
+		    zip->crc32func(zip->entry_crc32, buff, (unsigned)s);
 	return (s);
 
 }
@@ -834,10 +1139,28 @@ archive_write_zip_finish_entry(struct archive_write *a)
 	if (zip->entry_compression == COMPRESSION_DEFLATE) {
 		for (;;) {
 			size_t remainder;
+
 			ret = deflate(&zip->stream, Z_FINISH);
 			if (ret == Z_STREAM_ERROR)
 				return (ARCHIVE_FATAL);
 			remainder = zip->len_buf - zip->stream.avail_out;
+			if (zip->tctx_valid) {
+				trad_enc_encrypt_update(&zip->tctx,
+				    zip->buf, remainder, zip->buf, remainder);
+			} else if (zip->cctx_valid) {
+				size_t outl = remainder;
+				ret = archive_encrypto_aes_ctr_update(
+				    &zip->cctx, zip->buf, remainder,
+				    zip->buf, &outl);
+				if (ret < 0) {
+					archive_set_error(&a->archive,
+					    ARCHIVE_ERRNO_MISC,
+					    "Failed to encrypt file");
+					return (ARCHIVE_FAILED);
+				}
+				archive_hmac_sha1_update(&zip->hctx,
+				    zip->buf, remainder);
+			}
 			ret = __archive_write_output(a, zip->buf, remainder);
 			if (ret != ARCHIVE_OK)
 				return (ret);
@@ -851,20 +1174,38 @@ archive_write_zip_finish_entry(struct archive_write *a)
 		deflateEnd(&zip->stream);
 	}
 #endif
+	if (zip->hctx_valid) {
+		uint8_t hmac[20];
+		size_t hmac_len = 20;
+
+		archive_hmac_sha1_final(&zip->hctx, hmac, &hmac_len);
+		ret = __archive_write_output(a, hmac, AUTH_CODE_SIZE);
+		if (ret != ARCHIVE_OK)
+			return (ret);
+		zip->entry_compressed_written += AUTH_CODE_SIZE;
+		zip->written_bytes += AUTH_CODE_SIZE;
+	}
 
 	/* Write trailing data descriptor. */
 	if ((zip->entry_flags & ZIP_ENTRY_FLAG_LENGTH_AT_END) != 0) {
 		char d[24];
 		memcpy(d, "PK\007\010", 4);
-		archive_le32enc(d + 4, zip->entry_crc32);
+		if (zip->cctx_valid && zip->aes_vendor == AES_VENDOR_AE_2)
+			archive_le32enc(d + 4, 0);/* no CRC.*/
+		else
+			archive_le32enc(d + 4, zip->entry_crc32);
 		if (zip->entry_uses_zip64) {
-			archive_le64enc(d + 8, (uint64_t)zip->entry_compressed_written);
-			archive_le64enc(d + 16, (uint64_t)zip->entry_uncompressed_written);
+			archive_le64enc(d + 8,
+				(uint64_t)zip->entry_compressed_written);
+			archive_le64enc(d + 16,
+				(uint64_t)zip->entry_uncompressed_written);
 			ret = __archive_write_output(a, d, 24);
 			zip->written_bytes += 24;
 		} else {
-			archive_le32enc(d + 8, (uint32_t)zip->entry_compressed_written);
-			archive_le32enc(d + 12, (uint32_t)zip->entry_uncompressed_written);
+			archive_le32enc(d + 8,
+				(uint32_t)zip->entry_compressed_written);
+			archive_le32enc(d + 12,
+				(uint32_t)zip->entry_uncompressed_written);
 			ret = __archive_write_output(a, d, 16);
 			zip->written_bytes += 16;
 		}
@@ -892,7 +1233,7 @@ archive_write_zip_finish_entry(struct archive_write *a)
 			archive_le64enc(z, zip->entry_offset);
 			z += 8;
 		}
-		archive_le16enc(zip64 + 2, z - (zip64 + 4));
+		archive_le16enc(zip64 + 2, (uint16_t)(z - (zip64 + 4)));
 		zd = cd_alloc(zip, z - zip64);
 		if (zd == NULL) {
 			archive_set_error(&a->archive, ENOMEM,
@@ -906,15 +1247,21 @@ archive_write_zip_finish_entry(struct archive_write *a)
 	}
 
 	/* Fix up central directory file header. */
-	archive_le32enc(zip->file_header + 16, zip->entry_crc32);
+	if (zip->cctx_valid && zip->aes_vendor == AES_VENDOR_AE_2)
+		archive_le32enc(zip->file_header + 16, 0);/* no CRC.*/
+	else
+		archive_le32enc(zip->file_header + 16, zip->entry_crc32);
 	archive_le32enc(zip->file_header + 20,
-	    zipmin(zip->entry_compressed_written, 0xffffffffLL));
+		(uint32_t)zipmin(zip->entry_compressed_written,
+				 ARCHIVE_LITERAL_LL(0xffffffff)));
 	archive_le32enc(zip->file_header + 24,
-	    zipmin(zip->entry_uncompressed_written, 0xffffffffLL));
+		(uint32_t)zipmin(zip->entry_uncompressed_written,
+				 ARCHIVE_LITERAL_LL(0xffffffff)));
 	archive_le16enc(zip->file_header + 30,
-	    zip->central_directory_bytes - zip->file_header_extra_offset);
+	    (uint16_t)(zip->central_directory_bytes - zip->file_header_extra_offset));
 	archive_le32enc(zip->file_header + 42,
-	    zipmin(zip->entry_offset, 0xffffffffLL));
+		(uint32_t)zipmin(zip->entry_offset,
+				 ARCHIVE_LITERAL_LL(0xffffffff)));
 
 	return (ARCHIVE_OK);
 }
@@ -941,8 +1288,8 @@ archive_write_zip_close(struct archive_write *a)
 	offset_end = zip->written_bytes;
 
 	/* If central dir info is too large, write Zip64 end-of-cd */
-	if (offset_end - offset_start > 0xffffffffLL
-	    || offset_start > 0xffffffffLL
+	if (offset_end - offset_start > ARCHIVE_LITERAL_LL(0xffffffff)
+	    || offset_start > ARCHIVE_LITERAL_LL(0xffffffff)
 	    || zip->central_directory_entries > 0xffffUL
 	    || (zip->flags & ZIP_FLAG_FORCE_ZIP64)) {
 	  /* Zip64 end-of-cd record */
@@ -977,10 +1324,14 @@ archive_write_zip_close(struct archive_write *a)
 	/* Format and write end of central directory. */
 	memset(buff, 0, sizeof(buff));
 	memcpy(buff, "PK\005\006", 4);
-	archive_le16enc(buff + 8, zipmin(0xffffU, zip->central_directory_entries));
-	archive_le16enc(buff + 10, zipmin(0xffffU, zip->central_directory_entries));
-	archive_le32enc(buff + 12, (uint32_t)zipmin(0xffffffffLL, (offset_end - offset_start)));
-	archive_le32enc(buff + 16, (uint32_t)zipmin(0xffffffffLL, offset_start));
+	archive_le16enc(buff + 8, (uint16_t)zipmin(0xffffU,
+		zip->central_directory_entries));
+	archive_le16enc(buff + 10, (uint16_t)zipmin(0xffffU,
+		zip->central_directory_entries));
+	archive_le32enc(buff + 12,
+		(uint32_t)zipmin(0xffffffffLL, (offset_end - offset_start)));
+	archive_le32enc(buff + 16,
+		(uint32_t)zipmin(0xffffffffLL, offset_start));
 	ret = __archive_write_output(a, buff, 22);
 	if (ret != ARCHIVE_OK)
 		return (ARCHIVE_FATAL);
@@ -1001,10 +1352,12 @@ archive_write_zip_free(struct archive_write *a)
 		free(segment->buff);
 		free(segment);
 	}
-#ifdef HAVE_ZLIB_H
 	free(zip->buf);
-#endif
 	archive_entry_free(zip->entry);
+	if (zip->cctx_valid)
+		archive_encrypto_aes_ctr_release(&zip->cctx);
+	if (zip->hctx_valid)
+		archive_hmac_sha1_cleanup(&zip->hctx);
 	/* TODO: Free opt_sconv, sconv_default */
 
 	free(zip);
@@ -1124,3 +1477,199 @@ get_sconv(struct archive_write *a, struct zip *zip)
 	}
 	return (zip->sconv_default);
 }
+
+/*
+  Traditional PKWARE Decryption functions.
+ */
+
+static void
+trad_enc_update_keys(struct trad_enc_ctx *ctx, uint8_t c)
+{
+	uint8_t t;
+#define CRC32(c, b) (crc32(c ^ 0xffffffffUL, &b, 1) ^ 0xffffffffUL)
+
+	ctx->keys[0] = CRC32(ctx->keys[0], c);
+	ctx->keys[1] = (ctx->keys[1] + (ctx->keys[0] & 0xff)) * 134775813L + 1;
+	t = (ctx->keys[1] >> 24) & 0xff;
+	ctx->keys[2] = CRC32(ctx->keys[2], t);
+#undef CRC32
+}
+
+static uint8_t
+trad_enc_decypt_byte(struct trad_enc_ctx *ctx)
+{
+	unsigned temp = ctx->keys[2] | 2;
+	return (uint8_t)((temp * (temp ^ 1)) >> 8) & 0xff;
+}
+
+static unsigned
+trad_enc_encrypt_update(struct trad_enc_ctx *ctx, const uint8_t *in,
+    size_t in_len, uint8_t *out, size_t out_len)
+{
+	unsigned i, max;
+
+	max = (unsigned)((in_len < out_len)? in_len: out_len);
+
+	for (i = 0; i < max; i++) {
+		uint8_t t = in[i];
+		out[i] = t ^ trad_enc_decypt_byte(ctx);
+		trad_enc_update_keys(ctx, t);
+	}
+	return i;
+}
+
+static int
+trad_enc_init(struct trad_enc_ctx *ctx, const char *pw, size_t pw_len)
+{
+
+	ctx->keys[0] = 305419896L;
+	ctx->keys[1] = 591751049L;
+	ctx->keys[2] = 878082192L;
+
+	for (;pw_len; --pw_len)
+		trad_enc_update_keys(ctx, *pw++);
+	return 0;
+}
+
+static int
+is_traditional_pkware_encryption_supported(void)
+{
+	uint8_t key[TRAD_HEADER_SIZE];
+
+	if (archive_random(key, sizeof(key)-1) != ARCHIVE_OK)
+		return (0);
+	return (1);
+}
+
+static int
+init_traditional_pkware_encryption(struct archive_write *a)
+{
+	struct zip *zip = a->format_data;
+	const char *passphrase;
+	uint8_t key[TRAD_HEADER_SIZE];
+	uint8_t key_encrypted[TRAD_HEADER_SIZE];
+	int ret;
+
+	passphrase = __archive_write_get_passphrase(a);
+	if (passphrase == NULL) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Encryption needs passphrase");
+		return ARCHIVE_FAILED;
+	}
+	if (archive_random(key, sizeof(key)-1) != ARCHIVE_OK) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Can't generate random number for encryption");
+		return ARCHIVE_FATAL;
+	}
+	trad_enc_init(&zip->tctx, passphrase, strlen(passphrase));
+	/* Set the last key code which will be used as a check code
+	 * for verifying passphrase in decryption. */
+	key[TRAD_HEADER_SIZE-1] = zip->trad_chkdat;
+	trad_enc_encrypt_update(&zip->tctx, key, TRAD_HEADER_SIZE,
+	    key_encrypted, TRAD_HEADER_SIZE);
+	/* Write encrypted keys in the top of the file content. */
+	ret = __archive_write_output(a, key_encrypted, TRAD_HEADER_SIZE);
+	if (ret != ARCHIVE_OK)
+		return (ret);
+	zip->written_bytes += TRAD_HEADER_SIZE;
+	zip->entry_compressed_written += TRAD_HEADER_SIZE;
+	return (ret);
+}
+
+static int
+init_winzip_aes_encryption(struct archive_write *a)
+{
+	struct zip *zip = a->format_data;
+	const char *passphrase;
+	size_t key_len, salt_len;
+	uint8_t salt[16 + 2];
+	uint8_t derived_key[MAX_DERIVED_KEY_BUF_SIZE];
+	int ret;
+
+	passphrase = __archive_write_get_passphrase(a);
+	if (passphrase == NULL) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Encryption needs passphrase");
+		return (ARCHIVE_FAILED);
+	}
+	if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128) {
+		salt_len = 8;
+		key_len = 16;
+	} else {
+		/* AES 256 */
+		salt_len = 16;
+		key_len = 32;
+	}
+	if (archive_random(salt, salt_len) != ARCHIVE_OK) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Can't generate random number for encryption");
+		return (ARCHIVE_FATAL);
+	}
+	archive_pbkdf2_sha1(passphrase, strlen(passphrase),
+	    salt, salt_len, 1000, derived_key, key_len * 2 + 2);
+
+	ret = archive_encrypto_aes_ctr_init(&zip->cctx, derived_key, key_len);
+	if (ret != 0) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Decryption is unsupported due to lack of crypto library");
+		return (ARCHIVE_FAILED);
+	}
+	ret = archive_hmac_sha1_init(&zip->hctx, derived_key + key_len,
+	    key_len);
+	if (ret != 0) {
+		archive_encrypto_aes_ctr_release(&zip->cctx);
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Failed to initialize HMAC-SHA1");
+		return (ARCHIVE_FAILED);
+        }
+
+	/* Set a passowrd verification value after the 'salt'. */
+	salt[salt_len] = derived_key[key_len * 2];
+	salt[salt_len + 1] = derived_key[key_len * 2 + 1];
+
+	/* Write encrypted keys in the top of the file content. */
+	ret = __archive_write_output(a, salt, salt_len + 2);
+	if (ret != ARCHIVE_OK)
+		return (ret);
+	zip->written_bytes += salt_len + 2;
+	zip->entry_compressed_written += salt_len + 2;
+
+	return (ARCHIVE_OK);
+}
+
+static int
+is_winzip_aes_encryption_supported(int encryption)
+{
+	size_t key_len, salt_len;
+	uint8_t salt[16 + 2];
+	uint8_t derived_key[MAX_DERIVED_KEY_BUF_SIZE];
+	archive_crypto_ctx cctx;
+	archive_hmac_sha1_ctx hctx;
+	int ret;
+
+	if (encryption == ENCRYPTION_WINZIP_AES128) {
+		salt_len = 8;
+		key_len = 16;
+	} else {
+		/* AES 256 */
+		salt_len = 16;
+		key_len = 32;
+	}
+	if (archive_random(salt, salt_len) != ARCHIVE_OK)
+		return (0);
+	ret = archive_pbkdf2_sha1("p", 1, salt, salt_len, 1000,
+	    derived_key, key_len * 2 + 2);
+	if (ret != 0)
+		return (0);
+
+	ret = archive_encrypto_aes_ctr_init(&cctx, derived_key, key_len);
+	if (ret != 0)
+		return (0);
+	ret = archive_hmac_sha1_init(&hctx, derived_key + key_len,
+	    key_len);
+	archive_encrypto_aes_ctr_release(&cctx);
+	if (ret != 0)
+		return (0);
+	archive_hmac_sha1_cleanup(&hctx);
+	return (1);
+}
diff --git a/libarchive/archive_write_set_options.3 b/libarchive/archive_write_set_options.3
index 9d60515..500914f 100644
--- a/libarchive/archive_write_set_options.3
+++ b/libarchive/archive_write_set_options.3
@@ -397,6 +397,48 @@ Specifies a filename that should not be compressed when using
 This option can be provided multiple times to suppress compression
 on many files.
 .El
+.It Format zip
+.Bl -tag -compact -width indent
+.It Cm compression
+The value is either
+.Dq store
+or
+.Dq deflate
+to indicate how the following entries should be compressed.
+Note that this setting is ignored for directories, symbolic links,
+and other special entries.
+.It Cm experimental
+This boolean option enables or disables experimental Zip features
+that may not be compatible with other Zip implementations.
+.It Cm fakecrc32
+This boolean option disables CRC calculations.
+All CRC fields are set to zero.
+It should not be used except for testing purposes.
+.It Cm hdrcharset
+This sets the character set used for filenames.
+.It Cm zip64
+Zip64 extensions provide additional file size information
+for entries larger than 4 GiB.
+They also provide extended file offset and archive size information
+when archives exceed 4 GiB.
+By default, the Zip writer selectively enables these extensions only as needed.
+In particular, if the file size is unknown, the Zip writer will
+include Zip64 extensions to guard against the possibility that the
+file might be larger than 4 GiB.
+.Pp
+Setting this boolean option will force the writer to use Zip64 extensions
+even for small files that would not otherwise require them.
+This is primarily useful for testing.
+.Pp
+Disabling this option with
+.Cm !zip64
+will force the Zip writer to avoid Zip64 extensions:
+It will reject files with size greater than 4 GiB,
+it will reject any new entries once the total archive size reaches 4 GiB,
+and it will not use Zip64 extensions for files with unknown size.
+In particular, this can improve compatibility when generating archives
+where the entry sizes are not known in advance.
+.El
 .El
 .Sh EXAMPLES
 The following example creates an archive write handle to
diff --git a/libarchive/archive_write_data.3 b/libarchive/archive_write_set_passphrase.3
similarity index 60%
copy from libarchive/archive_write_data.3
copy to libarchive/archive_write_set_passphrase.3
index cfd5cd5..2585595 100644
--- a/libarchive/archive_write_data.3
+++ b/libarchive/archive_write_set_passphrase.3
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2003-2011 Tim Kientzle
+.\" Copyright (c) 2014 Michihiro NAKAJIMA
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,39 +24,51 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 2, 2012
-.Dt ARCHIVE_WRITE_DATA 3
+.Dd September 21, 2014
+.Dt ARCHIVE_WRITE_SET_PASSPHRASE 3
 .Os
 .Sh NAME
-.Nm archive_write_data
-.Nd functions for creating archives
+.Nm archive_write_set_passphrase ,
+.Nm archive_write_set_passphrase_callback
+.Nd functions for writing encrypted archives
 .Sh LIBRARY
 Streaming Archive Library (libarchive, -larchive)
 .Sh SYNOPSIS
 .In archive.h
-.Ft ssize_t
-.Fn archive_write_data "struct archive *" "const void *" "size_t"
+.Ft int
+.Fo archive_write_set_passphrase
+.Fa "struct archive *"
+.Fa "const char *passphrase"
+.Fc
+.Ft int
+.Fo archive_write_set_passphrase_callback
+.Fa "struct archive *"
+.Fa "void *client_data"
+.Fa "archive_passphrase_callback *"
+.Fc
 .Sh DESCRIPTION
-Write data corresponding to the header just written.
-.\" .Sh EXAMPLE
-.\"
-.Sh RETURN VALUES
-This function returns the number of bytes actually written, or
-.Li -1
-on error.
-.\"
-.Sh ERRORS
-Detailed error codes and textual descriptions are available from the
-.Fn archive_errno
-and
-.Fn archive_error_string
-functions.
-.\"
+.Bl -tag -width indent
+.It Fn archive_write_set_passphrase
+Set a passphrase for writing an encryption archive.
+If
+.Ar passphrase
+is
+.Dv NULL
+or empty, this function will do nothing and
+.Cm ARCHIVE_FAILED
+will be returned.
+Otherwise,
+.Cm ARCHIVE_OK
+will be returned. 
+.It Fn archive_write_set_passphrase_callback
+Register callback function that will be invoked to get a passphrase
+for encrption if the passphrase was not set by the
+.Fn archive_write_set_passphrase
+function.
+.El
+.\" .Sh ERRORS
 .Sh SEE ALSO
 .Xr tar 1 ,
 .Xr libarchive 3 ,
-.Xr archive_write_finish_entry 3 ,
-.Xr archive_write_set_options 3 ,
-.Xr cpio 5 ,
-.Xr mtree 5 ,
-.Xr tar 5
+.Xr archive_write 3 ,
+.Xr archive_write_set_options 3
diff --git a/libarchive/archive_write_set_passphrase.c b/libarchive/archive_write_set_passphrase.c
new file mode 100644
index 0000000..710ecba
--- /dev/null
+++ b/libarchive/archive_write_set_passphrase.c
@@ -0,0 +1,95 @@
+/*-
+ * Copyright (c) 2014 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+__FBSDID("$FreeBSD$");
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include "archive_write_private.h"
+
+int
+archive_write_set_passphrase(struct archive *_a, const char *p)
+{
+	struct archive_write *a = (struct archive_write *)_a;
+
+	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW,
+		"archive_write_set_passphrase");
+
+	if (p == NULL || p[0] == '\0') {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Empty passphrase is unacceptable");
+		return (ARCHIVE_FAILED);
+	}
+	free(a->passphrase);
+	a->passphrase = strdup(p);
+	if (a->passphrase == NULL) {
+		archive_set_error(&a->archive, ENOMEM,
+		    "Can't allocate data for passphrase");
+		return (ARCHIVE_FATAL);
+	}
+	return (ARCHIVE_OK);
+}
+
+
+int
+archive_write_set_passphrase_callback(struct archive *_a, void *client_data,
+    archive_passphrase_callback *cb)
+{
+	struct archive_write *a = (struct archive_write *)_a;
+
+	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW,
+		"archive_write_set_passphrase_callback");
+
+	a->passphrase_callback = cb;
+	a->passphrase_client_data = client_data;
+	return (ARCHIVE_OK);
+}
+
+
+const char *
+__archive_write_get_passphrase(struct archive_write *a)
+{
+
+	if (a->passphrase != NULL)
+		return (a->passphrase);
+
+	if (a->passphrase_callback != NULL) {
+		const char *p;
+		p = a->passphrase_callback(&a->archive,
+		    a->passphrase_client_data);
+		if (p != NULL) {
+			a->passphrase = strdup(p);
+			if (a->passphrase == NULL) {
+				archive_set_error(&a->archive, ENOMEM,
+				    "Can't allocate data for passphrase");
+				return (NULL);
+			}
+			return (a->passphrase);
+		}
+	}
+	return (NULL);
+}
diff --git a/libarchive/archive_write_add_filter.c b/libarchive/archive_xxhash.h
similarity index 50%
copy from libarchive/archive_write_add_filter.c
copy to libarchive/archive_xxhash.h
index 81dd683..4272416 100644
--- a/libarchive/archive_write_add_filter.c
+++ b/libarchive/archive_xxhash.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012 Ondrej Holy
+ * Copyright (c) 2014 Michihiro NAKAJIMA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,50 +21,27 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
-#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
 #endif
 
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
+#ifndef ARCHIVE_XXHASH_H
+#define ARCHIVE_XXHASH_H
 
-#include "archive.h"
-#include "archive_private.h"
+typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
 
-/* A table that maps filter codes to functions. */
-static
-struct { int code; int (*setter)(struct archive *); } codes[] =
-{
-	{ ARCHIVE_FILTER_NONE,		archive_write_add_filter_none },
-	{ ARCHIVE_FILTER_GZIP,		archive_write_add_filter_gzip },
-	{ ARCHIVE_FILTER_BZIP2,		archive_write_add_filter_bzip2 },
-	{ ARCHIVE_FILTER_COMPRESS,	archive_write_add_filter_compress },
-	{ ARCHIVE_FILTER_GRZIP,		archive_write_add_filter_grzip },
-	{ ARCHIVE_FILTER_LRZIP,		archive_write_add_filter_lrzip },
-	{ ARCHIVE_FILTER_LZIP,		archive_write_add_filter_lzip },
-	{ ARCHIVE_FILTER_LZMA,		archive_write_add_filter_lzma },
-	{ ARCHIVE_FILTER_LZOP,		archive_write_add_filter_lzip },
-	{ ARCHIVE_FILTER_UU,		archive_write_add_filter_uuencode },
-	{ ARCHIVE_FILTER_XZ,		archive_write_add_filter_xz },
-	{ -1,			NULL }
+struct archive_xxhash {
+	unsigned int  (*XXH32)(const void* input, unsigned int len,
+			unsigned int seed);
+	void*         (*XXH32_init)(unsigned int seed);
+	XXH_errorcode (*XXH32_update)(void* state, const void* input,
+			unsigned int len);
+	unsigned int  (*XXH32_digest)(void* state);
 };
 
-int
-archive_write_add_filter(struct archive *a, int code)
-{
-	int i;
+extern const struct archive_xxhash __archive_xxhash;
 
-	for (i = 0; codes[i].code != -1; i++) {
-		if (code == codes[i].code)
-			return ((codes[i].setter)(a));
-	}
-
-	archive_set_error(a, EINVAL, "No such filter");
-	return (ARCHIVE_FATAL);
-}
+#endif
diff --git a/libarchive/libarchive.3 b/libarchive/libarchive.3
index 3a9a841..c6894d2 100644
--- a/libarchive/libarchive.3
+++ b/libarchive/libarchive.3
@@ -146,11 +146,11 @@ pages for each API or utility function.
 .\"
 .Sh READING AN ARCHIVE
 See
-.Xr libarchive_read 3 .
+.Xr archive_read 3 .
 .\"
 .Sh WRITING AN ARCHIVE
 See
-.Xr libarchive_write 3 .
+.Xr archive_write 3 .
 .\"
 .Sh WRITING ENTRIES TO DISK
 The
diff --git a/libarchive/libarchive_internals.3 b/libarchive/libarchive_internals.3
index 4aa09f9..8275d66 100644
--- a/libarchive/libarchive_internals.3
+++ b/libarchive/libarchive_internals.3
@@ -347,11 +347,11 @@ Fortunately, such archives are very rare, and libarchive can read
 most ZIP archives, though it cannot always extract as much information
 as a dedicated ZIP program.
 .Sh SEE ALSO
-.Xr archive 3 ,
 .Xr archive_entry 3 ,
 .Xr archive_read 3 ,
 .Xr archive_write 3 ,
 .Xr archive_write_disk 3
+.Xr libarchive 3 ,
 .Sh HISTORY
 The
 .Nm libarchive
diff --git a/libarchive/mtree.5 b/libarchive/mtree.5
index 8c45a7d..16c8abe 100644
--- a/libarchive/mtree.5
+++ b/libarchive/mtree.5
@@ -56,14 +56,6 @@ corresponding character.
 .Pp
 Each line is interpreted independently as one of the following types:
 .Bl -tag -width Cm
-.It Signature
-The first line of any mtree file must begin with
-.Dq #mtree .
-If a file contains any full path entries, the first line should
-begin with
-.Dq #mtree v2.0 ,
-otherwise, the first line should begin with
-.Dq #mtree v1.0 .
 .It Blank
 Blank lines are ignored.
 .It Comment
@@ -302,16 +294,6 @@ The file owner as a symbolic name.
 .Xr find 1 ,
 .Xr mtree 8
 .Sh BUGS
-The
-.Fx
-implementation of mtree does not currently support
-the
-.Nm
-2.0
-format.
-The requirement for a
-.Dq #mtree
-signature line is new and not yet widely implemented.
 .Sh HISTORY
 The
 .Nm
diff --git a/libarchive/tar.5 b/libarchive/tar.5
index 688bb92..6e6f0c0 100644
--- a/libarchive/tar.5
+++ b/libarchive/tar.5
@@ -935,7 +935,7 @@ and formed the basis of
 (circa 1988).
 Joerg Shilling's
 .Nm star
-archiver is another open-source (GPL) archiver (originally developed
+archiver is another open-source (CDDL) archiver (originally developed
 circa 1985) which features complete support for pax interchange
 format.
 .Pp
diff --git a/libarchive/xxhash.c b/libarchive/xxhash.c
new file mode 100644
index 0000000..f7647a5
--- /dev/null
+++ b/libarchive/xxhash.c
@@ -0,0 +1,500 @@
+/*
+xxHash - Fast Hash algorithm
+Copyright (C) 2012-2014, Yann Collet.
+BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+You can contact the author at :
+- xxHash source repository : http://code.google.com/p/xxhash/
+*/
+
+#include "archive_platform.h"
+#ifdef HAVE_LIBLZ4
+
+/***************************************
+** Tuning parameters
+****************************************/
+/* Unaligned memory access is automatically enabled for "common" CPU, such as x86.
+** For others CPU, the compiler will be more cautious, and insert extra code to ensure aligned access is respected.
+** If you know your target CPU supports unaligned memory access, you want to force this option manually to improve performance.
+** You can also enable this parameter if you know your input data will always be aligned (boundaries of 4, for U32).
+*/
+#if defined(__ARM_FEATURE_UNALIGNED) || defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
+#  define XXH_USE_UNALIGNED_ACCESS 1
+#endif
+
+/* XXH_ACCEPT_NULL_INPUT_POINTER :
+** If the input pointer is a null pointer, xxHash default behavior is to trigger a memory access error, since it is a bad pointer.
+** When this option is enabled, xxHash output for null input pointers will be the same as a null-length input.
+** This option has a very small performance cost (only measurable on small inputs).
+** By default, this option is disabled. To enable it, uncomment below define :
+** #define XXH_ACCEPT_NULL_INPUT_POINTER 1
+
+** XXH_FORCE_NATIVE_FORMAT :
+** By default, xxHash library provides endian-independant Hash values, based on little-endian convention.
+** Results are therefore identical for little-endian and big-endian CPU.
+** This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format.
+** Should endian-independance be of no importance for your application, you may set the #define below to 1.
+** It will improve speed for Big-endian CPU.
+** This option has no impact on Little_Endian CPU.
+*/
+#define XXH_FORCE_NATIVE_FORMAT 0
+
+/***************************************
+** Compiler Specific Options
+****************************************/
+/* Disable some Visual warning messages */
+#ifdef _MSC_VER  /* Visual Studio */
+#  pragma warning(disable : 4127)      /* disable: C4127: conditional expression is constant */
+#endif
+
+#ifdef _MSC_VER    /* Visual Studio */
+#  define FORCE_INLINE __forceinline
+#else
+#  ifdef __GNUC__
+#    define FORCE_INLINE inline __attribute__((always_inline))
+#  else
+#    define FORCE_INLINE inline
+#  endif
+#endif
+
+/***************************************
+** Includes & Memory related functions
+****************************************/
+#include "archive_xxhash.h"
+#include <stdlib.h>
+#define XXH_malloc malloc
+#define XXH_free free
+#include <string.h>
+#define XXH_memcpy memcpy
+
+
+static unsigned int	  XXH32 (const void*, unsigned int, unsigned int);
+static void*		  XXH32_init   (unsigned int);
+static XXH_errorcode	  XXH32_update (void*, const void*, unsigned int);
+static unsigned int	  XXH32_digest (void*);
+/*static int		  XXH32_sizeofState(void);*/
+static XXH_errorcode	  XXH32_resetState(void*, unsigned int);
+#define       XXH32_SIZEOFSTATE 48
+typedef struct { long long ll[(XXH32_SIZEOFSTATE+(sizeof(long long)-1))/sizeof(long long)]; } XXH32_stateSpace_t;
+static unsigned int	  XXH32_intermediateDigest (void*);
+
+/***************************************
+** Basic Types
+****************************************/
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
+# include <stdint.h>
+  typedef uint8_t  BYTE;
+  typedef uint16_t U16;
+  typedef uint32_t U32;
+  typedef  int32_t S32;
+  typedef uint64_t U64;
+#else
+  typedef unsigned char      BYTE;
+  typedef unsigned short     U16;
+  typedef unsigned int       U32;
+  typedef   signed int       S32;
+  typedef unsigned long long U64;
+#endif
+
+#if defined(__GNUC__)  && !defined(XXH_USE_UNALIGNED_ACCESS)
+#  define _PACKED __attribute__ ((packed))
+#else
+#  define _PACKED
+#endif
+
+#if !defined(XXH_USE_UNALIGNED_ACCESS) && !defined(__GNUC__)
+#  ifdef __IBMC__
+#    pragma pack(1)
+#  else
+#    pragma pack(push, 1)
+#  endif
+#endif
+
+typedef struct _U32_S { U32 v; } _PACKED U32_S;
+
+#if !defined(XXH_USE_UNALIGNED_ACCESS) && !defined(__GNUC__)
+#  pragma pack(pop)
+#endif
+
+#define A32(x) (((const U32_S *)(x))->v)
+
+
+/****************************************
+** Compiler-specific Functions and Macros
+*****************************************/
+#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+
+/* Note : although _rotl exists for minGW (GCC under windows), performance seems poor */
+#if defined(_MSC_VER)
+#  define XXH_rotl32(x,r) _rotl(x,r)
+#else
+#  define XXH_rotl32(x,r) ((x << r) | (x >> (32 - r)))
+#endif
+
+#if defined(_MSC_VER)     /* Visual Studio */
+#  define XXH_swap32 _byteswap_ulong
+#elif GCC_VERSION >= 403
+#  define XXH_swap32 __builtin_bswap32
+#else
+static inline U32 XXH_swap32 (U32 x) {
+    return  ((x << 24) & 0xff000000 ) |
+			((x <<  8) & 0x00ff0000 ) |
+			((x >>  8) & 0x0000ff00 ) |
+			((x >> 24) & 0x000000ff );}
+#endif
+
+
+/***************************************
+** Constants
+****************************************/
+#define PRIME32_1   2654435761U
+#define PRIME32_2   2246822519U
+#define PRIME32_3   3266489917U
+#define PRIME32_4    668265263U
+#define PRIME32_5    374761393U
+
+
+/***************************************
+** Architecture Macros
+****************************************/
+typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
+#ifndef XXH_CPU_LITTLE_ENDIAN   /* It is possible to define XXH_CPU_LITTLE_ENDIAN externally, for example using a compiler switch */
+    static const int one = 1;
+#   define XXH_CPU_LITTLE_ENDIAN   (*(const char*)(&one))
+#endif
+
+
+/***************************************
+** Macros
+****************************************/
+#define XXH_STATIC_ASSERT(c)   { enum { XXH_static_assert = 1/(!!(c)) }; }    /* use only *after* variable declarations */
+
+
+/*****************************
+** Memory reads
+******************************/
+typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;
+
+static
+FORCE_INLINE U32 XXH_readLE32_align(const U32* ptr, XXH_endianess endian, XXH_alignment align)
+{
+    if (align==XXH_unaligned)
+        return endian==XXH_littleEndian ? A32(ptr) : XXH_swap32(A32(ptr));
+    else
+        return endian==XXH_littleEndian ? *ptr : XXH_swap32(*ptr);
+}
+
+static
+FORCE_INLINE U32 XXH_readLE32(const U32* ptr, XXH_endianess endian) { return XXH_readLE32_align(ptr, endian, XXH_unaligned); }
+
+
+/*****************************
+** Simple Hash Functions
+******************************/
+static
+FORCE_INLINE U32 XXH32_endian_align(const void* input, unsigned int len, U32 seed, XXH_endianess endian, XXH_alignment align)
+{
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* bEnd = p + len;
+    U32 h32;
+#define XXH_get32bits(p) XXH_readLE32_align((const U32*)p, endian, align)
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (p==NULL) { len=0; bEnd=p=(const BYTE*)(size_t)16; }
+#endif
+
+    if (len>=16)
+    {
+        const BYTE* const limit = bEnd - 16;
+        U32 v1 = seed + PRIME32_1 + PRIME32_2;
+        U32 v2 = seed + PRIME32_2;
+        U32 v3 = seed + 0;
+        U32 v4 = seed - PRIME32_1;
+
+        do
+        {
+            v1 += XXH_get32bits(p) * PRIME32_2; v1 = XXH_rotl32(v1, 13); v1 *= PRIME32_1; p+=4;
+            v2 += XXH_get32bits(p) * PRIME32_2; v2 = XXH_rotl32(v2, 13); v2 *= PRIME32_1; p+=4;
+            v3 += XXH_get32bits(p) * PRIME32_2; v3 = XXH_rotl32(v3, 13); v3 *= PRIME32_1; p+=4;
+            v4 += XXH_get32bits(p) * PRIME32_2; v4 = XXH_rotl32(v4, 13); v4 *= PRIME32_1; p+=4;
+        } while (p<=limit);
+
+        h32 = XXH_rotl32(v1, 1) + XXH_rotl32(v2, 7) + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18);
+    }
+    else
+    {
+        h32  = seed + PRIME32_5;
+    }
+
+    h32 += (U32) len;
+
+    while (p<=bEnd-4)
+    {
+        h32 += XXH_get32bits(p) * PRIME32_3;
+        h32  = XXH_rotl32(h32, 17) * PRIME32_4 ;
+        p+=4;
+    }
+
+    while (p<bEnd)
+    {
+        h32 += (*p) * PRIME32_5;
+        h32 = XXH_rotl32(h32, 11) * PRIME32_1 ;
+        p++;
+    }
+
+    h32 ^= h32 >> 15;
+    h32 *= PRIME32_2;
+    h32 ^= h32 >> 13;
+    h32 *= PRIME32_3;
+    h32 ^= h32 >> 16;
+
+    return h32;
+}
+
+
+U32 XXH32(const void* input, unsigned int len, U32 seed)
+{
+#if 0
+    // Simple version, good for code maintenance, but unfortunately slow for small inputs
+    void* state = XXH32_init(seed);
+    XXH32_update(state, input, len);
+    return XXH32_digest(state);
+#else
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+#  if !defined(XXH_USE_UNALIGNED_ACCESS)
+    if ((((size_t)input) & 3) == 0)   /* Input is aligned, let's leverage the speed advantage */
+    {
+        if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+            return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_aligned);
+        else
+            return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_aligned);
+    }
+#  endif
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_endian_align(input, len, seed, XXH_littleEndian, XXH_unaligned);
+    else
+        return XXH32_endian_align(input, len, seed, XXH_bigEndian, XXH_unaligned);
+#endif
+}
+
+/*****************************
+** Advanced Hash Functions
+******************************/
+
+struct XXH_state32_t
+{
+    U64 total_len;
+    U32 seed;
+    U32 v1;
+    U32 v2;
+    U32 v3;
+    U32 v4;
+    int memsize;
+    char memory[16];
+};
+
+#if 0
+static
+int XXH32_sizeofState(void)
+{
+    XXH_STATIC_ASSERT(XXH32_SIZEOFSTATE >= sizeof(struct XXH_state32_t));   /* A compilation error here means XXH32_SIZEOFSTATE is not large enough */
+    return sizeof(struct XXH_state32_t);
+}
+#endif
+
+static
+XXH_errorcode XXH32_resetState(void* state_in, U32 seed)
+{
+    struct XXH_state32_t * state = (struct XXH_state32_t *) state_in;
+    state->seed = seed;
+    state->v1 = seed + PRIME32_1 + PRIME32_2;
+    state->v2 = seed + PRIME32_2;
+    state->v3 = seed + 0;
+    state->v4 = seed - PRIME32_1;
+    state->total_len = 0;
+    state->memsize = 0;
+    return XXH_OK;
+}
+
+static
+void* XXH32_init (U32 seed)
+{
+    void* state = XXH_malloc (sizeof(struct XXH_state32_t));
+    XXH32_resetState(state, seed);
+    return state;
+}
+
+static
+FORCE_INLINE XXH_errorcode XXH32_update_endian (void* state_in, const void* input, int len, XXH_endianess endian)
+{
+    struct XXH_state32_t * state = (struct XXH_state32_t *) state_in;
+    const BYTE* p = (const BYTE*)input;
+    const BYTE* const bEnd = p + len;
+
+#ifdef XXH_ACCEPT_NULL_INPUT_POINTER
+    if (input==NULL) return XXH_ERROR;
+#endif
+
+    state->total_len += len;
+
+    if (state->memsize + len < 16)   /* fill in tmp buffer */
+    {
+        XXH_memcpy(state->memory + state->memsize, input, len);
+        state->memsize +=  len;
+        return XXH_OK;
+    }
+
+    if (state->memsize)   /* some data left from previous update */
+    {
+        XXH_memcpy(state->memory + state->memsize, input, 16-state->memsize);
+        {
+            const U32* p32 = (const U32*)state->memory;
+            state->v1 += XXH_readLE32(p32, endian) * PRIME32_2; state->v1 = XXH_rotl32(state->v1, 13); state->v1 *= PRIME32_1; p32++;
+            state->v2 += XXH_readLE32(p32, endian) * PRIME32_2; state->v2 = XXH_rotl32(state->v2, 13); state->v2 *= PRIME32_1; p32++;
+            state->v3 += XXH_readLE32(p32, endian) * PRIME32_2; state->v3 = XXH_rotl32(state->v3, 13); state->v3 *= PRIME32_1; p32++;
+            state->v4 += XXH_readLE32(p32, endian) * PRIME32_2; state->v4 = XXH_rotl32(state->v4, 13); state->v4 *= PRIME32_1; p32++;
+        }
+        p += 16-state->memsize;
+        state->memsize = 0;
+    }
+
+    if (p <= bEnd-16)
+    {
+        const BYTE* const limit = bEnd - 16;
+        U32 v1 = state->v1;
+        U32 v2 = state->v2;
+        U32 v3 = state->v3;
+        U32 v4 = state->v4;
+
+        do
+        {
+            v1 += XXH_readLE32((const U32*)p, endian) * PRIME32_2; v1 = XXH_rotl32(v1, 13); v1 *= PRIME32_1; p+=4;
+            v2 += XXH_readLE32((const U32*)p, endian) * PRIME32_2; v2 = XXH_rotl32(v2, 13); v2 *= PRIME32_1; p+=4;
+            v3 += XXH_readLE32((const U32*)p, endian) * PRIME32_2; v3 = XXH_rotl32(v3, 13); v3 *= PRIME32_1; p+=4;
+            v4 += XXH_readLE32((const U32*)p, endian) * PRIME32_2; v4 = XXH_rotl32(v4, 13); v4 *= PRIME32_1; p+=4;
+        } while (p<=limit);
+
+        state->v1 = v1;
+        state->v2 = v2;
+        state->v3 = v3;
+        state->v4 = v4;
+    }
+
+    if (p < bEnd)
+    {
+        XXH_memcpy(state->memory, p, bEnd-p);
+        state->memsize = (int)(bEnd-p);
+    }
+
+    return XXH_OK;
+}
+
+static
+XXH_errorcode XXH32_update (void* state_in, const void* input, unsigned int len)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_update_endian(state_in, input, len, XXH_littleEndian);
+    else
+        return XXH32_update_endian(state_in, input, len, XXH_bigEndian);
+}
+
+
+
+static
+FORCE_INLINE U32 XXH32_intermediateDigest_endian (void* state_in, XXH_endianess endian)
+{
+    struct XXH_state32_t * state = (struct XXH_state32_t *) state_in;
+    const BYTE * p = (const BYTE*)state->memory;
+    BYTE* bEnd = (BYTE*)state->memory + state->memsize;
+    U32 h32;
+
+    if (state->total_len >= 16)
+    {
+        h32 = XXH_rotl32(state->v1, 1) + XXH_rotl32(state->v2, 7) + XXH_rotl32(state->v3, 12) + XXH_rotl32(state->v4, 18);
+    }
+    else
+    {
+        h32  = state->seed + PRIME32_5;
+    }
+
+    h32 += (U32) state->total_len;
+
+    while (p<=bEnd-4)
+    {
+        h32 += XXH_readLE32((const U32*)p, endian) * PRIME32_3;
+        h32  = XXH_rotl32(h32, 17) * PRIME32_4;
+        p+=4;
+    }
+
+    while (p<bEnd)
+    {
+        h32 += (*p) * PRIME32_5;
+        h32 = XXH_rotl32(h32, 11) * PRIME32_1;
+        p++;
+    }
+
+    h32 ^= h32 >> 15;
+    h32 *= PRIME32_2;
+    h32 ^= h32 >> 13;
+    h32 *= PRIME32_3;
+    h32 ^= h32 >> 16;
+
+    return h32;
+}
+
+static
+U32 XXH32_intermediateDigest (void* state_in)
+{
+    XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;
+
+    if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)
+        return XXH32_intermediateDigest_endian(state_in, XXH_littleEndian);
+    else
+        return XXH32_intermediateDigest_endian(state_in, XXH_bigEndian);
+}
+
+static
+U32 XXH32_digest (void* state_in)
+{
+    U32 h32 = XXH32_intermediateDigest(state_in);
+
+    XXH_free(state_in);
+
+    return h32;
+}
+
+const
+struct archive_xxhash __archive_xxhash = {
+	XXH32,
+	XXH32_init,
+	XXH32_update,
+	XXH32_digest
+};
+#endif /* HAVE_LIBLZ4 */

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt                                     |    2 +
 Source/cmArchiveWrite.cxx                          |    4 +
 Source/cmSystemTools.cxx                           |    3 +
 Utilities/cmlibarchive/CMakeLists.txt              |   75 +-
 Utilities/cmlibarchive/COPYING                     |    5 +-
 Utilities/cmlibarchive/README-CMake.txt            |    8 +-
 .../build/cmake/CreatePkgConfigFile.cmake          |    6 +-
 Utilities/cmlibarchive/build/cmake/config.h.in     |   41 +-
 Utilities/cmlibarchive/libarchive/CMakeLists.txt   |   21 +-
 Utilities/cmlibarchive/libarchive/archive.h        |  186 ++--
 .../cmlibarchive/libarchive/archive_cryptor.c      |  432 ++++++++
 .../libarchive/archive_cryptor_private.h           |  145 +++
 .../{archive_crypto.c => archive_digest.c}         |   10 +-
 ...e_crypto_private.h => archive_digest_private.h} |   42 +-
 Utilities/cmlibarchive/libarchive/archive_entry.3  |    2 +-
 Utilities/cmlibarchive/libarchive/archive_entry.c  |  130 ++-
 Utilities/cmlibarchive/libarchive/archive_entry.h  |   59 +-
 .../cmlibarchive/libarchive/archive_entry_acl.3    |    2 +-
 .../cmlibarchive/libarchive/archive_entry_paths.3  |    2 +-
 .../cmlibarchive/libarchive/archive_entry_perms.3  |    2 +-
 .../cmlibarchive/libarchive/archive_entry_stat.3   |    4 +-
 .../cmlibarchive/libarchive/archive_entry_time.3   |    2 +-
 .../cmlibarchive/libarchive/archive_entry_xattr.c  |    5 +-
 Utilities/cmlibarchive/libarchive/archive_hmac.c   |  234 +++++
 .../cmlibarchive/libarchive/archive_hmac_private.h |   88 ++
 Utilities/cmlibarchive/libarchive/archive_match.c  |    9 +-
 .../cmlibarchive/libarchive/archive_pathmatch.c    |    8 +-
 .../cmlibarchive/libarchive/archive_private.h      |   19 +
 Utilities/cmlibarchive/libarchive/archive_random.c |  266 +++++
 ...write_add_filter.c => archive_random_private.h} |   50 +-
 Utilities/cmlibarchive/libarchive/archive_read.3   |    4 +-
 Utilities/cmlibarchive/libarchive/archive_read.c   |   74 +-
 ..._write_data.3 => archive_read_add_passphrase.3} |   66 +-
 .../libarchive/archive_read_add_passphrase.c       |  186 ++++
 .../libarchive/archive_read_append_filter.c        |    6 +-
 .../cmlibarchive/libarchive/archive_read_data.3    |    2 +-
 .../libarchive/archive_read_disk_entry_from_file.c |    8 +-
 .../libarchive/archive_read_disk_posix.c           |   23 +-
 .../libarchive/archive_read_disk_private.h         |    5 +
 .../archive_read_disk_set_standard_lookup.c        |    2 +-
 .../libarchive/archive_read_disk_windows.c         |   19 +-
 .../cmlibarchive/libarchive/archive_read_extract.c |   17 -
 .../libarchive/archive_read_extract2.c             |   21 +-
 .../cmlibarchive/libarchive/archive_read_filter.3  |   17 +-
 .../cmlibarchive/libarchive/archive_read_open.3    |    4 +-
 .../cmlibarchive/libarchive/archive_read_open_fd.c |   29 +
 .../libarchive/archive_read_open_memory.c          |   12 +-
 .../cmlibarchive/libarchive/archive_read_private.h |   43 +-
 .../libarchive/archive_read_set_options.c          |    7 +-
 .../libarchive/archive_read_support_filter_all.c   |    2 +
 .../archive_read_support_filter_compress.c         |   24 +-
 .../libarchive/archive_read_support_filter_lz4.c   |  728 +++++++++++++
 .../libarchive/archive_read_support_filter_lzop.c  |    7 +
 .../libarchive/archive_read_support_filter_uu.c    |    3 +-
 .../libarchive/archive_read_support_filter_xz.c    |    2 +-
 .../libarchive/archive_read_support_format_7zip.c  |   48 +-
 .../libarchive/archive_read_support_format_all.c   |    1 +
 .../libarchive/archive_read_support_format_ar.c    |   21 +-
 .../libarchive/archive_read_support_format_cpio.c  |   22 +-
 .../archive_read_support_format_iso9660.c          |   72 +-
 .../libarchive/archive_read_support_format_lha.c   |  477 +++++----
 .../libarchive/archive_read_support_format_mtree.c |  266 ++---
 .../libarchive/archive_read_support_format_rar.c   |   34 +-
 .../libarchive/archive_read_support_format_tar.c   |   44 +-
 .../libarchive/archive_read_support_format_warc.c  |  794 +++++++++++++++
 .../libarchive/archive_read_support_format_xar.c   |   34 +-
 .../libarchive/archive_read_support_format_zip.c   | 1070 +++++++++++++++++---
 Utilities/cmlibarchive/libarchive/archive_string.c |   91 +-
 Utilities/cmlibarchive/libarchive/archive_util.c   |  143 +--
 .../cmlibarchive/libarchive/archive_windows.h      |    2 +
 Utilities/cmlibarchive/libarchive/archive_write.3  |   15 +-
 Utilities/cmlibarchive/libarchive/archive_write.c  |   11 +
 .../libarchive/archive_write_add_filter.c          |    1 +
 .../libarchive/archive_write_add_filter_by_name.c  |    1 +
 .../libarchive/archive_write_add_filter_lz4.c      |  646 ++++++++++++
 .../libarchive/archive_write_add_filter_xz.c       |   44 +-
 .../cmlibarchive/libarchive/archive_write_data.3   |   14 +-
 .../cmlibarchive/libarchive/archive_write_disk.3   |   10 +-
 .../libarchive/archive_write_disk_posix.c          |   87 +-
 .../archive_write_disk_set_standard_lookup.c       |    7 +-
 .../libarchive/archive_write_disk_windows.c        |    6 +-
 .../cmlibarchive/libarchive/archive_write_filter.3 |   18 +-
 .../libarchive/archive_write_finish_entry.3        |    2 +-
 .../cmlibarchive/libarchive/archive_write_format.3 |   16 +-
 .../cmlibarchive/libarchive/archive_write_open.3   |    2 +-
 .../libarchive/archive_write_open_filename.c       |    5 +-
 .../libarchive/archive_write_private.h             |   15 +
 .../libarchive/archive_write_set_format.c          |    1 +
 .../libarchive/archive_write_set_format_by_name.c  |    1 +
 .../archive_write_set_format_filter_by_ext.c       |  142 +++
 .../libarchive/archive_write_set_format_iso9660.c  |   10 +
 .../libarchive/archive_write_set_format_mtree.c    |    4 +-
 .../libarchive/archive_write_set_format_warc.c     |  439 ++++++++
 .../libarchive/archive_write_set_format_xar.c      |   63 +-
 .../libarchive/archive_write_set_format_zip.c      |  678 +++++++++++--
 .../libarchive/archive_write_set_options.3         |   42 +
 ...write_data.3 => archive_write_set_passphrase.3} |   66 +-
 .../libarchive/archive_write_set_passphrase.c      |   95 ++
 ...archive_write_add_filter.c => archive_xxhash.h} |   55 +-
 Utilities/cmlibarchive/libarchive/libarchive.3     |    4 +-
 .../cmlibarchive/libarchive/libarchive_internals.3 |    2 +-
 Utilities/cmlibarchive/libarchive/mtree.5          |   18 -
 Utilities/cmlibarchive/libarchive/tar.5            |    2 +-
 Utilities/cmlibarchive/libarchive/xxhash.c         |  500 +++++++++
 104 files changed, 8128 insertions(+), 1186 deletions(-)
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_cryptor.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
 rename Utilities/cmlibarchive/libarchive/{archive_crypto.c => archive_digest.c} (99%)
 rename Utilities/cmlibarchive/libarchive/{archive_crypto_private.h => archive_digest_private.h} (93%)
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_hmac.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_hmac_private.h
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_random.c
 copy Utilities/cmlibarchive/libarchive/{archive_write_add_filter.c => archive_random_private.h} (50%)
 copy Utilities/cmlibarchive/libarchive/{archive_write_data.3 => archive_read_add_passphrase.3} (59%)
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_read_add_passphrase.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_read_support_filter_lz4.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_set_format_filter_by_ext.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_set_format_warc.c
 copy Utilities/cmlibarchive/libarchive/{archive_write_data.3 => archive_write_set_passphrase.3} (60%)
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_set_passphrase.c
 copy Utilities/cmlibarchive/libarchive/{archive_write_add_filter.c => archive_xxhash.h} (50%)
 create mode 100644 Utilities/cmlibarchive/libarchive/xxhash.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 13:03:19 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 13:03:19 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc1-340-g56cec75
Message-ID: <20151021170319.76DFCC0926@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  56cec75058b1980ead58ddda0c371a783547acec (commit)
       via  498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit)
      from  e4b7d5afde91efafb59749a0a513732a089a6f0a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 13:03:19 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 13:03:19 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-811-g998a7db
Message-ID: <20151021170319.A5A99C0925@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  998a7db7d498dc96407ad960f24d5294859d889b (commit)
       via  56cec75058b1980ead58ddda0c371a783547acec (commit)
      from  0efd8804fb40059974f5aa1d6d2eda81e074ddd1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=998a7db7d498dc96407ad960f24d5294859d889b
commit 998a7db7d498dc96407ad960f24d5294859d889b
Merge: 0efd880 56cec75
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 13:03:03 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 13:03:03 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 13:03:19 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 13:03:19 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.4.0-rc1-26-g498db9b
Message-ID: <20151021170319.BFFD3C092B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, release has been updated
       via  498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit)
      from  2ad1fed8ee1ddcee831ffe5b70f2abab52430b70 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From gjasny at googlemail.com  Wed Oct 21 13:31:44 2015
From: gjasny at googlemail.com (Gregor Jasny)
Date: Wed, 21 Oct 2015 13:31:44 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-813-g8ab1833
Message-ID: <20151021173144.A385EC0755@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8ab1833c2ad99fa882b7aa85ac87ded78c580576 (commit)
       via  cee12fd8a8c10258e0dde6cb7c44b64eaf65712c (commit)
      from  998a7db7d498dc96407ad960f24d5294859d889b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ab1833c2ad99fa882b7aa85ac87ded78c580576
commit 8ab1833c2ad99fa882b7aa85ac87ded78c580576
Merge: 998a7db cee12fd
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Oct 21 13:31:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 13:31:43 2015 -0400

    Merge topic 'xcode-optimization-flags' into next
    
    cee12fd8 Xcode: Test that extraction of -O flags preserves others


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cee12fd8a8c10258e0dde6cb7c44b64eaf65712c
commit cee12fd8a8c10258e0dde6cb7c44b64eaf65712c
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Oct 21 19:25:13 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Wed Oct 21 19:25:13 2015 +0200

    Xcode: Test that extraction of -O flags preserves others

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index a8c6816..7901ec0 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -5,6 +5,7 @@ run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
 run_cmake(XcodeObjectNeedsQuote)
 run_cmake(XcodeOptimizationFlags)
+run_cmake(XcodePreserveNonOptimizationFlags)
 run_cmake(XcodePreserveObjcFlag)
 if (NOT XCODE_VERSION VERSION_LESS 6)
   run_cmake(XcodePlatformFrameworks)
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
new file mode 100644
index 0000000..2f6c03d
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
@@ -0,0 +1,8 @@
+file(STRINGS ${RunCMake_TEST_BINARY_DIR}/XcodePreserveNonOptimizationFlags.xcodeproj/project.pbxproj actual
+     REGEX "OTHER_CPLUSPLUSFLAGS = [^;]*;")
+foreach(expect "-DA" "-DB +-DC" "-DD")
+  if(NOT "${actual}" MATCHES "${expect}")
+    message(SEND_ERROR "The actual project contains the lines:\n ${actual}\n"
+      "which do not match expected regex:\n ${expect}\n")
+  endif()
+endforeach()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
new file mode 100644
index 0000000..16f0381
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
@@ -0,0 +1,12 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported configuration types")
+
+project(XcodePreserveNonOptimizationFlags CXX)
+
+add_library(preserveStart STATIC foo.cpp)
+set_property(TARGET preserveStart PROPERTY COMPILE_OPTIONS -DA -O1)
+
+add_library(preserveBoth STATIC foo.cpp)
+set_property(TARGET preserveBoth PROPERTY COMPILE_OPTIONS -DB -O1 -DC)
+
+add_library(preserveEnd STATIC foo.cpp)
+set_property(TARGET preserveEnd PROPERTY COMPILE_OPTIONS -O1 -DD)

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake             |    1 +
 .../XcodePreserveNonOptimizationFlags-check.cmake          |    8 ++++++++
 .../XcodeProject/XcodePreserveNonOptimizationFlags.cmake   |   12 ++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 21 14:35:18 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 21 Oct 2015 14:35:18 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-816-gedf57f3
Message-ID: <20151021183518.F225AC0665@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  edf57f39262a38c17ba78501ebda5ac7eb23fe4e (commit)
       via  bae0e9c394efd50193f468f5bfd9e66744d8dbc3 (commit)
       via  000f68c3e015fffdab01f3e9768fa4d9f28f4df2 (commit)
      from  8ab1833c2ad99fa882b7aa85ac87ded78c580576 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edf57f39262a38c17ba78501ebda5ac7eb23fe4e
commit edf57f39262a38c17ba78501ebda5ac7eb23fe4e
Merge: 8ab1833 bae0e9c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:35:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 14:35:17 2015 -0400

    Merge topic 'update-libarchive' into next
    
    bae0e9c3 libarchive: Use CommonCrypto on OS X only when available
    000f68c3 libarchive: Define O_CLOEXEC when missing


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bae0e9c394efd50193f468f5bfd9e66744d8dbc3
commit bae0e9c394efd50193f468f5bfd9e66744d8dbc3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:30:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 14:31:34 2015 -0400

    libarchive: Use CommonCrypto on OS X only when available

diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
index 9b01df8..fb7307e 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
@@ -31,7 +31,7 @@
 #include "archive.h"
 #include "archive_cryptor_private.h"
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 
 static int
 pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
@@ -114,7 +114,7 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
 
 #endif
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 
 static int
 aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
index b62ec0c..690dfcc 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
@@ -31,6 +31,13 @@
 #define ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED
 
 #ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+#  define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 #include <CommonCrypto/CommonCryptor.h>
 #include <CommonCrypto/CommonKeyDerivation.h>
 #define AES_BLOCK_SIZE	16
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac.c b/Utilities/cmlibarchive/libarchive/archive_hmac.c
index 898853b..36e3e1c 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac.c
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac.c
@@ -31,7 +31,7 @@
 #include "archive.h"
 #include "archive_hmac_private.h"
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
 
 static int
 __hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
index 6a8bbf2..a9fb8ec 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
@@ -31,6 +31,13 @@
 #define ARCHIVE_HMAC_PRIVATE_H_INCLUDED
 
 #ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+#  define ARCHIVE_HMAC_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
 #include <CommonCrypto/CommonHMAC.h>
 
 typedef	CCHmacContext archive_hmac_sha1_ctx;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=000f68c3e015fffdab01f3e9768fa4d9f28f4df2
commit 000f68c3e015fffdab01f3e9768fa4d9f28f4df2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:14:54 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 21 14:14:54 2015 -0400

    libarchive: Define O_CLOEXEC when missing
    
    Do this in archive_random.c as we do in several other sources already.

diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index 57c49d5..7891077 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -62,6 +62,10 @@ static void arc4random_buf(void *, size_t);
 #include <wincrypt.h>
 #endif
 
+#ifndef O_CLOEXEC
+#define O_CLOEXEC	0
+#endif
+
 /*
  * Random number generator function.
  * This simply calls arc4random_buf function if the platform provides it.

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_cryptor.c         |    4 ++--
 Utilities/cmlibarchive/libarchive/archive_cryptor_private.h |    7 +++++++
 Utilities/cmlibarchive/libarchive/archive_hmac.c            |    2 +-
 Utilities/cmlibarchive/libarchive/archive_hmac_private.h    |    7 +++++++
 Utilities/cmlibarchive/libarchive/archive_random.c          |    4 ++++
 5 files changed, 21 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 21 15:27:49 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 21 Oct 2015 15:27:49 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-832-g3385d86
Message-ID: <20151021192749.59BA2C049F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3385d860ae497fdf9b1a52c7701ec6013ea61c16 (commit)
       via  0e73e4a606080880589ed1f4273ed01cb67b2fda (commit)
       via  78a13bcae980a8e50c3a3895c8dff652156dc605 (commit)
       via  f5fb7f1d1cdb87b03576b607e78a6ced9fe631a7 (commit)
       via  67e11dcd03afa00d5c7cdc83075eafb50243f145 (commit)
       via  15411eebfe1f3407a620d96ed85d92d67624ac5a (commit)
       via  ba39a6661b8be65647e4651b1356e4f25c0688fd (commit)
       via  a4bd5e7a13f9ab7b50f4b5de3725b0f531c3631c (commit)
       via  0e88d9c0156e74e422e1ed7e22aef9cf6327180d (commit)
       via  d261de843aded62176a2737830e3d2c3248c03db (commit)
       via  65cddc1e1c64c7ddbaf8ee437616e301d5dd030a (commit)
       via  0719fee046e721f703fb9dc04b11b0c33298b756 (commit)
       via  a2bff698a27adbbca715aad4534b1fbc4f5919e0 (commit)
       via  8de77993724933156f584fa6cf59fe4e488a55d7 (commit)
       via  5e18337d0c38f7d12fd44509112706f21f75a9fb (commit)
       via  eb21a05a987f27982f8918e1f771bf19accb4281 (commit)
      from  edf57f39262a38c17ba78501ebda5ac7eb23fe4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3385d860ae497fdf9b1a52c7701ec6013ea61c16
commit 3385d860ae497fdf9b1a52c7701ec6013ea61c16
Merge: edf57f3 0e73e4a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 15:27:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 15:27:46 2015 -0400

    Merge topic 'use-generator-target' into next
    
    0e73e4a6 Sublime: Port API to cmGeneratorTarget.
    78a13bca Xcode: Port API to cmGeneratorTarget.
    f5fb7f1d Xcode: Prefer to get target state from cmGeneratorTarget.
    67e11dcd Xcode: Re-order conditions.
    15411eeb Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.
    ba39a666 Xcode: Port loops to cmGeneratorTarget.
    a4bd5e7a Makefiles: Port to cmGeneratorTarget.
    0e88d9c0 Ninja: Port to cmGeneratorTarget.
    d261de84 Use cmLocalGenerator at generate-time.
    65cddc1e Port to GetGeneratorTargets.
    0719fee0 Makefiles: Port progress marks to cmGeneratorTarget.
    a2bff698 cmInstallTargetGenerator: Get a cmGeneratorTarget directly.
    8de77993 cmGlobalGenerator: Move GeneratorTargetsType to usage site.
    5e18337d Xcode: Remove value-less overrides.
    eb21a05a cmLocalGenerator: Store a vector of generator targets.

diff --cc Source/cmGlobalXCodeGenerator.cxx
index 576827c,9111a3f..eecc82b
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@@ -1617,42 -1619,9 +1619,42 @@@ std::string cmGlobalXCodeGenerator::Ext
  }
  
  //----------------------------------------------------------------------------
 +// This function removes each matching occurrence of the expression and
 +// returns the last one (i.e., the dominant flag in GCC)
 +std::string cmGlobalXCodeGenerator::ExtractFlagRegex(const char* exp,
 +                                                     int matchIndex,
 +                                                     std::string& flags)
 +{
 +  std::string retFlag;
 +
 +  cmsys::RegularExpression regex(exp);
 +  assert(regex.is_valid());
 +  if(!regex.is_valid())
 +    {
 +    return retFlag;
 +    }
 +
 +  std::string::size_type offset = 0;
 +
 +  while(regex.find(flags.c_str() + offset))
 +    {
 +    const std::string::size_type startPos = offset + regex.start(matchIndex);
 +    const std::string::size_type endPos = offset + regex.end(matchIndex);
 +    const std::string::size_type size = endPos - startPos;
 +
 +    offset = startPos + 1;
 +
 +    retFlag.assign(flags, startPos, size);
 +    flags.replace(startPos, size, size, ' ');
 +    }
 +
 +  return retFlag;
 +}
 +
 +//----------------------------------------------------------------------------
  void
  cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                                                 cmTarget& target,
+                                                 cmGeneratorTarget* target,
                                                  std::vector<cmCustomCommand>
                                                  const & commands,
                                                  const char* name)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e73e4a606080880589ed1f4273ed01cb67b2fda
commit 0e73e4a606080880589ed1f4273ed01cb67b2fda
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:53:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:27:00 2015 +0200

    Sublime: Port API to cmGeneratorTarget.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 47822e8..92d38b9 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -20,7 +20,6 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 
 #include <cmsys/SystemTools.hxx>
 
@@ -204,12 +203,12 @@ void cmExtraSublimeTextGenerator::
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, targetName, *lg, (*ti)->Target,
+          this->AppendTarget(fout, targetName, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           std::string fastTarget = targetName;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, *lg, (*ti)->Target,
+          this->AppendTarget(fout, fastTarget, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           }
@@ -225,7 +224,7 @@ void cmExtraSublimeTextGenerator::
   AppendTarget(cmGeneratedFileStream& fout,
                const std::string& targetName,
                cmLocalGenerator* lg,
-               cmTarget* target,
+               cmGeneratorTarget* target,
                const char* make,
                const cmMakefile* makefile,
                const char*, //compiler
@@ -235,10 +234,8 @@ void cmExtraSublimeTextGenerator::
 
   if (target != 0)
     {
-      cmGeneratorTarget *gtgt = this->GlobalGenerator
-                                    ->GetGeneratorTarget(target);
       std::vector<cmSourceFile*> sourceFiles;
-      gtgt->GetSourceFiles(sourceFiles,
+      target->GetSourceFiles(sourceFiles,
                              makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       std::vector<cmSourceFile*>::const_iterator sourceFilesEnd =
         sourceFiles.end();
@@ -256,9 +253,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, target);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, gtgt);
+            this->ComputeDefines(*iter, lg, target);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 5dd1140..cf31ee0 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -18,7 +18,6 @@
 
 class cmLocalGenerator;
 class cmMakefile;
-class cmTarget;
 class cmGeneratedFileStream;
 class cmGeneratorTarget;
 
@@ -67,7 +66,7 @@ private:
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string& targetName,
                     cmLocalGenerator* lg,
-                    cmTarget* target,
+                    cmGeneratorTarget* target,
                     const char* make,
                     const cmMakefile* makefile,
                     const char* compiler,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78a13bcae980a8e50c3a3895c8dff652156dc605
commit 78a13bcae980a8e50c3a3895c8dff652156dc605
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 21:23:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:26:58 2015 +0200

    Xcode: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 08c38a6..9111a3f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -711,9 +711,9 @@ cmXCodeObject* cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
+GetGroupMapKeyFromPath(cmGeneratorTarget* target, const std::string& fullpath)
 {
-  std::string key(cmtarget.GetName());
+  std::string key(target->GetName());
   key += "-";
   key += fullpath;
   return key;
@@ -721,16 +721,16 @@ GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKey(cmTarget& cmtarget, cmSourceFile* sf)
+GetGroupMapKey(cmGeneratorTarget* target, cmSourceFile* sf)
 {
-  return GetGroupMapKeyFromPath(cmtarget, sf->GetFullPath());
+  return GetGroupMapKeyFromPath(target, sf->GetFullPath());
 }
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
@@ -738,7 +738,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   // fileRef object for any given full path.
   //
   cmXCodeObject* fileRef =
-    this->CreateXCodeFileReferenceFromPath(fullpath, cmtarget, lang, sf);
+    this->CreateXCodeFileReferenceFromPath(fullpath, target, lang, sf);
 
   cmXCodeObject* buildFile = this->CreateObject(cmXCodeObject::PBXBuildFile);
   buildFile->SetComment(fileRef->GetComment());
@@ -751,7 +751,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
                                               cmSourceFile* sf,
-                                              cmTarget& cmtarget)
+                                              cmGeneratorTarget* gtgt)
 {
   // Add flags from target and source file properties.
   std::string flags;
@@ -781,7 +781,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   cmXCodeObject* buildFile =
-    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), cmtarget, lang, sf);
+    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), gtgt, lang, sf);
   cmXCodeObject* fileRef = buildFile->GetObject("fileRef")->GetObject();
 
   cmXCodeObject* settings =
@@ -791,7 +791,6 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
   // Is this a resource file in this target? Add it to the resources group...
   //
 
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmGeneratorTarget::SourceFileFlags tsFlags =
       gtgt->GetTargetSourceFileFlags(sf);
   bool isResource = tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource;
@@ -926,11 +925,11 @@ GetSourcecodeValueFromFileExtension(const std::string& _ext,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
-  std::string key = GetGroupMapKeyFromPath(cmtarget, fullpath);
+  std::string key = GetGroupMapKeyFromPath(target, fullpath);
   cmXCodeObject* fileRef = this->FileRefs[key];
   if(!fileRef)
     {
@@ -1007,13 +1006,13 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf,
-                                                 cmTarget& cmtarget)
+                                                 cmGeneratorTarget* target)
 {
   std::string lang =
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   return this->CreateXCodeFileReferenceFromPath(
-    sf->GetFullPath(), cmtarget, lang, sf);
+    sf->GetFullPath(), target, lang, sf);
 }
 
 //----------------------------------------------------------------------------
@@ -1100,7 +1099,6 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       l != sortedTargets.end(); l++)
     {
     cmGeneratorTarget* gtgt = l->second;
-    cmTarget& cmtarget = *gtgt->Target;
 
     std::string targetName = gtgt->GetName();
 
@@ -1118,7 +1116,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     if(gtgt->GetType() == cmState::UTILITY ||
        gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
-      cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
+      cmXCodeObject* t = this->CreateUtilityTarget(gtgt);
       if (!t)
         {
         return false;
@@ -1146,7 +1144,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       {
       cmXCodeObject* xsf =
         this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                    *i, cmtarget);
+                                    *i, gtgt);
       cmXCodeObject* fr = xsf->GetObject("fileRef");
       cmXCodeObject* filetype =
         fr->GetObject()->GetObject("explicitFileType");
@@ -1197,7 +1195,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
         {
         std::string obj = *oi;
         cmXCodeObject* xsf =
-          this->CreateXCodeSourceFileFromPath(obj, cmtarget, "", 0);
+          this->CreateXCodeSourceFileFromPath(obj, gtgt, "", 0);
         externalObjFiles.push_back(xsf);
         }
       }
@@ -1320,7 +1318,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
           {
           cmXCodeObject* xsf =
             this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                        *sfIt, cmtarget);
+                                        *sfIt, gtgt);
           buildFiles->AddObject(xsf);
           }
         contentBuildPhases.push_back(copyFilesBuildPhase);
@@ -1354,9 +1352,9 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     this->CreateCustomCommands(buildPhases, sourceBuildPhase,
                                headerBuildPhase, resourceBuildPhase,
                                contentBuildPhases,
-                               frameworkBuildPhase, cmtarget);
+                               frameworkBuildPhase, gtgt);
 
-    targets.push_back(this->CreateXCodeTarget(cmtarget, buildPhases));
+    targets.push_back(this->CreateXCodeTarget(gtgt, buildPhases));
     }
   return true;
 }
@@ -1431,7 +1429,7 @@ bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf)
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                                          const char* name2,
-                                         cmTarget& cmtarget,
+                                         cmGeneratorTarget* target,
                                          const std::vector<cmCustomCommand>&
                                          commands)
 {
@@ -1451,7 +1449,7 @@ cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                            this->CreateString("0"));
   buildPhase->AddAttribute("shellPath",
                            this->CreateString("/bin/sh"));
-  this->AddCommandsToBuildPhase(buildPhase, cmtarget, commands,
+  this->AddCommandsToBuildPhase(buildPhase, target, commands,
                                 name2);
   return buildPhase;
 }
@@ -1468,16 +1466,14 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
                                                   contentBuildPhases,
                                                   cmXCodeObject*
                                                   frameworkBuildPhase,
-                                                  cmTarget& cmtarget)
+                                                  cmGeneratorTarget* gtgt)
 {
   std::vector<cmCustomCommand> const & prebuild
-    = cmtarget.GetPreBuildCommands();
+    = gtgt->Target->GetPreBuildCommands();
   std::vector<cmCustomCommand> const & prelink
-    = cmtarget.GetPreLinkCommands();
+    = gtgt->Target->GetPreLinkCommands();
   std::vector<cmCustomCommand> postbuild
-    = cmtarget.GetPostBuildCommands();
-
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+    = gtgt->Target->GetPostBuildCommands();
 
   if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
@@ -1530,19 +1526,19 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   cmXCodeObject* cmakeRulesBuildPhase =
     this->CreateBuildPhase("CMake Rules",
                            "cmakeRulesBuildPhase",
-                           cmtarget, commands);
+                           gtgt, commands);
   // create prebuild phase
   cmXCodeObject* preBuildPhase =
     this->CreateBuildPhase("CMake PreBuild Rules", "preBuildCommands",
-                           cmtarget, prebuild);
+                           gtgt, prebuild);
   // create prelink phase
   cmXCodeObject* preLinkPhase =
     this->CreateBuildPhase("CMake PreLink Rules", "preLinkCommands",
-                           cmtarget, prelink);
+                           gtgt, prelink);
   // create postbuild phase
   cmXCodeObject* postBuildPhase =
     this->CreateBuildPhase("CMake PostBuild Rules", "postBuildPhase",
-                           cmtarget, postbuild);
+                           gtgt, postbuild);
 
   // The order here is the order they will be built in.
   // The order "headers, resources, sources" mimics a native project generated
@@ -1625,7 +1621,7 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag,
 //----------------------------------------------------------------------------
 void
 cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                                                cmTarget& target,
+                                                cmGeneratorTarget* target,
                                                 std::vector<cmCustomCommand>
                                                 const & commands,
                                                 const char* name)
@@ -1635,7 +1631,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
   makefile += "/";
-  makefile += target.GetName();
+  makefile += target->GetName();
   makefile += "_";
   makefile += name;
   makefile += ".make";
@@ -1669,7 +1665,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
 //----------------------------------------------------------------------------
 void  cmGlobalXCodeGenerator
 ::CreateCustomRulesMakefile(const char* makefileBasename,
-                            cmTarget& target,
+                            cmGeneratorTarget* target,
                             std::vector<cmCustomCommand>
                             const & commands,
                             const std::string& configName)
@@ -1686,7 +1682,7 @@ void  cmGlobalXCodeGenerator
     }
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  makefileStream << "# Custom rules for " << target.GetName() << "\n";
+  makefileStream << "# Custom rules for " << target->GetName() << "\n";
 
   // disable the implicit rules
   makefileStream << ".SUFFIXES: " << "\n";
@@ -1715,7 +1711,7 @@ void  cmGlobalXCodeGenerator
         {
         std::ostringstream str;
         str << "_buildpart_" << count++ ;
-        tname[&ccg.GetCC()] = std::string(target.GetName()) + str.str();
+        tname[&ccg.GetCC()] = std::string(target->GetName()) + str.str();
         makefileStream << "\\\n\t" << tname[&ccg.GetCC()];
         }
       }
@@ -1793,11 +1789,10 @@ void  cmGlobalXCodeGenerator
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
+void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
@@ -2020,7 +2015,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     if(this->XcodeVersion >= 21)
       {
       std::string pncdir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
                                   this->CreateString(pncdir.c_str()));
       }
@@ -2029,7 +2024,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       buildSettings->AddAttribute("OBJROOT",
                                   this->CreateString(pndir.c_str()));
       pndir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       }
     }
 
@@ -2067,7 +2062,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
         extraLinkOptions += " ";
         extraLinkOptions += createFlags;
         }
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the cfbundle name. This avoids creating
       // a per-configuration Info.plist file. The cfbundle plist
@@ -2113,11 +2108,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
-      std::string fw_version = target.GetFrameworkVersion();
+      std::string fw_version = gtgt->Target->GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
                                   this->CreateString(fw_version.c_str()));
 
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the framework name. This avoids creating
       // a per-configuration Info.plist file.
@@ -2160,7 +2155,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     // Handle bundles and normal executables separately.
     if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the executable name.  This avoids creating
       // a per-configuration Info.plist file.
@@ -2400,7 +2395,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
     }
 
-  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(target),
+  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(gtgt),
                               this->CreateString(extraLinkOptions.c_str()));
   buildSettings->AddAttribute("OTHER_REZFLAGS",
                               this->CreateString(""));
@@ -2459,7 +2454,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   // put this last so it can override existing settings
   // Convert "XCODE_ATTRIBUTE_*" properties directly.
   {
-  cmPropertyMap const& props = target.GetProperties();
+  cmPropertyMap const& props = gtgt->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin();
       i != props.end(); ++i)
     {
@@ -2508,9 +2503,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
+cmGlobalXCodeGenerator::CreateUtilityTarget(cmGeneratorTarget* gtgt)
 {
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2538,11 +2532,11 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
   this->CreateCustomCommands(buildPhases, 0, 0, 0, emptyContentVector, 0,
-                             cmtarget);
+                             gtgt);
   target->AddAttribute("buildPhases", buildPhases);
   if(this->XcodeVersion > 20)
     {
-    this->AddConfigurations(target, cmtarget);
+    this->AddConfigurations(target, gtgt);
     }
   else
     {
@@ -2550,7 +2544,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings, theConfig);
+    this->CreateBuildSettings(gtgt, buildSettings, theConfig);
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2558,8 +2552,8 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   target->AddAttribute("dependencies", dependencies);
   target->AddAttribute("name", this->CreateString(gtgt->GetName()));
   target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
 
   // Add source files without build rules for editing convenience.
   if(gtgt->GetType() == cmState::UTILITY)
@@ -2575,7 +2569,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       {
       if(!(*i)->GetPropertyAsBool("GENERATED"))
         {
-        this->CreateXCodeFileReference(*i, cmtarget);
+        this->CreateXCodeFileReference(*i, gtgt);
         }
       }
     }
@@ -2588,7 +2582,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
 //----------------------------------------------------------------------------
 std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
-                                                      cmTarget& cmtarget)
+                                                      cmGeneratorTarget* gtgt)
 {
   std::string configTypes =
     this->CurrentMakefile->GetRequiredDefinition("CMAKE_CONFIGURATION_TYPES");
@@ -2604,7 +2598,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
   std::string comment = "Build configuration list for ";
   comment += cmXCodeObject::PBXTypeNames[target->GetIsA()];
   comment += " \"";
-  comment += cmtarget.GetName();
+  comment += gtgt->GetName();
   comment += "\"";
   configlist->SetComment(comment.c_str());
   target->AddAttribute("buildConfigurationList",
@@ -2616,7 +2610,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
     buildConfigurations->AddObject(config);
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings,
+    this->CreateBuildSettings(gtgt, buildSettings,
                               configVector[i].c_str());
     config->AddAttribute("name", this->CreateString(configVector[i].c_str()));
     config->SetComment(configVector[i].c_str());
@@ -2634,12 +2628,12 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
 }
 
 //----------------------------------------------------------------------------
-const char*
-cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
+const char* cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(
+    cmGeneratorTarget const* target) const
 {
   if(this->XcodeVersion >= 60 &&
-     (cmtarget.GetType() == cmState::STATIC_LIBRARY ||
-      cmtarget.GetType() == cmState::OBJECT_LIBRARY))
+     (target->GetType() == cmState::STATIC_LIBRARY ||
+      target->GetType() == cmState::OBJECT_LIBRARY))
     {
     return "OTHER_LIBTOOLFLAGS";
     }
@@ -2709,11 +2703,9 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
+cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt,
                                           cmXCodeObject* buildPhases)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
-
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
@@ -2726,14 +2718,14 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   std::string defConfig;
   if(this->XcodeVersion > 20)
     {
-    defConfig = this->AddConfigurations(target, cmtarget);
+    defConfig = this->AddConfigurations(target, gtgt);
     }
   else
     {
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
     defConfig = this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-    this->CreateBuildSettings(cmtarget, buildSettings, defConfig.c_str());
+    this->CreateBuildSettings(gtgt, buildSettings, defConfig.c_str());
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2770,22 +2762,23 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     {
     target->AddAttribute("productType", this->CreateString(productType));
     }
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
   target->SetId(this->GetOrCreateId(
     gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
 //----------------------------------------------------------------------------
-cmXCodeObject* cmGlobalXCodeGenerator::FindXCodeTarget(cmTarget const* t)
+cmXCodeObject*
+cmGlobalXCodeGenerator::FindXCodeTarget(cmGeneratorTarget const* t)
 {
   if(!t)
     {
     return 0;
     }
 
-  std::map<cmTarget const*, cmXCodeObject*>::const_iterator const i =
+  std::map<cmGeneratorTarget const*, cmXCodeObject*>::const_iterator const i =
     this->XCodeObjectMap.find(t);
   if (i == this->XCodeObjectMap.end())
     {
@@ -2922,8 +2915,7 @@ void cmGlobalXCodeGenerator
 void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
-  cmTarget* cmtarget = target->GetTarget();
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  cmGeneratorTarget* gt = target->GetTarget();
   if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
@@ -2938,7 +2930,7 @@ void cmGlobalXCodeGenerator
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
-    if(cmXCodeObject* dptarget = this->FindXCodeTarget((*i)->Target))
+    if(cmXCodeObject* dptarget = this->FindXCodeTarget(*i))
       {
       this->AddDependTarget(target, dptarget);
       }
@@ -2967,7 +2959,7 @@ void cmGlobalXCodeGenerator
         linkObjs += this->XCodeEscapePath(oi->c_str());
         }
       this->AppendBuildSettingAttribute(
-        target, this->GetTargetLinkFlagsVar(*cmtarget),
+        target, this->GetTargetLinkFlagsVar(gt),
         linkObjs.c_str(), configName);
       }
 
@@ -3047,7 +3039,7 @@ void cmGlobalXCodeGenerator
         }
       }
     this->AppendBuildSettingAttribute(
-      target, this->GetTargetLinkFlagsVar(*cmtarget),
+      target, this->GetTargetLinkFlagsVar(gt),
       linkLibs.c_str(), configName);
     }
     }
@@ -3090,7 +3082,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       // MACOSX_BUNDLE file
       if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(gtgt->Target);
+        std::string plist = this->ComputeInfoPListLocation(gtgt);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3110,8 +3102,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKey(gtgt->Target, sf);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKey(gtgt, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
@@ -3125,8 +3117,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(gtgt->Target, source);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(gtgt, source);
         this->GroupMap[key] = pbxgroup;
         }
       }
@@ -3157,16 +3149,16 @@ cmXCodeObject *cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 cmXCodeObject* cmGlobalXCodeGenerator
-::CreateOrGetPBXGroup(cmTarget& cmtarget, cmSourceGroup* sg)
+::CreateOrGetPBXGroup(cmGeneratorTarget* gtgt, cmSourceGroup* sg)
 {
   std::string s;
   std::string target;
-  const char *targetFolder= cmtarget.GetProperty("FOLDER");
+  const char *targetFolder= gtgt->GetProperty("FOLDER");
   if(targetFolder) {
     target = targetFolder;
     target += "/";
   }
-  target += cmtarget.GetName();
+  target += gtgt->GetName();
   s = target + "/";
   s += sg->GetFullName();
   std::map<std::string, cmXCodeObject* >::iterator it =
@@ -3556,10 +3548,10 @@ std::string
 cmGlobalXCodeGenerator::GetObjectsNormalDirectory(
   const std::string &projName,
   const std::string &configName,
-  const cmTarget *t) const
+  const cmGeneratorTarget *t) const
 {
   std::string dir =
-    t->GetMakefile()->GetCurrentBinaryDirectory();
+    t->GetLocalGenerator()->GetCurrentBinaryDirectory();
   dir += "/";
   dir += projName;
   dir += ".build/";
@@ -3633,8 +3625,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         i != targets.end(); ++i)
       {
       cmXCodeObject* target = *i;
-      cmTarget* t =target->GetTarget();
-      cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
+      cmGeneratorTarget* gt =target->GetTarget();
 
       if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
@@ -3695,7 +3686,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         if(this->Architectures.size() > 1)
           {
           std::string universal = this->GetObjectsNormalDirectory(
-            this->CurrentProject, configName, t);
+            this->CurrentProject, configName, gt);
           for( std::vector<std::string>::iterator arch =
                  this->Architectures.begin();
                arch != this->Architectures.end(); ++arch)
@@ -4038,12 +4029,13 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags,
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmTarget& target)
+cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmGeneratorTarget* target)
 {
-  std::string plist = target.GetMakefile()->GetCurrentBinaryDirectory();
+  std::string plist =
+      target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   plist += cmake::GetCMakeFilesDirectory();
   plist += "/";
-  plist += target.GetName();
+  plist += target->GetName();
   plist += ".dir/Info.plist";
   return plist;
 }
@@ -4069,7 +4061,7 @@ void cmGlobalXCodeGenerator
 {
   std::string configName = this->GetCMakeCFGIntDir();
   std::string dir = this->GetObjectsNormalDirectory(
-    "$(PROJECT_NAME)", configName, gt->Target);
+    "$(PROJECT_NAME)", configName, gt);
   if(this->XcodeVersion >= 21)
     {
     dir += "$(CURRENT_ARCH)/";
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 10d9bd6..510d46e 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -16,7 +16,6 @@
 #include "cmXCodeObject.h"
 #include "cmCustomCommand.h"
 class cmGlobalGeneratorFactory;
-class cmTarget;
 class cmSourceFile;
 class cmSourceGroup;
 
@@ -90,7 +89,7 @@ protected:
   virtual void AddExtraIDETargets();
   virtual void Generate();
 private:
-  cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget,
+  cmXCodeObject* CreateOrGetPBXGroup(cmGeneratorTarget* gtgt,
                                      cmSourceGroup* sg);
   cmXCodeObject* CreatePBXGroup(cmXCodeObject *parent,
                                 std::string name);
@@ -108,22 +107,22 @@ private:
                             cmXCodeObject* resourceBuildPhase,
                             std::vector<cmXCodeObject*> contentBuildPhases,
                             cmXCodeObject* frameworkBuildPhase,
-                            cmTarget& cmtarget);
+                            cmGeneratorTarget *gtgt);
 
-  std::string ComputeInfoPListLocation(cmTarget& target);
+  std::string ComputeInfoPListLocation(cmGeneratorTarget *target);
 
   void AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                               cmTarget& target,
+                               cmGeneratorTarget *target,
                                std::vector<cmCustomCommand>
                                const & commands,
                                const char* commandFileName);
 
   void CreateCustomRulesMakefile(const char* makefileBasename,
-                                 cmTarget& target,
+                                 cmGeneratorTarget* target,
                                  std::vector<cmCustomCommand> const & commands,
                                  const std::string& configName);
 
-  cmXCodeObject* FindXCodeTarget(cmTarget const*);
+  cmXCodeObject* FindXCodeTarget(const cmGeneratorTarget *);
   std::string GetOrCreateId(const std::string& name, const std::string& id);
 
   // create cmXCodeObject from these functions so that memory can be managed
@@ -132,22 +131,23 @@ private:
   cmXCodeObject* CreateObject(cmXCodeObject::Type type);
   cmXCodeObject* CreateString(const std::string& s);
   cmXCodeObject* CreateObjectReference(cmXCodeObject*);
-  cmXCodeObject* CreateXCodeTarget(cmTarget& target,
+  cmXCodeObject* CreateXCodeTarget(cmGeneratorTarget *gtgt,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
   void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
-  const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
+  const char* GetTargetLinkFlagsVar(const cmGeneratorTarget *target) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);
-  std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget);
+  std::string AddConfigurations(cmXCodeObject* target,
+                                cmGeneratorTarget *gtgt);
   void AppendOrAddBuildSetting(cmXCodeObject* settings, const char* attr,
                                const char* value);
   void AppendBuildSettingAttribute(cmXCodeObject* target, const char* attr,
                                    const char* value,
                                    const std::string& configName);
-  cmXCodeObject* CreateUtilityTarget(cmTarget& target);
+  cmXCodeObject* CreateUtilityTarget(cmGeneratorTarget *gtgt);
   void AddDependAndLinkInformation(cmXCodeObject* target);
-  void CreateBuildSettings(cmTarget& target,
+  void CreateBuildSettings(cmGeneratorTarget *gtgt,
                            cmXCodeObject* buildSettings,
                            const std::string& buildType);
   std::string ExtractFlag(const char* flag, std::string& flags);
@@ -161,18 +161,18 @@ private:
   void WriteXCodePBXProj(std::ostream& fout, cmLocalGenerator* root,
                          std::vector<cmLocalGenerator*>& generators);
   cmXCodeObject* CreateXCodeFileReferenceFromPath(const std::string &fullpath,
-                                                  cmTarget& cmtarget,
+                                                  cmGeneratorTarget *target,
                                                   const std::string &lang,
                                                   cmSourceFile* sf);
   cmXCodeObject* CreateXCodeSourceFileFromPath(const std::string &fullpath,
-                                               cmTarget& cmtarget,
+                                               cmGeneratorTarget *target,
                                                const std::string &lang,
                                                cmSourceFile* sf);
   cmXCodeObject* CreateXCodeFileReference(cmSourceFile* sf,
-                                          cmTarget& cmtarget);
+                                          cmGeneratorTarget *target);
   cmXCodeObject* CreateXCodeSourceFile(cmLocalGenerator* gen,
                                        cmSourceFile* sf,
-                                       cmTarget& cmtarget);
+                                       cmGeneratorTarget *gtgt);
   bool CreateXCodeTargets(cmLocalGenerator* gen,
                           std::vector<cmXCodeObject*>&);
   bool IsHeaderFile(cmSourceFile*);
@@ -185,7 +185,7 @@ private:
                        std::vector<cmLocalGenerator*>& gens);
   cmXCodeObject* CreateBuildPhase(const char* name,
                                   const char* name2,
-                                  cmTarget& cmtarget,
+                                  cmGeneratorTarget *target,
                                   const std::vector<cmCustomCommand>&);
   void CreateReRunCMakeFile(cmLocalGenerator* root,
                             std::vector<cmLocalGenerator*> const& gens);
@@ -224,10 +224,9 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  std::string GetObjectsNormalDirectory(
-    const std::string &projName,
+  std::string GetObjectsNormalDirectory(const std::string &projName,
     const std::string &configName,
-    const cmTarget *t) const;
+    const cmGeneratorTarget *t) const;
 
   void addObject(cmXCodeObject *obj);
   std::string PostBuildMakeTarget(std::string const& tName,
@@ -249,7 +248,7 @@ private:
   std::map<std::string, cmXCodeObject* > GroupNameMap;
   std::map<std::string, cmXCodeObject* > TargetGroup;
   std::map<std::string, cmXCodeObject* > FileRefs;
-  std::map<cmTarget const*, cmXCodeObject* > XCodeObjectMap;
+  std::map<cmGeneratorTarget const*, cmXCodeObject* > XCodeObjectMap;
   std::vector<std::string> Architectures;
   std::string GeneratorToolset;
 };
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index ed2940a..0f0548b 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -13,7 +13,7 @@
 #define cmXCodeObject_h
 
 #include "cmStandardIncludes.h"
-class cmTarget;
+class cmGeneratorTarget;
 
 class cmXCodeObject
 {
@@ -87,11 +87,11 @@ public:
     {
       this->Id = id;
     }
-  cmTarget* GetTarget()
+  cmGeneratorTarget* GetTarget()
     {
       return this->Target;
     }
-  void SetTarget(cmTarget* t)
+  void SetTarget(cmGeneratorTarget* t)
     {
       this->Target = t;
     }
@@ -146,7 +146,7 @@ public:
 protected:
   void PrintString(std::ostream& os) const;
 
-  cmTarget* Target;
+  cmGeneratorTarget* Target;
   Type TypeValue;
   std::string Id;
   PBXType IsA;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5fb7f1d1cdb87b03576b607e78a6ced9fe631a7
commit f5fb7f1d1cdb87b03576b607e78a6ced9fe631a7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:36:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:26:07 2015 +0200

    Xcode: Prefer to get target state from cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d6c2e59..08c38a6 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1110,13 +1110,13 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+    if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::UTILITY ||
-       cmtarget.GetType() == cmState::GLOBAL_TARGET)
+    if(gtgt->GetType() == cmState::UTILITY ||
+       gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
       cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
       if (!t)
@@ -1204,7 +1204,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
 
     // some build phases only apply to bundles and/or frameworks
     bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
-    bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
+    bool isBundleTarget = gtgt->GetPropertyAsBool("MACOSX_BUNDLE");
     bool isCFBundleTarget = gtgt->IsCFBundleOnApple();
 
     cmXCodeObject* buildFiles = 0;
@@ -1479,7 +1479,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
 
   cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
 
-  if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
@@ -1488,13 +1488,13 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
     cmd[0].push_back("-E");
     cmd[0].push_back("cmake_symlink_library");
     std::string str_file = "$<TARGET_FILE:";
-    str_file += cmtarget.GetName();
+    str_file += gtgt->GetName();
     str_file += ">";
     std::string str_so_file = "$<TARGET_SONAME_FILE:";
-    str_so_file += cmtarget.GetName();
+    str_so_file += gtgt->GetName();
     str_so_file += ">";
     std::string str_link_file = "$<TARGET_LINKER_FILE:";
-    str_link_file += cmtarget.GetName();
+    str_link_file += gtgt->GetName();
     str_link_file += ">";
     cmd[0].push_back(str_file);
     cmd[0].push_back(str_so_file);
@@ -1797,22 +1797,22 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  if(target.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   std::string defFlags;
-  bool shared = ((target.GetType() == cmState::SHARED_LIBRARY) ||
-                 (target.GetType() == cmState::MODULE_LIBRARY));
-  bool binary = ((target.GetType() == cmState::OBJECT_LIBRARY) ||
-                 (target.GetType() == cmState::STATIC_LIBRARY) ||
-                 (target.GetType() == cmState::EXECUTABLE) ||
+  bool shared = ((gtgt->GetType() == cmState::SHARED_LIBRARY) ||
+                 (gtgt->GetType() == cmState::MODULE_LIBRARY));
+  bool binary = ((gtgt->GetType() == cmState::OBJECT_LIBRARY) ||
+                 (gtgt->GetType() == cmState::STATIC_LIBRARY) ||
+                 (gtgt->GetType() == cmState::EXECUTABLE) ||
                  shared);
 
   // Compute the compilation flags for each language.
   std::set<std::string> languages;
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   gtgt->GetLanguages(languages, configName);
   std::map<std::string, std::string> cflags;
   for (std::set<std::string>::iterator li = languages.begin();
@@ -1840,7 +1840,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     cmSystemTools::Error
       ("CMake can not determine linker language for target: ",
-       target.GetName().c_str());
+       gtgt->GetName().c_str());
     return;
     }
 
@@ -1869,15 +1869,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   std::string extraLinkOptionsVar;
   std::string extraLinkOptions;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptionsVar = "CMAKE_EXE_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::SHARED_LIBRARY)
+  else if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_SHARED_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::MODULE_LIBRARY)
+  else if(gtgt->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS";
     }
@@ -1889,8 +1889,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                configName);
     }
 
-  if(target.GetType() == cmState::OBJECT_LIBRARY ||
-     target.GetType() == cmState::STATIC_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY ||
+     gtgt->GetType() == cmState::STATIC_LIBRARY)
     {
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
@@ -1899,7 +1899,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
   else
     {
-    const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+    const char* targetLinkFlags = gtgt->GetProperty("LINK_FLAGS");
     if(targetLinkFlags)
       {
       this->CurrentLocalGenerator->
@@ -1909,7 +1909,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       std::string linkFlagsVar = "LINK_FLAGS_";
       linkFlagsVar += cmSystemTools::UpperCase(configName);
-      if(const char* linkFlags = target.GetProperty(linkFlagsVar.c_str()))
+      if(const char* linkFlags = gtgt->GetProperty(linkFlagsVar.c_str()))
         {
         this->CurrentLocalGenerator->
           AppendFlags(extraLinkOptions, linkFlags);
@@ -1952,8 +1952,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   std::string pnsuffix;
   gtgt->GetFullNameComponents(pnprefix, pnbase, pnsuffix, configName);
 
-  const char* version = target.GetProperty("VERSION");
-  const char* soversion = target.GetProperty("SOVERSION");
+  const char* version = gtgt->GetProperty("VERSION");
+  const char* soversion = gtgt->GetProperty("SOVERSION");
   if(!gtgt->HasSOName(configName) || gtgt->IsFrameworkOnApple())
     {
     version = 0;
@@ -1980,10 +1980,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Set attributes to specify the proper name for the target.
   std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
-  if(target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY ||
-     target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::STATIC_LIBRARY ||
+     gtgt->GetType() == cmState::SHARED_LIBRARY ||
+     gtgt->GetType() == cmState::MODULE_LIBRARY ||
+     gtgt->GetType() == cmState::EXECUTABLE)
     {
     if(this->XcodeVersion >= 21)
       {
@@ -2011,10 +2011,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     buildSettings->AddAttribute("EXECUTABLE_SUFFIX",
                                 this->CreateString(pnsuffix.c_str()));
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     pnprefix = "lib";
-    pnbase = target.GetName();
+    pnbase = gtgt->GetName();
     pnsuffix = ".a";
 
     if(this->XcodeVersion >= 21)
@@ -2040,7 +2040,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                               this->CreateString(pndir.c_str()));
 
   // Handle settings for each target type.
-  switch(target.GetType())
+  switch(gtgt->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
@@ -2111,7 +2111,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
     case cmState::SHARED_LIBRARY:
     {
-    if(target.GetPropertyAsBool("FRAMEWORK"))
+    if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
       std::string fw_version = target.GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
@@ -2158,7 +2158,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
 
     // Handle bundles and normal executables separately.
-    if(target.GetPropertyAsBool("MACOSX_BUNDLE"))
+    if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
       std::string plist = this->ComputeInfoPListLocation(target);
       // Xcode will create the final version of Info.plist at build time,
@@ -2323,7 +2323,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Add Fortran source format attribute if property is set.
   const char* format = 0;
-  const char* tgtfmt = target.GetProperty("Fortran_FORMAT");
+  const char* tgtfmt = gtgt->GetProperty("Fortran_FORMAT");
   switch(this->CurrentLocalGenerator->GetFortranFormat(tgtfmt))
     {
     case cmLocalGenerator::FortranFormatFixed: format = "fixed"; break;
@@ -2338,7 +2338,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Create the INSTALL_PATH attribute.
   std::string install_name_dir;
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir = gtgt->GetInstallNameDirForBuildTree(configName);
@@ -2426,7 +2426,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Runtime version information.
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     int major;
     int minor;
@@ -2510,6 +2510,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 {
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2532,7 +2533,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
   cmXCodeObject* target =
     this->CreateObject(cmXCodeObject::PBXAggregateTarget);
-  target->SetComment(cmtarget.GetName().c_str());
+  target->SetComment(gtgt->GetName().c_str());
   cmXCodeObject* buildPhases =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
@@ -2555,16 +2556,15 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
 
   // Add source files without build rules for editing convenience.
-  if(cmtarget.GetType() == cmState::UTILITY)
+  if(gtgt->GetType() == cmState::UTILITY)
     {
     std::vector<cmSourceFile*> sources;
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
     if (!gtgt->GetConfigCommonSourceFiles(sources))
       {
       return 0;
@@ -2581,7 +2581,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     }
 
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
 
   return target;
 }
@@ -2712,7 +2712,9 @@ cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
                                           cmXCodeObject* buildPhases)
 {
-  if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
     }
@@ -2737,10 +2739,8 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
-
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
 
   cmXCodeObject* fileRef =
     this->CreateObject(cmXCodeObject::PBXFileReference);
@@ -2749,10 +2749,10 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
   std::string fullName;
-  if(cmtarget.GetType() == cmState::OBJECT_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     fullName = "lib";
-    fullName += cmtarget.GetName();
+    fullName += gtgt->GetName();
     fullName += ".a";
     }
   else
@@ -2763,7 +2763,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   fileRef->AddAttribute("refType", this->CreateString("0"));
   fileRef->AddAttribute("sourceTree",
                         this->CreateString("BUILT_PRODUCTS_DIR"));
-  fileRef->SetComment(cmtarget.GetName().c_str());
+  fileRef->SetComment(gtgt->GetName().c_str());
   target->AddAttribute("productReference",
                        this->CreateObjectReference(fileRef));
   if(const char* productType = this->GetTargetProductType(gtgt))
@@ -2773,7 +2773,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
@@ -2923,18 +2923,18 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(!cmtarget)
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(gt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   // Add dependencies on other CMake targets.
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
@@ -2958,7 +2958,7 @@ void cmGlobalXCodeGenerator
       std::string linkObjs;
       const char* sep = "";
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(cmtarget)->UseObjectLibraries(objs, "");
+      gt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -2972,15 +2972,14 @@ void cmGlobalXCodeGenerator
       }
 
     // Skip link information for object libraries.
-    if(cmtarget->GetType() == cmState::OBJECT_LIBRARY ||
-       cmtarget->GetType() == cmState::STATIC_LIBRARY)
+    if(gt->GetType() == cmState::OBJECT_LIBRARY ||
+       gt->GetType() == cmState::STATIC_LIBRARY)
       {
       continue;
       }
 
     // Compute the link library and directory information.
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(cmtarget);
-    cmComputeLinkInformation* pcli = gtgt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
     if(!pcli)
       {
       continue;
@@ -3637,21 +3636,21 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
       cmTarget* t =target->GetTarget();
       cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
 
-      if(t->GetType() == cmState::EXECUTABLE ||
+      if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//         t->GetType() == cmState::OBJECT_LIBRARY ||
-         t->GetType() == cmState::STATIC_LIBRARY ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+//         gt->GetType() == cmState::OBJECT_LIBRARY ||
+         gt->GetType() == cmState::STATIC_LIBRARY ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         // Declare an entry point for the target post-build phase.
-        makefileStream << this->PostBuildMakeTarget(t->GetName(), *ct)
+        makefileStream << this->PostBuildMakeTarget(gt->GetName(), *ct)
                        << ":\n";
         }
 
-      if(t->GetType() == cmState::EXECUTABLE ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+      if(gt->GetType() == cmState::EXECUTABLE ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         std::string tfull = gt->GetFullPath(configName);
         std::string trel = this->ConvertToRelativeForMake(tfull.c_str());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67e11dcd03afa00d5c7cdc83075eafb50243f145
commit 67e11dcd03afa00d5c7cdc83075eafb50243f145
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:14:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:26:06 2015 +0200

    Xcode: Re-order conditions.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 5be76af..d6c2e59 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2923,13 +2923,13 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(!cmtarget)
     {
+    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(!cmtarget)
+  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
     {
-    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15411eebfe1f3407a620d96ed85d92d67624ac5a
commit 15411eebfe1f3407a620d96ed85d92d67624ac5a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:38:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:26:06 2015 +0200

    Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d015a92..5be76af 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1368,22 +1368,22 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguages()
   for(TargetMap::const_iterator
         ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
     {
-    this->ForceLinkerLanguage(*ti->second);
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
+    this->ForceLinkerLanguage(gt);
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
+void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
 {
   // This matters only for targets that link.
-  if(cmtarget.GetType() != cmState::EXECUTABLE &&
-     cmtarget.GetType() != cmState::SHARED_LIBRARY &&
-     cmtarget.GetType() != cmState::MODULE_LIBRARY)
+  if(gtgt->GetType() != cmState::EXECUTABLE &&
+     gtgt->GetType() != cmState::SHARED_LIBRARY &&
+     gtgt->GetType() != cmState::MODULE_LIBRARY)
     {
     return;
     }
 
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
   std::string llang = gtgt->GetLinkerLanguage("NOCONFIG");
   if(llang.empty()) { return; }
 
@@ -1399,11 +1399,11 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // Add an empty source file to the target that compiles with the
   // linker language.  This should convince Xcode to choose the proper
   // language.
-  cmMakefile* mf = cmtarget.GetMakefile();
+  cmMakefile* mf = gtgt->Target->GetMakefile();
   std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
-  fname += cmtarget.GetName();
+  fname += gtgt->GetName();
   fname += "-CMakeForceLinker";
   fname += ".";
   fname += cmSystemTools::LowerCase(llang);
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index feb5009..10d9bd6 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -135,7 +135,7 @@ private:
   cmXCodeObject* CreateXCodeTarget(cmTarget& target,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
-  void ForceLinkerLanguage(cmTarget& cmtarget);
+  void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
   const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba39a6661b8be65647e4651b1356e4f25c0688fd
commit ba39a6661b8be65647e4651b1356e4f25c0688fd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:32:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:26:05 2015 +0200

    Xcode: Port loops to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fe115ac..d015a92 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -514,18 +514,18 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& target = *(*l)->Target;
+      cmGeneratorTarget* target = *l;
 
-      if (target.GetType() == cmState::GLOBAL_TARGET)
+      if (target->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
-      std::string targetName = target.GetName();
+      std::string targetName = target->GetName();
 
       if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
         {
-        target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+        target->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
 
       // make all exe, shared libs and modules
@@ -533,19 +533,19 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       // this will make sure that when the next target is built
       // things are up-to-date
       if(!makeHelper.empty() &&
-         (target.GetType() == cmState::EXECUTABLE ||
+         (target->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//          target.GetType() == cmState::OBJECT_LIBRARY ||
-          target.GetType() == cmState::STATIC_LIBRARY ||
-          target.GetType() == cmState::SHARED_LIBRARY ||
-          target.GetType() == cmState::MODULE_LIBRARY))
+//          target->GetType() == cmState::OBJECT_LIBRARY ||
+          target->GetType() == cmState::STATIC_LIBRARY ||
+          target->GetType() == cmState::SHARED_LIBRARY ||
+          target->GetType() == cmState::MODULE_LIBRARY))
         {
         makeHelper[makeHelper.size()-1] = // fill placeholder
-          this->PostBuildMakeTarget(target.GetName(), "$(CONFIGURATION)");
+          this->PostBuildMakeTarget(target->GetName(), "$(CONFIGURATION)");
         cmCustomCommandLines commandLines;
         commandLines.push_back(makeHelper);
         std::vector<std::string> no_byproducts;
-        lg->GetMakefile()->AddCustomCommandToTarget(target.GetName(),
+        lg->GetMakefile()->AddCustomCommandToTarget(target->GetName(),
                                                     no_byproducts,
                                                     no_depends,
                                                     commandLines,
@@ -554,19 +554,17 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                                                     dir.c_str());
         }
 
-      if(target.GetType() != cmState::INTERFACE_LIBRARY
-          && !target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
+      if(target->GetType() != cmState::INTERFACE_LIBRARY
+          && !target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
-        allbuild->AddUtility(target.GetName());
+        allbuild->AddUtility(target->GetName());
         }
 
-      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
-
       // Refer to the build configuration file for easy editing.
       listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
-      targetGT->AddSource(listfile.c_str());
+      target->AddSource(listfile.c_str());
       }
     }
 }
@@ -3074,28 +3072,26 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& cmtarget = *(*l)->Target;
+      cmGeneratorTarget* gtgt = *l;
 
       // Same skipping logic here as in CreateXCodeTargets so that we do not
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
       // groups:
       //
-      if(cmtarget.GetType() == cmState::GLOBAL_TARGET)
+      if(gtgt->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+      if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
 
-      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
-
       // add the soon to be generated Info.plist file as a source for a
       // MACOSX_BUNDLE file
-      if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
+      if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(cmtarget);
+        std::string plist = this->ComputeInfoPListLocation(gtgt->Target);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3115,14 +3111,14 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKey(cmtarget, sf);
+          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKey(gtgt->Target, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
       // Put OBJECT_LIBRARY objects in proper groups:
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(&cmtarget)->UseObjectLibraries(objs, "");
+      gtgt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -3130,8 +3126,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(cmtarget, source);
+          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(gtgt->Target, source);
         this->GroupMap[key] = pbxgroup;
         }
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4bd5e7a13f9ab7b50f4b5de3725b0f531c3631c
commit a4bd5e7a13f9ab7b50f4b5de3725b0f531c3631c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:20:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:26:04 2015 +0200

    Makefiles: Port to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 2c47ab2..bd47715 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 
 cmCommonTargetGenerator::cmCommonTargetGenerator(
   cmOutputConverter::RelativeRoot wd,
@@ -26,7 +25,6 @@ cmCommonTargetGenerator::cmCommonTargetGenerator(
   )
   : WorkingDirectory(wd)
   , GeneratorTarget(gt)
-  , Target(gt->Target)
   , Makefile(gt->Makefile)
   , LocalGenerator(static_cast<cmLocalCommonGenerator*>(gt->LocalGenerator))
   , GlobalGenerator(static_cast<cmGlobalCommonGenerator*>(
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index a4b2c10..3fb1fd0 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -21,7 +21,6 @@ class cmGlobalCommonGenerator;
 class cmLocalCommonGenerator;
 class cmMakefile;
 class cmSourceFile;
-class cmTarget;
 
 /** \class cmCommonTargetGenerator
  * \brief Common infrastructure for Makefile and Ninja per-target generators
@@ -49,7 +48,6 @@ protected:
 
   cmOutputConverter::RelativeRoot WorkingDirectory;
   cmGeneratorTarget* GeneratorTarget;
-  cmTarget* Target;
   cmMakefile* Makefile;
   cmLocalCommonGenerator* LocalGenerator;
   cmGlobalCommonGenerator* GlobalGenerator;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 4d7ca25..b4a915c 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -16,7 +16,6 @@
 #include "cmake.h"
 #include "cmGeneratedFileStream.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmGeneratorTarget.h"
 #include "cmAlgorithms.h"
 
@@ -742,7 +741,7 @@ cmGlobalUnixMakefileGenerator3
       makefileName = localName;
       makefileName += "/build.make";
 
-      bool needRequiresStep = this->NeedRequiresStep(*gtarget->Target);
+      bool needRequiresStep = this->NeedRequiresStep(gtarget);
 
       lg->WriteDivider(ruleFileStream);
       ruleFileStream
@@ -1129,19 +1128,19 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
 
 
 bool cmGlobalUnixMakefileGenerator3
-::NeedRequiresStep(cmTarget const& target)
+::NeedRequiresStep(const cmGeneratorTarget* target)
 {
   std::set<std::string> languages;
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&target);
-  gtgt->GetLanguages(languages,
-                target.GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"));
+  target->GetLanguages(languages,
+                       target->Target->GetMakefile()
+                       ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::set<std::string>::const_iterator l = languages.begin();
       l != languages.end(); ++l)
     {
     std::string var = "CMAKE_NEEDS_REQUIRES_STEP_";
     var += *l;
     var += "_FLAG";
-    if(target.GetMakefile()->GetDefinition(var))
+    if(target->Target->GetMakefile()->GetDefinition(var))
       {
       return true;
       }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 0485eb8..63ffcb4 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -154,7 +154,7 @@ protected:
                                  cmGeneratorTarget* target);
 
   // does this generator need a requires step for any of its targets
-  bool NeedRequiresStep(cmTarget const&);
+  bool NeedRequiresStep(cmGeneratorTarget const*);
 
   // Target name hooks for superclass.
   const char* GetAllTargetName()           const { return "all"; }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index e9dc9ff..34a50a3 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1977,7 +1977,7 @@ void cmLocalUnixMakefileGenerator3
                           cmGeneratorTarget* target)
 {
   ImplicitDependLanguageMap const& implicitLangs =
-    this->GetImplicitDepends(*target->Target);
+    this->GetImplicitDepends(target);
 
   // list the languages
   cmakefileStream
@@ -2292,19 +2292,20 @@ cmLocalUnixMakefileGenerator3
 
 //----------------------------------------------------------------------------
 cmLocalUnixMakefileGenerator3::ImplicitDependLanguageMap const&
-cmLocalUnixMakefileGenerator3::GetImplicitDepends(cmTarget const& tgt)
+cmLocalUnixMakefileGenerator3::GetImplicitDepends(
+    const cmGeneratorTarget* tgt)
 {
-  return this->ImplicitDepends[tgt.GetName()];
+  return this->ImplicitDepends[tgt->GetName()];
 }
 
 //----------------------------------------------------------------------------
 void
-cmLocalUnixMakefileGenerator3::AddImplicitDepends(cmTarget const& tgt,
+cmLocalUnixMakefileGenerator3::AddImplicitDepends(const cmGeneratorTarget* tgt,
                                                   const std::string& lang,
                                                   const char* obj,
                                                   const char* src)
 {
-  this->ImplicitDepends[tgt.GetName()][lang][obj].push_back(src);
+  this->ImplicitDepends[tgt->GetName()][lang][obj].push_back(src);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 7e0f248..8f69311 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -21,7 +21,6 @@ class cmCustomCommand;
 class cmCustomCommandGenerator;
 class cmDepends;
 class cmMakefileTargetGenerator;
-class cmTarget;
 class cmSourceFile;
 
 /** \class cmLocalUnixMakefileGenerator3
@@ -141,9 +140,11 @@ public:
     public std::map<std::string, ImplicitDependFileMap> {};
   struct ImplicitDependTargetMap:
     public std::map<std::string, ImplicitDependLanguageMap> {};
-  ImplicitDependLanguageMap const& GetImplicitDepends(cmTarget const& tgt);
+  ImplicitDependLanguageMap const&
+  GetImplicitDepends(cmGeneratorTarget const* tgt);
 
-  void AddImplicitDepends(cmTarget const& tgt, const std::string& lang,
+  void AddImplicitDepends(cmGeneratorTarget const* tgt,
+                          const std::string& lang,
                           const char* obj, const char* src);
 
   // write the target rules for the local Makefile into the stream
@@ -197,12 +198,12 @@ protected:
                             const std::string& helpTarget);
 
   void WriteTargetDependRule(std::ostream& ruleFileStream,
-                             cmTarget& target);
+                             cmGeneratorTarget* target);
   void WriteTargetCleanRule(std::ostream& ruleFileStream,
-                            cmTarget& target,
+                            cmGeneratorTarget* target,
                             const std::vector<std::string>& files);
   void WriteTargetRequiresRule(std::ostream& ruleFileStream,
-                               cmTarget& target,
+                               cmGeneratorTarget* target,
                                const std::vector<std::string>& objects);
 
   void AppendRuleDepend(std::vector<std::string>& depends,
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 020e64c..f56037f 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 
 //----------------------------------------------------------------------------
@@ -279,11 +278,13 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(!relink)
     {
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget);
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -448,8 +449,9 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(!relink)
     {
     this->LocalGenerator->
-      AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->GeneratorTarget);
+      AppendCustomCommands(commands,
+                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget);
     }
 
   // Write the build rule.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index df2a8c9..0a65641 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 #include "cmAlgorithms.h"
 
@@ -114,7 +113,8 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
 
   // Add post-build rules.
   this->LocalGenerator->
-    AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
+    AppendCustomCommands(commands,
+                         this->GeneratorTarget->Target->GetPostBuildCommands(),
                          this->GeneratorTarget);
 
   // Depend on the object files.
@@ -457,11 +457,13 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(!relink)
     {
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget);
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -811,8 +813,9 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(!relink)
     {
     this->LocalGenerator->
-      AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->GeneratorTarget);
+      AppendCustomCommands(commands,
+                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget);
     }
 
   // Compute the list of outputs.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b7970fd..7acccb3 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 #include "cmState.h"
 #include "cmComputeLinkInformation.h"
@@ -432,7 +431,7 @@ void cmMakefileTargetGenerator
   std::string srcFullPath =
     this->Convert(source.GetFullPath(), cmLocalGenerator::FULL);
   this->LocalGenerator->
-    AddImplicitDepends(*this->Target, lang,
+    AddImplicitDepends(this->GeneratorTarget, lang,
                        objFullPath.c_str(),
                        srcFullPath.c_str());
 }
@@ -1241,7 +1240,7 @@ void cmMakefileTargetGenerator
     std::string srcFullPath =
       this->Convert(idi->second, cmLocalGenerator::FULL);
     this->LocalGenerator->
-      AddImplicitDepends(*this->Target, idi->first,
+      AddImplicitDepends(this->GeneratorTarget, idi->first,
                          objFullPath.c_str(),
                          srcFullPath.c_str());
     }
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index e38c50b..38f40c0 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -24,7 +24,6 @@ class cmGeneratedFileStream;
 class cmGlobalUnixMakefileGenerator3;
 class cmLocalUnixMakefileGenerator3;
 class cmMakefile;
-class cmTarget;
 class cmSourceFile;
 
 /** \class cmMakefileTargetGenerator
@@ -51,7 +50,6 @@ public:
   std::string GetProgressFileNameFull()
     { return this->ProgressFileNameFull; }
 
-  cmTarget* GetTarget() { return this->Target;}
   cmGeneratorTarget* GetGeneratorTarget() { return this->GeneratorTarget;}
 
 protected:
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 11601c5..d35c3ae 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 
 //----------------------------------------------------------------------------
 cmMakefileUtilityTargetGenerator
@@ -68,19 +67,21 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Utility targets store their rules in pre- and post-build commands.
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->Target->GetPreBuildCommands());
+    (depends, this->GeneratorTarget->Target->GetPreBuildCommands());
 
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->Target->GetPostBuildCommands());
+    (depends, this->GeneratorTarget->Target->GetPostBuildCommands());
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPreBuildCommands(), this->GeneratorTarget);
+    (commands, this->GeneratorTarget->Target->GetPreBuildCommands(),
+     this->GeneratorTarget);
 
   // Depend on all custom command outputs for sources
   this->DriveCustomCommands(depends);
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPostBuildCommands(), this->GeneratorTarget);
+    (commands, this->GeneratorTarget->Target->GetPostBuildCommands(),
+     this->GeneratorTarget);
 
   // Add dependencies on targets that must be built first.
   this->AppendTargetDepends(depends);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e88d9c0156e74e422e1ed7e22aef9cf6327180d
commit 0e88d9c0156e74e422e1ed7e22aef9cf6327180d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:13:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:26:01 2015 +0200

    Ninja: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6e650ce..2671f4d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -886,7 +886,7 @@ void cmGlobalNinjaGenerator::WriteDisclaimer(std::ostream& os)
     << cmVersion::GetMinorVersion() << "\n\n";
 }
 
-void cmGlobalNinjaGenerator::AddDependencyToAll(cmTarget* target)
+void cmGlobalNinjaGenerator::AddDependencyToAll(cmGeneratorTarget* target)
 {
   this->AppendTargetOutputs(target, this->AllDependencies);
 }
@@ -912,18 +912,16 @@ void cmGlobalNinjaGenerator::WriteAssumedSourceDependencies()
 
 void
 cmGlobalNinjaGenerator
-::AppendTargetOutputs(cmTarget const* target, cmNinjaDeps& outputs)
+::AppendTargetOutputs(cmGeneratorTarget const* target, cmNinjaDeps& outputs)
 {
   std::string configName =
-    target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
+    target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // for frameworks, we want the real name, not smple name
   // frameworks always appear versioned, and the build.ninja
   // will always attempt to manage symbolic links instead
   // of letting cmOSXBundleGenerator do it.
-  bool realname = gtgt->IsFrameworkOnApple();
+  bool realname = target->IsFrameworkOnApple();
 
   switch (target->GetType()) {
   case cmState::EXECUTABLE:
@@ -932,7 +930,7 @@ cmGlobalNinjaGenerator
   case cmState::MODULE_LIBRARY:
     {
     outputs.push_back(this->ConvertToNinjaPath(
-      gtgt->GetFullPath(configName, false, realname)));
+      target->GetFullPath(configName, false, realname)));
     break;
     }
   case cmState::OBJECT_LIBRARY:
@@ -962,16 +960,15 @@ cmGlobalNinjaGenerator
 
 void
 cmGlobalNinjaGenerator
-::AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs)
+::AppendTargetDepends(cmGeneratorTarget const* target, cmNinjaDeps& outputs)
 {
   if (target->GetType() == cmState::GLOBAL_TARGET) {
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
-    std::set<std::string> const& utils = target->GetUtilities();
+    std::set<std::string> const& utils = target->Target->GetUtilities();
     std::copy(utils.begin(), utils.end(), std::back_inserter(outputs));
   } else {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(gt);
+    cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(target);
     for (cmTargetDependSet::const_iterator i = targetDeps.begin();
          i != targetDeps.end(); ++i)
       {
@@ -979,13 +976,13 @@ cmGlobalNinjaGenerator
         {
         continue;
         }
-      this->AppendTargetOutputs((*i)->Target, outputs);
+      this->AppendTargetOutputs(*i, outputs);
     }
   }
 }
 
 void cmGlobalNinjaGenerator::AddTargetAlias(const std::string& alias,
-                                            cmTarget* target) {
+                                            cmGeneratorTarget* target) {
   cmNinjaDeps outputs;
   this->AppendTargetOutputs(target, outputs);
   // Mark the target's outputs as ambiguous to ensure that no other target uses
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 292f7c7..7547f16 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -285,9 +285,11 @@ public:
     ASD.insert(deps.begin(), deps.end());
   }
 
-  void AppendTargetOutputs(cmTarget const* target, cmNinjaDeps& outputs);
-  void AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs);
-  void AddDependencyToAll(cmTarget* target);
+  void AppendTargetOutputs(cmGeneratorTarget const* target,
+                           cmNinjaDeps& outputs);
+  void AppendTargetDepends(cmGeneratorTarget const* target,
+                           cmNinjaDeps& outputs);
+  void AddDependencyToAll(cmGeneratorTarget* target);
   void AddDependencyToAll(const std::string& input);
 
   const std::vector<cmLocalGenerator*>& GetLocalGenerators() const {
@@ -299,7 +301,7 @@ public:
   int GetRuleCmdLength(const std::string& name) {
     return RuleCmdLength[name]; }
 
-  void AddTargetAlias(const std::string& alias, cmTarget* target);
+  void AddTargetAlias(const std::string& alias, cmGeneratorTarget* target);
 
   virtual void ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const;
 
@@ -388,7 +390,7 @@ private:
   /// The mapping from source file to assumed dependencies.
   std::map<std::string, std::set<std::string> > AssumedSourceDependencies;
 
-  typedef std::map<std::string, cmTarget*> TargetAliasMap;
+  typedef std::map<std::string, cmGeneratorTarget*> TargetAliasMap;
   TargetAliasMap TargetAliases;
 };
 
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 3dd18bd..891c44e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -89,7 +89,7 @@ void cmLocalNinjaGenerator::Generate()
       if (!this->GetGlobalNinjaGenerator()->IsExcluded(
             this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0],
             *t))
-        this->GetGlobalNinjaGenerator()->AddDependencyToAll((*t)->Target);
+        this->GetGlobalNinjaGenerator()->AddDependencyToAll(*t);
       delete tg;
       }
     }
@@ -285,14 +285,14 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
 
 void
 cmLocalNinjaGenerator
-::AppendTargetOutputs(cmTarget* target, cmNinjaDeps& outputs)
+::AppendTargetOutputs(cmGeneratorTarget* target, cmNinjaDeps& outputs)
 {
   this->GetGlobalNinjaGenerator()->AppendTargetOutputs(target, outputs);
 }
 
 void
 cmLocalNinjaGenerator
-::AppendTargetDepends(cmTarget* target, cmNinjaDeps& outputs)
+::AppendTargetDepends(cmGeneratorTarget* target, cmNinjaDeps& outputs)
 {
   this->GetGlobalNinjaGenerator()->AppendTargetDepends(target, outputs);
 }
@@ -441,7 +441,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
 }
 
 void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand const* cc,
-                                                   cmTarget* target)
+                                                   cmGeneratorTarget* target)
 {
   this->CustomCommandTargets[cc].insert(target);
 }
@@ -459,7 +459,7 @@ void cmLocalNinjaGenerator::WriteCustomCommandBuildStatements()
     //
     // FIXME: This won't work in certain obscure scenarios involving indirect
     // dependencies.
-    std::set<cmTarget*>::iterator j = i->second.begin();
+    std::set<cmGeneratorTarget*>::iterator j = i->second.begin();
     assert(j != i->second.end());
     std::vector<std::string> ccTargetDeps;
     this->AppendTargetDepends(*j, ccTargetDeps);
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index ce5f82d..b6987ef 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -58,10 +58,11 @@ public:
 
   std::string BuildCommandLine(const std::vector<std::string> &cmdLines);
 
-  void AppendTargetOutputs(cmTarget* target, cmNinjaDeps& outputs);
-  void AppendTargetDepends(cmTarget* target, cmNinjaDeps& outputs);
+  void AppendTargetOutputs(cmGeneratorTarget* target, cmNinjaDeps& outputs);
+  void AppendTargetDepends(cmGeneratorTarget* target, cmNinjaDeps& outputs);
 
-  void AddCustomCommandTarget(cmCustomCommand const* cc, cmTarget* target);
+  void AddCustomCommandTarget(cmCustomCommand const* cc,
+                              cmGeneratorTarget* target);
   void AppendCustomCommandLines(cmCustomCommandGenerator const& ccg,
                                 std::vector<std::string> &cmdLines);
   void AppendCustomCommandDeps(cmCustomCommandGenerator const& ccg,
@@ -102,7 +103,7 @@ private:
 
   std::string HomeRelativeOutputPath;
 
-  typedef std::map<cmCustomCommand const*, std::set<cmTarget*> >
+  typedef std::map<cmCustomCommand const*, std::set<cmGeneratorTarget*> >
     CustomCommandTargetMap;
   CustomCommandTargetMap CustomCommandTargets;
 };
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index dafbda9..b533d37 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -399,7 +399,6 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
 
 void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 {
-  cmTarget& target = *this->GetTarget();
   cmGeneratorTarget& gt = *this->GetGeneratorTarget();
   const std::string cfgName = this->GetConfigName();
   std::string targetOutput = ConvertToNinjaPath(
@@ -443,7 +442,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   // Write comments.
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
-  const cmState::TargetType targetType = target.GetType();
+  const cmState::TargetType targetType = gt.GetType();
   this->GetBuildFileStream()
     << "# Link build statements for "
     << cmState::GetTargetTypeName(targetType)
@@ -490,13 +489,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                           &genTarget,
                           useWatcomQuote);
   if(this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS")
-     && target.GetType() == cmState::SHARED_LIBRARY)
+     && gt.GetType() == cmState::SHARED_LIBRARY)
     {
-    if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(gt.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file
         = gt.GetSupportDirectory();
-      name_of_def_file += "/" + target.GetName();
+      name_of_def_file += "/" + gt.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
       vars["LINK_FLAGS"] += this->GetLocalGenerator()
@@ -505,7 +504,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       }
     }
 
-  this->addPoolNinjaVariable("JOB_POOL_LINK", &target, vars);
+  this->addPoolNinjaVariable("JOB_POOL_LINK", &gt, vars);
 
   this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);
   vars["LINK_FLAGS"] = cmGlobalNinjaGenerator
@@ -599,9 +598,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   const std::vector<cmCustomCommand> *cmdLists[3] = {
-    &target.GetPreBuildCommands(),
-    &target.GetPreLinkCommands(),
-    &target.GetPostBuildCommands()
+    &gt.Target->GetPreBuildCommands(),
+    &gt.Target->GetPreLinkCommands(),
+    &gt.Target->GetPostBuildCommands()
   };
 
   std::vector<std::string> preLinkCmdLines, postBuildCmdLines;
@@ -626,17 +625,17 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // maybe create .def file from list of objects
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (gt.GetType() == cmState::SHARED_LIBRARY &&
       this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(gt.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
         = gt.GetSupportDirectory();
-      name_of_def_file += "/" + target.GetName();
+      name_of_def_file += "/" + gt.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
       cmd += " -E __create_def ";
@@ -699,11 +698,11 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   const std::string rspfile =
       std::string(cmake::GetCMakeFilesDirectoryPostSlash())
-      + target.GetName() + ".rsp";
+      + gt.GetName() + ".rsp";
 
   // Gather order-only dependencies.
   cmNinjaDeps orderOnlyDeps;
-  this->GetLocalGenerator()->AppendTargetDepends(this->GetTarget(),
+  this->GetLocalGenerator()->AppendTargetDepends(this->GetGeneratorTarget(),
     orderOnlyDeps);
 
   // Ninja should restat after linking if and only if there are byproducts.
@@ -772,8 +771,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // Add aliases for the file name and the target name.
-  globalGen.AddTargetAlias(this->TargetNameOut, &target);
-  globalGen.AddTargetAlias(this->GetTargetName(), &target);
+  globalGen.AddTargetAlias(this->TargetNameOut, &gt);
+  globalGen.AddTargetAlias(this->GetTargetName(), &gt);
 }
 
 //----------------------------------------------------------------------------
@@ -781,7 +780,8 @@ void cmNinjaNormalTargetGenerator::WriteObjectLibStatement()
 {
   // Write a phony output that depends on all object files.
   cmNinjaDeps outputs;
-  this->GetLocalGenerator()->AppendTargetOutputs(this->GetTarget(), outputs);
+  this->GetLocalGenerator()->AppendTargetOutputs(this->GetGeneratorTarget(),
+                                                 outputs);
   cmNinjaDeps depends = this->GetObjects();
   this->GetGlobalGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
                                               "Object library "
@@ -791,5 +791,5 @@ void cmNinjaNormalTargetGenerator::WriteObjectLibStatement()
 
   // Add aliases for the target name.
   this->GetGlobalGenerator()->AddTargetAlias(this->GetTargetName(),
-                                             this->GetTarget());
+                                             this->GetGeneratorTarget());
 }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index b018005..dc2c7a6 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -486,7 +486,8 @@ cmNinjaTargetGenerator
       si != customCommands.end(); ++si)
      {
      cmCustomCommand const* cc = (*si)->GetCustomCommand();
-     this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
+     this->GetLocalGenerator()->AddCustomCommandTarget(cc,
+         this->GetGeneratorTarget());
      // Record the custom commands for this target. The container is used
      // in WriteObjectBuildStatement when called in a loop below.
      this->CustomCommands.push_back(cc);
@@ -511,7 +512,8 @@ cmNinjaTargetGenerator
     }
 
   cmNinjaDeps orderOnlyDeps;
-  this->GetLocalGenerator()->AppendTargetDepends(this->Target, orderOnlyDeps);
+  this->GetLocalGenerator()->AppendTargetDepends(this->GeneratorTarget,
+                                                 orderOnlyDeps);
 
   // Add order-only dependencies on custom command outputs.
   for(std::vector<cmCustomCommand const*>::const_iterator
@@ -633,7 +635,8 @@ cmNinjaTargetGenerator
                               ConvertToNinjaPath(objectFileDir),
                               cmLocalGenerator::SHELL);
 
-  this->addPoolNinjaVariable("JOB_POOL_COMPILE", this->GetTarget(), vars);
+  this->addPoolNinjaVariable("JOB_POOL_COMPILE",
+                             this->GetGeneratorTarget(), vars);
 
   this->SetMsvcTargetPdbVariable(vars);
 
@@ -782,7 +785,7 @@ cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
 
 void cmNinjaTargetGenerator::addPoolNinjaVariable(
                                               const std::string& pool_property,
-                                              cmTarget* target,
+                                              cmGeneratorTarget* target,
                                               cmNinjaVars& vars)
 {
     const char* pool = target->GetProperty(pool_property);
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 0267f63..e3ec423 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -53,9 +53,6 @@ protected:
   cmGeneratedFileStream& GetBuildFileStream() const;
   cmGeneratedFileStream& GetRulesFileStream() const;
 
-  cmTarget* GetTarget() const
-  { return this->Target; }
-
   cmGeneratorTarget* GetGeneratorTarget() const
   { return this->GeneratorTarget; }
 
@@ -152,7 +149,7 @@ protected:
   std::set<std::string> MacContentFolders;
 
   void addPoolNinjaVariable(const std::string& pool_property,
-                            cmTarget* target,
+                            cmGeneratorTarget* target,
                             cmNinjaVars& vars);
 
 private:
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 5bbe268..b2a5334 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmGlobalNinjaGenerator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmCustomCommandGenerator.h"
 
 cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(
@@ -34,8 +33,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
   cmNinjaDeps deps, outputs, util_outputs(1, utilCommandName);
 
   const std::vector<cmCustomCommand> *cmdLists[2] = {
-    &this->GetTarget()->GetPreBuildCommands(),
-    &this->GetTarget()->GetPostBuildCommands()
+    &this->GetGeneratorTarget()->Target->GetPreBuildCommands(),
+    &this->GetGeneratorTarget()->Target->GetPostBuildCommands()
   };
 
   bool uses_terminal = false;
@@ -66,7 +65,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
       {
       cmCustomCommandGenerator ccg(*cc, this->GetConfigName(),
                                    this->GetLocalGenerator());
-      this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
+      this->GetLocalGenerator()->AddCustomCommandTarget(cc,
+          this->GetGeneratorTarget());
 
       // Depend on all custom command outputs.
       const std::vector<std::string>& ccOutputs = ccg.GetOutputs();
@@ -78,8 +78,10 @@ void cmNinjaUtilityTargetGenerator::Generate()
       }
     }
 
-  this->GetLocalGenerator()->AppendTargetOutputs(this->GetTarget(), outputs);
-  this->GetLocalGenerator()->AppendTargetDepends(this->GetTarget(), deps);
+  this->GetLocalGenerator()->AppendTargetOutputs(this->GetGeneratorTarget(),
+                                                 outputs);
+  this->GetLocalGenerator()->AppendTargetDepends(this->GetGeneratorTarget(),
+                                                 deps);
 
   if (commands.empty()) {
     this->GetGlobalGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
@@ -140,5 +142,5 @@ void cmNinjaUtilityTargetGenerator::Generate()
   }
 
   this->GetGlobalGenerator()->AddTargetAlias(this->GetTargetName(),
-                                             this->GetTarget());
+                                             this->GetGeneratorTarget());
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d261de843aded62176a2737830e3d2c3248c03db
commit d261de843aded62176a2737830e3d2c3248c03db
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:59:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:21:46 2015 +0200

    Use cmLocalGenerator at generate-time.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 6920faf..2c47ab2 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -123,7 +123,7 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const
     else
       {
       // Interpret relative to the current output directory.
-      mod_dir = this->Makefile->GetCurrentBinaryDirectory();
+      mod_dir = this->LocalGenerator->GetCurrentBinaryDirectory();
       mod_dir += "/";
       mod_dir += target_mod_dir;
       }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 1a84625..d52ce35 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -456,13 +456,13 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
 
   if (cge->GetHadContextSensitiveCondition())
     {
-    cmMakefile* mf = target->Target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" is installed with "
     "INCLUDES DESTINATION set to a context sensitive path.  Paths which "
     "depend on the configuration, policy values or the link interface are "
     "not supported.  Consider using target_include_directories instead.";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
@@ -535,11 +535,11 @@ void getCompatibleInterfaceProperties(cmGeneratorTarget *target,
 
   if (!info)
     {
-    cmMakefile* mf = target->Target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Exporting the target \"" << target->GetName() << "\" is not "
         "allowed since its linker language cannot be determined";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
@@ -835,13 +835,13 @@ cmExportFileGenerator
 
   if(newCMP0022Behavior && !this->ExportOld)
     {
-    cmMakefile *mf = target->Target->GetMakefile();
+    cmLocalGenerator *lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" has policy CMP0022 enabled, "
          "but also has old-style LINK_INTERFACE_LIBRARIES properties "
          "populated, but it was exported without the "
          "EXPORT_LINK_INTERFACE_LIBRARIES to export the old-style properties";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 89a6dff..6e650ce 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -719,7 +719,7 @@ void cmGlobalNinjaGenerator
 {
   // Compute full path to object file directory for this target.
   std::string dir;
-  dir += gt->Makefile->GetCurrentBinaryDirectory();
+  dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
@@ -938,7 +938,7 @@ cmGlobalNinjaGenerator
   case cmState::OBJECT_LIBRARY:
   case cmState::UTILITY: {
     std::string path = this->ConvertToNinjaPath(
-      target->GetMakefile()->GetCurrentBinaryDirectory());
+      target->GetLocalGenerator()->GetCurrentBinaryDirectory());
     if (path.empty() || path == ".")
       outputs.push_back(target->GetName());
     else {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 2a5b153..4d7ca25 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -116,7 +116,7 @@ cmGlobalUnixMakefileGenerator3
 {
   // Compute full path to object file directory for this target.
   std::string dir;
-  dir += gt->Makefile->GetCurrentBinaryDirectory();
+  dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7a10356..59d06f6 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -76,7 +76,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   if(this->Target->NeedRelinkBeforeInstall(config))
     {
     fromDirConfig =
-        this->Target->Target->GetMakefile()->GetCurrentBinaryDirectory();
+        this->Target->GetLocalGenerator()->GetCurrentBinaryDirectory();
     fromDirConfig += cmake::GetCMakeFilesDirectory();
     fromDirConfig += "/CMakeRelink.dir/";
     }
@@ -111,7 +111,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
     case cmState::UTILITY:
     case cmState::GLOBAL_TARGET:
     case cmState::UNKNOWN_LIBRARY:
-      this->Target->Target->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR,
+      this->Target->GetLocalGenerator()->IssueMessage(cmake::INTERNAL_ERROR,
         "cmInstallTargetGenerator created with non-installable target.");
       return;
     }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2166c09..c37417d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2140,7 +2140,7 @@ void cmLocalGenerator
       "has the following visibility properties set for " << lang << ":\n" <<
       warnCMP0063 <<
       "For compatibility CMake is not honoring them for this target.";
-    target->Target->GetMakefile()->GetCMakeInstance()
+    target->GetLocalGenerator()->GetCMakeInstance()
       ->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
                      target->GetBacktrace());
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index dae8aaf..e9dc9ff 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -188,7 +188,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     // Compute full path to object file directory for this target.
     std::string dir;
-    dir += gt->Makefile->GetCurrentBinaryDirectory();
+    dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
     dir += "/";
     dir += this->GetTargetDirectory(gt);
     dir += "/";

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65cddc1e1c64c7ddbaf8ee437616e301d5dd030a
commit 65cddc1e1c64c7ddbaf8ee437616e301d5dd030a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 17:06:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:19:47 2015 +0200

    Port to GetGeneratorTargets.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 03f4fdd..113c989 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -175,13 +175,12 @@ void cmComputeTargetDepends::CollectTargets()
     this->GlobalGenerator->GetLocalGenerators();
   for(unsigned int i = 0; i < lgens.size(); ++i)
     {
-    const cmTargets& targets = lgens[i]->GetMakefile()->GetTargets();
-    for(cmTargets::const_iterator ti = targets.begin();
+    const std::vector<cmGeneratorTarget*> targets =
+        lgens[i]->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      cmTarget const* target = &ti->second;
-      cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(target);
+      cmGeneratorTarget* gt = *ti;
       int index = static_cast<int>(this->Targets.size());
       this->TargetIndex[gt] = index;
       this->Targets.push_back(gt);
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 3bc76fa..a71b1cb 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -319,12 +319,12 @@ void cmExtraCodeBlocksGenerator
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
        lg!=lgs.end(); lg++)
     {
-    cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -333,7 +333,7 @@ void cmExtraCodeBlocksGenerator
           if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
-            this->AppendTarget(fout, ti->first, 0,
+            this->AppendTarget(fout, targetName, 0,
                                make.c_str(), *lg, compiler.c_str());
             }
           }
@@ -341,15 +341,16 @@ void cmExtraCodeBlocksGenerator
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-             || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-             || ((ti->first.find("Experimental")==0)
-                                               && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+             || ((targetName.find("Continuous")==0)
+                 &&(targetName!="Continuous"))
+             || ((targetName.find("Experimental")==0)
+                                             && (targetName!="Experimental")))
             {
             break;
             }
 
-          this->AppendTarget(fout, ti->first, 0,
+          this->AppendTarget(fout, targetName, 0,
                                  make.c_str(), *lg, compiler.c_str());
           break;
         case cmState::EXECUTABLE:
@@ -358,11 +359,10 @@ void cmExtraCodeBlocksGenerator
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
-          this->AppendTarget(fout, ti->first, gt,
+          cmGeneratorTarget* gt = *ti;
+          this->AppendTarget(fout, targetName, gt,
                              make.c_str(), *lg, compiler.c_str());
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
           this->AppendTarget(fout, fastTarget, gt,
                              make.c_str(), *lg, compiler.c_str());
@@ -388,11 +388,11 @@ void cmExtraCodeBlocksGenerator
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -402,8 +402,7 @@ void cmExtraCodeBlocksGenerator
         case cmState::UTILITY: // can have sources since 2.6.3
           {
           std::vector<cmSourceFile*> sources;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
@@ -442,7 +441,7 @@ void cmExtraCodeBlocksGenerator
               }
 
             CbpUnit &cbpUnit = allFiles[fullPath];
-            cbpUnit.Targets.push_back(&(ti->second));
+            cbpUnit.Targets.push_back((*ti)->Target);
             }
           }
         default:  // intended fallthrough
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 10f33be..f4a6537 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -155,12 +155,12 @@ void cmExtraCodeLiteGenerator
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
 
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
           {
@@ -186,7 +186,7 @@ void cmExtraCodeLiteGenerator
           break;
         }
 
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -194,8 +194,7 @@ void cmExtraCodeLiteGenerator
         case cmState::MODULE_LIBRARY:
           {
           std::vector<cmSourceFile*> sources;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 1921f03..aedf6f4 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -536,13 +536,15 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
        ++lgIt)
     {
     cmMakefile* makefile = (*lgIt)->GetMakefile();
-    const cmTargets& targets = makefile->GetTargets();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*lgIt)->GetGeneratorTargets();
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end();++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti=targets.begin();
+        ti!=targets.end();++ti)
       {
       std::string linkName2 = linkName;
       linkName2 += "/";
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -550,10 +552,10 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
+          const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
           linkName2 += prefix;
-          linkName2 += ti->first;
+          linkName2 += (*ti)->GetName();
           this->AppendLinkedResource(fout, linkName2, "virtual:/virtual",
                                      VirtualFolder);
           if (!this->GenerateLinkedResources)
@@ -562,10 +564,8 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
             }
           std::vector<cmSourceGroup> sourceGroups=makefile->GetSourceGroups();
           // get the files from the source lists then add them to the groups
-          cmTarget* tgt = const_cast<cmTarget*>(&ti->second);
+          cmGeneratorTarget* gt = const_cast<cmGeneratorTarget*>(*ti);
           std::vector<cmSourceFile*> files;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(tgt);
           gt->GetSourceFiles(files,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for(std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
@@ -1030,7 +1030,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*it)->GetGeneratorTargets();
     std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
@@ -1038,9 +1039,11 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       subdir = "";
       }
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti =
+        targets.begin(); ti!=targets.end(); ++ti)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -1048,22 +1051,22 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           // not from the subdirs
           if (subdir.empty())
            {
-           this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
+           this->AppendTarget(fout, targetName, make, makeArgs, subdir, ": ");
            }
          }
          break;
        case cmState::UTILITY:
          // Add all utility targets, except the Nightly/Continuous/
          // Experimental-"sub"targets as e.g. NightlyStart
-         if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-          || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-          || ((ti->first.find("Experimental")==0)
-                                            && (ti->first!="Experimental")))
+         if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+          || ((targetName.find("Continuous")==0)&&(targetName!="Continuous"))
+          || ((targetName.find("Experimental")==0)
+                                            && (targetName!="Experimental")))
            {
            break;
            }
 
-         this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
+         this->AppendTarget(fout, targetName, make, makeArgs, subdir, ": ");
          break;
        case cmState::EXECUTABLE:
        case cmState::STATIC_LIBRARY:
@@ -1071,10 +1074,10 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        case cmState::MODULE_LIBRARY:
        case cmState::OBJECT_LIBRARY:
          {
-         const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
+         const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
-         this->AppendTarget(fout, ti->first, make, makeArgs, subdir, prefix);
-         std::string fastTarget = ti->first;
+         this->AppendTarget(fout, targetName, make, makeArgs, subdir, prefix);
+         std::string fastTarget = targetName;
          fastTarget += "/fast";
          this->AppendTarget(fout, fastTarget, make, makeArgs, subdir, prefix);
 
@@ -1083,21 +1086,20 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           {
           std::string virtDir = "[Targets]/";
           virtDir += prefix;
-          virtDir += ti->first;
+          virtDir += targetName;
           std::string buildArgs = "-C \"";
           buildArgs += (*it)->GetBinaryDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
-                             ti->first.c_str());
+                             targetName.c_str());
 
           std::string cleanArgs = "-E chdir \"";
           cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           cleanArgs += (*it)->GetTargetDirectory(gt);
           cleanArgs += "/cmake_clean.cmake\"";
           this->AppendTarget(fout, "Clean", cmSystemTools::GetCMakeCommand(),
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index dc6421b..1741acf 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -119,14 +119,16 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*it)->GetGeneratorTargets();
     std::string currentDir = (*it)->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti =
+        targets.begin(); ti!=targets.end(); ++ti)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -138,9 +140,9 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             insertTarget = true;
             // only add the "edit_cache" target if it's not ccmake, because
             // this will not work within the IDE
-            if (ti->first == "edit_cache")
+            if (targetName == "edit_cache")
               {
-              const char* editCommand = makefile->GetDefinition
+              const char* editCommand = (*it)->GetMakefile()->GetDefinition
               ("CMAKE_EDIT_COMMAND");
               if (editCommand == 0)
                 {
@@ -154,7 +156,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             }
           if (insertTarget)
             {
-            this->AppendTarget(fout, ti->first, make, makeArgs,
+            this->AppendTarget(fout, targetName, make, makeArgs,
                                currentDir, homeOutputDir);
             }
         }
@@ -162,15 +164,16 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-            || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-            || ((ti->first.find("Experimental")==0)
-            && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+            || ((targetName.find("Continuous")==0)
+                &&(targetName!="Continuous"))
+            || ((targetName.find("Experimental")==0)
+            && (targetName!="Experimental")))
             {
               break;
             }
 
-            this->AppendTarget(fout, ti->first, make, makeArgs,
+            this->AppendTarget(fout, targetName, make, makeArgs,
                                currentDir, homeOutputDir);
           break;
         case cmState::EXECUTABLE:
@@ -179,9 +182,9 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
         {
-          this->AppendTarget(fout, ti->first, make, makeArgs,
+          this->AppendTarget(fout, targetName, make, makeArgs,
                              currentDir, homeOutputDir);
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
           this->AppendTarget(fout, fastTarget, make, makeArgs,
                              currentDir, homeOutputDir);
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index ac0202b..47822e8 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -162,11 +162,12 @@ void cmExtraSublimeTextGenerator::
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -175,7 +176,7 @@ void cmExtraSublimeTextGenerator::
           if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
-            this->AppendTarget(fout, ti->first, *lg, 0,
+            this->AppendTarget(fout, targetName, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
                                sourceFileFlags, false);
             }
@@ -184,15 +185,16 @@ void cmExtraSublimeTextGenerator::
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-             || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-             || ((ti->first.find("Experimental")==0)
-                                               && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+             || ((targetName.find("Continuous")==0)
+                 &&(targetName!="Continuous"))
+             || ((targetName.find("Experimental")==0)
+                 && (targetName!="Experimental")))
             {
             break;
             }
 
-          this->AppendTarget(fout, ti->first, *lg, 0,
+          this->AppendTarget(fout, targetName, *lg, 0,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           break;
@@ -202,12 +204,12 @@ void cmExtraSublimeTextGenerator::
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, ti->first, *lg, &ti->second,
+          this->AppendTarget(fout, targetName, *lg, (*ti)->Target,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, *lg, &ti->second,
+          this->AppendTarget(fout, fastTarget, *lg, (*ti)->Target,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 13efc4c..d26cc34 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1468,34 +1468,34 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
 #ifdef CMAKE_BUILD_WITH_CMAKE
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    cmTargets& targets =
-      this->LocalGenerators[i]->GetMakefile()->GetTargets();
+    std::vector<cmGeneratorTarget*> targets =
+      this->LocalGenerators[i]->GetGeneratorTargets();
     std::vector<cmGeneratorTarget*> filteredTargets;
     filteredTargets.reserve(targets.size());
-    for(cmTargets::iterator ti = targets.begin();
+    for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      if (ti->second.GetType() == cmState::GLOBAL_TARGET)
+      if ((*ti)->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(ti->second.GetType() != cmState::EXECUTABLE &&
-         ti->second.GetType() != cmState::STATIC_LIBRARY &&
-         ti->second.GetType() != cmState::SHARED_LIBRARY &&
-         ti->second.GetType() != cmState::MODULE_LIBRARY &&
-         ti->second.GetType() != cmState::OBJECT_LIBRARY)
+      if((*ti)->GetType() != cmState::EXECUTABLE &&
+         (*ti)->GetType() != cmState::STATIC_LIBRARY &&
+         (*ti)->GetType() != cmState::SHARED_LIBRARY &&
+         (*ti)->GetType() != cmState::MODULE_LIBRARY &&
+         (*ti)->GetType() != cmState::OBJECT_LIBRARY)
         {
         continue;
         }
-      if((!ti->second.GetPropertyAsBool("AUTOMOC")
-            && !ti->second.GetPropertyAsBool("AUTOUIC")
-            && !ti->second.GetPropertyAsBool("AUTORCC"))
-          || ti->second.IsImported())
+      if((!(*ti)->GetPropertyAsBool("AUTOMOC")
+            && !(*ti)->GetPropertyAsBool("AUTOUIC")
+            && !(*ti)->GetPropertyAsBool("AUTORCC"))
+          || (*ti)->IsImported())
         {
         continue;
         }
       // don't do anything if there is no Qt4 or Qt5Core (which contains moc):
-      cmMakefile* mf = ti->second.GetMakefile();
+      cmMakefile* mf = (*ti)->Target->GetMakefile();
       std::string qtMajorVersion = mf->GetSafeDefinition("QT_VERSION_MAJOR");
       if (qtMajorVersion == "")
         {
@@ -1506,7 +1506,7 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
         continue;
         }
 
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(&ti->second);
+      cmGeneratorTarget* gt = *ti;
 
       cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt);
       filteredTargets.push_back(gt);
@@ -2706,23 +2706,22 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
       {
       continue;
       }
-    cmMakefile* mf = (*i)->GetMakefile();
     // Get the targets in the makefile
-    cmTargets &tgts = mf->GetTargets();
+    std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
     // loop over all the targets
-    for (cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+    for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+         l != tgts.end(); ++l)
       {
-      cmTarget* target = &l->second;
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-      if(this->IsRootOnlyTarget(gt) &&
-         target->GetMakefile() != root->GetMakefile())
+      cmGeneratorTarget* target = *l;
+      if(this->IsRootOnlyTarget(target) &&
+         target->GetLocalGenerator() != root)
         {
         continue;
         }
       // put the target in the set of original targets
-      originalTargets.insert(gt);
+      originalTargets.insert(target);
       // Get the set of targets that depend on target
-      this->AddTargetDepends(gt, projectTargets);
+      this->AddTargetDepends(target, projectTargets);
       }
     }
 }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 8659e34..7c6c48c 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -133,14 +133,13 @@ bool cmGlobalKdevelopGenerator
       }
 
     //get all sources
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*it)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
       std::vector<cmSourceFile*> sources;
-      cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(&ti->second);
-      gt->GetSourceFiles(sources, ti->second.GetMakefile()
+      cmGeneratorTarget* gt = *ti;
+      gt->GetSourceFiles(sources, gt->Target->GetMakefile()
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
            si!=sources.end(); si++)
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 248701a..2a5b153 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -423,17 +423,18 @@ void cmGlobalUnixMakefileGenerator3
     {
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>(lGenerators[i]);
     // for all of out targets
-    for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
-         l != lg->GetMakefile()->GetTargets().end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+         l != tgts.end(); l++)
       {
-      if((l->second.GetType() == cmState::EXECUTABLE) ||
-         (l->second.GetType() == cmState::STATIC_LIBRARY) ||
-         (l->second.GetType() == cmState::SHARED_LIBRARY) ||
-         (l->second.GetType() == cmState::MODULE_LIBRARY) ||
-         (l->second.GetType() == cmState::OBJECT_LIBRARY) ||
-         (l->second.GetType() == cmState::UTILITY))
+      if(((*l)->GetType() == cmState::EXECUTABLE) ||
+         ((*l)->GetType() == cmState::STATIC_LIBRARY) ||
+         ((*l)->GetType() == cmState::SHARED_LIBRARY) ||
+         ((*l)->GetType() == cmState::MODULE_LIBRARY) ||
+         ((*l)->GetType() == cmState::OBJECT_LIBRARY) ||
+         ((*l)->GetType() == cmState::UTILITY))
         {
-        cmGeneratorTarget* gt = this->GetGeneratorTarget(&l->second);
+        cmGeneratorTarget* gt = *l;
         std::string tname = lg->GetRelativeTargetDirectory(gt);
         tname += "/DependInfo.cmake";
         cmSystemTools::ConvertToUnixSlashes(tname);
@@ -914,13 +915,11 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
       lgi != this->LocalGenerators.end(); ++lgi)
     {
     cmLocalGenerator* lg = *lgi;
-    cmMakefile* mf = lg->GetMakefile();
-    cmTargets const& targets = mf->GetTargets();
-    for(cmTargets::const_iterator t = targets.begin(); t != targets.end(); ++t)
+    std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::const_iterator t = targets.begin();
+        t != targets.end(); ++t)
       {
-      cmTarget const& target = t->second;
-
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
+      cmGeneratorTarget* gt = *t;
 
       cmLocalGenerator* tlg = gt->GetLocalGenerator();
 
@@ -1089,11 +1088,12 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
     if (lg2 == lg || lg->GetMakefile()->IsRootMakefile())
       {
       // for each target Generate the rule files for each target.
-      cmTargets& targets = lg2->GetMakefile()->GetTargets();
-      for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
+      std::vector<cmGeneratorTarget*> targets = lg2->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+          t != targets.end(); ++t)
         {
-        cmTarget const& target = t->second;
-        cmState::TargetType type = target.GetType();
+        cmGeneratorTarget* target = *t;
+        cmState::TargetType type = target->GetType();
         if((type == cmState::EXECUTABLE) ||
            (type == cmState::STATIC_LIBRARY) ||
            (type == cmState::SHARED_LIBRARY) ||
@@ -1102,7 +1102,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
            (type == cmState::GLOBAL_TARGET) ||
            (type == cmState::UTILITY))
           {
-          std::string name = target.GetName();
+          std::string name = target->GetName();
           if(emittedTargets.insert(name).second)
             {
             path = "... ";
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 2c8cb56..1d4b36c 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -375,11 +375,11 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
     for(std::vector<cmLocalGenerator*>::iterator i = gen.begin();
         i != gen.end(); ++i)
       {
-      cmTargets& targets = (*i)->GetMakefile()->GetTargets();
-      for(cmTargets::iterator ti = targets.begin();
+      std::vector<cmGeneratorTarget*> targets = (*i)->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(ti->second);
+        this->ComputeVSTargetDepends((*ti)->Target);
         }
       }
     }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index c06f503..fe115ac 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -510,17 +510,20 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       continue;
       }
 
-    cmTargets& tgts = lg->GetMakefile()->GetTargets();
-    for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+        l != tgts.end(); l++)
       {
-      cmTarget& target = l->second;
+      cmTarget& target = *(*l)->Target;
 
       if (target.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
-      if (regenerate && (l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
+      std::string targetName = target.GetName();
+
+      if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
         {
         target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
@@ -1085,21 +1088,26 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
                                            targets)
 {
   this->SetCurrentLocalGenerator(gen);
-  cmTargets &tgts = this->CurrentMakefile->GetTargets();
-  typedef std::map<std::string, cmTarget*, cmCompareTargets> cmSortedTargets;
+  std::vector<cmGeneratorTarget*> tgts =
+      this->CurrentLocalGenerator->GetGeneratorTargets();
+  typedef std::map<std::string, cmGeneratorTarget*, cmCompareTargets>
+      cmSortedTargets;
   cmSortedTargets sortedTargets;
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); l++)
     {
-    sortedTargets[l->first] = &l->second;
+    sortedTargets[(*l)->GetName()] = *l;
     }
   for(cmSortedTargets::iterator l = sortedTargets.begin();
       l != sortedTargets.end(); l++)
     {
-    cmTarget& cmtarget = *l->second;
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+    cmGeneratorTarget* gtgt = l->second;
+    cmTarget& cmtarget = *gtgt->Target;
+
+    std::string targetName = gtgt->GetName();
 
     // make sure ALL_BUILD, INSTALL, etc are only done once
-    if(this->SpecialTargetEmitted(l->first.c_str()))
+    if(this->SpecialTargetEmitted(targetName.c_str()))
       {
       continue;
       }
@@ -3062,10 +3070,11 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       }
     cmMakefile* mf = (*i)->GetMakefile();
     std::vector<cmSourceGroup> sourceGroups = mf->GetSourceGroups();
-    cmTargets &tgts = mf->GetTargets();
-    for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+        l != tgts.end(); l++)
       {
-      cmTarget& cmtarget = l->second;
+      cmTarget& cmtarget = *(*l)->Target;
 
       // Same skipping logic here as in CreateXCodeTargets so that we do not
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3658473..2166c09 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2510,28 +2510,29 @@ cmLocalGenerator
 {
   // Convert the old-style install specification from each target to
   // an install generator and run it.
-  cmTargets& tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
     // Include the user-specified pre-install script for this target.
-    if(const char* preinstall = l->second.GetProperty("PRE_INSTALL_SCRIPT"))
+    if(const char* preinstall = (*l)->GetProperty("PRE_INSTALL_SCRIPT"))
       {
       cmInstallScriptGenerator g(preinstall, false, 0);
       g.Generate(os, config, configurationTypes);
       }
 
     // Install this target if a destination is given.
-    if(l->second.GetInstallPath() != "")
+    if((*l)->Target->GetInstallPath() != "")
       {
       // Compute the full install destination.  Note that converting
       // to unix slashes also removes any trailing slash.
       // We also skip over the leading slash given by the user.
-      std::string destination = l->second.GetInstallPath().substr(1);
+      std::string destination = (*l)->Target->GetInstallPath().substr(1);
       cmSystemTools::ConvertToUnixSlashes(destination);
       if(destination.empty())
         {
@@ -2539,7 +2540,7 @@ cmLocalGenerator
         }
 
       // Generate the proper install generator for this target type.
-      switch(l->second.GetType())
+      switch((*l)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -2547,7 +2548,7 @@ cmLocalGenerator
           {
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
-            g(this, l->first, destination.c_str(), false);
+            g(this, (*l)->GetName(), destination.c_str(), false);
           g.Generate(os, config, configurationTypes);
           }
           break;
@@ -2558,18 +2559,18 @@ cmLocalGenerator
           // to the normal destination and the DLL to the runtime
           // destination.
           cmInstallTargetGeneratorLocal
-            g1(this, l->first, destination.c_str(), true);
+            g1(this, (*l)->GetName(), destination.c_str(), true);
           g1.Generate(os, config, configurationTypes);
           // We also skip over the leading slash given by the user.
-          destination = l->second.GetRuntimeInstallPath().substr(1);
+          destination = (*l)->Target->GetRuntimeInstallPath().substr(1);
           cmSystemTools::ConvertToUnixSlashes(destination);
           cmInstallTargetGeneratorLocal
-            g2(this, l->first, destination.c_str(), false);
+            g2(this, (*l)->GetName(), destination.c_str(), false);
           g2.Generate(os, config, configurationTypes);
 #else
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
-            g(this, l->first, destination.c_str(), false);
+            g(this, (*l)->GetName(), destination.c_str(), false);
           g.Generate(os, config, configurationTypes);
 #endif
           }
@@ -2580,7 +2581,7 @@ cmLocalGenerator
       }
 
     // Include the user-specified post-install script for this target.
-    if(const char* postinstall = l->second.GetProperty("POST_INSTALL_SCRIPT"))
+    if(const char* postinstall = (*l)->GetProperty("POST_INSTALL_SCRIPT"))
       {
       cmInstallScriptGenerator g(postinstall, false, 0);
       g.Generate(os, config, configurationTypes);
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 07f763b..dae8aaf 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1762,43 +1762,43 @@ void cmLocalUnixMakefileGenerator3
   ruleFileStream
     << "# Targets provided globally by CMake.\n"
     << "\n";
-  cmTargets* targets = &(this->Makefile->GetTargets());
-  cmTargets::iterator glIt;
-  for ( glIt = targets->begin(); glIt != targets->end(); ++ glIt )
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*>::iterator glIt;
+  for ( glIt = targets.begin(); glIt != targets.end(); ++ glIt )
     {
-    if ( glIt->second.GetType() == cmState::GLOBAL_TARGET )
+    if ( (*glIt)->GetType() == cmState::GLOBAL_TARGET )
       {
-      std::string targetString = "Special rule for the target " + glIt->first;
+      std::string targetString = "Special rule for the target " +
+          (*glIt)->GetName();
       std::vector<std::string> commands;
       std::vector<std::string> depends;
 
-      const char* text = glIt->second.GetProperty("EchoString");
+      const char* text = (*glIt)->GetProperty("EchoString");
       if ( !text )
         {
         text = "Running external command ...";
         }
-      depends.insert(depends.end(), glIt->second.GetUtilities().begin(),
-                     glIt->second.GetUtilities().end());
+      depends.insert(depends.end(), (*glIt)->Target->GetUtilities().begin(),
+                     (*glIt)->Target->GetUtilities().end());
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 
-      cmGeneratorTarget* gt = this->GlobalGenerator
-          ->GetGeneratorTarget(&glIt->second);
+      cmGeneratorTarget* gt = *glIt;
 
       // Global targets store their rules in pre- and post-build commands.
       this->AppendCustomDepends(depends,
-                                glIt->second.GetPreBuildCommands());
+                                gt->Target->GetPreBuildCommands());
       this->AppendCustomDepends(depends,
-                                glIt->second.GetPostBuildCommands());
+                                gt->Target->GetPostBuildCommands());
       this->AppendCustomCommands(commands,
-                                 glIt->second.GetPreBuildCommands(),
+                                 gt->Target->GetPreBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
       this->AppendCustomCommands(commands,
-                                 glIt->second.GetPostBuildCommands(),
+                                 gt->Target->GetPostBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
-      std::string targetName = glIt->second.GetName();
+      std::string targetName = gt->GetName();
       this->WriteMakeRule(ruleFileStream, targetString.c_str(),
                           targetName, depends, commands, true);
 
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 63fc283..c18fc16 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -74,22 +74,23 @@ cmLocalVisualStudio10Generator::~cmLocalVisualStudio10Generator()
 void cmLocalVisualStudio10Generator::Generate()
 {
 
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(l->second))
+       ->TargetIsFortranOnly((*l)->Target))
       {
-      this->CreateSingleVCProj(l->first.c_str(),l->second);
+      this->CreateSingleVCProj((*l)->GetName().c_str(),(*l)->Target);
       }
     else
       {
       cmVisualStudio10TargetGenerator tg(
-        &l->second, static_cast<cmGlobalVisualStudio10Generator*>(
+        (*l)->Target, static_cast<cmGlobalVisualStudio10Generator*>(
           this->GetGlobalGenerator()));
       tg.Generate();
       }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index a51eb67..76ca5b1 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -82,12 +82,12 @@ private:
 
 void cmLocalVisualStudio6Generator::AddCMakeListsRules()
 {
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin();
-      l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY
-        || l->second.GetType() == cmState::GLOBAL_TARGET)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY
+        || (*l)->GetType() == cmState::GLOBAL_TARGET)
       {
       continue;
       }
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
       this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
     if (!cmSystemTools::IsOn(suppRegenRule))
       {
-      this->AddDSPBuildRule(l->second);
+      this->AddDSPBuildRule((*l)->Target);
       }
     }
 }
@@ -124,54 +124,56 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 
   // Create the DSP or set of DSP's for libraries and executables
 
-  cmTargets &tgts = this->Makefile->GetTargets();
-
-  // build any targets
-  for(cmTargets::iterator l = tgts.begin();
-      l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    switch(l->second.GetType())
+    switch((*l)->GetType())
       {
       case cmState::STATIC_LIBRARY:
       case cmState::OBJECT_LIBRARY:
-        this->SetBuildType(STATIC_LIBRARY, l->first.c_str(), l->second);
+        this->SetBuildType(STATIC_LIBRARY,
+                           (*l)->GetName().c_str(), (*l)->Target);
         break;
       case cmState::SHARED_LIBRARY:
       case cmState::MODULE_LIBRARY:
-        this->SetBuildType(DLL, l->first.c_str(), l->second);
+        this->SetBuildType(DLL,
+                           (*l)->GetName().c_str(), (*l)->Target);
         break;
       case cmState::EXECUTABLE:
-        this->SetBuildType(EXECUTABLE,l->first.c_str(), l->second);
+        this->SetBuildType(EXECUTABLE,
+                           (*l)->GetName().c_str(), (*l)->Target);
         break;
       case cmState::UTILITY:
       case cmState::GLOBAL_TARGET:
-        this->SetBuildType(UTILITY, l->first.c_str(), l->second);
+        this->SetBuildType(UTILITY,
+                           (*l)->GetName().c_str(), (*l)->Target);
         break;
       case cmState::INTERFACE_LIBRARY:
         continue;
       default:
-        cmSystemTools::Error("Bad target type: ", l->first.c_str());
+        cmSystemTools::Error("Bad target type: ", (*l)->GetName().c_str());
         break;
       }
     // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
     // so don't build a projectfile for it
     const char* path =
-      l->second.GetProperty("EXTERNAL_MSPROJECT");
+      (*l)->GetProperty("EXTERNAL_MSPROJECT");
     if(!path)
       {
       // check to see if the dsp is going into a sub-directory
-      std::string::size_type pos = l->first.rfind('/');
+      std::string::size_type pos = (*l)->GetName().rfind('/');
       if(pos != std::string::npos)
         {
         std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
-        dir += l->first.substr(0, pos);
+        dir += (*l)->GetName().substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
           {
           cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
-      this->CreateSingleDSP(l->first.c_str(),l->second);
+      this->CreateSingleDSP((*l)->GetName().c_str(), (*l)->Target);
       }
     }
 }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 819998c..19f9178 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -67,19 +67,19 @@ cmLocalVisualStudio7Generator::~cmLocalVisualStudio7Generator()
 void cmLocalVisualStudio7Generator::AddHelperCommands()
 {
   // Now create GUIDs for targets
-  cmTargets &tgts = this->Makefile->GetTargets();
-
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    const char* path = l->second.GetProperty("EXTERNAL_MSPROJECT");
+    const char* path = (*l)->GetProperty("EXTERNAL_MSPROJECT");
     if(path)
       {
       this->ReadAndStoreExternalGUID(
-        l->second.GetName().c_str(), path);
+        (*l)->GetName().c_str(), path);
       }
     }
 
@@ -95,7 +95,6 @@ void cmLocalVisualStudio7Generator::Generate()
 
 void cmLocalVisualStudio7Generator::AddCMakeListsRules()
 {
-  cmTargets &tgts = this->Makefile->GetTargets();
   // Create the regeneration custom rule.
   if(!this->Makefile->IsOn("CMAKE_SUPPRESS_REGENERATION"))
     {
@@ -104,17 +103,17 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules()
     if(cmSourceFile* sf = this->CreateVCProjBuildRule())
       {
       // Add the rule to targets that need it.
-      for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+      std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+          l != tgts.end(); ++l)
         {
-        if (l->second.GetType() == cmState::GLOBAL_TARGET)
+        if ((*l)->GetType() == cmState::GLOBAL_TARGET)
           {
           continue;
           }
-        if(l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+        if((*l)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&l->second);
-          gt->AddSource(sf->GetFullPath());
+          (*l)->AddSource(sf->GetFullPath());
           }
         }
       }
@@ -126,11 +125,11 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   // Visual Studio .NET 2003 Service Pack 1 will not run post-build
   // commands for targets in which no sources are built.  Add dummy
   // rules to force these targets to build.
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = l->second;
+    cmTarget& tgt = (*l)->Target;
     if(tgt.GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
@@ -150,9 +149,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
            force.c_str(), no_depends, no_main_dependency,
            force_commands, " ", 0, true))
         {
-        cmGeneratorTarget* gt =
-            this->GlobalGenerator->GetGeneratorTarget(&tgt);
-        gt->AddSource(file->GetFullPath());
+        (*l)->AddSource(file->GetFullPath());
         }
       }
     }
@@ -176,21 +173,21 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     }
 
   // Get the set of targets in this directory.
-  cmTargets &tgts = this->Makefile->GetTargets();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
 
   // Create the project file for each target.
-  for(cmTargets::iterator l = tgts.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
     // so don't build a projectfile for it
-    if(!l->second.GetProperty("EXTERNAL_MSPROJECT"))
+    if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj(l->first.c_str(),l->second);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
     }
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0719fee046e721f703fb9dc04b11b0c33298b756
commit 0719fee046e721f703fb9dc04b11b0c33298b756
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:51:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:19:47 2015 +0200

    Makefiles: Port progress marks to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3f600b2..fe6b446 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3607,6 +3607,18 @@ std::string cmGeneratorTarget::GetPDBName(const std::string& config) const
   return prefix+base+".pdb";
 }
 
+bool cmGeneratorTarget::StrictTargetComparison::operator()(
+    cmGeneratorTarget const* t1, cmGeneratorTarget const* t2) const
+{
+  int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str());
+  if (nameResult == 0)
+    {
+    return strcmp(t1->GetLocalGenerator()->GetCurrentBinaryDirectory(),
+                  t2->GetLocalGenerator()->GetCurrentBinaryDirectory()) < 0;
+    }
+  return nameResult < 0;
+}
+
 //----------------------------------------------------------------------------
 struct cmGeneratorTarget::SourceFileFlags
 cmGeneratorTarget::GetTargetSourceFileFlags(const cmSourceFile* sf) const
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 4383288..544cf0e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -673,6 +673,11 @@ public:
   {
     return this->MaxLanguageStandards;
   }
+
+  struct StrictTargetComparison {
+    bool operator()(cmGeneratorTarget const* t1,
+                    cmGeneratorTarget const* t2) const;
+  };
 };
 
 #endif
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 74d23a3..248701a 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -778,7 +778,7 @@ cmGlobalUnixMakefileGenerator3
       std::ostringstream progressArg;
       const char* sep = "";
       std::vector<unsigned long>& progFiles =
-        this->ProgressMap[gtarget->Target].Marks;
+        this->ProgressMap[gtarget].Marks;
       for (std::vector<unsigned long>::iterator i = progFiles.begin();
            i != progFiles.end(); ++i)
         {
@@ -966,7 +966,7 @@ cmGlobalUnixMakefileGenerator3
   size_t count = 0;
   if(emitted.insert(target).second)
     {
-    count = this->ProgressMap[target->Target].Marks.size();
+    count = this->ProgressMap[target].Marks.size();
     TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -1003,7 +1003,7 @@ void
 cmGlobalUnixMakefileGenerator3::RecordTargetProgress(
   cmMakefileTargetGenerator* tg)
 {
-  TargetProgress& tp = this->ProgressMap[tg->GetTarget()];
+  TargetProgress& tp = this->ProgressMap[tg->GetGeneratorTarget()];
   tp.NumberOfActions = tg->GetNumberOfProgressActions();
   tp.VariableFile = tg->GetProgressFileNameFull();
 }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 5f39c79..0485eb8 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -192,8 +192,8 @@ protected:
     std::vector<unsigned long> Marks;
     void WriteProgressVariables(unsigned long total, unsigned long& current);
   };
-  typedef std::map<cmTarget const*, TargetProgress,
-                   cmStrictTargetComparison> ProgressMapType;
+  typedef std::map<cmGeneratorTarget const*, TargetProgress,
+                   cmGeneratorTarget::StrictTargetComparison> ProgressMapType;
   ProgressMapType ProgressMap;
 
   size_t CountProgressMarksInTarget(cmGeneratorTarget const* target,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2bff698a27adbbca715aad4534b1fbc4f5919e0
commit a2bff698a27adbbca715aad4534b1fbc4f5919e0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:49:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:19:46 2015 +0200

    cmInstallTargetGenerator: Get a cmGeneratorTarget directly.
    
    Extend the cmGeneratorTarget API to make this possible.

diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index a97cc5f..7a10356 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -440,8 +440,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmGeneratorTarget const* target,
 
 void cmInstallTargetGenerator::Compute(cmLocalGenerator* lg)
 {
-  this->Target = lg->GetGlobalGenerator()->GetGeneratorTarget(
-        lg->GetMakefile()->FindTarget(this->TargetName));
+  this->Target = lg->FindGeneratorTarget(this->TargetName);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6959e1d..3658473 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -453,6 +453,13 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
   this->GeneratorTargets.push_back(gt);
 }
 
+cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
+    const std::string& name) const
+{
+  return this->GetGlobalGenerator()->GetGeneratorTarget(
+        this->Makefile->FindTarget(name));
+}
+
 //----------------------------------------------------------------------------
 void cmLocalGenerator::ComputeTargetManifest()
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 1375985..552020b 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -120,6 +120,7 @@ public:
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
 
+  cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
   /**

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8de77993724933156f584fa6cf59fe4e488a55d7
commit 8de77993724933156f584fa6cf59fe4e488a55d7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:48:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 19:56:22 2015 +0200

    cmGlobalGenerator: Move GeneratorTargetsType to usage site.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 713ab6a..3f600b2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3607,18 +3607,6 @@ std::string cmGeneratorTarget::GetPDBName(const std::string& config) const
   return prefix+base+".pdb";
 }
 
-bool cmStrictTargetComparison::operator()(cmTarget const* t1,
-                                          cmTarget const* t2) const
-{
-  int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str());
-  if (nameResult == 0)
-    {
-    return strcmp(t1->GetMakefile()->GetCurrentBinaryDirectory(),
-                  t2->GetMakefile()->GetCurrentBinaryDirectory()) < 0;
-    }
-  return nameResult < 0;
-}
-
 //----------------------------------------------------------------------------
 struct cmGeneratorTarget::SourceFileFlags
 cmGeneratorTarget::GetTargetSourceFileFlags(const cmSourceFile* sf) const
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 2dc3a6f..4383288 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -675,12 +675,4 @@ public:
   }
 };
 
-struct cmStrictTargetComparison {
-  bool operator()(cmTarget const* t1, cmTarget const* t2) const;
-};
-
-typedef std::map<cmTarget const*,
-                 cmGeneratorTarget*,
-                 cmStrictTargetComparison> cmGeneratorTargetsType;
-
 #endif
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7e9b599..13efc4c 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -48,6 +48,18 @@
 
 #include <assert.h>
 
+bool cmTarget::StrictTargetComparison::operator()(cmTarget const* t1,
+                                                  cmTarget const* t2) const
+{
+  int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str());
+  if (nameResult == 0)
+    {
+    return strcmp(t1->GetMakefile()->GetCurrentBinaryDirectory(),
+                  t2->GetMakefile()->GetCurrentBinaryDirectory()) < 0;
+    }
+  return nameResult < 0;
+}
+
 cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   : CMakeInstance(cm)
 {
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c59d42d..18f5329 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -42,6 +42,10 @@ class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 class cmExportBuildFileGenerator;
 
+typedef std::map<cmTarget const*,
+                 cmGeneratorTarget*,
+                 cmTarget::StrictTargetComparison> cmGeneratorTargetsType;
+
 /** \class cmGlobalGenerator
  * \brief Responsible for overseeing the generation process for the entire tree
  *
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index e8c05da..1cae94f 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -260,6 +260,10 @@ public:
   return this->LinkLibrariesForVS6;}
 #endif
 
+  struct StrictTargetComparison {
+    bool operator()(cmTarget const* t1, cmTarget const* t2) const;
+  };
+
 private:
   bool HandleLocationPropertyPolicy(cmMakefile* context) const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e18337d0c38f7d12fd44509112706f21f75a9fb
commit 5e18337d0c38f7d12fd44509112706f21f75a9fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 22:55:03 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 19:40:28 2015 +0200

    Xcode: Remove value-less overrides.
    
    These only loop over targets and call a const method.  The method
    has a side-effect of emitting a warning in a certain case, but the
    other remaining call site will have the same effect.

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 3b430d2..30fd075 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -47,36 +47,6 @@ void cmLocalXCodeGenerator::AppendFlagEscape(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalXCodeGenerator::Generate()
-{
-  cmLocalGenerator::Generate();
-
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
-      iter != targets.end(); ++iter)
-    {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
-    }
-}
-
-//----------------------------------------------------------------------------
-void cmLocalXCodeGenerator::GenerateInstallRules()
-{
-  cmLocalGenerator::GenerateInstallRules();
-
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
-      iter != targets.end(); ++iter)
-    {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
-    }
-}
-
-//----------------------------------------------------------------------------
 void cmLocalXCodeGenerator::ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const*)
diff --git a/Source/cmLocalXCodeGenerator.h b/Source/cmLocalXCodeGenerator.h
index 4381a6d..57c1579 100644
--- a/Source/cmLocalXCodeGenerator.h
+++ b/Source/cmLocalXCodeGenerator.h
@@ -32,8 +32,6 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   virtual void AppendFlagEscape(std::string& flags,
                                 const std::string& rawFlag);
-  virtual void Generate();
-  virtual void GenerateInstallRules();
   virtual void ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const* gt = 0);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb21a05a987f27982f8918e1f771bf19accb4281
commit eb21a05a987f27982f8918e1f771bf19accb4281
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 16:53:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 19:40:23 2015 +0200

    cmLocalGenerator: Store a vector of generator targets.
    
    Not a map from cmTarget to cmGeneratorTarget.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 31c05fd..1921f03 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,13 +965,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
-    for (cmGeneratorTargetsType::iterator l = targets.begin();
+    std::vector<cmGeneratorTarget*> targets = (*it)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
       std::vector<std::string> includeDirs;
       std::string config = mf->GetSafeDefinition("CMAKE_BUILD_TYPE");
-      (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
+      (*it)->GetIncludeDirectories(includeDirs, *l, "C", config);
       this->AppendIncludeDirectories(fout, includeDirs, emmited);
       }
     }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 086ff25..7e9b599 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1584,7 +1584,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
-      lg->AddGeneratorTarget(t, gt);
+      lg->AddGeneratorTarget(gt);
       }
     }
 
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 45a1509..7c33904 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -287,8 +287,8 @@ void cmGlobalGhsMultiGenerator::Generate()
       {
       cmLocalGhsMultiGenerator *lg =
         static_cast<cmLocalGhsMultiGenerator *>(this->LocalGenerators[i]);
-      cmGeneratorTargetsType tgts = lg->GetGeneratorTargets();
-      this->UpdateBuildFiles(&tgts);
+      std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+      this->UpdateBuildFiles(tgts);
       }
     }
 
@@ -481,15 +481,15 @@ cmGlobalGhsMultiGenerator::GetFileNameFromPath(std::string const &path)
 }
 
 void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
-  cmGeneratorTargetsType *tgts)
+  std::vector<cmGeneratorTarget*> tgts)
 {
-  for (cmGeneratorTargetsType::iterator tgtsI = tgts->begin();
-       tgtsI != tgts->end(); ++tgtsI)
+  for (std::vector<cmGeneratorTarget*>::iterator tgtsI = tgts.begin();
+       tgtsI != tgts.end(); ++tgtsI)
     {
-    const cmTarget *tgt(tgtsI->first);
-    if (IsTgtForBuild(tgt))
+    const cmGeneratorTarget *tgt = *tgtsI;
+    if (IsTgtForBuild(tgt->Target))
       {
-      char const *rawFolderName = tgtsI->first->GetProperty("FOLDER");
+      char const *rawFolderName = tgt->GetProperty("FOLDER");
       if (NULL == rawFolderName)
         {
         rawFolderName = "";
@@ -504,13 +504,13 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
           GhsMultiGpj::PROJECT);
         }
       std::vector<cmsys::String> splitPath = cmSystemTools::SplitString(
-            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt));
+            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target));
       std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" +
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
                                                   << " ";
       GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag(
-                                 tgtsI->second),
+                                 tgt),
                                this->TargetFolderBuildStreams[folderName]);
       }
     }
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index 8f88d4f..04a9a5b 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -110,7 +110,7 @@ private:
       std::vector<cmsys::String>::const_iterator end,
       GhsMultiGpj::Types projType);
   static std::string GetFileNameFromPath(std::string const &path);
-  void UpdateBuildFiles(cmGeneratorTargetsType *tgts);
+  void UpdateBuildFiles(std::vector<cmGeneratorTarget*> tgts);
   bool IsTgtForBuild(const cmTarget *tgt);
 
   std::vector<cmGeneratedFileStream *> TargetSubProjects;
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 4eec3fb..8659e34 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,13 +68,14 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
-      for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
-           ti != targets.end(); ti++)
+      std::vector<cmGeneratorTarget*> const& targets =
+          (*lg)->GetGeneratorTargets();
+      for (std::vector<cmGeneratorTarget*>::const_iterator ti =
+           targets.begin(); ti != targets.end(); ti++)
         {
-        if (ti->second->GetType()==cmState::EXECUTABLE)
+        if ((*ti)->GetType()==cmState::EXECUTABLE)
           {
-          executable = ti->second->GetLocation("");
+          executable = (*ti)->GetLocation("");
           break;
           }
         }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 44e3de6..74d23a3 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -460,11 +460,11 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator l = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
-    cmGeneratorTarget* gtarget = l->second;
+    cmGeneratorTarget* gtarget = *l;
     int type = gtarget->GetType();
     if((type == cmState::EXECUTABLE) ||
        (type == cmState::STATIC_LIBRARY) ||
@@ -623,11 +623,11 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-    for(cmGeneratorTargetsType::iterator t = targets.begin();
+    std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
-      cmGeneratorTarget* gtarget = t->second;
+      cmGeneratorTarget* gtarget = *t;
       // Don't emit the same rule twice (e.g. two targets with the same
       // simple name)
       int type = gtarget->GetType();
@@ -720,11 +720,11 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    cmGeneratorTarget* gtarget = t->second;
+    cmGeneratorTarget* gtarget = *t;
     int type = gtarget->GetType();
     std::string name = gtarget->GetName();
     if (!name.empty()
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 61b19cf..a22315c 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -256,7 +256,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
                           noCommandLines);
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
-  lg->AddGeneratorTarget(tgt, gt);
+  lg->AddGeneratorTarget(gt);
   this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 91ca9a3..2c8cb56 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -108,19 +108,20 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
       for(std::vector<cmLocalGenerator*>::iterator i = gen.begin();
           i != gen.end(); ++i)
         {
-        cmGeneratorTargetsType targets =
+        std::vector<cmGeneratorTarget*> targets =
             (*i)->GetGeneratorTargets();
-        for(cmGeneratorTargetsType::iterator t = targets.begin();
+        for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
-          if (t->second->GetType() == cmState::GLOBAL_TARGET
-              || t->first->IsImported())
+          cmGeneratorTarget* tgt = *t;
+          if (tgt->GetType() == cmState::GLOBAL_TARGET
+              || tgt->IsImported())
             {
             continue;
             }
-          if(!this->IsExcluded(gen[0], t->second))
+          if(!this->IsExcluded(gen[0], tgt))
             {
-            allBuild->AddUtility(t->second->GetName());
+            allBuild->AddUtility(tgt->GetName());
             }
           }
         }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index df208f6..c06f503 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -459,7 +459,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         "echo", "Build all projects");
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
-  root->AddGeneratorTarget(allbuild, allBuildGt);
+  root->AddGeneratorTarget(allBuildGt);
   root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
@@ -495,7 +495,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           "make", "-f", file.c_str());
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
-    root->AddGeneratorTarget(check, checkGt);
+    root->AddGeneratorTarget(checkGt);
     root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8a76c21..6959e1d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,15 +132,15 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    t->second->TraceDependencies();
+    (*t)->TraceDependencies();
     }
 }
 
@@ -448,9 +448,9 @@ void cmLocalGenerator::GenerateInstallRules()
 }
 
 
-void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
 {
-  this->GeneratorTargets[t] = gt;
+  this->GeneratorTargets.push_back(gt);
 }
 
 //----------------------------------------------------------------------------
@@ -465,12 +465,12 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    cmGeneratorTarget& target = *t->second;
-    if (target.GetType() == cmState::INTERFACE_LIBRARY)
+    cmGeneratorTarget* target = *t;
+    if (target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -478,7 +478,7 @@ void cmLocalGenerator::ComputeTargetManifest()
         ci != configNames.end(); ++ci)
       {
       const char* config = ci->c_str();
-      target.ComputeTargetManifest(config);
+      target->ComputeTargetManifest(config);
       }
     }
 }
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 307c67f..1375985 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -113,12 +113,12 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
-  const cmGeneratorTargetsType &GetGeneratorTargets() const
+  const std::vector<cmGeneratorTarget*> &GetGeneratorTargets() const
     {
       return this->GeneratorTargets;
     }
 
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
+  void AddGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
@@ -367,7 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
-  cmGeneratorTargetsType GeneratorTargets;
+  std::vector<cmGeneratorTarget*> GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 869ba2c..a77a75e 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,16 +26,16 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
 
-  for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
-       ++l)
+  for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+       l != tgts.end(); ++l)
     {
-    if (l->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmGhsMultiTargetGenerator tg(l->second);
+    cmGhsMultiTargetGenerator tg(*l);
     tg.Generate();
     }
 }
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 756c139..3dd18bd 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,23 +73,23 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(t->second);
+    cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(*t);
     if(tg)
       {
       tg->Generate();
       // Add the target to "all" if required.
       if (!this->GetGlobalNinjaGenerator()->IsExcluded(
             this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0],
-            t->second))
-        this->GetGlobalNinjaGenerator()->AddDependencyToAll(t->second->Target);
+            *t))
+        this->GetGlobalNinjaGenerator()->AddDependencyToAll((*t)->Target);
       delete tg;
       }
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 5485da4..07f763b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,18 +113,18 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     cmsys::auto_ptr<cmMakefileTargetGenerator> tg(
-      cmMakefileTargetGenerator::New(t->second));
+      cmMakefileTargetGenerator::New(*t));
     if (tg.get())
       {
       tg->WriteRuleFiles();
@@ -174,11 +174,11 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator ti = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
-    cmGeneratorTarget* gt = ti->second;
+    cmGeneratorTarget* gt = *ti;
     if (gt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -417,22 +417,22 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
   std::string localName;
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if((t->second->GetType() == cmState::EXECUTABLE) ||
-       (t->second->GetType() == cmState::STATIC_LIBRARY) ||
-       (t->second->GetType() == cmState::SHARED_LIBRARY) ||
-       (t->second->GetType() == cmState::MODULE_LIBRARY) ||
-       (t->second->GetType() == cmState::OBJECT_LIBRARY) ||
-       (t->second->GetType() == cmState::UTILITY))
+    if(((*t)->GetType() == cmState::EXECUTABLE) ||
+       ((*t)->GetType() == cmState::STATIC_LIBRARY) ||
+       ((*t)->GetType() == cmState::SHARED_LIBRARY) ||
+       ((*t)->GetType() == cmState::MODULE_LIBRARY) ||
+       ((*t)->GetType() == cmState::OBJECT_LIBRARY) ||
+       ((*t)->GetType() == cmState::UTILITY))
       {
-      emitted.insert(t->second->GetName());
+      emitted.insert((*t)->GetName());
 
       // for subdirs add a rule to build this specific target by name.
-      localName = this->GetRelativeTargetDirectory(t->second);
+      localName = this->GetRelativeTargetDirectory(*t);
       localName += "/rule";
       commands.clear();
       depends.clear();
@@ -449,23 +449,23 @@ void cmLocalUnixMakefileGenerator3
                           localName, depends, commands, true);
 
       // Add a target with the canonical name (no prefix, suffix or path).
-      if(localName != t->second->GetName())
+      if(localName != (*t)->GetName())
         {
         commands.clear();
         depends.push_back(localName);
         this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
-                            t->second->GetName(), depends, commands, true);
+                            (*t)->GetName(), depends, commands, true);
         }
 
       // Add a fast rule to build the target
       std::string makefileName =
-                         this->GetRelativeTargetDirectory(t->second);
+                         this->GetRelativeTargetDirectory(*t);
       makefileName += "/build.make";
       // make sure the makefile name is suitable for a makefile
       std::string makeTargetName =
-        this->GetRelativeTargetDirectory(t->second);
+        this->GetRelativeTargetDirectory(*t);
       makeTargetName += "/build";
-      localName = t->second->GetName();
+      localName = (*t)->GetName();
       localName += "/fast";
       depends.clear();
       commands.clear();
@@ -479,11 +479,11 @@ void cmLocalUnixMakefileGenerator3
 
       // Add a local name for the rule to relink the target before
       // installation.
-      if(t->second->NeedRelinkBeforeInstall(this->ConfigName))
+      if((*t)->NeedRelinkBeforeInstall(this->ConfigName))
         {
-        makeTargetName = this->GetRelativeTargetDirectory(t->second);
+        makeTargetName = this->GetRelativeTargetDirectory(*t);
         makeTargetName += "/preinstall";
-        localName = t->second->GetName();
+        localName = (*t)->GetName();
         localName += "/preinstall";
         depends.clear();
         commands.clear();
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 16b8942..225c03e 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -895,7 +895,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    lg->AddGeneratorTarget(autogenTarget, gt);
+    lg->AddGeneratorTarget(gt);
     lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |    4 +-
 Source/cmCommonTargetGenerator.h               |    2 -
 Source/cmComputeTargetDepends.cxx              |    9 +-
 Source/cmExportFileGenerator.cxx               |   12 +-
 Source/cmExtraCodeBlocksGenerator.cxx          |   39 ++-
 Source/cmExtraCodeLiteGenerator.cxx            |   11 +-
 Source/cmExtraEclipseCDT4Generator.cxx         |   56 ++--
 Source/cmExtraKateGenerator.cxx                |   31 +-
 Source/cmExtraSublimeTextGenerator.cxx         |   37 ++-
 Source/cmExtraSublimeTextGenerator.h           |    3 +-
 Source/cmGeneratorTarget.cxx                   |    8 +-
 Source/cmGeneratorTarget.h                     |   11 +-
 Source/cmGlobalGenerator.cxx                   |   61 ++--
 Source/cmGlobalGenerator.h                     |    4 +
 Source/cmGlobalGhsMultiGenerator.cxx           |   20 +-
 Source/cmGlobalGhsMultiGenerator.h             |    2 +-
 Source/cmGlobalKdevelopGenerator.cxx           |   20 +-
 Source/cmGlobalNinjaGenerator.cxx              |   27 +-
 Source/cmGlobalNinjaGenerator.h                |   12 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |   79 +++--
 Source/cmGlobalUnixMakefileGenerator3.h        |    6 +-
 Source/cmGlobalVisualStudio8Generator.cxx      |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx       |   19 +-
 Source/cmGlobalXCodeGenerator.cxx              |  400 ++++++++++++------------
 Source/cmGlobalXCodeGenerator.h                |   43 ++-
 Source/cmInstallTargetGenerator.cxx            |    7 +-
 Source/cmLocalGenerator.cxx                    |   58 ++--
 Source/cmLocalGenerator.h                      |    7 +-
 Source/cmLocalGhsMultiGenerator.cxx            |   10 +-
 Source/cmLocalNinjaGenerator.cxx               |   20 +-
 Source/cmLocalNinjaGenerator.h                 |    9 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |   93 +++---
 Source/cmLocalUnixMakefileGenerator3.h         |   13 +-
 Source/cmLocalVisualStudio10Generator.cxx      |   13 +-
 Source/cmLocalVisualStudio6Generator.cxx       |   44 +--
 Source/cmLocalVisualStudio7Generator.cxx       |   45 ++-
 Source/cmLocalXCodeGenerator.cxx               |   30 --
 Source/cmLocalXCodeGenerator.h                 |    2 -
 Source/cmMakefileExecutableTargetGenerator.cxx |   16 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |   19 +-
 Source/cmMakefileTargetGenerator.cxx           |    5 +-
 Source/cmMakefileTargetGenerator.h             |    2 -
 Source/cmMakefileUtilityTargetGenerator.cxx    |   11 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |   36 +--
 Source/cmNinjaTargetGenerator.cxx              |   11 +-
 Source/cmNinjaTargetGenerator.h                |    5 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |   16 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |    2 +-
 Source/cmTarget.h                              |    4 +
 Source/cmXCodeObject.h                         |    8 +-
 50 files changed, 697 insertions(+), 707 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 21 15:58:07 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 21 Oct 2015 15:58:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-834-ga52e938
Message-ID: <20151021195807.8395FC07BB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a52e9382ed912858423b4683879109900376859b (commit)
       via  a013d46b49596bccabc9d5741499230ca015ef96 (commit)
      from  3385d860ae497fdf9b1a52c7701ec6013ea61c16 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a52e9382ed912858423b4683879109900376859b
commit a52e9382ed912858423b4683879109900376859b
Merge: 3385d86 a013d46
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 15:58:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 15:58:06 2015 -0400

    Merge topic 'use-generator-target' into next
    
    a013d46b fixup! Port to GetGeneratorTargets.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a013d46b49596bccabc9d5741499230ca015ef96
commit a013d46b49596bccabc9d5741499230ca015ef96
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:57:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:57:40 2015 +0200

    fixup! Port to GetGeneratorTargets.

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 1d4b36c..8ab2262 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -379,7 +379,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
       for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends((*ti)->Target);
+        this->ComputeVSTargetDepends(*(*ti)->Target);
         }
       }
     }
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index c18fc16..c9d53fe 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -83,9 +83,9 @@ void cmLocalVisualStudio10Generator::Generate()
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly((*l)->Target))
+       ->TargetIsFortranOnly(*(*l)->Target))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(),(*l)->Target);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 76ca5b1..773e555 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
       this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
     if (!cmSystemTools::IsOn(suppRegenRule))
       {
-      this->AddDSPBuildRule((*l)->Target);
+      this->AddDSPBuildRule(*(*l)->Target);
       }
     }
 }
@@ -133,21 +133,21 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       case cmState::STATIC_LIBRARY:
       case cmState::OBJECT_LIBRARY:
         this->SetBuildType(STATIC_LIBRARY,
-                           (*l)->GetName().c_str(), (*l)->Target);
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::SHARED_LIBRARY:
       case cmState::MODULE_LIBRARY:
         this->SetBuildType(DLL,
-                           (*l)->GetName().c_str(), (*l)->Target);
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::EXECUTABLE:
         this->SetBuildType(EXECUTABLE,
-                           (*l)->GetName().c_str(), (*l)->Target);
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::UTILITY:
       case cmState::GLOBAL_TARGET:
         this->SetBuildType(UTILITY,
-                           (*l)->GetName().c_str(), (*l)->Target);
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::INTERFACE_LIBRARY:
         continue;
@@ -173,7 +173,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
           cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
-      this->CreateSingleDSP((*l)->GetName().c_str(), (*l)->Target);
+      this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
       }
     }
 }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 19f9178..0f39ddb 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -187,7 +187,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     // so don't build a projectfile for it
     if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     }
 }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx  |    2 +-
 Source/cmLocalVisualStudio10Generator.cxx |    4 ++--
 Source/cmLocalVisualStudio6Generator.cxx  |   12 ++++++------
 Source/cmLocalVisualStudio7Generator.cxx  |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 21 16:00:50 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 21 Oct 2015 16:00:50 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-845-g464c031
Message-ID: <20151021200050.1D3DFC0800@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  464c0314e74dda86d3812e7022d88f516258dbf6 (commit)
       via  bdf3feb98e2efa29ac93873c5b16f98cc02143ee (commit)
       via  d158158255d11b1bfb3aff01bce98d1125dab757 (commit)
       via  93bc501d43c4ac66b1f27fae802054b7efaf40b5 (commit)
       via  dd82a1338bac70f4fcfbe2c29293950c250e605b (commit)
       via  a25fc62ac40f2fe24a7d96d9014d03bf604cdad0 (commit)
       via  23f212b86d1890722a8e58ff4153ec60df696580 (commit)
       via  5f8521d0755f65917b8f406e78097b9b444af094 (commit)
       via  0546c7fa0c379c154b0da606ff38b815cf3da25c (commit)
       via  ca72f3ce24edb8959a2d622c5fc34139e6b81fd4 (commit)
       via  b45d4a883d10a8b3cd2ddfa2fc9fcbdfffbe8187 (commit)
      from  a52e9382ed912858423b4683879109900376859b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=464c0314e74dda86d3812e7022d88f516258dbf6
commit 464c0314e74dda86d3812e7022d88f516258dbf6
Merge: a52e938 bdf3feb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 16:00:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 16:00:48 2015 -0400

    Merge topic 'use-generator-target' into next
    
    bdf3feb9 Sublime: Port API to cmGeneratorTarget.
    d1581582 Xcode: Port API to cmGeneratorTarget.
    93bc501d Xcode: Prefer to get target state from cmGeneratorTarget.
    dd82a133 Xcode: Re-order conditions.
    a25fc62a Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.
    23f212b8 Xcode: Port loops to cmGeneratorTarget.
    5f8521d0 Makefiles: Port to cmGeneratorTarget.
    0546c7fa Ninja: Port to cmGeneratorTarget.
    ca72f3ce Use cmLocalGenerator at generate-time.
    b45d4a88 Port to GetGeneratorTargets.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bdf3feb98e2efa29ac93873c5b16f98cc02143ee
commit bdf3feb98e2efa29ac93873c5b16f98cc02143ee
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:53:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:57 2015 +0200

    Sublime: Port API to cmGeneratorTarget.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 47822e8..92d38b9 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -20,7 +20,6 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 
 #include <cmsys/SystemTools.hxx>
 
@@ -204,12 +203,12 @@ void cmExtraSublimeTextGenerator::
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, targetName, *lg, (*ti)->Target,
+          this->AppendTarget(fout, targetName, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           std::string fastTarget = targetName;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, *lg, (*ti)->Target,
+          this->AppendTarget(fout, fastTarget, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           }
@@ -225,7 +224,7 @@ void cmExtraSublimeTextGenerator::
   AppendTarget(cmGeneratedFileStream& fout,
                const std::string& targetName,
                cmLocalGenerator* lg,
-               cmTarget* target,
+               cmGeneratorTarget* target,
                const char* make,
                const cmMakefile* makefile,
                const char*, //compiler
@@ -235,10 +234,8 @@ void cmExtraSublimeTextGenerator::
 
   if (target != 0)
     {
-      cmGeneratorTarget *gtgt = this->GlobalGenerator
-                                    ->GetGeneratorTarget(target);
       std::vector<cmSourceFile*> sourceFiles;
-      gtgt->GetSourceFiles(sourceFiles,
+      target->GetSourceFiles(sourceFiles,
                              makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       std::vector<cmSourceFile*>::const_iterator sourceFilesEnd =
         sourceFiles.end();
@@ -256,9 +253,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, target);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, gtgt);
+            this->ComputeDefines(*iter, lg, target);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 5dd1140..cf31ee0 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -18,7 +18,6 @@
 
 class cmLocalGenerator;
 class cmMakefile;
-class cmTarget;
 class cmGeneratedFileStream;
 class cmGeneratorTarget;
 
@@ -67,7 +66,7 @@ private:
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string& targetName,
                     cmLocalGenerator* lg,
-                    cmTarget* target,
+                    cmGeneratorTarget* target,
                     const char* make,
                     const cmMakefile* makefile,
                     const char* compiler,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d158158255d11b1bfb3aff01bce98d1125dab757
commit d158158255d11b1bfb3aff01bce98d1125dab757
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 21:23:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:57 2015 +0200

    Xcode: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 08c38a6..9111a3f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -711,9 +711,9 @@ cmXCodeObject* cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
+GetGroupMapKeyFromPath(cmGeneratorTarget* target, const std::string& fullpath)
 {
-  std::string key(cmtarget.GetName());
+  std::string key(target->GetName());
   key += "-";
   key += fullpath;
   return key;
@@ -721,16 +721,16 @@ GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKey(cmTarget& cmtarget, cmSourceFile* sf)
+GetGroupMapKey(cmGeneratorTarget* target, cmSourceFile* sf)
 {
-  return GetGroupMapKeyFromPath(cmtarget, sf->GetFullPath());
+  return GetGroupMapKeyFromPath(target, sf->GetFullPath());
 }
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
@@ -738,7 +738,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   // fileRef object for any given full path.
   //
   cmXCodeObject* fileRef =
-    this->CreateXCodeFileReferenceFromPath(fullpath, cmtarget, lang, sf);
+    this->CreateXCodeFileReferenceFromPath(fullpath, target, lang, sf);
 
   cmXCodeObject* buildFile = this->CreateObject(cmXCodeObject::PBXBuildFile);
   buildFile->SetComment(fileRef->GetComment());
@@ -751,7 +751,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
                                               cmSourceFile* sf,
-                                              cmTarget& cmtarget)
+                                              cmGeneratorTarget* gtgt)
 {
   // Add flags from target and source file properties.
   std::string flags;
@@ -781,7 +781,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   cmXCodeObject* buildFile =
-    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), cmtarget, lang, sf);
+    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), gtgt, lang, sf);
   cmXCodeObject* fileRef = buildFile->GetObject("fileRef")->GetObject();
 
   cmXCodeObject* settings =
@@ -791,7 +791,6 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
   // Is this a resource file in this target? Add it to the resources group...
   //
 
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmGeneratorTarget::SourceFileFlags tsFlags =
       gtgt->GetTargetSourceFileFlags(sf);
   bool isResource = tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource;
@@ -926,11 +925,11 @@ GetSourcecodeValueFromFileExtension(const std::string& _ext,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
-  std::string key = GetGroupMapKeyFromPath(cmtarget, fullpath);
+  std::string key = GetGroupMapKeyFromPath(target, fullpath);
   cmXCodeObject* fileRef = this->FileRefs[key];
   if(!fileRef)
     {
@@ -1007,13 +1006,13 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf,
-                                                 cmTarget& cmtarget)
+                                                 cmGeneratorTarget* target)
 {
   std::string lang =
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   return this->CreateXCodeFileReferenceFromPath(
-    sf->GetFullPath(), cmtarget, lang, sf);
+    sf->GetFullPath(), target, lang, sf);
 }
 
 //----------------------------------------------------------------------------
@@ -1100,7 +1099,6 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       l != sortedTargets.end(); l++)
     {
     cmGeneratorTarget* gtgt = l->second;
-    cmTarget& cmtarget = *gtgt->Target;
 
     std::string targetName = gtgt->GetName();
 
@@ -1118,7 +1116,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     if(gtgt->GetType() == cmState::UTILITY ||
        gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
-      cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
+      cmXCodeObject* t = this->CreateUtilityTarget(gtgt);
       if (!t)
         {
         return false;
@@ -1146,7 +1144,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       {
       cmXCodeObject* xsf =
         this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                    *i, cmtarget);
+                                    *i, gtgt);
       cmXCodeObject* fr = xsf->GetObject("fileRef");
       cmXCodeObject* filetype =
         fr->GetObject()->GetObject("explicitFileType");
@@ -1197,7 +1195,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
         {
         std::string obj = *oi;
         cmXCodeObject* xsf =
-          this->CreateXCodeSourceFileFromPath(obj, cmtarget, "", 0);
+          this->CreateXCodeSourceFileFromPath(obj, gtgt, "", 0);
         externalObjFiles.push_back(xsf);
         }
       }
@@ -1320,7 +1318,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
           {
           cmXCodeObject* xsf =
             this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                        *sfIt, cmtarget);
+                                        *sfIt, gtgt);
           buildFiles->AddObject(xsf);
           }
         contentBuildPhases.push_back(copyFilesBuildPhase);
@@ -1354,9 +1352,9 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     this->CreateCustomCommands(buildPhases, sourceBuildPhase,
                                headerBuildPhase, resourceBuildPhase,
                                contentBuildPhases,
-                               frameworkBuildPhase, cmtarget);
+                               frameworkBuildPhase, gtgt);
 
-    targets.push_back(this->CreateXCodeTarget(cmtarget, buildPhases));
+    targets.push_back(this->CreateXCodeTarget(gtgt, buildPhases));
     }
   return true;
 }
@@ -1431,7 +1429,7 @@ bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf)
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                                          const char* name2,
-                                         cmTarget& cmtarget,
+                                         cmGeneratorTarget* target,
                                          const std::vector<cmCustomCommand>&
                                          commands)
 {
@@ -1451,7 +1449,7 @@ cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                            this->CreateString("0"));
   buildPhase->AddAttribute("shellPath",
                            this->CreateString("/bin/sh"));
-  this->AddCommandsToBuildPhase(buildPhase, cmtarget, commands,
+  this->AddCommandsToBuildPhase(buildPhase, target, commands,
                                 name2);
   return buildPhase;
 }
@@ -1468,16 +1466,14 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
                                                   contentBuildPhases,
                                                   cmXCodeObject*
                                                   frameworkBuildPhase,
-                                                  cmTarget& cmtarget)
+                                                  cmGeneratorTarget* gtgt)
 {
   std::vector<cmCustomCommand> const & prebuild
-    = cmtarget.GetPreBuildCommands();
+    = gtgt->Target->GetPreBuildCommands();
   std::vector<cmCustomCommand> const & prelink
-    = cmtarget.GetPreLinkCommands();
+    = gtgt->Target->GetPreLinkCommands();
   std::vector<cmCustomCommand> postbuild
-    = cmtarget.GetPostBuildCommands();
-
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+    = gtgt->Target->GetPostBuildCommands();
 
   if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
@@ -1530,19 +1526,19 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   cmXCodeObject* cmakeRulesBuildPhase =
     this->CreateBuildPhase("CMake Rules",
                            "cmakeRulesBuildPhase",
-                           cmtarget, commands);
+                           gtgt, commands);
   // create prebuild phase
   cmXCodeObject* preBuildPhase =
     this->CreateBuildPhase("CMake PreBuild Rules", "preBuildCommands",
-                           cmtarget, prebuild);
+                           gtgt, prebuild);
   // create prelink phase
   cmXCodeObject* preLinkPhase =
     this->CreateBuildPhase("CMake PreLink Rules", "preLinkCommands",
-                           cmtarget, prelink);
+                           gtgt, prelink);
   // create postbuild phase
   cmXCodeObject* postBuildPhase =
     this->CreateBuildPhase("CMake PostBuild Rules", "postBuildPhase",
-                           cmtarget, postbuild);
+                           gtgt, postbuild);
 
   // The order here is the order they will be built in.
   // The order "headers, resources, sources" mimics a native project generated
@@ -1625,7 +1621,7 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag,
 //----------------------------------------------------------------------------
 void
 cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                                                cmTarget& target,
+                                                cmGeneratorTarget* target,
                                                 std::vector<cmCustomCommand>
                                                 const & commands,
                                                 const char* name)
@@ -1635,7 +1631,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
   makefile += "/";
-  makefile += target.GetName();
+  makefile += target->GetName();
   makefile += "_";
   makefile += name;
   makefile += ".make";
@@ -1669,7 +1665,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
 //----------------------------------------------------------------------------
 void  cmGlobalXCodeGenerator
 ::CreateCustomRulesMakefile(const char* makefileBasename,
-                            cmTarget& target,
+                            cmGeneratorTarget* target,
                             std::vector<cmCustomCommand>
                             const & commands,
                             const std::string& configName)
@@ -1686,7 +1682,7 @@ void  cmGlobalXCodeGenerator
     }
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  makefileStream << "# Custom rules for " << target.GetName() << "\n";
+  makefileStream << "# Custom rules for " << target->GetName() << "\n";
 
   // disable the implicit rules
   makefileStream << ".SUFFIXES: " << "\n";
@@ -1715,7 +1711,7 @@ void  cmGlobalXCodeGenerator
         {
         std::ostringstream str;
         str << "_buildpart_" << count++ ;
-        tname[&ccg.GetCC()] = std::string(target.GetName()) + str.str();
+        tname[&ccg.GetCC()] = std::string(target->GetName()) + str.str();
         makefileStream << "\\\n\t" << tname[&ccg.GetCC()];
         }
       }
@@ -1793,11 +1789,10 @@ void  cmGlobalXCodeGenerator
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
+void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
@@ -2020,7 +2015,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     if(this->XcodeVersion >= 21)
       {
       std::string pncdir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
                                   this->CreateString(pncdir.c_str()));
       }
@@ -2029,7 +2024,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       buildSettings->AddAttribute("OBJROOT",
                                   this->CreateString(pndir.c_str()));
       pndir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       }
     }
 
@@ -2067,7 +2062,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
         extraLinkOptions += " ";
         extraLinkOptions += createFlags;
         }
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the cfbundle name. This avoids creating
       // a per-configuration Info.plist file. The cfbundle plist
@@ -2113,11 +2108,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
-      std::string fw_version = target.GetFrameworkVersion();
+      std::string fw_version = gtgt->Target->GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
                                   this->CreateString(fw_version.c_str()));
 
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the framework name. This avoids creating
       // a per-configuration Info.plist file.
@@ -2160,7 +2155,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     // Handle bundles and normal executables separately.
     if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the executable name.  This avoids creating
       // a per-configuration Info.plist file.
@@ -2400,7 +2395,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
     }
 
-  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(target),
+  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(gtgt),
                               this->CreateString(extraLinkOptions.c_str()));
   buildSettings->AddAttribute("OTHER_REZFLAGS",
                               this->CreateString(""));
@@ -2459,7 +2454,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   // put this last so it can override existing settings
   // Convert "XCODE_ATTRIBUTE_*" properties directly.
   {
-  cmPropertyMap const& props = target.GetProperties();
+  cmPropertyMap const& props = gtgt->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin();
       i != props.end(); ++i)
     {
@@ -2508,9 +2503,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
+cmGlobalXCodeGenerator::CreateUtilityTarget(cmGeneratorTarget* gtgt)
 {
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2538,11 +2532,11 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
   this->CreateCustomCommands(buildPhases, 0, 0, 0, emptyContentVector, 0,
-                             cmtarget);
+                             gtgt);
   target->AddAttribute("buildPhases", buildPhases);
   if(this->XcodeVersion > 20)
     {
-    this->AddConfigurations(target, cmtarget);
+    this->AddConfigurations(target, gtgt);
     }
   else
     {
@@ -2550,7 +2544,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings, theConfig);
+    this->CreateBuildSettings(gtgt, buildSettings, theConfig);
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2558,8 +2552,8 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   target->AddAttribute("dependencies", dependencies);
   target->AddAttribute("name", this->CreateString(gtgt->GetName()));
   target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
 
   // Add source files without build rules for editing convenience.
   if(gtgt->GetType() == cmState::UTILITY)
@@ -2575,7 +2569,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       {
       if(!(*i)->GetPropertyAsBool("GENERATED"))
         {
-        this->CreateXCodeFileReference(*i, cmtarget);
+        this->CreateXCodeFileReference(*i, gtgt);
         }
       }
     }
@@ -2588,7 +2582,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
 //----------------------------------------------------------------------------
 std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
-                                                      cmTarget& cmtarget)
+                                                      cmGeneratorTarget* gtgt)
 {
   std::string configTypes =
     this->CurrentMakefile->GetRequiredDefinition("CMAKE_CONFIGURATION_TYPES");
@@ -2604,7 +2598,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
   std::string comment = "Build configuration list for ";
   comment += cmXCodeObject::PBXTypeNames[target->GetIsA()];
   comment += " \"";
-  comment += cmtarget.GetName();
+  comment += gtgt->GetName();
   comment += "\"";
   configlist->SetComment(comment.c_str());
   target->AddAttribute("buildConfigurationList",
@@ -2616,7 +2610,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
     buildConfigurations->AddObject(config);
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings,
+    this->CreateBuildSettings(gtgt, buildSettings,
                               configVector[i].c_str());
     config->AddAttribute("name", this->CreateString(configVector[i].c_str()));
     config->SetComment(configVector[i].c_str());
@@ -2634,12 +2628,12 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
 }
 
 //----------------------------------------------------------------------------
-const char*
-cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
+const char* cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(
+    cmGeneratorTarget const* target) const
 {
   if(this->XcodeVersion >= 60 &&
-     (cmtarget.GetType() == cmState::STATIC_LIBRARY ||
-      cmtarget.GetType() == cmState::OBJECT_LIBRARY))
+     (target->GetType() == cmState::STATIC_LIBRARY ||
+      target->GetType() == cmState::OBJECT_LIBRARY))
     {
     return "OTHER_LIBTOOLFLAGS";
     }
@@ -2709,11 +2703,9 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
+cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt,
                                           cmXCodeObject* buildPhases)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
-
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
@@ -2726,14 +2718,14 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   std::string defConfig;
   if(this->XcodeVersion > 20)
     {
-    defConfig = this->AddConfigurations(target, cmtarget);
+    defConfig = this->AddConfigurations(target, gtgt);
     }
   else
     {
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
     defConfig = this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-    this->CreateBuildSettings(cmtarget, buildSettings, defConfig.c_str());
+    this->CreateBuildSettings(gtgt, buildSettings, defConfig.c_str());
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2770,22 +2762,23 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     {
     target->AddAttribute("productType", this->CreateString(productType));
     }
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
   target->SetId(this->GetOrCreateId(
     gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
 //----------------------------------------------------------------------------
-cmXCodeObject* cmGlobalXCodeGenerator::FindXCodeTarget(cmTarget const* t)
+cmXCodeObject*
+cmGlobalXCodeGenerator::FindXCodeTarget(cmGeneratorTarget const* t)
 {
   if(!t)
     {
     return 0;
     }
 
-  std::map<cmTarget const*, cmXCodeObject*>::const_iterator const i =
+  std::map<cmGeneratorTarget const*, cmXCodeObject*>::const_iterator const i =
     this->XCodeObjectMap.find(t);
   if (i == this->XCodeObjectMap.end())
     {
@@ -2922,8 +2915,7 @@ void cmGlobalXCodeGenerator
 void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
-  cmTarget* cmtarget = target->GetTarget();
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  cmGeneratorTarget* gt = target->GetTarget();
   if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
@@ -2938,7 +2930,7 @@ void cmGlobalXCodeGenerator
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
-    if(cmXCodeObject* dptarget = this->FindXCodeTarget((*i)->Target))
+    if(cmXCodeObject* dptarget = this->FindXCodeTarget(*i))
       {
       this->AddDependTarget(target, dptarget);
       }
@@ -2967,7 +2959,7 @@ void cmGlobalXCodeGenerator
         linkObjs += this->XCodeEscapePath(oi->c_str());
         }
       this->AppendBuildSettingAttribute(
-        target, this->GetTargetLinkFlagsVar(*cmtarget),
+        target, this->GetTargetLinkFlagsVar(gt),
         linkObjs.c_str(), configName);
       }
 
@@ -3047,7 +3039,7 @@ void cmGlobalXCodeGenerator
         }
       }
     this->AppendBuildSettingAttribute(
-      target, this->GetTargetLinkFlagsVar(*cmtarget),
+      target, this->GetTargetLinkFlagsVar(gt),
       linkLibs.c_str(), configName);
     }
     }
@@ -3090,7 +3082,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       // MACOSX_BUNDLE file
       if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(gtgt->Target);
+        std::string plist = this->ComputeInfoPListLocation(gtgt);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3110,8 +3102,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKey(gtgt->Target, sf);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKey(gtgt, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
@@ -3125,8 +3117,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(gtgt->Target, source);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(gtgt, source);
         this->GroupMap[key] = pbxgroup;
         }
       }
@@ -3157,16 +3149,16 @@ cmXCodeObject *cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 cmXCodeObject* cmGlobalXCodeGenerator
-::CreateOrGetPBXGroup(cmTarget& cmtarget, cmSourceGroup* sg)
+::CreateOrGetPBXGroup(cmGeneratorTarget* gtgt, cmSourceGroup* sg)
 {
   std::string s;
   std::string target;
-  const char *targetFolder= cmtarget.GetProperty("FOLDER");
+  const char *targetFolder= gtgt->GetProperty("FOLDER");
   if(targetFolder) {
     target = targetFolder;
     target += "/";
   }
-  target += cmtarget.GetName();
+  target += gtgt->GetName();
   s = target + "/";
   s += sg->GetFullName();
   std::map<std::string, cmXCodeObject* >::iterator it =
@@ -3556,10 +3548,10 @@ std::string
 cmGlobalXCodeGenerator::GetObjectsNormalDirectory(
   const std::string &projName,
   const std::string &configName,
-  const cmTarget *t) const
+  const cmGeneratorTarget *t) const
 {
   std::string dir =
-    t->GetMakefile()->GetCurrentBinaryDirectory();
+    t->GetLocalGenerator()->GetCurrentBinaryDirectory();
   dir += "/";
   dir += projName;
   dir += ".build/";
@@ -3633,8 +3625,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         i != targets.end(); ++i)
       {
       cmXCodeObject* target = *i;
-      cmTarget* t =target->GetTarget();
-      cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
+      cmGeneratorTarget* gt =target->GetTarget();
 
       if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
@@ -3695,7 +3686,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         if(this->Architectures.size() > 1)
           {
           std::string universal = this->GetObjectsNormalDirectory(
-            this->CurrentProject, configName, t);
+            this->CurrentProject, configName, gt);
           for( std::vector<std::string>::iterator arch =
                  this->Architectures.begin();
                arch != this->Architectures.end(); ++arch)
@@ -4038,12 +4029,13 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags,
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmTarget& target)
+cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmGeneratorTarget* target)
 {
-  std::string plist = target.GetMakefile()->GetCurrentBinaryDirectory();
+  std::string plist =
+      target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   plist += cmake::GetCMakeFilesDirectory();
   plist += "/";
-  plist += target.GetName();
+  plist += target->GetName();
   plist += ".dir/Info.plist";
   return plist;
 }
@@ -4069,7 +4061,7 @@ void cmGlobalXCodeGenerator
 {
   std::string configName = this->GetCMakeCFGIntDir();
   std::string dir = this->GetObjectsNormalDirectory(
-    "$(PROJECT_NAME)", configName, gt->Target);
+    "$(PROJECT_NAME)", configName, gt);
   if(this->XcodeVersion >= 21)
     {
     dir += "$(CURRENT_ARCH)/";
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 10d9bd6..510d46e 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -16,7 +16,6 @@
 #include "cmXCodeObject.h"
 #include "cmCustomCommand.h"
 class cmGlobalGeneratorFactory;
-class cmTarget;
 class cmSourceFile;
 class cmSourceGroup;
 
@@ -90,7 +89,7 @@ protected:
   virtual void AddExtraIDETargets();
   virtual void Generate();
 private:
-  cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget,
+  cmXCodeObject* CreateOrGetPBXGroup(cmGeneratorTarget* gtgt,
                                      cmSourceGroup* sg);
   cmXCodeObject* CreatePBXGroup(cmXCodeObject *parent,
                                 std::string name);
@@ -108,22 +107,22 @@ private:
                             cmXCodeObject* resourceBuildPhase,
                             std::vector<cmXCodeObject*> contentBuildPhases,
                             cmXCodeObject* frameworkBuildPhase,
-                            cmTarget& cmtarget);
+                            cmGeneratorTarget *gtgt);
 
-  std::string ComputeInfoPListLocation(cmTarget& target);
+  std::string ComputeInfoPListLocation(cmGeneratorTarget *target);
 
   void AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                               cmTarget& target,
+                               cmGeneratorTarget *target,
                                std::vector<cmCustomCommand>
                                const & commands,
                                const char* commandFileName);
 
   void CreateCustomRulesMakefile(const char* makefileBasename,
-                                 cmTarget& target,
+                                 cmGeneratorTarget* target,
                                  std::vector<cmCustomCommand> const & commands,
                                  const std::string& configName);
 
-  cmXCodeObject* FindXCodeTarget(cmTarget const*);
+  cmXCodeObject* FindXCodeTarget(const cmGeneratorTarget *);
   std::string GetOrCreateId(const std::string& name, const std::string& id);
 
   // create cmXCodeObject from these functions so that memory can be managed
@@ -132,22 +131,23 @@ private:
   cmXCodeObject* CreateObject(cmXCodeObject::Type type);
   cmXCodeObject* CreateString(const std::string& s);
   cmXCodeObject* CreateObjectReference(cmXCodeObject*);
-  cmXCodeObject* CreateXCodeTarget(cmTarget& target,
+  cmXCodeObject* CreateXCodeTarget(cmGeneratorTarget *gtgt,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
   void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
-  const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
+  const char* GetTargetLinkFlagsVar(const cmGeneratorTarget *target) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);
-  std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget);
+  std::string AddConfigurations(cmXCodeObject* target,
+                                cmGeneratorTarget *gtgt);
   void AppendOrAddBuildSetting(cmXCodeObject* settings, const char* attr,
                                const char* value);
   void AppendBuildSettingAttribute(cmXCodeObject* target, const char* attr,
                                    const char* value,
                                    const std::string& configName);
-  cmXCodeObject* CreateUtilityTarget(cmTarget& target);
+  cmXCodeObject* CreateUtilityTarget(cmGeneratorTarget *gtgt);
   void AddDependAndLinkInformation(cmXCodeObject* target);
-  void CreateBuildSettings(cmTarget& target,
+  void CreateBuildSettings(cmGeneratorTarget *gtgt,
                            cmXCodeObject* buildSettings,
                            const std::string& buildType);
   std::string ExtractFlag(const char* flag, std::string& flags);
@@ -161,18 +161,18 @@ private:
   void WriteXCodePBXProj(std::ostream& fout, cmLocalGenerator* root,
                          std::vector<cmLocalGenerator*>& generators);
   cmXCodeObject* CreateXCodeFileReferenceFromPath(const std::string &fullpath,
-                                                  cmTarget& cmtarget,
+                                                  cmGeneratorTarget *target,
                                                   const std::string &lang,
                                                   cmSourceFile* sf);
   cmXCodeObject* CreateXCodeSourceFileFromPath(const std::string &fullpath,
-                                               cmTarget& cmtarget,
+                                               cmGeneratorTarget *target,
                                                const std::string &lang,
                                                cmSourceFile* sf);
   cmXCodeObject* CreateXCodeFileReference(cmSourceFile* sf,
-                                          cmTarget& cmtarget);
+                                          cmGeneratorTarget *target);
   cmXCodeObject* CreateXCodeSourceFile(cmLocalGenerator* gen,
                                        cmSourceFile* sf,
-                                       cmTarget& cmtarget);
+                                       cmGeneratorTarget *gtgt);
   bool CreateXCodeTargets(cmLocalGenerator* gen,
                           std::vector<cmXCodeObject*>&);
   bool IsHeaderFile(cmSourceFile*);
@@ -185,7 +185,7 @@ private:
                        std::vector<cmLocalGenerator*>& gens);
   cmXCodeObject* CreateBuildPhase(const char* name,
                                   const char* name2,
-                                  cmTarget& cmtarget,
+                                  cmGeneratorTarget *target,
                                   const std::vector<cmCustomCommand>&);
   void CreateReRunCMakeFile(cmLocalGenerator* root,
                             std::vector<cmLocalGenerator*> const& gens);
@@ -224,10 +224,9 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  std::string GetObjectsNormalDirectory(
-    const std::string &projName,
+  std::string GetObjectsNormalDirectory(const std::string &projName,
     const std::string &configName,
-    const cmTarget *t) const;
+    const cmGeneratorTarget *t) const;
 
   void addObject(cmXCodeObject *obj);
   std::string PostBuildMakeTarget(std::string const& tName,
@@ -249,7 +248,7 @@ private:
   std::map<std::string, cmXCodeObject* > GroupNameMap;
   std::map<std::string, cmXCodeObject* > TargetGroup;
   std::map<std::string, cmXCodeObject* > FileRefs;
-  std::map<cmTarget const*, cmXCodeObject* > XCodeObjectMap;
+  std::map<cmGeneratorTarget const*, cmXCodeObject* > XCodeObjectMap;
   std::vector<std::string> Architectures;
   std::string GeneratorToolset;
 };
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index ed2940a..0f0548b 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -13,7 +13,7 @@
 #define cmXCodeObject_h
 
 #include "cmStandardIncludes.h"
-class cmTarget;
+class cmGeneratorTarget;
 
 class cmXCodeObject
 {
@@ -87,11 +87,11 @@ public:
     {
       this->Id = id;
     }
-  cmTarget* GetTarget()
+  cmGeneratorTarget* GetTarget()
     {
       return this->Target;
     }
-  void SetTarget(cmTarget* t)
+  void SetTarget(cmGeneratorTarget* t)
     {
       this->Target = t;
     }
@@ -146,7 +146,7 @@ public:
 protected:
   void PrintString(std::ostream& os) const;
 
-  cmTarget* Target;
+  cmGeneratorTarget* Target;
   Type TypeValue;
   std::string Id;
   PBXType IsA;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93bc501d43c4ac66b1f27fae802054b7efaf40b5
commit 93bc501d43c4ac66b1f27fae802054b7efaf40b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:36:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:57 2015 +0200

    Xcode: Prefer to get target state from cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d6c2e59..08c38a6 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1110,13 +1110,13 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+    if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::UTILITY ||
-       cmtarget.GetType() == cmState::GLOBAL_TARGET)
+    if(gtgt->GetType() == cmState::UTILITY ||
+       gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
       cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
       if (!t)
@@ -1204,7 +1204,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
 
     // some build phases only apply to bundles and/or frameworks
     bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
-    bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
+    bool isBundleTarget = gtgt->GetPropertyAsBool("MACOSX_BUNDLE");
     bool isCFBundleTarget = gtgt->IsCFBundleOnApple();
 
     cmXCodeObject* buildFiles = 0;
@@ -1479,7 +1479,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
 
   cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
 
-  if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
@@ -1488,13 +1488,13 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
     cmd[0].push_back("-E");
     cmd[0].push_back("cmake_symlink_library");
     std::string str_file = "$<TARGET_FILE:";
-    str_file += cmtarget.GetName();
+    str_file += gtgt->GetName();
     str_file += ">";
     std::string str_so_file = "$<TARGET_SONAME_FILE:";
-    str_so_file += cmtarget.GetName();
+    str_so_file += gtgt->GetName();
     str_so_file += ">";
     std::string str_link_file = "$<TARGET_LINKER_FILE:";
-    str_link_file += cmtarget.GetName();
+    str_link_file += gtgt->GetName();
     str_link_file += ">";
     cmd[0].push_back(str_file);
     cmd[0].push_back(str_so_file);
@@ -1797,22 +1797,22 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  if(target.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   std::string defFlags;
-  bool shared = ((target.GetType() == cmState::SHARED_LIBRARY) ||
-                 (target.GetType() == cmState::MODULE_LIBRARY));
-  bool binary = ((target.GetType() == cmState::OBJECT_LIBRARY) ||
-                 (target.GetType() == cmState::STATIC_LIBRARY) ||
-                 (target.GetType() == cmState::EXECUTABLE) ||
+  bool shared = ((gtgt->GetType() == cmState::SHARED_LIBRARY) ||
+                 (gtgt->GetType() == cmState::MODULE_LIBRARY));
+  bool binary = ((gtgt->GetType() == cmState::OBJECT_LIBRARY) ||
+                 (gtgt->GetType() == cmState::STATIC_LIBRARY) ||
+                 (gtgt->GetType() == cmState::EXECUTABLE) ||
                  shared);
 
   // Compute the compilation flags for each language.
   std::set<std::string> languages;
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   gtgt->GetLanguages(languages, configName);
   std::map<std::string, std::string> cflags;
   for (std::set<std::string>::iterator li = languages.begin();
@@ -1840,7 +1840,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     cmSystemTools::Error
       ("CMake can not determine linker language for target: ",
-       target.GetName().c_str());
+       gtgt->GetName().c_str());
     return;
     }
 
@@ -1869,15 +1869,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   std::string extraLinkOptionsVar;
   std::string extraLinkOptions;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptionsVar = "CMAKE_EXE_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::SHARED_LIBRARY)
+  else if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_SHARED_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::MODULE_LIBRARY)
+  else if(gtgt->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS";
     }
@@ -1889,8 +1889,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                configName);
     }
 
-  if(target.GetType() == cmState::OBJECT_LIBRARY ||
-     target.GetType() == cmState::STATIC_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY ||
+     gtgt->GetType() == cmState::STATIC_LIBRARY)
     {
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
@@ -1899,7 +1899,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
   else
     {
-    const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+    const char* targetLinkFlags = gtgt->GetProperty("LINK_FLAGS");
     if(targetLinkFlags)
       {
       this->CurrentLocalGenerator->
@@ -1909,7 +1909,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       std::string linkFlagsVar = "LINK_FLAGS_";
       linkFlagsVar += cmSystemTools::UpperCase(configName);
-      if(const char* linkFlags = target.GetProperty(linkFlagsVar.c_str()))
+      if(const char* linkFlags = gtgt->GetProperty(linkFlagsVar.c_str()))
         {
         this->CurrentLocalGenerator->
           AppendFlags(extraLinkOptions, linkFlags);
@@ -1952,8 +1952,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   std::string pnsuffix;
   gtgt->GetFullNameComponents(pnprefix, pnbase, pnsuffix, configName);
 
-  const char* version = target.GetProperty("VERSION");
-  const char* soversion = target.GetProperty("SOVERSION");
+  const char* version = gtgt->GetProperty("VERSION");
+  const char* soversion = gtgt->GetProperty("SOVERSION");
   if(!gtgt->HasSOName(configName) || gtgt->IsFrameworkOnApple())
     {
     version = 0;
@@ -1980,10 +1980,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Set attributes to specify the proper name for the target.
   std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
-  if(target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY ||
-     target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::STATIC_LIBRARY ||
+     gtgt->GetType() == cmState::SHARED_LIBRARY ||
+     gtgt->GetType() == cmState::MODULE_LIBRARY ||
+     gtgt->GetType() == cmState::EXECUTABLE)
     {
     if(this->XcodeVersion >= 21)
       {
@@ -2011,10 +2011,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     buildSettings->AddAttribute("EXECUTABLE_SUFFIX",
                                 this->CreateString(pnsuffix.c_str()));
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     pnprefix = "lib";
-    pnbase = target.GetName();
+    pnbase = gtgt->GetName();
     pnsuffix = ".a";
 
     if(this->XcodeVersion >= 21)
@@ -2040,7 +2040,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                               this->CreateString(pndir.c_str()));
 
   // Handle settings for each target type.
-  switch(target.GetType())
+  switch(gtgt->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
@@ -2111,7 +2111,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
     case cmState::SHARED_LIBRARY:
     {
-    if(target.GetPropertyAsBool("FRAMEWORK"))
+    if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
       std::string fw_version = target.GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
@@ -2158,7 +2158,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
 
     // Handle bundles and normal executables separately.
-    if(target.GetPropertyAsBool("MACOSX_BUNDLE"))
+    if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
       std::string plist = this->ComputeInfoPListLocation(target);
       // Xcode will create the final version of Info.plist at build time,
@@ -2323,7 +2323,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Add Fortran source format attribute if property is set.
   const char* format = 0;
-  const char* tgtfmt = target.GetProperty("Fortran_FORMAT");
+  const char* tgtfmt = gtgt->GetProperty("Fortran_FORMAT");
   switch(this->CurrentLocalGenerator->GetFortranFormat(tgtfmt))
     {
     case cmLocalGenerator::FortranFormatFixed: format = "fixed"; break;
@@ -2338,7 +2338,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Create the INSTALL_PATH attribute.
   std::string install_name_dir;
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir = gtgt->GetInstallNameDirForBuildTree(configName);
@@ -2426,7 +2426,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Runtime version information.
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     int major;
     int minor;
@@ -2510,6 +2510,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 {
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2532,7 +2533,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
   cmXCodeObject* target =
     this->CreateObject(cmXCodeObject::PBXAggregateTarget);
-  target->SetComment(cmtarget.GetName().c_str());
+  target->SetComment(gtgt->GetName().c_str());
   cmXCodeObject* buildPhases =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
@@ -2555,16 +2556,15 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
 
   // Add source files without build rules for editing convenience.
-  if(cmtarget.GetType() == cmState::UTILITY)
+  if(gtgt->GetType() == cmState::UTILITY)
     {
     std::vector<cmSourceFile*> sources;
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
     if (!gtgt->GetConfigCommonSourceFiles(sources))
       {
       return 0;
@@ -2581,7 +2581,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     }
 
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
 
   return target;
 }
@@ -2712,7 +2712,9 @@ cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
                                           cmXCodeObject* buildPhases)
 {
-  if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
     }
@@ -2737,10 +2739,8 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
-
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
 
   cmXCodeObject* fileRef =
     this->CreateObject(cmXCodeObject::PBXFileReference);
@@ -2749,10 +2749,10 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
   std::string fullName;
-  if(cmtarget.GetType() == cmState::OBJECT_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     fullName = "lib";
-    fullName += cmtarget.GetName();
+    fullName += gtgt->GetName();
     fullName += ".a";
     }
   else
@@ -2763,7 +2763,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   fileRef->AddAttribute("refType", this->CreateString("0"));
   fileRef->AddAttribute("sourceTree",
                         this->CreateString("BUILT_PRODUCTS_DIR"));
-  fileRef->SetComment(cmtarget.GetName().c_str());
+  fileRef->SetComment(gtgt->GetName().c_str());
   target->AddAttribute("productReference",
                        this->CreateObjectReference(fileRef));
   if(const char* productType = this->GetTargetProductType(gtgt))
@@ -2773,7 +2773,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
@@ -2923,18 +2923,18 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(!cmtarget)
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(gt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   // Add dependencies on other CMake targets.
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
@@ -2958,7 +2958,7 @@ void cmGlobalXCodeGenerator
       std::string linkObjs;
       const char* sep = "";
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(cmtarget)->UseObjectLibraries(objs, "");
+      gt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -2972,15 +2972,14 @@ void cmGlobalXCodeGenerator
       }
 
     // Skip link information for object libraries.
-    if(cmtarget->GetType() == cmState::OBJECT_LIBRARY ||
-       cmtarget->GetType() == cmState::STATIC_LIBRARY)
+    if(gt->GetType() == cmState::OBJECT_LIBRARY ||
+       gt->GetType() == cmState::STATIC_LIBRARY)
       {
       continue;
       }
 
     // Compute the link library and directory information.
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(cmtarget);
-    cmComputeLinkInformation* pcli = gtgt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
     if(!pcli)
       {
       continue;
@@ -3637,21 +3636,21 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
       cmTarget* t =target->GetTarget();
       cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
 
-      if(t->GetType() == cmState::EXECUTABLE ||
+      if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//         t->GetType() == cmState::OBJECT_LIBRARY ||
-         t->GetType() == cmState::STATIC_LIBRARY ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+//         gt->GetType() == cmState::OBJECT_LIBRARY ||
+         gt->GetType() == cmState::STATIC_LIBRARY ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         // Declare an entry point for the target post-build phase.
-        makefileStream << this->PostBuildMakeTarget(t->GetName(), *ct)
+        makefileStream << this->PostBuildMakeTarget(gt->GetName(), *ct)
                        << ":\n";
         }
 
-      if(t->GetType() == cmState::EXECUTABLE ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+      if(gt->GetType() == cmState::EXECUTABLE ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         std::string tfull = gt->GetFullPath(configName);
         std::string trel = this->ConvertToRelativeForMake(tfull.c_str());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd82a1338bac70f4fcfbe2c29293950c250e605b
commit dd82a1338bac70f4fcfbe2c29293950c250e605b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:14:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:56 2015 +0200

    Xcode: Re-order conditions.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 5be76af..d6c2e59 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2923,13 +2923,13 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(!cmtarget)
     {
+    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(!cmtarget)
+  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
     {
-    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a25fc62ac40f2fe24a7d96d9014d03bf604cdad0
commit a25fc62ac40f2fe24a7d96d9014d03bf604cdad0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:38:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:56 2015 +0200

    Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d015a92..5be76af 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1368,22 +1368,22 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguages()
   for(TargetMap::const_iterator
         ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
     {
-    this->ForceLinkerLanguage(*ti->second);
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
+    this->ForceLinkerLanguage(gt);
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
+void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
 {
   // This matters only for targets that link.
-  if(cmtarget.GetType() != cmState::EXECUTABLE &&
-     cmtarget.GetType() != cmState::SHARED_LIBRARY &&
-     cmtarget.GetType() != cmState::MODULE_LIBRARY)
+  if(gtgt->GetType() != cmState::EXECUTABLE &&
+     gtgt->GetType() != cmState::SHARED_LIBRARY &&
+     gtgt->GetType() != cmState::MODULE_LIBRARY)
     {
     return;
     }
 
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
   std::string llang = gtgt->GetLinkerLanguage("NOCONFIG");
   if(llang.empty()) { return; }
 
@@ -1399,11 +1399,11 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // Add an empty source file to the target that compiles with the
   // linker language.  This should convince Xcode to choose the proper
   // language.
-  cmMakefile* mf = cmtarget.GetMakefile();
+  cmMakefile* mf = gtgt->Target->GetMakefile();
   std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
-  fname += cmtarget.GetName();
+  fname += gtgt->GetName();
   fname += "-CMakeForceLinker";
   fname += ".";
   fname += cmSystemTools::LowerCase(llang);
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index feb5009..10d9bd6 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -135,7 +135,7 @@ private:
   cmXCodeObject* CreateXCodeTarget(cmTarget& target,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
-  void ForceLinkerLanguage(cmTarget& cmtarget);
+  void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
   const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23f212b86d1890722a8e58ff4153ec60df696580
commit 23f212b86d1890722a8e58ff4153ec60df696580
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:32:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:56 2015 +0200

    Xcode: Port loops to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fe115ac..d015a92 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -514,18 +514,18 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& target = *(*l)->Target;
+      cmGeneratorTarget* target = *l;
 
-      if (target.GetType() == cmState::GLOBAL_TARGET)
+      if (target->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
-      std::string targetName = target.GetName();
+      std::string targetName = target->GetName();
 
       if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
         {
-        target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+        target->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
 
       // make all exe, shared libs and modules
@@ -533,19 +533,19 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       // this will make sure that when the next target is built
       // things are up-to-date
       if(!makeHelper.empty() &&
-         (target.GetType() == cmState::EXECUTABLE ||
+         (target->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//          target.GetType() == cmState::OBJECT_LIBRARY ||
-          target.GetType() == cmState::STATIC_LIBRARY ||
-          target.GetType() == cmState::SHARED_LIBRARY ||
-          target.GetType() == cmState::MODULE_LIBRARY))
+//          target->GetType() == cmState::OBJECT_LIBRARY ||
+          target->GetType() == cmState::STATIC_LIBRARY ||
+          target->GetType() == cmState::SHARED_LIBRARY ||
+          target->GetType() == cmState::MODULE_LIBRARY))
         {
         makeHelper[makeHelper.size()-1] = // fill placeholder
-          this->PostBuildMakeTarget(target.GetName(), "$(CONFIGURATION)");
+          this->PostBuildMakeTarget(target->GetName(), "$(CONFIGURATION)");
         cmCustomCommandLines commandLines;
         commandLines.push_back(makeHelper);
         std::vector<std::string> no_byproducts;
-        lg->GetMakefile()->AddCustomCommandToTarget(target.GetName(),
+        lg->GetMakefile()->AddCustomCommandToTarget(target->GetName(),
                                                     no_byproducts,
                                                     no_depends,
                                                     commandLines,
@@ -554,19 +554,17 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                                                     dir.c_str());
         }
 
-      if(target.GetType() != cmState::INTERFACE_LIBRARY
-          && !target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
+      if(target->GetType() != cmState::INTERFACE_LIBRARY
+          && !target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
-        allbuild->AddUtility(target.GetName());
+        allbuild->AddUtility(target->GetName());
         }
 
-      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
-
       // Refer to the build configuration file for easy editing.
       listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
-      targetGT->AddSource(listfile.c_str());
+      target->AddSource(listfile.c_str());
       }
     }
 }
@@ -3074,28 +3072,26 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& cmtarget = *(*l)->Target;
+      cmGeneratorTarget* gtgt = *l;
 
       // Same skipping logic here as in CreateXCodeTargets so that we do not
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
       // groups:
       //
-      if(cmtarget.GetType() == cmState::GLOBAL_TARGET)
+      if(gtgt->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+      if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
 
-      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
-
       // add the soon to be generated Info.plist file as a source for a
       // MACOSX_BUNDLE file
-      if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
+      if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(cmtarget);
+        std::string plist = this->ComputeInfoPListLocation(gtgt->Target);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3115,14 +3111,14 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKey(cmtarget, sf);
+          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKey(gtgt->Target, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
       // Put OBJECT_LIBRARY objects in proper groups:
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(&cmtarget)->UseObjectLibraries(objs, "");
+      gtgt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -3130,8 +3126,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(cmtarget, source);
+          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(gtgt->Target, source);
         this->GroupMap[key] = pbxgroup;
         }
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f8521d0755f65917b8f406e78097b9b444af094
commit 5f8521d0755f65917b8f406e78097b9b444af094
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:20:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:56 2015 +0200

    Makefiles: Port to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 2c47ab2..bd47715 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 
 cmCommonTargetGenerator::cmCommonTargetGenerator(
   cmOutputConverter::RelativeRoot wd,
@@ -26,7 +25,6 @@ cmCommonTargetGenerator::cmCommonTargetGenerator(
   )
   : WorkingDirectory(wd)
   , GeneratorTarget(gt)
-  , Target(gt->Target)
   , Makefile(gt->Makefile)
   , LocalGenerator(static_cast<cmLocalCommonGenerator*>(gt->LocalGenerator))
   , GlobalGenerator(static_cast<cmGlobalCommonGenerator*>(
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index a4b2c10..3fb1fd0 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -21,7 +21,6 @@ class cmGlobalCommonGenerator;
 class cmLocalCommonGenerator;
 class cmMakefile;
 class cmSourceFile;
-class cmTarget;
 
 /** \class cmCommonTargetGenerator
  * \brief Common infrastructure for Makefile and Ninja per-target generators
@@ -49,7 +48,6 @@ protected:
 
   cmOutputConverter::RelativeRoot WorkingDirectory;
   cmGeneratorTarget* GeneratorTarget;
-  cmTarget* Target;
   cmMakefile* Makefile;
   cmLocalCommonGenerator* LocalGenerator;
   cmGlobalCommonGenerator* GlobalGenerator;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 4d7ca25..b4a915c 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -16,7 +16,6 @@
 #include "cmake.h"
 #include "cmGeneratedFileStream.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmGeneratorTarget.h"
 #include "cmAlgorithms.h"
 
@@ -742,7 +741,7 @@ cmGlobalUnixMakefileGenerator3
       makefileName = localName;
       makefileName += "/build.make";
 
-      bool needRequiresStep = this->NeedRequiresStep(*gtarget->Target);
+      bool needRequiresStep = this->NeedRequiresStep(gtarget);
 
       lg->WriteDivider(ruleFileStream);
       ruleFileStream
@@ -1129,19 +1128,19 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
 
 
 bool cmGlobalUnixMakefileGenerator3
-::NeedRequiresStep(cmTarget const& target)
+::NeedRequiresStep(const cmGeneratorTarget* target)
 {
   std::set<std::string> languages;
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&target);
-  gtgt->GetLanguages(languages,
-                target.GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"));
+  target->GetLanguages(languages,
+                       target->Target->GetMakefile()
+                       ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::set<std::string>::const_iterator l = languages.begin();
       l != languages.end(); ++l)
     {
     std::string var = "CMAKE_NEEDS_REQUIRES_STEP_";
     var += *l;
     var += "_FLAG";
-    if(target.GetMakefile()->GetDefinition(var))
+    if(target->Target->GetMakefile()->GetDefinition(var))
       {
       return true;
       }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 0485eb8..63ffcb4 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -154,7 +154,7 @@ protected:
                                  cmGeneratorTarget* target);
 
   // does this generator need a requires step for any of its targets
-  bool NeedRequiresStep(cmTarget const&);
+  bool NeedRequiresStep(cmGeneratorTarget const*);
 
   // Target name hooks for superclass.
   const char* GetAllTargetName()           const { return "all"; }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index e9dc9ff..34a50a3 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1977,7 +1977,7 @@ void cmLocalUnixMakefileGenerator3
                           cmGeneratorTarget* target)
 {
   ImplicitDependLanguageMap const& implicitLangs =
-    this->GetImplicitDepends(*target->Target);
+    this->GetImplicitDepends(target);
 
   // list the languages
   cmakefileStream
@@ -2292,19 +2292,20 @@ cmLocalUnixMakefileGenerator3
 
 //----------------------------------------------------------------------------
 cmLocalUnixMakefileGenerator3::ImplicitDependLanguageMap const&
-cmLocalUnixMakefileGenerator3::GetImplicitDepends(cmTarget const& tgt)
+cmLocalUnixMakefileGenerator3::GetImplicitDepends(
+    const cmGeneratorTarget* tgt)
 {
-  return this->ImplicitDepends[tgt.GetName()];
+  return this->ImplicitDepends[tgt->GetName()];
 }
 
 //----------------------------------------------------------------------------
 void
-cmLocalUnixMakefileGenerator3::AddImplicitDepends(cmTarget const& tgt,
+cmLocalUnixMakefileGenerator3::AddImplicitDepends(const cmGeneratorTarget* tgt,
                                                   const std::string& lang,
                                                   const char* obj,
                                                   const char* src)
 {
-  this->ImplicitDepends[tgt.GetName()][lang][obj].push_back(src);
+  this->ImplicitDepends[tgt->GetName()][lang][obj].push_back(src);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 7e0f248..8f69311 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -21,7 +21,6 @@ class cmCustomCommand;
 class cmCustomCommandGenerator;
 class cmDepends;
 class cmMakefileTargetGenerator;
-class cmTarget;
 class cmSourceFile;
 
 /** \class cmLocalUnixMakefileGenerator3
@@ -141,9 +140,11 @@ public:
     public std::map<std::string, ImplicitDependFileMap> {};
   struct ImplicitDependTargetMap:
     public std::map<std::string, ImplicitDependLanguageMap> {};
-  ImplicitDependLanguageMap const& GetImplicitDepends(cmTarget const& tgt);
+  ImplicitDependLanguageMap const&
+  GetImplicitDepends(cmGeneratorTarget const* tgt);
 
-  void AddImplicitDepends(cmTarget const& tgt, const std::string& lang,
+  void AddImplicitDepends(cmGeneratorTarget const* tgt,
+                          const std::string& lang,
                           const char* obj, const char* src);
 
   // write the target rules for the local Makefile into the stream
@@ -197,12 +198,12 @@ protected:
                             const std::string& helpTarget);
 
   void WriteTargetDependRule(std::ostream& ruleFileStream,
-                             cmTarget& target);
+                             cmGeneratorTarget* target);
   void WriteTargetCleanRule(std::ostream& ruleFileStream,
-                            cmTarget& target,
+                            cmGeneratorTarget* target,
                             const std::vector<std::string>& files);
   void WriteTargetRequiresRule(std::ostream& ruleFileStream,
-                               cmTarget& target,
+                               cmGeneratorTarget* target,
                                const std::vector<std::string>& objects);
 
   void AppendRuleDepend(std::vector<std::string>& depends,
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 020e64c..f56037f 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 
 //----------------------------------------------------------------------------
@@ -279,11 +278,13 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(!relink)
     {
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget);
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -448,8 +449,9 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(!relink)
     {
     this->LocalGenerator->
-      AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->GeneratorTarget);
+      AppendCustomCommands(commands,
+                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget);
     }
 
   // Write the build rule.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index df2a8c9..0a65641 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 #include "cmAlgorithms.h"
 
@@ -114,7 +113,8 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
 
   // Add post-build rules.
   this->LocalGenerator->
-    AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
+    AppendCustomCommands(commands,
+                         this->GeneratorTarget->Target->GetPostBuildCommands(),
                          this->GeneratorTarget);
 
   // Depend on the object files.
@@ -457,11 +457,13 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(!relink)
     {
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget);
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -811,8 +813,9 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(!relink)
     {
     this->LocalGenerator->
-      AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->GeneratorTarget);
+      AppendCustomCommands(commands,
+                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget);
     }
 
   // Compute the list of outputs.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b7970fd..7acccb3 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 #include "cmState.h"
 #include "cmComputeLinkInformation.h"
@@ -432,7 +431,7 @@ void cmMakefileTargetGenerator
   std::string srcFullPath =
     this->Convert(source.GetFullPath(), cmLocalGenerator::FULL);
   this->LocalGenerator->
-    AddImplicitDepends(*this->Target, lang,
+    AddImplicitDepends(this->GeneratorTarget, lang,
                        objFullPath.c_str(),
                        srcFullPath.c_str());
 }
@@ -1241,7 +1240,7 @@ void cmMakefileTargetGenerator
     std::string srcFullPath =
       this->Convert(idi->second, cmLocalGenerator::FULL);
     this->LocalGenerator->
-      AddImplicitDepends(*this->Target, idi->first,
+      AddImplicitDepends(this->GeneratorTarget, idi->first,
                          objFullPath.c_str(),
                          srcFullPath.c_str());
     }
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index e38c50b..38f40c0 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -24,7 +24,6 @@ class cmGeneratedFileStream;
 class cmGlobalUnixMakefileGenerator3;
 class cmLocalUnixMakefileGenerator3;
 class cmMakefile;
-class cmTarget;
 class cmSourceFile;
 
 /** \class cmMakefileTargetGenerator
@@ -51,7 +50,6 @@ public:
   std::string GetProgressFileNameFull()
     { return this->ProgressFileNameFull; }
 
-  cmTarget* GetTarget() { return this->Target;}
   cmGeneratorTarget* GetGeneratorTarget() { return this->GeneratorTarget;}
 
 protected:
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 11601c5..d35c3ae 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 
 //----------------------------------------------------------------------------
 cmMakefileUtilityTargetGenerator
@@ -68,19 +67,21 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Utility targets store their rules in pre- and post-build commands.
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->Target->GetPreBuildCommands());
+    (depends, this->GeneratorTarget->Target->GetPreBuildCommands());
 
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->Target->GetPostBuildCommands());
+    (depends, this->GeneratorTarget->Target->GetPostBuildCommands());
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPreBuildCommands(), this->GeneratorTarget);
+    (commands, this->GeneratorTarget->Target->GetPreBuildCommands(),
+     this->GeneratorTarget);
 
   // Depend on all custom command outputs for sources
   this->DriveCustomCommands(depends);
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPostBuildCommands(), this->GeneratorTarget);
+    (commands, this->GeneratorTarget->Target->GetPostBuildCommands(),
+     this->GeneratorTarget);
 
   // Add dependencies on targets that must be built first.
   this->AppendTargetDepends(depends);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0546c7fa0c379c154b0da606ff38b815cf3da25c
commit 0546c7fa0c379c154b0da606ff38b815cf3da25c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:13:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:56 2015 +0200

    Ninja: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6e650ce..2671f4d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -886,7 +886,7 @@ void cmGlobalNinjaGenerator::WriteDisclaimer(std::ostream& os)
     << cmVersion::GetMinorVersion() << "\n\n";
 }
 
-void cmGlobalNinjaGenerator::AddDependencyToAll(cmTarget* target)
+void cmGlobalNinjaGenerator::AddDependencyToAll(cmGeneratorTarget* target)
 {
   this->AppendTargetOutputs(target, this->AllDependencies);
 }
@@ -912,18 +912,16 @@ void cmGlobalNinjaGenerator::WriteAssumedSourceDependencies()
 
 void
 cmGlobalNinjaGenerator
-::AppendTargetOutputs(cmTarget const* target, cmNinjaDeps& outputs)
+::AppendTargetOutputs(cmGeneratorTarget const* target, cmNinjaDeps& outputs)
 {
   std::string configName =
-    target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
+    target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // for frameworks, we want the real name, not smple name
   // frameworks always appear versioned, and the build.ninja
   // will always attempt to manage symbolic links instead
   // of letting cmOSXBundleGenerator do it.
-  bool realname = gtgt->IsFrameworkOnApple();
+  bool realname = target->IsFrameworkOnApple();
 
   switch (target->GetType()) {
   case cmState::EXECUTABLE:
@@ -932,7 +930,7 @@ cmGlobalNinjaGenerator
   case cmState::MODULE_LIBRARY:
     {
     outputs.push_back(this->ConvertToNinjaPath(
-      gtgt->GetFullPath(configName, false, realname)));
+      target->GetFullPath(configName, false, realname)));
     break;
     }
   case cmState::OBJECT_LIBRARY:
@@ -962,16 +960,15 @@ cmGlobalNinjaGenerator
 
 void
 cmGlobalNinjaGenerator
-::AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs)
+::AppendTargetDepends(cmGeneratorTarget const* target, cmNinjaDeps& outputs)
 {
   if (target->GetType() == cmState::GLOBAL_TARGET) {
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
-    std::set<std::string> const& utils = target->GetUtilities();
+    std::set<std::string> const& utils = target->Target->GetUtilities();
     std::copy(utils.begin(), utils.end(), std::back_inserter(outputs));
   } else {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(gt);
+    cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(target);
     for (cmTargetDependSet::const_iterator i = targetDeps.begin();
          i != targetDeps.end(); ++i)
       {
@@ -979,13 +976,13 @@ cmGlobalNinjaGenerator
         {
         continue;
         }
-      this->AppendTargetOutputs((*i)->Target, outputs);
+      this->AppendTargetOutputs(*i, outputs);
     }
   }
 }
 
 void cmGlobalNinjaGenerator::AddTargetAlias(const std::string& alias,
-                                            cmTarget* target) {
+                                            cmGeneratorTarget* target) {
   cmNinjaDeps outputs;
   this->AppendTargetOutputs(target, outputs);
   // Mark the target's outputs as ambiguous to ensure that no other target uses
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 292f7c7..7547f16 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -285,9 +285,11 @@ public:
     ASD.insert(deps.begin(), deps.end());
   }
 
-  void AppendTargetOutputs(cmTarget const* target, cmNinjaDeps& outputs);
-  void AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs);
-  void AddDependencyToAll(cmTarget* target);
+  void AppendTargetOutputs(cmGeneratorTarget const* target,
+                           cmNinjaDeps& outputs);
+  void AppendTargetDepends(cmGeneratorTarget const* target,
+                           cmNinjaDeps& outputs);
+  void AddDependencyToAll(cmGeneratorTarget* target);
   void AddDependencyToAll(const std::string& input);
 
   const std::vector<cmLocalGenerator*>& GetLocalGenerators() const {
@@ -299,7 +301,7 @@ public:
   int GetRuleCmdLength(const std::string& name) {
     return RuleCmdLength[name]; }
 
-  void AddTargetAlias(const std::string& alias, cmTarget* target);
+  void AddTargetAlias(const std::string& alias, cmGeneratorTarget* target);
 
   virtual void ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const;
 
@@ -388,7 +390,7 @@ private:
   /// The mapping from source file to assumed dependencies.
   std::map<std::string, std::set<std::string> > AssumedSourceDependencies;
 
-  typedef std::map<std::string, cmTarget*> TargetAliasMap;
+  typedef std::map<std::string, cmGeneratorTarget*> TargetAliasMap;
   TargetAliasMap TargetAliases;
 };
 
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 3dd18bd..891c44e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -89,7 +89,7 @@ void cmLocalNinjaGenerator::Generate()
       if (!this->GetGlobalNinjaGenerator()->IsExcluded(
             this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0],
             *t))
-        this->GetGlobalNinjaGenerator()->AddDependencyToAll((*t)->Target);
+        this->GetGlobalNinjaGenerator()->AddDependencyToAll(*t);
       delete tg;
       }
     }
@@ -285,14 +285,14 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
 
 void
 cmLocalNinjaGenerator
-::AppendTargetOutputs(cmTarget* target, cmNinjaDeps& outputs)
+::AppendTargetOutputs(cmGeneratorTarget* target, cmNinjaDeps& outputs)
 {
   this->GetGlobalNinjaGenerator()->AppendTargetOutputs(target, outputs);
 }
 
 void
 cmLocalNinjaGenerator
-::AppendTargetDepends(cmTarget* target, cmNinjaDeps& outputs)
+::AppendTargetDepends(cmGeneratorTarget* target, cmNinjaDeps& outputs)
 {
   this->GetGlobalNinjaGenerator()->AppendTargetDepends(target, outputs);
 }
@@ -441,7 +441,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
 }
 
 void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand const* cc,
-                                                   cmTarget* target)
+                                                   cmGeneratorTarget* target)
 {
   this->CustomCommandTargets[cc].insert(target);
 }
@@ -459,7 +459,7 @@ void cmLocalNinjaGenerator::WriteCustomCommandBuildStatements()
     //
     // FIXME: This won't work in certain obscure scenarios involving indirect
     // dependencies.
-    std::set<cmTarget*>::iterator j = i->second.begin();
+    std::set<cmGeneratorTarget*>::iterator j = i->second.begin();
     assert(j != i->second.end());
     std::vector<std::string> ccTargetDeps;
     this->AppendTargetDepends(*j, ccTargetDeps);
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index ce5f82d..b6987ef 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -58,10 +58,11 @@ public:
 
   std::string BuildCommandLine(const std::vector<std::string> &cmdLines);
 
-  void AppendTargetOutputs(cmTarget* target, cmNinjaDeps& outputs);
-  void AppendTargetDepends(cmTarget* target, cmNinjaDeps& outputs);
+  void AppendTargetOutputs(cmGeneratorTarget* target, cmNinjaDeps& outputs);
+  void AppendTargetDepends(cmGeneratorTarget* target, cmNinjaDeps& outputs);
 
-  void AddCustomCommandTarget(cmCustomCommand const* cc, cmTarget* target);
+  void AddCustomCommandTarget(cmCustomCommand const* cc,
+                              cmGeneratorTarget* target);
   void AppendCustomCommandLines(cmCustomCommandGenerator const& ccg,
                                 std::vector<std::string> &cmdLines);
   void AppendCustomCommandDeps(cmCustomCommandGenerator const& ccg,
@@ -102,7 +103,7 @@ private:
 
   std::string HomeRelativeOutputPath;
 
-  typedef std::map<cmCustomCommand const*, std::set<cmTarget*> >
+  typedef std::map<cmCustomCommand const*, std::set<cmGeneratorTarget*> >
     CustomCommandTargetMap;
   CustomCommandTargetMap CustomCommandTargets;
 };
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index dafbda9..b533d37 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -399,7 +399,6 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
 
 void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 {
-  cmTarget& target = *this->GetTarget();
   cmGeneratorTarget& gt = *this->GetGeneratorTarget();
   const std::string cfgName = this->GetConfigName();
   std::string targetOutput = ConvertToNinjaPath(
@@ -443,7 +442,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   // Write comments.
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
-  const cmState::TargetType targetType = target.GetType();
+  const cmState::TargetType targetType = gt.GetType();
   this->GetBuildFileStream()
     << "# Link build statements for "
     << cmState::GetTargetTypeName(targetType)
@@ -490,13 +489,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                           &genTarget,
                           useWatcomQuote);
   if(this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS")
-     && target.GetType() == cmState::SHARED_LIBRARY)
+     && gt.GetType() == cmState::SHARED_LIBRARY)
     {
-    if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(gt.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file
         = gt.GetSupportDirectory();
-      name_of_def_file += "/" + target.GetName();
+      name_of_def_file += "/" + gt.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
       vars["LINK_FLAGS"] += this->GetLocalGenerator()
@@ -505,7 +504,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       }
     }
 
-  this->addPoolNinjaVariable("JOB_POOL_LINK", &target, vars);
+  this->addPoolNinjaVariable("JOB_POOL_LINK", &gt, vars);
 
   this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);
   vars["LINK_FLAGS"] = cmGlobalNinjaGenerator
@@ -599,9 +598,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   const std::vector<cmCustomCommand> *cmdLists[3] = {
-    &target.GetPreBuildCommands(),
-    &target.GetPreLinkCommands(),
-    &target.GetPostBuildCommands()
+    &gt.Target->GetPreBuildCommands(),
+    &gt.Target->GetPreLinkCommands(),
+    &gt.Target->GetPostBuildCommands()
   };
 
   std::vector<std::string> preLinkCmdLines, postBuildCmdLines;
@@ -626,17 +625,17 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // maybe create .def file from list of objects
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (gt.GetType() == cmState::SHARED_LIBRARY &&
       this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(gt.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
         = gt.GetSupportDirectory();
-      name_of_def_file += "/" + target.GetName();
+      name_of_def_file += "/" + gt.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
       cmd += " -E __create_def ";
@@ -699,11 +698,11 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   const std::string rspfile =
       std::string(cmake::GetCMakeFilesDirectoryPostSlash())
-      + target.GetName() + ".rsp";
+      + gt.GetName() + ".rsp";
 
   // Gather order-only dependencies.
   cmNinjaDeps orderOnlyDeps;
-  this->GetLocalGenerator()->AppendTargetDepends(this->GetTarget(),
+  this->GetLocalGenerator()->AppendTargetDepends(this->GetGeneratorTarget(),
     orderOnlyDeps);
 
   // Ninja should restat after linking if and only if there are byproducts.
@@ -772,8 +771,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // Add aliases for the file name and the target name.
-  globalGen.AddTargetAlias(this->TargetNameOut, &target);
-  globalGen.AddTargetAlias(this->GetTargetName(), &target);
+  globalGen.AddTargetAlias(this->TargetNameOut, &gt);
+  globalGen.AddTargetAlias(this->GetTargetName(), &gt);
 }
 
 //----------------------------------------------------------------------------
@@ -781,7 +780,8 @@ void cmNinjaNormalTargetGenerator::WriteObjectLibStatement()
 {
   // Write a phony output that depends on all object files.
   cmNinjaDeps outputs;
-  this->GetLocalGenerator()->AppendTargetOutputs(this->GetTarget(), outputs);
+  this->GetLocalGenerator()->AppendTargetOutputs(this->GetGeneratorTarget(),
+                                                 outputs);
   cmNinjaDeps depends = this->GetObjects();
   this->GetGlobalGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
                                               "Object library "
@@ -791,5 +791,5 @@ void cmNinjaNormalTargetGenerator::WriteObjectLibStatement()
 
   // Add aliases for the target name.
   this->GetGlobalGenerator()->AddTargetAlias(this->GetTargetName(),
-                                             this->GetTarget());
+                                             this->GetGeneratorTarget());
 }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index b018005..dc2c7a6 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -486,7 +486,8 @@ cmNinjaTargetGenerator
       si != customCommands.end(); ++si)
      {
      cmCustomCommand const* cc = (*si)->GetCustomCommand();
-     this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
+     this->GetLocalGenerator()->AddCustomCommandTarget(cc,
+         this->GetGeneratorTarget());
      // Record the custom commands for this target. The container is used
      // in WriteObjectBuildStatement when called in a loop below.
      this->CustomCommands.push_back(cc);
@@ -511,7 +512,8 @@ cmNinjaTargetGenerator
     }
 
   cmNinjaDeps orderOnlyDeps;
-  this->GetLocalGenerator()->AppendTargetDepends(this->Target, orderOnlyDeps);
+  this->GetLocalGenerator()->AppendTargetDepends(this->GeneratorTarget,
+                                                 orderOnlyDeps);
 
   // Add order-only dependencies on custom command outputs.
   for(std::vector<cmCustomCommand const*>::const_iterator
@@ -633,7 +635,8 @@ cmNinjaTargetGenerator
                               ConvertToNinjaPath(objectFileDir),
                               cmLocalGenerator::SHELL);
 
-  this->addPoolNinjaVariable("JOB_POOL_COMPILE", this->GetTarget(), vars);
+  this->addPoolNinjaVariable("JOB_POOL_COMPILE",
+                             this->GetGeneratorTarget(), vars);
 
   this->SetMsvcTargetPdbVariable(vars);
 
@@ -782,7 +785,7 @@ cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
 
 void cmNinjaTargetGenerator::addPoolNinjaVariable(
                                               const std::string& pool_property,
-                                              cmTarget* target,
+                                              cmGeneratorTarget* target,
                                               cmNinjaVars& vars)
 {
     const char* pool = target->GetProperty(pool_property);
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 0267f63..e3ec423 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -53,9 +53,6 @@ protected:
   cmGeneratedFileStream& GetBuildFileStream() const;
   cmGeneratedFileStream& GetRulesFileStream() const;
 
-  cmTarget* GetTarget() const
-  { return this->Target; }
-
   cmGeneratorTarget* GetGeneratorTarget() const
   { return this->GeneratorTarget; }
 
@@ -152,7 +149,7 @@ protected:
   std::set<std::string> MacContentFolders;
 
   void addPoolNinjaVariable(const std::string& pool_property,
-                            cmTarget* target,
+                            cmGeneratorTarget* target,
                             cmNinjaVars& vars);
 
 private:
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 5bbe268..b2a5334 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmGlobalNinjaGenerator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmCustomCommandGenerator.h"
 
 cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(
@@ -34,8 +33,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
   cmNinjaDeps deps, outputs, util_outputs(1, utilCommandName);
 
   const std::vector<cmCustomCommand> *cmdLists[2] = {
-    &this->GetTarget()->GetPreBuildCommands(),
-    &this->GetTarget()->GetPostBuildCommands()
+    &this->GetGeneratorTarget()->Target->GetPreBuildCommands(),
+    &this->GetGeneratorTarget()->Target->GetPostBuildCommands()
   };
 
   bool uses_terminal = false;
@@ -66,7 +65,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
       {
       cmCustomCommandGenerator ccg(*cc, this->GetConfigName(),
                                    this->GetLocalGenerator());
-      this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
+      this->GetLocalGenerator()->AddCustomCommandTarget(cc,
+          this->GetGeneratorTarget());
 
       // Depend on all custom command outputs.
       const std::vector<std::string>& ccOutputs = ccg.GetOutputs();
@@ -78,8 +78,10 @@ void cmNinjaUtilityTargetGenerator::Generate()
       }
     }
 
-  this->GetLocalGenerator()->AppendTargetOutputs(this->GetTarget(), outputs);
-  this->GetLocalGenerator()->AppendTargetDepends(this->GetTarget(), deps);
+  this->GetLocalGenerator()->AppendTargetOutputs(this->GetGeneratorTarget(),
+                                                 outputs);
+  this->GetLocalGenerator()->AppendTargetDepends(this->GetGeneratorTarget(),
+                                                 deps);
 
   if (commands.empty()) {
     this->GetGlobalGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
@@ -140,5 +142,5 @@ void cmNinjaUtilityTargetGenerator::Generate()
   }
 
   this->GetGlobalGenerator()->AddTargetAlias(this->GetTargetName(),
-                                             this->GetTarget());
+                                             this->GetGeneratorTarget());
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca72f3ce24edb8959a2d622c5fc34139e6b81fd4
commit ca72f3ce24edb8959a2d622c5fc34139e6b81fd4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:59:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:56 2015 +0200

    Use cmLocalGenerator at generate-time.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 6920faf..2c47ab2 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -123,7 +123,7 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const
     else
       {
       // Interpret relative to the current output directory.
-      mod_dir = this->Makefile->GetCurrentBinaryDirectory();
+      mod_dir = this->LocalGenerator->GetCurrentBinaryDirectory();
       mod_dir += "/";
       mod_dir += target_mod_dir;
       }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 1a84625..d52ce35 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -456,13 +456,13 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
 
   if (cge->GetHadContextSensitiveCondition())
     {
-    cmMakefile* mf = target->Target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" is installed with "
     "INCLUDES DESTINATION set to a context sensitive path.  Paths which "
     "depend on the configuration, policy values or the link interface are "
     "not supported.  Consider using target_include_directories instead.";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
@@ -535,11 +535,11 @@ void getCompatibleInterfaceProperties(cmGeneratorTarget *target,
 
   if (!info)
     {
-    cmMakefile* mf = target->Target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Exporting the target \"" << target->GetName() << "\" is not "
         "allowed since its linker language cannot be determined";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
@@ -835,13 +835,13 @@ cmExportFileGenerator
 
   if(newCMP0022Behavior && !this->ExportOld)
     {
-    cmMakefile *mf = target->Target->GetMakefile();
+    cmLocalGenerator *lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" has policy CMP0022 enabled, "
          "but also has old-style LINK_INTERFACE_LIBRARIES properties "
          "populated, but it was exported without the "
          "EXPORT_LINK_INTERFACE_LIBRARIES to export the old-style properties";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 89a6dff..6e650ce 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -719,7 +719,7 @@ void cmGlobalNinjaGenerator
 {
   // Compute full path to object file directory for this target.
   std::string dir;
-  dir += gt->Makefile->GetCurrentBinaryDirectory();
+  dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
@@ -938,7 +938,7 @@ cmGlobalNinjaGenerator
   case cmState::OBJECT_LIBRARY:
   case cmState::UTILITY: {
     std::string path = this->ConvertToNinjaPath(
-      target->GetMakefile()->GetCurrentBinaryDirectory());
+      target->GetLocalGenerator()->GetCurrentBinaryDirectory());
     if (path.empty() || path == ".")
       outputs.push_back(target->GetName());
     else {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 2a5b153..4d7ca25 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -116,7 +116,7 @@ cmGlobalUnixMakefileGenerator3
 {
   // Compute full path to object file directory for this target.
   std::string dir;
-  dir += gt->Makefile->GetCurrentBinaryDirectory();
+  dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7a10356..59d06f6 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -76,7 +76,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   if(this->Target->NeedRelinkBeforeInstall(config))
     {
     fromDirConfig =
-        this->Target->Target->GetMakefile()->GetCurrentBinaryDirectory();
+        this->Target->GetLocalGenerator()->GetCurrentBinaryDirectory();
     fromDirConfig += cmake::GetCMakeFilesDirectory();
     fromDirConfig += "/CMakeRelink.dir/";
     }
@@ -111,7 +111,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
     case cmState::UTILITY:
     case cmState::GLOBAL_TARGET:
     case cmState::UNKNOWN_LIBRARY:
-      this->Target->Target->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR,
+      this->Target->GetLocalGenerator()->IssueMessage(cmake::INTERNAL_ERROR,
         "cmInstallTargetGenerator created with non-installable target.");
       return;
     }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2166c09..c37417d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2140,7 +2140,7 @@ void cmLocalGenerator
       "has the following visibility properties set for " << lang << ":\n" <<
       warnCMP0063 <<
       "For compatibility CMake is not honoring them for this target.";
-    target->Target->GetMakefile()->GetCMakeInstance()
+    target->GetLocalGenerator()->GetCMakeInstance()
       ->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
                      target->GetBacktrace());
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index dae8aaf..e9dc9ff 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -188,7 +188,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     // Compute full path to object file directory for this target.
     std::string dir;
-    dir += gt->Makefile->GetCurrentBinaryDirectory();
+    dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
     dir += "/";
     dir += this->GetTargetDirectory(gt);
     dir += "/";

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b45d4a883d10a8b3cd2ddfa2fc9fcbdfffbe8187
commit b45d4a883d10a8b3cd2ddfa2fc9fcbdfffbe8187
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 17:06:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 21:59:55 2015 +0200

    Port to GetGeneratorTargets.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 03f4fdd..113c989 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -175,13 +175,12 @@ void cmComputeTargetDepends::CollectTargets()
     this->GlobalGenerator->GetLocalGenerators();
   for(unsigned int i = 0; i < lgens.size(); ++i)
     {
-    const cmTargets& targets = lgens[i]->GetMakefile()->GetTargets();
-    for(cmTargets::const_iterator ti = targets.begin();
+    const std::vector<cmGeneratorTarget*> targets =
+        lgens[i]->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      cmTarget const* target = &ti->second;
-      cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(target);
+      cmGeneratorTarget* gt = *ti;
       int index = static_cast<int>(this->Targets.size());
       this->TargetIndex[gt] = index;
       this->Targets.push_back(gt);
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 3bc76fa..a71b1cb 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -319,12 +319,12 @@ void cmExtraCodeBlocksGenerator
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
        lg!=lgs.end(); lg++)
     {
-    cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -333,7 +333,7 @@ void cmExtraCodeBlocksGenerator
           if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
-            this->AppendTarget(fout, ti->first, 0,
+            this->AppendTarget(fout, targetName, 0,
                                make.c_str(), *lg, compiler.c_str());
             }
           }
@@ -341,15 +341,16 @@ void cmExtraCodeBlocksGenerator
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-             || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-             || ((ti->first.find("Experimental")==0)
-                                               && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+             || ((targetName.find("Continuous")==0)
+                 &&(targetName!="Continuous"))
+             || ((targetName.find("Experimental")==0)
+                                             && (targetName!="Experimental")))
             {
             break;
             }
 
-          this->AppendTarget(fout, ti->first, 0,
+          this->AppendTarget(fout, targetName, 0,
                                  make.c_str(), *lg, compiler.c_str());
           break;
         case cmState::EXECUTABLE:
@@ -358,11 +359,10 @@ void cmExtraCodeBlocksGenerator
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
-          this->AppendTarget(fout, ti->first, gt,
+          cmGeneratorTarget* gt = *ti;
+          this->AppendTarget(fout, targetName, gt,
                              make.c_str(), *lg, compiler.c_str());
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
           this->AppendTarget(fout, fastTarget, gt,
                              make.c_str(), *lg, compiler.c_str());
@@ -388,11 +388,11 @@ void cmExtraCodeBlocksGenerator
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -402,8 +402,7 @@ void cmExtraCodeBlocksGenerator
         case cmState::UTILITY: // can have sources since 2.6.3
           {
           std::vector<cmSourceFile*> sources;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
@@ -442,7 +441,7 @@ void cmExtraCodeBlocksGenerator
               }
 
             CbpUnit &cbpUnit = allFiles[fullPath];
-            cbpUnit.Targets.push_back(&(ti->second));
+            cbpUnit.Targets.push_back((*ti)->Target);
             }
           }
         default:  // intended fallthrough
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 10f33be..f4a6537 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -155,12 +155,12 @@ void cmExtraCodeLiteGenerator
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
 
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
           {
@@ -186,7 +186,7 @@ void cmExtraCodeLiteGenerator
           break;
         }
 
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -194,8 +194,7 @@ void cmExtraCodeLiteGenerator
         case cmState::MODULE_LIBRARY:
           {
           std::vector<cmSourceFile*> sources;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 1921f03..aedf6f4 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -536,13 +536,15 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
        ++lgIt)
     {
     cmMakefile* makefile = (*lgIt)->GetMakefile();
-    const cmTargets& targets = makefile->GetTargets();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*lgIt)->GetGeneratorTargets();
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end();++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti=targets.begin();
+        ti!=targets.end();++ti)
       {
       std::string linkName2 = linkName;
       linkName2 += "/";
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -550,10 +552,10 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
+          const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
           linkName2 += prefix;
-          linkName2 += ti->first;
+          linkName2 += (*ti)->GetName();
           this->AppendLinkedResource(fout, linkName2, "virtual:/virtual",
                                      VirtualFolder);
           if (!this->GenerateLinkedResources)
@@ -562,10 +564,8 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
             }
           std::vector<cmSourceGroup> sourceGroups=makefile->GetSourceGroups();
           // get the files from the source lists then add them to the groups
-          cmTarget* tgt = const_cast<cmTarget*>(&ti->second);
+          cmGeneratorTarget* gt = const_cast<cmGeneratorTarget*>(*ti);
           std::vector<cmSourceFile*> files;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(tgt);
           gt->GetSourceFiles(files,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for(std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
@@ -1030,7 +1030,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*it)->GetGeneratorTargets();
     std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
@@ -1038,9 +1039,11 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       subdir = "";
       }
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti =
+        targets.begin(); ti!=targets.end(); ++ti)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -1048,22 +1051,22 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           // not from the subdirs
           if (subdir.empty())
            {
-           this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
+           this->AppendTarget(fout, targetName, make, makeArgs, subdir, ": ");
            }
          }
          break;
        case cmState::UTILITY:
          // Add all utility targets, except the Nightly/Continuous/
          // Experimental-"sub"targets as e.g. NightlyStart
-         if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-          || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-          || ((ti->first.find("Experimental")==0)
-                                            && (ti->first!="Experimental")))
+         if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+          || ((targetName.find("Continuous")==0)&&(targetName!="Continuous"))
+          || ((targetName.find("Experimental")==0)
+                                            && (targetName!="Experimental")))
            {
            break;
            }
 
-         this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
+         this->AppendTarget(fout, targetName, make, makeArgs, subdir, ": ");
          break;
        case cmState::EXECUTABLE:
        case cmState::STATIC_LIBRARY:
@@ -1071,10 +1074,10 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        case cmState::MODULE_LIBRARY:
        case cmState::OBJECT_LIBRARY:
          {
-         const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
+         const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
-         this->AppendTarget(fout, ti->first, make, makeArgs, subdir, prefix);
-         std::string fastTarget = ti->first;
+         this->AppendTarget(fout, targetName, make, makeArgs, subdir, prefix);
+         std::string fastTarget = targetName;
          fastTarget += "/fast";
          this->AppendTarget(fout, fastTarget, make, makeArgs, subdir, prefix);
 
@@ -1083,21 +1086,20 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           {
           std::string virtDir = "[Targets]/";
           virtDir += prefix;
-          virtDir += ti->first;
+          virtDir += targetName;
           std::string buildArgs = "-C \"";
           buildArgs += (*it)->GetBinaryDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
-                             ti->first.c_str());
+                             targetName.c_str());
 
           std::string cleanArgs = "-E chdir \"";
           cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           cleanArgs += (*it)->GetTargetDirectory(gt);
           cleanArgs += "/cmake_clean.cmake\"";
           this->AppendTarget(fout, "Clean", cmSystemTools::GetCMakeCommand(),
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index dc6421b..1741acf 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -119,14 +119,16 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*it)->GetGeneratorTargets();
     std::string currentDir = (*it)->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti =
+        targets.begin(); ti!=targets.end(); ++ti)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -138,9 +140,9 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             insertTarget = true;
             // only add the "edit_cache" target if it's not ccmake, because
             // this will not work within the IDE
-            if (ti->first == "edit_cache")
+            if (targetName == "edit_cache")
               {
-              const char* editCommand = makefile->GetDefinition
+              const char* editCommand = (*it)->GetMakefile()->GetDefinition
               ("CMAKE_EDIT_COMMAND");
               if (editCommand == 0)
                 {
@@ -154,7 +156,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             }
           if (insertTarget)
             {
-            this->AppendTarget(fout, ti->first, make, makeArgs,
+            this->AppendTarget(fout, targetName, make, makeArgs,
                                currentDir, homeOutputDir);
             }
         }
@@ -162,15 +164,16 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-            || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-            || ((ti->first.find("Experimental")==0)
-            && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+            || ((targetName.find("Continuous")==0)
+                &&(targetName!="Continuous"))
+            || ((targetName.find("Experimental")==0)
+            && (targetName!="Experimental")))
             {
               break;
             }
 
-            this->AppendTarget(fout, ti->first, make, makeArgs,
+            this->AppendTarget(fout, targetName, make, makeArgs,
                                currentDir, homeOutputDir);
           break;
         case cmState::EXECUTABLE:
@@ -179,9 +182,9 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
         {
-          this->AppendTarget(fout, ti->first, make, makeArgs,
+          this->AppendTarget(fout, targetName, make, makeArgs,
                              currentDir, homeOutputDir);
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
           this->AppendTarget(fout, fastTarget, make, makeArgs,
                              currentDir, homeOutputDir);
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index ac0202b..47822e8 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -162,11 +162,12 @@ void cmExtraSublimeTextGenerator::
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -175,7 +176,7 @@ void cmExtraSublimeTextGenerator::
           if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
-            this->AppendTarget(fout, ti->first, *lg, 0,
+            this->AppendTarget(fout, targetName, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
                                sourceFileFlags, false);
             }
@@ -184,15 +185,16 @@ void cmExtraSublimeTextGenerator::
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-             || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-             || ((ti->first.find("Experimental")==0)
-                                               && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+             || ((targetName.find("Continuous")==0)
+                 &&(targetName!="Continuous"))
+             || ((targetName.find("Experimental")==0)
+                 && (targetName!="Experimental")))
             {
             break;
             }
 
-          this->AppendTarget(fout, ti->first, *lg, 0,
+          this->AppendTarget(fout, targetName, *lg, 0,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           break;
@@ -202,12 +204,12 @@ void cmExtraSublimeTextGenerator::
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, ti->first, *lg, &ti->second,
+          this->AppendTarget(fout, targetName, *lg, (*ti)->Target,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, *lg, &ti->second,
+          this->AppendTarget(fout, fastTarget, *lg, (*ti)->Target,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 13efc4c..d26cc34 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1468,34 +1468,34 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
 #ifdef CMAKE_BUILD_WITH_CMAKE
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    cmTargets& targets =
-      this->LocalGenerators[i]->GetMakefile()->GetTargets();
+    std::vector<cmGeneratorTarget*> targets =
+      this->LocalGenerators[i]->GetGeneratorTargets();
     std::vector<cmGeneratorTarget*> filteredTargets;
     filteredTargets.reserve(targets.size());
-    for(cmTargets::iterator ti = targets.begin();
+    for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      if (ti->second.GetType() == cmState::GLOBAL_TARGET)
+      if ((*ti)->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(ti->second.GetType() != cmState::EXECUTABLE &&
-         ti->second.GetType() != cmState::STATIC_LIBRARY &&
-         ti->second.GetType() != cmState::SHARED_LIBRARY &&
-         ti->second.GetType() != cmState::MODULE_LIBRARY &&
-         ti->second.GetType() != cmState::OBJECT_LIBRARY)
+      if((*ti)->GetType() != cmState::EXECUTABLE &&
+         (*ti)->GetType() != cmState::STATIC_LIBRARY &&
+         (*ti)->GetType() != cmState::SHARED_LIBRARY &&
+         (*ti)->GetType() != cmState::MODULE_LIBRARY &&
+         (*ti)->GetType() != cmState::OBJECT_LIBRARY)
         {
         continue;
         }
-      if((!ti->second.GetPropertyAsBool("AUTOMOC")
-            && !ti->second.GetPropertyAsBool("AUTOUIC")
-            && !ti->second.GetPropertyAsBool("AUTORCC"))
-          || ti->second.IsImported())
+      if((!(*ti)->GetPropertyAsBool("AUTOMOC")
+            && !(*ti)->GetPropertyAsBool("AUTOUIC")
+            && !(*ti)->GetPropertyAsBool("AUTORCC"))
+          || (*ti)->IsImported())
         {
         continue;
         }
       // don't do anything if there is no Qt4 or Qt5Core (which contains moc):
-      cmMakefile* mf = ti->second.GetMakefile();
+      cmMakefile* mf = (*ti)->Target->GetMakefile();
       std::string qtMajorVersion = mf->GetSafeDefinition("QT_VERSION_MAJOR");
       if (qtMajorVersion == "")
         {
@@ -1506,7 +1506,7 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
         continue;
         }
 
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(&ti->second);
+      cmGeneratorTarget* gt = *ti;
 
       cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt);
       filteredTargets.push_back(gt);
@@ -2706,23 +2706,22 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
       {
       continue;
       }
-    cmMakefile* mf = (*i)->GetMakefile();
     // Get the targets in the makefile
-    cmTargets &tgts = mf->GetTargets();
+    std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
     // loop over all the targets
-    for (cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+    for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+         l != tgts.end(); ++l)
       {
-      cmTarget* target = &l->second;
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-      if(this->IsRootOnlyTarget(gt) &&
-         target->GetMakefile() != root->GetMakefile())
+      cmGeneratorTarget* target = *l;
+      if(this->IsRootOnlyTarget(target) &&
+         target->GetLocalGenerator() != root)
         {
         continue;
         }
       // put the target in the set of original targets
-      originalTargets.insert(gt);
+      originalTargets.insert(target);
       // Get the set of targets that depend on target
-      this->AddTargetDepends(gt, projectTargets);
+      this->AddTargetDepends(target, projectTargets);
       }
     }
 }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 8659e34..7c6c48c 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -133,14 +133,13 @@ bool cmGlobalKdevelopGenerator
       }
 
     //get all sources
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*it)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
       std::vector<cmSourceFile*> sources;
-      cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(&ti->second);
-      gt->GetSourceFiles(sources, ti->second.GetMakefile()
+      cmGeneratorTarget* gt = *ti;
+      gt->GetSourceFiles(sources, gt->Target->GetMakefile()
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
            si!=sources.end(); si++)
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 248701a..2a5b153 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -423,17 +423,18 @@ void cmGlobalUnixMakefileGenerator3
     {
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>(lGenerators[i]);
     // for all of out targets
-    for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
-         l != lg->GetMakefile()->GetTargets().end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+         l != tgts.end(); l++)
       {
-      if((l->second.GetType() == cmState::EXECUTABLE) ||
-         (l->second.GetType() == cmState::STATIC_LIBRARY) ||
-         (l->second.GetType() == cmState::SHARED_LIBRARY) ||
-         (l->second.GetType() == cmState::MODULE_LIBRARY) ||
-         (l->second.GetType() == cmState::OBJECT_LIBRARY) ||
-         (l->second.GetType() == cmState::UTILITY))
+      if(((*l)->GetType() == cmState::EXECUTABLE) ||
+         ((*l)->GetType() == cmState::STATIC_LIBRARY) ||
+         ((*l)->GetType() == cmState::SHARED_LIBRARY) ||
+         ((*l)->GetType() == cmState::MODULE_LIBRARY) ||
+         ((*l)->GetType() == cmState::OBJECT_LIBRARY) ||
+         ((*l)->GetType() == cmState::UTILITY))
         {
-        cmGeneratorTarget* gt = this->GetGeneratorTarget(&l->second);
+        cmGeneratorTarget* gt = *l;
         std::string tname = lg->GetRelativeTargetDirectory(gt);
         tname += "/DependInfo.cmake";
         cmSystemTools::ConvertToUnixSlashes(tname);
@@ -914,13 +915,11 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
       lgi != this->LocalGenerators.end(); ++lgi)
     {
     cmLocalGenerator* lg = *lgi;
-    cmMakefile* mf = lg->GetMakefile();
-    cmTargets const& targets = mf->GetTargets();
-    for(cmTargets::const_iterator t = targets.begin(); t != targets.end(); ++t)
+    std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::const_iterator t = targets.begin();
+        t != targets.end(); ++t)
       {
-      cmTarget const& target = t->second;
-
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
+      cmGeneratorTarget* gt = *t;
 
       cmLocalGenerator* tlg = gt->GetLocalGenerator();
 
@@ -1089,11 +1088,12 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
     if (lg2 == lg || lg->GetMakefile()->IsRootMakefile())
       {
       // for each target Generate the rule files for each target.
-      cmTargets& targets = lg2->GetMakefile()->GetTargets();
-      for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
+      std::vector<cmGeneratorTarget*> targets = lg2->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+          t != targets.end(); ++t)
         {
-        cmTarget const& target = t->second;
-        cmState::TargetType type = target.GetType();
+        cmGeneratorTarget* target = *t;
+        cmState::TargetType type = target->GetType();
         if((type == cmState::EXECUTABLE) ||
            (type == cmState::STATIC_LIBRARY) ||
            (type == cmState::SHARED_LIBRARY) ||
@@ -1102,7 +1102,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
            (type == cmState::GLOBAL_TARGET) ||
            (type == cmState::UTILITY))
           {
-          std::string name = target.GetName();
+          std::string name = target->GetName();
           if(emittedTargets.insert(name).second)
             {
             path = "... ";
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 2c8cb56..8ab2262 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -375,11 +375,11 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
     for(std::vector<cmLocalGenerator*>::iterator i = gen.begin();
         i != gen.end(); ++i)
       {
-      cmTargets& targets = (*i)->GetMakefile()->GetTargets();
-      for(cmTargets::iterator ti = targets.begin();
+      std::vector<cmGeneratorTarget*> targets = (*i)->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(ti->second);
+        this->ComputeVSTargetDepends(*(*ti)->Target);
         }
       }
     }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index c06f503..fe115ac 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -510,17 +510,20 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       continue;
       }
 
-    cmTargets& tgts = lg->GetMakefile()->GetTargets();
-    for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+        l != tgts.end(); l++)
       {
-      cmTarget& target = l->second;
+      cmTarget& target = *(*l)->Target;
 
       if (target.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
-      if (regenerate && (l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
+      std::string targetName = target.GetName();
+
+      if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
         {
         target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
@@ -1085,21 +1088,26 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
                                            targets)
 {
   this->SetCurrentLocalGenerator(gen);
-  cmTargets &tgts = this->CurrentMakefile->GetTargets();
-  typedef std::map<std::string, cmTarget*, cmCompareTargets> cmSortedTargets;
+  std::vector<cmGeneratorTarget*> tgts =
+      this->CurrentLocalGenerator->GetGeneratorTargets();
+  typedef std::map<std::string, cmGeneratorTarget*, cmCompareTargets>
+      cmSortedTargets;
   cmSortedTargets sortedTargets;
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); l++)
     {
-    sortedTargets[l->first] = &l->second;
+    sortedTargets[(*l)->GetName()] = *l;
     }
   for(cmSortedTargets::iterator l = sortedTargets.begin();
       l != sortedTargets.end(); l++)
     {
-    cmTarget& cmtarget = *l->second;
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+    cmGeneratorTarget* gtgt = l->second;
+    cmTarget& cmtarget = *gtgt->Target;
+
+    std::string targetName = gtgt->GetName();
 
     // make sure ALL_BUILD, INSTALL, etc are only done once
-    if(this->SpecialTargetEmitted(l->first.c_str()))
+    if(this->SpecialTargetEmitted(targetName.c_str()))
       {
       continue;
       }
@@ -3062,10 +3070,11 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       }
     cmMakefile* mf = (*i)->GetMakefile();
     std::vector<cmSourceGroup> sourceGroups = mf->GetSourceGroups();
-    cmTargets &tgts = mf->GetTargets();
-    for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+        l != tgts.end(); l++)
       {
-      cmTarget& cmtarget = l->second;
+      cmTarget& cmtarget = *(*l)->Target;
 
       // Same skipping logic here as in CreateXCodeTargets so that we do not
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3658473..2166c09 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2510,28 +2510,29 @@ cmLocalGenerator
 {
   // Convert the old-style install specification from each target to
   // an install generator and run it.
-  cmTargets& tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
     // Include the user-specified pre-install script for this target.
-    if(const char* preinstall = l->second.GetProperty("PRE_INSTALL_SCRIPT"))
+    if(const char* preinstall = (*l)->GetProperty("PRE_INSTALL_SCRIPT"))
       {
       cmInstallScriptGenerator g(preinstall, false, 0);
       g.Generate(os, config, configurationTypes);
       }
 
     // Install this target if a destination is given.
-    if(l->second.GetInstallPath() != "")
+    if((*l)->Target->GetInstallPath() != "")
       {
       // Compute the full install destination.  Note that converting
       // to unix slashes also removes any trailing slash.
       // We also skip over the leading slash given by the user.
-      std::string destination = l->second.GetInstallPath().substr(1);
+      std::string destination = (*l)->Target->GetInstallPath().substr(1);
       cmSystemTools::ConvertToUnixSlashes(destination);
       if(destination.empty())
         {
@@ -2539,7 +2540,7 @@ cmLocalGenerator
         }
 
       // Generate the proper install generator for this target type.
-      switch(l->second.GetType())
+      switch((*l)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -2547,7 +2548,7 @@ cmLocalGenerator
           {
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
-            g(this, l->first, destination.c_str(), false);
+            g(this, (*l)->GetName(), destination.c_str(), false);
           g.Generate(os, config, configurationTypes);
           }
           break;
@@ -2558,18 +2559,18 @@ cmLocalGenerator
           // to the normal destination and the DLL to the runtime
           // destination.
           cmInstallTargetGeneratorLocal
-            g1(this, l->first, destination.c_str(), true);
+            g1(this, (*l)->GetName(), destination.c_str(), true);
           g1.Generate(os, config, configurationTypes);
           // We also skip over the leading slash given by the user.
-          destination = l->second.GetRuntimeInstallPath().substr(1);
+          destination = (*l)->Target->GetRuntimeInstallPath().substr(1);
           cmSystemTools::ConvertToUnixSlashes(destination);
           cmInstallTargetGeneratorLocal
-            g2(this, l->first, destination.c_str(), false);
+            g2(this, (*l)->GetName(), destination.c_str(), false);
           g2.Generate(os, config, configurationTypes);
 #else
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
-            g(this, l->first, destination.c_str(), false);
+            g(this, (*l)->GetName(), destination.c_str(), false);
           g.Generate(os, config, configurationTypes);
 #endif
           }
@@ -2580,7 +2581,7 @@ cmLocalGenerator
       }
 
     // Include the user-specified post-install script for this target.
-    if(const char* postinstall = l->second.GetProperty("POST_INSTALL_SCRIPT"))
+    if(const char* postinstall = (*l)->GetProperty("POST_INSTALL_SCRIPT"))
       {
       cmInstallScriptGenerator g(postinstall, false, 0);
       g.Generate(os, config, configurationTypes);
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 07f763b..dae8aaf 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1762,43 +1762,43 @@ void cmLocalUnixMakefileGenerator3
   ruleFileStream
     << "# Targets provided globally by CMake.\n"
     << "\n";
-  cmTargets* targets = &(this->Makefile->GetTargets());
-  cmTargets::iterator glIt;
-  for ( glIt = targets->begin(); glIt != targets->end(); ++ glIt )
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*>::iterator glIt;
+  for ( glIt = targets.begin(); glIt != targets.end(); ++ glIt )
     {
-    if ( glIt->second.GetType() == cmState::GLOBAL_TARGET )
+    if ( (*glIt)->GetType() == cmState::GLOBAL_TARGET )
       {
-      std::string targetString = "Special rule for the target " + glIt->first;
+      std::string targetString = "Special rule for the target " +
+          (*glIt)->GetName();
       std::vector<std::string> commands;
       std::vector<std::string> depends;
 
-      const char* text = glIt->second.GetProperty("EchoString");
+      const char* text = (*glIt)->GetProperty("EchoString");
       if ( !text )
         {
         text = "Running external command ...";
         }
-      depends.insert(depends.end(), glIt->second.GetUtilities().begin(),
-                     glIt->second.GetUtilities().end());
+      depends.insert(depends.end(), (*glIt)->Target->GetUtilities().begin(),
+                     (*glIt)->Target->GetUtilities().end());
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 
-      cmGeneratorTarget* gt = this->GlobalGenerator
-          ->GetGeneratorTarget(&glIt->second);
+      cmGeneratorTarget* gt = *glIt;
 
       // Global targets store their rules in pre- and post-build commands.
       this->AppendCustomDepends(depends,
-                                glIt->second.GetPreBuildCommands());
+                                gt->Target->GetPreBuildCommands());
       this->AppendCustomDepends(depends,
-                                glIt->second.GetPostBuildCommands());
+                                gt->Target->GetPostBuildCommands());
       this->AppendCustomCommands(commands,
-                                 glIt->second.GetPreBuildCommands(),
+                                 gt->Target->GetPreBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
       this->AppendCustomCommands(commands,
-                                 glIt->second.GetPostBuildCommands(),
+                                 gt->Target->GetPostBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
-      std::string targetName = glIt->second.GetName();
+      std::string targetName = gt->GetName();
       this->WriteMakeRule(ruleFileStream, targetString.c_str(),
                           targetName, depends, commands, true);
 
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 63fc283..c9d53fe 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -74,22 +74,23 @@ cmLocalVisualStudio10Generator::~cmLocalVisualStudio10Generator()
 void cmLocalVisualStudio10Generator::Generate()
 {
 
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(l->second))
+       ->TargetIsFortranOnly(*(*l)->Target))
       {
-      this->CreateSingleVCProj(l->first.c_str(),l->second);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     else
       {
       cmVisualStudio10TargetGenerator tg(
-        &l->second, static_cast<cmGlobalVisualStudio10Generator*>(
+        (*l)->Target, static_cast<cmGlobalVisualStudio10Generator*>(
           this->GetGlobalGenerator()));
       tg.Generate();
       }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index a51eb67..773e555 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -82,12 +82,12 @@ private:
 
 void cmLocalVisualStudio6Generator::AddCMakeListsRules()
 {
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin();
-      l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY
-        || l->second.GetType() == cmState::GLOBAL_TARGET)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY
+        || (*l)->GetType() == cmState::GLOBAL_TARGET)
       {
       continue;
       }
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
       this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
     if (!cmSystemTools::IsOn(suppRegenRule))
       {
-      this->AddDSPBuildRule(l->second);
+      this->AddDSPBuildRule(*(*l)->Target);
       }
     }
 }
@@ -124,54 +124,56 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 
   // Create the DSP or set of DSP's for libraries and executables
 
-  cmTargets &tgts = this->Makefile->GetTargets();
-
-  // build any targets
-  for(cmTargets::iterator l = tgts.begin();
-      l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    switch(l->second.GetType())
+    switch((*l)->GetType())
       {
       case cmState::STATIC_LIBRARY:
       case cmState::OBJECT_LIBRARY:
-        this->SetBuildType(STATIC_LIBRARY, l->first.c_str(), l->second);
+        this->SetBuildType(STATIC_LIBRARY,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::SHARED_LIBRARY:
       case cmState::MODULE_LIBRARY:
-        this->SetBuildType(DLL, l->first.c_str(), l->second);
+        this->SetBuildType(DLL,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::EXECUTABLE:
-        this->SetBuildType(EXECUTABLE,l->first.c_str(), l->second);
+        this->SetBuildType(EXECUTABLE,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::UTILITY:
       case cmState::GLOBAL_TARGET:
-        this->SetBuildType(UTILITY, l->first.c_str(), l->second);
+        this->SetBuildType(UTILITY,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::INTERFACE_LIBRARY:
         continue;
       default:
-        cmSystemTools::Error("Bad target type: ", l->first.c_str());
+        cmSystemTools::Error("Bad target type: ", (*l)->GetName().c_str());
         break;
       }
     // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
     // so don't build a projectfile for it
     const char* path =
-      l->second.GetProperty("EXTERNAL_MSPROJECT");
+      (*l)->GetProperty("EXTERNAL_MSPROJECT");
     if(!path)
       {
       // check to see if the dsp is going into a sub-directory
-      std::string::size_type pos = l->first.rfind('/');
+      std::string::size_type pos = (*l)->GetName().rfind('/');
       if(pos != std::string::npos)
         {
         std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
-        dir += l->first.substr(0, pos);
+        dir += (*l)->GetName().substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
           {
           cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
-      this->CreateSingleDSP(l->first.c_str(),l->second);
+      this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
       }
     }
 }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 819998c..0f39ddb 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -67,19 +67,19 @@ cmLocalVisualStudio7Generator::~cmLocalVisualStudio7Generator()
 void cmLocalVisualStudio7Generator::AddHelperCommands()
 {
   // Now create GUIDs for targets
-  cmTargets &tgts = this->Makefile->GetTargets();
-
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    const char* path = l->second.GetProperty("EXTERNAL_MSPROJECT");
+    const char* path = (*l)->GetProperty("EXTERNAL_MSPROJECT");
     if(path)
       {
       this->ReadAndStoreExternalGUID(
-        l->second.GetName().c_str(), path);
+        (*l)->GetName().c_str(), path);
       }
     }
 
@@ -95,7 +95,6 @@ void cmLocalVisualStudio7Generator::Generate()
 
 void cmLocalVisualStudio7Generator::AddCMakeListsRules()
 {
-  cmTargets &tgts = this->Makefile->GetTargets();
   // Create the regeneration custom rule.
   if(!this->Makefile->IsOn("CMAKE_SUPPRESS_REGENERATION"))
     {
@@ -104,17 +103,17 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules()
     if(cmSourceFile* sf = this->CreateVCProjBuildRule())
       {
       // Add the rule to targets that need it.
-      for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+      std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+          l != tgts.end(); ++l)
         {
-        if (l->second.GetType() == cmState::GLOBAL_TARGET)
+        if ((*l)->GetType() == cmState::GLOBAL_TARGET)
           {
           continue;
           }
-        if(l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+        if((*l)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&l->second);
-          gt->AddSource(sf->GetFullPath());
+          (*l)->AddSource(sf->GetFullPath());
           }
         }
       }
@@ -126,11 +125,11 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   // Visual Studio .NET 2003 Service Pack 1 will not run post-build
   // commands for targets in which no sources are built.  Add dummy
   // rules to force these targets to build.
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = l->second;
+    cmTarget& tgt = (*l)->Target;
     if(tgt.GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
@@ -150,9 +149,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
            force.c_str(), no_depends, no_main_dependency,
            force_commands, " ", 0, true))
         {
-        cmGeneratorTarget* gt =
-            this->GlobalGenerator->GetGeneratorTarget(&tgt);
-        gt->AddSource(file->GetFullPath());
+        (*l)->AddSource(file->GetFullPath());
         }
       }
     }
@@ -176,21 +173,21 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     }
 
   // Get the set of targets in this directory.
-  cmTargets &tgts = this->Makefile->GetTargets();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
 
   // Create the project file for each target.
-  for(cmTargets::iterator l = tgts.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
     // so don't build a projectfile for it
-    if(!l->second.GetProperty("EXTERNAL_MSPROJECT"))
+    if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj(l->first.c_str(),l->second);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     }
 }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 21 16:03:21 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 21 Oct 2015 16:03:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-849-gc3d33f3
Message-ID: <20151021200321.B60B3C083E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c3d33f3b0d9341d1a5927382ff58e6ba4baa330f (commit)
       via  ba75619be0d91624d2cc2451a225bb31d187be65 (commit)
       via  a991ddfd46c94f2743267ad572fab75936d34a10 (commit)
       via  92abc662014dc135ea5af612861373c67eb94734 (commit)
      from  464c0314e74dda86d3812e7022d88f516258dbf6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3d33f3b0d9341d1a5927382ff58e6ba4baa330f
commit c3d33f3b0d9341d1a5927382ff58e6ba4baa330f
Merge: 464c031 ba75619
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 16:03:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 16:03:20 2015 -0400

    Merge topic 'use-generator-target' into next
    
    ba75619b Graphviz: Port to cmGeneratorTarget.
    a991ddfd C::B: Port API to cmGeneratorTarget.
    92abc662 GHS: Port to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba75619be0d91624d2cc2451a225bb31d187be65
commit ba75619be0d91624d2cc2451a225bb31d187be65
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:49:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 22:01:30 2015 +0200

    Graphviz: Port to cmGeneratorTarget.

diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index cc36c62..a63b6e3 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -17,7 +17,7 @@
 
 
 
-static const char* getShapeForTarget(const cmTarget* target)
+static const char* getShapeForTarget(const cmGeneratorTarget* target)
 {
   if (!target)
     {
@@ -163,7 +163,7 @@ void cmGraphVizWriter::WriteTargetDependersFiles(const char* fileName)
 
   this->CollectTargetsAndLibs();
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -214,7 +214,7 @@ void cmGraphVizWriter::WritePerTargetFiles(const char* fileName)
 
   this->CollectTargetsAndLibs();
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -268,7 +268,7 @@ void cmGraphVizWriter::WriteGlobalFile(const char* fileName)
   std::set<std::string> insertedConnections;
   std::set<std::string> insertedNodes;
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -308,8 +308,8 @@ void cmGraphVizWriter::WriteConnections(const std::string& targetName,
                                     std::set<std::string>& insertedConnections,
                                     cmGeneratedFileStream& str) const
 {
-  std::map<std::string, const cmTarget* >::const_iterator targetPtrIt =
-                                             this->TargetPtrs.find(targetName);
+  std::map<std::string, const cmGeneratorTarget* >::const_iterator targetPtrIt
+      = this->TargetPtrs.find(targetName);
 
   if (targetPtrIt == this->TargetPtrs.end())  // not found at all
     {
@@ -327,7 +327,7 @@ void cmGraphVizWriter::WriteConnections(const std::string& targetName,
   std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
 
   const cmTarget::LinkLibraryVectorType* ll =
-                            &(targetPtrIt->second->GetOriginalLinkLibraries());
+      &(targetPtrIt->second->Target->GetOriginalLinkLibraries());
 
   for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
        llit != ll->end();
@@ -367,8 +367,8 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
                                     std::set<std::string>& insertedConnections,
                                     cmGeneratedFileStream& str) const
 {
-  std::map<std::string, const cmTarget* >::const_iterator targetPtrIt =
-                                             this->TargetPtrs.find(targetName);
+  std::map<std::string, const cmGeneratorTarget* >::const_iterator targetPtrIt
+      = this->TargetPtrs.find(targetName);
 
   if (targetPtrIt == this->TargetPtrs.end())  // not found at all
     {
@@ -386,8 +386,8 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
   std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
 
   // now search who links against me
-  for(std::map<std::string, const cmTarget*>::const_iterator dependerIt =
-                                                      this->TargetPtrs.begin();
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator
+      dependerIt = this->TargetPtrs.begin();
       dependerIt != this->TargetPtrs.end();
       ++dependerIt)
     {
@@ -404,7 +404,7 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
     // Now we have a target, check whether it links against targetName.
     // If so, draw a connection, and then continue with dependers on that one.
     const cmTarget::LinkLibraryVectorType* ll =
-                            &(dependerIt->second->GetOriginalLinkLibraries());
+        &(dependerIt->second->Target->GetOriginalLinkLibraries());
 
     for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
          llit != ll->end();
@@ -448,7 +448,7 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
 
 
 void cmGraphVizWriter::WriteNode(const std::string& targetName,
-                                 const cmTarget* target,
+                                 const cmGeneratorTarget* target,
                                  std::set<std::string>& insertedNodes,
                                  cmGeneratedFileStream& str) const
 {
@@ -488,12 +488,11 @@ int cmGraphVizWriter::CollectAllTargets()
        lit != this->LocalGenerators.end();
        ++ lit )
     {
-    const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
-    for ( cmTargets::const_iterator tit = targets->begin();
-          tit != targets->end();
-          ++ tit )
+    std::vector<cmGeneratorTarget*> targets = (*lit)->GetGeneratorTargets();
+    for ( std::vector<cmGeneratorTarget*>::const_iterator it =
+          targets.begin(); it != targets.end(); ++it )
       {
-      const char* realTargetName = tit->first.c_str();
+      const char* realTargetName = (*it)->GetName().c_str();
       if(this->IgnoreThisTarget(realTargetName))
         {
         // Skip ignored targets
@@ -503,7 +502,7 @@ int cmGraphVizWriter::CollectAllTargets()
       std::ostringstream ostr;
       ostr << this->GraphNodePrefix << cnt++;
       this->TargetNamesNodes[realTargetName] = ostr.str();
-      this->TargetPtrs[realTargetName] = &tit->second;
+      this->TargetPtrs[realTargetName] = *it;
       }
     }
 
@@ -519,19 +518,18 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
        lit != this->LocalGenerators.end();
        ++ lit )
     {
-    const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
-    for ( cmTargets::const_iterator tit = targets->begin();
-          tit != targets->end();
-          ++ tit )
+    std::vector<cmGeneratorTarget*> targets = (*lit)->GetGeneratorTargets();
+    for ( std::vector<cmGeneratorTarget*>::const_iterator it =
+          targets.begin(); it != targets.end(); ++it )
       {
-      const char* realTargetName = tit->first.c_str();
+      const char* realTargetName = (*it)->GetName().c_str();
       if (this->IgnoreThisTarget(realTargetName))
         {
         // Skip ignored targets
         continue;
         }
       const cmTarget::LinkLibraryVectorType* ll =
-                                     &(tit->second.GetOriginalLinkLibraries());
+          &((*it)->Target->GetOriginalLinkLibraries());
       for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
            llit != ll->end();
            ++ llit )
@@ -543,8 +541,8 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
           continue;
           }
 
-        std::map<std::string, const cmTarget*>::const_iterator tarIt =
-                                                this->TargetPtrs.find(libName);
+        std::map<std::string, const cmGeneratorTarget*>::const_iterator tarIt
+            = this->TargetPtrs.find(libName);
         if ( tarIt == this->TargetPtrs.end() )
           {
           std::ostringstream ostr;
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 0a20e6e..90d31d3 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -14,9 +14,9 @@
 #include "cmStandardIncludes.h"
 #include "cmLocalGenerator.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include <cmsys/RegularExpression.hxx>
 
+class cmGeneratorTarget;
 
 /** This class implements writing files for graphviz (dot) for graphs
  * representing the dependencies between the targets in the project. */
@@ -54,7 +54,8 @@ protected:
                                 std::set<std::string>& insertedConnections,
                                 cmGeneratedFileStream& str) const;
 
-  void WriteNode(const std::string& targetName, const cmTarget* target,
+  void WriteNode(const std::string& targetName,
+                 const cmGeneratorTarget* target,
                  std::set<std::string>& insertedNodes,
                  cmGeneratedFileStream& str) const;
 
@@ -73,7 +74,7 @@ protected:
 
   const std::vector<cmLocalGenerator*>& LocalGenerators;
 
-  std::map<std::string, const cmTarget*> TargetPtrs;
+  std::map<std::string, const cmGeneratorTarget*> TargetPtrs;
   // maps from the actual target names to node names in dot:
   std::map<std::string, std::string> TargetNamesNodes;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a991ddfd46c94f2743267ad572fab75936d34a10
commit a991ddfd46c94f2743267ad572fab75936d34a10
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:38:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 22:01:30 2015 +0200

    C::B: Port API to cmGeneratorTarget.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index a71b1cb..597c9d8 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -17,7 +17,6 @@
 #include "cmake.h"
 #include "cmSourceFile.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include "cmSystemTools.h"
 #include "cmXMLSafe.h"
 
@@ -441,7 +440,7 @@ void cmExtraCodeBlocksGenerator
               }
 
             CbpUnit &cbpUnit = allFiles[fullPath];
-            cbpUnit.Targets.push_back((*ti)->Target);
+            cbpUnit.Targets.push_back(*ti);
             }
           }
         default:  // intended fallthrough
@@ -501,8 +500,9 @@ void cmExtraCodeBlocksGenerator
 
     fout<<"      <Unit filename=\""<< cmXMLSafe(unitFilename) <<"\">\n";
 
-    for(std::vector<const cmTarget*>::const_iterator ti = unit.Targets.begin();
-      ti != unit.Targets.end(); ++ti)
+    for(std::vector<const cmGeneratorTarget*>::const_iterator ti =
+        unit.Targets.begin();
+        ti != unit.Targets.end(); ++ti)
       {
       std::string const& targetName = (*ti)->GetName();
       fout<<"         <Option target=\""<< cmXMLSafe(targetName) <<"\"/>\n";
@@ -560,7 +560,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
-    int cbTargetType = this->GetCBTargetType(target->Target);
+    int cbTargetType = this->GetCBTargetType(target);
     std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmState::EXECUTABLE)
       {
@@ -718,7 +718,7 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
 
 
 // Translate the cmake target type into the CodeBlocks target type id
-int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
+int cmExtraCodeBlocksGenerator::GetCBTargetType(cmGeneratorTarget* target)
 {
   if ( target->GetType()==cmState::EXECUTABLE)
     {
diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h
index f28809a..0c3846d 100644
--- a/Source/cmExtraCodeBlocksGenerator.h
+++ b/Source/cmExtraCodeBlocksGenerator.h
@@ -18,7 +18,6 @@
 class cmLocalGenerator;
 class cmMakefile;
 class cmGeneratorTarget;
-class cmTarget;
 class cmGeneratedFileStream;
 
 /** \class cmExtraCodeBlocksGenerator
@@ -42,7 +41,7 @@ public:
 private:
   struct CbpUnit
   {
-    std::vector<const cmTarget*> Targets;
+    std::vector<const cmGeneratorTarget*> Targets;
   };
 
   void CreateProjectFile(const std::vector<cmLocalGenerator*>& lgs);
@@ -53,7 +52,7 @@ private:
                                     cmGeneratorTarget* target) const;
 
   std::string GetCBCompilerId(const cmMakefile* mf);
-  int GetCBTargetType(cmTarget* target);
+  int GetCBTargetType(cmGeneratorTarget* target);
   std::string BuildMakeCommand(const std::string& make, const char* makefile,
                                const std::string& target);
   void AppendTarget(cmGeneratedFileStream& fout,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92abc662014dc135ea5af612861373c67eb94734
commit 92abc662014dc135ea5af612861373c67eb94734
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:31:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 22:01:30 2015 +0200

    GHS: Port to cmGeneratorTarget.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 01e6f8c..12115be 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -22,23 +22,22 @@
 std::string const cmGhsMultiTargetGenerator::DDOption("-dynamic");
 
 cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target)
-  : Target(target->Target)
-  , GeneratorTarget(target)
+  : GeneratorTarget(target)
   , LocalGenerator(static_cast<cmLocalGhsMultiGenerator *>(
                      target->GetLocalGenerator()))
   , Makefile(target->Target->GetMakefile())
   , TargetGroup(DetermineIfTargetGroup(target))
   , DynamicDownload(false)
 {
-  this->RelBuildFilePath = this->GetRelBuildFilePath(target->Target);
+  this->RelBuildFilePath = this->GetRelBuildFilePath(target);
 
   this->RelOutputFileName =
-    this->RelBuildFilePath + this->Target->GetName() + ".a";
+    this->RelBuildFilePath + target->GetName() + ".a";
 
   this->RelBuildFileName = this->RelBuildFilePath;
-  this->RelBuildFileName += this->GetBuildFileName(target->Target);
+  this->RelBuildFileName += this->GetBuildFileName(target);
 
-  std::string absPathToRoot = this->GetAbsPathToRoot(target->Target);
+  std::string absPathToRoot = this->GetAbsPathToRoot(target);
   absPathToRoot = this->AddSlashIfNeededToPath(absPathToRoot);
   this->AbsBuildFilePath = absPathToRoot + this->RelBuildFilePath;
   this->AbsBuildFileName = absPathToRoot + this->RelBuildFileName;
@@ -51,7 +50,8 @@ cmGhsMultiTargetGenerator::~cmGhsMultiTargetGenerator()
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetRelBuildFilePath(
+        const cmGeneratorTarget *target)
 {
   std::string output;
   char const *folderProp = target->GetProperty("FOLDER");
@@ -66,15 +66,13 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmGeneratorTarget *target)
 {
-  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
-      ->GetGeneratorTarget(target);
-  return gt->GetLocalGenerator()->GetBinaryDirectory();
+  return target->GetLocalGenerator()->GetBinaryDirectory();
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmGeneratorTarget *target)
 {
   std::string output;
   output = cmGhsMultiTargetGenerator::GetAbsPathToRoot(target);
@@ -84,7 +82,7 @@ cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmTarget *target)
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmGeneratorTarget *target)
 {
   std::string output;
   output = cmGhsMultiTargetGenerator::GetRelBuildFilePath(target);
@@ -93,7 +91,8 @@ cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmTarget *target)
   return  output;
 }
 
-std::string cmGhsMultiTargetGenerator::GetBuildFileName(const cmTarget *target)
+std::string
+cmGhsMultiTargetGenerator::GetBuildFileName(const cmGeneratorTarget *target)
 {
   std::string output;
   output = target->GetName();
@@ -161,7 +160,8 @@ void cmGhsMultiTargetGenerator::Generate()
 bool cmGhsMultiTargetGenerator::IncludeThisTarget()
 {
   bool output = true;
-  char const *excludeFromAll = this->Target->GetProperty("EXCLUDE_FROM_ALL");
+  char const *excludeFromAll =
+      this->GeneratorTarget->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
       '\0' == excludeFromAll[1])
     {
@@ -367,13 +367,13 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
   for (cmTargetDependSet::iterator tdsI = tds.begin(); tdsI != tds.end();
        ++tdsI)
     {
-    const cmTarget *tg = (*tdsI)->Target;
+    const cmGeneratorTarget *tg = *tdsI;
     *this->GetFolderBuildStreams() << "    -L\"" << GetAbsBuildFilePath(tg)
                                    << "\"" << std::endl;
     }
   // library targets
   cmTarget::LinkLibraryVectorType llv =
-    this->Target->GetOriginalLinkLibraries();
+    this->GeneratorTarget->Target->GetOriginalLinkLibraries();
   for (cmTarget::LinkLibraryVectorType::const_iterator llvI = llv.begin();
        llvI != llv.end(); ++llvI)
     {
@@ -391,10 +391,12 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
 
 void cmGhsMultiTargetGenerator::WriteCustomCommands()
 {
-  WriteCustomCommandsHelper(this->Target->GetPreBuildCommands(),
-                            cmTarget::PRE_BUILD);
-  WriteCustomCommandsHelper(this->Target->GetPostBuildCommands(),
-                            cmTarget::POST_BUILD);
+  WriteCustomCommandsHelper(
+        this->GeneratorTarget->Target->GetPreBuildCommands(),
+        cmTarget::PRE_BUILD);
+  WriteCustomCommandsHelper(
+        this->GeneratorTarget->Target->GetPostBuildCommands(),
+        cmTarget::POST_BUILD);
 }
 
 void cmGhsMultiTargetGenerator::WriteCustomCommandsHelper(
@@ -518,7 +520,7 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
   std::string outputDir(AbsBuildFilePath);
 
   const char *runtimeOutputProp =
-    this->Target->GetProperty("RUNTIME_OUTPUT_DIRECTORY");
+    this->GeneratorTarget->GetProperty("RUNTIME_OUTPUT_DIRECTORY");
   if (NULL != runtimeOutputProp)
     {
     outputDir = runtimeOutputProp;
@@ -526,7 +528,8 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
 
   std::string configCapped(cmSystemTools::UpperCase(config));
   const char *runtimeOutputSProp =
-    this->Target->GetProperty("RUNTIME_OUTPUT_DIRECTORY_" + configCapped);
+    this->GeneratorTarget
+      ->GetProperty("RUNTIME_OUTPUT_DIRECTORY_" + configCapped);
   if (NULL != runtimeOutputSProp)
     {
     outputDir = runtimeOutputSProp;
@@ -544,9 +547,10 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
 std::string
 cmGhsMultiTargetGenerator::GetOutputFilename(const std::string &config) const
 {
-  std::string outputFilename(this->Target->GetName());
+  std::string outputFilename(this->GeneratorTarget->GetName());
 
-  const char *outputNameProp = this->Target->GetProperty("OUTPUT_NAME");
+  const char *outputNameProp =
+      this->GeneratorTarget->GetProperty("OUTPUT_NAME");
   if (NULL != outputNameProp)
     {
     outputFilename = outputNameProp;
@@ -554,7 +558,7 @@ cmGhsMultiTargetGenerator::GetOutputFilename(const std::string &config) const
 
   std::string configCapped(cmSystemTools::UpperCase(config));
   const char *outputNameSProp =
-    this->Target->GetProperty(configCapped + "_OUTPUT_NAME");
+    this->GeneratorTarget->GetProperty(configCapped + "_OUTPUT_NAME");
   if (NULL != outputNameSProp)
     {
     outputFilename = outputNameSProp;
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index d1c17f4..327fdef 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -54,11 +54,11 @@ public:
     return this->AbsOutputFileName.c_str();
   }
 
-  static std::string GetRelBuildFilePath(const cmTarget *target);
-  static std::string GetAbsPathToRoot(const cmTarget *target);
-  static std::string GetAbsBuildFilePath(const cmTarget *target);
-  static std::string GetRelBuildFileName(const cmTarget *target);
-  static std::string GetBuildFileName(const cmTarget *target);
+  static std::string GetRelBuildFilePath(const cmGeneratorTarget *target);
+  static std::string GetAbsPathToRoot(const cmGeneratorTarget *target);
+  static std::string GetAbsBuildFilePath(const cmGeneratorTarget *target);
+  static std::string GetRelBuildFileName(const cmGeneratorTarget *target);
+  static std::string GetBuildFileName(const cmGeneratorTarget *target);
   static std::string AddSlashIfNeededToPath(std::string const &input);
 
 private:
@@ -99,7 +99,6 @@ private:
   bool DetermineIfDynamicDownload(std::string const &config,
                                   const std::string &language);
 
-  cmTarget *Target;
   cmGeneratorTarget* GeneratorTarget;
   cmLocalGhsMultiGenerator *LocalGenerator;
   cmMakefile *Makefile;
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 7c33904..e260049 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -516,13 +516,12 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
     }
 }
 
-bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt)
+bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmGeneratorTarget *tgt)
 {
   const std::string config =
-    tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
+    tgt->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   std::vector<cmSourceFile *> tgtSources;
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
-  gt->GetSourceFiles(tgtSources, config);
+  tgt->GetSourceFiles(tgtSources, config);
   bool tgtInBuild = true;
   char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index 04a9a5b..480cd6a 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -111,7 +111,7 @@ private:
       GhsMultiGpj::Types projType);
   static std::string GetFileNameFromPath(std::string const &path);
   void UpdateBuildFiles(std::vector<cmGeneratorTarget*> tgts);
-  bool IsTgtForBuild(const cmTarget *tgt);
+  bool IsTgtForBuild(const cmGeneratorTarget *tgt);
 
   std::vector<cmGeneratedFileStream *> TargetSubProjects;
   std::map<std::string, cmGeneratedFileStream *> TargetFolderBuildStreams;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx |   12 +++----
 Source/cmExtraCodeBlocksGenerator.h   |    5 ++-
 Source/cmGhsMultiTargetGenerator.cxx  |   56 ++++++++++++++++++---------------
 Source/cmGhsMultiTargetGenerator.h    |   11 +++----
 Source/cmGlobalGhsMultiGenerator.cxx  |    7 ++---
 Source/cmGlobalGhsMultiGenerator.h    |    2 +-
 Source/cmGraphVizWriter.cxx           |   52 +++++++++++++++---------------
 Source/cmGraphVizWriter.h             |    7 +++--
 8 files changed, 76 insertions(+), 76 deletions(-)


hooks/post-receive
-- 
CMake

From robert.maynard at kitware.com  Wed Oct 21 16:38:34 2015
From: robert.maynard at kitware.com (Robert Maynard)
Date: Wed, 21 Oct 2015 16:38:34 -0400 (EDT)
Subject: [Cmake-commits] CMake annotated tag, v3.4.0-rc2, created. v3.4.0-rc2
Message-ID: <20151021203834.8BE70C085A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The annotated tag, v3.4.0-rc2 has been created
        at  2b848180d46b682ad1074f740a2b01c80d4fca4a (tag)
   tagging  498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit)
  replaces  v3.4.0-rc1
 tagged by  Brad King
        on  Wed Oct 21 13:03:40 2015 -0400

- Log -----------------------------------------------------------------
CMake 3.4.0-rc2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJWJ8VsAAoJEC0s7xA0khaE040QAIJ49s2+UQqmbucIfhcRr8yS
pWR0OYULTOKjTGnpiSPkJEpiDYNkV86o3dl8ILAyLl10O5ic3i8Z+5pkDiyt2eN4
RkIQC05dEVCflpjx7F+xbpalAgMti01PQy4nBoSzR4NM/K00r0LWz6lo91SKDBUl
KdEz7mrV9NNtG+V1Wh+JorW/SYTlAB9CHx5A7Oeof2ANLEiFxpJgNtg9HJwmwWSO
rNek52t0C2vjU+Vd390XOSrvIM2ofRWfBirncXnndRv29oRSo/uCmQyjTISD08uF
sncifJw6ojBvdGEaC6s9/CdaetBksVlRNoeL5sNZr72qmH1qicEHq+yRDvYzuBkK
N2sgJPEjLm19gol2c5hfiTGmsn5j8y8rMqX7esixPHFq+/jz8ifoOzvUhrL33Cjh
wzvf9+5ze5zXZ/RyQ9C/s3QY/rGp84GyGshGQdn0ydlVMi9kj3cfkVY7ZtJNBWj2
OaNmdxonZNG1gql+X+36aJ77NdzBro3/8cj/eyF/22FscDZiywoE2DkrfGU86ChJ
Oy4n8EGVJnNyUauvx+/TB2QmJ3DuKudZ6JpeSugPMtxSllkDUj72LPMyDc73pccC
5i09nV/sVDzV7isSu839iceA+MCsW1TmmPzsD3KHsKUmeAjmfQ7f89hmJ90zTQjS
KPIulVu6y0lad7zbP7mt
=dEA6
-----END PGP SIGNATURE-----

Brad King (18):
      Revert topic 'compiler-features-solaris'
      Merge branch 'ctest-submit-content-type' into release
      Merge branch 'revert-compiler-features-solaris' into release
      Merge branch 'doc-clarify-shared-lib' into release
      Merge branch 'emacs-mode-fix-accidental-indentation' into release
      Merge branch 'cpack-wix-typos' into release
      Merge branch 'FindPostgreSQL-v9.5' into release
      Merge branch 'xcode-adjust-deployment-to-host-version' into release
      Help: Add release note about compile rule placeholder changes (#15787)
      Merge branch 'doc-INCLUDES-relnote' into release
      ExternalProject: Fix Git version report in error message (#15791)
      ExternalProject: Always use CMake builtin FindGit (#15791)
      Merge branch 'ExternalProject-fix-git-version' into release
      Help: Document add_test expectations of test command (#15798)
      Merge branch 'doc-add_test-requirements' into release
      Merge branch 'doc-file-GLOB-no-order' into release
      Merge branch 'fix-CMP0054-elseif-warning' into release
      CMake 3.4.0-rc2

Derek Bruening (1):
      CTest: Set Content-Type header for http file upload (#15774)

Gregor Jasny (1):
      Xcode: Adjust deployment target SDK version to host version

James Johnston (1):
      Help: Document that SHARED libraries must export a symbol (#15775)

Kevin Burge (1):
      cmake-mode.el: treat keywords as symbols

Kevin Wojniak (1):
      CPackWIX: fix typos in documentation

Ruslan Baratov (1):
      Help: Document that file(GLOB*) order is undefined

Stephen Kelly (1):
      cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)

Tamar Kranenburg (1):
      FindPostgreSQL: Search for version 9.5

-----------------------------------------------------------------------


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 21 17:17:46 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 21 Oct 2015 17:17:46 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-826-g7b38cda
Message-ID: <20151021211746.21B77C00E1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7b38cda3bc92ab002b19020a1c201552d039a6fc (commit)
       via  acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7 (commit)
       via  9c9072439af6d8f16ec407789e8a1223dd7c7564 (commit)
      from  c3d33f3b0d9341d1a5927382ff58e6ba4baa330f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b38cda3bc92ab002b19020a1c201552d039a6fc
commit 7b38cda3bc92ab002b19020a1c201552d039a6fc
Merge: c3d33f3 acf26f0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 17:17:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 17:17:45 2015 -0400

    Merge topic 'use-generator-target' into next
    
    acf26f03 fixup! Port to GetGeneratorTargets.
    9c907243 fixup! cmLocalGenerator: Store a vector of generator targets.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7
commit acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 23:17:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:17:22 2015 +0200

    fixup! Port to GetGeneratorTargets.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 0f39ddb..4895698 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -129,7 +129,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = (*l)->Target;
+    cmTarget& tgt = *(*l)->Target;
     if(tgt.GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c9072439af6d8f16ec407789e8a1223dd7c7564
commit 9c9072439af6d8f16ec407789e8a1223dd7c7564
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 23:16:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:16:06 2015 +0200

    fixup! cmLocalGenerator: Store a vector of generator targets.

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 8ab2262..4d431f6 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -87,7 +87,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           "Build all projects");
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
-      gen[0]->AddGeneratorTarget(allBuild, gt);
+      gen[0]->AddGeneratorTarget(gt);
       this->AddGeneratorTarget(allBuild, gt);
 
 #if 0

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 21 17:20:46 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 21 Oct 2015 17:20:46 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-828-g9d230d9
Message-ID: <20151021212046.2F51DC01A7@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9d230d94b91625ed2edaae73649b0371013cf54a (commit)
       via  3dce55492f97de80f455a53d5bce4178f2ae11a7 (commit)
      from  7b38cda3bc92ab002b19020a1c201552d039a6fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d230d94b91625ed2edaae73649b0371013cf54a
commit 9d230d94b91625ed2edaae73649b0371013cf54a
Merge: 7b38cda 3dce554
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 17:20:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 17:20:44 2015 -0400

    Merge topic 'use-generator-target' into next
    
    3dce5549 fixup! GHS: Port to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dce55492f97de80f455a53d5bce4178f2ae11a7
commit 3dce55492f97de80f455a53d5bce4178f2ae11a7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 23:19:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:20:02 2015 +0200

    fixup! GHS: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index e260049..1bcbd26 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -487,7 +487,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
        tgtsI != tgts.end(); ++tgtsI)
     {
     const cmGeneratorTarget *tgt = *tgtsI;
-    if (IsTgtForBuild(tgt->Target))
+    if (IsTgtForBuild(tgt))
       {
       char const *rawFolderName = tgt->GetProperty("FOLDER");
       if (NULL == rawFolderName)
@@ -504,7 +504,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
           GhsMultiGpj::PROJECT);
         }
       std::vector<cmsys::String> splitPath = cmSystemTools::SplitString(
-            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target));
+            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt));
       std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" +
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGhsMultiGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Wed Oct 21 17:34:14 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Wed, 21 Oct 2015 17:34:14 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-847-g358bcae
Message-ID: <20151021213414.6CE99C05D5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  358bcae013fc6a3f0b670ad08942eac5abdbefd2 (commit)
       via  f02136bef4677fe2645e35226557943b835ed0a3 (commit)
       via  0862e00c816d5f1b4676b4bcde7c32a7e265faa6 (commit)
       via  db6015d2487b427bca8180209ca6656da0386d93 (commit)
       via  3248a77ae9b6459e0a0fcd63092cfe1236f51a58 (commit)
       via  77e56c9c1bef782500416e3c8242f77e2719ee8a (commit)
       via  7fcfedf5edcb5658224542f6aca6514177fec43d (commit)
       via  e2baf86f385525ddd17f60109578eaeb15dd3526 (commit)
       via  47ea61600ffab189b8bc276194c2b7dd039e286f (commit)
       via  3ea7bff85fc1d5a6c27fd63f54a984da24520375 (commit)
       via  a2c2997e2151a12cc7e267bdb5a6eab42594e85d (commit)
       via  0b1f41dfc4794a636dbc52975c950c6b4dd9ebba (commit)
       via  a456855ece62f7337b62bbe578ae1eaebe73c8c3 (commit)
       via  b3f1aef5ee65d66a9f075f02812c90383eeec6e3 (commit)
       via  6d858ce5d3cde10c457da8cf9372339db018e843 (commit)
       via  37c976a599fbc7ddcffb640211bfaa19dfb86cad (commit)
       via  96f4b0c939e18799234dee180d4d6ae54ed61cc5 (commit)
       via  e20951c90df511cf0374a9fa6d27ad8a131b4903 (commit)
       via  a8c0fbcc194bca6986492278e705ff301f283378 (commit)
      from  9d230d94b91625ed2edaae73649b0371013cf54a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=358bcae013fc6a3f0b670ad08942eac5abdbefd2
commit 358bcae013fc6a3f0b670ad08942eac5abdbefd2
Merge: 9d230d9 f02136b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 17:34:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 17:34:11 2015 -0400

    Merge topic 'use-generator-target' into next
    
    f02136be Graphviz: Port to cmGeneratorTarget.
    0862e00c C::B: Port API to cmGeneratorTarget.
    db6015d2 GHS: Port to cmGeneratorTarget.
    3248a77a Sublime: Port API to cmGeneratorTarget.
    77e56c9c Xcode: Port API to cmGeneratorTarget.
    7fcfedf5 Xcode: Prefer to get target state from cmGeneratorTarget.
    e2baf86f Xcode: Re-order conditions.
    47ea6160 Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.
    3ea7bff8 Xcode: Port loops to cmGeneratorTarget.
    a2c2997e Makefiles: Port to cmGeneratorTarget.
    0b1f41df Ninja: Port to cmGeneratorTarget.
    a456855e Use cmLocalGenerator at generate-time.
    b3f1aef5 Port to GetGeneratorTargets.
    6d858ce5 Makefiles: Port progress marks to cmGeneratorTarget.
    37c976a5 cmInstallTargetGenerator: Get a cmGeneratorTarget directly.
    96f4b0c9 cmGlobalGenerator: Move GeneratorTargetsType to usage site.
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f02136bef4677fe2645e35226557943b835ed0a3
commit f02136bef4677fe2645e35226557943b835ed0a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:49:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:05 2015 +0200

    Graphviz: Port to cmGeneratorTarget.

diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index cc36c62..a63b6e3 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -17,7 +17,7 @@
 
 
 
-static const char* getShapeForTarget(const cmTarget* target)
+static const char* getShapeForTarget(const cmGeneratorTarget* target)
 {
   if (!target)
     {
@@ -163,7 +163,7 @@ void cmGraphVizWriter::WriteTargetDependersFiles(const char* fileName)
 
   this->CollectTargetsAndLibs();
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -214,7 +214,7 @@ void cmGraphVizWriter::WritePerTargetFiles(const char* fileName)
 
   this->CollectTargetsAndLibs();
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -268,7 +268,7 @@ void cmGraphVizWriter::WriteGlobalFile(const char* fileName)
   std::set<std::string> insertedConnections;
   std::set<std::string> insertedNodes;
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -308,8 +308,8 @@ void cmGraphVizWriter::WriteConnections(const std::string& targetName,
                                     std::set<std::string>& insertedConnections,
                                     cmGeneratedFileStream& str) const
 {
-  std::map<std::string, const cmTarget* >::const_iterator targetPtrIt =
-                                             this->TargetPtrs.find(targetName);
+  std::map<std::string, const cmGeneratorTarget* >::const_iterator targetPtrIt
+      = this->TargetPtrs.find(targetName);
 
   if (targetPtrIt == this->TargetPtrs.end())  // not found at all
     {
@@ -327,7 +327,7 @@ void cmGraphVizWriter::WriteConnections(const std::string& targetName,
   std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
 
   const cmTarget::LinkLibraryVectorType* ll =
-                            &(targetPtrIt->second->GetOriginalLinkLibraries());
+      &(targetPtrIt->second->Target->GetOriginalLinkLibraries());
 
   for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
        llit != ll->end();
@@ -367,8 +367,8 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
                                     std::set<std::string>& insertedConnections,
                                     cmGeneratedFileStream& str) const
 {
-  std::map<std::string, const cmTarget* >::const_iterator targetPtrIt =
-                                             this->TargetPtrs.find(targetName);
+  std::map<std::string, const cmGeneratorTarget* >::const_iterator targetPtrIt
+      = this->TargetPtrs.find(targetName);
 
   if (targetPtrIt == this->TargetPtrs.end())  // not found at all
     {
@@ -386,8 +386,8 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
   std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
 
   // now search who links against me
-  for(std::map<std::string, const cmTarget*>::const_iterator dependerIt =
-                                                      this->TargetPtrs.begin();
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator
+      dependerIt = this->TargetPtrs.begin();
       dependerIt != this->TargetPtrs.end();
       ++dependerIt)
     {
@@ -404,7 +404,7 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
     // Now we have a target, check whether it links against targetName.
     // If so, draw a connection, and then continue with dependers on that one.
     const cmTarget::LinkLibraryVectorType* ll =
-                            &(dependerIt->second->GetOriginalLinkLibraries());
+        &(dependerIt->second->Target->GetOriginalLinkLibraries());
 
     for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
          llit != ll->end();
@@ -448,7 +448,7 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
 
 
 void cmGraphVizWriter::WriteNode(const std::string& targetName,
-                                 const cmTarget* target,
+                                 const cmGeneratorTarget* target,
                                  std::set<std::string>& insertedNodes,
                                  cmGeneratedFileStream& str) const
 {
@@ -488,12 +488,11 @@ int cmGraphVizWriter::CollectAllTargets()
        lit != this->LocalGenerators.end();
        ++ lit )
     {
-    const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
-    for ( cmTargets::const_iterator tit = targets->begin();
-          tit != targets->end();
-          ++ tit )
+    std::vector<cmGeneratorTarget*> targets = (*lit)->GetGeneratorTargets();
+    for ( std::vector<cmGeneratorTarget*>::const_iterator it =
+          targets.begin(); it != targets.end(); ++it )
       {
-      const char* realTargetName = tit->first.c_str();
+      const char* realTargetName = (*it)->GetName().c_str();
       if(this->IgnoreThisTarget(realTargetName))
         {
         // Skip ignored targets
@@ -503,7 +502,7 @@ int cmGraphVizWriter::CollectAllTargets()
       std::ostringstream ostr;
       ostr << this->GraphNodePrefix << cnt++;
       this->TargetNamesNodes[realTargetName] = ostr.str();
-      this->TargetPtrs[realTargetName] = &tit->second;
+      this->TargetPtrs[realTargetName] = *it;
       }
     }
 
@@ -519,19 +518,18 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
        lit != this->LocalGenerators.end();
        ++ lit )
     {
-    const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
-    for ( cmTargets::const_iterator tit = targets->begin();
-          tit != targets->end();
-          ++ tit )
+    std::vector<cmGeneratorTarget*> targets = (*lit)->GetGeneratorTargets();
+    for ( std::vector<cmGeneratorTarget*>::const_iterator it =
+          targets.begin(); it != targets.end(); ++it )
       {
-      const char* realTargetName = tit->first.c_str();
+      const char* realTargetName = (*it)->GetName().c_str();
       if (this->IgnoreThisTarget(realTargetName))
         {
         // Skip ignored targets
         continue;
         }
       const cmTarget::LinkLibraryVectorType* ll =
-                                     &(tit->second.GetOriginalLinkLibraries());
+          &((*it)->Target->GetOriginalLinkLibraries());
       for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
            llit != ll->end();
            ++ llit )
@@ -543,8 +541,8 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
           continue;
           }
 
-        std::map<std::string, const cmTarget*>::const_iterator tarIt =
-                                                this->TargetPtrs.find(libName);
+        std::map<std::string, const cmGeneratorTarget*>::const_iterator tarIt
+            = this->TargetPtrs.find(libName);
         if ( tarIt == this->TargetPtrs.end() )
           {
           std::ostringstream ostr;
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 0a20e6e..90d31d3 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -14,9 +14,9 @@
 #include "cmStandardIncludes.h"
 #include "cmLocalGenerator.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include <cmsys/RegularExpression.hxx>
 
+class cmGeneratorTarget;
 
 /** This class implements writing files for graphviz (dot) for graphs
  * representing the dependencies between the targets in the project. */
@@ -54,7 +54,8 @@ protected:
                                 std::set<std::string>& insertedConnections,
                                 cmGeneratedFileStream& str) const;
 
-  void WriteNode(const std::string& targetName, const cmTarget* target,
+  void WriteNode(const std::string& targetName,
+                 const cmGeneratorTarget* target,
                  std::set<std::string>& insertedNodes,
                  cmGeneratedFileStream& str) const;
 
@@ -73,7 +74,7 @@ protected:
 
   const std::vector<cmLocalGenerator*>& LocalGenerators;
 
-  std::map<std::string, const cmTarget*> TargetPtrs;
+  std::map<std::string, const cmGeneratorTarget*> TargetPtrs;
   // maps from the actual target names to node names in dot:
   std::map<std::string, std::string> TargetNamesNodes;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0862e00c816d5f1b4676b4bcde7c32a7e265faa6
commit 0862e00c816d5f1b4676b4bcde7c32a7e265faa6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:38:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:05 2015 +0200

    C::B: Port API to cmGeneratorTarget.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index a71b1cb..597c9d8 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -17,7 +17,6 @@
 #include "cmake.h"
 #include "cmSourceFile.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include "cmSystemTools.h"
 #include "cmXMLSafe.h"
 
@@ -441,7 +440,7 @@ void cmExtraCodeBlocksGenerator
               }
 
             CbpUnit &cbpUnit = allFiles[fullPath];
-            cbpUnit.Targets.push_back((*ti)->Target);
+            cbpUnit.Targets.push_back(*ti);
             }
           }
         default:  // intended fallthrough
@@ -501,8 +500,9 @@ void cmExtraCodeBlocksGenerator
 
     fout<<"      <Unit filename=\""<< cmXMLSafe(unitFilename) <<"\">\n";
 
-    for(std::vector<const cmTarget*>::const_iterator ti = unit.Targets.begin();
-      ti != unit.Targets.end(); ++ti)
+    for(std::vector<const cmGeneratorTarget*>::const_iterator ti =
+        unit.Targets.begin();
+        ti != unit.Targets.end(); ++ti)
       {
       std::string const& targetName = (*ti)->GetName();
       fout<<"         <Option target=\""<< cmXMLSafe(targetName) <<"\"/>\n";
@@ -560,7 +560,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
-    int cbTargetType = this->GetCBTargetType(target->Target);
+    int cbTargetType = this->GetCBTargetType(target);
     std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmState::EXECUTABLE)
       {
@@ -718,7 +718,7 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
 
 
 // Translate the cmake target type into the CodeBlocks target type id
-int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
+int cmExtraCodeBlocksGenerator::GetCBTargetType(cmGeneratorTarget* target)
 {
   if ( target->GetType()==cmState::EXECUTABLE)
     {
diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h
index f28809a..0c3846d 100644
--- a/Source/cmExtraCodeBlocksGenerator.h
+++ b/Source/cmExtraCodeBlocksGenerator.h
@@ -18,7 +18,6 @@
 class cmLocalGenerator;
 class cmMakefile;
 class cmGeneratorTarget;
-class cmTarget;
 class cmGeneratedFileStream;
 
 /** \class cmExtraCodeBlocksGenerator
@@ -42,7 +41,7 @@ public:
 private:
   struct CbpUnit
   {
-    std::vector<const cmTarget*> Targets;
+    std::vector<const cmGeneratorTarget*> Targets;
   };
 
   void CreateProjectFile(const std::vector<cmLocalGenerator*>& lgs);
@@ -53,7 +52,7 @@ private:
                                     cmGeneratorTarget* target) const;
 
   std::string GetCBCompilerId(const cmMakefile* mf);
-  int GetCBTargetType(cmTarget* target);
+  int GetCBTargetType(cmGeneratorTarget* target);
   std::string BuildMakeCommand(const std::string& make, const char* makefile,
                                const std::string& target);
   void AppendTarget(cmGeneratedFileStream& fout,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db6015d2487b427bca8180209ca6656da0386d93
commit db6015d2487b427bca8180209ca6656da0386d93
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:31:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:05 2015 +0200

    GHS: Port to cmGeneratorTarget.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 01e6f8c..12115be 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -22,23 +22,22 @@
 std::string const cmGhsMultiTargetGenerator::DDOption("-dynamic");
 
 cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target)
-  : Target(target->Target)
-  , GeneratorTarget(target)
+  : GeneratorTarget(target)
   , LocalGenerator(static_cast<cmLocalGhsMultiGenerator *>(
                      target->GetLocalGenerator()))
   , Makefile(target->Target->GetMakefile())
   , TargetGroup(DetermineIfTargetGroup(target))
   , DynamicDownload(false)
 {
-  this->RelBuildFilePath = this->GetRelBuildFilePath(target->Target);
+  this->RelBuildFilePath = this->GetRelBuildFilePath(target);
 
   this->RelOutputFileName =
-    this->RelBuildFilePath + this->Target->GetName() + ".a";
+    this->RelBuildFilePath + target->GetName() + ".a";
 
   this->RelBuildFileName = this->RelBuildFilePath;
-  this->RelBuildFileName += this->GetBuildFileName(target->Target);
+  this->RelBuildFileName += this->GetBuildFileName(target);
 
-  std::string absPathToRoot = this->GetAbsPathToRoot(target->Target);
+  std::string absPathToRoot = this->GetAbsPathToRoot(target);
   absPathToRoot = this->AddSlashIfNeededToPath(absPathToRoot);
   this->AbsBuildFilePath = absPathToRoot + this->RelBuildFilePath;
   this->AbsBuildFileName = absPathToRoot + this->RelBuildFileName;
@@ -51,7 +50,8 @@ cmGhsMultiTargetGenerator::~cmGhsMultiTargetGenerator()
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetRelBuildFilePath(
+        const cmGeneratorTarget *target)
 {
   std::string output;
   char const *folderProp = target->GetProperty("FOLDER");
@@ -66,15 +66,13 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmGeneratorTarget *target)
 {
-  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
-      ->GetGeneratorTarget(target);
-  return gt->GetLocalGenerator()->GetBinaryDirectory();
+  return target->GetLocalGenerator()->GetBinaryDirectory();
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmGeneratorTarget *target)
 {
   std::string output;
   output = cmGhsMultiTargetGenerator::GetAbsPathToRoot(target);
@@ -84,7 +82,7 @@ cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmTarget *target)
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmGeneratorTarget *target)
 {
   std::string output;
   output = cmGhsMultiTargetGenerator::GetRelBuildFilePath(target);
@@ -93,7 +91,8 @@ cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmTarget *target)
   return  output;
 }
 
-std::string cmGhsMultiTargetGenerator::GetBuildFileName(const cmTarget *target)
+std::string
+cmGhsMultiTargetGenerator::GetBuildFileName(const cmGeneratorTarget *target)
 {
   std::string output;
   output = target->GetName();
@@ -161,7 +160,8 @@ void cmGhsMultiTargetGenerator::Generate()
 bool cmGhsMultiTargetGenerator::IncludeThisTarget()
 {
   bool output = true;
-  char const *excludeFromAll = this->Target->GetProperty("EXCLUDE_FROM_ALL");
+  char const *excludeFromAll =
+      this->GeneratorTarget->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
       '\0' == excludeFromAll[1])
     {
@@ -367,13 +367,13 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
   for (cmTargetDependSet::iterator tdsI = tds.begin(); tdsI != tds.end();
        ++tdsI)
     {
-    const cmTarget *tg = (*tdsI)->Target;
+    const cmGeneratorTarget *tg = *tdsI;
     *this->GetFolderBuildStreams() << "    -L\"" << GetAbsBuildFilePath(tg)
                                    << "\"" << std::endl;
     }
   // library targets
   cmTarget::LinkLibraryVectorType llv =
-    this->Target->GetOriginalLinkLibraries();
+    this->GeneratorTarget->Target->GetOriginalLinkLibraries();
   for (cmTarget::LinkLibraryVectorType::const_iterator llvI = llv.begin();
        llvI != llv.end(); ++llvI)
     {
@@ -391,10 +391,12 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
 
 void cmGhsMultiTargetGenerator::WriteCustomCommands()
 {
-  WriteCustomCommandsHelper(this->Target->GetPreBuildCommands(),
-                            cmTarget::PRE_BUILD);
-  WriteCustomCommandsHelper(this->Target->GetPostBuildCommands(),
-                            cmTarget::POST_BUILD);
+  WriteCustomCommandsHelper(
+        this->GeneratorTarget->Target->GetPreBuildCommands(),
+        cmTarget::PRE_BUILD);
+  WriteCustomCommandsHelper(
+        this->GeneratorTarget->Target->GetPostBuildCommands(),
+        cmTarget::POST_BUILD);
 }
 
 void cmGhsMultiTargetGenerator::WriteCustomCommandsHelper(
@@ -518,7 +520,7 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
   std::string outputDir(AbsBuildFilePath);
 
   const char *runtimeOutputProp =
-    this->Target->GetProperty("RUNTIME_OUTPUT_DIRECTORY");
+    this->GeneratorTarget->GetProperty("RUNTIME_OUTPUT_DIRECTORY");
   if (NULL != runtimeOutputProp)
     {
     outputDir = runtimeOutputProp;
@@ -526,7 +528,8 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
 
   std::string configCapped(cmSystemTools::UpperCase(config));
   const char *runtimeOutputSProp =
-    this->Target->GetProperty("RUNTIME_OUTPUT_DIRECTORY_" + configCapped);
+    this->GeneratorTarget
+      ->GetProperty("RUNTIME_OUTPUT_DIRECTORY_" + configCapped);
   if (NULL != runtimeOutputSProp)
     {
     outputDir = runtimeOutputSProp;
@@ -544,9 +547,10 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
 std::string
 cmGhsMultiTargetGenerator::GetOutputFilename(const std::string &config) const
 {
-  std::string outputFilename(this->Target->GetName());
+  std::string outputFilename(this->GeneratorTarget->GetName());
 
-  const char *outputNameProp = this->Target->GetProperty("OUTPUT_NAME");
+  const char *outputNameProp =
+      this->GeneratorTarget->GetProperty("OUTPUT_NAME");
   if (NULL != outputNameProp)
     {
     outputFilename = outputNameProp;
@@ -554,7 +558,7 @@ cmGhsMultiTargetGenerator::GetOutputFilename(const std::string &config) const
 
   std::string configCapped(cmSystemTools::UpperCase(config));
   const char *outputNameSProp =
-    this->Target->GetProperty(configCapped + "_OUTPUT_NAME");
+    this->GeneratorTarget->GetProperty(configCapped + "_OUTPUT_NAME");
   if (NULL != outputNameSProp)
     {
     outputFilename = outputNameSProp;
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index d1c17f4..327fdef 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -54,11 +54,11 @@ public:
     return this->AbsOutputFileName.c_str();
   }
 
-  static std::string GetRelBuildFilePath(const cmTarget *target);
-  static std::string GetAbsPathToRoot(const cmTarget *target);
-  static std::string GetAbsBuildFilePath(const cmTarget *target);
-  static std::string GetRelBuildFileName(const cmTarget *target);
-  static std::string GetBuildFileName(const cmTarget *target);
+  static std::string GetRelBuildFilePath(const cmGeneratorTarget *target);
+  static std::string GetAbsPathToRoot(const cmGeneratorTarget *target);
+  static std::string GetAbsBuildFilePath(const cmGeneratorTarget *target);
+  static std::string GetRelBuildFileName(const cmGeneratorTarget *target);
+  static std::string GetBuildFileName(const cmGeneratorTarget *target);
   static std::string AddSlashIfNeededToPath(std::string const &input);
 
 private:
@@ -99,7 +99,6 @@ private:
   bool DetermineIfDynamicDownload(std::string const &config,
                                   const std::string &language);
 
-  cmTarget *Target;
   cmGeneratorTarget* GeneratorTarget;
   cmLocalGhsMultiGenerator *LocalGenerator;
   cmMakefile *Makefile;
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 7c33904..1bcbd26 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -487,7 +487,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
        tgtsI != tgts.end(); ++tgtsI)
     {
     const cmGeneratorTarget *tgt = *tgtsI;
-    if (IsTgtForBuild(tgt->Target))
+    if (IsTgtForBuild(tgt))
       {
       char const *rawFolderName = tgt->GetProperty("FOLDER");
       if (NULL == rawFolderName)
@@ -504,7 +504,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
           GhsMultiGpj::PROJECT);
         }
       std::vector<cmsys::String> splitPath = cmSystemTools::SplitString(
-            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target));
+            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt));
       std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" +
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
@@ -516,13 +516,12 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
     }
 }
 
-bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt)
+bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmGeneratorTarget *tgt)
 {
   const std::string config =
-    tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
+    tgt->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   std::vector<cmSourceFile *> tgtSources;
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
-  gt->GetSourceFiles(tgtSources, config);
+  tgt->GetSourceFiles(tgtSources, config);
   bool tgtInBuild = true;
   char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index 04a9a5b..480cd6a 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -111,7 +111,7 @@ private:
       GhsMultiGpj::Types projType);
   static std::string GetFileNameFromPath(std::string const &path);
   void UpdateBuildFiles(std::vector<cmGeneratorTarget*> tgts);
-  bool IsTgtForBuild(const cmTarget *tgt);
+  bool IsTgtForBuild(const cmGeneratorTarget *tgt);
 
   std::vector<cmGeneratedFileStream *> TargetSubProjects;
   std::map<std::string, cmGeneratedFileStream *> TargetFolderBuildStreams;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3248a77ae9b6459e0a0fcd63092cfe1236f51a58
commit 3248a77ae9b6459e0a0fcd63092cfe1236f51a58
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:53:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:04 2015 +0200

    Sublime: Port API to cmGeneratorTarget.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 47822e8..92d38b9 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -20,7 +20,6 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 
 #include <cmsys/SystemTools.hxx>
 
@@ -204,12 +203,12 @@ void cmExtraSublimeTextGenerator::
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, targetName, *lg, (*ti)->Target,
+          this->AppendTarget(fout, targetName, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           std::string fastTarget = targetName;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, *lg, (*ti)->Target,
+          this->AppendTarget(fout, fastTarget, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           }
@@ -225,7 +224,7 @@ void cmExtraSublimeTextGenerator::
   AppendTarget(cmGeneratedFileStream& fout,
                const std::string& targetName,
                cmLocalGenerator* lg,
-               cmTarget* target,
+               cmGeneratorTarget* target,
                const char* make,
                const cmMakefile* makefile,
                const char*, //compiler
@@ -235,10 +234,8 @@ void cmExtraSublimeTextGenerator::
 
   if (target != 0)
     {
-      cmGeneratorTarget *gtgt = this->GlobalGenerator
-                                    ->GetGeneratorTarget(target);
       std::vector<cmSourceFile*> sourceFiles;
-      gtgt->GetSourceFiles(sourceFiles,
+      target->GetSourceFiles(sourceFiles,
                              makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       std::vector<cmSourceFile*>::const_iterator sourceFilesEnd =
         sourceFiles.end();
@@ -256,9 +253,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, target);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, gtgt);
+            this->ComputeDefines(*iter, lg, target);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 5dd1140..cf31ee0 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -18,7 +18,6 @@
 
 class cmLocalGenerator;
 class cmMakefile;
-class cmTarget;
 class cmGeneratedFileStream;
 class cmGeneratorTarget;
 
@@ -67,7 +66,7 @@ private:
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string& targetName,
                     cmLocalGenerator* lg,
-                    cmTarget* target,
+                    cmGeneratorTarget* target,
                     const char* make,
                     const cmMakefile* makefile,
                     const char* compiler,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77e56c9c1bef782500416e3c8242f77e2719ee8a
commit 77e56c9c1bef782500416e3c8242f77e2719ee8a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 21:23:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:04 2015 +0200

    Xcode: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 08c38a6..9111a3f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -711,9 +711,9 @@ cmXCodeObject* cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
+GetGroupMapKeyFromPath(cmGeneratorTarget* target, const std::string& fullpath)
 {
-  std::string key(cmtarget.GetName());
+  std::string key(target->GetName());
   key += "-";
   key += fullpath;
   return key;
@@ -721,16 +721,16 @@ GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKey(cmTarget& cmtarget, cmSourceFile* sf)
+GetGroupMapKey(cmGeneratorTarget* target, cmSourceFile* sf)
 {
-  return GetGroupMapKeyFromPath(cmtarget, sf->GetFullPath());
+  return GetGroupMapKeyFromPath(target, sf->GetFullPath());
 }
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
@@ -738,7 +738,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   // fileRef object for any given full path.
   //
   cmXCodeObject* fileRef =
-    this->CreateXCodeFileReferenceFromPath(fullpath, cmtarget, lang, sf);
+    this->CreateXCodeFileReferenceFromPath(fullpath, target, lang, sf);
 
   cmXCodeObject* buildFile = this->CreateObject(cmXCodeObject::PBXBuildFile);
   buildFile->SetComment(fileRef->GetComment());
@@ -751,7 +751,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
                                               cmSourceFile* sf,
-                                              cmTarget& cmtarget)
+                                              cmGeneratorTarget* gtgt)
 {
   // Add flags from target and source file properties.
   std::string flags;
@@ -781,7 +781,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   cmXCodeObject* buildFile =
-    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), cmtarget, lang, sf);
+    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), gtgt, lang, sf);
   cmXCodeObject* fileRef = buildFile->GetObject("fileRef")->GetObject();
 
   cmXCodeObject* settings =
@@ -791,7 +791,6 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
   // Is this a resource file in this target? Add it to the resources group...
   //
 
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmGeneratorTarget::SourceFileFlags tsFlags =
       gtgt->GetTargetSourceFileFlags(sf);
   bool isResource = tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource;
@@ -926,11 +925,11 @@ GetSourcecodeValueFromFileExtension(const std::string& _ext,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
-  std::string key = GetGroupMapKeyFromPath(cmtarget, fullpath);
+  std::string key = GetGroupMapKeyFromPath(target, fullpath);
   cmXCodeObject* fileRef = this->FileRefs[key];
   if(!fileRef)
     {
@@ -1007,13 +1006,13 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf,
-                                                 cmTarget& cmtarget)
+                                                 cmGeneratorTarget* target)
 {
   std::string lang =
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   return this->CreateXCodeFileReferenceFromPath(
-    sf->GetFullPath(), cmtarget, lang, sf);
+    sf->GetFullPath(), target, lang, sf);
 }
 
 //----------------------------------------------------------------------------
@@ -1100,7 +1099,6 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       l != sortedTargets.end(); l++)
     {
     cmGeneratorTarget* gtgt = l->second;
-    cmTarget& cmtarget = *gtgt->Target;
 
     std::string targetName = gtgt->GetName();
 
@@ -1118,7 +1116,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     if(gtgt->GetType() == cmState::UTILITY ||
        gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
-      cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
+      cmXCodeObject* t = this->CreateUtilityTarget(gtgt);
       if (!t)
         {
         return false;
@@ -1146,7 +1144,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       {
       cmXCodeObject* xsf =
         this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                    *i, cmtarget);
+                                    *i, gtgt);
       cmXCodeObject* fr = xsf->GetObject("fileRef");
       cmXCodeObject* filetype =
         fr->GetObject()->GetObject("explicitFileType");
@@ -1197,7 +1195,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
         {
         std::string obj = *oi;
         cmXCodeObject* xsf =
-          this->CreateXCodeSourceFileFromPath(obj, cmtarget, "", 0);
+          this->CreateXCodeSourceFileFromPath(obj, gtgt, "", 0);
         externalObjFiles.push_back(xsf);
         }
       }
@@ -1320,7 +1318,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
           {
           cmXCodeObject* xsf =
             this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                        *sfIt, cmtarget);
+                                        *sfIt, gtgt);
           buildFiles->AddObject(xsf);
           }
         contentBuildPhases.push_back(copyFilesBuildPhase);
@@ -1354,9 +1352,9 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     this->CreateCustomCommands(buildPhases, sourceBuildPhase,
                                headerBuildPhase, resourceBuildPhase,
                                contentBuildPhases,
-                               frameworkBuildPhase, cmtarget);
+                               frameworkBuildPhase, gtgt);
 
-    targets.push_back(this->CreateXCodeTarget(cmtarget, buildPhases));
+    targets.push_back(this->CreateXCodeTarget(gtgt, buildPhases));
     }
   return true;
 }
@@ -1431,7 +1429,7 @@ bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf)
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                                          const char* name2,
-                                         cmTarget& cmtarget,
+                                         cmGeneratorTarget* target,
                                          const std::vector<cmCustomCommand>&
                                          commands)
 {
@@ -1451,7 +1449,7 @@ cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                            this->CreateString("0"));
   buildPhase->AddAttribute("shellPath",
                            this->CreateString("/bin/sh"));
-  this->AddCommandsToBuildPhase(buildPhase, cmtarget, commands,
+  this->AddCommandsToBuildPhase(buildPhase, target, commands,
                                 name2);
   return buildPhase;
 }
@@ -1468,16 +1466,14 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
                                                   contentBuildPhases,
                                                   cmXCodeObject*
                                                   frameworkBuildPhase,
-                                                  cmTarget& cmtarget)
+                                                  cmGeneratorTarget* gtgt)
 {
   std::vector<cmCustomCommand> const & prebuild
-    = cmtarget.GetPreBuildCommands();
+    = gtgt->Target->GetPreBuildCommands();
   std::vector<cmCustomCommand> const & prelink
-    = cmtarget.GetPreLinkCommands();
+    = gtgt->Target->GetPreLinkCommands();
   std::vector<cmCustomCommand> postbuild
-    = cmtarget.GetPostBuildCommands();
-
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+    = gtgt->Target->GetPostBuildCommands();
 
   if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
@@ -1530,19 +1526,19 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   cmXCodeObject* cmakeRulesBuildPhase =
     this->CreateBuildPhase("CMake Rules",
                            "cmakeRulesBuildPhase",
-                           cmtarget, commands);
+                           gtgt, commands);
   // create prebuild phase
   cmXCodeObject* preBuildPhase =
     this->CreateBuildPhase("CMake PreBuild Rules", "preBuildCommands",
-                           cmtarget, prebuild);
+                           gtgt, prebuild);
   // create prelink phase
   cmXCodeObject* preLinkPhase =
     this->CreateBuildPhase("CMake PreLink Rules", "preLinkCommands",
-                           cmtarget, prelink);
+                           gtgt, prelink);
   // create postbuild phase
   cmXCodeObject* postBuildPhase =
     this->CreateBuildPhase("CMake PostBuild Rules", "postBuildPhase",
-                           cmtarget, postbuild);
+                           gtgt, postbuild);
 
   // The order here is the order they will be built in.
   // The order "headers, resources, sources" mimics a native project generated
@@ -1625,7 +1621,7 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag,
 //----------------------------------------------------------------------------
 void
 cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                                                cmTarget& target,
+                                                cmGeneratorTarget* target,
                                                 std::vector<cmCustomCommand>
                                                 const & commands,
                                                 const char* name)
@@ -1635,7 +1631,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
   makefile += "/";
-  makefile += target.GetName();
+  makefile += target->GetName();
   makefile += "_";
   makefile += name;
   makefile += ".make";
@@ -1669,7 +1665,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
 //----------------------------------------------------------------------------
 void  cmGlobalXCodeGenerator
 ::CreateCustomRulesMakefile(const char* makefileBasename,
-                            cmTarget& target,
+                            cmGeneratorTarget* target,
                             std::vector<cmCustomCommand>
                             const & commands,
                             const std::string& configName)
@@ -1686,7 +1682,7 @@ void  cmGlobalXCodeGenerator
     }
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  makefileStream << "# Custom rules for " << target.GetName() << "\n";
+  makefileStream << "# Custom rules for " << target->GetName() << "\n";
 
   // disable the implicit rules
   makefileStream << ".SUFFIXES: " << "\n";
@@ -1715,7 +1711,7 @@ void  cmGlobalXCodeGenerator
         {
         std::ostringstream str;
         str << "_buildpart_" << count++ ;
-        tname[&ccg.GetCC()] = std::string(target.GetName()) + str.str();
+        tname[&ccg.GetCC()] = std::string(target->GetName()) + str.str();
         makefileStream << "\\\n\t" << tname[&ccg.GetCC()];
         }
       }
@@ -1793,11 +1789,10 @@ void  cmGlobalXCodeGenerator
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
+void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
@@ -2020,7 +2015,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     if(this->XcodeVersion >= 21)
       {
       std::string pncdir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
                                   this->CreateString(pncdir.c_str()));
       }
@@ -2029,7 +2024,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       buildSettings->AddAttribute("OBJROOT",
                                   this->CreateString(pndir.c_str()));
       pndir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       }
     }
 
@@ -2067,7 +2062,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
         extraLinkOptions += " ";
         extraLinkOptions += createFlags;
         }
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the cfbundle name. This avoids creating
       // a per-configuration Info.plist file. The cfbundle plist
@@ -2113,11 +2108,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
-      std::string fw_version = target.GetFrameworkVersion();
+      std::string fw_version = gtgt->Target->GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
                                   this->CreateString(fw_version.c_str()));
 
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the framework name. This avoids creating
       // a per-configuration Info.plist file.
@@ -2160,7 +2155,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     // Handle bundles and normal executables separately.
     if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the executable name.  This avoids creating
       // a per-configuration Info.plist file.
@@ -2400,7 +2395,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
     }
 
-  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(target),
+  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(gtgt),
                               this->CreateString(extraLinkOptions.c_str()));
   buildSettings->AddAttribute("OTHER_REZFLAGS",
                               this->CreateString(""));
@@ -2459,7 +2454,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   // put this last so it can override existing settings
   // Convert "XCODE_ATTRIBUTE_*" properties directly.
   {
-  cmPropertyMap const& props = target.GetProperties();
+  cmPropertyMap const& props = gtgt->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin();
       i != props.end(); ++i)
     {
@@ -2508,9 +2503,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
+cmGlobalXCodeGenerator::CreateUtilityTarget(cmGeneratorTarget* gtgt)
 {
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2538,11 +2532,11 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
   this->CreateCustomCommands(buildPhases, 0, 0, 0, emptyContentVector, 0,
-                             cmtarget);
+                             gtgt);
   target->AddAttribute("buildPhases", buildPhases);
   if(this->XcodeVersion > 20)
     {
-    this->AddConfigurations(target, cmtarget);
+    this->AddConfigurations(target, gtgt);
     }
   else
     {
@@ -2550,7 +2544,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings, theConfig);
+    this->CreateBuildSettings(gtgt, buildSettings, theConfig);
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2558,8 +2552,8 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   target->AddAttribute("dependencies", dependencies);
   target->AddAttribute("name", this->CreateString(gtgt->GetName()));
   target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
 
   // Add source files without build rules for editing convenience.
   if(gtgt->GetType() == cmState::UTILITY)
@@ -2575,7 +2569,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       {
       if(!(*i)->GetPropertyAsBool("GENERATED"))
         {
-        this->CreateXCodeFileReference(*i, cmtarget);
+        this->CreateXCodeFileReference(*i, gtgt);
         }
       }
     }
@@ -2588,7 +2582,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
 //----------------------------------------------------------------------------
 std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
-                                                      cmTarget& cmtarget)
+                                                      cmGeneratorTarget* gtgt)
 {
   std::string configTypes =
     this->CurrentMakefile->GetRequiredDefinition("CMAKE_CONFIGURATION_TYPES");
@@ -2604,7 +2598,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
   std::string comment = "Build configuration list for ";
   comment += cmXCodeObject::PBXTypeNames[target->GetIsA()];
   comment += " \"";
-  comment += cmtarget.GetName();
+  comment += gtgt->GetName();
   comment += "\"";
   configlist->SetComment(comment.c_str());
   target->AddAttribute("buildConfigurationList",
@@ -2616,7 +2610,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
     buildConfigurations->AddObject(config);
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings,
+    this->CreateBuildSettings(gtgt, buildSettings,
                               configVector[i].c_str());
     config->AddAttribute("name", this->CreateString(configVector[i].c_str()));
     config->SetComment(configVector[i].c_str());
@@ -2634,12 +2628,12 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
 }
 
 //----------------------------------------------------------------------------
-const char*
-cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
+const char* cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(
+    cmGeneratorTarget const* target) const
 {
   if(this->XcodeVersion >= 60 &&
-     (cmtarget.GetType() == cmState::STATIC_LIBRARY ||
-      cmtarget.GetType() == cmState::OBJECT_LIBRARY))
+     (target->GetType() == cmState::STATIC_LIBRARY ||
+      target->GetType() == cmState::OBJECT_LIBRARY))
     {
     return "OTHER_LIBTOOLFLAGS";
     }
@@ -2709,11 +2703,9 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
+cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt,
                                           cmXCodeObject* buildPhases)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
-
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
@@ -2726,14 +2718,14 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   std::string defConfig;
   if(this->XcodeVersion > 20)
     {
-    defConfig = this->AddConfigurations(target, cmtarget);
+    defConfig = this->AddConfigurations(target, gtgt);
     }
   else
     {
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
     defConfig = this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-    this->CreateBuildSettings(cmtarget, buildSettings, defConfig.c_str());
+    this->CreateBuildSettings(gtgt, buildSettings, defConfig.c_str());
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2770,22 +2762,23 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     {
     target->AddAttribute("productType", this->CreateString(productType));
     }
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
   target->SetId(this->GetOrCreateId(
     gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
 //----------------------------------------------------------------------------
-cmXCodeObject* cmGlobalXCodeGenerator::FindXCodeTarget(cmTarget const* t)
+cmXCodeObject*
+cmGlobalXCodeGenerator::FindXCodeTarget(cmGeneratorTarget const* t)
 {
   if(!t)
     {
     return 0;
     }
 
-  std::map<cmTarget const*, cmXCodeObject*>::const_iterator const i =
+  std::map<cmGeneratorTarget const*, cmXCodeObject*>::const_iterator const i =
     this->XCodeObjectMap.find(t);
   if (i == this->XCodeObjectMap.end())
     {
@@ -2922,8 +2915,7 @@ void cmGlobalXCodeGenerator
 void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
-  cmTarget* cmtarget = target->GetTarget();
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  cmGeneratorTarget* gt = target->GetTarget();
   if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
@@ -2938,7 +2930,7 @@ void cmGlobalXCodeGenerator
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
-    if(cmXCodeObject* dptarget = this->FindXCodeTarget((*i)->Target))
+    if(cmXCodeObject* dptarget = this->FindXCodeTarget(*i))
       {
       this->AddDependTarget(target, dptarget);
       }
@@ -2967,7 +2959,7 @@ void cmGlobalXCodeGenerator
         linkObjs += this->XCodeEscapePath(oi->c_str());
         }
       this->AppendBuildSettingAttribute(
-        target, this->GetTargetLinkFlagsVar(*cmtarget),
+        target, this->GetTargetLinkFlagsVar(gt),
         linkObjs.c_str(), configName);
       }
 
@@ -3047,7 +3039,7 @@ void cmGlobalXCodeGenerator
         }
       }
     this->AppendBuildSettingAttribute(
-      target, this->GetTargetLinkFlagsVar(*cmtarget),
+      target, this->GetTargetLinkFlagsVar(gt),
       linkLibs.c_str(), configName);
     }
     }
@@ -3090,7 +3082,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       // MACOSX_BUNDLE file
       if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(gtgt->Target);
+        std::string plist = this->ComputeInfoPListLocation(gtgt);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3110,8 +3102,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKey(gtgt->Target, sf);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKey(gtgt, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
@@ -3125,8 +3117,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(gtgt->Target, source);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(gtgt, source);
         this->GroupMap[key] = pbxgroup;
         }
       }
@@ -3157,16 +3149,16 @@ cmXCodeObject *cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 cmXCodeObject* cmGlobalXCodeGenerator
-::CreateOrGetPBXGroup(cmTarget& cmtarget, cmSourceGroup* sg)
+::CreateOrGetPBXGroup(cmGeneratorTarget* gtgt, cmSourceGroup* sg)
 {
   std::string s;
   std::string target;
-  const char *targetFolder= cmtarget.GetProperty("FOLDER");
+  const char *targetFolder= gtgt->GetProperty("FOLDER");
   if(targetFolder) {
     target = targetFolder;
     target += "/";
   }
-  target += cmtarget.GetName();
+  target += gtgt->GetName();
   s = target + "/";
   s += sg->GetFullName();
   std::map<std::string, cmXCodeObject* >::iterator it =
@@ -3556,10 +3548,10 @@ std::string
 cmGlobalXCodeGenerator::GetObjectsNormalDirectory(
   const std::string &projName,
   const std::string &configName,
-  const cmTarget *t) const
+  const cmGeneratorTarget *t) const
 {
   std::string dir =
-    t->GetMakefile()->GetCurrentBinaryDirectory();
+    t->GetLocalGenerator()->GetCurrentBinaryDirectory();
   dir += "/";
   dir += projName;
   dir += ".build/";
@@ -3633,8 +3625,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         i != targets.end(); ++i)
       {
       cmXCodeObject* target = *i;
-      cmTarget* t =target->GetTarget();
-      cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
+      cmGeneratorTarget* gt =target->GetTarget();
 
       if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
@@ -3695,7 +3686,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         if(this->Architectures.size() > 1)
           {
           std::string universal = this->GetObjectsNormalDirectory(
-            this->CurrentProject, configName, t);
+            this->CurrentProject, configName, gt);
           for( std::vector<std::string>::iterator arch =
                  this->Architectures.begin();
                arch != this->Architectures.end(); ++arch)
@@ -4038,12 +4029,13 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags,
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmTarget& target)
+cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmGeneratorTarget* target)
 {
-  std::string plist = target.GetMakefile()->GetCurrentBinaryDirectory();
+  std::string plist =
+      target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   plist += cmake::GetCMakeFilesDirectory();
   plist += "/";
-  plist += target.GetName();
+  plist += target->GetName();
   plist += ".dir/Info.plist";
   return plist;
 }
@@ -4069,7 +4061,7 @@ void cmGlobalXCodeGenerator
 {
   std::string configName = this->GetCMakeCFGIntDir();
   std::string dir = this->GetObjectsNormalDirectory(
-    "$(PROJECT_NAME)", configName, gt->Target);
+    "$(PROJECT_NAME)", configName, gt);
   if(this->XcodeVersion >= 21)
     {
     dir += "$(CURRENT_ARCH)/";
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 10d9bd6..510d46e 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -16,7 +16,6 @@
 #include "cmXCodeObject.h"
 #include "cmCustomCommand.h"
 class cmGlobalGeneratorFactory;
-class cmTarget;
 class cmSourceFile;
 class cmSourceGroup;
 
@@ -90,7 +89,7 @@ protected:
   virtual void AddExtraIDETargets();
   virtual void Generate();
 private:
-  cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget,
+  cmXCodeObject* CreateOrGetPBXGroup(cmGeneratorTarget* gtgt,
                                      cmSourceGroup* sg);
   cmXCodeObject* CreatePBXGroup(cmXCodeObject *parent,
                                 std::string name);
@@ -108,22 +107,22 @@ private:
                             cmXCodeObject* resourceBuildPhase,
                             std::vector<cmXCodeObject*> contentBuildPhases,
                             cmXCodeObject* frameworkBuildPhase,
-                            cmTarget& cmtarget);
+                            cmGeneratorTarget *gtgt);
 
-  std::string ComputeInfoPListLocation(cmTarget& target);
+  std::string ComputeInfoPListLocation(cmGeneratorTarget *target);
 
   void AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                               cmTarget& target,
+                               cmGeneratorTarget *target,
                                std::vector<cmCustomCommand>
                                const & commands,
                                const char* commandFileName);
 
   void CreateCustomRulesMakefile(const char* makefileBasename,
-                                 cmTarget& target,
+                                 cmGeneratorTarget* target,
                                  std::vector<cmCustomCommand> const & commands,
                                  const std::string& configName);
 
-  cmXCodeObject* FindXCodeTarget(cmTarget const*);
+  cmXCodeObject* FindXCodeTarget(const cmGeneratorTarget *);
   std::string GetOrCreateId(const std::string& name, const std::string& id);
 
   // create cmXCodeObject from these functions so that memory can be managed
@@ -132,22 +131,23 @@ private:
   cmXCodeObject* CreateObject(cmXCodeObject::Type type);
   cmXCodeObject* CreateString(const std::string& s);
   cmXCodeObject* CreateObjectReference(cmXCodeObject*);
-  cmXCodeObject* CreateXCodeTarget(cmTarget& target,
+  cmXCodeObject* CreateXCodeTarget(cmGeneratorTarget *gtgt,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
   void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
-  const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
+  const char* GetTargetLinkFlagsVar(const cmGeneratorTarget *target) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);
-  std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget);
+  std::string AddConfigurations(cmXCodeObject* target,
+                                cmGeneratorTarget *gtgt);
   void AppendOrAddBuildSetting(cmXCodeObject* settings, const char* attr,
                                const char* value);
   void AppendBuildSettingAttribute(cmXCodeObject* target, const char* attr,
                                    const char* value,
                                    const std::string& configName);
-  cmXCodeObject* CreateUtilityTarget(cmTarget& target);
+  cmXCodeObject* CreateUtilityTarget(cmGeneratorTarget *gtgt);
   void AddDependAndLinkInformation(cmXCodeObject* target);
-  void CreateBuildSettings(cmTarget& target,
+  void CreateBuildSettings(cmGeneratorTarget *gtgt,
                            cmXCodeObject* buildSettings,
                            const std::string& buildType);
   std::string ExtractFlag(const char* flag, std::string& flags);
@@ -161,18 +161,18 @@ private:
   void WriteXCodePBXProj(std::ostream& fout, cmLocalGenerator* root,
                          std::vector<cmLocalGenerator*>& generators);
   cmXCodeObject* CreateXCodeFileReferenceFromPath(const std::string &fullpath,
-                                                  cmTarget& cmtarget,
+                                                  cmGeneratorTarget *target,
                                                   const std::string &lang,
                                                   cmSourceFile* sf);
   cmXCodeObject* CreateXCodeSourceFileFromPath(const std::string &fullpath,
-                                               cmTarget& cmtarget,
+                                               cmGeneratorTarget *target,
                                                const std::string &lang,
                                                cmSourceFile* sf);
   cmXCodeObject* CreateXCodeFileReference(cmSourceFile* sf,
-                                          cmTarget& cmtarget);
+                                          cmGeneratorTarget *target);
   cmXCodeObject* CreateXCodeSourceFile(cmLocalGenerator* gen,
                                        cmSourceFile* sf,
-                                       cmTarget& cmtarget);
+                                       cmGeneratorTarget *gtgt);
   bool CreateXCodeTargets(cmLocalGenerator* gen,
                           std::vector<cmXCodeObject*>&);
   bool IsHeaderFile(cmSourceFile*);
@@ -185,7 +185,7 @@ private:
                        std::vector<cmLocalGenerator*>& gens);
   cmXCodeObject* CreateBuildPhase(const char* name,
                                   const char* name2,
-                                  cmTarget& cmtarget,
+                                  cmGeneratorTarget *target,
                                   const std::vector<cmCustomCommand>&);
   void CreateReRunCMakeFile(cmLocalGenerator* root,
                             std::vector<cmLocalGenerator*> const& gens);
@@ -224,10 +224,9 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  std::string GetObjectsNormalDirectory(
-    const std::string &projName,
+  std::string GetObjectsNormalDirectory(const std::string &projName,
     const std::string &configName,
-    const cmTarget *t) const;
+    const cmGeneratorTarget *t) const;
 
   void addObject(cmXCodeObject *obj);
   std::string PostBuildMakeTarget(std::string const& tName,
@@ -249,7 +248,7 @@ private:
   std::map<std::string, cmXCodeObject* > GroupNameMap;
   std::map<std::string, cmXCodeObject* > TargetGroup;
   std::map<std::string, cmXCodeObject* > FileRefs;
-  std::map<cmTarget const*, cmXCodeObject* > XCodeObjectMap;
+  std::map<cmGeneratorTarget const*, cmXCodeObject* > XCodeObjectMap;
   std::vector<std::string> Architectures;
   std::string GeneratorToolset;
 };
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index ed2940a..0f0548b 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -13,7 +13,7 @@
 #define cmXCodeObject_h
 
 #include "cmStandardIncludes.h"
-class cmTarget;
+class cmGeneratorTarget;
 
 class cmXCodeObject
 {
@@ -87,11 +87,11 @@ public:
     {
       this->Id = id;
     }
-  cmTarget* GetTarget()
+  cmGeneratorTarget* GetTarget()
     {
       return this->Target;
     }
-  void SetTarget(cmTarget* t)
+  void SetTarget(cmGeneratorTarget* t)
     {
       this->Target = t;
     }
@@ -146,7 +146,7 @@ public:
 protected:
   void PrintString(std::ostream& os) const;
 
-  cmTarget* Target;
+  cmGeneratorTarget* Target;
   Type TypeValue;
   std::string Id;
   PBXType IsA;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fcfedf5edcb5658224542f6aca6514177fec43d
commit 7fcfedf5edcb5658224542f6aca6514177fec43d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:36:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:04 2015 +0200

    Xcode: Prefer to get target state from cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d6c2e59..08c38a6 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1110,13 +1110,13 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+    if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::UTILITY ||
-       cmtarget.GetType() == cmState::GLOBAL_TARGET)
+    if(gtgt->GetType() == cmState::UTILITY ||
+       gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
       cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
       if (!t)
@@ -1204,7 +1204,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
 
     // some build phases only apply to bundles and/or frameworks
     bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
-    bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
+    bool isBundleTarget = gtgt->GetPropertyAsBool("MACOSX_BUNDLE");
     bool isCFBundleTarget = gtgt->IsCFBundleOnApple();
 
     cmXCodeObject* buildFiles = 0;
@@ -1479,7 +1479,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
 
   cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
 
-  if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
@@ -1488,13 +1488,13 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
     cmd[0].push_back("-E");
     cmd[0].push_back("cmake_symlink_library");
     std::string str_file = "$<TARGET_FILE:";
-    str_file += cmtarget.GetName();
+    str_file += gtgt->GetName();
     str_file += ">";
     std::string str_so_file = "$<TARGET_SONAME_FILE:";
-    str_so_file += cmtarget.GetName();
+    str_so_file += gtgt->GetName();
     str_so_file += ">";
     std::string str_link_file = "$<TARGET_LINKER_FILE:";
-    str_link_file += cmtarget.GetName();
+    str_link_file += gtgt->GetName();
     str_link_file += ">";
     cmd[0].push_back(str_file);
     cmd[0].push_back(str_so_file);
@@ -1797,22 +1797,22 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  if(target.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   std::string defFlags;
-  bool shared = ((target.GetType() == cmState::SHARED_LIBRARY) ||
-                 (target.GetType() == cmState::MODULE_LIBRARY));
-  bool binary = ((target.GetType() == cmState::OBJECT_LIBRARY) ||
-                 (target.GetType() == cmState::STATIC_LIBRARY) ||
-                 (target.GetType() == cmState::EXECUTABLE) ||
+  bool shared = ((gtgt->GetType() == cmState::SHARED_LIBRARY) ||
+                 (gtgt->GetType() == cmState::MODULE_LIBRARY));
+  bool binary = ((gtgt->GetType() == cmState::OBJECT_LIBRARY) ||
+                 (gtgt->GetType() == cmState::STATIC_LIBRARY) ||
+                 (gtgt->GetType() == cmState::EXECUTABLE) ||
                  shared);
 
   // Compute the compilation flags for each language.
   std::set<std::string> languages;
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   gtgt->GetLanguages(languages, configName);
   std::map<std::string, std::string> cflags;
   for (std::set<std::string>::iterator li = languages.begin();
@@ -1840,7 +1840,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     cmSystemTools::Error
       ("CMake can not determine linker language for target: ",
-       target.GetName().c_str());
+       gtgt->GetName().c_str());
     return;
     }
 
@@ -1869,15 +1869,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   std::string extraLinkOptionsVar;
   std::string extraLinkOptions;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptionsVar = "CMAKE_EXE_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::SHARED_LIBRARY)
+  else if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_SHARED_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::MODULE_LIBRARY)
+  else if(gtgt->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS";
     }
@@ -1889,8 +1889,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                configName);
     }
 
-  if(target.GetType() == cmState::OBJECT_LIBRARY ||
-     target.GetType() == cmState::STATIC_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY ||
+     gtgt->GetType() == cmState::STATIC_LIBRARY)
     {
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
@@ -1899,7 +1899,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
   else
     {
-    const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+    const char* targetLinkFlags = gtgt->GetProperty("LINK_FLAGS");
     if(targetLinkFlags)
       {
       this->CurrentLocalGenerator->
@@ -1909,7 +1909,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       std::string linkFlagsVar = "LINK_FLAGS_";
       linkFlagsVar += cmSystemTools::UpperCase(configName);
-      if(const char* linkFlags = target.GetProperty(linkFlagsVar.c_str()))
+      if(const char* linkFlags = gtgt->GetProperty(linkFlagsVar.c_str()))
         {
         this->CurrentLocalGenerator->
           AppendFlags(extraLinkOptions, linkFlags);
@@ -1952,8 +1952,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   std::string pnsuffix;
   gtgt->GetFullNameComponents(pnprefix, pnbase, pnsuffix, configName);
 
-  const char* version = target.GetProperty("VERSION");
-  const char* soversion = target.GetProperty("SOVERSION");
+  const char* version = gtgt->GetProperty("VERSION");
+  const char* soversion = gtgt->GetProperty("SOVERSION");
   if(!gtgt->HasSOName(configName) || gtgt->IsFrameworkOnApple())
     {
     version = 0;
@@ -1980,10 +1980,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Set attributes to specify the proper name for the target.
   std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
-  if(target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY ||
-     target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::STATIC_LIBRARY ||
+     gtgt->GetType() == cmState::SHARED_LIBRARY ||
+     gtgt->GetType() == cmState::MODULE_LIBRARY ||
+     gtgt->GetType() == cmState::EXECUTABLE)
     {
     if(this->XcodeVersion >= 21)
       {
@@ -2011,10 +2011,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     buildSettings->AddAttribute("EXECUTABLE_SUFFIX",
                                 this->CreateString(pnsuffix.c_str()));
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     pnprefix = "lib";
-    pnbase = target.GetName();
+    pnbase = gtgt->GetName();
     pnsuffix = ".a";
 
     if(this->XcodeVersion >= 21)
@@ -2040,7 +2040,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                               this->CreateString(pndir.c_str()));
 
   // Handle settings for each target type.
-  switch(target.GetType())
+  switch(gtgt->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
@@ -2111,7 +2111,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
     case cmState::SHARED_LIBRARY:
     {
-    if(target.GetPropertyAsBool("FRAMEWORK"))
+    if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
       std::string fw_version = target.GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
@@ -2158,7 +2158,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
 
     // Handle bundles and normal executables separately.
-    if(target.GetPropertyAsBool("MACOSX_BUNDLE"))
+    if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
       std::string plist = this->ComputeInfoPListLocation(target);
       // Xcode will create the final version of Info.plist at build time,
@@ -2323,7 +2323,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Add Fortran source format attribute if property is set.
   const char* format = 0;
-  const char* tgtfmt = target.GetProperty("Fortran_FORMAT");
+  const char* tgtfmt = gtgt->GetProperty("Fortran_FORMAT");
   switch(this->CurrentLocalGenerator->GetFortranFormat(tgtfmt))
     {
     case cmLocalGenerator::FortranFormatFixed: format = "fixed"; break;
@@ -2338,7 +2338,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Create the INSTALL_PATH attribute.
   std::string install_name_dir;
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir = gtgt->GetInstallNameDirForBuildTree(configName);
@@ -2426,7 +2426,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Runtime version information.
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     int major;
     int minor;
@@ -2510,6 +2510,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 {
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2532,7 +2533,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
   cmXCodeObject* target =
     this->CreateObject(cmXCodeObject::PBXAggregateTarget);
-  target->SetComment(cmtarget.GetName().c_str());
+  target->SetComment(gtgt->GetName().c_str());
   cmXCodeObject* buildPhases =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
@@ -2555,16 +2556,15 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
 
   // Add source files without build rules for editing convenience.
-  if(cmtarget.GetType() == cmState::UTILITY)
+  if(gtgt->GetType() == cmState::UTILITY)
     {
     std::vector<cmSourceFile*> sources;
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
     if (!gtgt->GetConfigCommonSourceFiles(sources))
       {
       return 0;
@@ -2581,7 +2581,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     }
 
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
 
   return target;
 }
@@ -2712,7 +2712,9 @@ cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
                                           cmXCodeObject* buildPhases)
 {
-  if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
     }
@@ -2737,10 +2739,8 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
-
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
 
   cmXCodeObject* fileRef =
     this->CreateObject(cmXCodeObject::PBXFileReference);
@@ -2749,10 +2749,10 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
   std::string fullName;
-  if(cmtarget.GetType() == cmState::OBJECT_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     fullName = "lib";
-    fullName += cmtarget.GetName();
+    fullName += gtgt->GetName();
     fullName += ".a";
     }
   else
@@ -2763,7 +2763,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   fileRef->AddAttribute("refType", this->CreateString("0"));
   fileRef->AddAttribute("sourceTree",
                         this->CreateString("BUILT_PRODUCTS_DIR"));
-  fileRef->SetComment(cmtarget.GetName().c_str());
+  fileRef->SetComment(gtgt->GetName().c_str());
   target->AddAttribute("productReference",
                        this->CreateObjectReference(fileRef));
   if(const char* productType = this->GetTargetProductType(gtgt))
@@ -2773,7 +2773,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
@@ -2923,18 +2923,18 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(!cmtarget)
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(gt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   // Add dependencies on other CMake targets.
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
@@ -2958,7 +2958,7 @@ void cmGlobalXCodeGenerator
       std::string linkObjs;
       const char* sep = "";
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(cmtarget)->UseObjectLibraries(objs, "");
+      gt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -2972,15 +2972,14 @@ void cmGlobalXCodeGenerator
       }
 
     // Skip link information for object libraries.
-    if(cmtarget->GetType() == cmState::OBJECT_LIBRARY ||
-       cmtarget->GetType() == cmState::STATIC_LIBRARY)
+    if(gt->GetType() == cmState::OBJECT_LIBRARY ||
+       gt->GetType() == cmState::STATIC_LIBRARY)
       {
       continue;
       }
 
     // Compute the link library and directory information.
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(cmtarget);
-    cmComputeLinkInformation* pcli = gtgt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
     if(!pcli)
       {
       continue;
@@ -3637,21 +3636,21 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
       cmTarget* t =target->GetTarget();
       cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
 
-      if(t->GetType() == cmState::EXECUTABLE ||
+      if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//         t->GetType() == cmState::OBJECT_LIBRARY ||
-         t->GetType() == cmState::STATIC_LIBRARY ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+//         gt->GetType() == cmState::OBJECT_LIBRARY ||
+         gt->GetType() == cmState::STATIC_LIBRARY ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         // Declare an entry point for the target post-build phase.
-        makefileStream << this->PostBuildMakeTarget(t->GetName(), *ct)
+        makefileStream << this->PostBuildMakeTarget(gt->GetName(), *ct)
                        << ":\n";
         }
 
-      if(t->GetType() == cmState::EXECUTABLE ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+      if(gt->GetType() == cmState::EXECUTABLE ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         std::string tfull = gt->GetFullPath(configName);
         std::string trel = this->ConvertToRelativeForMake(tfull.c_str());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2baf86f385525ddd17f60109578eaeb15dd3526
commit e2baf86f385525ddd17f60109578eaeb15dd3526
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:14:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:04 2015 +0200

    Xcode: Re-order conditions.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 5be76af..d6c2e59 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2923,13 +2923,13 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(!cmtarget)
     {
+    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(!cmtarget)
+  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
     {
-    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47ea61600ffab189b8bc276194c2b7dd039e286f
commit 47ea61600ffab189b8bc276194c2b7dd039e286f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:38:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:04 2015 +0200

    Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d015a92..5be76af 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1368,22 +1368,22 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguages()
   for(TargetMap::const_iterator
         ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
     {
-    this->ForceLinkerLanguage(*ti->second);
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
+    this->ForceLinkerLanguage(gt);
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
+void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
 {
   // This matters only for targets that link.
-  if(cmtarget.GetType() != cmState::EXECUTABLE &&
-     cmtarget.GetType() != cmState::SHARED_LIBRARY &&
-     cmtarget.GetType() != cmState::MODULE_LIBRARY)
+  if(gtgt->GetType() != cmState::EXECUTABLE &&
+     gtgt->GetType() != cmState::SHARED_LIBRARY &&
+     gtgt->GetType() != cmState::MODULE_LIBRARY)
     {
     return;
     }
 
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
   std::string llang = gtgt->GetLinkerLanguage("NOCONFIG");
   if(llang.empty()) { return; }
 
@@ -1399,11 +1399,11 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // Add an empty source file to the target that compiles with the
   // linker language.  This should convince Xcode to choose the proper
   // language.
-  cmMakefile* mf = cmtarget.GetMakefile();
+  cmMakefile* mf = gtgt->Target->GetMakefile();
   std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
-  fname += cmtarget.GetName();
+  fname += gtgt->GetName();
   fname += "-CMakeForceLinker";
   fname += ".";
   fname += cmSystemTools::LowerCase(llang);
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index feb5009..10d9bd6 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -135,7 +135,7 @@ private:
   cmXCodeObject* CreateXCodeTarget(cmTarget& target,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
-  void ForceLinkerLanguage(cmTarget& cmtarget);
+  void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
   const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ea7bff85fc1d5a6c27fd63f54a984da24520375
commit 3ea7bff85fc1d5a6c27fd63f54a984da24520375
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:32:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:04 2015 +0200

    Xcode: Port loops to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fe115ac..d015a92 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -514,18 +514,18 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& target = *(*l)->Target;
+      cmGeneratorTarget* target = *l;
 
-      if (target.GetType() == cmState::GLOBAL_TARGET)
+      if (target->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
-      std::string targetName = target.GetName();
+      std::string targetName = target->GetName();
 
       if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
         {
-        target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+        target->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
 
       // make all exe, shared libs and modules
@@ -533,19 +533,19 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       // this will make sure that when the next target is built
       // things are up-to-date
       if(!makeHelper.empty() &&
-         (target.GetType() == cmState::EXECUTABLE ||
+         (target->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//          target.GetType() == cmState::OBJECT_LIBRARY ||
-          target.GetType() == cmState::STATIC_LIBRARY ||
-          target.GetType() == cmState::SHARED_LIBRARY ||
-          target.GetType() == cmState::MODULE_LIBRARY))
+//          target->GetType() == cmState::OBJECT_LIBRARY ||
+          target->GetType() == cmState::STATIC_LIBRARY ||
+          target->GetType() == cmState::SHARED_LIBRARY ||
+          target->GetType() == cmState::MODULE_LIBRARY))
         {
         makeHelper[makeHelper.size()-1] = // fill placeholder
-          this->PostBuildMakeTarget(target.GetName(), "$(CONFIGURATION)");
+          this->PostBuildMakeTarget(target->GetName(), "$(CONFIGURATION)");
         cmCustomCommandLines commandLines;
         commandLines.push_back(makeHelper);
         std::vector<std::string> no_byproducts;
-        lg->GetMakefile()->AddCustomCommandToTarget(target.GetName(),
+        lg->GetMakefile()->AddCustomCommandToTarget(target->GetName(),
                                                     no_byproducts,
                                                     no_depends,
                                                     commandLines,
@@ -554,19 +554,17 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                                                     dir.c_str());
         }
 
-      if(target.GetType() != cmState::INTERFACE_LIBRARY
-          && !target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
+      if(target->GetType() != cmState::INTERFACE_LIBRARY
+          && !target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
-        allbuild->AddUtility(target.GetName());
+        allbuild->AddUtility(target->GetName());
         }
 
-      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
-
       // Refer to the build configuration file for easy editing.
       listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
-      targetGT->AddSource(listfile.c_str());
+      target->AddSource(listfile.c_str());
       }
     }
 }
@@ -3074,28 +3072,26 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& cmtarget = *(*l)->Target;
+      cmGeneratorTarget* gtgt = *l;
 
       // Same skipping logic here as in CreateXCodeTargets so that we do not
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
       // groups:
       //
-      if(cmtarget.GetType() == cmState::GLOBAL_TARGET)
+      if(gtgt->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+      if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
 
-      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
-
       // add the soon to be generated Info.plist file as a source for a
       // MACOSX_BUNDLE file
-      if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
+      if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(cmtarget);
+        std::string plist = this->ComputeInfoPListLocation(gtgt->Target);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3115,14 +3111,14 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKey(cmtarget, sf);
+          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKey(gtgt->Target, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
       // Put OBJECT_LIBRARY objects in proper groups:
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(&cmtarget)->UseObjectLibraries(objs, "");
+      gtgt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -3130,8 +3126,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(cmtarget, source);
+          this->CreateOrGetPBXGroup(gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(gtgt->Target, source);
         this->GroupMap[key] = pbxgroup;
         }
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2c2997e2151a12cc7e267bdb5a6eab42594e85d
commit a2c2997e2151a12cc7e267bdb5a6eab42594e85d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:20:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:03 2015 +0200

    Makefiles: Port to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 2c47ab2..bd47715 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 
 cmCommonTargetGenerator::cmCommonTargetGenerator(
   cmOutputConverter::RelativeRoot wd,
@@ -26,7 +25,6 @@ cmCommonTargetGenerator::cmCommonTargetGenerator(
   )
   : WorkingDirectory(wd)
   , GeneratorTarget(gt)
-  , Target(gt->Target)
   , Makefile(gt->Makefile)
   , LocalGenerator(static_cast<cmLocalCommonGenerator*>(gt->LocalGenerator))
   , GlobalGenerator(static_cast<cmGlobalCommonGenerator*>(
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index a4b2c10..3fb1fd0 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -21,7 +21,6 @@ class cmGlobalCommonGenerator;
 class cmLocalCommonGenerator;
 class cmMakefile;
 class cmSourceFile;
-class cmTarget;
 
 /** \class cmCommonTargetGenerator
  * \brief Common infrastructure for Makefile and Ninja per-target generators
@@ -49,7 +48,6 @@ protected:
 
   cmOutputConverter::RelativeRoot WorkingDirectory;
   cmGeneratorTarget* GeneratorTarget;
-  cmTarget* Target;
   cmMakefile* Makefile;
   cmLocalCommonGenerator* LocalGenerator;
   cmGlobalCommonGenerator* GlobalGenerator;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 4d7ca25..b4a915c 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -16,7 +16,6 @@
 #include "cmake.h"
 #include "cmGeneratedFileStream.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmGeneratorTarget.h"
 #include "cmAlgorithms.h"
 
@@ -742,7 +741,7 @@ cmGlobalUnixMakefileGenerator3
       makefileName = localName;
       makefileName += "/build.make";
 
-      bool needRequiresStep = this->NeedRequiresStep(*gtarget->Target);
+      bool needRequiresStep = this->NeedRequiresStep(gtarget);
 
       lg->WriteDivider(ruleFileStream);
       ruleFileStream
@@ -1129,19 +1128,19 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
 
 
 bool cmGlobalUnixMakefileGenerator3
-::NeedRequiresStep(cmTarget const& target)
+::NeedRequiresStep(const cmGeneratorTarget* target)
 {
   std::set<std::string> languages;
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&target);
-  gtgt->GetLanguages(languages,
-                target.GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"));
+  target->GetLanguages(languages,
+                       target->Target->GetMakefile()
+                       ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::set<std::string>::const_iterator l = languages.begin();
       l != languages.end(); ++l)
     {
     std::string var = "CMAKE_NEEDS_REQUIRES_STEP_";
     var += *l;
     var += "_FLAG";
-    if(target.GetMakefile()->GetDefinition(var))
+    if(target->Target->GetMakefile()->GetDefinition(var))
       {
       return true;
       }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 0485eb8..63ffcb4 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -154,7 +154,7 @@ protected:
                                  cmGeneratorTarget* target);
 
   // does this generator need a requires step for any of its targets
-  bool NeedRequiresStep(cmTarget const&);
+  bool NeedRequiresStep(cmGeneratorTarget const*);
 
   // Target name hooks for superclass.
   const char* GetAllTargetName()           const { return "all"; }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index e9dc9ff..34a50a3 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1977,7 +1977,7 @@ void cmLocalUnixMakefileGenerator3
                           cmGeneratorTarget* target)
 {
   ImplicitDependLanguageMap const& implicitLangs =
-    this->GetImplicitDepends(*target->Target);
+    this->GetImplicitDepends(target);
 
   // list the languages
   cmakefileStream
@@ -2292,19 +2292,20 @@ cmLocalUnixMakefileGenerator3
 
 //----------------------------------------------------------------------------
 cmLocalUnixMakefileGenerator3::ImplicitDependLanguageMap const&
-cmLocalUnixMakefileGenerator3::GetImplicitDepends(cmTarget const& tgt)
+cmLocalUnixMakefileGenerator3::GetImplicitDepends(
+    const cmGeneratorTarget* tgt)
 {
-  return this->ImplicitDepends[tgt.GetName()];
+  return this->ImplicitDepends[tgt->GetName()];
 }
 
 //----------------------------------------------------------------------------
 void
-cmLocalUnixMakefileGenerator3::AddImplicitDepends(cmTarget const& tgt,
+cmLocalUnixMakefileGenerator3::AddImplicitDepends(const cmGeneratorTarget* tgt,
                                                   const std::string& lang,
                                                   const char* obj,
                                                   const char* src)
 {
-  this->ImplicitDepends[tgt.GetName()][lang][obj].push_back(src);
+  this->ImplicitDepends[tgt->GetName()][lang][obj].push_back(src);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 7e0f248..8f69311 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -21,7 +21,6 @@ class cmCustomCommand;
 class cmCustomCommandGenerator;
 class cmDepends;
 class cmMakefileTargetGenerator;
-class cmTarget;
 class cmSourceFile;
 
 /** \class cmLocalUnixMakefileGenerator3
@@ -141,9 +140,11 @@ public:
     public std::map<std::string, ImplicitDependFileMap> {};
   struct ImplicitDependTargetMap:
     public std::map<std::string, ImplicitDependLanguageMap> {};
-  ImplicitDependLanguageMap const& GetImplicitDepends(cmTarget const& tgt);
+  ImplicitDependLanguageMap const&
+  GetImplicitDepends(cmGeneratorTarget const* tgt);
 
-  void AddImplicitDepends(cmTarget const& tgt, const std::string& lang,
+  void AddImplicitDepends(cmGeneratorTarget const* tgt,
+                          const std::string& lang,
                           const char* obj, const char* src);
 
   // write the target rules for the local Makefile into the stream
@@ -197,12 +198,12 @@ protected:
                             const std::string& helpTarget);
 
   void WriteTargetDependRule(std::ostream& ruleFileStream,
-                             cmTarget& target);
+                             cmGeneratorTarget* target);
   void WriteTargetCleanRule(std::ostream& ruleFileStream,
-                            cmTarget& target,
+                            cmGeneratorTarget* target,
                             const std::vector<std::string>& files);
   void WriteTargetRequiresRule(std::ostream& ruleFileStream,
-                               cmTarget& target,
+                               cmGeneratorTarget* target,
                                const std::vector<std::string>& objects);
 
   void AppendRuleDepend(std::vector<std::string>& depends,
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 020e64c..f56037f 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 
 //----------------------------------------------------------------------------
@@ -279,11 +278,13 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(!relink)
     {
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget);
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -448,8 +449,9 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(!relink)
     {
     this->LocalGenerator->
-      AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->GeneratorTarget);
+      AppendCustomCommands(commands,
+                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget);
     }
 
   // Write the build rule.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index df2a8c9..0a65641 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 #include "cmAlgorithms.h"
 
@@ -114,7 +113,8 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
 
   // Add post-build rules.
   this->LocalGenerator->
-    AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
+    AppendCustomCommands(commands,
+                         this->GeneratorTarget->Target->GetPostBuildCommands(),
                          this->GeneratorTarget);
 
   // Depend on the object files.
@@ -457,11 +457,13 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(!relink)
     {
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget);
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -811,8 +813,9 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(!relink)
     {
     this->LocalGenerator->
-      AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->GeneratorTarget);
+      AppendCustomCommands(commands,
+                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget);
     }
 
   // Compute the list of outputs.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b7970fd..7acccb3 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 #include "cmState.h"
 #include "cmComputeLinkInformation.h"
@@ -432,7 +431,7 @@ void cmMakefileTargetGenerator
   std::string srcFullPath =
     this->Convert(source.GetFullPath(), cmLocalGenerator::FULL);
   this->LocalGenerator->
-    AddImplicitDepends(*this->Target, lang,
+    AddImplicitDepends(this->GeneratorTarget, lang,
                        objFullPath.c_str(),
                        srcFullPath.c_str());
 }
@@ -1241,7 +1240,7 @@ void cmMakefileTargetGenerator
     std::string srcFullPath =
       this->Convert(idi->second, cmLocalGenerator::FULL);
     this->LocalGenerator->
-      AddImplicitDepends(*this->Target, idi->first,
+      AddImplicitDepends(this->GeneratorTarget, idi->first,
                          objFullPath.c_str(),
                          srcFullPath.c_str());
     }
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index e38c50b..38f40c0 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -24,7 +24,6 @@ class cmGeneratedFileStream;
 class cmGlobalUnixMakefileGenerator3;
 class cmLocalUnixMakefileGenerator3;
 class cmMakefile;
-class cmTarget;
 class cmSourceFile;
 
 /** \class cmMakefileTargetGenerator
@@ -51,7 +50,6 @@ public:
   std::string GetProgressFileNameFull()
     { return this->ProgressFileNameFull; }
 
-  cmTarget* GetTarget() { return this->Target;}
   cmGeneratorTarget* GetGeneratorTarget() { return this->GeneratorTarget;}
 
 protected:
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 11601c5..d35c3ae 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 
 //----------------------------------------------------------------------------
 cmMakefileUtilityTargetGenerator
@@ -68,19 +67,21 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Utility targets store their rules in pre- and post-build commands.
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->Target->GetPreBuildCommands());
+    (depends, this->GeneratorTarget->Target->GetPreBuildCommands());
 
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->Target->GetPostBuildCommands());
+    (depends, this->GeneratorTarget->Target->GetPostBuildCommands());
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPreBuildCommands(), this->GeneratorTarget);
+    (commands, this->GeneratorTarget->Target->GetPreBuildCommands(),
+     this->GeneratorTarget);
 
   // Depend on all custom command outputs for sources
   this->DriveCustomCommands(depends);
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPostBuildCommands(), this->GeneratorTarget);
+    (commands, this->GeneratorTarget->Target->GetPostBuildCommands(),
+     this->GeneratorTarget);
 
   // Add dependencies on targets that must be built first.
   this->AppendTargetDepends(depends);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b1f41dfc4794a636dbc52975c950c6b4dd9ebba
commit 0b1f41dfc4794a636dbc52975c950c6b4dd9ebba
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:13:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:03 2015 +0200

    Ninja: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6e650ce..2671f4d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -886,7 +886,7 @@ void cmGlobalNinjaGenerator::WriteDisclaimer(std::ostream& os)
     << cmVersion::GetMinorVersion() << "\n\n";
 }
 
-void cmGlobalNinjaGenerator::AddDependencyToAll(cmTarget* target)
+void cmGlobalNinjaGenerator::AddDependencyToAll(cmGeneratorTarget* target)
 {
   this->AppendTargetOutputs(target, this->AllDependencies);
 }
@@ -912,18 +912,16 @@ void cmGlobalNinjaGenerator::WriteAssumedSourceDependencies()
 
 void
 cmGlobalNinjaGenerator
-::AppendTargetOutputs(cmTarget const* target, cmNinjaDeps& outputs)
+::AppendTargetOutputs(cmGeneratorTarget const* target, cmNinjaDeps& outputs)
 {
   std::string configName =
-    target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
+    target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // for frameworks, we want the real name, not smple name
   // frameworks always appear versioned, and the build.ninja
   // will always attempt to manage symbolic links instead
   // of letting cmOSXBundleGenerator do it.
-  bool realname = gtgt->IsFrameworkOnApple();
+  bool realname = target->IsFrameworkOnApple();
 
   switch (target->GetType()) {
   case cmState::EXECUTABLE:
@@ -932,7 +930,7 @@ cmGlobalNinjaGenerator
   case cmState::MODULE_LIBRARY:
     {
     outputs.push_back(this->ConvertToNinjaPath(
-      gtgt->GetFullPath(configName, false, realname)));
+      target->GetFullPath(configName, false, realname)));
     break;
     }
   case cmState::OBJECT_LIBRARY:
@@ -962,16 +960,15 @@ cmGlobalNinjaGenerator
 
 void
 cmGlobalNinjaGenerator
-::AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs)
+::AppendTargetDepends(cmGeneratorTarget const* target, cmNinjaDeps& outputs)
 {
   if (target->GetType() == cmState::GLOBAL_TARGET) {
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
-    std::set<std::string> const& utils = target->GetUtilities();
+    std::set<std::string> const& utils = target->Target->GetUtilities();
     std::copy(utils.begin(), utils.end(), std::back_inserter(outputs));
   } else {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(gt);
+    cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(target);
     for (cmTargetDependSet::const_iterator i = targetDeps.begin();
          i != targetDeps.end(); ++i)
       {
@@ -979,13 +976,13 @@ cmGlobalNinjaGenerator
         {
         continue;
         }
-      this->AppendTargetOutputs((*i)->Target, outputs);
+      this->AppendTargetOutputs(*i, outputs);
     }
   }
 }
 
 void cmGlobalNinjaGenerator::AddTargetAlias(const std::string& alias,
-                                            cmTarget* target) {
+                                            cmGeneratorTarget* target) {
   cmNinjaDeps outputs;
   this->AppendTargetOutputs(target, outputs);
   // Mark the target's outputs as ambiguous to ensure that no other target uses
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 292f7c7..7547f16 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -285,9 +285,11 @@ public:
     ASD.insert(deps.begin(), deps.end());
   }
 
-  void AppendTargetOutputs(cmTarget const* target, cmNinjaDeps& outputs);
-  void AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs);
-  void AddDependencyToAll(cmTarget* target);
+  void AppendTargetOutputs(cmGeneratorTarget const* target,
+                           cmNinjaDeps& outputs);
+  void AppendTargetDepends(cmGeneratorTarget const* target,
+                           cmNinjaDeps& outputs);
+  void AddDependencyToAll(cmGeneratorTarget* target);
   void AddDependencyToAll(const std::string& input);
 
   const std::vector<cmLocalGenerator*>& GetLocalGenerators() const {
@@ -299,7 +301,7 @@ public:
   int GetRuleCmdLength(const std::string& name) {
     return RuleCmdLength[name]; }
 
-  void AddTargetAlias(const std::string& alias, cmTarget* target);
+  void AddTargetAlias(const std::string& alias, cmGeneratorTarget* target);
 
   virtual void ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const;
 
@@ -388,7 +390,7 @@ private:
   /// The mapping from source file to assumed dependencies.
   std::map<std::string, std::set<std::string> > AssumedSourceDependencies;
 
-  typedef std::map<std::string, cmTarget*> TargetAliasMap;
+  typedef std::map<std::string, cmGeneratorTarget*> TargetAliasMap;
   TargetAliasMap TargetAliases;
 };
 
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 3dd18bd..891c44e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -89,7 +89,7 @@ void cmLocalNinjaGenerator::Generate()
       if (!this->GetGlobalNinjaGenerator()->IsExcluded(
             this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0],
             *t))
-        this->GetGlobalNinjaGenerator()->AddDependencyToAll((*t)->Target);
+        this->GetGlobalNinjaGenerator()->AddDependencyToAll(*t);
       delete tg;
       }
     }
@@ -285,14 +285,14 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
 
 void
 cmLocalNinjaGenerator
-::AppendTargetOutputs(cmTarget* target, cmNinjaDeps& outputs)
+::AppendTargetOutputs(cmGeneratorTarget* target, cmNinjaDeps& outputs)
 {
   this->GetGlobalNinjaGenerator()->AppendTargetOutputs(target, outputs);
 }
 
 void
 cmLocalNinjaGenerator
-::AppendTargetDepends(cmTarget* target, cmNinjaDeps& outputs)
+::AppendTargetDepends(cmGeneratorTarget* target, cmNinjaDeps& outputs)
 {
   this->GetGlobalNinjaGenerator()->AppendTargetDepends(target, outputs);
 }
@@ -441,7 +441,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
 }
 
 void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand const* cc,
-                                                   cmTarget* target)
+                                                   cmGeneratorTarget* target)
 {
   this->CustomCommandTargets[cc].insert(target);
 }
@@ -459,7 +459,7 @@ void cmLocalNinjaGenerator::WriteCustomCommandBuildStatements()
     //
     // FIXME: This won't work in certain obscure scenarios involving indirect
     // dependencies.
-    std::set<cmTarget*>::iterator j = i->second.begin();
+    std::set<cmGeneratorTarget*>::iterator j = i->second.begin();
     assert(j != i->second.end());
     std::vector<std::string> ccTargetDeps;
     this->AppendTargetDepends(*j, ccTargetDeps);
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index ce5f82d..b6987ef 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -58,10 +58,11 @@ public:
 
   std::string BuildCommandLine(const std::vector<std::string> &cmdLines);
 
-  void AppendTargetOutputs(cmTarget* target, cmNinjaDeps& outputs);
-  void AppendTargetDepends(cmTarget* target, cmNinjaDeps& outputs);
+  void AppendTargetOutputs(cmGeneratorTarget* target, cmNinjaDeps& outputs);
+  void AppendTargetDepends(cmGeneratorTarget* target, cmNinjaDeps& outputs);
 
-  void AddCustomCommandTarget(cmCustomCommand const* cc, cmTarget* target);
+  void AddCustomCommandTarget(cmCustomCommand const* cc,
+                              cmGeneratorTarget* target);
   void AppendCustomCommandLines(cmCustomCommandGenerator const& ccg,
                                 std::vector<std::string> &cmdLines);
   void AppendCustomCommandDeps(cmCustomCommandGenerator const& ccg,
@@ -102,7 +103,7 @@ private:
 
   std::string HomeRelativeOutputPath;
 
-  typedef std::map<cmCustomCommand const*, std::set<cmTarget*> >
+  typedef std::map<cmCustomCommand const*, std::set<cmGeneratorTarget*> >
     CustomCommandTargetMap;
   CustomCommandTargetMap CustomCommandTargets;
 };
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index dafbda9..b533d37 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -399,7 +399,6 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
 
 void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 {
-  cmTarget& target = *this->GetTarget();
   cmGeneratorTarget& gt = *this->GetGeneratorTarget();
   const std::string cfgName = this->GetConfigName();
   std::string targetOutput = ConvertToNinjaPath(
@@ -443,7 +442,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   // Write comments.
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
-  const cmState::TargetType targetType = target.GetType();
+  const cmState::TargetType targetType = gt.GetType();
   this->GetBuildFileStream()
     << "# Link build statements for "
     << cmState::GetTargetTypeName(targetType)
@@ -490,13 +489,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                           &genTarget,
                           useWatcomQuote);
   if(this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS")
-     && target.GetType() == cmState::SHARED_LIBRARY)
+     && gt.GetType() == cmState::SHARED_LIBRARY)
     {
-    if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(gt.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file
         = gt.GetSupportDirectory();
-      name_of_def_file += "/" + target.GetName();
+      name_of_def_file += "/" + gt.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
       vars["LINK_FLAGS"] += this->GetLocalGenerator()
@@ -505,7 +504,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       }
     }
 
-  this->addPoolNinjaVariable("JOB_POOL_LINK", &target, vars);
+  this->addPoolNinjaVariable("JOB_POOL_LINK", &gt, vars);
 
   this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);
   vars["LINK_FLAGS"] = cmGlobalNinjaGenerator
@@ -599,9 +598,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   const std::vector<cmCustomCommand> *cmdLists[3] = {
-    &target.GetPreBuildCommands(),
-    &target.GetPreLinkCommands(),
-    &target.GetPostBuildCommands()
+    &gt.Target->GetPreBuildCommands(),
+    &gt.Target->GetPreLinkCommands(),
+    &gt.Target->GetPostBuildCommands()
   };
 
   std::vector<std::string> preLinkCmdLines, postBuildCmdLines;
@@ -626,17 +625,17 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // maybe create .def file from list of objects
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (gt.GetType() == cmState::SHARED_LIBRARY &&
       this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(gt.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
         = gt.GetSupportDirectory();
-      name_of_def_file += "/" + target.GetName();
+      name_of_def_file += "/" + gt.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
       cmd += " -E __create_def ";
@@ -699,11 +698,11 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   const std::string rspfile =
       std::string(cmake::GetCMakeFilesDirectoryPostSlash())
-      + target.GetName() + ".rsp";
+      + gt.GetName() + ".rsp";
 
   // Gather order-only dependencies.
   cmNinjaDeps orderOnlyDeps;
-  this->GetLocalGenerator()->AppendTargetDepends(this->GetTarget(),
+  this->GetLocalGenerator()->AppendTargetDepends(this->GetGeneratorTarget(),
     orderOnlyDeps);
 
   // Ninja should restat after linking if and only if there are byproducts.
@@ -772,8 +771,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // Add aliases for the file name and the target name.
-  globalGen.AddTargetAlias(this->TargetNameOut, &target);
-  globalGen.AddTargetAlias(this->GetTargetName(), &target);
+  globalGen.AddTargetAlias(this->TargetNameOut, &gt);
+  globalGen.AddTargetAlias(this->GetTargetName(), &gt);
 }
 
 //----------------------------------------------------------------------------
@@ -781,7 +780,8 @@ void cmNinjaNormalTargetGenerator::WriteObjectLibStatement()
 {
   // Write a phony output that depends on all object files.
   cmNinjaDeps outputs;
-  this->GetLocalGenerator()->AppendTargetOutputs(this->GetTarget(), outputs);
+  this->GetLocalGenerator()->AppendTargetOutputs(this->GetGeneratorTarget(),
+                                                 outputs);
   cmNinjaDeps depends = this->GetObjects();
   this->GetGlobalGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
                                               "Object library "
@@ -791,5 +791,5 @@ void cmNinjaNormalTargetGenerator::WriteObjectLibStatement()
 
   // Add aliases for the target name.
   this->GetGlobalGenerator()->AddTargetAlias(this->GetTargetName(),
-                                             this->GetTarget());
+                                             this->GetGeneratorTarget());
 }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index b018005..dc2c7a6 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -486,7 +486,8 @@ cmNinjaTargetGenerator
       si != customCommands.end(); ++si)
      {
      cmCustomCommand const* cc = (*si)->GetCustomCommand();
-     this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
+     this->GetLocalGenerator()->AddCustomCommandTarget(cc,
+         this->GetGeneratorTarget());
      // Record the custom commands for this target. The container is used
      // in WriteObjectBuildStatement when called in a loop below.
      this->CustomCommands.push_back(cc);
@@ -511,7 +512,8 @@ cmNinjaTargetGenerator
     }
 
   cmNinjaDeps orderOnlyDeps;
-  this->GetLocalGenerator()->AppendTargetDepends(this->Target, orderOnlyDeps);
+  this->GetLocalGenerator()->AppendTargetDepends(this->GeneratorTarget,
+                                                 orderOnlyDeps);
 
   // Add order-only dependencies on custom command outputs.
   for(std::vector<cmCustomCommand const*>::const_iterator
@@ -633,7 +635,8 @@ cmNinjaTargetGenerator
                               ConvertToNinjaPath(objectFileDir),
                               cmLocalGenerator::SHELL);
 
-  this->addPoolNinjaVariable("JOB_POOL_COMPILE", this->GetTarget(), vars);
+  this->addPoolNinjaVariable("JOB_POOL_COMPILE",
+                             this->GetGeneratorTarget(), vars);
 
   this->SetMsvcTargetPdbVariable(vars);
 
@@ -782,7 +785,7 @@ cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
 
 void cmNinjaTargetGenerator::addPoolNinjaVariable(
                                               const std::string& pool_property,
-                                              cmTarget* target,
+                                              cmGeneratorTarget* target,
                                               cmNinjaVars& vars)
 {
     const char* pool = target->GetProperty(pool_property);
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 0267f63..e3ec423 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -53,9 +53,6 @@ protected:
   cmGeneratedFileStream& GetBuildFileStream() const;
   cmGeneratedFileStream& GetRulesFileStream() const;
 
-  cmTarget* GetTarget() const
-  { return this->Target; }
-
   cmGeneratorTarget* GetGeneratorTarget() const
   { return this->GeneratorTarget; }
 
@@ -152,7 +149,7 @@ protected:
   std::set<std::string> MacContentFolders;
 
   void addPoolNinjaVariable(const std::string& pool_property,
-                            cmTarget* target,
+                            cmGeneratorTarget* target,
                             cmNinjaVars& vars);
 
 private:
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 5bbe268..b2a5334 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmGlobalNinjaGenerator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmCustomCommandGenerator.h"
 
 cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(
@@ -34,8 +33,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
   cmNinjaDeps deps, outputs, util_outputs(1, utilCommandName);
 
   const std::vector<cmCustomCommand> *cmdLists[2] = {
-    &this->GetTarget()->GetPreBuildCommands(),
-    &this->GetTarget()->GetPostBuildCommands()
+    &this->GetGeneratorTarget()->Target->GetPreBuildCommands(),
+    &this->GetGeneratorTarget()->Target->GetPostBuildCommands()
   };
 
   bool uses_terminal = false;
@@ -66,7 +65,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
       {
       cmCustomCommandGenerator ccg(*cc, this->GetConfigName(),
                                    this->GetLocalGenerator());
-      this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
+      this->GetLocalGenerator()->AddCustomCommandTarget(cc,
+          this->GetGeneratorTarget());
 
       // Depend on all custom command outputs.
       const std::vector<std::string>& ccOutputs = ccg.GetOutputs();
@@ -78,8 +78,10 @@ void cmNinjaUtilityTargetGenerator::Generate()
       }
     }
 
-  this->GetLocalGenerator()->AppendTargetOutputs(this->GetTarget(), outputs);
-  this->GetLocalGenerator()->AppendTargetDepends(this->GetTarget(), deps);
+  this->GetLocalGenerator()->AppendTargetOutputs(this->GetGeneratorTarget(),
+                                                 outputs);
+  this->GetLocalGenerator()->AppendTargetDepends(this->GetGeneratorTarget(),
+                                                 deps);
 
   if (commands.empty()) {
     this->GetGlobalGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
@@ -140,5 +142,5 @@ void cmNinjaUtilityTargetGenerator::Generate()
   }
 
   this->GetGlobalGenerator()->AddTargetAlias(this->GetTargetName(),
-                                             this->GetTarget());
+                                             this->GetGeneratorTarget());
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a456855ece62f7337b62bbe578ae1eaebe73c8c3
commit a456855ece62f7337b62bbe578ae1eaebe73c8c3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:59:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:03 2015 +0200

    Use cmLocalGenerator at generate-time.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 6920faf..2c47ab2 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -123,7 +123,7 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const
     else
       {
       // Interpret relative to the current output directory.
-      mod_dir = this->Makefile->GetCurrentBinaryDirectory();
+      mod_dir = this->LocalGenerator->GetCurrentBinaryDirectory();
       mod_dir += "/";
       mod_dir += target_mod_dir;
       }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 1a84625..d52ce35 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -456,13 +456,13 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
 
   if (cge->GetHadContextSensitiveCondition())
     {
-    cmMakefile* mf = target->Target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" is installed with "
     "INCLUDES DESTINATION set to a context sensitive path.  Paths which "
     "depend on the configuration, policy values or the link interface are "
     "not supported.  Consider using target_include_directories instead.";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
@@ -535,11 +535,11 @@ void getCompatibleInterfaceProperties(cmGeneratorTarget *target,
 
   if (!info)
     {
-    cmMakefile* mf = target->Target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Exporting the target \"" << target->GetName() << "\" is not "
         "allowed since its linker language cannot be determined";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
@@ -835,13 +835,13 @@ cmExportFileGenerator
 
   if(newCMP0022Behavior && !this->ExportOld)
     {
-    cmMakefile *mf = target->Target->GetMakefile();
+    cmLocalGenerator *lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" has policy CMP0022 enabled, "
          "but also has old-style LINK_INTERFACE_LIBRARIES properties "
          "populated, but it was exported without the "
          "EXPORT_LINK_INTERFACE_LIBRARIES to export the old-style properties";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 89a6dff..6e650ce 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -719,7 +719,7 @@ void cmGlobalNinjaGenerator
 {
   // Compute full path to object file directory for this target.
   std::string dir;
-  dir += gt->Makefile->GetCurrentBinaryDirectory();
+  dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
@@ -938,7 +938,7 @@ cmGlobalNinjaGenerator
   case cmState::OBJECT_LIBRARY:
   case cmState::UTILITY: {
     std::string path = this->ConvertToNinjaPath(
-      target->GetMakefile()->GetCurrentBinaryDirectory());
+      target->GetLocalGenerator()->GetCurrentBinaryDirectory());
     if (path.empty() || path == ".")
       outputs.push_back(target->GetName());
     else {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 2a5b153..4d7ca25 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -116,7 +116,7 @@ cmGlobalUnixMakefileGenerator3
 {
   // Compute full path to object file directory for this target.
   std::string dir;
-  dir += gt->Makefile->GetCurrentBinaryDirectory();
+  dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7a10356..59d06f6 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -76,7 +76,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   if(this->Target->NeedRelinkBeforeInstall(config))
     {
     fromDirConfig =
-        this->Target->Target->GetMakefile()->GetCurrentBinaryDirectory();
+        this->Target->GetLocalGenerator()->GetCurrentBinaryDirectory();
     fromDirConfig += cmake::GetCMakeFilesDirectory();
     fromDirConfig += "/CMakeRelink.dir/";
     }
@@ -111,7 +111,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
     case cmState::UTILITY:
     case cmState::GLOBAL_TARGET:
     case cmState::UNKNOWN_LIBRARY:
-      this->Target->Target->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR,
+      this->Target->GetLocalGenerator()->IssueMessage(cmake::INTERNAL_ERROR,
         "cmInstallTargetGenerator created with non-installable target.");
       return;
     }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2166c09..c37417d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2140,7 +2140,7 @@ void cmLocalGenerator
       "has the following visibility properties set for " << lang << ":\n" <<
       warnCMP0063 <<
       "For compatibility CMake is not honoring them for this target.";
-    target->Target->GetMakefile()->GetCMakeInstance()
+    target->GetLocalGenerator()->GetCMakeInstance()
       ->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
                      target->GetBacktrace());
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index dae8aaf..e9dc9ff 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -188,7 +188,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     // Compute full path to object file directory for this target.
     std::string dir;
-    dir += gt->Makefile->GetCurrentBinaryDirectory();
+    dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
     dir += "/";
     dir += this->GetTargetDirectory(gt);
     dir += "/";

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3f1aef5ee65d66a9f075f02812c90383eeec6e3
commit b3f1aef5ee65d66a9f075f02812c90383eeec6e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 17:06:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:03 2015 +0200

    Port to GetGeneratorTargets.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 03f4fdd..113c989 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -175,13 +175,12 @@ void cmComputeTargetDepends::CollectTargets()
     this->GlobalGenerator->GetLocalGenerators();
   for(unsigned int i = 0; i < lgens.size(); ++i)
     {
-    const cmTargets& targets = lgens[i]->GetMakefile()->GetTargets();
-    for(cmTargets::const_iterator ti = targets.begin();
+    const std::vector<cmGeneratorTarget*> targets =
+        lgens[i]->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      cmTarget const* target = &ti->second;
-      cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(target);
+      cmGeneratorTarget* gt = *ti;
       int index = static_cast<int>(this->Targets.size());
       this->TargetIndex[gt] = index;
       this->Targets.push_back(gt);
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 3bc76fa..a71b1cb 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -319,12 +319,12 @@ void cmExtraCodeBlocksGenerator
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
        lg!=lgs.end(); lg++)
     {
-    cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -333,7 +333,7 @@ void cmExtraCodeBlocksGenerator
           if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
-            this->AppendTarget(fout, ti->first, 0,
+            this->AppendTarget(fout, targetName, 0,
                                make.c_str(), *lg, compiler.c_str());
             }
           }
@@ -341,15 +341,16 @@ void cmExtraCodeBlocksGenerator
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-             || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-             || ((ti->first.find("Experimental")==0)
-                                               && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+             || ((targetName.find("Continuous")==0)
+                 &&(targetName!="Continuous"))
+             || ((targetName.find("Experimental")==0)
+                                             && (targetName!="Experimental")))
             {
             break;
             }
 
-          this->AppendTarget(fout, ti->first, 0,
+          this->AppendTarget(fout, targetName, 0,
                                  make.c_str(), *lg, compiler.c_str());
           break;
         case cmState::EXECUTABLE:
@@ -358,11 +359,10 @@ void cmExtraCodeBlocksGenerator
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
-          this->AppendTarget(fout, ti->first, gt,
+          cmGeneratorTarget* gt = *ti;
+          this->AppendTarget(fout, targetName, gt,
                              make.c_str(), *lg, compiler.c_str());
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
           this->AppendTarget(fout, fastTarget, gt,
                              make.c_str(), *lg, compiler.c_str());
@@ -388,11 +388,11 @@ void cmExtraCodeBlocksGenerator
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -402,8 +402,7 @@ void cmExtraCodeBlocksGenerator
         case cmState::UTILITY: // can have sources since 2.6.3
           {
           std::vector<cmSourceFile*> sources;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
@@ -442,7 +441,7 @@ void cmExtraCodeBlocksGenerator
               }
 
             CbpUnit &cbpUnit = allFiles[fullPath];
-            cbpUnit.Targets.push_back(&(ti->second));
+            cbpUnit.Targets.push_back((*ti)->Target);
             }
           }
         default:  // intended fallthrough
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 10f33be..f4a6537 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -155,12 +155,12 @@ void cmExtraCodeLiteGenerator
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
 
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
           {
@@ -186,7 +186,7 @@ void cmExtraCodeLiteGenerator
           break;
         }
 
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -194,8 +194,7 @@ void cmExtraCodeLiteGenerator
         case cmState::MODULE_LIBRARY:
           {
           std::vector<cmSourceFile*> sources;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 1921f03..aedf6f4 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -536,13 +536,15 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
        ++lgIt)
     {
     cmMakefile* makefile = (*lgIt)->GetMakefile();
-    const cmTargets& targets = makefile->GetTargets();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*lgIt)->GetGeneratorTargets();
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end();++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti=targets.begin();
+        ti!=targets.end();++ti)
       {
       std::string linkName2 = linkName;
       linkName2 += "/";
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -550,10 +552,10 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
+          const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
           linkName2 += prefix;
-          linkName2 += ti->first;
+          linkName2 += (*ti)->GetName();
           this->AppendLinkedResource(fout, linkName2, "virtual:/virtual",
                                      VirtualFolder);
           if (!this->GenerateLinkedResources)
@@ -562,10 +564,8 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
             }
           std::vector<cmSourceGroup> sourceGroups=makefile->GetSourceGroups();
           // get the files from the source lists then add them to the groups
-          cmTarget* tgt = const_cast<cmTarget*>(&ti->second);
+          cmGeneratorTarget* gt = const_cast<cmGeneratorTarget*>(*ti);
           std::vector<cmSourceFile*> files;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(tgt);
           gt->GetSourceFiles(files,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for(std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
@@ -1030,7 +1030,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*it)->GetGeneratorTargets();
     std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
@@ -1038,9 +1039,11 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       subdir = "";
       }
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti =
+        targets.begin(); ti!=targets.end(); ++ti)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -1048,22 +1051,22 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           // not from the subdirs
           if (subdir.empty())
            {
-           this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
+           this->AppendTarget(fout, targetName, make, makeArgs, subdir, ": ");
            }
          }
          break;
        case cmState::UTILITY:
          // Add all utility targets, except the Nightly/Continuous/
          // Experimental-"sub"targets as e.g. NightlyStart
-         if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-          || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-          || ((ti->first.find("Experimental")==0)
-                                            && (ti->first!="Experimental")))
+         if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+          || ((targetName.find("Continuous")==0)&&(targetName!="Continuous"))
+          || ((targetName.find("Experimental")==0)
+                                            && (targetName!="Experimental")))
            {
            break;
            }
 
-         this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
+         this->AppendTarget(fout, targetName, make, makeArgs, subdir, ": ");
          break;
        case cmState::EXECUTABLE:
        case cmState::STATIC_LIBRARY:
@@ -1071,10 +1074,10 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        case cmState::MODULE_LIBRARY:
        case cmState::OBJECT_LIBRARY:
          {
-         const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
+         const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
-         this->AppendTarget(fout, ti->first, make, makeArgs, subdir, prefix);
-         std::string fastTarget = ti->first;
+         this->AppendTarget(fout, targetName, make, makeArgs, subdir, prefix);
+         std::string fastTarget = targetName;
          fastTarget += "/fast";
          this->AppendTarget(fout, fastTarget, make, makeArgs, subdir, prefix);
 
@@ -1083,21 +1086,20 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           {
           std::string virtDir = "[Targets]/";
           virtDir += prefix;
-          virtDir += ti->first;
+          virtDir += targetName;
           std::string buildArgs = "-C \"";
           buildArgs += (*it)->GetBinaryDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
-                             ti->first.c_str());
+                             targetName.c_str());
 
           std::string cleanArgs = "-E chdir \"";
           cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           cleanArgs += (*it)->GetTargetDirectory(gt);
           cleanArgs += "/cmake_clean.cmake\"";
           this->AppendTarget(fout, "Clean", cmSystemTools::GetCMakeCommand(),
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index dc6421b..1741acf 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -119,14 +119,16 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*it)->GetGeneratorTargets();
     std::string currentDir = (*it)->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti =
+        targets.begin(); ti!=targets.end(); ++ti)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -138,9 +140,9 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             insertTarget = true;
             // only add the "edit_cache" target if it's not ccmake, because
             // this will not work within the IDE
-            if (ti->first == "edit_cache")
+            if (targetName == "edit_cache")
               {
-              const char* editCommand = makefile->GetDefinition
+              const char* editCommand = (*it)->GetMakefile()->GetDefinition
               ("CMAKE_EDIT_COMMAND");
               if (editCommand == 0)
                 {
@@ -154,7 +156,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             }
           if (insertTarget)
             {
-            this->AppendTarget(fout, ti->first, make, makeArgs,
+            this->AppendTarget(fout, targetName, make, makeArgs,
                                currentDir, homeOutputDir);
             }
         }
@@ -162,15 +164,16 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-            || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-            || ((ti->first.find("Experimental")==0)
-            && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+            || ((targetName.find("Continuous")==0)
+                &&(targetName!="Continuous"))
+            || ((targetName.find("Experimental")==0)
+            && (targetName!="Experimental")))
             {
               break;
             }
 
-            this->AppendTarget(fout, ti->first, make, makeArgs,
+            this->AppendTarget(fout, targetName, make, makeArgs,
                                currentDir, homeOutputDir);
           break;
         case cmState::EXECUTABLE:
@@ -179,9 +182,9 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
         {
-          this->AppendTarget(fout, ti->first, make, makeArgs,
+          this->AppendTarget(fout, targetName, make, makeArgs,
                              currentDir, homeOutputDir);
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
           this->AppendTarget(fout, fastTarget, make, makeArgs,
                              currentDir, homeOutputDir);
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index ac0202b..47822e8 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -162,11 +162,12 @@ void cmExtraSublimeTextGenerator::
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -175,7 +176,7 @@ void cmExtraSublimeTextGenerator::
           if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
-            this->AppendTarget(fout, ti->first, *lg, 0,
+            this->AppendTarget(fout, targetName, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
                                sourceFileFlags, false);
             }
@@ -184,15 +185,16 @@ void cmExtraSublimeTextGenerator::
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-             || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-             || ((ti->first.find("Experimental")==0)
-                                               && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+             || ((targetName.find("Continuous")==0)
+                 &&(targetName!="Continuous"))
+             || ((targetName.find("Experimental")==0)
+                 && (targetName!="Experimental")))
             {
             break;
             }
 
-          this->AppendTarget(fout, ti->first, *lg, 0,
+          this->AppendTarget(fout, targetName, *lg, 0,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           break;
@@ -202,12 +204,12 @@ void cmExtraSublimeTextGenerator::
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, ti->first, *lg, &ti->second,
+          this->AppendTarget(fout, targetName, *lg, (*ti)->Target,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, *lg, &ti->second,
+          this->AppendTarget(fout, fastTarget, *lg, (*ti)->Target,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 13efc4c..d26cc34 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1468,34 +1468,34 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
 #ifdef CMAKE_BUILD_WITH_CMAKE
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    cmTargets& targets =
-      this->LocalGenerators[i]->GetMakefile()->GetTargets();
+    std::vector<cmGeneratorTarget*> targets =
+      this->LocalGenerators[i]->GetGeneratorTargets();
     std::vector<cmGeneratorTarget*> filteredTargets;
     filteredTargets.reserve(targets.size());
-    for(cmTargets::iterator ti = targets.begin();
+    for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      if (ti->second.GetType() == cmState::GLOBAL_TARGET)
+      if ((*ti)->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(ti->second.GetType() != cmState::EXECUTABLE &&
-         ti->second.GetType() != cmState::STATIC_LIBRARY &&
-         ti->second.GetType() != cmState::SHARED_LIBRARY &&
-         ti->second.GetType() != cmState::MODULE_LIBRARY &&
-         ti->second.GetType() != cmState::OBJECT_LIBRARY)
+      if((*ti)->GetType() != cmState::EXECUTABLE &&
+         (*ti)->GetType() != cmState::STATIC_LIBRARY &&
+         (*ti)->GetType() != cmState::SHARED_LIBRARY &&
+         (*ti)->GetType() != cmState::MODULE_LIBRARY &&
+         (*ti)->GetType() != cmState::OBJECT_LIBRARY)
         {
         continue;
         }
-      if((!ti->second.GetPropertyAsBool("AUTOMOC")
-            && !ti->second.GetPropertyAsBool("AUTOUIC")
-            && !ti->second.GetPropertyAsBool("AUTORCC"))
-          || ti->second.IsImported())
+      if((!(*ti)->GetPropertyAsBool("AUTOMOC")
+            && !(*ti)->GetPropertyAsBool("AUTOUIC")
+            && !(*ti)->GetPropertyAsBool("AUTORCC"))
+          || (*ti)->IsImported())
         {
         continue;
         }
       // don't do anything if there is no Qt4 or Qt5Core (which contains moc):
-      cmMakefile* mf = ti->second.GetMakefile();
+      cmMakefile* mf = (*ti)->Target->GetMakefile();
       std::string qtMajorVersion = mf->GetSafeDefinition("QT_VERSION_MAJOR");
       if (qtMajorVersion == "")
         {
@@ -1506,7 +1506,7 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
         continue;
         }
 
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(&ti->second);
+      cmGeneratorTarget* gt = *ti;
 
       cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt);
       filteredTargets.push_back(gt);
@@ -2706,23 +2706,22 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
       {
       continue;
       }
-    cmMakefile* mf = (*i)->GetMakefile();
     // Get the targets in the makefile
-    cmTargets &tgts = mf->GetTargets();
+    std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
     // loop over all the targets
-    for (cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+    for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+         l != tgts.end(); ++l)
       {
-      cmTarget* target = &l->second;
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-      if(this->IsRootOnlyTarget(gt) &&
-         target->GetMakefile() != root->GetMakefile())
+      cmGeneratorTarget* target = *l;
+      if(this->IsRootOnlyTarget(target) &&
+         target->GetLocalGenerator() != root)
         {
         continue;
         }
       // put the target in the set of original targets
-      originalTargets.insert(gt);
+      originalTargets.insert(target);
       // Get the set of targets that depend on target
-      this->AddTargetDepends(gt, projectTargets);
+      this->AddTargetDepends(target, projectTargets);
       }
     }
 }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 8659e34..7c6c48c 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -133,14 +133,13 @@ bool cmGlobalKdevelopGenerator
       }
 
     //get all sources
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*it)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
       std::vector<cmSourceFile*> sources;
-      cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(&ti->second);
-      gt->GetSourceFiles(sources, ti->second.GetMakefile()
+      cmGeneratorTarget* gt = *ti;
+      gt->GetSourceFiles(sources, gt->Target->GetMakefile()
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
            si!=sources.end(); si++)
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 248701a..2a5b153 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -423,17 +423,18 @@ void cmGlobalUnixMakefileGenerator3
     {
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>(lGenerators[i]);
     // for all of out targets
-    for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
-         l != lg->GetMakefile()->GetTargets().end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+         l != tgts.end(); l++)
       {
-      if((l->second.GetType() == cmState::EXECUTABLE) ||
-         (l->second.GetType() == cmState::STATIC_LIBRARY) ||
-         (l->second.GetType() == cmState::SHARED_LIBRARY) ||
-         (l->second.GetType() == cmState::MODULE_LIBRARY) ||
-         (l->second.GetType() == cmState::OBJECT_LIBRARY) ||
-         (l->second.GetType() == cmState::UTILITY))
+      if(((*l)->GetType() == cmState::EXECUTABLE) ||
+         ((*l)->GetType() == cmState::STATIC_LIBRARY) ||
+         ((*l)->GetType() == cmState::SHARED_LIBRARY) ||
+         ((*l)->GetType() == cmState::MODULE_LIBRARY) ||
+         ((*l)->GetType() == cmState::OBJECT_LIBRARY) ||
+         ((*l)->GetType() == cmState::UTILITY))
         {
-        cmGeneratorTarget* gt = this->GetGeneratorTarget(&l->second);
+        cmGeneratorTarget* gt = *l;
         std::string tname = lg->GetRelativeTargetDirectory(gt);
         tname += "/DependInfo.cmake";
         cmSystemTools::ConvertToUnixSlashes(tname);
@@ -914,13 +915,11 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
       lgi != this->LocalGenerators.end(); ++lgi)
     {
     cmLocalGenerator* lg = *lgi;
-    cmMakefile* mf = lg->GetMakefile();
-    cmTargets const& targets = mf->GetTargets();
-    for(cmTargets::const_iterator t = targets.begin(); t != targets.end(); ++t)
+    std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::const_iterator t = targets.begin();
+        t != targets.end(); ++t)
       {
-      cmTarget const& target = t->second;
-
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
+      cmGeneratorTarget* gt = *t;
 
       cmLocalGenerator* tlg = gt->GetLocalGenerator();
 
@@ -1089,11 +1088,12 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
     if (lg2 == lg || lg->GetMakefile()->IsRootMakefile())
       {
       // for each target Generate the rule files for each target.
-      cmTargets& targets = lg2->GetMakefile()->GetTargets();
-      for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
+      std::vector<cmGeneratorTarget*> targets = lg2->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+          t != targets.end(); ++t)
         {
-        cmTarget const& target = t->second;
-        cmState::TargetType type = target.GetType();
+        cmGeneratorTarget* target = *t;
+        cmState::TargetType type = target->GetType();
         if((type == cmState::EXECUTABLE) ||
            (type == cmState::STATIC_LIBRARY) ||
            (type == cmState::SHARED_LIBRARY) ||
@@ -1102,7 +1102,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
            (type == cmState::GLOBAL_TARGET) ||
            (type == cmState::UTILITY))
           {
-          std::string name = target.GetName();
+          std::string name = target->GetName();
           if(emittedTargets.insert(name).second)
             {
             path = "... ";
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 2d412f1..4d431f6 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -375,11 +375,11 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
     for(std::vector<cmLocalGenerator*>::iterator i = gen.begin();
         i != gen.end(); ++i)
       {
-      cmTargets& targets = (*i)->GetMakefile()->GetTargets();
-      for(cmTargets::iterator ti = targets.begin();
+      std::vector<cmGeneratorTarget*> targets = (*i)->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(ti->second);
+        this->ComputeVSTargetDepends(*(*ti)->Target);
         }
       }
     }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index c06f503..fe115ac 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -510,17 +510,20 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       continue;
       }
 
-    cmTargets& tgts = lg->GetMakefile()->GetTargets();
-    for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+        l != tgts.end(); l++)
       {
-      cmTarget& target = l->second;
+      cmTarget& target = *(*l)->Target;
 
       if (target.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
-      if (regenerate && (l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
+      std::string targetName = target.GetName();
+
+      if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
         {
         target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
@@ -1085,21 +1088,26 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
                                            targets)
 {
   this->SetCurrentLocalGenerator(gen);
-  cmTargets &tgts = this->CurrentMakefile->GetTargets();
-  typedef std::map<std::string, cmTarget*, cmCompareTargets> cmSortedTargets;
+  std::vector<cmGeneratorTarget*> tgts =
+      this->CurrentLocalGenerator->GetGeneratorTargets();
+  typedef std::map<std::string, cmGeneratorTarget*, cmCompareTargets>
+      cmSortedTargets;
   cmSortedTargets sortedTargets;
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); l++)
     {
-    sortedTargets[l->first] = &l->second;
+    sortedTargets[(*l)->GetName()] = *l;
     }
   for(cmSortedTargets::iterator l = sortedTargets.begin();
       l != sortedTargets.end(); l++)
     {
-    cmTarget& cmtarget = *l->second;
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+    cmGeneratorTarget* gtgt = l->second;
+    cmTarget& cmtarget = *gtgt->Target;
+
+    std::string targetName = gtgt->GetName();
 
     // make sure ALL_BUILD, INSTALL, etc are only done once
-    if(this->SpecialTargetEmitted(l->first.c_str()))
+    if(this->SpecialTargetEmitted(targetName.c_str()))
       {
       continue;
       }
@@ -3062,10 +3070,11 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       }
     cmMakefile* mf = (*i)->GetMakefile();
     std::vector<cmSourceGroup> sourceGroups = mf->GetSourceGroups();
-    cmTargets &tgts = mf->GetTargets();
-    for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+        l != tgts.end(); l++)
       {
-      cmTarget& cmtarget = l->second;
+      cmTarget& cmtarget = *(*l)->Target;
 
       // Same skipping logic here as in CreateXCodeTargets so that we do not
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3658473..2166c09 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2510,28 +2510,29 @@ cmLocalGenerator
 {
   // Convert the old-style install specification from each target to
   // an install generator and run it.
-  cmTargets& tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
     // Include the user-specified pre-install script for this target.
-    if(const char* preinstall = l->second.GetProperty("PRE_INSTALL_SCRIPT"))
+    if(const char* preinstall = (*l)->GetProperty("PRE_INSTALL_SCRIPT"))
       {
       cmInstallScriptGenerator g(preinstall, false, 0);
       g.Generate(os, config, configurationTypes);
       }
 
     // Install this target if a destination is given.
-    if(l->second.GetInstallPath() != "")
+    if((*l)->Target->GetInstallPath() != "")
       {
       // Compute the full install destination.  Note that converting
       // to unix slashes also removes any trailing slash.
       // We also skip over the leading slash given by the user.
-      std::string destination = l->second.GetInstallPath().substr(1);
+      std::string destination = (*l)->Target->GetInstallPath().substr(1);
       cmSystemTools::ConvertToUnixSlashes(destination);
       if(destination.empty())
         {
@@ -2539,7 +2540,7 @@ cmLocalGenerator
         }
 
       // Generate the proper install generator for this target type.
-      switch(l->second.GetType())
+      switch((*l)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -2547,7 +2548,7 @@ cmLocalGenerator
           {
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
-            g(this, l->first, destination.c_str(), false);
+            g(this, (*l)->GetName(), destination.c_str(), false);
           g.Generate(os, config, configurationTypes);
           }
           break;
@@ -2558,18 +2559,18 @@ cmLocalGenerator
           // to the normal destination and the DLL to the runtime
           // destination.
           cmInstallTargetGeneratorLocal
-            g1(this, l->first, destination.c_str(), true);
+            g1(this, (*l)->GetName(), destination.c_str(), true);
           g1.Generate(os, config, configurationTypes);
           // We also skip over the leading slash given by the user.
-          destination = l->second.GetRuntimeInstallPath().substr(1);
+          destination = (*l)->Target->GetRuntimeInstallPath().substr(1);
           cmSystemTools::ConvertToUnixSlashes(destination);
           cmInstallTargetGeneratorLocal
-            g2(this, l->first, destination.c_str(), false);
+            g2(this, (*l)->GetName(), destination.c_str(), false);
           g2.Generate(os, config, configurationTypes);
 #else
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
-            g(this, l->first, destination.c_str(), false);
+            g(this, (*l)->GetName(), destination.c_str(), false);
           g.Generate(os, config, configurationTypes);
 #endif
           }
@@ -2580,7 +2581,7 @@ cmLocalGenerator
       }
 
     // Include the user-specified post-install script for this target.
-    if(const char* postinstall = l->second.GetProperty("POST_INSTALL_SCRIPT"))
+    if(const char* postinstall = (*l)->GetProperty("POST_INSTALL_SCRIPT"))
       {
       cmInstallScriptGenerator g(postinstall, false, 0);
       g.Generate(os, config, configurationTypes);
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 07f763b..dae8aaf 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1762,43 +1762,43 @@ void cmLocalUnixMakefileGenerator3
   ruleFileStream
     << "# Targets provided globally by CMake.\n"
     << "\n";
-  cmTargets* targets = &(this->Makefile->GetTargets());
-  cmTargets::iterator glIt;
-  for ( glIt = targets->begin(); glIt != targets->end(); ++ glIt )
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*>::iterator glIt;
+  for ( glIt = targets.begin(); glIt != targets.end(); ++ glIt )
     {
-    if ( glIt->second.GetType() == cmState::GLOBAL_TARGET )
+    if ( (*glIt)->GetType() == cmState::GLOBAL_TARGET )
       {
-      std::string targetString = "Special rule for the target " + glIt->first;
+      std::string targetString = "Special rule for the target " +
+          (*glIt)->GetName();
       std::vector<std::string> commands;
       std::vector<std::string> depends;
 
-      const char* text = glIt->second.GetProperty("EchoString");
+      const char* text = (*glIt)->GetProperty("EchoString");
       if ( !text )
         {
         text = "Running external command ...";
         }
-      depends.insert(depends.end(), glIt->second.GetUtilities().begin(),
-                     glIt->second.GetUtilities().end());
+      depends.insert(depends.end(), (*glIt)->Target->GetUtilities().begin(),
+                     (*glIt)->Target->GetUtilities().end());
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 
-      cmGeneratorTarget* gt = this->GlobalGenerator
-          ->GetGeneratorTarget(&glIt->second);
+      cmGeneratorTarget* gt = *glIt;
 
       // Global targets store their rules in pre- and post-build commands.
       this->AppendCustomDepends(depends,
-                                glIt->second.GetPreBuildCommands());
+                                gt->Target->GetPreBuildCommands());
       this->AppendCustomDepends(depends,
-                                glIt->second.GetPostBuildCommands());
+                                gt->Target->GetPostBuildCommands());
       this->AppendCustomCommands(commands,
-                                 glIt->second.GetPreBuildCommands(),
+                                 gt->Target->GetPreBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
       this->AppendCustomCommands(commands,
-                                 glIt->second.GetPostBuildCommands(),
+                                 gt->Target->GetPostBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
-      std::string targetName = glIt->second.GetName();
+      std::string targetName = gt->GetName();
       this->WriteMakeRule(ruleFileStream, targetString.c_str(),
                           targetName, depends, commands, true);
 
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 63fc283..c9d53fe 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -74,22 +74,23 @@ cmLocalVisualStudio10Generator::~cmLocalVisualStudio10Generator()
 void cmLocalVisualStudio10Generator::Generate()
 {
 
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(l->second))
+       ->TargetIsFortranOnly(*(*l)->Target))
       {
-      this->CreateSingleVCProj(l->first.c_str(),l->second);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     else
       {
       cmVisualStudio10TargetGenerator tg(
-        &l->second, static_cast<cmGlobalVisualStudio10Generator*>(
+        (*l)->Target, static_cast<cmGlobalVisualStudio10Generator*>(
           this->GetGlobalGenerator()));
       tg.Generate();
       }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index a51eb67..773e555 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -82,12 +82,12 @@ private:
 
 void cmLocalVisualStudio6Generator::AddCMakeListsRules()
 {
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin();
-      l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY
-        || l->second.GetType() == cmState::GLOBAL_TARGET)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY
+        || (*l)->GetType() == cmState::GLOBAL_TARGET)
       {
       continue;
       }
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
       this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
     if (!cmSystemTools::IsOn(suppRegenRule))
       {
-      this->AddDSPBuildRule(l->second);
+      this->AddDSPBuildRule(*(*l)->Target);
       }
     }
 }
@@ -124,54 +124,56 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 
   // Create the DSP or set of DSP's for libraries and executables
 
-  cmTargets &tgts = this->Makefile->GetTargets();
-
-  // build any targets
-  for(cmTargets::iterator l = tgts.begin();
-      l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    switch(l->second.GetType())
+    switch((*l)->GetType())
       {
       case cmState::STATIC_LIBRARY:
       case cmState::OBJECT_LIBRARY:
-        this->SetBuildType(STATIC_LIBRARY, l->first.c_str(), l->second);
+        this->SetBuildType(STATIC_LIBRARY,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::SHARED_LIBRARY:
       case cmState::MODULE_LIBRARY:
-        this->SetBuildType(DLL, l->first.c_str(), l->second);
+        this->SetBuildType(DLL,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::EXECUTABLE:
-        this->SetBuildType(EXECUTABLE,l->first.c_str(), l->second);
+        this->SetBuildType(EXECUTABLE,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::UTILITY:
       case cmState::GLOBAL_TARGET:
-        this->SetBuildType(UTILITY, l->first.c_str(), l->second);
+        this->SetBuildType(UTILITY,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::INTERFACE_LIBRARY:
         continue;
       default:
-        cmSystemTools::Error("Bad target type: ", l->first.c_str());
+        cmSystemTools::Error("Bad target type: ", (*l)->GetName().c_str());
         break;
       }
     // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
     // so don't build a projectfile for it
     const char* path =
-      l->second.GetProperty("EXTERNAL_MSPROJECT");
+      (*l)->GetProperty("EXTERNAL_MSPROJECT");
     if(!path)
       {
       // check to see if the dsp is going into a sub-directory
-      std::string::size_type pos = l->first.rfind('/');
+      std::string::size_type pos = (*l)->GetName().rfind('/');
       if(pos != std::string::npos)
         {
         std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
-        dir += l->first.substr(0, pos);
+        dir += (*l)->GetName().substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
           {
           cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
-      this->CreateSingleDSP(l->first.c_str(),l->second);
+      this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
       }
     }
 }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 819998c..4895698 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -67,19 +67,19 @@ cmLocalVisualStudio7Generator::~cmLocalVisualStudio7Generator()
 void cmLocalVisualStudio7Generator::AddHelperCommands()
 {
   // Now create GUIDs for targets
-  cmTargets &tgts = this->Makefile->GetTargets();
-
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    const char* path = l->second.GetProperty("EXTERNAL_MSPROJECT");
+    const char* path = (*l)->GetProperty("EXTERNAL_MSPROJECT");
     if(path)
       {
       this->ReadAndStoreExternalGUID(
-        l->second.GetName().c_str(), path);
+        (*l)->GetName().c_str(), path);
       }
     }
 
@@ -95,7 +95,6 @@ void cmLocalVisualStudio7Generator::Generate()
 
 void cmLocalVisualStudio7Generator::AddCMakeListsRules()
 {
-  cmTargets &tgts = this->Makefile->GetTargets();
   // Create the regeneration custom rule.
   if(!this->Makefile->IsOn("CMAKE_SUPPRESS_REGENERATION"))
     {
@@ -104,17 +103,17 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules()
     if(cmSourceFile* sf = this->CreateVCProjBuildRule())
       {
       // Add the rule to targets that need it.
-      for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+      std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+          l != tgts.end(); ++l)
         {
-        if (l->second.GetType() == cmState::GLOBAL_TARGET)
+        if ((*l)->GetType() == cmState::GLOBAL_TARGET)
           {
           continue;
           }
-        if(l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+        if((*l)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&l->second);
-          gt->AddSource(sf->GetFullPath());
+          (*l)->AddSource(sf->GetFullPath());
           }
         }
       }
@@ -126,11 +125,11 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   // Visual Studio .NET 2003 Service Pack 1 will not run post-build
   // commands for targets in which no sources are built.  Add dummy
   // rules to force these targets to build.
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = l->second;
+    cmTarget& tgt = *(*l)->Target;
     if(tgt.GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
@@ -150,9 +149,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
            force.c_str(), no_depends, no_main_dependency,
            force_commands, " ", 0, true))
         {
-        cmGeneratorTarget* gt =
-            this->GlobalGenerator->GetGeneratorTarget(&tgt);
-        gt->AddSource(file->GetFullPath());
+        (*l)->AddSource(file->GetFullPath());
         }
       }
     }
@@ -176,21 +173,21 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     }
 
   // Get the set of targets in this directory.
-  cmTargets &tgts = this->Makefile->GetTargets();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
 
   // Create the project file for each target.
-  for(cmTargets::iterator l = tgts.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
     // so don't build a projectfile for it
-    if(!l->second.GetProperty("EXTERNAL_MSPROJECT"))
+    if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj(l->first.c_str(),l->second);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     }
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d858ce5d3cde10c457da8cf9372339db018e843
commit 6d858ce5d3cde10c457da8cf9372339db018e843
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:51:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:02 2015 +0200

    Makefiles: Port progress marks to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3f600b2..fe6b446 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3607,6 +3607,18 @@ std::string cmGeneratorTarget::GetPDBName(const std::string& config) const
   return prefix+base+".pdb";
 }
 
+bool cmGeneratorTarget::StrictTargetComparison::operator()(
+    cmGeneratorTarget const* t1, cmGeneratorTarget const* t2) const
+{
+  int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str());
+  if (nameResult == 0)
+    {
+    return strcmp(t1->GetLocalGenerator()->GetCurrentBinaryDirectory(),
+                  t2->GetLocalGenerator()->GetCurrentBinaryDirectory()) < 0;
+    }
+  return nameResult < 0;
+}
+
 //----------------------------------------------------------------------------
 struct cmGeneratorTarget::SourceFileFlags
 cmGeneratorTarget::GetTargetSourceFileFlags(const cmSourceFile* sf) const
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 4383288..544cf0e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -673,6 +673,11 @@ public:
   {
     return this->MaxLanguageStandards;
   }
+
+  struct StrictTargetComparison {
+    bool operator()(cmGeneratorTarget const* t1,
+                    cmGeneratorTarget const* t2) const;
+  };
 };
 
 #endif
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 74d23a3..248701a 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -778,7 +778,7 @@ cmGlobalUnixMakefileGenerator3
       std::ostringstream progressArg;
       const char* sep = "";
       std::vector<unsigned long>& progFiles =
-        this->ProgressMap[gtarget->Target].Marks;
+        this->ProgressMap[gtarget].Marks;
       for (std::vector<unsigned long>::iterator i = progFiles.begin();
            i != progFiles.end(); ++i)
         {
@@ -966,7 +966,7 @@ cmGlobalUnixMakefileGenerator3
   size_t count = 0;
   if(emitted.insert(target).second)
     {
-    count = this->ProgressMap[target->Target].Marks.size();
+    count = this->ProgressMap[target].Marks.size();
     TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -1003,7 +1003,7 @@ void
 cmGlobalUnixMakefileGenerator3::RecordTargetProgress(
   cmMakefileTargetGenerator* tg)
 {
-  TargetProgress& tp = this->ProgressMap[tg->GetTarget()];
+  TargetProgress& tp = this->ProgressMap[tg->GetGeneratorTarget()];
   tp.NumberOfActions = tg->GetNumberOfProgressActions();
   tp.VariableFile = tg->GetProgressFileNameFull();
 }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 5f39c79..0485eb8 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -192,8 +192,8 @@ protected:
     std::vector<unsigned long> Marks;
     void WriteProgressVariables(unsigned long total, unsigned long& current);
   };
-  typedef std::map<cmTarget const*, TargetProgress,
-                   cmStrictTargetComparison> ProgressMapType;
+  typedef std::map<cmGeneratorTarget const*, TargetProgress,
+                   cmGeneratorTarget::StrictTargetComparison> ProgressMapType;
   ProgressMapType ProgressMap;
 
   size_t CountProgressMarksInTarget(cmGeneratorTarget const* target,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37c976a599fbc7ddcffb640211bfaa19dfb86cad
commit 37c976a599fbc7ddcffb640211bfaa19dfb86cad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:49:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:02 2015 +0200

    cmInstallTargetGenerator: Get a cmGeneratorTarget directly.
    
    Extend the cmGeneratorTarget API to make this possible.

diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index a97cc5f..7a10356 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -440,8 +440,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmGeneratorTarget const* target,
 
 void cmInstallTargetGenerator::Compute(cmLocalGenerator* lg)
 {
-  this->Target = lg->GetGlobalGenerator()->GetGeneratorTarget(
-        lg->GetMakefile()->FindTarget(this->TargetName));
+  this->Target = lg->FindGeneratorTarget(this->TargetName);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6959e1d..3658473 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -453,6 +453,13 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
   this->GeneratorTargets.push_back(gt);
 }
 
+cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
+    const std::string& name) const
+{
+  return this->GetGlobalGenerator()->GetGeneratorTarget(
+        this->Makefile->FindTarget(name));
+}
+
 //----------------------------------------------------------------------------
 void cmLocalGenerator::ComputeTargetManifest()
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 1375985..552020b 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -120,6 +120,7 @@ public:
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
 
+  cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
   /**

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96f4b0c939e18799234dee180d4d6ae54ed61cc5
commit 96f4b0c939e18799234dee180d4d6ae54ed61cc5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:48:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:02 2015 +0200

    cmGlobalGenerator: Move GeneratorTargetsType to usage site.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 713ab6a..3f600b2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3607,18 +3607,6 @@ std::string cmGeneratorTarget::GetPDBName(const std::string& config) const
   return prefix+base+".pdb";
 }
 
-bool cmStrictTargetComparison::operator()(cmTarget const* t1,
-                                          cmTarget const* t2) const
-{
-  int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str());
-  if (nameResult == 0)
-    {
-    return strcmp(t1->GetMakefile()->GetCurrentBinaryDirectory(),
-                  t2->GetMakefile()->GetCurrentBinaryDirectory()) < 0;
-    }
-  return nameResult < 0;
-}
-
 //----------------------------------------------------------------------------
 struct cmGeneratorTarget::SourceFileFlags
 cmGeneratorTarget::GetTargetSourceFileFlags(const cmSourceFile* sf) const
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 2dc3a6f..4383288 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -675,12 +675,4 @@ public:
   }
 };
 
-struct cmStrictTargetComparison {
-  bool operator()(cmTarget const* t1, cmTarget const* t2) const;
-};
-
-typedef std::map<cmTarget const*,
-                 cmGeneratorTarget*,
-                 cmStrictTargetComparison> cmGeneratorTargetsType;
-
 #endif
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7e9b599..13efc4c 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -48,6 +48,18 @@
 
 #include <assert.h>
 
+bool cmTarget::StrictTargetComparison::operator()(cmTarget const* t1,
+                                                  cmTarget const* t2) const
+{
+  int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str());
+  if (nameResult == 0)
+    {
+    return strcmp(t1->GetMakefile()->GetCurrentBinaryDirectory(),
+                  t2->GetMakefile()->GetCurrentBinaryDirectory()) < 0;
+    }
+  return nameResult < 0;
+}
+
 cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   : CMakeInstance(cm)
 {
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c59d42d..18f5329 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -42,6 +42,10 @@ class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 class cmExportBuildFileGenerator;
 
+typedef std::map<cmTarget const*,
+                 cmGeneratorTarget*,
+                 cmTarget::StrictTargetComparison> cmGeneratorTargetsType;
+
 /** \class cmGlobalGenerator
  * \brief Responsible for overseeing the generation process for the entire tree
  *
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index e8c05da..1cae94f 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -260,6 +260,10 @@ public:
   return this->LinkLibrariesForVS6;}
 #endif
 
+  struct StrictTargetComparison {
+    bool operator()(cmTarget const* t1, cmTarget const* t2) const;
+  };
+
 private:
   bool HandleLocationPropertyPolicy(cmMakefile* context) const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e20951c90df511cf0374a9fa6d27ad8a131b4903
commit e20951c90df511cf0374a9fa6d27ad8a131b4903
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 22:55:03 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:02 2015 +0200

    Xcode: Remove value-less overrides.
    
    These only loop over targets and call a const method.  The method
    has a side-effect of emitting a warning in a certain case, but the
    other remaining call site will have the same effect.

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 3b430d2..30fd075 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -47,36 +47,6 @@ void cmLocalXCodeGenerator::AppendFlagEscape(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
-void cmLocalXCodeGenerator::Generate()
-{
-  cmLocalGenerator::Generate();
-
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
-      iter != targets.end(); ++iter)
-    {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
-    }
-}
-
-//----------------------------------------------------------------------------
-void cmLocalXCodeGenerator::GenerateInstallRules()
-{
-  cmLocalGenerator::GenerateInstallRules();
-
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
-      iter != targets.end(); ++iter)
-    {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
-    }
-}
-
-//----------------------------------------------------------------------------
 void cmLocalXCodeGenerator::ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const*)
diff --git a/Source/cmLocalXCodeGenerator.h b/Source/cmLocalXCodeGenerator.h
index 4381a6d..57c1579 100644
--- a/Source/cmLocalXCodeGenerator.h
+++ b/Source/cmLocalXCodeGenerator.h
@@ -32,8 +32,6 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   virtual void AppendFlagEscape(std::string& flags,
                                 const std::string& rawFlag);
-  virtual void Generate();
-  virtual void GenerateInstallRules();
   virtual void ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const* gt = 0);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8c0fbcc194bca6986492278e705ff301f283378
commit a8c0fbcc194bca6986492278e705ff301f283378
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 16:53:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:21:01 2015 +0200

    cmLocalGenerator: Store a vector of generator targets.
    
    Not a map from cmTarget to cmGeneratorTarget.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 31c05fd..1921f03 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,13 +965,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
-    for (cmGeneratorTargetsType::iterator l = targets.begin();
+    std::vector<cmGeneratorTarget*> targets = (*it)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator l = targets.begin();
          l != targets.end(); ++l)
       {
       std::vector<std::string> includeDirs;
       std::string config = mf->GetSafeDefinition("CMAKE_BUILD_TYPE");
-      (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
+      (*it)->GetIncludeDirectories(includeDirs, *l, "C", config);
       this->AppendIncludeDirectories(fout, includeDirs, emmited);
       }
     }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 086ff25..7e9b599 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1584,7 +1584,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
       this->GeneratorTargets[t] = gt;
-      lg->AddGeneratorTarget(t, gt);
+      lg->AddGeneratorTarget(gt);
       }
     }
 
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 45a1509..7c33904 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -287,8 +287,8 @@ void cmGlobalGhsMultiGenerator::Generate()
       {
       cmLocalGhsMultiGenerator *lg =
         static_cast<cmLocalGhsMultiGenerator *>(this->LocalGenerators[i]);
-      cmGeneratorTargetsType tgts = lg->GetGeneratorTargets();
-      this->UpdateBuildFiles(&tgts);
+      std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+      this->UpdateBuildFiles(tgts);
       }
     }
 
@@ -481,15 +481,15 @@ cmGlobalGhsMultiGenerator::GetFileNameFromPath(std::string const &path)
 }
 
 void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
-  cmGeneratorTargetsType *tgts)
+  std::vector<cmGeneratorTarget*> tgts)
 {
-  for (cmGeneratorTargetsType::iterator tgtsI = tgts->begin();
-       tgtsI != tgts->end(); ++tgtsI)
+  for (std::vector<cmGeneratorTarget*>::iterator tgtsI = tgts.begin();
+       tgtsI != tgts.end(); ++tgtsI)
     {
-    const cmTarget *tgt(tgtsI->first);
-    if (IsTgtForBuild(tgt))
+    const cmGeneratorTarget *tgt = *tgtsI;
+    if (IsTgtForBuild(tgt->Target))
       {
-      char const *rawFolderName = tgtsI->first->GetProperty("FOLDER");
+      char const *rawFolderName = tgt->GetProperty("FOLDER");
       if (NULL == rawFolderName)
         {
         rawFolderName = "";
@@ -504,13 +504,13 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
           GhsMultiGpj::PROJECT);
         }
       std::vector<cmsys::String> splitPath = cmSystemTools::SplitString(
-            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt));
+            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target));
       std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" +
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
                                                   << " ";
       GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag(
-                                 tgtsI->second),
+                                 tgt),
                                this->TargetFolderBuildStreams[folderName]);
       }
     }
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index 8f88d4f..04a9a5b 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -110,7 +110,7 @@ private:
       std::vector<cmsys::String>::const_iterator end,
       GhsMultiGpj::Types projType);
   static std::string GetFileNameFromPath(std::string const &path);
-  void UpdateBuildFiles(cmGeneratorTargetsType *tgts);
+  void UpdateBuildFiles(std::vector<cmGeneratorTarget*> tgts);
   bool IsTgtForBuild(const cmTarget *tgt);
 
   std::vector<cmGeneratedFileStream *> TargetSubProjects;
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 4eec3fb..8659e34 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,13 +68,14 @@ void cmGlobalKdevelopGenerator::Generate()
     for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
          lg!=lgs.end(); lg++)
       {
-      cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
-      for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
-           ti != targets.end(); ti++)
+      std::vector<cmGeneratorTarget*> const& targets =
+          (*lg)->GetGeneratorTargets();
+      for (std::vector<cmGeneratorTarget*>::const_iterator ti =
+           targets.begin(); ti != targets.end(); ti++)
         {
-        if (ti->second->GetType()==cmState::EXECUTABLE)
+        if ((*ti)->GetType()==cmState::EXECUTABLE)
           {
-          executable = ti->second->GetLocation("");
+          executable = (*ti)->GetLocation("");
           break;
           }
         }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 44e3de6..74d23a3 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -460,11 +460,11 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector<std::string> depends;
-  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator l = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = targets.begin();
       l != targets.end(); ++l)
     {
-    cmGeneratorTarget* gtarget = l->second;
+    cmGeneratorTarget* gtarget = *l;
     int type = gtarget->GetType();
     if((type == cmState::EXECUTABLE) ||
        (type == cmState::STATIC_LIBRARY) ||
@@ -623,11 +623,11 @@ cmGlobalUnixMakefileGenerator3
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>
       (this->LocalGenerators[i]);
     // for each target Generate the rule files for each target.
-    cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-    for(cmGeneratorTargetsType::iterator t = targets.begin();
+    std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
         t != targets.end(); ++t)
       {
-      cmGeneratorTarget* gtarget = t->second;
+      cmGeneratorTarget* gtarget = *t;
       // Don't emit the same rule twice (e.g. two targets with the same
       // simple name)
       int type = gtarget->GetType();
@@ -720,11 +720,11 @@ cmGlobalUnixMakefileGenerator3
   depends.push_back("cmake_check_build_system");
 
   // for each target Generate the rule files for each target.
-  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    cmGeneratorTarget* gtarget = t->second;
+    cmGeneratorTarget* gtarget = *t;
     int type = gtarget->GetType();
     std::string name = gtarget->GetName();
     if (!name.empty()
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 61b19cf..a22315c 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -256,7 +256,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
                           noCommandLines);
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
-  lg->AddGeneratorTarget(tgt, gt);
+  lg->AddGeneratorTarget(gt);
   this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 91ca9a3..2d412f1 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -87,7 +87,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           "Build all projects");
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
-      gen[0]->AddGeneratorTarget(allBuild, gt);
+      gen[0]->AddGeneratorTarget(gt);
       this->AddGeneratorTarget(allBuild, gt);
 
 #if 0
@@ -108,19 +108,20 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
       for(std::vector<cmLocalGenerator*>::iterator i = gen.begin();
           i != gen.end(); ++i)
         {
-        cmGeneratorTargetsType targets =
+        std::vector<cmGeneratorTarget*> targets =
             (*i)->GetGeneratorTargets();
-        for(cmGeneratorTargetsType::iterator t = targets.begin();
+        for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
             t != targets.end(); ++t)
           {
-          if (t->second->GetType() == cmState::GLOBAL_TARGET
-              || t->first->IsImported())
+          cmGeneratorTarget* tgt = *t;
+          if (tgt->GetType() == cmState::GLOBAL_TARGET
+              || tgt->IsImported())
             {
             continue;
             }
-          if(!this->IsExcluded(gen[0], t->second))
+          if(!this->IsExcluded(gen[0], tgt))
             {
-            allBuild->AddUtility(t->second->GetName());
+            allBuild->AddUtility(tgt->GetName());
             }
           }
         }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index df208f6..c06f503 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -459,7 +459,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                         "echo", "Build all projects");
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
-  root->AddGeneratorTarget(allbuild, allBuildGt);
+  root->AddGeneratorTarget(allBuildGt);
   root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
@@ -495,7 +495,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                           "make", "-f", file.c_str());
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
-    root->AddGeneratorTarget(check, checkGt);
+    root->AddGeneratorTarget(checkGt);
     root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8a76c21..6959e1d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,15 +132,15 @@ void cmLocalGenerator::TraceDependencies()
     this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
     }
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    t->second->TraceDependencies();
+    (*t)->TraceDependencies();
     }
 }
 
@@ -448,9 +448,9 @@ void cmLocalGenerator::GenerateInstallRules()
 }
 
 
-void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
 {
-  this->GeneratorTargets[t] = gt;
+  this->GeneratorTargets.push_back(gt);
 }
 
 //----------------------------------------------------------------------------
@@ -465,12 +465,12 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 
   // Add our targets to the manifest for each configuration.
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    cmGeneratorTarget& target = *t->second;
-    if (target.GetType() == cmState::INTERFACE_LIBRARY)
+    cmGeneratorTarget* target = *t;
+    if (target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
@@ -478,7 +478,7 @@ void cmLocalGenerator::ComputeTargetManifest()
         ci != configNames.end(); ++ci)
       {
       const char* config = ci->c_str();
-      target.ComputeTargetManifest(config);
+      target->ComputeTargetManifest(config);
       }
     }
 }
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 307c67f..1375985 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -113,12 +113,12 @@ public:
                               bool forResponseFile = false,
                               const std::string& config = "");
 
-  const cmGeneratorTargetsType &GetGeneratorTargets() const
+  const std::vector<cmGeneratorTarget*> &GetGeneratorTargets() const
     {
       return this->GeneratorTargets;
     }
 
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
+  void AddGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
@@ -367,7 +367,7 @@ protected:
   std::set<std::string> ObjectMaxPathViolations;
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
-  cmGeneratorTargetsType GeneratorTargets;
+  std::vector<cmGeneratorTarget*> GeneratorTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 869ba2c..a77a75e 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -26,16 +26,16 @@ cmLocalGhsMultiGenerator::~cmLocalGhsMultiGenerator() {}
 
 void cmLocalGhsMultiGenerator::Generate()
 {
-  cmGeneratorTargetsType tgts = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
 
-  for (cmGeneratorTargetsType::iterator l = tgts.begin(); l != tgts.end();
-       ++l)
+  for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+       l != tgts.end(); ++l)
     {
-    if (l->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmGhsMultiTargetGenerator tg(l->second);
+    cmGhsMultiTargetGenerator tg(*l);
     tg.Generate();
     }
 }
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 756c139..3dd18bd 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -73,23 +73,23 @@ void cmLocalNinjaGenerator::Generate()
       }
     }
 
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(t->second);
+    cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(*t);
     if(tg)
       {
       tg->Generate();
       // Add the target to "all" if required.
       if (!this->GetGlobalNinjaGenerator()->IsExcluded(
             this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0],
-            t->second))
-        this->GetGlobalNinjaGenerator()->AddDependencyToAll(t->second->Target);
+            *t))
+        this->GetGlobalNinjaGenerator()->AddDependencyToAll((*t)->Target);
       delete tg;
       }
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 5485da4..07f763b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -113,18 +113,18 @@ void cmLocalUnixMakefileGenerator3::Generate()
     this->Makefile->IsOn("CMAKE_SKIP_ASSEMBLY_SOURCE_RULES");
 
   // Generate the rule files for each target.
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
   cmGlobalUnixMakefileGenerator3* gg =
     static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (t->second->GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*t)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     cmsys::auto_ptr<cmMakefileTargetGenerator> tg(
-      cmMakefileTargetGenerator::New(t->second));
+      cmMakefileTargetGenerator::New(*t));
     if (tg.get())
       {
       tg->WriteRuleFiles();
@@ -174,11 +174,11 @@ void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
   std::set<std::string> emitted;
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::iterator ti = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
       ti != targets.end(); ++ti)
     {
-    cmGeneratorTarget* gt = ti->second;
+    cmGeneratorTarget* gt = *ti;
     if (gt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -417,22 +417,22 @@ void cmLocalUnixMakefileGenerator3
 
   // for each target we just provide a rule to cd up to the top and do a make
   // on the target
-  cmGeneratorTargetsType targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
   std::string localName;
-  for(cmGeneratorTargetsType::iterator t = targets.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if((t->second->GetType() == cmState::EXECUTABLE) ||
-       (t->second->GetType() == cmState::STATIC_LIBRARY) ||
-       (t->second->GetType() == cmState::SHARED_LIBRARY) ||
-       (t->second->GetType() == cmState::MODULE_LIBRARY) ||
-       (t->second->GetType() == cmState::OBJECT_LIBRARY) ||
-       (t->second->GetType() == cmState::UTILITY))
+    if(((*t)->GetType() == cmState::EXECUTABLE) ||
+       ((*t)->GetType() == cmState::STATIC_LIBRARY) ||
+       ((*t)->GetType() == cmState::SHARED_LIBRARY) ||
+       ((*t)->GetType() == cmState::MODULE_LIBRARY) ||
+       ((*t)->GetType() == cmState::OBJECT_LIBRARY) ||
+       ((*t)->GetType() == cmState::UTILITY))
       {
-      emitted.insert(t->second->GetName());
+      emitted.insert((*t)->GetName());
 
       // for subdirs add a rule to build this specific target by name.
-      localName = this->GetRelativeTargetDirectory(t->second);
+      localName = this->GetRelativeTargetDirectory(*t);
       localName += "/rule";
       commands.clear();
       depends.clear();
@@ -449,23 +449,23 @@ void cmLocalUnixMakefileGenerator3
                           localName, depends, commands, true);
 
       // Add a target with the canonical name (no prefix, suffix or path).
-      if(localName != t->second->GetName())
+      if(localName != (*t)->GetName())
         {
         commands.clear();
         depends.push_back(localName);
         this->WriteMakeRule(ruleFileStream, "Convenience name for target.",
-                            t->second->GetName(), depends, commands, true);
+                            (*t)->GetName(), depends, commands, true);
         }
 
       // Add a fast rule to build the target
       std::string makefileName =
-                         this->GetRelativeTargetDirectory(t->second);
+                         this->GetRelativeTargetDirectory(*t);
       makefileName += "/build.make";
       // make sure the makefile name is suitable for a makefile
       std::string makeTargetName =
-        this->GetRelativeTargetDirectory(t->second);
+        this->GetRelativeTargetDirectory(*t);
       makeTargetName += "/build";
-      localName = t->second->GetName();
+      localName = (*t)->GetName();
       localName += "/fast";
       depends.clear();
       commands.clear();
@@ -479,11 +479,11 @@ void cmLocalUnixMakefileGenerator3
 
       // Add a local name for the rule to relink the target before
       // installation.
-      if(t->second->NeedRelinkBeforeInstall(this->ConfigName))
+      if((*t)->NeedRelinkBeforeInstall(this->ConfigName))
         {
-        makeTargetName = this->GetRelativeTargetDirectory(t->second);
+        makeTargetName = this->GetRelativeTargetDirectory(*t);
         makeTargetName += "/preinstall";
-        localName = t->second->GetName();
+        localName = (*t)->GetName();
         localName += "/preinstall";
         depends.clear();
         commands.clear();
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 16b8942..225c03e 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -895,7 +895,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
                                 commandLines, false, autogenComment.c_str());
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
-    lg->AddGeneratorTarget(autogenTarget, gt);
+    lg->AddGeneratorTarget(gt);
     lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Oct 22 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu, 22 Oct 2015 00:01:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-315-g9e5f253
Message-ID: <20151022040110.61231C06B4@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  9e5f253f8dba871d7cdd966aca88af92bd8d14a6 (commit)
      from  56cec75058b1980ead58ddda0c371a783547acec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e5f253f8dba871d7cdd966aca88af92bd8d14a6
commit 9e5f253f8dba871d7cdd966aca88af92bd8d14a6
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Oct 22 00:01:08 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 22 00:01:08 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index d1132d2..fd17910 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151021)
+set(CMake_VERSION_PATCH 20151022)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 22 08:52:29 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 22 Oct 2015 08:52:29 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-849-gfd65691
Message-ID: <20151022125229.53135C02A1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fd65691ec3e92d8268d8370588b0e6bd3add0f1f (commit)
       via  4cfadee82628e5c8e7a7c33518d525082db1cc8b (commit)
      from  358bcae013fc6a3f0b670ad08942eac5abdbefd2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd65691ec3e92d8268d8370588b0e6bd3add0f1f
commit fd65691ec3e92d8268d8370588b0e6bd3add0f1f
Merge: 358bcae 4cfadee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 08:52:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 08:52:28 2015 -0400

    Merge topic 'update-libarchive' into next
    
    4cfadee8 fixup! libarchive: Use CommonCrypto on OS X only when available


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cfadee82628e5c8e7a7c33518d525082db1cc8b
commit 4cfadee82628e5c8e7a7c33518d525082db1cc8b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 08:52:10 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 08:52:10 2015 -0400

    fixup! libarchive: Use CommonCrypto on OS X only when available

diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
index 690dfcc..9a96aee 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
@@ -32,7 +32,7 @@
 
 #ifdef __APPLE__
 # include <AvailabilityMacros.h>
-# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
 #  define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 # endif
 #endif

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_cryptor_private.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 22 08:56:14 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 22 Oct 2015 08:56:14 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-851-g03c2593
Message-ID: <20151022125614.93D00C04D0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  03c259301d72cb598b89123acc7a478bae9c9c32 (commit)
       via  1f66627c467ee3df1b11b44867bc911464584195 (commit)
      from  fd65691ec3e92d8268d8370588b0e6bd3add0f1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03c259301d72cb598b89123acc7a478bae9c9c32
commit 03c259301d72cb598b89123acc7a478bae9c9c32
Merge: fd65691 1f66627
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 08:56:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 08:56:13 2015 -0400

    Merge topic 'update-libarchive' into next
    
    1f66627c libarchive: Use CommonCrypto APIs on OS X only when available


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f66627c467ee3df1b11b44867bc911464584195
commit 1f66627c467ee3df1b11b44867bc911464584195
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:30:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 08:55:21 2015 -0400

    libarchive: Use CommonCrypto APIs on OS X only when available
    
    Use each CommonCrypto API only when using an OS X SDK version new enough
    to provide it.

diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
index 9b01df8..fb7307e 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
@@ -31,7 +31,7 @@
 #include "archive.h"
 #include "archive_cryptor_private.h"
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 
 static int
 pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
@@ -114,7 +114,7 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
 
 #endif
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 
 static int
 aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
index b62ec0c..9a96aee 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
@@ -31,6 +31,13 @@
 #define ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED
 
 #ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+#  define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 #include <CommonCrypto/CommonCryptor.h>
 #include <CommonCrypto/CommonKeyDerivation.h>
 #define AES_BLOCK_SIZE	16
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac.c b/Utilities/cmlibarchive/libarchive/archive_hmac.c
index 898853b..36e3e1c 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac.c
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac.c
@@ -31,7 +31,7 @@
 #include "archive.h"
 #include "archive_hmac_private.h"
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
 
 static int
 __hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
index 6a8bbf2..a9fb8ec 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
@@ -31,6 +31,13 @@
 #define ARCHIVE_HMAC_PRIVATE_H_INCLUDED
 
 #ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+#  define ARCHIVE_HMAC_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
 #include <CommonCrypto/CommonHMAC.h>
 
 typedef	CCHmacContext archive_hmac_sha1_ctx;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 22 09:30:24 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 22 Oct 2015 09:30:24 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-853-g8d3944c
Message-ID: <20151022133024.28072C094E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8d3944cc9860454b1309ce8932cc15a94536964b (commit)
       via  231ec7854b464159ec1ec734a052ae651f400bb5 (commit)
      from  03c259301d72cb598b89123acc7a478bae9c9c32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d3944cc9860454b1309ce8932cc15a94536964b
commit 8d3944cc9860454b1309ce8932cc15a94536964b
Merge: 03c2593 231ec78
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:30:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 09:30:23 2015 -0400

    Merge topic 'update-libarchive' into next
    
    231ec785 fixup! libarchive: Use CommonCrypto APIs on OS X only when available


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=231ec7854b464159ec1ec734a052ae651f400bb5
commit 231ec7854b464159ec1ec734a052ae651f400bb5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:29:48 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 09:29:48 2015 -0400

    fixup! libarchive: Use CommonCrypto APIs on OS X only when available

diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
index fb7307e..efd350d 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
@@ -115,6 +115,9 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
 #endif
 
 #ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
+#  define kCCAlgorithmAES kCCAlgorithmAES128
+# endif
 
 static int
 aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_cryptor.c |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 22 09:30:38 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 22 Oct 2015 09:30:38 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-855-ge6d7f76
Message-ID: <20151022133038.F1CF6C0956@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e6d7f7695df7997fe20a4f14e8710f95bb87bff9 (commit)
       via  cbe044c42d1b11d780c7eac6a78dffa62ac62966 (commit)
      from  8d3944cc9860454b1309ce8932cc15a94536964b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6d7f7695df7997fe20a4f14e8710f95bb87bff9
commit e6d7f7695df7997fe20a4f14e8710f95bb87bff9
Merge: 8d3944c cbe044c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:30:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 09:30:38 2015 -0400

    Merge topic 'update-libarchive' into next
    
    cbe044c4 libarchive: Use CommonCrypto APIs on OS X only when available


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbe044c42d1b11d780c7eac6a78dffa62ac62966
commit cbe044c42d1b11d780c7eac6a78dffa62ac62966
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:30:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 09:30:27 2015 -0400

    libarchive: Use CommonCrypto APIs on OS X only when available
    
    Use each CommonCrypto API only when using an OS X SDK version new enough
    to provide it.

diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
index 9b01df8..efd350d 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
@@ -31,7 +31,7 @@
 #include "archive.h"
 #include "archive_cryptor_private.h"
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 
 static int
 pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
@@ -114,7 +114,10 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
 
 #endif
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
+#  define kCCAlgorithmAES kCCAlgorithmAES128
+# endif
 
 static int
 aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
index b62ec0c..9a96aee 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
@@ -31,6 +31,13 @@
 #define ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED
 
 #ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+#  define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 #include <CommonCrypto/CommonCryptor.h>
 #include <CommonCrypto/CommonKeyDerivation.h>
 #define AES_BLOCK_SIZE	16
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac.c b/Utilities/cmlibarchive/libarchive/archive_hmac.c
index 898853b..36e3e1c 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac.c
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac.c
@@ -31,7 +31,7 @@
 #include "archive.h"
 #include "archive_hmac_private.h"
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
 
 static int
 __hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
index 6a8bbf2..a9fb8ec 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
@@ -31,6 +31,13 @@
 #define ARCHIVE_HMAC_PRIVATE_H_INCLUDED
 
 #ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+#  define ARCHIVE_HMAC_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
 #include <CommonCrypto/CommonHMAC.h>
 
 typedef	CCHmacContext archive_hmac_sha1_ctx;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 22 09:39:57 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 22 Oct 2015 09:39:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-857-g3d10154
Message-ID: <20151022133957.35275BF391@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3d1015405b77213c46a1795a1106b0a7914899ac (commit)
       via  6d32d5361e497f6b0e27647682c3004be2d40ff3 (commit)
      from  e6d7f7695df7997fe20a4f14e8710f95bb87bff9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d1015405b77213c46a1795a1106b0a7914899ac
commit 3d1015405b77213c46a1795a1106b0a7914899ac
Merge: e6d7f76 6d32d53
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:39:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 09:39:56 2015 -0400

    Merge topic 'update-libarchive' into next
    
    6d32d536 libarchive: Avoid non-portable u_int8_t


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d32d5361e497f6b0e27647682c3004be2d40ff3
commit 6d32d5361e497f6b0e27647682c3004be2d40ff3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:39:06 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 09:39:06 2015 -0400

    libarchive: Avoid non-portable u_int8_t
    
    Use uint8_t that we prepare in config.h instead.

diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index 7891077..f4d4254 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -137,9 +137,9 @@ archive_random(void *buf, size_t nbytes)
 #endif				/* !__GNUC__ */
 
 struct arc4_stream {
-	u_int8_t i;
-	u_int8_t j;
-	u_int8_t s[256];
+	uint8_t i;
+	uint8_t j;
+	uint8_t s[256];
 };
 
 static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
@@ -159,7 +159,7 @@ static struct arc4_stream rs;
 static pid_t arc4_stir_pid;
 static int arc4_count;
 
-static inline u_int8_t arc4_getbyte(void);
+static inline uint8_t arc4_getbyte(void);
 static void arc4_stir(void);
 
 static inline void
@@ -177,7 +177,7 @@ static inline void
 arc4_addrandom(u_char *dat, int datlen)
 {
 	int     n;
-	u_int8_t si;
+	uint8_t si;
 
 	rs.i--;
 	for (n = 0; n < 256; n++) {
@@ -239,10 +239,10 @@ arc4_stir_if_needed(void)
 	}
 }
 
-static inline u_int8_t
+static inline uint8_t
 arc4_getbyte(void)
 {
-	u_int8_t si, sj;
+	uint8_t si, sj;
 
 	rs.i = (rs.i + 1);
 	si = rs.s[rs.i];

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_random.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 22 09:47:17 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 22 Oct 2015 09:47:17 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-859-g8c8bd72
Message-ID: <20151022134717.184B3C017D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8c8bd72d962dac7d52c74e7d56eae3ea93b437c0 (commit)
       via  19b3dc41898c7534acfbd9d752de0225e5398bcf (commit)
      from  3d1015405b77213c46a1795a1106b0a7914899ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c8bd72d962dac7d52c74e7d56eae3ea93b437c0
commit 8c8bd72d962dac7d52c74e7d56eae3ea93b437c0
Merge: 3d10154 19b3dc4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:47:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 09:47:16 2015 -0400

    Merge topic 'update-libarchive' into next
    
    19b3dc41 libarchive: Drop outdated CMake portability snprintf


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19b3dc41898c7534acfbd9d752de0225e5398bcf
commit 19b3dc41898c7534acfbd9d752de0225e5398bcf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:45:07 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 09:45:07 2015 -0400

    libarchive: Drop outdated CMake portability snprintf
    
    The archive_read_support_format_zip.c source no longer calls snprintf
    directly so we do not need a portability macro for it.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
index 8065ec3..62bf5e3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
@@ -67,10 +67,6 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102
 #include "archive_crc32.h"
 #endif
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
-# define snprintf _snprintf
-#endif
-
 struct zip_entry {
 	struct archive_rb_node	node;
 	struct zip_entry	*next;

-----------------------------------------------------------------------

Summary of changes:
 .../cmlibarchive/libarchive/archive_read_support_format_zip.c      |    4 ----
 1 file changed, 4 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 22 10:17:53 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 22 Oct 2015 10:17:53 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-862-g6e0a8ca
Message-ID: <20151022141753.F2E43C0794@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6e0a8ca07576308cde48d6554d7e5bacfef1451b (commit)
       via  023d01589b2313816cae715e990f0dd8b37b6e86 (commit)
       via  26bea611b12f8b2764a48d42efc57892f9b41657 (commit)
      from  8c8bd72d962dac7d52c74e7d56eae3ea93b437c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e0a8ca07576308cde48d6554d7e5bacfef1451b
commit 6e0a8ca07576308cde48d6554d7e5bacfef1451b
Merge: 8c8bd72 023d015
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 10:17:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 10:17:53 2015 -0400

    Merge topic 'update-libarchive' into next
    
    023d0158 libarchive: Avoid using 'uint8_t' as bitfield type
    26bea611 libarchive: Avoid using name 'hz'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=023d01589b2313816cae715e990f0dd8b37b6e86
commit 023d01589b2313816cae715e990f0dd8b37b6e86
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 10:09:24 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:09:24 2015 -0400

    libarchive: Avoid using 'uint8_t' as bitfield type
    
    The IBM XL compiler does not like it.  Use plain 'unsigned' instead.

diff --git a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
index 87b3f55..e23e5e9 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
@@ -54,14 +54,14 @@ __FBSDID("$FreeBSD$");
 
 struct private_data {
 	int		 compression_level;
-	uint8_t		 header_written:1;
-	uint8_t		 version_number:1;
-	uint8_t		 block_independence:1;
-	uint8_t		 block_checksum:1;
-	uint8_t		 stream_size:1;
-	uint8_t		 stream_checksum:1;
-	uint8_t		 preset_dictionary:1;
-	uint8_t		 block_maximum_size:3;
+	unsigned	 header_written:1;
+	unsigned	 version_number:1;
+	unsigned	 block_independence:1;
+	unsigned	 block_checksum:1;
+	unsigned	 stream_size:1;
+	unsigned	 stream_checksum:1;
+	unsigned	 preset_dictionary:1;
+	unsigned	 block_maximum_size:3;
 #if defined(HAVE_LIBLZ4) && LZ4_VERSION_MAJOR >= 1 && LZ4_VERSION_MINOR >= 2
 	int64_t		 total_in;
 	char		*out;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26bea611b12f8b2764a48d42efc57892f9b41657
commit 26bea611b12f8b2764a48d42efc57892f9b41657
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:58:25 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 09:58:25 2015 -0400

    libarchive: Avoid using name 'hz'
    
    AIX system headers define the symbol 'hz' as a preprocessor macro.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
index 6bd15f6..57534f3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
@@ -418,9 +418,9 @@ deconst(const void *c)
 }
 
 static char*
-xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz)
+xmemmem(const char *hay, const size_t hz_, const char *ndl, const size_t nz)
 {
-	const char *const eoh = hay + hz;
+	const char *const eoh = hay + hz_;
 	const char *const eon = ndl + nz;
 	const char *hp;
 	const char *np;
@@ -435,7 +435,7 @@ xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz)
          * that happens to begin with *NEEDLE) */
 	if (nz == 0UL) {
 		return deconst(hay);
-	} else if ((hay = memchr(hay, *ndl, hz)) == NULL) {
+	} else if ((hay = memchr(hay, *ndl, hz_)) == NULL) {
 		/* trivial */
 		return NULL;
 	}

-----------------------------------------------------------------------

Summary of changes:
 .../libarchive/archive_read_support_format_warc.c      |    6 +++---
 .../libarchive/archive_write_add_filter_lz4.c          |   16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 22 10:18:43 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 22 Oct 2015 10:18:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-873-g41256e0
Message-ID: <20151022141843.4047FC07D3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  41256e03c170a8395bc5cd59fbe55bec27f4e19d (commit)
       via  cdd8c25052c9812b4845113d7d4dab747cdfd4ea (commit)
       via  2bf5bb2da53b24f90a1bc919a0d39ac008ffa5a1 (commit)
       via  ccdc5dd7f82fa96d2b466a1de438e7216229337f (commit)
       via  bedffcf4df1253dd86a6fa4ee9dbee3f78d71971 (commit)
       via  85e0bb84f5eca2f77f070bce9f83024854096307 (commit)
       via  c70491d671b363b50a41d707d5fe82b02fe29424 (commit)
       via  1bbba477c747581d318b4fe5a1f3ede36301eed7 (commit)
       via  64bdf0b7469437b101bb0f1cf641956e0b5d1bb0 (commit)
       via  8f837fc9a9fc335f87613e0c113050e1533d9efd (commit)
       via  61a0251e824559b27e751ce7ff0be72b9bb8ec69 (commit)
      from  6e0a8ca07576308cde48d6554d7e5bacfef1451b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41256e03c170a8395bc5cd59fbe55bec27f4e19d
commit 41256e03c170a8395bc5cd59fbe55bec27f4e19d
Merge: 6e0a8ca cdd8c25
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 10:18:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 10:18:42 2015 -0400

    Merge topic 'update-libarchive' into next
    
    cdd8c250 cmSystemTools: Preemptively adapt to future libarchive 4.0 changes
    2bf5bb2d cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes
    ccdc5dd7 Update libarchive configuration within CMake
    bedffcf4 libarchive: Update README-CMake.txt for new snapshot
    85e0bb84 libarchive: Avoid using 'uint8_t' as bitfield type
    c70491d6 libarchive: Avoid using name 'hz'
    1bbba477 libarchive: Drop outdated CMake portability snprintf
    64bdf0b7 libarchive: Avoid non-portable u_int8_t
    8f837fc9 libarchive: Use CommonCrypto APIs on OS X only when available
    61a0251e libarchive: Define O_CLOEXEC when missing


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdd8c25052c9812b4845113d7d4dab747cdfd4ea
commit cdd8c25052c9812b4845113d7d4dab747cdfd4ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:56:09 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:28 2015 -0400

    cmSystemTools: Preemptively adapt to future libarchive 4.0 changes

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2c5aa8a..b2827dc 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -29,6 +29,9 @@
 # include "cmArchiveWrite.h"
 # include "cmLocale.h"
 # include <cm_libarchive.h>
+# ifndef __LA_INT64_T
+#  define __LA_INT64_T la_int64_t
+# endif
 #endif
 #include <cmsys/FStream.hxx>
 #include <cmsys/Terminal.h>

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bf5bb2da53b24f90a1bc919a0d39ac008ffa5a1
commit 2bf5bb2da53b24f90a1bc919a0d39ac008ffa5a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:37:14 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:28 2015 -0400

    cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 7946950..e62a2ed 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -18,6 +18,10 @@
 #include <cm_libarchive.h>
 #include "cm_get_date.h"
 
+#ifndef __LA_SSIZE_T
+# define __LA_SSIZE_T la_ssize_t
+#endif
+
 //----------------------------------------------------------------------------
 static std::string cm_archive_error_string(struct archive* a)
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccdc5dd7f82fa96d2b466a1de438e7216229337f
commit ccdc5dd7f82fa96d2b466a1de438e7216229337f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:08:30 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:27 2015 -0400

    Update libarchive configuration within CMake
    
    Hard-code libarchive build options to the way CMake needs them.  Set
    them as internal cache entries so users do not see them when building
    CMake.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c96f68b..ebee14b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -372,12 +372,14 @@ macro (CMAKE_BUILD_UTILITIES)
     set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system found LZMA library if found")
     set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system found ZLIB library if found")
     set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system found BZip2 library if found")
+    set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system found libxml2 library if found")
     set(ENABLE_EXPAT OFF CACHE INTERNAL "Enable the use of the system found EXPAT library if found")
     set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system found PCREPOSIX library if found")
     set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system found LibGCC library if found")
     set(ENABLE_XATTR OFF CACHE INTERNAL "Enable extended attribute support")
     set(ENABLE_ACL OFF CACHE INTERNAL "Enable ACL support")
     set(ENABLE_ICONV OFF CACHE INTERNAL "Enable iconv support")
+    set(ENABLE_CNG OFF CACHE INTERNAL "Enable the use of CNG(Crypto Next Generation)")
     add_subdirectory(Utilities/cmlibarchive)
     CMAKE_SET_TARGET_FOLDER(cmlibarchive "Utilities/3rdParty")
     set(CMAKE_TAR_LIBRARIES cmlibarchive ${BZIP2_LIBRARIES})

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bedffcf4df1253dd86a6fa4ee9dbee3f78d71971
commit bedffcf4df1253dd86a6fa4ee9dbee3f78d71971
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:21:39 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:27 2015 -0400

    libarchive: Update README-CMake.txt for new snapshot

diff --git a/Utilities/cmlibarchive/README-CMake.txt b/Utilities/cmlibarchive/README-CMake.txt
index 8f3b29b..0a3e34a 100644
--- a/Utilities/cmlibarchive/README-CMake.txt
+++ b/Utilities/cmlibarchive/README-CMake.txt
@@ -11,7 +11,7 @@ branch, but it is merged into our history.
 Update libarchive from upstream as follows.  Create a local branch to
 explicitly reference the upstream snapshot branch head:
 
- git branch libarchive-upstream 37f225b7
+ git branch libarchive-upstream 1a8c7bc2
 
 Use a temporary directory to checkout the branch:
 
@@ -24,7 +24,7 @@ Use a temporary directory to checkout the branch:
 Now place the (reduced) libarchive content in this directory.  See
 instructions shown by
 
- git log 37f225b7
+ git log 1a8c7bc2
 
 for help extracting the content from the upstream svn repo.  Then run
 the following commands to commit the new version.  Substitute the
@@ -34,8 +34,8 @@ appropriate date and version number:
 
  GIT_AUTHOR_NAME='LibArchive Upstream' \
  GIT_AUTHOR_EMAIL='libarchive-discuss at googlegroups.com' \
- GIT_AUTHOR_DATE='Mon Apr 14 19:19:05 2014 -0700' \
- git commit -m 'libarchive 3.1.2-246-ga5a5d28b (reduced)' &&
+ GIT_AUTHOR_DATE='Wed Oct 21 01:47:34 2015 -0700' \
+ git commit -m 'libarchive 3.1.2-601-g3bfe5f1 (reduced)' &&
  git commit --amend
 
 Edit the commit message to describe the procedure used to obtain the

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85e0bb84f5eca2f77f070bce9f83024854096307
commit 85e0bb84f5eca2f77f070bce9f83024854096307
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 10:09:24 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:27 2015 -0400

    libarchive: Avoid using 'uint8_t' as bitfield type
    
    The IBM XL compiler does not like it.  Use plain 'unsigned' instead.

diff --git a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
index 87b3f55..e23e5e9 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
@@ -54,14 +54,14 @@ __FBSDID("$FreeBSD$");
 
 struct private_data {
 	int		 compression_level;
-	uint8_t		 header_written:1;
-	uint8_t		 version_number:1;
-	uint8_t		 block_independence:1;
-	uint8_t		 block_checksum:1;
-	uint8_t		 stream_size:1;
-	uint8_t		 stream_checksum:1;
-	uint8_t		 preset_dictionary:1;
-	uint8_t		 block_maximum_size:3;
+	unsigned	 header_written:1;
+	unsigned	 version_number:1;
+	unsigned	 block_independence:1;
+	unsigned	 block_checksum:1;
+	unsigned	 stream_size:1;
+	unsigned	 stream_checksum:1;
+	unsigned	 preset_dictionary:1;
+	unsigned	 block_maximum_size:3;
 #if defined(HAVE_LIBLZ4) && LZ4_VERSION_MAJOR >= 1 && LZ4_VERSION_MINOR >= 2
 	int64_t		 total_in;
 	char		*out;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c70491d671b363b50a41d707d5fe82b02fe29424
commit c70491d671b363b50a41d707d5fe82b02fe29424
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:58:25 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:27 2015 -0400

    libarchive: Avoid using name 'hz'
    
    AIX system headers define the symbol 'hz' as a preprocessor macro.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
index 6bd15f6..57534f3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
@@ -418,9 +418,9 @@ deconst(const void *c)
 }
 
 static char*
-xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz)
+xmemmem(const char *hay, const size_t hz_, const char *ndl, const size_t nz)
 {
-	const char *const eoh = hay + hz;
+	const char *const eoh = hay + hz_;
 	const char *const eon = ndl + nz;
 	const char *hp;
 	const char *np;
@@ -435,7 +435,7 @@ xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz)
          * that happens to begin with *NEEDLE) */
 	if (nz == 0UL) {
 		return deconst(hay);
-	} else if ((hay = memchr(hay, *ndl, hz)) == NULL) {
+	} else if ((hay = memchr(hay, *ndl, hz_)) == NULL) {
 		/* trivial */
 		return NULL;
 	}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bbba477c747581d318b4fe5a1f3ede36301eed7
commit 1bbba477c747581d318b4fe5a1f3ede36301eed7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:45:07 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:26 2015 -0400

    libarchive: Drop outdated CMake portability snprintf
    
    The archive_read_support_format_zip.c source no longer calls snprintf
    directly so we do not need a portability macro for it.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
index 8065ec3..62bf5e3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c
@@ -67,10 +67,6 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102
 #include "archive_crc32.h"
 #endif
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
-# define snprintf _snprintf
-#endif
-
 struct zip_entry {
 	struct archive_rb_node	node;
 	struct zip_entry	*next;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64bdf0b7469437b101bb0f1cf641956e0b5d1bb0
commit 64bdf0b7469437b101bb0f1cf641956e0b5d1bb0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:39:06 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:26 2015 -0400

    libarchive: Avoid non-portable u_int8_t
    
    Use uint8_t that we prepare in config.h instead.

diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index 7891077..f4d4254 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -137,9 +137,9 @@ archive_random(void *buf, size_t nbytes)
 #endif				/* !__GNUC__ */
 
 struct arc4_stream {
-	u_int8_t i;
-	u_int8_t j;
-	u_int8_t s[256];
+	uint8_t i;
+	uint8_t j;
+	uint8_t s[256];
 };
 
 static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
@@ -159,7 +159,7 @@ static struct arc4_stream rs;
 static pid_t arc4_stir_pid;
 static int arc4_count;
 
-static inline u_int8_t arc4_getbyte(void);
+static inline uint8_t arc4_getbyte(void);
 static void arc4_stir(void);
 
 static inline void
@@ -177,7 +177,7 @@ static inline void
 arc4_addrandom(u_char *dat, int datlen)
 {
 	int     n;
-	u_int8_t si;
+	uint8_t si;
 
 	rs.i--;
 	for (n = 0; n < 256; n++) {
@@ -239,10 +239,10 @@ arc4_stir_if_needed(void)
 	}
 }
 
-static inline u_int8_t
+static inline uint8_t
 arc4_getbyte(void)
 {
-	u_int8_t si, sj;
+	uint8_t si, sj;
 
 	rs.i = (rs.i + 1);
 	si = rs.s[rs.i];

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f837fc9a9fc335f87613e0c113050e1533d9efd
commit 8f837fc9a9fc335f87613e0c113050e1533d9efd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:30:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:26 2015 -0400

    libarchive: Use CommonCrypto APIs on OS X only when available
    
    Use each CommonCrypto API only when using an OS X SDK version new enough
    to provide it.

diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
index 9b01df8..efd350d 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
@@ -31,7 +31,7 @@
 #include "archive.h"
 #include "archive_cryptor_private.h"
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 
 static int
 pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
@@ -114,7 +114,10 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
 
 #endif
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
+#  define kCCAlgorithmAES kCCAlgorithmAES128
+# endif
 
 static int
 aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
index b62ec0c..9a96aee 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
@@ -31,6 +31,13 @@
 #define ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED
 
 #ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+#  define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 #include <CommonCrypto/CommonCryptor.h>
 #include <CommonCrypto/CommonKeyDerivation.h>
 #define AES_BLOCK_SIZE	16
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac.c b/Utilities/cmlibarchive/libarchive/archive_hmac.c
index 898853b..36e3e1c 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac.c
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac.c
@@ -31,7 +31,7 @@
 #include "archive.h"
 #include "archive_hmac_private.h"
 
-#ifdef __APPLE__
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
 
 static int
 __hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len)
diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
index 6a8bbf2..a9fb8ec 100644
--- a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h
@@ -31,6 +31,13 @@
 #define ARCHIVE_HMAC_PRIVATE_H_INCLUDED
 
 #ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+#  define ARCHIVE_HMAC_USE_Apple_CommonCrypto
+# endif
+#endif
+
+#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto
 #include <CommonCrypto/CommonHMAC.h>
 
 typedef	CCHmacContext archive_hmac_sha1_ctx;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61a0251e824559b27e751ce7ff0be72b9bb8ec69
commit 61a0251e824559b27e751ce7ff0be72b9bb8ec69
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 14:14:54 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:18:26 2015 -0400

    libarchive: Define O_CLOEXEC when missing
    
    Do this in archive_random.c as we do in several other sources already.

diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index 57c49d5..7891077 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -62,6 +62,10 @@ static void arc4random_buf(void *, size_t);
 #include <wincrypt.h>
 #endif
 
+#ifndef O_CLOEXEC
+#define O_CLOEXEC	0
+#endif
+
 /*
  * Random number generator function.
  * This simply calls arc4random_buf function if the platform provides it.

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 22 10:32:20 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 22 Oct 2015 10:32:20 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-875-g01bd45b
Message-ID: <20151022143220.27B26C09C1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  01bd45b35341d83cc4f44c0976f14883817c0351 (commit)
       via  194011b86f0d41c9f4cd10bdc3e4bf327db3d9d2 (commit)
      from  41256e03c170a8395bc5cd59fbe55bec27f4e19d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01bd45b35341d83cc4f44c0976f14883817c0351
commit 01bd45b35341d83cc4f44c0976f14883817c0351
Merge: 41256e0 194011b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 10:32:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 10:32:19 2015 -0400

    Merge topic 'doc-add_executable-typo' into next
    
    194011b8 Help: Add missing parenthesis in add_executable docs


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=194011b86f0d41c9f4cd10bdc3e4bf327db3d9d2
commit 194011b86f0d41c9f4cd10bdc3e4bf327db3d9d2
Author:     Christopher Dembia <cld72 at cornell.edu>
AuthorDate: Wed Oct 21 23:10:39 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:31:49 2015 -0400

    Help: Add missing parenthesis in add_executable docs

diff --git a/Help/command/add_executable.rst b/Help/command/add_executable.rst
index 4ed10e1..8b3fb57 100644
--- a/Help/command/add_executable.rst
+++ b/Help/command/add_executable.rst
@@ -14,7 +14,7 @@ files listed in the command invocation.  The ``<name>`` corresponds to the
 logical target name and must be globally unique within a project.  The
 actual file name of the executable built is constructed based on
 conventions of the native platform (such as ``<name>.exe`` or just
-``<name>``.
+``<name>``).
 
 By default the executable file will be created in the build tree
 directory corresponding to the source tree directory in which the

-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_executable.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct 22 12:27:03 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu, 22 Oct 2015 12:27:03 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-885-g23a2ea9
Message-ID: <20151022162703.1BCDEC08A2@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  23a2ea9d7f1bf9e05462e78508cb4a8a5ab0d28c (commit)
       via  b579e955b411029e189c6f173884ee25be3c138c (commit)
       via  d67b9669fd1511a4bf8f9732c37e35f7d70c60ab (commit)
       via  8cb738cb008759bf5146822834130a466a0f74a1 (commit)
       via  d87154d0dc3881c81df8acad8275c629d48832f5 (commit)
       via  7b5508df640190bc6bbd8542de6ae5eeef4300a2 (commit)
       via  715a873cb5aed773241c28cfa24a490b105aca84 (commit)
       via  d02435b24edd127ff33f2eb9ea3075b2898ec057 (commit)
       via  7d88907a36306870673898a452cfa2ee77d3ea4d (commit)
       via  4ab54236e329f882a31081780645cd853ea90a63 (commit)
      from  01bd45b35341d83cc4f44c0976f14883817c0351 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23a2ea9d7f1bf9e05462e78508cb4a8a5ab0d28c
commit 23a2ea9d7f1bf9e05462e78508cb4a8a5ab0d28c
Merge: 01bd45b b579e95
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 12:27:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 12:27:01 2015 -0400

    Merge topic 'use-generator-target' into next
    
    b579e955 Graphviz: Port to cmGeneratorTarget.
    d67b9669 C::B: Port API to cmGeneratorTarget.
    8cb738cb GHS: Port to cmGeneratorTarget.
    d87154d0 Sublime: Port API to cmGeneratorTarget.
    7b5508df Xcode: Port API to cmGeneratorTarget.
    715a873c Xcode: Prefer to get target state from cmGeneratorTarget.
    d02435b2 Xcode: Re-order conditions.
    7d88907a Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.
    4ab54236 Xcode: Port loops to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b579e955b411029e189c6f173884ee25be3c138c
commit b579e955b411029e189c6f173884ee25be3c138c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:49:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:26:32 2015 +0200

    Graphviz: Port to cmGeneratorTarget.

diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index cc36c62..a63b6e3 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -17,7 +17,7 @@
 
 
 
-static const char* getShapeForTarget(const cmTarget* target)
+static const char* getShapeForTarget(const cmGeneratorTarget* target)
 {
   if (!target)
     {
@@ -163,7 +163,7 @@ void cmGraphVizWriter::WriteTargetDependersFiles(const char* fileName)
 
   this->CollectTargetsAndLibs();
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -214,7 +214,7 @@ void cmGraphVizWriter::WritePerTargetFiles(const char* fileName)
 
   this->CollectTargetsAndLibs();
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -268,7 +268,7 @@ void cmGraphVizWriter::WriteGlobalFile(const char* fileName)
   std::set<std::string> insertedConnections;
   std::set<std::string> insertedNodes;
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -308,8 +308,8 @@ void cmGraphVizWriter::WriteConnections(const std::string& targetName,
                                     std::set<std::string>& insertedConnections,
                                     cmGeneratedFileStream& str) const
 {
-  std::map<std::string, const cmTarget* >::const_iterator targetPtrIt =
-                                             this->TargetPtrs.find(targetName);
+  std::map<std::string, const cmGeneratorTarget* >::const_iterator targetPtrIt
+      = this->TargetPtrs.find(targetName);
 
   if (targetPtrIt == this->TargetPtrs.end())  // not found at all
     {
@@ -327,7 +327,7 @@ void cmGraphVizWriter::WriteConnections(const std::string& targetName,
   std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
 
   const cmTarget::LinkLibraryVectorType* ll =
-                            &(targetPtrIt->second->GetOriginalLinkLibraries());
+      &(targetPtrIt->second->Target->GetOriginalLinkLibraries());
 
   for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
        llit != ll->end();
@@ -367,8 +367,8 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
                                     std::set<std::string>& insertedConnections,
                                     cmGeneratedFileStream& str) const
 {
-  std::map<std::string, const cmTarget* >::const_iterator targetPtrIt =
-                                             this->TargetPtrs.find(targetName);
+  std::map<std::string, const cmGeneratorTarget* >::const_iterator targetPtrIt
+      = this->TargetPtrs.find(targetName);
 
   if (targetPtrIt == this->TargetPtrs.end())  // not found at all
     {
@@ -386,8 +386,8 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
   std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
 
   // now search who links against me
-  for(std::map<std::string, const cmTarget*>::const_iterator dependerIt =
-                                                      this->TargetPtrs.begin();
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator
+      dependerIt = this->TargetPtrs.begin();
       dependerIt != this->TargetPtrs.end();
       ++dependerIt)
     {
@@ -404,7 +404,7 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
     // Now we have a target, check whether it links against targetName.
     // If so, draw a connection, and then continue with dependers on that one.
     const cmTarget::LinkLibraryVectorType* ll =
-                            &(dependerIt->second->GetOriginalLinkLibraries());
+        &(dependerIt->second->Target->GetOriginalLinkLibraries());
 
     for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
          llit != ll->end();
@@ -448,7 +448,7 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
 
 
 void cmGraphVizWriter::WriteNode(const std::string& targetName,
-                                 const cmTarget* target,
+                                 const cmGeneratorTarget* target,
                                  std::set<std::string>& insertedNodes,
                                  cmGeneratedFileStream& str) const
 {
@@ -488,12 +488,11 @@ int cmGraphVizWriter::CollectAllTargets()
        lit != this->LocalGenerators.end();
        ++ lit )
     {
-    const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
-    for ( cmTargets::const_iterator tit = targets->begin();
-          tit != targets->end();
-          ++ tit )
+    std::vector<cmGeneratorTarget*> targets = (*lit)->GetGeneratorTargets();
+    for ( std::vector<cmGeneratorTarget*>::const_iterator it =
+          targets.begin(); it != targets.end(); ++it )
       {
-      const char* realTargetName = tit->first.c_str();
+      const char* realTargetName = (*it)->GetName().c_str();
       if(this->IgnoreThisTarget(realTargetName))
         {
         // Skip ignored targets
@@ -503,7 +502,7 @@ int cmGraphVizWriter::CollectAllTargets()
       std::ostringstream ostr;
       ostr << this->GraphNodePrefix << cnt++;
       this->TargetNamesNodes[realTargetName] = ostr.str();
-      this->TargetPtrs[realTargetName] = &tit->second;
+      this->TargetPtrs[realTargetName] = *it;
       }
     }
 
@@ -519,19 +518,18 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
        lit != this->LocalGenerators.end();
        ++ lit )
     {
-    const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
-    for ( cmTargets::const_iterator tit = targets->begin();
-          tit != targets->end();
-          ++ tit )
+    std::vector<cmGeneratorTarget*> targets = (*lit)->GetGeneratorTargets();
+    for ( std::vector<cmGeneratorTarget*>::const_iterator it =
+          targets.begin(); it != targets.end(); ++it )
       {
-      const char* realTargetName = tit->first.c_str();
+      const char* realTargetName = (*it)->GetName().c_str();
       if (this->IgnoreThisTarget(realTargetName))
         {
         // Skip ignored targets
         continue;
         }
       const cmTarget::LinkLibraryVectorType* ll =
-                                     &(tit->second.GetOriginalLinkLibraries());
+          &((*it)->Target->GetOriginalLinkLibraries());
       for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
            llit != ll->end();
            ++ llit )
@@ -543,8 +541,8 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
           continue;
           }
 
-        std::map<std::string, const cmTarget*>::const_iterator tarIt =
-                                                this->TargetPtrs.find(libName);
+        std::map<std::string, const cmGeneratorTarget*>::const_iterator tarIt
+            = this->TargetPtrs.find(libName);
         if ( tarIt == this->TargetPtrs.end() )
           {
           std::ostringstream ostr;
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 0a20e6e..90d31d3 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -14,9 +14,9 @@
 #include "cmStandardIncludes.h"
 #include "cmLocalGenerator.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include <cmsys/RegularExpression.hxx>
 
+class cmGeneratorTarget;
 
 /** This class implements writing files for graphviz (dot) for graphs
  * representing the dependencies between the targets in the project. */
@@ -54,7 +54,8 @@ protected:
                                 std::set<std::string>& insertedConnections,
                                 cmGeneratedFileStream& str) const;
 
-  void WriteNode(const std::string& targetName, const cmTarget* target,
+  void WriteNode(const std::string& targetName,
+                 const cmGeneratorTarget* target,
                  std::set<std::string>& insertedNodes,
                  cmGeneratedFileStream& str) const;
 
@@ -73,7 +74,7 @@ protected:
 
   const std::vector<cmLocalGenerator*>& LocalGenerators;
 
-  std::map<std::string, const cmTarget*> TargetPtrs;
+  std::map<std::string, const cmGeneratorTarget*> TargetPtrs;
   // maps from the actual target names to node names in dot:
   std::map<std::string, std::string> TargetNamesNodes;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d67b9669fd1511a4bf8f9732c37e35f7d70c60ab
commit d67b9669fd1511a4bf8f9732c37e35f7d70c60ab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:38:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:26:32 2015 +0200

    C::B: Port API to cmGeneratorTarget.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index a71b1cb..597c9d8 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -17,7 +17,6 @@
 #include "cmake.h"
 #include "cmSourceFile.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include "cmSystemTools.h"
 #include "cmXMLSafe.h"
 
@@ -441,7 +440,7 @@ void cmExtraCodeBlocksGenerator
               }
 
             CbpUnit &cbpUnit = allFiles[fullPath];
-            cbpUnit.Targets.push_back((*ti)->Target);
+            cbpUnit.Targets.push_back(*ti);
             }
           }
         default:  // intended fallthrough
@@ -501,8 +500,9 @@ void cmExtraCodeBlocksGenerator
 
     fout<<"      <Unit filename=\""<< cmXMLSafe(unitFilename) <<"\">\n";
 
-    for(std::vector<const cmTarget*>::const_iterator ti = unit.Targets.begin();
-      ti != unit.Targets.end(); ++ti)
+    for(std::vector<const cmGeneratorTarget*>::const_iterator ti =
+        unit.Targets.begin();
+        ti != unit.Targets.end(); ++ti)
       {
       std::string const& targetName = (*ti)->GetName();
       fout<<"         <Option target=\""<< cmXMLSafe(targetName) <<"\"/>\n";
@@ -560,7 +560,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
-    int cbTargetType = this->GetCBTargetType(target->Target);
+    int cbTargetType = this->GetCBTargetType(target);
     std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmState::EXECUTABLE)
       {
@@ -718,7 +718,7 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
 
 
 // Translate the cmake target type into the CodeBlocks target type id
-int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
+int cmExtraCodeBlocksGenerator::GetCBTargetType(cmGeneratorTarget* target)
 {
   if ( target->GetType()==cmState::EXECUTABLE)
     {
diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h
index f28809a..0c3846d 100644
--- a/Source/cmExtraCodeBlocksGenerator.h
+++ b/Source/cmExtraCodeBlocksGenerator.h
@@ -18,7 +18,6 @@
 class cmLocalGenerator;
 class cmMakefile;
 class cmGeneratorTarget;
-class cmTarget;
 class cmGeneratedFileStream;
 
 /** \class cmExtraCodeBlocksGenerator
@@ -42,7 +41,7 @@ public:
 private:
   struct CbpUnit
   {
-    std::vector<const cmTarget*> Targets;
+    std::vector<const cmGeneratorTarget*> Targets;
   };
 
   void CreateProjectFile(const std::vector<cmLocalGenerator*>& lgs);
@@ -53,7 +52,7 @@ private:
                                     cmGeneratorTarget* target) const;
 
   std::string GetCBCompilerId(const cmMakefile* mf);
-  int GetCBTargetType(cmTarget* target);
+  int GetCBTargetType(cmGeneratorTarget* target);
   std::string BuildMakeCommand(const std::string& make, const char* makefile,
                                const std::string& target);
   void AppendTarget(cmGeneratedFileStream& fout,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8cb738cb008759bf5146822834130a466a0f74a1
commit 8cb738cb008759bf5146822834130a466a0f74a1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:31:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:26:32 2015 +0200

    GHS: Port to cmGeneratorTarget.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 01e6f8c..12115be 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -22,23 +22,22 @@
 std::string const cmGhsMultiTargetGenerator::DDOption("-dynamic");
 
 cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target)
-  : Target(target->Target)
-  , GeneratorTarget(target)
+  : GeneratorTarget(target)
   , LocalGenerator(static_cast<cmLocalGhsMultiGenerator *>(
                      target->GetLocalGenerator()))
   , Makefile(target->Target->GetMakefile())
   , TargetGroup(DetermineIfTargetGroup(target))
   , DynamicDownload(false)
 {
-  this->RelBuildFilePath = this->GetRelBuildFilePath(target->Target);
+  this->RelBuildFilePath = this->GetRelBuildFilePath(target);
 
   this->RelOutputFileName =
-    this->RelBuildFilePath + this->Target->GetName() + ".a";
+    this->RelBuildFilePath + target->GetName() + ".a";
 
   this->RelBuildFileName = this->RelBuildFilePath;
-  this->RelBuildFileName += this->GetBuildFileName(target->Target);
+  this->RelBuildFileName += this->GetBuildFileName(target);
 
-  std::string absPathToRoot = this->GetAbsPathToRoot(target->Target);
+  std::string absPathToRoot = this->GetAbsPathToRoot(target);
   absPathToRoot = this->AddSlashIfNeededToPath(absPathToRoot);
   this->AbsBuildFilePath = absPathToRoot + this->RelBuildFilePath;
   this->AbsBuildFileName = absPathToRoot + this->RelBuildFileName;
@@ -51,7 +50,8 @@ cmGhsMultiTargetGenerator::~cmGhsMultiTargetGenerator()
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetRelBuildFilePath(
+        const cmGeneratorTarget *target)
 {
   std::string output;
   char const *folderProp = target->GetProperty("FOLDER");
@@ -66,15 +66,13 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmGeneratorTarget *target)
 {
-  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
-      ->GetGeneratorTarget(target);
-  return gt->GetLocalGenerator()->GetBinaryDirectory();
+  return target->GetLocalGenerator()->GetBinaryDirectory();
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmGeneratorTarget *target)
 {
   std::string output;
   output = cmGhsMultiTargetGenerator::GetAbsPathToRoot(target);
@@ -84,7 +82,7 @@ cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmTarget *target)
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmGeneratorTarget *target)
 {
   std::string output;
   output = cmGhsMultiTargetGenerator::GetRelBuildFilePath(target);
@@ -93,7 +91,8 @@ cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmTarget *target)
   return  output;
 }
 
-std::string cmGhsMultiTargetGenerator::GetBuildFileName(const cmTarget *target)
+std::string
+cmGhsMultiTargetGenerator::GetBuildFileName(const cmGeneratorTarget *target)
 {
   std::string output;
   output = target->GetName();
@@ -161,7 +160,8 @@ void cmGhsMultiTargetGenerator::Generate()
 bool cmGhsMultiTargetGenerator::IncludeThisTarget()
 {
   bool output = true;
-  char const *excludeFromAll = this->Target->GetProperty("EXCLUDE_FROM_ALL");
+  char const *excludeFromAll =
+      this->GeneratorTarget->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
       '\0' == excludeFromAll[1])
     {
@@ -367,13 +367,13 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
   for (cmTargetDependSet::iterator tdsI = tds.begin(); tdsI != tds.end();
        ++tdsI)
     {
-    const cmTarget *tg = (*tdsI)->Target;
+    const cmGeneratorTarget *tg = *tdsI;
     *this->GetFolderBuildStreams() << "    -L\"" << GetAbsBuildFilePath(tg)
                                    << "\"" << std::endl;
     }
   // library targets
   cmTarget::LinkLibraryVectorType llv =
-    this->Target->GetOriginalLinkLibraries();
+    this->GeneratorTarget->Target->GetOriginalLinkLibraries();
   for (cmTarget::LinkLibraryVectorType::const_iterator llvI = llv.begin();
        llvI != llv.end(); ++llvI)
     {
@@ -391,10 +391,12 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
 
 void cmGhsMultiTargetGenerator::WriteCustomCommands()
 {
-  WriteCustomCommandsHelper(this->Target->GetPreBuildCommands(),
-                            cmTarget::PRE_BUILD);
-  WriteCustomCommandsHelper(this->Target->GetPostBuildCommands(),
-                            cmTarget::POST_BUILD);
+  WriteCustomCommandsHelper(
+        this->GeneratorTarget->Target->GetPreBuildCommands(),
+        cmTarget::PRE_BUILD);
+  WriteCustomCommandsHelper(
+        this->GeneratorTarget->Target->GetPostBuildCommands(),
+        cmTarget::POST_BUILD);
 }
 
 void cmGhsMultiTargetGenerator::WriteCustomCommandsHelper(
@@ -518,7 +520,7 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
   std::string outputDir(AbsBuildFilePath);
 
   const char *runtimeOutputProp =
-    this->Target->GetProperty("RUNTIME_OUTPUT_DIRECTORY");
+    this->GeneratorTarget->GetProperty("RUNTIME_OUTPUT_DIRECTORY");
   if (NULL != runtimeOutputProp)
     {
     outputDir = runtimeOutputProp;
@@ -526,7 +528,8 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
 
   std::string configCapped(cmSystemTools::UpperCase(config));
   const char *runtimeOutputSProp =
-    this->Target->GetProperty("RUNTIME_OUTPUT_DIRECTORY_" + configCapped);
+    this->GeneratorTarget
+      ->GetProperty("RUNTIME_OUTPUT_DIRECTORY_" + configCapped);
   if (NULL != runtimeOutputSProp)
     {
     outputDir = runtimeOutputSProp;
@@ -544,9 +547,10 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
 std::string
 cmGhsMultiTargetGenerator::GetOutputFilename(const std::string &config) const
 {
-  std::string outputFilename(this->Target->GetName());
+  std::string outputFilename(this->GeneratorTarget->GetName());
 
-  const char *outputNameProp = this->Target->GetProperty("OUTPUT_NAME");
+  const char *outputNameProp =
+      this->GeneratorTarget->GetProperty("OUTPUT_NAME");
   if (NULL != outputNameProp)
     {
     outputFilename = outputNameProp;
@@ -554,7 +558,7 @@ cmGhsMultiTargetGenerator::GetOutputFilename(const std::string &config) const
 
   std::string configCapped(cmSystemTools::UpperCase(config));
   const char *outputNameSProp =
-    this->Target->GetProperty(configCapped + "_OUTPUT_NAME");
+    this->GeneratorTarget->GetProperty(configCapped + "_OUTPUT_NAME");
   if (NULL != outputNameSProp)
     {
     outputFilename = outputNameSProp;
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index d1c17f4..327fdef 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -54,11 +54,11 @@ public:
     return this->AbsOutputFileName.c_str();
   }
 
-  static std::string GetRelBuildFilePath(const cmTarget *target);
-  static std::string GetAbsPathToRoot(const cmTarget *target);
-  static std::string GetAbsBuildFilePath(const cmTarget *target);
-  static std::string GetRelBuildFileName(const cmTarget *target);
-  static std::string GetBuildFileName(const cmTarget *target);
+  static std::string GetRelBuildFilePath(const cmGeneratorTarget *target);
+  static std::string GetAbsPathToRoot(const cmGeneratorTarget *target);
+  static std::string GetAbsBuildFilePath(const cmGeneratorTarget *target);
+  static std::string GetRelBuildFileName(const cmGeneratorTarget *target);
+  static std::string GetBuildFileName(const cmGeneratorTarget *target);
   static std::string AddSlashIfNeededToPath(std::string const &input);
 
 private:
@@ -99,7 +99,6 @@ private:
   bool DetermineIfDynamicDownload(std::string const &config,
                                   const std::string &language);
 
-  cmTarget *Target;
   cmGeneratorTarget* GeneratorTarget;
   cmLocalGhsMultiGenerator *LocalGenerator;
   cmMakefile *Makefile;
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 7c33904..1bcbd26 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -487,7 +487,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
        tgtsI != tgts.end(); ++tgtsI)
     {
     const cmGeneratorTarget *tgt = *tgtsI;
-    if (IsTgtForBuild(tgt->Target))
+    if (IsTgtForBuild(tgt))
       {
       char const *rawFolderName = tgt->GetProperty("FOLDER");
       if (NULL == rawFolderName)
@@ -504,7 +504,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
           GhsMultiGpj::PROJECT);
         }
       std::vector<cmsys::String> splitPath = cmSystemTools::SplitString(
-            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target));
+            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt));
       std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" +
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
@@ -516,13 +516,12 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
     }
 }
 
-bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt)
+bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmGeneratorTarget *tgt)
 {
   const std::string config =
-    tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
+    tgt->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   std::vector<cmSourceFile *> tgtSources;
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
-  gt->GetSourceFiles(tgtSources, config);
+  tgt->GetSourceFiles(tgtSources, config);
   bool tgtInBuild = true;
   char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index 04a9a5b..480cd6a 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -111,7 +111,7 @@ private:
       GhsMultiGpj::Types projType);
   static std::string GetFileNameFromPath(std::string const &path);
   void UpdateBuildFiles(std::vector<cmGeneratorTarget*> tgts);
-  bool IsTgtForBuild(const cmTarget *tgt);
+  bool IsTgtForBuild(const cmGeneratorTarget *tgt);
 
   std::vector<cmGeneratedFileStream *> TargetSubProjects;
   std::map<std::string, cmGeneratedFileStream *> TargetFolderBuildStreams;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d87154d0dc3881c81df8acad8275c629d48832f5
commit d87154d0dc3881c81df8acad8275c629d48832f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:53:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:26:32 2015 +0200

    Sublime: Port API to cmGeneratorTarget.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 47822e8..92d38b9 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -20,7 +20,6 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 
 #include <cmsys/SystemTools.hxx>
 
@@ -204,12 +203,12 @@ void cmExtraSublimeTextGenerator::
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, targetName, *lg, (*ti)->Target,
+          this->AppendTarget(fout, targetName, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           std::string fastTarget = targetName;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, *lg, (*ti)->Target,
+          this->AppendTarget(fout, fastTarget, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           }
@@ -225,7 +224,7 @@ void cmExtraSublimeTextGenerator::
   AppendTarget(cmGeneratedFileStream& fout,
                const std::string& targetName,
                cmLocalGenerator* lg,
-               cmTarget* target,
+               cmGeneratorTarget* target,
                const char* make,
                const cmMakefile* makefile,
                const char*, //compiler
@@ -235,10 +234,8 @@ void cmExtraSublimeTextGenerator::
 
   if (target != 0)
     {
-      cmGeneratorTarget *gtgt = this->GlobalGenerator
-                                    ->GetGeneratorTarget(target);
       std::vector<cmSourceFile*> sourceFiles;
-      gtgt->GetSourceFiles(sourceFiles,
+      target->GetSourceFiles(sourceFiles,
                              makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       std::vector<cmSourceFile*>::const_iterator sourceFilesEnd =
         sourceFiles.end();
@@ -256,9 +253,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, target);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, gtgt);
+            this->ComputeDefines(*iter, lg, target);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 5dd1140..cf31ee0 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -18,7 +18,6 @@
 
 class cmLocalGenerator;
 class cmMakefile;
-class cmTarget;
 class cmGeneratedFileStream;
 class cmGeneratorTarget;
 
@@ -67,7 +66,7 @@ private:
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string& targetName,
                     cmLocalGenerator* lg,
-                    cmTarget* target,
+                    cmGeneratorTarget* target,
                     const char* make,
                     const cmMakefile* makefile,
                     const char* compiler,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b5508df640190bc6bbd8542de6ae5eeef4300a2
commit 7b5508df640190bc6bbd8542de6ae5eeef4300a2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 21:23:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:26:31 2015 +0200

    Xcode: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index a2d87ff..9111a3f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -711,9 +711,9 @@ cmXCodeObject* cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
+GetGroupMapKeyFromPath(cmGeneratorTarget* target, const std::string& fullpath)
 {
-  std::string key(cmtarget.GetName());
+  std::string key(target->GetName());
   key += "-";
   key += fullpath;
   return key;
@@ -721,16 +721,16 @@ GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKey(cmTarget& cmtarget, cmSourceFile* sf)
+GetGroupMapKey(cmGeneratorTarget* target, cmSourceFile* sf)
 {
-  return GetGroupMapKeyFromPath(cmtarget, sf->GetFullPath());
+  return GetGroupMapKeyFromPath(target, sf->GetFullPath());
 }
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
@@ -738,7 +738,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   // fileRef object for any given full path.
   //
   cmXCodeObject* fileRef =
-    this->CreateXCodeFileReferenceFromPath(fullpath, cmtarget, lang, sf);
+    this->CreateXCodeFileReferenceFromPath(fullpath, target, lang, sf);
 
   cmXCodeObject* buildFile = this->CreateObject(cmXCodeObject::PBXBuildFile);
   buildFile->SetComment(fileRef->GetComment());
@@ -751,7 +751,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
                                               cmSourceFile* sf,
-                                              cmTarget& cmtarget)
+                                              cmGeneratorTarget* gtgt)
 {
   // Add flags from target and source file properties.
   std::string flags;
@@ -781,7 +781,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   cmXCodeObject* buildFile =
-    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), cmtarget, lang, sf);
+    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), gtgt, lang, sf);
   cmXCodeObject* fileRef = buildFile->GetObject("fileRef")->GetObject();
 
   cmXCodeObject* settings =
@@ -791,7 +791,6 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
   // Is this a resource file in this target? Add it to the resources group...
   //
 
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmGeneratorTarget::SourceFileFlags tsFlags =
       gtgt->GetTargetSourceFileFlags(sf);
   bool isResource = tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource;
@@ -926,11 +925,11 @@ GetSourcecodeValueFromFileExtension(const std::string& _ext,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
-  std::string key = GetGroupMapKeyFromPath(cmtarget, fullpath);
+  std::string key = GetGroupMapKeyFromPath(target, fullpath);
   cmXCodeObject* fileRef = this->FileRefs[key];
   if(!fileRef)
     {
@@ -1007,13 +1006,13 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf,
-                                                 cmTarget& cmtarget)
+                                                 cmGeneratorTarget* target)
 {
   std::string lang =
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   return this->CreateXCodeFileReferenceFromPath(
-    sf->GetFullPath(), cmtarget, lang, sf);
+    sf->GetFullPath(), target, lang, sf);
 }
 
 //----------------------------------------------------------------------------
@@ -1100,7 +1099,6 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       l != sortedTargets.end(); l++)
     {
     cmGeneratorTarget* gtgt = l->second;
-    cmTarget& cmtarget = *gtgt->Target;
 
     std::string targetName = gtgt->GetName();
 
@@ -1118,7 +1116,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     if(gtgt->GetType() == cmState::UTILITY ||
        gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
-      cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
+      cmXCodeObject* t = this->CreateUtilityTarget(gtgt);
       if (!t)
         {
         return false;
@@ -1146,7 +1144,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       {
       cmXCodeObject* xsf =
         this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                    *i, cmtarget);
+                                    *i, gtgt);
       cmXCodeObject* fr = xsf->GetObject("fileRef");
       cmXCodeObject* filetype =
         fr->GetObject()->GetObject("explicitFileType");
@@ -1197,7 +1195,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
         {
         std::string obj = *oi;
         cmXCodeObject* xsf =
-          this->CreateXCodeSourceFileFromPath(obj, cmtarget, "", 0);
+          this->CreateXCodeSourceFileFromPath(obj, gtgt, "", 0);
         externalObjFiles.push_back(xsf);
         }
       }
@@ -1320,7 +1318,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
           {
           cmXCodeObject* xsf =
             this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                        *sfIt, cmtarget);
+                                        *sfIt, gtgt);
           buildFiles->AddObject(xsf);
           }
         contentBuildPhases.push_back(copyFilesBuildPhase);
@@ -1354,9 +1352,9 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     this->CreateCustomCommands(buildPhases, sourceBuildPhase,
                                headerBuildPhase, resourceBuildPhase,
                                contentBuildPhases,
-                               frameworkBuildPhase, cmtarget);
+                               frameworkBuildPhase, gtgt);
 
-    targets.push_back(this->CreateXCodeTarget(cmtarget, buildPhases));
+    targets.push_back(this->CreateXCodeTarget(gtgt, buildPhases));
     }
   return true;
 }
@@ -1431,7 +1429,7 @@ bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf)
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                                          const char* name2,
-                                         cmTarget& cmtarget,
+                                         cmGeneratorTarget* target,
                                          const std::vector<cmCustomCommand>&
                                          commands)
 {
@@ -1451,7 +1449,7 @@ cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                            this->CreateString("0"));
   buildPhase->AddAttribute("shellPath",
                            this->CreateString("/bin/sh"));
-  this->AddCommandsToBuildPhase(buildPhase, cmtarget, commands,
+  this->AddCommandsToBuildPhase(buildPhase, target, commands,
                                 name2);
   return buildPhase;
 }
@@ -1468,16 +1466,14 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
                                                   contentBuildPhases,
                                                   cmXCodeObject*
                                                   frameworkBuildPhase,
-                                                  cmTarget& cmtarget)
+                                                  cmGeneratorTarget* gtgt)
 {
   std::vector<cmCustomCommand> const & prebuild
-    = cmtarget.GetPreBuildCommands();
+    = gtgt->Target->GetPreBuildCommands();
   std::vector<cmCustomCommand> const & prelink
-    = cmtarget.GetPreLinkCommands();
+    = gtgt->Target->GetPreLinkCommands();
   std::vector<cmCustomCommand> postbuild
-    = cmtarget.GetPostBuildCommands();
-
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+    = gtgt->Target->GetPostBuildCommands();
 
   if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
@@ -1530,19 +1526,19 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   cmXCodeObject* cmakeRulesBuildPhase =
     this->CreateBuildPhase("CMake Rules",
                            "cmakeRulesBuildPhase",
-                           cmtarget, commands);
+                           gtgt, commands);
   // create prebuild phase
   cmXCodeObject* preBuildPhase =
     this->CreateBuildPhase("CMake PreBuild Rules", "preBuildCommands",
-                           cmtarget, prebuild);
+                           gtgt, prebuild);
   // create prelink phase
   cmXCodeObject* preLinkPhase =
     this->CreateBuildPhase("CMake PreLink Rules", "preLinkCommands",
-                           cmtarget, prelink);
+                           gtgt, prelink);
   // create postbuild phase
   cmXCodeObject* postBuildPhase =
     this->CreateBuildPhase("CMake PostBuild Rules", "postBuildPhase",
-                           cmtarget, postbuild);
+                           gtgt, postbuild);
 
   // The order here is the order they will be built in.
   // The order "headers, resources, sources" mimics a native project generated
@@ -1625,7 +1621,7 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag,
 //----------------------------------------------------------------------------
 void
 cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                                                cmTarget& target,
+                                                cmGeneratorTarget* target,
                                                 std::vector<cmCustomCommand>
                                                 const & commands,
                                                 const char* name)
@@ -1635,7 +1631,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
   makefile += "/";
-  makefile += target.GetName();
+  makefile += target->GetName();
   makefile += "_";
   makefile += name;
   makefile += ".make";
@@ -1669,7 +1665,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
 //----------------------------------------------------------------------------
 void  cmGlobalXCodeGenerator
 ::CreateCustomRulesMakefile(const char* makefileBasename,
-                            cmTarget& target,
+                            cmGeneratorTarget* target,
                             std::vector<cmCustomCommand>
                             const & commands,
                             const std::string& configName)
@@ -1686,7 +1682,7 @@ void  cmGlobalXCodeGenerator
     }
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  makefileStream << "# Custom rules for " << target.GetName() << "\n";
+  makefileStream << "# Custom rules for " << target->GetName() << "\n";
 
   // disable the implicit rules
   makefileStream << ".SUFFIXES: " << "\n";
@@ -1715,7 +1711,7 @@ void  cmGlobalXCodeGenerator
         {
         std::ostringstream str;
         str << "_buildpart_" << count++ ;
-        tname[&ccg.GetCC()] = std::string(target.GetName()) + str.str();
+        tname[&ccg.GetCC()] = std::string(target->GetName()) + str.str();
         makefileStream << "\\\n\t" << tname[&ccg.GetCC()];
         }
       }
@@ -1793,11 +1789,10 @@ void  cmGlobalXCodeGenerator
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
+void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
@@ -2020,7 +2015,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     if(this->XcodeVersion >= 21)
       {
       std::string pncdir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
                                   this->CreateString(pncdir.c_str()));
       }
@@ -2029,7 +2024,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       buildSettings->AddAttribute("OBJROOT",
                                   this->CreateString(pndir.c_str()));
       pndir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       }
     }
 
@@ -2067,7 +2062,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
         extraLinkOptions += " ";
         extraLinkOptions += createFlags;
         }
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the cfbundle name. This avoids creating
       // a per-configuration Info.plist file. The cfbundle plist
@@ -2113,11 +2108,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
-      std::string fw_version = target.GetFrameworkVersion();
+      std::string fw_version = gtgt->Target->GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
                                   this->CreateString(fw_version.c_str()));
 
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the framework name. This avoids creating
       // a per-configuration Info.plist file.
@@ -2160,7 +2155,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     // Handle bundles and normal executables separately.
     if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the executable name.  This avoids creating
       // a per-configuration Info.plist file.
@@ -2400,7 +2395,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
     }
 
-  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(target),
+  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(gtgt),
                               this->CreateString(extraLinkOptions.c_str()));
   buildSettings->AddAttribute("OTHER_REZFLAGS",
                               this->CreateString(""));
@@ -2459,7 +2454,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   // put this last so it can override existing settings
   // Convert "XCODE_ATTRIBUTE_*" properties directly.
   {
-  cmPropertyMap const& props = target.GetProperties();
+  cmPropertyMap const& props = gtgt->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin();
       i != props.end(); ++i)
     {
@@ -2508,9 +2503,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
+cmGlobalXCodeGenerator::CreateUtilityTarget(cmGeneratorTarget* gtgt)
 {
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2538,11 +2532,11 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
   this->CreateCustomCommands(buildPhases, 0, 0, 0, emptyContentVector, 0,
-                             cmtarget);
+                             gtgt);
   target->AddAttribute("buildPhases", buildPhases);
   if(this->XcodeVersion > 20)
     {
-    this->AddConfigurations(target, cmtarget);
+    this->AddConfigurations(target, gtgt);
     }
   else
     {
@@ -2550,7 +2544,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings, theConfig);
+    this->CreateBuildSettings(gtgt, buildSettings, theConfig);
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2558,8 +2552,8 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   target->AddAttribute("dependencies", dependencies);
   target->AddAttribute("name", this->CreateString(gtgt->GetName()));
   target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
 
   // Add source files without build rules for editing convenience.
   if(gtgt->GetType() == cmState::UTILITY)
@@ -2575,7 +2569,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       {
       if(!(*i)->GetPropertyAsBool("GENERATED"))
         {
-        this->CreateXCodeFileReference(*i, cmtarget);
+        this->CreateXCodeFileReference(*i, gtgt);
         }
       }
     }
@@ -2588,7 +2582,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
 //----------------------------------------------------------------------------
 std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
-                                                      cmTarget& cmtarget)
+                                                      cmGeneratorTarget* gtgt)
 {
   std::string configTypes =
     this->CurrentMakefile->GetRequiredDefinition("CMAKE_CONFIGURATION_TYPES");
@@ -2604,7 +2598,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
   std::string comment = "Build configuration list for ";
   comment += cmXCodeObject::PBXTypeNames[target->GetIsA()];
   comment += " \"";
-  comment += cmtarget.GetName();
+  comment += gtgt->GetName();
   comment += "\"";
   configlist->SetComment(comment.c_str());
   target->AddAttribute("buildConfigurationList",
@@ -2616,7 +2610,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
     buildConfigurations->AddObject(config);
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings,
+    this->CreateBuildSettings(gtgt, buildSettings,
                               configVector[i].c_str());
     config->AddAttribute("name", this->CreateString(configVector[i].c_str()));
     config->SetComment(configVector[i].c_str());
@@ -2634,12 +2628,12 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
 }
 
 //----------------------------------------------------------------------------
-const char*
-cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
+const char* cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(
+    cmGeneratorTarget const* target) const
 {
   if(this->XcodeVersion >= 60 &&
-     (cmtarget.GetType() == cmState::STATIC_LIBRARY ||
-      cmtarget.GetType() == cmState::OBJECT_LIBRARY))
+     (target->GetType() == cmState::STATIC_LIBRARY ||
+      target->GetType() == cmState::OBJECT_LIBRARY))
     {
     return "OTHER_LIBTOOLFLAGS";
     }
@@ -2709,11 +2703,9 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
+cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt,
                                           cmXCodeObject* buildPhases)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
-
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
@@ -2726,14 +2718,14 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   std::string defConfig;
   if(this->XcodeVersion > 20)
     {
-    defConfig = this->AddConfigurations(target, cmtarget);
+    defConfig = this->AddConfigurations(target, gtgt);
     }
   else
     {
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
     defConfig = this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-    this->CreateBuildSettings(cmtarget, buildSettings, defConfig.c_str());
+    this->CreateBuildSettings(gtgt, buildSettings, defConfig.c_str());
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2770,22 +2762,23 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     {
     target->AddAttribute("productType", this->CreateString(productType));
     }
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
   target->SetId(this->GetOrCreateId(
     gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
 //----------------------------------------------------------------------------
-cmXCodeObject* cmGlobalXCodeGenerator::FindXCodeTarget(cmTarget const* t)
+cmXCodeObject*
+cmGlobalXCodeGenerator::FindXCodeTarget(cmGeneratorTarget const* t)
 {
   if(!t)
     {
     return 0;
     }
 
-  std::map<cmTarget const*, cmXCodeObject*>::const_iterator const i =
+  std::map<cmGeneratorTarget const*, cmXCodeObject*>::const_iterator const i =
     this->XCodeObjectMap.find(t);
   if (i == this->XCodeObjectMap.end())
     {
@@ -2922,8 +2915,7 @@ void cmGlobalXCodeGenerator
 void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
-  cmTarget* cmtarget = target->GetTarget();
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  cmGeneratorTarget* gt = target->GetTarget();
   if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
@@ -2938,7 +2930,7 @@ void cmGlobalXCodeGenerator
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
-    if(cmXCodeObject* dptarget = this->FindXCodeTarget((*i)->Target))
+    if(cmXCodeObject* dptarget = this->FindXCodeTarget(*i))
       {
       this->AddDependTarget(target, dptarget);
       }
@@ -2967,7 +2959,7 @@ void cmGlobalXCodeGenerator
         linkObjs += this->XCodeEscapePath(oi->c_str());
         }
       this->AppendBuildSettingAttribute(
-        target, this->GetTargetLinkFlagsVar(*cmtarget),
+        target, this->GetTargetLinkFlagsVar(gt),
         linkObjs.c_str(), configName);
       }
 
@@ -3047,7 +3039,7 @@ void cmGlobalXCodeGenerator
         }
       }
     this->AppendBuildSettingAttribute(
-      target, this->GetTargetLinkFlagsVar(*cmtarget),
+      target, this->GetTargetLinkFlagsVar(gt),
       linkLibs.c_str(), configName);
     }
     }
@@ -3090,7 +3082,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       // MACOSX_BUNDLE file
       if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(*gtgt->Target);
+        std::string plist = this->ComputeInfoPListLocation(gtgt);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3110,8 +3102,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKey(*gtgt->Target, sf);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKey(gtgt, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
@@ -3125,8 +3117,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(*gtgt->Target, source);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(gtgt, source);
         this->GroupMap[key] = pbxgroup;
         }
       }
@@ -3157,16 +3149,16 @@ cmXCodeObject *cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 cmXCodeObject* cmGlobalXCodeGenerator
-::CreateOrGetPBXGroup(cmTarget& cmtarget, cmSourceGroup* sg)
+::CreateOrGetPBXGroup(cmGeneratorTarget* gtgt, cmSourceGroup* sg)
 {
   std::string s;
   std::string target;
-  const char *targetFolder= cmtarget.GetProperty("FOLDER");
+  const char *targetFolder= gtgt->GetProperty("FOLDER");
   if(targetFolder) {
     target = targetFolder;
     target += "/";
   }
-  target += cmtarget.GetName();
+  target += gtgt->GetName();
   s = target + "/";
   s += sg->GetFullName();
   std::map<std::string, cmXCodeObject* >::iterator it =
@@ -3556,10 +3548,10 @@ std::string
 cmGlobalXCodeGenerator::GetObjectsNormalDirectory(
   const std::string &projName,
   const std::string &configName,
-  const cmTarget *t) const
+  const cmGeneratorTarget *t) const
 {
   std::string dir =
-    t->GetMakefile()->GetCurrentBinaryDirectory();
+    t->GetLocalGenerator()->GetCurrentBinaryDirectory();
   dir += "/";
   dir += projName;
   dir += ".build/";
@@ -3633,8 +3625,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         i != targets.end(); ++i)
       {
       cmXCodeObject* target = *i;
-      cmTarget* t =target->GetTarget();
-      cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
+      cmGeneratorTarget* gt =target->GetTarget();
 
       if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
@@ -3695,7 +3686,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         if(this->Architectures.size() > 1)
           {
           std::string universal = this->GetObjectsNormalDirectory(
-            this->CurrentProject, configName, t);
+            this->CurrentProject, configName, gt);
           for( std::vector<std::string>::iterator arch =
                  this->Architectures.begin();
                arch != this->Architectures.end(); ++arch)
@@ -4038,12 +4029,13 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags,
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmTarget& target)
+cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmGeneratorTarget* target)
 {
-  std::string plist = target.GetMakefile()->GetCurrentBinaryDirectory();
+  std::string plist =
+      target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   plist += cmake::GetCMakeFilesDirectory();
   plist += "/";
-  plist += target.GetName();
+  plist += target->GetName();
   plist += ".dir/Info.plist";
   return plist;
 }
@@ -4069,7 +4061,7 @@ void cmGlobalXCodeGenerator
 {
   std::string configName = this->GetCMakeCFGIntDir();
   std::string dir = this->GetObjectsNormalDirectory(
-    "$(PROJECT_NAME)", configName, gt->Target);
+    "$(PROJECT_NAME)", configName, gt);
   if(this->XcodeVersion >= 21)
     {
     dir += "$(CURRENT_ARCH)/";
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 10d9bd6..510d46e 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -16,7 +16,6 @@
 #include "cmXCodeObject.h"
 #include "cmCustomCommand.h"
 class cmGlobalGeneratorFactory;
-class cmTarget;
 class cmSourceFile;
 class cmSourceGroup;
 
@@ -90,7 +89,7 @@ protected:
   virtual void AddExtraIDETargets();
   virtual void Generate();
 private:
-  cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget,
+  cmXCodeObject* CreateOrGetPBXGroup(cmGeneratorTarget* gtgt,
                                      cmSourceGroup* sg);
   cmXCodeObject* CreatePBXGroup(cmXCodeObject *parent,
                                 std::string name);
@@ -108,22 +107,22 @@ private:
                             cmXCodeObject* resourceBuildPhase,
                             std::vector<cmXCodeObject*> contentBuildPhases,
                             cmXCodeObject* frameworkBuildPhase,
-                            cmTarget& cmtarget);
+                            cmGeneratorTarget *gtgt);
 
-  std::string ComputeInfoPListLocation(cmTarget& target);
+  std::string ComputeInfoPListLocation(cmGeneratorTarget *target);
 
   void AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                               cmTarget& target,
+                               cmGeneratorTarget *target,
                                std::vector<cmCustomCommand>
                                const & commands,
                                const char* commandFileName);
 
   void CreateCustomRulesMakefile(const char* makefileBasename,
-                                 cmTarget& target,
+                                 cmGeneratorTarget* target,
                                  std::vector<cmCustomCommand> const & commands,
                                  const std::string& configName);
 
-  cmXCodeObject* FindXCodeTarget(cmTarget const*);
+  cmXCodeObject* FindXCodeTarget(const cmGeneratorTarget *);
   std::string GetOrCreateId(const std::string& name, const std::string& id);
 
   // create cmXCodeObject from these functions so that memory can be managed
@@ -132,22 +131,23 @@ private:
   cmXCodeObject* CreateObject(cmXCodeObject::Type type);
   cmXCodeObject* CreateString(const std::string& s);
   cmXCodeObject* CreateObjectReference(cmXCodeObject*);
-  cmXCodeObject* CreateXCodeTarget(cmTarget& target,
+  cmXCodeObject* CreateXCodeTarget(cmGeneratorTarget *gtgt,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
   void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
-  const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
+  const char* GetTargetLinkFlagsVar(const cmGeneratorTarget *target) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);
-  std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget);
+  std::string AddConfigurations(cmXCodeObject* target,
+                                cmGeneratorTarget *gtgt);
   void AppendOrAddBuildSetting(cmXCodeObject* settings, const char* attr,
                                const char* value);
   void AppendBuildSettingAttribute(cmXCodeObject* target, const char* attr,
                                    const char* value,
                                    const std::string& configName);
-  cmXCodeObject* CreateUtilityTarget(cmTarget& target);
+  cmXCodeObject* CreateUtilityTarget(cmGeneratorTarget *gtgt);
   void AddDependAndLinkInformation(cmXCodeObject* target);
-  void CreateBuildSettings(cmTarget& target,
+  void CreateBuildSettings(cmGeneratorTarget *gtgt,
                            cmXCodeObject* buildSettings,
                            const std::string& buildType);
   std::string ExtractFlag(const char* flag, std::string& flags);
@@ -161,18 +161,18 @@ private:
   void WriteXCodePBXProj(std::ostream& fout, cmLocalGenerator* root,
                          std::vector<cmLocalGenerator*>& generators);
   cmXCodeObject* CreateXCodeFileReferenceFromPath(const std::string &fullpath,
-                                                  cmTarget& cmtarget,
+                                                  cmGeneratorTarget *target,
                                                   const std::string &lang,
                                                   cmSourceFile* sf);
   cmXCodeObject* CreateXCodeSourceFileFromPath(const std::string &fullpath,
-                                               cmTarget& cmtarget,
+                                               cmGeneratorTarget *target,
                                                const std::string &lang,
                                                cmSourceFile* sf);
   cmXCodeObject* CreateXCodeFileReference(cmSourceFile* sf,
-                                          cmTarget& cmtarget);
+                                          cmGeneratorTarget *target);
   cmXCodeObject* CreateXCodeSourceFile(cmLocalGenerator* gen,
                                        cmSourceFile* sf,
-                                       cmTarget& cmtarget);
+                                       cmGeneratorTarget *gtgt);
   bool CreateXCodeTargets(cmLocalGenerator* gen,
                           std::vector<cmXCodeObject*>&);
   bool IsHeaderFile(cmSourceFile*);
@@ -185,7 +185,7 @@ private:
                        std::vector<cmLocalGenerator*>& gens);
   cmXCodeObject* CreateBuildPhase(const char* name,
                                   const char* name2,
-                                  cmTarget& cmtarget,
+                                  cmGeneratorTarget *target,
                                   const std::vector<cmCustomCommand>&);
   void CreateReRunCMakeFile(cmLocalGenerator* root,
                             std::vector<cmLocalGenerator*> const& gens);
@@ -224,10 +224,9 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  std::string GetObjectsNormalDirectory(
-    const std::string &projName,
+  std::string GetObjectsNormalDirectory(const std::string &projName,
     const std::string &configName,
-    const cmTarget *t) const;
+    const cmGeneratorTarget *t) const;
 
   void addObject(cmXCodeObject *obj);
   std::string PostBuildMakeTarget(std::string const& tName,
@@ -249,7 +248,7 @@ private:
   std::map<std::string, cmXCodeObject* > GroupNameMap;
   std::map<std::string, cmXCodeObject* > TargetGroup;
   std::map<std::string, cmXCodeObject* > FileRefs;
-  std::map<cmTarget const*, cmXCodeObject* > XCodeObjectMap;
+  std::map<cmGeneratorTarget const*, cmXCodeObject* > XCodeObjectMap;
   std::vector<std::string> Architectures;
   std::string GeneratorToolset;
 };
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index ed2940a..0f0548b 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -13,7 +13,7 @@
 #define cmXCodeObject_h
 
 #include "cmStandardIncludes.h"
-class cmTarget;
+class cmGeneratorTarget;
 
 class cmXCodeObject
 {
@@ -87,11 +87,11 @@ public:
     {
       this->Id = id;
     }
-  cmTarget* GetTarget()
+  cmGeneratorTarget* GetTarget()
     {
       return this->Target;
     }
-  void SetTarget(cmTarget* t)
+  void SetTarget(cmGeneratorTarget* t)
     {
       this->Target = t;
     }
@@ -146,7 +146,7 @@ public:
 protected:
   void PrintString(std::ostream& os) const;
 
-  cmTarget* Target;
+  cmGeneratorTarget* Target;
   Type TypeValue;
   std::string Id;
   PBXType IsA;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=715a873cb5aed773241c28cfa24a490b105aca84
commit 715a873cb5aed773241c28cfa24a490b105aca84
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:36:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:26:31 2015 +0200

    Xcode: Prefer to get target state from cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 4438860..a2d87ff 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1110,13 +1110,13 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+    if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::UTILITY ||
-       cmtarget.GetType() == cmState::GLOBAL_TARGET)
+    if(gtgt->GetType() == cmState::UTILITY ||
+       gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
       cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
       if (!t)
@@ -1204,7 +1204,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
 
     // some build phases only apply to bundles and/or frameworks
     bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
-    bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
+    bool isBundleTarget = gtgt->GetPropertyAsBool("MACOSX_BUNDLE");
     bool isCFBundleTarget = gtgt->IsCFBundleOnApple();
 
     cmXCodeObject* buildFiles = 0;
@@ -1479,7 +1479,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
 
   cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
 
-  if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
@@ -1488,13 +1488,13 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
     cmd[0].push_back("-E");
     cmd[0].push_back("cmake_symlink_library");
     std::string str_file = "$<TARGET_FILE:";
-    str_file += cmtarget.GetName();
+    str_file += gtgt->GetName();
     str_file += ">";
     std::string str_so_file = "$<TARGET_SONAME_FILE:";
-    str_so_file += cmtarget.GetName();
+    str_so_file += gtgt->GetName();
     str_so_file += ">";
     std::string str_link_file = "$<TARGET_LINKER_FILE:";
-    str_link_file += cmtarget.GetName();
+    str_link_file += gtgt->GetName();
     str_link_file += ">";
     cmd[0].push_back(str_file);
     cmd[0].push_back(str_so_file);
@@ -1797,22 +1797,22 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  if(target.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   std::string defFlags;
-  bool shared = ((target.GetType() == cmState::SHARED_LIBRARY) ||
-                 (target.GetType() == cmState::MODULE_LIBRARY));
-  bool binary = ((target.GetType() == cmState::OBJECT_LIBRARY) ||
-                 (target.GetType() == cmState::STATIC_LIBRARY) ||
-                 (target.GetType() == cmState::EXECUTABLE) ||
+  bool shared = ((gtgt->GetType() == cmState::SHARED_LIBRARY) ||
+                 (gtgt->GetType() == cmState::MODULE_LIBRARY));
+  bool binary = ((gtgt->GetType() == cmState::OBJECT_LIBRARY) ||
+                 (gtgt->GetType() == cmState::STATIC_LIBRARY) ||
+                 (gtgt->GetType() == cmState::EXECUTABLE) ||
                  shared);
 
   // Compute the compilation flags for each language.
   std::set<std::string> languages;
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   gtgt->GetLanguages(languages, configName);
   std::map<std::string, std::string> cflags;
   for (std::set<std::string>::iterator li = languages.begin();
@@ -1840,7 +1840,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     cmSystemTools::Error
       ("CMake can not determine linker language for target: ",
-       target.GetName().c_str());
+       gtgt->GetName().c_str());
     return;
     }
 
@@ -1869,15 +1869,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   std::string extraLinkOptionsVar;
   std::string extraLinkOptions;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptionsVar = "CMAKE_EXE_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::SHARED_LIBRARY)
+  else if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_SHARED_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::MODULE_LIBRARY)
+  else if(gtgt->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS";
     }
@@ -1889,8 +1889,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                configName);
     }
 
-  if(target.GetType() == cmState::OBJECT_LIBRARY ||
-     target.GetType() == cmState::STATIC_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY ||
+     gtgt->GetType() == cmState::STATIC_LIBRARY)
     {
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
@@ -1899,7 +1899,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
   else
     {
-    const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+    const char* targetLinkFlags = gtgt->GetProperty("LINK_FLAGS");
     if(targetLinkFlags)
       {
       this->CurrentLocalGenerator->
@@ -1909,7 +1909,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       std::string linkFlagsVar = "LINK_FLAGS_";
       linkFlagsVar += cmSystemTools::UpperCase(configName);
-      if(const char* linkFlags = target.GetProperty(linkFlagsVar.c_str()))
+      if(const char* linkFlags = gtgt->GetProperty(linkFlagsVar.c_str()))
         {
         this->CurrentLocalGenerator->
           AppendFlags(extraLinkOptions, linkFlags);
@@ -1952,8 +1952,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   std::string pnsuffix;
   gtgt->GetFullNameComponents(pnprefix, pnbase, pnsuffix, configName);
 
-  const char* version = target.GetProperty("VERSION");
-  const char* soversion = target.GetProperty("SOVERSION");
+  const char* version = gtgt->GetProperty("VERSION");
+  const char* soversion = gtgt->GetProperty("SOVERSION");
   if(!gtgt->HasSOName(configName) || gtgt->IsFrameworkOnApple())
     {
     version = 0;
@@ -1980,10 +1980,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Set attributes to specify the proper name for the target.
   std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
-  if(target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY ||
-     target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::STATIC_LIBRARY ||
+     gtgt->GetType() == cmState::SHARED_LIBRARY ||
+     gtgt->GetType() == cmState::MODULE_LIBRARY ||
+     gtgt->GetType() == cmState::EXECUTABLE)
     {
     if(this->XcodeVersion >= 21)
       {
@@ -2011,10 +2011,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     buildSettings->AddAttribute("EXECUTABLE_SUFFIX",
                                 this->CreateString(pnsuffix.c_str()));
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     pnprefix = "lib";
-    pnbase = target.GetName();
+    pnbase = gtgt->GetName();
     pnsuffix = ".a";
 
     if(this->XcodeVersion >= 21)
@@ -2040,7 +2040,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                               this->CreateString(pndir.c_str()));
 
   // Handle settings for each target type.
-  switch(target.GetType())
+  switch(gtgt->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
@@ -2111,7 +2111,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
     case cmState::SHARED_LIBRARY:
     {
-    if(target.GetPropertyAsBool("FRAMEWORK"))
+    if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
       std::string fw_version = target.GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
@@ -2158,7 +2158,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
 
     // Handle bundles and normal executables separately.
-    if(target.GetPropertyAsBool("MACOSX_BUNDLE"))
+    if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
       std::string plist = this->ComputeInfoPListLocation(target);
       // Xcode will create the final version of Info.plist at build time,
@@ -2323,7 +2323,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Add Fortran source format attribute if property is set.
   const char* format = 0;
-  const char* tgtfmt = target.GetProperty("Fortran_FORMAT");
+  const char* tgtfmt = gtgt->GetProperty("Fortran_FORMAT");
   switch(this->CurrentLocalGenerator->GetFortranFormat(tgtfmt))
     {
     case cmLocalGenerator::FortranFormatFixed: format = "fixed"; break;
@@ -2338,7 +2338,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Create the INSTALL_PATH attribute.
   std::string install_name_dir;
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir = gtgt->GetInstallNameDirForBuildTree(configName);
@@ -2426,7 +2426,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Runtime version information.
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     int major;
     int minor;
@@ -2510,6 +2510,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 {
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2532,7 +2533,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
   cmXCodeObject* target =
     this->CreateObject(cmXCodeObject::PBXAggregateTarget);
-  target->SetComment(cmtarget.GetName().c_str());
+  target->SetComment(gtgt->GetName().c_str());
   cmXCodeObject* buildPhases =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
@@ -2555,16 +2556,15 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
 
   // Add source files without build rules for editing convenience.
-  if(cmtarget.GetType() == cmState::UTILITY)
+  if(gtgt->GetType() == cmState::UTILITY)
     {
     std::vector<cmSourceFile*> sources;
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
     if (!gtgt->GetConfigCommonSourceFiles(sources))
       {
       return 0;
@@ -2581,7 +2581,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     }
 
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
 
   return target;
 }
@@ -2712,7 +2712,9 @@ cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
                                           cmXCodeObject* buildPhases)
 {
-  if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
     }
@@ -2737,10 +2739,8 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
-
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
 
   cmXCodeObject* fileRef =
     this->CreateObject(cmXCodeObject::PBXFileReference);
@@ -2749,10 +2749,10 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
   std::string fullName;
-  if(cmtarget.GetType() == cmState::OBJECT_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     fullName = "lib";
-    fullName += cmtarget.GetName();
+    fullName += gtgt->GetName();
     fullName += ".a";
     }
   else
@@ -2763,7 +2763,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   fileRef->AddAttribute("refType", this->CreateString("0"));
   fileRef->AddAttribute("sourceTree",
                         this->CreateString("BUILT_PRODUCTS_DIR"));
-  fileRef->SetComment(cmtarget.GetName().c_str());
+  fileRef->SetComment(gtgt->GetName().c_str());
   target->AddAttribute("productReference",
                        this->CreateObjectReference(fileRef));
   if(const char* productType = this->GetTargetProductType(gtgt))
@@ -2773,7 +2773,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
@@ -2923,18 +2923,18 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(!cmtarget)
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(gt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   // Add dependencies on other CMake targets.
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
@@ -2958,7 +2958,7 @@ void cmGlobalXCodeGenerator
       std::string linkObjs;
       const char* sep = "";
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(cmtarget)->UseObjectLibraries(objs, "");
+      gt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -2972,15 +2972,14 @@ void cmGlobalXCodeGenerator
       }
 
     // Skip link information for object libraries.
-    if(cmtarget->GetType() == cmState::OBJECT_LIBRARY ||
-       cmtarget->GetType() == cmState::STATIC_LIBRARY)
+    if(gt->GetType() == cmState::OBJECT_LIBRARY ||
+       gt->GetType() == cmState::STATIC_LIBRARY)
       {
       continue;
       }
 
     // Compute the link library and directory information.
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(cmtarget);
-    cmComputeLinkInformation* pcli = gtgt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
     if(!pcli)
       {
       continue;
@@ -3637,21 +3636,21 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
       cmTarget* t =target->GetTarget();
       cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
 
-      if(t->GetType() == cmState::EXECUTABLE ||
+      if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//         t->GetType() == cmState::OBJECT_LIBRARY ||
-         t->GetType() == cmState::STATIC_LIBRARY ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+//         gt->GetType() == cmState::OBJECT_LIBRARY ||
+         gt->GetType() == cmState::STATIC_LIBRARY ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         // Declare an entry point for the target post-build phase.
-        makefileStream << this->PostBuildMakeTarget(t->GetName(), *ct)
+        makefileStream << this->PostBuildMakeTarget(gt->GetName(), *ct)
                        << ":\n";
         }
 
-      if(t->GetType() == cmState::EXECUTABLE ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+      if(gt->GetType() == cmState::EXECUTABLE ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         std::string tfull = gt->GetFullPath(configName);
         std::string trel = this->ConvertToRelativeForMake(tfull.c_str());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d02435b24edd127ff33f2eb9ea3075b2898ec057
commit d02435b24edd127ff33f2eb9ea3075b2898ec057
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:14:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:26:31 2015 +0200

    Xcode: Re-order conditions.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index f00c9e5..4438860 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2923,13 +2923,13 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(!cmtarget)
     {
+    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(!cmtarget)
+  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
     {
-    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d88907a36306870673898a452cfa2ee77d3ea4d
commit 7d88907a36306870673898a452cfa2ee77d3ea4d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:38:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:26:31 2015 +0200

    Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6e2e386..f00c9e5 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1368,22 +1368,22 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguages()
   for(TargetMap::const_iterator
         ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
     {
-    this->ForceLinkerLanguage(*ti->second);
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
+    this->ForceLinkerLanguage(gt);
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
+void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
 {
   // This matters only for targets that link.
-  if(cmtarget.GetType() != cmState::EXECUTABLE &&
-     cmtarget.GetType() != cmState::SHARED_LIBRARY &&
-     cmtarget.GetType() != cmState::MODULE_LIBRARY)
+  if(gtgt->GetType() != cmState::EXECUTABLE &&
+     gtgt->GetType() != cmState::SHARED_LIBRARY &&
+     gtgt->GetType() != cmState::MODULE_LIBRARY)
     {
     return;
     }
 
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
   std::string llang = gtgt->GetLinkerLanguage("NOCONFIG");
   if(llang.empty()) { return; }
 
@@ -1399,11 +1399,11 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // Add an empty source file to the target that compiles with the
   // linker language.  This should convince Xcode to choose the proper
   // language.
-  cmMakefile* mf = cmtarget.GetMakefile();
+  cmMakefile* mf = gtgt->Target->GetMakefile();
   std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
-  fname += cmtarget.GetName();
+  fname += gtgt->GetName();
   fname += "-CMakeForceLinker";
   fname += ".";
   fname += cmSystemTools::LowerCase(llang);
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index feb5009..10d9bd6 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -135,7 +135,7 @@ private:
   cmXCodeObject* CreateXCodeTarget(cmTarget& target,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
-  void ForceLinkerLanguage(cmTarget& cmtarget);
+  void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
   const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ab54236e329f882a31081780645cd853ea90a63
commit 4ab54236e329f882a31081780645cd853ea90a63
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:32:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:26:30 2015 +0200

    Xcode: Port loops to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fe115ac..6e2e386 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -514,18 +514,18 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& target = *(*l)->Target;
+      cmGeneratorTarget* target = *l;
 
-      if (target.GetType() == cmState::GLOBAL_TARGET)
+      if (target->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
-      std::string targetName = target.GetName();
+      std::string targetName = target->GetName();
 
       if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
         {
-        target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+        target->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
 
       // make all exe, shared libs and modules
@@ -533,19 +533,19 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       // this will make sure that when the next target is built
       // things are up-to-date
       if(!makeHelper.empty() &&
-         (target.GetType() == cmState::EXECUTABLE ||
+         (target->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//          target.GetType() == cmState::OBJECT_LIBRARY ||
-          target.GetType() == cmState::STATIC_LIBRARY ||
-          target.GetType() == cmState::SHARED_LIBRARY ||
-          target.GetType() == cmState::MODULE_LIBRARY))
+//          target->GetType() == cmState::OBJECT_LIBRARY ||
+          target->GetType() == cmState::STATIC_LIBRARY ||
+          target->GetType() == cmState::SHARED_LIBRARY ||
+          target->GetType() == cmState::MODULE_LIBRARY))
         {
         makeHelper[makeHelper.size()-1] = // fill placeholder
-          this->PostBuildMakeTarget(target.GetName(), "$(CONFIGURATION)");
+          this->PostBuildMakeTarget(target->GetName(), "$(CONFIGURATION)");
         cmCustomCommandLines commandLines;
         commandLines.push_back(makeHelper);
         std::vector<std::string> no_byproducts;
-        lg->GetMakefile()->AddCustomCommandToTarget(target.GetName(),
+        lg->GetMakefile()->AddCustomCommandToTarget(target->GetName(),
                                                     no_byproducts,
                                                     no_depends,
                                                     commandLines,
@@ -554,19 +554,17 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                                                     dir.c_str());
         }
 
-      if(target.GetType() != cmState::INTERFACE_LIBRARY
-          && !target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
+      if(target->GetType() != cmState::INTERFACE_LIBRARY
+          && !target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
-        allbuild->AddUtility(target.GetName());
+        allbuild->AddUtility(target->GetName());
         }
 
-      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
-
       // Refer to the build configuration file for easy editing.
       listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
-      targetGT->AddSource(listfile.c_str());
+      target->AddSource(listfile.c_str());
       }
     }
 }
@@ -3074,28 +3072,26 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& cmtarget = *(*l)->Target;
+      cmGeneratorTarget* gtgt = *l;
 
       // Same skipping logic here as in CreateXCodeTargets so that we do not
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
       // groups:
       //
-      if(cmtarget.GetType() == cmState::GLOBAL_TARGET)
+      if(gtgt->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+      if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
 
-      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
-
       // add the soon to be generated Info.plist file as a source for a
       // MACOSX_BUNDLE file
-      if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
+      if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(cmtarget);
+        std::string plist = this->ComputeInfoPListLocation(*gtgt->Target);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3115,14 +3111,14 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKey(cmtarget, sf);
+          this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKey(*gtgt->Target, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
       // Put OBJECT_LIBRARY objects in proper groups:
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(&cmtarget)->UseObjectLibraries(objs, "");
+      gtgt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -3130,8 +3126,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(cmtarget, source);
+          this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(*gtgt->Target, source);
         this->GroupMap[key] = pbxgroup;
         }
       }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct 22 12:29:44 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu, 22 Oct 2015 12:29:44 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-890-gade9860
Message-ID: <20151022162944.3D7BCC0910@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ade9860f531113e13ce2c5acb2cbc38797ef3556 (commit)
       via  7b668158627f94d69e8dae1c6be7d6f83f0fa49b (commit)
       via  732055ef56d0c797ece0af9e2ca396e53734bc1f (commit)
       via  5c1433dc295b622be273614470e778fc65460efe (commit)
       via  a970363ae069e1b40eba2444df303cceb6d5d638 (commit)
      from  23a2ea9d7f1bf9e05462e78508cb4a8a5ab0d28c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ade9860f531113e13ce2c5acb2cbc38797ef3556
commit ade9860f531113e13ce2c5acb2cbc38797ef3556
Merge: 23a2ea9 7b66815
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 12:29:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 12:29:42 2015 -0400

    Merge topic 'use-generator-target' into next
    
    7b668158 VS: Port interface to cmGeneratorTarget
    732055ef VS7: Port to cmGeneratorTarget
    5c1433dc VS10: Port to cmGeneratorTarget.
    a970363a VS6: Port to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b668158627f94d69e8dae1c6be7d6f83f0fa49b
commit 7b668158627f94d69e8dae1c6be7d6f83f0fa49b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:29:06 2015 +0200

    VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 2452743..6b98ab6 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -298,7 +298,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -309,7 +309,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -382,12 +382,13 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(
+    const cmGeneratorTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
   pname = GetVS6TargetName(pname.c_str());
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index edf637f..22ad8a9 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -97,7 +97,7 @@ private:
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
   void WriteDSWFooter(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(cmGeneratorTarget const* target);
   std::string MSDevCommand;
   bool MSDevCommandInitialized;
   std::string const& GetMSDevCommand();
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 9bb37ce..8227b82 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -152,7 +152,7 @@ void
 cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
                                               const std::string& dspname,
                                               const char* dir,
-                                              cmTarget const& t)
+                                              cmGeneratorTarget const* t)
 {
   // check to see if this is a fortran build
   const char* ext = ".vcproj";
@@ -163,7 +163,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
     }
-  const char* targetExt = t.GetProperty("GENERATOR_FILE_NAME_EXT");
+  const char* targetExt = t->GetProperty("GENERATOR_FILE_NAME_EXT");
   if(targetExt)
     {
     ext = targetExt;
@@ -180,7 +180,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
 
   fout <<"EndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&t);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -204,9 +204,9 @@ void
 cmGlobalVisualStudio71Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string&,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -215,7 +215,7 @@ cmGlobalVisualStudio71Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index 7f88e34..5035fda 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -59,10 +59,10 @@ protected:
     std::ostream& fout, std::vector<std::string> const& configs);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            cmTarget const& t);
+                            const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const& t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 1909f21..89b21ed 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -441,7 +441,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -459,7 +459,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
                                  project.c_str(),
                                  location.c_str(),
                                  target->GetProperty("VS_PROJECT_TYPE"),
-                                 target->GetUtilities());
+                                 target->Target->GetUtilities());
       written = true;
       }
     else
@@ -468,9 +468,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmLocalGenerator* lg =
-            root->GetGlobalGenerator()->GetGeneratorTarget(target)
-            ->GetLocalGenerator();
+        cmLocalGenerator* lg = target->GetLocalGenerator();
         std::string dir = lg->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
@@ -479,7 +477,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
           dir = ""; // msbuild cannot handle ".\" prefix
           }
         this->WriteProject(fout, vcprojName, dir.c_str(),
-                           *target);
+                           target);
         written = true;
         }
       }
@@ -535,19 +533,19 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmMakefile* mf = target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     const char *vcprojName =
       target->GetProperty("GENERATOR_FILE_NAME");
     if (vcprojName)
       {
-      std::string dir = mf->GetCurrentSourceDirectory();
+      std::string dir = lg->GetCurrentSourceDirectory();
       this->WriteProjectDepends(fout, vcprojName,
-                                dir.c_str(), *target);
+                                dir.c_str(), target);
       }
     }
 }
@@ -687,7 +685,8 @@ cmGlobalVisualStudio7Generator::ConvertToSolutionPath(const char* path)
 // the libraries it uses are also done here
 void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
                                const std::string& dspname,
-                               const char* dir, cmTarget const& target)
+                               const char* dir,
+                               const cmGeneratorTarget *target)
 {
    // check to see if this is a fortran build
   const char* ext = ".vcproj";
@@ -705,7 +704,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
        << dspname << ext << "\", \"{"
        << this->GetGUID(dspname) << "}\"\nEndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -727,11 +726,11 @@ void
 cmGlobalVisualStudio7Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string& dspname,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
   int depcount = 0;
   std::string dspguid = this->GetGUID(dspname);
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -740,7 +739,7 @@ cmGlobalVisualStudio7Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
@@ -749,7 +748,7 @@ cmGlobalVisualStudio7Generator
     depcount++;
     }
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -889,13 +888,14 @@ void cmGlobalVisualStudio7Generator::WriteSLNHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio7Generator::WriteUtilityDepend(
+        cmGeneratorTarget const* target)
 {
   std::vector<std::string> configs;
-  target->GetMakefile()->GetConfigurations(configs);
+  target->Target->GetMakefile()->GetConfigurations(configs);
   std::string pname = target->GetName();
   pname += "_UTILITY";
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".vcproj";
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 4ef0990..3ab6169 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,7 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*) { return false; }
 
   const char* GetIntelProjectVersion();
 
@@ -123,10 +123,10 @@ protected:
                             std::vector<cmLocalGenerator*>& generators);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            cmTarget const& t);
+                            cmGeneratorTarget const* t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const&t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
@@ -136,7 +136,7 @@ protected:
                                       cmLocalGenerator* root);
   virtual void WriteSLNFooter(std::ostream& fout);
   virtual void WriteSLNHeader(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(cmGeneratorTarget const* target);
 
   virtual void WriteTargetsToSolution(
     std::ostream& fout,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index a22315c..00ca21a 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -441,9 +441,9 @@ bool cmGlobalVisualStudio8Generator::ComputeTargetDepends()
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Generator::WriteProjectDepends(
-  std::ostream& fout, const std::string&, const char*, cmTarget const& t)
+        std::ostream& fout, const std::string&, const char*,
+        const cmGeneratorTarget *gt)
 {
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&t);
   TargetDependSet const& unordered = this->GetTargetDirectDepends(gt);
   OrderedTargetDependSet depends(unordered, std::string());
   for(OrderedTargetDependSet::const_iterator i = depends.begin();
@@ -460,14 +460,16 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
 
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
-  cmTarget& target)
+        cmGeneratorTarget *target)
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target.GetUtilities().begin();
-      ui != target.GetUtilities().end(); ++ui)
+        target->Target->GetUtilities().begin();
+      ui != target->Target->GetUtilities().end(); ++ui)
     {
-    if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
+      cmGeneratorTarget* depTarget = 0;
+//    if(cmGeneratorTarget* depTarget =
+  //          this->FindGeneratorTarget(ui->c_str()))
       {
       if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index 60c63d1..54dc545 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget& target);
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget* target);
 
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const {
@@ -91,7 +91,8 @@ protected:
   virtual bool ComputeTargetDepends();
   virtual void WriteProjectDepends(std::ostream& fout,
                                    const std::string& name,
-                                   const char* path, cmTarget const& t);
+                                   const char* path,
+                                   cmGeneratorTarget const* gt);
 
   std::string Name;
   std::string WindowsCEVersion;
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 4d431f6..606e215 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -303,19 +303,19 @@ std::string cmGlobalVisualStudioGenerator::GetUserMacrosRegKeyBase()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
+void cmGlobalVisualStudioGenerator::FillLinkClosure(
+        cmGeneratorTarget const* target,
                                                     TargetSet& linked)
 {
   if(linked.insert(target).second)
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FillLinkClosure((*di)->Target, linked);
+        this->FillLinkClosure(*di, linked);
         }
       }
     }
@@ -323,7 +323,8 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
 
 //----------------------------------------------------------------------------
 cmGlobalVisualStudioGenerator::TargetSet const&
-cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
+cmGlobalVisualStudioGenerator::GetTargetLinkClosure(
+        cmGeneratorTarget *target)
 {
   TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
   if(i == this->TargetLinkClosure.end())
@@ -337,7 +338,8 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudioGenerator::FollowLinkDepends(
-  cmTarget const* target, std::set<cmTarget const*>& linked)
+        const cmGeneratorTarget *target,
+        std::set<const cmGeneratorTarget *> &linked)
 {
   if(target->GetType() == cmState::INTERFACE_LIBRARY)
     {
@@ -348,14 +350,13 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
     {
     // Static library targets do not list their link dependencies so
     // we must follow them transitively now.
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FollowLinkDepends((*di)->Target, linked);
+        this->FollowLinkDepends(*di, linked);
         }
       }
     }
@@ -379,7 +380,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
       for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(*(*ti)->Target);
+        this->ComputeVSTargetDepends(*ti);
         }
       }
     }
@@ -393,13 +394,13 @@ static bool VSLinkable(cmGeneratorTarget const* t)
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
+void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmGeneratorTarget* target)
 {
-  if(this->VSTargetDepends.find(&target) != this->VSTargetDepends.end())
+  if(this->VSTargetDepends.find(target) != this->VSTargetDepends.end())
     {
     return;
     }
-  VSDependSet& vsTargetDepend = this->VSTargetDepends[&target];
+  VSDependSet& vsTargetDepend = this->VSTargetDepends[target];
   // VS <= 7.1 has two behaviors that affect solution dependencies.
   //
   // (1) Solution-level dependencies between a linkable target and a
@@ -419,19 +420,18 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // leaving them out for the static library itself but following them
   // transitively for other targets.
 
-  bool allowLinkable = (target.GetType() != cmState::STATIC_LIBRARY &&
-                        target.GetType() != cmState::SHARED_LIBRARY &&
-                        target.GetType() != cmState::MODULE_LIBRARY &&
-                        target.GetType() != cmState::EXECUTABLE);
+  bool allowLinkable = (target->GetType() != cmState::STATIC_LIBRARY &&
+                        target->GetType() != cmState::SHARED_LIBRARY &&
+                        target->GetType() != cmState::MODULE_LIBRARY &&
+                        target->GetType() != cmState::EXECUTABLE);
 
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-  TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+  TargetDependSet const& depends = this->GetTargetDirectDepends(target);
 
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
-  std::set<cmTarget const*> linkDepends;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  std::set<cmGeneratorTarget const*> linkDepends;
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -439,55 +439,54 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
       cmTargetDepend dep = *di;
       if(dep.IsLink())
         {
-        this->FollowLinkDepends(dep->Target, linkDepends);
+        this->FollowLinkDepends(*di, linkDepends);
         }
       }
     }
 
   // Collect explicit util dependencies (add_dependencies).
-  std::set<cmTarget const*> utilDepends;
+  std::set<cmGeneratorTarget const*> utilDepends;
   for(TargetDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
     cmTargetDepend dep = *di;
     if(dep.IsUtil())
       {
-      this->FollowLinkDepends(dep->Target, utilDepends);
+      this->FollowLinkDepends(*di, utilDepends);
       }
     }
 
   // Collect all targets linked by this target so we can avoid
   // intermediate targets below.
   TargetSet linked;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
-    linked = this->GetTargetLinkClosure(&target);
+    linked = this->GetTargetLinkClosure(target);
     }
 
   // Emit link dependencies.
-  for(std::set<cmTarget const*>::iterator di = linkDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = linkDepends.begin();
       di != linkDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
+    cmGeneratorTarget const* dep = *di;
     vsTargetDepend.insert(dep->GetName());
     }
 
   // Emit util dependencies.  Possibly use intermediate targets.
-  for(std::set<cmTarget const*>::iterator di = utilDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = utilDepends.begin();
       di != utilDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
-    cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
-    if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
+    cmGeneratorTarget const* dgt = *di;
+    if(allowLinkable || !VSLinkable(dgt) || linked.count(dgt))
       {
       // Direct dependency allowed.
-      vsTargetDepend.insert(dep->GetName());
+      vsTargetDepend.insert(dgt->GetName());
       }
     else
       {
       // Direct dependency on linkable target not allowed.
       // Use an intermediate utility target.
-      vsTargetDepend.insert(this->GetUtilityDepend(dep));
+      vsTargetDepend.insert(this->GetUtilityDepend(dgt));
       }
     }
 }
@@ -507,7 +506,7 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudioGenerator::GetUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudioGenerator::GetUtilityDepend(cmGeneratorTarget const* target)
 {
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
@@ -830,21 +829,20 @@ void RegisterVisualStudioMacros(const std::string& macrosFile,
     }
 }
 bool
-cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget const& target)
+cmGlobalVisualStudioGenerator::TargetIsFortranOnly(
+        const cmGeneratorTarget* target)
 {
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-
   // check to see if this is a fortran build
   std::set<std::string> languages;
   {
   // Issue diagnostic if the source files depend on the config.
   std::vector<cmSourceFile*> sources;
-  if (!gt->GetConfigCommonSourceFiles(sources))
+  if (!target->GetConfigCommonSourceFiles(sources))
     {
     return false;
     }
   }
-  gt->GetLanguages(languages, "");
+  target->GetLanguages(languages, "");
   if(languages.size() == 1)
     {
     if(*languages.begin() == "Fortran")
@@ -892,9 +890,7 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
   for (TargetSet::const_iterator it = targets.begin();
        it != targets.end(); ++it)
     {
-    cmGeneratorTarget* gt =
-        (*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
-    this->insert(gt);
+    this->insert(*it);
     }
 }
 
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 41d0b88..83602bd 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -73,7 +73,7 @@ public:
                              const char* vsSolutionFile = 0);
 
   // return true if target is fortran only
-  bool TargetIsFortranOnly(cmTarget const& t);
+  bool TargetIsFortranOnly(const cmGeneratorTarget *t);
 
   /** Get the top-level registry key for this VS version.  */
   std::string GetRegistryBase();
@@ -88,7 +88,7 @@ public:
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const { return false; }
 
-  class TargetSet: public std::set<cmTarget const*> {};
+  class TargetSet: public std::set<cmGeneratorTarget const*> {};
   class TargetCompare
   {
     std::string First;
@@ -122,15 +122,15 @@ protected:
 
   virtual bool ComputeTargetDepends();
   class VSDependSet: public std::set<std::string> {};
-  class VSDependMap: public std::map<cmTarget const*, VSDependSet> {};
+  class VSDependMap: public std::map<cmGeneratorTarget const*, VSDependSet> {};
   VSDependMap VSTargetDepends;
-  void ComputeVSTargetDepends(cmTarget&);
+  void ComputeVSTargetDepends(cmGeneratorTarget *);
 
-  bool CheckTargetLinks(cmTarget& target, const std::string& name);
-  std::string GetUtilityForTarget(cmTarget& target, const std::string&);
-  virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
-  std::string GetUtilityDepend(cmTarget const* target);
-  typedef std::map<cmTarget const*, std::string> UtilityDependsMap;
+  bool CheckTargetLinks(cmGeneratorTarget& target, const std::string& name);
+  std::string GetUtilityForTarget(cmGeneratorTarget& target, const std::string&);
+  virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
+  std::string GetUtilityDepend(cmGeneratorTarget const* target);
+  typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
   UtilityDependsMap UtilityDepends;
 
 protected:
@@ -141,13 +141,14 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  void FollowLinkDepends(cmTarget const* target,
-                         std::set<cmTarget const*>& linked);
+  void FollowLinkDepends(cmGeneratorTarget const* target,
+                         std::set<cmGeneratorTarget const*>& linked);
 
-  class TargetSetMap: public std::map<cmTarget*, TargetSet> {};
+  class TargetSetMap: public std::map<cmGeneratorTarget*, TargetSet> {};
   TargetSetMap TargetLinkClosure;
-  void FillLinkClosure(cmTarget const* target, TargetSet& linked);
-  TargetSet const& GetTargetLinkClosure(cmTarget* target);
+  void FillLinkClosure(const cmGeneratorTarget *target,
+                       TargetSet& linked);
+  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget* target);
 };
 
 class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 0040331..d59fdc6 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -83,7 +83,7 @@ void cmLocalVisualStudio10Generator::Generate()
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*(*l)->Target))
+       ->TargetIsFortranOnly(*l))
       {
       this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index dda31b9..7fb2775 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -840,7 +840,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
   event.Write(target->Target->GetPreBuildCommands());
   event.Write(target->Target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(*target->Target, configName, false));
+    this->MaybeCreateImplibDir(target, configName, false));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -1932,7 +1932,7 @@ cmLocalVisualStudio6Generator
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio6Generator
-::ComputeLongestObjectDirectory(cmTarget&) const
+::ComputeLongestObjectDirectory(cmGeneratorTarget const*) const
 {
   // Compute the maximum length configuration name.
   std::string config_max;
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index 6375361..b8be3d8 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -50,7 +50,7 @@ public:
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
+  virtual std::string ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
 private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index b452acf..9444ccf 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -228,7 +228,7 @@ void cmLocalVisualStudio7Generator
 {
   cmGlobalVisualStudioGenerator* gg
       = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-  this->FortranProject = gg->TargetIsFortranOnly(*target->Target);
+  this->FortranProject = gg->TargetIsFortranOnly(target);
   this->WindowsCEProject = gg->TargetsWindowsCE();
 
   // Intel Fortran for VS10 uses VS9 format ".vfproj" files.
@@ -1183,7 +1183,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1282,7 +1282,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1686,10 +1686,10 @@ cmLocalVisualStudio7GeneratorFCInfo
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio7Generator
-::ComputeLongestObjectDirectory(cmTarget& target) const
+::ComputeLongestObjectDirectory(const cmGeneratorTarget *target) const
 {
   std::vector<std::string> configs;
-  target.GetMakefile()->GetConfigurations(configs);
+  target->Target->GetMakefile()->GetConfigurations(configs);
 
   // Compute the maximum length configuration name.
   std::string config_max;
@@ -1708,9 +1708,7 @@ cmLocalVisualStudio7Generator
   std::string dir_max;
   dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-  dir_max += this->GetTargetDirectory(gt);
+  dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
@@ -2047,7 +2045,7 @@ void cmLocalVisualStudio7Generator
     event.Write(target->Target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(*target->Target, configName, this->FortranProject));
+    this->MaybeCreateImplibDir(target, configName, this->FortranProject));
   if(pcc.get())
     {
     event.Write(*pcc);
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index c8dae02..0af65d1 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -56,7 +56,7 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   cmSourceFile* CreateVCProjBuildRule();
   void WriteStampFiles();
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
+  virtual std::string ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
 
   virtual void ReadAndStoreExternalGUID(const std::string& name,
                                         const char* path);
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 2f44fb7..f0be658 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -43,7 +43,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const* gt)
 {
-  std::string dir_max = this->ComputeLongestObjectDirectory(*gt->Target);
+  std::string dir_max = this->ComputeLongestObjectDirectory(gt);
 
   // Count the number of object files with each name.  Note that
   // windows file names are not case sensitive.
@@ -80,7 +80,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCustomCommand>
-cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
+cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmGeneratorTarget *target,
                                                    const std::string& config,
                                                    bool isFortran)
 {
@@ -89,13 +89,11 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
   // If an executable exports symbols then VS wants to create an
   // import library but forgets to create the output directory.
   // The Intel Fortran plugin always forgets to the directory.
-  if(target.GetType() != cmState::EXECUTABLE &&
-     !(isFortran && target.GetType() == cmState::SHARED_LIBRARY))
+  if(target->GetType() != cmState::EXECUTABLE &&
+     !(isFortran && target->GetType() == cmState::SHARED_LIBRARY))
     { return pcc; }
-  cmGeneratorTarget* gt =
-      this->GetGlobalGenerator()->GetGeneratorTarget(&target);
-  std::string outDir = gt->GetDirectory(config, false);
-  std::string impDir = gt->GetDirectory(config, true);
+  std::string outDir = target->GetDirectory(config, false);
+  std::string impDir = target->GetDirectory(config, true);
   if(impDir == outDir) { return pcc; }
 
   // Add a pre-build event to create the directory.
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 071bfb3..ab2b5cc 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -44,7 +44,7 @@ public:
 
   cmGlobalVisualStudioGenerator::VSVersion GetVersion() const;
 
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const = 0;
+  virtual std::string ComputeLongestObjectDirectory(cmGeneratorTarget const*) const = 0;
 
   virtual void AddCMakeListsRules() = 0;
 
@@ -58,7 +58,7 @@ protected:
 
   /** Construct a custom command to make exe import lib dir.  */
   cmsys::auto_ptr<cmCustomCommand>
-  MaybeCreateImplibDir(cmTarget& target, const std::string& config,
+  MaybeCreateImplibDir(cmGeneratorTarget* target, const std::string& config,
                        bool isFortran);
 };
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6384d56..06ae5fd 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2674,7 +2674,7 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 
   this->WriteString("</Link>\n", 2);
   if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
-              *this->GeneratorTarget->Target))
+              this->GeneratorTarget))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(
@@ -2883,7 +2883,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     // skip fortran targets as they can not be processed by MSBuild
     // the only reference will be in the .sln file
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*dt->Target))
+       ->TargetIsFortranOnly(dt))
       {
       continue;
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=732055ef56d0c797ece0af9e2ca396e53734bc1f
commit 732055ef56d0c797ece0af9e2ca396e53734bc1f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:28:44 2015 +0200

    VS7: Port to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index e9aee8a..0040331 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -85,7 +85,7 @@ void cmLocalVisualStudio10Generator::Generate()
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
        ->TargetIsFortranOnly(*(*l)->Target))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 4895698..b452acf 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -34,7 +34,7 @@ public:
     LocalGenerator(e) {}
   typedef cmComputeLinkInformation::ItemVector ItemVector;
   void OutputLibraries(std::ostream& fout, ItemVector const& libs);
-  void OutputObjects(std::ostream& fout, cmTarget* t, const char* isep = 0);
+  void OutputObjects(std::ostream& fout, cmGeneratorTarget* t, const char* isep = 0);
 private:
   cmLocalVisualStudio7Generator* LocalGenerator;
 };
@@ -129,8 +129,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = *(*l)->Target;
-    if(tgt.GetType() == cmState::GLOBAL_TARGET)
+    if((*l)->GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
       cmCustomCommandLine force_command;
@@ -142,7 +141,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
-      force += tgt.GetName();
+      force += (*l)->GetName();
       force += "_force";
       if(cmSourceFile* file =
          this->Makefile->AddCustomCommandToOutput(
@@ -187,7 +186,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     // so don't build a projectfile for it
     if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
     }
 }
@@ -225,11 +224,11 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio7Generator
-::CreateSingleVCProj(const std::string& lname, cmTarget &target)
+::CreateSingleVCProj(const std::string& lname, cmGeneratorTarget *target)
 {
   cmGlobalVisualStudioGenerator* gg
       = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-  this->FortranProject = gg->TargetIsFortranOnly(target);
+  this->FortranProject = gg->TargetIsFortranOnly(*target->Target);
   this->WindowsCEProject = gg->TargetsWindowsCE();
 
   // Intel Fortran for VS10 uses VS9 format ".vfproj" files.
@@ -241,7 +240,7 @@ void cmLocalVisualStudio7Generator
     }
 
   // add to the list of projects
-  target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
+  target->Target->SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
   fname = this->GetCurrentBinaryDirectory();
@@ -323,9 +322,8 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
     }
 }
 
-void cmLocalVisualStudio7Generator::WriteConfigurations(
-  std::ostream& fout, std::vector<std::string> const& configs,
-  const std::string& libName, cmTarget &target
+void cmLocalVisualStudio7Generator::WriteConfigurations(std::ostream& fout, std::vector<std::string> const& configs,
+  const std::string& libName, cmGeneratorTarget *target
   )
 {
   fout << "\t<Configurations>\n";
@@ -643,7 +641,7 @@ private:
 void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
                                                 const std::string& configName,
                                                 const std::string& libName,
-                                                cmTarget &target)
+                                                cmGeneratorTarget *target)
 {
   const char* mfcFlag = this->Makefile->GetDefinition("CMAKE_MFC_FLAG");
   if(!mfcFlag)
@@ -664,10 +662,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   const char* projectType = 0;
   bool targetBuilds = true;
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
       targetBuilds = false; // no manifest tool for object library
@@ -699,12 +694,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     {
     const std::string& linkLanguage = (this->FortranProject?
                                        std::string("Fortran"):
-                                gt->GetLinkerLanguage(configName));
+                                target->GetLinkerLanguage(configName));
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
         ("CMake can not determine linker language for target: ",
-         target.GetName().c_str());
+         target->GetName().c_str());
       return;
       }
     if(linkLanguage == "C" || linkLanguage == "CXX"
@@ -730,12 +725,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       }
 
     // Add the target-specific flags.
-    this->AddCompileOptions(flags, gt, linkLanguage, configName);
+    this->AddCompileOptions(flags, target, linkLanguage, configName);
     }
 
   if(this->FortranProject)
     {
-    switch(this->GetFortranFormat(target.GetProperty("Fortran_FORMAT")))
+    switch(this->GetFortranFormat(target->GetProperty("Fortran_FORMAT")))
       {
       case FortranFormatFixed: flags += " -fixed"; break;
       case FortranFormatFree: flags += " -free"; break;
@@ -762,7 +757,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.Parse(defineFlags.c_str());
   targetOptions.ParseFinish();
   std::vector<std::string> targetDefines;
-  gt->GetCompileDefinitions(targetDefines, configName, "CXX");
+  target->GetCompileDefinitions(targetDefines, configName, "CXX");
   targetOptions.AddDefines(targetDefines);
   targetOptions.SetVerboseMakefile(
     this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));
@@ -774,22 +769,22 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = gt->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     targetOptions.AddDefine(exportMacro);
     }
 
   // The intermediate directory name consists of a directory for the
   // target and a subdirectory for the configuration name.
-  std::string intermediateDir = this->GetTargetDirectory(gt);
+  std::string intermediateDir = this->GetTargetDirectory(target);
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target.GetType() < cmState::UTILITY)
+  if (target->Target->GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target.GetType() == cmState::OBJECT_LIBRARY?
-      intermediateDir : gt->GetDirectory(configName);
+      target->Target->GetType() == cmState::OBJECT_LIBRARY?
+      intermediateDir : target->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
     }
@@ -804,7 +799,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if (this->FortranProject)
     {
     // Intel Fortran >= 15.0 uses TargetName property.
-    std::string targetNameFull = gt->GetFullName(configName);
+    std::string targetNameFull = target->GetFullName(configName);
     std::string targetName =
       cmSystemTools::GetFilenameWithoutLastExtension(targetNameFull);
     std::string targetExt =
@@ -839,7 +834,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if(this->FortranProject)
     {
     const char* target_mod_dir =
-      target.GetProperty("Fortran_MODULE_DIRECTORY");
+      target->Target->GetProperty("Fortran_MODULE_DIRECTORY");
     std::string modDir;
     if(target_mod_dir)
       {
@@ -858,7 +853,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
   fout << "\t\t\t\tAdditionalIncludeDirectories=\"";
   std::vector<std::string> includes;
-  this->GetIncludeDirectories(includes, gt, "C", configName);
+  this->GetIncludeDirectories(includes, target, "C", configName);
   std::vector<std::string>::iterator i = includes.begin();
   for(;i != includes.end(); ++i)
     {
@@ -879,10 +874,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target.GetType() <= cmState::OBJECT_LIBRARY)
+  if(target->Target->GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
-    std::string pdb = gt->GetCompilePDBPath(configName);
+    std::string pdb = target->GetCompilePDBPath(configName);
     if(!pdb.empty())
       {
       fout <<  "\t\t\t\tProgramDataBaseFileName=\""
@@ -986,7 +981,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       "\t\t\t\tName=\"" << manifestTool << "\"";
 
     std::vector<cmSourceFile const*> manifest_srcs;
-    gt->GetManifests(manifest_srcs, configName);
+    target->GetManifests(manifest_srcs, configName);
     if (!manifest_srcs.empty())
       {
       fout << "\n\t\t\t\tAdditionalManifestFiles=\"";
@@ -1001,7 +996,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
     // Check if we need the FAT32 workaround.
     // Check the filesystem type where the target will be written.
-    if (cmLVS6G_IsFAT(gt->GetDirectory(configName).c_str()))
+    if (cmLVS6G_IsFAT(target->GetDirectory(configName).c_str()))
       {
       // Add a flag telling the manifest tool to use a workaround
       // for FAT32 file systems, which can cause an empty manifest
@@ -1035,28 +1030,28 @@ cmLocalVisualStudio7Generator
 }
 
 void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
-  const std::string& configName, cmTarget &target,
+  const std::string& configName, cmGeneratorTarget* target,
   const Options& targetOptions)
 {
   cmGlobalVisualStudio7Generator* gg =
     static_cast<cmGlobalVisualStudio7Generator*>(this->GlobalGenerator);
   std::string temp;
   std::string extraLinkOptions;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_EXE_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_SHARED_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS")
@@ -1064,7 +1059,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       + GetBuildTypeLinkerFlags("CMAKE_MODULE_LINKER_FLAGS", configName);
     }
 
-  const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags = target->GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1073,7 +1068,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
   std::string configTypeUpper = cmSystemTools::UpperCase(configName);
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += configTypeUpper;
-  targetLinkFlags = target.GetProperty(linkFlagsConfig.c_str());
+  targetLinkFlags = target->GetProperty(linkFlagsConfig.c_str());
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1093,28 +1088,26 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       this->ConvertToOutputFormat(this->ModuleDefinitionFile, SHELL);
     linkOptions.AddFlag("ModuleDefinitionFile", defFile.c_str());
     }
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
 
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (target->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)/exportall.def");
       }
     }
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::UNKNOWN_LIBRARY:
       break;
     case cmState::OBJECT_LIBRARY:
       {
-      std::string libpath = this->GetTargetDirectory(gt);
+      std::string libpath = this->GetTargetDirectory(target);
       libpath += "/";
       libpath += configName;
       libpath += "/";
-      libpath += target.GetName();
+      libpath += target->GetName();
       libpath += ".lib";
       const char* tool =
         this->FortranProject? "VFLibrarianTool":"VCLibrarianTool";
@@ -1126,8 +1119,8 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     case cmState::STATIC_LIBRARY:
     {
-    std::string targetNameFull = gt->GetFullName(configName);
-    std::string libpath = gt->GetDirectory(configName);
+    std::string targetNameFull = target->GetFullName(configName);
+    std::string libpath = target->GetDirectory(configName);
     libpath += "/";
     libpath += targetNameFull;
     const char* tool = "VCLibrarianTool";
@@ -1142,14 +1135,14 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
         || this->FortranProject)
       {
       std::ostringstream libdeps;
-      this->Internal->OutputObjects(libdeps, &target);
+      this->Internal->OutputObjects(libdeps, target);
       if(!libdeps.str().empty())
         {
         fout << "\t\t\t\tAdditionalDependencies=\"" << libdeps.str() << "\"\n";
         }
       }
     std::string libflags;
-    this->GetStaticLibraryFlags(libflags, configTypeUpper, gt);
+    this->GetStaticLibraryFlags(libflags, configTypeUpper, target);
     if(!libflags.empty())
       {
       fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
@@ -1166,11 +1159,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gt->GetLibraryNames(targetName, targetNameSO, targetNameFull,
+    target->GetLibraryNames(targetName, targetNameSO, targetNameFull,
                            targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1190,7 +1183,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(target))
+    if(!gg->NeedLinkLibraryDependencies(*target->Target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1202,22 +1195,22 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, &target, " ");
+      this->Internal->OutputObjects(fout, target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = gt->GetDirectory(configName);
+    temp = target->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, gt);
+    this->WriteTargetVersionAttribute(fout, target);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
-    temp = gt->GetPDBDirectory(configName);
+    temp = target->GetPDBDirectory(configName);
     temp += "/";
     temp += targetNamePDB;
     fout << "\t\t\t\tProgramDatabaseFile=\"" <<
@@ -1245,7 +1238,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal  << "\"\n";
       }
-    temp = gt->GetDirectory(configName, true);
+    temp = target->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1263,11 +1256,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gt->GetExecutableNames(targetName, targetNameFull,
+    target->GetExecutableNames(targetName, targetNameFull,
                               targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1275,7 +1268,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     cmComputeLinkInformation& cli = *pcli;
     std::string linkLanguage = cli.GetLinkLanguage();
 
-    bool isWin32Executable = target.GetPropertyAsBool("WIN32_EXECUTABLE");
+    bool isWin32Executable = target->GetPropertyAsBool("WIN32_EXECUTABLE");
 
     // Compute the variable name to lookup standard libraries for this
     // language.
@@ -1289,7 +1282,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(target))
+    if(!gg->NeedLinkLibraryDependencies(*target->Target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1301,23 +1294,23 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, &target, " ");
+      this->Internal->OutputObjects(fout, target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = gt->GetDirectory(configName);
+    temp = target->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, gt);
+    this->WriteTargetVersionAttribute(fout, target);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
     std::string path = this->ConvertToXMLOutputPathSingle(
-      gt->GetPDBDirectory(configName).c_str());
+      target->GetPDBDirectory(configName).c_str());
     fout << "\t\t\t\tProgramDatabaseFile=\""
          << path << "/" << targetNamePDB
          << "\"\n";
@@ -1364,7 +1357,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal << "\"";
       }
-    temp = gt->GetDirectory(configName, true);
+    temp = target->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1415,13 +1408,11 @@ cmLocalVisualStudio7GeneratorInternals
 //----------------------------------------------------------------------------
 void
 cmLocalVisualStudio7GeneratorInternals
-::OutputObjects(std::ostream& fout, cmTarget* t, const char* isep)
+::OutputObjects(std::ostream& fout, cmGeneratorTarget* gt, const char* isep)
 {
   // VS < 8 does not support per-config source locations so we
   // list object library content on the link line instead.
   cmLocalVisualStudio7Generator* lg = this->LocalGenerator;
-  cmGeneratorTarget* gt =
-    lg->GetGlobalGenerator()->GetGeneratorTarget(t);
   std::vector<std::string> objs;
   gt->UseObjectLibraries(objs, "");
   const char* sep = isep? isep : "";
@@ -1478,7 +1469,7 @@ cmLocalVisualStudio7Generator
 
 void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
                                                     const std::string& libName,
-                                                    cmTarget &target)
+                                                    cmGeneratorTarget* target)
 {
   std::vector<std::string> configs;
   this->Makefile->GetConfigurations(configs);
@@ -1486,13 +1477,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
   // We may be modifying the source groups temporarily, so make a copy.
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // get the classes from the source lists then add them to the groups
   this->ModuleDefinitionFile = "";
   std::vector<cmSourceFile*> classes;
-  if (!gt->GetConfigCommonSourceFiles(classes))
+  if (!target->GetConfigCommonSourceFiles(classes))
     {
     return;
     }
@@ -1535,7 +1523,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
     // VS >= 8 support per-config source locations so we
     // list object library content as external objects.
     std::vector<std::string> objs;
-    gt->UseObjectLibraries(objs, "");
+    target->UseObjectLibraries(objs, "");
     if(!objs.empty())
       {
       // TODO: Separate sub-filter for each object library used?
@@ -1570,7 +1558,7 @@ class cmLocalVisualStudio7GeneratorFCInfo
 {
 public:
   cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmTarget& target,
+                                      cmGeneratorTarget* target,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs);
   std::map<std::string, cmLVS7GFileConfig> FileConfigMap;
@@ -1578,12 +1566,10 @@ public:
 
 cmLocalVisualStudio7GeneratorFCInfo
 ::cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmTarget& target,
+                                      cmGeneratorTarget* gt,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs)
 {
-  cmGeneratorTarget* gt =
-    lg->GetGlobalGenerator()->GetGeneratorTarget(&target);
   std::string objectName;
   if(gt->HasExplicitObjectName(&sf))
     {
@@ -1732,7 +1718,7 @@ cmLocalVisualStudio7Generator
 }
 
 bool cmLocalVisualStudio7Generator
-::WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+::WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
              std::ostream &fout, const std::string& libName,
              std::vector<std::string> const& configs)
 {
@@ -1767,15 +1753,14 @@ bool cmLocalVisualStudio7Generator
     }
 
   // Loop through each source in the source group.
-  std::string objectName;
   for(std::vector<const cmSourceFile *>::const_iterator sf =
         sourceFiles.begin(); sf != sourceFiles.end(); ++sf)
     {
     std::string source = (*sf)->GetFullPath();
     FCInfo fcinfo(this, target, *(*sf), configs);
 
-    if (source != libName || target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET )
+    if (source != libName || target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET )
       {
       fout << "\t\t\t<File\n";
       std::string d = this->ConvertToXMLOutputPathSingle(source.c_str());
@@ -2022,10 +2007,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjEndGroup(std::ostream& fout)
 void cmLocalVisualStudio7Generator
 ::OutputTargetRules(std::ostream& fout,
                     const std::string& configName,
-                    cmTarget &target,
+                    cmGeneratorTarget *target,
                     const std::string& /*libName*/)
 {
-  if (target.GetType() > cmState::GLOBAL_TARGET)
+  if (target->GetType() > cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -2035,36 +2020,34 @@ void cmLocalVisualStudio7Generator
   const char* tool =
     this->FortranProject? "VFPreBuildEventTool":"VCPreBuildEventTool";
   event.Start(tool);
-  event.Write(target.GetPreBuildCommands());
+  event.Write(target->Target->GetPreBuildCommands());
   event.Finish();
 
   // Add pre-link event.
   tool = this->FortranProject? "VFPreLinkEventTool":"VCPreLinkEventTool";
   event.Start(tool);
   bool addedPrelink = false;
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (target->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        target.GetPreLinkCommands();
+        target->Target->GetPreLinkCommands();
       cmGlobalVisualStudioGenerator* gg
         = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-      cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(&target);
       gg->AddSymbolExportCommand(
-        gt, commands, configName);
+        target, commands, configName);
       event.Write(commands);
       }
     }
   if (!addedPrelink)
     {
-    event.Write(target.GetPreLinkCommands());
+    event.Write(target->Target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, this->FortranProject));
+    this->MaybeCreateImplibDir(*target->Target, configName, this->FortranProject));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -2074,18 +2057,18 @@ void cmLocalVisualStudio7Generator
   // Add post-build event.
   tool = this->FortranProject? "VFPostBuildEventTool":"VCPostBuildEventTool";
   event.Start(tool);
-  event.Write(target.GetPostBuildCommands());
+  event.Write(target->Target->GetPostBuildCommands());
   event.Finish();
 }
 
 void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
-                                                    cmTarget& target)
+                                                    cmGeneratorTarget* target)
 {
   // if we have all the required Source code control tags
   // then add that to the project
-  const char* vsProjectname = target.GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalpath = target.GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectname = target->GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalpath = target->GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider = target->GetProperty("VS_SCC_PROVIDER");
 
   if(vsProvider && vsLocalpath && vsProjectname)
     {
@@ -2093,7 +2076,7 @@ void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
          << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
          << "\tSccProvider=\"" << vsProvider << "\"\n";
 
-    const char* vsAuxPath = target.GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath = target->GetProperty("VS_SCC_AUXPATH");
     if(vsAuxPath)
       {
       fout << "\tSccAuxPath=\"" << vsAuxPath << "\"\n";
@@ -2105,7 +2088,7 @@ void
 cmLocalVisualStudio7Generator
 ::WriteProjectStartFortran(std::ostream& fout,
                            const std::string& libName,
-                           cmTarget & target)
+                           cmGeneratorTarget *target)
 {
 
   cmGlobalVisualStudio7Generator* gg =
@@ -2115,13 +2098,13 @@ cmLocalVisualStudio7Generator
        << "<VisualStudioProject\n"
        << "\tProjectCreator=\"Intel Fortran\"\n"
        << "\tVersion=\"" << gg->GetIntelProjectVersion() << "\"\n";
-  const char* keyword = target.GetProperty("VS_KEYWORD");
+  const char* keyword = target->GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Console Application";
     }
   const char* projectType = 0;
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::STATIC_LIBRARY:
       projectType = "typeStaticLibrary";
@@ -2166,7 +2149,7 @@ cmLocalVisualStudio7Generator
 void
 cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
                                                  const std::string& libName,
-                                                 cmTarget & target,
+                                                 cmGeneratorTarget *target,
                                                  std::vector<cmSourceGroup> &)
 {
   if(this->FortranProject)
@@ -2190,12 +2173,12 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     {
     fout <<  "\tVersion=\"" << (gg->GetVersion()/10) << ".00\"\n";
     }
-  const char* projLabel = target.GetProperty("PROJECT_LABEL");
+  const char* projLabel = target->GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = libName.c_str();
     }
-  const char* keyword = target.GetProperty("VS_KEYWORD");
+  const char* keyword = target->GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Win32Proj";
@@ -2207,7 +2190,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     }
   this->WriteProjectSCC(fout, target);
   if(const char* targetFrameworkVersion =
-     target.GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
+     target->GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     fout << "\tTargetFrameworkVersion=\"" << targetFrameworkVersion << "\"\n";
     }
@@ -2229,11 +2212,11 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
 
 
 void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream& fout,
-                                                      cmTarget &target)
+                                                      cmGeneratorTarget *target)
 {
   fout << "\t<Globals>\n";
 
-  cmPropertyMap const& props = target.GetProperties();
+  cmPropertyMap const& props = target->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     if(i->first.find("VS_GLOBAL_") == 0)
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 16cf004..c8dae02 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -15,7 +15,6 @@
 #include "cmLocalVisualStudioGenerator.h"
 #include "cmVisualStudioGeneratorOptions.h"
 
-class cmTarget;
 class cmSourceFile;
 class cmCustomCommand;
 class cmSourceGroup;
@@ -63,7 +62,8 @@ public:
                                         const char* path);
   virtual void AddCMakeListsRules();
 protected:
-  void CreateSingleVCProj(const std::string& lname, cmTarget &tgt);
+  void CreateSingleVCProj(const std::string& lname,
+                          cmGeneratorTarget *tgt);
 private:
   typedef cmVisualStudioGeneratorOptions Options;
   typedef cmLocalVisualStudio7GeneratorFCInfo FCInfo;
@@ -72,30 +72,30 @@ private:
   void FixGlobalTargets();
   void WriteProjectFiles();
   void WriteVCProjHeader(std::ostream& fout, const std::string& libName,
-                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
-  void WriteVCProjFooter(std::ostream& fout, cmTarget &target);
+                         cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
+  void WriteVCProjFooter(std::ostream& fout, cmGeneratorTarget* target);
   void WriteVCProjFile(std::ostream& fout, const std::string& libName,
-                       cmTarget &tgt);
+                       cmGeneratorTarget* tgt);
   void WriteConfigurations(std::ostream& fout,
                            std::vector<std::string> const& configs,
-                           const std::string& libName, cmTarget &tgt);
+                           const std::string& libName, cmGeneratorTarget* tgt);
   void WriteConfiguration(std::ostream& fout,
                           const std::string& configName,
-                          const std::string& libName, cmTarget &tgt);
+                          const std::string& libName, cmGeneratorTarget* tgt);
   std::string EscapeForXML(const std::string& s);
   std::string ConvertToXMLOutputPath(const char* path);
   std::string ConvertToXMLOutputPathSingle(const char* path);
   void OutputTargetRules(std::ostream& fout, const std::string& configName,
-                         cmTarget &target, const std::string& libName);
+                         cmGeneratorTarget* target, const std::string& libName);
   void OutputBuildTool(std::ostream& fout, const std::string& configName,
-                       cmTarget& t, const Options& targetOptions);
+                       cmGeneratorTarget* t, const Options& targetOptions);
   void OutputLibraryDirectories(std::ostream& fout,
                                 std::vector<std::string> const& dirs);
-  void WriteProjectSCC(std::ostream& fout, cmTarget& target);
+  void WriteProjectSCC(std::ostream& fout, cmGeneratorTarget *target);
   void WriteProjectStart(std::ostream& fout, const std::string& libName,
-                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
+                         cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
   void WriteProjectStartFortran(std::ostream& fout, const std::string& libName,
-                                cmTarget &tgt);
+                                cmGeneratorTarget* tgt);
   void WriteVCProjBeginGroup(std::ostream& fout,
                           const char* group,
                           const char* filter);
@@ -110,7 +110,7 @@ private:
                                    cmGeneratorTarget* gt);
 
   bool WriteGroup(const cmSourceGroup *sg,
-                  cmTarget& target, std::ostream &fout,
+                  cmGeneratorTarget* target, std::ostream &fout,
                   const std::string& libName,
                   std::vector<std::string> const& configs);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c1433dc295b622be273614470e778fc65460efe
commit 5c1433dc295b622be273614470e778fc65460efe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:28:30 2015 +0200

    VS10: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 161b532..0d579bf 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -331,7 +331,7 @@ void cmGlobalVisualStudio10Generator::Generate()
   this->cmGlobalVisualStudio8Generator::Generate();
   if(this->LongestSource.Length > 0)
     {
-    cmMakefile* mf = this->LongestSource.Target->GetMakefile();
+    cmLocalGenerator* lg = this->LongestSource.Target->GetLocalGenerator();
     std::ostringstream e;
     e <<
       "The binary and/or source directory paths may be too long to generate "
@@ -346,13 +346,13 @@ void cmGlobalVisualStudio10Generator::Generate()
       "  " << this->LongestSource.SourceFile->GetFullPath() << "\n"
       "This is because some Visual Studio tools would append the relative "
       "path to the end of the referencing directory path, as in:\n"
-      "  " << mf->GetCurrentBinaryDirectory() << "/"
+      "  " << lg->GetCurrentBinaryDirectory() << "/"
       << this->LongestSource.SourceRel << "\n"
       "and then incorrectly complain that the file does not exist because "
       "the path length is too long for some internal buffer or API.  "
       "To avoid this problem CMake must use a full path for this file "
       "which then triggers the VS 10 property dialog bug.";
-    mf->IssueMessage(cmake::WARNING, e.str().c_str());
+    lg->IssueMessage(cmake::WARNING, e.str().c_str());
     }
 }
 
@@ -591,9 +591,10 @@ cmGlobalVisualStudio10Generator
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio10Generator::PathTooLong(
-  cmTarget* target, cmSourceFile const* sf, std::string const& sfRel)
+        cmGeneratorTarget *target, cmSourceFile const* sf,
+        std::string const& sfRel)
 {
-  size_t len = (strlen(target->GetMakefile()->GetCurrentBinaryDirectory()) +
+  size_t len = (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
                 1 + sfRel.length());
   if(len > this->LongestSource.Length)
     {
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 7600a0d..6bf4740 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -95,7 +95,7 @@ public:
   /** Generate an <output>.rule file path for a given command output.  */
   virtual std::string GenerateRuleFile(std::string const& output) const;
 
-  void PathTooLong(cmTarget* target, cmSourceFile const* sf,
+  void PathTooLong(cmGeneratorTarget* target, cmSourceFile const* sf,
                    std::string const& sfRel);
 
   virtual const char* GetToolsVersion() { return "4.0"; }
@@ -139,7 +139,7 @@ private:
   {
     LongestSourcePath(): Length(0), Target(0), SourceFile(0) {}
     size_t Length;
-    cmTarget* Target;
+    cmGeneratorTarget* Target;
     cmSourceFile const* SourceFile;
     std::string SourceRel;
   };
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index c9d53fe..e9aee8a 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -90,7 +90,7 @@ void cmLocalVisualStudio10Generator::Generate()
     else
       {
       cmVisualStudio10TargetGenerator tg(
-        (*l)->Target, static_cast<cmGlobalVisualStudio10Generator*>(
+        *l, static_cast<cmGlobalVisualStudio10Generator*>(
           this->GetGlobalGenerator()));
       tg.Generate();
       }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f4c632d..6384d56 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -13,7 +13,6 @@
 #include "cmVisualStudio10TargetGenerator.h"
 #include "cmGlobalVisualStudio10Generator.h"
 #include "cmGeneratorTarget.h"
-#include "cmTarget.h"
 #include "cmComputeLinkInformation.h"
 #include "cmGeneratedFileStream.h"
 #include "cmMakefile.h"
@@ -167,13 +166,12 @@ static std::string cmVS10EscapeComment(std::string comment)
 }
 
 cmVisualStudio10TargetGenerator::
-cmVisualStudio10TargetGenerator(cmTarget* target,
+cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
                                 cmGlobalVisualStudio10Generator* gg)
 {
   this->GlobalGenerator = gg;
-  this->Target = target;
-  this->GeneratorTarget = gg->GetGeneratorTarget(target);
-  this->Makefile = target->GetMakefile();
+  this->GeneratorTarget = target;
+  this->Makefile = target->Target->GetMakefile();
   this->Makefile->GetConfigurations(this->Configurations);
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
@@ -275,8 +273,8 @@ void cmVisualStudio10TargetGenerator::Generate()
     return;
     }
   // Tell the global generator the name of the project file
-  this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
-  this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
+  this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
+  this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
   if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
     {
@@ -732,7 +730,7 @@ void cmVisualStudio10TargetGenerator
   cmGlobalVisualStudio10Generator* gg =
     static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
   const char* mfcFlag =
-    this->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
+    this->GeneratorTarget->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
   std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
 
   std::string useOfMfcValue = "false";
@@ -1462,7 +1460,8 @@ void cmVisualStudio10TargetGenerator::WriteSource(
       }
     else
       {
-      this->GlobalGenerator->PathTooLong(this->Target, sf, sourceRel);
+      this->GlobalGenerator->PathTooLong(this->GeneratorTarget,
+                                         sf, sourceRel);
       }
     }
   this->ConvertToWindowsSlash(sourceFile);
@@ -1915,12 +1914,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
     std::string baseFlagVar = "CMAKE_";
     baseFlagVar += linkLanguage;
     baseFlagVar += "_FLAGS";
-    flags = this->
+    flags = this->GeneratorTarget->
       Target->GetMakefile()->GetRequiredDefinition(baseFlagVar.c_str());
     std::string flagVar = baseFlagVar + std::string("_") +
       cmSystemTools::UpperCase(configName);
     flags += " ";
-    flags += this->
+    flags += this->GeneratorTarget->
       Target->GetMakefile()->GetRequiredDefinition(flagVar.c_str());
     }
   // set the correct language
@@ -1936,7 +1935,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
                                           linkLanguage, configName.c_str());
 
   // Get preprocessor definitions for this directory.
-  std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags();
+  std::string defineFlags = this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
   if(this->MSTools)
     {
     clOptions.FixExceptionHandlingDefault();
@@ -2440,11 +2439,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   linkFlagVarBase += linkType;
   linkFlagVarBase += "_LINKER_FLAGS";
   flags += " ";
-  flags += this->
+  flags += this->GeneratorTarget->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVarBase.c_str());
   std::string linkFlagVar = linkFlagVarBase + "_" + CONFIG;
   flags += " ";
-  flags += this->
+  flags += this->GeneratorTarget->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
   const char* targetLinkFlags =
       this->GeneratorTarget->GetProperty("LINK_FLAGS");
@@ -2674,7 +2673,8 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
   linkOptions.OutputFlagMap(*this->BuildFileStream, "      ");
 
   this->WriteString("</Link>\n", 2);
-  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(*this->Target))
+  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
+              *this->GeneratorTarget->Target))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(
@@ -2811,7 +2811,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        this->Target->GetPreLinkCommands();
+        this->GeneratorTarget->Target->GetPreLinkCommands();
       this->GlobalGenerator->AddSymbolExportCommand(
         this->GeneratorTarget, commands, configName);
       this->WriteEvent("PreLinkEvent", commands, configName);
@@ -2820,12 +2820,12 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (!addedPrelink)
     {
     this->WriteEvent("PreLinkEvent",
-                     this->Target->GetPreLinkCommands(), configName);
+                     this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
     }
   this->WriteEvent("PreBuildEvent",
-                   this->Target->GetPreBuildCommands(), configName);
+                   this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
   this->WriteEvent("PostBuildEvent",
-                   this->Target->GetPostBuildCommands(), configName);
+                   this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
 }
 
 void cmVisualStudio10TargetGenerator::WriteEvent(
@@ -2875,7 +2875,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
   for( OrderedTargetDependSet::const_iterator i = depends.begin();
        i != depends.end(); ++i)
     {
-    cmTarget const* dt = (*i)->Target;
+    cmGeneratorTarget const* dt = *i;
     if(dt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -2883,12 +2883,12 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     // skip fortran targets as they can not be processed by MSBuild
     // the only reference will be in the .sln file
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*dt))
+       ->TargetIsFortranOnly(*dt->Target))
       {
       continue;
       }
     this->WriteString("<ProjectReference Include=\"", 2);
-    cmMakefile* mf = dt->GetMakefile();
+    cmLocalGenerator* lg = dt->GetLocalGenerator();
     std::string name = dt->GetName();
     std::string path;
     const char* p = dt->GetProperty("EXTERNAL_MSPROJECT");
@@ -2898,7 +2898,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
       }
     else
       {
-      path =  mf->GetCurrentBinaryDirectory();
+      path =  lg->GetCurrentBinaryDirectory();
       path += "/";
       path += dt->GetName();
       path += ".vcxproj";
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 15ed9f2..044e0dd 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -13,7 +13,6 @@
 #define cmVisualStudioTargetGenerator_h
 #include "cmStandardIncludes.h"
 
-class cmTarget;
 class cmMakefile;
 class cmGeneratorTarget;
 class cmGeneratedFileStream;
@@ -29,7 +28,7 @@ struct cmIDEFlagTable;
 class cmVisualStudio10TargetGenerator
 {
 public:
-  cmVisualStudio10TargetGenerator(cmTarget* target,
+  cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
                                   cmGlobalVisualStudio10Generator* gg);
   ~cmVisualStudio10TargetGenerator();
   void Generate();
@@ -148,7 +147,6 @@ private:
   OptionsMap LinkOptions;
   std::string PathToVcxproj;
   std::vector<std::string> Configurations;
-  cmTarget* Target;
   cmGeneratorTarget* GeneratorTarget;
   cmMakefile* Makefile;
   std::string Platform;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a970363ae069e1b40eba2444df303cceb6d5d638
commit a970363ae069e1b40eba2444df303cceb6d5d638
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:28:11 2015 +0200

    VS6: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 12eccf9..2452743 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -223,7 +223,7 @@ void cmGlobalVisualStudio6Generator
         tt = orderedProjectTargets.begin();
       tt != orderedProjectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -235,14 +235,14 @@ void cmGlobalVisualStudio6Generator
       std::string project = target->GetName();
       std::string location = expath;
       this->WriteExternalProject(fout, project.c_str(),
-                                 location.c_str(), target->GetUtilities());
+                                 location.c_str(), target->Target->GetUtilities());
       }
     else
       {
       std::string dspname = GetVS6TargetName(target->GetName());
-      std::string dir = target->GetMakefile()->GetCurrentBinaryDirectory();
+      std::string dir = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
       dir = root->Convert(dir.c_str(), cmLocalGenerator::START_OUTPUT);
-      this->WriteProject(fout, dspname.c_str(), dir.c_str(), *target);
+      this->WriteProject(fout, dspname.c_str(), dir.c_str(), target);
       }
     }
 
@@ -289,7 +289,7 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile()
 void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
                                                   const std::string& dspname,
                                                   const char* dir,
-                                                  cmTarget const& target)
+                                                  const cmGeneratorTarget *target)
 {
   fout << "#########################################################"
     "######################\n\n";
@@ -298,7 +298,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -309,7 +309,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -382,7 +382,7 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index e9b24ea..edf637f 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -15,8 +15,6 @@
 #include "cmGlobalVisualStudioGenerator.h"
 #include "cmGlobalGeneratorFactory.h"
 
-class cmTarget;
-
 /** \class cmGlobalVisualStudio6Generator
  * \brief Write a Unix makefiles.
  *
@@ -94,7 +92,7 @@ private:
   void WriteDSWHeader(std::ostream& fout);
   void WriteProject(std::ostream& fout,
                     const std::string& name, const char* path,
-                    cmTarget const& t);
+                    cmGeneratorTarget const* t);
   void WriteExternalProject(std::ostream& fout,
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 773e555..dda31b9 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
       this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
     if (!cmSystemTools::IsOn(suppRegenRule))
       {
-      this->AddDSPBuildRule(*(*l)->Target);
+      this->AddDSPBuildRule(*l);
       }
     }
 }
@@ -133,21 +133,21 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       case cmState::STATIC_LIBRARY:
       case cmState::OBJECT_LIBRARY:
         this->SetBuildType(STATIC_LIBRARY,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::SHARED_LIBRARY:
       case cmState::MODULE_LIBRARY:
         this->SetBuildType(DLL,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::EXECUTABLE:
         this->SetBuildType(EXECUTABLE,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::UTILITY:
       case cmState::GLOBAL_TARGET:
         this->SetBuildType(UTILITY,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::INTERFACE_LIBRARY:
         continue;
@@ -173,7 +173,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
           cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
-      this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleDSP((*l)->GetName().c_str(), *l);
       }
     }
 }
@@ -184,7 +184,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 extern std::string GetVS6TargetName(const std::string& targetName);
 
 void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
-                                                    cmTarget &target)
+                                                    cmGeneratorTarget* target)
 {
   // add to the list of projects
   std::string pname = GetVS6TargetName(lname);
@@ -211,9 +211,9 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 }
 
 
-void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
+void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmGeneratorTarget *tgt)
 {
-  std::string dspname = GetVS6TargetName(tgt.GetName());
+  std::string dspname = GetVS6TargetName(tgt->GetName());
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
@@ -245,8 +245,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
                                            no_working_directory, true);
   if(this->Makefile->GetSource(makefileIn.c_str()))
     {
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&tgt);
-    gt->AddSource(makefileIn);
+    tgt->AddSource(makefileIn);
     }
   else
     {
@@ -257,7 +256,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
 
 void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
                                                  const std::string& libName,
-                                                 cmTarget &target)
+                                                 cmGeneratorTarget *target)
 {
   // For utility targets need custom command since pre- and post-
   // build does not do anything in Visual Studio 6.  In order for the
@@ -265,23 +264,23 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // special care for dependencies.  The first rule must depend on all
   // the dependencies of all the rules.  The later rules must each
   // depend only on the previous rule.
-  if ((target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET) &&
-      (!target.GetPreBuildCommands().empty() ||
-       !target.GetPostBuildCommands().empty()))
+  if ((target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET) &&
+      (!target->Target->GetPreBuildCommands().empty() ||
+       !target->Target->GetPostBuildCommands().empty()))
     {
     // Accumulate the dependencies of all the commands.
     std::vector<std::string> depends;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPreBuildCommands().begin();
-         cr != target.GetPreBuildCommands().end(); ++cr)
+           target->Target->GetPreBuildCommands().begin();
+         cr != target->Target->GetPreBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPostBuildCommands().begin();
-         cr != target.GetPostBuildCommands().end(); ++cr)
+           target->Target->GetPostBuildCommands().begin();
+         cr != target->Target->GetPostBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
@@ -290,14 +289,14 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
     // Add the pre- and post-build commands in order.
     int count = 1;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPreBuildCommands().begin();
-         cr != target.GetPreBuildCommands().end(); ++cr)
+           target->Target->GetPreBuildCommands().begin();
+         cr != target->Target->GetPreBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPostBuildCommands().begin();
-         cr != target.GetPostBuildCommands().end(); ++cr)
+           target->Target->GetPostBuildCommands().begin();
+         cr != target->Target->GetPostBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
@@ -306,12 +305,9 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // We may be modifying the source groups temporarily, so make a copy.
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // get the classes from the source lists then add them to the groups
   std::vector<cmSourceFile*> classes;
-  if (!gt->GetConfigCommonSourceFiles(classes))
+  if (!target->GetConfigCommonSourceFiles(classes))
     {
     return;
     }
@@ -375,11 +371,9 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
 }
 
 void cmLocalVisualStudio6Generator
-::WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+::WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
              std::ostream &fout, const std::string& libName)
 {
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   const std::vector<const cmSourceFile *> &sourceFiles =
     sg->GetSourceFiles();
   // If the group is empty, don't write it at all.
@@ -411,9 +405,9 @@ void cmLocalVisualStudio6Generator
     std::string compileFlags;
     std::vector<std::string> depends;
     std::string objectNameDir;
-    if(gt->HasExplicitObjectName(*sf))
+    if(target->HasExplicitObjectName(*sf))
       {
-      objectNameDir = cmSystemTools::GetFilenamePath(gt->GetObjectName(*sf));
+      objectNameDir = cmSystemTools::GetFilenamePath(target->GetObjectName(*sf));
       }
 
     // Add per-source file flags.
@@ -484,8 +478,8 @@ void cmLocalVisualStudio6Generator
       cmSystemTools::ExpandListArgument(dependsValue, depends);
       }
     if (GetVS6TargetName(source) != libName ||
-      target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET)
+      target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET)
       {
       fout << "# Begin Source File\n\n";
 
@@ -575,15 +569,15 @@ void cmLocalVisualStudio6Generator
 
 void
 cmLocalVisualStudio6Generator
-::AddUtilityCommandHack(cmTarget& target, int count,
+::AddUtilityCommandHack(cmGeneratorTarget *target, int count,
                         std::vector<std::string>& depends,
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
   char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
-                           + target.GetName().size() + 30)];
+                           + target->GetName().size() + 30)];
   sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
-          target.GetName().c_str(), count);
+          target->GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
     {
@@ -598,8 +592,7 @@ cmLocalVisualStudio6Generator
        origCommand.GetCommandLines(), comment,
        origCommand.GetWorkingDirectory().c_str()))
     {
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&target);
-    gt->AddSource(outsf->GetFullPath());
+    target->AddSource(outsf->GetFullPath());
     }
 
   // Replace the dependencies with the output of this rule so that the
@@ -715,7 +708,7 @@ void cmLocalVisualStudio6Generator::WriteDSPEndGroup(std::ostream& fout)
 
 void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
                                                  const std::string& libName,
-                                                 cmTarget& target)
+                                                 cmGeneratorTarget *target)
 {
   std::string root= this->Makefile->GetRequiredDefinition("CMAKE_ROOT");
   const char *def=
@@ -747,7 +740,7 @@ void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
       this->DSPFooterTemplate += "/DLLFooter.dsptemplate";
       break;
     case EXECUTABLE:
-      if ( target.GetPropertyAsBool("WIN32_EXECUTABLE") )
+      if ( target->GetPropertyAsBool("WIN32_EXECUTABLE") )
         {
         this->DSPHeaderTemplate = root;
         this->DSPHeaderTemplate += "/EXEWinHeader.dsptemplate";
@@ -799,19 +792,16 @@ void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCustomCommand>
-cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
+cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmGeneratorTarget* target,
                                                     const std::string& config)
 {
   cmsys::auto_ptr<cmCustomCommand> pcc;
 
   // VS6 forgets to create the output directory for archives if it
   // differs from the intermediate directory.
-  if(target.GetType() != cmState::STATIC_LIBRARY) { return pcc; }
-
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
+  if(target->GetType() != cmState::STATIC_LIBRARY) { return pcc; }
 
-  std::string outDir = gt->GetDirectory(config, false);
+  std::string outDir = target->GetDirectory(config, false);
 
   // Add a pre-link event to create the directory.
   cmCustomCommandLine command;
@@ -833,11 +823,11 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
 
 // look for custom rules on a target and collect them together
 std::string
-cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
+cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
                                               const std::string& configName,
                                               const std::string& /* libName */)
 {
-  if (target.GetType() >= cmState::UTILITY )
+  if (target->GetType() >= cmState::UTILITY )
     {
     return "";
     }
@@ -847,10 +837,10 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
 
   // Write the pre-build and pre-link together (VS6 does not support both).
   event.Start("PreLink");
-  event.Write(target.GetPreBuildCommands());
-  event.Write(target.GetPreLinkCommands());
+  event.Write(target->Target->GetPreBuildCommands());
+  event.Write(target->Target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, false));
+    this->MaybeCreateImplibDir(*target->Target, configName, false));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -864,7 +854,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
 
   // Write the post-build rules.
   event.Start("PostBuild");
-  event.Write(target.GetPostBuildCommands());
+  event.Write(target->Target->GetPostBuildCommands());
   event.Finish();
 
   customRuleCode += "# End Special Build Tool\n";
@@ -883,7 +873,8 @@ inline std::string removeQuotes(const std::string& s)
 
 
 std::string
-cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
+cmLocalVisualStudio6Generator::GetTargetIncludeOptions(
+        cmGeneratorTarget *target,
                                                   const std::string& config)
 {
   std::string includeOptions;
@@ -894,12 +885,10 @@ cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
   unsigned int maxIncludeLength = 3000;
   bool useShortPath = false;
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   for(int j=0; j < 2; ++j)
     {
     std::vector<std::string> includes;
-    this->GetIncludeDirectories(includes, gt, "C", config);
+    this->GetIncludeDirectories(includes, target, "C", config);
 
     std::vector<std::string>::iterator i;
     for(i = includes.begin(); i != includes.end(); ++i)
@@ -947,11 +936,11 @@ cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
 
 void cmLocalVisualStudio6Generator
 ::WriteDSPHeader(std::ostream& fout,
-                 const std::string& libName, cmTarget &target,
+                 const std::string& libName, cmGeneratorTarget* target,
                  std::vector<cmSourceGroup> &)
 {
-  bool targetBuilds = (target.GetType() >= cmState::EXECUTABLE &&
-                       target.GetType() <= cmState::MODULE_LIBRARY);
+  bool targetBuilds = (target->GetType() >= cmState::EXECUTABLE &&
+                       target->GetType() <= cmState::MODULE_LIBRARY);
 #ifdef CM_USE_OLD_VS6
   // Lookup the library and executable output directories.
   std::string libPath;
@@ -1061,7 +1050,7 @@ void cmLocalVisualStudio6Generator
       }
     }
   std::vector<std::string>::const_iterator i;
-  const std::vector<std::string>& libdirs = target.GetLinkDirectories();
+  const std::vector<std::string>& libdirs = target->Target->GetLinkDirectories();
   for(i = libdirs.begin(); i != libdirs.end(); ++i)
     {
     std::string path = *i;
@@ -1103,19 +1092,19 @@ void cmLocalVisualStudio6Generator
     }
   // find link libraries
   const cmTarget::LinkLibraryVectorType& libs =
-    target.GetLinkLibrariesForVS6();
+    target->Target->GetLinkLibrariesForVS6();
   cmTarget::LinkLibraryVectorType::const_iterator j;
   for(j = libs.begin(); j != libs.end(); ++j)
     {
     // add libraries to executables and dlls (but never include
     // a library in a library, bad recursion)
     // NEVER LINK STATIC LIBRARIES TO OTHER STATIC LIBRARIES
-    if ((target.GetType() != cmState::SHARED_LIBRARY
-         && target.GetType() != cmState::STATIC_LIBRARY
-         && target.GetType() != cmState::MODULE_LIBRARY) ||
-        (target.GetType()==cmState::SHARED_LIBRARY
+    if ((target->GetType() != cmState::SHARED_LIBRARY
+         && target->GetType() != cmState::STATIC_LIBRARY
+         && target->GetType() != cmState::MODULE_LIBRARY) ||
+        (target->GetType()==cmState::SHARED_LIBRARY
          && libName != GetVS6TargetName(j->first)) ||
-        (target.GetType()==cmState::MODULE_LIBRARY
+        (target->GetType()==cmState::MODULE_LIBRARY
          && libName != GetVS6TargetName(j->first)))
       {
       // Compute the proper name to use to link this library.
@@ -1197,7 +1186,7 @@ void cmLocalVisualStudio6Generator
   std::string extraLinkOptionsRelease;
   std::string extraLinkOptionsMinSizeRel;
   std::string extraLinkOptionsRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
@@ -1210,7 +1199,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
@@ -1223,7 +1212,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
@@ -1238,63 +1227,60 @@ void cmLocalVisualStudio6Generator
     }
 
   // Get extra linker options for this target.
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS"))
     {
     extraLinkOptions += " ";
     extraLinkOptions += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_DEBUG"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_DEBUG"))
     {
     extraLinkOptionsDebug += " ";
     extraLinkOptionsDebug += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_RELEASE"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_RELEASE"))
     {
     extraLinkOptionsRelease += " ";
     extraLinkOptionsRelease += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_MINSIZEREL"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_MINSIZEREL"))
     {
     extraLinkOptionsMinSizeRel += " ";
     extraLinkOptionsMinSizeRel += targetLinkFlags;
     }
 
   if(const char* targetLinkFlags =
-     target.GetProperty("LINK_FLAGS_RELWITHDEBINFO"))
+     target->GetProperty("LINK_FLAGS_RELWITHDEBINFO"))
     {
     extraLinkOptionsRelWithDebInfo += " ";
     extraLinkOptionsRelWithDebInfo += targetLinkFlags;
     }
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // Get standard libraries for this language.
   if(targetBuilds)
     {
     // Get the language to use for linking.
     std::vector<std::string> configs;
-    target.GetMakefile()->GetConfigurations(configs);
+    target->Target->GetMakefile()->GetConfigurations(configs);
     std::vector<std::string>::const_iterator it = configs.begin();
-    const std::string& linkLanguage = gt->GetLinkerLanguage(*it);
+    const std::string& linkLanguage = target->GetLinkerLanguage(*it);
     for ( ; it != configs.end(); ++it)
       {
-      const std::string& configLinkLanguage = gt->GetLinkerLanguage(*it);
+      const std::string& configLinkLanguage = target->GetLinkerLanguage(*it);
       if (configLinkLanguage != linkLanguage)
         {
         cmSystemTools::Error
           ("Linker language must not vary by configuration for target: ",
-          target.GetName().c_str());
+          target->GetName().c_str());
         }
       }
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
         ("CMake can not determine linker language for target: ",
-         target.GetName().c_str());
+         target->GetName().c_str());
       return;
       }
 
@@ -1315,13 +1301,13 @@ void cmLocalVisualStudio6Generator
 
   // Compute version number information.
   std::string targetVersionFlag;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     int major;
     int minor;
-    gt->GetTargetVersion(major, minor);
+    target->GetTargetVersion(major, minor);
     std::ostringstream targetVersionStream;
     targetVersionStream << "/version:" << major << "." << minor;
     targetVersionFlag = targetVersionStream.str();
@@ -1334,20 +1320,20 @@ void cmLocalVisualStudio6Generator
   std::string outputNameRelease = outputName;
   std::string outputNameMinSizeRel = outputName;
   std::string outputNameRelWithDebInfo = outputName;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::STATIC_LIBRARY ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
-    outputName = gt->GetFullName();
-    outputNameDebug = gt->GetFullName("Debug");
-    outputNameRelease = gt->GetFullName("Release");
-    outputNameMinSizeRel = gt->GetFullName("MinSizeRel");
-    outputNameRelWithDebInfo = gt->GetFullName("RelWithDebInfo");
+    outputName = target->GetFullName();
+    outputNameDebug = target->GetFullName("Debug");
+    outputNameRelease = target->GetFullName("Release");
+    outputNameMinSizeRel = target->GetFullName("MinSizeRel");
+    outputNameRelWithDebInfo = target->GetFullName("RelWithDebInfo");
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(target->GetType() == cmState::OBJECT_LIBRARY)
     {
-    outputName = target.GetName();
+    outputName = target->GetName();
     outputName += ".lib";
     outputNameDebug = outputName;
     outputNameRelease = outputName;
@@ -1361,30 +1347,30 @@ void cmLocalVisualStudio6Generator
   std::string outputDirRelease;
   std::string outputDirMinSizeRel;
   std::string outputDirRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::STATIC_LIBRARY ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
 #ifdef CM_USE_OLD_VS6
     outputDirOld =
       removeQuotes(this->ConvertToOutputFormat
-                   (gt->GetDirectory().c_str(), SHELL));
+                   (target->GetDirectory().c_str(), SHELL));
 #endif
     outputDirDebug =
         removeQuotes(this->ConvertToOutputFormat(
-                       gt->GetDirectory("Debug").c_str(), SHELL));
+                       target->GetDirectory("Debug").c_str(), SHELL));
     outputDirRelease =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("Release").c_str(), SHELL));
+                 target->GetDirectory("Release").c_str(), SHELL));
     outputDirMinSizeRel =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("MinSizeRel").c_str(), SHELL));
+                 target->GetDirectory("MinSizeRel").c_str(), SHELL));
     outputDirRelWithDebInfo =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("RelWithDebInfo").c_str(), SHELL));
+                 target->GetDirectory("RelWithDebInfo").c_str(), SHELL));
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(target->GetType() == cmState::OBJECT_LIBRARY)
     {
     std::string outputDir = cmake::GetCMakeFilesDirectoryPostSlash();
     outputDirDebug = outputDir + "Debug";
@@ -1398,9 +1384,9 @@ void cmLocalVisualStudio6Generator
   std::string optionsRelease;
   std::string optionsMinSizeRel;
   std::string optionsRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsDebug =
       extraLinkOptions + " " + extraLinkOptionsDebug;
@@ -1426,24 +1412,24 @@ void cmLocalVisualStudio6Generator
   std::string targetImplibFlagRelease;
   std::string targetImplibFlagMinSizeRel;
   std::string targetImplibFlagRelWithDebInfo;
-  if(target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY ||
-     target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY ||
+     target->GetType() == cmState::EXECUTABLE)
     {
-    std::string fullPathImpDebug = gt->GetDirectory("Debug", true);
-    std::string fullPathImpRelease = gt->GetDirectory("Release", true);
+    std::string fullPathImpDebug = target->GetDirectory("Debug", true);
+    std::string fullPathImpRelease = target->GetDirectory("Release", true);
     std::string fullPathImpMinSizeRel =
-      gt->GetDirectory("MinSizeRel", true);
+      target->GetDirectory("MinSizeRel", true);
     std::string fullPathImpRelWithDebInfo =
-      gt->GetDirectory("RelWithDebInfo", true);
+      target->GetDirectory("RelWithDebInfo", true);
     fullPathImpDebug += "/";
     fullPathImpRelease += "/";
     fullPathImpMinSizeRel += "/";
     fullPathImpRelWithDebInfo += "/";
-    fullPathImpDebug += gt->GetFullName("Debug", true);
-    fullPathImpRelease += gt->GetFullName("Release", true);
-    fullPathImpMinSizeRel += gt->GetFullName("MinSizeRel", true);
-    fullPathImpRelWithDebInfo += gt->GetFullName("RelWithDebInfo", true);
+    fullPathImpDebug += target->GetFullName("Debug", true);
+    fullPathImpRelease += target->GetFullName("Release", true);
+    fullPathImpMinSizeRel += target->GetFullName("MinSizeRel", true);
+    fullPathImpRelWithDebInfo += target->GetFullName("RelWithDebInfo", true);
 
     targetImplibFlagDebug = "/implib:";
     targetImplibFlagRelease = "/implib:";
@@ -1496,7 +1482,7 @@ void cmLocalVisualStudio6Generator
   std::string staticLibOptionsRelease;
   std::string staticLibOptionsMinSizeRel;
   std::string staticLibOptionsRelWithDebInfo;
-  if(target.GetType() == cmState::STATIC_LIBRARY )
+  if(target->GetType() == cmState::STATIC_LIBRARY )
     {
     const char *libflagsGlobal =
       this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS");
@@ -1515,7 +1501,7 @@ void cmLocalVisualStudio6Generator
     this->AppendFlags(staticLibOptionsRelWithDebInfo, this->Makefile->
       GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO"));
 
-    const char *libflags = target.GetProperty("STATIC_LIBRARY_FLAGS");
+    const char *libflags = target->GetProperty("STATIC_LIBRARY_FLAGS");
     this->AppendFlags(staticLibOptions, libflags);
     this->AppendFlags(staticLibOptionsDebug, libflags);
     this->AppendFlags(staticLibOptionsRelease, libflags);
@@ -1523,13 +1509,13 @@ void cmLocalVisualStudio6Generator
     this->AppendFlags(staticLibOptionsRelWithDebInfo, libflags);
 
     this->AppendFlags(staticLibOptionsDebug,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_DEBUG"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_DEBUG"));
     this->AppendFlags(staticLibOptionsRelease,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_RELEASE"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_RELEASE"));
     this->AppendFlags(staticLibOptionsMinSizeRel,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_MINSIZEREL"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_MINSIZEREL"));
     this->AppendFlags(staticLibOptionsRelWithDebInfo,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_RELWITHDEBINFO"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_RELWITHDEBINFO"));
 
     std::string objects;
     this->OutputObjects(target, "LIB", objects);
@@ -1545,7 +1531,7 @@ void cmLocalVisualStudio6Generator
 
   // Add the export symbol definition for shared library objects.
   std::string exportSymbol;
-  if(const char* exportMacro = gt->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     exportSymbol = exportMacro;
     }
@@ -1569,8 +1555,8 @@ void cmLocalVisualStudio6Generator
                                  libnameExports.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
                                  mfcFlag);
-    if(target.GetType() == cmState::STATIC_LIBRARY ||
-       target.GetType() == cmState::OBJECT_LIBRARY)
+    if(target->GetType() == cmState::STATIC_LIBRARY ||
+       target->GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "CM_STATIC_LIB_ARGS_DEBUG",
                                    staticLibOptionsDebug.c_str());
@@ -1676,7 +1662,7 @@ void cmLocalVisualStudio6Generator
                     (exePath.c_str(), SHELL)).c_str());
 #endif
 
-    if(targetBuilds || target.GetType() == cmState::OBJECT_LIBRARY)
+    if(targetBuilds || target->GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "OUTPUT_DIRECTORY_DEBUG",
                                    outputDirDebug.c_str());
@@ -1700,8 +1686,8 @@ void cmLocalVisualStudio6Generator
       = this->Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
     cmSystemTools::ReplaceString(line, "DEBUG_POSTFIX",
                                  debugPostfix?debugPostfix:"");
-    if(target.GetType() >= cmState::EXECUTABLE &&
-       target.GetType() <= cmState::OBJECT_LIBRARY)
+    if(target->GetType() >= cmState::EXECUTABLE &&
+       target->GetType() <= cmState::OBJECT_LIBRARY)
       {
       // store flags for each configuration
       std::string flags = " ";
@@ -1710,24 +1696,24 @@ void cmLocalVisualStudio6Generator
       std::string flagsDebug = " ";
       std::string flagsRelWithDebInfo = " ";
       std::vector<std::string> configs;
-      target.GetMakefile()->GetConfigurations(configs);
+      target->Target->GetMakefile()->GetConfigurations(configs);
       std::vector<std::string>::const_iterator it = configs.begin();
-      const std::string& linkLanguage = gt->GetLinkerLanguage(*it);
+      const std::string& linkLanguage = target->GetLinkerLanguage(*it);
       for ( ; it != configs.end(); ++it)
         {
-        const std::string& configLinkLanguage = gt->GetLinkerLanguage(*it);
+        const std::string& configLinkLanguage = target->GetLinkerLanguage(*it);
         if (configLinkLanguage != linkLanguage)
           {
           cmSystemTools::Error
             ("Linker language must not vary by configuration for target: ",
-            target.GetName().c_str());
+            target->GetName().c_str());
           }
         }
       if(linkLanguage.empty())
         {
         cmSystemTools::Error
           ("CMake can not determine linker language for target: ",
-           target.GetName().c_str());
+           target->GetName().c_str());
         return;
         }
       // if CXX is on and the target contains cxx code then add the cxx flags
@@ -1752,12 +1738,12 @@ void cmLocalVisualStudio6Generator
       flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
       flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
 
-      this->AddCompileOptions(flags, gt, linkLanguage, "");
-      this->AddCompileOptions(flagsDebug, gt, linkLanguage, "Debug");
-      this->AddCompileOptions(flagsRelease, gt, linkLanguage, "Release");
-      this->AddCompileOptions(flagsMinSizeRel, gt, linkLanguage,
+      this->AddCompileOptions(flags, target, linkLanguage, "");
+      this->AddCompileOptions(flagsDebug, target, linkLanguage, "Debug");
+      this->AddCompileOptions(flagsRelease, target, linkLanguage, "Release");
+      this->AddCompileOptions(flagsMinSizeRel, target, linkLanguage,
                               "MinSizeRel");
-      this->AddCompileOptions(flagsRelWithDebInfo, gt, linkLanguage,
+      this->AddCompileOptions(flagsRelWithDebInfo, target, linkLanguage,
                               "RelWithDebInfo");
 
       // if _UNICODE and _SBCS are not found, then add -D_MBCS
@@ -1777,14 +1763,14 @@ void cmLocalVisualStudio6Generator
       std::set<std::string> minsizeDefinesSet;
       std::set<std::string> debugrelDefinesSet;
 
-      this->AddCompileDefinitions(definesSet, gt, "", linkLanguage);
-      this->AddCompileDefinitions(debugDefinesSet, gt,
+      this->AddCompileDefinitions(definesSet, target, "", linkLanguage);
+      this->AddCompileDefinitions(debugDefinesSet, target,
                                   "DEBUG", linkLanguage);
-      this->AddCompileDefinitions(releaseDefinesSet, gt,
+      this->AddCompileDefinitions(releaseDefinesSet, target,
                                   "RELEASE", linkLanguage);
-      this->AddCompileDefinitions(minsizeDefinesSet, gt,
+      this->AddCompileDefinitions(minsizeDefinesSet, target,
                                   "MINSIZEREL", linkLanguage);
-      this->AddCompileDefinitions(debugrelDefinesSet, gt,
+      this->AddCompileDefinitions(debugrelDefinesSet, target,
                                   "RELWITHDEBINFO", linkLanguage);
 
       std::string defines = " ";
@@ -1852,15 +1838,13 @@ void cmLocalVisualStudio6Generator::WriteDSPFooter(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio6Generator
-::ComputeLinkOptions(cmTarget& target,
+::ComputeLinkOptions(cmGeneratorTarget *target,
                      const std::string& configName,
                      const std::string extraOptions,
                      std::string& options)
 {
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   // Compute the link information for this configuration.
-  cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+  cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
   if(!pcli)
     {
     return;
@@ -1919,15 +1903,13 @@ void cmLocalVisualStudio6Generator
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio6Generator
-::OutputObjects(cmTarget& target, const char* tool,
+::OutputObjects(cmGeneratorTarget* target, const char* tool,
                 std::string& options)
 {
   // VS 6 does not support per-config source locations so we
   // list object library content on the link line instead.
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   std::vector<std::string> objs;
-  gt->UseObjectLibraries(objs, "");
+  target->UseObjectLibraries(objs, "");
   for(std::vector<std::string>::const_iterator
         oi = objs.begin(); oi != objs.end(); ++oi)
     {
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index b3b61bb..6375361 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -14,7 +14,6 @@
 
 #include "cmLocalVisualStudioGenerator.h"
 
-class cmTarget;
 class cmSourceFile;
 class cmSourceGroup;
 class cmCustomCommand;
@@ -47,7 +46,7 @@ public:
   /**
    * Specify the type of the build: static, dll, or executable.
    */
-  void SetBuildType(BuildType, const std::string& libName, cmTarget&);
+  void SetBuildType(BuildType, const std::string& libName, cmGeneratorTarget*);
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
@@ -56,41 +55,41 @@ private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
 
-  void CreateSingleDSP(const std::string& lname, cmTarget &tgt);
+  void CreateSingleDSP(const std::string& lname, cmGeneratorTarget* tgt);
   void WriteDSPFile(std::ostream& fout, const std::string& libName,
-                    cmTarget &tgt);
+                    cmGeneratorTarget* tgt);
   void WriteDSPBeginGroup(std::ostream& fout,
                           const char* group,
                           const char* filter);
   void WriteDSPEndGroup(std::ostream& fout);
 
   void WriteDSPHeader(std::ostream& fout, const std::string& libName,
-                      cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
+                      cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
 
   void WriteDSPFooter(std::ostream& fout);
-  void AddDSPBuildRule(cmTarget& tgt);
+  void AddDSPBuildRule(cmGeneratorTarget* tgt);
   void WriteCustomRule(std::ostream& fout,
                        const char* source,
                        const cmCustomCommand& command,
                        const char* flags);
-  void AddUtilityCommandHack(cmTarget& target, int count,
+  void AddUtilityCommandHack(cmGeneratorTarget* target, int count,
                              std::vector<std::string>& depends,
                              const cmCustomCommand& origCommand);
-  void WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+  void WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
                   std::ostream &fout, const std::string& libName);
   class EventWriter;
   friend class EventWriter;
   cmsys::auto_ptr<cmCustomCommand>
-  MaybeCreateOutputDir(cmTarget& target, const std::string& config);
-  std::string CreateTargetRules(cmTarget &target,
+  MaybeCreateOutputDir(cmGeneratorTarget *target, const std::string& config);
+  std::string CreateTargetRules(cmGeneratorTarget* target,
                                 const std::string& configName,
                                 const std::string& libName);
-  void ComputeLinkOptions(cmTarget& target, const std::string& configName,
+  void ComputeLinkOptions(cmGeneratorTarget* target, const std::string& configName,
                           const std::string extraOptions,
                           std::string& options);
-  void OutputObjects(cmTarget& target, const char* tool,
+  void OutputObjects(cmGeneratorTarget* target, const char* tool,
                      std::string& options);
-  std::string GetTargetIncludeOptions(cmTarget &target,
+  std::string GetTargetIncludeOptions(cmGeneratorTarget* target,
                                       const std::string& config);
   std::vector<std::string> Configurations;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |   11 +-
 Source/cmGlobalVisualStudio10Generator.h   |    4 +-
 Source/cmGlobalVisualStudio6Generator.cxx  |   19 +-
 Source/cmGlobalVisualStudio6Generator.h    |    6 +-
 Source/cmGlobalVisualStudio71Generator.cxx |   12 +-
 Source/cmGlobalVisualStudio71Generator.h   |    4 +-
 Source/cmGlobalVisualStudio7Generator.cxx  |   38 ++--
 Source/cmGlobalVisualStudio7Generator.h    |    8 +-
 Source/cmGlobalVisualStudio8Generator.cxx  |   14 +-
 Source/cmGlobalVisualStudio8Generator.h    |    5 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |   82 ++++----
 Source/cmGlobalVisualStudioGenerator.h     |   29 +--
 Source/cmLocalVisualStudio10Generator.cxx  |    6 +-
 Source/cmLocalVisualStudio6Generator.cxx   |  298 +++++++++++++---------------
 Source/cmLocalVisualStudio6Generator.h     |   27 ++-
 Source/cmLocalVisualStudio7Generator.cxx   |  203 +++++++++----------
 Source/cmLocalVisualStudio7Generator.h     |   28 +--
 Source/cmLocalVisualStudioGenerator.cxx    |   14 +-
 Source/cmLocalVisualStudioGenerator.h      |    4 +-
 Source/cmVisualStudio10TargetGenerator.cxx |   46 ++---
 Source/cmVisualStudio10TargetGenerator.h   |    4 +-
 21 files changed, 410 insertions(+), 452 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct 22 12:43:31 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu, 22 Oct 2015 12:43:31 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-892-g2eb7d97
Message-ID: <20151022164331.12641C004E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2eb7d97faf19dd8e545aac544fba318a86383e36 (commit)
       via  a8afd07610a92140e7f47af1672cec2441d929a4 (commit)
      from  ade9860f531113e13ce2c5acb2cbc38797ef3556 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2eb7d97faf19dd8e545aac544fba318a86383e36
commit 2eb7d97faf19dd8e545aac544fba318a86383e36
Merge: ade9860 a8afd07
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 12:43:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 12:43:30 2015 -0400

    Merge topic 'use-generator-target' into next
    
    a8afd076 Fix whitespace.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8afd07610a92140e7f47af1672cec2441d929a4
commit a8afd07610a92140e7f47af1672cec2441d929a4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:43:04 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:43:04 2015 +0200

    Fix whitespace.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 0d579bf..e568704 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -594,7 +594,8 @@ void cmGlobalVisualStudio10Generator::PathTooLong(
         cmGeneratorTarget *target, cmSourceFile const* sf,
         std::string const& sfRel)
 {
-  size_t len = (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
+  size_t len =
+      (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
                 1 + sfRel.length());
   if(len > this->LongestSource.Length)
     {
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 6b98ab6..48c07a8 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -235,12 +235,13 @@ void cmGlobalVisualStudio6Generator
       std::string project = target->GetName();
       std::string location = expath;
       this->WriteExternalProject(fout, project.c_str(),
-                                 location.c_str(), target->Target->GetUtilities());
+          location.c_str(), target->Target->GetUtilities());
       }
     else
       {
       std::string dspname = GetVS6TargetName(target->GetName());
-      std::string dir = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
+      std::string dir =
+          target->GetLocalGenerator()->GetCurrentBinaryDirectory();
       dir = root->Convert(dir.c_str(), cmLocalGenerator::START_OUTPUT);
       this->WriteProject(fout, dspname.c_str(), dir.c_str(), target);
       }
@@ -287,9 +288,9 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile()
 // Note, that dependencies from executables to
 // the libraries it uses are also done here
 void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
-                                                  const std::string& dspname,
-                                                  const char* dir,
-                                                  const cmGeneratorTarget *target)
+                                            const std::string& dspname,
+                                            const char* dir,
+                                            const cmGeneratorTarget *target)
 {
   fout << "#########################################################"
     "######################\n\n";
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 3ab6169..b6caf5b 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*) { return false; }
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+  { return false; }
 
   const char* GetIntelProjectVersion();
 
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 606e215..31f6475 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -394,7 +394,8 @@ static bool VSLinkable(cmGeneratorTarget const* t)
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmGeneratorTarget* target)
+void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
+    cmGeneratorTarget* target)
 {
   if(this->VSTargetDepends.find(target) != this->VSTargetDepends.end())
     {
@@ -506,7 +507,8 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudioGenerator::GetUtilityDepend(cmGeneratorTarget const* target)
+cmGlobalVisualStudioGenerator::GetUtilityDepend(
+    cmGeneratorTarget const* target)
 {
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 83602bd..d529e2f 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -127,7 +127,8 @@ protected:
   void ComputeVSTargetDepends(cmGeneratorTarget *);
 
   bool CheckTargetLinks(cmGeneratorTarget& target, const std::string& name);
-  std::string GetUtilityForTarget(cmGeneratorTarget& target, const std::string&);
+  std::string GetUtilityForTarget(cmGeneratorTarget& target,
+                                  const std::string&);
   virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
   std::string GetUtilityDepend(cmGeneratorTarget const* target);
   typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 7fb2775..d5abf68 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -407,7 +407,8 @@ void cmLocalVisualStudio6Generator
     std::string objectNameDir;
     if(target->HasExplicitObjectName(*sf))
       {
-      objectNameDir = cmSystemTools::GetFilenamePath(target->GetObjectName(*sf));
+      objectNameDir =
+          cmSystemTools::GetFilenamePath(target->GetObjectName(*sf));
       }
 
     // Add per-source file flags.
@@ -1050,7 +1051,8 @@ void cmLocalVisualStudio6Generator
       }
     }
   std::vector<std::string>::const_iterator i;
-  const std::vector<std::string>& libdirs = target->Target->GetLinkDirectories();
+  const std::vector<std::string>& libdirs =
+      target->Target->GetLinkDirectories();
   for(i = libdirs.begin(); i != libdirs.end(); ++i)
     {
     std::string path = *i;
@@ -1245,7 +1247,8 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelease += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_MINSIZEREL"))
+  if(const char* targetLinkFlags =
+     target->GetProperty("LINK_FLAGS_MINSIZEREL"))
     {
     extraLinkOptionsMinSizeRel += " ";
     extraLinkOptionsMinSizeRel += targetLinkFlags;
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index b8be3d8..d0c8239 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -50,7 +50,8 @@ public:
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
-  virtual std::string ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
+  virtual std::string ComputeLongestObjectDirectory(
+      cmGeneratorTarget const*) const;
 private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
@@ -84,7 +85,8 @@ private:
   std::string CreateTargetRules(cmGeneratorTarget* target,
                                 const std::string& configName,
                                 const std::string& libName);
-  void ComputeLinkOptions(cmGeneratorTarget* target, const std::string& configName,
+  void ComputeLinkOptions(cmGeneratorTarget* target,
+                          const std::string& configName,
                           const std::string extraOptions,
                           std::string& options);
   void OutputObjects(cmGeneratorTarget* target, const char* tool,
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 9444ccf..139d7c3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -34,7 +34,8 @@ public:
     LocalGenerator(e) {}
   typedef cmComputeLinkInformation::ItemVector ItemVector;
   void OutputLibraries(std::ostream& fout, ItemVector const& libs);
-  void OutputObjects(std::ostream& fout, cmGeneratorTarget* t, const char* isep = 0);
+  void OutputObjects(std::ostream& fout, cmGeneratorTarget* t,
+                     const char* isep = 0);
 private:
   cmLocalVisualStudio7Generator* LocalGenerator;
 };
@@ -322,7 +323,9 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
     }
 }
 
-void cmLocalVisualStudio7Generator::WriteConfigurations(std::ostream& fout, std::vector<std::string> const& configs,
+void cmLocalVisualStudio7Generator::WriteConfigurations(
+    std::ostream& fout,
+    std::vector<std::string> const& configs,
   const std::string& libName, cmGeneratorTarget *target
   )
 {
@@ -2045,7 +2048,8 @@ void cmLocalVisualStudio7Generator
     event.Write(target->Target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, this->FortranProject));
+    this->MaybeCreateImplibDir(target,
+                               configName, this->FortranProject));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -2209,8 +2213,9 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
 }
 
 
-void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream& fout,
-                                                      cmGeneratorTarget *target)
+void cmLocalVisualStudio7Generator::WriteVCProjFooter(
+    std::ostream& fout,
+    cmGeneratorTarget *target)
 {
   fout << "\t<Globals>\n";
 
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 0af65d1..b282098 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -56,7 +56,8 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   cmSourceFile* CreateVCProjBuildRule();
   void WriteStampFiles();
-  virtual std::string ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
+  virtual std::string ComputeLongestObjectDirectory(
+      cmGeneratorTarget const*) const;
 
   virtual void ReadAndStoreExternalGUID(const std::string& name,
                                         const char* path);
@@ -72,7 +73,8 @@ private:
   void FixGlobalTargets();
   void WriteProjectFiles();
   void WriteVCProjHeader(std::ostream& fout, const std::string& libName,
-                         cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
+                         cmGeneratorTarget* tgt,
+                         std::vector<cmSourceGroup> &sgs);
   void WriteVCProjFooter(std::ostream& fout, cmGeneratorTarget* target);
   void WriteVCProjFile(std::ostream& fout, const std::string& libName,
                        cmGeneratorTarget* tgt);
@@ -86,14 +88,16 @@ private:
   std::string ConvertToXMLOutputPath(const char* path);
   std::string ConvertToXMLOutputPathSingle(const char* path);
   void OutputTargetRules(std::ostream& fout, const std::string& configName,
-                         cmGeneratorTarget* target, const std::string& libName);
+                         cmGeneratorTarget* target,
+                         const std::string& libName);
   void OutputBuildTool(std::ostream& fout, const std::string& configName,
                        cmGeneratorTarget* t, const Options& targetOptions);
   void OutputLibraryDirectories(std::ostream& fout,
                                 std::vector<std::string> const& dirs);
   void WriteProjectSCC(std::ostream& fout, cmGeneratorTarget *target);
   void WriteProjectStart(std::ostream& fout, const std::string& libName,
-                         cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
+                         cmGeneratorTarget* tgt,
+                         std::vector<cmSourceGroup> &sgs);
   void WriteProjectStartFortran(std::ostream& fout, const std::string& libName,
                                 cmGeneratorTarget* tgt);
   void WriteVCProjBeginGroup(std::ostream& fout,
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index ab2b5cc..21071e6 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -44,7 +44,8 @@ public:
 
   cmGlobalVisualStudioGenerator::VSVersion GetVersion() const;
 
-  virtual std::string ComputeLongestObjectDirectory(cmGeneratorTarget const*) const = 0;
+  virtual std::string ComputeLongestObjectDirectory(
+      cmGeneratorTarget const*) const = 0;
 
   virtual void AddCMakeListsRules() = 0;
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 06ae5fd..9c9f5ab 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -273,7 +273,8 @@ void cmVisualStudio10TargetGenerator::Generate()
     return;
     }
   // Tell the global generator the name of the project file
-  this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
+  this->GeneratorTarget->Target
+      ->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
   this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
   if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
@@ -730,7 +731,8 @@ void cmVisualStudio10TargetGenerator
   cmGlobalVisualStudio10Generator* gg =
     static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
   const char* mfcFlag =
-    this->GeneratorTarget->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
+    this->GeneratorTarget->
+      Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
   std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
 
   std::string useOfMfcValue = "false";
@@ -1935,7 +1937,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
                                           linkLanguage, configName.c_str());
 
   // Get preprocessor definitions for this directory.
-  std::string defineFlags = this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
+  std::string defineFlags =
+      this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
   if(this->MSTools)
     {
     clOptions.FixExceptionHandlingDefault();
@@ -2820,12 +2823,12 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (!addedPrelink)
     {
     this->WriteEvent("PreLinkEvent",
-                     this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
+        this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
     }
   this->WriteEvent("PreBuildEvent",
-                   this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
+        this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
   this->WriteEvent("PostBuildEvent",
-                   this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
+        this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
 }
 
 void cmVisualStudio10TargetGenerator::WriteEvent(

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |    3 ++-
 Source/cmGlobalVisualStudio6Generator.cxx  |   11 ++++++-----
 Source/cmGlobalVisualStudio7Generator.h    |    3 ++-
 Source/cmGlobalVisualStudioGenerator.cxx   |    6 ++++--
 Source/cmGlobalVisualStudioGenerator.h     |    3 ++-
 Source/cmLocalVisualStudio6Generator.cxx   |    9 ++++++---
 Source/cmLocalVisualStudio6Generator.h     |    6 ++++--
 Source/cmLocalVisualStudio7Generator.cxx   |   15 ++++++++++-----
 Source/cmLocalVisualStudio7Generator.h     |   12 ++++++++----
 Source/cmLocalVisualStudioGenerator.h      |    3 ++-
 Source/cmVisualStudio10TargetGenerator.cxx |   15 +++++++++------
 11 files changed, 55 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct 22 12:43:52 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu, 22 Oct 2015 12:43:52 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-897-g29164ea
Message-ID: <20151022164352.25142C008B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  29164eaa8289efb4891dfc8c46f75d87c5a481d7 (commit)
       via  7a846d46997341f52591cdaa0e500d2ae328eb06 (commit)
       via  979b1f5bdba2d1d3f27cf9c93013f59094519944 (commit)
       via  154405face0b7e8ca7142fc7d2db07ec64f10a73 (commit)
       via  3e340be968ce920e7d21156453acad7810b8d51e (commit)
      from  2eb7d97faf19dd8e545aac544fba318a86383e36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29164eaa8289efb4891dfc8c46f75d87c5a481d7
commit 29164eaa8289efb4891dfc8c46f75d87c5a481d7
Merge: 2eb7d97 7a846d4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 12:43:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 12:43:50 2015 -0400

    Merge topic 'use-generator-target' into next
    
    7a846d46 VS: Port interface to cmGeneratorTarget
    979b1f5b VS7: Port to cmGeneratorTarget
    154405fa VS10: Port to cmGeneratorTarget.
    3e340be9 VS6: Port to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a846d46997341f52591cdaa0e500d2ae328eb06
commit 7a846d46997341f52591cdaa0e500d2ae328eb06
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:42:24 2015 +0200

    VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 9e411c9..48c07a8 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -299,7 +299,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -310,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -383,12 +383,13 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(
+    const cmGeneratorTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
   pname = GetVS6TargetName(pname.c_str());
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index edf637f..22ad8a9 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -97,7 +97,7 @@ private:
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
   void WriteDSWFooter(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(cmGeneratorTarget const* target);
   std::string MSDevCommand;
   bool MSDevCommandInitialized;
   std::string const& GetMSDevCommand();
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 9bb37ce..8227b82 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -152,7 +152,7 @@ void
 cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
                                               const std::string& dspname,
                                               const char* dir,
-                                              cmTarget const& t)
+                                              cmGeneratorTarget const* t)
 {
   // check to see if this is a fortran build
   const char* ext = ".vcproj";
@@ -163,7 +163,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
     }
-  const char* targetExt = t.GetProperty("GENERATOR_FILE_NAME_EXT");
+  const char* targetExt = t->GetProperty("GENERATOR_FILE_NAME_EXT");
   if(targetExt)
     {
     ext = targetExt;
@@ -180,7 +180,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
 
   fout <<"EndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&t);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -204,9 +204,9 @@ void
 cmGlobalVisualStudio71Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string&,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -215,7 +215,7 @@ cmGlobalVisualStudio71Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index 7f88e34..5035fda 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -59,10 +59,10 @@ protected:
     std::ostream& fout, std::vector<std::string> const& configs);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            cmTarget const& t);
+                            const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const& t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 1909f21..89b21ed 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -441,7 +441,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -459,7 +459,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
                                  project.c_str(),
                                  location.c_str(),
                                  target->GetProperty("VS_PROJECT_TYPE"),
-                                 target->GetUtilities());
+                                 target->Target->GetUtilities());
       written = true;
       }
     else
@@ -468,9 +468,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmLocalGenerator* lg =
-            root->GetGlobalGenerator()->GetGeneratorTarget(target)
-            ->GetLocalGenerator();
+        cmLocalGenerator* lg = target->GetLocalGenerator();
         std::string dir = lg->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
@@ -479,7 +477,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
           dir = ""; // msbuild cannot handle ".\" prefix
           }
         this->WriteProject(fout, vcprojName, dir.c_str(),
-                           *target);
+                           target);
         written = true;
         }
       }
@@ -535,19 +533,19 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmMakefile* mf = target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     const char *vcprojName =
       target->GetProperty("GENERATOR_FILE_NAME");
     if (vcprojName)
       {
-      std::string dir = mf->GetCurrentSourceDirectory();
+      std::string dir = lg->GetCurrentSourceDirectory();
       this->WriteProjectDepends(fout, vcprojName,
-                                dir.c_str(), *target);
+                                dir.c_str(), target);
       }
     }
 }
@@ -687,7 +685,8 @@ cmGlobalVisualStudio7Generator::ConvertToSolutionPath(const char* path)
 // the libraries it uses are also done here
 void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
                                const std::string& dspname,
-                               const char* dir, cmTarget const& target)
+                               const char* dir,
+                               const cmGeneratorTarget *target)
 {
    // check to see if this is a fortran build
   const char* ext = ".vcproj";
@@ -705,7 +704,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
        << dspname << ext << "\", \"{"
        << this->GetGUID(dspname) << "}\"\nEndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -727,11 +726,11 @@ void
 cmGlobalVisualStudio7Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string& dspname,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
   int depcount = 0;
   std::string dspguid = this->GetGUID(dspname);
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -740,7 +739,7 @@ cmGlobalVisualStudio7Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
@@ -749,7 +748,7 @@ cmGlobalVisualStudio7Generator
     depcount++;
     }
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -889,13 +888,14 @@ void cmGlobalVisualStudio7Generator::WriteSLNHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio7Generator::WriteUtilityDepend(
+        cmGeneratorTarget const* target)
 {
   std::vector<std::string> configs;
-  target->GetMakefile()->GetConfigurations(configs);
+  target->Target->GetMakefile()->GetConfigurations(configs);
   std::string pname = target->GetName();
   pname += "_UTILITY";
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".vcproj";
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 4ef0990..b6caf5b 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+  { return false; }
 
   const char* GetIntelProjectVersion();
 
@@ -123,10 +124,10 @@ protected:
                             std::vector<cmLocalGenerator*>& generators);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            cmTarget const& t);
+                            cmGeneratorTarget const* t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const&t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
@@ -136,7 +137,7 @@ protected:
                                       cmLocalGenerator* root);
   virtual void WriteSLNFooter(std::ostream& fout);
   virtual void WriteSLNHeader(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(cmGeneratorTarget const* target);
 
   virtual void WriteTargetsToSolution(
     std::ostream& fout,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index a22315c..00ca21a 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -441,9 +441,9 @@ bool cmGlobalVisualStudio8Generator::ComputeTargetDepends()
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Generator::WriteProjectDepends(
-  std::ostream& fout, const std::string&, const char*, cmTarget const& t)
+        std::ostream& fout, const std::string&, const char*,
+        const cmGeneratorTarget *gt)
 {
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&t);
   TargetDependSet const& unordered = this->GetTargetDirectDepends(gt);
   OrderedTargetDependSet depends(unordered, std::string());
   for(OrderedTargetDependSet::const_iterator i = depends.begin();
@@ -460,14 +460,16 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
 
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
-  cmTarget& target)
+        cmGeneratorTarget *target)
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target.GetUtilities().begin();
-      ui != target.GetUtilities().end(); ++ui)
+        target->Target->GetUtilities().begin();
+      ui != target->Target->GetUtilities().end(); ++ui)
     {
-    if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
+      cmGeneratorTarget* depTarget = 0;
+//    if(cmGeneratorTarget* depTarget =
+  //          this->FindGeneratorTarget(ui->c_str()))
       {
       if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index 60c63d1..54dc545 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget& target);
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget* target);
 
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const {
@@ -91,7 +91,8 @@ protected:
   virtual bool ComputeTargetDepends();
   virtual void WriteProjectDepends(std::ostream& fout,
                                    const std::string& name,
-                                   const char* path, cmTarget const& t);
+                                   const char* path,
+                                   cmGeneratorTarget const* gt);
 
   std::string Name;
   std::string WindowsCEVersion;
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 4d431f6..31f6475 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -303,19 +303,19 @@ std::string cmGlobalVisualStudioGenerator::GetUserMacrosRegKeyBase()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
+void cmGlobalVisualStudioGenerator::FillLinkClosure(
+        cmGeneratorTarget const* target,
                                                     TargetSet& linked)
 {
   if(linked.insert(target).second)
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FillLinkClosure((*di)->Target, linked);
+        this->FillLinkClosure(*di, linked);
         }
       }
     }
@@ -323,7 +323,8 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
 
 //----------------------------------------------------------------------------
 cmGlobalVisualStudioGenerator::TargetSet const&
-cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
+cmGlobalVisualStudioGenerator::GetTargetLinkClosure(
+        cmGeneratorTarget *target)
 {
   TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
   if(i == this->TargetLinkClosure.end())
@@ -337,7 +338,8 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudioGenerator::FollowLinkDepends(
-  cmTarget const* target, std::set<cmTarget const*>& linked)
+        const cmGeneratorTarget *target,
+        std::set<const cmGeneratorTarget *> &linked)
 {
   if(target->GetType() == cmState::INTERFACE_LIBRARY)
     {
@@ -348,14 +350,13 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
     {
     // Static library targets do not list their link dependencies so
     // we must follow them transitively now.
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FollowLinkDepends((*di)->Target, linked);
+        this->FollowLinkDepends(*di, linked);
         }
       }
     }
@@ -379,7 +380,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
       for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(*(*ti)->Target);
+        this->ComputeVSTargetDepends(*ti);
         }
       }
     }
@@ -393,13 +394,14 @@ static bool VSLinkable(cmGeneratorTarget const* t)
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
+void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
+    cmGeneratorTarget* target)
 {
-  if(this->VSTargetDepends.find(&target) != this->VSTargetDepends.end())
+  if(this->VSTargetDepends.find(target) != this->VSTargetDepends.end())
     {
     return;
     }
-  VSDependSet& vsTargetDepend = this->VSTargetDepends[&target];
+  VSDependSet& vsTargetDepend = this->VSTargetDepends[target];
   // VS <= 7.1 has two behaviors that affect solution dependencies.
   //
   // (1) Solution-level dependencies between a linkable target and a
@@ -419,19 +421,18 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // leaving them out for the static library itself but following them
   // transitively for other targets.
 
-  bool allowLinkable = (target.GetType() != cmState::STATIC_LIBRARY &&
-                        target.GetType() != cmState::SHARED_LIBRARY &&
-                        target.GetType() != cmState::MODULE_LIBRARY &&
-                        target.GetType() != cmState::EXECUTABLE);
+  bool allowLinkable = (target->GetType() != cmState::STATIC_LIBRARY &&
+                        target->GetType() != cmState::SHARED_LIBRARY &&
+                        target->GetType() != cmState::MODULE_LIBRARY &&
+                        target->GetType() != cmState::EXECUTABLE);
 
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-  TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+  TargetDependSet const& depends = this->GetTargetDirectDepends(target);
 
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
-  std::set<cmTarget const*> linkDepends;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  std::set<cmGeneratorTarget const*> linkDepends;
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -439,55 +440,54 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
       cmTargetDepend dep = *di;
       if(dep.IsLink())
         {
-        this->FollowLinkDepends(dep->Target, linkDepends);
+        this->FollowLinkDepends(*di, linkDepends);
         }
       }
     }
 
   // Collect explicit util dependencies (add_dependencies).
-  std::set<cmTarget const*> utilDepends;
+  std::set<cmGeneratorTarget const*> utilDepends;
   for(TargetDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
     cmTargetDepend dep = *di;
     if(dep.IsUtil())
       {
-      this->FollowLinkDepends(dep->Target, utilDepends);
+      this->FollowLinkDepends(*di, utilDepends);
       }
     }
 
   // Collect all targets linked by this target so we can avoid
   // intermediate targets below.
   TargetSet linked;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
-    linked = this->GetTargetLinkClosure(&target);
+    linked = this->GetTargetLinkClosure(target);
     }
 
   // Emit link dependencies.
-  for(std::set<cmTarget const*>::iterator di = linkDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = linkDepends.begin();
       di != linkDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
+    cmGeneratorTarget const* dep = *di;
     vsTargetDepend.insert(dep->GetName());
     }
 
   // Emit util dependencies.  Possibly use intermediate targets.
-  for(std::set<cmTarget const*>::iterator di = utilDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = utilDepends.begin();
       di != utilDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
-    cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
-    if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
+    cmGeneratorTarget const* dgt = *di;
+    if(allowLinkable || !VSLinkable(dgt) || linked.count(dgt))
       {
       // Direct dependency allowed.
-      vsTargetDepend.insert(dep->GetName());
+      vsTargetDepend.insert(dgt->GetName());
       }
     else
       {
       // Direct dependency on linkable target not allowed.
       // Use an intermediate utility target.
-      vsTargetDepend.insert(this->GetUtilityDepend(dep));
+      vsTargetDepend.insert(this->GetUtilityDepend(dgt));
       }
     }
 }
@@ -507,7 +507,8 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudioGenerator::GetUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudioGenerator::GetUtilityDepend(
+    cmGeneratorTarget const* target)
 {
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
@@ -830,21 +831,20 @@ void RegisterVisualStudioMacros(const std::string& macrosFile,
     }
 }
 bool
-cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget const& target)
+cmGlobalVisualStudioGenerator::TargetIsFortranOnly(
+        const cmGeneratorTarget* target)
 {
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-
   // check to see if this is a fortran build
   std::set<std::string> languages;
   {
   // Issue diagnostic if the source files depend on the config.
   std::vector<cmSourceFile*> sources;
-  if (!gt->GetConfigCommonSourceFiles(sources))
+  if (!target->GetConfigCommonSourceFiles(sources))
     {
     return false;
     }
   }
-  gt->GetLanguages(languages, "");
+  target->GetLanguages(languages, "");
   if(languages.size() == 1)
     {
     if(*languages.begin() == "Fortran")
@@ -892,9 +892,7 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
   for (TargetSet::const_iterator it = targets.begin();
        it != targets.end(); ++it)
     {
-    cmGeneratorTarget* gt =
-        (*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
-    this->insert(gt);
+    this->insert(*it);
     }
 }
 
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 41d0b88..d529e2f 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -73,7 +73,7 @@ public:
                              const char* vsSolutionFile = 0);
 
   // return true if target is fortran only
-  bool TargetIsFortranOnly(cmTarget const& t);
+  bool TargetIsFortranOnly(const cmGeneratorTarget *t);
 
   /** Get the top-level registry key for this VS version.  */
   std::string GetRegistryBase();
@@ -88,7 +88,7 @@ public:
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const { return false; }
 
-  class TargetSet: public std::set<cmTarget const*> {};
+  class TargetSet: public std::set<cmGeneratorTarget const*> {};
   class TargetCompare
   {
     std::string First;
@@ -122,15 +122,16 @@ protected:
 
   virtual bool ComputeTargetDepends();
   class VSDependSet: public std::set<std::string> {};
-  class VSDependMap: public std::map<cmTarget const*, VSDependSet> {};
+  class VSDependMap: public std::map<cmGeneratorTarget const*, VSDependSet> {};
   VSDependMap VSTargetDepends;
-  void ComputeVSTargetDepends(cmTarget&);
-
-  bool CheckTargetLinks(cmTarget& target, const std::string& name);
-  std::string GetUtilityForTarget(cmTarget& target, const std::string&);
-  virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
-  std::string GetUtilityDepend(cmTarget const* target);
-  typedef std::map<cmTarget const*, std::string> UtilityDependsMap;
+  void ComputeVSTargetDepends(cmGeneratorTarget *);
+
+  bool CheckTargetLinks(cmGeneratorTarget& target, const std::string& name);
+  std::string GetUtilityForTarget(cmGeneratorTarget& target,
+                                  const std::string&);
+  virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
+  std::string GetUtilityDepend(cmGeneratorTarget const* target);
+  typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
   UtilityDependsMap UtilityDepends;
 
 protected:
@@ -141,13 +142,14 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  void FollowLinkDepends(cmTarget const* target,
-                         std::set<cmTarget const*>& linked);
+  void FollowLinkDepends(cmGeneratorTarget const* target,
+                         std::set<cmGeneratorTarget const*>& linked);
 
-  class TargetSetMap: public std::map<cmTarget*, TargetSet> {};
+  class TargetSetMap: public std::map<cmGeneratorTarget*, TargetSet> {};
   TargetSetMap TargetLinkClosure;
-  void FillLinkClosure(cmTarget const* target, TargetSet& linked);
-  TargetSet const& GetTargetLinkClosure(cmTarget* target);
+  void FillLinkClosure(const cmGeneratorTarget *target,
+                       TargetSet& linked);
+  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget* target);
 };
 
 class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 0040331..d59fdc6 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -83,7 +83,7 @@ void cmLocalVisualStudio10Generator::Generate()
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*(*l)->Target))
+       ->TargetIsFortranOnly(*l))
       {
       this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index a7f0616..d5abf68 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -841,7 +841,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
   event.Write(target->Target->GetPreBuildCommands());
   event.Write(target->Target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(*target->Target, configName, false));
+    this->MaybeCreateImplibDir(target, configName, false));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -1935,7 +1935,7 @@ cmLocalVisualStudio6Generator
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio6Generator
-::ComputeLongestObjectDirectory(cmTarget&) const
+::ComputeLongestObjectDirectory(cmGeneratorTarget const*) const
 {
   // Compute the maximum length configuration name.
   std::string config_max;
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index 4772d54..d0c8239 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -50,7 +50,8 @@ public:
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
+  virtual std::string ComputeLongestObjectDirectory(
+      cmGeneratorTarget const*) const;
 private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a3ca67e..139d7c3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -229,7 +229,7 @@ void cmLocalVisualStudio7Generator
 {
   cmGlobalVisualStudioGenerator* gg
       = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-  this->FortranProject = gg->TargetIsFortranOnly(*target->Target);
+  this->FortranProject = gg->TargetIsFortranOnly(target);
   this->WindowsCEProject = gg->TargetsWindowsCE();
 
   // Intel Fortran for VS10 uses VS9 format ".vfproj" files.
@@ -1186,7 +1186,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1285,7 +1285,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1689,10 +1689,10 @@ cmLocalVisualStudio7GeneratorFCInfo
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio7Generator
-::ComputeLongestObjectDirectory(cmTarget& target) const
+::ComputeLongestObjectDirectory(const cmGeneratorTarget *target) const
 {
   std::vector<std::string> configs;
-  target.GetMakefile()->GetConfigurations(configs);
+  target->Target->GetMakefile()->GetConfigurations(configs);
 
   // Compute the maximum length configuration name.
   std::string config_max;
@@ -1711,9 +1711,7 @@ cmLocalVisualStudio7Generator
   std::string dir_max;
   dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-  dir_max += this->GetTargetDirectory(gt);
+  dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
@@ -2050,7 +2048,7 @@ void cmLocalVisualStudio7Generator
     event.Write(target->Target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(*target->Target,
+    this->MaybeCreateImplibDir(target,
                                configName, this->FortranProject));
   if(pcc.get())
     {
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index deb8d8f..b282098 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -56,7 +56,8 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   cmSourceFile* CreateVCProjBuildRule();
   void WriteStampFiles();
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
+  virtual std::string ComputeLongestObjectDirectory(
+      cmGeneratorTarget const*) const;
 
   virtual void ReadAndStoreExternalGUID(const std::string& name,
                                         const char* path);
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 2f44fb7..f0be658 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -43,7 +43,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const* gt)
 {
-  std::string dir_max = this->ComputeLongestObjectDirectory(*gt->Target);
+  std::string dir_max = this->ComputeLongestObjectDirectory(gt);
 
   // Count the number of object files with each name.  Note that
   // windows file names are not case sensitive.
@@ -80,7 +80,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCustomCommand>
-cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
+cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmGeneratorTarget *target,
                                                    const std::string& config,
                                                    bool isFortran)
 {
@@ -89,13 +89,11 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
   // If an executable exports symbols then VS wants to create an
   // import library but forgets to create the output directory.
   // The Intel Fortran plugin always forgets to the directory.
-  if(target.GetType() != cmState::EXECUTABLE &&
-     !(isFortran && target.GetType() == cmState::SHARED_LIBRARY))
+  if(target->GetType() != cmState::EXECUTABLE &&
+     !(isFortran && target->GetType() == cmState::SHARED_LIBRARY))
     { return pcc; }
-  cmGeneratorTarget* gt =
-      this->GetGlobalGenerator()->GetGeneratorTarget(&target);
-  std::string outDir = gt->GetDirectory(config, false);
-  std::string impDir = gt->GetDirectory(config, true);
+  std::string outDir = target->GetDirectory(config, false);
+  std::string impDir = target->GetDirectory(config, true);
   if(impDir == outDir) { return pcc; }
 
   // Add a pre-build event to create the directory.
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 071bfb3..21071e6 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -44,7 +44,8 @@ public:
 
   cmGlobalVisualStudioGenerator::VSVersion GetVersion() const;
 
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const = 0;
+  virtual std::string ComputeLongestObjectDirectory(
+      cmGeneratorTarget const*) const = 0;
 
   virtual void AddCMakeListsRules() = 0;
 
@@ -58,7 +59,7 @@ protected:
 
   /** Construct a custom command to make exe import lib dir.  */
   cmsys::auto_ptr<cmCustomCommand>
-  MaybeCreateImplibDir(cmTarget& target, const std::string& config,
+  MaybeCreateImplibDir(cmGeneratorTarget* target, const std::string& config,
                        bool isFortran);
 };
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 3f8e627..9c9f5ab 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2677,7 +2677,7 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 
   this->WriteString("</Link>\n", 2);
   if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
-              *this->GeneratorTarget->Target))
+              this->GeneratorTarget))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(
@@ -2886,7 +2886,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     // skip fortran targets as they can not be processed by MSBuild
     // the only reference will be in the .sln file
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*dt->Target))
+       ->TargetIsFortranOnly(dt))
       {
       continue;
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=979b1f5bdba2d1d3f27cf9c93013f59094519944
commit 979b1f5bdba2d1d3f27cf9c93013f59094519944
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:39:40 2015 +0200

    VS7: Port to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index e9aee8a..0040331 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -85,7 +85,7 @@ void cmLocalVisualStudio10Generator::Generate()
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
        ->TargetIsFortranOnly(*(*l)->Target))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 4895698..a3ca67e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -34,7 +34,8 @@ public:
     LocalGenerator(e) {}
   typedef cmComputeLinkInformation::ItemVector ItemVector;
   void OutputLibraries(std::ostream& fout, ItemVector const& libs);
-  void OutputObjects(std::ostream& fout, cmTarget* t, const char* isep = 0);
+  void OutputObjects(std::ostream& fout, cmGeneratorTarget* t,
+                     const char* isep = 0);
 private:
   cmLocalVisualStudio7Generator* LocalGenerator;
 };
@@ -129,8 +130,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = *(*l)->Target;
-    if(tgt.GetType() == cmState::GLOBAL_TARGET)
+    if((*l)->GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
       cmCustomCommandLine force_command;
@@ -142,7 +142,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
-      force += tgt.GetName();
+      force += (*l)->GetName();
       force += "_force";
       if(cmSourceFile* file =
          this->Makefile->AddCustomCommandToOutput(
@@ -187,7 +187,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     // so don't build a projectfile for it
     if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
     }
 }
@@ -225,11 +225,11 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio7Generator
-::CreateSingleVCProj(const std::string& lname, cmTarget &target)
+::CreateSingleVCProj(const std::string& lname, cmGeneratorTarget *target)
 {
   cmGlobalVisualStudioGenerator* gg
       = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-  this->FortranProject = gg->TargetIsFortranOnly(target);
+  this->FortranProject = gg->TargetIsFortranOnly(*target->Target);
   this->WindowsCEProject = gg->TargetsWindowsCE();
 
   // Intel Fortran for VS10 uses VS9 format ".vfproj" files.
@@ -241,7 +241,7 @@ void cmLocalVisualStudio7Generator
     }
 
   // add to the list of projects
-  target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
+  target->Target->SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
   fname = this->GetCurrentBinaryDirectory();
@@ -324,8 +324,9 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 }
 
 void cmLocalVisualStudio7Generator::WriteConfigurations(
-  std::ostream& fout, std::vector<std::string> const& configs,
-  const std::string& libName, cmTarget &target
+    std::ostream& fout,
+    std::vector<std::string> const& configs,
+  const std::string& libName, cmGeneratorTarget *target
   )
 {
   fout << "\t<Configurations>\n";
@@ -643,7 +644,7 @@ private:
 void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
                                                 const std::string& configName,
                                                 const std::string& libName,
-                                                cmTarget &target)
+                                                cmGeneratorTarget *target)
 {
   const char* mfcFlag = this->Makefile->GetDefinition("CMAKE_MFC_FLAG");
   if(!mfcFlag)
@@ -664,10 +665,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   const char* projectType = 0;
   bool targetBuilds = true;
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
       targetBuilds = false; // no manifest tool for object library
@@ -699,12 +697,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     {
     const std::string& linkLanguage = (this->FortranProject?
                                        std::string("Fortran"):
-                                gt->GetLinkerLanguage(configName));
+                                target->GetLinkerLanguage(configName));
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
         ("CMake can not determine linker language for target: ",
-         target.GetName().c_str());
+         target->GetName().c_str());
       return;
       }
     if(linkLanguage == "C" || linkLanguage == "CXX"
@@ -730,12 +728,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       }
 
     // Add the target-specific flags.
-    this->AddCompileOptions(flags, gt, linkLanguage, configName);
+    this->AddCompileOptions(flags, target, linkLanguage, configName);
     }
 
   if(this->FortranProject)
     {
-    switch(this->GetFortranFormat(target.GetProperty("Fortran_FORMAT")))
+    switch(this->GetFortranFormat(target->GetProperty("Fortran_FORMAT")))
       {
       case FortranFormatFixed: flags += " -fixed"; break;
       case FortranFormatFree: flags += " -free"; break;
@@ -762,7 +760,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.Parse(defineFlags.c_str());
   targetOptions.ParseFinish();
   std::vector<std::string> targetDefines;
-  gt->GetCompileDefinitions(targetDefines, configName, "CXX");
+  target->GetCompileDefinitions(targetDefines, configName, "CXX");
   targetOptions.AddDefines(targetDefines);
   targetOptions.SetVerboseMakefile(
     this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));
@@ -774,22 +772,22 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = gt->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     targetOptions.AddDefine(exportMacro);
     }
 
   // The intermediate directory name consists of a directory for the
   // target and a subdirectory for the configuration name.
-  std::string intermediateDir = this->GetTargetDirectory(gt);
+  std::string intermediateDir = this->GetTargetDirectory(target);
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target.GetType() < cmState::UTILITY)
+  if (target->Target->GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target.GetType() == cmState::OBJECT_LIBRARY?
-      intermediateDir : gt->GetDirectory(configName);
+      target->Target->GetType() == cmState::OBJECT_LIBRARY?
+      intermediateDir : target->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
     }
@@ -804,7 +802,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if (this->FortranProject)
     {
     // Intel Fortran >= 15.0 uses TargetName property.
-    std::string targetNameFull = gt->GetFullName(configName);
+    std::string targetNameFull = target->GetFullName(configName);
     std::string targetName =
       cmSystemTools::GetFilenameWithoutLastExtension(targetNameFull);
     std::string targetExt =
@@ -839,7 +837,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if(this->FortranProject)
     {
     const char* target_mod_dir =
-      target.GetProperty("Fortran_MODULE_DIRECTORY");
+      target->Target->GetProperty("Fortran_MODULE_DIRECTORY");
     std::string modDir;
     if(target_mod_dir)
       {
@@ -858,7 +856,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
   fout << "\t\t\t\tAdditionalIncludeDirectories=\"";
   std::vector<std::string> includes;
-  this->GetIncludeDirectories(includes, gt, "C", configName);
+  this->GetIncludeDirectories(includes, target, "C", configName);
   std::vector<std::string>::iterator i = includes.begin();
   for(;i != includes.end(); ++i)
     {
@@ -879,10 +877,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target.GetType() <= cmState::OBJECT_LIBRARY)
+  if(target->Target->GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
-    std::string pdb = gt->GetCompilePDBPath(configName);
+    std::string pdb = target->GetCompilePDBPath(configName);
     if(!pdb.empty())
       {
       fout <<  "\t\t\t\tProgramDataBaseFileName=\""
@@ -986,7 +984,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       "\t\t\t\tName=\"" << manifestTool << "\"";
 
     std::vector<cmSourceFile const*> manifest_srcs;
-    gt->GetManifests(manifest_srcs, configName);
+    target->GetManifests(manifest_srcs, configName);
     if (!manifest_srcs.empty())
       {
       fout << "\n\t\t\t\tAdditionalManifestFiles=\"";
@@ -1001,7 +999,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
     // Check if we need the FAT32 workaround.
     // Check the filesystem type where the target will be written.
-    if (cmLVS6G_IsFAT(gt->GetDirectory(configName).c_str()))
+    if (cmLVS6G_IsFAT(target->GetDirectory(configName).c_str()))
       {
       // Add a flag telling the manifest tool to use a workaround
       // for FAT32 file systems, which can cause an empty manifest
@@ -1035,28 +1033,28 @@ cmLocalVisualStudio7Generator
 }
 
 void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
-  const std::string& configName, cmTarget &target,
+  const std::string& configName, cmGeneratorTarget* target,
   const Options& targetOptions)
 {
   cmGlobalVisualStudio7Generator* gg =
     static_cast<cmGlobalVisualStudio7Generator*>(this->GlobalGenerator);
   std::string temp;
   std::string extraLinkOptions;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_EXE_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_SHARED_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS")
@@ -1064,7 +1062,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       + GetBuildTypeLinkerFlags("CMAKE_MODULE_LINKER_FLAGS", configName);
     }
 
-  const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags = target->GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1073,7 +1071,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
   std::string configTypeUpper = cmSystemTools::UpperCase(configName);
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += configTypeUpper;
-  targetLinkFlags = target.GetProperty(linkFlagsConfig.c_str());
+  targetLinkFlags = target->GetProperty(linkFlagsConfig.c_str());
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1093,28 +1091,26 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       this->ConvertToOutputFormat(this->ModuleDefinitionFile, SHELL);
     linkOptions.AddFlag("ModuleDefinitionFile", defFile.c_str());
     }
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
 
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (target->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)/exportall.def");
       }
     }
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::UNKNOWN_LIBRARY:
       break;
     case cmState::OBJECT_LIBRARY:
       {
-      std::string libpath = this->GetTargetDirectory(gt);
+      std::string libpath = this->GetTargetDirectory(target);
       libpath += "/";
       libpath += configName;
       libpath += "/";
-      libpath += target.GetName();
+      libpath += target->GetName();
       libpath += ".lib";
       const char* tool =
         this->FortranProject? "VFLibrarianTool":"VCLibrarianTool";
@@ -1126,8 +1122,8 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     case cmState::STATIC_LIBRARY:
     {
-    std::string targetNameFull = gt->GetFullName(configName);
-    std::string libpath = gt->GetDirectory(configName);
+    std::string targetNameFull = target->GetFullName(configName);
+    std::string libpath = target->GetDirectory(configName);
     libpath += "/";
     libpath += targetNameFull;
     const char* tool = "VCLibrarianTool";
@@ -1142,14 +1138,14 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
         || this->FortranProject)
       {
       std::ostringstream libdeps;
-      this->Internal->OutputObjects(libdeps, &target);
+      this->Internal->OutputObjects(libdeps, target);
       if(!libdeps.str().empty())
         {
         fout << "\t\t\t\tAdditionalDependencies=\"" << libdeps.str() << "\"\n";
         }
       }
     std::string libflags;
-    this->GetStaticLibraryFlags(libflags, configTypeUpper, gt);
+    this->GetStaticLibraryFlags(libflags, configTypeUpper, target);
     if(!libflags.empty())
       {
       fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
@@ -1166,11 +1162,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gt->GetLibraryNames(targetName, targetNameSO, targetNameFull,
+    target->GetLibraryNames(targetName, targetNameSO, targetNameFull,
                            targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1190,7 +1186,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(target))
+    if(!gg->NeedLinkLibraryDependencies(*target->Target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1202,22 +1198,22 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, &target, " ");
+      this->Internal->OutputObjects(fout, target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = gt->GetDirectory(configName);
+    temp = target->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, gt);
+    this->WriteTargetVersionAttribute(fout, target);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
-    temp = gt->GetPDBDirectory(configName);
+    temp = target->GetPDBDirectory(configName);
     temp += "/";
     temp += targetNamePDB;
     fout << "\t\t\t\tProgramDatabaseFile=\"" <<
@@ -1245,7 +1241,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal  << "\"\n";
       }
-    temp = gt->GetDirectory(configName, true);
+    temp = target->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1263,11 +1259,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gt->GetExecutableNames(targetName, targetNameFull,
+    target->GetExecutableNames(targetName, targetNameFull,
                               targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1275,7 +1271,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     cmComputeLinkInformation& cli = *pcli;
     std::string linkLanguage = cli.GetLinkLanguage();
 
-    bool isWin32Executable = target.GetPropertyAsBool("WIN32_EXECUTABLE");
+    bool isWin32Executable = target->GetPropertyAsBool("WIN32_EXECUTABLE");
 
     // Compute the variable name to lookup standard libraries for this
     // language.
@@ -1289,7 +1285,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(target))
+    if(!gg->NeedLinkLibraryDependencies(*target->Target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1301,23 +1297,23 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, &target, " ");
+      this->Internal->OutputObjects(fout, target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = gt->GetDirectory(configName);
+    temp = target->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, gt);
+    this->WriteTargetVersionAttribute(fout, target);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
     std::string path = this->ConvertToXMLOutputPathSingle(
-      gt->GetPDBDirectory(configName).c_str());
+      target->GetPDBDirectory(configName).c_str());
     fout << "\t\t\t\tProgramDatabaseFile=\""
          << path << "/" << targetNamePDB
          << "\"\n";
@@ -1364,7 +1360,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal << "\"";
       }
-    temp = gt->GetDirectory(configName, true);
+    temp = target->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1415,13 +1411,11 @@ cmLocalVisualStudio7GeneratorInternals
 //----------------------------------------------------------------------------
 void
 cmLocalVisualStudio7GeneratorInternals
-::OutputObjects(std::ostream& fout, cmTarget* t, const char* isep)
+::OutputObjects(std::ostream& fout, cmGeneratorTarget* gt, const char* isep)
 {
   // VS < 8 does not support per-config source locations so we
   // list object library content on the link line instead.
   cmLocalVisualStudio7Generator* lg = this->LocalGenerator;
-  cmGeneratorTarget* gt =
-    lg->GetGlobalGenerator()->GetGeneratorTarget(t);
   std::vector<std::string> objs;
   gt->UseObjectLibraries(objs, "");
   const char* sep = isep? isep : "";
@@ -1478,7 +1472,7 @@ cmLocalVisualStudio7Generator
 
 void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
                                                     const std::string& libName,
-                                                    cmTarget &target)
+                                                    cmGeneratorTarget* target)
 {
   std::vector<std::string> configs;
   this->Makefile->GetConfigurations(configs);
@@ -1486,13 +1480,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
   // We may be modifying the source groups temporarily, so make a copy.
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // get the classes from the source lists then add them to the groups
   this->ModuleDefinitionFile = "";
   std::vector<cmSourceFile*> classes;
-  if (!gt->GetConfigCommonSourceFiles(classes))
+  if (!target->GetConfigCommonSourceFiles(classes))
     {
     return;
     }
@@ -1535,7 +1526,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
     // VS >= 8 support per-config source locations so we
     // list object library content as external objects.
     std::vector<std::string> objs;
-    gt->UseObjectLibraries(objs, "");
+    target->UseObjectLibraries(objs, "");
     if(!objs.empty())
       {
       // TODO: Separate sub-filter for each object library used?
@@ -1570,7 +1561,7 @@ class cmLocalVisualStudio7GeneratorFCInfo
 {
 public:
   cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmTarget& target,
+                                      cmGeneratorTarget* target,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs);
   std::map<std::string, cmLVS7GFileConfig> FileConfigMap;
@@ -1578,12 +1569,10 @@ public:
 
 cmLocalVisualStudio7GeneratorFCInfo
 ::cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmTarget& target,
+                                      cmGeneratorTarget* gt,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs)
 {
-  cmGeneratorTarget* gt =
-    lg->GetGlobalGenerator()->GetGeneratorTarget(&target);
   std::string objectName;
   if(gt->HasExplicitObjectName(&sf))
     {
@@ -1732,7 +1721,7 @@ cmLocalVisualStudio7Generator
 }
 
 bool cmLocalVisualStudio7Generator
-::WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+::WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
              std::ostream &fout, const std::string& libName,
              std::vector<std::string> const& configs)
 {
@@ -1767,15 +1756,14 @@ bool cmLocalVisualStudio7Generator
     }
 
   // Loop through each source in the source group.
-  std::string objectName;
   for(std::vector<const cmSourceFile *>::const_iterator sf =
         sourceFiles.begin(); sf != sourceFiles.end(); ++sf)
     {
     std::string source = (*sf)->GetFullPath();
     FCInfo fcinfo(this, target, *(*sf), configs);
 
-    if (source != libName || target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET )
+    if (source != libName || target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET )
       {
       fout << "\t\t\t<File\n";
       std::string d = this->ConvertToXMLOutputPathSingle(source.c_str());
@@ -2022,10 +2010,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjEndGroup(std::ostream& fout)
 void cmLocalVisualStudio7Generator
 ::OutputTargetRules(std::ostream& fout,
                     const std::string& configName,
-                    cmTarget &target,
+                    cmGeneratorTarget *target,
                     const std::string& /*libName*/)
 {
-  if (target.GetType() > cmState::GLOBAL_TARGET)
+  if (target->GetType() > cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -2035,36 +2023,35 @@ void cmLocalVisualStudio7Generator
   const char* tool =
     this->FortranProject? "VFPreBuildEventTool":"VCPreBuildEventTool";
   event.Start(tool);
-  event.Write(target.GetPreBuildCommands());
+  event.Write(target->Target->GetPreBuildCommands());
   event.Finish();
 
   // Add pre-link event.
   tool = this->FortranProject? "VFPreLinkEventTool":"VCPreLinkEventTool";
   event.Start(tool);
   bool addedPrelink = false;
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (target->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        target.GetPreLinkCommands();
+        target->Target->GetPreLinkCommands();
       cmGlobalVisualStudioGenerator* gg
         = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-      cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(&target);
       gg->AddSymbolExportCommand(
-        gt, commands, configName);
+        target, commands, configName);
       event.Write(commands);
       }
     }
   if (!addedPrelink)
     {
-    event.Write(target.GetPreLinkCommands());
+    event.Write(target->Target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, this->FortranProject));
+    this->MaybeCreateImplibDir(*target->Target,
+                               configName, this->FortranProject));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -2074,18 +2061,18 @@ void cmLocalVisualStudio7Generator
   // Add post-build event.
   tool = this->FortranProject? "VFPostBuildEventTool":"VCPostBuildEventTool";
   event.Start(tool);
-  event.Write(target.GetPostBuildCommands());
+  event.Write(target->Target->GetPostBuildCommands());
   event.Finish();
 }
 
 void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
-                                                    cmTarget& target)
+                                                    cmGeneratorTarget* target)
 {
   // if we have all the required Source code control tags
   // then add that to the project
-  const char* vsProjectname = target.GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalpath = target.GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectname = target->GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalpath = target->GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider = target->GetProperty("VS_SCC_PROVIDER");
 
   if(vsProvider && vsLocalpath && vsProjectname)
     {
@@ -2093,7 +2080,7 @@ void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
          << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
          << "\tSccProvider=\"" << vsProvider << "\"\n";
 
-    const char* vsAuxPath = target.GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath = target->GetProperty("VS_SCC_AUXPATH");
     if(vsAuxPath)
       {
       fout << "\tSccAuxPath=\"" << vsAuxPath << "\"\n";
@@ -2105,7 +2092,7 @@ void
 cmLocalVisualStudio7Generator
 ::WriteProjectStartFortran(std::ostream& fout,
                            const std::string& libName,
-                           cmTarget & target)
+                           cmGeneratorTarget *target)
 {
 
   cmGlobalVisualStudio7Generator* gg =
@@ -2115,13 +2102,13 @@ cmLocalVisualStudio7Generator
        << "<VisualStudioProject\n"
        << "\tProjectCreator=\"Intel Fortran\"\n"
        << "\tVersion=\"" << gg->GetIntelProjectVersion() << "\"\n";
-  const char* keyword = target.GetProperty("VS_KEYWORD");
+  const char* keyword = target->GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Console Application";
     }
   const char* projectType = 0;
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::STATIC_LIBRARY:
       projectType = "typeStaticLibrary";
@@ -2166,7 +2153,7 @@ cmLocalVisualStudio7Generator
 void
 cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
                                                  const std::string& libName,
-                                                 cmTarget & target,
+                                                 cmGeneratorTarget *target,
                                                  std::vector<cmSourceGroup> &)
 {
   if(this->FortranProject)
@@ -2190,12 +2177,12 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     {
     fout <<  "\tVersion=\"" << (gg->GetVersion()/10) << ".00\"\n";
     }
-  const char* projLabel = target.GetProperty("PROJECT_LABEL");
+  const char* projLabel = target->GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = libName.c_str();
     }
-  const char* keyword = target.GetProperty("VS_KEYWORD");
+  const char* keyword = target->GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Win32Proj";
@@ -2207,7 +2194,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     }
   this->WriteProjectSCC(fout, target);
   if(const char* targetFrameworkVersion =
-     target.GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
+     target->GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     fout << "\tTargetFrameworkVersion=\"" << targetFrameworkVersion << "\"\n";
     }
@@ -2228,12 +2215,13 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
 }
 
 
-void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream& fout,
-                                                      cmTarget &target)
+void cmLocalVisualStudio7Generator::WriteVCProjFooter(
+    std::ostream& fout,
+    cmGeneratorTarget *target)
 {
   fout << "\t<Globals>\n";
 
-  cmPropertyMap const& props = target.GetProperties();
+  cmPropertyMap const& props = target->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     if(i->first.find("VS_GLOBAL_") == 0)
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 16cf004..deb8d8f 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -15,7 +15,6 @@
 #include "cmLocalVisualStudioGenerator.h"
 #include "cmVisualStudioGeneratorOptions.h"
 
-class cmTarget;
 class cmSourceFile;
 class cmCustomCommand;
 class cmSourceGroup;
@@ -63,7 +62,8 @@ public:
                                         const char* path);
   virtual void AddCMakeListsRules();
 protected:
-  void CreateSingleVCProj(const std::string& lname, cmTarget &tgt);
+  void CreateSingleVCProj(const std::string& lname,
+                          cmGeneratorTarget *tgt);
 private:
   typedef cmVisualStudioGeneratorOptions Options;
   typedef cmLocalVisualStudio7GeneratorFCInfo FCInfo;
@@ -72,30 +72,33 @@ private:
   void FixGlobalTargets();
   void WriteProjectFiles();
   void WriteVCProjHeader(std::ostream& fout, const std::string& libName,
-                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
-  void WriteVCProjFooter(std::ostream& fout, cmTarget &target);
+                         cmGeneratorTarget* tgt,
+                         std::vector<cmSourceGroup> &sgs);
+  void WriteVCProjFooter(std::ostream& fout, cmGeneratorTarget* target);
   void WriteVCProjFile(std::ostream& fout, const std::string& libName,
-                       cmTarget &tgt);
+                       cmGeneratorTarget* tgt);
   void WriteConfigurations(std::ostream& fout,
                            std::vector<std::string> const& configs,
-                           const std::string& libName, cmTarget &tgt);
+                           const std::string& libName, cmGeneratorTarget* tgt);
   void WriteConfiguration(std::ostream& fout,
                           const std::string& configName,
-                          const std::string& libName, cmTarget &tgt);
+                          const std::string& libName, cmGeneratorTarget* tgt);
   std::string EscapeForXML(const std::string& s);
   std::string ConvertToXMLOutputPath(const char* path);
   std::string ConvertToXMLOutputPathSingle(const char* path);
   void OutputTargetRules(std::ostream& fout, const std::string& configName,
-                         cmTarget &target, const std::string& libName);
+                         cmGeneratorTarget* target,
+                         const std::string& libName);
   void OutputBuildTool(std::ostream& fout, const std::string& configName,
-                       cmTarget& t, const Options& targetOptions);
+                       cmGeneratorTarget* t, const Options& targetOptions);
   void OutputLibraryDirectories(std::ostream& fout,
                                 std::vector<std::string> const& dirs);
-  void WriteProjectSCC(std::ostream& fout, cmTarget& target);
+  void WriteProjectSCC(std::ostream& fout, cmGeneratorTarget *target);
   void WriteProjectStart(std::ostream& fout, const std::string& libName,
-                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
+                         cmGeneratorTarget* tgt,
+                         std::vector<cmSourceGroup> &sgs);
   void WriteProjectStartFortran(std::ostream& fout, const std::string& libName,
-                                cmTarget &tgt);
+                                cmGeneratorTarget* tgt);
   void WriteVCProjBeginGroup(std::ostream& fout,
                           const char* group,
                           const char* filter);
@@ -110,7 +113,7 @@ private:
                                    cmGeneratorTarget* gt);
 
   bool WriteGroup(const cmSourceGroup *sg,
-                  cmTarget& target, std::ostream &fout,
+                  cmGeneratorTarget* target, std::ostream &fout,
                   const std::string& libName,
                   std::vector<std::string> const& configs);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=154405face0b7e8ca7142fc7d2db07ec64f10a73
commit 154405face0b7e8ca7142fc7d2db07ec64f10a73
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:38:27 2015 +0200

    VS10: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 161b532..e568704 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -331,7 +331,7 @@ void cmGlobalVisualStudio10Generator::Generate()
   this->cmGlobalVisualStudio8Generator::Generate();
   if(this->LongestSource.Length > 0)
     {
-    cmMakefile* mf = this->LongestSource.Target->GetMakefile();
+    cmLocalGenerator* lg = this->LongestSource.Target->GetLocalGenerator();
     std::ostringstream e;
     e <<
       "The binary and/or source directory paths may be too long to generate "
@@ -346,13 +346,13 @@ void cmGlobalVisualStudio10Generator::Generate()
       "  " << this->LongestSource.SourceFile->GetFullPath() << "\n"
       "This is because some Visual Studio tools would append the relative "
       "path to the end of the referencing directory path, as in:\n"
-      "  " << mf->GetCurrentBinaryDirectory() << "/"
+      "  " << lg->GetCurrentBinaryDirectory() << "/"
       << this->LongestSource.SourceRel << "\n"
       "and then incorrectly complain that the file does not exist because "
       "the path length is too long for some internal buffer or API.  "
       "To avoid this problem CMake must use a full path for this file "
       "which then triggers the VS 10 property dialog bug.";
-    mf->IssueMessage(cmake::WARNING, e.str().c_str());
+    lg->IssueMessage(cmake::WARNING, e.str().c_str());
     }
 }
 
@@ -591,9 +591,11 @@ cmGlobalVisualStudio10Generator
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio10Generator::PathTooLong(
-  cmTarget* target, cmSourceFile const* sf, std::string const& sfRel)
+        cmGeneratorTarget *target, cmSourceFile const* sf,
+        std::string const& sfRel)
 {
-  size_t len = (strlen(target->GetMakefile()->GetCurrentBinaryDirectory()) +
+  size_t len =
+      (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
                 1 + sfRel.length());
   if(len > this->LongestSource.Length)
     {
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 7600a0d..6bf4740 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -95,7 +95,7 @@ public:
   /** Generate an <output>.rule file path for a given command output.  */
   virtual std::string GenerateRuleFile(std::string const& output) const;
 
-  void PathTooLong(cmTarget* target, cmSourceFile const* sf,
+  void PathTooLong(cmGeneratorTarget* target, cmSourceFile const* sf,
                    std::string const& sfRel);
 
   virtual const char* GetToolsVersion() { return "4.0"; }
@@ -139,7 +139,7 @@ private:
   {
     LongestSourcePath(): Length(0), Target(0), SourceFile(0) {}
     size_t Length;
-    cmTarget* Target;
+    cmGeneratorTarget* Target;
     cmSourceFile const* SourceFile;
     std::string SourceRel;
   };
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index c9d53fe..e9aee8a 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -90,7 +90,7 @@ void cmLocalVisualStudio10Generator::Generate()
     else
       {
       cmVisualStudio10TargetGenerator tg(
-        (*l)->Target, static_cast<cmGlobalVisualStudio10Generator*>(
+        *l, static_cast<cmGlobalVisualStudio10Generator*>(
           this->GetGlobalGenerator()));
       tg.Generate();
       }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f4c632d..3f8e627 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -13,7 +13,6 @@
 #include "cmVisualStudio10TargetGenerator.h"
 #include "cmGlobalVisualStudio10Generator.h"
 #include "cmGeneratorTarget.h"
-#include "cmTarget.h"
 #include "cmComputeLinkInformation.h"
 #include "cmGeneratedFileStream.h"
 #include "cmMakefile.h"
@@ -167,13 +166,12 @@ static std::string cmVS10EscapeComment(std::string comment)
 }
 
 cmVisualStudio10TargetGenerator::
-cmVisualStudio10TargetGenerator(cmTarget* target,
+cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
                                 cmGlobalVisualStudio10Generator* gg)
 {
   this->GlobalGenerator = gg;
-  this->Target = target;
-  this->GeneratorTarget = gg->GetGeneratorTarget(target);
-  this->Makefile = target->GetMakefile();
+  this->GeneratorTarget = target;
+  this->Makefile = target->Target->GetMakefile();
   this->Makefile->GetConfigurations(this->Configurations);
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
@@ -275,8 +273,9 @@ void cmVisualStudio10TargetGenerator::Generate()
     return;
     }
   // Tell the global generator the name of the project file
-  this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
-  this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
+  this->GeneratorTarget->Target
+      ->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
+  this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
   if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
     {
@@ -732,7 +731,8 @@ void cmVisualStudio10TargetGenerator
   cmGlobalVisualStudio10Generator* gg =
     static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
   const char* mfcFlag =
-    this->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
+    this->GeneratorTarget->
+      Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
   std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
 
   std::string useOfMfcValue = "false";
@@ -1462,7 +1462,8 @@ void cmVisualStudio10TargetGenerator::WriteSource(
       }
     else
       {
-      this->GlobalGenerator->PathTooLong(this->Target, sf, sourceRel);
+      this->GlobalGenerator->PathTooLong(this->GeneratorTarget,
+                                         sf, sourceRel);
       }
     }
   this->ConvertToWindowsSlash(sourceFile);
@@ -1915,12 +1916,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
     std::string baseFlagVar = "CMAKE_";
     baseFlagVar += linkLanguage;
     baseFlagVar += "_FLAGS";
-    flags = this->
+    flags = this->GeneratorTarget->
       Target->GetMakefile()->GetRequiredDefinition(baseFlagVar.c_str());
     std::string flagVar = baseFlagVar + std::string("_") +
       cmSystemTools::UpperCase(configName);
     flags += " ";
-    flags += this->
+    flags += this->GeneratorTarget->
       Target->GetMakefile()->GetRequiredDefinition(flagVar.c_str());
     }
   // set the correct language
@@ -1936,7 +1937,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
                                           linkLanguage, configName.c_str());
 
   // Get preprocessor definitions for this directory.
-  std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags();
+  std::string defineFlags =
+      this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
   if(this->MSTools)
     {
     clOptions.FixExceptionHandlingDefault();
@@ -2440,11 +2442,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   linkFlagVarBase += linkType;
   linkFlagVarBase += "_LINKER_FLAGS";
   flags += " ";
-  flags += this->
+  flags += this->GeneratorTarget->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVarBase.c_str());
   std::string linkFlagVar = linkFlagVarBase + "_" + CONFIG;
   flags += " ";
-  flags += this->
+  flags += this->GeneratorTarget->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
   const char* targetLinkFlags =
       this->GeneratorTarget->GetProperty("LINK_FLAGS");
@@ -2674,7 +2676,8 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
   linkOptions.OutputFlagMap(*this->BuildFileStream, "      ");
 
   this->WriteString("</Link>\n", 2);
-  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(*this->Target))
+  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
+              *this->GeneratorTarget->Target))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(
@@ -2811,7 +2814,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        this->Target->GetPreLinkCommands();
+        this->GeneratorTarget->Target->GetPreLinkCommands();
       this->GlobalGenerator->AddSymbolExportCommand(
         this->GeneratorTarget, commands, configName);
       this->WriteEvent("PreLinkEvent", commands, configName);
@@ -2820,12 +2823,12 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (!addedPrelink)
     {
     this->WriteEvent("PreLinkEvent",
-                     this->Target->GetPreLinkCommands(), configName);
+        this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
     }
   this->WriteEvent("PreBuildEvent",
-                   this->Target->GetPreBuildCommands(), configName);
+        this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
   this->WriteEvent("PostBuildEvent",
-                   this->Target->GetPostBuildCommands(), configName);
+        this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
 }
 
 void cmVisualStudio10TargetGenerator::WriteEvent(
@@ -2875,7 +2878,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
   for( OrderedTargetDependSet::const_iterator i = depends.begin();
        i != depends.end(); ++i)
     {
-    cmTarget const* dt = (*i)->Target;
+    cmGeneratorTarget const* dt = *i;
     if(dt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -2883,12 +2886,12 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     // skip fortran targets as they can not be processed by MSBuild
     // the only reference will be in the .sln file
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*dt))
+       ->TargetIsFortranOnly(*dt->Target))
       {
       continue;
       }
     this->WriteString("<ProjectReference Include=\"", 2);
-    cmMakefile* mf = dt->GetMakefile();
+    cmLocalGenerator* lg = dt->GetLocalGenerator();
     std::string name = dt->GetName();
     std::string path;
     const char* p = dt->GetProperty("EXTERNAL_MSPROJECT");
@@ -2898,7 +2901,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
       }
     else
       {
-      path =  mf->GetCurrentBinaryDirectory();
+      path =  lg->GetCurrentBinaryDirectory();
       path += "/";
       path += dt->GetName();
       path += ".vcxproj";
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 15ed9f2..044e0dd 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -13,7 +13,6 @@
 #define cmVisualStudioTargetGenerator_h
 #include "cmStandardIncludes.h"
 
-class cmTarget;
 class cmMakefile;
 class cmGeneratorTarget;
 class cmGeneratedFileStream;
@@ -29,7 +28,7 @@ struct cmIDEFlagTable;
 class cmVisualStudio10TargetGenerator
 {
 public:
-  cmVisualStudio10TargetGenerator(cmTarget* target,
+  cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
                                   cmGlobalVisualStudio10Generator* gg);
   ~cmVisualStudio10TargetGenerator();
   void Generate();
@@ -148,7 +147,6 @@ private:
   OptionsMap LinkOptions;
   std::string PathToVcxproj;
   std::vector<std::string> Configurations;
-  cmTarget* Target;
   cmGeneratorTarget* GeneratorTarget;
   cmMakefile* Makefile;
   std::string Platform;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e340be968ce920e7d21156453acad7810b8d51e
commit 3e340be968ce920e7d21156453acad7810b8d51e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:37:04 2015 +0200

    VS6: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 12eccf9..9e411c9 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -223,7 +223,7 @@ void cmGlobalVisualStudio6Generator
         tt = orderedProjectTargets.begin();
       tt != orderedProjectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -235,14 +235,15 @@ void cmGlobalVisualStudio6Generator
       std::string project = target->GetName();
       std::string location = expath;
       this->WriteExternalProject(fout, project.c_str(),
-                                 location.c_str(), target->GetUtilities());
+          location.c_str(), target->Target->GetUtilities());
       }
     else
       {
       std::string dspname = GetVS6TargetName(target->GetName());
-      std::string dir = target->GetMakefile()->GetCurrentBinaryDirectory();
+      std::string dir =
+          target->GetLocalGenerator()->GetCurrentBinaryDirectory();
       dir = root->Convert(dir.c_str(), cmLocalGenerator::START_OUTPUT);
-      this->WriteProject(fout, dspname.c_str(), dir.c_str(), *target);
+      this->WriteProject(fout, dspname.c_str(), dir.c_str(), target);
       }
     }
 
@@ -287,9 +288,9 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile()
 // Note, that dependencies from executables to
 // the libraries it uses are also done here
 void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
-                                                  const std::string& dspname,
-                                                  const char* dir,
-                                                  cmTarget const& target)
+                                            const std::string& dspname,
+                                            const char* dir,
+                                            const cmGeneratorTarget *target)
 {
   fout << "#########################################################"
     "######################\n\n";
@@ -298,7 +299,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -309,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -382,7 +383,7 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index e9b24ea..edf637f 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -15,8 +15,6 @@
 #include "cmGlobalVisualStudioGenerator.h"
 #include "cmGlobalGeneratorFactory.h"
 
-class cmTarget;
-
 /** \class cmGlobalVisualStudio6Generator
  * \brief Write a Unix makefiles.
  *
@@ -94,7 +92,7 @@ private:
   void WriteDSWHeader(std::ostream& fout);
   void WriteProject(std::ostream& fout,
                     const std::string& name, const char* path,
-                    cmTarget const& t);
+                    cmGeneratorTarget const* t);
   void WriteExternalProject(std::ostream& fout,
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 773e555..a7f0616 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
       this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
     if (!cmSystemTools::IsOn(suppRegenRule))
       {
-      this->AddDSPBuildRule(*(*l)->Target);
+      this->AddDSPBuildRule(*l);
       }
     }
 }
@@ -133,21 +133,21 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       case cmState::STATIC_LIBRARY:
       case cmState::OBJECT_LIBRARY:
         this->SetBuildType(STATIC_LIBRARY,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::SHARED_LIBRARY:
       case cmState::MODULE_LIBRARY:
         this->SetBuildType(DLL,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::EXECUTABLE:
         this->SetBuildType(EXECUTABLE,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::UTILITY:
       case cmState::GLOBAL_TARGET:
         this->SetBuildType(UTILITY,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::INTERFACE_LIBRARY:
         continue;
@@ -173,7 +173,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
           cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
-      this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleDSP((*l)->GetName().c_str(), *l);
       }
     }
 }
@@ -184,7 +184,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 extern std::string GetVS6TargetName(const std::string& targetName);
 
 void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
-                                                    cmTarget &target)
+                                                    cmGeneratorTarget* target)
 {
   // add to the list of projects
   std::string pname = GetVS6TargetName(lname);
@@ -211,9 +211,9 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 }
 
 
-void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
+void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmGeneratorTarget *tgt)
 {
-  std::string dspname = GetVS6TargetName(tgt.GetName());
+  std::string dspname = GetVS6TargetName(tgt->GetName());
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
@@ -245,8 +245,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
                                            no_working_directory, true);
   if(this->Makefile->GetSource(makefileIn.c_str()))
     {
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&tgt);
-    gt->AddSource(makefileIn);
+    tgt->AddSource(makefileIn);
     }
   else
     {
@@ -257,7 +256,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
 
 void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
                                                  const std::string& libName,
-                                                 cmTarget &target)
+                                                 cmGeneratorTarget *target)
 {
   // For utility targets need custom command since pre- and post-
   // build does not do anything in Visual Studio 6.  In order for the
@@ -265,23 +264,23 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // special care for dependencies.  The first rule must depend on all
   // the dependencies of all the rules.  The later rules must each
   // depend only on the previous rule.
-  if ((target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET) &&
-      (!target.GetPreBuildCommands().empty() ||
-       !target.GetPostBuildCommands().empty()))
+  if ((target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET) &&
+      (!target->Target->GetPreBuildCommands().empty() ||
+       !target->Target->GetPostBuildCommands().empty()))
     {
     // Accumulate the dependencies of all the commands.
     std::vector<std::string> depends;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPreBuildCommands().begin();
-         cr != target.GetPreBuildCommands().end(); ++cr)
+           target->Target->GetPreBuildCommands().begin();
+         cr != target->Target->GetPreBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPostBuildCommands().begin();
-         cr != target.GetPostBuildCommands().end(); ++cr)
+           target->Target->GetPostBuildCommands().begin();
+         cr != target->Target->GetPostBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
@@ -290,14 +289,14 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
     // Add the pre- and post-build commands in order.
     int count = 1;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPreBuildCommands().begin();
-         cr != target.GetPreBuildCommands().end(); ++cr)
+           target->Target->GetPreBuildCommands().begin();
+         cr != target->Target->GetPreBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPostBuildCommands().begin();
-         cr != target.GetPostBuildCommands().end(); ++cr)
+           target->Target->GetPostBuildCommands().begin();
+         cr != target->Target->GetPostBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
@@ -306,12 +305,9 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // We may be modifying the source groups temporarily, so make a copy.
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // get the classes from the source lists then add them to the groups
   std::vector<cmSourceFile*> classes;
-  if (!gt->GetConfigCommonSourceFiles(classes))
+  if (!target->GetConfigCommonSourceFiles(classes))
     {
     return;
     }
@@ -375,11 +371,9 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
 }
 
 void cmLocalVisualStudio6Generator
-::WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+::WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
              std::ostream &fout, const std::string& libName)
 {
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   const std::vector<const cmSourceFile *> &sourceFiles =
     sg->GetSourceFiles();
   // If the group is empty, don't write it at all.
@@ -411,9 +405,10 @@ void cmLocalVisualStudio6Generator
     std::string compileFlags;
     std::vector<std::string> depends;
     std::string objectNameDir;
-    if(gt->HasExplicitObjectName(*sf))
+    if(target->HasExplicitObjectName(*sf))
       {
-      objectNameDir = cmSystemTools::GetFilenamePath(gt->GetObjectName(*sf));
+      objectNameDir =
+          cmSystemTools::GetFilenamePath(target->GetObjectName(*sf));
       }
 
     // Add per-source file flags.
@@ -484,8 +479,8 @@ void cmLocalVisualStudio6Generator
       cmSystemTools::ExpandListArgument(dependsValue, depends);
       }
     if (GetVS6TargetName(source) != libName ||
-      target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET)
+      target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET)
       {
       fout << "# Begin Source File\n\n";
 
@@ -575,15 +570,15 @@ void cmLocalVisualStudio6Generator
 
 void
 cmLocalVisualStudio6Generator
-::AddUtilityCommandHack(cmTarget& target, int count,
+::AddUtilityCommandHack(cmGeneratorTarget *target, int count,
                         std::vector<std::string>& depends,
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
   char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
-                           + target.GetName().size() + 30)];
+                           + target->GetName().size() + 30)];
   sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
-          target.GetName().c_str(), count);
+          target->GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
     {
@@ -598,8 +593,7 @@ cmLocalVisualStudio6Generator
        origCommand.GetCommandLines(), comment,
        origCommand.GetWorkingDirectory().c_str()))
     {
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&target);
-    gt->AddSource(outsf->GetFullPath());
+    target->AddSource(outsf->GetFullPath());
     }
 
   // Replace the dependencies with the output of this rule so that the
@@ -715,7 +709,7 @@ void cmLocalVisualStudio6Generator::WriteDSPEndGroup(std::ostream& fout)
 
 void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
                                                  const std::string& libName,
-                                                 cmTarget& target)
+                                                 cmGeneratorTarget *target)
 {
   std::string root= this->Makefile->GetRequiredDefinition("CMAKE_ROOT");
   const char *def=
@@ -747,7 +741,7 @@ void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
       this->DSPFooterTemplate += "/DLLFooter.dsptemplate";
       break;
     case EXECUTABLE:
-      if ( target.GetPropertyAsBool("WIN32_EXECUTABLE") )
+      if ( target->GetPropertyAsBool("WIN32_EXECUTABLE") )
         {
         this->DSPHeaderTemplate = root;
         this->DSPHeaderTemplate += "/EXEWinHeader.dsptemplate";
@@ -799,19 +793,16 @@ void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCustomCommand>
-cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
+cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmGeneratorTarget* target,
                                                     const std::string& config)
 {
   cmsys::auto_ptr<cmCustomCommand> pcc;
 
   // VS6 forgets to create the output directory for archives if it
   // differs from the intermediate directory.
-  if(target.GetType() != cmState::STATIC_LIBRARY) { return pcc; }
-
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
+  if(target->GetType() != cmState::STATIC_LIBRARY) { return pcc; }
 
-  std::string outDir = gt->GetDirectory(config, false);
+  std::string outDir = target->GetDirectory(config, false);
 
   // Add a pre-link event to create the directory.
   cmCustomCommandLine command;
@@ -833,11 +824,11 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
 
 // look for custom rules on a target and collect them together
 std::string
-cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
+cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
                                               const std::string& configName,
                                               const std::string& /* libName */)
 {
-  if (target.GetType() >= cmState::UTILITY )
+  if (target->GetType() >= cmState::UTILITY )
     {
     return "";
     }
@@ -847,10 +838,10 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
 
   // Write the pre-build and pre-link together (VS6 does not support both).
   event.Start("PreLink");
-  event.Write(target.GetPreBuildCommands());
-  event.Write(target.GetPreLinkCommands());
+  event.Write(target->Target->GetPreBuildCommands());
+  event.Write(target->Target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, false));
+    this->MaybeCreateImplibDir(*target->Target, configName, false));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -864,7 +855,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
 
   // Write the post-build rules.
   event.Start("PostBuild");
-  event.Write(target.GetPostBuildCommands());
+  event.Write(target->Target->GetPostBuildCommands());
   event.Finish();
 
   customRuleCode += "# End Special Build Tool\n";
@@ -883,7 +874,8 @@ inline std::string removeQuotes(const std::string& s)
 
 
 std::string
-cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
+cmLocalVisualStudio6Generator::GetTargetIncludeOptions(
+        cmGeneratorTarget *target,
                                                   const std::string& config)
 {
   std::string includeOptions;
@@ -894,12 +886,10 @@ cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
   unsigned int maxIncludeLength = 3000;
   bool useShortPath = false;
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   for(int j=0; j < 2; ++j)
     {
     std::vector<std::string> includes;
-    this->GetIncludeDirectories(includes, gt, "C", config);
+    this->GetIncludeDirectories(includes, target, "C", config);
 
     std::vector<std::string>::iterator i;
     for(i = includes.begin(); i != includes.end(); ++i)
@@ -947,11 +937,11 @@ cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
 
 void cmLocalVisualStudio6Generator
 ::WriteDSPHeader(std::ostream& fout,
-                 const std::string& libName, cmTarget &target,
+                 const std::string& libName, cmGeneratorTarget* target,
                  std::vector<cmSourceGroup> &)
 {
-  bool targetBuilds = (target.GetType() >= cmState::EXECUTABLE &&
-                       target.GetType() <= cmState::MODULE_LIBRARY);
+  bool targetBuilds = (target->GetType() >= cmState::EXECUTABLE &&
+                       target->GetType() <= cmState::MODULE_LIBRARY);
 #ifdef CM_USE_OLD_VS6
   // Lookup the library and executable output directories.
   std::string libPath;
@@ -1061,7 +1051,8 @@ void cmLocalVisualStudio6Generator
       }
     }
   std::vector<std::string>::const_iterator i;
-  const std::vector<std::string>& libdirs = target.GetLinkDirectories();
+  const std::vector<std::string>& libdirs =
+      target->Target->GetLinkDirectories();
   for(i = libdirs.begin(); i != libdirs.end(); ++i)
     {
     std::string path = *i;
@@ -1103,19 +1094,19 @@ void cmLocalVisualStudio6Generator
     }
   // find link libraries
   const cmTarget::LinkLibraryVectorType& libs =
-    target.GetLinkLibrariesForVS6();
+    target->Target->GetLinkLibrariesForVS6();
   cmTarget::LinkLibraryVectorType::const_iterator j;
   for(j = libs.begin(); j != libs.end(); ++j)
     {
     // add libraries to executables and dlls (but never include
     // a library in a library, bad recursion)
     // NEVER LINK STATIC LIBRARIES TO OTHER STATIC LIBRARIES
-    if ((target.GetType() != cmState::SHARED_LIBRARY
-         && target.GetType() != cmState::STATIC_LIBRARY
-         && target.GetType() != cmState::MODULE_LIBRARY) ||
-        (target.GetType()==cmState::SHARED_LIBRARY
+    if ((target->GetType() != cmState::SHARED_LIBRARY
+         && target->GetType() != cmState::STATIC_LIBRARY
+         && target->GetType() != cmState::MODULE_LIBRARY) ||
+        (target->GetType()==cmState::SHARED_LIBRARY
          && libName != GetVS6TargetName(j->first)) ||
-        (target.GetType()==cmState::MODULE_LIBRARY
+        (target->GetType()==cmState::MODULE_LIBRARY
          && libName != GetVS6TargetName(j->first)))
       {
       // Compute the proper name to use to link this library.
@@ -1197,7 +1188,7 @@ void cmLocalVisualStudio6Generator
   std::string extraLinkOptionsRelease;
   std::string extraLinkOptionsMinSizeRel;
   std::string extraLinkOptionsRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
@@ -1210,7 +1201,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
@@ -1223,7 +1214,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
@@ -1238,63 +1229,61 @@ void cmLocalVisualStudio6Generator
     }
 
   // Get extra linker options for this target.
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS"))
     {
     extraLinkOptions += " ";
     extraLinkOptions += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_DEBUG"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_DEBUG"))
     {
     extraLinkOptionsDebug += " ";
     extraLinkOptionsDebug += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_RELEASE"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_RELEASE"))
     {
     extraLinkOptionsRelease += " ";
     extraLinkOptionsRelease += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_MINSIZEREL"))
+  if(const char* targetLinkFlags =
+     target->GetProperty("LINK_FLAGS_MINSIZEREL"))
     {
     extraLinkOptionsMinSizeRel += " ";
     extraLinkOptionsMinSizeRel += targetLinkFlags;
     }
 
   if(const char* targetLinkFlags =
-     target.GetProperty("LINK_FLAGS_RELWITHDEBINFO"))
+     target->GetProperty("LINK_FLAGS_RELWITHDEBINFO"))
     {
     extraLinkOptionsRelWithDebInfo += " ";
     extraLinkOptionsRelWithDebInfo += targetLinkFlags;
     }
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // Get standard libraries for this language.
   if(targetBuilds)
     {
     // Get the language to use for linking.
     std::vector<std::string> configs;
-    target.GetMakefile()->GetConfigurations(configs);
+    target->Target->GetMakefile()->GetConfigurations(configs);
     std::vector<std::string>::const_iterator it = configs.begin();
-    const std::string& linkLanguage = gt->GetLinkerLanguage(*it);
+    const std::string& linkLanguage = target->GetLinkerLanguage(*it);
     for ( ; it != configs.end(); ++it)
       {
-      const std::string& configLinkLanguage = gt->GetLinkerLanguage(*it);
+      const std::string& configLinkLanguage = target->GetLinkerLanguage(*it);
       if (configLinkLanguage != linkLanguage)
         {
         cmSystemTools::Error
           ("Linker language must not vary by configuration for target: ",
-          target.GetName().c_str());
+          target->GetName().c_str());
         }
       }
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
         ("CMake can not determine linker language for target: ",
-         target.GetName().c_str());
+         target->GetName().c_str());
       return;
       }
 
@@ -1315,13 +1304,13 @@ void cmLocalVisualStudio6Generator
 
   // Compute version number information.
   std::string targetVersionFlag;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     int major;
     int minor;
-    gt->GetTargetVersion(major, minor);
+    target->GetTargetVersion(major, minor);
     std::ostringstream targetVersionStream;
     targetVersionStream << "/version:" << major << "." << minor;
     targetVersionFlag = targetVersionStream.str();
@@ -1334,20 +1323,20 @@ void cmLocalVisualStudio6Generator
   std::string outputNameRelease = outputName;
   std::string outputNameMinSizeRel = outputName;
   std::string outputNameRelWithDebInfo = outputName;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::STATIC_LIBRARY ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
-    outputName = gt->GetFullName();
-    outputNameDebug = gt->GetFullName("Debug");
-    outputNameRelease = gt->GetFullName("Release");
-    outputNameMinSizeRel = gt->GetFullName("MinSizeRel");
-    outputNameRelWithDebInfo = gt->GetFullName("RelWithDebInfo");
+    outputName = target->GetFullName();
+    outputNameDebug = target->GetFullName("Debug");
+    outputNameRelease = target->GetFullName("Release");
+    outputNameMinSizeRel = target->GetFullName("MinSizeRel");
+    outputNameRelWithDebInfo = target->GetFullName("RelWithDebInfo");
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(target->GetType() == cmState::OBJECT_LIBRARY)
     {
-    outputName = target.GetName();
+    outputName = target->GetName();
     outputName += ".lib";
     outputNameDebug = outputName;
     outputNameRelease = outputName;
@@ -1361,30 +1350,30 @@ void cmLocalVisualStudio6Generator
   std::string outputDirRelease;
   std::string outputDirMinSizeRel;
   std::string outputDirRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::STATIC_LIBRARY ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
 #ifdef CM_USE_OLD_VS6
     outputDirOld =
       removeQuotes(this->ConvertToOutputFormat
-                   (gt->GetDirectory().c_str(), SHELL));
+                   (target->GetDirectory().c_str(), SHELL));
 #endif
     outputDirDebug =
         removeQuotes(this->ConvertToOutputFormat(
-                       gt->GetDirectory("Debug").c_str(), SHELL));
+                       target->GetDirectory("Debug").c_str(), SHELL));
     outputDirRelease =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("Release").c_str(), SHELL));
+                 target->GetDirectory("Release").c_str(), SHELL));
     outputDirMinSizeRel =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("MinSizeRel").c_str(), SHELL));
+                 target->GetDirectory("MinSizeRel").c_str(), SHELL));
     outputDirRelWithDebInfo =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("RelWithDebInfo").c_str(), SHELL));
+                 target->GetDirectory("RelWithDebInfo").c_str(), SHELL));
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(target->GetType() == cmState::OBJECT_LIBRARY)
     {
     std::string outputDir = cmake::GetCMakeFilesDirectoryPostSlash();
     outputDirDebug = outputDir + "Debug";
@@ -1398,9 +1387,9 @@ void cmLocalVisualStudio6Generator
   std::string optionsRelease;
   std::string optionsMinSizeRel;
   std::string optionsRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsDebug =
       extraLinkOptions + " " + extraLinkOptionsDebug;
@@ -1426,24 +1415,24 @@ void cmLocalVisualStudio6Generator
   std::string targetImplibFlagRelease;
   std::string targetImplibFlagMinSizeRel;
   std::string targetImplibFlagRelWithDebInfo;
-  if(target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY ||
-     target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY ||
+     target->GetType() == cmState::EXECUTABLE)
     {
-    std::string fullPathImpDebug = gt->GetDirectory("Debug", true);
-    std::string fullPathImpRelease = gt->GetDirectory("Release", true);
+    std::string fullPathImpDebug = target->GetDirectory("Debug", true);
+    std::string fullPathImpRelease = target->GetDirectory("Release", true);
     std::string fullPathImpMinSizeRel =
-      gt->GetDirectory("MinSizeRel", true);
+      target->GetDirectory("MinSizeRel", true);
     std::string fullPathImpRelWithDebInfo =
-      gt->GetDirectory("RelWithDebInfo", true);
+      target->GetDirectory("RelWithDebInfo", true);
     fullPathImpDebug += "/";
     fullPathImpRelease += "/";
     fullPathImpMinSizeRel += "/";
     fullPathImpRelWithDebInfo += "/";
-    fullPathImpDebug += gt->GetFullName("Debug", true);
-    fullPathImpRelease += gt->GetFullName("Release", true);
-    fullPathImpMinSizeRel += gt->GetFullName("MinSizeRel", true);
-    fullPathImpRelWithDebInfo += gt->GetFullName("RelWithDebInfo", true);
+    fullPathImpDebug += target->GetFullName("Debug", true);
+    fullPathImpRelease += target->GetFullName("Release", true);
+    fullPathImpMinSizeRel += target->GetFullName("MinSizeRel", true);
+    fullPathImpRelWithDebInfo += target->GetFullName("RelWithDebInfo", true);
 
     targetImplibFlagDebug = "/implib:";
     targetImplibFlagRelease = "/implib:";
@@ -1496,7 +1485,7 @@ void cmLocalVisualStudio6Generator
   std::string staticLibOptionsRelease;
   std::string staticLibOptionsMinSizeRel;
   std::string staticLibOptionsRelWithDebInfo;
-  if(target.GetType() == cmState::STATIC_LIBRARY )
+  if(target->GetType() == cmState::STATIC_LIBRARY )
     {
     const char *libflagsGlobal =
       this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS");
@@ -1515,7 +1504,7 @@ void cmLocalVisualStudio6Generator
     this->AppendFlags(staticLibOptionsRelWithDebInfo, this->Makefile->
       GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO"));
 
-    const char *libflags = target.GetProperty("STATIC_LIBRARY_FLAGS");
+    const char *libflags = target->GetProperty("STATIC_LIBRARY_FLAGS");
     this->AppendFlags(staticLibOptions, libflags);
     this->AppendFlags(staticLibOptionsDebug, libflags);
     this->AppendFlags(staticLibOptionsRelease, libflags);
@@ -1523,13 +1512,13 @@ void cmLocalVisualStudio6Generator
     this->AppendFlags(staticLibOptionsRelWithDebInfo, libflags);
 
     this->AppendFlags(staticLibOptionsDebug,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_DEBUG"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_DEBUG"));
     this->AppendFlags(staticLibOptionsRelease,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_RELEASE"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_RELEASE"));
     this->AppendFlags(staticLibOptionsMinSizeRel,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_MINSIZEREL"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_MINSIZEREL"));
     this->AppendFlags(staticLibOptionsRelWithDebInfo,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_RELWITHDEBINFO"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_RELWITHDEBINFO"));
 
     std::string objects;
     this->OutputObjects(target, "LIB", objects);
@@ -1545,7 +1534,7 @@ void cmLocalVisualStudio6Generator
 
   // Add the export symbol definition for shared library objects.
   std::string exportSymbol;
-  if(const char* exportMacro = gt->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     exportSymbol = exportMacro;
     }
@@ -1569,8 +1558,8 @@ void cmLocalVisualStudio6Generator
                                  libnameExports.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
                                  mfcFlag);
-    if(target.GetType() == cmState::STATIC_LIBRARY ||
-       target.GetType() == cmState::OBJECT_LIBRARY)
+    if(target->GetType() == cmState::STATIC_LIBRARY ||
+       target->GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "CM_STATIC_LIB_ARGS_DEBUG",
                                    staticLibOptionsDebug.c_str());
@@ -1676,7 +1665,7 @@ void cmLocalVisualStudio6Generator
                     (exePath.c_str(), SHELL)).c_str());
 #endif
 
-    if(targetBuilds || target.GetType() == cmState::OBJECT_LIBRARY)
+    if(targetBuilds || target->GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "OUTPUT_DIRECTORY_DEBUG",
                                    outputDirDebug.c_str());
@@ -1700,8 +1689,8 @@ void cmLocalVisualStudio6Generator
       = this->Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
     cmSystemTools::ReplaceString(line, "DEBUG_POSTFIX",
                                  debugPostfix?debugPostfix:"");
-    if(target.GetType() >= cmState::EXECUTABLE &&
-       target.GetType() <= cmState::OBJECT_LIBRARY)
+    if(target->GetType() >= cmState::EXECUTABLE &&
+       target->GetType() <= cmState::OBJECT_LIBRARY)
       {
       // store flags for each configuration
       std::string flags = " ";
@@ -1710,24 +1699,24 @@ void cmLocalVisualStudio6Generator
       std::string flagsDebug = " ";
       std::string flagsRelWithDebInfo = " ";
       std::vector<std::string> configs;
-      target.GetMakefile()->GetConfigurations(configs);
+      target->Target->GetMakefile()->GetConfigurations(configs);
       std::vector<std::string>::const_iterator it = configs.begin();
-      const std::string& linkLanguage = gt->GetLinkerLanguage(*it);
+      const std::string& linkLanguage = target->GetLinkerLanguage(*it);
       for ( ; it != configs.end(); ++it)
         {
-        const std::string& configLinkLanguage = gt->GetLinkerLanguage(*it);
+        const std::string& configLinkLanguage = target->GetLinkerLanguage(*it);
         if (configLinkLanguage != linkLanguage)
           {
           cmSystemTools::Error
             ("Linker language must not vary by configuration for target: ",
-            target.GetName().c_str());
+            target->GetName().c_str());
           }
         }
       if(linkLanguage.empty())
         {
         cmSystemTools::Error
           ("CMake can not determine linker language for target: ",
-           target.GetName().c_str());
+           target->GetName().c_str());
         return;
         }
       // if CXX is on and the target contains cxx code then add the cxx flags
@@ -1752,12 +1741,12 @@ void cmLocalVisualStudio6Generator
       flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
       flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
 
-      this->AddCompileOptions(flags, gt, linkLanguage, "");
-      this->AddCompileOptions(flagsDebug, gt, linkLanguage, "Debug");
-      this->AddCompileOptions(flagsRelease, gt, linkLanguage, "Release");
-      this->AddCompileOptions(flagsMinSizeRel, gt, linkLanguage,
+      this->AddCompileOptions(flags, target, linkLanguage, "");
+      this->AddCompileOptions(flagsDebug, target, linkLanguage, "Debug");
+      this->AddCompileOptions(flagsRelease, target, linkLanguage, "Release");
+      this->AddCompileOptions(flagsMinSizeRel, target, linkLanguage,
                               "MinSizeRel");
-      this->AddCompileOptions(flagsRelWithDebInfo, gt, linkLanguage,
+      this->AddCompileOptions(flagsRelWithDebInfo, target, linkLanguage,
                               "RelWithDebInfo");
 
       // if _UNICODE and _SBCS are not found, then add -D_MBCS
@@ -1777,14 +1766,14 @@ void cmLocalVisualStudio6Generator
       std::set<std::string> minsizeDefinesSet;
       std::set<std::string> debugrelDefinesSet;
 
-      this->AddCompileDefinitions(definesSet, gt, "", linkLanguage);
-      this->AddCompileDefinitions(debugDefinesSet, gt,
+      this->AddCompileDefinitions(definesSet, target, "", linkLanguage);
+      this->AddCompileDefinitions(debugDefinesSet, target,
                                   "DEBUG", linkLanguage);
-      this->AddCompileDefinitions(releaseDefinesSet, gt,
+      this->AddCompileDefinitions(releaseDefinesSet, target,
                                   "RELEASE", linkLanguage);
-      this->AddCompileDefinitions(minsizeDefinesSet, gt,
+      this->AddCompileDefinitions(minsizeDefinesSet, target,
                                   "MINSIZEREL", linkLanguage);
-      this->AddCompileDefinitions(debugrelDefinesSet, gt,
+      this->AddCompileDefinitions(debugrelDefinesSet, target,
                                   "RELWITHDEBINFO", linkLanguage);
 
       std::string defines = " ";
@@ -1852,15 +1841,13 @@ void cmLocalVisualStudio6Generator::WriteDSPFooter(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio6Generator
-::ComputeLinkOptions(cmTarget& target,
+::ComputeLinkOptions(cmGeneratorTarget *target,
                      const std::string& configName,
                      const std::string extraOptions,
                      std::string& options)
 {
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   // Compute the link information for this configuration.
-  cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+  cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
   if(!pcli)
     {
     return;
@@ -1919,15 +1906,13 @@ void cmLocalVisualStudio6Generator
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio6Generator
-::OutputObjects(cmTarget& target, const char* tool,
+::OutputObjects(cmGeneratorTarget* target, const char* tool,
                 std::string& options)
 {
   // VS 6 does not support per-config source locations so we
   // list object library content on the link line instead.
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   std::vector<std::string> objs;
-  gt->UseObjectLibraries(objs, "");
+  target->UseObjectLibraries(objs, "");
   for(std::vector<std::string>::const_iterator
         oi = objs.begin(); oi != objs.end(); ++oi)
     {
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index b3b61bb..4772d54 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -14,7 +14,6 @@
 
 #include "cmLocalVisualStudioGenerator.h"
 
-class cmTarget;
 class cmSourceFile;
 class cmSourceGroup;
 class cmCustomCommand;
@@ -47,7 +46,7 @@ public:
   /**
    * Specify the type of the build: static, dll, or executable.
    */
-  void SetBuildType(BuildType, const std::string& libName, cmTarget&);
+  void SetBuildType(BuildType, const std::string& libName, cmGeneratorTarget*);
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
@@ -56,41 +55,42 @@ private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
 
-  void CreateSingleDSP(const std::string& lname, cmTarget &tgt);
+  void CreateSingleDSP(const std::string& lname, cmGeneratorTarget* tgt);
   void WriteDSPFile(std::ostream& fout, const std::string& libName,
-                    cmTarget &tgt);
+                    cmGeneratorTarget* tgt);
   void WriteDSPBeginGroup(std::ostream& fout,
                           const char* group,
                           const char* filter);
   void WriteDSPEndGroup(std::ostream& fout);
 
   void WriteDSPHeader(std::ostream& fout, const std::string& libName,
-                      cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
+                      cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
 
   void WriteDSPFooter(std::ostream& fout);
-  void AddDSPBuildRule(cmTarget& tgt);
+  void AddDSPBuildRule(cmGeneratorTarget* tgt);
   void WriteCustomRule(std::ostream& fout,
                        const char* source,
                        const cmCustomCommand& command,
                        const char* flags);
-  void AddUtilityCommandHack(cmTarget& target, int count,
+  void AddUtilityCommandHack(cmGeneratorTarget* target, int count,
                              std::vector<std::string>& depends,
                              const cmCustomCommand& origCommand);
-  void WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+  void WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
                   std::ostream &fout, const std::string& libName);
   class EventWriter;
   friend class EventWriter;
   cmsys::auto_ptr<cmCustomCommand>
-  MaybeCreateOutputDir(cmTarget& target, const std::string& config);
-  std::string CreateTargetRules(cmTarget &target,
+  MaybeCreateOutputDir(cmGeneratorTarget *target, const std::string& config);
+  std::string CreateTargetRules(cmGeneratorTarget* target,
                                 const std::string& configName,
                                 const std::string& libName);
-  void ComputeLinkOptions(cmTarget& target, const std::string& configName,
+  void ComputeLinkOptions(cmGeneratorTarget* target,
+                          const std::string& configName,
                           const std::string extraOptions,
                           std::string& options);
-  void OutputObjects(cmTarget& target, const char* tool,
+  void OutputObjects(cmGeneratorTarget* target, const char* tool,
                      std::string& options);
-  std::string GetTargetIncludeOptions(cmTarget &target,
+  std::string GetTargetIncludeOptions(cmGeneratorTarget* target,
                                       const std::string& config);
   std::vector<std::string> Configurations;
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct 22 17:12:34 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu, 22 Oct 2015 17:12:34 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-899-gf271764
Message-ID: <20151022211234.E8E70BF7ED@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f271764c40abbc481d9920e907b7a547ffe313fa (commit)
       via  940375c6202eaac97b0967204964163b5b683e9d (commit)
      from  29164eaa8289efb4891dfc8c46f75d87c5a481d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f271764c40abbc481d9920e907b7a547ffe313fa
commit f271764c40abbc481d9920e907b7a547ffe313fa
Merge: 29164ea 940375c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 17:12:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 17:12:33 2015 -0400

    Merge topic 'use-generator-target' into next
    
    940375c6 Partial revert.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=940375c6202eaac97b0967204964163b5b683e9d
commit 940375c6202eaac97b0967204964163b5b683e9d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 23:10:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 23:10:53 2015 +0200

    Partial revert.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index e568704..161b532 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -331,7 +331,7 @@ void cmGlobalVisualStudio10Generator::Generate()
   this->cmGlobalVisualStudio8Generator::Generate();
   if(this->LongestSource.Length > 0)
     {
-    cmLocalGenerator* lg = this->LongestSource.Target->GetLocalGenerator();
+    cmMakefile* mf = this->LongestSource.Target->GetMakefile();
     std::ostringstream e;
     e <<
       "The binary and/or source directory paths may be too long to generate "
@@ -346,13 +346,13 @@ void cmGlobalVisualStudio10Generator::Generate()
       "  " << this->LongestSource.SourceFile->GetFullPath() << "\n"
       "This is because some Visual Studio tools would append the relative "
       "path to the end of the referencing directory path, as in:\n"
-      "  " << lg->GetCurrentBinaryDirectory() << "/"
+      "  " << mf->GetCurrentBinaryDirectory() << "/"
       << this->LongestSource.SourceRel << "\n"
       "and then incorrectly complain that the file does not exist because "
       "the path length is too long for some internal buffer or API.  "
       "To avoid this problem CMake must use a full path for this file "
       "which then triggers the VS 10 property dialog bug.";
-    lg->IssueMessage(cmake::WARNING, e.str().c_str());
+    mf->IssueMessage(cmake::WARNING, e.str().c_str());
     }
 }
 
@@ -591,11 +591,9 @@ cmGlobalVisualStudio10Generator
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio10Generator::PathTooLong(
-        cmGeneratorTarget *target, cmSourceFile const* sf,
-        std::string const& sfRel)
+  cmTarget* target, cmSourceFile const* sf, std::string const& sfRel)
 {
-  size_t len =
-      (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
+  size_t len = (strlen(target->GetMakefile()->GetCurrentBinaryDirectory()) +
                 1 + sfRel.length());
   if(len > this->LongestSource.Length)
     {
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 6bf4740..7600a0d 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -95,7 +95,7 @@ public:
   /** Generate an <output>.rule file path for a given command output.  */
   virtual std::string GenerateRuleFile(std::string const& output) const;
 
-  void PathTooLong(cmGeneratorTarget* target, cmSourceFile const* sf,
+  void PathTooLong(cmTarget* target, cmSourceFile const* sf,
                    std::string const& sfRel);
 
   virtual const char* GetToolsVersion() { return "4.0"; }
@@ -139,7 +139,7 @@ private:
   {
     LongestSourcePath(): Length(0), Target(0), SourceFile(0) {}
     size_t Length;
-    cmGeneratorTarget* Target;
+    cmTarget* Target;
     cmSourceFile const* SourceFile;
     std::string SourceRel;
   };
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 48c07a8..9e411c9 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -299,7 +299,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -310,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -383,13 +383,12 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(
-    const cmGeneratorTarget *target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
   pname = GetVS6TargetName(pname.c_str());
-  std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
+  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index 22ad8a9..edf637f 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -97,7 +97,7 @@ private:
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
   void WriteDSWFooter(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmGeneratorTarget const* target);
+  virtual std::string WriteUtilityDepend(cmTarget const* target);
   std::string MSDevCommand;
   bool MSDevCommandInitialized;
   std::string const& GetMSDevCommand();
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 8227b82..9bb37ce 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -152,7 +152,7 @@ void
 cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
                                               const std::string& dspname,
                                               const char* dir,
-                                              cmGeneratorTarget const* t)
+                                              cmTarget const& t)
 {
   // check to see if this is a fortran build
   const char* ext = ".vcproj";
@@ -163,7 +163,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
     }
-  const char* targetExt = t->GetProperty("GENERATOR_FILE_NAME_EXT");
+  const char* targetExt = t.GetProperty("GENERATOR_FILE_NAME_EXT");
   if(targetExt)
     {
     ext = targetExt;
@@ -180,7 +180,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
 
   fout <<"EndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&t);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -204,9 +204,9 @@ void
 cmGlobalVisualStudio71Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string&,
-                      const char*, cmGeneratorTarget const* target)
+                      const char*, cmTarget const& target)
 {
-  VSDependSet const& depends = this->VSTargetDepends[target];
+  VSDependSet const& depends = this->VSTargetDepends[&target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -215,7 +215,7 @@ cmGlobalVisualStudio71Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target->GetName();
+      m += target.GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index 5035fda..7f88e34 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -59,10 +59,10 @@ protected:
     std::ostream& fout, std::vector<std::string> const& configs);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            const cmGeneratorTarget *t);
+                            cmTarget const& t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmGeneratorTarget const* t);
+                           cmTarget const& t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 89b21ed..1909f21 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -441,7 +441,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmGeneratorTarget const* target = *tt;
+    cmTarget const* target = (*tt)->Target;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -459,7 +459,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
                                  project.c_str(),
                                  location.c_str(),
                                  target->GetProperty("VS_PROJECT_TYPE"),
-                                 target->Target->GetUtilities());
+                                 target->GetUtilities());
       written = true;
       }
     else
@@ -468,7 +468,9 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmLocalGenerator* lg = target->GetLocalGenerator();
+        cmLocalGenerator* lg =
+            root->GetGlobalGenerator()->GetGeneratorTarget(target)
+            ->GetLocalGenerator();
         std::string dir = lg->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
@@ -477,7 +479,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
           dir = ""; // msbuild cannot handle ".\" prefix
           }
         this->WriteProject(fout, vcprojName, dir.c_str(),
-                           target);
+                           *target);
         written = true;
         }
       }
@@ -533,19 +535,19 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmGeneratorTarget const* target = *tt;
+    cmTarget const* target = (*tt)->Target;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmLocalGenerator* lg = target->GetLocalGenerator();
+    cmMakefile* mf = target->GetMakefile();
     const char *vcprojName =
       target->GetProperty("GENERATOR_FILE_NAME");
     if (vcprojName)
       {
-      std::string dir = lg->GetCurrentSourceDirectory();
+      std::string dir = mf->GetCurrentSourceDirectory();
       this->WriteProjectDepends(fout, vcprojName,
-                                dir.c_str(), target);
+                                dir.c_str(), *target);
       }
     }
 }
@@ -685,8 +687,7 @@ cmGlobalVisualStudio7Generator::ConvertToSolutionPath(const char* path)
 // the libraries it uses are also done here
 void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
                                const std::string& dspname,
-                               const char* dir,
-                               const cmGeneratorTarget *target)
+                               const char* dir, cmTarget const& target)
 {
    // check to see if this is a fortran build
   const char* ext = ".vcproj";
@@ -704,7 +705,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
        << dspname << ext << "\", \"{"
        << this->GetGUID(dspname) << "}\"\nEndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -726,11 +727,11 @@ void
 cmGlobalVisualStudio7Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string& dspname,
-                      const char*, cmGeneratorTarget const* target)
+                      const char*, cmTarget const& target)
 {
   int depcount = 0;
   std::string dspguid = this->GetGUID(dspname);
-  VSDependSet const& depends = this->VSTargetDepends[target];
+  VSDependSet const& depends = this->VSTargetDepends[&target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -739,7 +740,7 @@ cmGlobalVisualStudio7Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target->GetName();
+      m += target.GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
@@ -748,7 +749,7 @@ cmGlobalVisualStudio7Generator
     depcount++;
     }
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -888,14 +889,13 @@ void cmGlobalVisualStudio7Generator::WriteSLNHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio7Generator::WriteUtilityDepend(
-        cmGeneratorTarget const* target)
+cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget const* target)
 {
   std::vector<std::string> configs;
-  target->Target->GetMakefile()->GetConfigurations(configs);
+  target->GetMakefile()->GetConfigurations(configs);
   std::string pname = target->GetName();
   pname += "_UTILITY";
-  std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
+  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".vcproj";
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index b6caf5b..4ef0990 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,8 +94,7 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
-  { return false; }
+  virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
 
   const char* GetIntelProjectVersion();
 
@@ -124,10 +123,10 @@ protected:
                             std::vector<cmLocalGenerator*>& generators);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            cmGeneratorTarget const* t);
+                            cmTarget const& t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmGeneratorTarget const* t);
+                           cmTarget const&t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
@@ -137,7 +136,7 @@ protected:
                                       cmLocalGenerator* root);
   virtual void WriteSLNFooter(std::ostream& fout);
   virtual void WriteSLNHeader(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmGeneratorTarget const* target);
+  virtual std::string WriteUtilityDepend(cmTarget const* target);
 
   virtual void WriteTargetsToSolution(
     std::ostream& fout,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 00ca21a..a22315c 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -441,9 +441,9 @@ bool cmGlobalVisualStudio8Generator::ComputeTargetDepends()
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Generator::WriteProjectDepends(
-        std::ostream& fout, const std::string&, const char*,
-        const cmGeneratorTarget *gt)
+  std::ostream& fout, const std::string&, const char*, cmTarget const& t)
 {
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(&t);
   TargetDependSet const& unordered = this->GetTargetDirectDepends(gt);
   OrderedTargetDependSet depends(unordered, std::string());
   for(OrderedTargetDependSet::const_iterator i = depends.begin();
@@ -460,16 +460,14 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
 
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
-        cmGeneratorTarget *target)
+  cmTarget& target)
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target->Target->GetUtilities().begin();
-      ui != target->Target->GetUtilities().end(); ++ui)
+        target.GetUtilities().begin();
+      ui != target.GetUtilities().end(); ++ui)
     {
-      cmGeneratorTarget* depTarget = 0;
-//    if(cmGeneratorTarget* depTarget =
-  //          this->FindGeneratorTarget(ui->c_str()))
+    if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
       {
       if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index 54dc545..60c63d1 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget* target);
+  virtual bool NeedLinkLibraryDependencies(cmTarget& target);
 
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const {
@@ -91,8 +91,7 @@ protected:
   virtual bool ComputeTargetDepends();
   virtual void WriteProjectDepends(std::ostream& fout,
                                    const std::string& name,
-                                   const char* path,
-                                   cmGeneratorTarget const* gt);
+                                   const char* path, cmTarget const& t);
 
   std::string Name;
   std::string WindowsCEVersion;
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 31f6475..4d431f6 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -303,19 +303,19 @@ std::string cmGlobalVisualStudioGenerator::GetUserMacrosRegKeyBase()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::FillLinkClosure(
-        cmGeneratorTarget const* target,
+void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
                                                     TargetSet& linked)
 {
   if(linked.insert(target).second)
     {
-    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FillLinkClosure(*di, linked);
+        this->FillLinkClosure((*di)->Target, linked);
         }
       }
     }
@@ -323,8 +323,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
 
 //----------------------------------------------------------------------------
 cmGlobalVisualStudioGenerator::TargetSet const&
-cmGlobalVisualStudioGenerator::GetTargetLinkClosure(
-        cmGeneratorTarget *target)
+cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
 {
   TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
   if(i == this->TargetLinkClosure.end())
@@ -338,8 +337,7 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudioGenerator::FollowLinkDepends(
-        const cmGeneratorTarget *target,
-        std::set<const cmGeneratorTarget *> &linked)
+  cmTarget const* target, std::set<cmTarget const*>& linked)
 {
   if(target->GetType() == cmState::INTERFACE_LIBRARY)
     {
@@ -350,13 +348,14 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
     {
     // Static library targets do not list their link dependencies so
     // we must follow them transitively now.
-    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FollowLinkDepends(*di, linked);
+        this->FollowLinkDepends((*di)->Target, linked);
         }
       }
     }
@@ -380,7 +379,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
       for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(*ti);
+        this->ComputeVSTargetDepends(*(*ti)->Target);
         }
       }
     }
@@ -394,14 +393,13 @@ static bool VSLinkable(cmGeneratorTarget const* t)
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
-    cmGeneratorTarget* target)
+void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
 {
-  if(this->VSTargetDepends.find(target) != this->VSTargetDepends.end())
+  if(this->VSTargetDepends.find(&target) != this->VSTargetDepends.end())
     {
     return;
     }
-  VSDependSet& vsTargetDepend = this->VSTargetDepends[target];
+  VSDependSet& vsTargetDepend = this->VSTargetDepends[&target];
   // VS <= 7.1 has two behaviors that affect solution dependencies.
   //
   // (1) Solution-level dependencies between a linkable target and a
@@ -421,18 +419,19 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
   // leaving them out for the static library itself but following them
   // transitively for other targets.
 
-  bool allowLinkable = (target->GetType() != cmState::STATIC_LIBRARY &&
-                        target->GetType() != cmState::SHARED_LIBRARY &&
-                        target->GetType() != cmState::MODULE_LIBRARY &&
-                        target->GetType() != cmState::EXECUTABLE);
+  bool allowLinkable = (target.GetType() != cmState::STATIC_LIBRARY &&
+                        target.GetType() != cmState::SHARED_LIBRARY &&
+                        target.GetType() != cmState::MODULE_LIBRARY &&
+                        target.GetType() != cmState::EXECUTABLE);
 
-  TargetDependSet const& depends = this->GetTargetDirectDepends(target);
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
+  TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
 
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
-  std::set<cmGeneratorTarget const*> linkDepends;
-  if(target->GetType() != cmState::STATIC_LIBRARY)
+  std::set<cmTarget const*> linkDepends;
+  if(target.GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -440,54 +439,55 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
       cmTargetDepend dep = *di;
       if(dep.IsLink())
         {
-        this->FollowLinkDepends(*di, linkDepends);
+        this->FollowLinkDepends(dep->Target, linkDepends);
         }
       }
     }
 
   // Collect explicit util dependencies (add_dependencies).
-  std::set<cmGeneratorTarget const*> utilDepends;
+  std::set<cmTarget const*> utilDepends;
   for(TargetDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
     cmTargetDepend dep = *di;
     if(dep.IsUtil())
       {
-      this->FollowLinkDepends(*di, utilDepends);
+      this->FollowLinkDepends(dep->Target, utilDepends);
       }
     }
 
   // Collect all targets linked by this target so we can avoid
   // intermediate targets below.
   TargetSet linked;
-  if(target->GetType() != cmState::STATIC_LIBRARY)
+  if(target.GetType() != cmState::STATIC_LIBRARY)
     {
-    linked = this->GetTargetLinkClosure(target);
+    linked = this->GetTargetLinkClosure(&target);
     }
 
   // Emit link dependencies.
-  for(std::set<cmGeneratorTarget const*>::iterator di = linkDepends.begin();
+  for(std::set<cmTarget const*>::iterator di = linkDepends.begin();
       di != linkDepends.end(); ++di)
     {
-    cmGeneratorTarget const* dep = *di;
+    cmTarget const* dep = *di;
     vsTargetDepend.insert(dep->GetName());
     }
 
   // Emit util dependencies.  Possibly use intermediate targets.
-  for(std::set<cmGeneratorTarget const*>::iterator di = utilDepends.begin();
+  for(std::set<cmTarget const*>::iterator di = utilDepends.begin();
       di != utilDepends.end(); ++di)
     {
-    cmGeneratorTarget const* dgt = *di;
-    if(allowLinkable || !VSLinkable(dgt) || linked.count(dgt))
+    cmTarget const* dep = *di;
+    cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
+    if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
       {
       // Direct dependency allowed.
-      vsTargetDepend.insert(dgt->GetName());
+      vsTargetDepend.insert(dep->GetName());
       }
     else
       {
       // Direct dependency on linkable target not allowed.
       // Use an intermediate utility target.
-      vsTargetDepend.insert(this->GetUtilityDepend(dgt));
+      vsTargetDepend.insert(this->GetUtilityDepend(dep));
       }
     }
 }
@@ -507,8 +507,7 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudioGenerator::GetUtilityDepend(
-    cmGeneratorTarget const* target)
+cmGlobalVisualStudioGenerator::GetUtilityDepend(cmTarget const* target)
 {
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
@@ -831,20 +830,21 @@ void RegisterVisualStudioMacros(const std::string& macrosFile,
     }
 }
 bool
-cmGlobalVisualStudioGenerator::TargetIsFortranOnly(
-        const cmGeneratorTarget* target)
+cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget const& target)
 {
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
+
   // check to see if this is a fortran build
   std::set<std::string> languages;
   {
   // Issue diagnostic if the source files depend on the config.
   std::vector<cmSourceFile*> sources;
-  if (!target->GetConfigCommonSourceFiles(sources))
+  if (!gt->GetConfigCommonSourceFiles(sources))
     {
     return false;
     }
   }
-  target->GetLanguages(languages, "");
+  gt->GetLanguages(languages, "");
   if(languages.size() == 1)
     {
     if(*languages.begin() == "Fortran")
@@ -892,7 +892,9 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
   for (TargetSet::const_iterator it = targets.begin();
        it != targets.end(); ++it)
     {
-    this->insert(*it);
+    cmGeneratorTarget* gt =
+        (*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
+    this->insert(gt);
     }
 }
 
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index d529e2f..41d0b88 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -73,7 +73,7 @@ public:
                              const char* vsSolutionFile = 0);
 
   // return true if target is fortran only
-  bool TargetIsFortranOnly(const cmGeneratorTarget *t);
+  bool TargetIsFortranOnly(cmTarget const& t);
 
   /** Get the top-level registry key for this VS version.  */
   std::string GetRegistryBase();
@@ -88,7 +88,7 @@ public:
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const { return false; }
 
-  class TargetSet: public std::set<cmGeneratorTarget const*> {};
+  class TargetSet: public std::set<cmTarget const*> {};
   class TargetCompare
   {
     std::string First;
@@ -122,16 +122,15 @@ protected:
 
   virtual bool ComputeTargetDepends();
   class VSDependSet: public std::set<std::string> {};
-  class VSDependMap: public std::map<cmGeneratorTarget const*, VSDependSet> {};
+  class VSDependMap: public std::map<cmTarget const*, VSDependSet> {};
   VSDependMap VSTargetDepends;
-  void ComputeVSTargetDepends(cmGeneratorTarget *);
-
-  bool CheckTargetLinks(cmGeneratorTarget& target, const std::string& name);
-  std::string GetUtilityForTarget(cmGeneratorTarget& target,
-                                  const std::string&);
-  virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
-  std::string GetUtilityDepend(cmGeneratorTarget const* target);
-  typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
+  void ComputeVSTargetDepends(cmTarget&);
+
+  bool CheckTargetLinks(cmTarget& target, const std::string& name);
+  std::string GetUtilityForTarget(cmTarget& target, const std::string&);
+  virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
+  std::string GetUtilityDepend(cmTarget const* target);
+  typedef std::map<cmTarget const*, std::string> UtilityDependsMap;
   UtilityDependsMap UtilityDepends;
 
 protected:
@@ -142,14 +141,13 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  void FollowLinkDepends(cmGeneratorTarget const* target,
-                         std::set<cmGeneratorTarget const*>& linked);
+  void FollowLinkDepends(cmTarget const* target,
+                         std::set<cmTarget const*>& linked);
 
-  class TargetSetMap: public std::map<cmGeneratorTarget*, TargetSet> {};
+  class TargetSetMap: public std::map<cmTarget*, TargetSet> {};
   TargetSetMap TargetLinkClosure;
-  void FillLinkClosure(const cmGeneratorTarget *target,
-                       TargetSet& linked);
-  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget* target);
+  void FillLinkClosure(cmTarget const* target, TargetSet& linked);
+  TargetSet const& GetTargetLinkClosure(cmTarget* target);
 };
 
 class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index d59fdc6..c9d53fe 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -83,14 +83,14 @@ void cmLocalVisualStudio10Generator::Generate()
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*l))
+       ->TargetIsFortranOnly(*(*l)->Target))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     else
       {
       cmVisualStudio10TargetGenerator tg(
-        *l, static_cast<cmGlobalVisualStudio10Generator*>(
+        (*l)->Target, static_cast<cmGlobalVisualStudio10Generator*>(
           this->GetGlobalGenerator()));
       tg.Generate();
       }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index d5abf68..a7f0616 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -841,7 +841,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
   event.Write(target->Target->GetPreBuildCommands());
   event.Write(target->Target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, false));
+    this->MaybeCreateImplibDir(*target->Target, configName, false));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -1935,7 +1935,7 @@ cmLocalVisualStudio6Generator
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio6Generator
-::ComputeLongestObjectDirectory(cmGeneratorTarget const*) const
+::ComputeLongestObjectDirectory(cmTarget&) const
 {
   // Compute the maximum length configuration name.
   std::string config_max;
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index d0c8239..4772d54 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -50,8 +50,7 @@ public:
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
-  virtual std::string ComputeLongestObjectDirectory(
-      cmGeneratorTarget const*) const;
+  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
 private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 139d7c3..4895698 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -34,8 +34,7 @@ public:
     LocalGenerator(e) {}
   typedef cmComputeLinkInformation::ItemVector ItemVector;
   void OutputLibraries(std::ostream& fout, ItemVector const& libs);
-  void OutputObjects(std::ostream& fout, cmGeneratorTarget* t,
-                     const char* isep = 0);
+  void OutputObjects(std::ostream& fout, cmTarget* t, const char* isep = 0);
 private:
   cmLocalVisualStudio7Generator* LocalGenerator;
 };
@@ -130,7 +129,8 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    if((*l)->GetType() == cmState::GLOBAL_TARGET)
+    cmTarget& tgt = *(*l)->Target;
+    if(tgt.GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
       cmCustomCommandLine force_command;
@@ -142,7 +142,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
-      force += (*l)->GetName();
+      force += tgt.GetName();
       force += "_force";
       if(cmSourceFile* file =
          this->Makefile->AddCustomCommandToOutput(
@@ -187,7 +187,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     // so don't build a projectfile for it
     if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     }
 }
@@ -225,7 +225,7 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio7Generator
-::CreateSingleVCProj(const std::string& lname, cmGeneratorTarget *target)
+::CreateSingleVCProj(const std::string& lname, cmTarget &target)
 {
   cmGlobalVisualStudioGenerator* gg
       = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
@@ -241,7 +241,7 @@ void cmLocalVisualStudio7Generator
     }
 
   // add to the list of projects
-  target->Target->SetProperty("GENERATOR_FILE_NAME",lname.c_str());
+  target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
   fname = this->GetCurrentBinaryDirectory();
@@ -324,9 +324,8 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 }
 
 void cmLocalVisualStudio7Generator::WriteConfigurations(
-    std::ostream& fout,
-    std::vector<std::string> const& configs,
-  const std::string& libName, cmGeneratorTarget *target
+  std::ostream& fout, std::vector<std::string> const& configs,
+  const std::string& libName, cmTarget &target
   )
 {
   fout << "\t<Configurations>\n";
@@ -644,7 +643,7 @@ private:
 void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
                                                 const std::string& configName,
                                                 const std::string& libName,
-                                                cmGeneratorTarget *target)
+                                                cmTarget &target)
 {
   const char* mfcFlag = this->Makefile->GetDefinition("CMAKE_MFC_FLAG");
   if(!mfcFlag)
@@ -665,7 +664,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   const char* projectType = 0;
   bool targetBuilds = true;
 
-  switch(target->GetType())
+  cmGeneratorTarget* gt =
+    this->GlobalGenerator->GetGeneratorTarget(&target);
+
+  switch(target.GetType())
     {
     case cmState::OBJECT_LIBRARY:
       targetBuilds = false; // no manifest tool for object library
@@ -697,12 +699,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     {
     const std::string& linkLanguage = (this->FortranProject?
                                        std::string("Fortran"):
-                                target->GetLinkerLanguage(configName));
+                                gt->GetLinkerLanguage(configName));
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
         ("CMake can not determine linker language for target: ",
-         target->GetName().c_str());
+         target.GetName().c_str());
       return;
       }
     if(linkLanguage == "C" || linkLanguage == "CXX"
@@ -728,12 +730,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       }
 
     // Add the target-specific flags.
-    this->AddCompileOptions(flags, target, linkLanguage, configName);
+    this->AddCompileOptions(flags, gt, linkLanguage, configName);
     }
 
   if(this->FortranProject)
     {
-    switch(this->GetFortranFormat(target->GetProperty("Fortran_FORMAT")))
+    switch(this->GetFortranFormat(target.GetProperty("Fortran_FORMAT")))
       {
       case FortranFormatFixed: flags += " -fixed"; break;
       case FortranFormatFree: flags += " -free"; break;
@@ -760,7 +762,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.Parse(defineFlags.c_str());
   targetOptions.ParseFinish();
   std::vector<std::string> targetDefines;
-  target->GetCompileDefinitions(targetDefines, configName, "CXX");
+  gt->GetCompileDefinitions(targetDefines, configName, "CXX");
   targetOptions.AddDefines(targetDefines);
   targetOptions.SetVerboseMakefile(
     this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));
@@ -772,22 +774,22 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->GetExportMacro())
+  if(const char* exportMacro = gt->GetExportMacro())
     {
     targetOptions.AddDefine(exportMacro);
     }
 
   // The intermediate directory name consists of a directory for the
   // target and a subdirectory for the configuration name.
-  std::string intermediateDir = this->GetTargetDirectory(target);
+  std::string intermediateDir = this->GetTargetDirectory(gt);
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target->Target->GetType() < cmState::UTILITY)
+  if (target.GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target->Target->GetType() == cmState::OBJECT_LIBRARY?
-      intermediateDir : target->GetDirectory(configName);
+      target.GetType() == cmState::OBJECT_LIBRARY?
+      intermediateDir : gt->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
     }
@@ -802,7 +804,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if (this->FortranProject)
     {
     // Intel Fortran >= 15.0 uses TargetName property.
-    std::string targetNameFull = target->GetFullName(configName);
+    std::string targetNameFull = gt->GetFullName(configName);
     std::string targetName =
       cmSystemTools::GetFilenameWithoutLastExtension(targetNameFull);
     std::string targetExt =
@@ -837,7 +839,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if(this->FortranProject)
     {
     const char* target_mod_dir =
-      target->Target->GetProperty("Fortran_MODULE_DIRECTORY");
+      target.GetProperty("Fortran_MODULE_DIRECTORY");
     std::string modDir;
     if(target_mod_dir)
       {
@@ -856,7 +858,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
   fout << "\t\t\t\tAdditionalIncludeDirectories=\"";
   std::vector<std::string> includes;
-  this->GetIncludeDirectories(includes, target, "C", configName);
+  this->GetIncludeDirectories(includes, gt, "C", configName);
   std::vector<std::string>::iterator i = includes.begin();
   for(;i != includes.end(); ++i)
     {
@@ -877,10 +879,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target->Target->GetType() <= cmState::OBJECT_LIBRARY)
+  if(target.GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
-    std::string pdb = target->GetCompilePDBPath(configName);
+    std::string pdb = gt->GetCompilePDBPath(configName);
     if(!pdb.empty())
       {
       fout <<  "\t\t\t\tProgramDataBaseFileName=\""
@@ -984,7 +986,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       "\t\t\t\tName=\"" << manifestTool << "\"";
 
     std::vector<cmSourceFile const*> manifest_srcs;
-    target->GetManifests(manifest_srcs, configName);
+    gt->GetManifests(manifest_srcs, configName);
     if (!manifest_srcs.empty())
       {
       fout << "\n\t\t\t\tAdditionalManifestFiles=\"";
@@ -999,7 +1001,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
     // Check if we need the FAT32 workaround.
     // Check the filesystem type where the target will be written.
-    if (cmLVS6G_IsFAT(target->GetDirectory(configName).c_str()))
+    if (cmLVS6G_IsFAT(gt->GetDirectory(configName).c_str()))
       {
       // Add a flag telling the manifest tool to use a workaround
       // for FAT32 file systems, which can cause an empty manifest
@@ -1033,28 +1035,28 @@ cmLocalVisualStudio7Generator
 }
 
 void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
-  const std::string& configName, cmGeneratorTarget* target,
+  const std::string& configName, cmTarget &target,
   const Options& targetOptions)
 {
   cmGlobalVisualStudio7Generator* gg =
     static_cast<cmGlobalVisualStudio7Generator*>(this->GlobalGenerator);
   std::string temp;
   std::string extraLinkOptions;
-  if(target->GetType() == cmState::EXECUTABLE)
+  if(target.GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_EXE_LINKER_FLAGS", configName);
     }
-  if(target->GetType() == cmState::SHARED_LIBRARY)
+  if(target.GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_SHARED_LINKER_FLAGS", configName);
     }
-  if(target->GetType() == cmState::MODULE_LIBRARY)
+  if(target.GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS")
@@ -1062,7 +1064,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       + GetBuildTypeLinkerFlags("CMAKE_MODULE_LINKER_FLAGS", configName);
     }
 
-  const char* targetLinkFlags = target->GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1071,7 +1073,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
   std::string configTypeUpper = cmSystemTools::UpperCase(configName);
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += configTypeUpper;
-  targetLinkFlags = target->GetProperty(linkFlagsConfig.c_str());
+  targetLinkFlags = target.GetProperty(linkFlagsConfig.c_str());
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1091,26 +1093,28 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       this->ConvertToOutputFormat(this->ModuleDefinitionFile, SHELL);
     linkOptions.AddFlag("ModuleDefinitionFile", defFile.c_str());
     }
+  cmGeneratorTarget* gt =
+    this->GlobalGenerator->GetGeneratorTarget(&target);
 
-  if (target->GetType() == cmState::SHARED_LIBRARY &&
+  if (target.GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)/exportall.def");
       }
     }
-  switch(target->GetType())
+  switch(target.GetType())
     {
     case cmState::UNKNOWN_LIBRARY:
       break;
     case cmState::OBJECT_LIBRARY:
       {
-      std::string libpath = this->GetTargetDirectory(target);
+      std::string libpath = this->GetTargetDirectory(gt);
       libpath += "/";
       libpath += configName;
       libpath += "/";
-      libpath += target->GetName();
+      libpath += target.GetName();
       libpath += ".lib";
       const char* tool =
         this->FortranProject? "VFLibrarianTool":"VCLibrarianTool";
@@ -1122,8 +1126,8 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     case cmState::STATIC_LIBRARY:
     {
-    std::string targetNameFull = target->GetFullName(configName);
-    std::string libpath = target->GetDirectory(configName);
+    std::string targetNameFull = gt->GetFullName(configName);
+    std::string libpath = gt->GetDirectory(configName);
     libpath += "/";
     libpath += targetNameFull;
     const char* tool = "VCLibrarianTool";
@@ -1138,14 +1142,14 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
         || this->FortranProject)
       {
       std::ostringstream libdeps;
-      this->Internal->OutputObjects(libdeps, target);
+      this->Internal->OutputObjects(libdeps, &target);
       if(!libdeps.str().empty())
         {
         fout << "\t\t\t\tAdditionalDependencies=\"" << libdeps.str() << "\"\n";
         }
       }
     std::string libflags;
-    this->GetStaticLibraryFlags(libflags, configTypeUpper, target);
+    this->GetStaticLibraryFlags(libflags, configTypeUpper, gt);
     if(!libflags.empty())
       {
       fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
@@ -1162,11 +1166,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    target->GetLibraryNames(targetName, targetNameSO, targetNameFull,
+    gt->GetLibraryNames(targetName, targetNameSO, targetNameFull,
                            targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1198,22 +1202,22 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, target, " ");
+      this->Internal->OutputObjects(fout, &target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = target->GetDirectory(configName);
+    temp = gt->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, target);
+    this->WriteTargetVersionAttribute(fout, gt);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
-    temp = target->GetPDBDirectory(configName);
+    temp = gt->GetPDBDirectory(configName);
     temp += "/";
     temp += targetNamePDB;
     fout << "\t\t\t\tProgramDatabaseFile=\"" <<
@@ -1241,7 +1245,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal  << "\"\n";
       }
-    temp = target->GetDirectory(configName, true);
+    temp = gt->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1259,11 +1263,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    target->GetExecutableNames(targetName, targetNameFull,
+    gt->GetExecutableNames(targetName, targetNameFull,
                               targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1271,7 +1275,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     cmComputeLinkInformation& cli = *pcli;
     std::string linkLanguage = cli.GetLinkLanguage();
 
-    bool isWin32Executable = target->GetPropertyAsBool("WIN32_EXECUTABLE");
+    bool isWin32Executable = target.GetPropertyAsBool("WIN32_EXECUTABLE");
 
     // Compute the variable name to lookup standard libraries for this
     // language.
@@ -1297,23 +1301,23 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, target, " ");
+      this->Internal->OutputObjects(fout, &target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = target->GetDirectory(configName);
+    temp = gt->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, target);
+    this->WriteTargetVersionAttribute(fout, gt);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
     std::string path = this->ConvertToXMLOutputPathSingle(
-      target->GetPDBDirectory(configName).c_str());
+      gt->GetPDBDirectory(configName).c_str());
     fout << "\t\t\t\tProgramDatabaseFile=\""
          << path << "/" << targetNamePDB
          << "\"\n";
@@ -1360,7 +1364,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal << "\"";
       }
-    temp = target->GetDirectory(configName, true);
+    temp = gt->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1411,11 +1415,13 @@ cmLocalVisualStudio7GeneratorInternals
 //----------------------------------------------------------------------------
 void
 cmLocalVisualStudio7GeneratorInternals
-::OutputObjects(std::ostream& fout, cmGeneratorTarget* gt, const char* isep)
+::OutputObjects(std::ostream& fout, cmTarget* t, const char* isep)
 {
   // VS < 8 does not support per-config source locations so we
   // list object library content on the link line instead.
   cmLocalVisualStudio7Generator* lg = this->LocalGenerator;
+  cmGeneratorTarget* gt =
+    lg->GetGlobalGenerator()->GetGeneratorTarget(t);
   std::vector<std::string> objs;
   gt->UseObjectLibraries(objs, "");
   const char* sep = isep? isep : "";
@@ -1472,7 +1478,7 @@ cmLocalVisualStudio7Generator
 
 void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
                                                     const std::string& libName,
-                                                    cmGeneratorTarget* target)
+                                                    cmTarget &target)
 {
   std::vector<std::string> configs;
   this->Makefile->GetConfigurations(configs);
@@ -1480,10 +1486,13 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
   // We may be modifying the source groups temporarily, so make a copy.
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
+  cmGeneratorTarget* gt =
+    this->GlobalGenerator->GetGeneratorTarget(&target);
+
   // get the classes from the source lists then add them to the groups
   this->ModuleDefinitionFile = "";
   std::vector<cmSourceFile*> classes;
-  if (!target->GetConfigCommonSourceFiles(classes))
+  if (!gt->GetConfigCommonSourceFiles(classes))
     {
     return;
     }
@@ -1526,7 +1535,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
     // VS >= 8 support per-config source locations so we
     // list object library content as external objects.
     std::vector<std::string> objs;
-    target->UseObjectLibraries(objs, "");
+    gt->UseObjectLibraries(objs, "");
     if(!objs.empty())
       {
       // TODO: Separate sub-filter for each object library used?
@@ -1561,7 +1570,7 @@ class cmLocalVisualStudio7GeneratorFCInfo
 {
 public:
   cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmGeneratorTarget* target,
+                                      cmTarget& target,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs);
   std::map<std::string, cmLVS7GFileConfig> FileConfigMap;
@@ -1569,10 +1578,12 @@ public:
 
 cmLocalVisualStudio7GeneratorFCInfo
 ::cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmGeneratorTarget* gt,
+                                      cmTarget& target,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs)
 {
+  cmGeneratorTarget* gt =
+    lg->GetGlobalGenerator()->GetGeneratorTarget(&target);
   std::string objectName;
   if(gt->HasExplicitObjectName(&sf))
     {
@@ -1689,10 +1700,10 @@ cmLocalVisualStudio7GeneratorFCInfo
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio7Generator
-::ComputeLongestObjectDirectory(const cmGeneratorTarget *target) const
+::ComputeLongestObjectDirectory(cmTarget& target) const
 {
   std::vector<std::string> configs;
-  target->Target->GetMakefile()->GetConfigurations(configs);
+  target.GetMakefile()->GetConfigurations(configs);
 
   // Compute the maximum length configuration name.
   std::string config_max;
@@ -1711,7 +1722,9 @@ cmLocalVisualStudio7Generator
   std::string dir_max;
   dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
-  dir_max += this->GetTargetDirectory(target);
+  cmGeneratorTarget* gt =
+    this->GlobalGenerator->GetGeneratorTarget(&target);
+  dir_max += this->GetTargetDirectory(gt);
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
@@ -1719,7 +1732,7 @@ cmLocalVisualStudio7Generator
 }
 
 bool cmLocalVisualStudio7Generator
-::WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
+::WriteGroup(const cmSourceGroup *sg, cmTarget& target,
              std::ostream &fout, const std::string& libName,
              std::vector<std::string> const& configs)
 {
@@ -1754,14 +1767,15 @@ bool cmLocalVisualStudio7Generator
     }
 
   // Loop through each source in the source group.
+  std::string objectName;
   for(std::vector<const cmSourceFile *>::const_iterator sf =
         sourceFiles.begin(); sf != sourceFiles.end(); ++sf)
     {
     std::string source = (*sf)->GetFullPath();
     FCInfo fcinfo(this, target, *(*sf), configs);
 
-    if (source != libName || target->GetType() == cmState::UTILITY ||
-      target->GetType() == cmState::GLOBAL_TARGET )
+    if (source != libName || target.GetType() == cmState::UTILITY ||
+      target.GetType() == cmState::GLOBAL_TARGET )
       {
       fout << "\t\t\t<File\n";
       std::string d = this->ConvertToXMLOutputPathSingle(source.c_str());
@@ -2008,10 +2022,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjEndGroup(std::ostream& fout)
 void cmLocalVisualStudio7Generator
 ::OutputTargetRules(std::ostream& fout,
                     const std::string& configName,
-                    cmGeneratorTarget *target,
+                    cmTarget &target,
                     const std::string& /*libName*/)
 {
-  if (target->GetType() > cmState::GLOBAL_TARGET)
+  if (target.GetType() > cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -2021,35 +2035,36 @@ void cmLocalVisualStudio7Generator
   const char* tool =
     this->FortranProject? "VFPreBuildEventTool":"VCPreBuildEventTool";
   event.Start(tool);
-  event.Write(target->Target->GetPreBuildCommands());
+  event.Write(target.GetPreBuildCommands());
   event.Finish();
 
   // Add pre-link event.
   tool = this->FortranProject? "VFPreLinkEventTool":"VCPreLinkEventTool";
   event.Start(tool);
   bool addedPrelink = false;
-  if (target->GetType() == cmState::SHARED_LIBRARY &&
+  if (target.GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        target->Target->GetPreLinkCommands();
+        target.GetPreLinkCommands();
       cmGlobalVisualStudioGenerator* gg
         = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
+      cmGeneratorTarget* gt =
+        this->GlobalGenerator->GetGeneratorTarget(&target);
       gg->AddSymbolExportCommand(
-        target, commands, configName);
+        gt, commands, configName);
       event.Write(commands);
       }
     }
   if (!addedPrelink)
     {
-    event.Write(target->Target->GetPreLinkCommands());
+    event.Write(target.GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target,
-                               configName, this->FortranProject));
+    this->MaybeCreateImplibDir(target, configName, this->FortranProject));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -2059,18 +2074,18 @@ void cmLocalVisualStudio7Generator
   // Add post-build event.
   tool = this->FortranProject? "VFPostBuildEventTool":"VCPostBuildEventTool";
   event.Start(tool);
-  event.Write(target->Target->GetPostBuildCommands());
+  event.Write(target.GetPostBuildCommands());
   event.Finish();
 }
 
 void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
-                                                    cmGeneratorTarget* target)
+                                                    cmTarget& target)
 {
   // if we have all the required Source code control tags
   // then add that to the project
-  const char* vsProjectname = target->GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalpath = target->GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = target->GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectname = target.GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalpath = target.GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
 
   if(vsProvider && vsLocalpath && vsProjectname)
     {
@@ -2078,7 +2093,7 @@ void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
          << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
          << "\tSccProvider=\"" << vsProvider << "\"\n";
 
-    const char* vsAuxPath = target->GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath = target.GetProperty("VS_SCC_AUXPATH");
     if(vsAuxPath)
       {
       fout << "\tSccAuxPath=\"" << vsAuxPath << "\"\n";
@@ -2090,7 +2105,7 @@ void
 cmLocalVisualStudio7Generator
 ::WriteProjectStartFortran(std::ostream& fout,
                            const std::string& libName,
-                           cmGeneratorTarget *target)
+                           cmTarget & target)
 {
 
   cmGlobalVisualStudio7Generator* gg =
@@ -2100,13 +2115,13 @@ cmLocalVisualStudio7Generator
        << "<VisualStudioProject\n"
        << "\tProjectCreator=\"Intel Fortran\"\n"
        << "\tVersion=\"" << gg->GetIntelProjectVersion() << "\"\n";
-  const char* keyword = target->GetProperty("VS_KEYWORD");
+  const char* keyword = target.GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Console Application";
     }
   const char* projectType = 0;
-  switch(target->GetType())
+  switch(target.GetType())
     {
     case cmState::STATIC_LIBRARY:
       projectType = "typeStaticLibrary";
@@ -2151,7 +2166,7 @@ cmLocalVisualStudio7Generator
 void
 cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
                                                  const std::string& libName,
-                                                 cmGeneratorTarget *target,
+                                                 cmTarget & target,
                                                  std::vector<cmSourceGroup> &)
 {
   if(this->FortranProject)
@@ -2175,12 +2190,12 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     {
     fout <<  "\tVersion=\"" << (gg->GetVersion()/10) << ".00\"\n";
     }
-  const char* projLabel = target->GetProperty("PROJECT_LABEL");
+  const char* projLabel = target.GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = libName.c_str();
     }
-  const char* keyword = target->GetProperty("VS_KEYWORD");
+  const char* keyword = target.GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Win32Proj";
@@ -2192,7 +2207,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     }
   this->WriteProjectSCC(fout, target);
   if(const char* targetFrameworkVersion =
-     target->GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
+     target.GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     fout << "\tTargetFrameworkVersion=\"" << targetFrameworkVersion << "\"\n";
     }
@@ -2213,13 +2228,12 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
 }
 
 
-void cmLocalVisualStudio7Generator::WriteVCProjFooter(
-    std::ostream& fout,
-    cmGeneratorTarget *target)
+void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream& fout,
+                                                      cmTarget &target)
 {
   fout << "\t<Globals>\n";
 
-  cmPropertyMap const& props = target->Target->GetProperties();
+  cmPropertyMap const& props = target.GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     if(i->first.find("VS_GLOBAL_") == 0)
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index b282098..16cf004 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -15,6 +15,7 @@
 #include "cmLocalVisualStudioGenerator.h"
 #include "cmVisualStudioGeneratorOptions.h"
 
+class cmTarget;
 class cmSourceFile;
 class cmCustomCommand;
 class cmSourceGroup;
@@ -56,15 +57,13 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   cmSourceFile* CreateVCProjBuildRule();
   void WriteStampFiles();
-  virtual std::string ComputeLongestObjectDirectory(
-      cmGeneratorTarget const*) const;
+  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
 
   virtual void ReadAndStoreExternalGUID(const std::string& name,
                                         const char* path);
   virtual void AddCMakeListsRules();
 protected:
-  void CreateSingleVCProj(const std::string& lname,
-                          cmGeneratorTarget *tgt);
+  void CreateSingleVCProj(const std::string& lname, cmTarget &tgt);
 private:
   typedef cmVisualStudioGeneratorOptions Options;
   typedef cmLocalVisualStudio7GeneratorFCInfo FCInfo;
@@ -73,33 +72,30 @@ private:
   void FixGlobalTargets();
   void WriteProjectFiles();
   void WriteVCProjHeader(std::ostream& fout, const std::string& libName,
-                         cmGeneratorTarget* tgt,
-                         std::vector<cmSourceGroup> &sgs);
-  void WriteVCProjFooter(std::ostream& fout, cmGeneratorTarget* target);
+                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
+  void WriteVCProjFooter(std::ostream& fout, cmTarget &target);
   void WriteVCProjFile(std::ostream& fout, const std::string& libName,
-                       cmGeneratorTarget* tgt);
+                       cmTarget &tgt);
   void WriteConfigurations(std::ostream& fout,
                            std::vector<std::string> const& configs,
-                           const std::string& libName, cmGeneratorTarget* tgt);
+                           const std::string& libName, cmTarget &tgt);
   void WriteConfiguration(std::ostream& fout,
                           const std::string& configName,
-                          const std::string& libName, cmGeneratorTarget* tgt);
+                          const std::string& libName, cmTarget &tgt);
   std::string EscapeForXML(const std::string& s);
   std::string ConvertToXMLOutputPath(const char* path);
   std::string ConvertToXMLOutputPathSingle(const char* path);
   void OutputTargetRules(std::ostream& fout, const std::string& configName,
-                         cmGeneratorTarget* target,
-                         const std::string& libName);
+                         cmTarget &target, const std::string& libName);
   void OutputBuildTool(std::ostream& fout, const std::string& configName,
-                       cmGeneratorTarget* t, const Options& targetOptions);
+                       cmTarget& t, const Options& targetOptions);
   void OutputLibraryDirectories(std::ostream& fout,
                                 std::vector<std::string> const& dirs);
-  void WriteProjectSCC(std::ostream& fout, cmGeneratorTarget *target);
+  void WriteProjectSCC(std::ostream& fout, cmTarget& target);
   void WriteProjectStart(std::ostream& fout, const std::string& libName,
-                         cmGeneratorTarget* tgt,
-                         std::vector<cmSourceGroup> &sgs);
+                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
   void WriteProjectStartFortran(std::ostream& fout, const std::string& libName,
-                                cmGeneratorTarget* tgt);
+                                cmTarget &tgt);
   void WriteVCProjBeginGroup(std::ostream& fout,
                           const char* group,
                           const char* filter);
@@ -114,7 +110,7 @@ private:
                                    cmGeneratorTarget* gt);
 
   bool WriteGroup(const cmSourceGroup *sg,
-                  cmGeneratorTarget* target, std::ostream &fout,
+                  cmTarget& target, std::ostream &fout,
                   const std::string& libName,
                   std::vector<std::string> const& configs);
 
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index f0be658..2f44fb7 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -43,7 +43,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const* gt)
 {
-  std::string dir_max = this->ComputeLongestObjectDirectory(gt);
+  std::string dir_max = this->ComputeLongestObjectDirectory(*gt->Target);
 
   // Count the number of object files with each name.  Note that
   // windows file names are not case sensitive.
@@ -80,7 +80,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCustomCommand>
-cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmGeneratorTarget *target,
+cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
                                                    const std::string& config,
                                                    bool isFortran)
 {
@@ -89,11 +89,13 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmGeneratorTarget *target,
   // If an executable exports symbols then VS wants to create an
   // import library but forgets to create the output directory.
   // The Intel Fortran plugin always forgets to the directory.
-  if(target->GetType() != cmState::EXECUTABLE &&
-     !(isFortran && target->GetType() == cmState::SHARED_LIBRARY))
+  if(target.GetType() != cmState::EXECUTABLE &&
+     !(isFortran && target.GetType() == cmState::SHARED_LIBRARY))
     { return pcc; }
-  std::string outDir = target->GetDirectory(config, false);
-  std::string impDir = target->GetDirectory(config, true);
+  cmGeneratorTarget* gt =
+      this->GetGlobalGenerator()->GetGeneratorTarget(&target);
+  std::string outDir = gt->GetDirectory(config, false);
+  std::string impDir = gt->GetDirectory(config, true);
   if(impDir == outDir) { return pcc; }
 
   // Add a pre-build event to create the directory.
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 21071e6..071bfb3 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -44,8 +44,7 @@ public:
 
   cmGlobalVisualStudioGenerator::VSVersion GetVersion() const;
 
-  virtual std::string ComputeLongestObjectDirectory(
-      cmGeneratorTarget const*) const = 0;
+  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const = 0;
 
   virtual void AddCMakeListsRules() = 0;
 
@@ -59,7 +58,7 @@ protected:
 
   /** Construct a custom command to make exe import lib dir.  */
   cmsys::auto_ptr<cmCustomCommand>
-  MaybeCreateImplibDir(cmGeneratorTarget* target, const std::string& config,
+  MaybeCreateImplibDir(cmTarget& target, const std::string& config,
                        bool isFortran);
 };
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 9c9f5ab..f4c632d 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -13,6 +13,7 @@
 #include "cmVisualStudio10TargetGenerator.h"
 #include "cmGlobalVisualStudio10Generator.h"
 #include "cmGeneratorTarget.h"
+#include "cmTarget.h"
 #include "cmComputeLinkInformation.h"
 #include "cmGeneratedFileStream.h"
 #include "cmMakefile.h"
@@ -166,12 +167,13 @@ static std::string cmVS10EscapeComment(std::string comment)
 }
 
 cmVisualStudio10TargetGenerator::
-cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
+cmVisualStudio10TargetGenerator(cmTarget* target,
                                 cmGlobalVisualStudio10Generator* gg)
 {
   this->GlobalGenerator = gg;
-  this->GeneratorTarget = target;
-  this->Makefile = target->Target->GetMakefile();
+  this->Target = target;
+  this->GeneratorTarget = gg->GetGeneratorTarget(target);
+  this->Makefile = target->GetMakefile();
   this->Makefile->GetConfigurations(this->Configurations);
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
@@ -273,9 +275,8 @@ void cmVisualStudio10TargetGenerator::Generate()
     return;
     }
   // Tell the global generator the name of the project file
-  this->GeneratorTarget->Target
-      ->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
-  this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
+  this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
+  this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
   if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
     {
@@ -731,8 +732,7 @@ void cmVisualStudio10TargetGenerator
   cmGlobalVisualStudio10Generator* gg =
     static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
   const char* mfcFlag =
-    this->GeneratorTarget->
-      Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
+    this->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
   std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
 
   std::string useOfMfcValue = "false";
@@ -1462,8 +1462,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
       }
     else
       {
-      this->GlobalGenerator->PathTooLong(this->GeneratorTarget,
-                                         sf, sourceRel);
+      this->GlobalGenerator->PathTooLong(this->Target, sf, sourceRel);
       }
     }
   this->ConvertToWindowsSlash(sourceFile);
@@ -1916,12 +1915,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
     std::string baseFlagVar = "CMAKE_";
     baseFlagVar += linkLanguage;
     baseFlagVar += "_FLAGS";
-    flags = this->GeneratorTarget->
+    flags = this->
       Target->GetMakefile()->GetRequiredDefinition(baseFlagVar.c_str());
     std::string flagVar = baseFlagVar + std::string("_") +
       cmSystemTools::UpperCase(configName);
     flags += " ";
-    flags += this->GeneratorTarget->
+    flags += this->
       Target->GetMakefile()->GetRequiredDefinition(flagVar.c_str());
     }
   // set the correct language
@@ -1937,8 +1936,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
                                           linkLanguage, configName.c_str());
 
   // Get preprocessor definitions for this directory.
-  std::string defineFlags =
-      this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
+  std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags();
   if(this->MSTools)
     {
     clOptions.FixExceptionHandlingDefault();
@@ -2442,11 +2440,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   linkFlagVarBase += linkType;
   linkFlagVarBase += "_LINKER_FLAGS";
   flags += " ";
-  flags += this->GeneratorTarget->
+  flags += this->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVarBase.c_str());
   std::string linkFlagVar = linkFlagVarBase + "_" + CONFIG;
   flags += " ";
-  flags += this->GeneratorTarget->
+  flags += this->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
   const char* targetLinkFlags =
       this->GeneratorTarget->GetProperty("LINK_FLAGS");
@@ -2676,8 +2674,7 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
   linkOptions.OutputFlagMap(*this->BuildFileStream, "      ");
 
   this->WriteString("</Link>\n", 2);
-  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
-              this->GeneratorTarget))
+  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(*this->Target))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(
@@ -2814,7 +2811,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        this->GeneratorTarget->Target->GetPreLinkCommands();
+        this->Target->GetPreLinkCommands();
       this->GlobalGenerator->AddSymbolExportCommand(
         this->GeneratorTarget, commands, configName);
       this->WriteEvent("PreLinkEvent", commands, configName);
@@ -2823,12 +2820,12 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (!addedPrelink)
     {
     this->WriteEvent("PreLinkEvent",
-        this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
+                     this->Target->GetPreLinkCommands(), configName);
     }
   this->WriteEvent("PreBuildEvent",
-        this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
+                   this->Target->GetPreBuildCommands(), configName);
   this->WriteEvent("PostBuildEvent",
-        this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
+                   this->Target->GetPostBuildCommands(), configName);
 }
 
 void cmVisualStudio10TargetGenerator::WriteEvent(
@@ -2878,7 +2875,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
   for( OrderedTargetDependSet::const_iterator i = depends.begin();
        i != depends.end(); ++i)
     {
-    cmGeneratorTarget const* dt = *i;
+    cmTarget const* dt = (*i)->Target;
     if(dt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -2886,12 +2883,12 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     // skip fortran targets as they can not be processed by MSBuild
     // the only reference will be in the .sln file
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(dt))
+       ->TargetIsFortranOnly(*dt))
       {
       continue;
       }
     this->WriteString("<ProjectReference Include=\"", 2);
-    cmLocalGenerator* lg = dt->GetLocalGenerator();
+    cmMakefile* mf = dt->GetMakefile();
     std::string name = dt->GetName();
     std::string path;
     const char* p = dt->GetProperty("EXTERNAL_MSPROJECT");
@@ -2901,7 +2898,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
       }
     else
       {
-      path =  lg->GetCurrentBinaryDirectory();
+      path =  mf->GetCurrentBinaryDirectory();
       path += "/";
       path += dt->GetName();
       path += ".vcxproj";
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 044e0dd..15ed9f2 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -13,6 +13,7 @@
 #define cmVisualStudioTargetGenerator_h
 #include "cmStandardIncludes.h"
 
+class cmTarget;
 class cmMakefile;
 class cmGeneratorTarget;
 class cmGeneratedFileStream;
@@ -28,7 +29,7 @@ struct cmIDEFlagTable;
 class cmVisualStudio10TargetGenerator
 {
 public:
-  cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
+  cmVisualStudio10TargetGenerator(cmTarget* target,
                                   cmGlobalVisualStudio10Generator* gg);
   ~cmVisualStudio10TargetGenerator();
   void Generate();
@@ -147,6 +148,7 @@ private:
   OptionsMap LinkOptions;
   std::string PathToVcxproj;
   std::vector<std::string> Configurations;
+  cmTarget* Target;
   cmGeneratorTarget* GeneratorTarget;
   cmMakefile* Makefile;
   std::string Platform;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |   12 +-
 Source/cmGlobalVisualStudio10Generator.h   |    4 +-
 Source/cmGlobalVisualStudio6Generator.cxx  |    9 +-
 Source/cmGlobalVisualStudio6Generator.h    |    2 +-
 Source/cmGlobalVisualStudio71Generator.cxx |   12 +-
 Source/cmGlobalVisualStudio71Generator.h   |    4 +-
 Source/cmGlobalVisualStudio7Generator.cxx  |   38 ++---
 Source/cmGlobalVisualStudio7Generator.h    |    9 +-
 Source/cmGlobalVisualStudio8Generator.cxx  |   14 +-
 Source/cmGlobalVisualStudio8Generator.h    |    5 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |   84 +++++------
 Source/cmGlobalVisualStudioGenerator.h     |   32 ++---
 Source/cmLocalVisualStudio10Generator.cxx  |    6 +-
 Source/cmLocalVisualStudio6Generator.cxx   |    4 +-
 Source/cmLocalVisualStudio6Generator.h     |    3 +-
 Source/cmLocalVisualStudio7Generator.cxx   |  210 +++++++++++++++-------------
 Source/cmLocalVisualStudio7Generator.h     |   32 ++---
 Source/cmLocalVisualStudioGenerator.cxx    |   14 +-
 Source/cmLocalVisualStudioGenerator.h      |    5 +-
 Source/cmVisualStudio10TargetGenerator.cxx |   49 +++----
 Source/cmVisualStudio10TargetGenerator.h   |    4 +-
 21 files changed, 277 insertions(+), 275 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Thu Oct 22 17:13:08 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Thu, 22 Oct 2015 17:13:08 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-901-g36f0c5e
Message-ID: <20151022211308.7598BBFA27@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  36f0c5e076363d2fbc66dc474f977c1ba32f461d (commit)
       via  252e10e0ac05f082269be461ad522e32c84b568c (commit)
      from  f271764c40abbc481d9920e907b7a547ffe313fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36f0c5e076363d2fbc66dc474f977c1ba32f461d
commit 36f0c5e076363d2fbc66dc474f977c1ba32f461d
Merge: f271764 252e10e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 17:13:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 17:13:07 2015 -0400

    Merge topic 'use-generator-target' into next
    
    252e10e0 VS6: Port to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=252e10e0ac05f082269be461ad522e32c84b568c
commit 252e10e0ac05f082269be461ad522e32c84b568c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 23:12:56 2015 +0200

    VS6: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 12eccf9..9e411c9 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -223,7 +223,7 @@ void cmGlobalVisualStudio6Generator
         tt = orderedProjectTargets.begin();
       tt != orderedProjectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -235,14 +235,15 @@ void cmGlobalVisualStudio6Generator
       std::string project = target->GetName();
       std::string location = expath;
       this->WriteExternalProject(fout, project.c_str(),
-                                 location.c_str(), target->GetUtilities());
+          location.c_str(), target->Target->GetUtilities());
       }
     else
       {
       std::string dspname = GetVS6TargetName(target->GetName());
-      std::string dir = target->GetMakefile()->GetCurrentBinaryDirectory();
+      std::string dir =
+          target->GetLocalGenerator()->GetCurrentBinaryDirectory();
       dir = root->Convert(dir.c_str(), cmLocalGenerator::START_OUTPUT);
-      this->WriteProject(fout, dspname.c_str(), dir.c_str(), *target);
+      this->WriteProject(fout, dspname.c_str(), dir.c_str(), target);
       }
     }
 
@@ -287,9 +288,9 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile()
 // Note, that dependencies from executables to
 // the libraries it uses are also done here
 void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
-                                                  const std::string& dspname,
-                                                  const char* dir,
-                                                  cmTarget const& target)
+                                            const std::string& dspname,
+                                            const char* dir,
+                                            const cmGeneratorTarget *target)
 {
   fout << "#########################################################"
     "######################\n\n";
@@ -298,7 +299,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -309,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -382,7 +383,7 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index e9b24ea..edf637f 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -15,8 +15,6 @@
 #include "cmGlobalVisualStudioGenerator.h"
 #include "cmGlobalGeneratorFactory.h"
 
-class cmTarget;
-
 /** \class cmGlobalVisualStudio6Generator
  * \brief Write a Unix makefiles.
  *
@@ -94,7 +92,7 @@ private:
   void WriteDSWHeader(std::ostream& fout);
   void WriteProject(std::ostream& fout,
                     const std::string& name, const char* path,
-                    cmTarget const& t);
+                    cmGeneratorTarget const* t);
   void WriteExternalProject(std::ostream& fout,
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 773e555..a7f0616 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
       this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
     if (!cmSystemTools::IsOn(suppRegenRule))
       {
-      this->AddDSPBuildRule(*(*l)->Target);
+      this->AddDSPBuildRule(*l);
       }
     }
 }
@@ -133,21 +133,21 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       case cmState::STATIC_LIBRARY:
       case cmState::OBJECT_LIBRARY:
         this->SetBuildType(STATIC_LIBRARY,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::SHARED_LIBRARY:
       case cmState::MODULE_LIBRARY:
         this->SetBuildType(DLL,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::EXECUTABLE:
         this->SetBuildType(EXECUTABLE,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::UTILITY:
       case cmState::GLOBAL_TARGET:
         this->SetBuildType(UTILITY,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::INTERFACE_LIBRARY:
         continue;
@@ -173,7 +173,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
           cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
-      this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleDSP((*l)->GetName().c_str(), *l);
       }
     }
 }
@@ -184,7 +184,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 extern std::string GetVS6TargetName(const std::string& targetName);
 
 void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
-                                                    cmTarget &target)
+                                                    cmGeneratorTarget* target)
 {
   // add to the list of projects
   std::string pname = GetVS6TargetName(lname);
@@ -211,9 +211,9 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 }
 
 
-void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
+void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmGeneratorTarget *tgt)
 {
-  std::string dspname = GetVS6TargetName(tgt.GetName());
+  std::string dspname = GetVS6TargetName(tgt->GetName());
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
@@ -245,8 +245,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
                                            no_working_directory, true);
   if(this->Makefile->GetSource(makefileIn.c_str()))
     {
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&tgt);
-    gt->AddSource(makefileIn);
+    tgt->AddSource(makefileIn);
     }
   else
     {
@@ -257,7 +256,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
 
 void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
                                                  const std::string& libName,
-                                                 cmTarget &target)
+                                                 cmGeneratorTarget *target)
 {
   // For utility targets need custom command since pre- and post-
   // build does not do anything in Visual Studio 6.  In order for the
@@ -265,23 +264,23 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // special care for dependencies.  The first rule must depend on all
   // the dependencies of all the rules.  The later rules must each
   // depend only on the previous rule.
-  if ((target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET) &&
-      (!target.GetPreBuildCommands().empty() ||
-       !target.GetPostBuildCommands().empty()))
+  if ((target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET) &&
+      (!target->Target->GetPreBuildCommands().empty() ||
+       !target->Target->GetPostBuildCommands().empty()))
     {
     // Accumulate the dependencies of all the commands.
     std::vector<std::string> depends;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPreBuildCommands().begin();
-         cr != target.GetPreBuildCommands().end(); ++cr)
+           target->Target->GetPreBuildCommands().begin();
+         cr != target->Target->GetPreBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPostBuildCommands().begin();
-         cr != target.GetPostBuildCommands().end(); ++cr)
+           target->Target->GetPostBuildCommands().begin();
+         cr != target->Target->GetPostBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
@@ -290,14 +289,14 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
     // Add the pre- and post-build commands in order.
     int count = 1;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPreBuildCommands().begin();
-         cr != target.GetPreBuildCommands().end(); ++cr)
+           target->Target->GetPreBuildCommands().begin();
+         cr != target->Target->GetPreBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPostBuildCommands().begin();
-         cr != target.GetPostBuildCommands().end(); ++cr)
+           target->Target->GetPostBuildCommands().begin();
+         cr != target->Target->GetPostBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
@@ -306,12 +305,9 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // We may be modifying the source groups temporarily, so make a copy.
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // get the classes from the source lists then add them to the groups
   std::vector<cmSourceFile*> classes;
-  if (!gt->GetConfigCommonSourceFiles(classes))
+  if (!target->GetConfigCommonSourceFiles(classes))
     {
     return;
     }
@@ -375,11 +371,9 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
 }
 
 void cmLocalVisualStudio6Generator
-::WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+::WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
              std::ostream &fout, const std::string& libName)
 {
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   const std::vector<const cmSourceFile *> &sourceFiles =
     sg->GetSourceFiles();
   // If the group is empty, don't write it at all.
@@ -411,9 +405,10 @@ void cmLocalVisualStudio6Generator
     std::string compileFlags;
     std::vector<std::string> depends;
     std::string objectNameDir;
-    if(gt->HasExplicitObjectName(*sf))
+    if(target->HasExplicitObjectName(*sf))
       {
-      objectNameDir = cmSystemTools::GetFilenamePath(gt->GetObjectName(*sf));
+      objectNameDir =
+          cmSystemTools::GetFilenamePath(target->GetObjectName(*sf));
       }
 
     // Add per-source file flags.
@@ -484,8 +479,8 @@ void cmLocalVisualStudio6Generator
       cmSystemTools::ExpandListArgument(dependsValue, depends);
       }
     if (GetVS6TargetName(source) != libName ||
-      target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET)
+      target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET)
       {
       fout << "# Begin Source File\n\n";
 
@@ -575,15 +570,15 @@ void cmLocalVisualStudio6Generator
 
 void
 cmLocalVisualStudio6Generator
-::AddUtilityCommandHack(cmTarget& target, int count,
+::AddUtilityCommandHack(cmGeneratorTarget *target, int count,
                         std::vector<std::string>& depends,
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
   char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
-                           + target.GetName().size() + 30)];
+                           + target->GetName().size() + 30)];
   sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
-          target.GetName().c_str(), count);
+          target->GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
     {
@@ -598,8 +593,7 @@ cmLocalVisualStudio6Generator
        origCommand.GetCommandLines(), comment,
        origCommand.GetWorkingDirectory().c_str()))
     {
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&target);
-    gt->AddSource(outsf->GetFullPath());
+    target->AddSource(outsf->GetFullPath());
     }
 
   // Replace the dependencies with the output of this rule so that the
@@ -715,7 +709,7 @@ void cmLocalVisualStudio6Generator::WriteDSPEndGroup(std::ostream& fout)
 
 void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
                                                  const std::string& libName,
-                                                 cmTarget& target)
+                                                 cmGeneratorTarget *target)
 {
   std::string root= this->Makefile->GetRequiredDefinition("CMAKE_ROOT");
   const char *def=
@@ -747,7 +741,7 @@ void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
       this->DSPFooterTemplate += "/DLLFooter.dsptemplate";
       break;
     case EXECUTABLE:
-      if ( target.GetPropertyAsBool("WIN32_EXECUTABLE") )
+      if ( target->GetPropertyAsBool("WIN32_EXECUTABLE") )
         {
         this->DSPHeaderTemplate = root;
         this->DSPHeaderTemplate += "/EXEWinHeader.dsptemplate";
@@ -799,19 +793,16 @@ void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCustomCommand>
-cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
+cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmGeneratorTarget* target,
                                                     const std::string& config)
 {
   cmsys::auto_ptr<cmCustomCommand> pcc;
 
   // VS6 forgets to create the output directory for archives if it
   // differs from the intermediate directory.
-  if(target.GetType() != cmState::STATIC_LIBRARY) { return pcc; }
-
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
+  if(target->GetType() != cmState::STATIC_LIBRARY) { return pcc; }
 
-  std::string outDir = gt->GetDirectory(config, false);
+  std::string outDir = target->GetDirectory(config, false);
 
   // Add a pre-link event to create the directory.
   cmCustomCommandLine command;
@@ -833,11 +824,11 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
 
 // look for custom rules on a target and collect them together
 std::string
-cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
+cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
                                               const std::string& configName,
                                               const std::string& /* libName */)
 {
-  if (target.GetType() >= cmState::UTILITY )
+  if (target->GetType() >= cmState::UTILITY )
     {
     return "";
     }
@@ -847,10 +838,10 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
 
   // Write the pre-build and pre-link together (VS6 does not support both).
   event.Start("PreLink");
-  event.Write(target.GetPreBuildCommands());
-  event.Write(target.GetPreLinkCommands());
+  event.Write(target->Target->GetPreBuildCommands());
+  event.Write(target->Target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, false));
+    this->MaybeCreateImplibDir(*target->Target, configName, false));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -864,7 +855,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
 
   // Write the post-build rules.
   event.Start("PostBuild");
-  event.Write(target.GetPostBuildCommands());
+  event.Write(target->Target->GetPostBuildCommands());
   event.Finish();
 
   customRuleCode += "# End Special Build Tool\n";
@@ -883,7 +874,8 @@ inline std::string removeQuotes(const std::string& s)
 
 
 std::string
-cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
+cmLocalVisualStudio6Generator::GetTargetIncludeOptions(
+        cmGeneratorTarget *target,
                                                   const std::string& config)
 {
   std::string includeOptions;
@@ -894,12 +886,10 @@ cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
   unsigned int maxIncludeLength = 3000;
   bool useShortPath = false;
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   for(int j=0; j < 2; ++j)
     {
     std::vector<std::string> includes;
-    this->GetIncludeDirectories(includes, gt, "C", config);
+    this->GetIncludeDirectories(includes, target, "C", config);
 
     std::vector<std::string>::iterator i;
     for(i = includes.begin(); i != includes.end(); ++i)
@@ -947,11 +937,11 @@ cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
 
 void cmLocalVisualStudio6Generator
 ::WriteDSPHeader(std::ostream& fout,
-                 const std::string& libName, cmTarget &target,
+                 const std::string& libName, cmGeneratorTarget* target,
                  std::vector<cmSourceGroup> &)
 {
-  bool targetBuilds = (target.GetType() >= cmState::EXECUTABLE &&
-                       target.GetType() <= cmState::MODULE_LIBRARY);
+  bool targetBuilds = (target->GetType() >= cmState::EXECUTABLE &&
+                       target->GetType() <= cmState::MODULE_LIBRARY);
 #ifdef CM_USE_OLD_VS6
   // Lookup the library and executable output directories.
   std::string libPath;
@@ -1061,7 +1051,8 @@ void cmLocalVisualStudio6Generator
       }
     }
   std::vector<std::string>::const_iterator i;
-  const std::vector<std::string>& libdirs = target.GetLinkDirectories();
+  const std::vector<std::string>& libdirs =
+      target->Target->GetLinkDirectories();
   for(i = libdirs.begin(); i != libdirs.end(); ++i)
     {
     std::string path = *i;
@@ -1103,19 +1094,19 @@ void cmLocalVisualStudio6Generator
     }
   // find link libraries
   const cmTarget::LinkLibraryVectorType& libs =
-    target.GetLinkLibrariesForVS6();
+    target->Target->GetLinkLibrariesForVS6();
   cmTarget::LinkLibraryVectorType::const_iterator j;
   for(j = libs.begin(); j != libs.end(); ++j)
     {
     // add libraries to executables and dlls (but never include
     // a library in a library, bad recursion)
     // NEVER LINK STATIC LIBRARIES TO OTHER STATIC LIBRARIES
-    if ((target.GetType() != cmState::SHARED_LIBRARY
-         && target.GetType() != cmState::STATIC_LIBRARY
-         && target.GetType() != cmState::MODULE_LIBRARY) ||
-        (target.GetType()==cmState::SHARED_LIBRARY
+    if ((target->GetType() != cmState::SHARED_LIBRARY
+         && target->GetType() != cmState::STATIC_LIBRARY
+         && target->GetType() != cmState::MODULE_LIBRARY) ||
+        (target->GetType()==cmState::SHARED_LIBRARY
          && libName != GetVS6TargetName(j->first)) ||
-        (target.GetType()==cmState::MODULE_LIBRARY
+        (target->GetType()==cmState::MODULE_LIBRARY
          && libName != GetVS6TargetName(j->first)))
       {
       // Compute the proper name to use to link this library.
@@ -1197,7 +1188,7 @@ void cmLocalVisualStudio6Generator
   std::string extraLinkOptionsRelease;
   std::string extraLinkOptionsMinSizeRel;
   std::string extraLinkOptionsRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
@@ -1210,7 +1201,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
@@ -1223,7 +1214,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
@@ -1238,63 +1229,61 @@ void cmLocalVisualStudio6Generator
     }
 
   // Get extra linker options for this target.
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS"))
     {
     extraLinkOptions += " ";
     extraLinkOptions += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_DEBUG"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_DEBUG"))
     {
     extraLinkOptionsDebug += " ";
     extraLinkOptionsDebug += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_RELEASE"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_RELEASE"))
     {
     extraLinkOptionsRelease += " ";
     extraLinkOptionsRelease += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_MINSIZEREL"))
+  if(const char* targetLinkFlags =
+     target->GetProperty("LINK_FLAGS_MINSIZEREL"))
     {
     extraLinkOptionsMinSizeRel += " ";
     extraLinkOptionsMinSizeRel += targetLinkFlags;
     }
 
   if(const char* targetLinkFlags =
-     target.GetProperty("LINK_FLAGS_RELWITHDEBINFO"))
+     target->GetProperty("LINK_FLAGS_RELWITHDEBINFO"))
     {
     extraLinkOptionsRelWithDebInfo += " ";
     extraLinkOptionsRelWithDebInfo += targetLinkFlags;
     }
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // Get standard libraries for this language.
   if(targetBuilds)
     {
     // Get the language to use for linking.
     std::vector<std::string> configs;
-    target.GetMakefile()->GetConfigurations(configs);
+    target->Target->GetMakefile()->GetConfigurations(configs);
     std::vector<std::string>::const_iterator it = configs.begin();
-    const std::string& linkLanguage = gt->GetLinkerLanguage(*it);
+    const std::string& linkLanguage = target->GetLinkerLanguage(*it);
     for ( ; it != configs.end(); ++it)
       {
-      const std::string& configLinkLanguage = gt->GetLinkerLanguage(*it);
+      const std::string& configLinkLanguage = target->GetLinkerLanguage(*it);
       if (configLinkLanguage != linkLanguage)
         {
         cmSystemTools::Error
           ("Linker language must not vary by configuration for target: ",
-          target.GetName().c_str());
+          target->GetName().c_str());
         }
       }
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
         ("CMake can not determine linker language for target: ",
-         target.GetName().c_str());
+         target->GetName().c_str());
       return;
       }
 
@@ -1315,13 +1304,13 @@ void cmLocalVisualStudio6Generator
 
   // Compute version number information.
   std::string targetVersionFlag;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     int major;
     int minor;
-    gt->GetTargetVersion(major, minor);
+    target->GetTargetVersion(major, minor);
     std::ostringstream targetVersionStream;
     targetVersionStream << "/version:" << major << "." << minor;
     targetVersionFlag = targetVersionStream.str();
@@ -1334,20 +1323,20 @@ void cmLocalVisualStudio6Generator
   std::string outputNameRelease = outputName;
   std::string outputNameMinSizeRel = outputName;
   std::string outputNameRelWithDebInfo = outputName;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::STATIC_LIBRARY ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
-    outputName = gt->GetFullName();
-    outputNameDebug = gt->GetFullName("Debug");
-    outputNameRelease = gt->GetFullName("Release");
-    outputNameMinSizeRel = gt->GetFullName("MinSizeRel");
-    outputNameRelWithDebInfo = gt->GetFullName("RelWithDebInfo");
+    outputName = target->GetFullName();
+    outputNameDebug = target->GetFullName("Debug");
+    outputNameRelease = target->GetFullName("Release");
+    outputNameMinSizeRel = target->GetFullName("MinSizeRel");
+    outputNameRelWithDebInfo = target->GetFullName("RelWithDebInfo");
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(target->GetType() == cmState::OBJECT_LIBRARY)
     {
-    outputName = target.GetName();
+    outputName = target->GetName();
     outputName += ".lib";
     outputNameDebug = outputName;
     outputNameRelease = outputName;
@@ -1361,30 +1350,30 @@ void cmLocalVisualStudio6Generator
   std::string outputDirRelease;
   std::string outputDirMinSizeRel;
   std::string outputDirRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::STATIC_LIBRARY ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
 #ifdef CM_USE_OLD_VS6
     outputDirOld =
       removeQuotes(this->ConvertToOutputFormat
-                   (gt->GetDirectory().c_str(), SHELL));
+                   (target->GetDirectory().c_str(), SHELL));
 #endif
     outputDirDebug =
         removeQuotes(this->ConvertToOutputFormat(
-                       gt->GetDirectory("Debug").c_str(), SHELL));
+                       target->GetDirectory("Debug").c_str(), SHELL));
     outputDirRelease =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("Release").c_str(), SHELL));
+                 target->GetDirectory("Release").c_str(), SHELL));
     outputDirMinSizeRel =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("MinSizeRel").c_str(), SHELL));
+                 target->GetDirectory("MinSizeRel").c_str(), SHELL));
     outputDirRelWithDebInfo =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("RelWithDebInfo").c_str(), SHELL));
+                 target->GetDirectory("RelWithDebInfo").c_str(), SHELL));
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(target->GetType() == cmState::OBJECT_LIBRARY)
     {
     std::string outputDir = cmake::GetCMakeFilesDirectoryPostSlash();
     outputDirDebug = outputDir + "Debug";
@@ -1398,9 +1387,9 @@ void cmLocalVisualStudio6Generator
   std::string optionsRelease;
   std::string optionsMinSizeRel;
   std::string optionsRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsDebug =
       extraLinkOptions + " " + extraLinkOptionsDebug;
@@ -1426,24 +1415,24 @@ void cmLocalVisualStudio6Generator
   std::string targetImplibFlagRelease;
   std::string targetImplibFlagMinSizeRel;
   std::string targetImplibFlagRelWithDebInfo;
-  if(target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY ||
-     target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY ||
+     target->GetType() == cmState::EXECUTABLE)
     {
-    std::string fullPathImpDebug = gt->GetDirectory("Debug", true);
-    std::string fullPathImpRelease = gt->GetDirectory("Release", true);
+    std::string fullPathImpDebug = target->GetDirectory("Debug", true);
+    std::string fullPathImpRelease = target->GetDirectory("Release", true);
     std::string fullPathImpMinSizeRel =
-      gt->GetDirectory("MinSizeRel", true);
+      target->GetDirectory("MinSizeRel", true);
     std::string fullPathImpRelWithDebInfo =
-      gt->GetDirectory("RelWithDebInfo", true);
+      target->GetDirectory("RelWithDebInfo", true);
     fullPathImpDebug += "/";
     fullPathImpRelease += "/";
     fullPathImpMinSizeRel += "/";
     fullPathImpRelWithDebInfo += "/";
-    fullPathImpDebug += gt->GetFullName("Debug", true);
-    fullPathImpRelease += gt->GetFullName("Release", true);
-    fullPathImpMinSizeRel += gt->GetFullName("MinSizeRel", true);
-    fullPathImpRelWithDebInfo += gt->GetFullName("RelWithDebInfo", true);
+    fullPathImpDebug += target->GetFullName("Debug", true);
+    fullPathImpRelease += target->GetFullName("Release", true);
+    fullPathImpMinSizeRel += target->GetFullName("MinSizeRel", true);
+    fullPathImpRelWithDebInfo += target->GetFullName("RelWithDebInfo", true);
 
     targetImplibFlagDebug = "/implib:";
     targetImplibFlagRelease = "/implib:";
@@ -1496,7 +1485,7 @@ void cmLocalVisualStudio6Generator
   std::string staticLibOptionsRelease;
   std::string staticLibOptionsMinSizeRel;
   std::string staticLibOptionsRelWithDebInfo;
-  if(target.GetType() == cmState::STATIC_LIBRARY )
+  if(target->GetType() == cmState::STATIC_LIBRARY )
     {
     const char *libflagsGlobal =
       this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS");
@@ -1515,7 +1504,7 @@ void cmLocalVisualStudio6Generator
     this->AppendFlags(staticLibOptionsRelWithDebInfo, this->Makefile->
       GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO"));
 
-    const char *libflags = target.GetProperty("STATIC_LIBRARY_FLAGS");
+    const char *libflags = target->GetProperty("STATIC_LIBRARY_FLAGS");
     this->AppendFlags(staticLibOptions, libflags);
     this->AppendFlags(staticLibOptionsDebug, libflags);
     this->AppendFlags(staticLibOptionsRelease, libflags);
@@ -1523,13 +1512,13 @@ void cmLocalVisualStudio6Generator
     this->AppendFlags(staticLibOptionsRelWithDebInfo, libflags);
 
     this->AppendFlags(staticLibOptionsDebug,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_DEBUG"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_DEBUG"));
     this->AppendFlags(staticLibOptionsRelease,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_RELEASE"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_RELEASE"));
     this->AppendFlags(staticLibOptionsMinSizeRel,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_MINSIZEREL"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_MINSIZEREL"));
     this->AppendFlags(staticLibOptionsRelWithDebInfo,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_RELWITHDEBINFO"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_RELWITHDEBINFO"));
 
     std::string objects;
     this->OutputObjects(target, "LIB", objects);
@@ -1545,7 +1534,7 @@ void cmLocalVisualStudio6Generator
 
   // Add the export symbol definition for shared library objects.
   std::string exportSymbol;
-  if(const char* exportMacro = gt->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     exportSymbol = exportMacro;
     }
@@ -1569,8 +1558,8 @@ void cmLocalVisualStudio6Generator
                                  libnameExports.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
                                  mfcFlag);
-    if(target.GetType() == cmState::STATIC_LIBRARY ||
-       target.GetType() == cmState::OBJECT_LIBRARY)
+    if(target->GetType() == cmState::STATIC_LIBRARY ||
+       target->GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "CM_STATIC_LIB_ARGS_DEBUG",
                                    staticLibOptionsDebug.c_str());
@@ -1676,7 +1665,7 @@ void cmLocalVisualStudio6Generator
                     (exePath.c_str(), SHELL)).c_str());
 #endif
 
-    if(targetBuilds || target.GetType() == cmState::OBJECT_LIBRARY)
+    if(targetBuilds || target->GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "OUTPUT_DIRECTORY_DEBUG",
                                    outputDirDebug.c_str());
@@ -1700,8 +1689,8 @@ void cmLocalVisualStudio6Generator
       = this->Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
     cmSystemTools::ReplaceString(line, "DEBUG_POSTFIX",
                                  debugPostfix?debugPostfix:"");
-    if(target.GetType() >= cmState::EXECUTABLE &&
-       target.GetType() <= cmState::OBJECT_LIBRARY)
+    if(target->GetType() >= cmState::EXECUTABLE &&
+       target->GetType() <= cmState::OBJECT_LIBRARY)
       {
       // store flags for each configuration
       std::string flags = " ";
@@ -1710,24 +1699,24 @@ void cmLocalVisualStudio6Generator
       std::string flagsDebug = " ";
       std::string flagsRelWithDebInfo = " ";
       std::vector<std::string> configs;
-      target.GetMakefile()->GetConfigurations(configs);
+      target->Target->GetMakefile()->GetConfigurations(configs);
       std::vector<std::string>::const_iterator it = configs.begin();
-      const std::string& linkLanguage = gt->GetLinkerLanguage(*it);
+      const std::string& linkLanguage = target->GetLinkerLanguage(*it);
       for ( ; it != configs.end(); ++it)
         {
-        const std::string& configLinkLanguage = gt->GetLinkerLanguage(*it);
+        const std::string& configLinkLanguage = target->GetLinkerLanguage(*it);
         if (configLinkLanguage != linkLanguage)
           {
           cmSystemTools::Error
             ("Linker language must not vary by configuration for target: ",
-            target.GetName().c_str());
+            target->GetName().c_str());
           }
         }
       if(linkLanguage.empty())
         {
         cmSystemTools::Error
           ("CMake can not determine linker language for target: ",
-           target.GetName().c_str());
+           target->GetName().c_str());
         return;
         }
       // if CXX is on and the target contains cxx code then add the cxx flags
@@ -1752,12 +1741,12 @@ void cmLocalVisualStudio6Generator
       flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
       flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
 
-      this->AddCompileOptions(flags, gt, linkLanguage, "");
-      this->AddCompileOptions(flagsDebug, gt, linkLanguage, "Debug");
-      this->AddCompileOptions(flagsRelease, gt, linkLanguage, "Release");
-      this->AddCompileOptions(flagsMinSizeRel, gt, linkLanguage,
+      this->AddCompileOptions(flags, target, linkLanguage, "");
+      this->AddCompileOptions(flagsDebug, target, linkLanguage, "Debug");
+      this->AddCompileOptions(flagsRelease, target, linkLanguage, "Release");
+      this->AddCompileOptions(flagsMinSizeRel, target, linkLanguage,
                               "MinSizeRel");
-      this->AddCompileOptions(flagsRelWithDebInfo, gt, linkLanguage,
+      this->AddCompileOptions(flagsRelWithDebInfo, target, linkLanguage,
                               "RelWithDebInfo");
 
       // if _UNICODE and _SBCS are not found, then add -D_MBCS
@@ -1777,14 +1766,14 @@ void cmLocalVisualStudio6Generator
       std::set<std::string> minsizeDefinesSet;
       std::set<std::string> debugrelDefinesSet;
 
-      this->AddCompileDefinitions(definesSet, gt, "", linkLanguage);
-      this->AddCompileDefinitions(debugDefinesSet, gt,
+      this->AddCompileDefinitions(definesSet, target, "", linkLanguage);
+      this->AddCompileDefinitions(debugDefinesSet, target,
                                   "DEBUG", linkLanguage);
-      this->AddCompileDefinitions(releaseDefinesSet, gt,
+      this->AddCompileDefinitions(releaseDefinesSet, target,
                                   "RELEASE", linkLanguage);
-      this->AddCompileDefinitions(minsizeDefinesSet, gt,
+      this->AddCompileDefinitions(minsizeDefinesSet, target,
                                   "MINSIZEREL", linkLanguage);
-      this->AddCompileDefinitions(debugrelDefinesSet, gt,
+      this->AddCompileDefinitions(debugrelDefinesSet, target,
                                   "RELWITHDEBINFO", linkLanguage);
 
       std::string defines = " ";
@@ -1852,15 +1841,13 @@ void cmLocalVisualStudio6Generator::WriteDSPFooter(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio6Generator
-::ComputeLinkOptions(cmTarget& target,
+::ComputeLinkOptions(cmGeneratorTarget *target,
                      const std::string& configName,
                      const std::string extraOptions,
                      std::string& options)
 {
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   // Compute the link information for this configuration.
-  cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+  cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
   if(!pcli)
     {
     return;
@@ -1919,15 +1906,13 @@ void cmLocalVisualStudio6Generator
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio6Generator
-::OutputObjects(cmTarget& target, const char* tool,
+::OutputObjects(cmGeneratorTarget* target, const char* tool,
                 std::string& options)
 {
   // VS 6 does not support per-config source locations so we
   // list object library content on the link line instead.
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   std::vector<std::string> objs;
-  gt->UseObjectLibraries(objs, "");
+  target->UseObjectLibraries(objs, "");
   for(std::vector<std::string>::const_iterator
         oi = objs.begin(); oi != objs.end(); ++oi)
     {
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index b3b61bb..4772d54 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -14,7 +14,6 @@
 
 #include "cmLocalVisualStudioGenerator.h"
 
-class cmTarget;
 class cmSourceFile;
 class cmSourceGroup;
 class cmCustomCommand;
@@ -47,7 +46,7 @@ public:
   /**
    * Specify the type of the build: static, dll, or executable.
    */
-  void SetBuildType(BuildType, const std::string& libName, cmTarget&);
+  void SetBuildType(BuildType, const std::string& libName, cmGeneratorTarget*);
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
@@ -56,41 +55,42 @@ private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
 
-  void CreateSingleDSP(const std::string& lname, cmTarget &tgt);
+  void CreateSingleDSP(const std::string& lname, cmGeneratorTarget* tgt);
   void WriteDSPFile(std::ostream& fout, const std::string& libName,
-                    cmTarget &tgt);
+                    cmGeneratorTarget* tgt);
   void WriteDSPBeginGroup(std::ostream& fout,
                           const char* group,
                           const char* filter);
   void WriteDSPEndGroup(std::ostream& fout);
 
   void WriteDSPHeader(std::ostream& fout, const std::string& libName,
-                      cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
+                      cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
 
   void WriteDSPFooter(std::ostream& fout);
-  void AddDSPBuildRule(cmTarget& tgt);
+  void AddDSPBuildRule(cmGeneratorTarget* tgt);
   void WriteCustomRule(std::ostream& fout,
                        const char* source,
                        const cmCustomCommand& command,
                        const char* flags);
-  void AddUtilityCommandHack(cmTarget& target, int count,
+  void AddUtilityCommandHack(cmGeneratorTarget* target, int count,
                              std::vector<std::string>& depends,
                              const cmCustomCommand& origCommand);
-  void WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+  void WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
                   std::ostream &fout, const std::string& libName);
   class EventWriter;
   friend class EventWriter;
   cmsys::auto_ptr<cmCustomCommand>
-  MaybeCreateOutputDir(cmTarget& target, const std::string& config);
-  std::string CreateTargetRules(cmTarget &target,
+  MaybeCreateOutputDir(cmGeneratorTarget *target, const std::string& config);
+  std::string CreateTargetRules(cmGeneratorTarget* target,
                                 const std::string& configName,
                                 const std::string& libName);
-  void ComputeLinkOptions(cmTarget& target, const std::string& configName,
+  void ComputeLinkOptions(cmGeneratorTarget* target,
+                          const std::string& configName,
                           const std::string extraOptions,
                           std::string& options);
-  void OutputObjects(cmTarget& target, const char* tool,
+  void OutputObjects(cmGeneratorTarget* target, const char* tool,
                      std::string& options);
-  std::string GetTargetIncludeOptions(cmTarget &target,
+  std::string GetTargetIncludeOptions(cmGeneratorTarget* target,
                                       const std::string& config);
   std::vector<std::string> Configurations;
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Oct 23 00:01:12 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri, 23 Oct 2015 00:01:12 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-316-ga03c13a
Message-ID: <20151023040112.E23C8C05E9@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  a03c13a710fc4c65035e92749720b559cbeeff2e (commit)
      from  9e5f253f8dba871d7cdd966aca88af92bd8d14a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a03c13a710fc4c65035e92749720b559cbeeff2e
commit a03c13a710fc4c65035e92749720b559cbeeff2e
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Oct 23 00:01:10 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 23 00:01:10 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index fd17910..7bed54b 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151022)
+set(CMake_VERSION_PATCH 20151023)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 23 10:04:47 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 23 Oct 2015 10:04:47 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-903-g786a5bb
Message-ID: <20151023140447.44466C0BB6@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  786a5bbd1612a6da3487aae97ae99a88f20ea272 (commit)
       via  e61973e1ab2c01f9ae5df145bfdc14e83a0cf1d9 (commit)
      from  36f0c5e076363d2fbc66dc474f977c1ba32f461d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=786a5bbd1612a6da3487aae97ae99a88f20ea272
commit 786a5bbd1612a6da3487aae97ae99a88f20ea272
Merge: 36f0c5e e61973e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 23 10:04:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 23 10:04:45 2015 -0400

    Merge topic 'fix-test-RUN_SERIAL-failure-regression' into next
    
    e61973e1 CTest: Fix regression in handling of a RUN_SERIAL test that fails


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e61973e1ab2c01f9ae5df145bfdc14e83a0cf1d9
commit e61973e1ab2c01f9ae5df145bfdc14e83a0cf1d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 23 09:25:25 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 23 09:55:25 2015 -0400

    CTest: Fix regression in handling of a RUN_SERIAL test that fails
    
    Refactoring in commit v3.4.0-rc1~390^2~1 (cmCTestMultiProcessHandler:
    Refactor RUN_SERIAL implementation, 2015-06-01) forgot to update a code
    path for cleaning up after a failed RUN_SERIAL test.  This causes an
    infinite loop after a RUN_SERIAL test fails.  Fix it and add a test.

diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 4832186..7c7f5df 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -198,6 +198,10 @@ void cmCTestMultiProcessHandler::UnlockResources(int index)
     {
     this->LockedResources.erase(*i);
     }
+  if (this->Properties[index]->RunSerial)
+    {
+    this->SerialTestRunning = false;
+    }
 }
 
 //---------------------------------------------------------
@@ -451,11 +455,6 @@ bool cmCTestMultiProcessHandler::CheckOutput()
     this->WriteCheckpoint(test);
     this->UnlockResources(test);
     this->RunningCount -= GetProcessorsUsed(test);
-    if (this->Properties[test]->RunSerial)
-      {
-      this->SerialTestRunning = false;
-      }
-
     delete p;
     }
   return true;
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 00895cc..2bc3693 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -78,6 +78,21 @@ endfunction()
 
 run_LabelCount()
 
+function(run_SerialFailed)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/SerialFailed)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" "
+add_test(NoSuchCommand no_such_command)
+set_tests_properties(NoSuchCommand PROPERTIES RUN_SERIAL ON)
+add_test(Echo \"${CMAKE_COMMAND}\" -E echo \"EchoTest\")
+")
+
+  run_cmake_command(SerialFailed ${CMAKE_CTEST_COMMAND} -V)
+endfunction()
+run_SerialFailed()
+
 function(run_TestLoad name load)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/TestLoad)
   set(RunCMake_TEST_NO_CLEAN 1)
diff --git a/Tests/RunCMake/CTestCommandLine/SerialFailed-result.txt b/Tests/RunCMake/CTestCommandLine/SerialFailed-result.txt
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/SerialFailed-result.txt
@@ -0,0 +1 @@
+8
diff --git a/Tests/RunCMake/CTestCommandLine/SerialFailed-stderr.txt b/Tests/RunCMake/CTestCommandLine/SerialFailed-stderr.txt
new file mode 100644
index 0000000..cafe565
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/SerialFailed-stderr.txt
@@ -0,0 +1 @@
+Unable to find executable: no_such_command
diff --git a/Tests/RunCMake/CTestCommandLine/SerialFailed-stdout.txt b/Tests/RunCMake/CTestCommandLine/SerialFailed-stdout.txt
new file mode 100644
index 0000000..d7144f7
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/SerialFailed-stdout.txt
@@ -0,0 +1,10 @@
+Could not find executable no_such_command
+.*
+2/2 Test #2: Echo .............................   Passed +[0-9.]+ sec
++
+50% tests passed, 1 tests failed out of 2
++
+Total Test time \(real\) = +[0-9.]+ sec
++
+The following tests FAILED:
+[	 ]+1 - NoSuchCommand \(Not Run\)$

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestMultiProcessHandler.cxx             |    9 ++++-----
 Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake      |   15 +++++++++++++++
 ...il-fail-ctest-result.txt => SerialFailed-result.txt} |    0
 Tests/RunCMake/CTestCommandLine/SerialFailed-stderr.txt |    1 +
 Tests/RunCMake/CTestCommandLine/SerialFailed-stdout.txt |   10 ++++++++++
 5 files changed, 30 insertions(+), 5 deletions(-)
 copy Tests/RunCMake/CTestCommandLine/{repeat-until-fail-ctest-result.txt => SerialFailed-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestCommandLine/SerialFailed-stderr.txt
 create mode 100644 Tests/RunCMake/CTestCommandLine/SerialFailed-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 23 10:39:10 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 23 Oct 2015 10:39:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-905-g9a24d6a
Message-ID: <20151023143910.C70D21AE6@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9a24d6a269df453ce684bfe856b7a3570f5b141f (commit)
       via  96a151398387fae00dde98c2a626f38b635e114c (commit)
      from  786a5bbd1612a6da3487aae97ae99a88f20ea272 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a24d6a269df453ce684bfe856b7a3570f5b141f
commit 9a24d6a269df453ce684bfe856b7a3570f5b141f
Merge: 786a5bb 96a1513
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 23 10:39:10 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 23 10:39:10 2015 -0400

    Merge topic 'update-libarchive' into next
    
    96a15139 libarchive: Test for Clang builtin before using it


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96a151398387fae00dde98c2a626f38b635e114c
commit 96a151398387fae00dde98c2a626f38b635e114c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 23 10:24:47 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 23 10:24:47 2015 -0400

    libarchive: Test for Clang builtin before using it
    
    The __builtin_bswap16 builtin is not available on Clang 2.1.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
index c359d83..eff02d8 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
@@ -1712,10 +1712,13 @@ lha_crc16(uint16_t crc, const void *pp, size_t len)
 	for (;len >= 8; len -= 8) {
 		/* This if statement expects compiler optimization will
 		 * remove the stament which will not be executed. */
+#ifndef __has_builtin
+#  define __has_builtin(x) 0
+#endif
 #if defined(_MSC_VER) && _MSC_VER >= 1400  /* Visual Studio */
 #  define bswap16(x) _byteswap_ushort(x)
 #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8) \
-      || defined(__clang__)
+      || (defined(__clang__) && __has_builtin(__builtin_bswap16))
 #  define bswap16(x) __builtin_bswap16(x)
 #else
 #  define bswap16(x) ((((x) >> 8) & 0xff) | ((x) << 8))

-----------------------------------------------------------------------

Summary of changes:
 .../cmlibarchive/libarchive/archive_read_support_format_lha.c     |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 23 11:03:47 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 23 Oct 2015 11:03:47 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-907-g22bded4
Message-ID: <20151023150347.BE49CC0B51@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  22bded47beb0417d004d152ab35e2b57b9e3c338 (commit)
       via  66178ae5a0a154c11934574347b75e71772b77b9 (commit)
      from  9a24d6a269df453ce684bfe856b7a3570f5b141f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22bded47beb0417d004d152ab35e2b57b9e3c338
commit 22bded47beb0417d004d152ab35e2b57b9e3c338
Merge: 9a24d6a 66178ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 23 11:03:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 23 11:03:46 2015 -0400

    Merge topic 'cpack-deb-fakeroot-removal' into next
    
    66178ae5 CPackDEB: Use proper compression scheme for control.tar.gz


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66178ae5a0a154c11934574347b75e71772b77b9
commit 66178ae5a0a154c11934574347b75e71772b77b9
Author:     Raffi Enficiaud <raffi.enficiaud at mines-paris.org>
AuthorDate: Fri Oct 23 12:01:35 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 23 10:58:43 2015 -0400

    CPackDEB: Use proper compression scheme for control.tar.gz
    
    Changes in commit v3.4.0-rc1~79^2~1 (CPackDeb: use of libarchive and
    removal of fakeroot, 2015-09-11) accidentally set the wrong compression
    scheme for the `control.tar.gz` file.  Set it explicitly to GZip.

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 9402689..f9dfdf6 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -565,7 +565,7 @@ int cmCPackDebGenerator::createDeb()
       return 0;
       }
     cmArchiveWrite control_tar(fileStream_control_tar,
-                               tar_compression_type,
+                               cmArchiveWrite::CompressGZip,
                                "paxr");
 
     // sets permissions and uid/gid for the files

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Fri Oct 23 12:31:58 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Fri, 23 Oct 2015 12:31:58 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-921-g88b9b0a
Message-ID: <20151023163158.78C76C09E8@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  88b9b0a6f138fa933cd9d286c02fe5a7e255080a (commit)
       via  636bcd6428f4c05ff7c0c7d41668e306e2d1789e (commit)
       via  8766741e7fefceb2302243e8fcc16def63756c64 (commit)
       via  4283faa2f135cafba8481a0ba617b81ee126dd9b (commit)
       via  55e1200a87f9775d159906d52955c2055e30560a (commit)
       via  c0389992b2be8bd4e458a86e066c28380d26ea96 (commit)
       via  0fef3c54a68b279bd8f7bc4135886ceb01ea10c7 (commit)
       via  dd2a1c8d230d2e142aa4ff81f4e1c34c938dd4fe (commit)
       via  96e918c6b10483cae8a67b7afd44bcabca39ced4 (commit)
       via  065e54e569f7bb47665ec69564e3fccf3dfa0db9 (commit)
       via  8778d695e411d65611e38a4cb6e258dba14c93bd (commit)
       via  b09b42f168772d781d6e80568ed8c986343cf915 (commit)
       via  7b9ac9cc4805d2be79364ce2a18baf66e7415110 (commit)
       via  650938a289cc5da9304aeaaab6ee3fb85710a204 (commit)
      from  22bded47beb0417d004d152ab35e2b57b9e3c338 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88b9b0a6f138fa933cd9d286c02fe5a7e255080a
commit 88b9b0a6f138fa933cd9d286c02fe5a7e255080a
Merge: 22bded4 636bcd6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 12:31:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 23 12:31:56 2015 -0400

    Merge topic 'use-generator-target' into next
    
    636bcd64 VS: Port interface to cmGeneratorTarget
    8766741e VS: Port WriteUtilityDepends to cmGeneratorTarget
    4283faa2 VS: Port utility depends to cmGeneratorTarget
    55e1200a VS: Port target depends to cmGeneratorTarget
    c0389992 VS: Port PorjectDepends to cmGeneratorTarget.
    0fef3c54 VS: Port TargetIsFortranOnly to cmGeneratorTarget
    dd2a1c8d VS: Port WriteProject to cmGeneratorTarget
    96e918c6 VS: Port loop to cmGeneratorTarget
    065e54e5 VS: Port ImplibDir to cmGeneratorTarget
    8778d695 VS: Port LinkClosure to cmGeneratorTarget
    b09b42f1 VS: Port ComputeLongestObjectDirectory to cmGeneratorTarget
    7b9ac9cc VS7: Port to cmGeneratorTarget
    650938a2 VS10: Port to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=636bcd6428f4c05ff7c0c7d41668e306e2d1789e
commit 636bcd6428f4c05ff7c0c7d41668e306e2d1789e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:30:52 2015 +0200

    VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index bc91e87..6a0e5e9 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+  { return false; }
 
   const char* GetIntelProjectVersion();
 
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 9b8b9fd..e185c8e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -460,14 +460,15 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
 
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
-  cmTarget& target)
+        cmGeneratorTarget *target)
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target.GetUtilities().begin();
-      ui != target.GetUtilities().end(); ++ui)
+        target->Target->GetUtilities().begin();
+      ui != target->Target->GetUtilities().end(); ++ui)
     {
-    if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
+    if(cmGeneratorTarget* depTarget =
+        this->FindGeneratorTarget(ui->c_str()))
       {
       if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index c05e5fa..b3093cc 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget& target);
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget* target);
 
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 0ba0ccb..7ee5dd0 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -338,7 +338,8 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudioGenerator::FollowLinkDepends(
-  cmTarget const* target, std::set<cmTarget const*>& linked)
+        const cmGeneratorTarget *target,
+        std::set<const cmGeneratorTarget *> &linked)
 {
   if(target->GetType() == cmState::INTERFACE_LIBRARY)
     {
@@ -349,14 +350,13 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
     {
     // Static library targets do not list their link dependencies so
     // we must follow them transitively now.
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FollowLinkDepends((*di)->Target, linked);
+        this->FollowLinkDepends(*di, linked);
         }
       }
     }
@@ -431,7 +431,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
-  std::set<cmTarget const*> linkDepends;
+  std::set<cmGeneratorTarget const*> linkDepends;
   if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
@@ -440,20 +440,20 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
       cmTargetDepend dep = *di;
       if(dep.IsLink())
         {
-        this->FollowLinkDepends(dep->Target, linkDepends);
+        this->FollowLinkDepends(*di, linkDepends);
         }
       }
     }
 
   // Collect explicit util dependencies (add_dependencies).
-  std::set<cmTarget const*> utilDepends;
+  std::set<cmGeneratorTarget const*> utilDepends;
   for(TargetDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
     cmTargetDepend dep = *di;
     if(dep.IsUtil())
       {
-      this->FollowLinkDepends(dep->Target, utilDepends);
+      this->FollowLinkDepends(*di, utilDepends);
       }
     }
 
@@ -466,23 +466,22 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
     }
 
   // Emit link dependencies.
-  for(std::set<cmTarget const*>::iterator di = linkDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = linkDepends.begin();
       di != linkDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
+    cmGeneratorTarget const* dep = *di;
     vsTargetDepend.insert(dep->GetName());
     }
 
   // Emit util dependencies.  Possibly use intermediate targets.
-  for(std::set<cmTarget const*>::iterator di = utilDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = utilDepends.begin();
       di != utilDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
-    cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
-    if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
+    cmGeneratorTarget const* dgt = *di;
+    if(allowLinkable || !VSLinkable(dgt) || linked.count(dgt))
       {
       // Direct dependency allowed.
-      vsTargetDepend.insert(dep->GetName());
+      vsTargetDepend.insert(dgt->GetName());
       }
     else
       {
@@ -892,9 +891,7 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
   for (TargetSet::const_iterator it = targets.begin();
        it != targets.end(); ++it)
     {
-    cmGeneratorTarget* gt =
-        (*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
-    this->insert(gt);
+    this->insert(*it);
     }
 }
 
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index c81ddda..f827f26 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -88,7 +88,7 @@ public:
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const { return false; }
 
-  class TargetSet: public std::set<cmTarget const*> {};
+  class TargetSet: public std::set<cmGeneratorTarget const*> {};
   class TargetCompare
   {
     std::string First;
@@ -126,8 +126,9 @@ protected:
   VSDependMap VSTargetDepends;
   void ComputeVSTargetDepends(cmGeneratorTarget *);
 
-  bool CheckTargetLinks(cmTarget& target, const std::string& name);
-  std::string GetUtilityForTarget(cmTarget& target, const std::string&);
+  bool CheckTargetLinks(cmGeneratorTarget& target, const std::string& name);
+  std::string GetUtilityForTarget(cmGeneratorTarget& target,
+                                  const std::string&);
   virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
   std::string GetUtilityDepend(const cmGeneratorTarget *target);
   typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
@@ -141,13 +142,14 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  void FollowLinkDepends(cmTarget const* target,
-                         std::set<cmTarget const*>& linked);
+  void FollowLinkDepends(cmGeneratorTarget const* target,
+                         std::set<cmGeneratorTarget const*>& linked);
 
-  class TargetSetMap: public std::map<cmTarget*, TargetSet> {};
+  class TargetSetMap: public std::map<cmGeneratorTarget*, TargetSet> {};
   TargetSetMap TargetLinkClosure;
-  void FillLinkClosure(cmGeneratorTarget const* target, TargetSet& linked);
-  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget *target);
+  void FillLinkClosure(const cmGeneratorTarget *target,
+                       TargetSet& linked);
+  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget* target);
 };
 
 class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5ba59ee..ca8d697 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1186,7 +1186,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1285,7 +1285,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2bb67fd..9c9f5ab 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2677,7 +2677,7 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 
   this->WriteString("</Link>\n", 2);
   if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
-              *this->GeneratorTarget->Target))
+              this->GeneratorTarget))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8766741e7fefceb2302243e8fcc16def63756c64
commit 8766741e7fefceb2302243e8fcc16def63756c64
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:30:31 2015 +0200

    VS: Port WriteUtilityDepends to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index dd4e871..bb494f1 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -383,12 +383,14 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(
+        const cmGeneratorTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
   pname = GetVS6TargetName(pname.c_str());
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname =
+          target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index edf637f..993a48f 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -97,7 +97,7 @@ private:
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
   void WriteDSWFooter(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(const cmGeneratorTarget *target);
   std::string MSDevCommand;
   bool MSDevCommandInitialized;
   std::string const& GetMSDevCommand();
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 37f509a..5473247 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -888,13 +888,14 @@ void cmGlobalVisualStudio7Generator::WriteSLNHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio7Generator::WriteUtilityDepend(
+        cmGeneratorTarget const* target)
 {
   std::vector<std::string> configs;
-  target->GetMakefile()->GetConfigurations(configs);
+  target->Target->GetMakefile()->GetConfigurations(configs);
   std::string pname = target->GetName();
   pname += "_UTILITY";
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".vcproj";
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index eed6f49..bc91e87 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -136,7 +136,7 @@ protected:
                                       cmLocalGenerator* root);
   virtual void WriteSLNFooter(std::ostream& fout);
   virtual void WriteSLNHeader(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(const cmGeneratorTarget *target);
 
   virtual void WriteTargetsToSolution(
     std::ostream& fout,
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 3e25559..0ba0ccb 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -514,7 +514,7 @@ cmGlobalVisualStudioGenerator::GetUtilityDepend(
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
     {
-    std::string name = this->WriteUtilityDepend(target->Target);
+    std::string name = this->WriteUtilityDepend(target);
     UtilityDependsMap::value_type entry(target, name);
     i = this->UtilityDepends.insert(entry).first;
     }
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 6d804d8..c81ddda 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -128,7 +128,7 @@ protected:
 
   bool CheckTargetLinks(cmTarget& target, const std::string& name);
   std::string GetUtilityForTarget(cmTarget& target, const std::string&);
-  virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
+  virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
   std::string GetUtilityDepend(const cmGeneratorTarget *target);
   typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
   UtilityDependsMap UtilityDepends;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4283faa2f135cafba8481a0ba617b81ee126dd9b
commit 4283faa2f135cafba8481a0ba617b81ee126dd9b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:30:13 2015 +0200

    VS: Port utility depends to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 7d0c558..dd4e871 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -310,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 3152e91..8227b82 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -180,7 +180,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
 
   fout <<"EndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index b2ad365..37f509a 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -704,7 +704,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
        << dspname << ext << "\", \"{"
        << this->GetGUID(dspname) << "}\"\nEndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -748,7 +748,7 @@ cmGlobalVisualStudio7Generator
     depcount++;
     }
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index eb6a4ef..3e25559 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -488,7 +488,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
       {
       // Direct dependency on linkable target not allowed.
       // Use an intermediate utility target.
-      vsTargetDepend.insert(this->GetUtilityDepend(dep));
+      vsTargetDepend.insert(this->GetUtilityDepend(dgt));
       }
     }
 }
@@ -508,12 +508,13 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudioGenerator::GetUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudioGenerator::GetUtilityDepend(
+        cmGeneratorTarget const* target)
 {
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
     {
-    std::string name = this->WriteUtilityDepend(target);
+    std::string name = this->WriteUtilityDepend(target->Target);
     UtilityDependsMap::value_type entry(target, name);
     i = this->UtilityDepends.insert(entry).first;
     }
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 0b0b7b1..6d804d8 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -129,8 +129,8 @@ protected:
   bool CheckTargetLinks(cmTarget& target, const std::string& name);
   std::string GetUtilityForTarget(cmTarget& target, const std::string&);
   virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
-  std::string GetUtilityDepend(cmTarget const* target);
-  typedef std::map<cmTarget const*, std::string> UtilityDependsMap;
+  std::string GetUtilityDepend(const cmGeneratorTarget *target);
+  typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
   UtilityDependsMap UtilityDepends;
 
 protected:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55e1200a87f9775d159906d52955c2055e30560a
commit 55e1200a87f9775d159906d52955c2055e30560a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:45 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:29:57 2015 +0200

    VS: Port target depends to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 9e411c9..7d0c558 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -299,7 +299,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 77c8fc8..3152e91 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -206,7 +206,7 @@ cmGlobalVisualStudio71Generator
                       const std::string&,
                       const char*, cmGeneratorTarget const* target)
 {
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 972188f..b2ad365 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -730,7 +730,7 @@ cmGlobalVisualStudio7Generator
 {
   int depcount = 0;
   std::string dspguid = this->GetGUID(dspname);
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 39a7bda..eb6a4ef 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -380,7 +380,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
       for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(*(*ti)->Target);
+        this->ComputeVSTargetDepends(*ti);
         }
       }
     }
@@ -394,13 +394,14 @@ static bool VSLinkable(cmGeneratorTarget const* t)
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
+void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
+        cmGeneratorTarget* target)
 {
-  if(this->VSTargetDepends.find(&target) != this->VSTargetDepends.end())
+  if(this->VSTargetDepends.find(target) != this->VSTargetDepends.end())
     {
     return;
     }
-  VSDependSet& vsTargetDepend = this->VSTargetDepends[&target];
+  VSDependSet& vsTargetDepend = this->VSTargetDepends[target];
   // VS <= 7.1 has two behaviors that affect solution dependencies.
   //
   // (1) Solution-level dependencies between a linkable target and a
@@ -420,19 +421,18 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // leaving them out for the static library itself but following them
   // transitively for other targets.
 
-  bool allowLinkable = (target.GetType() != cmState::STATIC_LIBRARY &&
-                        target.GetType() != cmState::SHARED_LIBRARY &&
-                        target.GetType() != cmState::MODULE_LIBRARY &&
-                        target.GetType() != cmState::EXECUTABLE);
+  bool allowLinkable = (target->GetType() != cmState::STATIC_LIBRARY &&
+                        target->GetType() != cmState::SHARED_LIBRARY &&
+                        target->GetType() != cmState::MODULE_LIBRARY &&
+                        target->GetType() != cmState::EXECUTABLE);
 
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-  TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+  TargetDependSet const& depends = this->GetTargetDirectDepends(target);
 
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
   std::set<cmTarget const*> linkDepends;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -460,9 +460,9 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // Collect all targets linked by this target so we can avoid
   // intermediate targets below.
   TargetSet linked;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
-    linked = this->GetTargetLinkClosure(gt);
+    linked = this->GetTargetLinkClosure(target);
     }
 
   // Emit link dependencies.
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index f0bc5dc..0b0b7b1 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -122,9 +122,9 @@ protected:
 
   virtual bool ComputeTargetDepends();
   class VSDependSet: public std::set<std::string> {};
-  class VSDependMap: public std::map<cmTarget const*, VSDependSet> {};
+  class VSDependMap: public std::map<cmGeneratorTarget const*, VSDependSet> {};
   VSDependMap VSTargetDepends;
-  void ComputeVSTargetDepends(cmTarget&);
+  void ComputeVSTargetDepends(cmGeneratorTarget *);
 
   bool CheckTargetLinks(cmTarget& target, const std::string& name);
   std::string GetUtilityForTarget(cmTarget& target, const std::string&);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0389992b2be8bd4e458a86e066c28380d26ea96
commit c0389992b2be8bd4e458a86e066c28380d26ea96
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:29:42 2015 +0200

    VS: Port PorjectDepends to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 195aaa0..77c8fc8 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -175,7 +175,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
        << this->ConvertToSolutionPath(dir) << (dir[0]? "\\":"")
        << dspname << ext << "\", \"{" << guid << "}\"\n";
   fout << "\tProjectSection(ProjectDependencies) = postProject\n";
-  this->WriteProjectDepends(fout, dspname, dir, *t->Target);
+  this->WriteProjectDepends(fout, dspname, dir, t);
   fout << "\tEndProjectSection\n";
 
   fout <<"EndProject\n";
@@ -204,9 +204,9 @@ void
 cmGlobalVisualStudio71Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string&,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -215,7 +215,7 @@ cmGlobalVisualStudio71Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index 074bce5..5035fda 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -62,7 +62,7 @@ protected:
                             const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const& t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 906166c..972188f 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -533,19 +533,19 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmMakefile* mf = target->GetMakefile();
     const char *vcprojName =
       target->GetProperty("GENERATOR_FILE_NAME");
     if (vcprojName)
       {
-      std::string dir = mf->GetCurrentSourceDirectory();
+      std::string dir = target->GetLocalGenerator()
+              ->GetCurrentSourceDirectory();
       this->WriteProjectDepends(fout, vcprojName,
-                                dir.c_str(), *target);
+                                dir.c_str(), target);
       }
     }
 }
@@ -726,11 +726,11 @@ void
 cmGlobalVisualStudio7Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string& dspname,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
   int depcount = 0;
   std::string dspguid = this->GetGUID(dspname);
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -739,7 +739,7 @@ cmGlobalVisualStudio7Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
@@ -748,7 +748,7 @@ cmGlobalVisualStudio7Generator
     depcount++;
     }
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index a514dcd..eed6f49 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -126,7 +126,7 @@ protected:
                             const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const&t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index a22315c..9b8b9fd 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -441,9 +441,9 @@ bool cmGlobalVisualStudio8Generator::ComputeTargetDepends()
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Generator::WriteProjectDepends(
-  std::ostream& fout, const std::string&, const char*, cmTarget const& t)
+  std::ostream& fout, const std::string&, const char*,
+        cmGeneratorTarget const* gt)
 {
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&t);
   TargetDependSet const& unordered = this->GetTargetDirectDepends(gt);
   OrderedTargetDependSet depends(unordered, std::string());
   for(OrderedTargetDependSet::const_iterator i = depends.begin();
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index 60c63d1..c05e5fa 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -91,7 +91,8 @@ protected:
   virtual bool ComputeTargetDepends();
   virtual void WriteProjectDepends(std::ostream& fout,
                                    const std::string& name,
-                                   const char* path, cmTarget const& t);
+                                   const char* path,
+                                   const cmGeneratorTarget *t);
 
   std::string Name;
   std::string WindowsCEVersion;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fef3c54a68b279bd8f7bc4135886ceb01ea10c7
commit 0fef3c54a68b279bd8f7bc4135886ceb01ea10c7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:29:28 2015 +0200

    VS: Port TargetIsFortranOnly to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index adf5c67..195aaa0 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -158,7 +158,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
   const char* ext = ".vcproj";
   const char* project =
     "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
-  if(this->TargetIsFortranOnly(*t->Target))
+  if(this->TargetIsFortranOnly(t))
     {
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 8b874b6..906166c 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -692,7 +692,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
   const char* ext = ".vcproj";
   const char* project =
     "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
-  if(this->TargetIsFortranOnly(*target->Target))
+  if(this->TargetIsFortranOnly(target))
     {
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index c43f884..39a7bda 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -831,10 +831,8 @@ void RegisterVisualStudioMacros(const std::string& macrosFile,
     }
 }
 bool
-cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget const& target)
+cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmGeneratorTarget const* gt)
 {
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-
   // check to see if this is a fortran build
   std::set<std::string> languages;
   {
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 5ada37e..f0bc5dc 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -73,7 +73,7 @@ public:
                              const char* vsSolutionFile = 0);
 
   // return true if target is fortran only
-  bool TargetIsFortranOnly(cmTarget const& t);
+  bool TargetIsFortranOnly(const cmGeneratorTarget *gt);
 
   /** Get the top-level registry key for this VS version.  */
   std::string GetRegistryBase();
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 0040331..d59fdc6 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -83,7 +83,7 @@ void cmLocalVisualStudio10Generator::Generate()
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*(*l)->Target))
+       ->TargetIsFortranOnly(*l))
       {
       this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a2d4d16..5ba59ee 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -229,7 +229,7 @@ void cmLocalVisualStudio7Generator
 {
   cmGlobalVisualStudioGenerator* gg
       = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-  this->FortranProject = gg->TargetIsFortranOnly(*target->Target);
+  this->FortranProject = gg->TargetIsFortranOnly(target);
   this->WindowsCEProject = gg->TargetsWindowsCE();
 
   // Intel Fortran for VS10 uses VS9 format ".vfproj" files.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 3f8e627..2bb67fd 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2886,7 +2886,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     // skip fortran targets as they can not be processed by MSBuild
     // the only reference will be in the .sln file
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*dt->Target))
+       ->TargetIsFortranOnly(dt))
       {
       continue;
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd2a1c8d230d2e142aa4ff81f4e1c34c938dd4fe
commit dd2a1c8d230d2e142aa4ff81f4e1c34c938dd4fe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:42 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:29:06 2015 +0200

    VS: Port WriteProject to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 9bb37ce..adf5c67 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -152,18 +152,18 @@ void
 cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
                                               const std::string& dspname,
                                               const char* dir,
-                                              cmTarget const& t)
+                                              cmGeneratorTarget const* t)
 {
   // check to see if this is a fortran build
   const char* ext = ".vcproj";
   const char* project =
     "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
-  if(this->TargetIsFortranOnly(t))
+  if(this->TargetIsFortranOnly(*t->Target))
     {
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
     }
-  const char* targetExt = t.GetProperty("GENERATOR_FILE_NAME_EXT");
+  const char* targetExt = t->GetProperty("GENERATOR_FILE_NAME_EXT");
   if(targetExt)
     {
     ext = targetExt;
@@ -175,12 +175,12 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
        << this->ConvertToSolutionPath(dir) << (dir[0]? "\\":"")
        << dspname << ext << "\", \"{" << guid << "}\"\n";
   fout << "\tProjectSection(ProjectDependencies) = postProject\n";
-  this->WriteProjectDepends(fout, dspname, dir, t);
+  this->WriteProjectDepends(fout, dspname, dir, *t->Target);
   fout << "\tEndProjectSection\n";
 
   fout <<"EndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&t);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index 7f88e34..074bce5 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -59,7 +59,7 @@ protected:
     std::ostream& fout, std::vector<std::string> const& configs);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            cmTarget const& t);
+                            const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
                            cmTarget const& t);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index bc831e5..8b874b6 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -477,7 +477,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
           dir = ""; // msbuild cannot handle ".\" prefix
           }
         this->WriteProject(fout, vcprojName, dir.c_str(),
-                           *target->Target);
+                           target);
         written = true;
         }
       }
@@ -685,13 +685,14 @@ cmGlobalVisualStudio7Generator::ConvertToSolutionPath(const char* path)
 // the libraries it uses are also done here
 void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
                                const std::string& dspname,
-                               const char* dir, cmTarget const& target)
+                               const char* dir,
+                               cmGeneratorTarget const* target)
 {
    // check to see if this is a fortran build
   const char* ext = ".vcproj";
   const char* project =
     "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
-  if(this->TargetIsFortranOnly(target))
+  if(this->TargetIsFortranOnly(*target->Target))
     {
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
@@ -703,7 +704,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
        << dspname << ext << "\", \"{"
        << this->GetGUID(dspname) << "}\"\nEndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 4ef0990..a514dcd 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -123,7 +123,7 @@ protected:
                             std::vector<cmLocalGenerator*>& generators);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            cmTarget const& t);
+                            const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
                            cmTarget const&t);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96e918c6b10483cae8a67b7afd44bcabca39ced4
commit 96e918c6b10483cae8a67b7afd44bcabca39ced4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:28:49 2015 +0200

    VS: Port loop to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 1909f21..bc831e5 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -441,7 +441,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -459,7 +459,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
                                  project.c_str(),
                                  location.c_str(),
                                  target->GetProperty("VS_PROJECT_TYPE"),
-                                 target->GetUtilities());
+                                 target->Target->GetUtilities());
       written = true;
       }
     else
@@ -468,9 +468,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmLocalGenerator* lg =
-            root->GetGlobalGenerator()->GetGeneratorTarget(target)
-            ->GetLocalGenerator();
+        cmLocalGenerator* lg = target->GetLocalGenerator();
         std::string dir = lg->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
@@ -479,7 +477,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
           dir = ""; // msbuild cannot handle ".\" prefix
           }
         this->WriteProject(fout, vcprojName, dir.c_str(),
-                           *target);
+                           *target->Target);
         written = true;
         }
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=065e54e569f7bb47665ec69564e3fccf3dfa0db9
commit 065e54e569f7bb47665ec69564e3fccf3dfa0db9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:28:33 2015 +0200

    VS: Port ImplibDir to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index c4cbdef..d5abf68 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -841,7 +841,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
   event.Write(target->Target->GetPreBuildCommands());
   event.Write(target->Target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(*target->Target, configName, false));
+    this->MaybeCreateImplibDir(target, configName, false));
   if(pcc.get())
     {
     event.Write(*pcc);
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 8b1915a..a2d4d16 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2048,7 +2048,7 @@ void cmLocalVisualStudio7Generator
     event.Write(target->Target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(*target->Target,
+    this->MaybeCreateImplibDir(target,
                                configName, this->FortranProject));
   if(pcc.get())
     {
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 8516ce7..561f9a1 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -80,7 +80,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCustomCommand>
-cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
+cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmGeneratorTarget* target,
                                                    const std::string& config,
                                                    bool isFortran)
 {
@@ -89,13 +89,11 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
   // If an executable exports symbols then VS wants to create an
   // import library but forgets to create the output directory.
   // The Intel Fortran plugin always forgets to the directory.
-  if(target.GetType() != cmState::EXECUTABLE &&
-     !(isFortran && target.GetType() == cmState::SHARED_LIBRARY))
+  if(target->GetType() != cmState::EXECUTABLE &&
+     !(isFortran && target->GetType() == cmState::SHARED_LIBRARY))
     { return pcc; }
-  cmGeneratorTarget* gt =
-      this->GetGlobalGenerator()->GetGeneratorTarget(&target);
-  std::string outDir = gt->GetDirectory(config, false);
-  std::string impDir = gt->GetDirectory(config, true);
+  std::string outDir = target->GetDirectory(config, false);
+  std::string impDir = target->GetDirectory(config, true);
   if(impDir == outDir) { return pcc; }
 
   // Add a pre-build event to create the directory.
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 6d915e7..f95eefa 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -59,7 +59,8 @@ protected:
 
   /** Construct a custom command to make exe import lib dir.  */
   cmsys::auto_ptr<cmCustomCommand>
-  MaybeCreateImplibDir(cmTarget& target, const std::string& config,
+  MaybeCreateImplibDir(cmGeneratorTarget *target,
+                       const std::string& config,
                        bool isFortran);
 };
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8778d695e411d65611e38a4cb6e258dba14c93bd
commit 8778d695e411d65611e38a4cb6e258dba14c93bd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:39 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:28:06 2015 +0200

    VS: Port LinkClosure to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 4d431f6..c43f884 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -303,19 +303,20 @@ std::string cmGlobalVisualStudioGenerator::GetUserMacrosRegKeyBase()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
-                                                    TargetSet& linked)
+void cmGlobalVisualStudioGenerator::FillLinkClosure(
+        const cmGeneratorTarget *target,
+        TargetSet& linked)
 {
-  if(linked.insert(target).second)
+  if(linked.insert(target->Target).second)
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends =
+            this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FillLinkClosure((*di)->Target, linked);
+        this->FillLinkClosure(*di, linked);
         }
       }
     }
@@ -323,12 +324,12 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
 
 //----------------------------------------------------------------------------
 cmGlobalVisualStudioGenerator::TargetSet const&
-cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
+cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 {
-  TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
+  TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target);
   if(i == this->TargetLinkClosure.end())
     {
-    TargetSetMap::value_type entry(target, TargetSet());
+    TargetSetMap::value_type entry(target->Target, TargetSet());
     i = this->TargetLinkClosure.insert(entry).first;
     this->FillLinkClosure(target, i->second);
     }
@@ -461,7 +462,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   TargetSet linked;
   if(target.GetType() != cmState::STATIC_LIBRARY)
     {
-    linked = this->GetTargetLinkClosure(&target);
+    linked = this->GetTargetLinkClosure(gt);
     }
 
   // Emit link dependencies.
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 41d0b88..5ada37e 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -146,8 +146,8 @@ private:
 
   class TargetSetMap: public std::map<cmTarget*, TargetSet> {};
   TargetSetMap TargetLinkClosure;
-  void FillLinkClosure(cmTarget const* target, TargetSet& linked);
-  TargetSet const& GetTargetLinkClosure(cmTarget* target);
+  void FillLinkClosure(cmGeneratorTarget const* target, TargetSet& linked);
+  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget *target);
 };
 
 class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b09b42f168772d781d6e80568ed8c986343cf915
commit b09b42f168772d781d6e80568ed8c986343cf915
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 23 18:27:38 2015 +0200

    VS: Port ComputeLongestObjectDirectory to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index a7f0616..c4cbdef 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1935,7 +1935,7 @@ cmLocalVisualStudio6Generator
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio6Generator
-::ComputeLongestObjectDirectory(cmTarget&) const
+::ComputeLongestObjectDirectory(cmGeneratorTarget const*) const
 {
   // Compute the maximum length configuration name.
   std::string config_max;
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index 4772d54..dab32a5 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -50,7 +50,8 @@ public:
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
+  virtual std::string
+  ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
 private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a3ca67e..8b1915a 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1689,10 +1689,10 @@ cmLocalVisualStudio7GeneratorFCInfo
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio7Generator
-::ComputeLongestObjectDirectory(cmTarget& target) const
+::ComputeLongestObjectDirectory(cmGeneratorTarget const* target) const
 {
   std::vector<std::string> configs;
-  target.GetMakefile()->GetConfigurations(configs);
+  target->Target->GetMakefile()->GetConfigurations(configs);
 
   // Compute the maximum length configuration name.
   std::string config_max;
@@ -1711,9 +1711,7 @@ cmLocalVisualStudio7Generator
   std::string dir_max;
   dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-  dir_max += this->GetTargetDirectory(gt);
+  dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index deb8d8f..7bb9cc6 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -56,7 +56,8 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   cmSourceFile* CreateVCProjBuildRule();
   void WriteStampFiles();
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
+  virtual std::string
+  ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
 
   virtual void ReadAndStoreExternalGUID(const std::string& name,
                                         const char* path);
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 2f44fb7..8516ce7 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -43,7 +43,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const* gt)
 {
-  std::string dir_max = this->ComputeLongestObjectDirectory(*gt->Target);
+  std::string dir_max = this->ComputeLongestObjectDirectory(gt);
 
   // Count the number of object files with each name.  Note that
   // windows file names are not case sensitive.
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 071bfb3..6d915e7 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -44,7 +44,8 @@ public:
 
   cmGlobalVisualStudioGenerator::VSVersion GetVersion() const;
 
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const = 0;
+  virtual std::string
+  ComputeLongestObjectDirectory(cmGeneratorTarget const*) const = 0;
 
   virtual void AddCMakeListsRules() = 0;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b9ac9cc4805d2be79364ce2a18baf66e7415110
commit 7b9ac9cc4805d2be79364ce2a18baf66e7415110
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 23:13:44 2015 +0200

    VS7: Port to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index e9aee8a..0040331 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -85,7 +85,7 @@ void cmLocalVisualStudio10Generator::Generate()
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
        ->TargetIsFortranOnly(*(*l)->Target))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 4895698..a3ca67e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -34,7 +34,8 @@ public:
     LocalGenerator(e) {}
   typedef cmComputeLinkInformation::ItemVector ItemVector;
   void OutputLibraries(std::ostream& fout, ItemVector const& libs);
-  void OutputObjects(std::ostream& fout, cmTarget* t, const char* isep = 0);
+  void OutputObjects(std::ostream& fout, cmGeneratorTarget* t,
+                     const char* isep = 0);
 private:
   cmLocalVisualStudio7Generator* LocalGenerator;
 };
@@ -129,8 +130,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = *(*l)->Target;
-    if(tgt.GetType() == cmState::GLOBAL_TARGET)
+    if((*l)->GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
       cmCustomCommandLine force_command;
@@ -142,7 +142,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
-      force += tgt.GetName();
+      force += (*l)->GetName();
       force += "_force";
       if(cmSourceFile* file =
          this->Makefile->AddCustomCommandToOutput(
@@ -187,7 +187,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     // so don't build a projectfile for it
     if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
     }
 }
@@ -225,11 +225,11 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio7Generator
-::CreateSingleVCProj(const std::string& lname, cmTarget &target)
+::CreateSingleVCProj(const std::string& lname, cmGeneratorTarget *target)
 {
   cmGlobalVisualStudioGenerator* gg
       = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-  this->FortranProject = gg->TargetIsFortranOnly(target);
+  this->FortranProject = gg->TargetIsFortranOnly(*target->Target);
   this->WindowsCEProject = gg->TargetsWindowsCE();
 
   // Intel Fortran for VS10 uses VS9 format ".vfproj" files.
@@ -241,7 +241,7 @@ void cmLocalVisualStudio7Generator
     }
 
   // add to the list of projects
-  target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
+  target->Target->SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
   fname = this->GetCurrentBinaryDirectory();
@@ -324,8 +324,9 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 }
 
 void cmLocalVisualStudio7Generator::WriteConfigurations(
-  std::ostream& fout, std::vector<std::string> const& configs,
-  const std::string& libName, cmTarget &target
+    std::ostream& fout,
+    std::vector<std::string> const& configs,
+  const std::string& libName, cmGeneratorTarget *target
   )
 {
   fout << "\t<Configurations>\n";
@@ -643,7 +644,7 @@ private:
 void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
                                                 const std::string& configName,
                                                 const std::string& libName,
-                                                cmTarget &target)
+                                                cmGeneratorTarget *target)
 {
   const char* mfcFlag = this->Makefile->GetDefinition("CMAKE_MFC_FLAG");
   if(!mfcFlag)
@@ -664,10 +665,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   const char* projectType = 0;
   bool targetBuilds = true;
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
       targetBuilds = false; // no manifest tool for object library
@@ -699,12 +697,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     {
     const std::string& linkLanguage = (this->FortranProject?
                                        std::string("Fortran"):
-                                gt->GetLinkerLanguage(configName));
+                                target->GetLinkerLanguage(configName));
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
         ("CMake can not determine linker language for target: ",
-         target.GetName().c_str());
+         target->GetName().c_str());
       return;
       }
     if(linkLanguage == "C" || linkLanguage == "CXX"
@@ -730,12 +728,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       }
 
     // Add the target-specific flags.
-    this->AddCompileOptions(flags, gt, linkLanguage, configName);
+    this->AddCompileOptions(flags, target, linkLanguage, configName);
     }
 
   if(this->FortranProject)
     {
-    switch(this->GetFortranFormat(target.GetProperty("Fortran_FORMAT")))
+    switch(this->GetFortranFormat(target->GetProperty("Fortran_FORMAT")))
       {
       case FortranFormatFixed: flags += " -fixed"; break;
       case FortranFormatFree: flags += " -free"; break;
@@ -762,7 +760,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.Parse(defineFlags.c_str());
   targetOptions.ParseFinish();
   std::vector<std::string> targetDefines;
-  gt->GetCompileDefinitions(targetDefines, configName, "CXX");
+  target->GetCompileDefinitions(targetDefines, configName, "CXX");
   targetOptions.AddDefines(targetDefines);
   targetOptions.SetVerboseMakefile(
     this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));
@@ -774,22 +772,22 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = gt->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     targetOptions.AddDefine(exportMacro);
     }
 
   // The intermediate directory name consists of a directory for the
   // target and a subdirectory for the configuration name.
-  std::string intermediateDir = this->GetTargetDirectory(gt);
+  std::string intermediateDir = this->GetTargetDirectory(target);
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target.GetType() < cmState::UTILITY)
+  if (target->Target->GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target.GetType() == cmState::OBJECT_LIBRARY?
-      intermediateDir : gt->GetDirectory(configName);
+      target->Target->GetType() == cmState::OBJECT_LIBRARY?
+      intermediateDir : target->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
     }
@@ -804,7 +802,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if (this->FortranProject)
     {
     // Intel Fortran >= 15.0 uses TargetName property.
-    std::string targetNameFull = gt->GetFullName(configName);
+    std::string targetNameFull = target->GetFullName(configName);
     std::string targetName =
       cmSystemTools::GetFilenameWithoutLastExtension(targetNameFull);
     std::string targetExt =
@@ -839,7 +837,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if(this->FortranProject)
     {
     const char* target_mod_dir =
-      target.GetProperty("Fortran_MODULE_DIRECTORY");
+      target->Target->GetProperty("Fortran_MODULE_DIRECTORY");
     std::string modDir;
     if(target_mod_dir)
       {
@@ -858,7 +856,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
   fout << "\t\t\t\tAdditionalIncludeDirectories=\"";
   std::vector<std::string> includes;
-  this->GetIncludeDirectories(includes, gt, "C", configName);
+  this->GetIncludeDirectories(includes, target, "C", configName);
   std::vector<std::string>::iterator i = includes.begin();
   for(;i != includes.end(); ++i)
     {
@@ -879,10 +877,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target.GetType() <= cmState::OBJECT_LIBRARY)
+  if(target->Target->GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
-    std::string pdb = gt->GetCompilePDBPath(configName);
+    std::string pdb = target->GetCompilePDBPath(configName);
     if(!pdb.empty())
       {
       fout <<  "\t\t\t\tProgramDataBaseFileName=\""
@@ -986,7 +984,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       "\t\t\t\tName=\"" << manifestTool << "\"";
 
     std::vector<cmSourceFile const*> manifest_srcs;
-    gt->GetManifests(manifest_srcs, configName);
+    target->GetManifests(manifest_srcs, configName);
     if (!manifest_srcs.empty())
       {
       fout << "\n\t\t\t\tAdditionalManifestFiles=\"";
@@ -1001,7 +999,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
     // Check if we need the FAT32 workaround.
     // Check the filesystem type where the target will be written.
-    if (cmLVS6G_IsFAT(gt->GetDirectory(configName).c_str()))
+    if (cmLVS6G_IsFAT(target->GetDirectory(configName).c_str()))
       {
       // Add a flag telling the manifest tool to use a workaround
       // for FAT32 file systems, which can cause an empty manifest
@@ -1035,28 +1033,28 @@ cmLocalVisualStudio7Generator
 }
 
 void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
-  const std::string& configName, cmTarget &target,
+  const std::string& configName, cmGeneratorTarget* target,
   const Options& targetOptions)
 {
   cmGlobalVisualStudio7Generator* gg =
     static_cast<cmGlobalVisualStudio7Generator*>(this->GlobalGenerator);
   std::string temp;
   std::string extraLinkOptions;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_EXE_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_SHARED_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS")
@@ -1064,7 +1062,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       + GetBuildTypeLinkerFlags("CMAKE_MODULE_LINKER_FLAGS", configName);
     }
 
-  const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags = target->GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1073,7 +1071,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
   std::string configTypeUpper = cmSystemTools::UpperCase(configName);
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += configTypeUpper;
-  targetLinkFlags = target.GetProperty(linkFlagsConfig.c_str());
+  targetLinkFlags = target->GetProperty(linkFlagsConfig.c_str());
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1093,28 +1091,26 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       this->ConvertToOutputFormat(this->ModuleDefinitionFile, SHELL);
     linkOptions.AddFlag("ModuleDefinitionFile", defFile.c_str());
     }
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
 
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (target->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)/exportall.def");
       }
     }
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::UNKNOWN_LIBRARY:
       break;
     case cmState::OBJECT_LIBRARY:
       {
-      std::string libpath = this->GetTargetDirectory(gt);
+      std::string libpath = this->GetTargetDirectory(target);
       libpath += "/";
       libpath += configName;
       libpath += "/";
-      libpath += target.GetName();
+      libpath += target->GetName();
       libpath += ".lib";
       const char* tool =
         this->FortranProject? "VFLibrarianTool":"VCLibrarianTool";
@@ -1126,8 +1122,8 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     case cmState::STATIC_LIBRARY:
     {
-    std::string targetNameFull = gt->GetFullName(configName);
-    std::string libpath = gt->GetDirectory(configName);
+    std::string targetNameFull = target->GetFullName(configName);
+    std::string libpath = target->GetDirectory(configName);
     libpath += "/";
     libpath += targetNameFull;
     const char* tool = "VCLibrarianTool";
@@ -1142,14 +1138,14 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
         || this->FortranProject)
       {
       std::ostringstream libdeps;
-      this->Internal->OutputObjects(libdeps, &target);
+      this->Internal->OutputObjects(libdeps, target);
       if(!libdeps.str().empty())
         {
         fout << "\t\t\t\tAdditionalDependencies=\"" << libdeps.str() << "\"\n";
         }
       }
     std::string libflags;
-    this->GetStaticLibraryFlags(libflags, configTypeUpper, gt);
+    this->GetStaticLibraryFlags(libflags, configTypeUpper, target);
     if(!libflags.empty())
       {
       fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
@@ -1166,11 +1162,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gt->GetLibraryNames(targetName, targetNameSO, targetNameFull,
+    target->GetLibraryNames(targetName, targetNameSO, targetNameFull,
                            targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1190,7 +1186,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(target))
+    if(!gg->NeedLinkLibraryDependencies(*target->Target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1202,22 +1198,22 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, &target, " ");
+      this->Internal->OutputObjects(fout, target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = gt->GetDirectory(configName);
+    temp = target->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, gt);
+    this->WriteTargetVersionAttribute(fout, target);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
-    temp = gt->GetPDBDirectory(configName);
+    temp = target->GetPDBDirectory(configName);
     temp += "/";
     temp += targetNamePDB;
     fout << "\t\t\t\tProgramDatabaseFile=\"" <<
@@ -1245,7 +1241,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal  << "\"\n";
       }
-    temp = gt->GetDirectory(configName, true);
+    temp = target->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1263,11 +1259,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gt->GetExecutableNames(targetName, targetNameFull,
+    target->GetExecutableNames(targetName, targetNameFull,
                               targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1275,7 +1271,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     cmComputeLinkInformation& cli = *pcli;
     std::string linkLanguage = cli.GetLinkLanguage();
 
-    bool isWin32Executable = target.GetPropertyAsBool("WIN32_EXECUTABLE");
+    bool isWin32Executable = target->GetPropertyAsBool("WIN32_EXECUTABLE");
 
     // Compute the variable name to lookup standard libraries for this
     // language.
@@ -1289,7 +1285,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(target))
+    if(!gg->NeedLinkLibraryDependencies(*target->Target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1301,23 +1297,23 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, &target, " ");
+      this->Internal->OutputObjects(fout, target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = gt->GetDirectory(configName);
+    temp = target->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, gt);
+    this->WriteTargetVersionAttribute(fout, target);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
     std::string path = this->ConvertToXMLOutputPathSingle(
-      gt->GetPDBDirectory(configName).c_str());
+      target->GetPDBDirectory(configName).c_str());
     fout << "\t\t\t\tProgramDatabaseFile=\""
          << path << "/" << targetNamePDB
          << "\"\n";
@@ -1364,7 +1360,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal << "\"";
       }
-    temp = gt->GetDirectory(configName, true);
+    temp = target->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1415,13 +1411,11 @@ cmLocalVisualStudio7GeneratorInternals
 //----------------------------------------------------------------------------
 void
 cmLocalVisualStudio7GeneratorInternals
-::OutputObjects(std::ostream& fout, cmTarget* t, const char* isep)
+::OutputObjects(std::ostream& fout, cmGeneratorTarget* gt, const char* isep)
 {
   // VS < 8 does not support per-config source locations so we
   // list object library content on the link line instead.
   cmLocalVisualStudio7Generator* lg = this->LocalGenerator;
-  cmGeneratorTarget* gt =
-    lg->GetGlobalGenerator()->GetGeneratorTarget(t);
   std::vector<std::string> objs;
   gt->UseObjectLibraries(objs, "");
   const char* sep = isep? isep : "";
@@ -1478,7 +1472,7 @@ cmLocalVisualStudio7Generator
 
 void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
                                                     const std::string& libName,
-                                                    cmTarget &target)
+                                                    cmGeneratorTarget* target)
 {
   std::vector<std::string> configs;
   this->Makefile->GetConfigurations(configs);
@@ -1486,13 +1480,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
   // We may be modifying the source groups temporarily, so make a copy.
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // get the classes from the source lists then add them to the groups
   this->ModuleDefinitionFile = "";
   std::vector<cmSourceFile*> classes;
-  if (!gt->GetConfigCommonSourceFiles(classes))
+  if (!target->GetConfigCommonSourceFiles(classes))
     {
     return;
     }
@@ -1535,7 +1526,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
     // VS >= 8 support per-config source locations so we
     // list object library content as external objects.
     std::vector<std::string> objs;
-    gt->UseObjectLibraries(objs, "");
+    target->UseObjectLibraries(objs, "");
     if(!objs.empty())
       {
       // TODO: Separate sub-filter for each object library used?
@@ -1570,7 +1561,7 @@ class cmLocalVisualStudio7GeneratorFCInfo
 {
 public:
   cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmTarget& target,
+                                      cmGeneratorTarget* target,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs);
   std::map<std::string, cmLVS7GFileConfig> FileConfigMap;
@@ -1578,12 +1569,10 @@ public:
 
 cmLocalVisualStudio7GeneratorFCInfo
 ::cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmTarget& target,
+                                      cmGeneratorTarget* gt,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs)
 {
-  cmGeneratorTarget* gt =
-    lg->GetGlobalGenerator()->GetGeneratorTarget(&target);
   std::string objectName;
   if(gt->HasExplicitObjectName(&sf))
     {
@@ -1732,7 +1721,7 @@ cmLocalVisualStudio7Generator
 }
 
 bool cmLocalVisualStudio7Generator
-::WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+::WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
              std::ostream &fout, const std::string& libName,
              std::vector<std::string> const& configs)
 {
@@ -1767,15 +1756,14 @@ bool cmLocalVisualStudio7Generator
     }
 
   // Loop through each source in the source group.
-  std::string objectName;
   for(std::vector<const cmSourceFile *>::const_iterator sf =
         sourceFiles.begin(); sf != sourceFiles.end(); ++sf)
     {
     std::string source = (*sf)->GetFullPath();
     FCInfo fcinfo(this, target, *(*sf), configs);
 
-    if (source != libName || target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET )
+    if (source != libName || target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET )
       {
       fout << "\t\t\t<File\n";
       std::string d = this->ConvertToXMLOutputPathSingle(source.c_str());
@@ -2022,10 +2010,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjEndGroup(std::ostream& fout)
 void cmLocalVisualStudio7Generator
 ::OutputTargetRules(std::ostream& fout,
                     const std::string& configName,
-                    cmTarget &target,
+                    cmGeneratorTarget *target,
                     const std::string& /*libName*/)
 {
-  if (target.GetType() > cmState::GLOBAL_TARGET)
+  if (target->GetType() > cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -2035,36 +2023,35 @@ void cmLocalVisualStudio7Generator
   const char* tool =
     this->FortranProject? "VFPreBuildEventTool":"VCPreBuildEventTool";
   event.Start(tool);
-  event.Write(target.GetPreBuildCommands());
+  event.Write(target->Target->GetPreBuildCommands());
   event.Finish();
 
   // Add pre-link event.
   tool = this->FortranProject? "VFPreLinkEventTool":"VCPreLinkEventTool";
   event.Start(tool);
   bool addedPrelink = false;
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (target->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        target.GetPreLinkCommands();
+        target->Target->GetPreLinkCommands();
       cmGlobalVisualStudioGenerator* gg
         = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-      cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(&target);
       gg->AddSymbolExportCommand(
-        gt, commands, configName);
+        target, commands, configName);
       event.Write(commands);
       }
     }
   if (!addedPrelink)
     {
-    event.Write(target.GetPreLinkCommands());
+    event.Write(target->Target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, this->FortranProject));
+    this->MaybeCreateImplibDir(*target->Target,
+                               configName, this->FortranProject));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -2074,18 +2061,18 @@ void cmLocalVisualStudio7Generator
   // Add post-build event.
   tool = this->FortranProject? "VFPostBuildEventTool":"VCPostBuildEventTool";
   event.Start(tool);
-  event.Write(target.GetPostBuildCommands());
+  event.Write(target->Target->GetPostBuildCommands());
   event.Finish();
 }
 
 void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
-                                                    cmTarget& target)
+                                                    cmGeneratorTarget* target)
 {
   // if we have all the required Source code control tags
   // then add that to the project
-  const char* vsProjectname = target.GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalpath = target.GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectname = target->GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalpath = target->GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider = target->GetProperty("VS_SCC_PROVIDER");
 
   if(vsProvider && vsLocalpath && vsProjectname)
     {
@@ -2093,7 +2080,7 @@ void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
          << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
          << "\tSccProvider=\"" << vsProvider << "\"\n";
 
-    const char* vsAuxPath = target.GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath = target->GetProperty("VS_SCC_AUXPATH");
     if(vsAuxPath)
       {
       fout << "\tSccAuxPath=\"" << vsAuxPath << "\"\n";
@@ -2105,7 +2092,7 @@ void
 cmLocalVisualStudio7Generator
 ::WriteProjectStartFortran(std::ostream& fout,
                            const std::string& libName,
-                           cmTarget & target)
+                           cmGeneratorTarget *target)
 {
 
   cmGlobalVisualStudio7Generator* gg =
@@ -2115,13 +2102,13 @@ cmLocalVisualStudio7Generator
        << "<VisualStudioProject\n"
        << "\tProjectCreator=\"Intel Fortran\"\n"
        << "\tVersion=\"" << gg->GetIntelProjectVersion() << "\"\n";
-  const char* keyword = target.GetProperty("VS_KEYWORD");
+  const char* keyword = target->GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Console Application";
     }
   const char* projectType = 0;
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::STATIC_LIBRARY:
       projectType = "typeStaticLibrary";
@@ -2166,7 +2153,7 @@ cmLocalVisualStudio7Generator
 void
 cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
                                                  const std::string& libName,
-                                                 cmTarget & target,
+                                                 cmGeneratorTarget *target,
                                                  std::vector<cmSourceGroup> &)
 {
   if(this->FortranProject)
@@ -2190,12 +2177,12 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     {
     fout <<  "\tVersion=\"" << (gg->GetVersion()/10) << ".00\"\n";
     }
-  const char* projLabel = target.GetProperty("PROJECT_LABEL");
+  const char* projLabel = target->GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = libName.c_str();
     }
-  const char* keyword = target.GetProperty("VS_KEYWORD");
+  const char* keyword = target->GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Win32Proj";
@@ -2207,7 +2194,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     }
   this->WriteProjectSCC(fout, target);
   if(const char* targetFrameworkVersion =
-     target.GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
+     target->GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     fout << "\tTargetFrameworkVersion=\"" << targetFrameworkVersion << "\"\n";
     }
@@ -2228,12 +2215,13 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
 }
 
 
-void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream& fout,
-                                                      cmTarget &target)
+void cmLocalVisualStudio7Generator::WriteVCProjFooter(
+    std::ostream& fout,
+    cmGeneratorTarget *target)
 {
   fout << "\t<Globals>\n";
 
-  cmPropertyMap const& props = target.GetProperties();
+  cmPropertyMap const& props = target->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     if(i->first.find("VS_GLOBAL_") == 0)
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 16cf004..deb8d8f 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -15,7 +15,6 @@
 #include "cmLocalVisualStudioGenerator.h"
 #include "cmVisualStudioGeneratorOptions.h"
 
-class cmTarget;
 class cmSourceFile;
 class cmCustomCommand;
 class cmSourceGroup;
@@ -63,7 +62,8 @@ public:
                                         const char* path);
   virtual void AddCMakeListsRules();
 protected:
-  void CreateSingleVCProj(const std::string& lname, cmTarget &tgt);
+  void CreateSingleVCProj(const std::string& lname,
+                          cmGeneratorTarget *tgt);
 private:
   typedef cmVisualStudioGeneratorOptions Options;
   typedef cmLocalVisualStudio7GeneratorFCInfo FCInfo;
@@ -72,30 +72,33 @@ private:
   void FixGlobalTargets();
   void WriteProjectFiles();
   void WriteVCProjHeader(std::ostream& fout, const std::string& libName,
-                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
-  void WriteVCProjFooter(std::ostream& fout, cmTarget &target);
+                         cmGeneratorTarget* tgt,
+                         std::vector<cmSourceGroup> &sgs);
+  void WriteVCProjFooter(std::ostream& fout, cmGeneratorTarget* target);
   void WriteVCProjFile(std::ostream& fout, const std::string& libName,
-                       cmTarget &tgt);
+                       cmGeneratorTarget* tgt);
   void WriteConfigurations(std::ostream& fout,
                            std::vector<std::string> const& configs,
-                           const std::string& libName, cmTarget &tgt);
+                           const std::string& libName, cmGeneratorTarget* tgt);
   void WriteConfiguration(std::ostream& fout,
                           const std::string& configName,
-                          const std::string& libName, cmTarget &tgt);
+                          const std::string& libName, cmGeneratorTarget* tgt);
   std::string EscapeForXML(const std::string& s);
   std::string ConvertToXMLOutputPath(const char* path);
   std::string ConvertToXMLOutputPathSingle(const char* path);
   void OutputTargetRules(std::ostream& fout, const std::string& configName,
-                         cmTarget &target, const std::string& libName);
+                         cmGeneratorTarget* target,
+                         const std::string& libName);
   void OutputBuildTool(std::ostream& fout, const std::string& configName,
-                       cmTarget& t, const Options& targetOptions);
+                       cmGeneratorTarget* t, const Options& targetOptions);
   void OutputLibraryDirectories(std::ostream& fout,
                                 std::vector<std::string> const& dirs);
-  void WriteProjectSCC(std::ostream& fout, cmTarget& target);
+  void WriteProjectSCC(std::ostream& fout, cmGeneratorTarget *target);
   void WriteProjectStart(std::ostream& fout, const std::string& libName,
-                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
+                         cmGeneratorTarget* tgt,
+                         std::vector<cmSourceGroup> &sgs);
   void WriteProjectStartFortran(std::ostream& fout, const std::string& libName,
-                                cmTarget &tgt);
+                                cmGeneratorTarget* tgt);
   void WriteVCProjBeginGroup(std::ostream& fout,
                           const char* group,
                           const char* filter);
@@ -110,7 +113,7 @@ private:
                                    cmGeneratorTarget* gt);
 
   bool WriteGroup(const cmSourceGroup *sg,
-                  cmTarget& target, std::ostream &fout,
+                  cmGeneratorTarget* target, std::ostream &fout,
                   const std::string& libName,
                   std::vector<std::string> const& configs);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=650938a289cc5da9304aeaaab6ee3fb85710a204
commit 650938a289cc5da9304aeaaab6ee3fb85710a204
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 23:13:44 2015 +0200

    VS10: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 161b532..e568704 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -331,7 +331,7 @@ void cmGlobalVisualStudio10Generator::Generate()
   this->cmGlobalVisualStudio8Generator::Generate();
   if(this->LongestSource.Length > 0)
     {
-    cmMakefile* mf = this->LongestSource.Target->GetMakefile();
+    cmLocalGenerator* lg = this->LongestSource.Target->GetLocalGenerator();
     std::ostringstream e;
     e <<
       "The binary and/or source directory paths may be too long to generate "
@@ -346,13 +346,13 @@ void cmGlobalVisualStudio10Generator::Generate()
       "  " << this->LongestSource.SourceFile->GetFullPath() << "\n"
       "This is because some Visual Studio tools would append the relative "
       "path to the end of the referencing directory path, as in:\n"
-      "  " << mf->GetCurrentBinaryDirectory() << "/"
+      "  " << lg->GetCurrentBinaryDirectory() << "/"
       << this->LongestSource.SourceRel << "\n"
       "and then incorrectly complain that the file does not exist because "
       "the path length is too long for some internal buffer or API.  "
       "To avoid this problem CMake must use a full path for this file "
       "which then triggers the VS 10 property dialog bug.";
-    mf->IssueMessage(cmake::WARNING, e.str().c_str());
+    lg->IssueMessage(cmake::WARNING, e.str().c_str());
     }
 }
 
@@ -591,9 +591,11 @@ cmGlobalVisualStudio10Generator
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio10Generator::PathTooLong(
-  cmTarget* target, cmSourceFile const* sf, std::string const& sfRel)
+        cmGeneratorTarget *target, cmSourceFile const* sf,
+        std::string const& sfRel)
 {
-  size_t len = (strlen(target->GetMakefile()->GetCurrentBinaryDirectory()) +
+  size_t len =
+      (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
                 1 + sfRel.length());
   if(len > this->LongestSource.Length)
     {
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 7600a0d..6bf4740 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -95,7 +95,7 @@ public:
   /** Generate an <output>.rule file path for a given command output.  */
   virtual std::string GenerateRuleFile(std::string const& output) const;
 
-  void PathTooLong(cmTarget* target, cmSourceFile const* sf,
+  void PathTooLong(cmGeneratorTarget* target, cmSourceFile const* sf,
                    std::string const& sfRel);
 
   virtual const char* GetToolsVersion() { return "4.0"; }
@@ -139,7 +139,7 @@ private:
   {
     LongestSourcePath(): Length(0), Target(0), SourceFile(0) {}
     size_t Length;
-    cmTarget* Target;
+    cmGeneratorTarget* Target;
     cmSourceFile const* SourceFile;
     std::string SourceRel;
   };
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index c9d53fe..e9aee8a 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -90,7 +90,7 @@ void cmLocalVisualStudio10Generator::Generate()
     else
       {
       cmVisualStudio10TargetGenerator tg(
-        (*l)->Target, static_cast<cmGlobalVisualStudio10Generator*>(
+        *l, static_cast<cmGlobalVisualStudio10Generator*>(
           this->GetGlobalGenerator()));
       tg.Generate();
       }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f4c632d..3f8e627 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -13,7 +13,6 @@
 #include "cmVisualStudio10TargetGenerator.h"
 #include "cmGlobalVisualStudio10Generator.h"
 #include "cmGeneratorTarget.h"
-#include "cmTarget.h"
 #include "cmComputeLinkInformation.h"
 #include "cmGeneratedFileStream.h"
 #include "cmMakefile.h"
@@ -167,13 +166,12 @@ static std::string cmVS10EscapeComment(std::string comment)
 }
 
 cmVisualStudio10TargetGenerator::
-cmVisualStudio10TargetGenerator(cmTarget* target,
+cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
                                 cmGlobalVisualStudio10Generator* gg)
 {
   this->GlobalGenerator = gg;
-  this->Target = target;
-  this->GeneratorTarget = gg->GetGeneratorTarget(target);
-  this->Makefile = target->GetMakefile();
+  this->GeneratorTarget = target;
+  this->Makefile = target->Target->GetMakefile();
   this->Makefile->GetConfigurations(this->Configurations);
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
@@ -275,8 +273,9 @@ void cmVisualStudio10TargetGenerator::Generate()
     return;
     }
   // Tell the global generator the name of the project file
-  this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
-  this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
+  this->GeneratorTarget->Target
+      ->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
+  this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
   if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
     {
@@ -732,7 +731,8 @@ void cmVisualStudio10TargetGenerator
   cmGlobalVisualStudio10Generator* gg =
     static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
   const char* mfcFlag =
-    this->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
+    this->GeneratorTarget->
+      Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
   std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
 
   std::string useOfMfcValue = "false";
@@ -1462,7 +1462,8 @@ void cmVisualStudio10TargetGenerator::WriteSource(
       }
     else
       {
-      this->GlobalGenerator->PathTooLong(this->Target, sf, sourceRel);
+      this->GlobalGenerator->PathTooLong(this->GeneratorTarget,
+                                         sf, sourceRel);
       }
     }
   this->ConvertToWindowsSlash(sourceFile);
@@ -1915,12 +1916,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
     std::string baseFlagVar = "CMAKE_";
     baseFlagVar += linkLanguage;
     baseFlagVar += "_FLAGS";
-    flags = this->
+    flags = this->GeneratorTarget->
       Target->GetMakefile()->GetRequiredDefinition(baseFlagVar.c_str());
     std::string flagVar = baseFlagVar + std::string("_") +
       cmSystemTools::UpperCase(configName);
     flags += " ";
-    flags += this->
+    flags += this->GeneratorTarget->
       Target->GetMakefile()->GetRequiredDefinition(flagVar.c_str());
     }
   // set the correct language
@@ -1936,7 +1937,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
                                           linkLanguage, configName.c_str());
 
   // Get preprocessor definitions for this directory.
-  std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags();
+  std::string defineFlags =
+      this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
   if(this->MSTools)
     {
     clOptions.FixExceptionHandlingDefault();
@@ -2440,11 +2442,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   linkFlagVarBase += linkType;
   linkFlagVarBase += "_LINKER_FLAGS";
   flags += " ";
-  flags += this->
+  flags += this->GeneratorTarget->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVarBase.c_str());
   std::string linkFlagVar = linkFlagVarBase + "_" + CONFIG;
   flags += " ";
-  flags += this->
+  flags += this->GeneratorTarget->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
   const char* targetLinkFlags =
       this->GeneratorTarget->GetProperty("LINK_FLAGS");
@@ -2674,7 +2676,8 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
   linkOptions.OutputFlagMap(*this->BuildFileStream, "      ");
 
   this->WriteString("</Link>\n", 2);
-  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(*this->Target))
+  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
+              *this->GeneratorTarget->Target))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(
@@ -2811,7 +2814,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        this->Target->GetPreLinkCommands();
+        this->GeneratorTarget->Target->GetPreLinkCommands();
       this->GlobalGenerator->AddSymbolExportCommand(
         this->GeneratorTarget, commands, configName);
       this->WriteEvent("PreLinkEvent", commands, configName);
@@ -2820,12 +2823,12 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (!addedPrelink)
     {
     this->WriteEvent("PreLinkEvent",
-                     this->Target->GetPreLinkCommands(), configName);
+        this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
     }
   this->WriteEvent("PreBuildEvent",
-                   this->Target->GetPreBuildCommands(), configName);
+        this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
   this->WriteEvent("PostBuildEvent",
-                   this->Target->GetPostBuildCommands(), configName);
+        this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
 }
 
 void cmVisualStudio10TargetGenerator::WriteEvent(
@@ -2875,7 +2878,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
   for( OrderedTargetDependSet::const_iterator i = depends.begin();
        i != depends.end(); ++i)
     {
-    cmTarget const* dt = (*i)->Target;
+    cmGeneratorTarget const* dt = *i;
     if(dt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -2883,12 +2886,12 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     // skip fortran targets as they can not be processed by MSBuild
     // the only reference will be in the .sln file
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*dt))
+       ->TargetIsFortranOnly(*dt->Target))
       {
       continue;
       }
     this->WriteString("<ProjectReference Include=\"", 2);
-    cmMakefile* mf = dt->GetMakefile();
+    cmLocalGenerator* lg = dt->GetLocalGenerator();
     std::string name = dt->GetName();
     std::string path;
     const char* p = dt->GetProperty("EXTERNAL_MSPROJECT");
@@ -2898,7 +2901,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
       }
     else
       {
-      path =  mf->GetCurrentBinaryDirectory();
+      path =  lg->GetCurrentBinaryDirectory();
       path += "/";
       path += dt->GetName();
       path += ".vcxproj";
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 15ed9f2..044e0dd 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -13,7 +13,6 @@
 #define cmVisualStudioTargetGenerator_h
 #include "cmStandardIncludes.h"
 
-class cmTarget;
 class cmMakefile;
 class cmGeneratorTarget;
 class cmGeneratedFileStream;
@@ -29,7 +28,7 @@ struct cmIDEFlagTable;
 class cmVisualStudio10TargetGenerator
 {
 public:
-  cmVisualStudio10TargetGenerator(cmTarget* target,
+  cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
                                   cmGlobalVisualStudio10Generator* gg);
   ~cmVisualStudio10TargetGenerator();
   void Generate();
@@ -148,7 +147,6 @@ private:
   OptionsMap LinkOptions;
   std::string PathToVcxproj;
   std::vector<std::string> Configurations;
-  cmTarget* Target;
   cmGeneratorTarget* GeneratorTarget;
   cmMakefile* Makefile;
   std::string Platform;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |   12 +-
 Source/cmGlobalVisualStudio10Generator.h   |    4 +-
 Source/cmGlobalVisualStudio6Generator.cxx  |   10 +-
 Source/cmGlobalVisualStudio6Generator.h    |    2 +-
 Source/cmGlobalVisualStudio71Generator.cxx |   12 +-
 Source/cmGlobalVisualStudio71Generator.h   |    4 +-
 Source/cmGlobalVisualStudio7Generator.cxx  |   38 ++---
 Source/cmGlobalVisualStudio7Generator.h    |    9 +-
 Source/cmGlobalVisualStudio8Generator.cxx  |   13 +-
 Source/cmGlobalVisualStudio8Generator.h    |    5 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |   87 ++++++------
 Source/cmGlobalVisualStudioGenerator.h     |   32 +++--
 Source/cmLocalVisualStudio10Generator.cxx  |    6 +-
 Source/cmLocalVisualStudio6Generator.cxx   |    4 +-
 Source/cmLocalVisualStudio6Generator.h     |    3 +-
 Source/cmLocalVisualStudio7Generator.cxx   |  210 +++++++++++++---------------
 Source/cmLocalVisualStudio7Generator.h     |   32 +++--
 Source/cmLocalVisualStudioGenerator.cxx    |   14 +-
 Source/cmLocalVisualStudioGenerator.h      |    6 +-
 Source/cmVisualStudio10TargetGenerator.cxx |   49 ++++---
 Source/cmVisualStudio10TargetGenerator.h   |    4 +-
 21 files changed, 277 insertions(+), 279 deletions(-)


hooks/post-receive
-- 
CMake

From gjasny at googlemail.com  Fri Oct 23 13:30:43 2015
From: gjasny at googlemail.com (Gregor Jasny)
Date: Fri, 23 Oct 2015 13:30:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-923-g8fbc8e4
Message-ID: <20151023173043.16AD8C08CA@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8fbc8e473b347d69331cd120aea3dd6c33e98599 (commit)
       via  601e6e1ad10b83dcb5ad09d061b04e6974cda283 (commit)
      from  88b9b0a6f138fa933cd9d286c02fe5a7e255080a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8fbc8e473b347d69331cd120aea3dd6c33e98599
commit 8fbc8e473b347d69331cd120aea3dd6c33e98599
Merge: 88b9b0a 601e6e1
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Oct 23 13:30:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 23 13:30:42 2015 -0400

    Merge topic 'xcode-optimization-flags' into next
    
    601e6e1a Xcode: Use regular expression to extract all optimisation flags (#15794)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=601e6e1ad10b83dcb5ad09d061b04e6974cda283
commit 601e6e1ad10b83dcb5ad09d061b04e6974cda283
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Oct 18 21:53:12 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Fri Oct 23 19:29:09 2015 +0200

    Xcode: Use regular expression to extract all optimisation flags (#15794)

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bc05aea..0e3af88 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1612,6 +1612,39 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag,
 }
 
 //----------------------------------------------------------------------------
+// This function removes each matching occurrence of the expression and
+// returns the last one (i.e., the dominant flag in GCC)
+std::string cmGlobalXCodeGenerator::ExtractFlagRegex(const char* exp,
+                                                     int matchIndex,
+                                                     std::string& flags)
+{
+  std::string retFlag;
+
+  cmsys::RegularExpression regex(exp);
+  assert(regex.is_valid());
+  if(!regex.is_valid())
+    {
+    return retFlag;
+    }
+
+  std::string::size_type offset = 0;
+
+  while(regex.find(flags.c_str() + offset))
+    {
+    const std::string::size_type startPos = offset + regex.start(matchIndex);
+    const std::string::size_type endPos = offset + regex.end(matchIndex);
+    const std::string::size_type size = endPos - startPos;
+
+    offset = startPos + 1;
+
+    retFlag.assign(flags, startPos, size);
+    flags.replace(startPos, size, size, ' ');
+    }
+
+  return retFlag;
+}
+
+//----------------------------------------------------------------------------
 void
 cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
                                                 cmTarget& target,
@@ -2227,9 +2260,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   bool same_gflags = true;
   std::map<std::string, std::string> gflags;
   std::string const* last_gflag = 0;
-  char optLevel[2];
-  optLevel[0] = '0';
-  optLevel[1] = 0;
+  std::string optLevel = "0";
 
   // Minimal map of flags to build settings.
   for (std::set<std::string>::iterator li = languages.begin();
@@ -2237,14 +2268,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     std::string& flags = cflags[*li];
     std::string& gflag = gflags[*li];
-    std::string oflag = this->ExtractFlag("-O", flags);
-    if(oflag.size() == 3)
+    std::string oflag =
+      this->ExtractFlagRegex("(^| )(-Ofast|-Os|-O[0-9]*)( |$)", 2, flags);
+    if(oflag.size() == 2)
       {
-      optLevel[0] = oflag[2];
+      optLevel = "1";
       }
-    if(oflag.size() == 2)
+    else if(oflag.size() > 2)
       {
-      optLevel[0] = '1';
+      optLevel = oflag.substr(2);
       }
     gflag = this->ExtractFlag("-g", flags);
     // put back gdwarf-2 if used since there is no way
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 9daf0ab..791324d 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -151,6 +151,8 @@ private:
                            cmXCodeObject* buildSettings,
                            const std::string& buildType);
   std::string ExtractFlag(const char* flag, std::string& flags);
+  std::string ExtractFlagRegex(const char* exp, int matchIndex,
+                               std::string& flags);
   void SortXCodeObjects();
   // delete all objects in the this->XCodeObjects vector.
   void ClearXCodeObjects();
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 8ab618b..7901ec0 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -4,6 +4,9 @@ run_cmake(XcodeFileType)
 run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
 run_cmake(XcodeObjectNeedsQuote)
+run_cmake(XcodeOptimizationFlags)
+run_cmake(XcodePreserveNonOptimizationFlags)
+run_cmake(XcodePreserveObjcFlag)
 if (NOT XCODE_VERSION VERSION_LESS 6)
   run_cmake(XcodePlatformFrameworks)
 endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags-check.cmake b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags-check.cmake
new file mode 100644
index 0000000..f5595b3
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags-check.cmake
@@ -0,0 +1,7 @@
+foreach(level 1 2 3 s fast)
+  file(STRINGS ${RunCMake_TEST_BINARY_DIR}/XcodeOptimizationFlags.xcodeproj/project.pbxproj actual-${level}
+       REGEX "GCC_OPTIMIZATION_LEVEL = ${level};" LIMIT_COUNT 1)
+  if(NOT actual-${level})
+    message(SEND_ERROR "Optimization level '${level}' not found in Xcode project.")
+  endif()
+endforeach()
diff --git a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
new file mode 100644
index 0000000..e14bf80
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
@@ -0,0 +1,20 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported configuration types")
+
+set(CMAKE_CXX_FLAGS_RELEASE "")
+
+project(XcodeOptimizationFlags CXX)
+
+add_library(fooO1 STATIC foo.cpp)
+set_target_properties(fooO1 PROPERTIES COMPILE_OPTIONS -O1)
+
+add_library(fooO2 STATIC foo.cpp)
+set_target_properties(fooO2 PROPERTIES COMPILE_OPTIONS -O2)
+
+add_library(fooO3 STATIC foo.cpp)
+set_target_properties(fooO3 PROPERTIES COMPILE_OPTIONS -O3)
+
+add_library(fooOs STATIC foo.cpp)
+set_target_properties(fooOs PROPERTIES COMPILE_OPTIONS -Os)
+
+add_library(fooOfast STATIC foo.cpp)
+set_target_properties(fooOfast PROPERTIES COMPILE_OPTIONS -Ofast)
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
new file mode 100644
index 0000000..2f6c03d
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
@@ -0,0 +1,8 @@
+file(STRINGS ${RunCMake_TEST_BINARY_DIR}/XcodePreserveNonOptimizationFlags.xcodeproj/project.pbxproj actual
+     REGEX "OTHER_CPLUSPLUSFLAGS = [^;]*;")
+foreach(expect "-DA" "-DB +-DC" "-DD")
+  if(NOT "${actual}" MATCHES "${expect}")
+    message(SEND_ERROR "The actual project contains the lines:\n ${actual}\n"
+      "which do not match expected regex:\n ${expect}\n")
+  endif()
+endforeach()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
new file mode 100644
index 0000000..16f0381
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
@@ -0,0 +1,12 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported configuration types")
+
+project(XcodePreserveNonOptimizationFlags CXX)
+
+add_library(preserveStart STATIC foo.cpp)
+set_property(TARGET preserveStart PROPERTY COMPILE_OPTIONS -DA -O1)
+
+add_library(preserveBoth STATIC foo.cpp)
+set_property(TARGET preserveBoth PROPERTY COMPILE_OPTIONS -DB -O1 -DC)
+
+add_library(preserveEnd STATIC foo.cpp)
+set_property(TARGET preserveEnd PROPERTY COMPILE_OPTIONS -O1 -DD)
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake
new file mode 100644
index 0000000..332906f
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake
@@ -0,0 +1,7 @@
+set(expect "-ObjC")
+file(STRINGS ${RunCMake_TEST_BINARY_DIR}/XcodePreserveObjcFlag.xcodeproj/project.pbxproj actual
+     REGEX "OTHER_CPLUSPLUSFLAGS = [^;]*;" LIMIT_COUNT 1)
+if(NOT "${actual}" MATCHES "${expect}")
+  message(SEND_ERROR "The actual project contains the line:\n ${actual}\n"
+    "which does not match expected regex:\n ${expect}\n")
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake
new file mode 100644
index 0000000..64db633
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake
@@ -0,0 +1,6 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported configuration types")
+
+project(XcodePreserveObjcFlag CXX)
+
+add_library(foo STATIC foo.cpp)
+set_target_properties(foo PROPERTIES COMPILE_OPTIONS -ObjC)

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From gjasny at googlemail.com  Fri Oct 23 16:21:12 2015
From: gjasny at googlemail.com (Gregor Jasny)
Date: Fri, 23 Oct 2015 16:21:12 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-925-gaddb1da
Message-ID: <20151023202112.ABD92C06CB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  addb1dad4f1f99e054f3fc3e0f94d571ef8842c8 (commit)
       via  a91eebebdb2a012c233db7869ec0ade534c4dd57 (commit)
      from  8fbc8e473b347d69331cd120aea3dd6c33e98599 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=addb1dad4f1f99e054f3fc3e0f94d571ef8842c8
commit addb1dad4f1f99e054f3fc3e0f94d571ef8842c8
Merge: 8fbc8e4 a91eebe
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Oct 23 16:21:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 23 16:21:11 2015 -0400

    Merge topic 'xcode-watch-and-tvos' into next
    
    a91eebeb Xcode: Recognise Watch and TV OS as embedded platforms


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a91eebebdb2a012c233db7869ec0ade534c4dd57
commit a91eebebdb2a012c233db7869ec0ade534c4dd57
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Oct 23 22:19:43 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Fri Oct 23 22:19:43 2015 +0200

    Xcode: Recognise Watch and TV OS as embedded platforms

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a1f143a..148b4a8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2407,10 +2407,23 @@ bool cmMakefile::PlatformIsAppleIos() const
   sdkRoot = this->GetSafeDefinition("CMAKE_OSX_SYSROOT");
   sdkRoot = cmSystemTools::LowerCase(sdkRoot);
 
-  return sdkRoot.find("iphoneos") == 0 ||
-         sdkRoot.find("/iphoneos") != std::string::npos ||
-         sdkRoot.find("iphonesimulator") == 0 ||
-         sdkRoot.find("/iphonesimulator") != std::string::npos;
+  const std::string embedded[] =
+    {
+    "appletvos", "appletvsimulator",
+    "iphoneos", "iphonesimulator",
+    "watchos", "watchsimulator",
+    };
+
+  for(size_t i = 0; i < sizeof(embedded) / sizeof(embedded[0]); ++i)
+    {
+    if(sdkRoot.find(embedded[i]) == 0 ||
+       sdkRoot.find(std::string("/") + embedded[i]) != std::string::npos)
+      {
+      return true;
+      }
+    }
+
+   return false;
 }
 
 const char* cmMakefile::GetSONameFlag(const std::string& language) const
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 8ab618b..3b7b9f4 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -55,6 +55,38 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
 endif()
 
 if(NOT XCODE_VERSION VERSION_LESS 7)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesWatchOS-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS "-DTEST_WATCHOS=ON")
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(XcodeBundles)
+  run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+  unset(RunCMake_TEST_OPTIONS)
+endif()
+
+if(NOT XCODE_VERSION VERSION_LESS 7.1)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeBundlesTvOS-build)
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OPTIONS "-DTEST_TVOS=ON")
+
+  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+  run_cmake(XcodeBundles)
+  run_cmake_command(XcodeBundles-build ${CMAKE_COMMAND} --build .)
+
+  unset(RunCMake_TEST_BINARY_DIR)
+  unset(RunCMake_TEST_NO_CLEAN)
+  unset(RunCMake_TEST_OPTIONS)
+endif()
+
+if(NOT XCODE_VERSION VERSION_LESS 7)
   set(RunCMake_TEST_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/osx.cmake")
   run_cmake(XcodeTbdStub)
   unset(RunCMake_TEST_OPTIONS)
diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
index 2cbccfa..0fdc6af 100644
--- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake
@@ -10,6 +10,22 @@ if(TEST_IOS)
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
 endif(TEST_IOS)
 
+if(TEST_WATCHOS)
+  set(CMAKE_OSX_SYSROOT watchos)
+  set(CMAKE_OSX_ARCHITECTURES "armv7k")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+  set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
+endif()
+
+if(TEST_TVOS)
+  set(CMAKE_OSX_SYSROOT appletvos)
+  set(CMAKE_OSX_ARCHITECTURES "arm64")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+  set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
+endif()
+
 # App Bundle
 
 add_executable(AppBundle MACOSX_BUNDLE main.m)
@@ -35,11 +51,13 @@ endif()
 
 # Bundle
 
-add_library(Bundle MODULE main.c)
-set_target_properties(Bundle PROPERTIES BUNDLE TRUE)
+if(NOT CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE)
+  add_library(Bundle MODULE main.c)
+  set_target_properties(Bundle PROPERTIES BUNDLE TRUE)
 
-add_custom_target(BundleTest ALL
-  COMMAND ${CMAKE_COMMAND} -E copy
-    "$<TARGET_FILE:Bundle>" "$<TARGET_FILE:Bundle>.old")
+  add_custom_target(BundleTest ALL
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "$<TARGET_FILE:Bundle>" "$<TARGET_FILE:Bundle>.old")
 
-add_dependencies(BundleTest Bundle)
+  add_dependencies(BundleTest Bundle)
+endif()

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx                          |   21 +++++++++++++---
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake |   32 ++++++++++++++++++++++++
 Tests/RunCMake/XcodeProject/XcodeBundles.cmake |   30 +++++++++++++++++-----
 3 files changed, 73 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Oct 24 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 24 Oct 2015 00:01:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-317-g66fcb15
Message-ID: <20151024040110.3D2C1C07E0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  66fcb15bb46a6e24bf513d3f703c1a08bb20aa8d (commit)
      from  a03c13a710fc4c65035e92749720b559cbeeff2e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66fcb15bb46a6e24bf513d3f703c1a08bb20aa8d
commit 66fcb15bb46a6e24bf513d3f703c1a08bb20aa8d
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Oct 24 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Oct 24 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 7bed54b..fce16dd 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151023)
+set(CMake_VERSION_PATCH 20151024)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 24 03:08:51 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 24 Oct 2015 03:08:51 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-927-g5a023c8
Message-ID: <20151024070851.732E1C0A48@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87 (commit)
       via  7de7776d7f01054c97e3ca4498cc0f7d8ce106e8 (commit)
      from  addb1dad4f1f99e054f3fc3e0f94d571ef8842c8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87
commit 5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87
Merge: addb1da 7de7776
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 03:08:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 24 03:08:50 2015 -0400

    Merge topic 'use-generator-target' into next
    
    7de7776d fixup! VS: Port interface to cmGeneratorTarget


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7de7776d7f01054c97e3ca4498cc0f7d8ce106e8
commit 7de7776d7f01054c97e3ca4498cc0f7d8ce106e8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 09:08:03 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:08:03 2015 +0200

    fixup! VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 7ee5dd0..b819dad 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -307,7 +307,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
         const cmGeneratorTarget *target,
         TargetSet& linked)
 {
-  if(linked.insert(target->Target).second)
+  if(linked.insert(target).second)
     {
     TargetDependSet const& depends =
             this->GetTargetDirectDepends(target);
@@ -326,10 +326,10 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
 cmGlobalVisualStudioGenerator::TargetSet const&
 cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 {
-  TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target);
+  TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
   if(i == this->TargetLinkClosure.end())
     {
-    TargetSetMap::value_type entry(target->Target, TargetSet());
+    TargetSetMap::value_type entry(target, TargetSet());
     i = this->TargetLinkClosure.insert(entry).first;
     this->FillLinkClosure(target, i->second);
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 24 03:09:13 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 24 Oct 2015 03:09:13 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-929-gb7fb0ad
Message-ID: <20151024070913.E40B0155E@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b7fb0ad756d908018ecc53ab50c153ec22b4bf4a (commit)
       via  5d7a437bcb781a6c8b0d2b29cc2c6cc911de661e (commit)
      from  5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7fb0ad756d908018ecc53ab50c153ec22b4bf4a
commit b7fb0ad756d908018ecc53ab50c153ec22b4bf4a
Merge: 5a023c8 5d7a437
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 03:09:12 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 24 03:09:12 2015 -0400

    Merge topic 'use-generator-target' into next
    
    5d7a437b VS: Port interface to cmGeneratorTarget


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d7a437bcb781a6c8b0d2b29cc2c6cc911de661e
commit 5d7a437bcb781a6c8b0d2b29cc2c6cc911de661e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:08:58 2015 +0200

    VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index bc91e87..6a0e5e9 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+  { return false; }
 
   const char* GetIntelProjectVersion();
 
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 9b8b9fd..e185c8e 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -460,14 +460,15 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
 
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
-  cmTarget& target)
+        cmGeneratorTarget *target)
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target.GetUtilities().begin();
-      ui != target.GetUtilities().end(); ++ui)
+        target->Target->GetUtilities().begin();
+      ui != target->Target->GetUtilities().end(); ++ui)
     {
-    if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
+    if(cmGeneratorTarget* depTarget =
+        this->FindGeneratorTarget(ui->c_str()))
       {
       if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index c05e5fa..b3093cc 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget& target);
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget* target);
 
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 0ba0ccb..b819dad 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -307,7 +307,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
         const cmGeneratorTarget *target,
         TargetSet& linked)
 {
-  if(linked.insert(target->Target).second)
+  if(linked.insert(target).second)
     {
     TargetDependSet const& depends =
             this->GetTargetDirectDepends(target);
@@ -326,10 +326,10 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
 cmGlobalVisualStudioGenerator::TargetSet const&
 cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 {
-  TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target);
+  TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
   if(i == this->TargetLinkClosure.end())
     {
-    TargetSetMap::value_type entry(target->Target, TargetSet());
+    TargetSetMap::value_type entry(target, TargetSet());
     i = this->TargetLinkClosure.insert(entry).first;
     this->FillLinkClosure(target, i->second);
     }
@@ -338,7 +338,8 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudioGenerator::FollowLinkDepends(
-  cmTarget const* target, std::set<cmTarget const*>& linked)
+        const cmGeneratorTarget *target,
+        std::set<const cmGeneratorTarget *> &linked)
 {
   if(target->GetType() == cmState::INTERFACE_LIBRARY)
     {
@@ -349,14 +350,13 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
     {
     // Static library targets do not list their link dependencies so
     // we must follow them transitively now.
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FollowLinkDepends((*di)->Target, linked);
+        this->FollowLinkDepends(*di, linked);
         }
       }
     }
@@ -431,7 +431,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
-  std::set<cmTarget const*> linkDepends;
+  std::set<cmGeneratorTarget const*> linkDepends;
   if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
@@ -440,20 +440,20 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
       cmTargetDepend dep = *di;
       if(dep.IsLink())
         {
-        this->FollowLinkDepends(dep->Target, linkDepends);
+        this->FollowLinkDepends(*di, linkDepends);
         }
       }
     }
 
   // Collect explicit util dependencies (add_dependencies).
-  std::set<cmTarget const*> utilDepends;
+  std::set<cmGeneratorTarget const*> utilDepends;
   for(TargetDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
     cmTargetDepend dep = *di;
     if(dep.IsUtil())
       {
-      this->FollowLinkDepends(dep->Target, utilDepends);
+      this->FollowLinkDepends(*di, utilDepends);
       }
     }
 
@@ -466,23 +466,22 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
     }
 
   // Emit link dependencies.
-  for(std::set<cmTarget const*>::iterator di = linkDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = linkDepends.begin();
       di != linkDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
+    cmGeneratorTarget const* dep = *di;
     vsTargetDepend.insert(dep->GetName());
     }
 
   // Emit util dependencies.  Possibly use intermediate targets.
-  for(std::set<cmTarget const*>::iterator di = utilDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = utilDepends.begin();
       di != utilDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
-    cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
-    if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
+    cmGeneratorTarget const* dgt = *di;
+    if(allowLinkable || !VSLinkable(dgt) || linked.count(dgt))
       {
       // Direct dependency allowed.
-      vsTargetDepend.insert(dep->GetName());
+      vsTargetDepend.insert(dgt->GetName());
       }
     else
       {
@@ -892,9 +891,7 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
   for (TargetSet::const_iterator it = targets.begin();
        it != targets.end(); ++it)
     {
-    cmGeneratorTarget* gt =
-        (*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
-    this->insert(gt);
+    this->insert(*it);
     }
 }
 
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index c81ddda..f827f26 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -88,7 +88,7 @@ public:
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const { return false; }
 
-  class TargetSet: public std::set<cmTarget const*> {};
+  class TargetSet: public std::set<cmGeneratorTarget const*> {};
   class TargetCompare
   {
     std::string First;
@@ -126,8 +126,9 @@ protected:
   VSDependMap VSTargetDepends;
   void ComputeVSTargetDepends(cmGeneratorTarget *);
 
-  bool CheckTargetLinks(cmTarget& target, const std::string& name);
-  std::string GetUtilityForTarget(cmTarget& target, const std::string&);
+  bool CheckTargetLinks(cmGeneratorTarget& target, const std::string& name);
+  std::string GetUtilityForTarget(cmGeneratorTarget& target,
+                                  const std::string&);
   virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
   std::string GetUtilityDepend(const cmGeneratorTarget *target);
   typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
@@ -141,13 +142,14 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  void FollowLinkDepends(cmTarget const* target,
-                         std::set<cmTarget const*>& linked);
+  void FollowLinkDepends(cmGeneratorTarget const* target,
+                         std::set<cmGeneratorTarget const*>& linked);
 
-  class TargetSetMap: public std::map<cmTarget*, TargetSet> {};
+  class TargetSetMap: public std::map<cmGeneratorTarget*, TargetSet> {};
   TargetSetMap TargetLinkClosure;
-  void FillLinkClosure(cmGeneratorTarget const* target, TargetSet& linked);
-  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget *target);
+  void FillLinkClosure(const cmGeneratorTarget *target,
+                       TargetSet& linked);
+  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget* target);
 };
 
 class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5ba59ee..ca8d697 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1186,7 +1186,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1285,7 +1285,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2bb67fd..9c9f5ab 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2677,7 +2677,7 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 
   this->WriteString("</Link>\n", 2);
   if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
-              *this->GeneratorTarget->Target))
+              this->GeneratorTarget))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 24 03:19:46 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 24 Oct 2015 03:19:46 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-932-g6052702
Message-ID: <20151024071946.80583C0418@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  60527028258a114ce5b7bfb5779f2611f1c1a2c6 (commit)
       via  b2989d1bfc2730b1539c587142a23f7cbaa3088c (commit)
       via  3fdb3490503041d999e8381c11a1e431953204df (commit)
      from  b7fb0ad756d908018ecc53ab50c153ec22b4bf4a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60527028258a114ce5b7bfb5779f2611f1c1a2c6
commit 60527028258a114ce5b7bfb5779f2611f1c1a2c6
Merge: b7fb0ad b2989d1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 03:19:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 24 03:19:45 2015 -0400

    Merge topic 'use-generator-target' into next
    
    b2989d1b Revert "Xcode: Remove value-less overrides."
    3fdb3490 fixup! VS: Port interface to cmGeneratorTarget


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2989d1bfc2730b1539c587142a23f7cbaa3088c
commit b2989d1bfc2730b1539c587142a23f7cbaa3088c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 09:18:35 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:18:35 2015 +0200

    Revert "Xcode: Remove value-less overrides."
    
    This reverts commit e20951c90df511cf0374a9fa6d27ad8a131b4903.

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 30fd075..3b430d2 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -47,6 +47,36 @@ void cmLocalXCodeGenerator::AppendFlagEscape(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
+void cmLocalXCodeGenerator::Generate()
+{
+  cmLocalGenerator::Generate();
+
+  cmTargets& targets = this->Makefile->GetTargets();
+  for(cmTargets::iterator iter = targets.begin();
+      iter != targets.end(); ++iter)
+    {
+    cmTarget* t = &iter->second;
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
+    }
+}
+
+//----------------------------------------------------------------------------
+void cmLocalXCodeGenerator::GenerateInstallRules()
+{
+  cmLocalGenerator::GenerateInstallRules();
+
+  cmTargets& targets = this->Makefile->GetTargets();
+  for(cmTargets::iterator iter = targets.begin();
+      iter != targets.end(); ++iter)
+    {
+    cmTarget* t = &iter->second;
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmLocalXCodeGenerator::ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const*)
diff --git a/Source/cmLocalXCodeGenerator.h b/Source/cmLocalXCodeGenerator.h
index 57c1579..4381a6d 100644
--- a/Source/cmLocalXCodeGenerator.h
+++ b/Source/cmLocalXCodeGenerator.h
@@ -32,6 +32,8 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   virtual void AppendFlagEscape(std::string& flags,
                                 const std::string& rawFlag);
+  virtual void Generate();
+  virtual void GenerateInstallRules();
   virtual void ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const* gt = 0);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fdb3490503041d999e8381c11a1e431953204df
commit 3fdb3490503041d999e8381c11a1e431953204df
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 09:18:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:18:11 2015 +0200

    fixup! VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index e185c8e..bdb1b25 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -468,7 +468,7 @@ bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
       ui != target->Target->GetUtilities().end(); ++ui)
     {
     if(cmGeneratorTarget* depTarget =
-        this->FindGeneratorTarget(ui->c_str()))
+        target->GetLocalGenerator()->FindGeneratorTargetToUse(ui->c_str()))
       {
       if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |    2 +-
 Source/cmLocalXCodeGenerator.cxx          |   30 +++++++++++++++++++++++++++++
 Source/cmLocalXCodeGenerator.h            |    2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 24 03:20:33 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 24 Oct 2015 03:20:33 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-963-gab90caa
Message-ID: <20151024072033.64314C04E1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ab90caa1110936859e9bd2c46aee3e043d2aab6e (commit)
       via  c582f6801bbf2bd0c7f5a61f2c648bacbb4cca8e (commit)
       via  e1103fb672c66d832dc84d74027dfc249c4e9b7e (commit)
       via  20d79eaca06f1d8577fdd5922ec78e70af690e5b (commit)
       via  e526d71328336e1a07e5990b79b1adf2ad4740fb (commit)
       via  cc07a7b80d1295de9465d9798f4c6874356990ad (commit)
       via  8ac8739b2e5df2f36194261f9dcac95107b4b5f7 (commit)
       via  84fb579fc8935202bf182bbd1685aff6acc2a3b5 (commit)
       via  1eff421ad00bd26a22b5145fe2b175a300041dca (commit)
       via  94fd5a5af87adafbbf7f47d6d083b53c6bd3e941 (commit)
       via  ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e (commit)
       via  26e23e8463f9b9e2298e317a70925c56bcb018d1 (commit)
       via  01c26986931a409dbb246b780b808c51aea35c2b (commit)
       via  459c891088c8b2fb8b7cb950878cf7c0579ddb33 (commit)
       via  7f8bb857b8ab714b80acfa6a6e2c34195fabff6f (commit)
       via  a0ebd69b52dea77c5d8c718bcb7ba0c75ceb9d5f (commit)
       via  bcee21ceb733d7e6d12d85346d8e683399cc4fc4 (commit)
       via  b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f (commit)
       via  b92d0b2c94936fa438c8c92a6961b6323795d6f9 (commit)
       via  05982b26e6fc58422dd4c05497466f206d6c93f7 (commit)
       via  effe874d25cc0448d9f37fd90283fb83118cb31e (commit)
       via  8616d12cfc868492c030168c228983cf6b22b534 (commit)
       via  ed4ea59a33d094245ff4807c143134846b2be77a (commit)
       via  634155d6952033f353de90073ac58ef53a900306 (commit)
       via  4bc65d76f13c63367857b22e87f73baa8e6d5970 (commit)
       via  80de856bb5cba20d424b91e4a49fe8fdb1f904a3 (commit)
       via  4c41e74da58b6f1057466e7eaa22942dc62c8802 (commit)
       via  67b2f4312c431eb363dd94a2bb5d88cc6c8a7c95 (commit)
       via  f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5 (commit)
       via  a6b7eb5bc8c304dab2102689eb09ec85c1e7f6be (commit)
       via  c2c239e607549d6513d95c3e919b4f509733bc87 (commit)
      from  60527028258a114ce5b7bfb5779f2611f1c1a2c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab90caa1110936859e9bd2c46aee3e043d2aab6e
commit ab90caa1110936859e9bd2c46aee3e043d2aab6e
Merge: 6052702 c582f68
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 03:20:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 24 03:20:29 2015 -0400

    Merge topic 'use-generator-target' into next
    
    c582f680 VS: Port interface to cmGeneratorTarget
    e1103fb6 VS: Port WriteUtilityDepends to cmGeneratorTarget
    20d79eac VS: Port utility depends to cmGeneratorTarget
    e526d713 VS: Port target depends to cmGeneratorTarget
    cc07a7b8 VS: Port PorjectDepends to cmGeneratorTarget.
    8ac8739b VS: Port TargetIsFortranOnly to cmGeneratorTarget
    84fb579f VS: Port WriteProject to cmGeneratorTarget
    1eff421a VS: Port loop to cmGeneratorTarget
    94fd5a5a VS: Port ImplibDir to cmGeneratorTarget
    ce9e9a92 VS: Port LinkClosure to cmGeneratorTarget
    26e23e84 VS: Port ComputeLongestObjectDirectory to cmGeneratorTarget
    01c26986 VS7: Port to cmGeneratorTarget
    459c8910 VS10: Port to cmGeneratorTarget.
    7f8bb857 VS6: Port to cmGeneratorTarget.
    a0ebd69b Graphviz: Port to cmGeneratorTarget.
    bcee21ce C::B: Port API to cmGeneratorTarget.
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c582f6801bbf2bd0c7f5a61f2c648bacbb4cca8e
commit c582f6801bbf2bd0c7f5a61f2c648bacbb4cca8e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:58 2015 +0200

    VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index bc91e87..6a0e5e9 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+  { return false; }
 
   const char* GetIntelProjectVersion();
 
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 9b8b9fd..bdb1b25 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -460,14 +460,15 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
 
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
-  cmTarget& target)
+        cmGeneratorTarget *target)
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target.GetUtilities().begin();
-      ui != target.GetUtilities().end(); ++ui)
+        target->Target->GetUtilities().begin();
+      ui != target->Target->GetUtilities().end(); ++ui)
     {
-    if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
+    if(cmGeneratorTarget* depTarget =
+        target->GetLocalGenerator()->FindGeneratorTargetToUse(ui->c_str()))
       {
       if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index c05e5fa..b3093cc 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget& target);
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget* target);
 
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 0ba0ccb..b819dad 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -307,7 +307,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
         const cmGeneratorTarget *target,
         TargetSet& linked)
 {
-  if(linked.insert(target->Target).second)
+  if(linked.insert(target).second)
     {
     TargetDependSet const& depends =
             this->GetTargetDirectDepends(target);
@@ -326,10 +326,10 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
 cmGlobalVisualStudioGenerator::TargetSet const&
 cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 {
-  TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target);
+  TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
   if(i == this->TargetLinkClosure.end())
     {
-    TargetSetMap::value_type entry(target->Target, TargetSet());
+    TargetSetMap::value_type entry(target, TargetSet());
     i = this->TargetLinkClosure.insert(entry).first;
     this->FillLinkClosure(target, i->second);
     }
@@ -338,7 +338,8 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudioGenerator::FollowLinkDepends(
-  cmTarget const* target, std::set<cmTarget const*>& linked)
+        const cmGeneratorTarget *target,
+        std::set<const cmGeneratorTarget *> &linked)
 {
   if(target->GetType() == cmState::INTERFACE_LIBRARY)
     {
@@ -349,14 +350,13 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
     {
     // Static library targets do not list their link dependencies so
     // we must follow them transitively now.
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FollowLinkDepends((*di)->Target, linked);
+        this->FollowLinkDepends(*di, linked);
         }
       }
     }
@@ -431,7 +431,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
-  std::set<cmTarget const*> linkDepends;
+  std::set<cmGeneratorTarget const*> linkDepends;
   if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
@@ -440,20 +440,20 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
       cmTargetDepend dep = *di;
       if(dep.IsLink())
         {
-        this->FollowLinkDepends(dep->Target, linkDepends);
+        this->FollowLinkDepends(*di, linkDepends);
         }
       }
     }
 
   // Collect explicit util dependencies (add_dependencies).
-  std::set<cmTarget const*> utilDepends;
+  std::set<cmGeneratorTarget const*> utilDepends;
   for(TargetDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
     cmTargetDepend dep = *di;
     if(dep.IsUtil())
       {
-      this->FollowLinkDepends(dep->Target, utilDepends);
+      this->FollowLinkDepends(*di, utilDepends);
       }
     }
 
@@ -466,23 +466,22 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
     }
 
   // Emit link dependencies.
-  for(std::set<cmTarget const*>::iterator di = linkDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = linkDepends.begin();
       di != linkDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
+    cmGeneratorTarget const* dep = *di;
     vsTargetDepend.insert(dep->GetName());
     }
 
   // Emit util dependencies.  Possibly use intermediate targets.
-  for(std::set<cmTarget const*>::iterator di = utilDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = utilDepends.begin();
       di != utilDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
-    cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
-    if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
+    cmGeneratorTarget const* dgt = *di;
+    if(allowLinkable || !VSLinkable(dgt) || linked.count(dgt))
       {
       // Direct dependency allowed.
-      vsTargetDepend.insert(dep->GetName());
+      vsTargetDepend.insert(dgt->GetName());
       }
     else
       {
@@ -892,9 +891,7 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
   for (TargetSet::const_iterator it = targets.begin();
        it != targets.end(); ++it)
     {
-    cmGeneratorTarget* gt =
-        (*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
-    this->insert(gt);
+    this->insert(*it);
     }
 }
 
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index c81ddda..f827f26 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -88,7 +88,7 @@ public:
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const { return false; }
 
-  class TargetSet: public std::set<cmTarget const*> {};
+  class TargetSet: public std::set<cmGeneratorTarget const*> {};
   class TargetCompare
   {
     std::string First;
@@ -126,8 +126,9 @@ protected:
   VSDependMap VSTargetDepends;
   void ComputeVSTargetDepends(cmGeneratorTarget *);
 
-  bool CheckTargetLinks(cmTarget& target, const std::string& name);
-  std::string GetUtilityForTarget(cmTarget& target, const std::string&);
+  bool CheckTargetLinks(cmGeneratorTarget& target, const std::string& name);
+  std::string GetUtilityForTarget(cmGeneratorTarget& target,
+                                  const std::string&);
   virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
   std::string GetUtilityDepend(const cmGeneratorTarget *target);
   typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
@@ -141,13 +142,14 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  void FollowLinkDepends(cmTarget const* target,
-                         std::set<cmTarget const*>& linked);
+  void FollowLinkDepends(cmGeneratorTarget const* target,
+                         std::set<cmGeneratorTarget const*>& linked);
 
-  class TargetSetMap: public std::map<cmTarget*, TargetSet> {};
+  class TargetSetMap: public std::map<cmGeneratorTarget*, TargetSet> {};
   TargetSetMap TargetLinkClosure;
-  void FillLinkClosure(cmGeneratorTarget const* target, TargetSet& linked);
-  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget *target);
+  void FillLinkClosure(const cmGeneratorTarget *target,
+                       TargetSet& linked);
+  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget* target);
 };
 
 class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5ba59ee..ca8d697 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1186,7 +1186,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1285,7 +1285,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2bb67fd..9c9f5ab 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2677,7 +2677,7 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 
   this->WriteString("</Link>\n", 2);
   if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
-              *this->GeneratorTarget->Target))
+              this->GeneratorTarget))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1103fb672c66d832dc84d74027dfc249c4e9b7e
commit e1103fb672c66d832dc84d74027dfc249c4e9b7e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:57 2015 +0200

    VS: Port WriteUtilityDepends to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index dd4e871..bb494f1 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -383,12 +383,14 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(
+        const cmGeneratorTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
   pname = GetVS6TargetName(pname.c_str());
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname =
+          target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index edf637f..993a48f 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -97,7 +97,7 @@ private:
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
   void WriteDSWFooter(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(const cmGeneratorTarget *target);
   std::string MSDevCommand;
   bool MSDevCommandInitialized;
   std::string const& GetMSDevCommand();
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 37f509a..5473247 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -888,13 +888,14 @@ void cmGlobalVisualStudio7Generator::WriteSLNHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio7Generator::WriteUtilityDepend(
+        cmGeneratorTarget const* target)
 {
   std::vector<std::string> configs;
-  target->GetMakefile()->GetConfigurations(configs);
+  target->Target->GetMakefile()->GetConfigurations(configs);
   std::string pname = target->GetName();
   pname += "_UTILITY";
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".vcproj";
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index eed6f49..bc91e87 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -136,7 +136,7 @@ protected:
                                       cmLocalGenerator* root);
   virtual void WriteSLNFooter(std::ostream& fout);
   virtual void WriteSLNHeader(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(const cmGeneratorTarget *target);
 
   virtual void WriteTargetsToSolution(
     std::ostream& fout,
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 3e25559..0ba0ccb 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -514,7 +514,7 @@ cmGlobalVisualStudioGenerator::GetUtilityDepend(
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
     {
-    std::string name = this->WriteUtilityDepend(target->Target);
+    std::string name = this->WriteUtilityDepend(target);
     UtilityDependsMap::value_type entry(target, name);
     i = this->UtilityDepends.insert(entry).first;
     }
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 6d804d8..c81ddda 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -128,7 +128,7 @@ protected:
 
   bool CheckTargetLinks(cmTarget& target, const std::string& name);
   std::string GetUtilityForTarget(cmTarget& target, const std::string&);
-  virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
+  virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
   std::string GetUtilityDepend(const cmGeneratorTarget *target);
   typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
   UtilityDependsMap UtilityDepends;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20d79eaca06f1d8577fdd5922ec78e70af690e5b
commit 20d79eaca06f1d8577fdd5922ec78e70af690e5b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:57 2015 +0200

    VS: Port utility depends to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 7d0c558..dd4e871 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -310,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 3152e91..8227b82 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -180,7 +180,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
 
   fout <<"EndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index b2ad365..37f509a 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -704,7 +704,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
        << dspname << ext << "\", \"{"
        << this->GetGUID(dspname) << "}\"\nEndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -748,7 +748,7 @@ cmGlobalVisualStudio7Generator
     depcount++;
     }
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index eb6a4ef..3e25559 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -488,7 +488,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
       {
       // Direct dependency on linkable target not allowed.
       // Use an intermediate utility target.
-      vsTargetDepend.insert(this->GetUtilityDepend(dep));
+      vsTargetDepend.insert(this->GetUtilityDepend(dgt));
       }
     }
 }
@@ -508,12 +508,13 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudioGenerator::GetUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudioGenerator::GetUtilityDepend(
+        cmGeneratorTarget const* target)
 {
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
     {
-    std::string name = this->WriteUtilityDepend(target);
+    std::string name = this->WriteUtilityDepend(target->Target);
     UtilityDependsMap::value_type entry(target, name);
     i = this->UtilityDepends.insert(entry).first;
     }
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 0b0b7b1..6d804d8 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -129,8 +129,8 @@ protected:
   bool CheckTargetLinks(cmTarget& target, const std::string& name);
   std::string GetUtilityForTarget(cmTarget& target, const std::string&);
   virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
-  std::string GetUtilityDepend(cmTarget const* target);
-  typedef std::map<cmTarget const*, std::string> UtilityDependsMap;
+  std::string GetUtilityDepend(const cmGeneratorTarget *target);
+  typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
   UtilityDependsMap UtilityDepends;
 
 protected:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e526d71328336e1a07e5990b79b1adf2ad4740fb
commit e526d71328336e1a07e5990b79b1adf2ad4740fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:45 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:57 2015 +0200

    VS: Port target depends to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 9e411c9..7d0c558 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -299,7 +299,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 77c8fc8..3152e91 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -206,7 +206,7 @@ cmGlobalVisualStudio71Generator
                       const std::string&,
                       const char*, cmGeneratorTarget const* target)
 {
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 972188f..b2ad365 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -730,7 +730,7 @@ cmGlobalVisualStudio7Generator
 {
   int depcount = 0;
   std::string dspguid = this->GetGUID(dspname);
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 39a7bda..eb6a4ef 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -380,7 +380,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
       for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(*(*ti)->Target);
+        this->ComputeVSTargetDepends(*ti);
         }
       }
     }
@@ -394,13 +394,14 @@ static bool VSLinkable(cmGeneratorTarget const* t)
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
+void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
+        cmGeneratorTarget* target)
 {
-  if(this->VSTargetDepends.find(&target) != this->VSTargetDepends.end())
+  if(this->VSTargetDepends.find(target) != this->VSTargetDepends.end())
     {
     return;
     }
-  VSDependSet& vsTargetDepend = this->VSTargetDepends[&target];
+  VSDependSet& vsTargetDepend = this->VSTargetDepends[target];
   // VS <= 7.1 has two behaviors that affect solution dependencies.
   //
   // (1) Solution-level dependencies between a linkable target and a
@@ -420,19 +421,18 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // leaving them out for the static library itself but following them
   // transitively for other targets.
 
-  bool allowLinkable = (target.GetType() != cmState::STATIC_LIBRARY &&
-                        target.GetType() != cmState::SHARED_LIBRARY &&
-                        target.GetType() != cmState::MODULE_LIBRARY &&
-                        target.GetType() != cmState::EXECUTABLE);
+  bool allowLinkable = (target->GetType() != cmState::STATIC_LIBRARY &&
+                        target->GetType() != cmState::SHARED_LIBRARY &&
+                        target->GetType() != cmState::MODULE_LIBRARY &&
+                        target->GetType() != cmState::EXECUTABLE);
 
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-  TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+  TargetDependSet const& depends = this->GetTargetDirectDepends(target);
 
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
   std::set<cmTarget const*> linkDepends;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -460,9 +460,9 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // Collect all targets linked by this target so we can avoid
   // intermediate targets below.
   TargetSet linked;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
-    linked = this->GetTargetLinkClosure(gt);
+    linked = this->GetTargetLinkClosure(target);
     }
 
   // Emit link dependencies.
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index f0bc5dc..0b0b7b1 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -122,9 +122,9 @@ protected:
 
   virtual bool ComputeTargetDepends();
   class VSDependSet: public std::set<std::string> {};
-  class VSDependMap: public std::map<cmTarget const*, VSDependSet> {};
+  class VSDependMap: public std::map<cmGeneratorTarget const*, VSDependSet> {};
   VSDependMap VSTargetDepends;
-  void ComputeVSTargetDepends(cmTarget&);
+  void ComputeVSTargetDepends(cmGeneratorTarget *);
 
   bool CheckTargetLinks(cmTarget& target, const std::string& name);
   std::string GetUtilityForTarget(cmTarget& target, const std::string&);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc07a7b80d1295de9465d9798f4c6874356990ad
commit cc07a7b80d1295de9465d9798f4c6874356990ad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:57 2015 +0200

    VS: Port PorjectDepends to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 195aaa0..77c8fc8 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -175,7 +175,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
        << this->ConvertToSolutionPath(dir) << (dir[0]? "\\":"")
        << dspname << ext << "\", \"{" << guid << "}\"\n";
   fout << "\tProjectSection(ProjectDependencies) = postProject\n";
-  this->WriteProjectDepends(fout, dspname, dir, *t->Target);
+  this->WriteProjectDepends(fout, dspname, dir, t);
   fout << "\tEndProjectSection\n";
 
   fout <<"EndProject\n";
@@ -204,9 +204,9 @@ void
 cmGlobalVisualStudio71Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string&,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -215,7 +215,7 @@ cmGlobalVisualStudio71Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index 074bce5..5035fda 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -62,7 +62,7 @@ protected:
                             const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const& t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 906166c..972188f 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -533,19 +533,19 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmMakefile* mf = target->GetMakefile();
     const char *vcprojName =
       target->GetProperty("GENERATOR_FILE_NAME");
     if (vcprojName)
       {
-      std::string dir = mf->GetCurrentSourceDirectory();
+      std::string dir = target->GetLocalGenerator()
+              ->GetCurrentSourceDirectory();
       this->WriteProjectDepends(fout, vcprojName,
-                                dir.c_str(), *target);
+                                dir.c_str(), target);
       }
     }
 }
@@ -726,11 +726,11 @@ void
 cmGlobalVisualStudio7Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string& dspname,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
   int depcount = 0;
   std::string dspguid = this->GetGUID(dspname);
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -739,7 +739,7 @@ cmGlobalVisualStudio7Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
@@ -748,7 +748,7 @@ cmGlobalVisualStudio7Generator
     depcount++;
     }
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index a514dcd..eed6f49 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -126,7 +126,7 @@ protected:
                             const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const&t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index a22315c..9b8b9fd 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -441,9 +441,9 @@ bool cmGlobalVisualStudio8Generator::ComputeTargetDepends()
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Generator::WriteProjectDepends(
-  std::ostream& fout, const std::string&, const char*, cmTarget const& t)
+  std::ostream& fout, const std::string&, const char*,
+        cmGeneratorTarget const* gt)
 {
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&t);
   TargetDependSet const& unordered = this->GetTargetDirectDepends(gt);
   OrderedTargetDependSet depends(unordered, std::string());
   for(OrderedTargetDependSet::const_iterator i = depends.begin();
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index 60c63d1..c05e5fa 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -91,7 +91,8 @@ protected:
   virtual bool ComputeTargetDepends();
   virtual void WriteProjectDepends(std::ostream& fout,
                                    const std::string& name,
-                                   const char* path, cmTarget const& t);
+                                   const char* path,
+                                   const cmGeneratorTarget *t);
 
   std::string Name;
   std::string WindowsCEVersion;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ac8739b2e5df2f36194261f9dcac95107b4b5f7
commit 8ac8739b2e5df2f36194261f9dcac95107b4b5f7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:43 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:57 2015 +0200

    VS: Port TargetIsFortranOnly to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index adf5c67..195aaa0 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -158,7 +158,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
   const char* ext = ".vcproj";
   const char* project =
     "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
-  if(this->TargetIsFortranOnly(*t->Target))
+  if(this->TargetIsFortranOnly(t))
     {
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 8b874b6..906166c 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -692,7 +692,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
   const char* ext = ".vcproj";
   const char* project =
     "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
-  if(this->TargetIsFortranOnly(*target->Target))
+  if(this->TargetIsFortranOnly(target))
     {
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index c43f884..39a7bda 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -831,10 +831,8 @@ void RegisterVisualStudioMacros(const std::string& macrosFile,
     }
 }
 bool
-cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget const& target)
+cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmGeneratorTarget const* gt)
 {
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-
   // check to see if this is a fortran build
   std::set<std::string> languages;
   {
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 5ada37e..f0bc5dc 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -73,7 +73,7 @@ public:
                              const char* vsSolutionFile = 0);
 
   // return true if target is fortran only
-  bool TargetIsFortranOnly(cmTarget const& t);
+  bool TargetIsFortranOnly(const cmGeneratorTarget *gt);
 
   /** Get the top-level registry key for this VS version.  */
   std::string GetRegistryBase();
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 0040331..d59fdc6 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -83,7 +83,7 @@ void cmLocalVisualStudio10Generator::Generate()
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*(*l)->Target))
+       ->TargetIsFortranOnly(*l))
       {
       this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a2d4d16..5ba59ee 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -229,7 +229,7 @@ void cmLocalVisualStudio7Generator
 {
   cmGlobalVisualStudioGenerator* gg
       = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-  this->FortranProject = gg->TargetIsFortranOnly(*target->Target);
+  this->FortranProject = gg->TargetIsFortranOnly(target);
   this->WindowsCEProject = gg->TargetsWindowsCE();
 
   // Intel Fortran for VS10 uses VS9 format ".vfproj" files.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 3f8e627..2bb67fd 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2886,7 +2886,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     // skip fortran targets as they can not be processed by MSBuild
     // the only reference will be in the .sln file
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*dt->Target))
+       ->TargetIsFortranOnly(dt))
       {
       continue;
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84fb579fc8935202bf182bbd1685aff6acc2a3b5
commit 84fb579fc8935202bf182bbd1685aff6acc2a3b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:42 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:56 2015 +0200

    VS: Port WriteProject to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 9bb37ce..adf5c67 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -152,18 +152,18 @@ void
 cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
                                               const std::string& dspname,
                                               const char* dir,
-                                              cmTarget const& t)
+                                              cmGeneratorTarget const* t)
 {
   // check to see if this is a fortran build
   const char* ext = ".vcproj";
   const char* project =
     "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
-  if(this->TargetIsFortranOnly(t))
+  if(this->TargetIsFortranOnly(*t->Target))
     {
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
     }
-  const char* targetExt = t.GetProperty("GENERATOR_FILE_NAME_EXT");
+  const char* targetExt = t->GetProperty("GENERATOR_FILE_NAME_EXT");
   if(targetExt)
     {
     ext = targetExt;
@@ -175,12 +175,12 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
        << this->ConvertToSolutionPath(dir) << (dir[0]? "\\":"")
        << dspname << ext << "\", \"{" << guid << "}\"\n";
   fout << "\tProjectSection(ProjectDependencies) = postProject\n";
-  this->WriteProjectDepends(fout, dspname, dir, t);
+  this->WriteProjectDepends(fout, dspname, dir, *t->Target);
   fout << "\tEndProjectSection\n";
 
   fout <<"EndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&t);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index 7f88e34..074bce5 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -59,7 +59,7 @@ protected:
     std::ostream& fout, std::vector<std::string> const& configs);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            cmTarget const& t);
+                            const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
                            cmTarget const& t);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index bc831e5..8b874b6 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -477,7 +477,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
           dir = ""; // msbuild cannot handle ".\" prefix
           }
         this->WriteProject(fout, vcprojName, dir.c_str(),
-                           *target->Target);
+                           target);
         written = true;
         }
       }
@@ -685,13 +685,14 @@ cmGlobalVisualStudio7Generator::ConvertToSolutionPath(const char* path)
 // the libraries it uses are also done here
 void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
                                const std::string& dspname,
-                               const char* dir, cmTarget const& target)
+                               const char* dir,
+                               cmGeneratorTarget const* target)
 {
    // check to see if this is a fortran build
   const char* ext = ".vcproj";
   const char* project =
     "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
-  if(this->TargetIsFortranOnly(target))
+  if(this->TargetIsFortranOnly(*target->Target))
     {
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
@@ -703,7 +704,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
        << dspname << ext << "\", \"{"
        << this->GetGUID(dspname) << "}\"\nEndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 4ef0990..a514dcd 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -123,7 +123,7 @@ protected:
                             std::vector<cmLocalGenerator*>& generators);
   virtual void WriteProject(std::ostream& fout,
                             const std::string& name, const char* path,
-                            cmTarget const& t);
+                            const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
                            cmTarget const&t);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1eff421ad00bd26a22b5145fe2b175a300041dca
commit 1eff421ad00bd26a22b5145fe2b175a300041dca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:56 2015 +0200

    VS: Port loop to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 1909f21..bc831e5 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -441,7 +441,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -459,7 +459,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
                                  project.c_str(),
                                  location.c_str(),
                                  target->GetProperty("VS_PROJECT_TYPE"),
-                                 target->GetUtilities());
+                                 target->Target->GetUtilities());
       written = true;
       }
     else
@@ -468,9 +468,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
         target->GetProperty("GENERATOR_FILE_NAME");
       if(vcprojName)
         {
-        cmLocalGenerator* lg =
-            root->GetGlobalGenerator()->GetGeneratorTarget(target)
-            ->GetLocalGenerator();
+        cmLocalGenerator* lg = target->GetLocalGenerator();
         std::string dir = lg->GetCurrentBinaryDirectory();
         dir = root->Convert(dir.c_str(),
                             cmLocalGenerator::START_OUTPUT);
@@ -479,7 +477,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
           dir = ""; // msbuild cannot handle ".\" prefix
           }
         this->WriteProject(fout, vcprojName, dir.c_str(),
-                           *target);
+                           *target->Target);
         written = true;
         }
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94fd5a5af87adafbbf7f47d6d083b53c6bd3e941
commit 94fd5a5af87adafbbf7f47d6d083b53c6bd3e941
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:56 2015 +0200

    VS: Port ImplibDir to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index c4cbdef..d5abf68 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -841,7 +841,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
   event.Write(target->Target->GetPreBuildCommands());
   event.Write(target->Target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(*target->Target, configName, false));
+    this->MaybeCreateImplibDir(target, configName, false));
   if(pcc.get())
     {
     event.Write(*pcc);
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 8b1915a..a2d4d16 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2048,7 +2048,7 @@ void cmLocalVisualStudio7Generator
     event.Write(target->Target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(*target->Target,
+    this->MaybeCreateImplibDir(target,
                                configName, this->FortranProject));
   if(pcc.get())
     {
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 8516ce7..561f9a1 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -80,7 +80,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCustomCommand>
-cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
+cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmGeneratorTarget* target,
                                                    const std::string& config,
                                                    bool isFortran)
 {
@@ -89,13 +89,11 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmTarget& target,
   // If an executable exports symbols then VS wants to create an
   // import library but forgets to create the output directory.
   // The Intel Fortran plugin always forgets to the directory.
-  if(target.GetType() != cmState::EXECUTABLE &&
-     !(isFortran && target.GetType() == cmState::SHARED_LIBRARY))
+  if(target->GetType() != cmState::EXECUTABLE &&
+     !(isFortran && target->GetType() == cmState::SHARED_LIBRARY))
     { return pcc; }
-  cmGeneratorTarget* gt =
-      this->GetGlobalGenerator()->GetGeneratorTarget(&target);
-  std::string outDir = gt->GetDirectory(config, false);
-  std::string impDir = gt->GetDirectory(config, true);
+  std::string outDir = target->GetDirectory(config, false);
+  std::string impDir = target->GetDirectory(config, true);
   if(impDir == outDir) { return pcc; }
 
   // Add a pre-build event to create the directory.
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 6d915e7..f95eefa 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -59,7 +59,8 @@ protected:
 
   /** Construct a custom command to make exe import lib dir.  */
   cmsys::auto_ptr<cmCustomCommand>
-  MaybeCreateImplibDir(cmTarget& target, const std::string& config,
+  MaybeCreateImplibDir(cmGeneratorTarget *target,
+                       const std::string& config,
                        bool isFortran);
 };
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e
commit ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:39 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:56 2015 +0200

    VS: Port LinkClosure to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 4d431f6..c43f884 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -303,19 +303,20 @@ std::string cmGlobalVisualStudioGenerator::GetUserMacrosRegKeyBase()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
-                                                    TargetSet& linked)
+void cmGlobalVisualStudioGenerator::FillLinkClosure(
+        const cmGeneratorTarget *target,
+        TargetSet& linked)
 {
-  if(linked.insert(target).second)
+  if(linked.insert(target->Target).second)
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends =
+            this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FillLinkClosure((*di)->Target, linked);
+        this->FillLinkClosure(*di, linked);
         }
       }
     }
@@ -323,12 +324,12 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(cmTarget const* target,
 
 //----------------------------------------------------------------------------
 cmGlobalVisualStudioGenerator::TargetSet const&
-cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmTarget* target)
+cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 {
-  TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
+  TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target);
   if(i == this->TargetLinkClosure.end())
     {
-    TargetSetMap::value_type entry(target, TargetSet());
+    TargetSetMap::value_type entry(target->Target, TargetSet());
     i = this->TargetLinkClosure.insert(entry).first;
     this->FillLinkClosure(target, i->second);
     }
@@ -461,7 +462,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   TargetSet linked;
   if(target.GetType() != cmState::STATIC_LIBRARY)
     {
-    linked = this->GetTargetLinkClosure(&target);
+    linked = this->GetTargetLinkClosure(gt);
     }
 
   // Emit link dependencies.
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 41d0b88..5ada37e 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -146,8 +146,8 @@ private:
 
   class TargetSetMap: public std::map<cmTarget*, TargetSet> {};
   TargetSetMap TargetLinkClosure;
-  void FillLinkClosure(cmTarget const* target, TargetSet& linked);
-  TargetSet const& GetTargetLinkClosure(cmTarget* target);
+  void FillLinkClosure(cmGeneratorTarget const* target, TargetSet& linked);
+  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget *target);
 };
 
 class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26e23e8463f9b9e2298e317a70925c56bcb018d1
commit 26e23e8463f9b9e2298e317a70925c56bcb018d1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:56 2015 +0200

    VS: Port ComputeLongestObjectDirectory to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index a7f0616..c4cbdef 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1935,7 +1935,7 @@ cmLocalVisualStudio6Generator
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio6Generator
-::ComputeLongestObjectDirectory(cmTarget&) const
+::ComputeLongestObjectDirectory(cmGeneratorTarget const*) const
 {
   // Compute the maximum length configuration name.
   std::string config_max;
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index 4772d54..dab32a5 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -50,7 +50,8 @@ public:
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
+  virtual std::string
+  ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
 private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a3ca67e..8b1915a 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1689,10 +1689,10 @@ cmLocalVisualStudio7GeneratorFCInfo
 //----------------------------------------------------------------------------
 std::string
 cmLocalVisualStudio7Generator
-::ComputeLongestObjectDirectory(cmTarget& target) const
+::ComputeLongestObjectDirectory(cmGeneratorTarget const* target) const
 {
   std::vector<std::string> configs;
-  target.GetMakefile()->GetConfigurations(configs);
+  target->Target->GetMakefile()->GetConfigurations(configs);
 
   // Compute the maximum length configuration name.
   std::string config_max;
@@ -1711,9 +1711,7 @@ cmLocalVisualStudio7Generator
   std::string dir_max;
   dir_max += this->GetCurrentBinaryDirectory();
   dir_max += "/";
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-  dir_max += this->GetTargetDirectory(gt);
+  dir_max += this->GetTargetDirectory(target);
   dir_max += "/";
   dir_max += config_max;
   dir_max += "/";
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index deb8d8f..7bb9cc6 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -56,7 +56,8 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   cmSourceFile* CreateVCProjBuildRule();
   void WriteStampFiles();
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const;
+  virtual std::string
+  ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
 
   virtual void ReadAndStoreExternalGUID(const std::string& name,
                                         const char* path);
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 2f44fb7..8516ce7 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -43,7 +43,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const* gt)
 {
-  std::string dir_max = this->ComputeLongestObjectDirectory(*gt->Target);
+  std::string dir_max = this->ComputeLongestObjectDirectory(gt);
 
   // Count the number of object files with each name.  Note that
   // windows file names are not case sensitive.
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 071bfb3..6d915e7 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -44,7 +44,8 @@ public:
 
   cmGlobalVisualStudioGenerator::VSVersion GetVersion() const;
 
-  virtual std::string ComputeLongestObjectDirectory(cmTarget&) const = 0;
+  virtual std::string
+  ComputeLongestObjectDirectory(cmGeneratorTarget const*) const = 0;
 
   virtual void AddCMakeListsRules() = 0;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01c26986931a409dbb246b780b808c51aea35c2b
commit 01c26986931a409dbb246b780b808c51aea35c2b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:56 2015 +0200

    VS7: Port to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index e9aee8a..0040331 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -85,7 +85,7 @@ void cmLocalVisualStudio10Generator::Generate()
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
        ->TargetIsFortranOnly(*(*l)->Target))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
     else
       {
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 4895698..a3ca67e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -34,7 +34,8 @@ public:
     LocalGenerator(e) {}
   typedef cmComputeLinkInformation::ItemVector ItemVector;
   void OutputLibraries(std::ostream& fout, ItemVector const& libs);
-  void OutputObjects(std::ostream& fout, cmTarget* t, const char* isep = 0);
+  void OutputObjects(std::ostream& fout, cmGeneratorTarget* t,
+                     const char* isep = 0);
 private:
   cmLocalVisualStudio7Generator* LocalGenerator;
 };
@@ -129,8 +130,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = *(*l)->Target;
-    if(tgt.GetType() == cmState::GLOBAL_TARGET)
+    if((*l)->GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
       cmCustomCommandLine force_command;
@@ -142,7 +142,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       std::string force = this->GetCurrentBinaryDirectory();
       force += cmake::GetCMakeFilesDirectory();
       force += "/";
-      force += tgt.GetName();
+      force += (*l)->GetName();
       force += "_force";
       if(cmSourceFile* file =
          this->Makefile->AddCustomCommandToOutput(
@@ -187,7 +187,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     // so don't build a projectfile for it
     if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
       }
     }
 }
@@ -225,11 +225,11 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio7Generator
-::CreateSingleVCProj(const std::string& lname, cmTarget &target)
+::CreateSingleVCProj(const std::string& lname, cmGeneratorTarget *target)
 {
   cmGlobalVisualStudioGenerator* gg
       = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-  this->FortranProject = gg->TargetIsFortranOnly(target);
+  this->FortranProject = gg->TargetIsFortranOnly(*target->Target);
   this->WindowsCEProject = gg->TargetsWindowsCE();
 
   // Intel Fortran for VS10 uses VS9 format ".vfproj" files.
@@ -241,7 +241,7 @@ void cmLocalVisualStudio7Generator
     }
 
   // add to the list of projects
-  target.SetProperty("GENERATOR_FILE_NAME",lname.c_str());
+  target->Target->SetProperty("GENERATOR_FILE_NAME",lname.c_str());
   // create the dsp.cmake file
   std::string fname;
   fname = this->GetCurrentBinaryDirectory();
@@ -324,8 +324,9 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
 }
 
 void cmLocalVisualStudio7Generator::WriteConfigurations(
-  std::ostream& fout, std::vector<std::string> const& configs,
-  const std::string& libName, cmTarget &target
+    std::ostream& fout,
+    std::vector<std::string> const& configs,
+  const std::string& libName, cmGeneratorTarget *target
   )
 {
   fout << "\t<Configurations>\n";
@@ -643,7 +644,7 @@ private:
 void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
                                                 const std::string& configName,
                                                 const std::string& libName,
-                                                cmTarget &target)
+                                                cmGeneratorTarget *target)
 {
   const char* mfcFlag = this->Makefile->GetDefinition("CMAKE_MFC_FLAG");
   if(!mfcFlag)
@@ -664,10 +665,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   const char* projectType = 0;
   bool targetBuilds = true;
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::OBJECT_LIBRARY:
       targetBuilds = false; // no manifest tool for object library
@@ -699,12 +697,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     {
     const std::string& linkLanguage = (this->FortranProject?
                                        std::string("Fortran"):
-                                gt->GetLinkerLanguage(configName));
+                                target->GetLinkerLanguage(configName));
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
         ("CMake can not determine linker language for target: ",
-         target.GetName().c_str());
+         target->GetName().c_str());
       return;
       }
     if(linkLanguage == "C" || linkLanguage == "CXX"
@@ -730,12 +728,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       }
 
     // Add the target-specific flags.
-    this->AddCompileOptions(flags, gt, linkLanguage, configName);
+    this->AddCompileOptions(flags, target, linkLanguage, configName);
     }
 
   if(this->FortranProject)
     {
-    switch(this->GetFortranFormat(target.GetProperty("Fortran_FORMAT")))
+    switch(this->GetFortranFormat(target->GetProperty("Fortran_FORMAT")))
       {
       case FortranFormatFixed: flags += " -fixed"; break;
       case FortranFormatFree: flags += " -free"; break;
@@ -762,7 +760,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.Parse(defineFlags.c_str());
   targetOptions.ParseFinish();
   std::vector<std::string> targetDefines;
-  gt->GetCompileDefinitions(targetDefines, configName, "CXX");
+  target->GetCompileDefinitions(targetDefines, configName, "CXX");
   targetOptions.AddDefines(targetDefines);
   targetOptions.SetVerboseMakefile(
     this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));
@@ -774,22 +772,22 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = gt->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     targetOptions.AddDefine(exportMacro);
     }
 
   // The intermediate directory name consists of a directory for the
   // target and a subdirectory for the configuration name.
-  std::string intermediateDir = this->GetTargetDirectory(gt);
+  std::string intermediateDir = this->GetTargetDirectory(target);
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target.GetType() < cmState::UTILITY)
+  if (target->Target->GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target.GetType() == cmState::OBJECT_LIBRARY?
-      intermediateDir : gt->GetDirectory(configName);
+      target->Target->GetType() == cmState::OBJECT_LIBRARY?
+      intermediateDir : target->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
     }
@@ -804,7 +802,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if (this->FortranProject)
     {
     // Intel Fortran >= 15.0 uses TargetName property.
-    std::string targetNameFull = gt->GetFullName(configName);
+    std::string targetNameFull = target->GetFullName(configName);
     std::string targetName =
       cmSystemTools::GetFilenameWithoutLastExtension(targetNameFull);
     std::string targetExt =
@@ -839,7 +837,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if(this->FortranProject)
     {
     const char* target_mod_dir =
-      target.GetProperty("Fortran_MODULE_DIRECTORY");
+      target->Target->GetProperty("Fortran_MODULE_DIRECTORY");
     std::string modDir;
     if(target_mod_dir)
       {
@@ -858,7 +856,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
   fout << "\t\t\t\tAdditionalIncludeDirectories=\"";
   std::vector<std::string> includes;
-  this->GetIncludeDirectories(includes, gt, "C", configName);
+  this->GetIncludeDirectories(includes, target, "C", configName);
   std::vector<std::string>::iterator i = includes.begin();
   for(;i != includes.end(); ++i)
     {
@@ -879,10 +877,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target.GetType() <= cmState::OBJECT_LIBRARY)
+  if(target->Target->GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
-    std::string pdb = gt->GetCompilePDBPath(configName);
+    std::string pdb = target->GetCompilePDBPath(configName);
     if(!pdb.empty())
       {
       fout <<  "\t\t\t\tProgramDataBaseFileName=\""
@@ -986,7 +984,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
       "\t\t\t\tName=\"" << manifestTool << "\"";
 
     std::vector<cmSourceFile const*> manifest_srcs;
-    gt->GetManifests(manifest_srcs, configName);
+    target->GetManifests(manifest_srcs, configName);
     if (!manifest_srcs.empty())
       {
       fout << "\n\t\t\t\tAdditionalManifestFiles=\"";
@@ -1001,7 +999,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
 
     // Check if we need the FAT32 workaround.
     // Check the filesystem type where the target will be written.
-    if (cmLVS6G_IsFAT(gt->GetDirectory(configName).c_str()))
+    if (cmLVS6G_IsFAT(target->GetDirectory(configName).c_str()))
       {
       // Add a flag telling the manifest tool to use a workaround
       // for FAT32 file systems, which can cause an empty manifest
@@ -1035,28 +1033,28 @@ cmLocalVisualStudio7Generator
 }
 
 void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
-  const std::string& configName, cmTarget &target,
+  const std::string& configName, cmGeneratorTarget* target,
   const Options& targetOptions)
 {
   cmGlobalVisualStudio7Generator* gg =
     static_cast<cmGlobalVisualStudio7Generator*>(this->GlobalGenerator);
   std::string temp;
   std::string extraLinkOptions;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_EXE_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS")
       + std::string(" ")
       + GetBuildTypeLinkerFlags("CMAKE_SHARED_LINKER_FLAGS", configName);
     }
-  if(target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions =
       this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS")
@@ -1064,7 +1062,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       + GetBuildTypeLinkerFlags("CMAKE_MODULE_LINKER_FLAGS", configName);
     }
 
-  const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+  const char* targetLinkFlags = target->GetProperty("LINK_FLAGS");
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1073,7 +1071,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
   std::string configTypeUpper = cmSystemTools::UpperCase(configName);
   std::string linkFlagsConfig = "LINK_FLAGS_";
   linkFlagsConfig += configTypeUpper;
-  targetLinkFlags = target.GetProperty(linkFlagsConfig.c_str());
+  targetLinkFlags = target->GetProperty(linkFlagsConfig.c_str());
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1093,28 +1091,26 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       this->ConvertToOutputFormat(this->ModuleDefinitionFile, SHELL);
     linkOptions.AddFlag("ModuleDefinitionFile", defFile.c_str());
     }
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
 
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (target->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)/exportall.def");
       }
     }
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::UNKNOWN_LIBRARY:
       break;
     case cmState::OBJECT_LIBRARY:
       {
-      std::string libpath = this->GetTargetDirectory(gt);
+      std::string libpath = this->GetTargetDirectory(target);
       libpath += "/";
       libpath += configName;
       libpath += "/";
-      libpath += target.GetName();
+      libpath += target->GetName();
       libpath += ".lib";
       const char* tool =
         this->FortranProject? "VFLibrarianTool":"VCLibrarianTool";
@@ -1126,8 +1122,8 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     case cmState::STATIC_LIBRARY:
     {
-    std::string targetNameFull = gt->GetFullName(configName);
-    std::string libpath = gt->GetDirectory(configName);
+    std::string targetNameFull = target->GetFullName(configName);
+    std::string libpath = target->GetDirectory(configName);
     libpath += "/";
     libpath += targetNameFull;
     const char* tool = "VCLibrarianTool";
@@ -1142,14 +1138,14 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
         || this->FortranProject)
       {
       std::ostringstream libdeps;
-      this->Internal->OutputObjects(libdeps, &target);
+      this->Internal->OutputObjects(libdeps, target);
       if(!libdeps.str().empty())
         {
         fout << "\t\t\t\tAdditionalDependencies=\"" << libdeps.str() << "\"\n";
         }
       }
     std::string libflags;
-    this->GetStaticLibraryFlags(libflags, configTypeUpper, gt);
+    this->GetStaticLibraryFlags(libflags, configTypeUpper, target);
     if(!libflags.empty())
       {
       fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
@@ -1166,11 +1162,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gt->GetLibraryNames(targetName, targetNameSO, targetNameFull,
+    target->GetLibraryNames(targetName, targetNameSO, targetNameFull,
                            targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1190,7 +1186,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(target))
+    if(!gg->NeedLinkLibraryDependencies(*target->Target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1202,22 +1198,22 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, &target, " ");
+      this->Internal->OutputObjects(fout, target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = gt->GetDirectory(configName);
+    temp = target->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, gt);
+    this->WriteTargetVersionAttribute(fout, target);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
-    temp = gt->GetPDBDirectory(configName);
+    temp = target->GetPDBDirectory(configName);
     temp += "/";
     temp += targetNamePDB;
     fout << "\t\t\t\tProgramDatabaseFile=\"" <<
@@ -1245,7 +1241,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal  << "\"\n";
       }
-    temp = gt->GetDirectory(configName, true);
+    temp = target->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1263,11 +1259,11 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     std::string targetNameFull;
     std::string targetNameImport;
     std::string targetNamePDB;
-    gt->GetExecutableNames(targetName, targetNameFull,
+    target->GetExecutableNames(targetName, targetNameFull,
                               targetNameImport, targetNamePDB, configName);
 
     // Compute the link library and directory information.
-    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
     if(!pcli)
       {
       return;
@@ -1275,7 +1271,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     cmComputeLinkInformation& cli = *pcli;
     std::string linkLanguage = cli.GetLinkLanguage();
 
-    bool isWin32Executable = target.GetPropertyAsBool("WIN32_EXECUTABLE");
+    bool isWin32Executable = target->GetPropertyAsBool("WIN32_EXECUTABLE");
 
     // Compute the variable name to lookup standard libraries for this
     // language.
@@ -1289,7 +1285,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(target))
+    if(!gg->NeedLinkLibraryDependencies(*target->Target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1301,23 +1297,23 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
     if(this->GetVersion() < cmGlobalVisualStudioGenerator::VS8
         || this->FortranProject)
       {
-      this->Internal->OutputObjects(fout, &target, " ");
+      this->Internal->OutputObjects(fout, target, " ");
       }
     fout << " ";
     this->Internal->OutputLibraries(fout, cli.GetItems());
     fout << "\"\n";
-    temp = gt->GetDirectory(configName);
+    temp = target->GetDirectory(configName);
     temp += "/";
     temp += targetNameFull;
     fout << "\t\t\t\tOutputFile=\""
          << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n";
-    this->WriteTargetVersionAttribute(fout, gt);
+    this->WriteTargetVersionAttribute(fout, target);
     linkOptions.OutputFlagMap(fout, "\t\t\t\t");
     fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
     this->OutputLibraryDirectories(fout, cli.GetDirectories());
     fout << "\"\n";
     std::string path = this->ConvertToXMLOutputPathSingle(
-      gt->GetPDBDirectory(configName).c_str());
+      target->GetPDBDirectory(configName).c_str());
     fout << "\t\t\t\tProgramDatabaseFile=\""
          << path << "/" << targetNamePDB
          << "\"\n";
@@ -1364,7 +1360,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tStackReserveSize=\"" << stackVal << "\"";
       }
-    temp = gt->GetDirectory(configName, true);
+    temp = target->GetDirectory(configName, true);
     temp += "/";
     temp += targetNameImport;
     fout << "\t\t\t\tImportLibrary=\""
@@ -1415,13 +1411,11 @@ cmLocalVisualStudio7GeneratorInternals
 //----------------------------------------------------------------------------
 void
 cmLocalVisualStudio7GeneratorInternals
-::OutputObjects(std::ostream& fout, cmTarget* t, const char* isep)
+::OutputObjects(std::ostream& fout, cmGeneratorTarget* gt, const char* isep)
 {
   // VS < 8 does not support per-config source locations so we
   // list object library content on the link line instead.
   cmLocalVisualStudio7Generator* lg = this->LocalGenerator;
-  cmGeneratorTarget* gt =
-    lg->GetGlobalGenerator()->GetGeneratorTarget(t);
   std::vector<std::string> objs;
   gt->UseObjectLibraries(objs, "");
   const char* sep = isep? isep : "";
@@ -1478,7 +1472,7 @@ cmLocalVisualStudio7Generator
 
 void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
                                                     const std::string& libName,
-                                                    cmTarget &target)
+                                                    cmGeneratorTarget* target)
 {
   std::vector<std::string> configs;
   this->Makefile->GetConfigurations(configs);
@@ -1486,13 +1480,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
   // We may be modifying the source groups temporarily, so make a copy.
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // get the classes from the source lists then add them to the groups
   this->ModuleDefinitionFile = "";
   std::vector<cmSourceFile*> classes;
-  if (!gt->GetConfigCommonSourceFiles(classes))
+  if (!target->GetConfigCommonSourceFiles(classes))
     {
     return;
     }
@@ -1535,7 +1526,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
     // VS >= 8 support per-config source locations so we
     // list object library content as external objects.
     std::vector<std::string> objs;
-    gt->UseObjectLibraries(objs, "");
+    target->UseObjectLibraries(objs, "");
     if(!objs.empty())
       {
       // TODO: Separate sub-filter for each object library used?
@@ -1570,7 +1561,7 @@ class cmLocalVisualStudio7GeneratorFCInfo
 {
 public:
   cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmTarget& target,
+                                      cmGeneratorTarget* target,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs);
   std::map<std::string, cmLVS7GFileConfig> FileConfigMap;
@@ -1578,12 +1569,10 @@ public:
 
 cmLocalVisualStudio7GeneratorFCInfo
 ::cmLocalVisualStudio7GeneratorFCInfo(cmLocalVisualStudio7Generator* lg,
-                                      cmTarget& target,
+                                      cmGeneratorTarget* gt,
                                       cmSourceFile const& sf,
                                       std::vector<std::string> const& configs)
 {
-  cmGeneratorTarget* gt =
-    lg->GetGlobalGenerator()->GetGeneratorTarget(&target);
   std::string objectName;
   if(gt->HasExplicitObjectName(&sf))
     {
@@ -1732,7 +1721,7 @@ cmLocalVisualStudio7Generator
 }
 
 bool cmLocalVisualStudio7Generator
-::WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+::WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
              std::ostream &fout, const std::string& libName,
              std::vector<std::string> const& configs)
 {
@@ -1767,15 +1756,14 @@ bool cmLocalVisualStudio7Generator
     }
 
   // Loop through each source in the source group.
-  std::string objectName;
   for(std::vector<const cmSourceFile *>::const_iterator sf =
         sourceFiles.begin(); sf != sourceFiles.end(); ++sf)
     {
     std::string source = (*sf)->GetFullPath();
     FCInfo fcinfo(this, target, *(*sf), configs);
 
-    if (source != libName || target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET )
+    if (source != libName || target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET )
       {
       fout << "\t\t\t<File\n";
       std::string d = this->ConvertToXMLOutputPathSingle(source.c_str());
@@ -2022,10 +2010,10 @@ void cmLocalVisualStudio7Generator::WriteVCProjEndGroup(std::ostream& fout)
 void cmLocalVisualStudio7Generator
 ::OutputTargetRules(std::ostream& fout,
                     const std::string& configName,
-                    cmTarget &target,
+                    cmGeneratorTarget *target,
                     const std::string& /*libName*/)
 {
-  if (target.GetType() > cmState::GLOBAL_TARGET)
+  if (target->GetType() > cmState::GLOBAL_TARGET)
     {
     return;
     }
@@ -2035,36 +2023,35 @@ void cmLocalVisualStudio7Generator
   const char* tool =
     this->FortranProject? "VFPreBuildEventTool":"VCPreBuildEventTool";
   event.Start(tool);
-  event.Write(target.GetPreBuildCommands());
+  event.Write(target->Target->GetPreBuildCommands());
   event.Finish();
 
   // Add pre-link event.
   tool = this->FortranProject? "VFPreLinkEventTool":"VCPreLinkEventTool";
   event.Start(tool);
   bool addedPrelink = false;
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (target->GetType() == cmState::SHARED_LIBRARY &&
       this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if (target->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        target.GetPreLinkCommands();
+        target->Target->GetPreLinkCommands();
       cmGlobalVisualStudioGenerator* gg
         = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
-      cmGeneratorTarget* gt =
-        this->GlobalGenerator->GetGeneratorTarget(&target);
       gg->AddSymbolExportCommand(
-        gt, commands, configName);
+        target, commands, configName);
       event.Write(commands);
       }
     }
   if (!addedPrelink)
     {
-    event.Write(target.GetPreLinkCommands());
+    event.Write(target->Target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, this->FortranProject));
+    this->MaybeCreateImplibDir(*target->Target,
+                               configName, this->FortranProject));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -2074,18 +2061,18 @@ void cmLocalVisualStudio7Generator
   // Add post-build event.
   tool = this->FortranProject? "VFPostBuildEventTool":"VCPostBuildEventTool";
   event.Start(tool);
-  event.Write(target.GetPostBuildCommands());
+  event.Write(target->Target->GetPostBuildCommands());
   event.Finish();
 }
 
 void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
-                                                    cmTarget& target)
+                                                    cmGeneratorTarget* target)
 {
   // if we have all the required Source code control tags
   // then add that to the project
-  const char* vsProjectname = target.GetProperty("VS_SCC_PROJECTNAME");
-  const char* vsLocalpath = target.GetProperty("VS_SCC_LOCALPATH");
-  const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
+  const char* vsProjectname = target->GetProperty("VS_SCC_PROJECTNAME");
+  const char* vsLocalpath = target->GetProperty("VS_SCC_LOCALPATH");
+  const char* vsProvider = target->GetProperty("VS_SCC_PROVIDER");
 
   if(vsProvider && vsLocalpath && vsProjectname)
     {
@@ -2093,7 +2080,7 @@ void cmLocalVisualStudio7Generator::WriteProjectSCC(std::ostream& fout,
          << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
          << "\tSccProvider=\"" << vsProvider << "\"\n";
 
-    const char* vsAuxPath = target.GetProperty("VS_SCC_AUXPATH");
+    const char* vsAuxPath = target->GetProperty("VS_SCC_AUXPATH");
     if(vsAuxPath)
       {
       fout << "\tSccAuxPath=\"" << vsAuxPath << "\"\n";
@@ -2105,7 +2092,7 @@ void
 cmLocalVisualStudio7Generator
 ::WriteProjectStartFortran(std::ostream& fout,
                            const std::string& libName,
-                           cmTarget & target)
+                           cmGeneratorTarget *target)
 {
 
   cmGlobalVisualStudio7Generator* gg =
@@ -2115,13 +2102,13 @@ cmLocalVisualStudio7Generator
        << "<VisualStudioProject\n"
        << "\tProjectCreator=\"Intel Fortran\"\n"
        << "\tVersion=\"" << gg->GetIntelProjectVersion() << "\"\n";
-  const char* keyword = target.GetProperty("VS_KEYWORD");
+  const char* keyword = target->GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Console Application";
     }
   const char* projectType = 0;
-  switch(target.GetType())
+  switch(target->GetType())
     {
     case cmState::STATIC_LIBRARY:
       projectType = "typeStaticLibrary";
@@ -2166,7 +2153,7 @@ cmLocalVisualStudio7Generator
 void
 cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
                                                  const std::string& libName,
-                                                 cmTarget & target,
+                                                 cmGeneratorTarget *target,
                                                  std::vector<cmSourceGroup> &)
 {
   if(this->FortranProject)
@@ -2190,12 +2177,12 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     {
     fout <<  "\tVersion=\"" << (gg->GetVersion()/10) << ".00\"\n";
     }
-  const char* projLabel = target.GetProperty("PROJECT_LABEL");
+  const char* projLabel = target->GetProperty("PROJECT_LABEL");
   if(!projLabel)
     {
     projLabel = libName.c_str();
     }
-  const char* keyword = target.GetProperty("VS_KEYWORD");
+  const char* keyword = target->GetProperty("VS_KEYWORD");
   if(!keyword)
     {
     keyword = "Win32Proj";
@@ -2207,7 +2194,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
     }
   this->WriteProjectSCC(fout, target);
   if(const char* targetFrameworkVersion =
-     target.GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
+     target->GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION"))
     {
     fout << "\tTargetFrameworkVersion=\"" << targetFrameworkVersion << "\"\n";
     }
@@ -2228,12 +2215,13 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
 }
 
 
-void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream& fout,
-                                                      cmTarget &target)
+void cmLocalVisualStudio7Generator::WriteVCProjFooter(
+    std::ostream& fout,
+    cmGeneratorTarget *target)
 {
   fout << "\t<Globals>\n";
 
-  cmPropertyMap const& props = target.GetProperties();
+  cmPropertyMap const& props = target->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
     {
     if(i->first.find("VS_GLOBAL_") == 0)
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 16cf004..deb8d8f 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -15,7 +15,6 @@
 #include "cmLocalVisualStudioGenerator.h"
 #include "cmVisualStudioGeneratorOptions.h"
 
-class cmTarget;
 class cmSourceFile;
 class cmCustomCommand;
 class cmSourceGroup;
@@ -63,7 +62,8 @@ public:
                                         const char* path);
   virtual void AddCMakeListsRules();
 protected:
-  void CreateSingleVCProj(const std::string& lname, cmTarget &tgt);
+  void CreateSingleVCProj(const std::string& lname,
+                          cmGeneratorTarget *tgt);
 private:
   typedef cmVisualStudioGeneratorOptions Options;
   typedef cmLocalVisualStudio7GeneratorFCInfo FCInfo;
@@ -72,30 +72,33 @@ private:
   void FixGlobalTargets();
   void WriteProjectFiles();
   void WriteVCProjHeader(std::ostream& fout, const std::string& libName,
-                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
-  void WriteVCProjFooter(std::ostream& fout, cmTarget &target);
+                         cmGeneratorTarget* tgt,
+                         std::vector<cmSourceGroup> &sgs);
+  void WriteVCProjFooter(std::ostream& fout, cmGeneratorTarget* target);
   void WriteVCProjFile(std::ostream& fout, const std::string& libName,
-                       cmTarget &tgt);
+                       cmGeneratorTarget* tgt);
   void WriteConfigurations(std::ostream& fout,
                            std::vector<std::string> const& configs,
-                           const std::string& libName, cmTarget &tgt);
+                           const std::string& libName, cmGeneratorTarget* tgt);
   void WriteConfiguration(std::ostream& fout,
                           const std::string& configName,
-                          const std::string& libName, cmTarget &tgt);
+                          const std::string& libName, cmGeneratorTarget* tgt);
   std::string EscapeForXML(const std::string& s);
   std::string ConvertToXMLOutputPath(const char* path);
   std::string ConvertToXMLOutputPathSingle(const char* path);
   void OutputTargetRules(std::ostream& fout, const std::string& configName,
-                         cmTarget &target, const std::string& libName);
+                         cmGeneratorTarget* target,
+                         const std::string& libName);
   void OutputBuildTool(std::ostream& fout, const std::string& configName,
-                       cmTarget& t, const Options& targetOptions);
+                       cmGeneratorTarget* t, const Options& targetOptions);
   void OutputLibraryDirectories(std::ostream& fout,
                                 std::vector<std::string> const& dirs);
-  void WriteProjectSCC(std::ostream& fout, cmTarget& target);
+  void WriteProjectSCC(std::ostream& fout, cmGeneratorTarget *target);
   void WriteProjectStart(std::ostream& fout, const std::string& libName,
-                         cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
+                         cmGeneratorTarget* tgt,
+                         std::vector<cmSourceGroup> &sgs);
   void WriteProjectStartFortran(std::ostream& fout, const std::string& libName,
-                                cmTarget &tgt);
+                                cmGeneratorTarget* tgt);
   void WriteVCProjBeginGroup(std::ostream& fout,
                           const char* group,
                           const char* filter);
@@ -110,7 +113,7 @@ private:
                                    cmGeneratorTarget* gt);
 
   bool WriteGroup(const cmSourceGroup *sg,
-                  cmTarget& target, std::ostream &fout,
+                  cmGeneratorTarget* target, std::ostream &fout,
                   const std::string& libName,
                   std::vector<std::string> const& configs);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=459c891088c8b2fb8b7cb950878cf7c0579ddb33
commit 459c891088c8b2fb8b7cb950878cf7c0579ddb33
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:55 2015 +0200

    VS10: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 161b532..e568704 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -331,7 +331,7 @@ void cmGlobalVisualStudio10Generator::Generate()
   this->cmGlobalVisualStudio8Generator::Generate();
   if(this->LongestSource.Length > 0)
     {
-    cmMakefile* mf = this->LongestSource.Target->GetMakefile();
+    cmLocalGenerator* lg = this->LongestSource.Target->GetLocalGenerator();
     std::ostringstream e;
     e <<
       "The binary and/or source directory paths may be too long to generate "
@@ -346,13 +346,13 @@ void cmGlobalVisualStudio10Generator::Generate()
       "  " << this->LongestSource.SourceFile->GetFullPath() << "\n"
       "This is because some Visual Studio tools would append the relative "
       "path to the end of the referencing directory path, as in:\n"
-      "  " << mf->GetCurrentBinaryDirectory() << "/"
+      "  " << lg->GetCurrentBinaryDirectory() << "/"
       << this->LongestSource.SourceRel << "\n"
       "and then incorrectly complain that the file does not exist because "
       "the path length is too long for some internal buffer or API.  "
       "To avoid this problem CMake must use a full path for this file "
       "which then triggers the VS 10 property dialog bug.";
-    mf->IssueMessage(cmake::WARNING, e.str().c_str());
+    lg->IssueMessage(cmake::WARNING, e.str().c_str());
     }
 }
 
@@ -591,9 +591,11 @@ cmGlobalVisualStudio10Generator
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio10Generator::PathTooLong(
-  cmTarget* target, cmSourceFile const* sf, std::string const& sfRel)
+        cmGeneratorTarget *target, cmSourceFile const* sf,
+        std::string const& sfRel)
 {
-  size_t len = (strlen(target->GetMakefile()->GetCurrentBinaryDirectory()) +
+  size_t len =
+      (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
                 1 + sfRel.length());
   if(len > this->LongestSource.Length)
     {
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 7600a0d..6bf4740 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -95,7 +95,7 @@ public:
   /** Generate an <output>.rule file path for a given command output.  */
   virtual std::string GenerateRuleFile(std::string const& output) const;
 
-  void PathTooLong(cmTarget* target, cmSourceFile const* sf,
+  void PathTooLong(cmGeneratorTarget* target, cmSourceFile const* sf,
                    std::string const& sfRel);
 
   virtual const char* GetToolsVersion() { return "4.0"; }
@@ -139,7 +139,7 @@ private:
   {
     LongestSourcePath(): Length(0), Target(0), SourceFile(0) {}
     size_t Length;
-    cmTarget* Target;
+    cmGeneratorTarget* Target;
     cmSourceFile const* SourceFile;
     std::string SourceRel;
   };
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index c9d53fe..e9aee8a 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -90,7 +90,7 @@ void cmLocalVisualStudio10Generator::Generate()
     else
       {
       cmVisualStudio10TargetGenerator tg(
-        (*l)->Target, static_cast<cmGlobalVisualStudio10Generator*>(
+        *l, static_cast<cmGlobalVisualStudio10Generator*>(
           this->GetGlobalGenerator()));
       tg.Generate();
       }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f4c632d..3f8e627 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -13,7 +13,6 @@
 #include "cmVisualStudio10TargetGenerator.h"
 #include "cmGlobalVisualStudio10Generator.h"
 #include "cmGeneratorTarget.h"
-#include "cmTarget.h"
 #include "cmComputeLinkInformation.h"
 #include "cmGeneratedFileStream.h"
 #include "cmMakefile.h"
@@ -167,13 +166,12 @@ static std::string cmVS10EscapeComment(std::string comment)
 }
 
 cmVisualStudio10TargetGenerator::
-cmVisualStudio10TargetGenerator(cmTarget* target,
+cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
                                 cmGlobalVisualStudio10Generator* gg)
 {
   this->GlobalGenerator = gg;
-  this->Target = target;
-  this->GeneratorTarget = gg->GetGeneratorTarget(target);
-  this->Makefile = target->GetMakefile();
+  this->GeneratorTarget = target;
+  this->Makefile = target->Target->GetMakefile();
   this->Makefile->GetConfigurations(this->Configurations);
   this->LocalGenerator =
     (cmLocalVisualStudio7Generator*)
@@ -275,8 +273,9 @@ void cmVisualStudio10TargetGenerator::Generate()
     return;
     }
   // Tell the global generator the name of the project file
-  this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
-  this->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
+  this->GeneratorTarget->Target
+      ->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
+  this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
                             ".vcxproj");
   if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
     {
@@ -732,7 +731,8 @@ void cmVisualStudio10TargetGenerator
   cmGlobalVisualStudio10Generator* gg =
     static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
   const char* mfcFlag =
-    this->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
+    this->GeneratorTarget->
+      Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
   std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
 
   std::string useOfMfcValue = "false";
@@ -1462,7 +1462,8 @@ void cmVisualStudio10TargetGenerator::WriteSource(
       }
     else
       {
-      this->GlobalGenerator->PathTooLong(this->Target, sf, sourceRel);
+      this->GlobalGenerator->PathTooLong(this->GeneratorTarget,
+                                         sf, sourceRel);
       }
     }
   this->ConvertToWindowsSlash(sourceFile);
@@ -1915,12 +1916,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
     std::string baseFlagVar = "CMAKE_";
     baseFlagVar += linkLanguage;
     baseFlagVar += "_FLAGS";
-    flags = this->
+    flags = this->GeneratorTarget->
       Target->GetMakefile()->GetRequiredDefinition(baseFlagVar.c_str());
     std::string flagVar = baseFlagVar + std::string("_") +
       cmSystemTools::UpperCase(configName);
     flags += " ";
-    flags += this->
+    flags += this->GeneratorTarget->
       Target->GetMakefile()->GetRequiredDefinition(flagVar.c_str());
     }
   // set the correct language
@@ -1936,7 +1937,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
                                           linkLanguage, configName.c_str());
 
   // Get preprocessor definitions for this directory.
-  std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags();
+  std::string defineFlags =
+      this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
   if(this->MSTools)
     {
     clOptions.FixExceptionHandlingDefault();
@@ -2440,11 +2442,11 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
   linkFlagVarBase += linkType;
   linkFlagVarBase += "_LINKER_FLAGS";
   flags += " ";
-  flags += this->
+  flags += this->GeneratorTarget->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVarBase.c_str());
   std::string linkFlagVar = linkFlagVarBase + "_" + CONFIG;
   flags += " ";
-  flags += this->
+  flags += this->GeneratorTarget->
     Target->GetMakefile()->GetRequiredDefinition(linkFlagVar.c_str());
   const char* targetLinkFlags =
       this->GeneratorTarget->GetProperty("LINK_FLAGS");
@@ -2674,7 +2676,8 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
   linkOptions.OutputFlagMap(*this->BuildFileStream, "      ");
 
   this->WriteString("</Link>\n", 2);
-  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(*this->Target))
+  if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
+              *this->GeneratorTarget->Target))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(
@@ -2811,7 +2814,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        this->Target->GetPreLinkCommands();
+        this->GeneratorTarget->Target->GetPreLinkCommands();
       this->GlobalGenerator->AddSymbolExportCommand(
         this->GeneratorTarget, commands, configName);
       this->WriteEvent("PreLinkEvent", commands, configName);
@@ -2820,12 +2823,12 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (!addedPrelink)
     {
     this->WriteEvent("PreLinkEvent",
-                     this->Target->GetPreLinkCommands(), configName);
+        this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
     }
   this->WriteEvent("PreBuildEvent",
-                   this->Target->GetPreBuildCommands(), configName);
+        this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
   this->WriteEvent("PostBuildEvent",
-                   this->Target->GetPostBuildCommands(), configName);
+        this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
 }
 
 void cmVisualStudio10TargetGenerator::WriteEvent(
@@ -2875,7 +2878,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
   for( OrderedTargetDependSet::const_iterator i = depends.begin();
        i != depends.end(); ++i)
     {
-    cmTarget const* dt = (*i)->Target;
+    cmGeneratorTarget const* dt = *i;
     if(dt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -2883,12 +2886,12 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
     // skip fortran targets as they can not be processed by MSBuild
     // the only reference will be in the .sln file
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(*dt))
+       ->TargetIsFortranOnly(*dt->Target))
       {
       continue;
       }
     this->WriteString("<ProjectReference Include=\"", 2);
-    cmMakefile* mf = dt->GetMakefile();
+    cmLocalGenerator* lg = dt->GetLocalGenerator();
     std::string name = dt->GetName();
     std::string path;
     const char* p = dt->GetProperty("EXTERNAL_MSPROJECT");
@@ -2898,7 +2901,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
       }
     else
       {
-      path =  mf->GetCurrentBinaryDirectory();
+      path =  lg->GetCurrentBinaryDirectory();
       path += "/";
       path += dt->GetName();
       path += ".vcxproj";
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 15ed9f2..044e0dd 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -13,7 +13,6 @@
 #define cmVisualStudioTargetGenerator_h
 #include "cmStandardIncludes.h"
 
-class cmTarget;
 class cmMakefile;
 class cmGeneratorTarget;
 class cmGeneratedFileStream;
@@ -29,7 +28,7 @@ struct cmIDEFlagTable;
 class cmVisualStudio10TargetGenerator
 {
 public:
-  cmVisualStudio10TargetGenerator(cmTarget* target,
+  cmVisualStudio10TargetGenerator(cmGeneratorTarget* target,
                                   cmGlobalVisualStudio10Generator* gg);
   ~cmVisualStudio10TargetGenerator();
   void Generate();
@@ -148,7 +147,6 @@ private:
   OptionsMap LinkOptions;
   std::string PathToVcxproj;
   std::vector<std::string> Configurations;
-  cmTarget* Target;
   cmGeneratorTarget* GeneratorTarget;
   cmMakefile* Makefile;
   std::string Platform;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f8bb857b8ab714b80acfa6a6e2c34195fabff6f
commit 7f8bb857b8ab714b80acfa6a6e2c34195fabff6f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:27:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:55 2015 +0200

    VS6: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 12eccf9..9e411c9 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -223,7 +223,7 @@ void cmGlobalVisualStudio6Generator
         tt = orderedProjectTargets.begin();
       tt != orderedProjectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -235,14 +235,15 @@ void cmGlobalVisualStudio6Generator
       std::string project = target->GetName();
       std::string location = expath;
       this->WriteExternalProject(fout, project.c_str(),
-                                 location.c_str(), target->GetUtilities());
+          location.c_str(), target->Target->GetUtilities());
       }
     else
       {
       std::string dspname = GetVS6TargetName(target->GetName());
-      std::string dir = target->GetMakefile()->GetCurrentBinaryDirectory();
+      std::string dir =
+          target->GetLocalGenerator()->GetCurrentBinaryDirectory();
       dir = root->Convert(dir.c_str(), cmLocalGenerator::START_OUTPUT);
-      this->WriteProject(fout, dspname.c_str(), dir.c_str(), *target);
+      this->WriteProject(fout, dspname.c_str(), dir.c_str(), target);
       }
     }
 
@@ -287,9 +288,9 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile()
 // Note, that dependencies from executables to
 // the libraries it uses are also done here
 void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
-                                                  const std::string& dspname,
-                                                  const char* dir,
-                                                  cmTarget const& target)
+                                            const std::string& dspname,
+                                            const char* dir,
+                                            const cmGeneratorTarget *target)
 {
   fout << "#########################################################"
     "######################\n\n";
@@ -298,7 +299,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -309,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -382,7 +383,7 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index e9b24ea..edf637f 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -15,8 +15,6 @@
 #include "cmGlobalVisualStudioGenerator.h"
 #include "cmGlobalGeneratorFactory.h"
 
-class cmTarget;
-
 /** \class cmGlobalVisualStudio6Generator
  * \brief Write a Unix makefiles.
  *
@@ -94,7 +92,7 @@ private:
   void WriteDSWHeader(std::ostream& fout);
   void WriteProject(std::ostream& fout,
                     const std::string& name, const char* path,
-                    cmTarget const& t);
+                    cmGeneratorTarget const* t);
   void WriteExternalProject(std::ostream& fout,
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 773e555..a7f0616 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
       this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
     if (!cmSystemTools::IsOn(suppRegenRule))
       {
-      this->AddDSPBuildRule(*(*l)->Target);
+      this->AddDSPBuildRule(*l);
       }
     }
 }
@@ -133,21 +133,21 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
       case cmState::STATIC_LIBRARY:
       case cmState::OBJECT_LIBRARY:
         this->SetBuildType(STATIC_LIBRARY,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::SHARED_LIBRARY:
       case cmState::MODULE_LIBRARY:
         this->SetBuildType(DLL,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::EXECUTABLE:
         this->SetBuildType(EXECUTABLE,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::UTILITY:
       case cmState::GLOBAL_TARGET:
         this->SetBuildType(UTILITY,
-                           (*l)->GetName().c_str(), *(*l)->Target);
+                           (*l)->GetName().c_str(), *l);
         break;
       case cmState::INTERFACE_LIBRARY:
         continue;
@@ -173,7 +173,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
           cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
-      this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
+      this->CreateSingleDSP((*l)->GetName().c_str(), *l);
       }
     }
 }
@@ -184,7 +184,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 extern std::string GetVS6TargetName(const std::string& targetName);
 
 void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
-                                                    cmTarget &target)
+                                                    cmGeneratorTarget* target)
 {
   // add to the list of projects
   std::string pname = GetVS6TargetName(lname);
@@ -211,9 +211,9 @@ void cmLocalVisualStudio6Generator::CreateSingleDSP(const std::string& lname,
 }
 
 
-void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
+void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmGeneratorTarget *tgt)
 {
-  std::string dspname = GetVS6TargetName(tgt.GetName());
+  std::string dspname = GetVS6TargetName(tgt->GetName());
   dspname += ".dsp.cmake";
   cmCustomCommandLine commandLine;
   commandLine.push_back(cmSystemTools::GetCMakeCommand());
@@ -245,8 +245,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
                                            no_working_directory, true);
   if(this->Makefile->GetSource(makefileIn.c_str()))
     {
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&tgt);
-    gt->AddSource(makefileIn);
+    tgt->AddSource(makefileIn);
     }
   else
     {
@@ -257,7 +256,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
 
 void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
                                                  const std::string& libName,
-                                                 cmTarget &target)
+                                                 cmGeneratorTarget *target)
 {
   // For utility targets need custom command since pre- and post-
   // build does not do anything in Visual Studio 6.  In order for the
@@ -265,23 +264,23 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // special care for dependencies.  The first rule must depend on all
   // the dependencies of all the rules.  The later rules must each
   // depend only on the previous rule.
-  if ((target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET) &&
-      (!target.GetPreBuildCommands().empty() ||
-       !target.GetPostBuildCommands().empty()))
+  if ((target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET) &&
+      (!target->Target->GetPreBuildCommands().empty() ||
+       !target->Target->GetPostBuildCommands().empty()))
     {
     // Accumulate the dependencies of all the commands.
     std::vector<std::string> depends;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPreBuildCommands().begin();
-         cr != target.GetPreBuildCommands().end(); ++cr)
+           target->Target->GetPreBuildCommands().begin();
+         cr != target->Target->GetPreBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPostBuildCommands().begin();
-         cr != target.GetPostBuildCommands().end(); ++cr)
+           target->Target->GetPostBuildCommands().begin();
+         cr != target->Target->GetPostBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
@@ -290,14 +289,14 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
     // Add the pre- and post-build commands in order.
     int count = 1;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPreBuildCommands().begin();
-         cr != target.GetPreBuildCommands().end(); ++cr)
+           target->Target->GetPreBuildCommands().begin();
+         cr != target->Target->GetPreBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target.GetPostBuildCommands().begin();
-         cr != target.GetPostBuildCommands().end(); ++cr)
+           target->Target->GetPostBuildCommands().begin();
+         cr != target->Target->GetPostBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
@@ -306,12 +305,9 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // We may be modifying the source groups temporarily, so make a copy.
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // get the classes from the source lists then add them to the groups
   std::vector<cmSourceFile*> classes;
-  if (!gt->GetConfigCommonSourceFiles(classes))
+  if (!target->GetConfigCommonSourceFiles(classes))
     {
     return;
     }
@@ -375,11 +371,9 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
 }
 
 void cmLocalVisualStudio6Generator
-::WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+::WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
              std::ostream &fout, const std::string& libName)
 {
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   const std::vector<const cmSourceFile *> &sourceFiles =
     sg->GetSourceFiles();
   // If the group is empty, don't write it at all.
@@ -411,9 +405,10 @@ void cmLocalVisualStudio6Generator
     std::string compileFlags;
     std::vector<std::string> depends;
     std::string objectNameDir;
-    if(gt->HasExplicitObjectName(*sf))
+    if(target->HasExplicitObjectName(*sf))
       {
-      objectNameDir = cmSystemTools::GetFilenamePath(gt->GetObjectName(*sf));
+      objectNameDir =
+          cmSystemTools::GetFilenamePath(target->GetObjectName(*sf));
       }
 
     // Add per-source file flags.
@@ -484,8 +479,8 @@ void cmLocalVisualStudio6Generator
       cmSystemTools::ExpandListArgument(dependsValue, depends);
       }
     if (GetVS6TargetName(source) != libName ||
-      target.GetType() == cmState::UTILITY ||
-      target.GetType() == cmState::GLOBAL_TARGET)
+      target->GetType() == cmState::UTILITY ||
+      target->GetType() == cmState::GLOBAL_TARGET)
       {
       fout << "# Begin Source File\n\n";
 
@@ -575,15 +570,15 @@ void cmLocalVisualStudio6Generator
 
 void
 cmLocalVisualStudio6Generator
-::AddUtilityCommandHack(cmTarget& target, int count,
+::AddUtilityCommandHack(cmGeneratorTarget *target, int count,
                         std::vector<std::string>& depends,
                         const cmCustomCommand& origCommand)
 {
   // Create a fake output that forces the rule to run.
   char* output = new char[(strlen(this->GetCurrentBinaryDirectory())
-                           + target.GetName().size() + 30)];
+                           + target->GetName().size() + 30)];
   sprintf(output,"%s/%s_force_%i", this->GetCurrentBinaryDirectory(),
-          target.GetName().c_str(), count);
+          target->GetName().c_str(), count);
   const char* comment = origCommand.GetComment();
   if(!comment && origCommand.GetOutputs().empty())
     {
@@ -598,8 +593,7 @@ cmLocalVisualStudio6Generator
        origCommand.GetCommandLines(), comment,
        origCommand.GetWorkingDirectory().c_str()))
     {
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(&target);
-    gt->AddSource(outsf->GetFullPath());
+    target->AddSource(outsf->GetFullPath());
     }
 
   // Replace the dependencies with the output of this rule so that the
@@ -715,7 +709,7 @@ void cmLocalVisualStudio6Generator::WriteDSPEndGroup(std::ostream& fout)
 
 void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
                                                  const std::string& libName,
-                                                 cmTarget& target)
+                                                 cmGeneratorTarget *target)
 {
   std::string root= this->Makefile->GetRequiredDefinition("CMAKE_ROOT");
   const char *def=
@@ -747,7 +741,7 @@ void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
       this->DSPFooterTemplate += "/DLLFooter.dsptemplate";
       break;
     case EXECUTABLE:
-      if ( target.GetPropertyAsBool("WIN32_EXECUTABLE") )
+      if ( target->GetPropertyAsBool("WIN32_EXECUTABLE") )
         {
         this->DSPHeaderTemplate = root;
         this->DSPHeaderTemplate += "/EXEWinHeader.dsptemplate";
@@ -799,19 +793,16 @@ void cmLocalVisualStudio6Generator::SetBuildType(BuildType b,
 
 //----------------------------------------------------------------------------
 cmsys::auto_ptr<cmCustomCommand>
-cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
+cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmGeneratorTarget* target,
                                                     const std::string& config)
 {
   cmsys::auto_ptr<cmCustomCommand> pcc;
 
   // VS6 forgets to create the output directory for archives if it
   // differs from the intermediate directory.
-  if(target.GetType() != cmState::STATIC_LIBRARY) { return pcc; }
-
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
+  if(target->GetType() != cmState::STATIC_LIBRARY) { return pcc; }
 
-  std::string outDir = gt->GetDirectory(config, false);
+  std::string outDir = target->GetDirectory(config, false);
 
   // Add a pre-link event to create the directory.
   cmCustomCommandLine command;
@@ -833,11 +824,11 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target,
 
 // look for custom rules on a target and collect them together
 std::string
-cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
+cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
                                               const std::string& configName,
                                               const std::string& /* libName */)
 {
-  if (target.GetType() >= cmState::UTILITY )
+  if (target->GetType() >= cmState::UTILITY )
     {
     return "";
     }
@@ -847,10 +838,10 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
 
   // Write the pre-build and pre-link together (VS6 does not support both).
   event.Start("PreLink");
-  event.Write(target.GetPreBuildCommands());
-  event.Write(target.GetPreLinkCommands());
+  event.Write(target->Target->GetPreBuildCommands());
+  event.Write(target->Target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
-    this->MaybeCreateImplibDir(target, configName, false));
+    this->MaybeCreateImplibDir(*target->Target, configName, false));
   if(pcc.get())
     {
     event.Write(*pcc);
@@ -864,7 +855,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target,
 
   // Write the post-build rules.
   event.Start("PostBuild");
-  event.Write(target.GetPostBuildCommands());
+  event.Write(target->Target->GetPostBuildCommands());
   event.Finish();
 
   customRuleCode += "# End Special Build Tool\n";
@@ -883,7 +874,8 @@ inline std::string removeQuotes(const std::string& s)
 
 
 std::string
-cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
+cmLocalVisualStudio6Generator::GetTargetIncludeOptions(
+        cmGeneratorTarget *target,
                                                   const std::string& config)
 {
   std::string includeOptions;
@@ -894,12 +886,10 @@ cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
   unsigned int maxIncludeLength = 3000;
   bool useShortPath = false;
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   for(int j=0; j < 2; ++j)
     {
     std::vector<std::string> includes;
-    this->GetIncludeDirectories(includes, gt, "C", config);
+    this->GetIncludeDirectories(includes, target, "C", config);
 
     std::vector<std::string>::iterator i;
     for(i = includes.begin(); i != includes.end(); ++i)
@@ -947,11 +937,11 @@ cmLocalVisualStudio6Generator::GetTargetIncludeOptions(cmTarget &target,
 
 void cmLocalVisualStudio6Generator
 ::WriteDSPHeader(std::ostream& fout,
-                 const std::string& libName, cmTarget &target,
+                 const std::string& libName, cmGeneratorTarget* target,
                  std::vector<cmSourceGroup> &)
 {
-  bool targetBuilds = (target.GetType() >= cmState::EXECUTABLE &&
-                       target.GetType() <= cmState::MODULE_LIBRARY);
+  bool targetBuilds = (target->GetType() >= cmState::EXECUTABLE &&
+                       target->GetType() <= cmState::MODULE_LIBRARY);
 #ifdef CM_USE_OLD_VS6
   // Lookup the library and executable output directories.
   std::string libPath;
@@ -1061,7 +1051,8 @@ void cmLocalVisualStudio6Generator
       }
     }
   std::vector<std::string>::const_iterator i;
-  const std::vector<std::string>& libdirs = target.GetLinkDirectories();
+  const std::vector<std::string>& libdirs =
+      target->Target->GetLinkDirectories();
   for(i = libdirs.begin(); i != libdirs.end(); ++i)
     {
     std::string path = *i;
@@ -1103,19 +1094,19 @@ void cmLocalVisualStudio6Generator
     }
   // find link libraries
   const cmTarget::LinkLibraryVectorType& libs =
-    target.GetLinkLibrariesForVS6();
+    target->Target->GetLinkLibrariesForVS6();
   cmTarget::LinkLibraryVectorType::const_iterator j;
   for(j = libs.begin(); j != libs.end(); ++j)
     {
     // add libraries to executables and dlls (but never include
     // a library in a library, bad recursion)
     // NEVER LINK STATIC LIBRARIES TO OTHER STATIC LIBRARIES
-    if ((target.GetType() != cmState::SHARED_LIBRARY
-         && target.GetType() != cmState::STATIC_LIBRARY
-         && target.GetType() != cmState::MODULE_LIBRARY) ||
-        (target.GetType()==cmState::SHARED_LIBRARY
+    if ((target->GetType() != cmState::SHARED_LIBRARY
+         && target->GetType() != cmState::STATIC_LIBRARY
+         && target->GetType() != cmState::MODULE_LIBRARY) ||
+        (target->GetType()==cmState::SHARED_LIBRARY
          && libName != GetVS6TargetName(j->first)) ||
-        (target.GetType()==cmState::MODULE_LIBRARY
+        (target->GetType()==cmState::MODULE_LIBRARY
          && libName != GetVS6TargetName(j->first)))
       {
       // Compute the proper name to use to link this library.
@@ -1197,7 +1188,7 @@ void cmLocalVisualStudio6Generator
   std::string extraLinkOptionsRelease;
   std::string extraLinkOptionsMinSizeRel;
   std::string extraLinkOptionsRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
@@ -1210,7 +1201,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(target->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
@@ -1223,7 +1214,7 @@ void cmLocalVisualStudio6Generator
     extraLinkOptionsRelWithDebInfo = this->Makefile->
       GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO");
     }
-  if(target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptions = this->Makefile->
       GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
@@ -1238,63 +1229,61 @@ void cmLocalVisualStudio6Generator
     }
 
   // Get extra linker options for this target.
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS"))
     {
     extraLinkOptions += " ";
     extraLinkOptions += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_DEBUG"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_DEBUG"))
     {
     extraLinkOptionsDebug += " ";
     extraLinkOptionsDebug += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_RELEASE"))
+  if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_RELEASE"))
     {
     extraLinkOptionsRelease += " ";
     extraLinkOptionsRelease += targetLinkFlags;
     }
 
-  if(const char* targetLinkFlags = target.GetProperty("LINK_FLAGS_MINSIZEREL"))
+  if(const char* targetLinkFlags =
+     target->GetProperty("LINK_FLAGS_MINSIZEREL"))
     {
     extraLinkOptionsMinSizeRel += " ";
     extraLinkOptionsMinSizeRel += targetLinkFlags;
     }
 
   if(const char* targetLinkFlags =
-     target.GetProperty("LINK_FLAGS_RELWITHDEBINFO"))
+     target->GetProperty("LINK_FLAGS_RELWITHDEBINFO"))
     {
     extraLinkOptionsRelWithDebInfo += " ";
     extraLinkOptionsRelWithDebInfo += targetLinkFlags;
     }
 
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
-
   // Get standard libraries for this language.
   if(targetBuilds)
     {
     // Get the language to use for linking.
     std::vector<std::string> configs;
-    target.GetMakefile()->GetConfigurations(configs);
+    target->Target->GetMakefile()->GetConfigurations(configs);
     std::vector<std::string>::const_iterator it = configs.begin();
-    const std::string& linkLanguage = gt->GetLinkerLanguage(*it);
+    const std::string& linkLanguage = target->GetLinkerLanguage(*it);
     for ( ; it != configs.end(); ++it)
       {
-      const std::string& configLinkLanguage = gt->GetLinkerLanguage(*it);
+      const std::string& configLinkLanguage = target->GetLinkerLanguage(*it);
       if (configLinkLanguage != linkLanguage)
         {
         cmSystemTools::Error
           ("Linker language must not vary by configuration for target: ",
-          target.GetName().c_str());
+          target->GetName().c_str());
         }
       }
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
         ("CMake can not determine linker language for target: ",
-         target.GetName().c_str());
+         target->GetName().c_str());
       return;
       }
 
@@ -1315,13 +1304,13 @@ void cmLocalVisualStudio6Generator
 
   // Compute version number information.
   std::string targetVersionFlag;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     int major;
     int minor;
-    gt->GetTargetVersion(major, minor);
+    target->GetTargetVersion(major, minor);
     std::ostringstream targetVersionStream;
     targetVersionStream << "/version:" << major << "." << minor;
     targetVersionFlag = targetVersionStream.str();
@@ -1334,20 +1323,20 @@ void cmLocalVisualStudio6Generator
   std::string outputNameRelease = outputName;
   std::string outputNameMinSizeRel = outputName;
   std::string outputNameRelWithDebInfo = outputName;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::STATIC_LIBRARY ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
-    outputName = gt->GetFullName();
-    outputNameDebug = gt->GetFullName("Debug");
-    outputNameRelease = gt->GetFullName("Release");
-    outputNameMinSizeRel = gt->GetFullName("MinSizeRel");
-    outputNameRelWithDebInfo = gt->GetFullName("RelWithDebInfo");
+    outputName = target->GetFullName();
+    outputNameDebug = target->GetFullName("Debug");
+    outputNameRelease = target->GetFullName("Release");
+    outputNameMinSizeRel = target->GetFullName("MinSizeRel");
+    outputNameRelWithDebInfo = target->GetFullName("RelWithDebInfo");
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(target->GetType() == cmState::OBJECT_LIBRARY)
     {
-    outputName = target.GetName();
+    outputName = target->GetName();
     outputName += ".lib";
     outputNameDebug = outputName;
     outputNameRelease = outputName;
@@ -1361,30 +1350,30 @@ void cmLocalVisualStudio6Generator
   std::string outputDirRelease;
   std::string outputDirMinSizeRel;
   std::string outputDirRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::STATIC_LIBRARY ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
 #ifdef CM_USE_OLD_VS6
     outputDirOld =
       removeQuotes(this->ConvertToOutputFormat
-                   (gt->GetDirectory().c_str(), SHELL));
+                   (target->GetDirectory().c_str(), SHELL));
 #endif
     outputDirDebug =
         removeQuotes(this->ConvertToOutputFormat(
-                       gt->GetDirectory("Debug").c_str(), SHELL));
+                       target->GetDirectory("Debug").c_str(), SHELL));
     outputDirRelease =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("Release").c_str(), SHELL));
+                 target->GetDirectory("Release").c_str(), SHELL));
     outputDirMinSizeRel =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("MinSizeRel").c_str(), SHELL));
+                 target->GetDirectory("MinSizeRel").c_str(), SHELL));
     outputDirRelWithDebInfo =
         removeQuotes(this->ConvertToOutputFormat(
-                 gt->GetDirectory("RelWithDebInfo").c_str(), SHELL));
+                 target->GetDirectory("RelWithDebInfo").c_str(), SHELL));
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(target->GetType() == cmState::OBJECT_LIBRARY)
     {
     std::string outputDir = cmake::GetCMakeFilesDirectoryPostSlash();
     outputDirDebug = outputDir + "Debug";
@@ -1398,9 +1387,9 @@ void cmLocalVisualStudio6Generator
   std::string optionsRelease;
   std::string optionsMinSizeRel;
   std::string optionsRelWithDebInfo;
-  if(target.GetType() == cmState::EXECUTABLE ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY)
+  if(target->GetType() == cmState::EXECUTABLE ||
+     target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsDebug =
       extraLinkOptions + " " + extraLinkOptionsDebug;
@@ -1426,24 +1415,24 @@ void cmLocalVisualStudio6Generator
   std::string targetImplibFlagRelease;
   std::string targetImplibFlagMinSizeRel;
   std::string targetImplibFlagRelWithDebInfo;
-  if(target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY ||
-     target.GetType() == cmState::EXECUTABLE)
+  if(target->GetType() == cmState::SHARED_LIBRARY ||
+     target->GetType() == cmState::MODULE_LIBRARY ||
+     target->GetType() == cmState::EXECUTABLE)
     {
-    std::string fullPathImpDebug = gt->GetDirectory("Debug", true);
-    std::string fullPathImpRelease = gt->GetDirectory("Release", true);
+    std::string fullPathImpDebug = target->GetDirectory("Debug", true);
+    std::string fullPathImpRelease = target->GetDirectory("Release", true);
     std::string fullPathImpMinSizeRel =
-      gt->GetDirectory("MinSizeRel", true);
+      target->GetDirectory("MinSizeRel", true);
     std::string fullPathImpRelWithDebInfo =
-      gt->GetDirectory("RelWithDebInfo", true);
+      target->GetDirectory("RelWithDebInfo", true);
     fullPathImpDebug += "/";
     fullPathImpRelease += "/";
     fullPathImpMinSizeRel += "/";
     fullPathImpRelWithDebInfo += "/";
-    fullPathImpDebug += gt->GetFullName("Debug", true);
-    fullPathImpRelease += gt->GetFullName("Release", true);
-    fullPathImpMinSizeRel += gt->GetFullName("MinSizeRel", true);
-    fullPathImpRelWithDebInfo += gt->GetFullName("RelWithDebInfo", true);
+    fullPathImpDebug += target->GetFullName("Debug", true);
+    fullPathImpRelease += target->GetFullName("Release", true);
+    fullPathImpMinSizeRel += target->GetFullName("MinSizeRel", true);
+    fullPathImpRelWithDebInfo += target->GetFullName("RelWithDebInfo", true);
 
     targetImplibFlagDebug = "/implib:";
     targetImplibFlagRelease = "/implib:";
@@ -1496,7 +1485,7 @@ void cmLocalVisualStudio6Generator
   std::string staticLibOptionsRelease;
   std::string staticLibOptionsMinSizeRel;
   std::string staticLibOptionsRelWithDebInfo;
-  if(target.GetType() == cmState::STATIC_LIBRARY )
+  if(target->GetType() == cmState::STATIC_LIBRARY )
     {
     const char *libflagsGlobal =
       this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS");
@@ -1515,7 +1504,7 @@ void cmLocalVisualStudio6Generator
     this->AppendFlags(staticLibOptionsRelWithDebInfo, this->Makefile->
       GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO"));
 
-    const char *libflags = target.GetProperty("STATIC_LIBRARY_FLAGS");
+    const char *libflags = target->GetProperty("STATIC_LIBRARY_FLAGS");
     this->AppendFlags(staticLibOptions, libflags);
     this->AppendFlags(staticLibOptionsDebug, libflags);
     this->AppendFlags(staticLibOptionsRelease, libflags);
@@ -1523,13 +1512,13 @@ void cmLocalVisualStudio6Generator
     this->AppendFlags(staticLibOptionsRelWithDebInfo, libflags);
 
     this->AppendFlags(staticLibOptionsDebug,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_DEBUG"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_DEBUG"));
     this->AppendFlags(staticLibOptionsRelease,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_RELEASE"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_RELEASE"));
     this->AppendFlags(staticLibOptionsMinSizeRel,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_MINSIZEREL"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_MINSIZEREL"));
     this->AppendFlags(staticLibOptionsRelWithDebInfo,
-      target.GetProperty("STATIC_LIBRARY_FLAGS_RELWITHDEBINFO"));
+      target->GetProperty("STATIC_LIBRARY_FLAGS_RELWITHDEBINFO"));
 
     std::string objects;
     this->OutputObjects(target, "LIB", objects);
@@ -1545,7 +1534,7 @@ void cmLocalVisualStudio6Generator
 
   // Add the export symbol definition for shared library objects.
   std::string exportSymbol;
-  if(const char* exportMacro = gt->GetExportMacro())
+  if(const char* exportMacro = target->GetExportMacro())
     {
     exportSymbol = exportMacro;
     }
@@ -1569,8 +1558,8 @@ void cmLocalVisualStudio6Generator
                                  libnameExports.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_MFC_FLAG",
                                  mfcFlag);
-    if(target.GetType() == cmState::STATIC_LIBRARY ||
-       target.GetType() == cmState::OBJECT_LIBRARY)
+    if(target->GetType() == cmState::STATIC_LIBRARY ||
+       target->GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "CM_STATIC_LIB_ARGS_DEBUG",
                                    staticLibOptionsDebug.c_str());
@@ -1676,7 +1665,7 @@ void cmLocalVisualStudio6Generator
                     (exePath.c_str(), SHELL)).c_str());
 #endif
 
-    if(targetBuilds || target.GetType() == cmState::OBJECT_LIBRARY)
+    if(targetBuilds || target->GetType() == cmState::OBJECT_LIBRARY)
       {
       cmSystemTools::ReplaceString(line, "OUTPUT_DIRECTORY_DEBUG",
                                    outputDirDebug.c_str());
@@ -1700,8 +1689,8 @@ void cmLocalVisualStudio6Generator
       = this->Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX");
     cmSystemTools::ReplaceString(line, "DEBUG_POSTFIX",
                                  debugPostfix?debugPostfix:"");
-    if(target.GetType() >= cmState::EXECUTABLE &&
-       target.GetType() <= cmState::OBJECT_LIBRARY)
+    if(target->GetType() >= cmState::EXECUTABLE &&
+       target->GetType() <= cmState::OBJECT_LIBRARY)
       {
       // store flags for each configuration
       std::string flags = " ";
@@ -1710,24 +1699,24 @@ void cmLocalVisualStudio6Generator
       std::string flagsDebug = " ";
       std::string flagsRelWithDebInfo = " ";
       std::vector<std::string> configs;
-      target.GetMakefile()->GetConfigurations(configs);
+      target->Target->GetMakefile()->GetConfigurations(configs);
       std::vector<std::string>::const_iterator it = configs.begin();
-      const std::string& linkLanguage = gt->GetLinkerLanguage(*it);
+      const std::string& linkLanguage = target->GetLinkerLanguage(*it);
       for ( ; it != configs.end(); ++it)
         {
-        const std::string& configLinkLanguage = gt->GetLinkerLanguage(*it);
+        const std::string& configLinkLanguage = target->GetLinkerLanguage(*it);
         if (configLinkLanguage != linkLanguage)
           {
           cmSystemTools::Error
             ("Linker language must not vary by configuration for target: ",
-            target.GetName().c_str());
+            target->GetName().c_str());
           }
         }
       if(linkLanguage.empty())
         {
         cmSystemTools::Error
           ("CMake can not determine linker language for target: ",
-           target.GetName().c_str());
+           target->GetName().c_str());
         return;
         }
       // if CXX is on and the target contains cxx code then add the cxx flags
@@ -1752,12 +1741,12 @@ void cmLocalVisualStudio6Generator
       flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
       flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
 
-      this->AddCompileOptions(flags, gt, linkLanguage, "");
-      this->AddCompileOptions(flagsDebug, gt, linkLanguage, "Debug");
-      this->AddCompileOptions(flagsRelease, gt, linkLanguage, "Release");
-      this->AddCompileOptions(flagsMinSizeRel, gt, linkLanguage,
+      this->AddCompileOptions(flags, target, linkLanguage, "");
+      this->AddCompileOptions(flagsDebug, target, linkLanguage, "Debug");
+      this->AddCompileOptions(flagsRelease, target, linkLanguage, "Release");
+      this->AddCompileOptions(flagsMinSizeRel, target, linkLanguage,
                               "MinSizeRel");
-      this->AddCompileOptions(flagsRelWithDebInfo, gt, linkLanguage,
+      this->AddCompileOptions(flagsRelWithDebInfo, target, linkLanguage,
                               "RelWithDebInfo");
 
       // if _UNICODE and _SBCS are not found, then add -D_MBCS
@@ -1777,14 +1766,14 @@ void cmLocalVisualStudio6Generator
       std::set<std::string> minsizeDefinesSet;
       std::set<std::string> debugrelDefinesSet;
 
-      this->AddCompileDefinitions(definesSet, gt, "", linkLanguage);
-      this->AddCompileDefinitions(debugDefinesSet, gt,
+      this->AddCompileDefinitions(definesSet, target, "", linkLanguage);
+      this->AddCompileDefinitions(debugDefinesSet, target,
                                   "DEBUG", linkLanguage);
-      this->AddCompileDefinitions(releaseDefinesSet, gt,
+      this->AddCompileDefinitions(releaseDefinesSet, target,
                                   "RELEASE", linkLanguage);
-      this->AddCompileDefinitions(minsizeDefinesSet, gt,
+      this->AddCompileDefinitions(minsizeDefinesSet, target,
                                   "MINSIZEREL", linkLanguage);
-      this->AddCompileDefinitions(debugrelDefinesSet, gt,
+      this->AddCompileDefinitions(debugrelDefinesSet, target,
                                   "RELWITHDEBINFO", linkLanguage);
 
       std::string defines = " ";
@@ -1852,15 +1841,13 @@ void cmLocalVisualStudio6Generator::WriteDSPFooter(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio6Generator
-::ComputeLinkOptions(cmTarget& target,
+::ComputeLinkOptions(cmGeneratorTarget *target,
                      const std::string& configName,
                      const std::string extraOptions,
                      std::string& options)
 {
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   // Compute the link information for this configuration.
-  cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
+  cmComputeLinkInformation* pcli = target->GetLinkInformation(configName);
   if(!pcli)
     {
     return;
@@ -1919,15 +1906,13 @@ void cmLocalVisualStudio6Generator
 
 //----------------------------------------------------------------------------
 void cmLocalVisualStudio6Generator
-::OutputObjects(cmTarget& target, const char* tool,
+::OutputObjects(cmGeneratorTarget* target, const char* tool,
                 std::string& options)
 {
   // VS 6 does not support per-config source locations so we
   // list object library content on the link line instead.
-  cmGeneratorTarget* gt =
-    this->GlobalGenerator->GetGeneratorTarget(&target);
   std::vector<std::string> objs;
-  gt->UseObjectLibraries(objs, "");
+  target->UseObjectLibraries(objs, "");
   for(std::vector<std::string>::const_iterator
         oi = objs.begin(); oi != objs.end(); ++oi)
     {
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index b3b61bb..4772d54 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -14,7 +14,6 @@
 
 #include "cmLocalVisualStudioGenerator.h"
 
-class cmTarget;
 class cmSourceFile;
 class cmSourceGroup;
 class cmCustomCommand;
@@ -47,7 +46,7 @@ public:
   /**
    * Specify the type of the build: static, dll, or executable.
    */
-  void SetBuildType(BuildType, const std::string& libName, cmTarget&);
+  void SetBuildType(BuildType, const std::string& libName, cmGeneratorTarget*);
 
   virtual
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
@@ -56,41 +55,42 @@ private:
   std::string DSPHeaderTemplate;
   std::string DSPFooterTemplate;
 
-  void CreateSingleDSP(const std::string& lname, cmTarget &tgt);
+  void CreateSingleDSP(const std::string& lname, cmGeneratorTarget* tgt);
   void WriteDSPFile(std::ostream& fout, const std::string& libName,
-                    cmTarget &tgt);
+                    cmGeneratorTarget* tgt);
   void WriteDSPBeginGroup(std::ostream& fout,
                           const char* group,
                           const char* filter);
   void WriteDSPEndGroup(std::ostream& fout);
 
   void WriteDSPHeader(std::ostream& fout, const std::string& libName,
-                      cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
+                      cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
 
   void WriteDSPFooter(std::ostream& fout);
-  void AddDSPBuildRule(cmTarget& tgt);
+  void AddDSPBuildRule(cmGeneratorTarget* tgt);
   void WriteCustomRule(std::ostream& fout,
                        const char* source,
                        const cmCustomCommand& command,
                        const char* flags);
-  void AddUtilityCommandHack(cmTarget& target, int count,
+  void AddUtilityCommandHack(cmGeneratorTarget* target, int count,
                              std::vector<std::string>& depends,
                              const cmCustomCommand& origCommand);
-  void WriteGroup(const cmSourceGroup *sg, cmTarget& target,
+  void WriteGroup(const cmSourceGroup *sg, cmGeneratorTarget* target,
                   std::ostream &fout, const std::string& libName);
   class EventWriter;
   friend class EventWriter;
   cmsys::auto_ptr<cmCustomCommand>
-  MaybeCreateOutputDir(cmTarget& target, const std::string& config);
-  std::string CreateTargetRules(cmTarget &target,
+  MaybeCreateOutputDir(cmGeneratorTarget *target, const std::string& config);
+  std::string CreateTargetRules(cmGeneratorTarget* target,
                                 const std::string& configName,
                                 const std::string& libName);
-  void ComputeLinkOptions(cmTarget& target, const std::string& configName,
+  void ComputeLinkOptions(cmGeneratorTarget* target,
+                          const std::string& configName,
                           const std::string extraOptions,
                           std::string& options);
-  void OutputObjects(cmTarget& target, const char* tool,
+  void OutputObjects(cmGeneratorTarget* target, const char* tool,
                      std::string& options);
-  std::string GetTargetIncludeOptions(cmTarget &target,
+  std::string GetTargetIncludeOptions(cmGeneratorTarget* target,
                                       const std::string& config);
   std::vector<std::string> Configurations;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0ebd69b52dea77c5d8c718bcb7ba0c75ceb9d5f
commit a0ebd69b52dea77c5d8c718bcb7ba0c75ceb9d5f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:49:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:55 2015 +0200

    Graphviz: Port to cmGeneratorTarget.

diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index cc36c62..a63b6e3 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -17,7 +17,7 @@
 
 
 
-static const char* getShapeForTarget(const cmTarget* target)
+static const char* getShapeForTarget(const cmGeneratorTarget* target)
 {
   if (!target)
     {
@@ -163,7 +163,7 @@ void cmGraphVizWriter::WriteTargetDependersFiles(const char* fileName)
 
   this->CollectTargetsAndLibs();
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -214,7 +214,7 @@ void cmGraphVizWriter::WritePerTargetFiles(const char* fileName)
 
   this->CollectTargetsAndLibs();
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -268,7 +268,7 @@ void cmGraphVizWriter::WriteGlobalFile(const char* fileName)
   std::set<std::string> insertedConnections;
   std::set<std::string> insertedNodes;
 
-  for(std::map<std::string, const cmTarget*>::const_iterator ptrIt =
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator ptrIt =
                                                       this->TargetPtrs.begin();
       ptrIt != this->TargetPtrs.end();
       ++ptrIt)
@@ -308,8 +308,8 @@ void cmGraphVizWriter::WriteConnections(const std::string& targetName,
                                     std::set<std::string>& insertedConnections,
                                     cmGeneratedFileStream& str) const
 {
-  std::map<std::string, const cmTarget* >::const_iterator targetPtrIt =
-                                             this->TargetPtrs.find(targetName);
+  std::map<std::string, const cmGeneratorTarget* >::const_iterator targetPtrIt
+      = this->TargetPtrs.find(targetName);
 
   if (targetPtrIt == this->TargetPtrs.end())  // not found at all
     {
@@ -327,7 +327,7 @@ void cmGraphVizWriter::WriteConnections(const std::string& targetName,
   std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
 
   const cmTarget::LinkLibraryVectorType* ll =
-                            &(targetPtrIt->second->GetOriginalLinkLibraries());
+      &(targetPtrIt->second->Target->GetOriginalLinkLibraries());
 
   for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
        llit != ll->end();
@@ -367,8 +367,8 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
                                     std::set<std::string>& insertedConnections,
                                     cmGeneratedFileStream& str) const
 {
-  std::map<std::string, const cmTarget* >::const_iterator targetPtrIt =
-                                             this->TargetPtrs.find(targetName);
+  std::map<std::string, const cmGeneratorTarget* >::const_iterator targetPtrIt
+      = this->TargetPtrs.find(targetName);
 
   if (targetPtrIt == this->TargetPtrs.end())  // not found at all
     {
@@ -386,8 +386,8 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
   std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
 
   // now search who links against me
-  for(std::map<std::string, const cmTarget*>::const_iterator dependerIt =
-                                                      this->TargetPtrs.begin();
+  for(std::map<std::string, const cmGeneratorTarget*>::const_iterator
+      dependerIt = this->TargetPtrs.begin();
       dependerIt != this->TargetPtrs.end();
       ++dependerIt)
     {
@@ -404,7 +404,7 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
     // Now we have a target, check whether it links against targetName.
     // If so, draw a connection, and then continue with dependers on that one.
     const cmTarget::LinkLibraryVectorType* ll =
-                            &(dependerIt->second->GetOriginalLinkLibraries());
+        &(dependerIt->second->Target->GetOriginalLinkLibraries());
 
     for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
          llit != ll->end();
@@ -448,7 +448,7 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
 
 
 void cmGraphVizWriter::WriteNode(const std::string& targetName,
-                                 const cmTarget* target,
+                                 const cmGeneratorTarget* target,
                                  std::set<std::string>& insertedNodes,
                                  cmGeneratedFileStream& str) const
 {
@@ -488,12 +488,11 @@ int cmGraphVizWriter::CollectAllTargets()
        lit != this->LocalGenerators.end();
        ++ lit )
     {
-    const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
-    for ( cmTargets::const_iterator tit = targets->begin();
-          tit != targets->end();
-          ++ tit )
+    std::vector<cmGeneratorTarget*> targets = (*lit)->GetGeneratorTargets();
+    for ( std::vector<cmGeneratorTarget*>::const_iterator it =
+          targets.begin(); it != targets.end(); ++it )
       {
-      const char* realTargetName = tit->first.c_str();
+      const char* realTargetName = (*it)->GetName().c_str();
       if(this->IgnoreThisTarget(realTargetName))
         {
         // Skip ignored targets
@@ -503,7 +502,7 @@ int cmGraphVizWriter::CollectAllTargets()
       std::ostringstream ostr;
       ostr << this->GraphNodePrefix << cnt++;
       this->TargetNamesNodes[realTargetName] = ostr.str();
-      this->TargetPtrs[realTargetName] = &tit->second;
+      this->TargetPtrs[realTargetName] = *it;
       }
     }
 
@@ -519,19 +518,18 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
        lit != this->LocalGenerators.end();
        ++ lit )
     {
-    const cmTargets* targets = &((*lit)->GetMakefile()->GetTargets());
-    for ( cmTargets::const_iterator tit = targets->begin();
-          tit != targets->end();
-          ++ tit )
+    std::vector<cmGeneratorTarget*> targets = (*lit)->GetGeneratorTargets();
+    for ( std::vector<cmGeneratorTarget*>::const_iterator it =
+          targets.begin(); it != targets.end(); ++it )
       {
-      const char* realTargetName = tit->first.c_str();
+      const char* realTargetName = (*it)->GetName().c_str();
       if (this->IgnoreThisTarget(realTargetName))
         {
         // Skip ignored targets
         continue;
         }
       const cmTarget::LinkLibraryVectorType* ll =
-                                     &(tit->second.GetOriginalLinkLibraries());
+          &((*it)->Target->GetOriginalLinkLibraries());
       for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
            llit != ll->end();
            ++ llit )
@@ -543,8 +541,8 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
           continue;
           }
 
-        std::map<std::string, const cmTarget*>::const_iterator tarIt =
-                                                this->TargetPtrs.find(libName);
+        std::map<std::string, const cmGeneratorTarget*>::const_iterator tarIt
+            = this->TargetPtrs.find(libName);
         if ( tarIt == this->TargetPtrs.end() )
           {
           std::ostringstream ostr;
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 0a20e6e..90d31d3 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -14,9 +14,9 @@
 #include "cmStandardIncludes.h"
 #include "cmLocalGenerator.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include <cmsys/RegularExpression.hxx>
 
+class cmGeneratorTarget;
 
 /** This class implements writing files for graphviz (dot) for graphs
  * representing the dependencies between the targets in the project. */
@@ -54,7 +54,8 @@ protected:
                                 std::set<std::string>& insertedConnections,
                                 cmGeneratedFileStream& str) const;
 
-  void WriteNode(const std::string& targetName, const cmTarget* target,
+  void WriteNode(const std::string& targetName,
+                 const cmGeneratorTarget* target,
                  std::set<std::string>& insertedNodes,
                  cmGeneratedFileStream& str) const;
 
@@ -73,7 +74,7 @@ protected:
 
   const std::vector<cmLocalGenerator*>& LocalGenerators;
 
-  std::map<std::string, const cmTarget*> TargetPtrs;
+  std::map<std::string, const cmGeneratorTarget*> TargetPtrs;
   // maps from the actual target names to node names in dot:
   std::map<std::string, std::string> TargetNamesNodes;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcee21ceb733d7e6d12d85346d8e683399cc4fc4
commit bcee21ceb733d7e6d12d85346d8e683399cc4fc4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:38:24 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:55 2015 +0200

    C::B: Port API to cmGeneratorTarget.

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index a71b1cb..597c9d8 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -17,7 +17,6 @@
 #include "cmake.h"
 #include "cmSourceFile.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include "cmSystemTools.h"
 #include "cmXMLSafe.h"
 
@@ -441,7 +440,7 @@ void cmExtraCodeBlocksGenerator
               }
 
             CbpUnit &cbpUnit = allFiles[fullPath];
-            cbpUnit.Targets.push_back((*ti)->Target);
+            cbpUnit.Targets.push_back(*ti);
             }
           }
         default:  // intended fallthrough
@@ -501,8 +500,9 @@ void cmExtraCodeBlocksGenerator
 
     fout<<"      <Unit filename=\""<< cmXMLSafe(unitFilename) <<"\">\n";
 
-    for(std::vector<const cmTarget*>::const_iterator ti = unit.Targets.begin();
-      ti != unit.Targets.end(); ++ti)
+    for(std::vector<const cmGeneratorTarget*>::const_iterator ti =
+        unit.Targets.begin();
+        ti != unit.Targets.end(); ++ti)
       {
       std::string const& targetName = (*ti)->GetName();
       fout<<"         <Option target=\""<< cmXMLSafe(targetName) <<"\"/>\n";
@@ -560,7 +560,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   fout<<"      <Target title=\"" << targetName << "\">\n";
   if (target!=0)
     {
-    int cbTargetType = this->GetCBTargetType(target->Target);
+    int cbTargetType = this->GetCBTargetType(target);
     std::string workingDir = lg->GetCurrentBinaryDirectory();
     if ( target->GetType()==cmState::EXECUTABLE)
       {
@@ -718,7 +718,7 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
 
 
 // Translate the cmake target type into the CodeBlocks target type id
-int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
+int cmExtraCodeBlocksGenerator::GetCBTargetType(cmGeneratorTarget* target)
 {
   if ( target->GetType()==cmState::EXECUTABLE)
     {
diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h
index f28809a..0c3846d 100644
--- a/Source/cmExtraCodeBlocksGenerator.h
+++ b/Source/cmExtraCodeBlocksGenerator.h
@@ -18,7 +18,6 @@
 class cmLocalGenerator;
 class cmMakefile;
 class cmGeneratorTarget;
-class cmTarget;
 class cmGeneratedFileStream;
 
 /** \class cmExtraCodeBlocksGenerator
@@ -42,7 +41,7 @@ public:
 private:
   struct CbpUnit
   {
-    std::vector<const cmTarget*> Targets;
+    std::vector<const cmGeneratorTarget*> Targets;
   };
 
   void CreateProjectFile(const std::vector<cmLocalGenerator*>& lgs);
@@ -53,7 +52,7 @@ private:
                                     cmGeneratorTarget* target) const;
 
   std::string GetCBCompilerId(const cmMakefile* mf);
-  int GetCBTargetType(cmTarget* target);
+  int GetCBTargetType(cmGeneratorTarget* target);
   std::string BuildMakeCommand(const std::string& make, const char* makefile,
                                const std::string& target);
   void AppendTarget(cmGeneratedFileStream& fout,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f
commit b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:31:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:55 2015 +0200

    GHS: Port to cmGeneratorTarget.

diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 01e6f8c..12115be 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -22,23 +22,22 @@
 std::string const cmGhsMultiTargetGenerator::DDOption("-dynamic");
 
 cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target)
-  : Target(target->Target)
-  , GeneratorTarget(target)
+  : GeneratorTarget(target)
   , LocalGenerator(static_cast<cmLocalGhsMultiGenerator *>(
                      target->GetLocalGenerator()))
   , Makefile(target->Target->GetMakefile())
   , TargetGroup(DetermineIfTargetGroup(target))
   , DynamicDownload(false)
 {
-  this->RelBuildFilePath = this->GetRelBuildFilePath(target->Target);
+  this->RelBuildFilePath = this->GetRelBuildFilePath(target);
 
   this->RelOutputFileName =
-    this->RelBuildFilePath + this->Target->GetName() + ".a";
+    this->RelBuildFilePath + target->GetName() + ".a";
 
   this->RelBuildFileName = this->RelBuildFilePath;
-  this->RelBuildFileName += this->GetBuildFileName(target->Target);
+  this->RelBuildFileName += this->GetBuildFileName(target);
 
-  std::string absPathToRoot = this->GetAbsPathToRoot(target->Target);
+  std::string absPathToRoot = this->GetAbsPathToRoot(target);
   absPathToRoot = this->AddSlashIfNeededToPath(absPathToRoot);
   this->AbsBuildFilePath = absPathToRoot + this->RelBuildFilePath;
   this->AbsBuildFileName = absPathToRoot + this->RelBuildFileName;
@@ -51,7 +50,8 @@ cmGhsMultiTargetGenerator::~cmGhsMultiTargetGenerator()
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetRelBuildFilePath(
+        const cmGeneratorTarget *target)
 {
   std::string output;
   char const *folderProp = target->GetProperty("FOLDER");
@@ -66,15 +66,13 @@ cmGhsMultiTargetGenerator::GetRelBuildFilePath(const cmTarget *target)
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetAbsPathToRoot(const cmGeneratorTarget *target)
 {
-  cmGeneratorTarget* gt = target->GetMakefile()->GetGlobalGenerator()
-      ->GetGeneratorTarget(target);
-  return gt->GetLocalGenerator()->GetBinaryDirectory();
+  return target->GetLocalGenerator()->GetBinaryDirectory();
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmGeneratorTarget *target)
 {
   std::string output;
   output = cmGhsMultiTargetGenerator::GetAbsPathToRoot(target);
@@ -84,7 +82,7 @@ cmGhsMultiTargetGenerator::GetAbsBuildFilePath(const cmTarget *target)
 }
 
 std::string
-cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmTarget *target)
+cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmGeneratorTarget *target)
 {
   std::string output;
   output = cmGhsMultiTargetGenerator::GetRelBuildFilePath(target);
@@ -93,7 +91,8 @@ cmGhsMultiTargetGenerator::GetRelBuildFileName(const cmTarget *target)
   return  output;
 }
 
-std::string cmGhsMultiTargetGenerator::GetBuildFileName(const cmTarget *target)
+std::string
+cmGhsMultiTargetGenerator::GetBuildFileName(const cmGeneratorTarget *target)
 {
   std::string output;
   output = target->GetName();
@@ -161,7 +160,8 @@ void cmGhsMultiTargetGenerator::Generate()
 bool cmGhsMultiTargetGenerator::IncludeThisTarget()
 {
   bool output = true;
-  char const *excludeFromAll = this->Target->GetProperty("EXCLUDE_FROM_ALL");
+  char const *excludeFromAll =
+      this->GeneratorTarget->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
       '\0' == excludeFromAll[1])
     {
@@ -367,13 +367,13 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
   for (cmTargetDependSet::iterator tdsI = tds.begin(); tdsI != tds.end();
        ++tdsI)
     {
-    const cmTarget *tg = (*tdsI)->Target;
+    const cmGeneratorTarget *tg = *tdsI;
     *this->GetFolderBuildStreams() << "    -L\"" << GetAbsBuildFilePath(tg)
                                    << "\"" << std::endl;
     }
   // library targets
   cmTarget::LinkLibraryVectorType llv =
-    this->Target->GetOriginalLinkLibraries();
+    this->GeneratorTarget->Target->GetOriginalLinkLibraries();
   for (cmTarget::LinkLibraryVectorType::const_iterator llvI = llv.begin();
        llvI != llv.end(); ++llvI)
     {
@@ -391,10 +391,12 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
 
 void cmGhsMultiTargetGenerator::WriteCustomCommands()
 {
-  WriteCustomCommandsHelper(this->Target->GetPreBuildCommands(),
-                            cmTarget::PRE_BUILD);
-  WriteCustomCommandsHelper(this->Target->GetPostBuildCommands(),
-                            cmTarget::POST_BUILD);
+  WriteCustomCommandsHelper(
+        this->GeneratorTarget->Target->GetPreBuildCommands(),
+        cmTarget::PRE_BUILD);
+  WriteCustomCommandsHelper(
+        this->GeneratorTarget->Target->GetPostBuildCommands(),
+        cmTarget::POST_BUILD);
 }
 
 void cmGhsMultiTargetGenerator::WriteCustomCommandsHelper(
@@ -518,7 +520,7 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
   std::string outputDir(AbsBuildFilePath);
 
   const char *runtimeOutputProp =
-    this->Target->GetProperty("RUNTIME_OUTPUT_DIRECTORY");
+    this->GeneratorTarget->GetProperty("RUNTIME_OUTPUT_DIRECTORY");
   if (NULL != runtimeOutputProp)
     {
     outputDir = runtimeOutputProp;
@@ -526,7 +528,8 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
 
   std::string configCapped(cmSystemTools::UpperCase(config));
   const char *runtimeOutputSProp =
-    this->Target->GetProperty("RUNTIME_OUTPUT_DIRECTORY_" + configCapped);
+    this->GeneratorTarget
+      ->GetProperty("RUNTIME_OUTPUT_DIRECTORY_" + configCapped);
   if (NULL != runtimeOutputSProp)
     {
     outputDir = runtimeOutputSProp;
@@ -544,9 +547,10 @@ cmGhsMultiTargetGenerator::GetOutputDirectory(const std::string &config) const
 std::string
 cmGhsMultiTargetGenerator::GetOutputFilename(const std::string &config) const
 {
-  std::string outputFilename(this->Target->GetName());
+  std::string outputFilename(this->GeneratorTarget->GetName());
 
-  const char *outputNameProp = this->Target->GetProperty("OUTPUT_NAME");
+  const char *outputNameProp =
+      this->GeneratorTarget->GetProperty("OUTPUT_NAME");
   if (NULL != outputNameProp)
     {
     outputFilename = outputNameProp;
@@ -554,7 +558,7 @@ cmGhsMultiTargetGenerator::GetOutputFilename(const std::string &config) const
 
   std::string configCapped(cmSystemTools::UpperCase(config));
   const char *outputNameSProp =
-    this->Target->GetProperty(configCapped + "_OUTPUT_NAME");
+    this->GeneratorTarget->GetProperty(configCapped + "_OUTPUT_NAME");
   if (NULL != outputNameSProp)
     {
     outputFilename = outputNameSProp;
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index d1c17f4..327fdef 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -54,11 +54,11 @@ public:
     return this->AbsOutputFileName.c_str();
   }
 
-  static std::string GetRelBuildFilePath(const cmTarget *target);
-  static std::string GetAbsPathToRoot(const cmTarget *target);
-  static std::string GetAbsBuildFilePath(const cmTarget *target);
-  static std::string GetRelBuildFileName(const cmTarget *target);
-  static std::string GetBuildFileName(const cmTarget *target);
+  static std::string GetRelBuildFilePath(const cmGeneratorTarget *target);
+  static std::string GetAbsPathToRoot(const cmGeneratorTarget *target);
+  static std::string GetAbsBuildFilePath(const cmGeneratorTarget *target);
+  static std::string GetRelBuildFileName(const cmGeneratorTarget *target);
+  static std::string GetBuildFileName(const cmGeneratorTarget *target);
   static std::string AddSlashIfNeededToPath(std::string const &input);
 
 private:
@@ -99,7 +99,6 @@ private:
   bool DetermineIfDynamicDownload(std::string const &config,
                                   const std::string &language);
 
-  cmTarget *Target;
   cmGeneratorTarget* GeneratorTarget;
   cmLocalGhsMultiGenerator *LocalGenerator;
   cmMakefile *Makefile;
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 7c33904..1bcbd26 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -487,7 +487,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
        tgtsI != tgts.end(); ++tgtsI)
     {
     const cmGeneratorTarget *tgt = *tgtsI;
-    if (IsTgtForBuild(tgt->Target))
+    if (IsTgtForBuild(tgt))
       {
       char const *rawFolderName = tgt->GetProperty("FOLDER");
       if (NULL == rawFolderName)
@@ -504,7 +504,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
           GhsMultiGpj::PROJECT);
         }
       std::vector<cmsys::String> splitPath = cmSystemTools::SplitString(
-            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target));
+            cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt));
       std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" +
                                        splitPath.back());
       *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
@@ -516,13 +516,12 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
     }
 }
 
-bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt)
+bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmGeneratorTarget *tgt)
 {
   const std::string config =
-    tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
+    tgt->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
   std::vector<cmSourceFile *> tgtSources;
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
-  gt->GetSourceFiles(tgtSources, config);
+  tgt->GetSourceFiles(tgtSources, config);
   bool tgtInBuild = true;
   char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL");
   if (NULL != excludeFromAll && '1' == excludeFromAll[0] &&
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index 04a9a5b..480cd6a 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -111,7 +111,7 @@ private:
       GhsMultiGpj::Types projType);
   static std::string GetFileNameFromPath(std::string const &path);
   void UpdateBuildFiles(std::vector<cmGeneratorTarget*> tgts);
-  bool IsTgtForBuild(const cmTarget *tgt);
+  bool IsTgtForBuild(const cmGeneratorTarget *tgt);
 
   std::vector<cmGeneratedFileStream *> TargetSubProjects;
   std::map<std::string, cmGeneratedFileStream *> TargetFolderBuildStreams;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b92d0b2c94936fa438c8c92a6961b6323795d6f9
commit b92d0b2c94936fa438c8c92a6961b6323795d6f9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:53:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:54 2015 +0200

    Sublime: Port API to cmGeneratorTarget.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 47822e8..92d38b9 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -20,7 +20,6 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 
 #include <cmsys/SystemTools.hxx>
 
@@ -204,12 +203,12 @@ void cmExtraSublimeTextGenerator::
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, targetName, *lg, (*ti)->Target,
+          this->AppendTarget(fout, targetName, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           std::string fastTarget = targetName;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, *lg, (*ti)->Target,
+          this->AppendTarget(fout, fastTarget, *lg, *ti,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           }
@@ -225,7 +224,7 @@ void cmExtraSublimeTextGenerator::
   AppendTarget(cmGeneratedFileStream& fout,
                const std::string& targetName,
                cmLocalGenerator* lg,
-               cmTarget* target,
+               cmGeneratorTarget* target,
                const char* make,
                const cmMakefile* makefile,
                const char*, //compiler
@@ -235,10 +234,8 @@ void cmExtraSublimeTextGenerator::
 
   if (target != 0)
     {
-      cmGeneratorTarget *gtgt = this->GlobalGenerator
-                                    ->GetGeneratorTarget(target);
       std::vector<cmSourceFile*> sourceFiles;
-      gtgt->GetSourceFiles(sourceFiles,
+      target->GetSourceFiles(sourceFiles,
                              makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       std::vector<cmSourceFile*>::const_iterator sourceFilesEnd =
         sourceFiles.end();
@@ -256,9 +253,9 @@ void cmExtraSublimeTextGenerator::
             }
           std::vector<std::string>& flags = sourceFileFlagsIter->second;
           std::string flagsString =
-            this->ComputeFlagsForObject(*iter, lg, gtgt);
+            this->ComputeFlagsForObject(*iter, lg, target);
           std::string definesString =
-            this->ComputeDefines(*iter, lg, gtgt);
+            this->ComputeDefines(*iter, lg, target);
           flags.clear();
           cmsys::RegularExpression flagRegex;
           // Regular expression to extract compiler flags from a string
diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h
index 5dd1140..cf31ee0 100644
--- a/Source/cmExtraSublimeTextGenerator.h
+++ b/Source/cmExtraSublimeTextGenerator.h
@@ -18,7 +18,6 @@
 
 class cmLocalGenerator;
 class cmMakefile;
-class cmTarget;
 class cmGeneratedFileStream;
 class cmGeneratorTarget;
 
@@ -67,7 +66,7 @@ private:
   void AppendTarget(cmGeneratedFileStream& fout,
                     const std::string& targetName,
                     cmLocalGenerator* lg,
-                    cmTarget* target,
+                    cmGeneratorTarget* target,
                     const char* make,
                     const cmMakefile* makefile,
                     const char* compiler,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05982b26e6fc58422dd4c05497466f206d6c93f7
commit 05982b26e6fc58422dd4c05497466f206d6c93f7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 19 21:23:29 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:54 2015 +0200

    Xcode: Port API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index a2d87ff..9111a3f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -711,9 +711,9 @@ cmXCodeObject* cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
+GetGroupMapKeyFromPath(cmGeneratorTarget* target, const std::string& fullpath)
 {
-  std::string key(cmtarget.GetName());
+  std::string key(target->GetName());
   key += "-";
   key += fullpath;
   return key;
@@ -721,16 +721,16 @@ GetGroupMapKeyFromPath(cmTarget& cmtarget, const std::string& fullpath)
 
 //----------------------------------------------------------------------------
 std::string
-GetGroupMapKey(cmTarget& cmtarget, cmSourceFile* sf)
+GetGroupMapKey(cmGeneratorTarget* target, cmSourceFile* sf)
 {
-  return GetGroupMapKeyFromPath(cmtarget, sf->GetFullPath());
+  return GetGroupMapKeyFromPath(target, sf->GetFullPath());
 }
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
@@ -738,7 +738,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
   // fileRef object for any given full path.
   //
   cmXCodeObject* fileRef =
-    this->CreateXCodeFileReferenceFromPath(fullpath, cmtarget, lang, sf);
+    this->CreateXCodeFileReferenceFromPath(fullpath, target, lang, sf);
 
   cmXCodeObject* buildFile = this->CreateObject(cmXCodeObject::PBXBuildFile);
   buildFile->SetComment(fileRef->GetComment());
@@ -751,7 +751,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath(
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
                                               cmSourceFile* sf,
-                                              cmTarget& cmtarget)
+                                              cmGeneratorTarget* gtgt)
 {
   // Add flags from target and source file properties.
   std::string flags;
@@ -781,7 +781,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   cmXCodeObject* buildFile =
-    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), cmtarget, lang, sf);
+    this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), gtgt, lang, sf);
   cmXCodeObject* fileRef = buildFile->GetObject("fileRef")->GetObject();
 
   cmXCodeObject* settings =
@@ -791,7 +791,6 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
   // Is this a resource file in this target? Add it to the resources group...
   //
 
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmGeneratorTarget::SourceFileFlags tsFlags =
       gtgt->GetTargetSourceFileFlags(sf);
   bool isResource = tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource;
@@ -926,11 +925,11 @@ GetSourcecodeValueFromFileExtension(const std::string& _ext,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
   const std::string &fullpath,
-  cmTarget& cmtarget,
+  cmGeneratorTarget* target,
   const std::string &lang,
   cmSourceFile* sf)
 {
-  std::string key = GetGroupMapKeyFromPath(cmtarget, fullpath);
+  std::string key = GetGroupMapKeyFromPath(target, fullpath);
   cmXCodeObject* fileRef = this->FileRefs[key];
   if(!fileRef)
     {
@@ -1007,13 +1006,13 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
 //----------------------------------------------------------------------------
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf,
-                                                 cmTarget& cmtarget)
+                                                 cmGeneratorTarget* target)
 {
   std::string lang =
     this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
 
   return this->CreateXCodeFileReferenceFromPath(
-    sf->GetFullPath(), cmtarget, lang, sf);
+    sf->GetFullPath(), target, lang, sf);
 }
 
 //----------------------------------------------------------------------------
@@ -1100,7 +1099,6 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       l != sortedTargets.end(); l++)
     {
     cmGeneratorTarget* gtgt = l->second;
-    cmTarget& cmtarget = *gtgt->Target;
 
     std::string targetName = gtgt->GetName();
 
@@ -1118,7 +1116,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     if(gtgt->GetType() == cmState::UTILITY ||
        gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
-      cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
+      cmXCodeObject* t = this->CreateUtilityTarget(gtgt);
       if (!t)
         {
         return false;
@@ -1146,7 +1144,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       {
       cmXCodeObject* xsf =
         this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                    *i, cmtarget);
+                                    *i, gtgt);
       cmXCodeObject* fr = xsf->GetObject("fileRef");
       cmXCodeObject* filetype =
         fr->GetObject()->GetObject("explicitFileType");
@@ -1197,7 +1195,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
         {
         std::string obj = *oi;
         cmXCodeObject* xsf =
-          this->CreateXCodeSourceFileFromPath(obj, cmtarget, "", 0);
+          this->CreateXCodeSourceFileFromPath(obj, gtgt, "", 0);
         externalObjFiles.push_back(xsf);
         }
       }
@@ -1320,7 +1318,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
           {
           cmXCodeObject* xsf =
             this->CreateXCodeSourceFile(this->CurrentLocalGenerator,
-                                        *sfIt, cmtarget);
+                                        *sfIt, gtgt);
           buildFiles->AddObject(xsf);
           }
         contentBuildPhases.push_back(copyFilesBuildPhase);
@@ -1354,9 +1352,9 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
     this->CreateCustomCommands(buildPhases, sourceBuildPhase,
                                headerBuildPhase, resourceBuildPhase,
                                contentBuildPhases,
-                               frameworkBuildPhase, cmtarget);
+                               frameworkBuildPhase, gtgt);
 
-    targets.push_back(this->CreateXCodeTarget(cmtarget, buildPhases));
+    targets.push_back(this->CreateXCodeTarget(gtgt, buildPhases));
     }
   return true;
 }
@@ -1431,7 +1429,7 @@ bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf)
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                                          const char* name2,
-                                         cmTarget& cmtarget,
+                                         cmGeneratorTarget* target,
                                          const std::vector<cmCustomCommand>&
                                          commands)
 {
@@ -1451,7 +1449,7 @@ cmGlobalXCodeGenerator::CreateBuildPhase(const char* name,
                            this->CreateString("0"));
   buildPhase->AddAttribute("shellPath",
                            this->CreateString("/bin/sh"));
-  this->AddCommandsToBuildPhase(buildPhase, cmtarget, commands,
+  this->AddCommandsToBuildPhase(buildPhase, target, commands,
                                 name2);
   return buildPhase;
 }
@@ -1468,16 +1466,14 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
                                                   contentBuildPhases,
                                                   cmXCodeObject*
                                                   frameworkBuildPhase,
-                                                  cmTarget& cmtarget)
+                                                  cmGeneratorTarget* gtgt)
 {
   std::vector<cmCustomCommand> const & prebuild
-    = cmtarget.GetPreBuildCommands();
+    = gtgt->Target->GetPreBuildCommands();
   std::vector<cmCustomCommand> const & prelink
-    = cmtarget.GetPreLinkCommands();
+    = gtgt->Target->GetPreLinkCommands();
   std::vector<cmCustomCommand> postbuild
-    = cmtarget.GetPostBuildCommands();
-
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+    = gtgt->Target->GetPostBuildCommands();
 
   if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
@@ -1530,19 +1526,19 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   cmXCodeObject* cmakeRulesBuildPhase =
     this->CreateBuildPhase("CMake Rules",
                            "cmakeRulesBuildPhase",
-                           cmtarget, commands);
+                           gtgt, commands);
   // create prebuild phase
   cmXCodeObject* preBuildPhase =
     this->CreateBuildPhase("CMake PreBuild Rules", "preBuildCommands",
-                           cmtarget, prebuild);
+                           gtgt, prebuild);
   // create prelink phase
   cmXCodeObject* preLinkPhase =
     this->CreateBuildPhase("CMake PreLink Rules", "preLinkCommands",
-                           cmtarget, prelink);
+                           gtgt, prelink);
   // create postbuild phase
   cmXCodeObject* postBuildPhase =
     this->CreateBuildPhase("CMake PostBuild Rules", "postBuildPhase",
-                           cmtarget, postbuild);
+                           gtgt, postbuild);
 
   // The order here is the order they will be built in.
   // The order "headers, resources, sources" mimics a native project generated
@@ -1625,7 +1621,7 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag,
 //----------------------------------------------------------------------------
 void
 cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                                                cmTarget& target,
+                                                cmGeneratorTarget* target,
                                                 std::vector<cmCustomCommand>
                                                 const & commands,
                                                 const char* name)
@@ -1635,7 +1631,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
   cmSystemTools::MakeDirectory(dir.c_str());
   std::string makefile = dir;
   makefile += "/";
-  makefile += target.GetName();
+  makefile += target->GetName();
   makefile += "_";
   makefile += name;
   makefile += ".make";
@@ -1669,7 +1665,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
 //----------------------------------------------------------------------------
 void  cmGlobalXCodeGenerator
 ::CreateCustomRulesMakefile(const char* makefileBasename,
-                            cmTarget& target,
+                            cmGeneratorTarget* target,
                             std::vector<cmCustomCommand>
                             const & commands,
                             const std::string& configName)
@@ -1686,7 +1682,7 @@ void  cmGlobalXCodeGenerator
     }
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  makefileStream << "# Custom rules for " << target.GetName() << "\n";
+  makefileStream << "# Custom rules for " << target->GetName() << "\n";
 
   // disable the implicit rules
   makefileStream << ".SUFFIXES: " << "\n";
@@ -1715,7 +1711,7 @@ void  cmGlobalXCodeGenerator
         {
         std::ostringstream str;
         str << "_buildpart_" << count++ ;
-        tname[&ccg.GetCC()] = std::string(target.GetName()) + str.str();
+        tname[&ccg.GetCC()] = std::string(target->GetName()) + str.str();
         makefileStream << "\\\n\t" << tname[&ccg.GetCC()];
         }
       }
@@ -1793,11 +1789,10 @@ void  cmGlobalXCodeGenerator
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
+void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
@@ -2020,7 +2015,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     if(this->XcodeVersion >= 21)
       {
       std::string pncdir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
                                   this->CreateString(pncdir.c_str()));
       }
@@ -2029,7 +2024,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       buildSettings->AddAttribute("OBJROOT",
                                   this->CreateString(pndir.c_str()));
       pndir = this->GetObjectsNormalDirectory(
-        this->CurrentProject, configName, &target);
+        this->CurrentProject, configName, gtgt);
       }
     }
 
@@ -2067,7 +2062,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
         extraLinkOptions += " ";
         extraLinkOptions += createFlags;
         }
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the cfbundle name. This avoids creating
       // a per-configuration Info.plist file. The cfbundle plist
@@ -2113,11 +2108,11 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
-      std::string fw_version = target.GetFrameworkVersion();
+      std::string fw_version = gtgt->Target->GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
                                   this->CreateString(fw_version.c_str()));
 
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the framework name. This avoids creating
       // a per-configuration Info.plist file.
@@ -2160,7 +2155,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     // Handle bundles and normal executables separately.
     if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
-      std::string plist = this->ComputeInfoPListLocation(target);
+      std::string plist = this->ComputeInfoPListLocation(gtgt);
       // Xcode will create the final version of Info.plist at build time,
       // so let it replace the executable name.  This avoids creating
       // a per-configuration Info.plist file.
@@ -2400,7 +2395,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
     }
 
-  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(target),
+  buildSettings->AddAttribute(this->GetTargetLinkFlagsVar(gtgt),
                               this->CreateString(extraLinkOptions.c_str()));
   buildSettings->AddAttribute("OTHER_REZFLAGS",
                               this->CreateString(""));
@@ -2459,7 +2454,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   // put this last so it can override existing settings
   // Convert "XCODE_ATTRIBUTE_*" properties directly.
   {
-  cmPropertyMap const& props = target.GetProperties();
+  cmPropertyMap const& props = gtgt->Target->GetProperties();
   for(cmPropertyMap::const_iterator i = props.begin();
       i != props.end(); ++i)
     {
@@ -2508,9 +2503,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
+cmGlobalXCodeGenerator::CreateUtilityTarget(cmGeneratorTarget* gtgt)
 {
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2538,11 +2532,11 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
   this->CreateCustomCommands(buildPhases, 0, 0, 0, emptyContentVector, 0,
-                             cmtarget);
+                             gtgt);
   target->AddAttribute("buildPhases", buildPhases);
   if(this->XcodeVersion > 20)
     {
-    this->AddConfigurations(target, cmtarget);
+    this->AddConfigurations(target, gtgt);
     }
   else
     {
@@ -2550,7 +2544,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings, theConfig);
+    this->CreateBuildSettings(gtgt, buildSettings, theConfig);
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2558,8 +2552,8 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   target->AddAttribute("dependencies", dependencies);
   target->AddAttribute("name", this->CreateString(gtgt->GetName()));
   target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
 
   // Add source files without build rules for editing convenience.
   if(gtgt->GetType() == cmState::UTILITY)
@@ -2575,7 +2569,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
       {
       if(!(*i)->GetPropertyAsBool("GENERATED"))
         {
-        this->CreateXCodeFileReference(*i, cmtarget);
+        this->CreateXCodeFileReference(*i, gtgt);
         }
       }
     }
@@ -2588,7 +2582,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
 //----------------------------------------------------------------------------
 std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
-                                                      cmTarget& cmtarget)
+                                                      cmGeneratorTarget* gtgt)
 {
   std::string configTypes =
     this->CurrentMakefile->GetRequiredDefinition("CMAKE_CONFIGURATION_TYPES");
@@ -2604,7 +2598,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
   std::string comment = "Build configuration list for ";
   comment += cmXCodeObject::PBXTypeNames[target->GetIsA()];
   comment += " \"";
-  comment += cmtarget.GetName();
+  comment += gtgt->GetName();
   comment += "\"";
   configlist->SetComment(comment.c_str());
   target->AddAttribute("buildConfigurationList",
@@ -2616,7 +2610,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
     buildConfigurations->AddObject(config);
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
-    this->CreateBuildSettings(cmtarget, buildSettings,
+    this->CreateBuildSettings(gtgt, buildSettings,
                               configVector[i].c_str());
     config->AddAttribute("name", this->CreateString(configVector[i].c_str()));
     config->SetComment(configVector[i].c_str());
@@ -2634,12 +2628,12 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
 }
 
 //----------------------------------------------------------------------------
-const char*
-cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(cmTarget const& cmtarget) const
+const char* cmGlobalXCodeGenerator::GetTargetLinkFlagsVar(
+    cmGeneratorTarget const* target) const
 {
   if(this->XcodeVersion >= 60 &&
-     (cmtarget.GetType() == cmState::STATIC_LIBRARY ||
-      cmtarget.GetType() == cmState::OBJECT_LIBRARY))
+     (target->GetType() == cmState::STATIC_LIBRARY ||
+      target->GetType() == cmState::OBJECT_LIBRARY))
     {
     return "OTHER_LIBTOOLFLAGS";
     }
@@ -2709,11 +2703,9 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType(
 
 //----------------------------------------------------------------------------
 cmXCodeObject*
-cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
+cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt,
                                           cmXCodeObject* buildPhases)
 {
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
-
   if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
@@ -2726,14 +2718,14 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   std::string defConfig;
   if(this->XcodeVersion > 20)
     {
-    defConfig = this->AddConfigurations(target, cmtarget);
+    defConfig = this->AddConfigurations(target, gtgt);
     }
   else
     {
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
     defConfig = this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-    this->CreateBuildSettings(cmtarget, buildSettings, defConfig.c_str());
+    this->CreateBuildSettings(gtgt, buildSettings, defConfig.c_str());
     target->AddAttribute("buildSettings", buildSettings);
     }
   cmXCodeObject* dependencies =
@@ -2770,22 +2762,23 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     {
     target->AddAttribute("productType", this->CreateString(productType));
     }
-  target->SetTarget(&cmtarget);
-  this->XCodeObjectMap[&cmtarget] = target;
+  target->SetTarget(gtgt);
+  this->XCodeObjectMap[gtgt] = target;
   target->SetId(this->GetOrCreateId(
     gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
 //----------------------------------------------------------------------------
-cmXCodeObject* cmGlobalXCodeGenerator::FindXCodeTarget(cmTarget const* t)
+cmXCodeObject*
+cmGlobalXCodeGenerator::FindXCodeTarget(cmGeneratorTarget const* t)
 {
   if(!t)
     {
     return 0;
     }
 
-  std::map<cmTarget const*, cmXCodeObject*>::const_iterator const i =
+  std::map<cmGeneratorTarget const*, cmXCodeObject*>::const_iterator const i =
     this->XCodeObjectMap.find(t);
   if (i == this->XCodeObjectMap.end())
     {
@@ -2922,8 +2915,7 @@ void cmGlobalXCodeGenerator
 void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
-  cmTarget* cmtarget = target->GetTarget();
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  cmGeneratorTarget* gt = target->GetTarget();
   if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
@@ -2938,7 +2930,7 @@ void cmGlobalXCodeGenerator
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
-    if(cmXCodeObject* dptarget = this->FindXCodeTarget((*i)->Target))
+    if(cmXCodeObject* dptarget = this->FindXCodeTarget(*i))
       {
       this->AddDependTarget(target, dptarget);
       }
@@ -2967,7 +2959,7 @@ void cmGlobalXCodeGenerator
         linkObjs += this->XCodeEscapePath(oi->c_str());
         }
       this->AppendBuildSettingAttribute(
-        target, this->GetTargetLinkFlagsVar(*cmtarget),
+        target, this->GetTargetLinkFlagsVar(gt),
         linkObjs.c_str(), configName);
       }
 
@@ -3047,7 +3039,7 @@ void cmGlobalXCodeGenerator
         }
       }
     this->AppendBuildSettingAttribute(
-      target, this->GetTargetLinkFlagsVar(*cmtarget),
+      target, this->GetTargetLinkFlagsVar(gt),
       linkLibs.c_str(), configName);
     }
     }
@@ -3090,7 +3082,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       // MACOSX_BUNDLE file
       if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(*gtgt->Target);
+        std::string plist = this->ComputeInfoPListLocation(gtgt);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3110,8 +3102,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKey(*gtgt->Target, sf);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKey(gtgt, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
@@ -3125,8 +3117,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(*gtgt->Target, source);
+          this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(gtgt, source);
         this->GroupMap[key] = pbxgroup;
         }
       }
@@ -3157,16 +3149,16 @@ cmXCodeObject *cmGlobalXCodeGenerator
 
 //----------------------------------------------------------------------------
 cmXCodeObject* cmGlobalXCodeGenerator
-::CreateOrGetPBXGroup(cmTarget& cmtarget, cmSourceGroup* sg)
+::CreateOrGetPBXGroup(cmGeneratorTarget* gtgt, cmSourceGroup* sg)
 {
   std::string s;
   std::string target;
-  const char *targetFolder= cmtarget.GetProperty("FOLDER");
+  const char *targetFolder= gtgt->GetProperty("FOLDER");
   if(targetFolder) {
     target = targetFolder;
     target += "/";
   }
-  target += cmtarget.GetName();
+  target += gtgt->GetName();
   s = target + "/";
   s += sg->GetFullName();
   std::map<std::string, cmXCodeObject* >::iterator it =
@@ -3556,10 +3548,10 @@ std::string
 cmGlobalXCodeGenerator::GetObjectsNormalDirectory(
   const std::string &projName,
   const std::string &configName,
-  const cmTarget *t) const
+  const cmGeneratorTarget *t) const
 {
   std::string dir =
-    t->GetMakefile()->GetCurrentBinaryDirectory();
+    t->GetLocalGenerator()->GetCurrentBinaryDirectory();
   dir += "/";
   dir += projName;
   dir += ".build/";
@@ -3633,8 +3625,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         i != targets.end(); ++i)
       {
       cmXCodeObject* target = *i;
-      cmTarget* t =target->GetTarget();
-      cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
+      cmGeneratorTarget* gt =target->GetTarget();
 
       if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
@@ -3695,7 +3686,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         if(this->Architectures.size() > 1)
           {
           std::string universal = this->GetObjectsNormalDirectory(
-            this->CurrentProject, configName, t);
+            this->CurrentProject, configName, gt);
           for( std::vector<std::string>::iterator arch =
                  this->Architectures.begin();
                arch != this->Architectures.end(); ++arch)
@@ -4038,12 +4029,13 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags,
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmTarget& target)
+cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmGeneratorTarget* target)
 {
-  std::string plist = target.GetMakefile()->GetCurrentBinaryDirectory();
+  std::string plist =
+      target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   plist += cmake::GetCMakeFilesDirectory();
   plist += "/";
-  plist += target.GetName();
+  plist += target->GetName();
   plist += ".dir/Info.plist";
   return plist;
 }
@@ -4069,7 +4061,7 @@ void cmGlobalXCodeGenerator
 {
   std::string configName = this->GetCMakeCFGIntDir();
   std::string dir = this->GetObjectsNormalDirectory(
-    "$(PROJECT_NAME)", configName, gt->Target);
+    "$(PROJECT_NAME)", configName, gt);
   if(this->XcodeVersion >= 21)
     {
     dir += "$(CURRENT_ARCH)/";
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 10d9bd6..510d46e 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -16,7 +16,6 @@
 #include "cmXCodeObject.h"
 #include "cmCustomCommand.h"
 class cmGlobalGeneratorFactory;
-class cmTarget;
 class cmSourceFile;
 class cmSourceGroup;
 
@@ -90,7 +89,7 @@ protected:
   virtual void AddExtraIDETargets();
   virtual void Generate();
 private:
-  cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget,
+  cmXCodeObject* CreateOrGetPBXGroup(cmGeneratorTarget* gtgt,
                                      cmSourceGroup* sg);
   cmXCodeObject* CreatePBXGroup(cmXCodeObject *parent,
                                 std::string name);
@@ -108,22 +107,22 @@ private:
                             cmXCodeObject* resourceBuildPhase,
                             std::vector<cmXCodeObject*> contentBuildPhases,
                             cmXCodeObject* frameworkBuildPhase,
-                            cmTarget& cmtarget);
+                            cmGeneratorTarget *gtgt);
 
-  std::string ComputeInfoPListLocation(cmTarget& target);
+  std::string ComputeInfoPListLocation(cmGeneratorTarget *target);
 
   void AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                               cmTarget& target,
+                               cmGeneratorTarget *target,
                                std::vector<cmCustomCommand>
                                const & commands,
                                const char* commandFileName);
 
   void CreateCustomRulesMakefile(const char* makefileBasename,
-                                 cmTarget& target,
+                                 cmGeneratorTarget* target,
                                  std::vector<cmCustomCommand> const & commands,
                                  const std::string& configName);
 
-  cmXCodeObject* FindXCodeTarget(cmTarget const*);
+  cmXCodeObject* FindXCodeTarget(const cmGeneratorTarget *);
   std::string GetOrCreateId(const std::string& name, const std::string& id);
 
   // create cmXCodeObject from these functions so that memory can be managed
@@ -132,22 +131,23 @@ private:
   cmXCodeObject* CreateObject(cmXCodeObject::Type type);
   cmXCodeObject* CreateString(const std::string& s);
   cmXCodeObject* CreateObjectReference(cmXCodeObject*);
-  cmXCodeObject* CreateXCodeTarget(cmTarget& target,
+  cmXCodeObject* CreateXCodeTarget(cmGeneratorTarget *gtgt,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
   void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
-  const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
+  const char* GetTargetLinkFlagsVar(const cmGeneratorTarget *target) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);
-  std::string AddConfigurations(cmXCodeObject* target, cmTarget& cmtarget);
+  std::string AddConfigurations(cmXCodeObject* target,
+                                cmGeneratorTarget *gtgt);
   void AppendOrAddBuildSetting(cmXCodeObject* settings, const char* attr,
                                const char* value);
   void AppendBuildSettingAttribute(cmXCodeObject* target, const char* attr,
                                    const char* value,
                                    const std::string& configName);
-  cmXCodeObject* CreateUtilityTarget(cmTarget& target);
+  cmXCodeObject* CreateUtilityTarget(cmGeneratorTarget *gtgt);
   void AddDependAndLinkInformation(cmXCodeObject* target);
-  void CreateBuildSettings(cmTarget& target,
+  void CreateBuildSettings(cmGeneratorTarget *gtgt,
                            cmXCodeObject* buildSettings,
                            const std::string& buildType);
   std::string ExtractFlag(const char* flag, std::string& flags);
@@ -161,18 +161,18 @@ private:
   void WriteXCodePBXProj(std::ostream& fout, cmLocalGenerator* root,
                          std::vector<cmLocalGenerator*>& generators);
   cmXCodeObject* CreateXCodeFileReferenceFromPath(const std::string &fullpath,
-                                                  cmTarget& cmtarget,
+                                                  cmGeneratorTarget *target,
                                                   const std::string &lang,
                                                   cmSourceFile* sf);
   cmXCodeObject* CreateXCodeSourceFileFromPath(const std::string &fullpath,
-                                               cmTarget& cmtarget,
+                                               cmGeneratorTarget *target,
                                                const std::string &lang,
                                                cmSourceFile* sf);
   cmXCodeObject* CreateXCodeFileReference(cmSourceFile* sf,
-                                          cmTarget& cmtarget);
+                                          cmGeneratorTarget *target);
   cmXCodeObject* CreateXCodeSourceFile(cmLocalGenerator* gen,
                                        cmSourceFile* sf,
-                                       cmTarget& cmtarget);
+                                       cmGeneratorTarget *gtgt);
   bool CreateXCodeTargets(cmLocalGenerator* gen,
                           std::vector<cmXCodeObject*>&);
   bool IsHeaderFile(cmSourceFile*);
@@ -185,7 +185,7 @@ private:
                        std::vector<cmLocalGenerator*>& gens);
   cmXCodeObject* CreateBuildPhase(const char* name,
                                   const char* name2,
-                                  cmTarget& cmtarget,
+                                  cmGeneratorTarget *target,
                                   const std::vector<cmCustomCommand>&);
   void CreateReRunCMakeFile(cmLocalGenerator* root,
                             std::vector<cmLocalGenerator*> const& gens);
@@ -224,10 +224,9 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  std::string GetObjectsNormalDirectory(
-    const std::string &projName,
+  std::string GetObjectsNormalDirectory(const std::string &projName,
     const std::string &configName,
-    const cmTarget *t) const;
+    const cmGeneratorTarget *t) const;
 
   void addObject(cmXCodeObject *obj);
   std::string PostBuildMakeTarget(std::string const& tName,
@@ -249,7 +248,7 @@ private:
   std::map<std::string, cmXCodeObject* > GroupNameMap;
   std::map<std::string, cmXCodeObject* > TargetGroup;
   std::map<std::string, cmXCodeObject* > FileRefs;
-  std::map<cmTarget const*, cmXCodeObject* > XCodeObjectMap;
+  std::map<cmGeneratorTarget const*, cmXCodeObject* > XCodeObjectMap;
   std::vector<std::string> Architectures;
   std::string GeneratorToolset;
 };
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index ed2940a..0f0548b 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -13,7 +13,7 @@
 #define cmXCodeObject_h
 
 #include "cmStandardIncludes.h"
-class cmTarget;
+class cmGeneratorTarget;
 
 class cmXCodeObject
 {
@@ -87,11 +87,11 @@ public:
     {
       this->Id = id;
     }
-  cmTarget* GetTarget()
+  cmGeneratorTarget* GetTarget()
     {
       return this->Target;
     }
-  void SetTarget(cmTarget* t)
+  void SetTarget(cmGeneratorTarget* t)
     {
       this->Target = t;
     }
@@ -146,7 +146,7 @@ public:
 protected:
   void PrintString(std::ostream& os) const;
 
-  cmTarget* Target;
+  cmGeneratorTarget* Target;
   Type TypeValue;
   std::string Id;
   PBXType IsA;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=effe874d25cc0448d9f37fd90283fb83118cb31e
commit effe874d25cc0448d9f37fd90283fb83118cb31e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:36:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:54 2015 +0200

    Xcode: Prefer to get target state from cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 4438860..a2d87ff 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1110,13 +1110,13 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+    if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
-    if(cmtarget.GetType() == cmState::UTILITY ||
-       cmtarget.GetType() == cmState::GLOBAL_TARGET)
+    if(gtgt->GetType() == cmState::UTILITY ||
+       gtgt->GetType() == cmState::GLOBAL_TARGET)
       {
       cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
       if (!t)
@@ -1204,7 +1204,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
 
     // some build phases only apply to bundles and/or frameworks
     bool isFrameworkTarget = gtgt->IsFrameworkOnApple();
-    bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE");
+    bool isBundleTarget = gtgt->GetPropertyAsBool("MACOSX_BUNDLE");
     bool isCFBundleTarget = gtgt->IsCFBundleOnApple();
 
     cmXCodeObject* buildFiles = 0;
@@ -1479,7 +1479,7 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
 
   cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
 
-  if(cmtarget.GetType() == cmState::SHARED_LIBRARY &&
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
     {
     cmCustomCommandLines cmd;
@@ -1488,13 +1488,13 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
     cmd[0].push_back("-E");
     cmd[0].push_back("cmake_symlink_library");
     std::string str_file = "$<TARGET_FILE:";
-    str_file += cmtarget.GetName();
+    str_file += gtgt->GetName();
     str_file += ">";
     std::string str_so_file = "$<TARGET_SONAME_FILE:";
-    str_so_file += cmtarget.GetName();
+    str_so_file += gtgt->GetName();
     str_so_file += ">";
     std::string str_link_file = "$<TARGET_LINKER_FILE:";
-    str_link_file += cmtarget.GetName();
+    str_link_file += gtgt->GetName();
     str_link_file += ">";
     cmd[0].push_back(str_file);
     cmd[0].push_back(str_so_file);
@@ -1797,22 +1797,22 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                                 cmXCodeObject* buildSettings,
                                                 const std::string& configName)
 {
-  if(target.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   std::string defFlags;
-  bool shared = ((target.GetType() == cmState::SHARED_LIBRARY) ||
-                 (target.GetType() == cmState::MODULE_LIBRARY));
-  bool binary = ((target.GetType() == cmState::OBJECT_LIBRARY) ||
-                 (target.GetType() == cmState::STATIC_LIBRARY) ||
-                 (target.GetType() == cmState::EXECUTABLE) ||
+  bool shared = ((gtgt->GetType() == cmState::SHARED_LIBRARY) ||
+                 (gtgt->GetType() == cmState::MODULE_LIBRARY));
+  bool binary = ((gtgt->GetType() == cmState::OBJECT_LIBRARY) ||
+                 (gtgt->GetType() == cmState::STATIC_LIBRARY) ||
+                 (gtgt->GetType() == cmState::EXECUTABLE) ||
                  shared);
 
   // Compute the compilation flags for each language.
   std::set<std::string> languages;
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
   gtgt->GetLanguages(languages, configName);
   std::map<std::string, std::string> cflags;
   for (std::set<std::string>::iterator li = languages.begin();
@@ -1840,7 +1840,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     cmSystemTools::Error
       ("CMake can not determine linker language for target: ",
-       target.GetName().c_str());
+       gtgt->GetName().c_str());
     return;
     }
 
@@ -1869,15 +1869,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   std::string extraLinkOptionsVar;
   std::string extraLinkOptions;
-  if(target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::EXECUTABLE)
     {
     extraLinkOptionsVar = "CMAKE_EXE_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::SHARED_LIBRARY)
+  else if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_SHARED_LINKER_FLAGS";
     }
-  else if(target.GetType() == cmState::MODULE_LIBRARY)
+  else if(gtgt->GetType() == cmState::MODULE_LIBRARY)
     {
     extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS";
     }
@@ -1889,8 +1889,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                configName);
     }
 
-  if(target.GetType() == cmState::OBJECT_LIBRARY ||
-     target.GetType() == cmState::STATIC_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY ||
+     gtgt->GetType() == cmState::STATIC_LIBRARY)
     {
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
@@ -1899,7 +1899,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
   else
     {
-    const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+    const char* targetLinkFlags = gtgt->GetProperty("LINK_FLAGS");
     if(targetLinkFlags)
       {
       this->CurrentLocalGenerator->
@@ -1909,7 +1909,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       std::string linkFlagsVar = "LINK_FLAGS_";
       linkFlagsVar += cmSystemTools::UpperCase(configName);
-      if(const char* linkFlags = target.GetProperty(linkFlagsVar.c_str()))
+      if(const char* linkFlags = gtgt->GetProperty(linkFlagsVar.c_str()))
         {
         this->CurrentLocalGenerator->
           AppendFlags(extraLinkOptions, linkFlags);
@@ -1952,8 +1952,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   std::string pnsuffix;
   gtgt->GetFullNameComponents(pnprefix, pnbase, pnsuffix, configName);
 
-  const char* version = target.GetProperty("VERSION");
-  const char* soversion = target.GetProperty("SOVERSION");
+  const char* version = gtgt->GetProperty("VERSION");
+  const char* soversion = gtgt->GetProperty("SOVERSION");
   if(!gtgt->HasSOName(configName) || gtgt->IsFrameworkOnApple())
     {
     version = 0;
@@ -1980,10 +1980,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Set attributes to specify the proper name for the target.
   std::string pndir = this->CurrentLocalGenerator->GetCurrentBinaryDirectory();
-  if(target.GetType() == cmState::STATIC_LIBRARY ||
-     target.GetType() == cmState::SHARED_LIBRARY ||
-     target.GetType() == cmState::MODULE_LIBRARY ||
-     target.GetType() == cmState::EXECUTABLE)
+  if(gtgt->GetType() == cmState::STATIC_LIBRARY ||
+     gtgt->GetType() == cmState::SHARED_LIBRARY ||
+     gtgt->GetType() == cmState::MODULE_LIBRARY ||
+     gtgt->GetType() == cmState::EXECUTABLE)
     {
     if(this->XcodeVersion >= 21)
       {
@@ -2011,10 +2011,10 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     buildSettings->AddAttribute("EXECUTABLE_SUFFIX",
                                 this->CreateString(pnsuffix.c_str()));
     }
-  else if(target.GetType() == cmState::OBJECT_LIBRARY)
+  else if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     pnprefix = "lib";
-    pnbase = target.GetName();
+    pnbase = gtgt->GetName();
     pnsuffix = ".a";
 
     if(this->XcodeVersion >= 21)
@@ -2040,7 +2040,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                               this->CreateString(pndir.c_str()));
 
   // Handle settings for each target type.
-  switch(target.GetType())
+  switch(gtgt->GetType())
     {
     case cmState::OBJECT_LIBRARY:
     case cmState::STATIC_LIBRARY:
@@ -2111,7 +2111,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
     case cmState::SHARED_LIBRARY:
     {
-    if(target.GetPropertyAsBool("FRAMEWORK"))
+    if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
       std::string fw_version = target.GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
@@ -2158,7 +2158,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       }
 
     // Handle bundles and normal executables separately.
-    if(target.GetPropertyAsBool("MACOSX_BUNDLE"))
+    if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
       {
       std::string plist = this->ComputeInfoPListLocation(target);
       // Xcode will create the final version of Info.plist at build time,
@@ -2323,7 +2323,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Add Fortran source format attribute if property is set.
   const char* format = 0;
-  const char* tgtfmt = target.GetProperty("Fortran_FORMAT");
+  const char* tgtfmt = gtgt->GetProperty("Fortran_FORMAT");
   switch(this->CurrentLocalGenerator->GetFortranFormat(tgtfmt))
     {
     case cmLocalGenerator::FortranFormatFixed: format = "fixed"; break;
@@ -2338,7 +2338,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 
   // Create the INSTALL_PATH attribute.
   std::string install_name_dir;
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     // Get the install_name directory for the build tree.
     install_name_dir = gtgt->GetInstallNameDirForBuildTree(configName);
@@ -2426,7 +2426,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
 
   // Runtime version information.
-  if(target.GetType() == cmState::SHARED_LIBRARY)
+  if(gtgt->GetType() == cmState::SHARED_LIBRARY)
     {
     int major;
     int minor;
@@ -2510,6 +2510,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
 cmXCodeObject*
 cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 {
+  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
   cmXCodeObject* shellBuildPhase =
     this->CreateObject(cmXCodeObject::PBXShellScriptBuildPhase);
   shellBuildPhase->AddAttribute("buildActionMask",
@@ -2532,7 +2533,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
 
   cmXCodeObject* target =
     this->CreateObject(cmXCodeObject::PBXAggregateTarget);
-  target->SetComment(cmtarget.GetName().c_str());
+  target->SetComment(gtgt->GetName().c_str());
   cmXCodeObject* buildPhases =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   std::vector<cmXCodeObject*> emptyContentVector;
@@ -2555,16 +2556,15 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
 
   // Add source files without build rules for editing convenience.
-  if(cmtarget.GetType() == cmState::UTILITY)
+  if(gtgt->GetType() == cmState::UTILITY)
     {
     std::vector<cmSourceFile*> sources;
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
     if (!gtgt->GetConfigCommonSourceFiles(sources))
       {
       return 0;
@@ -2581,7 +2581,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     }
 
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
 
   return target;
 }
@@ -2712,7 +2712,9 @@ cmXCodeObject*
 cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
                                           cmXCodeObject* buildPhases)
 {
-  if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+
+  if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return 0;
     }
@@ -2737,10 +2739,8 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   cmXCodeObject* dependencies =
     this->CreateObject(cmXCodeObject::OBJECT_LIST);
   target->AddAttribute("dependencies", dependencies);
-  target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
-  target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
-
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
+  target->AddAttribute("name", this->CreateString(gtgt->GetName()));
+  target->AddAttribute("productName",this->CreateString(gtgt->GetName()));
 
   cmXCodeObject* fileRef =
     this->CreateObject(cmXCodeObject::PBXFileReference);
@@ -2749,10 +2749,10 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
     fileRef->AddAttribute("explicitFileType", this->CreateString(fileType));
     }
   std::string fullName;
-  if(cmtarget.GetType() == cmState::OBJECT_LIBRARY)
+  if(gtgt->GetType() == cmState::OBJECT_LIBRARY)
     {
     fullName = "lib";
-    fullName += cmtarget.GetName();
+    fullName += gtgt->GetName();
     fullName += ".a";
     }
   else
@@ -2763,7 +2763,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   fileRef->AddAttribute("refType", this->CreateString("0"));
   fileRef->AddAttribute("sourceTree",
                         this->CreateString("BUILT_PRODUCTS_DIR"));
-  fileRef->SetComment(cmtarget.GetName().c_str());
+  fileRef->SetComment(gtgt->GetName().c_str());
   target->AddAttribute("productReference",
                        this->CreateObjectReference(fileRef));
   if(const char* productType = this->GetTargetProductType(gtgt))
@@ -2773,7 +2773,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
   target->SetTarget(&cmtarget);
   this->XCodeObjectMap[&cmtarget] = target;
   target->SetId(this->GetOrCreateId(
-    cmtarget.GetName(), target->GetId()).c_str());
+    gtgt->GetName(), target->GetId()).c_str());
   return target;
 }
 
@@ -2923,18 +2923,18 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(!cmtarget)
+  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
+  if(!gt)
     {
     cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(gt->GetType() == cmState::INTERFACE_LIBRARY)
     {
     return;
     }
 
   // Add dependencies on other CMake targets.
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(cmtarget);
   TargetDependSet const& deps = this->GetTargetDirectDepends(gt);
   for(TargetDependSet::const_iterator i = deps.begin(); i != deps.end(); ++i)
     {
@@ -2958,7 +2958,7 @@ void cmGlobalXCodeGenerator
       std::string linkObjs;
       const char* sep = "";
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(cmtarget)->UseObjectLibraries(objs, "");
+      gt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -2972,15 +2972,14 @@ void cmGlobalXCodeGenerator
       }
 
     // Skip link information for object libraries.
-    if(cmtarget->GetType() == cmState::OBJECT_LIBRARY ||
-       cmtarget->GetType() == cmState::STATIC_LIBRARY)
+    if(gt->GetType() == cmState::OBJECT_LIBRARY ||
+       gt->GetType() == cmState::STATIC_LIBRARY)
       {
       continue;
       }
 
     // Compute the link library and directory information.
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(cmtarget);
-    cmComputeLinkInformation* pcli = gtgt->GetLinkInformation(configName);
+    cmComputeLinkInformation* pcli = gt->GetLinkInformation(configName);
     if(!pcli)
       {
       continue;
@@ -3637,21 +3636,21 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
       cmTarget* t =target->GetTarget();
       cmGeneratorTarget *gt = this->GetGeneratorTarget(t);
 
-      if(t->GetType() == cmState::EXECUTABLE ||
+      if(gt->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//         t->GetType() == cmState::OBJECT_LIBRARY ||
-         t->GetType() == cmState::STATIC_LIBRARY ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+//         gt->GetType() == cmState::OBJECT_LIBRARY ||
+         gt->GetType() == cmState::STATIC_LIBRARY ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         // Declare an entry point for the target post-build phase.
-        makefileStream << this->PostBuildMakeTarget(t->GetName(), *ct)
+        makefileStream << this->PostBuildMakeTarget(gt->GetName(), *ct)
                        << ":\n";
         }
 
-      if(t->GetType() == cmState::EXECUTABLE ||
-         t->GetType() == cmState::SHARED_LIBRARY ||
-         t->GetType() == cmState::MODULE_LIBRARY)
+      if(gt->GetType() == cmState::EXECUTABLE ||
+         gt->GetType() == cmState::SHARED_LIBRARY ||
+         gt->GetType() == cmState::MODULE_LIBRARY)
         {
         std::string tfull = gt->GetFullPath(configName);
         std::string trel = this->ConvertToRelativeForMake(tfull.c_str());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8616d12cfc868492c030168c228983cf6b22b534
commit 8616d12cfc868492c030168c228983cf6b22b534
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 21:14:00 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:54 2015 +0200

    Xcode: Re-order conditions.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index f00c9e5..4438860 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2923,13 +2923,13 @@ void cmGlobalXCodeGenerator
 ::AddDependAndLinkInformation(cmXCodeObject* target)
 {
   cmTarget* cmtarget = target->GetTarget();
-  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
+  if(!cmtarget)
     {
+    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
-  if(!cmtarget)
+  if(cmtarget->GetType() == cmState::INTERFACE_LIBRARY)
     {
-    cmSystemTools::Error("Error no target on xobject\n");
     return;
     }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed4ea59a33d094245ff4807c143134846b2be77a
commit ed4ea59a33d094245ff4807c143134846b2be77a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:38:10 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:54 2015 +0200

    Xcode: Port ForceLinkerLanguage to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6e2e386..f00c9e5 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1368,22 +1368,22 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguages()
   for(TargetMap::const_iterator
         ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
     {
-    this->ForceLinkerLanguage(*ti->second);
+    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
+    this->ForceLinkerLanguage(gt);
     }
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
+void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
 {
   // This matters only for targets that link.
-  if(cmtarget.GetType() != cmState::EXECUTABLE &&
-     cmtarget.GetType() != cmState::SHARED_LIBRARY &&
-     cmtarget.GetType() != cmState::MODULE_LIBRARY)
+  if(gtgt->GetType() != cmState::EXECUTABLE &&
+     gtgt->GetType() != cmState::SHARED_LIBRARY &&
+     gtgt->GetType() != cmState::MODULE_LIBRARY)
     {
     return;
     }
 
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&cmtarget);
   std::string llang = gtgt->GetLinkerLanguage("NOCONFIG");
   if(llang.empty()) { return; }
 
@@ -1399,11 +1399,11 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
   // Add an empty source file to the target that compiles with the
   // linker language.  This should convince Xcode to choose the proper
   // language.
-  cmMakefile* mf = cmtarget.GetMakefile();
+  cmMakefile* mf = gtgt->Target->GetMakefile();
   std::string fname = gtgt->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += cmake::GetCMakeFilesDirectory();
   fname += "/";
-  fname += cmtarget.GetName();
+  fname += gtgt->GetName();
   fname += "-CMakeForceLinker";
   fname += ".";
   fname += cmSystemTools::LowerCase(llang);
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index feb5009..10d9bd6 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -135,7 +135,7 @@ private:
   cmXCodeObject* CreateXCodeTarget(cmTarget& target,
                                    cmXCodeObject* buildPhases);
   void ForceLinkerLanguages();
-  void ForceLinkerLanguage(cmTarget& cmtarget);
+  void ForceLinkerLanguage(cmGeneratorTarget* gtgt);
   const char* GetTargetLinkFlagsVar(cmTarget const& cmtarget) const;
   const char* GetTargetFileType(cmGeneratorTarget* target);
   const char* GetTargetProductType(cmGeneratorTarget* target);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=634155d6952033f353de90073ac58ef53a900306
commit 634155d6952033f353de90073ac58ef53a900306
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 20:32:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:53 2015 +0200

    Xcode: Port loops to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fe115ac..6e2e386 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -514,18 +514,18 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& target = *(*l)->Target;
+      cmGeneratorTarget* target = *l;
 
-      if (target.GetType() == cmState::GLOBAL_TARGET)
+      if (target->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
-      std::string targetName = target.GetName();
+      std::string targetName = target->GetName();
 
       if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
         {
-        target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+        target->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
 
       // make all exe, shared libs and modules
@@ -533,19 +533,19 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       // this will make sure that when the next target is built
       // things are up-to-date
       if(!makeHelper.empty() &&
-         (target.GetType() == cmState::EXECUTABLE ||
+         (target->GetType() == cmState::EXECUTABLE ||
 // Nope - no post-build for OBJECT_LIRBRARY
-//          target.GetType() == cmState::OBJECT_LIBRARY ||
-          target.GetType() == cmState::STATIC_LIBRARY ||
-          target.GetType() == cmState::SHARED_LIBRARY ||
-          target.GetType() == cmState::MODULE_LIBRARY))
+//          target->GetType() == cmState::OBJECT_LIBRARY ||
+          target->GetType() == cmState::STATIC_LIBRARY ||
+          target->GetType() == cmState::SHARED_LIBRARY ||
+          target->GetType() == cmState::MODULE_LIBRARY))
         {
         makeHelper[makeHelper.size()-1] = // fill placeholder
-          this->PostBuildMakeTarget(target.GetName(), "$(CONFIGURATION)");
+          this->PostBuildMakeTarget(target->GetName(), "$(CONFIGURATION)");
         cmCustomCommandLines commandLines;
         commandLines.push_back(makeHelper);
         std::vector<std::string> no_byproducts;
-        lg->GetMakefile()->AddCustomCommandToTarget(target.GetName(),
+        lg->GetMakefile()->AddCustomCommandToTarget(target->GetName(),
                                                     no_byproducts,
                                                     no_depends,
                                                     commandLines,
@@ -554,19 +554,17 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
                                                     dir.c_str());
         }
 
-      if(target.GetType() != cmState::INTERFACE_LIBRARY
-          && !target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
+      if(target->GetType() != cmState::INTERFACE_LIBRARY
+          && !target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
         {
-        allbuild->AddUtility(target.GetName());
+        allbuild->AddUtility(target->GetName());
         }
 
-      cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
-
       // Refer to the build configuration file for easy editing.
       listfile = lg->GetCurrentSourceDirectory();
       listfile += "/";
       listfile += "CMakeLists.txt";
-      targetGT->AddSource(listfile.c_str());
+      target->AddSource(listfile.c_str());
       }
     }
 }
@@ -3074,28 +3072,26 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
     for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
         l != tgts.end(); l++)
       {
-      cmTarget& cmtarget = *(*l)->Target;
+      cmGeneratorTarget* gtgt = *l;
 
       // Same skipping logic here as in CreateXCodeTargets so that we do not
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
       // groups:
       //
-      if(cmtarget.GetType() == cmState::GLOBAL_TARGET)
+      if(gtgt->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY)
+      if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
         {
         continue;
         }
 
-      cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
-
       // add the soon to be generated Info.plist file as a source for a
       // MACOSX_BUNDLE file
-      if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"))
+      if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
         {
-        std::string plist = this->ComputeInfoPListLocation(cmtarget);
+        std::string plist = this->ComputeInfoPListLocation(*gtgt->Target);
         mf->GetOrCreateSource(plist, true);
         gtgt->AddSource(plist);
         }
@@ -3115,14 +3111,14 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKey(cmtarget, sf);
+          this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKey(*gtgt->Target, sf);
         this->GroupMap[key] = pbxgroup;
         }
 
       // Put OBJECT_LIBRARY objects in proper groups:
       std::vector<std::string> objs;
-      this->GetGeneratorTarget(&cmtarget)->UseObjectLibraries(objs, "");
+      gtgt->UseObjectLibraries(objs, "");
       for(std::vector<std::string>::const_iterator
             oi = objs.begin(); oi != objs.end(); ++oi)
         {
@@ -3130,8 +3126,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
         cmSourceGroup* sourceGroup =
           mf->FindSourceGroup(source.c_str(), sourceGroups);
         cmXCodeObject* pbxgroup =
-          this->CreateOrGetPBXGroup(cmtarget, sourceGroup);
-        std::string key = GetGroupMapKeyFromPath(cmtarget, source);
+          this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
+        std::string key = GetGroupMapKeyFromPath(*gtgt->Target, source);
         this->GroupMap[key] = pbxgroup;
         }
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bc65d76f13c63367857b22e87f73baa8e6d5970
commit 4bc65d76f13c63367857b22e87f73baa8e6d5970
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:20:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:53 2015 +0200

    Makefiles: Port to cmGeneratorTarget.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 2c47ab2..bd47715 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 
 cmCommonTargetGenerator::cmCommonTargetGenerator(
   cmOutputConverter::RelativeRoot wd,
@@ -26,7 +25,6 @@ cmCommonTargetGenerator::cmCommonTargetGenerator(
   )
   : WorkingDirectory(wd)
   , GeneratorTarget(gt)
-  , Target(gt->Target)
   , Makefile(gt->Makefile)
   , LocalGenerator(static_cast<cmLocalCommonGenerator*>(gt->LocalGenerator))
   , GlobalGenerator(static_cast<cmGlobalCommonGenerator*>(
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index a4b2c10..3fb1fd0 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -21,7 +21,6 @@ class cmGlobalCommonGenerator;
 class cmLocalCommonGenerator;
 class cmMakefile;
 class cmSourceFile;
-class cmTarget;
 
 /** \class cmCommonTargetGenerator
  * \brief Common infrastructure for Makefile and Ninja per-target generators
@@ -49,7 +48,6 @@ protected:
 
   cmOutputConverter::RelativeRoot WorkingDirectory;
   cmGeneratorTarget* GeneratorTarget;
-  cmTarget* Target;
   cmMakefile* Makefile;
   cmLocalCommonGenerator* LocalGenerator;
   cmGlobalCommonGenerator* GlobalGenerator;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 4d7ca25..b4a915c 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -16,7 +16,6 @@
 #include "cmake.h"
 #include "cmGeneratedFileStream.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmGeneratorTarget.h"
 #include "cmAlgorithms.h"
 
@@ -742,7 +741,7 @@ cmGlobalUnixMakefileGenerator3
       makefileName = localName;
       makefileName += "/build.make";
 
-      bool needRequiresStep = this->NeedRequiresStep(*gtarget->Target);
+      bool needRequiresStep = this->NeedRequiresStep(gtarget);
 
       lg->WriteDivider(ruleFileStream);
       ruleFileStream
@@ -1129,19 +1128,19 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
 
 
 bool cmGlobalUnixMakefileGenerator3
-::NeedRequiresStep(cmTarget const& target)
+::NeedRequiresStep(const cmGeneratorTarget* target)
 {
   std::set<std::string> languages;
-  cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&target);
-  gtgt->GetLanguages(languages,
-                target.GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"));
+  target->GetLanguages(languages,
+                       target->Target->GetMakefile()
+                       ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
   for(std::set<std::string>::const_iterator l = languages.begin();
       l != languages.end(); ++l)
     {
     std::string var = "CMAKE_NEEDS_REQUIRES_STEP_";
     var += *l;
     var += "_FLAG";
-    if(target.GetMakefile()->GetDefinition(var))
+    if(target->Target->GetMakefile()->GetDefinition(var))
       {
       return true;
       }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 0485eb8..63ffcb4 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -154,7 +154,7 @@ protected:
                                  cmGeneratorTarget* target);
 
   // does this generator need a requires step for any of its targets
-  bool NeedRequiresStep(cmTarget const&);
+  bool NeedRequiresStep(cmGeneratorTarget const*);
 
   // Target name hooks for superclass.
   const char* GetAllTargetName()           const { return "all"; }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index e9dc9ff..34a50a3 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1977,7 +1977,7 @@ void cmLocalUnixMakefileGenerator3
                           cmGeneratorTarget* target)
 {
   ImplicitDependLanguageMap const& implicitLangs =
-    this->GetImplicitDepends(*target->Target);
+    this->GetImplicitDepends(target);
 
   // list the languages
   cmakefileStream
@@ -2292,19 +2292,20 @@ cmLocalUnixMakefileGenerator3
 
 //----------------------------------------------------------------------------
 cmLocalUnixMakefileGenerator3::ImplicitDependLanguageMap const&
-cmLocalUnixMakefileGenerator3::GetImplicitDepends(cmTarget const& tgt)
+cmLocalUnixMakefileGenerator3::GetImplicitDepends(
+    const cmGeneratorTarget* tgt)
 {
-  return this->ImplicitDepends[tgt.GetName()];
+  return this->ImplicitDepends[tgt->GetName()];
 }
 
 //----------------------------------------------------------------------------
 void
-cmLocalUnixMakefileGenerator3::AddImplicitDepends(cmTarget const& tgt,
+cmLocalUnixMakefileGenerator3::AddImplicitDepends(const cmGeneratorTarget* tgt,
                                                   const std::string& lang,
                                                   const char* obj,
                                                   const char* src)
 {
-  this->ImplicitDepends[tgt.GetName()][lang][obj].push_back(src);
+  this->ImplicitDepends[tgt->GetName()][lang][obj].push_back(src);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 7e0f248..8f69311 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -21,7 +21,6 @@ class cmCustomCommand;
 class cmCustomCommandGenerator;
 class cmDepends;
 class cmMakefileTargetGenerator;
-class cmTarget;
 class cmSourceFile;
 
 /** \class cmLocalUnixMakefileGenerator3
@@ -141,9 +140,11 @@ public:
     public std::map<std::string, ImplicitDependFileMap> {};
   struct ImplicitDependTargetMap:
     public std::map<std::string, ImplicitDependLanguageMap> {};
-  ImplicitDependLanguageMap const& GetImplicitDepends(cmTarget const& tgt);
+  ImplicitDependLanguageMap const&
+  GetImplicitDepends(cmGeneratorTarget const* tgt);
 
-  void AddImplicitDepends(cmTarget const& tgt, const std::string& lang,
+  void AddImplicitDepends(cmGeneratorTarget const* tgt,
+                          const std::string& lang,
                           const char* obj, const char* src);
 
   // write the target rules for the local Makefile into the stream
@@ -197,12 +198,12 @@ protected:
                             const std::string& helpTarget);
 
   void WriteTargetDependRule(std::ostream& ruleFileStream,
-                             cmTarget& target);
+                             cmGeneratorTarget* target);
   void WriteTargetCleanRule(std::ostream& ruleFileStream,
-                            cmTarget& target,
+                            cmGeneratorTarget* target,
                             const std::vector<std::string>& files);
   void WriteTargetRequiresRule(std::ostream& ruleFileStream,
-                               cmTarget& target,
+                               cmGeneratorTarget* target,
                                const std::vector<std::string>& objects);
 
   void AppendRuleDepend(std::vector<std::string>& depends,
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 020e64c..f56037f 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 
 //----------------------------------------------------------------------------
@@ -279,11 +278,13 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(!relink)
     {
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget);
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -448,8 +449,9 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(!relink)
     {
     this->LocalGenerator->
-      AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->GeneratorTarget);
+      AppendCustomCommands(commands,
+                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget);
     }
 
   // Write the build rule.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index df2a8c9..0a65641 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 #include "cmAlgorithms.h"
 
@@ -114,7 +113,8 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
 
   // Add post-build rules.
   this->LocalGenerator->
-    AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
+    AppendCustomCommands(commands,
+                         this->GeneratorTarget->Target->GetPostBuildCommands(),
                          this->GeneratorTarget);
 
   // Depend on the object files.
@@ -457,11 +457,13 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(!relink)
     {
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget);
     this->LocalGenerator
-      ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(),
-                             this->GeneratorTarget);
+      ->AppendCustomCommands(commands,
+                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget);
     }
 
   // Determine whether a link script will be used.
@@ -811,8 +813,9 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   if(!relink)
     {
     this->LocalGenerator->
-      AppendCustomCommands(commands, this->Target->GetPostBuildCommands(),
-                           this->GeneratorTarget);
+      AppendCustomCommands(commands,
+                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget);
     }
 
   // Compute the list of outputs.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index b7970fd..7acccb3 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -18,7 +18,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmake.h"
 #include "cmState.h"
 #include "cmComputeLinkInformation.h"
@@ -432,7 +431,7 @@ void cmMakefileTargetGenerator
   std::string srcFullPath =
     this->Convert(source.GetFullPath(), cmLocalGenerator::FULL);
   this->LocalGenerator->
-    AddImplicitDepends(*this->Target, lang,
+    AddImplicitDepends(this->GeneratorTarget, lang,
                        objFullPath.c_str(),
                        srcFullPath.c_str());
 }
@@ -1241,7 +1240,7 @@ void cmMakefileTargetGenerator
     std::string srcFullPath =
       this->Convert(idi->second, cmLocalGenerator::FULL);
     this->LocalGenerator->
-      AddImplicitDepends(*this->Target, idi->first,
+      AddImplicitDepends(this->GeneratorTarget, idi->first,
                          objFullPath.c_str(),
                          srcFullPath.c_str());
     }
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index e38c50b..38f40c0 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -24,7 +24,6 @@ class cmGeneratedFileStream;
 class cmGlobalUnixMakefileGenerator3;
 class cmLocalUnixMakefileGenerator3;
 class cmMakefile;
-class cmTarget;
 class cmSourceFile;
 
 /** \class cmMakefileTargetGenerator
@@ -51,7 +50,6 @@ public:
   std::string GetProgressFileNameFull()
     { return this->ProgressFileNameFull; }
 
-  cmTarget* GetTarget() { return this->Target;}
   cmGeneratorTarget* GetGeneratorTarget() { return this->GeneratorTarget;}
 
 protected:
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index 11601c5..d35c3ae 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 
 //----------------------------------------------------------------------------
 cmMakefileUtilityTargetGenerator
@@ -68,19 +67,21 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Utility targets store their rules in pre- and post-build commands.
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->Target->GetPreBuildCommands());
+    (depends, this->GeneratorTarget->Target->GetPreBuildCommands());
 
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->Target->GetPostBuildCommands());
+    (depends, this->GeneratorTarget->Target->GetPostBuildCommands());
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPreBuildCommands(), this->GeneratorTarget);
+    (commands, this->GeneratorTarget->Target->GetPreBuildCommands(),
+     this->GeneratorTarget);
 
   // Depend on all custom command outputs for sources
   this->DriveCustomCommands(depends);
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->Target->GetPostBuildCommands(), this->GeneratorTarget);
+    (commands, this->GeneratorTarget->Target->GetPostBuildCommands(),
+     this->GeneratorTarget);
 
   // Add dependencies on targets that must be built first.
   this->AppendTargetDepends(depends);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80de856bb5cba20d424b91e4a49fe8fdb1f904a3
commit 80de856bb5cba20d424b91e4a49fe8fdb1f904a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:13:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:53 2015 +0200

    Ninja: Port to cmGeneratorTarget.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6e650ce..2671f4d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -886,7 +886,7 @@ void cmGlobalNinjaGenerator::WriteDisclaimer(std::ostream& os)
     << cmVersion::GetMinorVersion() << "\n\n";
 }
 
-void cmGlobalNinjaGenerator::AddDependencyToAll(cmTarget* target)
+void cmGlobalNinjaGenerator::AddDependencyToAll(cmGeneratorTarget* target)
 {
   this->AppendTargetOutputs(target, this->AllDependencies);
 }
@@ -912,18 +912,16 @@ void cmGlobalNinjaGenerator::WriteAssumedSourceDependencies()
 
 void
 cmGlobalNinjaGenerator
-::AppendTargetOutputs(cmTarget const* target, cmNinjaDeps& outputs)
+::AppendTargetOutputs(cmGeneratorTarget const* target, cmNinjaDeps& outputs)
 {
   std::string configName =
-    target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
-
-  cmGeneratorTarget *gtgt = this->GetGeneratorTarget(target);
+    target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE");
 
   // for frameworks, we want the real name, not smple name
   // frameworks always appear versioned, and the build.ninja
   // will always attempt to manage symbolic links instead
   // of letting cmOSXBundleGenerator do it.
-  bool realname = gtgt->IsFrameworkOnApple();
+  bool realname = target->IsFrameworkOnApple();
 
   switch (target->GetType()) {
   case cmState::EXECUTABLE:
@@ -932,7 +930,7 @@ cmGlobalNinjaGenerator
   case cmState::MODULE_LIBRARY:
     {
     outputs.push_back(this->ConvertToNinjaPath(
-      gtgt->GetFullPath(configName, false, realname)));
+      target->GetFullPath(configName, false, realname)));
     break;
     }
   case cmState::OBJECT_LIBRARY:
@@ -962,16 +960,15 @@ cmGlobalNinjaGenerator
 
 void
 cmGlobalNinjaGenerator
-::AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs)
+::AppendTargetDepends(cmGeneratorTarget const* target, cmNinjaDeps& outputs)
 {
   if (target->GetType() == cmState::GLOBAL_TARGET) {
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
-    std::set<std::string> const& utils = target->GetUtilities();
+    std::set<std::string> const& utils = target->Target->GetUtilities();
     std::copy(utils.begin(), utils.end(), std::back_inserter(outputs));
   } else {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(gt);
+    cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(target);
     for (cmTargetDependSet::const_iterator i = targetDeps.begin();
          i != targetDeps.end(); ++i)
       {
@@ -979,13 +976,13 @@ cmGlobalNinjaGenerator
         {
         continue;
         }
-      this->AppendTargetOutputs((*i)->Target, outputs);
+      this->AppendTargetOutputs(*i, outputs);
     }
   }
 }
 
 void cmGlobalNinjaGenerator::AddTargetAlias(const std::string& alias,
-                                            cmTarget* target) {
+                                            cmGeneratorTarget* target) {
   cmNinjaDeps outputs;
   this->AppendTargetOutputs(target, outputs);
   // Mark the target's outputs as ambiguous to ensure that no other target uses
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 292f7c7..7547f16 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -285,9 +285,11 @@ public:
     ASD.insert(deps.begin(), deps.end());
   }
 
-  void AppendTargetOutputs(cmTarget const* target, cmNinjaDeps& outputs);
-  void AppendTargetDepends(cmTarget const* target, cmNinjaDeps& outputs);
-  void AddDependencyToAll(cmTarget* target);
+  void AppendTargetOutputs(cmGeneratorTarget const* target,
+                           cmNinjaDeps& outputs);
+  void AppendTargetDepends(cmGeneratorTarget const* target,
+                           cmNinjaDeps& outputs);
+  void AddDependencyToAll(cmGeneratorTarget* target);
   void AddDependencyToAll(const std::string& input);
 
   const std::vector<cmLocalGenerator*>& GetLocalGenerators() const {
@@ -299,7 +301,7 @@ public:
   int GetRuleCmdLength(const std::string& name) {
     return RuleCmdLength[name]; }
 
-  void AddTargetAlias(const std::string& alias, cmTarget* target);
+  void AddTargetAlias(const std::string& alias, cmGeneratorTarget* target);
 
   virtual void ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const;
 
@@ -388,7 +390,7 @@ private:
   /// The mapping from source file to assumed dependencies.
   std::map<std::string, std::set<std::string> > AssumedSourceDependencies;
 
-  typedef std::map<std::string, cmTarget*> TargetAliasMap;
+  typedef std::map<std::string, cmGeneratorTarget*> TargetAliasMap;
   TargetAliasMap TargetAliases;
 };
 
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 3dd18bd..891c44e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -89,7 +89,7 @@ void cmLocalNinjaGenerator::Generate()
       if (!this->GetGlobalNinjaGenerator()->IsExcluded(
             this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0],
             *t))
-        this->GetGlobalNinjaGenerator()->AddDependencyToAll((*t)->Target);
+        this->GetGlobalNinjaGenerator()->AddDependencyToAll(*t);
       delete tg;
       }
     }
@@ -285,14 +285,14 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
 
 void
 cmLocalNinjaGenerator
-::AppendTargetOutputs(cmTarget* target, cmNinjaDeps& outputs)
+::AppendTargetOutputs(cmGeneratorTarget* target, cmNinjaDeps& outputs)
 {
   this->GetGlobalNinjaGenerator()->AppendTargetOutputs(target, outputs);
 }
 
 void
 cmLocalNinjaGenerator
-::AppendTargetDepends(cmTarget* target, cmNinjaDeps& outputs)
+::AppendTargetDepends(cmGeneratorTarget* target, cmNinjaDeps& outputs)
 {
   this->GetGlobalNinjaGenerator()->AppendTargetDepends(target, outputs);
 }
@@ -441,7 +441,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
 }
 
 void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand const* cc,
-                                                   cmTarget* target)
+                                                   cmGeneratorTarget* target)
 {
   this->CustomCommandTargets[cc].insert(target);
 }
@@ -459,7 +459,7 @@ void cmLocalNinjaGenerator::WriteCustomCommandBuildStatements()
     //
     // FIXME: This won't work in certain obscure scenarios involving indirect
     // dependencies.
-    std::set<cmTarget*>::iterator j = i->second.begin();
+    std::set<cmGeneratorTarget*>::iterator j = i->second.begin();
     assert(j != i->second.end());
     std::vector<std::string> ccTargetDeps;
     this->AppendTargetDepends(*j, ccTargetDeps);
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index ce5f82d..b6987ef 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -58,10 +58,11 @@ public:
 
   std::string BuildCommandLine(const std::vector<std::string> &cmdLines);
 
-  void AppendTargetOutputs(cmTarget* target, cmNinjaDeps& outputs);
-  void AppendTargetDepends(cmTarget* target, cmNinjaDeps& outputs);
+  void AppendTargetOutputs(cmGeneratorTarget* target, cmNinjaDeps& outputs);
+  void AppendTargetDepends(cmGeneratorTarget* target, cmNinjaDeps& outputs);
 
-  void AddCustomCommandTarget(cmCustomCommand const* cc, cmTarget* target);
+  void AddCustomCommandTarget(cmCustomCommand const* cc,
+                              cmGeneratorTarget* target);
   void AppendCustomCommandLines(cmCustomCommandGenerator const& ccg,
                                 std::vector<std::string> &cmdLines);
   void AppendCustomCommandDeps(cmCustomCommandGenerator const& ccg,
@@ -102,7 +103,7 @@ private:
 
   std::string HomeRelativeOutputPath;
 
-  typedef std::map<cmCustomCommand const*, std::set<cmTarget*> >
+  typedef std::map<cmCustomCommand const*, std::set<cmGeneratorTarget*> >
     CustomCommandTargetMap;
   CustomCommandTargetMap CustomCommandTargets;
 };
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index dafbda9..b533d37 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -399,7 +399,6 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
 
 void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 {
-  cmTarget& target = *this->GetTarget();
   cmGeneratorTarget& gt = *this->GetGeneratorTarget();
   const std::string cfgName = this->GetConfigName();
   std::string targetOutput = ConvertToNinjaPath(
@@ -443,7 +442,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   // Write comments.
   cmGlobalNinjaGenerator::WriteDivider(this->GetBuildFileStream());
-  const cmState::TargetType targetType = target.GetType();
+  const cmState::TargetType targetType = gt.GetType();
   this->GetBuildFileStream()
     << "# Link build statements for "
     << cmState::GetTargetTypeName(targetType)
@@ -490,13 +489,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                           &genTarget,
                           useWatcomQuote);
   if(this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS")
-     && target.GetType() == cmState::SHARED_LIBRARY)
+     && gt.GetType() == cmState::SHARED_LIBRARY)
     {
-    if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(gt.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string name_of_def_file
         = gt.GetSupportDirectory();
-      name_of_def_file += "/" + target.GetName();
+      name_of_def_file += "/" + gt.GetName();
       name_of_def_file += ".def ";
       vars["LINK_FLAGS"] += " /DEF:";
       vars["LINK_FLAGS"] += this->GetLocalGenerator()
@@ -505,7 +504,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       }
     }
 
-  this->addPoolNinjaVariable("JOB_POOL_LINK", &target, vars);
+  this->addPoolNinjaVariable("JOB_POOL_LINK", &gt, vars);
 
   this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);
   vars["LINK_FLAGS"] = cmGlobalNinjaGenerator
@@ -599,9 +598,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   const std::vector<cmCustomCommand> *cmdLists[3] = {
-    &target.GetPreBuildCommands(),
-    &target.GetPreLinkCommands(),
-    &target.GetPostBuildCommands()
+    &gt.Target->GetPreBuildCommands(),
+    &gt.Target->GetPreLinkCommands(),
+    &gt.Target->GetPostBuildCommands()
   };
 
   std::vector<std::string> preLinkCmdLines, postBuildCmdLines;
@@ -626,17 +625,17 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // maybe create .def file from list of objects
-  if (target.GetType() == cmState::SHARED_LIBRARY &&
+  if (gt.GetType() == cmState::SHARED_LIBRARY &&
       this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
     {
-    if(target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
+    if(gt.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
       {
       std::string cmakeCommand =
       this->GetLocalGenerator()->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       std::string name_of_def_file
         = gt.GetSupportDirectory();
-      name_of_def_file += "/" + target.GetName();
+      name_of_def_file += "/" + gt.GetName();
       name_of_def_file += ".def";
       std::string cmd = cmakeCommand;
       cmd += " -E __create_def ";
@@ -699,11 +698,11 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   const std::string rspfile =
       std::string(cmake::GetCMakeFilesDirectoryPostSlash())
-      + target.GetName() + ".rsp";
+      + gt.GetName() + ".rsp";
 
   // Gather order-only dependencies.
   cmNinjaDeps orderOnlyDeps;
-  this->GetLocalGenerator()->AppendTargetDepends(this->GetTarget(),
+  this->GetLocalGenerator()->AppendTargetDepends(this->GetGeneratorTarget(),
     orderOnlyDeps);
 
   // Ninja should restat after linking if and only if there are byproducts.
@@ -772,8 +771,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   // Add aliases for the file name and the target name.
-  globalGen.AddTargetAlias(this->TargetNameOut, &target);
-  globalGen.AddTargetAlias(this->GetTargetName(), &target);
+  globalGen.AddTargetAlias(this->TargetNameOut, &gt);
+  globalGen.AddTargetAlias(this->GetTargetName(), &gt);
 }
 
 //----------------------------------------------------------------------------
@@ -781,7 +780,8 @@ void cmNinjaNormalTargetGenerator::WriteObjectLibStatement()
 {
   // Write a phony output that depends on all object files.
   cmNinjaDeps outputs;
-  this->GetLocalGenerator()->AppendTargetOutputs(this->GetTarget(), outputs);
+  this->GetLocalGenerator()->AppendTargetOutputs(this->GetGeneratorTarget(),
+                                                 outputs);
   cmNinjaDeps depends = this->GetObjects();
   this->GetGlobalGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
                                               "Object library "
@@ -791,5 +791,5 @@ void cmNinjaNormalTargetGenerator::WriteObjectLibStatement()
 
   // Add aliases for the target name.
   this->GetGlobalGenerator()->AddTargetAlias(this->GetTargetName(),
-                                             this->GetTarget());
+                                             this->GetGeneratorTarget());
 }
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index b018005..dc2c7a6 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -486,7 +486,8 @@ cmNinjaTargetGenerator
       si != customCommands.end(); ++si)
      {
      cmCustomCommand const* cc = (*si)->GetCustomCommand();
-     this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
+     this->GetLocalGenerator()->AddCustomCommandTarget(cc,
+         this->GetGeneratorTarget());
      // Record the custom commands for this target. The container is used
      // in WriteObjectBuildStatement when called in a loop below.
      this->CustomCommands.push_back(cc);
@@ -511,7 +512,8 @@ cmNinjaTargetGenerator
     }
 
   cmNinjaDeps orderOnlyDeps;
-  this->GetLocalGenerator()->AppendTargetDepends(this->Target, orderOnlyDeps);
+  this->GetLocalGenerator()->AppendTargetDepends(this->GeneratorTarget,
+                                                 orderOnlyDeps);
 
   // Add order-only dependencies on custom command outputs.
   for(std::vector<cmCustomCommand const*>::const_iterator
@@ -633,7 +635,8 @@ cmNinjaTargetGenerator
                               ConvertToNinjaPath(objectFileDir),
                               cmLocalGenerator::SHELL);
 
-  this->addPoolNinjaVariable("JOB_POOL_COMPILE", this->GetTarget(), vars);
+  this->addPoolNinjaVariable("JOB_POOL_COMPILE",
+                             this->GetGeneratorTarget(), vars);
 
   this->SetMsvcTargetPdbVariable(vars);
 
@@ -782,7 +785,7 @@ cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
 
 void cmNinjaTargetGenerator::addPoolNinjaVariable(
                                               const std::string& pool_property,
-                                              cmTarget* target,
+                                              cmGeneratorTarget* target,
                                               cmNinjaVars& vars)
 {
     const char* pool = target->GetProperty(pool_property);
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 0267f63..e3ec423 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -53,9 +53,6 @@ protected:
   cmGeneratedFileStream& GetBuildFileStream() const;
   cmGeneratedFileStream& GetRulesFileStream() const;
 
-  cmTarget* GetTarget() const
-  { return this->Target; }
-
   cmGeneratorTarget* GetGeneratorTarget() const
   { return this->GeneratorTarget; }
 
@@ -152,7 +149,7 @@ protected:
   std::set<std::string> MacContentFolders;
 
   void addPoolNinjaVariable(const std::string& pool_property,
-                            cmTarget* target,
+                            cmGeneratorTarget* target,
                             cmNinjaVars& vars);
 
 private:
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 5bbe268..b2a5334 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -16,7 +16,6 @@
 #include "cmGlobalNinjaGenerator.h"
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
-#include "cmTarget.h"
 #include "cmCustomCommandGenerator.h"
 
 cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(
@@ -34,8 +33,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
   cmNinjaDeps deps, outputs, util_outputs(1, utilCommandName);
 
   const std::vector<cmCustomCommand> *cmdLists[2] = {
-    &this->GetTarget()->GetPreBuildCommands(),
-    &this->GetTarget()->GetPostBuildCommands()
+    &this->GetGeneratorTarget()->Target->GetPreBuildCommands(),
+    &this->GetGeneratorTarget()->Target->GetPostBuildCommands()
   };
 
   bool uses_terminal = false;
@@ -66,7 +65,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
       {
       cmCustomCommandGenerator ccg(*cc, this->GetConfigName(),
                                    this->GetLocalGenerator());
-      this->GetLocalGenerator()->AddCustomCommandTarget(cc, this->GetTarget());
+      this->GetLocalGenerator()->AddCustomCommandTarget(cc,
+          this->GetGeneratorTarget());
 
       // Depend on all custom command outputs.
       const std::vector<std::string>& ccOutputs = ccg.GetOutputs();
@@ -78,8 +78,10 @@ void cmNinjaUtilityTargetGenerator::Generate()
       }
     }
 
-  this->GetLocalGenerator()->AppendTargetOutputs(this->GetTarget(), outputs);
-  this->GetLocalGenerator()->AppendTargetDepends(this->GetTarget(), deps);
+  this->GetLocalGenerator()->AppendTargetOutputs(this->GetGeneratorTarget(),
+                                                 outputs);
+  this->GetLocalGenerator()->AppendTargetDepends(this->GetGeneratorTarget(),
+                                                 deps);
 
   if (commands.empty()) {
     this->GetGlobalGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
@@ -140,5 +142,5 @@ void cmNinjaUtilityTargetGenerator::Generate()
   }
 
   this->GetGlobalGenerator()->AddTargetAlias(this->GetTargetName(),
-                                             this->GetTarget());
+                                             this->GetGeneratorTarget());
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c41e74da58b6f1057466e7eaa22942dc62c8802
commit 4c41e74da58b6f1057466e7eaa22942dc62c8802
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:59:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:53 2015 +0200

    Use cmLocalGenerator at generate-time.

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 6920faf..2c47ab2 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -123,7 +123,7 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const
     else
       {
       // Interpret relative to the current output directory.
-      mod_dir = this->Makefile->GetCurrentBinaryDirectory();
+      mod_dir = this->LocalGenerator->GetCurrentBinaryDirectory();
       mod_dir += "/";
       mod_dir += target_mod_dir;
       }
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 1a84625..d52ce35 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -456,13 +456,13 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
 
   if (cge->GetHadContextSensitiveCondition())
     {
-    cmMakefile* mf = target->Target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" is installed with "
     "INCLUDES DESTINATION set to a context sensitive path.  Paths which "
     "depend on the configuration, policy values or the link interface are "
     "not supported.  Consider using target_include_directories instead.";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
@@ -535,11 +535,11 @@ void getCompatibleInterfaceProperties(cmGeneratorTarget *target,
 
   if (!info)
     {
-    cmMakefile* mf = target->Target->GetMakefile();
+    cmLocalGenerator* lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Exporting the target \"" << target->GetName() << "\" is not "
         "allowed since its linker language cannot be determined";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
@@ -835,13 +835,13 @@ cmExportFileGenerator
 
   if(newCMP0022Behavior && !this->ExportOld)
     {
-    cmMakefile *mf = target->Target->GetMakefile();
+    cmLocalGenerator *lg = target->GetLocalGenerator();
     std::ostringstream e;
     e << "Target \"" << target->GetName() << "\" has policy CMP0022 enabled, "
          "but also has old-style LINK_INTERFACE_LIBRARIES properties "
          "populated, but it was exported without the "
          "EXPORT_LINK_INTERFACE_LIBRARIES to export the old-style properties";
-    mf->IssueMessage(cmake::FATAL_ERROR, e.str());
+    lg->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
     }
 
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 89a6dff..6e650ce 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -719,7 +719,7 @@ void cmGlobalNinjaGenerator
 {
   // Compute full path to object file directory for this target.
   std::string dir;
-  dir += gt->Makefile->GetCurrentBinaryDirectory();
+  dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
@@ -938,7 +938,7 @@ cmGlobalNinjaGenerator
   case cmState::OBJECT_LIBRARY:
   case cmState::UTILITY: {
     std::string path = this->ConvertToNinjaPath(
-      target->GetMakefile()->GetCurrentBinaryDirectory());
+      target->GetLocalGenerator()->GetCurrentBinaryDirectory());
     if (path.empty() || path == ".")
       outputs.push_back(target->GetName());
     else {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 2a5b153..4d7ca25 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -116,7 +116,7 @@ cmGlobalUnixMakefileGenerator3
 {
   // Compute full path to object file directory for this target.
   std::string dir;
-  dir += gt->Makefile->GetCurrentBinaryDirectory();
+  dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   dir += gt->LocalGenerator->GetTargetDirectory(gt);
   dir += "/";
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 7a10356..59d06f6 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -76,7 +76,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
   if(this->Target->NeedRelinkBeforeInstall(config))
     {
     fromDirConfig =
-        this->Target->Target->GetMakefile()->GetCurrentBinaryDirectory();
+        this->Target->GetLocalGenerator()->GetCurrentBinaryDirectory();
     fromDirConfig += cmake::GetCMakeFilesDirectory();
     fromDirConfig += "/CMakeRelink.dir/";
     }
@@ -111,7 +111,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
     case cmState::UTILITY:
     case cmState::GLOBAL_TARGET:
     case cmState::UNKNOWN_LIBRARY:
-      this->Target->Target->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR,
+      this->Target->GetLocalGenerator()->IssueMessage(cmake::INTERNAL_ERROR,
         "cmInstallTargetGenerator created with non-installable target.");
       return;
     }
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 2166c09..c37417d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2140,7 +2140,7 @@ void cmLocalGenerator
       "has the following visibility properties set for " << lang << ":\n" <<
       warnCMP0063 <<
       "For compatibility CMake is not honoring them for this target.";
-    target->Target->GetMakefile()->GetCMakeInstance()
+    target->GetLocalGenerator()->GetCMakeInstance()
       ->IssueMessage(cmake::AUTHOR_WARNING, w.str(),
                      target->GetBacktrace());
     }
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index dae8aaf..e9dc9ff 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -188,7 +188,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
     // Compute full path to object file directory for this target.
     std::string dir;
-    dir += gt->Makefile->GetCurrentBinaryDirectory();
+    dir += gt->LocalGenerator->GetCurrentBinaryDirectory();
     dir += "/";
     dir += this->GetTargetDirectory(gt);
     dir += "/";

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67b2f4312c431eb363dd94a2bb5d88cc6c8a7c95
commit 67b2f4312c431eb363dd94a2bb5d88cc6c8a7c95
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 17:06:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:53 2015 +0200

    Port to GetGeneratorTargets.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 03f4fdd..113c989 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -175,13 +175,12 @@ void cmComputeTargetDepends::CollectTargets()
     this->GlobalGenerator->GetLocalGenerators();
   for(unsigned int i = 0; i < lgens.size(); ++i)
     {
-    const cmTargets& targets = lgens[i]->GetMakefile()->GetTargets();
-    for(cmTargets::const_iterator ti = targets.begin();
+    const std::vector<cmGeneratorTarget*> targets =
+        lgens[i]->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      cmTarget const* target = &ti->second;
-      cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(target);
+      cmGeneratorTarget* gt = *ti;
       int index = static_cast<int>(this->Targets.size());
       this->TargetIndex[gt] = index;
       this->Targets.push_back(gt);
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 3bc76fa..a71b1cb 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -319,12 +319,12 @@ void cmExtraCodeBlocksGenerator
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
        lg!=lgs.end(); lg++)
     {
-    cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -333,7 +333,7 @@ void cmExtraCodeBlocksGenerator
           if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
-            this->AppendTarget(fout, ti->first, 0,
+            this->AppendTarget(fout, targetName, 0,
                                make.c_str(), *lg, compiler.c_str());
             }
           }
@@ -341,15 +341,16 @@ void cmExtraCodeBlocksGenerator
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-             || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-             || ((ti->first.find("Experimental")==0)
-                                               && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+             || ((targetName.find("Continuous")==0)
+                 &&(targetName!="Continuous"))
+             || ((targetName.find("Experimental")==0)
+                                             && (targetName!="Experimental")))
             {
             break;
             }
 
-          this->AppendTarget(fout, ti->first, 0,
+          this->AppendTarget(fout, targetName, 0,
                                  make.c_str(), *lg, compiler.c_str());
           break;
         case cmState::EXECUTABLE:
@@ -358,11 +359,10 @@ void cmExtraCodeBlocksGenerator
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
-          this->AppendTarget(fout, ti->first, gt,
+          cmGeneratorTarget* gt = *ti;
+          this->AppendTarget(fout, targetName, gt,
                              make.c_str(), *lg, compiler.c_str());
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
           this->AppendTarget(fout, fastTarget, gt,
                              make.c_str(), *lg, compiler.c_str());
@@ -388,11 +388,11 @@ void cmExtraCodeBlocksGenerator
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -402,8 +402,7 @@ void cmExtraCodeBlocksGenerator
         case cmState::UTILITY: // can have sources since 2.6.3
           {
           std::vector<cmSourceFile*> sources;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
@@ -442,7 +441,7 @@ void cmExtraCodeBlocksGenerator
               }
 
             CbpUnit &cbpUnit = allFiles[fullPath];
-            cbpUnit.Targets.push_back(&(ti->second));
+            cbpUnit.Targets.push_back((*ti)->Target);
             }
           }
         default:  // intended fallthrough
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 10f33be..f4a6537 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -155,12 +155,12 @@ void cmExtraCodeLiteGenerator
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
 
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
           {
@@ -186,7 +186,7 @@ void cmExtraCodeLiteGenerator
           break;
         }
 
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -194,8 +194,7 @@ void cmExtraCodeLiteGenerator
         case cmState::MODULE_LIBRARY:
           {
           std::vector<cmSourceFile*> sources;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           gt->GetSourceFiles(sources,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 1921f03..aedf6f4 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -536,13 +536,15 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
        ++lgIt)
     {
     cmMakefile* makefile = (*lgIt)->GetMakefile();
-    const cmTargets& targets = makefile->GetTargets();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*lgIt)->GetGeneratorTargets();
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end();++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti=targets.begin();
+        ti!=targets.end();++ti)
       {
       std::string linkName2 = linkName;
       linkName2 += "/";
-      switch(ti->second.GetType())
+      switch((*ti)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -550,10 +552,10 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
+          const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
           linkName2 += prefix;
-          linkName2 += ti->first;
+          linkName2 += (*ti)->GetName();
           this->AppendLinkedResource(fout, linkName2, "virtual:/virtual",
                                      VirtualFolder);
           if (!this->GenerateLinkedResources)
@@ -562,10 +564,8 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
             }
           std::vector<cmSourceGroup> sourceGroups=makefile->GetSourceGroups();
           // get the files from the source lists then add them to the groups
-          cmTarget* tgt = const_cast<cmTarget*>(&ti->second);
+          cmGeneratorTarget* gt = const_cast<cmGeneratorTarget*>(*ti);
           std::vector<cmSourceFile*> files;
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(tgt);
           gt->GetSourceFiles(files,
                             makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
           for(std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
@@ -1030,7 +1030,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*it)->GetGeneratorTargets();
     std::string subdir = (*it)->Convert((*it)->GetCurrentBinaryDirectory(),
                            cmLocalGenerator::HOME_OUTPUT);
     if (subdir == ".")
@@ -1038,9 +1039,11 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       subdir = "";
       }
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti =
+        targets.begin(); ti!=targets.end(); ++ti)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -1048,22 +1051,22 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           // not from the subdirs
           if (subdir.empty())
            {
-           this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
+           this->AppendTarget(fout, targetName, make, makeArgs, subdir, ": ");
            }
          }
          break;
        case cmState::UTILITY:
          // Add all utility targets, except the Nightly/Continuous/
          // Experimental-"sub"targets as e.g. NightlyStart
-         if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-          || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-          || ((ti->first.find("Experimental")==0)
-                                            && (ti->first!="Experimental")))
+         if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+          || ((targetName.find("Continuous")==0)&&(targetName!="Continuous"))
+          || ((targetName.find("Experimental")==0)
+                                            && (targetName!="Experimental")))
            {
            break;
            }
 
-         this->AppendTarget(fout, ti->first, make, makeArgs, subdir, ": ");
+         this->AppendTarget(fout, targetName, make, makeArgs, subdir, ": ");
          break;
        case cmState::EXECUTABLE:
        case cmState::STATIC_LIBRARY:
@@ -1071,10 +1074,10 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        case cmState::MODULE_LIBRARY:
        case cmState::OBJECT_LIBRARY:
          {
-         const char* prefix = (ti->second.GetType()==cmState::EXECUTABLE ?
+         const char* prefix = ((*ti)->GetType()==cmState::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
-         this->AppendTarget(fout, ti->first, make, makeArgs, subdir, prefix);
-         std::string fastTarget = ti->first;
+         this->AppendTarget(fout, targetName, make, makeArgs, subdir, prefix);
+         std::string fastTarget = targetName;
          fastTarget += "/fast";
          this->AppendTarget(fout, fastTarget, make, makeArgs, subdir, prefix);
 
@@ -1083,21 +1086,20 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
           {
           std::string virtDir = "[Targets]/";
           virtDir += prefix;
-          virtDir += ti->first;
+          virtDir += targetName;
           std::string buildArgs = "-C \"";
           buildArgs += (*it)->GetBinaryDirectory();
           buildArgs += "\" ";
           buildArgs += makeArgs;
           this->AppendTarget(fout, "Build", make, buildArgs, virtDir, "",
-                             ti->first.c_str());
+                             targetName.c_str());
 
           std::string cleanArgs = "-E chdir \"";
           cleanArgs += (*it)->GetCurrentBinaryDirectory();
           cleanArgs += "\" \"";
           cleanArgs += cmSystemTools::GetCMakeCommand();
           cleanArgs += "\" -P \"";
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&ti->second);
+          cmGeneratorTarget* gt = *ti;
           cleanArgs += (*it)->GetTargetDirectory(gt);
           cleanArgs += "/cmake_clean.cmake\"";
           this->AppendTarget(fout, "Clean", cmSystemTools::GetCMakeCommand(),
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index dc6421b..1741acf 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -119,14 +119,16 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    const cmTargets& targets = (*it)->GetMakefile()->GetTargets();
-    cmMakefile* makefile=(*it)->GetMakefile();
+    const std::vector<cmGeneratorTarget*> targets =
+        (*it)->GetGeneratorTargets();
     std::string currentDir = (*it)->GetCurrentBinaryDirectory();
     bool topLevel = (currentDir == (*it)->GetBinaryDirectory());
 
-    for(cmTargets::const_iterator ti=targets.begin(); ti!=targets.end(); ++ti)
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti =
+        targets.begin(); ti!=targets.end(); ++ti)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -138,9 +140,9 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             insertTarget = true;
             // only add the "edit_cache" target if it's not ccmake, because
             // this will not work within the IDE
-            if (ti->first == "edit_cache")
+            if (targetName == "edit_cache")
               {
-              const char* editCommand = makefile->GetDefinition
+              const char* editCommand = (*it)->GetMakefile()->GetDefinition
               ("CMAKE_EDIT_COMMAND");
               if (editCommand == 0)
                 {
@@ -154,7 +156,7 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
             }
           if (insertTarget)
             {
-            this->AppendTarget(fout, ti->first, make, makeArgs,
+            this->AppendTarget(fout, targetName, make, makeArgs,
                                currentDir, homeOutputDir);
             }
         }
@@ -162,15 +164,16 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-            || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-            || ((ti->first.find("Experimental")==0)
-            && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+            || ((targetName.find("Continuous")==0)
+                &&(targetName!="Continuous"))
+            || ((targetName.find("Experimental")==0)
+            && (targetName!="Experimental")))
             {
               break;
             }
 
-            this->AppendTarget(fout, ti->first, make, makeArgs,
+            this->AppendTarget(fout, targetName, make, makeArgs,
                                currentDir, homeOutputDir);
           break;
         case cmState::EXECUTABLE:
@@ -179,9 +182,9 @@ cmExtraKateGenerator::WriteTargets(const cmLocalGenerator* lg,
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
         {
-          this->AppendTarget(fout, ti->first, make, makeArgs,
+          this->AppendTarget(fout, targetName, make, makeArgs,
                              currentDir, homeOutputDir);
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
           this->AppendTarget(fout, fastTarget, make, makeArgs,
                              currentDir, homeOutputDir);
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index ac0202b..47822e8 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -162,11 +162,12 @@ void cmExtraSublimeTextGenerator::
        lg!=lgs.end(); lg++)
     {
     cmMakefile* makefile=(*lg)->GetMakefile();
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*lg)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
-      switch(ti->second.GetType())
+      std::string targetName = (*ti)->GetName();
+      switch((*ti)->GetType())
         {
         case cmState::GLOBAL_TARGET:
           {
@@ -175,7 +176,7 @@ void cmExtraSublimeTextGenerator::
           if (strcmp((*lg)->GetCurrentBinaryDirectory(),
                      (*lg)->GetBinaryDirectory())==0)
             {
-            this->AppendTarget(fout, ti->first, *lg, 0,
+            this->AppendTarget(fout, targetName, *lg, 0,
                                make.c_str(), makefile, compiler.c_str(),
                                sourceFileFlags, false);
             }
@@ -184,15 +185,16 @@ void cmExtraSublimeTextGenerator::
         case cmState::UTILITY:
           // Add all utility targets, except the Nightly/Continuous/
           // Experimental-"sub"targets as e.g. NightlyStart
-          if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
-             || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
-             || ((ti->first.find("Experimental")==0)
-                                               && (ti->first!="Experimental")))
+          if (((targetName.find("Nightly")==0)   &&(targetName!="Nightly"))
+             || ((targetName.find("Continuous")==0)
+                 &&(targetName!="Continuous"))
+             || ((targetName.find("Experimental")==0)
+                 && (targetName!="Experimental")))
             {
             break;
             }
 
-          this->AppendTarget(fout, ti->first, *lg, 0,
+          this->AppendTarget(fout, targetName, *lg, 0,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           break;
@@ -202,12 +204,12 @@ void cmExtraSublimeTextGenerator::
         case cmState::MODULE_LIBRARY:
         case cmState::OBJECT_LIBRARY:
           {
-          this->AppendTarget(fout, ti->first, *lg, &ti->second,
+          this->AppendTarget(fout, targetName, *lg, (*ti)->Target,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
-          std::string fastTarget = ti->first;
+          std::string fastTarget = targetName;
           fastTarget += "/fast";
-          this->AppendTarget(fout, fastTarget, *lg, &ti->second,
+          this->AppendTarget(fout, fastTarget, *lg, (*ti)->Target,
                              make.c_str(), makefile, compiler.c_str(),
                              sourceFileFlags, false);
           }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 13efc4c..d26cc34 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1468,34 +1468,34 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
 #ifdef CMAKE_BUILD_WITH_CMAKE
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    cmTargets& targets =
-      this->LocalGenerators[i]->GetMakefile()->GetTargets();
+    std::vector<cmGeneratorTarget*> targets =
+      this->LocalGenerators[i]->GetGeneratorTargets();
     std::vector<cmGeneratorTarget*> filteredTargets;
     filteredTargets.reserve(targets.size());
-    for(cmTargets::iterator ti = targets.begin();
+    for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
         ti != targets.end(); ++ti)
       {
-      if (ti->second.GetType() == cmState::GLOBAL_TARGET)
+      if ((*ti)->GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
-      if(ti->second.GetType() != cmState::EXECUTABLE &&
-         ti->second.GetType() != cmState::STATIC_LIBRARY &&
-         ti->second.GetType() != cmState::SHARED_LIBRARY &&
-         ti->second.GetType() != cmState::MODULE_LIBRARY &&
-         ti->second.GetType() != cmState::OBJECT_LIBRARY)
+      if((*ti)->GetType() != cmState::EXECUTABLE &&
+         (*ti)->GetType() != cmState::STATIC_LIBRARY &&
+         (*ti)->GetType() != cmState::SHARED_LIBRARY &&
+         (*ti)->GetType() != cmState::MODULE_LIBRARY &&
+         (*ti)->GetType() != cmState::OBJECT_LIBRARY)
         {
         continue;
         }
-      if((!ti->second.GetPropertyAsBool("AUTOMOC")
-            && !ti->second.GetPropertyAsBool("AUTOUIC")
-            && !ti->second.GetPropertyAsBool("AUTORCC"))
-          || ti->second.IsImported())
+      if((!(*ti)->GetPropertyAsBool("AUTOMOC")
+            && !(*ti)->GetPropertyAsBool("AUTOUIC")
+            && !(*ti)->GetPropertyAsBool("AUTORCC"))
+          || (*ti)->IsImported())
         {
         continue;
         }
       // don't do anything if there is no Qt4 or Qt5Core (which contains moc):
-      cmMakefile* mf = ti->second.GetMakefile();
+      cmMakefile* mf = (*ti)->Target->GetMakefile();
       std::string qtMajorVersion = mf->GetSafeDefinition("QT_VERSION_MAJOR");
       if (qtMajorVersion == "")
         {
@@ -1506,7 +1506,7 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
         continue;
         }
 
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(&ti->second);
+      cmGeneratorTarget* gt = *ti;
 
       cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt);
       filteredTargets.push_back(gt);
@@ -2706,23 +2706,22 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
       {
       continue;
       }
-    cmMakefile* mf = (*i)->GetMakefile();
     // Get the targets in the makefile
-    cmTargets &tgts = mf->GetTargets();
+    std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
     // loop over all the targets
-    for (cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+    for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+         l != tgts.end(); ++l)
       {
-      cmTarget* target = &l->second;
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-      if(this->IsRootOnlyTarget(gt) &&
-         target->GetMakefile() != root->GetMakefile())
+      cmGeneratorTarget* target = *l;
+      if(this->IsRootOnlyTarget(target) &&
+         target->GetLocalGenerator() != root)
         {
         continue;
         }
       // put the target in the set of original targets
-      originalTargets.insert(gt);
+      originalTargets.insert(target);
       // Get the set of targets that depend on target
-      this->AddTargetDepends(gt, projectTargets);
+      this->AddTargetDepends(target, projectTargets);
       }
     }
 }
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 8659e34..7c6c48c 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -133,14 +133,13 @@ bool cmGlobalKdevelopGenerator
       }
 
     //get all sources
-    cmTargets& targets=makefile->GetTargets();
-    for (cmTargets::iterator ti = targets.begin();
+    std::vector<cmGeneratorTarget*> targets=(*it)->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
          ti != targets.end(); ti++)
       {
       std::vector<cmSourceFile*> sources;
-      cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(&ti->second);
-      gt->GetSourceFiles(sources, ti->second.GetMakefile()
+      cmGeneratorTarget* gt = *ti;
+      gt->GetSourceFiles(sources, gt->Target->GetMakefile()
                                     ->GetSafeDefinition("CMAKE_BUILD_TYPE"));
       for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
            si!=sources.end(); si++)
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 248701a..2a5b153 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -423,17 +423,18 @@ void cmGlobalUnixMakefileGenerator3
     {
     lg = static_cast<cmLocalUnixMakefileGenerator3 *>(lGenerators[i]);
     // for all of out targets
-    for (cmTargets::iterator l = lg->GetMakefile()->GetTargets().begin();
-         l != lg->GetMakefile()->GetTargets().end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+         l != tgts.end(); l++)
       {
-      if((l->second.GetType() == cmState::EXECUTABLE) ||
-         (l->second.GetType() == cmState::STATIC_LIBRARY) ||
-         (l->second.GetType() == cmState::SHARED_LIBRARY) ||
-         (l->second.GetType() == cmState::MODULE_LIBRARY) ||
-         (l->second.GetType() == cmState::OBJECT_LIBRARY) ||
-         (l->second.GetType() == cmState::UTILITY))
+      if(((*l)->GetType() == cmState::EXECUTABLE) ||
+         ((*l)->GetType() == cmState::STATIC_LIBRARY) ||
+         ((*l)->GetType() == cmState::SHARED_LIBRARY) ||
+         ((*l)->GetType() == cmState::MODULE_LIBRARY) ||
+         ((*l)->GetType() == cmState::OBJECT_LIBRARY) ||
+         ((*l)->GetType() == cmState::UTILITY))
         {
-        cmGeneratorTarget* gt = this->GetGeneratorTarget(&l->second);
+        cmGeneratorTarget* gt = *l;
         std::string tname = lg->GetRelativeTargetDirectory(gt);
         tname += "/DependInfo.cmake";
         cmSystemTools::ConvertToUnixSlashes(tname);
@@ -914,13 +915,11 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
       lgi != this->LocalGenerators.end(); ++lgi)
     {
     cmLocalGenerator* lg = *lgi;
-    cmMakefile* mf = lg->GetMakefile();
-    cmTargets const& targets = mf->GetTargets();
-    for(cmTargets::const_iterator t = targets.begin(); t != targets.end(); ++t)
+    std::vector<cmGeneratorTarget*> targets = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::const_iterator t = targets.begin();
+        t != targets.end(); ++t)
       {
-      cmTarget const& target = t->second;
-
-      cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
+      cmGeneratorTarget* gt = *t;
 
       cmLocalGenerator* tlg = gt->GetLocalGenerator();
 
@@ -1089,11 +1088,12 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
     if (lg2 == lg || lg->GetMakefile()->IsRootMakefile())
       {
       // for each target Generate the rule files for each target.
-      cmTargets& targets = lg2->GetMakefile()->GetTargets();
-      for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
+      std::vector<cmGeneratorTarget*> targets = lg2->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin();
+          t != targets.end(); ++t)
         {
-        cmTarget const& target = t->second;
-        cmState::TargetType type = target.GetType();
+        cmGeneratorTarget* target = *t;
+        cmState::TargetType type = target->GetType();
         if((type == cmState::EXECUTABLE) ||
            (type == cmState::STATIC_LIBRARY) ||
            (type == cmState::SHARED_LIBRARY) ||
@@ -1102,7 +1102,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
            (type == cmState::GLOBAL_TARGET) ||
            (type == cmState::UTILITY))
           {
-          std::string name = target.GetName();
+          std::string name = target->GetName();
           if(emittedTargets.insert(name).second)
             {
             path = "... ";
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 2d412f1..4d431f6 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -375,11 +375,11 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
     for(std::vector<cmLocalGenerator*>::iterator i = gen.begin();
         i != gen.end(); ++i)
       {
-      cmTargets& targets = (*i)->GetMakefile()->GetTargets();
-      for(cmTargets::iterator ti = targets.begin();
+      std::vector<cmGeneratorTarget*> targets = (*i)->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(ti->second);
+        this->ComputeVSTargetDepends(*(*ti)->Target);
         }
       }
     }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index c06f503..fe115ac 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -510,17 +510,20 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
       continue;
       }
 
-    cmTargets& tgts = lg->GetMakefile()->GetTargets();
-    for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+        l != tgts.end(); l++)
       {
-      cmTarget& target = l->second;
+      cmTarget& target = *(*l)->Target;
 
       if (target.GetType() == cmState::GLOBAL_TARGET)
         {
         continue;
         }
 
-      if (regenerate && (l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
+      std::string targetName = target.GetName();
+
+      if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
         {
         target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
         }
@@ -1085,21 +1088,26 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
                                            targets)
 {
   this->SetCurrentLocalGenerator(gen);
-  cmTargets &tgts = this->CurrentMakefile->GetTargets();
-  typedef std::map<std::string, cmTarget*, cmCompareTargets> cmSortedTargets;
+  std::vector<cmGeneratorTarget*> tgts =
+      this->CurrentLocalGenerator->GetGeneratorTargets();
+  typedef std::map<std::string, cmGeneratorTarget*, cmCompareTargets>
+      cmSortedTargets;
   cmSortedTargets sortedTargets;
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); l++)
     {
-    sortedTargets[l->first] = &l->second;
+    sortedTargets[(*l)->GetName()] = *l;
     }
   for(cmSortedTargets::iterator l = sortedTargets.begin();
       l != sortedTargets.end(); l++)
     {
-    cmTarget& cmtarget = *l->second;
-    cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
+    cmGeneratorTarget* gtgt = l->second;
+    cmTarget& cmtarget = *gtgt->Target;
+
+    std::string targetName = gtgt->GetName();
 
     // make sure ALL_BUILD, INSTALL, etc are only done once
-    if(this->SpecialTargetEmitted(l->first.c_str()))
+    if(this->SpecialTargetEmitted(targetName.c_str()))
       {
       continue;
       }
@@ -3062,10 +3070,11 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
       }
     cmMakefile* mf = (*i)->GetMakefile();
     std::vector<cmSourceGroup> sourceGroups = mf->GetSourceGroups();
-    cmTargets &tgts = mf->GetTargets();
-    for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+    std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
+    for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+        l != tgts.end(); l++)
       {
-      cmTarget& cmtarget = l->second;
+      cmTarget& cmtarget = *(*l)->Target;
 
       // Same skipping logic here as in CreateXCodeTargets so that we do not
       // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 3658473..2166c09 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2510,28 +2510,29 @@ cmLocalGenerator
 {
   // Convert the old-style install specification from each target to
   // an install generator and run it.
-  cmTargets& tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
 
     // Include the user-specified pre-install script for this target.
-    if(const char* preinstall = l->second.GetProperty("PRE_INSTALL_SCRIPT"))
+    if(const char* preinstall = (*l)->GetProperty("PRE_INSTALL_SCRIPT"))
       {
       cmInstallScriptGenerator g(preinstall, false, 0);
       g.Generate(os, config, configurationTypes);
       }
 
     // Install this target if a destination is given.
-    if(l->second.GetInstallPath() != "")
+    if((*l)->Target->GetInstallPath() != "")
       {
       // Compute the full install destination.  Note that converting
       // to unix slashes also removes any trailing slash.
       // We also skip over the leading slash given by the user.
-      std::string destination = l->second.GetInstallPath().substr(1);
+      std::string destination = (*l)->Target->GetInstallPath().substr(1);
       cmSystemTools::ConvertToUnixSlashes(destination);
       if(destination.empty())
         {
@@ -2539,7 +2540,7 @@ cmLocalGenerator
         }
 
       // Generate the proper install generator for this target type.
-      switch(l->second.GetType())
+      switch((*l)->GetType())
         {
         case cmState::EXECUTABLE:
         case cmState::STATIC_LIBRARY:
@@ -2547,7 +2548,7 @@ cmLocalGenerator
           {
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
-            g(this, l->first, destination.c_str(), false);
+            g(this, (*l)->GetName(), destination.c_str(), false);
           g.Generate(os, config, configurationTypes);
           }
           break;
@@ -2558,18 +2559,18 @@ cmLocalGenerator
           // to the normal destination and the DLL to the runtime
           // destination.
           cmInstallTargetGeneratorLocal
-            g1(this, l->first, destination.c_str(), true);
+            g1(this, (*l)->GetName(), destination.c_str(), true);
           g1.Generate(os, config, configurationTypes);
           // We also skip over the leading slash given by the user.
-          destination = l->second.GetRuntimeInstallPath().substr(1);
+          destination = (*l)->Target->GetRuntimeInstallPath().substr(1);
           cmSystemTools::ConvertToUnixSlashes(destination);
           cmInstallTargetGeneratorLocal
-            g2(this, l->first, destination.c_str(), false);
+            g2(this, (*l)->GetName(), destination.c_str(), false);
           g2.Generate(os, config, configurationTypes);
 #else
           // Use a target install generator.
           cmInstallTargetGeneratorLocal
-            g(this, l->first, destination.c_str(), false);
+            g(this, (*l)->GetName(), destination.c_str(), false);
           g.Generate(os, config, configurationTypes);
 #endif
           }
@@ -2580,7 +2581,7 @@ cmLocalGenerator
       }
 
     // Include the user-specified post-install script for this target.
-    if(const char* postinstall = l->second.GetProperty("POST_INSTALL_SCRIPT"))
+    if(const char* postinstall = (*l)->GetProperty("POST_INSTALL_SCRIPT"))
       {
       cmInstallScriptGenerator g(postinstall, false, 0);
       g.Generate(os, config, configurationTypes);
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 07f763b..dae8aaf 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1762,43 +1762,43 @@ void cmLocalUnixMakefileGenerator3
   ruleFileStream
     << "# Targets provided globally by CMake.\n"
     << "\n";
-  cmTargets* targets = &(this->Makefile->GetTargets());
-  cmTargets::iterator glIt;
-  for ( glIt = targets->begin(); glIt != targets->end(); ++ glIt )
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  std::vector<cmGeneratorTarget*>::iterator glIt;
+  for ( glIt = targets.begin(); glIt != targets.end(); ++ glIt )
     {
-    if ( glIt->second.GetType() == cmState::GLOBAL_TARGET )
+    if ( (*glIt)->GetType() == cmState::GLOBAL_TARGET )
       {
-      std::string targetString = "Special rule for the target " + glIt->first;
+      std::string targetString = "Special rule for the target " +
+          (*glIt)->GetName();
       std::vector<std::string> commands;
       std::vector<std::string> depends;
 
-      const char* text = glIt->second.GetProperty("EchoString");
+      const char* text = (*glIt)->GetProperty("EchoString");
       if ( !text )
         {
         text = "Running external command ...";
         }
-      depends.insert(depends.end(), glIt->second.GetUtilities().begin(),
-                     glIt->second.GetUtilities().end());
+      depends.insert(depends.end(), (*glIt)->Target->GetUtilities().begin(),
+                     (*glIt)->Target->GetUtilities().end());
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 
-      cmGeneratorTarget* gt = this->GlobalGenerator
-          ->GetGeneratorTarget(&glIt->second);
+      cmGeneratorTarget* gt = *glIt;
 
       // Global targets store their rules in pre- and post-build commands.
       this->AppendCustomDepends(depends,
-                                glIt->second.GetPreBuildCommands());
+                                gt->Target->GetPreBuildCommands());
       this->AppendCustomDepends(depends,
-                                glIt->second.GetPostBuildCommands());
+                                gt->Target->GetPostBuildCommands());
       this->AppendCustomCommands(commands,
-                                 glIt->second.GetPreBuildCommands(),
+                                 gt->Target->GetPreBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
       this->AppendCustomCommands(commands,
-                                 glIt->second.GetPostBuildCommands(),
+                                 gt->Target->GetPostBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
-      std::string targetName = glIt->second.GetName();
+      std::string targetName = gt->GetName();
       this->WriteMakeRule(ruleFileStream, targetString.c_str(),
                           targetName, depends, commands, true);
 
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 63fc283..c9d53fe 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -74,22 +74,23 @@ cmLocalVisualStudio10Generator::~cmLocalVisualStudio10Generator()
 void cmLocalVisualStudio10Generator::Generate()
 {
 
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
-       ->TargetIsFortranOnly(l->second))
+       ->TargetIsFortranOnly(*(*l)->Target))
       {
-      this->CreateSingleVCProj(l->first.c_str(),l->second);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     else
       {
       cmVisualStudio10TargetGenerator tg(
-        &l->second, static_cast<cmGlobalVisualStudio10Generator*>(
+        (*l)->Target, static_cast<cmGlobalVisualStudio10Generator*>(
           this->GetGlobalGenerator()));
       tg.Generate();
       }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index a51eb67..773e555 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -82,12 +82,12 @@ private:
 
 void cmLocalVisualStudio6Generator::AddCMakeListsRules()
 {
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin();
-      l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY
-        || l->second.GetType() == cmState::GLOBAL_TARGET)
+    if ((*l)->GetType() == cmState::INTERFACE_LIBRARY
+        || (*l)->GetType() == cmState::GLOBAL_TARGET)
       {
       continue;
       }
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
       this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
     if (!cmSystemTools::IsOn(suppRegenRule))
       {
-      this->AddDSPBuildRule(l->second);
+      this->AddDSPBuildRule(*(*l)->Target);
       }
     }
 }
@@ -124,54 +124,56 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
 
   // Create the DSP or set of DSP's for libraries and executables
 
-  cmTargets &tgts = this->Makefile->GetTargets();
-
-  // build any targets
-  for(cmTargets::iterator l = tgts.begin();
-      l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    switch(l->second.GetType())
+    switch((*l)->GetType())
       {
       case cmState::STATIC_LIBRARY:
       case cmState::OBJECT_LIBRARY:
-        this->SetBuildType(STATIC_LIBRARY, l->first.c_str(), l->second);
+        this->SetBuildType(STATIC_LIBRARY,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::SHARED_LIBRARY:
       case cmState::MODULE_LIBRARY:
-        this->SetBuildType(DLL, l->first.c_str(), l->second);
+        this->SetBuildType(DLL,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::EXECUTABLE:
-        this->SetBuildType(EXECUTABLE,l->first.c_str(), l->second);
+        this->SetBuildType(EXECUTABLE,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::UTILITY:
       case cmState::GLOBAL_TARGET:
-        this->SetBuildType(UTILITY, l->first.c_str(), l->second);
+        this->SetBuildType(UTILITY,
+                           (*l)->GetName().c_str(), *(*l)->Target);
         break;
       case cmState::INTERFACE_LIBRARY:
         continue;
       default:
-        cmSystemTools::Error("Bad target type: ", l->first.c_str());
+        cmSystemTools::Error("Bad target type: ", (*l)->GetName().c_str());
         break;
       }
     // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
     // so don't build a projectfile for it
     const char* path =
-      l->second.GetProperty("EXTERNAL_MSPROJECT");
+      (*l)->GetProperty("EXTERNAL_MSPROJECT");
     if(!path)
       {
       // check to see if the dsp is going into a sub-directory
-      std::string::size_type pos = l->first.rfind('/');
+      std::string::size_type pos = (*l)->GetName().rfind('/');
       if(pos != std::string::npos)
         {
         std::string dir = this->GetCurrentBinaryDirectory();
         dir += "/";
-        dir += l->first.substr(0, pos);
+        dir += (*l)->GetName().substr(0, pos);
         if(!cmSystemTools::MakeDirectory(dir.c_str()))
           {
           cmSystemTools::Error("Error creating directory: ", dir.c_str());
           }
         }
-      this->CreateSingleDSP(l->first.c_str(),l->second);
+      this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
       }
     }
 }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 819998c..4895698 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -67,19 +67,19 @@ cmLocalVisualStudio7Generator::~cmLocalVisualStudio7Generator()
 void cmLocalVisualStudio7Generator::AddHelperCommands()
 {
   // Now create GUIDs for targets
-  cmTargets &tgts = this->Makefile->GetTargets();
-
-  for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+      l != tgts.end(); ++l)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    const char* path = l->second.GetProperty("EXTERNAL_MSPROJECT");
+    const char* path = (*l)->GetProperty("EXTERNAL_MSPROJECT");
     if(path)
       {
       this->ReadAndStoreExternalGUID(
-        l->second.GetName().c_str(), path);
+        (*l)->GetName().c_str(), path);
       }
     }
 
@@ -95,7 +95,6 @@ void cmLocalVisualStudio7Generator::Generate()
 
 void cmLocalVisualStudio7Generator::AddCMakeListsRules()
 {
-  cmTargets &tgts = this->Makefile->GetTargets();
   // Create the regeneration custom rule.
   if(!this->Makefile->IsOn("CMAKE_SUPPRESS_REGENERATION"))
     {
@@ -104,17 +103,17 @@ void cmLocalVisualStudio7Generator::AddCMakeListsRules()
     if(cmSourceFile* sf = this->CreateVCProjBuildRule())
       {
       // Add the rule to targets that need it.
-      for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
+      std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+      for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
+          l != tgts.end(); ++l)
         {
-        if (l->second.GetType() == cmState::GLOBAL_TARGET)
+        if ((*l)->GetType() == cmState::GLOBAL_TARGET)
           {
           continue;
           }
-        if(l->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+        if((*l)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          cmGeneratorTarget* gt =
-              this->GlobalGenerator->GetGeneratorTarget(&l->second);
-          gt->AddSource(sf->GetFullPath());
+          (*l)->AddSource(sf->GetFullPath());
           }
         }
       }
@@ -126,11 +125,11 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   // Visual Studio .NET 2003 Service Pack 1 will not run post-build
   // commands for targets in which no sources are built.  Add dummy
   // rules to force these targets to build.
-  cmTargets &tgts = this->Makefile->GetTargets();
-  for(cmTargets::iterator l = tgts.begin();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = l->second;
+    cmTarget& tgt = *(*l)->Target;
     if(tgt.GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;
@@ -150,9 +149,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
            force.c_str(), no_depends, no_main_dependency,
            force_commands, " ", 0, true))
         {
-        cmGeneratorTarget* gt =
-            this->GlobalGenerator->GetGeneratorTarget(&tgt);
-        gt->AddSource(file->GetFullPath());
+        (*l)->AddSource(file->GetFullPath());
         }
       }
     }
@@ -176,21 +173,21 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
     }
 
   // Get the set of targets in this directory.
-  cmTargets &tgts = this->Makefile->GetTargets();
+  std::vector<cmGeneratorTarget*> tgts = this->GetGeneratorTargets();
 
   // Create the project file for each target.
-  for(cmTargets::iterator l = tgts.begin();
+  for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    if(l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    if((*l)->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
     // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
     // so don't build a projectfile for it
-    if(!l->second.GetProperty("EXTERNAL_MSPROJECT"))
+    if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
       {
-      this->CreateSingleVCProj(l->first.c_str(),l->second);
+      this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
       }
     }
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5
commit f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:51:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:53 2015 +0200

    Makefiles: Port progress marks to cmGeneratorTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3f600b2..fe6b446 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3607,6 +3607,18 @@ std::string cmGeneratorTarget::GetPDBName(const std::string& config) const
   return prefix+base+".pdb";
 }
 
+bool cmGeneratorTarget::StrictTargetComparison::operator()(
+    cmGeneratorTarget const* t1, cmGeneratorTarget const* t2) const
+{
+  int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str());
+  if (nameResult == 0)
+    {
+    return strcmp(t1->GetLocalGenerator()->GetCurrentBinaryDirectory(),
+                  t2->GetLocalGenerator()->GetCurrentBinaryDirectory()) < 0;
+    }
+  return nameResult < 0;
+}
+
 //----------------------------------------------------------------------------
 struct cmGeneratorTarget::SourceFileFlags
 cmGeneratorTarget::GetTargetSourceFileFlags(const cmSourceFile* sf) const
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 4383288..544cf0e 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -673,6 +673,11 @@ public:
   {
     return this->MaxLanguageStandards;
   }
+
+  struct StrictTargetComparison {
+    bool operator()(cmGeneratorTarget const* t1,
+                    cmGeneratorTarget const* t2) const;
+  };
 };
 
 #endif
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 74d23a3..248701a 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -778,7 +778,7 @@ cmGlobalUnixMakefileGenerator3
       std::ostringstream progressArg;
       const char* sep = "";
       std::vector<unsigned long>& progFiles =
-        this->ProgressMap[gtarget->Target].Marks;
+        this->ProgressMap[gtarget].Marks;
       for (std::vector<unsigned long>::iterator i = progFiles.begin();
            i != progFiles.end(); ++i)
         {
@@ -966,7 +966,7 @@ cmGlobalUnixMakefileGenerator3
   size_t count = 0;
   if(emitted.insert(target).second)
     {
-    count = this->ProgressMap[target->Target].Marks.size();
+    count = this->ProgressMap[target].Marks.size();
     TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -1003,7 +1003,7 @@ void
 cmGlobalUnixMakefileGenerator3::RecordTargetProgress(
   cmMakefileTargetGenerator* tg)
 {
-  TargetProgress& tp = this->ProgressMap[tg->GetTarget()];
+  TargetProgress& tp = this->ProgressMap[tg->GetGeneratorTarget()];
   tp.NumberOfActions = tg->GetNumberOfProgressActions();
   tp.VariableFile = tg->GetProgressFileNameFull();
 }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 5f39c79..0485eb8 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -192,8 +192,8 @@ protected:
     std::vector<unsigned long> Marks;
     void WriteProgressVariables(unsigned long total, unsigned long& current);
   };
-  typedef std::map<cmTarget const*, TargetProgress,
-                   cmStrictTargetComparison> ProgressMapType;
+  typedef std::map<cmGeneratorTarget const*, TargetProgress,
+                   cmGeneratorTarget::StrictTargetComparison> ProgressMapType;
   ProgressMapType ProgressMap;
 
   size_t CountProgressMarksInTarget(cmGeneratorTarget const* target,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6b7eb5bc8c304dab2102689eb09ec85c1e7f6be
commit a6b7eb5bc8c304dab2102689eb09ec85c1e7f6be
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 18 23:49:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:52 2015 +0200

    cmInstallTargetGenerator: Get a cmGeneratorTarget directly.
    
    Extend the cmGeneratorTarget API to make this possible.

diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index a97cc5f..7a10356 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -440,8 +440,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmGeneratorTarget const* target,
 
 void cmInstallTargetGenerator::Compute(cmLocalGenerator* lg)
 {
-  this->Target = lg->GetGlobalGenerator()->GetGeneratorTarget(
-        lg->GetMakefile()->FindTarget(this->TargetName));
+  this->Target = lg->FindGeneratorTarget(this->TargetName);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6959e1d..3658473 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -453,6 +453,13 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
   this->GeneratorTargets.push_back(gt);
 }
 
+cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
+    const std::string& name) const
+{
+  return this->GetGlobalGenerator()->GetGeneratorTarget(
+        this->Makefile->FindTarget(name));
+}
+
 //----------------------------------------------------------------------------
 void cmLocalGenerator::ComputeTargetManifest()
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 1375985..552020b 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -120,6 +120,7 @@ public:
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
 
+  cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
 
   /**

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2c239e607549d6513d95c3e919b4f509733bc87
commit c2c239e607549d6513d95c3e919b4f509733bc87
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 19:48:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:19:52 2015 +0200

    cmGlobalGenerator: Move GeneratorTargetsType to usage site.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 713ab6a..3f600b2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3607,18 +3607,6 @@ std::string cmGeneratorTarget::GetPDBName(const std::string& config) const
   return prefix+base+".pdb";
 }
 
-bool cmStrictTargetComparison::operator()(cmTarget const* t1,
-                                          cmTarget const* t2) const
-{
-  int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str());
-  if (nameResult == 0)
-    {
-    return strcmp(t1->GetMakefile()->GetCurrentBinaryDirectory(),
-                  t2->GetMakefile()->GetCurrentBinaryDirectory()) < 0;
-    }
-  return nameResult < 0;
-}
-
 //----------------------------------------------------------------------------
 struct cmGeneratorTarget::SourceFileFlags
 cmGeneratorTarget::GetTargetSourceFileFlags(const cmSourceFile* sf) const
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 2dc3a6f..4383288 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -675,12 +675,4 @@ public:
   }
 };
 
-struct cmStrictTargetComparison {
-  bool operator()(cmTarget const* t1, cmTarget const* t2) const;
-};
-
-typedef std::map<cmTarget const*,
-                 cmGeneratorTarget*,
-                 cmStrictTargetComparison> cmGeneratorTargetsType;
-
 #endif
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 7e9b599..13efc4c 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -48,6 +48,18 @@
 
 #include <assert.h>
 
+bool cmTarget::StrictTargetComparison::operator()(cmTarget const* t1,
+                                                  cmTarget const* t2) const
+{
+  int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str());
+  if (nameResult == 0)
+    {
+    return strcmp(t1->GetMakefile()->GetCurrentBinaryDirectory(),
+                  t2->GetMakefile()->GetCurrentBinaryDirectory()) < 0;
+    }
+  return nameResult < 0;
+}
+
 cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   : CMakeInstance(cm)
 {
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c59d42d..18f5329 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -42,6 +42,10 @@ class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 class cmExportBuildFileGenerator;
 
+typedef std::map<cmTarget const*,
+                 cmGeneratorTarget*,
+                 cmTarget::StrictTargetComparison> cmGeneratorTargetsType;
+
 /** \class cmGlobalGenerator
  * \brief Responsible for overseeing the generation process for the entire tree
  *
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index e8c05da..1cae94f 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -260,6 +260,10 @@ public:
   return this->LinkLibrariesForVS6;}
 #endif
 
+  struct StrictTargetComparison {
+    bool operator()(cmTarget const* t1, cmTarget const* t2) const;
+  };
+
 private:
   bool HandleLocationPropertyPolicy(cmMakefile* context) const;
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Sat Oct 24 03:24:57 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Sat, 24 Oct 2015 03:24:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-969-gb976c49
Message-ID: <20151024072457.13EF8C0641@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b976c491833cbe263ff972624650087253b2aa30 (commit)
       via  6cac952b9ed8ad202286ddee7246d9ef7ed8f22d (commit)
       via  97b3768898431ffff824388dc263654a35a33aa2 (commit)
       via  600af01d41e32d304e43dc98783ec0f7f010f40e (commit)
       via  330bfa83368989f6fd67072ef9f5c9e457230f17 (commit)
       via  b13e26e278dcc34243a2b31dfca8e23b01e15b76 (commit)
      from  ab90caa1110936859e9bd2c46aee3e043d2aab6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b976c491833cbe263ff972624650087253b2aa30
commit b976c491833cbe263ff972624650087253b2aa30
Merge: ab90caa 6cac952
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 03:24:55 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 24 03:24:55 2015 -0400

    Merge topic 'use-generator-target' into next
    
    6cac952b VS: Port interface to cmGeneratorTarget
    97b37688 VS: Port WriteUtilityDepends to cmGeneratorTarget
    600af01d VS: Port utility depends to cmGeneratorTarget
    330bfa83 VS: Port target depends to cmGeneratorTarget
    b13e26e2 VS: Port ProjectDepends to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cac952b9ed8ad202286ddee7246d9ef7ed8f22d
commit 6cac952b9ed8ad202286ddee7246d9ef7ed8f22d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:24:43 2015 +0200

    VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index bc91e87..6a0e5e9 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget&) { return false; }
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+  { return false; }
 
   const char* GetIntelProjectVersion();
 
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 9b8b9fd..bdb1b25 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -460,14 +460,15 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends(
 
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
-  cmTarget& target)
+        cmGeneratorTarget *target)
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target.GetUtilities().begin();
-      ui != target.GetUtilities().end(); ++ui)
+        target->Target->GetUtilities().begin();
+      ui != target->Target->GetUtilities().end(); ++ui)
     {
-    if(cmTarget* depTarget = this->FindTarget(ui->c_str()))
+    if(cmGeneratorTarget* depTarget =
+        target->GetLocalGenerator()->FindGeneratorTargetToUse(ui->c_str()))
       {
       if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index c05e5fa..b3093cc 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -60,7 +60,7 @@ public:
 
   /** Return true if the target project file should have the option
       LinkLibraryDependencies and link to .sln dependencies. */
-  virtual bool NeedLinkLibraryDependencies(cmTarget& target);
+  virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget* target);
 
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 0ba0ccb..b819dad 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -307,7 +307,7 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
         const cmGeneratorTarget *target,
         TargetSet& linked)
 {
-  if(linked.insert(target->Target).second)
+  if(linked.insert(target).second)
     {
     TargetDependSet const& depends =
             this->GetTargetDirectDepends(target);
@@ -326,10 +326,10 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure(
 cmGlobalVisualStudioGenerator::TargetSet const&
 cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 {
-  TargetSetMap::iterator i = this->TargetLinkClosure.find(target->Target);
+  TargetSetMap::iterator i = this->TargetLinkClosure.find(target);
   if(i == this->TargetLinkClosure.end())
     {
-    TargetSetMap::value_type entry(target->Target, TargetSet());
+    TargetSetMap::value_type entry(target, TargetSet());
     i = this->TargetLinkClosure.insert(entry).first;
     this->FillLinkClosure(target, i->second);
     }
@@ -338,7 +338,8 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target)
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudioGenerator::FollowLinkDepends(
-  cmTarget const* target, std::set<cmTarget const*>& linked)
+        const cmGeneratorTarget *target,
+        std::set<const cmGeneratorTarget *> &linked)
 {
   if(target->GetType() == cmState::INTERFACE_LIBRARY)
     {
@@ -349,14 +350,13 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
     {
     // Static library targets do not list their link dependencies so
     // we must follow them transitively now.
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-    TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+    TargetDependSet const& depends = this->GetTargetDirectDepends(target);
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
       {
       if(di->IsLink())
         {
-        this->FollowLinkDepends((*di)->Target, linked);
+        this->FollowLinkDepends(*di, linked);
         }
       }
     }
@@ -431,7 +431,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
-  std::set<cmTarget const*> linkDepends;
+  std::set<cmGeneratorTarget const*> linkDepends;
   if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
@@ -440,20 +440,20 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
       cmTargetDepend dep = *di;
       if(dep.IsLink())
         {
-        this->FollowLinkDepends(dep->Target, linkDepends);
+        this->FollowLinkDepends(*di, linkDepends);
         }
       }
     }
 
   // Collect explicit util dependencies (add_dependencies).
-  std::set<cmTarget const*> utilDepends;
+  std::set<cmGeneratorTarget const*> utilDepends;
   for(TargetDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
     cmTargetDepend dep = *di;
     if(dep.IsUtil())
       {
-      this->FollowLinkDepends(dep->Target, utilDepends);
+      this->FollowLinkDepends(*di, utilDepends);
       }
     }
 
@@ -466,23 +466,22 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
     }
 
   // Emit link dependencies.
-  for(std::set<cmTarget const*>::iterator di = linkDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = linkDepends.begin();
       di != linkDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
+    cmGeneratorTarget const* dep = *di;
     vsTargetDepend.insert(dep->GetName());
     }
 
   // Emit util dependencies.  Possibly use intermediate targets.
-  for(std::set<cmTarget const*>::iterator di = utilDepends.begin();
+  for(std::set<cmGeneratorTarget const*>::iterator di = utilDepends.begin();
       di != utilDepends.end(); ++di)
     {
-    cmTarget const* dep = *di;
-    cmGeneratorTarget* dgt = this->GetGeneratorTarget(dep);
-    if(allowLinkable || !VSLinkable(dgt) || linked.count(dep))
+    cmGeneratorTarget const* dgt = *di;
+    if(allowLinkable || !VSLinkable(dgt) || linked.count(dgt))
       {
       // Direct dependency allowed.
-      vsTargetDepend.insert(dep->GetName());
+      vsTargetDepend.insert(dgt->GetName());
       }
     else
       {
@@ -892,9 +891,7 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
   for (TargetSet::const_iterator it = targets.begin();
        it != targets.end(); ++it)
     {
-    cmGeneratorTarget* gt =
-        (*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
-    this->insert(gt);
+    this->insert(*it);
     }
 }
 
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index c81ddda..f827f26 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -88,7 +88,7 @@ public:
   /** Return true if building for Windows CE */
   virtual bool TargetsWindowsCE() const { return false; }
 
-  class TargetSet: public std::set<cmTarget const*> {};
+  class TargetSet: public std::set<cmGeneratorTarget const*> {};
   class TargetCompare
   {
     std::string First;
@@ -126,8 +126,9 @@ protected:
   VSDependMap VSTargetDepends;
   void ComputeVSTargetDepends(cmGeneratorTarget *);
 
-  bool CheckTargetLinks(cmTarget& target, const std::string& name);
-  std::string GetUtilityForTarget(cmTarget& target, const std::string&);
+  bool CheckTargetLinks(cmGeneratorTarget& target, const std::string& name);
+  std::string GetUtilityForTarget(cmGeneratorTarget& target,
+                                  const std::string&);
   virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
   std::string GetUtilityDepend(const cmGeneratorTarget *target);
   typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
@@ -141,13 +142,14 @@ private:
   void PrintCompilerAdvice(std::ostream&, std::string const&,
                            const char*) const {}
 
-  void FollowLinkDepends(cmTarget const* target,
-                         std::set<cmTarget const*>& linked);
+  void FollowLinkDepends(cmGeneratorTarget const* target,
+                         std::set<cmGeneratorTarget const*>& linked);
 
-  class TargetSetMap: public std::map<cmTarget*, TargetSet> {};
+  class TargetSetMap: public std::map<cmGeneratorTarget*, TargetSet> {};
   TargetSetMap TargetLinkClosure;
-  void FillLinkClosure(cmGeneratorTarget const* target, TargetSet& linked);
-  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget *target);
+  void FillLinkClosure(const cmGeneratorTarget *target,
+                       TargetSet& linked);
+  TargetSet const& GetTargetLinkClosure(cmGeneratorTarget* target);
 };
 
 class cmGlobalVisualStudioGenerator::OrderedTargetDependSet:
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5ba59ee..ca8d697 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1186,7 +1186,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
@@ -1285,7 +1285,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     fout << "\t\t\t<Tool\n"
          << "\t\t\t\tName=\"" << tool << "\"\n";
-    if(!gg->NeedLinkLibraryDependencies(*target->Target))
+    if(!gg->NeedLinkLibraryDependencies(target))
       {
       fout << "\t\t\t\tLinkLibraryDependencies=\"false\"\n";
       }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2bb67fd..9c9f5ab 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2677,7 +2677,7 @@ cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config)
 
   this->WriteString("</Link>\n", 2);
   if(!this->GlobalGenerator->NeedLinkLibraryDependencies(
-              *this->GeneratorTarget->Target))
+              this->GeneratorTarget))
     {
     this->WriteString("<ProjectReference>\n", 2);
     this->WriteString(

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97b3768898431ffff824388dc263654a35a33aa2
commit 97b3768898431ffff824388dc263654a35a33aa2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:47 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:24:43 2015 +0200

    VS: Port WriteUtilityDepends to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index dd4e871..bb494f1 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -383,12 +383,14 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target)
+cmGlobalVisualStudio6Generator::WriteUtilityDepend(
+        const cmGeneratorTarget *target)
 {
   std::string pname = target->GetName();
   pname += "_UTILITY";
   pname = GetVS6TargetName(pname.c_str());
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname =
+          target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".dsp";
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index edf637f..993a48f 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -97,7 +97,7 @@ private:
                             const std::string& name, const char* path,
                             const std::set<std::string>& dependencies);
   void WriteDSWFooter(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(const cmGeneratorTarget *target);
   std::string MSDevCommand;
   bool MSDevCommandInitialized;
   std::string const& GetMSDevCommand();
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 37f509a..5473247 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -888,13 +888,14 @@ void cmGlobalVisualStudio7Generator::WriteSLNHeader(std::ostream& fout)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudio7Generator::WriteUtilityDepend(
+        cmGeneratorTarget const* target)
 {
   std::vector<std::string> configs;
-  target->GetMakefile()->GetConfigurations(configs);
+  target->Target->GetMakefile()->GetConfigurations(configs);
   std::string pname = target->GetName();
   pname += "_UTILITY";
-  std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory();
+  std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
   fname += "/";
   fname += pname;
   fname += ".vcproj";
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index eed6f49..bc91e87 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -136,7 +136,7 @@ protected:
                                       cmLocalGenerator* root);
   virtual void WriteSLNFooter(std::ostream& fout);
   virtual void WriteSLNHeader(std::ostream& fout);
-  virtual std::string WriteUtilityDepend(cmTarget const* target);
+  virtual std::string WriteUtilityDepend(const cmGeneratorTarget *target);
 
   virtual void WriteTargetsToSolution(
     std::ostream& fout,
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 3e25559..0ba0ccb 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -514,7 +514,7 @@ cmGlobalVisualStudioGenerator::GetUtilityDepend(
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
     {
-    std::string name = this->WriteUtilityDepend(target->Target);
+    std::string name = this->WriteUtilityDepend(target);
     UtilityDependsMap::value_type entry(target, name);
     i = this->UtilityDepends.insert(entry).first;
     }
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 6d804d8..c81ddda 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -128,7 +128,7 @@ protected:
 
   bool CheckTargetLinks(cmTarget& target, const std::string& name);
   std::string GetUtilityForTarget(cmTarget& target, const std::string&);
-  virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
+  virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
   std::string GetUtilityDepend(const cmGeneratorTarget *target);
   typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
   UtilityDependsMap UtilityDepends;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=600af01d41e32d304e43dc98783ec0f7f010f40e
commit 600af01d41e32d304e43dc98783ec0f7f010f40e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:24:43 2015 +0200

    VS: Port utility depends to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 7d0c558..dd4e871 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -310,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
     }
   fout << "}}}\n\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 3152e91..8227b82 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -180,7 +180,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
 
   fout <<"EndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(t);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index b2ad365..37f509a 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -704,7 +704,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
        << dspname << ext << "\", \"{"
        << this->GetGUID(dspname) << "}\"\nEndProject\n";
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
@@ -748,7 +748,7 @@ cmGlobalVisualStudio7Generator
     depcount++;
     }
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index eb6a4ef..3e25559 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -488,7 +488,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
       {
       // Direct dependency on linkable target not allowed.
       // Use an intermediate utility target.
-      vsTargetDepend.insert(this->GetUtilityDepend(dep));
+      vsTargetDepend.insert(this->GetUtilityDepend(dgt));
       }
     }
 }
@@ -508,12 +508,13 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf)
 
 //----------------------------------------------------------------------------
 std::string
-cmGlobalVisualStudioGenerator::GetUtilityDepend(cmTarget const* target)
+cmGlobalVisualStudioGenerator::GetUtilityDepend(
+        cmGeneratorTarget const* target)
 {
   UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
   if(i == this->UtilityDepends.end())
     {
-    std::string name = this->WriteUtilityDepend(target);
+    std::string name = this->WriteUtilityDepend(target->Target);
     UtilityDependsMap::value_type entry(target, name);
     i = this->UtilityDepends.insert(entry).first;
     }
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 0b0b7b1..6d804d8 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -129,8 +129,8 @@ protected:
   bool CheckTargetLinks(cmTarget& target, const std::string& name);
   std::string GetUtilityForTarget(cmTarget& target, const std::string&);
   virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
-  std::string GetUtilityDepend(cmTarget const* target);
-  typedef std::map<cmTarget const*, std::string> UtilityDependsMap;
+  std::string GetUtilityDepend(const cmGeneratorTarget *target);
+  typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
   UtilityDependsMap UtilityDepends;
 
 protected:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=330bfa83368989f6fd67072ef9f5c9e457230f17
commit 330bfa83368989f6fd67072ef9f5c9e457230f17
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:45 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:24:43 2015 +0200

    VS: Port target depends to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 9e411c9..7d0c558 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -299,7 +299,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
   fout << "Package=<5>\n{{{\n}}}\n\n";
   fout << "Package=<4>\n";
   fout << "{{{\n";
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 77c8fc8..3152e91 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -206,7 +206,7 @@ cmGlobalVisualStudio71Generator
                       const std::string&,
                       const char*, cmGeneratorTarget const* target)
 {
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 972188f..b2ad365 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -730,7 +730,7 @@ cmGlobalVisualStudio7Generator
 {
   int depcount = 0;
   std::string dspguid = this->GetGUID(dspname);
-  VSDependSet const& depends = this->VSTargetDepends[target->Target];
+  VSDependSet const& depends = this->VSTargetDepends[target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 39a7bda..eb6a4ef 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -380,7 +380,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
       for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
           ti != targets.end(); ++ti)
         {
-        this->ComputeVSTargetDepends(*(*ti)->Target);
+        this->ComputeVSTargetDepends(*ti);
         }
       }
     }
@@ -394,13 +394,14 @@ static bool VSLinkable(cmGeneratorTarget const* t)
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
+void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
+        cmGeneratorTarget* target)
 {
-  if(this->VSTargetDepends.find(&target) != this->VSTargetDepends.end())
+  if(this->VSTargetDepends.find(target) != this->VSTargetDepends.end())
     {
     return;
     }
-  VSDependSet& vsTargetDepend = this->VSTargetDepends[&target];
+  VSDependSet& vsTargetDepend = this->VSTargetDepends[target];
   // VS <= 7.1 has two behaviors that affect solution dependencies.
   //
   // (1) Solution-level dependencies between a linkable target and a
@@ -420,19 +421,18 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // leaving them out for the static library itself but following them
   // transitively for other targets.
 
-  bool allowLinkable = (target.GetType() != cmState::STATIC_LIBRARY &&
-                        target.GetType() != cmState::SHARED_LIBRARY &&
-                        target.GetType() != cmState::MODULE_LIBRARY &&
-                        target.GetType() != cmState::EXECUTABLE);
+  bool allowLinkable = (target->GetType() != cmState::STATIC_LIBRARY &&
+                        target->GetType() != cmState::SHARED_LIBRARY &&
+                        target->GetType() != cmState::MODULE_LIBRARY &&
+                        target->GetType() != cmState::EXECUTABLE);
 
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
-  TargetDependSet const& depends = this->GetTargetDirectDepends(gt);
+  TargetDependSet const& depends = this->GetTargetDirectDepends(target);
 
   // Collect implicit link dependencies (target_link_libraries).
   // Static libraries cannot depend on their link implementation
   // due to behavior (2), but they do not really need to.
   std::set<cmTarget const*> linkDepends;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
     for(TargetDependSet::const_iterator di = depends.begin();
         di != depends.end(); ++di)
@@ -460,9 +460,9 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
   // Collect all targets linked by this target so we can avoid
   // intermediate targets below.
   TargetSet linked;
-  if(target.GetType() != cmState::STATIC_LIBRARY)
+  if(target->GetType() != cmState::STATIC_LIBRARY)
     {
-    linked = this->GetTargetLinkClosure(gt);
+    linked = this->GetTargetLinkClosure(target);
     }
 
   // Emit link dependencies.
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index f0bc5dc..0b0b7b1 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -122,9 +122,9 @@ protected:
 
   virtual bool ComputeTargetDepends();
   class VSDependSet: public std::set<std::string> {};
-  class VSDependMap: public std::map<cmTarget const*, VSDependSet> {};
+  class VSDependMap: public std::map<cmGeneratorTarget const*, VSDependSet> {};
   VSDependMap VSTargetDepends;
-  void ComputeVSTargetDepends(cmTarget&);
+  void ComputeVSTargetDepends(cmGeneratorTarget *);
 
   bool CheckTargetLinks(cmTarget& target, const std::string& name);
   std::string GetUtilityForTarget(cmTarget& target, const std::string&);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b13e26e278dcc34243a2b31dfca8e23b01e15b76
commit b13e26e278dcc34243a2b31dfca8e23b01e15b76
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 18:26:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:24:30 2015 +0200

    VS: Port ProjectDepends to cmGeneratorTarget.

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 195aaa0..77c8fc8 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -175,7 +175,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
        << this->ConvertToSolutionPath(dir) << (dir[0]? "\\":"")
        << dspname << ext << "\", \"{" << guid << "}\"\n";
   fout << "\tProjectSection(ProjectDependencies) = postProject\n";
-  this->WriteProjectDepends(fout, dspname, dir, *t->Target);
+  this->WriteProjectDepends(fout, dspname, dir, t);
   fout << "\tEndProjectSection\n";
 
   fout <<"EndProject\n";
@@ -204,9 +204,9 @@ void
 cmGlobalVisualStudio71Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string&,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -215,7 +215,7 @@ cmGlobalVisualStudio71Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index 074bce5..5035fda 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -62,7 +62,7 @@ protected:
                             const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const& t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 906166c..972188f 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -533,19 +533,19 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
       }
-    cmMakefile* mf = target->GetMakefile();
     const char *vcprojName =
       target->GetProperty("GENERATOR_FILE_NAME");
     if (vcprojName)
       {
-      std::string dir = mf->GetCurrentSourceDirectory();
+      std::string dir = target->GetLocalGenerator()
+              ->GetCurrentSourceDirectory();
       this->WriteProjectDepends(fout, vcprojName,
-                                dir.c_str(), *target);
+                                dir.c_str(), target);
       }
     }
 }
@@ -726,11 +726,11 @@ void
 cmGlobalVisualStudio7Generator
 ::WriteProjectDepends(std::ostream& fout,
                       const std::string& dspname,
-                      const char*, cmTarget const& target)
+                      const char*, cmGeneratorTarget const* target)
 {
   int depcount = 0;
   std::string dspguid = this->GetGUID(dspname);
-  VSDependSet const& depends = this->VSTargetDepends[&target];
+  VSDependSet const& depends = this->VSTargetDepends[target->Target];
   for(VSDependSet::const_iterator di = depends.begin();
       di != depends.end(); ++di)
     {
@@ -739,7 +739,7 @@ cmGlobalVisualStudio7Generator
     if(guid.empty())
       {
       std::string m = "Target: ";
-      m += target.GetName();
+      m += target->GetName();
       m += " depends on unknown target: ";
       m += name;
       cmSystemTools::Error(m.c_str());
@@ -748,7 +748,7 @@ cmGlobalVisualStudio7Generator
     depcount++;
     }
 
-  UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target);
+  UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
   if(ui != this->UtilityDepends.end())
     {
     const char* uname = ui->second.c_str();
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index a514dcd..eed6f49 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -126,7 +126,7 @@ protected:
                             const cmGeneratorTarget *t);
   virtual void WriteProjectDepends(std::ostream& fout,
                            const std::string& name, const char* path,
-                           cmTarget const&t);
+                           cmGeneratorTarget const* t);
   virtual void WriteProjectConfigurations(
     std::ostream& fout, const std::string& name, cmState::TargetType type,
     std::vector<std::string> const& configs,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index a22315c..9b8b9fd 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -441,9 +441,9 @@ bool cmGlobalVisualStudio8Generator::ComputeTargetDepends()
 
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Generator::WriteProjectDepends(
-  std::ostream& fout, const std::string&, const char*, cmTarget const& t)
+  std::ostream& fout, const std::string&, const char*,
+        cmGeneratorTarget const* gt)
 {
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(&t);
   TargetDependSet const& unordered = this->GetTargetDirectDepends(gt);
   OrderedTargetDependSet depends(unordered, std::string());
   for(OrderedTargetDependSet::const_iterator i = depends.begin();
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index 60c63d1..c05e5fa 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -91,7 +91,8 @@ protected:
   virtual bool ComputeTargetDepends();
   virtual void WriteProjectDepends(std::ostream& fout,
                                    const std::string& name,
-                                   const char* path, cmTarget const& t);
+                                   const char* path,
+                                   const cmGeneratorTarget *t);
 
   std::string Name;
   std::string WindowsCEVersion;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sun Oct 25 00:01:09 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sun, 25 Oct 2015 00:01:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-318-g33b43ec
Message-ID: <20151025040109.C507BC064A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  33b43ec26bc4c22998376cb1f087cd07856a61e0 (commit)
      from  66fcb15bb46a6e24bf513d3f703c1a08bb20aa8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33b43ec26bc4c22998376cb1f087cd07856a61e0
commit 33b43ec26bc4c22998376cb1f087cd07856a61e0
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sun Oct 25 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Oct 25 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index fce16dd..c48694e 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151024)
+set(CMake_VERSION_PATCH 20151025)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Mon Oct 26 00:01:07 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Mon, 26 Oct 2015 00:01:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-319-g70d2f2a
Message-ID: <20151026040107.3481BC0789@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  70d2f2aa610fe82f7eac4a4dab510ff8fa3e2638 (commit)
      from  33b43ec26bc4c22998376cb1f087cd07856a61e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70d2f2aa610fe82f7eac4a4dab510ff8fa3e2638
commit 70d2f2aa610fe82f7eac4a4dab510ff8fa3e2638
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Mon Oct 26 00:01:05 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Oct 26 00:01:05 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index c48694e..a5f01d3 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151025)
+set(CMake_VERSION_PATCH 20151026)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 09:08:22 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 09:08:22 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-972-g9b73251
Message-ID: <20151026130822.BA597C0B1A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9b73251ba80778b7e4c97dabe549e285d478d7b3 (commit)
       via  fb5c12d8d3a4a653854f42c15a6a170a5b5e1261 (commit)
       via  cad56c165456a71b2d078bf562f072ce703499f2 (commit)
      from  b976c491833cbe263ff972624650087253b2aa30 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b73251ba80778b7e4c97dabe549e285d478d7b3
commit 9b73251ba80778b7e4c97dabe549e285d478d7b3
Merge: b976c49 fb5c12d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 09:08:21 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 09:08:21 2015 -0400

    Merge topic 'update-libarchive' into next
    
    fb5c12d8 libarchive: Drop use of pthread.h for CMake build
    cad56c16 libarchive: Do not use pthread.h API without header


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb5c12d8d3a4a653854f42c15a6a170a5b5e1261
commit fb5c12d8d3a4a653854f42c15a6a170a5b5e1261
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 09:07:18 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 26 09:07:18 2015 -0400

    libarchive: Drop use of pthread.h for CMake build
    
    CMake does not use threads so we do not need this in our libarchive.

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 6b13c2f..00550e2 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -94,6 +94,8 @@ IF(WIN32)
   SET(_WIN32_WINNT ${WINVER})
 ENDIF(WIN32)
 
+set(HAVE_PTHREAD_H 0) # no threads in CMake
+
 IF("${CMAKE_C_PLATFORM_ID}" MATCHES "^(HP-UX)$")
   ADD_DEFINITIONS(-D_XOPEN_SOURCE=500) # Ask wchar.h for mbstate_t
 ENDIF()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cad56c165456a71b2d078bf562f072ce703499f2
commit cad56c165456a71b2d078bf562f072ce703499f2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 09:04:44 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 26 09:05:04 2015 -0400

    libarchive: Do not use pthread.h API without header

diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index f4d4254..a20b9b1 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -142,11 +142,10 @@ struct arc4_stream {
 	uint8_t s[256];
 };
 
-static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-
 #define	RANDOMDEV	"/dev/urandom"
 #define	KEYSIZE		128
 #ifdef HAVE_PTHREAD_H
+static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
 #define	_ARC4_LOCK()	pthread_mutex_lock(&arc4random_mtx);
 #define	_ARC4_UNLOCK()  pthread_mutex_unlock(&arc4random_mtx);
 #else

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmlibarchive/CMakeLists.txt              |    2 ++
 Utilities/cmlibarchive/libarchive/archive_random.c |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 13:02:57 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 13:02:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-974-g35313e8
Message-ID: <20151026170257.93FD2C0A86@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  35313e8e7b9286388c51bd4c5cbe0e4886730e47 (commit)
       via  77be366c5841d08c4128ae83946a48093fdbe789 (commit)
      from  9b73251ba80778b7e4c97dabe549e285d478d7b3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35313e8e7b9286388c51bd4c5cbe0e4886730e47
commit 35313e8e7b9286388c51bd4c5cbe0e4886730e47
Merge: 9b73251 77be366
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:02:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:02:56 2015 -0400

    Merge topic 'intel-fortran-2016' into next
    
    77be366c Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77be366c5841d08c4128ae83946a48093fdbe789
commit 77be366c5841d08c4128ae83946a48093fdbe789
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:00:15 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 26 13:02:37 2015 -0400

    Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)

diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
index 2533d3f..017af91 100644
--- a/Modules/CMakeFortranCompilerId.F.in
+++ b/Modules/CMakeFortranCompilerId.F.in
@@ -17,7 +17,9 @@
 
 # if defined(_MSC_VER)
         PRINT *, 'INFO:simulate[MSVC]'
-#  if _MSC_VER >= 1800
+#  if _MSC_VER >= 1900
+        PRINT *, 'INFO:simulate_version[019.00]'
+#  elif _MSC_VER >= 1800
         PRINT *, 'INFO:simulate_version[018.00]'
 #  elif _MSC_VER >= 1700
         PRINT *, 'INFO:simulate_version[017.00]'

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeFortranCompilerId.F.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 13:12:49 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 13:12:49 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-321-g8e86e11
Message-ID: <20151026171249.E3ECFBF7D8@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  8e86e113bc738cf3cce13991ff6208305f950206 (commit)
       via  194011b86f0d41c9f4cd10bdc3e4bf327db3d9d2 (commit)
      from  70d2f2aa610fe82f7eac4a4dab510ff8fa3e2638 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e86e113bc738cf3cce13991ff6208305f950206
commit 8e86e113bc738cf3cce13991ff6208305f950206
Merge: 70d2f2a 194011b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:12:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:12:48 2015 -0400

    Merge topic 'doc-add_executable-typo'
    
    194011b8 Help: Add missing parenthesis in add_executable docs


-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_executable.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 13:12:52 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 13:12:52 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-323-gf054552
Message-ID: <20151026171252.68BC1BF7EC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  f054552124bfffce3b15c3422ceb39acec9b8b6a (commit)
       via  e61973e1ab2c01f9ae5df145bfdc14e83a0cf1d9 (commit)
      from  8e86e113bc738cf3cce13991ff6208305f950206 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f054552124bfffce3b15c3422ceb39acec9b8b6a
commit f054552124bfffce3b15c3422ceb39acec9b8b6a
Merge: 8e86e11 e61973e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:12:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:12:50 2015 -0400

    Merge topic 'fix-test-RUN_SERIAL-failure-regression'
    
    e61973e1 CTest: Fix regression in handling of a RUN_SERIAL test that fails


-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestMultiProcessHandler.cxx             |    9 ++++-----
 Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake      |   15 +++++++++++++++
 ...il-fail-ctest-result.txt => SerialFailed-result.txt} |    0
 Tests/RunCMake/CTestCommandLine/SerialFailed-stderr.txt |    1 +
 Tests/RunCMake/CTestCommandLine/SerialFailed-stdout.txt |   10 ++++++++++
 5 files changed, 30 insertions(+), 5 deletions(-)
 copy Tests/RunCMake/CTestCommandLine/{repeat-until-fail-ctest-result.txt => SerialFailed-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestCommandLine/SerialFailed-stderr.txt
 create mode 100644 Tests/RunCMake/CTestCommandLine/SerialFailed-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 13:12:54 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 13:12:54 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-325-g06ee07b
Message-ID: <20151026171254.DD927BF8B6@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  06ee07b854d4a77c4147dadb97f9769b17da832d (commit)
       via  66178ae5a0a154c11934574347b75e71772b77b9 (commit)
      from  f054552124bfffce3b15c3422ceb39acec9b8b6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06ee07b854d4a77c4147dadb97f9769b17da832d
commit 06ee07b854d4a77c4147dadb97f9769b17da832d
Merge: f054552 66178ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:12:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:12:53 2015 -0400

    Merge topic 'cpack-deb-fakeroot-removal'
    
    66178ae5 CPackDEB: Use proper compression scheme for control.tar.gz


-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 13:13:01 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 13:13:01 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-327-g4c4da56
Message-ID: <20151026171301.81C0ABF7EC@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  4c4da56b2eb22fd902a100b294ff2acb6d77fac3 (commit)
       via  601e6e1ad10b83dcb5ad09d061b04e6974cda283 (commit)
      from  06ee07b854d4a77c4147dadb97f9769b17da832d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c4da56b2eb22fd902a100b294ff2acb6d77fac3
commit 4c4da56b2eb22fd902a100b294ff2acb6d77fac3
Merge: 06ee07b 601e6e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:12:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:12:59 2015 -0400

    Merge topic 'xcode-optimization-flags'
    
    601e6e1a Xcode: Use regular expression to extract all optimisation flags (#15794)


-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx                  |   48 ++++++++++++++++----
 Source/cmGlobalXCodeGenerator.h                    |    2 +
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake     |    3 ++
 .../XcodeOptimizationFlags-check.cmake             |    7 +++
 .../XcodeProject/XcodeOptimizationFlags.cmake      |   20 ++++++++
 .../XcodePreserveNonOptimizationFlags-check.cmake  |    8 ++++
 .../XcodePreserveNonOptimizationFlags.cmake        |   12 +++++
 ...eck.cmake => XcodePreserveObjcFlag-check.cmake} |    6 +--
 .../XcodeProject/XcodePreserveObjcFlag.cmake       |    6 +++
 9 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeOptimizationFlags-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
 copy Tests/RunCMake/XcodeProject/{XcodeObjectNeedsQuote-check.cmake => XcodePreserveObjcFlag-check.cmake} (56%)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 13:13:03 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 13:13:03 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-329-gd71920c
Message-ID: <20151026171303.CC192BF9ED@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  d71920c45763fe15fa93c2fc1f5aceabba23975e (commit)
       via  a91eebebdb2a012c233db7869ec0ade534c4dd57 (commit)
      from  4c4da56b2eb22fd902a100b294ff2acb6d77fac3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d71920c45763fe15fa93c2fc1f5aceabba23975e
commit d71920c45763fe15fa93c2fc1f5aceabba23975e
Merge: 4c4da56 a91eebe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:13:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:13:02 2015 -0400

    Merge topic 'xcode-watch-and-tvos'
    
    a91eebeb Xcode: Recognise Watch and TV OS as embedded platforms


-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx                          |   21 +++++++++++++---
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake |   32 ++++++++++++++++++++++++
 Tests/RunCMake/XcodeProject/XcodeBundles.cmake |   30 +++++++++++++++++-----
 3 files changed, 73 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 13:13:07 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 13:13:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-361-gd288b21
Message-ID: <20151026171307.BF34DBF8CE@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  d288b216af6864567354ccb05e85466fb57d46b0 (commit)
       via  6cac952b9ed8ad202286ddee7246d9ef7ed8f22d (commit)
       via  97b3768898431ffff824388dc263654a35a33aa2 (commit)
       via  600af01d41e32d304e43dc98783ec0f7f010f40e (commit)
       via  330bfa83368989f6fd67072ef9f5c9e457230f17 (commit)
       via  b13e26e278dcc34243a2b31dfca8e23b01e15b76 (commit)
       via  8ac8739b2e5df2f36194261f9dcac95107b4b5f7 (commit)
       via  84fb579fc8935202bf182bbd1685aff6acc2a3b5 (commit)
       via  1eff421ad00bd26a22b5145fe2b175a300041dca (commit)
       via  94fd5a5af87adafbbf7f47d6d083b53c6bd3e941 (commit)
       via  ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e (commit)
       via  26e23e8463f9b9e2298e317a70925c56bcb018d1 (commit)
       via  01c26986931a409dbb246b780b808c51aea35c2b (commit)
       via  459c891088c8b2fb8b7cb950878cf7c0579ddb33 (commit)
       via  7f8bb857b8ab714b80acfa6a6e2c34195fabff6f (commit)
       via  a0ebd69b52dea77c5d8c718bcb7ba0c75ceb9d5f (commit)
       via  bcee21ceb733d7e6d12d85346d8e683399cc4fc4 (commit)
       via  b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f (commit)
       via  b92d0b2c94936fa438c8c92a6961b6323795d6f9 (commit)
       via  05982b26e6fc58422dd4c05497466f206d6c93f7 (commit)
       via  effe874d25cc0448d9f37fd90283fb83118cb31e (commit)
       via  8616d12cfc868492c030168c228983cf6b22b534 (commit)
       via  ed4ea59a33d094245ff4807c143134846b2be77a (commit)
       via  634155d6952033f353de90073ac58ef53a900306 (commit)
       via  4bc65d76f13c63367857b22e87f73baa8e6d5970 (commit)
       via  80de856bb5cba20d424b91e4a49fe8fdb1f904a3 (commit)
       via  4c41e74da58b6f1057466e7eaa22942dc62c8802 (commit)
       via  67b2f4312c431eb363dd94a2bb5d88cc6c8a7c95 (commit)
       via  f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5 (commit)
       via  a6b7eb5bc8c304dab2102689eb09ec85c1e7f6be (commit)
       via  c2c239e607549d6513d95c3e919b4f509733bc87 (commit)
       via  a8c0fbcc194bca6986492278e705ff301f283378 (commit)
      from  d71920c45763fe15fa93c2fc1f5aceabba23975e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d288b216af6864567354ccb05e85466fb57d46b0
commit d288b216af6864567354ccb05e85466fb57d46b0
Merge: d71920c 6cac952
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:13:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:13:04 2015 -0400

    Merge topic 'use-generator-target'
    
    6cac952b VS: Port interface to cmGeneratorTarget
    97b37688 VS: Port WriteUtilityDepends to cmGeneratorTarget
    600af01d VS: Port utility depends to cmGeneratorTarget
    330bfa83 VS: Port target depends to cmGeneratorTarget
    b13e26e2 VS: Port ProjectDepends to cmGeneratorTarget.
    8ac8739b VS: Port TargetIsFortranOnly to cmGeneratorTarget
    84fb579f VS: Port WriteProject to cmGeneratorTarget
    1eff421a VS: Port loop to cmGeneratorTarget
    94fd5a5a VS: Port ImplibDir to cmGeneratorTarget
    ce9e9a92 VS: Port LinkClosure to cmGeneratorTarget
    26e23e84 VS: Port ComputeLongestObjectDirectory to cmGeneratorTarget
    01c26986 VS7: Port to cmGeneratorTarget
    459c8910 VS10: Port to cmGeneratorTarget.
    7f8bb857 VS6: Port to cmGeneratorTarget.
    a0ebd69b Graphviz: Port to cmGeneratorTarget.
    bcee21ce C::B: Port API to cmGeneratorTarget.
    ...

diff --cc Source/cmGlobalXCodeGenerator.cxx
index 576827c,9111a3f..eecc82b
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@@ -1617,42 -1619,9 +1619,42 @@@ std::string cmGlobalXCodeGenerator::Ext
  }
  
  //----------------------------------------------------------------------------
 +// This function removes each matching occurrence of the expression and
 +// returns the last one (i.e., the dominant flag in GCC)
 +std::string cmGlobalXCodeGenerator::ExtractFlagRegex(const char* exp,
 +                                                     int matchIndex,
 +                                                     std::string& flags)
 +{
 +  std::string retFlag;
 +
 +  cmsys::RegularExpression regex(exp);
 +  assert(regex.is_valid());
 +  if(!regex.is_valid())
 +    {
 +    return retFlag;
 +    }
 +
 +  std::string::size_type offset = 0;
 +
 +  while(regex.find(flags.c_str() + offset))
 +    {
 +    const std::string::size_type startPos = offset + regex.start(matchIndex);
 +    const std::string::size_type endPos = offset + regex.end(matchIndex);
 +    const std::string::size_type size = endPos - startPos;
 +
 +    offset = startPos + 1;
 +
 +    retFlag.assign(flags, startPos, size);
 +    flags.replace(startPos, size, size, ' ');
 +    }
 +
 +  return retFlag;
 +}
 +
 +//----------------------------------------------------------------------------
  void
  cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
-                                                 cmTarget& target,
+                                                 cmGeneratorTarget* target,
                                                  std::vector<cmCustomCommand>
                                                  const & commands,
                                                  const char* name)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCommonTargetGenerator.cxx             |    4 +-
 Source/cmCommonTargetGenerator.h               |    2 -
 Source/cmComputeTargetDepends.cxx              |    9 +-
 Source/cmExportFileGenerator.cxx               |   12 +-
 Source/cmExtraCodeBlocksGenerator.cxx          |   49 ++-
 Source/cmExtraCodeBlocksGenerator.h            |    5 +-
 Source/cmExtraCodeLiteGenerator.cxx            |   11 +-
 Source/cmExtraEclipseCDT4Generator.cxx         |   56 ++--
 Source/cmExtraKateGenerator.cxx                |   31 +-
 Source/cmExtraSublimeTextGenerator.cxx         |   37 ++-
 Source/cmExtraSublimeTextGenerator.h           |    3 +-
 Source/cmGeneratorTarget.cxx                   |    8 +-
 Source/cmGeneratorTarget.h                     |   11 +-
 Source/cmGhsMultiTargetGenerator.cxx           |   56 ++--
 Source/cmGhsMultiTargetGenerator.h             |   11 +-
 Source/cmGlobalGenerator.cxx                   |   61 ++--
 Source/cmGlobalGenerator.h                     |    4 +
 Source/cmGlobalGhsMultiGenerator.cxx           |   23 +-
 Source/cmGlobalGhsMultiGenerator.h             |    4 +-
 Source/cmGlobalKdevelopGenerator.cxx           |   20 +-
 Source/cmGlobalNinjaGenerator.cxx              |   27 +-
 Source/cmGlobalNinjaGenerator.h                |   12 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |   79 +++--
 Source/cmGlobalUnixMakefileGenerator3.h        |    6 +-
 Source/cmGlobalVisualStudio10Generator.cxx     |   12 +-
 Source/cmGlobalVisualStudio10Generator.h       |    4 +-
 Source/cmGlobalVisualStudio6Generator.cxx      |   25 +-
 Source/cmGlobalVisualStudio6Generator.h        |    6 +-
 Source/cmGlobalVisualStudio71Generator.cxx     |   12 +-
 Source/cmGlobalVisualStudio71Generator.h       |    4 +-
 Source/cmGlobalVisualStudio7Generator.cxx      |   38 +--
 Source/cmGlobalVisualStudio7Generator.h        |    9 +-
 Source/cmGlobalVisualStudio8Generator.cxx      |   15 +-
 Source/cmGlobalVisualStudio8Generator.h        |    5 +-
 Source/cmGlobalVisualStudioGenerator.cxx       |  100 +++---
 Source/cmGlobalVisualStudioGenerator.h         |   32 +-
 Source/cmGlobalXCodeGenerator.cxx              |  400 ++++++++++++------------
 Source/cmGlobalXCodeGenerator.h                |   43 ++-
 Source/cmGraphVizWriter.cxx                    |   52 ++-
 Source/cmGraphVizWriter.h                      |    7 +-
 Source/cmInstallTargetGenerator.cxx            |    7 +-
 Source/cmLocalGenerator.cxx                    |   58 ++--
 Source/cmLocalGenerator.h                      |    7 +-
 Source/cmLocalGhsMultiGenerator.cxx            |   10 +-
 Source/cmLocalNinjaGenerator.cxx               |   20 +-
 Source/cmLocalNinjaGenerator.h                 |    9 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |   93 +++---
 Source/cmLocalUnixMakefileGenerator3.h         |   13 +-
 Source/cmLocalVisualStudio10Generator.cxx      |   13 +-
 Source/cmLocalVisualStudio6Generator.cxx       |  333 ++++++++++----------
 Source/cmLocalVisualStudio6Generator.h         |   29 +-
 Source/cmLocalVisualStudio7Generator.cxx       |  251 +++++++--------
 Source/cmLocalVisualStudio7Generator.h         |   32 +-
 Source/cmLocalVisualStudioGenerator.cxx        |   14 +-
 Source/cmLocalVisualStudioGenerator.h          |    6 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |   16 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |   19 +-
 Source/cmMakefileTargetGenerator.cxx           |    5 +-
 Source/cmMakefileTargetGenerator.h             |    2 -
 Source/cmMakefileUtilityTargetGenerator.cxx    |   11 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |   36 +--
 Source/cmNinjaTargetGenerator.cxx              |   11 +-
 Source/cmNinjaTargetGenerator.h                |    5 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |   16 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |    2 +-
 Source/cmTarget.h                              |    4 +
 Source/cmVisualStudio10TargetGenerator.cxx     |   49 +--
 Source/cmVisualStudio10TargetGenerator.h       |    4 +-
 Source/cmXCodeObject.h                         |    8 +-
 69 files changed, 1196 insertions(+), 1192 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 13:14:00 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 13:14:00 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-986-g4752866
Message-ID: <20151026171400.AD8DBBFBD3@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4752866b6d3a4543572a9b150571d623e24efd4a (commit)
       via  d288b216af6864567354ccb05e85466fb57d46b0 (commit)
       via  d71920c45763fe15fa93c2fc1f5aceabba23975e (commit)
       via  4c4da56b2eb22fd902a100b294ff2acb6d77fac3 (commit)
       via  06ee07b854d4a77c4147dadb97f9769b17da832d (commit)
       via  f054552124bfffce3b15c3422ceb39acec9b8b6a (commit)
       via  8e86e113bc738cf3cce13991ff6208305f950206 (commit)
       via  70d2f2aa610fe82f7eac4a4dab510ff8fa3e2638 (commit)
       via  33b43ec26bc4c22998376cb1f087cd07856a61e0 (commit)
       via  66fcb15bb46a6e24bf513d3f703c1a08bb20aa8d (commit)
       via  a03c13a710fc4c65035e92749720b559cbeeff2e (commit)
       via  9e5f253f8dba871d7cdd966aca88af92bd8d14a6 (commit)
      from  35313e8e7b9286388c51bd4c5cbe0e4886730e47 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4752866b6d3a4543572a9b150571d623e24efd4a
commit 4752866b6d3a4543572a9b150571d623e24efd4a
Merge: 35313e8 d288b21
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:13:49 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 26 13:13:49 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Mon Oct 26 13:22:22 2015
From: brad.king at kitware.com (Brad King)
Date: Mon, 26 Oct 2015 13:22:22 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-988-g1e9cfc0
Message-ID: <20151026172222.2C6EBC061A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1e9cfc0f22edb7df06dc6059cecb712b06c063a1 (commit)
       via  e166203f31890e5bbe2bfa19bd5eb63e7d8c3b90 (commit)
      from  4752866b6d3a4543572a9b150571d623e24efd4a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e9cfc0f22edb7df06dc6059cecb712b06c063a1
commit 1e9cfc0f22edb7df06dc6059cecb712b06c063a1
Merge: 4752866 e166203
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:22:21 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:22:21 2015 -0400

    Merge topic 'fix-C-comment-syntax' into next
    
    e166203f CheckForPthreads.c: Do not use C++-style comments in C source


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e166203f31890e5bbe2bfa19bd5eb63e7d8c3b90
commit e166203f31890e5bbe2bfa19bd5eb63e7d8c3b90
Author:     Marc Chevrier <marc.chevrier at sap.com>
AuthorDate: Mon Oct 26 14:17:44 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 26 13:21:59 2015 -0400

    CheckForPthreads.c: Do not use C++-style comments in C source

diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c
index 2732957..344c81b 100644
--- a/Modules/CheckForPthreads.c
+++ b/Modules/CheckForPthreads.c
@@ -16,8 +16,8 @@ int main(int ac, char*av[]){
   pthread_create(&tid[0], 0, runner, (void*)1);
   pthread_create(&tid[1], 0, runner, (void*)2);
 
-#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.)
-  usleep(1); // for strange behavior on single-processor sun
+#if defined(__BEOS__) && !defined(__ZETA__) /* (no usleep on BeOS 5.) */
+  usleep(1); /* for strange behavior on single-processor sun */
 #endif
 
   pthread_join(tid[0], 0);

-----------------------------------------------------------------------

Summary of changes:
 Modules/CheckForPthreads.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 26 17:26:38 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 26 Oct 2015 17:26:38 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1021-g19ea1c6
Message-ID: <20151026212638.566A4C0A93@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  19ea1c6f3ec02bc9e06f4518f8dc1b2d3497aa22 (commit)
       via  3e72e81c21ac623fe849f2272d2052fe2e68c1d6 (commit)
       via  04945b5b3bcfb1f38741e59fa74f788847265e52 (commit)
       via  2e495b948fb8f18526292be8a0a1a73f5845731b (commit)
       via  15470969b867442b5547425f830a71fe4977195d (commit)
       via  495ef58b5686cd3073aa1f0a6cd7fc5b1893ee64 (commit)
       via  a67d87f7d1d8ea4a18c4bf59a3ba1b21c59bfd57 (commit)
       via  d948be4660331e42e683c6efa8c34513d7b22670 (commit)
       via  d21c090c5816913599e6d19954f1d3e8fe490063 (commit)
       via  c637e81d6a0b1d84482ded02702fea8598da8e63 (commit)
       via  033d75bacc31269808e2964d0394ca0cff2d4387 (commit)
       via  c48ec1eb7473ed22f47f43c75902120b76651f4e (commit)
       via  c36aab2c1e14c8b8e9e3dcfe1d33ff209a3d10e7 (commit)
       via  9220295298732e69f2ed3d7c21417d20ec72fef9 (commit)
       via  228dfffbe900b161df292a2c826ed84de0d6551d (commit)
       via  267736ce1e5827e30fd49c96075adeb123aca2e3 (commit)
       via  6bc79630288d468ed1cd669aa3fbda04b5adb7e3 (commit)
       via  5b7ed7a73661201dc691477b81ec2436723d263a (commit)
       via  4e6d18cf3cb0d2aac2aabe388e3be38153c43a6b (commit)
       via  5d30d016f85ba0f94450e60b68ff627be3599318 (commit)
       via  14abcc1dbedecfb7aa6a945fcf29f19d3fe4465e (commit)
       via  0a500eaaf6e37f5d413d7d2384769e144e951aa2 (commit)
       via  26ccc3821fce09e04540dacc3714a3fdb278c6b9 (commit)
       via  f9c3f0a7ff450d266e54621cfe5009e5aef3ea1e (commit)
       via  06fdd262b21f3eb7b23a9d90e2582bdf820122a9 (commit)
       via  c346202ef815fe600d7970ddf47cdc71fa3b4a47 (commit)
       via  882544cdaa44612ae37b60ec5fc45c6909bd8efa (commit)
       via  7455293496e8543830b3a5b7c1bffbd58713014f (commit)
       via  a24eb94f5b608441265eaa591934a4b0b6d1c46b (commit)
       via  05fc07b1fe6793147902a4363b61c12ae0c40c5f (commit)
       via  bde277e811fea2532ed32ade6d7f3d6e910bfda0 (commit)
       via  cf69630e510a5c639a93a99b315fcefea9688935 (commit)
       via  3f8aa62bfb339dded326b0bc36016134a3dc845b (commit)
      from  1e9cfc0f22edb7df06dc6059cecb712b06c063a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19ea1c6f3ec02bc9e06f4518f8dc1b2d3497aa22
commit 19ea1c6f3ec02bc9e06f4518f8dc1b2d3497aa22
Merge: 1e9cfc0 3e72e81
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 17:26:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 17:26:34 2015 -0400

    Merge topic 'use-generator-target' into next
    
    3e72e81c cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
    04945b5b cmLocalGenerator: Port Find method away from GetGeneratorTarget
    2e495b94 cmMakefile: Add imported target accessor
    15470969 CMP0026: Port away from GetGeneratorTarget
    495ef58b VS6: Port to FindGeneratorTarget
    a67d87f7 cmake: Port find_package mode away from GetGeneratorTarget
    d948be46 cmGlobalGenerator: Add FindGeneratorTarget API
    d21c090c cmGeneratorTarget: Add API for globally visible IMPORTED
    c637e81d Xcode: Port away from GetGeneratorTarget
    033d75ba cmLocalGenerator: Store imported targets in a separate container.
    c48ec1eb cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget
    c36aab2c cmTarget: Implement ALIAS in terms of name mapping
    92202952 cmGlobalGenerator: Remove unneeded GetGeneratorTarget
    228dfffb cmGlobalGenerator: Remove direct storage of targets
    267736ce cmTargetCollectLinkLanguages: Remove cmMakefile dependency
    6bc79630 cmGeneratorTarget: Port cmOptionalLinkImplementation
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e72e81c21ac623fe849f2272d2052fe2e68c1d6
commit 3e72e81c21ac623fe849f2272d2052fe2e68c1d6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:22:42 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:19:52 2015 +0100

    cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
    
    The configure-time and generate-time types should be completely
    independent.
    
    Add ownership of cmGeneratorTarget instances to the cmLocalGenerator.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..3d2db42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1208,8 +1208,6 @@ void cmGlobalGenerator::Configure()
 void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
 {
   this->CreateLocalGenerators();
-  cmDeleteAll(this->GeneratorTargets);
-  this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
   this->ComputeBuildFileGenerators();
 }
@@ -1597,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(
       {
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
-      this->GeneratorTargets[t] = gt;
       lg->AddGeneratorTarget(gt);
       }
     }
@@ -1622,9 +1619,9 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
           j = mf->GetOwnedImportedTargets().begin();
         j != mf->GetOwnedImportedTargets().end(); ++j)
       {
-      cmGeneratorTarget* gt =
-          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
-      this->GeneratorTargets[*j] = gt;
+      cmLocalGenerator* lg = this->LocalGenerators[i];
+      cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
+      lg->AddOwnedImportedGeneratorTarget(gt);
       importedMap[*j] = gt;
       }
     }
@@ -1641,9 +1638,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::ClearGeneratorMembers()
 {
-  cmDeleteAll(this->GeneratorTargets);
-  this->GeneratorTargets.clear();
-
   cmDeleteAll(this->BuildExportSets);
   this->BuildExportSets.clear();
 
@@ -1662,20 +1656,6 @@ void cmGlobalGenerator::ClearGeneratorMembers()
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmGlobalGenerator::GetGeneratorTarget(cmTarget const* t) const
-{
-  cmGeneratorTargetsType::const_iterator ti = this->GeneratorTargets.find(t);
-  if(ti == this->GeneratorTargets.end())
-    {
-    this->CMakeInstance->IssueMessage(
-      cmake::INTERNAL_ERROR, "Missing cmGeneratorTarget instance!");
-    return 0;
-    }
-  return ti->second;
-}
-
-//----------------------------------------------------------------------------
 void cmGlobalGenerator::ComputeTargetObjectDirectory(cmGeneratorTarget*) const
 {
 }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 0057d61..bc6e17d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -42,10 +42,6 @@ class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 class cmExportBuildFileGenerator;
 
-typedef std::map<cmTarget const*,
-                 cmGeneratorTarget*,
-                 cmTarget::StrictTargetComparison> cmGeneratorTargetsType;
-
 /** \class cmGlobalGenerator
  * \brief Responsible for overseeing the generation process for the entire tree
  *
@@ -307,14 +303,6 @@ public:
   TargetDependSet const& GetTargetDirectDepends(
       const cmGeneratorTarget* target);
 
-  /** Get per-target generator information.  */
-  cmGeneratorTarget* GetGeneratorTarget(cmTarget const*) const;
-
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-  {
-    this->GeneratorTargets[t] = gt;
-  }
-
   const std::map<std::string, std::vector<cmLocalGenerator*> >& GetProjectMap()
                                                const {return this->ProjectMap;}
 
@@ -482,8 +470,6 @@ private:
   typedef std::map<cmGeneratorTarget const*, TargetDependSet> TargetDependMap;
   TargetDependMap TargetDependencies;
 
-  // Per-target generator information.
-  cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
   void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
                    cmLocalGenerator* lg,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index c205d1a..9f36b54 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -257,7 +257,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   lg->AddGeneratorTarget(gt);
-  this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index b819dad..bb0c974 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -88,7 +88,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       gen[0]->AddGeneratorTarget(gt);
-      this->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6d4fc1f..da8c814 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -460,7 +460,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   root->AddGeneratorTarget(allBuildGt);
-  root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -496,7 +495,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     root->AddGeneratorTarget(checkGt);
-    root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ec7c29f..d92cbea 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -62,6 +62,8 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
 
 cmLocalGenerator::~cmLocalGenerator()
 {
+  cmDeleteAll(this->GeneratorTargets);
+  cmDeleteAll(this->OwnedImportedGeneratorTargets);
 }
 
 void cmLocalGenerator::IssueMessage(cmake::MessageType t,
@@ -460,6 +462,11 @@ void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt)
   this->ImportedGeneratorTargets.push_back(gt);
 }
 
+void cmLocalGenerator::AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt)
+{
+  this->OwnedImportedGeneratorTargets.push_back(gt);
+}
+
 struct NamedGeneratorTargetFinder
 {
   NamedGeneratorTargetFinder(std::string const& name)
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 67383d7..e2f5519 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -127,6 +127,7 @@ public:
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
+  void AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
@@ -380,6 +381,7 @@ protected:
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
   std::vector<cmGeneratorTarget*> ImportedGeneratorTargets;
+  std::vector<cmGeneratorTarget*> OwnedImportedGeneratorTargets;
   std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 225c03e..b813c14 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -896,7 +896,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     lg->AddGeneratorTarget(gt);
-    lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04945b5b3bcfb1f38741e59fa74f788847265e52
commit 04945b5b3bcfb1f38741e59fa74f788847265e52
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:14:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:19:31 2015 +0100

    cmLocalGenerator: Port Find method away from GetGeneratorTarget
    
    Mirror the cmMakefile::FindTarget method.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5928fb5..d53f0e3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1583,10 +1583,12 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
-                                               cmLocalGenerator *lg)
+void cmGlobalGenerator::CreateGeneratorTargets(
+    TargetTypes targetTypes,
+    cmMakefile *mf,
+    cmLocalGenerator *lg,
+    std::map<cmTarget*, cmGeneratorTarget*> const& importedMap)
 {
-  cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
     {
     cmTargets& targets = mf->GetTargets();
@@ -1600,23 +1602,38 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       }
     }
 
+  std::vector<cmTarget*> itgts = mf->GetImportedTargets();
+
   for(std::vector<cmTarget*>::const_iterator
-        j = mf->GetOwnedImportedTargets().begin();
-      j != mf->GetOwnedImportedTargets().end(); ++j)
+        j = itgts.begin(); j != itgts.end(); ++j)
     {
-    cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
-    this->GeneratorTargets[*j] = gt;
-    lg->AddImportedGeneratorTarget(gt);
+    lg->AddImportedGeneratorTarget(importedMap.find(*j)->second);
     }
 }
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 {
+  std::map<cmTarget*, cmGeneratorTarget*> importedMap;
+  for(unsigned int i=0; i < this->Makefiles.size(); ++i)
+    {
+    cmMakefile* mf = this->Makefiles[i];
+    for(std::vector<cmTarget*>::const_iterator
+          j = mf->GetOwnedImportedTargets().begin();
+        j != mf->GetOwnedImportedTargets().end(); ++j)
+      {
+      cmGeneratorTarget* gt =
+          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
+      this->GeneratorTargets[*j] = gt;
+      importedMap[*j] = gt;
+      }
+    }
+
   // Construct per-target generator information.
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    this->CreateGeneratorTargets(targetTypes, this->LocalGenerators[i]);
+    this->CreateGeneratorTargets(targetTypes, this->Makefiles[i],
+                                 this->LocalGenerators[i], importedMap);
     }
 }
 
@@ -2240,11 +2257,11 @@ cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
     std::vector<cmGeneratorTarget*> tgts =
-        this->LocalGenerators[i]->GetGeneratorTargets();
+        this->LocalGenerators[i]->GetImportedGeneratorTargets();
     for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
          it != tgts.end(); ++it)
       {
-      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+      if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name)
         {
         return *it;
         }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c52b209..0057d61 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -485,7 +485,9 @@ private:
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
-  void CreateGeneratorTargets(TargetTypes targetTypes, cmLocalGenerator* lg);
+  void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
+                   cmLocalGenerator* lg,
+                   std::map<cmTarget*, cmGeneratorTarget*> const& importedMap);
   void CreateGeneratorTargets(TargetTypes targetTypes);
 
   void ClearGeneratorMembers();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1bc7f81..ec7c29f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1821,11 +1821,21 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 cmGeneratorTarget*
 cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
 {
-  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+  std::vector<cmGeneratorTarget*>::const_iterator
+    imported = std::find_if(this->ImportedGeneratorTargets.begin(),
+                            this->ImportedGeneratorTargets.end(),
+                            NamedGeneratorTargetFinder(name));
+  if(imported != this->ImportedGeneratorTargets.end())
     {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    return *imported;
     }
-  return 0;
+
+  if(cmGeneratorTarget* t = this->FindGeneratorTarget(name))
+    {
+    return t;
+    }
+
+  return this->GetGlobalGenerator()->FindGeneratorTarget(name);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7841d05..67383d7 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -120,6 +120,11 @@ public:
       return this->GeneratorTargets;
     }
 
+  const std::vector<cmGeneratorTarget*> &GetImportedGeneratorTargets() const
+    {
+      return this->ImportedGeneratorTargets;
+    }
+
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e495b948fb8f18526292be8a0a1a73f5845731b
commit 2e495b948fb8f18526292be8a0a1a73f5845731b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 22:18:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:18:43 2015 +0100

    cmMakefile: Add imported target accessor

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 10b9737..fc23760 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1766,6 +1766,18 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
+std::vector<cmTarget*> cmMakefile::GetImportedTargets() const
+{
+  std::vector<cmTarget*> tgts;
+  tgts.reserve(this->ImportedTargets.size());
+  for (TargetMap::const_iterator it = this->ImportedTargets.begin();
+       it != this->ImportedTargets.end(); ++it)
+    {
+    tgts.push_back(it->second);
+    }
+  return tgts;
+}
+
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 01c4524..f1dd374 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -390,6 +390,7 @@ public:
     {
       return this->ImportedTargetsOwned;
     }
+  std::vector<cmTarget*> GetImportedTargets() const;
 
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15470969b867442b5547425f830a71fe4977195d
commit 15470969b867442b5547425f830a71fe4977195d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:19:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:50 2015 +0100

    CMP0026: Port away from GetGeneratorTarget

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f0f404c..1eebd12 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1602,7 +1602,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         // CMake time.
         cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
         gg->CreateGenerationObjects();
-        cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+        cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
         this->Properties.SetProperty(propLOCATION,
                                      gt->GetLocationForBuild());
         }
@@ -1627,7 +1627,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         {
         cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
         gg->CreateGenerationObjects();
-        cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+        cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
         this->Properties.SetProperty(
                 prop, gt->GetFullPath(configName, false).c_str());
         }
@@ -1651,7 +1651,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
           {
           cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
           gg->CreateGenerationObjects();
-          cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+          cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
           this->Properties.SetProperty(
                   prop, gt->GetFullPath(configName, false).c_str());
           }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=495ef58b5686cd3073aa1f0a6cd7fc5b1893ee64
commit 495ef58b5686cd3073aa1f0a6cd7fc5b1893ee64
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:19:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:50 2015 +0100

    VS6: Port to FindGeneratorTarget

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index fd0af61..cdacb9e 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1112,15 +1112,14 @@ void cmLocalVisualStudio6Generator
       // Compute the proper name to use to link this library.
       std::string lib;
       std::string libDebug;
-      cmTarget* tgt = this->GlobalGenerator->FindTarget(j->first.c_str());
+      cmGeneratorTarget* tgt =
+          this->GlobalGenerator->FindGeneratorTarget(j->first.c_str());
       if(tgt)
         {
-        cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(tgt);
         lib = cmSystemTools::GetFilenameWithoutExtension
-          (gt->GetFullName().c_str());
+          (tgt->GetFullName().c_str());
         libDebug = cmSystemTools::GetFilenameWithoutExtension
-          (gt->GetFullName("Debug").c_str());
+          (tgt->GetFullName("Debug").c_str());
         lib += ".lib";
         libDebug += ".lib";
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a67d87f7d1d8ea4a18c4bf59a3ba1b21c59bfd57
commit a67d87f7d1d8ea4a18c4bf59a3ba1b21c59bfd57
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 14:17:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:50 2015 +0100

    cmake: Port find_package mode away from GetGeneratorTarget

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 16417fc..2e96e59 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -448,7 +448,6 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
   // read in the list file to fill the cache
   snapshot.SetDefaultDefinitions();
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
-  cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
 
   mf->SetArgcArgv(args);
 
@@ -481,6 +480,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::vector<std::string> includeDirs;
     cmSystemTools::ExpandListArgument(includes, includeDirs);
 
+    gg->CreateGenerationObjects();
+    cmLocalGenerator* lg = gg->LocalGenerators[0];
     std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
 
     std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
@@ -510,8 +511,9 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::string linkPath;
     std::string flags;
     std::string linkFlags;
-    gg->CreateGeneratorTargets(cmGlobalGenerator::AllTargets, lg.get());
-    cmGeneratorTarget *gtgt = gg->GetGeneratorTarget(tgt);
+    gg->CreateGenerationObjects();
+    cmGeneratorTarget *gtgt = gg->FindGeneratorTarget(tgt->GetName());
+    cmLocalGenerator* lg = gtgt->GetLocalGenerator();
     lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags,
                        gtgt, false);
     linkLibs = frameworkPath + linkPath + linkLibs;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d948be4660331e42e683c6efa8c34513d7b22670
commit d948be4660331e42e683c6efa8c34513d7b22670
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:06:59 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:49 2015 +0100

    cmGlobalGenerator: Add FindGeneratorTarget API

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6b5cb97..5928fb5 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2196,6 +2196,25 @@ cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const
   return 0;
 }
 
+cmGeneratorTarget*
+cmGlobalGenerator::FindGeneratorTargetImpl(std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
+      {
+      if ((*it)->GetName() == name)
+        {
+        return *it;
+        }
+      }
+    }
+  return 0;
+}
+
 cmTarget*
 cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
 {
@@ -2215,6 +2234,25 @@ cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
   return 0;
 }
 
+cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
+    std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
+      {
+      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+        {
+        return *it;
+        }
+      }
+    }
+  return 0;
+}
+
 //----------------------------------------------------------------------------
 cmTarget*
 cmGlobalGenerator::FindTarget(const std::string& name,
@@ -2236,6 +2274,16 @@ cmGlobalGenerator::FindTarget(const std::string& name,
   return this->FindImportedTargetImpl(name);
 }
 
+cmGeneratorTarget*
+cmGlobalGenerator::FindGeneratorTarget(const std::string& name) const
+{
+  if (cmGeneratorTarget* tgt = this->FindGeneratorTargetImpl(name))
+    {
+    return tgt;
+    }
+  return this->FindImportedGeneratorTargetImpl(name);
+}
+
 //----------------------------------------------------------------------------
 bool
 cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 419cada..c52b209 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -254,6 +254,8 @@ public:
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
+  cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
+
   void AddAlias(const std::string& name, const std::string& tgtName);
   bool IsAlias(const std::string& name) const;
 
@@ -432,6 +434,10 @@ protected:
   cmTarget* FindTargetImpl(std::string const& name) const;
   cmTarget* FindImportedTargetImpl(std::string const& name) const;
 
+  cmGeneratorTarget* FindGeneratorTargetImpl(std::string const& name) const;
+  cmGeneratorTarget*
+  FindImportedGeneratorTargetImpl(std::string const& name) const;
+
   const char* GetPredefinedTargetsFolder();
   virtual bool UseFolderProperty();
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d21c090c5816913599e6d19954f1d3e8fe490063
commit d21c090c5816913599e6d19954f1d3e8fe490063
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:06:37 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:49 2015 +0100

    cmGeneratorTarget: Add API for globally visible IMPORTED

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9376e98..1f74eda 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -856,6 +856,11 @@ bool cmGeneratorTarget::IsImported() const
   return this->Target->IsImported();
 }
 
+bool cmGeneratorTarget::IsImportedGloballyVisible() const
+{
+  return this->Target->IsImportedGloballyVisible();
+}
+
 //----------------------------------------------------------------------------
 const char* cmGeneratorTarget::GetLocationForBuild() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index c2607a7..da59a98 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -31,6 +31,7 @@ public:
   cmLocalGenerator* GetLocalGenerator() const;
 
   bool IsImported() const;
+  bool IsImportedGloballyVisible() const;
   const char *GetLocation(const std::string& config) const;
 
   std::vector<cmCustomCommand> const &GetPreBuildCommands() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c637e81d6a0b1d84482ded02702fea8598da8e63
commit c637e81d6a0b1d84482ded02702fea8598da8e63
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:59:39 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:49 2015 +0100

    Xcode: Port away from GetGeneratorTarget

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 3b430d2..aec2603 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -51,13 +51,11 @@ void cmLocalXCodeGenerator::Generate()
 {
   cmLocalGenerator::Generate();
 
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator iter = targets.begin();
       iter != targets.end(); ++iter)
     {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
+    (*iter)->HasMacOSXRpathInstallNameDir("");
     }
 }
 
@@ -66,13 +64,11 @@ void cmLocalXCodeGenerator::GenerateInstallRules()
 {
   cmLocalGenerator::GenerateInstallRules();
 
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator iter = targets.begin();
       iter != targets.end(); ++iter)
     {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
+    (*iter)->HasMacOSXRpathInstallNameDir("");
     }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=033d75bacc31269808e2964d0394ca0cff2d4387
commit 033d75bacc31269808e2964d0394ca0cff2d4387
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:56:31 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:49 2015 +0100

    cmLocalGenerator: Store imported targets in a separate container.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 47d254e..6b5cb97 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1606,6 +1606,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     {
     cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
     this->GeneratorTargets[*j] = gt;
+    lg->AddImportedGeneratorTarget(gt);
     }
 }
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9d5335e..1bc7f81 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -455,6 +455,11 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
   this->GeneratorTargets.push_back(gt);
 }
 
+void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt)
+{
+  this->ImportedGeneratorTargets.push_back(gt);
+}
+
 struct NamedGeneratorTargetFinder
 {
   NamedGeneratorTargetFinder(std::string const& name)
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 91a476f..7841d05 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -121,6 +121,7 @@ public:
     }
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
+  void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
@@ -373,6 +374,7 @@ protected:
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
+  std::vector<cmGeneratorTarget*> ImportedGeneratorTargets;
   std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c48ec1eb7473ed22f47f43c75902120b76651f4e
commit c48ec1eb7473ed22f47f43c75902120b76651f4e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:52:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:49 2015 +0100

    cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b5f5ce9..9d5335e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -51,6 +51,8 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
 
   this->Makefile = makefile;
 
+  this->AliasTargets = makefile->GetAliasTargets();
+
   this->EmitUniversalBinaryFlags = true;
   this->BackwardsCompatibility = 0;
   this->BackwardsCompatibilityFinal = false;
@@ -453,11 +455,45 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
   this->GeneratorTargets.push_back(gt);
 }
 
+struct NamedGeneratorTargetFinder
+{
+  NamedGeneratorTargetFinder(std::string const& name)
+    : Name(name)
+  {
+
+  }
+
+  bool operator()(cmGeneratorTarget* tgt)
+  {
+    return tgt->GetName() == this->Name;
+  }
+private:
+  std::string Name;
+};
+
 cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
     const std::string& name) const
 {
-  return this->GetGlobalGenerator()->GetGeneratorTarget(
-        this->Makefile->FindTarget(name));
+  std::map<std::string, std::string>::const_iterator i =
+      this->AliasTargets.find(name);
+  if (i != this->AliasTargets.end())
+    {
+    std::vector<cmGeneratorTarget*>::const_iterator ai =
+        std::find_if(this->GeneratorTargets.begin(),
+                     this->GeneratorTargets.end(),
+                     NamedGeneratorTargetFinder(i->second));
+    return *ai;
+    }
+  std::vector<cmGeneratorTarget*>::const_iterator ti =
+      std::find_if(this->GeneratorTargets.begin(),
+                   this->GeneratorTargets.end(),
+                   NamedGeneratorTargetFinder(name));
+  if ( ti != this->GeneratorTargets.end() )
+    {
+    return *ti;
+    }
+
+  return 0;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 46eb1b3..91a476f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -373,6 +373,7 @@ protected:
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
+  std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 35dd3c6..01c4524 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -400,6 +400,11 @@ public:
                             bool excludeAliases = false) const;
   bool IsAlias(const std::string& name) const;
 
+  std::map<std::string, std::string> GetAliasTargets() const
+  {
+    return this->AliasTargets;
+  }
+
   /**
    * Mark include directories as system directories.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c36aab2c1e14c8b8e9e3dcfe1d33ff209a3d10e7
commit c36aab2c1e14c8b8e9e3dcfe1d33ff209a3d10e7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:43:00 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:48 2015 +0100

    cmTarget: Implement ALIAS in terms of name mapping
    
    Remove mapping to cmTarget.

diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index 47f6592..a84bb9d 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -192,7 +192,7 @@ bool cmAddExecutableCommand
       this->SetError(e.str());
       return false;
       }
-    this->Makefile->AddAlias(exename, aliasedTarget);
+    this->Makefile->AddAlias(exename, aliasedName);
     return true;
     }
 
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index e0adee3..5296cbb 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -314,7 +314,7 @@ bool cmAddLibraryCommand
       this->SetError(e.str());
       return false;
       }
-    this->Makefile->AddAlias(libName, aliasedTarget);
+    this->Makefile->AddAlias(libName, aliasedName);
     return true;
     }
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 215d63f..47d254e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2167,9 +2167,10 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::AddAlias(const std::string& name, cmTarget *tgt)
+void cmGlobalGenerator::AddAlias(const std::string& name,
+                                 std::string const& tgtName)
 {
-  this->AliasTargets[name] = tgt;
+  this->AliasTargets[name] = tgtName;
 }
 
 //----------------------------------------------------------------------------
@@ -2220,10 +2221,11 @@ cmGlobalGenerator::FindTarget(const std::string& name,
 {
   if (!excludeAliases)
     {
-    TargetMap::const_iterator ai = this->AliasTargets.find(name);
+    std::map<std::string, std::string>::const_iterator ai =
+        this->AliasTargets.find(name);
     if (ai != this->AliasTargets.end())
       {
-      return ai->second;
+      return this->FindTargetImpl(ai->second);
       }
     }
   if (cmTarget* tgt = this->FindTargetImpl(name))
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 5d4ce08..419cada 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -254,7 +254,7 @@ public:
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
-  void AddAlias(const std::string& name, cmTarget *tgt);
+  void AddAlias(const std::string& name, const std::string& tgtName);
   bool IsAlias(const std::string& name) const;
 
   /** Determine if a name resolves to a framework on disk or a built target
@@ -427,17 +427,7 @@ protected:
   std::map<std::string, cmExportBuildFileGenerator*> BuildExportSets;
   std::map<std::string, cmExportBuildFileGenerator*> BuildExportExportSets;
 
-  // All targets in the entire project.
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX11_UNORDERED_MAP
-  typedef std::unordered_map<std::string, cmTarget*> TargetMap;
-#else
-  typedef cmsys::hash_map<std::string, cmTarget*> TargetMap;
-#endif
-#else
-  typedef std::map<std::string,cmTarget *> TargetMap;
-#endif
-  TargetMap AliasTargets;
+  std::map<std::string, std::string> AliasTargets;
 
   cmTarget* FindTargetImpl(std::string const& name) const;
   cmTarget* FindImportedTargetImpl(std::string const& name) const;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index bebcf09..10b9737 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2036,10 +2036,11 @@ void cmMakefile::AddGlobalLinkInformation(const std::string& name,
 }
 
 
-void cmMakefile::AddAlias(const std::string& lname, cmTarget *tgt)
+void cmMakefile::AddAlias(const std::string& lname,
+                          std::string const& tgtName)
 {
-  this->AliasTargets[lname] = tgt;
-  this->GetGlobalGenerator()->AddAlias(lname, tgt);
+  this->AliasTargets[lname] = tgtName;
+  this->GetGlobalGenerator()->AddAlias(lname, tgtName);
 }
 
 cmTarget* cmMakefile::AddLibrary(const std::string& lname,
@@ -4024,10 +4025,12 @@ cmTarget* cmMakefile::FindTarget(const std::string& name,
 {
   if (!excludeAliases)
     {
-    TargetMap::const_iterator i = this->AliasTargets.find(name);
+    std::map<std::string, std::string>::const_iterator i =
+        this->AliasTargets.find(name);
     if (i != this->AliasTargets.end())
       {
-      return i->second;
+      cmTargets::iterator ai = this->Targets.find(i->second);
+      return &ai->second;
       }
     }
   cmTargets::iterator i = this->Targets.find( name );
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index f3dbb74..35dd3c6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -283,7 +283,7 @@ public:
   cmTarget* AddLibrary(const std::string& libname, cmState::TargetType type,
                   const std::vector<std::string> &srcs,
                   bool excludeFromAll = false);
-  void AddAlias(const std::string& libname, cmTarget *tgt);
+  void AddAlias(const std::string& libname, const std::string& tgt);
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
   /**
@@ -790,7 +790,7 @@ protected:
 #else
   typedef std::map<std::string, cmTarget*> TargetMap;
 #endif
-  TargetMap AliasTargets;
+  std::map<std::string, std::string> AliasTargets;
   std::vector<cmSourceFile*> SourceFiles;
 
   // Tests

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9220295298732e69f2ed3d7c21417d20ec72fef9
commit 9220295298732e69f2ed3d7c21417d20ec72fef9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:33:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:48 2015 +0100

    cmGlobalGenerator: Remove unneeded GetGeneratorTarget

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e33e942..215d63f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2244,8 +2244,7 @@ cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
 
   if(cmTarget* tgt = this->FindTarget(libname))
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
-    if(gt->IsFrameworkOnApple())
+    if(tgt->IsFrameworkOnApple())
        {
        return true;
        }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=228dfffbe900b161df292a2c826ed84de0d6551d
commit 228dfffbe900b161df292a2c826ed84de0d6551d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:22:51 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:48 2015 +0100

    cmGlobalGenerator: Remove direct storage of targets
    
    Find the target by looping when needed.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d26cc34..e33e942 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1637,8 +1637,6 @@ void cmGlobalGenerator::ClearGeneratorMembers()
 
   this->ExportSets.clear();
   this->TargetDependencies.clear();
-  this->TotalTargets.clear();
-  this->ImportedTargets.clear();
   this->ProjectMap.clear();
   this->RuleHashes.clear();
   this->DirectoryContentMap.clear();
@@ -2180,6 +2178,41 @@ bool cmGlobalGenerator::IsAlias(const std::string& name) const
   return this->AliasTargets.find(name) != this->AliasTargets.end();
 }
 
+cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
+    {
+    cmTargets& tgts = this->Makefiles[i]->GetTargets();
+    for (cmTargets::iterator it = tgts.begin(); it != tgts.end(); ++it)
+      {
+      if (it->second.GetName() == name)
+        {
+        return &it->second;
+        }
+      }
+    }
+  return 0;
+}
+
+cmTarget*
+cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
+    {
+    std::vector<cmTarget*> tgts =
+        this->Makefiles[i]->GetOwnedImportedTargets();
+    for (std::vector<cmTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
+      {
+      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+        {
+        return *it;
+        }
+      }
+    }
+  return 0;
+}
+
 //----------------------------------------------------------------------------
 cmTarget*
 cmGlobalGenerator::FindTarget(const std::string& name,
@@ -2193,17 +2226,11 @@ cmGlobalGenerator::FindTarget(const std::string& name,
       return ai->second;
       }
     }
-  TargetMap::const_iterator i = this->TotalTargets.find ( name );
-  if ( i != this->TotalTargets.end() )
-    {
-    return i->second;
-    }
-  i = this->ImportedTargets.find(name);
-  if ( i != this->ImportedTargets.end() )
+  if (cmTarget* tgt = this->FindTargetImpl(name))
     {
-    return i->second;
+    return tgt;
     }
-  return 0;
+  return this->FindImportedTargetImpl(name);
 }
 
 //----------------------------------------------------------------------------
@@ -2622,18 +2649,6 @@ cmGlobalGenerator::GetTargetDirectDepends(cmGeneratorTarget const* target)
   return this->TargetDependencies[target];
 }
 
-void cmGlobalGenerator::AddTarget(cmTarget* t)
-{
-  if(t->IsImported())
-    {
-    this->ImportedTargets[t->GetName()] = t;
-    }
-  else
-    {
-    this->TotalTargets[t->GetName()] = t;
-    }
-}
-
 bool cmGlobalGenerator::IsReservedTarget(std::string const& name)
 {
   // The following is a list of targets reserved
@@ -2939,17 +2954,20 @@ void cmGlobalGenerator::WriteSummary()
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
 
-  // Generate summary information files for each target.
-  for(TargetMap::const_iterator ti =
-        this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
-    if ((ti->second)->GetType() == cmState::INTERFACE_LIBRARY)
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
       {
-      continue;
+      if ((*it)->GetType() == cmState::INTERFACE_LIBRARY)
+        {
+        continue;
+        }
+      this->WriteSummary(*it);
+      fout << (*it)->GetSupportDirectory() << "\n";
       }
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
-    this->WriteSummary(gt);
-    fout << gt->GetSupportDirectory() << "\n";
     }
 }
 
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 18f5329..5d4ce08 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -280,8 +280,6 @@ public:
   std::set<std::string> const& GetDirectoryContent(std::string const& dir,
                                                    bool needDisk = true);
 
-  void AddTarget(cmTarget* t);
-
   static bool IsReservedTarget(std::string const& name);
 
   virtual const char* GetAllTargetName()         const { return "ALL_BUILD"; }
@@ -439,9 +437,10 @@ protected:
 #else
   typedef std::map<std::string,cmTarget *> TargetMap;
 #endif
-  TargetMap TotalTargets;
   TargetMap AliasTargets;
-  TargetMap ImportedTargets;
+
+  cmTarget* FindTargetImpl(std::string const& name) const;
+  cmTarget* FindImportedTargetImpl(std::string const& name) const;
 
   const char* GetPredefinedTargetsFolder();
   virtual bool UseFolderProperty();
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index b771f11..c205d1a 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -354,14 +354,17 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
   cmGlobalVisualStudio7Generator::AddExtraIDETargets();
   if(this->AddCheckTarget())
     {
-    // All targets depend on the build-system check target.
-    for(TargetMap::const_iterator
-          ti = this->TotalTargets.begin();
-        ti != this->TotalTargets.end(); ++ti)
+    for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
       {
-      if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+      cmTargets& tgts = this->Makefiles[i]->GetTargets();
+      // All targets depend on the build-system check target.
+      for(cmTargets::iterator ti = tgts.begin();
+          ti != tgts.end(); ++ti)
         {
-        ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+        if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+          {
+          ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+          }
         }
       }
     }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 42f9758..6d4fc1f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1362,12 +1362,17 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::ForceLinkerLanguages()
 {
-  // This makes sure all targets link using the proper language.
-  for(TargetMap::const_iterator
-        ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
-    this->ForceLinkerLanguage(gt);
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    // All targets depend on the build-system check target.
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti = tgts.begin();
+        ti != tgts.end(); ++ti)
+      {
+      // This makes sure all targets link using the proper language.
+      this->ForceLinkerLanguage(*ti);
+      }
     }
 }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 4ec493d..bebcf09 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2096,7 +2096,6 @@ cmMakefile::AddNewTarget(cmState::TargetType type, const std::string& name)
   cmTarget& target = it->second;
   target.SetType(type, name);
   target.SetMakefile(this);
-  this->GetGlobalGenerator()->AddTarget(&it->second);
   return &it->second;
 }
 
@@ -4183,15 +4182,11 @@ cmMakefile::AddImportedTarget(const std::string& name,
   // Create the target.
   cmsys::auto_ptr<cmTarget> target(new cmTarget);
   target->SetType(type, name);
-  target->MarkAsImported();
+  target->MarkAsImported(global);
   target->SetMakefile(this);
 
   // Add to the set of available imported targets.
   this->ImportedTargets[name] = target.get();
-  if(global)
-    {
-    this->GetGlobalGenerator()->AddTarget(target.get());
-    }
 
   // Transfer ownership to this cmMakefile object.
   this->ImportedTargetsOwned.push_back(target.get());
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c887fc8..f0f404c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -63,6 +63,7 @@ cmTarget::cmTarget()
   this->IsAndroid = false;
   this->IsApple = false;
   this->IsImportedTarget = false;
+  this->ImportedGloballyVisible = false;
   this->BuildInterfaceIncludesAppended = false;
 }
 
@@ -1505,9 +1506,10 @@ void cmTarget::CheckProperty(const std::string& prop,
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::MarkAsImported()
+void cmTarget::MarkAsImported(bool global)
 {
   this->IsImportedTarget = true;
+  this->ImportedGloballyVisible = global;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 541e850..62e10f4 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -75,7 +75,7 @@ public:
    */
   void SetType(cmState::TargetType f, const std::string& name);
 
-  void MarkAsImported();
+  void MarkAsImported(bool global = false);
 
   ///! Set/Get the name of the target
   const std::string& GetName() const {return this->Name;}
@@ -186,6 +186,8 @@ public:
   void CheckProperty(const std::string& prop, cmMakefile* context) const;
 
   bool IsImported() const {return this->IsImportedTarget;}
+  bool IsImportedGloballyVisible() const
+  { return this->ImportedGloballyVisible; }
 
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
@@ -349,6 +351,7 @@ private:
   bool IsAndroid;
   bool IsApple;
   bool IsImportedTarget;
+  bool ImportedGloballyVisible;
   bool BuildInterfaceIncludesAppended;
 #if defined(_WIN32) && !defined(__CYGWIN__)
   bool LinkLibrariesForVS6Analyzed;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=267736ce1e5827e30fd49c96075adeb123aca2e3
commit 267736ce1e5827e30fd49c96075adeb123aca2e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 11:49:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:48 2015 +0100

    cmTargetCollectLinkLanguages: Remove cmMakefile dependency

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e19d5e5..9376e98 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1793,7 +1793,7 @@ public:
                                UNORDERED_SET<std::string>& languages,
                                cmGeneratorTarget const* head):
     Config(config), Languages(languages), HeadTarget(head),
-    Makefile(target->Target->GetMakefile()), Target(target)
+    Target(target)
   { this->Visited.insert(target); }
 
   void Visit(cmLinkItem const& item)
@@ -1805,7 +1805,8 @@ public:
         bool noMessage = false;
         cmake::MessageType messageType = cmake::FATAL_ERROR;
         std::stringstream e;
-        switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0028))
+        switch(this->Target->GetLocalGenerator()
+               ->GetPolicyStatus(cmPolicies::CMP0028))
           {
           case cmPolicies::WARN:
             {
@@ -1859,7 +1860,6 @@ private:
   std::string Config;
   UNORDERED_SET<std::string>& Languages;
   cmGeneratorTarget const* HeadTarget;
-  cmMakefile* Makefile;
   const cmGeneratorTarget* Target;
   std::set<cmGeneratorTarget const*> Visited;
 };

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bc79630288d468ed1cd669aa3fbda04b5adb7e3
commit 6bc79630288d468ed1cd669aa3fbda04b5adb7e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 11:37:34 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:47 2015 +0100

    cmGeneratorTarget: Port cmOptionalLinkImplementation

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3df43ff..e19d5e5 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5560,7 +5560,7 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const
     }
 
   std::string CONFIG = cmSystemTools::UpperCase(config);
-  cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this->Target];
+  cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this];
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
@@ -5840,7 +5840,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkImplementation& impl = hm[head->Target];
+  cmOptionalLinkImplementation& impl = hm[head];
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 3c6f267..c2607a7 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -647,7 +647,7 @@ private:
                       const std::string& config) const;
 
   struct HeadToLinkImplementationMap:
-    public std::map<cmTarget const*, cmOptionalLinkImplementation> {};
+    public std::map<cmGeneratorTarget const*, cmOptionalLinkImplementation> {};
   typedef std::map<std::string,
                    HeadToLinkImplementationMap> LinkImplMapType;
   mutable LinkImplMapType LinkImplMap;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b7ed7a73661201dc691477b81ec2436723d263a
commit 5b7ed7a73661201dc691477b81ec2436723d263a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 10:35:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:47 2015 +0100

    cmGeneratorTarget: Add API for property keys

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 1daa67e..83127e7 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -105,16 +105,18 @@ cmExportTryCompileFileGenerator::PopulateProperties(
                                  ImportPropertyMap& properties,
                                  std::set<cmGeneratorTarget const*> &emitted)
 {
-  cmPropertyMap props = target->Target->GetProperties();
-  for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
+  std::vector<std::string> props = target->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator i = props.begin();
+      i != props.end(); ++i)
     {
-    properties[i->first] = i->second.GetValue();
 
-    if(i->first.find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0
-        || i->first.find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0
-        || i->first.find("INTERFACE_LINK_LIBRARIES") == 0)
+    properties[*i] = target->GetProperty(*i);
+
+    if(i->find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0
+        || i->find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0
+        || i->find("INTERFACE_LINK_LIBRARIES") == 0)
       {
-      std::string evalResult = this->FindTargets(i->first,
+      std::string evalResult = this->FindTargets(*i,
                                                  target, emitted);
 
       std::vector<std::string> depends;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 651c89c..3df43ff 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4251,9 +4251,11 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                           PropertyType *)
 {
   PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
-  const bool explicitlySet = tgt->Target->GetProperties()
-                                  .find(p)
-                                  != tgt->Target->GetProperties().end();
+  std::vector<std::string> headPropKeys = tgt->GetPropertyKeys();
+  const bool explicitlySet =
+      std::find(headPropKeys.begin(), headPropKeys.end(),
+                p) != headPropKeys.end();
+
   const bool impliedByUse =
           tgt->IsNullImpliedByLinkLibraries(p);
   assert((impliedByUse ^ explicitlySet)
@@ -4298,9 +4300,11 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
 
     cmGeneratorTarget const* theTarget = *li;
 
-    const bool ifaceIsSet = theTarget->Target->GetProperties()
-                            .find(interfaceProperty)
-                            != theTarget->Target->GetProperties().end();
+    std::vector<std::string> propKeys = theTarget->GetPropertyKeys();
+
+    const bool ifaceIsSet =
+        std::find(propKeys.begin(), propKeys.end(),
+                  interfaceProperty) != propKeys.end();
     PropertyType ifacePropContent =
                     getTypedProperty<PropertyType>(theTarget,
                               interfaceProperty);
@@ -4577,6 +4581,19 @@ void cmGeneratorTarget::ComputeVersionedName(std::string& vName,
   vName += this->Makefile->IsOn("APPLE") ? suffix : std::string();
 }
 
+std::vector<std::string> cmGeneratorTarget::GetPropertyKeys() const
+{
+  cmPropertyMap propsObject = this->Target->GetProperties();
+  std::vector<std::string> props;
+  props.reserve(propsObject.size());
+  for (cmPropertyMap::const_iterator it = propsObject.begin();
+       it != propsObject.end(); ++it)
+    {
+    props.push_back(it->first);
+    }
+  return props;
+}
+
 //----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ReportPropertyOrigin(const std::string &p,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 58c3421..3c6f267 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -57,6 +57,7 @@ public:
   std::string GetName() const;
   std::string GetExportName() const;
 
+  std::vector<std::string> GetPropertyKeys() const;
   const char *GetProperty(const std::string& prop) const;
   bool GetPropertyAsBool(const std::string& prop) const;
   void GetSourceFiles(std::vector<cmSourceFile*>& files,
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 5737bee..42f9758 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2486,13 +2486,13 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   // put this last so it can override existing settings
   // Convert "XCODE_ATTRIBUTE_*" properties directly.
   {
-  cmPropertyMap const& props = gtgt->Target->GetProperties();
-  for(cmPropertyMap::const_iterator i = props.begin();
+  std::vector<std::string> const& props = gtgt->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator i = props.begin();
       i != props.end(); ++i)
     {
-    if(i->first.find("XCODE_ATTRIBUTE_") == 0)
+    if(i->find("XCODE_ATTRIBUTE_") == 0)
       {
-      std::string attribute = i->first.substr(16);
+      std::string attribute = i->substr(16);
       // Handle [variant=<config>] condition explicitly here.
       std::string::size_type beginVariant =
         attribute.find("[variant=");
@@ -2523,7 +2523,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
       if (!attribute.empty())
         {
         cmGeneratorExpression ge;
-        std::string processed = ge.Parse(i->second.GetValue())
+        std::string processed = ge.Parse(gtgt->GetProperty(*i))
           ->Evaluate(this->CurrentLocalGenerator, configName);
         buildSettings->AddAttribute(attribute.c_str(),
                                     this->CreateString(processed));
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 0eac203..ae6a24e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2219,17 +2219,18 @@ void cmLocalVisualStudio7Generator::WriteVCProjFooter(
 {
   fout << "\t<Globals>\n";
 
-  cmPropertyMap const& props = target->Target->GetProperties();
-  for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
+  std::vector<std::string> const& props = target->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator i = props.begin();
+      i != props.end(); ++i)
     {
-    if(i->first.find("VS_GLOBAL_") == 0)
+    if(i->find("VS_GLOBAL_") == 0)
       {
-      std::string name = i->first.substr(10);
+      std::string name = i->substr(10);
       if(name != "")
         {
         fout << "\t\t<Global\n"
              << "\t\t\tName=\"" << name << "\"\n"
-             << "\t\t\tValue=\"" << i->second.GetValue() << "\"\n"
+             << "\t\t\tValue=\"" << target->GetProperty(*i) << "\"\n"
              << "\t\t/>\n";
         }
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e6d18cf3cb0d2aac2aabe388e3be38153c43a6b
commit 4e6d18cf3cb0d2aac2aabe388e3be38153c43a6b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 01:19:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:47 2015 +0100

    cmLocalGenerator: Port internals to cmGeneratorTarget

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1926772..b5f5ce9 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2033,7 +2033,7 @@ AddCompilerRequirementFlag(std::string &flags,
 }
 
 static void AddVisibilityCompileOption(std::string &flags,
-                                       cmTarget const* target,
+                                       cmGeneratorTarget const* target,
                                        cmLocalGenerator *lg,
                                        const std::string& lang,
                                        std::string* warnCMP0063)
@@ -2073,7 +2073,7 @@ static void AddVisibilityCompileOption(std::string &flags,
 }
 
 static void AddInlineVisibilityCompileOption(std::string &flags,
-                                       cmTarget const* target,
+                                       cmGeneratorTarget const* target,
                                        cmLocalGenerator *lg,
                                        std::string* warnCMP0063)
 {
@@ -2126,12 +2126,11 @@ void cmLocalGenerator
       }
     }
 
-  AddVisibilityCompileOption(flags, target->Target, this, lang, pWarnCMP0063);
+  AddVisibilityCompileOption(flags, target, this, lang, pWarnCMP0063);
 
   if(lang == "CXX")
     {
-    AddInlineVisibilityCompileOption(flags, target->Target,
-                                     this, pWarnCMP0063);
+    AddInlineVisibilityCompileOption(flags, target, this, pWarnCMP0063);
     }
 
   if (!warnCMP0063.empty() &&

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d30d016f85ba0f94450e60b68ff627be3599318
commit 5d30d016f85ba0f94450e60b68ff627be3599318
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 00:49:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:47 2015 +0100

    VS7: Port some implementation details to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 95a299d..0eac203 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -783,10 +783,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target->Target->GetType() < cmState::UTILITY)
+  if (target->GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target->Target->GetType() == cmState::OBJECT_LIBRARY?
+      target->GetType() == cmState::OBJECT_LIBRARY?
       intermediateDir : target->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
@@ -837,7 +837,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if(this->FortranProject)
     {
     const char* target_mod_dir =
-      target->Target->GetProperty("Fortran_MODULE_DIRECTORY");
+      target->GetProperty("Fortran_MODULE_DIRECTORY");
     std::string modDir;
     if(target_mod_dir)
       {
@@ -877,7 +877,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target->Target->GetType() <= cmState::OBJECT_LIBRARY)
+  if(target->GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
     std::string pdb = target->GetCompilePDBPath(configName);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14abcc1dbedecfb7aa6a945fcf29f19d3fe4465e
commit 14abcc1dbedecfb7aa6a945fcf29f19d3fe4465e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 15:42:04 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:47 2015 +0100

    VS7: Port remaining interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 340a0f7..f5848ab 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -401,7 +401,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -996,7 +996,8 @@ cmGlobalVisualStudio7Generator
 std::set<std::string>
 cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
   std::vector<std::string> const& configs,
-  OrderedTargetDependSet const& projectTargets, cmTarget const* target)
+  OrderedTargetDependSet const& projectTargets,
+  cmGeneratorTarget const* target)
 {
   std::set<std::string> activeConfigs;
   // if it is a utilitiy target then only make it part of the
@@ -1011,13 +1012,13 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
       for(std::vector<std::string>::const_iterator i = configs.begin();
           i != configs.end(); ++i)
         {
-        const char* propertyValue = target->GetMakefile()
+        const char* propertyValue = target->Target->GetMakefile()
           ->GetDefinition("CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD");
         cmGeneratorExpression ge;
         cmsys::auto_ptr<cmCompiledGeneratorExpression>
           cge = ge.Parse(propertyValue);
-        cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-        if(cmSystemTools::IsOn(cge->Evaluate(gt->GetLocalGenerator(), *i)))
+        if(cmSystemTools::IsOn(cge->Evaluate(target->GetLocalGenerator(),
+                                             *i)))
           {
           activeConfigs.insert(*i);
           }
@@ -1029,13 +1030,12 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
     {
     return activeConfigs;
     }
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
   // inspect EXCLUDE_FROM_DEFAULT_BUILD[_<CONFIG>] properties
   for(std::vector<std::string>::const_iterator i = configs.begin();
       i != configs.end(); ++i)
     {
     const char* propertyValue =
-      gt->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i->c_str());
+      target->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i->c_str());
     if(cmSystemTools::IsOff(propertyValue))
       {
       activeConfigs.insert(*i);
@@ -1047,9 +1047,8 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
 bool
 cmGlobalVisualStudio7Generator
 ::IsDependedOn(OrderedTargetDependSet const& projectTargets,
-               cmTarget const* targetIn)
+               cmGeneratorTarget const* gtIn)
 {
-  cmGeneratorTarget* gtIn = this->GetGeneratorTarget(targetIn);
   for (OrderedTargetDependSet::const_iterator l = projectTargets.begin();
        l != projectTargets.end(); ++l)
     {
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 6a0e5e9..fe6db2e 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -163,9 +163,9 @@ protected:
   std::set<std::string>
     IsPartOfDefaultBuild(std::vector<std::string> const& configs,
                          OrderedTargetDependSet const& projectTargets,
-                         cmTarget const* target);
+                         cmGeneratorTarget const* target);
   bool IsDependedOn(OrderedTargetDependSet const& projectTargets,
-                    cmTarget const* target);
+                    cmGeneratorTarget const* target);
   std::map<std::string, std::string> GUIDMap;
 
   virtual void WriteFolders(std::ostream& fout);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a500eaaf6e37f5d413d7d2384769e144e951aa2
commit 0a500eaaf6e37f5d413d7d2384769e144e951aa2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 14:58:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:46 2015 +0100

    cmake: Store hardcoded lists of sources and headers
    
    Don't duplicate this in each cmMakefile.

diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index 5f5017d..92ac07d 100644
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@@ -60,10 +60,10 @@ bool cmAuxSourceDirectoryCommand::InitialPass
         std::string ext = file.substr(dotpos+1);
         std::string base = file.substr(0, dotpos);
         // Process only source files
-        if(!base.empty()
-            && std::find( this->Makefile->GetSourceExtensions().begin(),
-                          this->Makefile->GetSourceExtensions().end(), ext )
-                 != this->Makefile->GetSourceExtensions().end() )
+        std::vector<std::string> srcExts =
+            this->Makefile->GetCMakeInstance()->GetSourceExtensions();
+        if(!base.empty() &&
+           std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end())
           {
           std::string fullname = templateDirectory;
           fullname += "/";
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 597c9d8..9348ef2 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -383,6 +383,9 @@ void cmExtraCodeBlocksGenerator
   all_files_map_t allFiles;
   std::vector<std::string> cFiles;
 
+  std::vector<std::string> srcExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetSourceExtensions();
+
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
        lg!=lgs.end(); lg++)
     {
@@ -420,9 +423,7 @@ void cmExtraCodeBlocksGenerator
               {
               std::string srcext = (*si)->GetExtension();
               for(std::vector<std::string>::const_iterator
-                  ext = mf->GetSourceExtensions().begin();
-                  ext !=  mf->GetSourceExtensions().end();
-                  ++ext)
+                  ext = srcExts.begin(); ext != srcExts.end(); ++ext)
                 {
                 if (srcext == *ext)
                   {
@@ -449,6 +450,9 @@ void cmExtraCodeBlocksGenerator
       }
     }
 
+  std::vector<std::string> headerExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetHeaderExtensions();
+
   // The following loop tries to add header files matching to implementation
   // files to the project. It does that by iterating over all
   // C/C++ source files,
@@ -468,8 +472,8 @@ void cmExtraCodeBlocksGenerator
 
     // check if there's a matching header around
     for(std::vector<std::string>::const_iterator
-        ext = mf->GetHeaderExtensions().begin();
-        ext !=  mf->GetHeaderExtensions().end();
+        ext = headerExts.begin();
+        ext != headerExts.end();
         ++ext)
       {
       std::string hname=headerBasename;
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index f4a6537..67aa157 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -149,6 +149,11 @@ void cmExtraCodeLiteGenerator
   // which may have an acompanying header, one for all other files
   std::string projectType;
 
+  std::vector<std::string> srcExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetSourceExtensions();
+  std::vector<std::string> headerExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetHeaderExtensions();
+
   std::map<std::string, cmSourceFile*> cFiles;
   std::set<std::string> otherFiles;
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
@@ -207,9 +212,7 @@ void cmExtraCodeLiteGenerator
               {
               std::string srcext = (*si)->GetExtension();
               for(std::vector<std::string>::const_iterator
-                  ext = mf->GetSourceExtensions().begin();
-                  ext !=  mf->GetSourceExtensions().end();
-                  ++ext)
+                  ext = srcExts.begin(); ext != srcExts.end(); ++ext)
                 {
                 if (srcext == *ext)
                   {
@@ -253,8 +256,8 @@ void cmExtraCodeLiteGenerator
 
     // check if there's a matching header around
     for(std::vector<std::string>::const_iterator
-        ext = mf->GetHeaderExtensions().begin();
-        ext !=  mf->GetHeaderExtensions().end();
+        ext = headerExts.begin();
+        ext != headerExts.end();
         ++ext)
       {
       std::string hname=headerBasename;
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 7c6c48c..018ab24 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -105,6 +105,9 @@ bool cmGlobalKdevelopGenerator
   std::set<std::string> files;
   std::string tmp;
 
+  std::vector<std::string> hdrExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetHeaderExtensions();
+
   for (std::vector<cmLocalGenerator*>::const_iterator it=lgs.begin();
        it!=lgs.end(); it++)
     {
@@ -160,8 +163,7 @@ bool cmGlobalKdevelopGenerator
 
           // check if there's a matching header around
           for(std::vector<std::string>::const_iterator
-                ext = makefile->GetHeaderExtensions().begin();
-              ext !=  makefile->GetHeaderExtensions().end(); ++ext)
+                ext = hdrExts.begin(); ext != hdrExts.end(); ++ext)
             {
             std::string hname=headerBasename;
             hname += ".";
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9a5c367..5737bee 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1420,7 +1420,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
 bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf)
 {
   const std::vector<std::string>& hdrExts =
-    this->CurrentMakefile->GetHeaderExtensions();
+    this->CMakeInstance->GetHeaderExtensions();
   return (std::find(hdrExts.begin(), hdrExts.end(), sf->GetExtension()) !=
           hdrExts.end());
 }
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 75591fd..4ec493d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -57,31 +57,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
 
   // Setup the default include complaint regular expression (match nothing).
   this->ComplainFileRegularExpression = "^$";
-  // Source and header file extensions that we can handle
-
-  // Set up a list of source and header extensions
-  // these are used to find files when the extension
-  // is not given
-  // The "c" extension MUST precede the "C" extension.
-  this->SourceFileExtensions.push_back( "c" );
-  this->SourceFileExtensions.push_back( "C" );
-
-  this->SourceFileExtensions.push_back( "c++" );
-  this->SourceFileExtensions.push_back( "cc" );
-  this->SourceFileExtensions.push_back( "cpp" );
-  this->SourceFileExtensions.push_back( "cxx" );
-  this->SourceFileExtensions.push_back( "m" );
-  this->SourceFileExtensions.push_back( "M" );
-  this->SourceFileExtensions.push_back( "mm" );
-
-  this->HeaderFileExtensions.push_back( "h" );
-  this->HeaderFileExtensions.push_back( "hh" );
-  this->HeaderFileExtensions.push_back( "h++" );
-  this->HeaderFileExtensions.push_back( "hm" );
-  this->HeaderFileExtensions.push_back( "hpp" );
-  this->HeaderFileExtensions.push_back( "hxx" );
-  this->HeaderFileExtensions.push_back( "in" );
-  this->HeaderFileExtensions.push_back( "txx" );
 
   this->DefineFlags = " ";
 
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 725448b..f3dbb74 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -425,17 +425,6 @@ public:
   cmSourceFile* GetOrCreateSource(const std::string& sourceName,
                                   bool generated = false);
 
-  //@{
-  /**
-   * Return a list of extensions associated with source and header
-   * files
-   */
-  const std::vector<std::string>& GetSourceExtensions() const
-    {return this->SourceFileExtensions;}
-  const std::vector<std::string>& GetHeaderExtensions() const
-    {return this->HeaderFileExtensions;}
-  //@}
-
   /**
    * Given a variable name, return its value (as a string).
    * If the variable is not found in this makefile instance, the
@@ -823,8 +812,6 @@ protected:
   std::vector<cmTestGenerator*> TestGenerators;
 
   std::string ComplainFileRegularExpression;
-  std::vector<std::string> SourceFileExtensions;
-  std::vector<std::string> HeaderFileExtensions;
   std::string DefineFlags;
 
   // Track the value of the computed DEFINITIONS property.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index fc690f8..b16eccd 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -528,7 +528,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
   cmSystemTools::ExpandListArgument(this->Sources, sourceFiles);
 
   const std::vector<std::string>& headerExtensions =
-                                               makefile->GetHeaderExtensions();
+      makefile->GetCMakeInstance()->GetHeaderExtensions();
 
   std::map<std::string, std::vector<std::string> > includedUis;
   std::map<std::string, std::vector<std::string> > skippedUis;
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 37383be..a9ac549 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -167,8 +167,10 @@ bool cmSourceFile::FindFullPath(std::string* error)
     {
     tryDirs[0] = "";
     }
-  const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
-  const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions();
+  const std::vector<std::string>& srcExts =
+      mf->GetCMakeInstance()->GetSourceExtensions();
+  std::vector<std::string> hdrExts =
+      mf->GetCMakeInstance()->GetHeaderExtensions();
   for(const char* const* di = tryDirs; *di; ++di)
     {
     std::string tryPath = this->Location.GetDirectory();
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index b8d5c02..00d5d6a 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -121,8 +121,10 @@ void cmSourceFileLocation::UpdateExtension(const std::string& name)
   // The global generator checks extensions of enabled languages.
   cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
   cmMakefile const* mf = this->Makefile;
-  const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
-  const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions();
+  const std::vector<std::string>& srcExts =
+      mf->GetCMakeInstance()->GetSourceExtensions();
+  const std::vector<std::string>& hdrExts =
+      mf->GetCMakeInstance()->GetHeaderExtensions();
   if(!gg->GetLanguageFromExtension(ext.c_str()).empty() ||
      std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end() ||
      std::find(hdrExts.begin(), hdrExts.end(), ext) != hdrExts.end())
@@ -193,12 +195,14 @@ cmSourceFileLocation
   // disk.  One of these must match if loc refers to this source file.
   std::string const& ext = this->Name.substr(loc.Name.size()+1);
   cmMakefile const* mf = this->Makefile;
-  const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
+  const std::vector<std::string>& srcExts =
+      mf->GetCMakeInstance()->GetSourceExtensions();
   if(std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end())
     {
     return true;
     }
-  const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions();
+  std::vector<std::string> hdrExts =
+      mf->GetCMakeInstance()->GetHeaderExtensions();
   if(std::find(hdrExts.begin(), hdrExts.end(), ext) != hdrExts.end())
     {
     return true;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 7268241..16417fc 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -165,6 +165,30 @@ cmake::cmake()
 
   // Make sure we can capture the build tool output.
   cmSystemTools::EnableVSConsoleOutput();
+
+  // Set up a list of source and header extensions
+  // these are used to find files when the extension
+  // is not given
+  // The "c" extension MUST precede the "C" extension.
+  this->SourceFileExtensions.push_back( "c" );
+  this->SourceFileExtensions.push_back( "C" );
+
+  this->SourceFileExtensions.push_back( "c++" );
+  this->SourceFileExtensions.push_back( "cc" );
+  this->SourceFileExtensions.push_back( "cpp" );
+  this->SourceFileExtensions.push_back( "cxx" );
+  this->SourceFileExtensions.push_back( "m" );
+  this->SourceFileExtensions.push_back( "M" );
+  this->SourceFileExtensions.push_back( "mm" );
+
+  this->HeaderFileExtensions.push_back( "h" );
+  this->HeaderFileExtensions.push_back( "hh" );
+  this->HeaderFileExtensions.push_back( "h++" );
+  this->HeaderFileExtensions.push_back( "hm" );
+  this->HeaderFileExtensions.push_back( "hpp" );
+  this->HeaderFileExtensions.push_back( "hxx" );
+  this->HeaderFileExtensions.push_back( "in" );
+  this->HeaderFileExtensions.push_back( "txx" );
 }
 
 cmake::~cmake()
diff --git a/Source/cmake.h b/Source/cmake.h
index 9d28cba..6b0e83f 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -182,6 +182,11 @@ class cmake
   ///! get the cmCachemManager used by this invocation of cmake
   cmCacheManager *GetCacheManager() { return this->CacheManager; }
 
+  const std::vector<std::string>& GetSourceExtensions() const
+    {return this->SourceFileExtensions;}
+  const std::vector<std::string>& GetHeaderExtensions() const
+    {return this->HeaderFileExtensions;}
+
   /**
    * Given a variable name, return its value (as a string).
    */
@@ -391,6 +396,8 @@ private:
   std::string CheckStampFile;
   std::string CheckStampList;
   std::string VSSolutionFile;
+  std::vector<std::string> SourceFileExtensions;
+  std::vector<std::string> HeaderFileExtensions;
   bool ClearBuildSystem;
   bool DebugTryCompile;
   cmFileTimeComparison* FileComparison;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26ccc3821fce09e04540dacc3714a3fdb278c6b9
commit 26ccc3821fce09e04540dacc3714a3fdb278c6b9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 13:30:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:46 2015 +0100

    Export: Use existing IsDLLPlatform porcelain

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 23c11d7..9e36539 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -213,12 +213,8 @@ cmExportBuildFileGenerator
   properties[prop] = value;
   }
 
-  // Check whether this is a DLL platform.
-  bool dll_platform =
-    (mf->IsOn("WIN32") || mf->IsOn("CYGWIN") || mf->IsOn("MINGW"));
-
   // Add the import library for windows DLLs.
-  if(dll_platform &&
+  if(target->IsDLLPlatform() &&
      (target->GetType() == cmState::SHARED_LIBRARY ||
       target->IsExecutableWithExports()) &&
      mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX"))
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d52ce35..e8a2e6a 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -879,10 +879,7 @@ cmExportFileGenerator
   if(target->GetType() == cmState::SHARED_LIBRARY ||
      target->GetType() == cmState::MODULE_LIBRARY)
     {
-    // Check whether this is a DLL platform.
-    bool dll_platform =
-      (mf->IsOn("WIN32") || mf->IsOn("CYGWIN") || mf->IsOn("MINGW"));
-    if(!dll_platform)
+    if(!target->IsDLLPlatform())
       {
       std::string prop;
       std::string value;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9c3f0a7ff450d266e54621cfe5009e5aef3ea1e
commit f9c3f0a7ff450d266e54621cfe5009e5aef3ea1e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 09:29:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:46 2015 +0100

    cmGeneratorTarget: Move LinkLanguagePropagatesToDependents from cmTarget

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7e75d93..df6e3fb 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -999,7 +999,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
 
     if (propertyName == "LINKER_LANGUAGE")
       {
-      if (target->Target->LinkLanguagePropagatesToDependents() &&
+      if (target->LinkLanguagePropagatesToDependents() &&
           dagCheckerParent && (dagCheckerParent->EvaluatingLinkLibraries()
             || dagCheckerParent->EvaluatingSources()))
         {
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index eb433f5..651c89c 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4770,7 +4770,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
     iface.WrongConfigLibraries = impl->WrongConfigLibraries;
     }
 
-  if(this->Target->LinkLanguagePropagatesToDependents())
+  if(this->LinkLanguagePropagatesToDependents())
     {
     // Targets using this archive need its language runtime libraries.
     if(cmLinkImplementation const* impl =
@@ -5485,7 +5485,7 @@ void cmGeneratorTarget::ComputeImportInfo(std::string const& desired_config,
   }
 
   // Get the link languages.
-  if(this->Target->LinkLanguagePropagatesToDependents())
+  if(this->LinkLanguagePropagatesToDependents())
     {
     std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES";
     linkProp += suffix;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 588ff33..58c3421 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -189,6 +189,9 @@ public:
   std::set<std::string>const& GetUtilities() const;
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
+  bool LinkLanguagePropagatesToDependents() const
+  { return this->GetType() == cmState::STATIC_LIBRARY; }
+
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 17a1d4d..541e850 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -227,9 +227,6 @@ public:
   std::set<std::string> const & GetSystemIncludeDirectories() const
     { return this->SystemIncludeDirectories; }
 
-  bool LinkLanguagePropagatesToDependents() const
-  { return this->TargetTypeValue == cmState::STATIC_LIBRARY; }
-
   cmStringRange GetIncludeDirectoriesEntries() const;
   cmBacktraceRange GetIncludeDirectoriesBacktraces() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06fdd262b21f3eb7b23a9d90e2582bdf820122a9
commit 06fdd262b21f3eb7b23a9d90e2582bdf820122a9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:17:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:46 2015 +0100

    cmLocalGenerator: Add IsRootMakefile API

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index b4a915c..7dd24fb 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -523,7 +523,7 @@ cmGlobalUnixMakefileGenerator3
                        cmLocalUnixMakefileGenerator3* lg)
 {
   // Only subdirectories need these rules.
-  if(lg->GetMakefile()->IsRootMakefile())
+  if(lg->IsRootMakefile())
     {
     return;
     }
@@ -1084,7 +1084,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
     // for the passed in makefile or if this is the top Makefile wripte out
     // the targets
-    if (lg2 == lg || lg->GetMakefile()->IsRootMakefile())
+    if (lg2 == lg || lg->IsRootMakefile())
       {
       // for each target Generate the rule files for each target.
       std::vector<cmGeneratorTarget*> targets = lg2->GetGeneratorTargets();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 5f0242e..1926772 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -490,6 +490,11 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 }
 
+bool cmLocalGenerator::IsRootMakefile() const
+{
+  return !this->StateSnapshot.GetBuildsystemDirectoryParent().IsValid();
+}
+
 cmState* cmLocalGenerator::GetState() const
 {
   return this->GlobalGenerator->GetCMakeInstance()->GetState();
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 6380db6..46eb1b3 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -67,6 +67,8 @@ public:
    */
   void ComputeTargetManifest();
 
+  bool IsRootMakefile() const;
+
   ///! Get the makefile for this generator
   cmMakefile *GetMakefile() {
     return this->Makefile; }
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 891c44e..7de48a4 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -56,7 +56,7 @@ void cmLocalNinjaGenerator::Generate()
 #endif
 
   // We do that only once for the top CMakeLists.txt file.
-  if(this->Makefile->IsRootMakefile())
+  if(this->IsRootMakefile())
     {
     this->WriteBuildFileTop();
 
@@ -277,7 +277,7 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
     << "# Write statements declared in CMakeLists.txt:" << std::endl
     << "# "
     << this->Makefile->GetDefinition("CMAKE_CURRENT_LIST_FILE") << std::endl;
-  if(this->Makefile->IsRootMakefile())
+  if(this->IsRootMakefile())
     os << "# Which is the root file." << std::endl;
   cmGlobalNinjaGenerator::WriteDivider(os);
   os << std::endl;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 9bb2765..82e3b01 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -254,7 +254,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
     return;
     }
   // always write the top makefile
-  if (!this->GetMakefile()->IsRootMakefile())
+  if (!this->IsRootMakefile())
     {
     ruleFileStream.SetCopyIfDifferent(true);
     }
@@ -265,7 +265,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
   // only write local targets unless at the top Keep track of targets already
   // listed.
   std::set<std::string> emittedTargets;
-  if (!this->GetMakefile()->IsRootMakefile())
+  if (!this->IsRootMakefile())
     {
     // write our targets, and while doing it collect up the object
     // file rules
@@ -880,7 +880,7 @@ void cmLocalUnixMakefileGenerator3
   std::vector<std::string> no_depends;
   std::vector<std::string> commands;
   commands.push_back(runRule);
-  if(!this->GetMakefile()->IsRootMakefile())
+  if(!this->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
                           this->GetBinaryDirectory(),

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c346202ef815fe600d7970ddf47cdc71fa3b4a47
commit c346202ef815fe600d7970ddf47cdc71fa3b4a47
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:14:08 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:45 2015 +0100

    Genex: use cmGeneratorTarget policy API

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 03f8d3f..7e75d93 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1442,7 +1442,7 @@ cmPolicies::PolicyStatus statusForTarget(cmGeneratorTarget const* tgt,
 #define RETURN_POLICY(POLICY) \
   if (strcmp(policy, #POLICY) == 0) \
   { \
-    return tgt->Target->GetPolicyStatus ## POLICY (); \
+    return tgt->GetPolicyStatus ## POLICY (); \
   } \
 
   CM_FOR_EACH_TARGET_POLICY(RETURN_POLICY)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=882544cdaa44612ae37b60ec5fc45c6909bd8efa
commit 882544cdaa44612ae37b60ec5fc45c6909bd8efa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:13:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:45 2015 +0100

    cmLocalGenerator: Add GetPolicyStatus API

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7a7e4ff..03f8d3f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -393,7 +393,7 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
 
     if (cmsysString_strcasecmp(parameters.begin()->c_str(), compilerId) == 0)
       {
-      switch(context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0044))
+      switch(context->LG->GetPolicyStatus(cmPolicies::CMP0044))
         {
         case cmPolicies::WARN:
           {
@@ -1100,7 +1100,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
                            "COMPILE_DEFINITIONS_"))
       {
       cmPolicies::PolicyStatus polSt =
-          context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0043);
+          context->LG->GetPolicyStatus(cmPolicies::CMP0043);
       if (polSt == cmPolicies::WARN || polSt == cmPolicies::OLD)
         {
         interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c37417d..5f0242e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2201,7 +2201,7 @@ bool cmLocalGenerator::GetShouldUseOldFlags(bool shared,
 
     if (flags && flags != originalFlags)
       {
-      switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0018))
+      switch (this->GetPolicyStatus(cmPolicies::CMP0018))
         {
         case cmPolicies::WARN:
         {
@@ -2949,7 +2949,7 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
 {
   // Check the policy to decide whether to pay attention to this
   // variable.
-  switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0001))
+  switch(this->GetPolicyStatus(cmPolicies::CMP0001))
     {
     case cmPolicies::WARN:
       // WARN is just OLD without warning because user code does not
@@ -2976,6 +2976,12 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
           actual_compat <= CMake_VERSION_ENCODE(2, 4, 255));
 }
 
+cmPolicies::PolicyStatus
+cmLocalGenerator::GetPolicyStatus(cmPolicies::PolicyID id) const
+{
+  return this->Makefile->GetPolicyStatus(id);
+}
+
 //----------------------------------------------------------------------------
 bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 552020b..6380db6 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -265,6 +265,8 @@ public:
    */
   bool NeedBackwardsCompatibility_2_4();
 
+  cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id) const;
+
   cmake* GetCMakeInstance() const;
 
   const char* GetSourceDirectory() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7455293496e8543830b3a5b7c1bffbd58713014f
commit 7455293496e8543830b3a5b7c1bffbd58713014f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:04:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:45 2015 +0100

    cmGeneratorTarget: Add GetUtilityBacktrace API

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 113c989..586b5bf 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -382,7 +382,7 @@ void cmComputeTargetDepends::AddTargetDepend(
         << "\" of target \"" << depender->GetName() << "\" does not exist.";
 
       cmListFileBacktrace const* backtrace =
-        depender->Target->GetUtilityBacktrace(dependee_name);
+        depender->GetUtilityBacktrace(dependee_name);
       if(backtrace)
         {
         cm->IssueMessage(messageType, e.str(), *backtrace);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7d5a9d0..eb433f5 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1742,6 +1742,12 @@ const std::set<std::string>& cmGeneratorTarget::GetUtilities() const
   return this->Target->GetUtilities();
 }
 
+const cmListFileBacktrace*
+cmGeneratorTarget::GetUtilityBacktrace(const std::string& u) const
+{
+  return this->Target->GetUtilityBacktrace(u);
+}
+
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index ff975c5..588ff33 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -187,6 +187,8 @@ public:
   const std::vector<std::string>& GetLinkDirectories() const;
 
   std::set<std::string>const& GetUtilities() const;
+  cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
+
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a24eb94f5b608441265eaa591934a4b0b6d1c46b
commit a24eb94f5b608441265eaa591934a4b0b6d1c46b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:01:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:12:35 2015 +0100

    cmGeneratorTarget: Add GetUtilities API

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7516576..7d5a9d0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -796,7 +796,7 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
   if(!this->UtilityItemsDone)
     {
     this->UtilityItemsDone = true;
-    std::set<std::string> const& utilities = this->Target->GetUtilities();
+    std::set<std::string> const& utilities = this->GetUtilities();
     for(std::set<std::string>::const_iterator i = utilities.begin();
         i != utilities.end(); ++i)
       {
@@ -1737,6 +1737,11 @@ const std::vector<std::string>&cmGeneratorTarget::GetLinkDirectories() const
   return this->Target->GetLinkDirectories();
 }
 
+const std::set<std::string>& cmGeneratorTarget::GetUtilities() const
+{
+  return this->Target->GetUtilities();
+}
+
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 38e1826..ff975c5 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -186,6 +186,7 @@ public:
 
   const std::vector<std::string>& GetLinkDirectories() const;
 
+  std::set<std::string>const& GetUtilities() const;
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 2671f4d..8498e39 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -965,7 +965,7 @@ cmGlobalNinjaGenerator
   if (target->GetType() == cmState::GLOBAL_TARGET) {
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
-    std::set<std::string> const& utils = target->Target->GetUtilities();
+    std::set<std::string> const& utils = target->GetUtilities();
     std::copy(utils.begin(), utils.end(), std::back_inserter(outputs));
   } else {
     cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(target);
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index bb494f1..5866c0e 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -235,7 +235,7 @@ void cmGlobalVisualStudio6Generator
       std::string project = target->GetName();
       std::string location = expath;
       this->WriteExternalProject(fout, project.c_str(),
-          location.c_str(), target->Target->GetUtilities());
+          location.c_str(), target->GetUtilities());
       }
     else
       {
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 5473247..340a0f7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -459,7 +459,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
                                  project.c_str(),
                                  location.c_str(),
                                  target->GetProperty("VS_PROJECT_TYPE"),
-                                 target->Target->GetUtilities());
+                                 target->GetUtilities());
       written = true;
       }
     else
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index bdb1b25..b771f11 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -464,8 +464,8 @@ bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target->Target->GetUtilities().begin();
-      ui != target->Target->GetUtilities().end(); ++ui)
+        target->GetUtilities().begin();
+      ui != target->GetUtilities().end(); ++ui)
     {
     if(cmGeneratorTarget* depTarget =
         target->GetLocalGenerator()->FindGeneratorTargetToUse(ui->c_str()))
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 541257b..9bb2765 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1778,8 +1778,8 @@ void cmLocalUnixMakefileGenerator3
         {
         text = "Running external command ...";
         }
-      depends.insert(depends.end(), (*glIt)->Target->GetUtilities().begin(),
-                     (*glIt)->Target->GetUtilities().end());
+      depends.insert(depends.end(), (*glIt)->GetUtilities().begin(),
+                     (*glIt)->GetUtilities().end());
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05fc07b1fe6793147902a4363b61c12ae0c40c5f
commit 05fc07b1fe6793147902a4363b61c12ae0c40c5f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:59:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:02:13 2015 +0100

    cmTarget: Make compatbility API explicit.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..75591fd 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -756,15 +756,26 @@ void cmMakefile::ConfigureFinalPass()
       "with CMake 2.4 or later. For compatibility with older versions please "
       "use any CMake 2.8.x release or lower.");
     }
-  for (cmTargets::iterator l = this->Targets.begin();
-       l != this->Targets.end(); l++)
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  // Do old-style link dependency analysis only for CM_USE_OLD_VS6.
+  if(this->Makefile->GetGlobalGenerator()->IsForVS6())
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    for (cmTargets::iterator l = this->Targets.begin();
+         l != this->Targets.end(); l++)
       {
-      continue;
+      if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+        {
+        continue;
+        }
+      // Erase any cached link information that might have been comptued
+      // on-demand during the configuration.  This ensures that build
+      // system generation uses up-to-date information even if other cache
+      // invalidation code in this source file is buggy.
+
+      l->second->AnalyzeLibDependenciesForVS6(this);
       }
-    l->second.FinishConfigure();
     }
+#endif
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0c0cf8e..c887fc8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -315,23 +315,6 @@ cmListFileBacktrace const* cmTarget::GetUtilityBacktrace(
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::FinishConfigure()
-{
-  // Erase any cached link information that might have been comptued
-  // on-demand during the configuration.  This ensures that build
-  // system generation uses up-to-date information even if other cache
-  // invalidation code in this source file is buggy.
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-  // Do old-style link dependency analysis only for CM_USE_OLD_VS6.
-  if(this->Makefile->GetGlobalGenerator()->IsForVS6())
-    {
-    this->AnalyzeLibDependenciesForVS6(*this->Makefile);
-    }
-#endif
-}
-
-//----------------------------------------------------------------------------
 cmListFileBacktrace const& cmTarget::GetBacktrace() const
 {
   return this->Backtrace;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7e7e34a..17a1d4d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -176,9 +176,6 @@ public:
   std::set<std::string>const& GetUtilities() const { return this->Utilities; }
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
-  /** Finalize the target at the end of the Configure step.  */
-  void FinishConfigure();
-
   ///! Set/Get a property of this target file
   void SetProperty(const std::string& prop, const char *value);
   void AppendProperty(const std::string&  prop, const char* value,
@@ -250,10 +247,11 @@ public:
   cmStringRange GetLinkImplementationEntries() const;
   cmBacktraceRange GetLinkImplementationBacktraces() const;
 
-
 #if defined(_WIN32) && !defined(__CYGWIN__)
   const LinkLibraryVectorType &GetLinkLibrariesForVS6() const {
   return this->LinkLibrariesForVS6;}
+
+  void AnalyzeLibDependenciesForVS6( const cmMakefile& mf );
 #endif
 
   struct StrictTargetComparison {
@@ -312,8 +310,6 @@ private:
   void GatherDependenciesForVS6( const cmMakefile& mf,
                                  const LibraryID& lib,
                                  DependencyMap& dep_map);
-
-  void AnalyzeLibDependenciesForVS6( const cmMakefile& mf );
 #endif
 
   const char* GetSuffixVariableInternal(bool implib) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bde277e811fea2532ed32ade6d7f3d6e910bfda0
commit bde277e811fea2532ed32ade6d7f3d6e910bfda0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:49:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:02:13 2015 +0100

    cmGeneratorTarget: Add GetLinkDirectories API.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index a32bb48..50d8324 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -377,9 +377,9 @@ cmComputeLinkInformation
 
   // Add the search path entries requested by the user to path ordering.
   this->OrderLinkerSearchPath
-    ->AddUserDirectories(this->Target->Target->GetLinkDirectories());
+    ->AddUserDirectories(this->Target->GetLinkDirectories());
   this->OrderRuntimeSearchPath
-    ->AddUserDirectories(this->Target->Target->GetLinkDirectories());
+    ->AddUserDirectories(this->Target->GetLinkDirectories());
 
   // Set up the implicit link directories.
   this->LoadImplicitLinkInfo();
@@ -413,7 +413,7 @@ cmComputeLinkInformation
     // Construct a mask to not bother with this behavior for link
     // directories already specified by the user.
     std::vector<std::string> const& dirs =
-        this->Target->Target->GetLinkDirectories();
+        this->Target->GetLinkDirectories();
     this->OldLinkDirMask.insert(dirs.begin(), dirs.end());
     }
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 95d93bc..7516576 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1732,6 +1732,11 @@ cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const
   return this->Target->GetBacktrace();
 }
 
+const std::vector<std::string>&cmGeneratorTarget::GetLinkDirectories() const
+{
+  return this->Target->GetLinkDirectories();
+}
+
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index cc7d585..38e1826 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -184,6 +184,8 @@ public:
 
   cmListFileBacktrace GetBacktrace() const;
 
+  const std::vector<std::string>& GetLinkDirectories() const;
+
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 3b25eda..fd0af61 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1052,7 +1052,7 @@ void cmLocalVisualStudio6Generator
     }
   std::vector<std::string>::const_iterator i;
   const std::vector<std::string>& libdirs =
-      target->Target->GetLinkDirectories();
+      target->GetLinkDirectories();
   for(i = libdirs.begin(); i != libdirs.end(); ++i)
     {
     std::string path = *i;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf69630e510a5c639a93a99b315fcefea9688935
commit cf69630e510a5c639a93a99b315fcefea9688935
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:47:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:02:13 2015 +0100

    cmGeneratorTarget: Move GetFrameworkVersion from cmTarget

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index b224f09..95d93bc 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1641,7 +1641,7 @@ cmGeneratorTarget::GetFrameworkDirectory(const std::string& config,
   if(!rootDir && !this->Makefile->PlatformIsAppleIos())
     {
     fpath += "/Versions/";
-    fpath += this->Target->GetFrameworkVersion();
+    fpath += this->GetFrameworkVersion();
     }
   return fpath;
 }
@@ -3331,7 +3331,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
     if(!this->Makefile->PlatformIsAppleIos())
       {
       realName += "Versions/";
-      realName += this->Target->GetFrameworkVersion();
+      realName += this->GetFrameworkVersion();
       realName += "/";
       }
     realName += base;
@@ -4526,6 +4526,25 @@ void cmGeneratorTarget::GetTargetVersion(bool soversion,
 }
 
 //----------------------------------------------------------------------------
+std::string cmGeneratorTarget::GetFrameworkVersion() const
+{
+  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
+
+  if(const char* fversion = this->GetProperty("FRAMEWORK_VERSION"))
+    {
+    return fversion;
+    }
+  else if(const char* tversion = this->GetProperty("VERSION"))
+    {
+    return tversion;
+    }
+  else
+    {
+    return "A";
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmGeneratorTarget::ComputeVersionedName(std::string& vName,
                                     std::string const& prefix,
                                     std::string const& base,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 2b2dc86..cc7d585 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -165,6 +165,10 @@ public:
   std::string GetFrameworkDirectory(const std::string& config,
                                     bool rootDir) const;
 
+  /** Return the framework version string.  Undefined if
+      IsFrameworkOnApple returns false.  */
+  std::string GetFrameworkVersion() const;
+
   /** @return the Mac CFBundle directory without the base */
   std::string GetCFBundleDirectory(const std::string& config,
                                    bool contentOnly) const;
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index e6af94f..9a5c367 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2141,7 +2141,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
     {
     if(gtgt->GetPropertyAsBool("FRAMEWORK"))
       {
-      std::string fw_version = gtgt->Target->GetFrameworkVersion();
+      std::string fw_version = gtgt->GetFrameworkVersion();
       buildSettings->AddAttribute("FRAMEWORK_VERSION",
                                   this->CreateString(fw_version.c_str()));
 
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index e9dc433..3c4aa00 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -83,7 +83,7 @@ void cmOSXBundleGenerator::CreateFramework(
   std::string newoutpath = outpath + "/" +
     this->GT->GetFrameworkDirectory(this->ConfigName, false);
 
-  std::string frameworkVersion = this->GT->Target->GetFrameworkVersion();
+  std::string frameworkVersion = this->GT->GetFrameworkVersion();
 
   // Configure the Info.plist file into the Resources directory.
   this->MacContentFolders->insert("Resources");
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e056469..0c0cf8e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2048,25 +2048,6 @@ void cmTarget::SetPropertyDefault(const std::string& property,
     }
 }
 
-//----------------------------------------------------------------------------
-std::string cmTarget::GetFrameworkVersion() const
-{
-  assert(this->GetType() != cmState::INTERFACE_LIBRARY);
-
-  if(const char* fversion = this->GetProperty("FRAMEWORK_VERSION"))
-    {
-    return fversion;
-    }
-  else if(const char* tversion = this->GetProperty("VERSION"))
-    {
-    return tversion;
-    }
-  else
-    {
-    return "A";
-    }
-}
-
 bool cmTarget::GetMappedConfig(std::string const& desired_config,
                                const char** loc,
                                const char** imp,
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 1cae94f..7e7e34a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -209,10 +209,6 @@ public:
   /** Return whether this target is an executable Bundle on Apple.  */
   bool IsAppBundleOnApple() const;
 
-  /** Return the framework version string.  Undefined if
-      IsFrameworkOnApple returns false.  */
-  std::string GetFrameworkVersion() const;
-
   /** Get a backtrace from the creation of the target.  */
   cmListFileBacktrace const& GetBacktrace() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f8aa62bfb339dded326b0bc36016134a3dc845b
commit 3f8aa62bfb339dded326b0bc36016134a3dc845b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:42:58 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:02:13 2015 +0100

    cmGeneratorTarget: Add API for target-relative commands.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index fe6b446..b224f09 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -833,6 +833,24 @@ const char* cmGeneratorTarget::GetLocation(const std::string& config) const
   return location.c_str();
 }
 
+std::vector<cmCustomCommand> const&
+cmGeneratorTarget::GetPreBuildCommands() const
+{
+  return this->Target->GetPreBuildCommands();
+}
+
+std::vector<cmCustomCommand> const&
+cmGeneratorTarget::GetPreLinkCommands() const
+{
+  return this->Target->GetPreLinkCommands();
+}
+
+std::vector<cmCustomCommand> const&
+cmGeneratorTarget::GetPostBuildCommands() const
+{
+  return this->Target->GetPostBuildCommands();
+}
+
 bool cmGeneratorTarget::IsImported() const
 {
   return this->Target->IsImported();
@@ -2267,11 +2285,11 @@ cmTargetTraceDependencies
 
   // Queue pre-build, pre-link, and post-build rule dependencies.
   this->CheckCustomCommands(
-        this->GeneratorTarget->Target->GetPreBuildCommands());
+        this->GeneratorTarget->GetPreBuildCommands());
   this->CheckCustomCommands(
-        this->GeneratorTarget->Target->GetPreLinkCommands());
+        this->GeneratorTarget->GetPreLinkCommands());
   this->CheckCustomCommands(
-        this->GeneratorTarget->Target->GetPostBuildCommands());
+        this->GeneratorTarget->GetPostBuildCommands());
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 544cf0e..2b2dc86 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -33,6 +33,10 @@ public:
   bool IsImported() const;
   const char *GetLocation(const std::string& config) const;
 
+  std::vector<cmCustomCommand> const &GetPreBuildCommands() const;
+  std::vector<cmCustomCommand> const &GetPreLinkCommands() const;
+  std::vector<cmCustomCommand> const &GetPostBuildCommands() const;
+
 #define DECLARE_TARGET_POLICY(POLICY) \
   cmPolicies::PolicyStatus GetPolicyStatus ## POLICY () const \
     { return this->PolicyMap.Get(cmPolicies::POLICY); }
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 12115be..18e140e 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -392,10 +392,10 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries()
 void cmGhsMultiTargetGenerator::WriteCustomCommands()
 {
   WriteCustomCommandsHelper(
-        this->GeneratorTarget->Target->GetPreBuildCommands(),
+        this->GeneratorTarget->GetPreBuildCommands(),
         cmTarget::PRE_BUILD);
   WriteCustomCommandsHelper(
-        this->GeneratorTarget->Target->GetPostBuildCommands(),
+        this->GeneratorTarget->GetPostBuildCommands(),
         cmTarget::POST_BUILD);
 }
 
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index eecc82b..e6af94f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1469,11 +1469,11 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
                                                   cmGeneratorTarget* gtgt)
 {
   std::vector<cmCustomCommand> const & prebuild
-    = gtgt->Target->GetPreBuildCommands();
+    = gtgt->GetPreBuildCommands();
   std::vector<cmCustomCommand> const & prelink
-    = gtgt->Target->GetPreLinkCommands();
+    = gtgt->GetPreLinkCommands();
   std::vector<cmCustomCommand> postbuild
-    = gtgt->Target->GetPostBuildCommands();
+    = gtgt->GetPostBuildCommands();
 
   if(gtgt->GetType() == cmState::SHARED_LIBRARY &&
     !gtgt->IsFrameworkOnApple())
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 34a50a3..541257b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1787,15 +1787,15 @@ void cmLocalUnixMakefileGenerator3
 
       // Global targets store their rules in pre- and post-build commands.
       this->AppendCustomDepends(depends,
-                                gt->Target->GetPreBuildCommands());
+                                gt->GetPreBuildCommands());
       this->AppendCustomDepends(depends,
-                                gt->Target->GetPostBuildCommands());
+                                gt->GetPostBuildCommands());
       this->AppendCustomCommands(commands,
-                                 gt->Target->GetPreBuildCommands(),
+                                 gt->GetPreBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
       this->AppendCustomCommands(commands,
-                                 gt->Target->GetPostBuildCommands(),
+                                 gt->GetPostBuildCommands(),
                                  gt,
                                  cmLocalGenerator::START_OUTPUT);
       std::string targetName = gt->GetName();
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index d5abf68..3b25eda 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -266,21 +266,21 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   // depend only on the previous rule.
   if ((target->GetType() == cmState::UTILITY ||
       target->GetType() == cmState::GLOBAL_TARGET) &&
-      (!target->Target->GetPreBuildCommands().empty() ||
-       !target->Target->GetPostBuildCommands().empty()))
+      (!target->GetPreBuildCommands().empty() ||
+       !target->GetPostBuildCommands().empty()))
     {
     // Accumulate the dependencies of all the commands.
     std::vector<std::string> depends;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target->Target->GetPreBuildCommands().begin();
-         cr != target->Target->GetPreBuildCommands().end(); ++cr)
+           target->GetPreBuildCommands().begin();
+         cr != target->GetPreBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target->Target->GetPostBuildCommands().begin();
-         cr != target->Target->GetPostBuildCommands().end(); ++cr)
+           target->GetPostBuildCommands().begin();
+         cr != target->GetPostBuildCommands().end(); ++cr)
       {
       depends.insert(depends.end(),
                      cr->GetDepends().begin(), cr->GetDepends().end());
@@ -289,14 +289,14 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
     // Add the pre- and post-build commands in order.
     int count = 1;
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target->Target->GetPreBuildCommands().begin();
-         cr != target->Target->GetPreBuildCommands().end(); ++cr)
+           target->GetPreBuildCommands().begin();
+         cr != target->GetPreBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
     for (std::vector<cmCustomCommand>::const_iterator cr =
-           target->Target->GetPostBuildCommands().begin();
-         cr != target->Target->GetPostBuildCommands().end(); ++cr)
+           target->GetPostBuildCommands().begin();
+         cr != target->GetPostBuildCommands().end(); ++cr)
       {
       this->AddUtilityCommandHack(target, count++, depends, *cr);
       }
@@ -838,8 +838,8 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
 
   // Write the pre-build and pre-link together (VS6 does not support both).
   event.Start("PreLink");
-  event.Write(target->Target->GetPreBuildCommands());
-  event.Write(target->Target->GetPreLinkCommands());
+  event.Write(target->GetPreBuildCommands());
+  event.Write(target->GetPreLinkCommands());
   cmsys::auto_ptr<cmCustomCommand> pcc(
     this->MaybeCreateImplibDir(target, configName, false));
   if(pcc.get())
@@ -855,7 +855,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(cmGeneratorTarget *target,
 
   // Write the post-build rules.
   event.Start("PostBuild");
-  event.Write(target->Target->GetPostBuildCommands());
+  event.Write(target->GetPostBuildCommands());
   event.Finish();
 
   customRuleCode += "# End Special Build Tool\n";
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index ca8d697..95a299d 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2021,7 +2021,7 @@ void cmLocalVisualStudio7Generator
   const char* tool =
     this->FortranProject? "VFPreBuildEventTool":"VCPreBuildEventTool";
   event.Start(tool);
-  event.Write(target->Target->GetPreBuildCommands());
+  event.Write(target->GetPreBuildCommands());
   event.Finish();
 
   // Add pre-link event.
@@ -2035,7 +2035,7 @@ void cmLocalVisualStudio7Generator
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        target->Target->GetPreLinkCommands();
+        target->GetPreLinkCommands();
       cmGlobalVisualStudioGenerator* gg
         = static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator);
       gg->AddSymbolExportCommand(
@@ -2045,7 +2045,7 @@ void cmLocalVisualStudio7Generator
     }
   if (!addedPrelink)
     {
-    event.Write(target->Target->GetPreLinkCommands());
+    event.Write(target->GetPreLinkCommands());
     }
   cmsys::auto_ptr<cmCustomCommand> pcc(
     this->MaybeCreateImplibDir(target,
@@ -2059,7 +2059,7 @@ void cmLocalVisualStudio7Generator
   // Add post-build event.
   tool = this->FortranProject? "VFPostBuildEventTool":"VCPostBuildEventTool";
   event.Start(tool);
-  event.Write(target->Target->GetPostBuildCommands());
+  event.Write(target->GetPostBuildCommands());
   event.Finish();
 }
 
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index f56037f..9e35e4c 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -279,11 +279,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     {
     this->LocalGenerator
       ->AppendCustomCommands(commands,
-                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget->GetPreBuildCommands(),
                         this->GeneratorTarget);
     this->LocalGenerator
       ->AppendCustomCommands(commands,
-                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget->GetPreLinkCommands(),
                         this->GeneratorTarget);
     }
 
@@ -450,7 +450,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     {
     this->LocalGenerator->
       AppendCustomCommands(commands,
-                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget->GetPostBuildCommands(),
                        this->GeneratorTarget);
     }
 
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 0a65641..1923ea4 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -114,7 +114,7 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules()
   // Add post-build rules.
   this->LocalGenerator->
     AppendCustomCommands(commands,
-                         this->GeneratorTarget->Target->GetPostBuildCommands(),
+                         this->GeneratorTarget->GetPostBuildCommands(),
                          this->GeneratorTarget);
 
   // Depend on the object files.
@@ -458,11 +458,11 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     {
     this->LocalGenerator
       ->AppendCustomCommands(commands,
-                        this->GeneratorTarget->Target->GetPreBuildCommands(),
+                        this->GeneratorTarget->GetPreBuildCommands(),
                         this->GeneratorTarget);
     this->LocalGenerator
       ->AppendCustomCommands(commands,
-                        this->GeneratorTarget->Target->GetPreLinkCommands(),
+                        this->GeneratorTarget->GetPreLinkCommands(),
                         this->GeneratorTarget);
     }
 
@@ -814,7 +814,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
     {
     this->LocalGenerator->
       AppendCustomCommands(commands,
-                       this->GeneratorTarget->Target->GetPostBuildCommands(),
+                       this->GeneratorTarget->GetPostBuildCommands(),
                        this->GeneratorTarget);
     }
 
diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx
index d35c3ae..5b62cbf 100644
--- a/Source/cmMakefileUtilityTargetGenerator.cxx
+++ b/Source/cmMakefileUtilityTargetGenerator.cxx
@@ -67,20 +67,20 @@ void cmMakefileUtilityTargetGenerator::WriteRuleFiles()
 
   // Utility targets store their rules in pre- and post-build commands.
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->GeneratorTarget->Target->GetPreBuildCommands());
+    (depends, this->GeneratorTarget->GetPreBuildCommands());
 
   this->LocalGenerator->AppendCustomDepends
-    (depends, this->GeneratorTarget->Target->GetPostBuildCommands());
+    (depends, this->GeneratorTarget->GetPostBuildCommands());
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->GeneratorTarget->Target->GetPreBuildCommands(),
+    (commands, this->GeneratorTarget->GetPreBuildCommands(),
      this->GeneratorTarget);
 
   // Depend on all custom command outputs for sources
   this->DriveCustomCommands(depends);
 
   this->LocalGenerator->AppendCustomCommands
-    (commands, this->GeneratorTarget->Target->GetPostBuildCommands(),
+    (commands, this->GeneratorTarget->GetPostBuildCommands(),
      this->GeneratorTarget);
 
   // Add dependencies on targets that must be built first.
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index b533d37..17561b5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -598,9 +598,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     }
 
   const std::vector<cmCustomCommand> *cmdLists[3] = {
-    &gt.Target->GetPreBuildCommands(),
-    &gt.Target->GetPreLinkCommands(),
-    &gt.Target->GetPostBuildCommands()
+    &gt.GetPreBuildCommands(),
+    &gt.GetPreLinkCommands(),
+    &gt.GetPostBuildCommands()
   };
 
   std::vector<std::string> preLinkCmdLines, postBuildCmdLines;
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index b2a5334..edc65f0 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -33,8 +33,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
   cmNinjaDeps deps, outputs, util_outputs(1, utilCommandName);
 
   const std::vector<cmCustomCommand> *cmdLists[2] = {
-    &this->GetGeneratorTarget()->Target->GetPreBuildCommands(),
-    &this->GetGeneratorTarget()->Target->GetPostBuildCommands()
+    &this->GetGeneratorTarget()->GetPreBuildCommands(),
+    &this->GetGeneratorTarget()->GetPostBuildCommands()
   };
 
   bool uses_terminal = false;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 9c9f5ab..541e5f6 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2814,7 +2814,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
       {
       addedPrelink = true;
       std::vector<cmCustomCommand> commands =
-        this->GeneratorTarget->Target->GetPreLinkCommands();
+        this->GeneratorTarget->GetPreLinkCommands();
       this->GlobalGenerator->AddSymbolExportCommand(
         this->GeneratorTarget, commands, configName);
       this->WriteEvent("PreLinkEvent", commands, configName);
@@ -2823,12 +2823,12 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
   if (!addedPrelink)
     {
     this->WriteEvent("PreLinkEvent",
-        this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
+        this->GeneratorTarget->GetPreLinkCommands(), configName);
     }
   this->WriteEvent("PreBuildEvent",
-        this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
+        this->GeneratorTarget->GetPreBuildCommands(), configName);
   this->WriteEvent("PostBuildEvent",
-        this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
+        this->GeneratorTarget->GetPostBuildCommands(), configName);
 }
 
 void cmVisualStudio10TargetGenerator::WriteEvent(

-----------------------------------------------------------------------

Summary of changes:
 Source/cmAddExecutableCommand.cxx              |    2 +-
 Source/cmAddLibraryCommand.cxx                 |    2 +-
 Source/cmAuxSourceDirectoryCommand.cxx         |    8 +-
 Source/cmComputeLinkInformation.cxx            |    6 +-
 Source/cmComputeTargetDepends.cxx              |    2 +-
 Source/cmExportBuildFileGenerator.cxx          |    6 +-
 Source/cmExportFileGenerator.cxx               |    5 +-
 Source/cmExportTryCompileFileGenerator.cxx     |   16 +-
 Source/cmExtraCodeBlocksGenerator.cxx          |   14 +-
 Source/cmExtraCodeLiteGenerator.cxx            |   13 +-
 Source/cmGeneratorExpressionNode.cxx           |    8 +-
 Source/cmGeneratorTarget.cxx                   |  113 +++++++++++---
 Source/cmGeneratorTarget.h                     |   20 ++-
 Source/cmGhsMultiTargetGenerator.cxx           |    4 +-
 Source/cmGlobalGenerator.cxx                   |  191 ++++++++++++++++--------
 Source/cmGlobalGenerator.h                     |   45 ++----
 Source/cmGlobalKdevelopGenerator.cxx           |    6 +-
 Source/cmGlobalNinjaGenerator.cxx              |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |    4 +-
 Source/cmGlobalVisualStudio6Generator.cxx      |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx      |   19 ++-
 Source/cmGlobalVisualStudio7Generator.h        |    4 +-
 Source/cmGlobalVisualStudio8Generator.cxx      |   20 +--
 Source/cmGlobalVisualStudioGenerator.cxx       |    1 -
 Source/cmGlobalXCodeGenerator.cxx              |   37 ++---
 Source/cmLocalGenerator.cxx                    |   92 ++++++++++--
 Source/cmLocalGenerator.h                      |   14 ++
 Source/cmLocalNinjaGenerator.cxx               |    4 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |   18 +--
 Source/cmLocalVisualStudio6Generator.cxx       |   37 +++--
 Source/cmLocalVisualStudio7Generator.cxx       |   27 ++--
 Source/cmLocalXCodeGenerator.cxx               |   16 +-
 Source/cmMakefile.cxx                          |   78 +++++-----
 Source/cmMakefile.h                            |   23 +--
 Source/cmMakefileExecutableTargetGenerator.cxx |    6 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |    8 +-
 Source/cmMakefileUtilityTargetGenerator.cxx    |    8 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    6 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |    4 +-
 Source/cmOSXBundleGenerator.cxx                |    2 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |    1 -
 Source/cmQtAutoGenerators.cxx                  |    2 +-
 Source/cmSourceFile.cxx                        |    6 +-
 Source/cmSourceFileLocation.cxx                |   12 +-
 Source/cmTarget.cxx                            |   46 +-----
 Source/cmTarget.h                              |   20 +--
 Source/cmVisualStudio10TargetGenerator.cxx     |    8 +-
 Source/cmake.cxx                               |   32 +++-
 Source/cmake.h                                 |    7 +
 49 files changed, 619 insertions(+), 408 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 26 17:45:49 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 26 Oct 2015 17:45:49 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1025-g3f2e77e
Message-ID: <20151026214549.19752C0241@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3f2e77edfc78b4a1780a1f9b0cc8ece0f4f030c6 (commit)
       via  716ad6f482964d7653ba321eea53b48d60a8b745 (commit)
       via  2d4fed8ff924cdb5f0af9c62d869b7e7c796e77f (commit)
       via  151658ccee329ff2620872d689e5429a3d01196c (commit)
      from  19ea1c6f3ec02bc9e06f4518f8dc1b2d3497aa22 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f2e77edfc78b4a1780a1f9b0cc8ece0f4f030c6
commit 3f2e77edfc78b4a1780a1f9b0cc8ece0f4f030c6
Merge: 19ea1c6 716ad6f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 17:45:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 17:45:47 2015 -0400

    Merge topic 'use-generator-target' into next
    
    716ad6f4 Revert "cmake: Port find_package mode away from GetGeneratorTarget"
    2d4fed8f Revert "VS6: Port to FindGeneratorTarget"
    151658cc Revert "cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=716ad6f482964d7653ba321eea53b48d60a8b745
commit 716ad6f482964d7653ba321eea53b48d60a8b745
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 22:45:24 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:45:24 2015 +0100

    Revert "cmake: Port find_package mode away from GetGeneratorTarget"
    
    This reverts commit a67d87f7d1d8ea4a18c4bf59a3ba1b21c59bfd57.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2e96e59..16417fc 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -448,6 +448,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
   // read in the list file to fill the cache
   snapshot.SetDefaultDefinitions();
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
+  cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
 
   mf->SetArgcArgv(args);
 
@@ -480,8 +481,6 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::vector<std::string> includeDirs;
     cmSystemTools::ExpandListArgument(includes, includeDirs);
 
-    gg->CreateGenerationObjects();
-    cmLocalGenerator* lg = gg->LocalGenerators[0];
     std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
 
     std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
@@ -511,9 +510,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::string linkPath;
     std::string flags;
     std::string linkFlags;
-    gg->CreateGenerationObjects();
-    cmGeneratorTarget *gtgt = gg->FindGeneratorTarget(tgt->GetName());
-    cmLocalGenerator* lg = gtgt->GetLocalGenerator();
+    gg->CreateGeneratorTargets(cmGlobalGenerator::AllTargets, lg.get());
+    cmGeneratorTarget *gtgt = gg->GetGeneratorTarget(tgt);
     lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags,
                        gtgt, false);
     linkLibs = frameworkPath + linkPath + linkLibs;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d4fed8ff924cdb5f0af9c62d869b7e7c796e77f
commit 2d4fed8ff924cdb5f0af9c62d869b7e7c796e77f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 22:45:21 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:45:21 2015 +0100

    Revert "VS6: Port to FindGeneratorTarget"
    
    This reverts commit 495ef58b5686cd3073aa1f0a6cd7fc5b1893ee64.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index cdacb9e..fd0af61 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1112,14 +1112,15 @@ void cmLocalVisualStudio6Generator
       // Compute the proper name to use to link this library.
       std::string lib;
       std::string libDebug;
-      cmGeneratorTarget* tgt =
-          this->GlobalGenerator->FindGeneratorTarget(j->first.c_str());
+      cmTarget* tgt = this->GlobalGenerator->FindTarget(j->first.c_str());
       if(tgt)
         {
+        cmGeneratorTarget* gt =
+          this->GlobalGenerator->GetGeneratorTarget(tgt);
         lib = cmSystemTools::GetFilenameWithoutExtension
-          (tgt->GetFullName().c_str());
+          (gt->GetFullName().c_str());
         libDebug = cmSystemTools::GetFilenameWithoutExtension
-          (tgt->GetFullName("Debug").c_str());
+          (gt->GetFullName("Debug").c_str());
         lib += ".lib";
         libDebug += ".lib";
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=151658ccee329ff2620872d689e5429a3d01196c
commit 151658ccee329ff2620872d689e5429a3d01196c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 22:45:05 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:45:05 2015 +0100

    Revert "cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget"
    
    This reverts commit 3e72e81c21ac623fe849f2272d2052fe2e68c1d6.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3d2db42..d53f0e3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1208,6 +1208,8 @@ void cmGlobalGenerator::Configure()
 void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
 {
   this->CreateLocalGenerators();
+  cmDeleteAll(this->GeneratorTargets);
+  this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
   this->ComputeBuildFileGenerators();
 }
@@ -1595,6 +1597,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(
       {
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
+      this->GeneratorTargets[t] = gt;
       lg->AddGeneratorTarget(gt);
       }
     }
@@ -1619,9 +1622,9 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
           j = mf->GetOwnedImportedTargets().begin();
         j != mf->GetOwnedImportedTargets().end(); ++j)
       {
-      cmLocalGenerator* lg = this->LocalGenerators[i];
-      cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
-      lg->AddOwnedImportedGeneratorTarget(gt);
+      cmGeneratorTarget* gt =
+          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
+      this->GeneratorTargets[*j] = gt;
       importedMap[*j] = gt;
       }
     }
@@ -1638,6 +1641,9 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::ClearGeneratorMembers()
 {
+  cmDeleteAll(this->GeneratorTargets);
+  this->GeneratorTargets.clear();
+
   cmDeleteAll(this->BuildExportSets);
   this->BuildExportSets.clear();
 
@@ -1656,6 +1662,20 @@ void cmGlobalGenerator::ClearGeneratorMembers()
 }
 
 //----------------------------------------------------------------------------
+cmGeneratorTarget*
+cmGlobalGenerator::GetGeneratorTarget(cmTarget const* t) const
+{
+  cmGeneratorTargetsType::const_iterator ti = this->GeneratorTargets.find(t);
+  if(ti == this->GeneratorTargets.end())
+    {
+    this->CMakeInstance->IssueMessage(
+      cmake::INTERNAL_ERROR, "Missing cmGeneratorTarget instance!");
+    return 0;
+    }
+  return ti->second;
+}
+
+//----------------------------------------------------------------------------
 void cmGlobalGenerator::ComputeTargetObjectDirectory(cmGeneratorTarget*) const
 {
 }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index bc6e17d..0057d61 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -42,6 +42,10 @@ class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 class cmExportBuildFileGenerator;
 
+typedef std::map<cmTarget const*,
+                 cmGeneratorTarget*,
+                 cmTarget::StrictTargetComparison> cmGeneratorTargetsType;
+
 /** \class cmGlobalGenerator
  * \brief Responsible for overseeing the generation process for the entire tree
  *
@@ -303,6 +307,14 @@ public:
   TargetDependSet const& GetTargetDirectDepends(
       const cmGeneratorTarget* target);
 
+  /** Get per-target generator information.  */
+  cmGeneratorTarget* GetGeneratorTarget(cmTarget const*) const;
+
+  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+  {
+    this->GeneratorTargets[t] = gt;
+  }
+
   const std::map<std::string, std::vector<cmLocalGenerator*> >& GetProjectMap()
                                                const {return this->ProjectMap;}
 
@@ -470,6 +482,8 @@ private:
   typedef std::map<cmGeneratorTarget const*, TargetDependSet> TargetDependMap;
   TargetDependMap TargetDependencies;
 
+  // Per-target generator information.
+  cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
   void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
                    cmLocalGenerator* lg,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 9f36b54..c205d1a 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -257,6 +257,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   lg->AddGeneratorTarget(gt);
+  this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index bb0c974..b819dad 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -88,6 +88,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       gen[0]->AddGeneratorTarget(gt);
+      this->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index da8c814..6d4fc1f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -460,6 +460,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   root->AddGeneratorTarget(allBuildGt);
+  root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -495,6 +496,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     root->AddGeneratorTarget(checkGt);
+    root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d92cbea..ec7c29f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -62,8 +62,6 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
 
 cmLocalGenerator::~cmLocalGenerator()
 {
-  cmDeleteAll(this->GeneratorTargets);
-  cmDeleteAll(this->OwnedImportedGeneratorTargets);
 }
 
 void cmLocalGenerator::IssueMessage(cmake::MessageType t,
@@ -462,11 +460,6 @@ void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt)
   this->ImportedGeneratorTargets.push_back(gt);
 }
 
-void cmLocalGenerator::AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt)
-{
-  this->OwnedImportedGeneratorTargets.push_back(gt);
-}
-
 struct NamedGeneratorTargetFinder
 {
   NamedGeneratorTargetFinder(std::string const& name)
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index e2f5519..67383d7 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -127,7 +127,6 @@ public:
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
-  void AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
@@ -381,7 +380,6 @@ protected:
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
   std::vector<cmGeneratorTarget*> ImportedGeneratorTargets;
-  std::vector<cmGeneratorTarget*> OwnedImportedGeneratorTargets;
   std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index b813c14..225c03e 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -896,6 +896,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     lg->AddGeneratorTarget(gt);
+    lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx              |   26 +++++++++++++++++++++++---
 Source/cmGlobalGenerator.h                |   14 ++++++++++++++
 Source/cmGlobalVisualStudio8Generator.cxx |    1 +
 Source/cmGlobalVisualStudioGenerator.cxx  |    1 +
 Source/cmGlobalXCodeGenerator.cxx         |    2 ++
 Source/cmLocalGenerator.cxx               |    7 -------
 Source/cmLocalGenerator.h                 |    2 --
 Source/cmLocalVisualStudio6Generator.cxx  |    9 +++++----
 Source/cmQtAutoGeneratorInitializer.cxx   |    1 +
 Source/cmake.cxx                          |    8 +++-----
 10 files changed, 50 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 26 17:46:17 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 26 Oct 2015 17:46:17 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1029-g96b3231
Message-ID: <20151026214617.8E4FCC03B0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  96b3231f81778c7d7a7bcfdbc299dd0fbd47de3b (commit)
       via  d111fa6817c5974a9fb4bc3b0d604493fee12a19 (commit)
       via  3ba6490b94f1268e6a9901bf5a78dec9459ec64e (commit)
       via  3f2388be33118a6f17e7907347eba2b37b13d996 (commit)
      from  3f2e77edfc78b4a1780a1f9b0cc8ece0f4f030c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96b3231f81778c7d7a7bcfdbc299dd0fbd47de3b
commit 96b3231f81778c7d7a7bcfdbc299dd0fbd47de3b
Merge: 3f2e77e d111fa6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 17:46:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 17:46:16 2015 -0400

    Merge topic 'use-generator-target' into next
    
    d111fa68 cmLocalGenerator: Port Find method away from GetGeneratorTarget
    3ba6490b cmMakefile: Add imported target accessor
    3f2388be CMP0026: Port away from GetGeneratorTarget


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d111fa6817c5974a9fb4bc3b0d604493fee12a19
commit d111fa6817c5974a9fb4bc3b0d604493fee12a19
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:14:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:46:05 2015 +0100

    cmLocalGenerator: Port Find method away from GetGeneratorTarget
    
    Mirror the cmMakefile::FindTarget method.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5928fb5..d53f0e3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1583,10 +1583,12 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
-                                               cmLocalGenerator *lg)
+void cmGlobalGenerator::CreateGeneratorTargets(
+    TargetTypes targetTypes,
+    cmMakefile *mf,
+    cmLocalGenerator *lg,
+    std::map<cmTarget*, cmGeneratorTarget*> const& importedMap)
 {
-  cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
     {
     cmTargets& targets = mf->GetTargets();
@@ -1600,23 +1602,38 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       }
     }
 
+  std::vector<cmTarget*> itgts = mf->GetImportedTargets();
+
   for(std::vector<cmTarget*>::const_iterator
-        j = mf->GetOwnedImportedTargets().begin();
-      j != mf->GetOwnedImportedTargets().end(); ++j)
+        j = itgts.begin(); j != itgts.end(); ++j)
     {
-    cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
-    this->GeneratorTargets[*j] = gt;
-    lg->AddImportedGeneratorTarget(gt);
+    lg->AddImportedGeneratorTarget(importedMap.find(*j)->second);
     }
 }
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 {
+  std::map<cmTarget*, cmGeneratorTarget*> importedMap;
+  for(unsigned int i=0; i < this->Makefiles.size(); ++i)
+    {
+    cmMakefile* mf = this->Makefiles[i];
+    for(std::vector<cmTarget*>::const_iterator
+          j = mf->GetOwnedImportedTargets().begin();
+        j != mf->GetOwnedImportedTargets().end(); ++j)
+      {
+      cmGeneratorTarget* gt =
+          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
+      this->GeneratorTargets[*j] = gt;
+      importedMap[*j] = gt;
+      }
+    }
+
   // Construct per-target generator information.
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    this->CreateGeneratorTargets(targetTypes, this->LocalGenerators[i]);
+    this->CreateGeneratorTargets(targetTypes, this->Makefiles[i],
+                                 this->LocalGenerators[i], importedMap);
     }
 }
 
@@ -2240,11 +2257,11 @@ cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
     std::vector<cmGeneratorTarget*> tgts =
-        this->LocalGenerators[i]->GetGeneratorTargets();
+        this->LocalGenerators[i]->GetImportedGeneratorTargets();
     for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
          it != tgts.end(); ++it)
       {
-      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+      if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name)
         {
         return *it;
         }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c52b209..0057d61 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -485,7 +485,9 @@ private:
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
-  void CreateGeneratorTargets(TargetTypes targetTypes, cmLocalGenerator* lg);
+  void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
+                   cmLocalGenerator* lg,
+                   std::map<cmTarget*, cmGeneratorTarget*> const& importedMap);
   void CreateGeneratorTargets(TargetTypes targetTypes);
 
   void ClearGeneratorMembers();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1bc7f81..ec7c29f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1821,11 +1821,21 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 cmGeneratorTarget*
 cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
 {
-  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+  std::vector<cmGeneratorTarget*>::const_iterator
+    imported = std::find_if(this->ImportedGeneratorTargets.begin(),
+                            this->ImportedGeneratorTargets.end(),
+                            NamedGeneratorTargetFinder(name));
+  if(imported != this->ImportedGeneratorTargets.end())
     {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    return *imported;
     }
-  return 0;
+
+  if(cmGeneratorTarget* t = this->FindGeneratorTarget(name))
+    {
+    return t;
+    }
+
+  return this->GetGlobalGenerator()->FindGeneratorTarget(name);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7841d05..67383d7 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -120,6 +120,11 @@ public:
       return this->GeneratorTargets;
     }
 
+  const std::vector<cmGeneratorTarget*> &GetImportedGeneratorTargets() const
+    {
+      return this->ImportedGeneratorTargets;
+    }
+
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ba6490b94f1268e6a9901bf5a78dec9459ec64e
commit 3ba6490b94f1268e6a9901bf5a78dec9459ec64e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 22:18:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:46:05 2015 +0100

    cmMakefile: Add imported target accessor

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 10b9737..fc23760 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1766,6 +1766,18 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
+std::vector<cmTarget*> cmMakefile::GetImportedTargets() const
+{
+  std::vector<cmTarget*> tgts;
+  tgts.reserve(this->ImportedTargets.size());
+  for (TargetMap::const_iterator it = this->ImportedTargets.begin();
+       it != this->ImportedTargets.end(); ++it)
+    {
+    tgts.push_back(it->second);
+    }
+  return tgts;
+}
+
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 01c4524..f1dd374 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -390,6 +390,7 @@ public:
     {
       return this->ImportedTargetsOwned;
     }
+  std::vector<cmTarget*> GetImportedTargets() const;
 
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f2388be33118a6f17e7907347eba2b37b13d996
commit 3f2388be33118a6f17e7907347eba2b37b13d996
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:19:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:46:05 2015 +0100

    CMP0026: Port away from GetGeneratorTarget

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f0f404c..1eebd12 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1602,7 +1602,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         // CMake time.
         cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
         gg->CreateGenerationObjects();
-        cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+        cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
         this->Properties.SetProperty(propLOCATION,
                                      gt->GetLocationForBuild());
         }
@@ -1627,7 +1627,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         {
         cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
         gg->CreateGenerationObjects();
-        cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+        cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
         this->Properties.SetProperty(
                 prop, gt->GetFullPath(configName, false).c_str());
         }
@@ -1651,7 +1651,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
           {
           cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
           gg->CreateGenerationObjects();
-          cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+          cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
           this->Properties.SetProperty(
                   prop, gt->GetFullPath(configName, false).c_str());
           }

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 26 17:51:51 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 26 Oct 2015 17:51:51 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1031-g623dca7
Message-ID: <20151026215151.D5C00C0697@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  623dca799db66d64cc9a8d534f9b47bc4ab8c2e7 (commit)
       via  55333e9accde64372a8c5055dde2c9f06f81ee18 (commit)
      from  96b3231f81778c7d7a7bcfdbc299dd0fbd47de3b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=623dca799db66d64cc9a8d534f9b47bc4ab8c2e7
commit 623dca799db66d64cc9a8d534f9b47bc4ab8c2e7
Merge: 96b3231 55333e9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 17:51:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 17:51:51 2015 -0400

    Merge topic 'use-generator-target' into next
    
    55333e9a Revert "cmLocalGenerator: Port Find method away from GetGeneratorTarget"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55333e9accde64372a8c5055dde2c9f06f81ee18
commit 55333e9accde64372a8c5055dde2c9f06f81ee18
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 22:51:33 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:51:33 2015 +0100

    Revert "cmLocalGenerator: Port Find method away from GetGeneratorTarget"
    
    This reverts commit d111fa6817c5974a9fb4bc3b0d604493fee12a19.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..5928fb5 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1583,12 +1583,10 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateGeneratorTargets(
-    TargetTypes targetTypes,
-    cmMakefile *mf,
-    cmLocalGenerator *lg,
-    std::map<cmTarget*, cmGeneratorTarget*> const& importedMap)
+void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
+                                               cmLocalGenerator *lg)
 {
+  cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
     {
     cmTargets& targets = mf->GetTargets();
@@ -1602,38 +1600,23 @@ void cmGlobalGenerator::CreateGeneratorTargets(
       }
     }
 
-  std::vector<cmTarget*> itgts = mf->GetImportedTargets();
-
   for(std::vector<cmTarget*>::const_iterator
-        j = itgts.begin(); j != itgts.end(); ++j)
+        j = mf->GetOwnedImportedTargets().begin();
+      j != mf->GetOwnedImportedTargets().end(); ++j)
     {
-    lg->AddImportedGeneratorTarget(importedMap.find(*j)->second);
+    cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
+    this->GeneratorTargets[*j] = gt;
+    lg->AddImportedGeneratorTarget(gt);
     }
 }
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 {
-  std::map<cmTarget*, cmGeneratorTarget*> importedMap;
-  for(unsigned int i=0; i < this->Makefiles.size(); ++i)
-    {
-    cmMakefile* mf = this->Makefiles[i];
-    for(std::vector<cmTarget*>::const_iterator
-          j = mf->GetOwnedImportedTargets().begin();
-        j != mf->GetOwnedImportedTargets().end(); ++j)
-      {
-      cmGeneratorTarget* gt =
-          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
-      this->GeneratorTargets[*j] = gt;
-      importedMap[*j] = gt;
-      }
-    }
-
   // Construct per-target generator information.
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    this->CreateGeneratorTargets(targetTypes, this->Makefiles[i],
-                                 this->LocalGenerators[i], importedMap);
+    this->CreateGeneratorTargets(targetTypes, this->LocalGenerators[i]);
     }
 }
 
@@ -2257,11 +2240,11 @@ cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
     std::vector<cmGeneratorTarget*> tgts =
-        this->LocalGenerators[i]->GetImportedGeneratorTargets();
+        this->LocalGenerators[i]->GetGeneratorTargets();
     for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
          it != tgts.end(); ++it)
       {
-      if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name)
+      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
         {
         return *it;
         }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 0057d61..c52b209 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -485,9 +485,7 @@ private:
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
-  void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
-                   cmLocalGenerator* lg,
-                   std::map<cmTarget*, cmGeneratorTarget*> const& importedMap);
+  void CreateGeneratorTargets(TargetTypes targetTypes, cmLocalGenerator* lg);
   void CreateGeneratorTargets(TargetTypes targetTypes);
 
   void ClearGeneratorMembers();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ec7c29f..1bc7f81 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1821,21 +1821,11 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 cmGeneratorTarget*
 cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
 {
-  std::vector<cmGeneratorTarget*>::const_iterator
-    imported = std::find_if(this->ImportedGeneratorTargets.begin(),
-                            this->ImportedGeneratorTargets.end(),
-                            NamedGeneratorTargetFinder(name));
-  if(imported != this->ImportedGeneratorTargets.end())
+  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
     {
-    return *imported;
+    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
     }
-
-  if(cmGeneratorTarget* t = this->FindGeneratorTarget(name))
-    {
-    return t;
-    }
-
-  return this->GetGlobalGenerator()->FindGeneratorTarget(name);
+  return 0;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 67383d7..7841d05 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -120,11 +120,6 @@ public:
       return this->GeneratorTargets;
     }
 
-  const std::vector<cmGeneratorTarget*> &GetImportedGeneratorTargets() const
-    {
-      return this->ImportedGeneratorTargets;
-    }
-
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx |   39 +++++++++++----------------------------
 Source/cmGlobalGenerator.h   |    4 +---
 Source/cmLocalGenerator.cxx  |   16 +++-------------
 Source/cmLocalGenerator.h    |    5 -----
 4 files changed, 15 insertions(+), 49 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 26 17:55:05 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 26 Oct 2015 17:55:05 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1045-ge7e0c3d
Message-ID: <20151026215505.931D5C0321@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e7e0c3d2bf5acdfe910f88f82649e9ee77eeb51f (commit)
       via  b1be66ed644728d981d26e67a375a69cb23506b2 (commit)
       via  a00135f26ba8f5c8d6bd7d5751c2e229455170b5 (commit)
       via  f6e2ec7ba59e0231d128de54c8cc4a535c651197 (commit)
       via  82153a79e944e44594ff7eb9a39f37d1cf000675 (commit)
       via  fd5e3ad4a1c5f9ef8e6bd3f19bc1620c58010f93 (commit)
       via  878cebd3c9ce7d5dec268fb5b4d55b18c8b4e4a4 (commit)
       via  a84f34ef545e626650df811a711b61995d8b7a47 (commit)
       via  7ef7920915b014e38f4e1fcd79bcd291b9497934 (commit)
       via  d90c9738da7003b966036c70727611b17d17f3a6 (commit)
       via  331023ae06b795a1733ae03dce2ce2197ca1c36a (commit)
       via  a03f3d0e01edcb617813144626400058a5c0a177 (commit)
       via  d50c4220e29ef0b7366f3e1812f0a79736f2c18e (commit)
       via  803f1901784937e40717fbf6cc675eb7aacbcce1 (commit)
      from  623dca799db66d64cc9a8d534f9b47bc4ab8c2e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7e0c3d2bf5acdfe910f88f82649e9ee77eeb51f
commit e7e0c3d2bf5acdfe910f88f82649e9ee77eeb51f
Merge: 623dca7 b1be66e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 17:55:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 17:55:03 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    b1be66ed cmMakefile: Fix typo in comment
    a00135f2 cmMakefile: Fix style
    f6e2ec7b Makefiles: Remove unused variable
    82153a79 cmTarget: Remove obsolete member
    fd5e3ad4 cmTarget: Fix style
    878cebd3 Remove some obsolete declarations
    a84f34ef Use LocalGenerator when possible
    7ef79209 Remove unused includes
    d90c9738 Makefiles: Remove some unneeded casts
    331023ae Export: Remove unused variable
    a03f3d0e cmFunctionBlocker: Constify method
    d50c4220 Xcode: Fix typo in comment
    803f1901 Xcode: Remove trailing semicolon

diff --cc Source/cmTarget.cxx
index 1eebd12,da49048..9ea1a34
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -61,9 -61,7 +61,8 @@@ cmTarget::cmTarget(
    this->HaveInstallRule = false;
    this->DLLPlatform = false;
    this->IsAndroid = false;
-   this->IsApple = false;
    this->IsImportedTarget = false;
 +  this->ImportedGloballyVisible = false;
    this->BuildInterfaceIncludesAppended = false;
  }
  
diff --cc Source/cmTarget.h
index 62e10f4,f3a45d3..97b0871
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@@ -349,9 -357,7 +348,8 @@@ private
    bool RecordDependencies;
    bool DLLPlatform;
    bool IsAndroid;
-   bool IsApple;
    bool IsImportedTarget;
 +  bool ImportedGloballyVisible;
    bool BuildInterfaceIncludesAppended;
  #if defined(_WIN32) && !defined(__CYGWIN__)
    bool LinkLibrariesForVS6Analyzed;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1be66ed644728d981d26e67a375a69cb23506b2
commit b1be66ed644728d981d26e67a375a69cb23506b2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:03:55 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:32:01 2015 +0100

    cmMakefile: Fix typo in comment

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0982da1..84ec4fb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2174,7 +2174,7 @@ cmMakefile::GetSourceGroup(const std::vector<std::string>&name) const
 {
   cmSourceGroup* sg = 0;
 
-  // first look for source group starting with the same as the one we wants
+  // first look for source group starting with the same as the one we want
   for (std::vector<cmSourceGroup>::const_iterator
       sgIt = this->SourceGroups.begin();
       sgIt != this->SourceGroups.end(); ++sgIt)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a00135f26ba8f5c8d6bd7d5751c2e229455170b5
commit a00135f26ba8f5c8d6bd7d5751c2e229455170b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:04:07 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:32:01 2015 +0100

    cmMakefile: Fix style

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..0982da1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2207,7 +2207,7 @@ void cmMakefile::AddSourceGroup(const std::string& name,
 {
   std::vector<std::string> nameVector;
   nameVector.push_back(name);
-  AddSourceGroup(nameVector, regex);
+  this->AddSourceGroup(nameVector, regex);
 }
 
 void cmMakefile::AddSourceGroup(const std::vector<std::string>& name,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6e2ec7ba59e0231d128de54c8cc4a535c651197
commit f6e2ec7ba59e0231d128de54c8cc4a535c651197
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 01:12:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:32:01 2015 +0100

    Makefiles: Remove unused variable

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 27d631e..3972b41 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -173,7 +173,6 @@ void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames(
 void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
-  std::set<std::string> emitted;
   std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
   for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
       ti != targets.end(); ++ti)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82153a79e944e44594ff7eb9a39f37d1cf000675
commit 82153a79e944e44594ff7eb9a39f37d1cf000675
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:09:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:32:01 2015 +0100

    cmTarget: Remove obsolete member

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a016e92..da49048 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -61,7 +61,6 @@ cmTarget::cmTarget()
   this->HaveInstallRule = false;
   this->DLLPlatform = false;
   this->IsAndroid = false;
-  this->IsApple = false;
   this->IsImportedTarget = false;
   this->BuildInterfaceIncludesAppended = false;
 }
@@ -98,9 +97,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     strcmp(this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME"),
            "Android") == 0;
 
-  // Check whether we are targeting an Apple platform.
-  this->IsApple = this->Makefile->IsOn("APPLE");
-
   // Setup default property values.
   if (this->GetType() != cmState::INTERFACE_LIBRARY
       && this->GetType() != cmState::UTILITY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 52ed578..f3a45d3 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -357,7 +357,6 @@ private:
   bool RecordDependencies;
   bool DLLPlatform;
   bool IsAndroid;
-  bool IsApple;
   bool IsImportedTarget;
   bool BuildInterfaceIncludesAppended;
 #if defined(_WIN32) && !defined(__CYGWIN__)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd5e3ad4a1c5f9ef8e6bd3f19bc1620c58010f93
commit fd5e3ad4a1c5f9ef8e6bd3f19bc1620c58010f93
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:56:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:32:01 2015 +0100

    cmTarget: Fix style

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e056469..a016e92 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -299,7 +299,8 @@ void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
   if(this->Utilities.insert(u).second && makefile)
     {
-    UtilityBacktraces.insert(std::make_pair(u, makefile->GetBacktrace()));
+    this->UtilityBacktraces.insert(
+            std::make_pair(u, makefile->GetBacktrace()));
     }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=878cebd3c9ce7d5dec268fb5b4d55b18c8b4e4a4
commit 878cebd3c9ce7d5dec268fb5b4d55b18c8b4e4a4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 18:27:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:32:00 2015 +0100

    Remove some obsolete declarations

diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 889fb08..f10e4e4 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -13,7 +13,6 @@
 #define cmComputeLinkDepends_h
 
 #include "cmStandardIncludes.h"
-#include "cmTarget.h"
 #include "cmLinkItem.h"
 
 #include "cmGraphAdjacencyList.h"
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 1741acf..ff5d3ab 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -17,7 +17,6 @@
 #include "cmake.h"
 #include "cmSourceFile.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include "cmSystemTools.h"
 
 #include <cmsys/SystemTools.hxx>
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index b20d0a7..281c1ef 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -16,8 +16,6 @@
 #include "cmExternalMakefileProjectGenerator.h"
 
 class cmLocalGenerator;
-class cmMakefile;
-class cmTarget;
 class cmGeneratedFileStream;
 
 /** \class cmExtraKateGenerator
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 5eed89d..c3b0272 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -12,7 +12,6 @@
 
 #include "cmGeneratorExpressionDAGChecker.h"
 
-#include "cmMakefile.h"
 #include "cmLocalGenerator.h"
 #include "cmAlgorithms.h"
 
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index 7c1bd8c..db56eb1 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -18,8 +18,6 @@
 #include "cmListFileCache.h"
 #include "cmGeneratorExpressionContext.h"
 
-class cmTarget;
-
 struct cmGeneratorExpressionDAGChecker;
 struct cmGeneratorExpressionNode;
 
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7a7e4ff..af72123 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -14,6 +14,7 @@
 #include "cmGlobalGenerator.h"
 #include "cmAlgorithms.h"
 #include "cmOutputConverter.h"
+#include "cmMakefile.h"
 
 //----------------------------------------------------------------------------
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index db65db1..854811b 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -12,8 +12,6 @@
 #ifndef cmGeneratorExpressionNode_h
 #define cmGeneratorExpressionNode_h
 
-#include "cmMakefile.h"
-
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionParser.h"
 #include "cmGeneratorExpressionDAGChecker.h"
diff --git a/Source/cmGeneratorExpressionParser.h b/Source/cmGeneratorExpressionParser.h
index 28f1441..5bd6777 100644
--- a/Source/cmGeneratorExpressionParser.h
+++ b/Source/cmGeneratorExpressionParser.h
@@ -19,8 +19,6 @@
 
 #include "cmListFileCache.h"
 
-class cmMakefile;
-class cmTarget;
 struct cmGeneratorExpressionEvaluator;
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index edd6a0e..ea27f61 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -11,7 +11,6 @@
 ============================================================================*/
 #include "cmInstallDirectoryGenerator.h"
 
-#include "cmTarget.h"
 #include "cmGeneratorExpression.h"
 #include "cmLocalGenerator.h"
 
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index d59fdc6..d0784ad 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmLocalVisualStudio10Generator.h"
-#include "cmTarget.h"
 #include "cmMakefile.h"
 #include "cmVisualStudio10TargetGenerator.h"
 #include "cmGlobalVisualStudio10Generator.h"
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 1cae94f..52ed578 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -30,7 +30,6 @@ class cmake;
 class cmMakefile;
 class cmSourceFile;
 class cmGlobalGenerator;
-class cmComputeLinkInformation;
 class cmListFileBacktrace;
 class cmTarget;
 class cmGeneratorTarget;
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index d997596..b411f15 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -13,10 +13,8 @@
 
 #include "cmGeneratorExpression.h"
 #include "cmOutputConverter.h"
-#include "cmMakefile.h"
 #include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 #include "cmTest.h"
 
 //----------------------------------------------------------------------------

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a84f34ef545e626650df811a711b61995d8b7a47
commit a84f34ef545e626650df811a711b61995d8b7a47
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 00:29:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:32:00 2015 +0100

    Use LocalGenerator when possible

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index b819dad..0488391 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -147,7 +147,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
 void cmGlobalVisualStudioGenerator
 ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const
 {
-  std::string dir = gt->Makefile->GetCurrentBinaryDirectory();
+  std::string dir = gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   std::string tgtDir = gt->LocalGenerator->GetTargetDirectory(gt);
   if(!tgtDir.empty())
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 891c44e..e11571a 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -42,7 +42,7 @@ void cmLocalNinjaGenerator::Generate()
   // Compute the path to use when referencing the current output
   // directory from the top output directory.
   this->HomeRelativeOutputPath =
-    this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT);
+    this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT);
   if(this->HomeRelativeOutputPath == ".")
     {
     this->HomeRelativeOutputPath = "";
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 34a50a3..27d631e 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -144,7 +144,7 @@ void cmLocalUnixMakefileGenerator3::ComputeHomeRelativeOutputPath()
   // Compute the path to use when referencing the current output
   // directory from the top output directory.
   this->HomeRelativeOutputPath =
-    this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT);
+    this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT);
   if(this->HomeRelativeOutputPath == ".")
     {
     this->HomeRelativeOutputPath = "";
@@ -503,7 +503,7 @@ void cmLocalUnixMakefileGenerator3
 //----------------------------------------------------------------------------
 void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile()
 {
-  std::string infoFileName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string infoFileName = this->GetCurrentBinaryDirectory();
   infoFileName += cmake::GetCMakeFilesDirectory();
   infoFileName += "/CMakeDirectoryInformation.cmake";
 
@@ -567,7 +567,7 @@ std::string
 cmLocalUnixMakefileGenerator3
 ::ConvertToFullPath(const std::string& localPath)
 {
-  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+  std::string dir = this->GetCurrentBinaryDirectory();
   dir += "/";
   dir += localPath;
   return dir;
@@ -1064,7 +1064,7 @@ cmLocalUnixMakefileGenerator3
     }
 
   // if the command specified a working directory use it.
-  std::string dir  = this->Makefile->GetCurrentBinaryDirectory();
+  std::string dir  = this->GetCurrentBinaryDirectory();
   std::string workingDir = ccg.GetWorkingDirectory();
   if(!workingDir.empty())
     {
@@ -1214,7 +1214,7 @@ cmLocalUnixMakefileGenerator3
                      const std::vector<std::string>& files,
                      cmGeneratorTarget* target, const char* filename)
 {
-  std::string cleanfile = this->Makefile->GetCurrentBinaryDirectory();
+  std::string cleanfile = this->GetCurrentBinaryDirectory();
   cleanfile += "/";
   cleanfile += this->GetTargetDirectory(target);
   cleanfile += "/cmake_clean";
@@ -1493,7 +1493,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
   // If the directory information is newer than depend.internal, include dirs
   // may have changed. In this case discard all old dependencies.
   bool needRescanDirInfo = false;
-  std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory();
+  std::string dirInfoFile = this->GetCurrentBinaryDirectory();
   dirInfoFile += cmake::GetCMakeFilesDirectory();
   dirInfoFile += "/CMakeDirectoryInformation.cmake";
   {
@@ -1567,7 +1567,7 @@ cmLocalUnixMakefileGenerator3
   // Read the directory information file.
   cmMakefile* mf = this->Makefile;
   bool haveDirectoryInfo = false;
-  std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory();
+  std::string dirInfoFile = this->GetCurrentBinaryDirectory();
   dirInfoFile += cmake::GetCMakeFilesDirectory();
   dirInfoFile += "/CMakeDirectoryInformation.cmake";
   if(mf->ReadListFile(dirInfoFile.c_str()) &&
@@ -1828,7 +1828,7 @@ void cmLocalUnixMakefileGenerator3
   std::vector<std::string> commands;
 
   // Write the all rule.
-  std::string recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+  std::string recursiveTarget = this->GetCurrentBinaryDirectory();
   recursiveTarget += "/all";
 
   depends.push_back("cmake_check_build_system");
@@ -1872,7 +1872,7 @@ void cmLocalUnixMakefileGenerator3
                       depends, commands, true);
 
   // Write the clean rule.
-  recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+  recursiveTarget = this->GetCurrentBinaryDirectory();
   recursiveTarget += "/clean";
   commands.clear();
   depends.clear();
@@ -1890,7 +1890,7 @@ void cmLocalUnixMakefileGenerator3
                       depends, commands, true);
 
   // Write the preinstall rule.
-  recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+  recursiveTarget = this->GetCurrentBinaryDirectory();
   recursiveTarget += "/preinstall";
   commands.clear();
   depends.clear();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ef7920915b014e38f4e1fcd79bcd291b9497934
commit 7ef7920915b014e38f4e1fcd79bcd291b9497934
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 01:09:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:30:20 2015 +0100

    Remove unused includes

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index c4e28ca..2fa0598 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -15,7 +15,6 @@
 #include "cmMakefile.h"
 #include "cmake.h"
 #include "cmGeneratedFileStream.h"
-#include "cmSourceFile.h"
 #include "cmGeneratorTarget.h"
 #include "cmAlgorithms.h"
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d90c9738da7003b966036c70727611b17d17f3a6
commit d90c9738da7003b966036c70727611b17d17f3a6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 01:06:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:30:18 2015 +0100

    Makefiles: Remove some unneeded casts

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index b4a915c..c4e28ca 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -158,8 +158,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
     }
   for(unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
-    cmLocalUnixMakefileGenerator3 *lg =
-      static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
+    cmLocalGenerator *lg = this->LocalGenerators[i];
     std::string markFileName = lg->GetCurrentBinaryDirectory();
     markFileName += "/";
     markFileName += cmake::GetCMakeFilesDirectory();
@@ -982,7 +981,7 @@ cmGlobalUnixMakefileGenerator3
 //----------------------------------------------------------------------------
 size_t
 cmGlobalUnixMakefileGenerator3
-::CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg)
+::CountProgressMarksInAll(cmLocalGenerator* lg)
 {
   size_t count = 0;
   std::set<cmGeneratorTarget const*> emitted;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 63ffcb4..54fdc0e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -198,7 +198,7 @@ protected:
 
   size_t CountProgressMarksInTarget(cmGeneratorTarget const* target,
                                  std::set<cmGeneratorTarget const*>& emitted);
-  size_t CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg);
+  size_t CountProgressMarksInAll(cmLocalGenerator* lg);
 
   cmGeneratedFileStream *CommandDatabase;
 private:

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=331023ae06b795a1733ae03dce2ce2197ca1c36a
commit 331023ae06b795a1733ae03dce2ce2197ca1c36a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 00:51:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:30:17 2015 +0100

    Export: Remove unused variable

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 23c11d7..a99c50b 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -36,7 +36,6 @@ void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg)
 //----------------------------------------------------------------------------
 bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
 {
-  std::vector<cmGeneratorTarget*> allTargets;
   {
   std::string expectedTargets;
   std::string sep;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a03f3d0e01edcb617813144626400058a5c0a177
commit a03f3d0e01edcb617813144626400058a5c0a177
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 00:50:53 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:30:15 2015 +0100

    cmFunctionBlocker: Constify method

diff --git a/Source/cmFunctionBlocker.h b/Source/cmFunctionBlocker.h
index 68bf762..a3b8078 100644
--- a/Source/cmFunctionBlocker.h
+++ b/Source/cmFunctionBlocker.h
@@ -39,7 +39,7 @@ public:
   /** Set/Get the context in which this blocker is created.  */
   void SetStartingContext(cmListFileContext const& lfc)
     { this->StartingContext = lfc; }
-  cmListFileContext const& GetStartingContext()
+  cmListFileContext const& GetStartingContext() const
     { return this->StartingContext; }
 private:
   cmListFileContext StartingContext;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d50c4220e29ef0b7366f3e1812f0a79736f2c18e
commit d50c4220e29ef0b7366f3e1812f0a79736f2c18e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 00:50:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:30:13 2015 +0100

    Xcode: Fix typo in comment

diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index 975d94b..bd0f43f 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -105,7 +105,7 @@ public:
         }
       return 0;
     }
-  // serach the attribute list for an object of the specified type
+  // search the attribute list for an object of the specified type
   cmXCodeObject* GetObject(cmXCodeObject::PBXType t)
     {
       for(std::vector<cmXCodeObject*>::iterator i = this->List.begin();

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=803f1901784937e40717fbf6cc675eb7aacbcce1
commit 803f1901784937e40717fbf6cc675eb7aacbcce1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 00:49:54 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 22:30:11 2015 +0100

    Xcode: Remove trailing semicolon

diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index 0f0548b..975d94b 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -75,7 +75,7 @@ public:
   }
   static void Indent(int level, std::ostream& out);
   void Print(std::ostream& out);
-  virtual void PrintComment(std::ostream&) {};
+  virtual void PrintComment(std::ostream&) {}
 
   static void PrintList(std::vector<cmXCodeObject*> const&,
                         std::ostream& out);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkDepends.h              |    1 -
 Source/cmExportBuildFileGenerator.cxx      |    1 -
 Source/cmExtraKateGenerator.cxx            |    1 -
 Source/cmExtraKateGenerator.h              |    2 --
 Source/cmFunctionBlocker.h                 |    2 +-
 Source/cmGeneratorExpressionDAGChecker.cxx |    1 -
 Source/cmGeneratorExpressionEvaluator.h    |    2 --
 Source/cmGeneratorExpressionNode.cxx       |    1 +
 Source/cmGeneratorExpressionNode.h         |    2 --
 Source/cmGeneratorExpressionParser.h       |    2 --
 Source/cmGlobalUnixMakefileGenerator3.cxx  |    6 ++----
 Source/cmGlobalUnixMakefileGenerator3.h    |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |    2 +-
 Source/cmInstallDirectoryGenerator.cxx     |    1 -
 Source/cmLocalNinjaGenerator.cxx           |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx   |   21 ++++++++++-----------
 Source/cmLocalVisualStudio10Generator.cxx  |    1 -
 Source/cmMakefile.cxx                      |    4 ++--
 Source/cmTarget.cxx                        |    7 ++-----
 Source/cmTarget.h                          |    2 --
 Source/cmTestGenerator.cxx                 |    2 --
 Source/cmXCodeObject.h                     |    4 ++--
 22 files changed, 23 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 26 18:22:21 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 26 Oct 2015 18:22:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1050-g4f9e8fe
Message-ID: <20151026222221.D412CC09B8@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4f9e8feff6fdfe494c2593f9a134b9bdf95482c6 (commit)
       via  f612829d6646566c22e52801dcef139eaf93138c (commit)
       via  a8c067ddda62aa792afdd3cad96c7b5e91782044 (commit)
       via  f2071631488fbc22d309bef66e839f21bfa996a2 (commit)
       via  cc35daad41c2dca7625f0cb509083eaf18df1d2a (commit)
      from  e7e0c3d2bf5acdfe910f88f82649e9ee77eeb51f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f9e8feff6fdfe494c2593f9a134b9bdf95482c6
commit 4f9e8feff6fdfe494c2593f9a134b9bdf95482c6
Merge: e7e0c3d f612829
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 18:22:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 18:22:20 2015 -0400

    Merge topic 'use-generator-target' into next
    
    f612829d cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
    a8c067dd cmLocalGenerator: Port Find method away from GetGeneratorTarget
    f2071631 VS6: Port to FindGeneratorTarget
    cc35daad cmake: Port find_package mode away from GetGeneratorTarget


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f612829d6646566c22e52801dcef139eaf93138c
commit f612829d6646566c22e52801dcef139eaf93138c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:22:42 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:19:50 2015 +0100

    cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
    
    The configure-time and generate-time types should be completely
    independent.
    
    Add ownership of cmGeneratorTarget instances to the cmLocalGenerator.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..3d2db42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1208,8 +1208,6 @@ void cmGlobalGenerator::Configure()
 void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
 {
   this->CreateLocalGenerators();
-  cmDeleteAll(this->GeneratorTargets);
-  this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
   this->ComputeBuildFileGenerators();
 }
@@ -1597,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(
       {
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
-      this->GeneratorTargets[t] = gt;
       lg->AddGeneratorTarget(gt);
       }
     }
@@ -1622,9 +1619,9 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
           j = mf->GetOwnedImportedTargets().begin();
         j != mf->GetOwnedImportedTargets().end(); ++j)
       {
-      cmGeneratorTarget* gt =
-          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
-      this->GeneratorTargets[*j] = gt;
+      cmLocalGenerator* lg = this->LocalGenerators[i];
+      cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
+      lg->AddOwnedImportedGeneratorTarget(gt);
       importedMap[*j] = gt;
       }
     }
@@ -1641,9 +1638,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::ClearGeneratorMembers()
 {
-  cmDeleteAll(this->GeneratorTargets);
-  this->GeneratorTargets.clear();
-
   cmDeleteAll(this->BuildExportSets);
   this->BuildExportSets.clear();
 
@@ -1662,20 +1656,6 @@ void cmGlobalGenerator::ClearGeneratorMembers()
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmGlobalGenerator::GetGeneratorTarget(cmTarget const* t) const
-{
-  cmGeneratorTargetsType::const_iterator ti = this->GeneratorTargets.find(t);
-  if(ti == this->GeneratorTargets.end())
-    {
-    this->CMakeInstance->IssueMessage(
-      cmake::INTERNAL_ERROR, "Missing cmGeneratorTarget instance!");
-    return 0;
-    }
-  return ti->second;
-}
-
-//----------------------------------------------------------------------------
 void cmGlobalGenerator::ComputeTargetObjectDirectory(cmGeneratorTarget*) const
 {
 }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 0057d61..bc6e17d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -42,10 +42,6 @@ class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 class cmExportBuildFileGenerator;
 
-typedef std::map<cmTarget const*,
-                 cmGeneratorTarget*,
-                 cmTarget::StrictTargetComparison> cmGeneratorTargetsType;
-
 /** \class cmGlobalGenerator
  * \brief Responsible for overseeing the generation process for the entire tree
  *
@@ -307,14 +303,6 @@ public:
   TargetDependSet const& GetTargetDirectDepends(
       const cmGeneratorTarget* target);
 
-  /** Get per-target generator information.  */
-  cmGeneratorTarget* GetGeneratorTarget(cmTarget const*) const;
-
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-  {
-    this->GeneratorTargets[t] = gt;
-  }
-
   const std::map<std::string, std::vector<cmLocalGenerator*> >& GetProjectMap()
                                                const {return this->ProjectMap;}
 
@@ -482,8 +470,6 @@ private:
   typedef std::map<cmGeneratorTarget const*, TargetDependSet> TargetDependMap;
   TargetDependMap TargetDependencies;
 
-  // Per-target generator information.
-  cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
   void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
                    cmLocalGenerator* lg,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index c205d1a..9f36b54 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -257,7 +257,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   lg->AddGeneratorTarget(gt);
-  this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index b819dad..bb0c974 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -88,7 +88,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       gen[0]->AddGeneratorTarget(gt);
-      this->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6d4fc1f..da8c814 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -460,7 +460,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   root->AddGeneratorTarget(allBuildGt);
-  root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -496,7 +495,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     root->AddGeneratorTarget(checkGt);
-    root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ec7c29f..d92cbea 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -62,6 +62,8 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
 
 cmLocalGenerator::~cmLocalGenerator()
 {
+  cmDeleteAll(this->GeneratorTargets);
+  cmDeleteAll(this->OwnedImportedGeneratorTargets);
 }
 
 void cmLocalGenerator::IssueMessage(cmake::MessageType t,
@@ -460,6 +462,11 @@ void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt)
   this->ImportedGeneratorTargets.push_back(gt);
 }
 
+void cmLocalGenerator::AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt)
+{
+  this->OwnedImportedGeneratorTargets.push_back(gt);
+}
+
 struct NamedGeneratorTargetFinder
 {
   NamedGeneratorTargetFinder(std::string const& name)
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 67383d7..e2f5519 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -127,6 +127,7 @@ public:
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
+  void AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
@@ -380,6 +381,7 @@ protected:
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
   std::vector<cmGeneratorTarget*> ImportedGeneratorTargets;
+  std::vector<cmGeneratorTarget*> OwnedImportedGeneratorTargets;
   std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 225c03e..b813c14 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -896,7 +896,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     lg->AddGeneratorTarget(gt);
-    lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8c067ddda62aa792afdd3cad96c7b5e91782044
commit a8c067ddda62aa792afdd3cad96c7b5e91782044
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:14:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:19:50 2015 +0100

    cmLocalGenerator: Port Find method away from GetGeneratorTarget
    
    Mirror the cmMakefile::FindTarget method.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5928fb5..d53f0e3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1583,10 +1583,12 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
-                                               cmLocalGenerator *lg)
+void cmGlobalGenerator::CreateGeneratorTargets(
+    TargetTypes targetTypes,
+    cmMakefile *mf,
+    cmLocalGenerator *lg,
+    std::map<cmTarget*, cmGeneratorTarget*> const& importedMap)
 {
-  cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
     {
     cmTargets& targets = mf->GetTargets();
@@ -1600,23 +1602,38 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       }
     }
 
+  std::vector<cmTarget*> itgts = mf->GetImportedTargets();
+
   for(std::vector<cmTarget*>::const_iterator
-        j = mf->GetOwnedImportedTargets().begin();
-      j != mf->GetOwnedImportedTargets().end(); ++j)
+        j = itgts.begin(); j != itgts.end(); ++j)
     {
-    cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
-    this->GeneratorTargets[*j] = gt;
-    lg->AddImportedGeneratorTarget(gt);
+    lg->AddImportedGeneratorTarget(importedMap.find(*j)->second);
     }
 }
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 {
+  std::map<cmTarget*, cmGeneratorTarget*> importedMap;
+  for(unsigned int i=0; i < this->Makefiles.size(); ++i)
+    {
+    cmMakefile* mf = this->Makefiles[i];
+    for(std::vector<cmTarget*>::const_iterator
+          j = mf->GetOwnedImportedTargets().begin();
+        j != mf->GetOwnedImportedTargets().end(); ++j)
+      {
+      cmGeneratorTarget* gt =
+          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
+      this->GeneratorTargets[*j] = gt;
+      importedMap[*j] = gt;
+      }
+    }
+
   // Construct per-target generator information.
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    this->CreateGeneratorTargets(targetTypes, this->LocalGenerators[i]);
+    this->CreateGeneratorTargets(targetTypes, this->Makefiles[i],
+                                 this->LocalGenerators[i], importedMap);
     }
 }
 
@@ -2240,11 +2257,11 @@ cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
     std::vector<cmGeneratorTarget*> tgts =
-        this->LocalGenerators[i]->GetGeneratorTargets();
+        this->LocalGenerators[i]->GetImportedGeneratorTargets();
     for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
          it != tgts.end(); ++it)
       {
-      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+      if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name)
         {
         return *it;
         }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c52b209..0057d61 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -485,7 +485,9 @@ private:
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
-  void CreateGeneratorTargets(TargetTypes targetTypes, cmLocalGenerator* lg);
+  void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
+                   cmLocalGenerator* lg,
+                   std::map<cmTarget*, cmGeneratorTarget*> const& importedMap);
   void CreateGeneratorTargets(TargetTypes targetTypes);
 
   void ClearGeneratorMembers();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1bc7f81..ec7c29f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1821,11 +1821,21 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 cmGeneratorTarget*
 cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
 {
-  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+  std::vector<cmGeneratorTarget*>::const_iterator
+    imported = std::find_if(this->ImportedGeneratorTargets.begin(),
+                            this->ImportedGeneratorTargets.end(),
+                            NamedGeneratorTargetFinder(name));
+  if(imported != this->ImportedGeneratorTargets.end())
     {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    return *imported;
     }
-  return 0;
+
+  if(cmGeneratorTarget* t = this->FindGeneratorTarget(name))
+    {
+    return t;
+    }
+
+  return this->GetGlobalGenerator()->FindGeneratorTarget(name);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7841d05..67383d7 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -120,6 +120,11 @@ public:
       return this->GeneratorTargets;
     }
 
+  const std::vector<cmGeneratorTarget*> &GetImportedGeneratorTargets() const
+    {
+      return this->ImportedGeneratorTargets;
+    }
+
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2071631488fbc22d309bef66e839f21bfa996a2
commit f2071631488fbc22d309bef66e839f21bfa996a2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:19:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:19:49 2015 +0100

    VS6: Port to FindGeneratorTarget

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index fd0af61..cdacb9e 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1112,15 +1112,14 @@ void cmLocalVisualStudio6Generator
       // Compute the proper name to use to link this library.
       std::string lib;
       std::string libDebug;
-      cmTarget* tgt = this->GlobalGenerator->FindTarget(j->first.c_str());
+      cmGeneratorTarget* tgt =
+          this->GlobalGenerator->FindGeneratorTarget(j->first.c_str());
       if(tgt)
         {
-        cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(tgt);
         lib = cmSystemTools::GetFilenameWithoutExtension
-          (gt->GetFullName().c_str());
+          (tgt->GetFullName().c_str());
         libDebug = cmSystemTools::GetFilenameWithoutExtension
-          (gt->GetFullName("Debug").c_str());
+          (tgt->GetFullName("Debug").c_str());
         lib += ".lib";
         libDebug += ".lib";
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc35daad41c2dca7625f0cb509083eaf18df1d2a
commit cc35daad41c2dca7625f0cb509083eaf18df1d2a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 14:17:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:19:38 2015 +0100

    cmake: Port find_package mode away from GetGeneratorTarget

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 16417fc..d5bc3d2 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -447,8 +447,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     (cmSystemTools::GetCurrentWorkingDirectory());
   // read in the list file to fill the cache
   snapshot.SetDefaultDefinitions();
-  cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
-  cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
+  cmMakefile* mf = new cmMakefile(gg, snapshot);
+  gg->AddMakefile(mf);
 
   mf->SetArgcArgv(args);
 
@@ -481,6 +481,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::vector<std::string> includeDirs;
     cmSystemTools::ExpandListArgument(includes, includeDirs);
 
+    gg->CreateGenerationObjects();
+    cmLocalGenerator* lg = gg->LocalGenerators[0];
     std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
 
     std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
@@ -510,8 +512,9 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::string linkPath;
     std::string flags;
     std::string linkFlags;
-    gg->CreateGeneratorTargets(cmGlobalGenerator::AllTargets, lg.get());
-    cmGeneratorTarget *gtgt = gg->GetGeneratorTarget(tgt);
+    gg->CreateGenerationObjects();
+    cmGeneratorTarget *gtgt = gg->FindGeneratorTarget(tgt->GetName());
+    cmLocalGenerator* lg = gtgt->GetLocalGenerator();
     lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags,
                        gtgt, false);
     linkLibs = frameworkPath + linkPath + linkLibs;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalGenerator.cxx              |   59 ++++++++++++++---------------
 Source/cmGlobalGenerator.h                |   18 ++-------
 Source/cmGlobalVisualStudio8Generator.cxx |    1 -
 Source/cmGlobalVisualStudioGenerator.cxx  |    1 -
 Source/cmGlobalXCodeGenerator.cxx         |    2 -
 Source/cmLocalGenerator.cxx               |   23 +++++++++--
 Source/cmLocalGenerator.h                 |    7 ++++
 Source/cmLocalVisualStudio6Generator.cxx  |    9 ++---
 Source/cmQtAutoGeneratorInitializer.cxx   |    1 -
 Source/cmake.cxx                          |   11 ++++--
 10 files changed, 69 insertions(+), 63 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 26 18:46:57 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 26 Oct 2015 18:46:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1053-gc711536
Message-ID: <20151026224657.69204C0355@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c71153606ef52a10fe8d1867f169bf28a8baf9fb (commit)
       via  83ac11ddee0b40999bd94d52c4fffd09ab268a43 (commit)
       via  ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742 (commit)
      from  4f9e8feff6fdfe494c2593f9a134b9bdf95482c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c71153606ef52a10fe8d1867f169bf28a8baf9fb
commit c71153606ef52a10fe8d1867f169bf28a8baf9fb
Merge: 4f9e8fe 83ac11d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 18:46:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 18:46:56 2015 -0400

    Merge topic 'use-generator-target' into next
    
    83ac11dd fixup! cmTarget: Make compatbility API explicit.
    ce3a4cde fixup! cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83ac11ddee0b40999bd94d52c4fffd09ab268a43
commit 83ac11ddee0b40999bd94d52c4fffd09ab268a43
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 23:46:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:46:11 2015 +0100

    fixup! cmTarget: Make compatbility API explicit.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fc23760..35c6084 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -733,7 +733,7 @@ void cmMakefile::ConfigureFinalPass()
     }
 #if defined(_WIN32) && !defined(__CYGWIN__)
   // Do old-style link dependency analysis only for CM_USE_OLD_VS6.
-  if(this->Makefile->GetGlobalGenerator()->IsForVS6())
+  if(this->GetGlobalGenerator()->IsForVS6())
     {
     for (cmTargets::iterator l = this->Targets.begin();
          l != this->Targets.end(); l++)
@@ -747,7 +747,7 @@ void cmMakefile::ConfigureFinalPass()
       // system generation uses up-to-date information even if other cache
       // invalidation code in this source file is buggy.
 
-      l->second->AnalyzeLibDependenciesForVS6(this);
+      l->second.AnalyzeLibDependenciesForVS6(this);
       }
     }
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742
commit ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 23:44:17 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:44:17 2015 +0100

    fixup! cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 9f36b54..b7478f9 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -353,16 +353,17 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
   cmGlobalVisualStudio7Generator::AddExtraIDETargets();
   if(this->AddCheckTarget())
     {
-    for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
+    for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
       {
-      cmTargets& tgts = this->Makefiles[i]->GetTargets();
+      std::vector<cmGeneratorTarget*> tgts =
+          this->LocalGenerators[i]->GetGeneratorTargets();
       // All targets depend on the build-system check target.
-      for(cmTargets::iterator ti = tgts.begin();
+      for(std::vector<cmGeneratorTarget*>::iterator ti = tgts.begin();
           ti != tgts.end(); ++ti)
         {
-        if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+        if((*ti)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+          (*ti)->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
           }
         }
       }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |   11 ++++++-----
 Source/cmMakefile.cxx                     |    4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 26 18:49:18 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 26 Oct 2015 18:49:18 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1083-g5faad89
Message-ID: <20151026224918.5EA6CC0439@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5faad89d23c55235bfa4510c7378bae5620053ae (commit)
       via  164d11d3dbb65359fa64ff1b33478d7a21c3cf62 (commit)
       via  58a001242c3342838d4cd19303b093eceff678ca (commit)
       via  4ae36de53a171357889825a863460c8eda56844d (commit)
       via  3c9b31e2576c518117266429de50298b86bd7bb8 (commit)
       via  77cdfa1ce75e992b58a00b004d1dcfbe84a86c5f (commit)
       via  82913d2acfeb90b442703bd53b7c8cf9015d3d9a (commit)
       via  db2a97da1ef82d54a9a4a86c125c8accf3dd0814 (commit)
       via  2dc870c081a5a1d292ff57e8baea3e80a83a8bb3 (commit)
       via  88eced78c37f90729afd43e466568e240b95a5fc (commit)
       via  c0ae76151e252e572d2abf8fafc08fb3eaec8563 (commit)
       via  47bc139ee6e7043b1486a89e97a25941cb00a356 (commit)
       via  6316178da0d01778eb7a82e0c2c77526f0a0e47a (commit)
       via  778a3a92b1dae56edd247800002da7b75d0a61e5 (commit)
       via  4826709d4b314fb30398ee9ee0060876b772abde (commit)
       via  270344ffbaabf2a0bc44a2dadf7fe63c302fc124 (commit)
       via  063d1758e064310ef90b803ab03ab16d8324b6fb (commit)
       via  ad90bf916fde6ee0b929bb971053a09d6f89ef20 (commit)
       via  ae3b13d414dc4802805302b2d754fa915e78e379 (commit)
       via  fc97ea8c4e75885d8f21838e8096fadcbf5318b7 (commit)
       via  92c573bbf930e9e7d67e27f328d5627659e089e6 (commit)
       via  2861573b6ed32cc6d1779f23cc00d58d35123cb7 (commit)
       via  a4ac72e7c925081e8f353e6fb62d9c782a8fca3a (commit)
       via  6b90c1a174ccce659569ad2c630275bd0d60e73d (commit)
       via  cce8b1abbc622503188f525347d877523d74d0f0 (commit)
       via  3721fca04d6fff4c337e862192f1fe86bc1ce754 (commit)
       via  af464f982ccde44217892200ef3279456ce220b2 (commit)
       via  a39310dc2250b061db63ca2e0c78aa080b8ab63b (commit)
       via  49e77f3cb0d4365e333140911b3a782512bfe4bb (commit)
       via  32ce5957282a4e09ae7023c4ba3ff3b058998637 (commit)
      from  c71153606ef52a10fe8d1867f169bf28a8baf9fb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5faad89d23c55235bfa4510c7378bae5620053ae
commit 5faad89d23c55235bfa4510c7378bae5620053ae
Merge: c711536 164d11d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 18:49:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 18:49:15 2015 -0400

    Merge topic 'use-generator-target' into next
    
    164d11d3 cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
    58a00124 cmLocalGenerator: Port Find method away from GetGeneratorTarget
    4ae36de5 VS6: Port to FindGeneratorTarget
    3c9b31e2 cmake: Port find_package mode away from GetGeneratorTarget
    77cdfa1c cmMakefile: Add imported target accessor
    82913d2a CMP0026: Port away from GetGeneratorTarget
    db2a97da cmGlobalGenerator: Add FindGeneratorTarget API
    2dc870c0 cmGeneratorTarget: Add API for globally visible IMPORTED
    88eced78 Xcode: Port away from GetGeneratorTarget
    c0ae7615 cmLocalGenerator: Store imported targets in a separate container.
    47bc139e cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget
    6316178d cmTarget: Implement ALIAS in terms of name mapping
    778a3a92 cmGlobalGenerator: Remove unneeded GetGeneratorTarget
    4826709d cmGlobalGenerator: Remove direct storage of targets
    270344ff cmTargetCollectLinkLanguages: Remove cmMakefile dependency
    063d1758 cmGeneratorTarget: Port cmOptionalLinkImplementation
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=164d11d3dbb65359fa64ff1b33478d7a21c3cf62
commit 164d11d3dbb65359fa64ff1b33478d7a21c3cf62
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:22:42 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:51 2015 +0100

    cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
    
    The configure-time and generate-time types should be completely
    independent.
    
    Add ownership of cmGeneratorTarget instances to the cmLocalGenerator.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..3d2db42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1208,8 +1208,6 @@ void cmGlobalGenerator::Configure()
 void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
 {
   this->CreateLocalGenerators();
-  cmDeleteAll(this->GeneratorTargets);
-  this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
   this->ComputeBuildFileGenerators();
 }
@@ -1597,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(
       {
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
-      this->GeneratorTargets[t] = gt;
       lg->AddGeneratorTarget(gt);
       }
     }
@@ -1622,9 +1619,9 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
           j = mf->GetOwnedImportedTargets().begin();
         j != mf->GetOwnedImportedTargets().end(); ++j)
       {
-      cmGeneratorTarget* gt =
-          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
-      this->GeneratorTargets[*j] = gt;
+      cmLocalGenerator* lg = this->LocalGenerators[i];
+      cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
+      lg->AddOwnedImportedGeneratorTarget(gt);
       importedMap[*j] = gt;
       }
     }
@@ -1641,9 +1638,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::ClearGeneratorMembers()
 {
-  cmDeleteAll(this->GeneratorTargets);
-  this->GeneratorTargets.clear();
-
   cmDeleteAll(this->BuildExportSets);
   this->BuildExportSets.clear();
 
@@ -1662,20 +1656,6 @@ void cmGlobalGenerator::ClearGeneratorMembers()
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmGlobalGenerator::GetGeneratorTarget(cmTarget const* t) const
-{
-  cmGeneratorTargetsType::const_iterator ti = this->GeneratorTargets.find(t);
-  if(ti == this->GeneratorTargets.end())
-    {
-    this->CMakeInstance->IssueMessage(
-      cmake::INTERNAL_ERROR, "Missing cmGeneratorTarget instance!");
-    return 0;
-    }
-  return ti->second;
-}
-
-//----------------------------------------------------------------------------
 void cmGlobalGenerator::ComputeTargetObjectDirectory(cmGeneratorTarget*) const
 {
 }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 0057d61..bc6e17d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -42,10 +42,6 @@ class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 class cmExportBuildFileGenerator;
 
-typedef std::map<cmTarget const*,
-                 cmGeneratorTarget*,
-                 cmTarget::StrictTargetComparison> cmGeneratorTargetsType;
-
 /** \class cmGlobalGenerator
  * \brief Responsible for overseeing the generation process for the entire tree
  *
@@ -307,14 +303,6 @@ public:
   TargetDependSet const& GetTargetDirectDepends(
       const cmGeneratorTarget* target);
 
-  /** Get per-target generator information.  */
-  cmGeneratorTarget* GetGeneratorTarget(cmTarget const*) const;
-
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-  {
-    this->GeneratorTargets[t] = gt;
-  }
-
   const std::map<std::string, std::vector<cmLocalGenerator*> >& GetProjectMap()
                                                const {return this->ProjectMap;}
 
@@ -482,8 +470,6 @@ private:
   typedef std::map<cmGeneratorTarget const*, TargetDependSet> TargetDependMap;
   TargetDependMap TargetDependencies;
 
-  // Per-target generator information.
-  cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
   void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
                    cmLocalGenerator* lg,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 889eb93..b7478f9 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -257,7 +257,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   lg->AddGeneratorTarget(gt);
-  this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index b819dad..bb0c974 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -88,7 +88,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       gen[0]->AddGeneratorTarget(gt);
-      this->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6d4fc1f..da8c814 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -460,7 +460,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   root->AddGeneratorTarget(allBuildGt);
-  root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -496,7 +495,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     root->AddGeneratorTarget(checkGt);
-    root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ec7c29f..d92cbea 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -62,6 +62,8 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
 
 cmLocalGenerator::~cmLocalGenerator()
 {
+  cmDeleteAll(this->GeneratorTargets);
+  cmDeleteAll(this->OwnedImportedGeneratorTargets);
 }
 
 void cmLocalGenerator::IssueMessage(cmake::MessageType t,
@@ -460,6 +462,11 @@ void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt)
   this->ImportedGeneratorTargets.push_back(gt);
 }
 
+void cmLocalGenerator::AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt)
+{
+  this->OwnedImportedGeneratorTargets.push_back(gt);
+}
+
 struct NamedGeneratorTargetFinder
 {
   NamedGeneratorTargetFinder(std::string const& name)
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 67383d7..e2f5519 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -127,6 +127,7 @@ public:
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
+  void AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
@@ -380,6 +381,7 @@ protected:
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
   std::vector<cmGeneratorTarget*> ImportedGeneratorTargets;
+  std::vector<cmGeneratorTarget*> OwnedImportedGeneratorTargets;
   std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 225c03e..b813c14 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -896,7 +896,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     lg->AddGeneratorTarget(gt);
-    lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58a001242c3342838d4cd19303b093eceff678ca
commit 58a001242c3342838d4cd19303b093eceff678ca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:14:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:50 2015 +0100

    cmLocalGenerator: Port Find method away from GetGeneratorTarget
    
    Mirror the cmMakefile::FindTarget method.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5928fb5..d53f0e3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1583,10 +1583,12 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
-                                               cmLocalGenerator *lg)
+void cmGlobalGenerator::CreateGeneratorTargets(
+    TargetTypes targetTypes,
+    cmMakefile *mf,
+    cmLocalGenerator *lg,
+    std::map<cmTarget*, cmGeneratorTarget*> const& importedMap)
 {
-  cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
     {
     cmTargets& targets = mf->GetTargets();
@@ -1600,23 +1602,38 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       }
     }
 
+  std::vector<cmTarget*> itgts = mf->GetImportedTargets();
+
   for(std::vector<cmTarget*>::const_iterator
-        j = mf->GetOwnedImportedTargets().begin();
-      j != mf->GetOwnedImportedTargets().end(); ++j)
+        j = itgts.begin(); j != itgts.end(); ++j)
     {
-    cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
-    this->GeneratorTargets[*j] = gt;
-    lg->AddImportedGeneratorTarget(gt);
+    lg->AddImportedGeneratorTarget(importedMap.find(*j)->second);
     }
 }
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 {
+  std::map<cmTarget*, cmGeneratorTarget*> importedMap;
+  for(unsigned int i=0; i < this->Makefiles.size(); ++i)
+    {
+    cmMakefile* mf = this->Makefiles[i];
+    for(std::vector<cmTarget*>::const_iterator
+          j = mf->GetOwnedImportedTargets().begin();
+        j != mf->GetOwnedImportedTargets().end(); ++j)
+      {
+      cmGeneratorTarget* gt =
+          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
+      this->GeneratorTargets[*j] = gt;
+      importedMap[*j] = gt;
+      }
+    }
+
   // Construct per-target generator information.
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    this->CreateGeneratorTargets(targetTypes, this->LocalGenerators[i]);
+    this->CreateGeneratorTargets(targetTypes, this->Makefiles[i],
+                                 this->LocalGenerators[i], importedMap);
     }
 }
 
@@ -2240,11 +2257,11 @@ cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
     std::vector<cmGeneratorTarget*> tgts =
-        this->LocalGenerators[i]->GetGeneratorTargets();
+        this->LocalGenerators[i]->GetImportedGeneratorTargets();
     for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
          it != tgts.end(); ++it)
       {
-      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+      if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name)
         {
         return *it;
         }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c52b209..0057d61 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -485,7 +485,9 @@ private:
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
-  void CreateGeneratorTargets(TargetTypes targetTypes, cmLocalGenerator* lg);
+  void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
+                   cmLocalGenerator* lg,
+                   std::map<cmTarget*, cmGeneratorTarget*> const& importedMap);
   void CreateGeneratorTargets(TargetTypes targetTypes);
 
   void ClearGeneratorMembers();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1bc7f81..ec7c29f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1821,11 +1821,21 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 cmGeneratorTarget*
 cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
 {
-  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+  std::vector<cmGeneratorTarget*>::const_iterator
+    imported = std::find_if(this->ImportedGeneratorTargets.begin(),
+                            this->ImportedGeneratorTargets.end(),
+                            NamedGeneratorTargetFinder(name));
+  if(imported != this->ImportedGeneratorTargets.end())
     {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    return *imported;
     }
-  return 0;
+
+  if(cmGeneratorTarget* t = this->FindGeneratorTarget(name))
+    {
+    return t;
+    }
+
+  return this->GetGlobalGenerator()->FindGeneratorTarget(name);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7841d05..67383d7 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -120,6 +120,11 @@ public:
       return this->GeneratorTargets;
     }
 
+  const std::vector<cmGeneratorTarget*> &GetImportedGeneratorTargets() const
+    {
+      return this->ImportedGeneratorTargets;
+    }
+
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ae36de53a171357889825a863460c8eda56844d
commit 4ae36de53a171357889825a863460c8eda56844d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:19:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:50 2015 +0100

    VS6: Port to FindGeneratorTarget

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index fd0af61..cdacb9e 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1112,15 +1112,14 @@ void cmLocalVisualStudio6Generator
       // Compute the proper name to use to link this library.
       std::string lib;
       std::string libDebug;
-      cmTarget* tgt = this->GlobalGenerator->FindTarget(j->first.c_str());
+      cmGeneratorTarget* tgt =
+          this->GlobalGenerator->FindGeneratorTarget(j->first.c_str());
       if(tgt)
         {
-        cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(tgt);
         lib = cmSystemTools::GetFilenameWithoutExtension
-          (gt->GetFullName().c_str());
+          (tgt->GetFullName().c_str());
         libDebug = cmSystemTools::GetFilenameWithoutExtension
-          (gt->GetFullName("Debug").c_str());
+          (tgt->GetFullName("Debug").c_str());
         lib += ".lib";
         libDebug += ".lib";
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c9b31e2576c518117266429de50298b86bd7bb8
commit 3c9b31e2576c518117266429de50298b86bd7bb8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 14:17:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:50 2015 +0100

    cmake: Port find_package mode away from GetGeneratorTarget

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 16417fc..d5bc3d2 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -447,8 +447,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     (cmSystemTools::GetCurrentWorkingDirectory());
   // read in the list file to fill the cache
   snapshot.SetDefaultDefinitions();
-  cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
-  cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
+  cmMakefile* mf = new cmMakefile(gg, snapshot);
+  gg->AddMakefile(mf);
 
   mf->SetArgcArgv(args);
 
@@ -481,6 +481,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::vector<std::string> includeDirs;
     cmSystemTools::ExpandListArgument(includes, includeDirs);
 
+    gg->CreateGenerationObjects();
+    cmLocalGenerator* lg = gg->LocalGenerators[0];
     std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
 
     std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
@@ -510,8 +512,9 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::string linkPath;
     std::string flags;
     std::string linkFlags;
-    gg->CreateGeneratorTargets(cmGlobalGenerator::AllTargets, lg.get());
-    cmGeneratorTarget *gtgt = gg->GetGeneratorTarget(tgt);
+    gg->CreateGenerationObjects();
+    cmGeneratorTarget *gtgt = gg->FindGeneratorTarget(tgt->GetName());
+    cmLocalGenerator* lg = gtgt->GetLocalGenerator();
     lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags,
                        gtgt, false);
     linkLibs = frameworkPath + linkPath + linkLibs;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77cdfa1ce75e992b58a00b004d1dcfbe84a86c5f
commit 77cdfa1ce75e992b58a00b004d1dcfbe84a86c5f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 22:18:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:50 2015 +0100

    cmMakefile: Add imported target accessor

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 4a6ad94..35c6084 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1766,6 +1766,18 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
+std::vector<cmTarget*> cmMakefile::GetImportedTargets() const
+{
+  std::vector<cmTarget*> tgts;
+  tgts.reserve(this->ImportedTargets.size());
+  for (TargetMap::const_iterator it = this->ImportedTargets.begin();
+       it != this->ImportedTargets.end(); ++it)
+    {
+    tgts.push_back(it->second);
+    }
+  return tgts;
+}
+
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 01c4524..f1dd374 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -390,6 +390,7 @@ public:
     {
       return this->ImportedTargetsOwned;
     }
+  std::vector<cmTarget*> GetImportedTargets() const;
 
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82913d2acfeb90b442703bd53b7c8cf9015d3d9a
commit 82913d2acfeb90b442703bd53b7c8cf9015d3d9a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:19:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:50 2015 +0100

    CMP0026: Port away from GetGeneratorTarget

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f0f404c..1eebd12 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1602,7 +1602,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         // CMake time.
         cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
         gg->CreateGenerationObjects();
-        cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+        cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
         this->Properties.SetProperty(propLOCATION,
                                      gt->GetLocationForBuild());
         }
@@ -1627,7 +1627,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         {
         cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
         gg->CreateGenerationObjects();
-        cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+        cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
         this->Properties.SetProperty(
                 prop, gt->GetFullPath(configName, false).c_str());
         }
@@ -1651,7 +1651,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
           {
           cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
           gg->CreateGenerationObjects();
-          cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+          cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
           this->Properties.SetProperty(
                   prop, gt->GetFullPath(configName, false).c_str());
           }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db2a97da1ef82d54a9a4a86c125c8accf3dd0814
commit db2a97da1ef82d54a9a4a86c125c8accf3dd0814
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:06:59 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:49 2015 +0100

    cmGlobalGenerator: Add FindGeneratorTarget API

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6b5cb97..5928fb5 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2196,6 +2196,25 @@ cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const
   return 0;
 }
 
+cmGeneratorTarget*
+cmGlobalGenerator::FindGeneratorTargetImpl(std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
+      {
+      if ((*it)->GetName() == name)
+        {
+        return *it;
+        }
+      }
+    }
+  return 0;
+}
+
 cmTarget*
 cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
 {
@@ -2215,6 +2234,25 @@ cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
   return 0;
 }
 
+cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
+    std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
+      {
+      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+        {
+        return *it;
+        }
+      }
+    }
+  return 0;
+}
+
 //----------------------------------------------------------------------------
 cmTarget*
 cmGlobalGenerator::FindTarget(const std::string& name,
@@ -2236,6 +2274,16 @@ cmGlobalGenerator::FindTarget(const std::string& name,
   return this->FindImportedTargetImpl(name);
 }
 
+cmGeneratorTarget*
+cmGlobalGenerator::FindGeneratorTarget(const std::string& name) const
+{
+  if (cmGeneratorTarget* tgt = this->FindGeneratorTargetImpl(name))
+    {
+    return tgt;
+    }
+  return this->FindImportedGeneratorTargetImpl(name);
+}
+
 //----------------------------------------------------------------------------
 bool
 cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 419cada..c52b209 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -254,6 +254,8 @@ public:
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
+  cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
+
   void AddAlias(const std::string& name, const std::string& tgtName);
   bool IsAlias(const std::string& name) const;
 
@@ -432,6 +434,10 @@ protected:
   cmTarget* FindTargetImpl(std::string const& name) const;
   cmTarget* FindImportedTargetImpl(std::string const& name) const;
 
+  cmGeneratorTarget* FindGeneratorTargetImpl(std::string const& name) const;
+  cmGeneratorTarget*
+  FindImportedGeneratorTargetImpl(std::string const& name) const;
+
   const char* GetPredefinedTargetsFolder();
   virtual bool UseFolderProperty();
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dc870c081a5a1d292ff57e8baea3e80a83a8bb3
commit 2dc870c081a5a1d292ff57e8baea3e80a83a8bb3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:06:37 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:49 2015 +0100

    cmGeneratorTarget: Add API for globally visible IMPORTED

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9376e98..1f74eda 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -856,6 +856,11 @@ bool cmGeneratorTarget::IsImported() const
   return this->Target->IsImported();
 }
 
+bool cmGeneratorTarget::IsImportedGloballyVisible() const
+{
+  return this->Target->IsImportedGloballyVisible();
+}
+
 //----------------------------------------------------------------------------
 const char* cmGeneratorTarget::GetLocationForBuild() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index c2607a7..da59a98 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -31,6 +31,7 @@ public:
   cmLocalGenerator* GetLocalGenerator() const;
 
   bool IsImported() const;
+  bool IsImportedGloballyVisible() const;
   const char *GetLocation(const std::string& config) const;
 
   std::vector<cmCustomCommand> const &GetPreBuildCommands() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88eced78c37f90729afd43e466568e240b95a5fc
commit 88eced78c37f90729afd43e466568e240b95a5fc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:59:39 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:49 2015 +0100

    Xcode: Port away from GetGeneratorTarget

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 3b430d2..aec2603 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -51,13 +51,11 @@ void cmLocalXCodeGenerator::Generate()
 {
   cmLocalGenerator::Generate();
 
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator iter = targets.begin();
       iter != targets.end(); ++iter)
     {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
+    (*iter)->HasMacOSXRpathInstallNameDir("");
     }
 }
 
@@ -66,13 +64,11 @@ void cmLocalXCodeGenerator::GenerateInstallRules()
 {
   cmLocalGenerator::GenerateInstallRules();
 
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator iter = targets.begin();
       iter != targets.end(); ++iter)
     {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
+    (*iter)->HasMacOSXRpathInstallNameDir("");
     }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0ae76151e252e572d2abf8fafc08fb3eaec8563
commit c0ae76151e252e572d2abf8fafc08fb3eaec8563
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:56:31 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:49 2015 +0100

    cmLocalGenerator: Store imported targets in a separate container.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 47d254e..6b5cb97 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1606,6 +1606,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     {
     cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
     this->GeneratorTargets[*j] = gt;
+    lg->AddImportedGeneratorTarget(gt);
     }
 }
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9d5335e..1bc7f81 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -455,6 +455,11 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
   this->GeneratorTargets.push_back(gt);
 }
 
+void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt)
+{
+  this->ImportedGeneratorTargets.push_back(gt);
+}
+
 struct NamedGeneratorTargetFinder
 {
   NamedGeneratorTargetFinder(std::string const& name)
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 91a476f..7841d05 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -121,6 +121,7 @@ public:
     }
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
+  void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
@@ -373,6 +374,7 @@ protected:
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
+  std::vector<cmGeneratorTarget*> ImportedGeneratorTargets;
   std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47bc139ee6e7043b1486a89e97a25941cb00a356
commit 47bc139ee6e7043b1486a89e97a25941cb00a356
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:52:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:48 2015 +0100

    cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b5f5ce9..9d5335e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -51,6 +51,8 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
 
   this->Makefile = makefile;
 
+  this->AliasTargets = makefile->GetAliasTargets();
+
   this->EmitUniversalBinaryFlags = true;
   this->BackwardsCompatibility = 0;
   this->BackwardsCompatibilityFinal = false;
@@ -453,11 +455,45 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
   this->GeneratorTargets.push_back(gt);
 }
 
+struct NamedGeneratorTargetFinder
+{
+  NamedGeneratorTargetFinder(std::string const& name)
+    : Name(name)
+  {
+
+  }
+
+  bool operator()(cmGeneratorTarget* tgt)
+  {
+    return tgt->GetName() == this->Name;
+  }
+private:
+  std::string Name;
+};
+
 cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
     const std::string& name) const
 {
-  return this->GetGlobalGenerator()->GetGeneratorTarget(
-        this->Makefile->FindTarget(name));
+  std::map<std::string, std::string>::const_iterator i =
+      this->AliasTargets.find(name);
+  if (i != this->AliasTargets.end())
+    {
+    std::vector<cmGeneratorTarget*>::const_iterator ai =
+        std::find_if(this->GeneratorTargets.begin(),
+                     this->GeneratorTargets.end(),
+                     NamedGeneratorTargetFinder(i->second));
+    return *ai;
+    }
+  std::vector<cmGeneratorTarget*>::const_iterator ti =
+      std::find_if(this->GeneratorTargets.begin(),
+                   this->GeneratorTargets.end(),
+                   NamedGeneratorTargetFinder(name));
+  if ( ti != this->GeneratorTargets.end() )
+    {
+    return *ti;
+    }
+
+  return 0;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 46eb1b3..91a476f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -373,6 +373,7 @@ protected:
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
+  std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 35dd3c6..01c4524 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -400,6 +400,11 @@ public:
                             bool excludeAliases = false) const;
   bool IsAlias(const std::string& name) const;
 
+  std::map<std::string, std::string> GetAliasTargets() const
+  {
+    return this->AliasTargets;
+  }
+
   /**
    * Mark include directories as system directories.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6316178da0d01778eb7a82e0c2c77526f0a0e47a
commit 6316178da0d01778eb7a82e0c2c77526f0a0e47a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:43:00 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:48 2015 +0100

    cmTarget: Implement ALIAS in terms of name mapping
    
    Remove mapping to cmTarget.

diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index 47f6592..a84bb9d 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -192,7 +192,7 @@ bool cmAddExecutableCommand
       this->SetError(e.str());
       return false;
       }
-    this->Makefile->AddAlias(exename, aliasedTarget);
+    this->Makefile->AddAlias(exename, aliasedName);
     return true;
     }
 
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index e0adee3..5296cbb 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -314,7 +314,7 @@ bool cmAddLibraryCommand
       this->SetError(e.str());
       return false;
       }
-    this->Makefile->AddAlias(libName, aliasedTarget);
+    this->Makefile->AddAlias(libName, aliasedName);
     return true;
     }
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 215d63f..47d254e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2167,9 +2167,10 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::AddAlias(const std::string& name, cmTarget *tgt)
+void cmGlobalGenerator::AddAlias(const std::string& name,
+                                 std::string const& tgtName)
 {
-  this->AliasTargets[name] = tgt;
+  this->AliasTargets[name] = tgtName;
 }
 
 //----------------------------------------------------------------------------
@@ -2220,10 +2221,11 @@ cmGlobalGenerator::FindTarget(const std::string& name,
 {
   if (!excludeAliases)
     {
-    TargetMap::const_iterator ai = this->AliasTargets.find(name);
+    std::map<std::string, std::string>::const_iterator ai =
+        this->AliasTargets.find(name);
     if (ai != this->AliasTargets.end())
       {
-      return ai->second;
+      return this->FindTargetImpl(ai->second);
       }
     }
   if (cmTarget* tgt = this->FindTargetImpl(name))
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 5d4ce08..419cada 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -254,7 +254,7 @@ public:
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
-  void AddAlias(const std::string& name, cmTarget *tgt);
+  void AddAlias(const std::string& name, const std::string& tgtName);
   bool IsAlias(const std::string& name) const;
 
   /** Determine if a name resolves to a framework on disk or a built target
@@ -427,17 +427,7 @@ protected:
   std::map<std::string, cmExportBuildFileGenerator*> BuildExportSets;
   std::map<std::string, cmExportBuildFileGenerator*> BuildExportExportSets;
 
-  // All targets in the entire project.
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX11_UNORDERED_MAP
-  typedef std::unordered_map<std::string, cmTarget*> TargetMap;
-#else
-  typedef cmsys::hash_map<std::string, cmTarget*> TargetMap;
-#endif
-#else
-  typedef std::map<std::string,cmTarget *> TargetMap;
-#endif
-  TargetMap AliasTargets;
+  std::map<std::string, std::string> AliasTargets;
 
   cmTarget* FindTargetImpl(std::string const& name) const;
   cmTarget* FindImportedTargetImpl(std::string const& name) const;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 91ee36e..4a6ad94 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2036,10 +2036,11 @@ void cmMakefile::AddGlobalLinkInformation(const std::string& name,
 }
 
 
-void cmMakefile::AddAlias(const std::string& lname, cmTarget *tgt)
+void cmMakefile::AddAlias(const std::string& lname,
+                          std::string const& tgtName)
 {
-  this->AliasTargets[lname] = tgt;
-  this->GetGlobalGenerator()->AddAlias(lname, tgt);
+  this->AliasTargets[lname] = tgtName;
+  this->GetGlobalGenerator()->AddAlias(lname, tgtName);
 }
 
 cmTarget* cmMakefile::AddLibrary(const std::string& lname,
@@ -4024,10 +4025,12 @@ cmTarget* cmMakefile::FindTarget(const std::string& name,
 {
   if (!excludeAliases)
     {
-    TargetMap::const_iterator i = this->AliasTargets.find(name);
+    std::map<std::string, std::string>::const_iterator i =
+        this->AliasTargets.find(name);
     if (i != this->AliasTargets.end())
       {
-      return i->second;
+      cmTargets::iterator ai = this->Targets.find(i->second);
+      return &ai->second;
       }
     }
   cmTargets::iterator i = this->Targets.find( name );
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index f3dbb74..35dd3c6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -283,7 +283,7 @@ public:
   cmTarget* AddLibrary(const std::string& libname, cmState::TargetType type,
                   const std::vector<std::string> &srcs,
                   bool excludeFromAll = false);
-  void AddAlias(const std::string& libname, cmTarget *tgt);
+  void AddAlias(const std::string& libname, const std::string& tgt);
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
   /**
@@ -790,7 +790,7 @@ protected:
 #else
   typedef std::map<std::string, cmTarget*> TargetMap;
 #endif
-  TargetMap AliasTargets;
+  std::map<std::string, std::string> AliasTargets;
   std::vector<cmSourceFile*> SourceFiles;
 
   // Tests

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=778a3a92b1dae56edd247800002da7b75d0a61e5
commit 778a3a92b1dae56edd247800002da7b75d0a61e5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:33:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:48 2015 +0100

    cmGlobalGenerator: Remove unneeded GetGeneratorTarget

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e33e942..215d63f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2244,8 +2244,7 @@ cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
 
   if(cmTarget* tgt = this->FindTarget(libname))
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
-    if(gt->IsFrameworkOnApple())
+    if(tgt->IsFrameworkOnApple())
        {
        return true;
        }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4826709d4b314fb30398ee9ee0060876b772abde
commit 4826709d4b314fb30398ee9ee0060876b772abde
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:22:51 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:48:48 2015 +0100

    cmGlobalGenerator: Remove direct storage of targets
    
    Find the target by looping when needed.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d26cc34..e33e942 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1637,8 +1637,6 @@ void cmGlobalGenerator::ClearGeneratorMembers()
 
   this->ExportSets.clear();
   this->TargetDependencies.clear();
-  this->TotalTargets.clear();
-  this->ImportedTargets.clear();
   this->ProjectMap.clear();
   this->RuleHashes.clear();
   this->DirectoryContentMap.clear();
@@ -2180,6 +2178,41 @@ bool cmGlobalGenerator::IsAlias(const std::string& name) const
   return this->AliasTargets.find(name) != this->AliasTargets.end();
 }
 
+cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
+    {
+    cmTargets& tgts = this->Makefiles[i]->GetTargets();
+    for (cmTargets::iterator it = tgts.begin(); it != tgts.end(); ++it)
+      {
+      if (it->second.GetName() == name)
+        {
+        return &it->second;
+        }
+      }
+    }
+  return 0;
+}
+
+cmTarget*
+cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
+    {
+    std::vector<cmTarget*> tgts =
+        this->Makefiles[i]->GetOwnedImportedTargets();
+    for (std::vector<cmTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
+      {
+      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+        {
+        return *it;
+        }
+      }
+    }
+  return 0;
+}
+
 //----------------------------------------------------------------------------
 cmTarget*
 cmGlobalGenerator::FindTarget(const std::string& name,
@@ -2193,17 +2226,11 @@ cmGlobalGenerator::FindTarget(const std::string& name,
       return ai->second;
       }
     }
-  TargetMap::const_iterator i = this->TotalTargets.find ( name );
-  if ( i != this->TotalTargets.end() )
-    {
-    return i->second;
-    }
-  i = this->ImportedTargets.find(name);
-  if ( i != this->ImportedTargets.end() )
+  if (cmTarget* tgt = this->FindTargetImpl(name))
     {
-    return i->second;
+    return tgt;
     }
-  return 0;
+  return this->FindImportedTargetImpl(name);
 }
 
 //----------------------------------------------------------------------------
@@ -2622,18 +2649,6 @@ cmGlobalGenerator::GetTargetDirectDepends(cmGeneratorTarget const* target)
   return this->TargetDependencies[target];
 }
 
-void cmGlobalGenerator::AddTarget(cmTarget* t)
-{
-  if(t->IsImported())
-    {
-    this->ImportedTargets[t->GetName()] = t;
-    }
-  else
-    {
-    this->TotalTargets[t->GetName()] = t;
-    }
-}
-
 bool cmGlobalGenerator::IsReservedTarget(std::string const& name)
 {
   // The following is a list of targets reserved
@@ -2939,17 +2954,20 @@ void cmGlobalGenerator::WriteSummary()
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
 
-  // Generate summary information files for each target.
-  for(TargetMap::const_iterator ti =
-        this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
-    if ((ti->second)->GetType() == cmState::INTERFACE_LIBRARY)
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
       {
-      continue;
+      if ((*it)->GetType() == cmState::INTERFACE_LIBRARY)
+        {
+        continue;
+        }
+      this->WriteSummary(*it);
+      fout << (*it)->GetSupportDirectory() << "\n";
       }
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
-    this->WriteSummary(gt);
-    fout << gt->GetSupportDirectory() << "\n";
     }
 }
 
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 18f5329..5d4ce08 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -280,8 +280,6 @@ public:
   std::set<std::string> const& GetDirectoryContent(std::string const& dir,
                                                    bool needDisk = true);
 
-  void AddTarget(cmTarget* t);
-
   static bool IsReservedTarget(std::string const& name);
 
   virtual const char* GetAllTargetName()         const { return "ALL_BUILD"; }
@@ -439,9 +437,10 @@ protected:
 #else
   typedef std::map<std::string,cmTarget *> TargetMap;
 #endif
-  TargetMap TotalTargets;
   TargetMap AliasTargets;
-  TargetMap ImportedTargets;
+
+  cmTarget* FindTargetImpl(std::string const& name) const;
+  cmTarget* FindImportedTargetImpl(std::string const& name) const;
 
   const char* GetPredefinedTargetsFolder();
   virtual bool UseFolderProperty();
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index b771f11..889eb93 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -354,14 +354,18 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
   cmGlobalVisualStudio7Generator::AddExtraIDETargets();
   if(this->AddCheckTarget())
     {
-    // All targets depend on the build-system check target.
-    for(TargetMap::const_iterator
-          ti = this->TotalTargets.begin();
-        ti != this->TotalTargets.end(); ++ti)
+    for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
       {
-      if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+      std::vector<cmGeneratorTarget*> tgts =
+          this->LocalGenerators[i]->GetGeneratorTargets();
+      // All targets depend on the build-system check target.
+      for(std::vector<cmGeneratorTarget*>::iterator ti = tgts.begin();
+          ti != tgts.end(); ++ti)
         {
-        ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+        if((*ti)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+          {
+          (*ti)->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+          }
         }
       }
     }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 42f9758..6d4fc1f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1362,12 +1362,17 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::ForceLinkerLanguages()
 {
-  // This makes sure all targets link using the proper language.
-  for(TargetMap::const_iterator
-        ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
-    this->ForceLinkerLanguage(gt);
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    // All targets depend on the build-system check target.
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti = tgts.begin();
+        ti != tgts.end(); ++ti)
+      {
+      // This makes sure all targets link using the proper language.
+      this->ForceLinkerLanguage(*ti);
+      }
     }
 }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 70f7e52..91ee36e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2096,7 +2096,6 @@ cmMakefile::AddNewTarget(cmState::TargetType type, const std::string& name)
   cmTarget& target = it->second;
   target.SetType(type, name);
   target.SetMakefile(this);
-  this->GetGlobalGenerator()->AddTarget(&it->second);
   return &it->second;
 }
 
@@ -4183,15 +4182,11 @@ cmMakefile::AddImportedTarget(const std::string& name,
   // Create the target.
   cmsys::auto_ptr<cmTarget> target(new cmTarget);
   target->SetType(type, name);
-  target->MarkAsImported();
+  target->MarkAsImported(global);
   target->SetMakefile(this);
 
   // Add to the set of available imported targets.
   this->ImportedTargets[name] = target.get();
-  if(global)
-    {
-    this->GetGlobalGenerator()->AddTarget(target.get());
-    }
 
   // Transfer ownership to this cmMakefile object.
   this->ImportedTargetsOwned.push_back(target.get());
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c887fc8..f0f404c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -63,6 +63,7 @@ cmTarget::cmTarget()
   this->IsAndroid = false;
   this->IsApple = false;
   this->IsImportedTarget = false;
+  this->ImportedGloballyVisible = false;
   this->BuildInterfaceIncludesAppended = false;
 }
 
@@ -1505,9 +1506,10 @@ void cmTarget::CheckProperty(const std::string& prop,
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::MarkAsImported()
+void cmTarget::MarkAsImported(bool global)
 {
   this->IsImportedTarget = true;
+  this->ImportedGloballyVisible = global;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 541e850..62e10f4 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -75,7 +75,7 @@ public:
    */
   void SetType(cmState::TargetType f, const std::string& name);
 
-  void MarkAsImported();
+  void MarkAsImported(bool global = false);
 
   ///! Set/Get the name of the target
   const std::string& GetName() const {return this->Name;}
@@ -186,6 +186,8 @@ public:
   void CheckProperty(const std::string& prop, cmMakefile* context) const;
 
   bool IsImported() const {return this->IsImportedTarget;}
+  bool IsImportedGloballyVisible() const
+  { return this->ImportedGloballyVisible; }
 
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
@@ -349,6 +351,7 @@ private:
   bool IsAndroid;
   bool IsApple;
   bool IsImportedTarget;
+  bool ImportedGloballyVisible;
   bool BuildInterfaceIncludesAppended;
 #if defined(_WIN32) && !defined(__CYGWIN__)
   bool LinkLibrariesForVS6Analyzed;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=270344ffbaabf2a0bc44a2dadf7fe63c302fc124
commit 270344ffbaabf2a0bc44a2dadf7fe63c302fc124
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 11:49:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:26 2015 +0100

    cmTargetCollectLinkLanguages: Remove cmMakefile dependency

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e19d5e5..9376e98 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1793,7 +1793,7 @@ public:
                                UNORDERED_SET<std::string>& languages,
                                cmGeneratorTarget const* head):
     Config(config), Languages(languages), HeadTarget(head),
-    Makefile(target->Target->GetMakefile()), Target(target)
+    Target(target)
   { this->Visited.insert(target); }
 
   void Visit(cmLinkItem const& item)
@@ -1805,7 +1805,8 @@ public:
         bool noMessage = false;
         cmake::MessageType messageType = cmake::FATAL_ERROR;
         std::stringstream e;
-        switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0028))
+        switch(this->Target->GetLocalGenerator()
+               ->GetPolicyStatus(cmPolicies::CMP0028))
           {
           case cmPolicies::WARN:
             {
@@ -1859,7 +1860,6 @@ private:
   std::string Config;
   UNORDERED_SET<std::string>& Languages;
   cmGeneratorTarget const* HeadTarget;
-  cmMakefile* Makefile;
   const cmGeneratorTarget* Target;
   std::set<cmGeneratorTarget const*> Visited;
 };

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=063d1758e064310ef90b803ab03ab16d8324b6fb
commit 063d1758e064310ef90b803ab03ab16d8324b6fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 11:37:34 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:26 2015 +0100

    cmGeneratorTarget: Port cmOptionalLinkImplementation

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3df43ff..e19d5e5 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5560,7 +5560,7 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const
     }
 
   std::string CONFIG = cmSystemTools::UpperCase(config);
-  cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this->Target];
+  cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this];
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
@@ -5840,7 +5840,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkImplementation& impl = hm[head->Target];
+  cmOptionalLinkImplementation& impl = hm[head];
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 3c6f267..c2607a7 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -647,7 +647,7 @@ private:
                       const std::string& config) const;
 
   struct HeadToLinkImplementationMap:
-    public std::map<cmTarget const*, cmOptionalLinkImplementation> {};
+    public std::map<cmGeneratorTarget const*, cmOptionalLinkImplementation> {};
   typedef std::map<std::string,
                    HeadToLinkImplementationMap> LinkImplMapType;
   mutable LinkImplMapType LinkImplMap;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad90bf916fde6ee0b929bb971053a09d6f89ef20
commit ad90bf916fde6ee0b929bb971053a09d6f89ef20
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 10:35:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:25 2015 +0100

    cmGeneratorTarget: Add API for property keys

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 1daa67e..83127e7 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -105,16 +105,18 @@ cmExportTryCompileFileGenerator::PopulateProperties(
                                  ImportPropertyMap& properties,
                                  std::set<cmGeneratorTarget const*> &emitted)
 {
-  cmPropertyMap props = target->Target->GetProperties();
-  for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
+  std::vector<std::string> props = target->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator i = props.begin();
+      i != props.end(); ++i)
     {
-    properties[i->first] = i->second.GetValue();
 
-    if(i->first.find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0
-        || i->first.find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0
-        || i->first.find("INTERFACE_LINK_LIBRARIES") == 0)
+    properties[*i] = target->GetProperty(*i);
+
+    if(i->find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0
+        || i->find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0
+        || i->find("INTERFACE_LINK_LIBRARIES") == 0)
       {
-      std::string evalResult = this->FindTargets(i->first,
+      std::string evalResult = this->FindTargets(*i,
                                                  target, emitted);
 
       std::vector<std::string> depends;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 651c89c..3df43ff 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4251,9 +4251,11 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                           PropertyType *)
 {
   PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
-  const bool explicitlySet = tgt->Target->GetProperties()
-                                  .find(p)
-                                  != tgt->Target->GetProperties().end();
+  std::vector<std::string> headPropKeys = tgt->GetPropertyKeys();
+  const bool explicitlySet =
+      std::find(headPropKeys.begin(), headPropKeys.end(),
+                p) != headPropKeys.end();
+
   const bool impliedByUse =
           tgt->IsNullImpliedByLinkLibraries(p);
   assert((impliedByUse ^ explicitlySet)
@@ -4298,9 +4300,11 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
 
     cmGeneratorTarget const* theTarget = *li;
 
-    const bool ifaceIsSet = theTarget->Target->GetProperties()
-                            .find(interfaceProperty)
-                            != theTarget->Target->GetProperties().end();
+    std::vector<std::string> propKeys = theTarget->GetPropertyKeys();
+
+    const bool ifaceIsSet =
+        std::find(propKeys.begin(), propKeys.end(),
+                  interfaceProperty) != propKeys.end();
     PropertyType ifacePropContent =
                     getTypedProperty<PropertyType>(theTarget,
                               interfaceProperty);
@@ -4577,6 +4581,19 @@ void cmGeneratorTarget::ComputeVersionedName(std::string& vName,
   vName += this->Makefile->IsOn("APPLE") ? suffix : std::string();
 }
 
+std::vector<std::string> cmGeneratorTarget::GetPropertyKeys() const
+{
+  cmPropertyMap propsObject = this->Target->GetProperties();
+  std::vector<std::string> props;
+  props.reserve(propsObject.size());
+  for (cmPropertyMap::const_iterator it = propsObject.begin();
+       it != propsObject.end(); ++it)
+    {
+    props.push_back(it->first);
+    }
+  return props;
+}
+
 //----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ReportPropertyOrigin(const std::string &p,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 58c3421..3c6f267 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -57,6 +57,7 @@ public:
   std::string GetName() const;
   std::string GetExportName() const;
 
+  std::vector<std::string> GetPropertyKeys() const;
   const char *GetProperty(const std::string& prop) const;
   bool GetPropertyAsBool(const std::string& prop) const;
   void GetSourceFiles(std::vector<cmSourceFile*>& files,
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 5737bee..42f9758 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2486,13 +2486,13 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   // put this last so it can override existing settings
   // Convert "XCODE_ATTRIBUTE_*" properties directly.
   {
-  cmPropertyMap const& props = gtgt->Target->GetProperties();
-  for(cmPropertyMap::const_iterator i = props.begin();
+  std::vector<std::string> const& props = gtgt->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator i = props.begin();
       i != props.end(); ++i)
     {
-    if(i->first.find("XCODE_ATTRIBUTE_") == 0)
+    if(i->find("XCODE_ATTRIBUTE_") == 0)
       {
-      std::string attribute = i->first.substr(16);
+      std::string attribute = i->substr(16);
       // Handle [variant=<config>] condition explicitly here.
       std::string::size_type beginVariant =
         attribute.find("[variant=");
@@ -2523,7 +2523,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
       if (!attribute.empty())
         {
         cmGeneratorExpression ge;
-        std::string processed = ge.Parse(i->second.GetValue())
+        std::string processed = ge.Parse(gtgt->GetProperty(*i))
           ->Evaluate(this->CurrentLocalGenerator, configName);
         buildSettings->AddAttribute(attribute.c_str(),
                                     this->CreateString(processed));
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 0eac203..ae6a24e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2219,17 +2219,18 @@ void cmLocalVisualStudio7Generator::WriteVCProjFooter(
 {
   fout << "\t<Globals>\n";
 
-  cmPropertyMap const& props = target->Target->GetProperties();
-  for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
+  std::vector<std::string> const& props = target->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator i = props.begin();
+      i != props.end(); ++i)
     {
-    if(i->first.find("VS_GLOBAL_") == 0)
+    if(i->find("VS_GLOBAL_") == 0)
       {
-      std::string name = i->first.substr(10);
+      std::string name = i->substr(10);
       if(name != "")
         {
         fout << "\t\t<Global\n"
              << "\t\t\tName=\"" << name << "\"\n"
-             << "\t\t\tValue=\"" << i->second.GetValue() << "\"\n"
+             << "\t\t\tValue=\"" << target->GetProperty(*i) << "\"\n"
              << "\t\t/>\n";
         }
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae3b13d414dc4802805302b2d754fa915e78e379
commit ae3b13d414dc4802805302b2d754fa915e78e379
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 01:19:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:25 2015 +0100

    cmLocalGenerator: Port internals to cmGeneratorTarget

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1926772..b5f5ce9 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2033,7 +2033,7 @@ AddCompilerRequirementFlag(std::string &flags,
 }
 
 static void AddVisibilityCompileOption(std::string &flags,
-                                       cmTarget const* target,
+                                       cmGeneratorTarget const* target,
                                        cmLocalGenerator *lg,
                                        const std::string& lang,
                                        std::string* warnCMP0063)
@@ -2073,7 +2073,7 @@ static void AddVisibilityCompileOption(std::string &flags,
 }
 
 static void AddInlineVisibilityCompileOption(std::string &flags,
-                                       cmTarget const* target,
+                                       cmGeneratorTarget const* target,
                                        cmLocalGenerator *lg,
                                        std::string* warnCMP0063)
 {
@@ -2126,12 +2126,11 @@ void cmLocalGenerator
       }
     }
 
-  AddVisibilityCompileOption(flags, target->Target, this, lang, pWarnCMP0063);
+  AddVisibilityCompileOption(flags, target, this, lang, pWarnCMP0063);
 
   if(lang == "CXX")
     {
-    AddInlineVisibilityCompileOption(flags, target->Target,
-                                     this, pWarnCMP0063);
+    AddInlineVisibilityCompileOption(flags, target, this, pWarnCMP0063);
     }
 
   if (!warnCMP0063.empty() &&

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc97ea8c4e75885d8f21838e8096fadcbf5318b7
commit fc97ea8c4e75885d8f21838e8096fadcbf5318b7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 00:49:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:25 2015 +0100

    VS7: Port some implementation details to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 95a299d..0eac203 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -783,10 +783,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target->Target->GetType() < cmState::UTILITY)
+  if (target->GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target->Target->GetType() == cmState::OBJECT_LIBRARY?
+      target->GetType() == cmState::OBJECT_LIBRARY?
       intermediateDir : target->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
@@ -837,7 +837,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if(this->FortranProject)
     {
     const char* target_mod_dir =
-      target->Target->GetProperty("Fortran_MODULE_DIRECTORY");
+      target->GetProperty("Fortran_MODULE_DIRECTORY");
     std::string modDir;
     if(target_mod_dir)
       {
@@ -877,7 +877,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target->Target->GetType() <= cmState::OBJECT_LIBRARY)
+  if(target->GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
     std::string pdb = target->GetCompilePDBPath(configName);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92c573bbf930e9e7d67e27f328d5627659e089e6
commit 92c573bbf930e9e7d67e27f328d5627659e089e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 15:42:04 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:25 2015 +0100

    VS7: Port remaining interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 340a0f7..f5848ab 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -401,7 +401,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -996,7 +996,8 @@ cmGlobalVisualStudio7Generator
 std::set<std::string>
 cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
   std::vector<std::string> const& configs,
-  OrderedTargetDependSet const& projectTargets, cmTarget const* target)
+  OrderedTargetDependSet const& projectTargets,
+  cmGeneratorTarget const* target)
 {
   std::set<std::string> activeConfigs;
   // if it is a utilitiy target then only make it part of the
@@ -1011,13 +1012,13 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
       for(std::vector<std::string>::const_iterator i = configs.begin();
           i != configs.end(); ++i)
         {
-        const char* propertyValue = target->GetMakefile()
+        const char* propertyValue = target->Target->GetMakefile()
           ->GetDefinition("CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD");
         cmGeneratorExpression ge;
         cmsys::auto_ptr<cmCompiledGeneratorExpression>
           cge = ge.Parse(propertyValue);
-        cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-        if(cmSystemTools::IsOn(cge->Evaluate(gt->GetLocalGenerator(), *i)))
+        if(cmSystemTools::IsOn(cge->Evaluate(target->GetLocalGenerator(),
+                                             *i)))
           {
           activeConfigs.insert(*i);
           }
@@ -1029,13 +1030,12 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
     {
     return activeConfigs;
     }
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
   // inspect EXCLUDE_FROM_DEFAULT_BUILD[_<CONFIG>] properties
   for(std::vector<std::string>::const_iterator i = configs.begin();
       i != configs.end(); ++i)
     {
     const char* propertyValue =
-      gt->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i->c_str());
+      target->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i->c_str());
     if(cmSystemTools::IsOff(propertyValue))
       {
       activeConfigs.insert(*i);
@@ -1047,9 +1047,8 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
 bool
 cmGlobalVisualStudio7Generator
 ::IsDependedOn(OrderedTargetDependSet const& projectTargets,
-               cmTarget const* targetIn)
+               cmGeneratorTarget const* gtIn)
 {
-  cmGeneratorTarget* gtIn = this->GetGeneratorTarget(targetIn);
   for (OrderedTargetDependSet::const_iterator l = projectTargets.begin();
        l != projectTargets.end(); ++l)
     {
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 6a0e5e9..fe6db2e 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -163,9 +163,9 @@ protected:
   std::set<std::string>
     IsPartOfDefaultBuild(std::vector<std::string> const& configs,
                          OrderedTargetDependSet const& projectTargets,
-                         cmTarget const* target);
+                         cmGeneratorTarget const* target);
   bool IsDependedOn(OrderedTargetDependSet const& projectTargets,
-                    cmTarget const* target);
+                    cmGeneratorTarget const* target);
   std::map<std::string, std::string> GUIDMap;
 
   virtual void WriteFolders(std::ostream& fout);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2861573b6ed32cc6d1779f23cc00d58d35123cb7
commit 2861573b6ed32cc6d1779f23cc00d58d35123cb7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 14:58:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:25 2015 +0100

    cmake: Store hardcoded lists of sources and headers
    
    Don't duplicate this in each cmMakefile.

diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index 5f5017d..92ac07d 100644
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@@ -60,10 +60,10 @@ bool cmAuxSourceDirectoryCommand::InitialPass
         std::string ext = file.substr(dotpos+1);
         std::string base = file.substr(0, dotpos);
         // Process only source files
-        if(!base.empty()
-            && std::find( this->Makefile->GetSourceExtensions().begin(),
-                          this->Makefile->GetSourceExtensions().end(), ext )
-                 != this->Makefile->GetSourceExtensions().end() )
+        std::vector<std::string> srcExts =
+            this->Makefile->GetCMakeInstance()->GetSourceExtensions();
+        if(!base.empty() &&
+           std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end())
           {
           std::string fullname = templateDirectory;
           fullname += "/";
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 597c9d8..9348ef2 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -383,6 +383,9 @@ void cmExtraCodeBlocksGenerator
   all_files_map_t allFiles;
   std::vector<std::string> cFiles;
 
+  std::vector<std::string> srcExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetSourceExtensions();
+
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
        lg!=lgs.end(); lg++)
     {
@@ -420,9 +423,7 @@ void cmExtraCodeBlocksGenerator
               {
               std::string srcext = (*si)->GetExtension();
               for(std::vector<std::string>::const_iterator
-                  ext = mf->GetSourceExtensions().begin();
-                  ext !=  mf->GetSourceExtensions().end();
-                  ++ext)
+                  ext = srcExts.begin(); ext != srcExts.end(); ++ext)
                 {
                 if (srcext == *ext)
                   {
@@ -449,6 +450,9 @@ void cmExtraCodeBlocksGenerator
       }
     }
 
+  std::vector<std::string> headerExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetHeaderExtensions();
+
   // The following loop tries to add header files matching to implementation
   // files to the project. It does that by iterating over all
   // C/C++ source files,
@@ -468,8 +472,8 @@ void cmExtraCodeBlocksGenerator
 
     // check if there's a matching header around
     for(std::vector<std::string>::const_iterator
-        ext = mf->GetHeaderExtensions().begin();
-        ext !=  mf->GetHeaderExtensions().end();
+        ext = headerExts.begin();
+        ext != headerExts.end();
         ++ext)
       {
       std::string hname=headerBasename;
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index f4a6537..67aa157 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -149,6 +149,11 @@ void cmExtraCodeLiteGenerator
   // which may have an acompanying header, one for all other files
   std::string projectType;
 
+  std::vector<std::string> srcExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetSourceExtensions();
+  std::vector<std::string> headerExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetHeaderExtensions();
+
   std::map<std::string, cmSourceFile*> cFiles;
   std::set<std::string> otherFiles;
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
@@ -207,9 +212,7 @@ void cmExtraCodeLiteGenerator
               {
               std::string srcext = (*si)->GetExtension();
               for(std::vector<std::string>::const_iterator
-                  ext = mf->GetSourceExtensions().begin();
-                  ext !=  mf->GetSourceExtensions().end();
-                  ++ext)
+                  ext = srcExts.begin(); ext != srcExts.end(); ++ext)
                 {
                 if (srcext == *ext)
                   {
@@ -253,8 +256,8 @@ void cmExtraCodeLiteGenerator
 
     // check if there's a matching header around
     for(std::vector<std::string>::const_iterator
-        ext = mf->GetHeaderExtensions().begin();
-        ext !=  mf->GetHeaderExtensions().end();
+        ext = headerExts.begin();
+        ext != headerExts.end();
         ++ext)
       {
       std::string hname=headerBasename;
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 7c6c48c..018ab24 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -105,6 +105,9 @@ bool cmGlobalKdevelopGenerator
   std::set<std::string> files;
   std::string tmp;
 
+  std::vector<std::string> hdrExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetHeaderExtensions();
+
   for (std::vector<cmLocalGenerator*>::const_iterator it=lgs.begin();
        it!=lgs.end(); it++)
     {
@@ -160,8 +163,7 @@ bool cmGlobalKdevelopGenerator
 
           // check if there's a matching header around
           for(std::vector<std::string>::const_iterator
-                ext = makefile->GetHeaderExtensions().begin();
-              ext !=  makefile->GetHeaderExtensions().end(); ++ext)
+                ext = hdrExts.begin(); ext != hdrExts.end(); ++ext)
             {
             std::string hname=headerBasename;
             hname += ".";
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9a5c367..5737bee 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1420,7 +1420,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
 bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf)
 {
   const std::vector<std::string>& hdrExts =
-    this->CurrentMakefile->GetHeaderExtensions();
+    this->CMakeInstance->GetHeaderExtensions();
   return (std::find(hdrExts.begin(), hdrExts.end(), sf->GetExtension()) !=
           hdrExts.end());
 }
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 1c3d9d9..70f7e52 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -57,31 +57,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
 
   // Setup the default include complaint regular expression (match nothing).
   this->ComplainFileRegularExpression = "^$";
-  // Source and header file extensions that we can handle
-
-  // Set up a list of source and header extensions
-  // these are used to find files when the extension
-  // is not given
-  // The "c" extension MUST precede the "C" extension.
-  this->SourceFileExtensions.push_back( "c" );
-  this->SourceFileExtensions.push_back( "C" );
-
-  this->SourceFileExtensions.push_back( "c++" );
-  this->SourceFileExtensions.push_back( "cc" );
-  this->SourceFileExtensions.push_back( "cpp" );
-  this->SourceFileExtensions.push_back( "cxx" );
-  this->SourceFileExtensions.push_back( "m" );
-  this->SourceFileExtensions.push_back( "M" );
-  this->SourceFileExtensions.push_back( "mm" );
-
-  this->HeaderFileExtensions.push_back( "h" );
-  this->HeaderFileExtensions.push_back( "hh" );
-  this->HeaderFileExtensions.push_back( "h++" );
-  this->HeaderFileExtensions.push_back( "hm" );
-  this->HeaderFileExtensions.push_back( "hpp" );
-  this->HeaderFileExtensions.push_back( "hxx" );
-  this->HeaderFileExtensions.push_back( "in" );
-  this->HeaderFileExtensions.push_back( "txx" );
 
   this->DefineFlags = " ";
 
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 725448b..f3dbb74 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -425,17 +425,6 @@ public:
   cmSourceFile* GetOrCreateSource(const std::string& sourceName,
                                   bool generated = false);
 
-  //@{
-  /**
-   * Return a list of extensions associated with source and header
-   * files
-   */
-  const std::vector<std::string>& GetSourceExtensions() const
-    {return this->SourceFileExtensions;}
-  const std::vector<std::string>& GetHeaderExtensions() const
-    {return this->HeaderFileExtensions;}
-  //@}
-
   /**
    * Given a variable name, return its value (as a string).
    * If the variable is not found in this makefile instance, the
@@ -823,8 +812,6 @@ protected:
   std::vector<cmTestGenerator*> TestGenerators;
 
   std::string ComplainFileRegularExpression;
-  std::vector<std::string> SourceFileExtensions;
-  std::vector<std::string> HeaderFileExtensions;
   std::string DefineFlags;
 
   // Track the value of the computed DEFINITIONS property.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index fc690f8..b16eccd 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -528,7 +528,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
   cmSystemTools::ExpandListArgument(this->Sources, sourceFiles);
 
   const std::vector<std::string>& headerExtensions =
-                                               makefile->GetHeaderExtensions();
+      makefile->GetCMakeInstance()->GetHeaderExtensions();
 
   std::map<std::string, std::vector<std::string> > includedUis;
   std::map<std::string, std::vector<std::string> > skippedUis;
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 37383be..a9ac549 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -167,8 +167,10 @@ bool cmSourceFile::FindFullPath(std::string* error)
     {
     tryDirs[0] = "";
     }
-  const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
-  const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions();
+  const std::vector<std::string>& srcExts =
+      mf->GetCMakeInstance()->GetSourceExtensions();
+  std::vector<std::string> hdrExts =
+      mf->GetCMakeInstance()->GetHeaderExtensions();
   for(const char* const* di = tryDirs; *di; ++di)
     {
     std::string tryPath = this->Location.GetDirectory();
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index b8d5c02..00d5d6a 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -121,8 +121,10 @@ void cmSourceFileLocation::UpdateExtension(const std::string& name)
   // The global generator checks extensions of enabled languages.
   cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
   cmMakefile const* mf = this->Makefile;
-  const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
-  const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions();
+  const std::vector<std::string>& srcExts =
+      mf->GetCMakeInstance()->GetSourceExtensions();
+  const std::vector<std::string>& hdrExts =
+      mf->GetCMakeInstance()->GetHeaderExtensions();
   if(!gg->GetLanguageFromExtension(ext.c_str()).empty() ||
      std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end() ||
      std::find(hdrExts.begin(), hdrExts.end(), ext) != hdrExts.end())
@@ -193,12 +195,14 @@ cmSourceFileLocation
   // disk.  One of these must match if loc refers to this source file.
   std::string const& ext = this->Name.substr(loc.Name.size()+1);
   cmMakefile const* mf = this->Makefile;
-  const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
+  const std::vector<std::string>& srcExts =
+      mf->GetCMakeInstance()->GetSourceExtensions();
   if(std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end())
     {
     return true;
     }
-  const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions();
+  std::vector<std::string> hdrExts =
+      mf->GetCMakeInstance()->GetHeaderExtensions();
   if(std::find(hdrExts.begin(), hdrExts.end(), ext) != hdrExts.end())
     {
     return true;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 7268241..16417fc 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -165,6 +165,30 @@ cmake::cmake()
 
   // Make sure we can capture the build tool output.
   cmSystemTools::EnableVSConsoleOutput();
+
+  // Set up a list of source and header extensions
+  // these are used to find files when the extension
+  // is not given
+  // The "c" extension MUST precede the "C" extension.
+  this->SourceFileExtensions.push_back( "c" );
+  this->SourceFileExtensions.push_back( "C" );
+
+  this->SourceFileExtensions.push_back( "c++" );
+  this->SourceFileExtensions.push_back( "cc" );
+  this->SourceFileExtensions.push_back( "cpp" );
+  this->SourceFileExtensions.push_back( "cxx" );
+  this->SourceFileExtensions.push_back( "m" );
+  this->SourceFileExtensions.push_back( "M" );
+  this->SourceFileExtensions.push_back( "mm" );
+
+  this->HeaderFileExtensions.push_back( "h" );
+  this->HeaderFileExtensions.push_back( "hh" );
+  this->HeaderFileExtensions.push_back( "h++" );
+  this->HeaderFileExtensions.push_back( "hm" );
+  this->HeaderFileExtensions.push_back( "hpp" );
+  this->HeaderFileExtensions.push_back( "hxx" );
+  this->HeaderFileExtensions.push_back( "in" );
+  this->HeaderFileExtensions.push_back( "txx" );
 }
 
 cmake::~cmake()
diff --git a/Source/cmake.h b/Source/cmake.h
index 9d28cba..6b0e83f 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -182,6 +182,11 @@ class cmake
   ///! get the cmCachemManager used by this invocation of cmake
   cmCacheManager *GetCacheManager() { return this->CacheManager; }
 
+  const std::vector<std::string>& GetSourceExtensions() const
+    {return this->SourceFileExtensions;}
+  const std::vector<std::string>& GetHeaderExtensions() const
+    {return this->HeaderFileExtensions;}
+
   /**
    * Given a variable name, return its value (as a string).
    */
@@ -391,6 +396,8 @@ private:
   std::string CheckStampFile;
   std::string CheckStampList;
   std::string VSSolutionFile;
+  std::vector<std::string> SourceFileExtensions;
+  std::vector<std::string> HeaderFileExtensions;
   bool ClearBuildSystem;
   bool DebugTryCompile;
   cmFileTimeComparison* FileComparison;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4ac72e7c925081e8f353e6fb62d9c782a8fca3a
commit a4ac72e7c925081e8f353e6fb62d9c782a8fca3a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 13:30:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:24 2015 +0100

    Export: Use existing IsDLLPlatform porcelain

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 23c11d7..9e36539 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -213,12 +213,8 @@ cmExportBuildFileGenerator
   properties[prop] = value;
   }
 
-  // Check whether this is a DLL platform.
-  bool dll_platform =
-    (mf->IsOn("WIN32") || mf->IsOn("CYGWIN") || mf->IsOn("MINGW"));
-
   // Add the import library for windows DLLs.
-  if(dll_platform &&
+  if(target->IsDLLPlatform() &&
      (target->GetType() == cmState::SHARED_LIBRARY ||
       target->IsExecutableWithExports()) &&
      mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX"))
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d52ce35..e8a2e6a 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -879,10 +879,7 @@ cmExportFileGenerator
   if(target->GetType() == cmState::SHARED_LIBRARY ||
      target->GetType() == cmState::MODULE_LIBRARY)
     {
-    // Check whether this is a DLL platform.
-    bool dll_platform =
-      (mf->IsOn("WIN32") || mf->IsOn("CYGWIN") || mf->IsOn("MINGW"));
-    if(!dll_platform)
+    if(!target->IsDLLPlatform())
       {
       std::string prop;
       std::string value;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b90c1a174ccce659569ad2c630275bd0d60e73d
commit 6b90c1a174ccce659569ad2c630275bd0d60e73d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 09:29:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:24 2015 +0100

    cmGeneratorTarget: Move LinkLanguagePropagatesToDependents from cmTarget

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7e75d93..df6e3fb 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -999,7 +999,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
 
     if (propertyName == "LINKER_LANGUAGE")
       {
-      if (target->Target->LinkLanguagePropagatesToDependents() &&
+      if (target->LinkLanguagePropagatesToDependents() &&
           dagCheckerParent && (dagCheckerParent->EvaluatingLinkLibraries()
             || dagCheckerParent->EvaluatingSources()))
         {
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index eb433f5..651c89c 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4770,7 +4770,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
     iface.WrongConfigLibraries = impl->WrongConfigLibraries;
     }
 
-  if(this->Target->LinkLanguagePropagatesToDependents())
+  if(this->LinkLanguagePropagatesToDependents())
     {
     // Targets using this archive need its language runtime libraries.
     if(cmLinkImplementation const* impl =
@@ -5485,7 +5485,7 @@ void cmGeneratorTarget::ComputeImportInfo(std::string const& desired_config,
   }
 
   // Get the link languages.
-  if(this->Target->LinkLanguagePropagatesToDependents())
+  if(this->LinkLanguagePropagatesToDependents())
     {
     std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES";
     linkProp += suffix;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 588ff33..58c3421 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -189,6 +189,9 @@ public:
   std::set<std::string>const& GetUtilities() const;
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
+  bool LinkLanguagePropagatesToDependents() const
+  { return this->GetType() == cmState::STATIC_LIBRARY; }
+
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 17a1d4d..541e850 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -227,9 +227,6 @@ public:
   std::set<std::string> const & GetSystemIncludeDirectories() const
     { return this->SystemIncludeDirectories; }
 
-  bool LinkLanguagePropagatesToDependents() const
-  { return this->TargetTypeValue == cmState::STATIC_LIBRARY; }
-
   cmStringRange GetIncludeDirectoriesEntries() const;
   cmBacktraceRange GetIncludeDirectoriesBacktraces() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cce8b1abbc622503188f525347d877523d74d0f0
commit cce8b1abbc622503188f525347d877523d74d0f0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:17:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:24 2015 +0100

    cmLocalGenerator: Add IsRootMakefile API

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index b4a915c..7dd24fb 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -523,7 +523,7 @@ cmGlobalUnixMakefileGenerator3
                        cmLocalUnixMakefileGenerator3* lg)
 {
   // Only subdirectories need these rules.
-  if(lg->GetMakefile()->IsRootMakefile())
+  if(lg->IsRootMakefile())
     {
     return;
     }
@@ -1084,7 +1084,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
     // for the passed in makefile or if this is the top Makefile wripte out
     // the targets
-    if (lg2 == lg || lg->GetMakefile()->IsRootMakefile())
+    if (lg2 == lg || lg->IsRootMakefile())
       {
       // for each target Generate the rule files for each target.
       std::vector<cmGeneratorTarget*> targets = lg2->GetGeneratorTargets();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 5f0242e..1926772 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -490,6 +490,11 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 }
 
+bool cmLocalGenerator::IsRootMakefile() const
+{
+  return !this->StateSnapshot.GetBuildsystemDirectoryParent().IsValid();
+}
+
 cmState* cmLocalGenerator::GetState() const
 {
   return this->GlobalGenerator->GetCMakeInstance()->GetState();
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 6380db6..46eb1b3 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -67,6 +67,8 @@ public:
    */
   void ComputeTargetManifest();
 
+  bool IsRootMakefile() const;
+
   ///! Get the makefile for this generator
   cmMakefile *GetMakefile() {
     return this->Makefile; }
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 891c44e..7de48a4 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -56,7 +56,7 @@ void cmLocalNinjaGenerator::Generate()
 #endif
 
   // We do that only once for the top CMakeLists.txt file.
-  if(this->Makefile->IsRootMakefile())
+  if(this->IsRootMakefile())
     {
     this->WriteBuildFileTop();
 
@@ -277,7 +277,7 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
     << "# Write statements declared in CMakeLists.txt:" << std::endl
     << "# "
     << this->Makefile->GetDefinition("CMAKE_CURRENT_LIST_FILE") << std::endl;
-  if(this->Makefile->IsRootMakefile())
+  if(this->IsRootMakefile())
     os << "# Which is the root file." << std::endl;
   cmGlobalNinjaGenerator::WriteDivider(os);
   os << std::endl;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 9bb2765..82e3b01 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -254,7 +254,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
     return;
     }
   // always write the top makefile
-  if (!this->GetMakefile()->IsRootMakefile())
+  if (!this->IsRootMakefile())
     {
     ruleFileStream.SetCopyIfDifferent(true);
     }
@@ -265,7 +265,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
   // only write local targets unless at the top Keep track of targets already
   // listed.
   std::set<std::string> emittedTargets;
-  if (!this->GetMakefile()->IsRootMakefile())
+  if (!this->IsRootMakefile())
     {
     // write our targets, and while doing it collect up the object
     // file rules
@@ -880,7 +880,7 @@ void cmLocalUnixMakefileGenerator3
   std::vector<std::string> no_depends;
   std::vector<std::string> commands;
   commands.push_back(runRule);
-  if(!this->GetMakefile()->IsRootMakefile())
+  if(!this->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
                           this->GetBinaryDirectory(),

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3721fca04d6fff4c337e862192f1fe86bc1ce754
commit 3721fca04d6fff4c337e862192f1fe86bc1ce754
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:14:08 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:24 2015 +0100

    Genex: use cmGeneratorTarget policy API

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 03f8d3f..7e75d93 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1442,7 +1442,7 @@ cmPolicies::PolicyStatus statusForTarget(cmGeneratorTarget const* tgt,
 #define RETURN_POLICY(POLICY) \
   if (strcmp(policy, #POLICY) == 0) \
   { \
-    return tgt->Target->GetPolicyStatus ## POLICY (); \
+    return tgt->GetPolicyStatus ## POLICY (); \
   } \
 
   CM_FOR_EACH_TARGET_POLICY(RETURN_POLICY)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af464f982ccde44217892200ef3279456ce220b2
commit af464f982ccde44217892200ef3279456ce220b2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:13:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:23 2015 +0100

    cmLocalGenerator: Add GetPolicyStatus API

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7a7e4ff..03f8d3f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -393,7 +393,7 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
 
     if (cmsysString_strcasecmp(parameters.begin()->c_str(), compilerId) == 0)
       {
-      switch(context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0044))
+      switch(context->LG->GetPolicyStatus(cmPolicies::CMP0044))
         {
         case cmPolicies::WARN:
           {
@@ -1100,7 +1100,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
                            "COMPILE_DEFINITIONS_"))
       {
       cmPolicies::PolicyStatus polSt =
-          context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0043);
+          context->LG->GetPolicyStatus(cmPolicies::CMP0043);
       if (polSt == cmPolicies::WARN || polSt == cmPolicies::OLD)
         {
         interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c37417d..5f0242e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2201,7 +2201,7 @@ bool cmLocalGenerator::GetShouldUseOldFlags(bool shared,
 
     if (flags && flags != originalFlags)
       {
-      switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0018))
+      switch (this->GetPolicyStatus(cmPolicies::CMP0018))
         {
         case cmPolicies::WARN:
         {
@@ -2949,7 +2949,7 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
 {
   // Check the policy to decide whether to pay attention to this
   // variable.
-  switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0001))
+  switch(this->GetPolicyStatus(cmPolicies::CMP0001))
     {
     case cmPolicies::WARN:
       // WARN is just OLD without warning because user code does not
@@ -2976,6 +2976,12 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
           actual_compat <= CMake_VERSION_ENCODE(2, 4, 255));
 }
 
+cmPolicies::PolicyStatus
+cmLocalGenerator::GetPolicyStatus(cmPolicies::PolicyID id) const
+{
+  return this->Makefile->GetPolicyStatus(id);
+}
+
 //----------------------------------------------------------------------------
 bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 552020b..6380db6 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -265,6 +265,8 @@ public:
    */
   bool NeedBackwardsCompatibility_2_4();
 
+  cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id) const;
+
   cmake* GetCMakeInstance() const;
 
   const char* GetSourceDirectory() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a39310dc2250b061db63ca2e0c78aa080b8ab63b
commit a39310dc2250b061db63ca2e0c78aa080b8ab63b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:04:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:23 2015 +0100

    cmGeneratorTarget: Add GetUtilityBacktrace API

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 113c989..586b5bf 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -382,7 +382,7 @@ void cmComputeTargetDepends::AddTargetDepend(
         << "\" of target \"" << depender->GetName() << "\" does not exist.";
 
       cmListFileBacktrace const* backtrace =
-        depender->Target->GetUtilityBacktrace(dependee_name);
+        depender->GetUtilityBacktrace(dependee_name);
       if(backtrace)
         {
         cm->IssueMessage(messageType, e.str(), *backtrace);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7d5a9d0..eb433f5 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1742,6 +1742,12 @@ const std::set<std::string>& cmGeneratorTarget::GetUtilities() const
   return this->Target->GetUtilities();
 }
 
+const cmListFileBacktrace*
+cmGeneratorTarget::GetUtilityBacktrace(const std::string& u) const
+{
+  return this->Target->GetUtilityBacktrace(u);
+}
+
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index ff975c5..588ff33 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -187,6 +187,8 @@ public:
   const std::vector<std::string>& GetLinkDirectories() const;
 
   std::set<std::string>const& GetUtilities() const;
+  cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
+
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49e77f3cb0d4365e333140911b3a782512bfe4bb
commit 49e77f3cb0d4365e333140911b3a782512bfe4bb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:01:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:23 2015 +0100

    cmGeneratorTarget: Add GetUtilities API

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7516576..7d5a9d0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -796,7 +796,7 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
   if(!this->UtilityItemsDone)
     {
     this->UtilityItemsDone = true;
-    std::set<std::string> const& utilities = this->Target->GetUtilities();
+    std::set<std::string> const& utilities = this->GetUtilities();
     for(std::set<std::string>::const_iterator i = utilities.begin();
         i != utilities.end(); ++i)
       {
@@ -1737,6 +1737,11 @@ const std::vector<std::string>&cmGeneratorTarget::GetLinkDirectories() const
   return this->Target->GetLinkDirectories();
 }
 
+const std::set<std::string>& cmGeneratorTarget::GetUtilities() const
+{
+  return this->Target->GetUtilities();
+}
+
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 38e1826..ff975c5 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -186,6 +186,7 @@ public:
 
   const std::vector<std::string>& GetLinkDirectories() const;
 
+  std::set<std::string>const& GetUtilities() const;
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 2671f4d..8498e39 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -965,7 +965,7 @@ cmGlobalNinjaGenerator
   if (target->GetType() == cmState::GLOBAL_TARGET) {
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
-    std::set<std::string> const& utils = target->Target->GetUtilities();
+    std::set<std::string> const& utils = target->GetUtilities();
     std::copy(utils.begin(), utils.end(), std::back_inserter(outputs));
   } else {
     cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(target);
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index bb494f1..5866c0e 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -235,7 +235,7 @@ void cmGlobalVisualStudio6Generator
       std::string project = target->GetName();
       std::string location = expath;
       this->WriteExternalProject(fout, project.c_str(),
-          location.c_str(), target->Target->GetUtilities());
+          location.c_str(), target->GetUtilities());
       }
     else
       {
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 5473247..340a0f7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -459,7 +459,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
                                  project.c_str(),
                                  location.c_str(),
                                  target->GetProperty("VS_PROJECT_TYPE"),
-                                 target->Target->GetUtilities());
+                                 target->GetUtilities());
       written = true;
       }
     else
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index bdb1b25..b771f11 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -464,8 +464,8 @@ bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target->Target->GetUtilities().begin();
-      ui != target->Target->GetUtilities().end(); ++ui)
+        target->GetUtilities().begin();
+      ui != target->GetUtilities().end(); ++ui)
     {
     if(cmGeneratorTarget* depTarget =
         target->GetLocalGenerator()->FindGeneratorTargetToUse(ui->c_str()))
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 541257b..9bb2765 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1778,8 +1778,8 @@ void cmLocalUnixMakefileGenerator3
         {
         text = "Running external command ...";
         }
-      depends.insert(depends.end(), (*glIt)->Target->GetUtilities().begin(),
-                     (*glIt)->Target->GetUtilities().end());
+      depends.insert(depends.end(), (*glIt)->GetUtilities().begin(),
+                     (*glIt)->GetUtilities().end());
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32ce5957282a4e09ae7023c4ba3ff3b058998637
commit 32ce5957282a4e09ae7023c4ba3ff3b058998637
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:59:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:47:23 2015 +0100

    cmTarget: Make compatbility API explicit.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..1c3d9d9 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -756,15 +756,26 @@ void cmMakefile::ConfigureFinalPass()
       "with CMake 2.4 or later. For compatibility with older versions please "
       "use any CMake 2.8.x release or lower.");
     }
-  for (cmTargets::iterator l = this->Targets.begin();
-       l != this->Targets.end(); l++)
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  // Do old-style link dependency analysis only for CM_USE_OLD_VS6.
+  if(this->GetGlobalGenerator()->IsForVS6())
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    for (cmTargets::iterator l = this->Targets.begin();
+         l != this->Targets.end(); l++)
       {
-      continue;
+      if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+        {
+        continue;
+        }
+      // Erase any cached link information that might have been comptued
+      // on-demand during the configuration.  This ensures that build
+      // system generation uses up-to-date information even if other cache
+      // invalidation code in this source file is buggy.
+
+      l->second.AnalyzeLibDependenciesForVS6(this);
       }
-    l->second.FinishConfigure();
     }
+#endif
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0c0cf8e..c887fc8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -315,23 +315,6 @@ cmListFileBacktrace const* cmTarget::GetUtilityBacktrace(
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::FinishConfigure()
-{
-  // Erase any cached link information that might have been comptued
-  // on-demand during the configuration.  This ensures that build
-  // system generation uses up-to-date information even if other cache
-  // invalidation code in this source file is buggy.
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-  // Do old-style link dependency analysis only for CM_USE_OLD_VS6.
-  if(this->Makefile->GetGlobalGenerator()->IsForVS6())
-    {
-    this->AnalyzeLibDependenciesForVS6(*this->Makefile);
-    }
-#endif
-}
-
-//----------------------------------------------------------------------------
 cmListFileBacktrace const& cmTarget::GetBacktrace() const
 {
   return this->Backtrace;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7e7e34a..17a1d4d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -176,9 +176,6 @@ public:
   std::set<std::string>const& GetUtilities() const { return this->Utilities; }
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
-  /** Finalize the target at the end of the Configure step.  */
-  void FinishConfigure();
-
   ///! Set/Get a property of this target file
   void SetProperty(const std::string& prop, const char *value);
   void AppendProperty(const std::string&  prop, const char* value,
@@ -250,10 +247,11 @@ public:
   cmStringRange GetLinkImplementationEntries() const;
   cmBacktraceRange GetLinkImplementationBacktraces() const;
 
-
 #if defined(_WIN32) && !defined(__CYGWIN__)
   const LinkLibraryVectorType &GetLinkLibrariesForVS6() const {
   return this->LinkLibrariesForVS6;}
+
+  void AnalyzeLibDependenciesForVS6( const cmMakefile& mf );
 #endif
 
   struct StrictTargetComparison {
@@ -312,8 +310,6 @@ private:
   void GatherDependenciesForVS6( const cmMakefile& mf,
                                  const LibraryID& lib,
                                  DependencyMap& dep_map);
-
-  void AnalyzeLibDependenciesForVS6( const cmMakefile& mf );
 #endif
 
   const char* GetSuffixVariableInternal(bool implib) const;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Mon Oct 26 18:50:26 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Mon, 26 Oct 2015 18:50:26 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1091-gf94ceec
Message-ID: <20151026225026.61375BBA46@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f94ceec95d7444fc6d4f151f8d8a07643ec27db6 (commit)
       via  1385ec49f071e81838bcb5bf8973c6fcbba9e280 (commit)
       via  0e0a60ac4ea0687ddd991b80762f591b79f2b528 (commit)
       via  58f96e3e5ed6d62f7aa381283fbad16a5a8b4847 (commit)
       via  a7dec996fb26a27411cafe2872ad255e741f3fb4 (commit)
       via  b5f23d67b5d6be6c7e4d970d23ca4eb86a6857a0 (commit)
       via  c941d7e324b88ec7cda88dbe99e64b1b37f42cff (commit)
       via  ce43ed2cc14f96c56441da9908053737efbaaf2e (commit)
      from  5faad89d23c55235bfa4510c7378bae5620053ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f94ceec95d7444fc6d4f151f8d8a07643ec27db6
commit f94ceec95d7444fc6d4f151f8d8a07643ec27db6
Merge: 5faad89 1385ec4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 18:50:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 18:50:25 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    1385ec49 cmMakefile: Fix typo in comment
    0e0a60ac cmMakefile: Fix style
    58f96e3e Makefiles: Remove unused variable
    a7dec996 cmTarget: Remove obsolete member
    b5f23d67 cmTarget: Fix style
    c941d7e3 Remove some obsolete declarations
    ce43ed2c Use LocalGenerator when possible


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1385ec49f071e81838bcb5bf8973c6fcbba9e280
commit 1385ec49f071e81838bcb5bf8973c6fcbba9e280
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:03:55 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:06 2015 +0100

    cmMakefile: Fix typo in comment

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0982da1..84ec4fb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2174,7 +2174,7 @@ cmMakefile::GetSourceGroup(const std::vector<std::string>&name) const
 {
   cmSourceGroup* sg = 0;
 
-  // first look for source group starting with the same as the one we wants
+  // first look for source group starting with the same as the one we want
   for (std::vector<cmSourceGroup>::const_iterator
       sgIt = this->SourceGroups.begin();
       sgIt != this->SourceGroups.end(); ++sgIt)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e0a60ac4ea0687ddd991b80762f591b79f2b528
commit 0e0a60ac4ea0687ddd991b80762f591b79f2b528
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:04:07 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:06 2015 +0100

    cmMakefile: Fix style

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..0982da1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2207,7 +2207,7 @@ void cmMakefile::AddSourceGroup(const std::string& name,
 {
   std::vector<std::string> nameVector;
   nameVector.push_back(name);
-  AddSourceGroup(nameVector, regex);
+  this->AddSourceGroup(nameVector, regex);
 }
 
 void cmMakefile::AddSourceGroup(const std::vector<std::string>& name,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58f96e3e5ed6d62f7aa381283fbad16a5a8b4847
commit 58f96e3e5ed6d62f7aa381283fbad16a5a8b4847
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 01:12:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:06 2015 +0100

    Makefiles: Remove unused variable

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 27d631e..3972b41 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -173,7 +173,6 @@ void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames(
 void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
-  std::set<std::string> emitted;
   std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
   for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
       ti != targets.end(); ++ti)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7dec996fb26a27411cafe2872ad255e741f3fb4
commit a7dec996fb26a27411cafe2872ad255e741f3fb4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:09:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:06 2015 +0100

    cmTarget: Remove obsolete member

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a016e92..da49048 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -61,7 +61,6 @@ cmTarget::cmTarget()
   this->HaveInstallRule = false;
   this->DLLPlatform = false;
   this->IsAndroid = false;
-  this->IsApple = false;
   this->IsImportedTarget = false;
   this->BuildInterfaceIncludesAppended = false;
 }
@@ -98,9 +97,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     strcmp(this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME"),
            "Android") == 0;
 
-  // Check whether we are targeting an Apple platform.
-  this->IsApple = this->Makefile->IsOn("APPLE");
-
   // Setup default property values.
   if (this->GetType() != cmState::INTERFACE_LIBRARY
       && this->GetType() != cmState::UTILITY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 52ed578..f3a45d3 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -357,7 +357,6 @@ private:
   bool RecordDependencies;
   bool DLLPlatform;
   bool IsAndroid;
-  bool IsApple;
   bool IsImportedTarget;
   bool BuildInterfaceIncludesAppended;
 #if defined(_WIN32) && !defined(__CYGWIN__)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5f23d67b5d6be6c7e4d970d23ca4eb86a6857a0
commit b5f23d67b5d6be6c7e4d970d23ca4eb86a6857a0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:56:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:05 2015 +0100

    cmTarget: Fix style

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e056469..a016e92 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -299,7 +299,8 @@ void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
   if(this->Utilities.insert(u).second && makefile)
     {
-    UtilityBacktraces.insert(std::make_pair(u, makefile->GetBacktrace()));
+    this->UtilityBacktraces.insert(
+            std::make_pair(u, makefile->GetBacktrace()));
     }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c941d7e324b88ec7cda88dbe99e64b1b37f42cff
commit c941d7e324b88ec7cda88dbe99e64b1b37f42cff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 18:27:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:05 2015 +0100

    Remove some obsolete declarations

diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 889fb08..f10e4e4 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -13,7 +13,6 @@
 #define cmComputeLinkDepends_h
 
 #include "cmStandardIncludes.h"
-#include "cmTarget.h"
 #include "cmLinkItem.h"
 
 #include "cmGraphAdjacencyList.h"
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 1741acf..ff5d3ab 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -17,7 +17,6 @@
 #include "cmake.h"
 #include "cmSourceFile.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include "cmSystemTools.h"
 
 #include <cmsys/SystemTools.hxx>
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index b20d0a7..281c1ef 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -16,8 +16,6 @@
 #include "cmExternalMakefileProjectGenerator.h"
 
 class cmLocalGenerator;
-class cmMakefile;
-class cmTarget;
 class cmGeneratedFileStream;
 
 /** \class cmExtraKateGenerator
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 5eed89d..c3b0272 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -12,7 +12,6 @@
 
 #include "cmGeneratorExpressionDAGChecker.h"
 
-#include "cmMakefile.h"
 #include "cmLocalGenerator.h"
 #include "cmAlgorithms.h"
 
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index 7c1bd8c..db56eb1 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -18,8 +18,6 @@
 #include "cmListFileCache.h"
 #include "cmGeneratorExpressionContext.h"
 
-class cmTarget;
-
 struct cmGeneratorExpressionDAGChecker;
 struct cmGeneratorExpressionNode;
 
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7a7e4ff..af72123 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -14,6 +14,7 @@
 #include "cmGlobalGenerator.h"
 #include "cmAlgorithms.h"
 #include "cmOutputConverter.h"
+#include "cmMakefile.h"
 
 //----------------------------------------------------------------------------
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index db65db1..854811b 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -12,8 +12,6 @@
 #ifndef cmGeneratorExpressionNode_h
 #define cmGeneratorExpressionNode_h
 
-#include "cmMakefile.h"
-
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionParser.h"
 #include "cmGeneratorExpressionDAGChecker.h"
diff --git a/Source/cmGeneratorExpressionParser.h b/Source/cmGeneratorExpressionParser.h
index 28f1441..5bd6777 100644
--- a/Source/cmGeneratorExpressionParser.h
+++ b/Source/cmGeneratorExpressionParser.h
@@ -19,8 +19,6 @@
 
 #include "cmListFileCache.h"
 
-class cmMakefile;
-class cmTarget;
 struct cmGeneratorExpressionEvaluator;
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index c4e28ca..2fa0598 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -15,7 +15,6 @@
 #include "cmMakefile.h"
 #include "cmake.h"
 #include "cmGeneratedFileStream.h"
-#include "cmSourceFile.h"
 #include "cmGeneratorTarget.h"
 #include "cmAlgorithms.h"
 
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index edd6a0e..ea27f61 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -11,7 +11,6 @@
 ============================================================================*/
 #include "cmInstallDirectoryGenerator.h"
 
-#include "cmTarget.h"
 #include "cmGeneratorExpression.h"
 #include "cmLocalGenerator.h"
 
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index d59fdc6..d0784ad 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmLocalVisualStudio10Generator.h"
-#include "cmTarget.h"
 #include "cmMakefile.h"
 #include "cmVisualStudio10TargetGenerator.h"
 #include "cmGlobalVisualStudio10Generator.h"
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 1cae94f..52ed578 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -30,7 +30,6 @@ class cmake;
 class cmMakefile;
 class cmSourceFile;
 class cmGlobalGenerator;
-class cmComputeLinkInformation;
 class cmListFileBacktrace;
 class cmTarget;
 class cmGeneratorTarget;
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index d997596..b411f15 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -13,10 +13,8 @@
 
 #include "cmGeneratorExpression.h"
 #include "cmOutputConverter.h"
-#include "cmMakefile.h"
 #include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 #include "cmTest.h"
 
 //----------------------------------------------------------------------------

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce43ed2cc14f96c56441da9908053737efbaaf2e
commit ce43ed2cc14f96c56441da9908053737efbaaf2e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 00:29:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:50:05 2015 +0100

    Use LocalGenerator when possible

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index b819dad..0488391 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -147,7 +147,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
 void cmGlobalVisualStudioGenerator
 ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const
 {
-  std::string dir = gt->Makefile->GetCurrentBinaryDirectory();
+  std::string dir = gt->LocalGenerator->GetCurrentBinaryDirectory();
   dir += "/";
   std::string tgtDir = gt->LocalGenerator->GetTargetDirectory(gt);
   if(!tgtDir.empty())
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 891c44e..e11571a 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -42,7 +42,7 @@ void cmLocalNinjaGenerator::Generate()
   // Compute the path to use when referencing the current output
   // directory from the top output directory.
   this->HomeRelativeOutputPath =
-    this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT);
+    this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT);
   if(this->HomeRelativeOutputPath == ".")
     {
     this->HomeRelativeOutputPath = "";
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 34a50a3..27d631e 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -144,7 +144,7 @@ void cmLocalUnixMakefileGenerator3::ComputeHomeRelativeOutputPath()
   // Compute the path to use when referencing the current output
   // directory from the top output directory.
   this->HomeRelativeOutputPath =
-    this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT);
+    this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT);
   if(this->HomeRelativeOutputPath == ".")
     {
     this->HomeRelativeOutputPath = "";
@@ -503,7 +503,7 @@ void cmLocalUnixMakefileGenerator3
 //----------------------------------------------------------------------------
 void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile()
 {
-  std::string infoFileName = this->Makefile->GetCurrentBinaryDirectory();
+  std::string infoFileName = this->GetCurrentBinaryDirectory();
   infoFileName += cmake::GetCMakeFilesDirectory();
   infoFileName += "/CMakeDirectoryInformation.cmake";
 
@@ -567,7 +567,7 @@ std::string
 cmLocalUnixMakefileGenerator3
 ::ConvertToFullPath(const std::string& localPath)
 {
-  std::string dir = this->Makefile->GetCurrentBinaryDirectory();
+  std::string dir = this->GetCurrentBinaryDirectory();
   dir += "/";
   dir += localPath;
   return dir;
@@ -1064,7 +1064,7 @@ cmLocalUnixMakefileGenerator3
     }
 
   // if the command specified a working directory use it.
-  std::string dir  = this->Makefile->GetCurrentBinaryDirectory();
+  std::string dir  = this->GetCurrentBinaryDirectory();
   std::string workingDir = ccg.GetWorkingDirectory();
   if(!workingDir.empty())
     {
@@ -1214,7 +1214,7 @@ cmLocalUnixMakefileGenerator3
                      const std::vector<std::string>& files,
                      cmGeneratorTarget* target, const char* filename)
 {
-  std::string cleanfile = this->Makefile->GetCurrentBinaryDirectory();
+  std::string cleanfile = this->GetCurrentBinaryDirectory();
   cleanfile += "/";
   cleanfile += this->GetTargetDirectory(target);
   cleanfile += "/cmake_clean";
@@ -1493,7 +1493,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
   // If the directory information is newer than depend.internal, include dirs
   // may have changed. In this case discard all old dependencies.
   bool needRescanDirInfo = false;
-  std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory();
+  std::string dirInfoFile = this->GetCurrentBinaryDirectory();
   dirInfoFile += cmake::GetCMakeFilesDirectory();
   dirInfoFile += "/CMakeDirectoryInformation.cmake";
   {
@@ -1567,7 +1567,7 @@ cmLocalUnixMakefileGenerator3
   // Read the directory information file.
   cmMakefile* mf = this->Makefile;
   bool haveDirectoryInfo = false;
-  std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory();
+  std::string dirInfoFile = this->GetCurrentBinaryDirectory();
   dirInfoFile += cmake::GetCMakeFilesDirectory();
   dirInfoFile += "/CMakeDirectoryInformation.cmake";
   if(mf->ReadListFile(dirInfoFile.c_str()) &&
@@ -1828,7 +1828,7 @@ void cmLocalUnixMakefileGenerator3
   std::vector<std::string> commands;
 
   // Write the all rule.
-  std::string recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+  std::string recursiveTarget = this->GetCurrentBinaryDirectory();
   recursiveTarget += "/all";
 
   depends.push_back("cmake_check_build_system");
@@ -1872,7 +1872,7 @@ void cmLocalUnixMakefileGenerator3
                       depends, commands, true);
 
   // Write the clean rule.
-  recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+  recursiveTarget = this->GetCurrentBinaryDirectory();
   recursiveTarget += "/clean";
   commands.clear();
   depends.clear();
@@ -1890,7 +1890,7 @@ void cmLocalUnixMakefileGenerator3
                       depends, commands, true);
 
   // Write the preinstall rule.
-  recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+  recursiveTarget = this->GetCurrentBinaryDirectory();
   recursiveTarget += "/preinstall";
   commands.clear();
   depends.clear();

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Tue Oct 27 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Tue, 27 Oct 2015 00:01:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-362-g8c13f0f
Message-ID: <20151027040110.67304C0750@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b (commit)
      from  d288b216af6864567354ccb05e85466fb57d46b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b
commit 8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Tue Oct 27 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 27 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index a5f01d3..5aebca4 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151026)
+set(CMake_VERSION_PATCH 20151027)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 27 02:43:52 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 27 Oct 2015 02:43:52 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1094-ge1cff3e
Message-ID: <20151027064352.49F7BC07A1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e1cff3e94cf6d46776d33d0ebe83aaf826bc0037 (commit)
       via  e45be64386ea6974c27e58f8253a7144956fd767 (commit)
       via  4960ce1287665ddbaec12424c722f4d0018a7756 (commit)
      from  f94ceec95d7444fc6d4f151f8d8a07643ec27db6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1cff3e94cf6d46776d33d0ebe83aaf826bc0037
commit e1cff3e94cf6d46776d33d0ebe83aaf826bc0037
Merge: f94ceec e45be64
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 02:43:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 02:43:51 2015 -0400

    Merge topic 'use-generator-target' into next
    
    e45be643 fixup! cmTarget: Make compatbility API explicit.
    4960ce12 fixup! cmGlobalGenerator: Remove direct storage of targets


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e45be64386ea6974c27e58f8253a7144956fd767
commit e45be64386ea6974c27e58f8253a7144956fd767
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 07:42:07 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:42:07 2015 +0100

    fixup! cmTarget: Make compatbility API explicit.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 35c6084..ffe92af 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -747,7 +747,7 @@ void cmMakefile::ConfigureFinalPass()
       // system generation uses up-to-date information even if other cache
       // invalidation code in this source file is buggy.
 
-      l->second.AnalyzeLibDependenciesForVS6(this);
+      l->second.AnalyzeLibDependenciesForVS6(*this);
       }
     }
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4960ce1287665ddbaec12424c722f4d0018a7756
commit 4960ce1287665ddbaec12424c722f4d0018a7756
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 07:41:48 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:41:48 2015 +0100

    fixup! cmGlobalGenerator: Remove direct storage of targets

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index b7478f9..5e239b8 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -363,7 +363,7 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
         {
         if((*ti)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          (*ti)->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+          (*ti)->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
           }
         }
       }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |    2 +-
 Source/cmMakefile.cxx                     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 27 02:45:03 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 27 Oct 2015 02:45:03 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1124-gdcf76f3
Message-ID: <20151027064504.44CF2C0827@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe (commit)
       via  79c3a2a8f72ea175533da9f323f88c507220486e (commit)
       via  c389f8bb07e900d805ca3163f47b06e3dbe4303b (commit)
       via  02533038dae9fb5b4ae1b6f7d55bb5af397400af (commit)
       via  b6278e9ff714d8bdacb54f055eac71fe073b28d8 (commit)
       via  7a6caae1a78e8d67422b144ceffdd97595f67683 (commit)
       via  0fb187cc589b83ded107d9a9a1971830efb6c751 (commit)
       via  8caf1f361b2207522d19bf4a28cecaa3a2391918 (commit)
       via  278ba2db477fdc8cccd2313eb56e0179234747a0 (commit)
       via  79c11d23405d3894a254a8c03df5ead32464b109 (commit)
       via  9b244cc0ecff0cde22b71b7097a3d84c018c6044 (commit)
       via  def6da616b81958c9f1058a4e520ac3cbc534757 (commit)
       via  a67231ac114235f0af4673235c4c07fa896c8ab6 (commit)
       via  d566f39a640297114bd3ad933bb3279440b2f38f (commit)
       via  0c97d32f7a592a768d614c19b3fd48eab245a2c4 (commit)
       via  383bfd95432990365ac5c7fc3ab190bfb05cbec1 (commit)
       via  7f6beddae372a7ae47789f5460bcdfdac39c64e6 (commit)
       via  520ca0ff6c123250c633a3618459d0161cbc4683 (commit)
       via  3e3c754b8cc3af463dcea95000daf3a18b359b7a (commit)
       via  593f347b5385a510e641eca0448f7ddf64c1c12b (commit)
       via  7b127c62d4d4c94cf96e9d406859dbd24eed7dc9 (commit)
       via  780bff5279c6c2d356e5c7726b656bd9c68532b8 (commit)
       via  6bd7bd1e06fcf92d40c762f2713626d125cb8f87 (commit)
       via  b397eae82e14fdf75eddcbfd022d9f2d5933eb1e (commit)
       via  00b8c0a8d4b59dc01276d083ccae4a8138718b12 (commit)
       via  4c6374bcc56ea7d7f7e67c518e60de94be267256 (commit)
       via  7d409f500e3403f8dbb4a0fee6ecdad94f45c35e (commit)
       via  7a1b83cb3fc79639b9e2c1bf11af2d2274e4224a (commit)
       via  736c2042c6bade0322441aafabababcbd92af52e (commit)
       via  f210cb131e5814631d6d2974cf2437632446654f (commit)
      from  e1cff3e94cf6d46776d33d0ebe83aaf826bc0037 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe
commit dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe
Merge: e1cff3e 79c3a2a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 02:45:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 02:45:00 2015 -0400

    Merge topic 'use-generator-target' into next
    
    79c3a2a8 cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
    c389f8bb cmLocalGenerator: Port Find method away from GetGeneratorTarget
    02533038 VS6: Port to FindGeneratorTarget
    b6278e9f cmake: Port find_package mode away from GetGeneratorTarget
    7a6caae1 cmMakefile: Add imported target accessor
    0fb187cc CMP0026: Port away from GetGeneratorTarget
    8caf1f36 cmGlobalGenerator: Add FindGeneratorTarget API
    278ba2db cmGeneratorTarget: Add API for globally visible IMPORTED
    79c11d23 Xcode: Port away from GetGeneratorTarget
    9b244cc0 cmLocalGenerator: Store imported targets in a separate container.
    def6da61 cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget
    a67231ac cmTarget: Implement ALIAS in terms of name mapping
    d566f39a cmGlobalGenerator: Remove unneeded GetGeneratorTarget
    0c97d32f cmGlobalGenerator: Remove direct storage of targets
    383bfd95 cmTargetCollectLinkLanguages: Remove cmMakefile dependency
    7f6bedda cmGeneratorTarget: Port cmOptionalLinkImplementation
    ...


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79c3a2a8f72ea175533da9f323f88c507220486e
commit 79c3a2a8f72ea175533da9f323f88c507220486e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:22:42 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:26 2015 +0100

    cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
    
    The configure-time and generate-time types should be completely
    independent.
    
    Add ownership of cmGeneratorTarget instances to the cmLocalGenerator.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d53f0e3..3d2db42 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1208,8 +1208,6 @@ void cmGlobalGenerator::Configure()
 void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
 {
   this->CreateLocalGenerators();
-  cmDeleteAll(this->GeneratorTargets);
-  this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
   this->ComputeBuildFileGenerators();
 }
@@ -1597,7 +1595,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(
       {
       cmTarget* t = &ti->second;
       cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
-      this->GeneratorTargets[t] = gt;
       lg->AddGeneratorTarget(gt);
       }
     }
@@ -1622,9 +1619,9 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
           j = mf->GetOwnedImportedTargets().begin();
         j != mf->GetOwnedImportedTargets().end(); ++j)
       {
-      cmGeneratorTarget* gt =
-          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
-      this->GeneratorTargets[*j] = gt;
+      cmLocalGenerator* lg = this->LocalGenerators[i];
+      cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
+      lg->AddOwnedImportedGeneratorTarget(gt);
       importedMap[*j] = gt;
       }
     }
@@ -1641,9 +1638,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::ClearGeneratorMembers()
 {
-  cmDeleteAll(this->GeneratorTargets);
-  this->GeneratorTargets.clear();
-
   cmDeleteAll(this->BuildExportSets);
   this->BuildExportSets.clear();
 
@@ -1662,20 +1656,6 @@ void cmGlobalGenerator::ClearGeneratorMembers()
 }
 
 //----------------------------------------------------------------------------
-cmGeneratorTarget*
-cmGlobalGenerator::GetGeneratorTarget(cmTarget const* t) const
-{
-  cmGeneratorTargetsType::const_iterator ti = this->GeneratorTargets.find(t);
-  if(ti == this->GeneratorTargets.end())
-    {
-    this->CMakeInstance->IssueMessage(
-      cmake::INTERNAL_ERROR, "Missing cmGeneratorTarget instance!");
-    return 0;
-    }
-  return ti->second;
-}
-
-//----------------------------------------------------------------------------
 void cmGlobalGenerator::ComputeTargetObjectDirectory(cmGeneratorTarget*) const
 {
 }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 0057d61..bc6e17d 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -42,10 +42,6 @@ class cmInstallTargetGenerator;
 class cmInstallFilesGenerator;
 class cmExportBuildFileGenerator;
 
-typedef std::map<cmTarget const*,
-                 cmGeneratorTarget*,
-                 cmTarget::StrictTargetComparison> cmGeneratorTargetsType;
-
 /** \class cmGlobalGenerator
  * \brief Responsible for overseeing the generation process for the entire tree
  *
@@ -307,14 +303,6 @@ public:
   TargetDependSet const& GetTargetDirectDepends(
       const cmGeneratorTarget* target);
 
-  /** Get per-target generator information.  */
-  cmGeneratorTarget* GetGeneratorTarget(cmTarget const*) const;
-
-  void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
-  {
-    this->GeneratorTargets[t] = gt;
-  }
-
   const std::map<std::string, std::vector<cmLocalGenerator*> >& GetProjectMap()
                                                const {return this->ProjectMap;}
 
@@ -482,8 +470,6 @@ private:
   typedef std::map<cmGeneratorTarget const*, TargetDependSet> TargetDependMap;
   TargetDependMap TargetDependencies;
 
-  // Per-target generator information.
-  cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
   void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
                    cmLocalGenerator* lg,
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index f08ab5a..5e239b8 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -257,7 +257,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
 
   cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg);
   lg->AddGeneratorTarget(gt);
-  this->AddGeneratorTarget(tgt, gt);
 
   // Organize in the "predefined targets" folder:
   //
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index b819dad..bb0c974 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -88,7 +88,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
       gen[0]->AddGeneratorTarget(gt);
-      this->AddGeneratorTarget(allBuild, gt);
 
 #if 0
       // Can't activate this code because we want ALL_BUILD
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6d4fc1f..da8c814 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -460,7 +460,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
   cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
   root->AddGeneratorTarget(allBuildGt);
-  root->GetGlobalGenerator()->AddGeneratorTarget(allbuild, allBuildGt);
 
   // Refer to the main build configuration file for easy editing.
   std::string listfile = root->GetCurrentSourceDirectory();
@@ -496,7 +495,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 
     cmGeneratorTarget* checkGt = new cmGeneratorTarget(check, root);
     root->AddGeneratorTarget(checkGt);
-    root->GetGlobalGenerator()->AddGeneratorTarget(check, checkGt);
     }
 
   // now make the allbuild depend on all the non-utility targets
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ec7c29f..d92cbea 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -62,6 +62,8 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
 
 cmLocalGenerator::~cmLocalGenerator()
 {
+  cmDeleteAll(this->GeneratorTargets);
+  cmDeleteAll(this->OwnedImportedGeneratorTargets);
 }
 
 void cmLocalGenerator::IssueMessage(cmake::MessageType t,
@@ -460,6 +462,11 @@ void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt)
   this->ImportedGeneratorTargets.push_back(gt);
 }
 
+void cmLocalGenerator::AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt)
+{
+  this->OwnedImportedGeneratorTargets.push_back(gt);
+}
+
 struct NamedGeneratorTargetFinder
 {
   NamedGeneratorTargetFinder(std::string const& name)
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 67383d7..e2f5519 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -127,6 +127,7 @@ public:
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
+  void AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
@@ -380,6 +381,7 @@ protected:
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
   std::vector<cmGeneratorTarget*> ImportedGeneratorTargets;
+  std::vector<cmGeneratorTarget*> OwnedImportedGeneratorTargets;
   std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 225c03e..b813c14 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -896,7 +896,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
 
     cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg);
     lg->AddGeneratorTarget(gt);
-    lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt);
 
     // Set target folder
     const char* autogenFolder = makefile->GetState()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c389f8bb07e900d805ca3163f47b06e3dbe4303b
commit c389f8bb07e900d805ca3163f47b06e3dbe4303b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:14:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:26 2015 +0100

    cmLocalGenerator: Port Find method away from GetGeneratorTarget
    
    Mirror the cmMakefile::FindTarget method.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5928fb5..d53f0e3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1583,10 +1583,12 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
-                                               cmLocalGenerator *lg)
+void cmGlobalGenerator::CreateGeneratorTargets(
+    TargetTypes targetTypes,
+    cmMakefile *mf,
+    cmLocalGenerator *lg,
+    std::map<cmTarget*, cmGeneratorTarget*> const& importedMap)
 {
-  cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
     {
     cmTargets& targets = mf->GetTargets();
@@ -1600,23 +1602,38 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
       }
     }
 
+  std::vector<cmTarget*> itgts = mf->GetImportedTargets();
+
   for(std::vector<cmTarget*>::const_iterator
-        j = mf->GetOwnedImportedTargets().begin();
-      j != mf->GetOwnedImportedTargets().end(); ++j)
+        j = itgts.begin(); j != itgts.end(); ++j)
     {
-    cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
-    this->GeneratorTargets[*j] = gt;
-    lg->AddImportedGeneratorTarget(gt);
+    lg->AddImportedGeneratorTarget(importedMap.find(*j)->second);
     }
 }
 
 //----------------------------------------------------------------------------
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes)
 {
+  std::map<cmTarget*, cmGeneratorTarget*> importedMap;
+  for(unsigned int i=0; i < this->Makefiles.size(); ++i)
+    {
+    cmMakefile* mf = this->Makefiles[i];
+    for(std::vector<cmTarget*>::const_iterator
+          j = mf->GetOwnedImportedTargets().begin();
+        j != mf->GetOwnedImportedTargets().end(); ++j)
+      {
+      cmGeneratorTarget* gt =
+          new cmGeneratorTarget(*j, this->LocalGenerators[i]);
+      this->GeneratorTargets[*j] = gt;
+      importedMap[*j] = gt;
+      }
+    }
+
   // Construct per-target generator information.
   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
     {
-    this->CreateGeneratorTargets(targetTypes, this->LocalGenerators[i]);
+    this->CreateGeneratorTargets(targetTypes, this->Makefiles[i],
+                                 this->LocalGenerators[i], importedMap);
     }
 }
 
@@ -2240,11 +2257,11 @@ cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
     std::vector<cmGeneratorTarget*> tgts =
-        this->LocalGenerators[i]->GetGeneratorTargets();
+        this->LocalGenerators[i]->GetImportedGeneratorTargets();
     for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
          it != tgts.end(); ++it)
       {
-      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+      if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name)
         {
         return *it;
         }
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c52b209..0057d61 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -485,7 +485,9 @@ private:
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   friend class cmake;
-  void CreateGeneratorTargets(TargetTypes targetTypes, cmLocalGenerator* lg);
+  void CreateGeneratorTargets(TargetTypes targetTypes, cmMakefile* mf,
+                   cmLocalGenerator* lg,
+                   std::map<cmTarget*, cmGeneratorTarget*> const& importedMap);
   void CreateGeneratorTargets(TargetTypes targetTypes);
 
   void ClearGeneratorMembers();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1bc7f81..ec7c29f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1821,11 +1821,21 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
 cmGeneratorTarget*
 cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
 {
-  if (cmTarget *t = this->Makefile->FindTargetToUse(name))
+  std::vector<cmGeneratorTarget*>::const_iterator
+    imported = std::find_if(this->ImportedGeneratorTargets.begin(),
+                            this->ImportedGeneratorTargets.end(),
+                            NamedGeneratorTargetFinder(name));
+  if(imported != this->ImportedGeneratorTargets.end())
     {
-    return this->GetGlobalGenerator()->GetGeneratorTarget(t);
+    return *imported;
     }
-  return 0;
+
+  if(cmGeneratorTarget* t = this->FindGeneratorTarget(name))
+    {
+    return t;
+    }
+
+  return this->GetGlobalGenerator()->FindGeneratorTarget(name);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7841d05..67383d7 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -120,6 +120,11 @@ public:
       return this->GeneratorTargets;
     }
 
+  const std::vector<cmGeneratorTarget*> &GetImportedGeneratorTargets() const
+    {
+      return this->ImportedGeneratorTargets;
+    }
+
   void AddGeneratorTarget(cmGeneratorTarget* gt);
   void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02533038dae9fb5b4ae1b6f7d55bb5af397400af
commit 02533038dae9fb5b4ae1b6f7d55bb5af397400af
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:19:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:26 2015 +0100

    VS6: Port to FindGeneratorTarget

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index fd0af61..cdacb9e 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1112,15 +1112,14 @@ void cmLocalVisualStudio6Generator
       // Compute the proper name to use to link this library.
       std::string lib;
       std::string libDebug;
-      cmTarget* tgt = this->GlobalGenerator->FindTarget(j->first.c_str());
+      cmGeneratorTarget* tgt =
+          this->GlobalGenerator->FindGeneratorTarget(j->first.c_str());
       if(tgt)
         {
-        cmGeneratorTarget* gt =
-          this->GlobalGenerator->GetGeneratorTarget(tgt);
         lib = cmSystemTools::GetFilenameWithoutExtension
-          (gt->GetFullName().c_str());
+          (tgt->GetFullName().c_str());
         libDebug = cmSystemTools::GetFilenameWithoutExtension
-          (gt->GetFullName("Debug").c_str());
+          (tgt->GetFullName("Debug").c_str());
         lib += ".lib";
         libDebug += ".lib";
         }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6278e9ff714d8bdacb54f055eac71fe073b28d8
commit b6278e9ff714d8bdacb54f055eac71fe073b28d8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 14:17:56 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:26 2015 +0100

    cmake: Port find_package mode away from GetGeneratorTarget

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 16417fc..d5bc3d2 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -447,8 +447,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     (cmSystemTools::GetCurrentWorkingDirectory());
   // read in the list file to fill the cache
   snapshot.SetDefaultDefinitions();
-  cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
-  cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
+  cmMakefile* mf = new cmMakefile(gg, snapshot);
+  gg->AddMakefile(mf);
 
   mf->SetArgcArgv(args);
 
@@ -481,6 +481,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::vector<std::string> includeDirs;
     cmSystemTools::ExpandListArgument(includes, includeDirs);
 
+    gg->CreateGenerationObjects();
+    cmLocalGenerator* lg = gg->LocalGenerators[0];
     std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
 
     std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
@@ -510,8 +512,9 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     std::string linkPath;
     std::string flags;
     std::string linkFlags;
-    gg->CreateGeneratorTargets(cmGlobalGenerator::AllTargets, lg.get());
-    cmGeneratorTarget *gtgt = gg->GetGeneratorTarget(tgt);
+    gg->CreateGenerationObjects();
+    cmGeneratorTarget *gtgt = gg->FindGeneratorTarget(tgt->GetName());
+    cmLocalGenerator* lg = gtgt->GetLocalGenerator();
     lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags,
                        gtgt, false);
     linkLibs = frameworkPath + linkPath + linkLibs;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a6caae1a78e8d67422b144ceffdd97595f67683
commit 7a6caae1a78e8d67422b144ceffdd97595f67683
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 22:18:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:25 2015 +0100

    cmMakefile: Add imported target accessor

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 8f72f67..ffe92af 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1766,6 +1766,18 @@ const char* cmMakefile::GetCurrentBinaryDirectory() const
   return this->StateSnapshot.GetDirectory().GetCurrentBinary();
 }
 
+std::vector<cmTarget*> cmMakefile::GetImportedTargets() const
+{
+  std::vector<cmTarget*> tgts;
+  tgts.reserve(this->ImportedTargets.size());
+  for (TargetMap::const_iterator it = this->ImportedTargets.begin();
+       it != this->ImportedTargets.end(); ++it)
+    {
+    tgts.push_back(it->second);
+    }
+  return tgts;
+}
+
 //----------------------------------------------------------------------------
 void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs,
                                        bool before)
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 01c4524..f1dd374 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -390,6 +390,7 @@ public:
     {
       return this->ImportedTargetsOwned;
     }
+  std::vector<cmTarget*> GetImportedTargets() const;
 
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fb187cc589b83ded107d9a9a1971830efb6c751
commit 0fb187cc589b83ded107d9a9a1971830efb6c751
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:19:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:25 2015 +0100

    CMP0026: Port away from GetGeneratorTarget

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f0f404c..1eebd12 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1602,7 +1602,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         // CMake time.
         cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
         gg->CreateGenerationObjects();
-        cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+        cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
         this->Properties.SetProperty(propLOCATION,
                                      gt->GetLocationForBuild());
         }
@@ -1627,7 +1627,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
         {
         cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
         gg->CreateGenerationObjects();
-        cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+        cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
         this->Properties.SetProperty(
                 prop, gt->GetFullPath(configName, false).c_str());
         }
@@ -1651,7 +1651,7 @@ const char *cmTarget::GetProperty(const std::string& prop,
           {
           cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
           gg->CreateGenerationObjects();
-          cmGeneratorTarget* gt = gg->GetGeneratorTarget(this);
+          cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName());
           this->Properties.SetProperty(
                   prop, gt->GetFullPath(configName, false).c_str());
           }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8caf1f361b2207522d19bf4a28cecaa3a2391918
commit 8caf1f361b2207522d19bf4a28cecaa3a2391918
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:06:59 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:25 2015 +0100

    cmGlobalGenerator: Add FindGeneratorTarget API

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 6b5cb97..5928fb5 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2196,6 +2196,25 @@ cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const
   return 0;
 }
 
+cmGeneratorTarget*
+cmGlobalGenerator::FindGeneratorTargetImpl(std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
+      {
+      if ((*it)->GetName() == name)
+        {
+        return *it;
+        }
+      }
+    }
+  return 0;
+}
+
 cmTarget*
 cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
 {
@@ -2215,6 +2234,25 @@ cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
   return 0;
 }
 
+cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl(
+    std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
+      {
+      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+        {
+        return *it;
+        }
+      }
+    }
+  return 0;
+}
+
 //----------------------------------------------------------------------------
 cmTarget*
 cmGlobalGenerator::FindTarget(const std::string& name,
@@ -2236,6 +2274,16 @@ cmGlobalGenerator::FindTarget(const std::string& name,
   return this->FindImportedTargetImpl(name);
 }
 
+cmGeneratorTarget*
+cmGlobalGenerator::FindGeneratorTarget(const std::string& name) const
+{
+  if (cmGeneratorTarget* tgt = this->FindGeneratorTargetImpl(name))
+    {
+    return tgt;
+    }
+  return this->FindImportedGeneratorTargetImpl(name);
+}
+
 //----------------------------------------------------------------------------
 bool
 cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 419cada..c52b209 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -254,6 +254,8 @@ public:
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
+  cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
+
   void AddAlias(const std::string& name, const std::string& tgtName);
   bool IsAlias(const std::string& name) const;
 
@@ -432,6 +434,10 @@ protected:
   cmTarget* FindTargetImpl(std::string const& name) const;
   cmTarget* FindImportedTargetImpl(std::string const& name) const;
 
+  cmGeneratorTarget* FindGeneratorTargetImpl(std::string const& name) const;
+  cmGeneratorTarget*
+  FindImportedGeneratorTargetImpl(std::string const& name) const;
+
   const char* GetPredefinedTargetsFolder();
   virtual bool UseFolderProperty();
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=278ba2db477fdc8cccd2313eb56e0179234747a0
commit 278ba2db477fdc8cccd2313eb56e0179234747a0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 13:06:37 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:25 2015 +0100

    cmGeneratorTarget: Add API for globally visible IMPORTED

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9376e98..1f74eda 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -856,6 +856,11 @@ bool cmGeneratorTarget::IsImported() const
   return this->Target->IsImported();
 }
 
+bool cmGeneratorTarget::IsImportedGloballyVisible() const
+{
+  return this->Target->IsImportedGloballyVisible();
+}
+
 //----------------------------------------------------------------------------
 const char* cmGeneratorTarget::GetLocationForBuild() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index c2607a7..da59a98 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -31,6 +31,7 @@ public:
   cmLocalGenerator* GetLocalGenerator() const;
 
   bool IsImported() const;
+  bool IsImportedGloballyVisible() const;
   const char *GetLocation(const std::string& config) const;
 
   std::vector<cmCustomCommand> const &GetPreBuildCommands() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79c11d23405d3894a254a8c03df5ead32464b109
commit 79c11d23405d3894a254a8c03df5ead32464b109
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:59:39 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:24 2015 +0100

    Xcode: Port away from GetGeneratorTarget

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 3b430d2..aec2603 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -51,13 +51,11 @@ void cmLocalXCodeGenerator::Generate()
 {
   cmLocalGenerator::Generate();
 
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator iter = targets.begin();
       iter != targets.end(); ++iter)
     {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
+    (*iter)->HasMacOSXRpathInstallNameDir("");
     }
 }
 
@@ -66,13 +64,11 @@ void cmLocalXCodeGenerator::GenerateInstallRules()
 {
   cmLocalGenerator::GenerateInstallRules();
 
-  cmTargets& targets = this->Makefile->GetTargets();
-  for(cmTargets::iterator iter = targets.begin();
+  std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
+  for(std::vector<cmGeneratorTarget*>::iterator iter = targets.begin();
       iter != targets.end(); ++iter)
     {
-    cmTarget* t = &iter->second;
-    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
-    gt->HasMacOSXRpathInstallNameDir("");
+    (*iter)->HasMacOSXRpathInstallNameDir("");
     }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b244cc0ecff0cde22b71b7097a3d84c018c6044
commit 9b244cc0ecff0cde22b71b7097a3d84c018c6044
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:56:31 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:24 2015 +0100

    cmLocalGenerator: Store imported targets in a separate container.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 47d254e..6b5cb97 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1606,6 +1606,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
     {
     cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
     this->GeneratorTargets[*j] = gt;
+    lg->AddImportedGeneratorTarget(gt);
     }
 }
 
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9d5335e..1bc7f81 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -455,6 +455,11 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
   this->GeneratorTargets.push_back(gt);
 }
 
+void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt)
+{
+  this->ImportedGeneratorTargets.push_back(gt);
+}
+
 struct NamedGeneratorTargetFinder
 {
   NamedGeneratorTargetFinder(std::string const& name)
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 91a476f..7841d05 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -121,6 +121,7 @@ public:
     }
 
   void AddGeneratorTarget(cmGeneratorTarget* gt);
+  void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
@@ -373,6 +374,7 @@ protected:
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
+  std::vector<cmGeneratorTarget*> ImportedGeneratorTargets;
   std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=def6da616b81958c9f1058a4e520ac3cbc534757
commit def6da616b81958c9f1058a4e520ac3cbc534757
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:52:46 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:24 2015 +0100

    cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b5f5ce9..9d5335e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -51,6 +51,8 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
 
   this->Makefile = makefile;
 
+  this->AliasTargets = makefile->GetAliasTargets();
+
   this->EmitUniversalBinaryFlags = true;
   this->BackwardsCompatibility = 0;
   this->BackwardsCompatibilityFinal = false;
@@ -453,11 +455,45 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
   this->GeneratorTargets.push_back(gt);
 }
 
+struct NamedGeneratorTargetFinder
+{
+  NamedGeneratorTargetFinder(std::string const& name)
+    : Name(name)
+  {
+
+  }
+
+  bool operator()(cmGeneratorTarget* tgt)
+  {
+    return tgt->GetName() == this->Name;
+  }
+private:
+  std::string Name;
+};
+
 cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
     const std::string& name) const
 {
-  return this->GetGlobalGenerator()->GetGeneratorTarget(
-        this->Makefile->FindTarget(name));
+  std::map<std::string, std::string>::const_iterator i =
+      this->AliasTargets.find(name);
+  if (i != this->AliasTargets.end())
+    {
+    std::vector<cmGeneratorTarget*>::const_iterator ai =
+        std::find_if(this->GeneratorTargets.begin(),
+                     this->GeneratorTargets.end(),
+                     NamedGeneratorTargetFinder(i->second));
+    return *ai;
+    }
+  std::vector<cmGeneratorTarget*>::const_iterator ti =
+      std::find_if(this->GeneratorTargets.begin(),
+                   this->GeneratorTargets.end(),
+                   NamedGeneratorTargetFinder(name));
+  if ( ti != this->GeneratorTargets.end() )
+    {
+    return *ti;
+    }
+
+  return 0;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 46eb1b3..91a476f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -373,6 +373,7 @@ protected:
 
   std::set<cmGeneratorTarget const*> WarnCMP0063;
   std::vector<cmGeneratorTarget*> GeneratorTargets;
+  std::map<std::string, std::string> AliasTargets;
 
   bool EmitUniversalBinaryFlags;
 
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 35dd3c6..01c4524 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -400,6 +400,11 @@ public:
                             bool excludeAliases = false) const;
   bool IsAlias(const std::string& name) const;
 
+  std::map<std::string, std::string> GetAliasTargets() const
+  {
+    return this->AliasTargets;
+  }
+
   /**
    * Mark include directories as system directories.
    */

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a67231ac114235f0af4673235c4c07fa896c8ab6
commit a67231ac114235f0af4673235c4c07fa896c8ab6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:43:00 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:24 2015 +0100

    cmTarget: Implement ALIAS in terms of name mapping
    
    Remove mapping to cmTarget.

diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index 47f6592..a84bb9d 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -192,7 +192,7 @@ bool cmAddExecutableCommand
       this->SetError(e.str());
       return false;
       }
-    this->Makefile->AddAlias(exename, aliasedTarget);
+    this->Makefile->AddAlias(exename, aliasedName);
     return true;
     }
 
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index e0adee3..5296cbb 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -314,7 +314,7 @@ bool cmAddLibraryCommand
       this->SetError(e.str());
       return false;
       }
-    this->Makefile->AddAlias(libName, aliasedTarget);
+    this->Makefile->AddAlias(libName, aliasedName);
     return true;
     }
 
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 215d63f..47d254e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2167,9 +2167,10 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalGenerator::AddAlias(const std::string& name, cmTarget *tgt)
+void cmGlobalGenerator::AddAlias(const std::string& name,
+                                 std::string const& tgtName)
 {
-  this->AliasTargets[name] = tgt;
+  this->AliasTargets[name] = tgtName;
 }
 
 //----------------------------------------------------------------------------
@@ -2220,10 +2221,11 @@ cmGlobalGenerator::FindTarget(const std::string& name,
 {
   if (!excludeAliases)
     {
-    TargetMap::const_iterator ai = this->AliasTargets.find(name);
+    std::map<std::string, std::string>::const_iterator ai =
+        this->AliasTargets.find(name);
     if (ai != this->AliasTargets.end())
       {
-      return ai->second;
+      return this->FindTargetImpl(ai->second);
       }
     }
   if (cmTarget* tgt = this->FindTargetImpl(name))
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 5d4ce08..419cada 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -254,7 +254,7 @@ public:
   cmTarget* FindTarget(const std::string& name,
                        bool excludeAliases = false) const;
 
-  void AddAlias(const std::string& name, cmTarget *tgt);
+  void AddAlias(const std::string& name, const std::string& tgtName);
   bool IsAlias(const std::string& name) const;
 
   /** Determine if a name resolves to a framework on disk or a built target
@@ -427,17 +427,7 @@ protected:
   std::map<std::string, cmExportBuildFileGenerator*> BuildExportSets;
   std::map<std::string, cmExportBuildFileGenerator*> BuildExportExportSets;
 
-  // All targets in the entire project.
-#if defined(CMAKE_BUILD_WITH_CMAKE)
-#ifdef CMake_HAVE_CXX11_UNORDERED_MAP
-  typedef std::unordered_map<std::string, cmTarget*> TargetMap;
-#else
-  typedef cmsys::hash_map<std::string, cmTarget*> TargetMap;
-#endif
-#else
-  typedef std::map<std::string,cmTarget *> TargetMap;
-#endif
-  TargetMap AliasTargets;
+  std::map<std::string, std::string> AliasTargets;
 
   cmTarget* FindTargetImpl(std::string const& name) const;
   cmTarget* FindImportedTargetImpl(std::string const& name) const;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d9d773d..8f72f67 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2036,10 +2036,11 @@ void cmMakefile::AddGlobalLinkInformation(const std::string& name,
 }
 
 
-void cmMakefile::AddAlias(const std::string& lname, cmTarget *tgt)
+void cmMakefile::AddAlias(const std::string& lname,
+                          std::string const& tgtName)
 {
-  this->AliasTargets[lname] = tgt;
-  this->GetGlobalGenerator()->AddAlias(lname, tgt);
+  this->AliasTargets[lname] = tgtName;
+  this->GetGlobalGenerator()->AddAlias(lname, tgtName);
 }
 
 cmTarget* cmMakefile::AddLibrary(const std::string& lname,
@@ -4024,10 +4025,12 @@ cmTarget* cmMakefile::FindTarget(const std::string& name,
 {
   if (!excludeAliases)
     {
-    TargetMap::const_iterator i = this->AliasTargets.find(name);
+    std::map<std::string, std::string>::const_iterator i =
+        this->AliasTargets.find(name);
     if (i != this->AliasTargets.end())
       {
-      return i->second;
+      cmTargets::iterator ai = this->Targets.find(i->second);
+      return &ai->second;
       }
     }
   cmTargets::iterator i = this->Targets.find( name );
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index f3dbb74..35dd3c6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -283,7 +283,7 @@ public:
   cmTarget* AddLibrary(const std::string& libname, cmState::TargetType type,
                   const std::vector<std::string> &srcs,
                   bool excludeFromAll = false);
-  void AddAlias(const std::string& libname, cmTarget *tgt);
+  void AddAlias(const std::string& libname, const std::string& tgt);
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
   /**
@@ -790,7 +790,7 @@ protected:
 #else
   typedef std::map<std::string, cmTarget*> TargetMap;
 #endif
-  TargetMap AliasTargets;
+  std::map<std::string, std::string> AliasTargets;
   std::vector<cmSourceFile*> SourceFiles;
 
   // Tests

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d566f39a640297114bd3ad933bb3279440b2f38f
commit d566f39a640297114bd3ad933bb3279440b2f38f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:33:38 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:24 2015 +0100

    cmGlobalGenerator: Remove unneeded GetGeneratorTarget

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e33e942..215d63f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2244,8 +2244,7 @@ cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const
 
   if(cmTarget* tgt = this->FindTarget(libname))
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt);
-    if(gt->IsFrameworkOnApple())
+    if(tgt->IsFrameworkOnApple())
        {
        return true;
        }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c97d32f7a592a768d614c19b3fd48eab245a2c4
commit 0c97d32f7a592a768d614c19b3fd48eab245a2c4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 12:22:51 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:23 2015 +0100

    cmGlobalGenerator: Remove direct storage of targets
    
    Find the target by looping when needed.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d26cc34..e33e942 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1637,8 +1637,6 @@ void cmGlobalGenerator::ClearGeneratorMembers()
 
   this->ExportSets.clear();
   this->TargetDependencies.clear();
-  this->TotalTargets.clear();
-  this->ImportedTargets.clear();
   this->ProjectMap.clear();
   this->RuleHashes.clear();
   this->DirectoryContentMap.clear();
@@ -2180,6 +2178,41 @@ bool cmGlobalGenerator::IsAlias(const std::string& name) const
   return this->AliasTargets.find(name) != this->AliasTargets.end();
 }
 
+cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
+    {
+    cmTargets& tgts = this->Makefiles[i]->GetTargets();
+    for (cmTargets::iterator it = tgts.begin(); it != tgts.end(); ++it)
+      {
+      if (it->second.GetName() == name)
+        {
+        return &it->second;
+        }
+      }
+    }
+  return 0;
+}
+
+cmTarget*
+cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const
+{
+  for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
+    {
+    std::vector<cmTarget*> tgts =
+        this->Makefiles[i]->GetOwnedImportedTargets();
+    for (std::vector<cmTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
+      {
+      if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible())
+        {
+        return *it;
+        }
+      }
+    }
+  return 0;
+}
+
 //----------------------------------------------------------------------------
 cmTarget*
 cmGlobalGenerator::FindTarget(const std::string& name,
@@ -2193,17 +2226,11 @@ cmGlobalGenerator::FindTarget(const std::string& name,
       return ai->second;
       }
     }
-  TargetMap::const_iterator i = this->TotalTargets.find ( name );
-  if ( i != this->TotalTargets.end() )
-    {
-    return i->second;
-    }
-  i = this->ImportedTargets.find(name);
-  if ( i != this->ImportedTargets.end() )
+  if (cmTarget* tgt = this->FindTargetImpl(name))
     {
-    return i->second;
+    return tgt;
     }
-  return 0;
+  return this->FindImportedTargetImpl(name);
 }
 
 //----------------------------------------------------------------------------
@@ -2622,18 +2649,6 @@ cmGlobalGenerator::GetTargetDirectDepends(cmGeneratorTarget const* target)
   return this->TargetDependencies[target];
 }
 
-void cmGlobalGenerator::AddTarget(cmTarget* t)
-{
-  if(t->IsImported())
-    {
-    this->ImportedTargets[t->GetName()] = t;
-    }
-  else
-    {
-    this->TotalTargets[t->GetName()] = t;
-    }
-}
-
 bool cmGlobalGenerator::IsReservedTarget(std::string const& name)
 {
   // The following is a list of targets reserved
@@ -2939,17 +2954,20 @@ void cmGlobalGenerator::WriteSummary()
   fname += "/TargetDirectories.txt";
   cmGeneratedFileStream fout(fname.c_str());
 
-  // Generate summary information files for each target.
-  for(TargetMap::const_iterator ti =
-        this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
-    if ((ti->second)->GetType() == cmState::INTERFACE_LIBRARY)
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    for (std::vector<cmGeneratorTarget*>::iterator it = tgts.begin();
+         it != tgts.end(); ++it)
       {
-      continue;
+      if ((*it)->GetType() == cmState::INTERFACE_LIBRARY)
+        {
+        continue;
+        }
+      this->WriteSummary(*it);
+      fout << (*it)->GetSupportDirectory() << "\n";
       }
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
-    this->WriteSummary(gt);
-    fout << gt->GetSupportDirectory() << "\n";
     }
 }
 
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 18f5329..5d4ce08 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -280,8 +280,6 @@ public:
   std::set<std::string> const& GetDirectoryContent(std::string const& dir,
                                                    bool needDisk = true);
 
-  void AddTarget(cmTarget* t);
-
   static bool IsReservedTarget(std::string const& name);
 
   virtual const char* GetAllTargetName()         const { return "ALL_BUILD"; }
@@ -439,9 +437,10 @@ protected:
 #else
   typedef std::map<std::string,cmTarget *> TargetMap;
 #endif
-  TargetMap TotalTargets;
   TargetMap AliasTargets;
-  TargetMap ImportedTargets;
+
+  cmTarget* FindTargetImpl(std::string const& name) const;
+  cmTarget* FindImportedTargetImpl(std::string const& name) const;
 
   const char* GetPredefinedTargetsFolder();
   virtual bool UseFolderProperty();
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index b771f11..f08ab5a 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -354,14 +354,18 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
   cmGlobalVisualStudio7Generator::AddExtraIDETargets();
   if(this->AddCheckTarget())
     {
-    // All targets depend on the build-system check target.
-    for(TargetMap::const_iterator
-          ti = this->TotalTargets.begin();
-        ti != this->TotalTargets.end(); ++ti)
+    for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
       {
-      if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+      std::vector<cmGeneratorTarget*> tgts =
+          this->LocalGenerators[i]->GetGeneratorTargets();
+      // All targets depend on the build-system check target.
+      for(std::vector<cmGeneratorTarget*>::iterator ti = tgts.begin();
+          ti != tgts.end(); ++ti)
         {
-        ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+        if((*ti)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+          {
+          (*ti)->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+          }
         }
       }
     }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 42f9758..6d4fc1f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1362,12 +1362,17 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::ForceLinkerLanguages()
 {
-  // This makes sure all targets link using the proper language.
-  for(TargetMap::const_iterator
-        ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
+  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
-    cmGeneratorTarget* gt = this->GetGeneratorTarget(ti->second);
-    this->ForceLinkerLanguage(gt);
+    std::vector<cmGeneratorTarget*> tgts =
+        this->LocalGenerators[i]->GetGeneratorTargets();
+    // All targets depend on the build-system check target.
+    for(std::vector<cmGeneratorTarget*>::const_iterator ti = tgts.begin();
+        ti != tgts.end(); ++ti)
+      {
+      // This makes sure all targets link using the proper language.
+      this->ForceLinkerLanguage(*ti);
+      }
     }
 }
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3bf34e2..d9d773d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2096,7 +2096,6 @@ cmMakefile::AddNewTarget(cmState::TargetType type, const std::string& name)
   cmTarget& target = it->second;
   target.SetType(type, name);
   target.SetMakefile(this);
-  this->GetGlobalGenerator()->AddTarget(&it->second);
   return &it->second;
 }
 
@@ -4183,15 +4182,11 @@ cmMakefile::AddImportedTarget(const std::string& name,
   // Create the target.
   cmsys::auto_ptr<cmTarget> target(new cmTarget);
   target->SetType(type, name);
-  target->MarkAsImported();
+  target->MarkAsImported(global);
   target->SetMakefile(this);
 
   // Add to the set of available imported targets.
   this->ImportedTargets[name] = target.get();
-  if(global)
-    {
-    this->GetGlobalGenerator()->AddTarget(target.get());
-    }
 
   // Transfer ownership to this cmMakefile object.
   this->ImportedTargetsOwned.push_back(target.get());
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c887fc8..f0f404c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -63,6 +63,7 @@ cmTarget::cmTarget()
   this->IsAndroid = false;
   this->IsApple = false;
   this->IsImportedTarget = false;
+  this->ImportedGloballyVisible = false;
   this->BuildInterfaceIncludesAppended = false;
 }
 
@@ -1505,9 +1506,10 @@ void cmTarget::CheckProperty(const std::string& prop,
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::MarkAsImported()
+void cmTarget::MarkAsImported(bool global)
 {
   this->IsImportedTarget = true;
+  this->ImportedGloballyVisible = global;
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 541e850..62e10f4 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -75,7 +75,7 @@ public:
    */
   void SetType(cmState::TargetType f, const std::string& name);
 
-  void MarkAsImported();
+  void MarkAsImported(bool global = false);
 
   ///! Set/Get the name of the target
   const std::string& GetName() const {return this->Name;}
@@ -186,6 +186,8 @@ public:
   void CheckProperty(const std::string& prop, cmMakefile* context) const;
 
   bool IsImported() const {return this->IsImportedTarget;}
+  bool IsImportedGloballyVisible() const
+  { return this->ImportedGloballyVisible; }
 
   // Get the properties
   cmPropertyMap &GetProperties() const { return this->Properties; }
@@ -349,6 +351,7 @@ private:
   bool IsAndroid;
   bool IsApple;
   bool IsImportedTarget;
+  bool ImportedGloballyVisible;
   bool BuildInterfaceIncludesAppended;
 #if defined(_WIN32) && !defined(__CYGWIN__)
   bool LinkLibrariesForVS6Analyzed;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=383bfd95432990365ac5c7fc3ab190bfb05cbec1
commit 383bfd95432990365ac5c7fc3ab190bfb05cbec1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 11:49:03 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:23 2015 +0100

    cmTargetCollectLinkLanguages: Remove cmMakefile dependency

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e19d5e5..9376e98 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1793,7 +1793,7 @@ public:
                                UNORDERED_SET<std::string>& languages,
                                cmGeneratorTarget const* head):
     Config(config), Languages(languages), HeadTarget(head),
-    Makefile(target->Target->GetMakefile()), Target(target)
+    Target(target)
   { this->Visited.insert(target); }
 
   void Visit(cmLinkItem const& item)
@@ -1805,7 +1805,8 @@ public:
         bool noMessage = false;
         cmake::MessageType messageType = cmake::FATAL_ERROR;
         std::stringstream e;
-        switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0028))
+        switch(this->Target->GetLocalGenerator()
+               ->GetPolicyStatus(cmPolicies::CMP0028))
           {
           case cmPolicies::WARN:
             {
@@ -1859,7 +1860,6 @@ private:
   std::string Config;
   UNORDERED_SET<std::string>& Languages;
   cmGeneratorTarget const* HeadTarget;
-  cmMakefile* Makefile;
   const cmGeneratorTarget* Target;
   std::set<cmGeneratorTarget const*> Visited;
 };

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f6beddae372a7ae47789f5460bcdfdac39c64e6
commit 7f6beddae372a7ae47789f5460bcdfdac39c64e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 11:37:34 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:23 2015 +0100

    cmGeneratorTarget: Port cmOptionalLinkImplementation

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3df43ff..e19d5e5 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -5560,7 +5560,7 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const
     }
 
   std::string CONFIG = cmSystemTools::UpperCase(config);
-  cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this->Target];
+  cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this];
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
@@ -5840,7 +5840,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal(
     return &hm.begin()->second;
     }
 
-  cmOptionalLinkImplementation& impl = hm[head->Target];
+  cmOptionalLinkImplementation& impl = hm[head];
   if(!impl.LibrariesDone)
     {
     impl.LibrariesDone = true;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 3c6f267..c2607a7 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -647,7 +647,7 @@ private:
                       const std::string& config) const;
 
   struct HeadToLinkImplementationMap:
-    public std::map<cmTarget const*, cmOptionalLinkImplementation> {};
+    public std::map<cmGeneratorTarget const*, cmOptionalLinkImplementation> {};
   typedef std::map<std::string,
                    HeadToLinkImplementationMap> LinkImplMapType;
   mutable LinkImplMapType LinkImplMap;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=520ca0ff6c123250c633a3618459d0161cbc4683
commit 520ca0ff6c123250c633a3618459d0161cbc4683
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 10:35:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:23 2015 +0100

    cmGeneratorTarget: Add API for property keys

diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 1daa67e..83127e7 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -105,16 +105,18 @@ cmExportTryCompileFileGenerator::PopulateProperties(
                                  ImportPropertyMap& properties,
                                  std::set<cmGeneratorTarget const*> &emitted)
 {
-  cmPropertyMap props = target->Target->GetProperties();
-  for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
+  std::vector<std::string> props = target->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator i = props.begin();
+      i != props.end(); ++i)
     {
-    properties[i->first] = i->second.GetValue();
 
-    if(i->first.find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0
-        || i->first.find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0
-        || i->first.find("INTERFACE_LINK_LIBRARIES") == 0)
+    properties[*i] = target->GetProperty(*i);
+
+    if(i->find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0
+        || i->find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0
+        || i->find("INTERFACE_LINK_LIBRARIES") == 0)
       {
-      std::string evalResult = this->FindTargets(i->first,
+      std::string evalResult = this->FindTargets(*i,
                                                  target, emitted);
 
       std::vector<std::string> depends;
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 651c89c..3df43ff 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4251,9 +4251,11 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
                                           PropertyType *)
 {
   PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
-  const bool explicitlySet = tgt->Target->GetProperties()
-                                  .find(p)
-                                  != tgt->Target->GetProperties().end();
+  std::vector<std::string> headPropKeys = tgt->GetPropertyKeys();
+  const bool explicitlySet =
+      std::find(headPropKeys.begin(), headPropKeys.end(),
+                p) != headPropKeys.end();
+
   const bool impliedByUse =
           tgt->IsNullImpliedByLinkLibraries(p);
   assert((impliedByUse ^ explicitlySet)
@@ -4298,9 +4300,11 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
 
     cmGeneratorTarget const* theTarget = *li;
 
-    const bool ifaceIsSet = theTarget->Target->GetProperties()
-                            .find(interfaceProperty)
-                            != theTarget->Target->GetProperties().end();
+    std::vector<std::string> propKeys = theTarget->GetPropertyKeys();
+
+    const bool ifaceIsSet =
+        std::find(propKeys.begin(), propKeys.end(),
+                  interfaceProperty) != propKeys.end();
     PropertyType ifacePropContent =
                     getTypedProperty<PropertyType>(theTarget,
                               interfaceProperty);
@@ -4577,6 +4581,19 @@ void cmGeneratorTarget::ComputeVersionedName(std::string& vName,
   vName += this->Makefile->IsOn("APPLE") ? suffix : std::string();
 }
 
+std::vector<std::string> cmGeneratorTarget::GetPropertyKeys() const
+{
+  cmPropertyMap propsObject = this->Target->GetProperties();
+  std::vector<std::string> props;
+  props.reserve(propsObject.size());
+  for (cmPropertyMap::const_iterator it = propsObject.begin();
+       it != propsObject.end(); ++it)
+    {
+    props.push_back(it->first);
+    }
+  return props;
+}
+
 //----------------------------------------------------------------------------
 void
 cmGeneratorTarget::ReportPropertyOrigin(const std::string &p,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 58c3421..3c6f267 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -57,6 +57,7 @@ public:
   std::string GetName() const;
   std::string GetExportName() const;
 
+  std::vector<std::string> GetPropertyKeys() const;
   const char *GetProperty(const std::string& prop) const;
   bool GetPropertyAsBool(const std::string& prop) const;
   void GetSourceFiles(std::vector<cmSourceFile*>& files,
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 5737bee..42f9758 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2486,13 +2486,13 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
   // put this last so it can override existing settings
   // Convert "XCODE_ATTRIBUTE_*" properties directly.
   {
-  cmPropertyMap const& props = gtgt->Target->GetProperties();
-  for(cmPropertyMap::const_iterator i = props.begin();
+  std::vector<std::string> const& props = gtgt->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator i = props.begin();
       i != props.end(); ++i)
     {
-    if(i->first.find("XCODE_ATTRIBUTE_") == 0)
+    if(i->find("XCODE_ATTRIBUTE_") == 0)
       {
-      std::string attribute = i->first.substr(16);
+      std::string attribute = i->substr(16);
       // Handle [variant=<config>] condition explicitly here.
       std::string::size_type beginVariant =
         attribute.find("[variant=");
@@ -2523,7 +2523,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
       if (!attribute.empty())
         {
         cmGeneratorExpression ge;
-        std::string processed = ge.Parse(i->second.GetValue())
+        std::string processed = ge.Parse(gtgt->GetProperty(*i))
           ->Evaluate(this->CurrentLocalGenerator, configName);
         buildSettings->AddAttribute(attribute.c_str(),
                                     this->CreateString(processed));
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 0eac203..ae6a24e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2219,17 +2219,18 @@ void cmLocalVisualStudio7Generator::WriteVCProjFooter(
 {
   fout << "\t<Globals>\n";
 
-  cmPropertyMap const& props = target->Target->GetProperties();
-  for(cmPropertyMap::const_iterator i = props.begin(); i != props.end(); ++i)
+  std::vector<std::string> const& props = target->GetPropertyKeys();
+  for(std::vector<std::string>::const_iterator i = props.begin();
+      i != props.end(); ++i)
     {
-    if(i->first.find("VS_GLOBAL_") == 0)
+    if(i->find("VS_GLOBAL_") == 0)
       {
-      std::string name = i->first.substr(10);
+      std::string name = i->substr(10);
       if(name != "")
         {
         fout << "\t\t<Global\n"
              << "\t\t\tName=\"" << name << "\"\n"
-             << "\t\t\tValue=\"" << i->second.GetValue() << "\"\n"
+             << "\t\t\tValue=\"" << target->GetProperty(*i) << "\"\n"
              << "\t\t/>\n";
         }
       }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e3c754b8cc3af463dcea95000daf3a18b359b7a
commit 3e3c754b8cc3af463dcea95000daf3a18b359b7a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 01:19:14 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:22 2015 +0100

    cmLocalGenerator: Port internals to cmGeneratorTarget

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1926772..b5f5ce9 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2033,7 +2033,7 @@ AddCompilerRequirementFlag(std::string &flags,
 }
 
 static void AddVisibilityCompileOption(std::string &flags,
-                                       cmTarget const* target,
+                                       cmGeneratorTarget const* target,
                                        cmLocalGenerator *lg,
                                        const std::string& lang,
                                        std::string* warnCMP0063)
@@ -2073,7 +2073,7 @@ static void AddVisibilityCompileOption(std::string &flags,
 }
 
 static void AddInlineVisibilityCompileOption(std::string &flags,
-                                       cmTarget const* target,
+                                       cmGeneratorTarget const* target,
                                        cmLocalGenerator *lg,
                                        std::string* warnCMP0063)
 {
@@ -2126,12 +2126,11 @@ void cmLocalGenerator
       }
     }
 
-  AddVisibilityCompileOption(flags, target->Target, this, lang, pWarnCMP0063);
+  AddVisibilityCompileOption(flags, target, this, lang, pWarnCMP0063);
 
   if(lang == "CXX")
     {
-    AddInlineVisibilityCompileOption(flags, target->Target,
-                                     this, pWarnCMP0063);
+    AddInlineVisibilityCompileOption(flags, target, this, pWarnCMP0063);
     }
 
   if (!warnCMP0063.empty() &&

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=593f347b5385a510e641eca0448f7ddf64c1c12b
commit 593f347b5385a510e641eca0448f7ddf64c1c12b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 00:49:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:22 2015 +0100

    VS7: Port some implementation details to cmGeneratorTarget

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 95a299d..0eac203 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -783,10 +783,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   intermediateDir += "/";
   intermediateDir += configName;
 
-  if (target->Target->GetType() < cmState::UTILITY)
+  if (target->GetType() < cmState::UTILITY)
     {
     std::string const& outDir =
-      target->Target->GetType() == cmState::OBJECT_LIBRARY?
+      target->GetType() == cmState::OBJECT_LIBRARY?
       intermediateDir : target->GetDirectory(configName);
     fout << "\t\t\tOutputDirectory=\""
          << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
@@ -837,7 +837,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   if(this->FortranProject)
     {
     const char* target_mod_dir =
-      target->Target->GetProperty("Fortran_MODULE_DIRECTORY");
+      target->GetProperty("Fortran_MODULE_DIRECTORY");
     std::string modDir;
     if(target_mod_dir)
       {
@@ -877,7 +877,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.OutputFlagMap(fout, "\t\t\t\t");
   targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
   fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
-  if(target->Target->GetType() <= cmState::OBJECT_LIBRARY)
+  if(target->GetType() <= cmState::OBJECT_LIBRARY)
     {
     // Specify the compiler program database file if configured.
     std::string pdb = target->GetCompilePDBPath(configName);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b127c62d4d4c94cf96e9d406859dbd24eed7dc9
commit 7b127c62d4d4c94cf96e9d406859dbd24eed7dc9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 15:42:04 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:22 2015 +0100

    VS7: Port remaining interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 340a0f7..f5848ab 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -401,7 +401,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
   for(OrderedTargetDependSet::const_iterator tt =
         projectTargets.begin(); tt != projectTargets.end(); ++tt)
     {
-    cmTarget const* target = (*tt)->Target;
+    cmGeneratorTarget const* target = *tt;
     if(target->GetType() == cmState::INTERFACE_LIBRARY)
       {
       continue;
@@ -996,7 +996,8 @@ cmGlobalVisualStudio7Generator
 std::set<std::string>
 cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
   std::vector<std::string> const& configs,
-  OrderedTargetDependSet const& projectTargets, cmTarget const* target)
+  OrderedTargetDependSet const& projectTargets,
+  cmGeneratorTarget const* target)
 {
   std::set<std::string> activeConfigs;
   // if it is a utilitiy target then only make it part of the
@@ -1011,13 +1012,13 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
       for(std::vector<std::string>::const_iterator i = configs.begin();
           i != configs.end(); ++i)
         {
-        const char* propertyValue = target->GetMakefile()
+        const char* propertyValue = target->Target->GetMakefile()
           ->GetDefinition("CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD");
         cmGeneratorExpression ge;
         cmsys::auto_ptr<cmCompiledGeneratorExpression>
           cge = ge.Parse(propertyValue);
-        cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
-        if(cmSystemTools::IsOn(cge->Evaluate(gt->GetLocalGenerator(), *i)))
+        if(cmSystemTools::IsOn(cge->Evaluate(target->GetLocalGenerator(),
+                                             *i)))
           {
           activeConfigs.insert(*i);
           }
@@ -1029,13 +1030,12 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
     {
     return activeConfigs;
     }
-  cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
   // inspect EXCLUDE_FROM_DEFAULT_BUILD[_<CONFIG>] properties
   for(std::vector<std::string>::const_iterator i = configs.begin();
       i != configs.end(); ++i)
     {
     const char* propertyValue =
-      gt->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i->c_str());
+      target->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i->c_str());
     if(cmSystemTools::IsOff(propertyValue))
       {
       activeConfigs.insert(*i);
@@ -1047,9 +1047,8 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
 bool
 cmGlobalVisualStudio7Generator
 ::IsDependedOn(OrderedTargetDependSet const& projectTargets,
-               cmTarget const* targetIn)
+               cmGeneratorTarget const* gtIn)
 {
-  cmGeneratorTarget* gtIn = this->GetGeneratorTarget(targetIn);
   for (OrderedTargetDependSet::const_iterator l = projectTargets.begin();
        l != projectTargets.end(); ++l)
     {
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 6a0e5e9..fe6db2e 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -163,9 +163,9 @@ protected:
   std::set<std::string>
     IsPartOfDefaultBuild(std::vector<std::string> const& configs,
                          OrderedTargetDependSet const& projectTargets,
-                         cmTarget const* target);
+                         cmGeneratorTarget const* target);
   bool IsDependedOn(OrderedTargetDependSet const& projectTargets,
-                    cmTarget const* target);
+                    cmGeneratorTarget const* target);
   std::map<std::string, std::string> GUIDMap;
 
   virtual void WriteFolders(std::ostream& fout);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=780bff5279c6c2d356e5c7726b656bd9c68532b8
commit 780bff5279c6c2d356e5c7726b656bd9c68532b8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 14:58:23 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:22 2015 +0100

    cmake: Store hardcoded lists of sources and headers
    
    Don't duplicate this in each cmMakefile.

diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index 5f5017d..92ac07d 100644
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@@ -60,10 +60,10 @@ bool cmAuxSourceDirectoryCommand::InitialPass
         std::string ext = file.substr(dotpos+1);
         std::string base = file.substr(0, dotpos);
         // Process only source files
-        if(!base.empty()
-            && std::find( this->Makefile->GetSourceExtensions().begin(),
-                          this->Makefile->GetSourceExtensions().end(), ext )
-                 != this->Makefile->GetSourceExtensions().end() )
+        std::vector<std::string> srcExts =
+            this->Makefile->GetCMakeInstance()->GetSourceExtensions();
+        if(!base.empty() &&
+           std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end())
           {
           std::string fullname = templateDirectory;
           fullname += "/";
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 597c9d8..9348ef2 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -383,6 +383,9 @@ void cmExtraCodeBlocksGenerator
   all_files_map_t allFiles;
   std::vector<std::string> cFiles;
 
+  std::vector<std::string> srcExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetSourceExtensions();
+
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
        lg!=lgs.end(); lg++)
     {
@@ -420,9 +423,7 @@ void cmExtraCodeBlocksGenerator
               {
               std::string srcext = (*si)->GetExtension();
               for(std::vector<std::string>::const_iterator
-                  ext = mf->GetSourceExtensions().begin();
-                  ext !=  mf->GetSourceExtensions().end();
-                  ++ext)
+                  ext = srcExts.begin(); ext != srcExts.end(); ++ext)
                 {
                 if (srcext == *ext)
                   {
@@ -449,6 +450,9 @@ void cmExtraCodeBlocksGenerator
       }
     }
 
+  std::vector<std::string> headerExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetHeaderExtensions();
+
   // The following loop tries to add header files matching to implementation
   // files to the project. It does that by iterating over all
   // C/C++ source files,
@@ -468,8 +472,8 @@ void cmExtraCodeBlocksGenerator
 
     // check if there's a matching header around
     for(std::vector<std::string>::const_iterator
-        ext = mf->GetHeaderExtensions().begin();
-        ext !=  mf->GetHeaderExtensions().end();
+        ext = headerExts.begin();
+        ext != headerExts.end();
         ++ext)
       {
       std::string hname=headerBasename;
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index f4a6537..67aa157 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -149,6 +149,11 @@ void cmExtraCodeLiteGenerator
   // which may have an acompanying header, one for all other files
   std::string projectType;
 
+  std::vector<std::string> srcExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetSourceExtensions();
+  std::vector<std::string> headerExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetHeaderExtensions();
+
   std::map<std::string, cmSourceFile*> cFiles;
   std::set<std::string> otherFiles;
   for (std::vector<cmLocalGenerator*>::const_iterator lg=lgs.begin();
@@ -207,9 +212,7 @@ void cmExtraCodeLiteGenerator
               {
               std::string srcext = (*si)->GetExtension();
               for(std::vector<std::string>::const_iterator
-                  ext = mf->GetSourceExtensions().begin();
-                  ext !=  mf->GetSourceExtensions().end();
-                  ++ext)
+                  ext = srcExts.begin(); ext != srcExts.end(); ++ext)
                 {
                 if (srcext == *ext)
                   {
@@ -253,8 +256,8 @@ void cmExtraCodeLiteGenerator
 
     // check if there's a matching header around
     for(std::vector<std::string>::const_iterator
-        ext = mf->GetHeaderExtensions().begin();
-        ext !=  mf->GetHeaderExtensions().end();
+        ext = headerExts.begin();
+        ext != headerExts.end();
         ++ext)
       {
       std::string hname=headerBasename;
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 7c6c48c..018ab24 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -105,6 +105,9 @@ bool cmGlobalKdevelopGenerator
   std::set<std::string> files;
   std::string tmp;
 
+  std::vector<std::string> hdrExts =
+      this->GlobalGenerator->GetCMakeInstance()->GetHeaderExtensions();
+
   for (std::vector<cmLocalGenerator*>::const_iterator it=lgs.begin();
        it!=lgs.end(); it++)
     {
@@ -160,8 +163,7 @@ bool cmGlobalKdevelopGenerator
 
           // check if there's a matching header around
           for(std::vector<std::string>::const_iterator
-                ext = makefile->GetHeaderExtensions().begin();
-              ext !=  makefile->GetHeaderExtensions().end(); ++ext)
+                ext = hdrExts.begin(); ext != hdrExts.end(); ++ext)
             {
             std::string hname=headerBasename;
             hname += ".";
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9a5c367..5737bee 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1420,7 +1420,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt)
 bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf)
 {
   const std::vector<std::string>& hdrExts =
-    this->CurrentMakefile->GetHeaderExtensions();
+    this->CMakeInstance->GetHeaderExtensions();
   return (std::find(hdrExts.begin(), hdrExts.end(), sf->GetExtension()) !=
           hdrExts.end());
 }
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 361aa99..3bf34e2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -57,31 +57,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
 
   // Setup the default include complaint regular expression (match nothing).
   this->ComplainFileRegularExpression = "^$";
-  // Source and header file extensions that we can handle
-
-  // Set up a list of source and header extensions
-  // these are used to find files when the extension
-  // is not given
-  // The "c" extension MUST precede the "C" extension.
-  this->SourceFileExtensions.push_back( "c" );
-  this->SourceFileExtensions.push_back( "C" );
-
-  this->SourceFileExtensions.push_back( "c++" );
-  this->SourceFileExtensions.push_back( "cc" );
-  this->SourceFileExtensions.push_back( "cpp" );
-  this->SourceFileExtensions.push_back( "cxx" );
-  this->SourceFileExtensions.push_back( "m" );
-  this->SourceFileExtensions.push_back( "M" );
-  this->SourceFileExtensions.push_back( "mm" );
-
-  this->HeaderFileExtensions.push_back( "h" );
-  this->HeaderFileExtensions.push_back( "hh" );
-  this->HeaderFileExtensions.push_back( "h++" );
-  this->HeaderFileExtensions.push_back( "hm" );
-  this->HeaderFileExtensions.push_back( "hpp" );
-  this->HeaderFileExtensions.push_back( "hxx" );
-  this->HeaderFileExtensions.push_back( "in" );
-  this->HeaderFileExtensions.push_back( "txx" );
 
   this->DefineFlags = " ";
 
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 725448b..f3dbb74 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -425,17 +425,6 @@ public:
   cmSourceFile* GetOrCreateSource(const std::string& sourceName,
                                   bool generated = false);
 
-  //@{
-  /**
-   * Return a list of extensions associated with source and header
-   * files
-   */
-  const std::vector<std::string>& GetSourceExtensions() const
-    {return this->SourceFileExtensions;}
-  const std::vector<std::string>& GetHeaderExtensions() const
-    {return this->HeaderFileExtensions;}
-  //@}
-
   /**
    * Given a variable name, return its value (as a string).
    * If the variable is not found in this makefile instance, the
@@ -823,8 +812,6 @@ protected:
   std::vector<cmTestGenerator*> TestGenerators;
 
   std::string ComplainFileRegularExpression;
-  std::vector<std::string> SourceFileExtensions;
-  std::vector<std::string> HeaderFileExtensions;
   std::string DefineFlags;
 
   // Track the value of the computed DEFINITIONS property.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index fc690f8..b16eccd 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -528,7 +528,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
   cmSystemTools::ExpandListArgument(this->Sources, sourceFiles);
 
   const std::vector<std::string>& headerExtensions =
-                                               makefile->GetHeaderExtensions();
+      makefile->GetCMakeInstance()->GetHeaderExtensions();
 
   std::map<std::string, std::vector<std::string> > includedUis;
   std::map<std::string, std::vector<std::string> > skippedUis;
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 37383be..a9ac549 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -167,8 +167,10 @@ bool cmSourceFile::FindFullPath(std::string* error)
     {
     tryDirs[0] = "";
     }
-  const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
-  const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions();
+  const std::vector<std::string>& srcExts =
+      mf->GetCMakeInstance()->GetSourceExtensions();
+  std::vector<std::string> hdrExts =
+      mf->GetCMakeInstance()->GetHeaderExtensions();
   for(const char* const* di = tryDirs; *di; ++di)
     {
     std::string tryPath = this->Location.GetDirectory();
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index b8d5c02..00d5d6a 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -121,8 +121,10 @@ void cmSourceFileLocation::UpdateExtension(const std::string& name)
   // The global generator checks extensions of enabled languages.
   cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator();
   cmMakefile const* mf = this->Makefile;
-  const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
-  const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions();
+  const std::vector<std::string>& srcExts =
+      mf->GetCMakeInstance()->GetSourceExtensions();
+  const std::vector<std::string>& hdrExts =
+      mf->GetCMakeInstance()->GetHeaderExtensions();
   if(!gg->GetLanguageFromExtension(ext.c_str()).empty() ||
      std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end() ||
      std::find(hdrExts.begin(), hdrExts.end(), ext) != hdrExts.end())
@@ -193,12 +195,14 @@ cmSourceFileLocation
   // disk.  One of these must match if loc refers to this source file.
   std::string const& ext = this->Name.substr(loc.Name.size()+1);
   cmMakefile const* mf = this->Makefile;
-  const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
+  const std::vector<std::string>& srcExts =
+      mf->GetCMakeInstance()->GetSourceExtensions();
   if(std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end())
     {
     return true;
     }
-  const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions();
+  std::vector<std::string> hdrExts =
+      mf->GetCMakeInstance()->GetHeaderExtensions();
   if(std::find(hdrExts.begin(), hdrExts.end(), ext) != hdrExts.end())
     {
     return true;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 7268241..16417fc 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -165,6 +165,30 @@ cmake::cmake()
 
   // Make sure we can capture the build tool output.
   cmSystemTools::EnableVSConsoleOutput();
+
+  // Set up a list of source and header extensions
+  // these are used to find files when the extension
+  // is not given
+  // The "c" extension MUST precede the "C" extension.
+  this->SourceFileExtensions.push_back( "c" );
+  this->SourceFileExtensions.push_back( "C" );
+
+  this->SourceFileExtensions.push_back( "c++" );
+  this->SourceFileExtensions.push_back( "cc" );
+  this->SourceFileExtensions.push_back( "cpp" );
+  this->SourceFileExtensions.push_back( "cxx" );
+  this->SourceFileExtensions.push_back( "m" );
+  this->SourceFileExtensions.push_back( "M" );
+  this->SourceFileExtensions.push_back( "mm" );
+
+  this->HeaderFileExtensions.push_back( "h" );
+  this->HeaderFileExtensions.push_back( "hh" );
+  this->HeaderFileExtensions.push_back( "h++" );
+  this->HeaderFileExtensions.push_back( "hm" );
+  this->HeaderFileExtensions.push_back( "hpp" );
+  this->HeaderFileExtensions.push_back( "hxx" );
+  this->HeaderFileExtensions.push_back( "in" );
+  this->HeaderFileExtensions.push_back( "txx" );
 }
 
 cmake::~cmake()
diff --git a/Source/cmake.h b/Source/cmake.h
index 9d28cba..6b0e83f 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -182,6 +182,11 @@ class cmake
   ///! get the cmCachemManager used by this invocation of cmake
   cmCacheManager *GetCacheManager() { return this->CacheManager; }
 
+  const std::vector<std::string>& GetSourceExtensions() const
+    {return this->SourceFileExtensions;}
+  const std::vector<std::string>& GetHeaderExtensions() const
+    {return this->HeaderFileExtensions;}
+
   /**
    * Given a variable name, return its value (as a string).
    */
@@ -391,6 +396,8 @@ private:
   std::string CheckStampFile;
   std::string CheckStampList;
   std::string VSSolutionFile;
+  std::vector<std::string> SourceFileExtensions;
+  std::vector<std::string> HeaderFileExtensions;
   bool ClearBuildSystem;
   bool DebugTryCompile;
   cmFileTimeComparison* FileComparison;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bd7bd1e06fcf92d40c762f2713626d125cb8f87
commit 6bd7bd1e06fcf92d40c762f2713626d125cb8f87
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 13:30:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:22 2015 +0100

    Export: Use existing IsDLLPlatform porcelain

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 23c11d7..9e36539 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -213,12 +213,8 @@ cmExportBuildFileGenerator
   properties[prop] = value;
   }
 
-  // Check whether this is a DLL platform.
-  bool dll_platform =
-    (mf->IsOn("WIN32") || mf->IsOn("CYGWIN") || mf->IsOn("MINGW"));
-
   // Add the import library for windows DLLs.
-  if(dll_platform &&
+  if(target->IsDLLPlatform() &&
      (target->GetType() == cmState::SHARED_LIBRARY ||
       target->IsExecutableWithExports()) &&
      mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX"))
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d52ce35..e8a2e6a 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -879,10 +879,7 @@ cmExportFileGenerator
   if(target->GetType() == cmState::SHARED_LIBRARY ||
      target->GetType() == cmState::MODULE_LIBRARY)
     {
-    // Check whether this is a DLL platform.
-    bool dll_platform =
-      (mf->IsOn("WIN32") || mf->IsOn("CYGWIN") || mf->IsOn("MINGW"));
-    if(!dll_platform)
+    if(!target->IsDLLPlatform())
       {
       std::string prop;
       std::string value;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b397eae82e14fdf75eddcbfd022d9f2d5933eb1e
commit b397eae82e14fdf75eddcbfd022d9f2d5933eb1e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 09:29:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:21 2015 +0100

    cmGeneratorTarget: Move LinkLanguagePropagatesToDependents from cmTarget

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7e75d93..df6e3fb 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -999,7 +999,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
 
     if (propertyName == "LINKER_LANGUAGE")
       {
-      if (target->Target->LinkLanguagePropagatesToDependents() &&
+      if (target->LinkLanguagePropagatesToDependents() &&
           dagCheckerParent && (dagCheckerParent->EvaluatingLinkLibraries()
             || dagCheckerParent->EvaluatingSources()))
         {
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index eb433f5..651c89c 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4770,7 +4770,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
     iface.WrongConfigLibraries = impl->WrongConfigLibraries;
     }
 
-  if(this->Target->LinkLanguagePropagatesToDependents())
+  if(this->LinkLanguagePropagatesToDependents())
     {
     // Targets using this archive need its language runtime libraries.
     if(cmLinkImplementation const* impl =
@@ -5485,7 +5485,7 @@ void cmGeneratorTarget::ComputeImportInfo(std::string const& desired_config,
   }
 
   // Get the link languages.
-  if(this->Target->LinkLanguagePropagatesToDependents())
+  if(this->LinkLanguagePropagatesToDependents())
     {
     std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES";
     linkProp += suffix;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 588ff33..58c3421 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -189,6 +189,9 @@ public:
   std::set<std::string>const& GetUtilities() const;
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
+  bool LinkLanguagePropagatesToDependents() const
+  { return this->GetType() == cmState::STATIC_LIBRARY; }
+
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 17a1d4d..541e850 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -227,9 +227,6 @@ public:
   std::set<std::string> const & GetSystemIncludeDirectories() const
     { return this->SystemIncludeDirectories; }
 
-  bool LinkLanguagePropagatesToDependents() const
-  { return this->TargetTypeValue == cmState::STATIC_LIBRARY; }
-
   cmStringRange GetIncludeDirectoriesEntries() const;
   cmBacktraceRange GetIncludeDirectoriesBacktraces() const;
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00b8c0a8d4b59dc01276d083ccae4a8138718b12
commit 00b8c0a8d4b59dc01276d083ccae4a8138718b12
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:17:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:21 2015 +0100

    cmLocalGenerator: Add IsRootMakefile API

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index b4a915c..7dd24fb 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -523,7 +523,7 @@ cmGlobalUnixMakefileGenerator3
                        cmLocalUnixMakefileGenerator3* lg)
 {
   // Only subdirectories need these rules.
-  if(lg->GetMakefile()->IsRootMakefile())
+  if(lg->IsRootMakefile())
     {
     return;
     }
@@ -1084,7 +1084,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
       static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
     // for the passed in makefile or if this is the top Makefile wripte out
     // the targets
-    if (lg2 == lg || lg->GetMakefile()->IsRootMakefile())
+    if (lg2 == lg || lg->IsRootMakefile())
       {
       // for each target Generate the rule files for each target.
       std::vector<cmGeneratorTarget*> targets = lg2->GetGeneratorTargets();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 5f0242e..1926772 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -490,6 +490,11 @@ void cmLocalGenerator::ComputeTargetManifest()
     }
 }
 
+bool cmLocalGenerator::IsRootMakefile() const
+{
+  return !this->StateSnapshot.GetBuildsystemDirectoryParent().IsValid();
+}
+
 cmState* cmLocalGenerator::GetState() const
 {
   return this->GlobalGenerator->GetCMakeInstance()->GetState();
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 6380db6..46eb1b3 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -67,6 +67,8 @@ public:
    */
   void ComputeTargetManifest();
 
+  bool IsRootMakefile() const;
+
   ///! Get the makefile for this generator
   cmMakefile *GetMakefile() {
     return this->Makefile; }
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 891c44e..7de48a4 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -56,7 +56,7 @@ void cmLocalNinjaGenerator::Generate()
 #endif
 
   // We do that only once for the top CMakeLists.txt file.
-  if(this->Makefile->IsRootMakefile())
+  if(this->IsRootMakefile())
     {
     this->WriteBuildFileTop();
 
@@ -277,7 +277,7 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
     << "# Write statements declared in CMakeLists.txt:" << std::endl
     << "# "
     << this->Makefile->GetDefinition("CMAKE_CURRENT_LIST_FILE") << std::endl;
-  if(this->Makefile->IsRootMakefile())
+  if(this->IsRootMakefile())
     os << "# Which is the root file." << std::endl;
   cmGlobalNinjaGenerator::WriteDivider(os);
   os << std::endl;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 9bb2765..82e3b01 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -254,7 +254,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
     return;
     }
   // always write the top makefile
-  if (!this->GetMakefile()->IsRootMakefile())
+  if (!this->IsRootMakefile())
     {
     ruleFileStream.SetCopyIfDifferent(true);
     }
@@ -265,7 +265,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
   // only write local targets unless at the top Keep track of targets already
   // listed.
   std::set<std::string> emittedTargets;
-  if (!this->GetMakefile()->IsRootMakefile())
+  if (!this->IsRootMakefile())
     {
     // write our targets, and while doing it collect up the object
     // file rules
@@ -880,7 +880,7 @@ void cmLocalUnixMakefileGenerator3
   std::vector<std::string> no_depends;
   std::vector<std::string> commands;
   commands.push_back(runRule);
-  if(!this->GetMakefile()->IsRootMakefile())
+  if(!this->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
                           this->GetBinaryDirectory(),

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c6374bcc56ea7d7f7e67c518e60de94be267256
commit 4c6374bcc56ea7d7f7e67c518e60de94be267256
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:14:08 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:21 2015 +0100

    Genex: use cmGeneratorTarget policy API

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 03f8d3f..7e75d93 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1442,7 +1442,7 @@ cmPolicies::PolicyStatus statusForTarget(cmGeneratorTarget const* tgt,
 #define RETURN_POLICY(POLICY) \
   if (strcmp(policy, #POLICY) == 0) \
   { \
-    return tgt->Target->GetPolicyStatus ## POLICY (); \
+    return tgt->GetPolicyStatus ## POLICY (); \
   } \
 
   CM_FOR_EACH_TARGET_POLICY(RETURN_POLICY)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d409f500e3403f8dbb4a0fee6ecdad94f45c35e
commit 7d409f500e3403f8dbb4a0fee6ecdad94f45c35e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:13:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:21 2015 +0100

    cmLocalGenerator: Add GetPolicyStatus API

diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7a7e4ff..03f8d3f 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -393,7 +393,7 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
 
     if (cmsysString_strcasecmp(parameters.begin()->c_str(), compilerId) == 0)
       {
-      switch(context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0044))
+      switch(context->LG->GetPolicyStatus(cmPolicies::CMP0044))
         {
         case cmPolicies::WARN:
           {
@@ -1100,7 +1100,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
                            "COMPILE_DEFINITIONS_"))
       {
       cmPolicies::PolicyStatus polSt =
-          context->LG->GetMakefile()->GetPolicyStatus(cmPolicies::CMP0043);
+          context->LG->GetPolicyStatus(cmPolicies::CMP0043);
       if (polSt == cmPolicies::WARN || polSt == cmPolicies::OLD)
         {
         interfacePropertyName = "INTERFACE_COMPILE_DEFINITIONS";
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c37417d..5f0242e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2201,7 +2201,7 @@ bool cmLocalGenerator::GetShouldUseOldFlags(bool shared,
 
     if (flags && flags != originalFlags)
       {
-      switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0018))
+      switch (this->GetPolicyStatus(cmPolicies::CMP0018))
         {
         case cmPolicies::WARN:
         {
@@ -2949,7 +2949,7 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
 {
   // Check the policy to decide whether to pay attention to this
   // variable.
-  switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0001))
+  switch(this->GetPolicyStatus(cmPolicies::CMP0001))
     {
     case cmPolicies::WARN:
       // WARN is just OLD without warning because user code does not
@@ -2976,6 +2976,12 @@ bool cmLocalGenerator::NeedBackwardsCompatibility_2_4()
           actual_compat <= CMake_VERSION_ENCODE(2, 4, 255));
 }
 
+cmPolicies::PolicyStatus
+cmLocalGenerator::GetPolicyStatus(cmPolicies::PolicyID id) const
+{
+  return this->Makefile->GetPolicyStatus(id);
+}
+
 //----------------------------------------------------------------------------
 bool cmLocalGenerator::CheckDefinition(std::string const& define) const
 {
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 552020b..6380db6 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -265,6 +265,8 @@ public:
    */
   bool NeedBackwardsCompatibility_2_4();
 
+  cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id) const;
+
   cmake* GetCMakeInstance() const;
 
   const char* GetSourceDirectory() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a1b83cb3fc79639b9e2c1bf11af2d2274e4224a
commit 7a1b83cb3fc79639b9e2c1bf11af2d2274e4224a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:04:07 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:21 2015 +0100

    cmGeneratorTarget: Add GetUtilityBacktrace API

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 113c989..586b5bf 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -382,7 +382,7 @@ void cmComputeTargetDepends::AddTargetDepend(
         << "\" of target \"" << depender->GetName() << "\" does not exist.";
 
       cmListFileBacktrace const* backtrace =
-        depender->Target->GetUtilityBacktrace(dependee_name);
+        depender->GetUtilityBacktrace(dependee_name);
       if(backtrace)
         {
         cm->IssueMessage(messageType, e.str(), *backtrace);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7d5a9d0..eb433f5 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1742,6 +1742,12 @@ const std::set<std::string>& cmGeneratorTarget::GetUtilities() const
   return this->Target->GetUtilities();
 }
 
+const cmListFileBacktrace*
+cmGeneratorTarget::GetUtilityBacktrace(const std::string& u) const
+{
+  return this->Target->GetUtilityBacktrace(u);
+}
+
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index ff975c5..588ff33 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -187,6 +187,8 @@ public:
   const std::vector<std::string>& GetLinkDirectories() const;
 
   std::set<std::string>const& GetUtilities() const;
+  cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
+
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=736c2042c6bade0322441aafabababcbd92af52e
commit 736c2042c6bade0322441aafabababcbd92af52e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 01:01:46 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:20 2015 +0100

    cmGeneratorTarget: Add GetUtilities API

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7516576..7d5a9d0 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -796,7 +796,7 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const
   if(!this->UtilityItemsDone)
     {
     this->UtilityItemsDone = true;
-    std::set<std::string> const& utilities = this->Target->GetUtilities();
+    std::set<std::string> const& utilities = this->GetUtilities();
     for(std::set<std::string>::const_iterator i = utilities.begin();
         i != utilities.end(); ++i)
       {
@@ -1737,6 +1737,11 @@ const std::vector<std::string>&cmGeneratorTarget::GetLinkDirectories() const
   return this->Target->GetLinkDirectories();
 }
 
+const std::set<std::string>& cmGeneratorTarget::GetUtilities() const
+{
+  return this->Target->GetUtilities();
+}
+
 //----------------------------------------------------------------------------
 bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const
 {
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 38e1826..ff975c5 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -186,6 +186,7 @@ public:
 
   const std::vector<std::string>& GetLinkDirectories() const;
 
+  std::set<std::string>const& GetUtilities() const;
   /** Get the macro to define when building sources in this target.
       If no macro should be defined null is returned.  */
   const char* GetExportMacro() const;
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 2671f4d..8498e39 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -965,7 +965,7 @@ cmGlobalNinjaGenerator
   if (target->GetType() == cmState::GLOBAL_TARGET) {
     // Global targets only depend on other utilities, which may not appear in
     // the TargetDepends set (e.g. "all").
-    std::set<std::string> const& utils = target->Target->GetUtilities();
+    std::set<std::string> const& utils = target->GetUtilities();
     std::copy(utils.begin(), utils.end(), std::back_inserter(outputs));
   } else {
     cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(target);
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index bb494f1..5866c0e 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -235,7 +235,7 @@ void cmGlobalVisualStudio6Generator
       std::string project = target->GetName();
       std::string location = expath;
       this->WriteExternalProject(fout, project.c_str(),
-          location.c_str(), target->Target->GetUtilities());
+          location.c_str(), target->GetUtilities());
       }
     else
       {
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 5473247..340a0f7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -459,7 +459,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
                                  project.c_str(),
                                  location.c_str(),
                                  target->GetProperty("VS_PROJECT_TYPE"),
-                                 target->Target->GetUtilities());
+                                 target->GetUtilities());
       written = true;
       }
     else
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index bdb1b25..b771f11 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -464,8 +464,8 @@ bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
 {
   // Look for utility dependencies that magically link.
   for(std::set<std::string>::const_iterator ui =
-        target->Target->GetUtilities().begin();
-      ui != target->Target->GetUtilities().end(); ++ui)
+        target->GetUtilities().begin();
+      ui != target->GetUtilities().end(); ++ui)
     {
     if(cmGeneratorTarget* depTarget =
         target->GetLocalGenerator()->FindGeneratorTargetToUse(ui->c_str()))
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 541257b..9bb2765 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1778,8 +1778,8 @@ void cmLocalUnixMakefileGenerator3
         {
         text = "Running external command ...";
         }
-      depends.insert(depends.end(), (*glIt)->Target->GetUtilities().begin(),
-                     (*glIt)->Target->GetUtilities().end());
+      depends.insert(depends.end(), (*glIt)->GetUtilities().begin(),
+                     (*glIt)->GetUtilities().end());
       this->AppendEcho(commands, text,
                        cmLocalUnixMakefileGenerator3::EchoGlobal);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f210cb131e5814631d6d2974cf2437632446654f
commit f210cb131e5814631d6d2974cf2437632446654f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:59:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 07:44:20 2015 +0100

    cmTarget: Make compatbility API explicit.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..361aa99 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -756,15 +756,26 @@ void cmMakefile::ConfigureFinalPass()
       "with CMake 2.4 or later. For compatibility with older versions please "
       "use any CMake 2.8.x release or lower.");
     }
-  for (cmTargets::iterator l = this->Targets.begin();
-       l != this->Targets.end(); l++)
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  // Do old-style link dependency analysis only for CM_USE_OLD_VS6.
+  if(this->GetGlobalGenerator()->IsForVS6())
     {
-    if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+    for (cmTargets::iterator l = this->Targets.begin();
+         l != this->Targets.end(); l++)
       {
-      continue;
+      if (l->second.GetType() == cmState::INTERFACE_LIBRARY)
+        {
+        continue;
+        }
+      // Erase any cached link information that might have been comptued
+      // on-demand during the configuration.  This ensures that build
+      // system generation uses up-to-date information even if other cache
+      // invalidation code in this source file is buggy.
+
+      l->second.AnalyzeLibDependenciesForVS6(*this);
       }
-    l->second.FinishConfigure();
     }
+#endif
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0c0cf8e..c887fc8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -315,23 +315,6 @@ cmListFileBacktrace const* cmTarget::GetUtilityBacktrace(
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::FinishConfigure()
-{
-  // Erase any cached link information that might have been comptued
-  // on-demand during the configuration.  This ensures that build
-  // system generation uses up-to-date information even if other cache
-  // invalidation code in this source file is buggy.
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-  // Do old-style link dependency analysis only for CM_USE_OLD_VS6.
-  if(this->Makefile->GetGlobalGenerator()->IsForVS6())
-    {
-    this->AnalyzeLibDependenciesForVS6(*this->Makefile);
-    }
-#endif
-}
-
-//----------------------------------------------------------------------------
 cmListFileBacktrace const& cmTarget::GetBacktrace() const
 {
   return this->Backtrace;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7e7e34a..17a1d4d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -176,9 +176,6 @@ public:
   std::set<std::string>const& GetUtilities() const { return this->Utilities; }
   cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
 
-  /** Finalize the target at the end of the Configure step.  */
-  void FinishConfigure();
-
   ///! Set/Get a property of this target file
   void SetProperty(const std::string& prop, const char *value);
   void AppendProperty(const std::string&  prop, const char* value,
@@ -250,10 +247,11 @@ public:
   cmStringRange GetLinkImplementationEntries() const;
   cmBacktraceRange GetLinkImplementationBacktraces() const;
 
-
 #if defined(_WIN32) && !defined(__CYGWIN__)
   const LinkLibraryVectorType &GetLinkLibrariesForVS6() const {
   return this->LinkLibrariesForVS6;}
+
+  void AnalyzeLibDependenciesForVS6( const cmMakefile& mf );
 #endif
 
   struct StrictTargetComparison {
@@ -312,8 +310,6 @@ private:
   void GatherDependenciesForVS6( const cmMakefile& mf,
                                  const LibraryID& lib,
                                  DependencyMap& dep_map);
-
-  void AnalyzeLibDependenciesForVS6( const cmMakefile& mf );
 #endif
 
   const char* GetSuffixVariableInternal(bool implib) const;

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 27 04:08:48 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 27 Oct 2015 04:08:48 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1126-gb398ad6
Message-ID: <20151027080848.626B4C117A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b398ad685ee8e6becd8a8da37af80d12e4d8e14d (commit)
       via  08147a9a0cee722196ddf8d63c25c5d1f8ebd336 (commit)
      from  dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b398ad685ee8e6becd8a8da37af80d12e4d8e14d
commit b398ad685ee8e6becd8a8da37af80d12e4d8e14d
Merge: dcf76f3 08147a9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 04:08:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 04:08:47 2015 -0400

    Merge topic 'use-correct-rcc-command-option' into next
    
    08147a9a Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08147a9a0cee722196ddf8d63c25c5d1f8ebd336
commit 08147a9a0cee722196ddf8d63c25c5d1f8ebd336
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 09:00:24 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 09:08:25 2015 +0100

    Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
    
    This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0.
    
    It was the wrong thing to do, as made obvious in the bug report because it
    changes cmake from doing the right thing (using --list) to doing the wrong
    thing (using -list, which exists only for compatibility).
    
    Qt 5.1 is old enough that cmake should not get new support for it in
    CMake 3.4.  That would be a maintainance cost forever, including into Qt 6
    times because of the use of the compatibility-only switch.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 225c03e..053c805 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -494,7 +494,7 @@ static std::string ListQt5RccInputs(cmSourceFile* sf,
 
   std::vector<std::string> command;
   command.push_back(rccCommand);
-  command.push_back("-list");
+  command.push_back("--list");
 
   std::string absFile = cmsys::SystemTools::GetRealPath(
                                               sf->GetFullPath());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 27 09:55:17 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 27 Oct 2015 09:55:17 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1128-g661712c
Message-ID: <20151027135517.A4544C0DF5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  661712cd21acc4ae8d6fc865eae49a6c9c696557 (commit)
       via  1e1bf45e270773fa5b85957a1753dfa162baca9d (commit)
      from  b398ad685ee8e6becd8a8da37af80d12e4d8e14d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=661712cd21acc4ae8d6fc865eae49a6c9c696557
commit 661712cd21acc4ae8d6fc865eae49a6c9c696557
Merge: b398ad6 1e1bf45
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 09:55:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 09:55:16 2015 -0400

    Merge topic 'use-correct-rcc-command-option' into next
    
    1e1bf45e Revert "Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)""


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e1bf45e270773fa5b85957a1753dfa162baca9d
commit 1e1bf45e270773fa5b85957a1753dfa162baca9d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 09:53:40 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 27 09:53:40 2015 -0400

    Revert "Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)""
    
    This reverts commit 08147a9a0cee722196ddf8d63c25c5d1f8ebd336.
    Discussion in the bug report pointed out that the proper fix is
    to adapt based on the availability of -list or --list from the
    version of rcc found.  Using -list is how to support all existing
    versions of Qt.  Detecting when --list is available is how to
    support new versions of Qt that offer it and future versions of
    Qt that do not offer -list.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 053c805..225c03e 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -494,7 +494,7 @@ static std::string ListQt5RccInputs(cmSourceFile* sf,
 
   std::vector<std::string> command;
   command.push_back(rccCommand);
-  command.push_back("--list");
+  command.push_back("-list");
 
   std::string absFile = cmsys::SystemTools::GetRealPath(
                                               sf->GetFullPath());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Tue Oct 27 14:00:19 2015
From: brad.king at kitware.com (Brad King)
Date: Tue, 27 Oct 2015 14:00:19 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1130-g543db74
Message-ID: <20151027180019.9AA79C09BB@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  543db74ee695f2da558b1524a77850dd2d491fbd (commit)
       via  c34258c8190cbf2978067168d80fc4c6bb41d369 (commit)
      from  661712cd21acc4ae8d6fc865eae49a6c9c696557 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=543db74ee695f2da558b1524a77850dd2d491fbd
commit 543db74ee695f2da558b1524a77850dd2d491fbd
Merge: 661712c c34258c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 14:00:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 14:00:18 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    c34258c8 cmGeneratorExpressionEvaluator.h: Include a CMake header first


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c34258c8190cbf2978067168d80fc4c6bb41d369
commit c34258c8190cbf2978067168d80fc4c6bb41d369
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 13:55:57 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 27 13:59:12 2015 -0400

    cmGeneratorExpressionEvaluator.h: Include a CMake header first
    
    On AIX we need to include our own headers first to get large file
    support macros defined consistently within system headers.  The old
    order in this header worked only because it was always included after
    other headers.

diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index db56eb1..407f83f 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -12,12 +12,12 @@
 #ifndef cmGeneratorExpressionEvaluator_h
 #define cmGeneratorExpressionEvaluator_h
 
-#include <vector>
-#include <string>
-
 #include "cmListFileCache.h"
 #include "cmGeneratorExpressionContext.h"
 
+#include <vector>
+#include <string>
+
 struct cmGeneratorExpressionDAGChecker;
 struct cmGeneratorExpressionNode;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 27 16:46:24 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 27 Oct 2015 16:46:24 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1134-gb033817
Message-ID: <20151027204624.8960CC094C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b0338173a7374c328c7b10691da55d4ffa57fda5 (commit)
       via  6a56c8247fa874bd418c3e175c941070dafb0e76 (commit)
       via  5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0 (commit)
       via  8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b (commit)
      from  543db74ee695f2da558b1524a77850dd2d491fbd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0338173a7374c328c7b10691da55d4ffa57fda5
commit b0338173a7374c328c7b10691da55d4ffa57fda5
Merge: 543db74 6a56c82
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 16:46:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 16:46:22 2015 -0400

    Merge topic 'fix-ctest_test-parallel-execution' into next
    
    6a56c824 Tests: Disable parallel test execution while running ctest_test
    5f14040c Tests: Don't overwrite RunCMake_TEST_FAILED variable
    8c13f0f7 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a56c8247fa874bd418c3e175c941070dafb0e76
commit 6a56c8247fa874bd418c3e175c941070dafb0e76
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 21:41:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:44:04 2015 +0100

    Tests: Disable parallel test execution while running ctest_test

diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index e2f380c..1b31726 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -71,6 +71,7 @@ add_test(NAME PassingTest COMMAND ${CMAKE_COMMAND} -E echo PassingTestOutput)
 add_test(NAME FailingTest COMMAND ${CMAKE_COMMAND} -E no_such_command)
   ]])
 
+  unset(ENV{CTEST_PARALLEL_LEVEL})
   run_ctest(TestOutputSize)
 endfunction()
 run_TestOutputSize()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0
commit 5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 21:41:31 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:42:24 2015 +0100

    Tests: Don't overwrite RunCMake_TEST_FAILED variable

diff --git a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
index 918d242..74ad669 100644
--- a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
+++ b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
@@ -4,14 +4,14 @@ if(test_xml_file)
   if("${test_xml}" MATCHES [[(<Test Status="passed">.*</Test>).*(<Test Status="failed">.*</Test>)]])
     set(test_passed "${CMAKE_MATCH_1}")
     set(test_failed "${CMAKE_MATCH_2}")
+    if(NOT "${test_passed}" MATCHES [[<Value>PassingTes\.\.\..*10 bytes]])
+      set(RunCMake_TEST_FAILED "Test.xml passed test output not truncated at 10 bytes:\n ${test_passed}")
+    elseif(NOT "${test_failed}" MATCHES [[<Value>CMake Error:\.\.\..*12 bytes]])
+      set(RunCMake_TEST_FAILED "Test.xml failed test output not truncated at 12 bytes:\n ${test_failed}")
+    endif()
   else()
     set(RunCMake_TEST_FAILED "Test.xml does not contain a passed then failed test:\n ${test_xml}")
   endif()
-  if(NOT "${test_passed}" MATCHES [[<Value>PassingTes\.\.\..*10 bytes]])
-    set(RunCMake_TEST_FAILED "Test.xml passed test output not truncated at 10 bytes:\n ${test_passed}")
-  elseif(NOT "${test_failed}" MATCHES [[<Value>CMake Error:\.\.\..*12 bytes]])
-    set(RunCMake_TEST_FAILED "Test.xml failed test output not truncated at 12 bytes:\n ${test_failed}")
-  endif()
 else()
   set(RunCMake_TEST_FAILED "Test.xml not found")
 endif()

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake                            |    2 +-
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake         |    1 +
 Tests/RunCMake/ctest_test/TestOutputSize-check.cmake |   10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake

From steveire at gmail.com  Tue Oct 27 16:55:01 2015
From: steveire at gmail.com (Stephen Kelly)
Date: Tue, 27 Oct 2015 16:55:01 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1141-g9783c9d
Message-ID: <20151027205501.52A7EC06D8@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9783c9d76f4feaa77b4952b99179702195c57484 (commit)
       via  13a37f5f76eb03e01e9ca225281531233ff0006c (commit)
       via  958508bb1fa8854cfe7bc4386fe83c82fed73e65 (commit)
       via  91a829c165209b96c20d17f8eb7d46d3375cc57c (commit)
       via  e0213882222798eec587a4dbed6f28555d64b8d9 (commit)
       via  0554c2c970bf12dba01b408f3d8a103ede10a30b (commit)
       via  b22e5d0ab71199b45f1f9f4e271f677dba602452 (commit)
      from  b0338173a7374c328c7b10691da55d4ffa57fda5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9783c9d76f4feaa77b4952b99179702195c57484
commit 9783c9d76f4feaa77b4952b99179702195c57484
Merge: b033817 13a37f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 16:54:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 16:54:59 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    13a37f5f cmMakefile: Fix typo in comment
    958508bb cmMakefile: Fix style
    91a829c1 Makefiles: Remove unused variable
    e0213882 cmTarget: Remove obsolete member
    0554c2c9 cmTarget: Fix style
    b22e5d0a Remove some obsolete declarations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13a37f5f76eb03e01e9ca225281531233ff0006c
commit 13a37f5f76eb03e01e9ca225281531233ff0006c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:03:55 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:12 2015 +0100

    cmMakefile: Fix typo in comment

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0982da1..84ec4fb 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2174,7 +2174,7 @@ cmMakefile::GetSourceGroup(const std::vector<std::string>&name) const
 {
   cmSourceGroup* sg = 0;
 
-  // first look for source group starting with the same as the one we wants
+  // first look for source group starting with the same as the one we want
   for (std::vector<cmSourceGroup>::const_iterator
       sgIt = this->SourceGroups.begin();
       sgIt != this->SourceGroups.end(); ++sgIt)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=958508bb1fa8854cfe7bc4386fe83c82fed73e65
commit 958508bb1fa8854cfe7bc4386fe83c82fed73e65
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:04:07 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:11 2015 +0100

    cmMakefile: Fix style

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40e2892..0982da1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2207,7 +2207,7 @@ void cmMakefile::AddSourceGroup(const std::string& name,
 {
   std::vector<std::string> nameVector;
   nameVector.push_back(name);
-  AddSourceGroup(nameVector, regex);
+  this->AddSourceGroup(nameVector, regex);
 }
 
 void cmMakefile::AddSourceGroup(const std::vector<std::string>& name,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91a829c165209b96c20d17f8eb7d46d3375cc57c
commit 91a829c165209b96c20d17f8eb7d46d3375cc57c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 01:12:38 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:11 2015 +0100

    Makefiles: Remove unused variable

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 27d631e..3972b41 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -173,7 +173,6 @@ void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames(
 void cmLocalUnixMakefileGenerator3::
 GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
 {
-  std::set<std::string> emitted;
   std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
   for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
       ti != targets.end(); ++ti)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0213882222798eec587a4dbed6f28555d64b8d9
commit e0213882222798eec587a4dbed6f28555d64b8d9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 25 15:09:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:11 2015 +0100

    cmTarget: Remove obsolete member

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a016e92..da49048 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -61,7 +61,6 @@ cmTarget::cmTarget()
   this->HaveInstallRule = false;
   this->DLLPlatform = false;
   this->IsAndroid = false;
-  this->IsApple = false;
   this->IsImportedTarget = false;
   this->BuildInterfaceIncludesAppended = false;
 }
@@ -98,9 +97,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     strcmp(this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME"),
            "Android") == 0;
 
-  // Check whether we are targeting an Apple platform.
-  this->IsApple = this->Makefile->IsOn("APPLE");
-
   // Setup default property values.
   if (this->GetType() != cmState::INTERFACE_LIBRARY
       && this->GetType() != cmState::UTILITY)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 52ed578..f3a45d3 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -357,7 +357,6 @@ private:
   bool RecordDependencies;
   bool DLLPlatform;
   bool IsAndroid;
-  bool IsApple;
   bool IsImportedTarget;
   bool BuildInterfaceIncludesAppended;
 #if defined(_WIN32) && !defined(__CYGWIN__)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0554c2c970bf12dba01b408f3d8a103ede10a30b
commit 0554c2c970bf12dba01b408f3d8a103ede10a30b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 23 00:56:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:54:11 2015 +0100

    cmTarget: Fix style

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e056469..a016e92 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -299,7 +299,8 @@ void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile)
 {
   if(this->Utilities.insert(u).second && makefile)
     {
-    UtilityBacktraces.insert(std::make_pair(u, makefile->GetBacktrace()));
+    this->UtilityBacktraces.insert(
+            std::make_pair(u, makefile->GetBacktrace()));
     }
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b22e5d0ab71199b45f1f9f4e271f677dba602452
commit b22e5d0ab71199b45f1f9f4e271f677dba602452
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 18:27:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:52:47 2015 +0100

    Remove some obsolete declarations
    
    Ensure that cmStandardIncludes.h is included before any platform header
    in cmGeneratorExpressionEvaluator.h.  That file needs to change as
    a result of removal of the cmMakefile.h header from
    cmGeneratorExpressionNode.h, affecting the compilation of
    cmGeneratorExpressionNode.cxx.
    
    On AIX we need to include our own headers first to get large file
    support macros defined consistently within system headers.  The old
    order in this header worked only because it was always included after
    other headers.

diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 889fb08..f10e4e4 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -13,7 +13,6 @@
 #define cmComputeLinkDepends_h
 
 #include "cmStandardIncludes.h"
-#include "cmTarget.h"
 #include "cmLinkItem.h"
 
 #include "cmGraphAdjacencyList.h"
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 1741acf..ff5d3ab 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -17,7 +17,6 @@
 #include "cmake.h"
 #include "cmSourceFile.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include "cmSystemTools.h"
 
 #include <cmsys/SystemTools.hxx>
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index b20d0a7..281c1ef 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -16,8 +16,6 @@
 #include "cmExternalMakefileProjectGenerator.h"
 
 class cmLocalGenerator;
-class cmMakefile;
-class cmTarget;
 class cmGeneratedFileStream;
 
 /** \class cmExtraKateGenerator
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 5eed89d..c3b0272 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -12,7 +12,6 @@
 
 #include "cmGeneratorExpressionDAGChecker.h"
 
-#include "cmMakefile.h"
 #include "cmLocalGenerator.h"
 #include "cmAlgorithms.h"
 
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index 7c1bd8c..407f83f 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -12,13 +12,11 @@
 #ifndef cmGeneratorExpressionEvaluator_h
 #define cmGeneratorExpressionEvaluator_h
 
-#include <vector>
-#include <string>
-
 #include "cmListFileCache.h"
 #include "cmGeneratorExpressionContext.h"
 
-class cmTarget;
+#include <vector>
+#include <string>
 
 struct cmGeneratorExpressionDAGChecker;
 struct cmGeneratorExpressionNode;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7a7e4ff..af72123 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -14,6 +14,7 @@
 #include "cmGlobalGenerator.h"
 #include "cmAlgorithms.h"
 #include "cmOutputConverter.h"
+#include "cmMakefile.h"
 
 //----------------------------------------------------------------------------
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index db65db1..854811b 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -12,8 +12,6 @@
 #ifndef cmGeneratorExpressionNode_h
 #define cmGeneratorExpressionNode_h
 
-#include "cmMakefile.h"
-
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionParser.h"
 #include "cmGeneratorExpressionDAGChecker.h"
diff --git a/Source/cmGeneratorExpressionParser.h b/Source/cmGeneratorExpressionParser.h
index 28f1441..5bd6777 100644
--- a/Source/cmGeneratorExpressionParser.h
+++ b/Source/cmGeneratorExpressionParser.h
@@ -19,8 +19,6 @@
 
 #include "cmListFileCache.h"
 
-class cmMakefile;
-class cmTarget;
 struct cmGeneratorExpressionEvaluator;
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index c4e28ca..2fa0598 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -15,7 +15,6 @@
 #include "cmMakefile.h"
 #include "cmake.h"
 #include "cmGeneratedFileStream.h"
-#include "cmSourceFile.h"
 #include "cmGeneratorTarget.h"
 #include "cmAlgorithms.h"
 
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index edd6a0e..ea27f61 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -11,7 +11,6 @@
 ============================================================================*/
 #include "cmInstallDirectoryGenerator.h"
 
-#include "cmTarget.h"
 #include "cmGeneratorExpression.h"
 #include "cmLocalGenerator.h"
 
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index d59fdc6..d0784ad 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmLocalVisualStudio10Generator.h"
-#include "cmTarget.h"
 #include "cmMakefile.h"
 #include "cmVisualStudio10TargetGenerator.h"
 #include "cmGlobalVisualStudio10Generator.h"
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 1cae94f..52ed578 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -30,7 +30,6 @@ class cmake;
 class cmMakefile;
 class cmSourceFile;
 class cmGlobalGenerator;
-class cmComputeLinkInformation;
 class cmListFileBacktrace;
 class cmTarget;
 class cmGeneratorTarget;
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index d997596..b411f15 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -13,10 +13,8 @@
 
 #include "cmGeneratorExpression.h"
 #include "cmOutputConverter.h"
-#include "cmMakefile.h"
 #include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 #include "cmTest.h"
 
 //----------------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Wed Oct 28 00:01:09 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Wed, 28 Oct 2015 00:01:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-363-gb28101c
Message-ID: <20151028040109.1EDB0C0BD1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  b28101c65fe47cb15390ac1ad4c85418071468d5 (commit)
      from  8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b28101c65fe47cb15390ac1ad4c85418071468d5
commit b28101c65fe47cb15390ac1ad4c85418071468d5
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Wed Oct 28 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Oct 28 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 5aebca4..97768e1 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151027)
+set(CMake_VERSION_PATCH 20151028)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 08:45:31 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 08:45:31 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1149-g4e4866a
Message-ID: <20151028124531.593C1C100F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4e4866aa7e26a8151683300da019208a9cb06f4a (commit)
       via  b272a656552682e4042a65089703d6f78043ff18 (commit)
       via  87f1f363dfaf181854b81d84518ea57334edcc8f (commit)
       via  45cd9e63371ae09b6ad9dbc27ac4d36c19b357af (commit)
       via  c09acf4fdd961a8ba9a27f9af2800e9262cd18be (commit)
       via  2f940f89951027bc596edbe1a5768cc0a0ef78a0 (commit)
       via  1e4738173053450c370f6d558fff6c08e5b084f5 (commit)
       via  43d577dcb9e29842c91073056ca400963d6bee0e (commit)
      from  9783c9d76f4feaa77b4952b99179702195c57484 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e4866aa7e26a8151683300da019208a9cb06f4a
commit 4e4866aa7e26a8151683300da019208a9cb06f4a
Merge: 9783c9d b272a65
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:45:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 08:45:30 2015 -0400

    Merge topic 'update-libarchive' into next
    
    b272a656 cmSystemTools: Preemptively adapt to future libarchive 4.0 changes
    87f1f363 cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes
    45cd9e63 Update libarchive configuration within CMake
    c09acf4f libarchive: Update README-CMake.txt for new snapshot
    2f940f89 libarchive: Drop use of pthread.h for CMake build
    1e473817 libarchive: Do not use pthread.h API without header
    43d577dc libarchive: Test for Clang builtin before using it


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b272a656552682e4042a65089703d6f78043ff18
commit b272a656552682e4042a65089703d6f78043ff18
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:56:09 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:48 2015 -0400

    cmSystemTools: Preemptively adapt to future libarchive 4.0 changes

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2c5aa8a..b2827dc 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -29,6 +29,9 @@
 # include "cmArchiveWrite.h"
 # include "cmLocale.h"
 # include <cm_libarchive.h>
+# ifndef __LA_INT64_T
+#  define __LA_INT64_T la_int64_t
+# endif
 #endif
 #include <cmsys/FStream.hxx>
 #include <cmsys/Terminal.h>

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87f1f363dfaf181854b81d84518ea57334edcc8f
commit 87f1f363dfaf181854b81d84518ea57334edcc8f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:37:14 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:48 2015 -0400

    cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 7946950..e62a2ed 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -18,6 +18,10 @@
 #include <cm_libarchive.h>
 #include "cm_get_date.h"
 
+#ifndef __LA_SSIZE_T
+# define __LA_SSIZE_T la_ssize_t
+#endif
+
 //----------------------------------------------------------------------------
 static std::string cm_archive_error_string(struct archive* a)
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45cd9e63371ae09b6ad9dbc27ac4d36c19b357af
commit 45cd9e63371ae09b6ad9dbc27ac4d36c19b357af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:08:30 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:48 2015 -0400

    Update libarchive configuration within CMake
    
    Hard-code libarchive build options to the way CMake needs them.  Set
    them as internal cache entries so users do not see them when building
    CMake.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c96f68b..ebee14b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -372,12 +372,14 @@ macro (CMAKE_BUILD_UTILITIES)
     set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system found LZMA library if found")
     set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system found ZLIB library if found")
     set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system found BZip2 library if found")
+    set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system found libxml2 library if found")
     set(ENABLE_EXPAT OFF CACHE INTERNAL "Enable the use of the system found EXPAT library if found")
     set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system found PCREPOSIX library if found")
     set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system found LibGCC library if found")
     set(ENABLE_XATTR OFF CACHE INTERNAL "Enable extended attribute support")
     set(ENABLE_ACL OFF CACHE INTERNAL "Enable ACL support")
     set(ENABLE_ICONV OFF CACHE INTERNAL "Enable iconv support")
+    set(ENABLE_CNG OFF CACHE INTERNAL "Enable the use of CNG(Crypto Next Generation)")
     add_subdirectory(Utilities/cmlibarchive)
     CMAKE_SET_TARGET_FOLDER(cmlibarchive "Utilities/3rdParty")
     set(CMAKE_TAR_LIBRARIES cmlibarchive ${BZIP2_LIBRARIES})

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c09acf4fdd961a8ba9a27f9af2800e9262cd18be
commit c09acf4fdd961a8ba9a27f9af2800e9262cd18be
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:21:39 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:47 2015 -0400

    libarchive: Update README-CMake.txt for new snapshot

diff --git a/Utilities/cmlibarchive/README-CMake.txt b/Utilities/cmlibarchive/README-CMake.txt
index 8f3b29b..0a3e34a 100644
--- a/Utilities/cmlibarchive/README-CMake.txt
+++ b/Utilities/cmlibarchive/README-CMake.txt
@@ -11,7 +11,7 @@ branch, but it is merged into our history.
 Update libarchive from upstream as follows.  Create a local branch to
 explicitly reference the upstream snapshot branch head:
 
- git branch libarchive-upstream 37f225b7
+ git branch libarchive-upstream 1a8c7bc2
 
 Use a temporary directory to checkout the branch:
 
@@ -24,7 +24,7 @@ Use a temporary directory to checkout the branch:
 Now place the (reduced) libarchive content in this directory.  See
 instructions shown by
 
- git log 37f225b7
+ git log 1a8c7bc2
 
 for help extracting the content from the upstream svn repo.  Then run
 the following commands to commit the new version.  Substitute the
@@ -34,8 +34,8 @@ appropriate date and version number:
 
  GIT_AUTHOR_NAME='LibArchive Upstream' \
  GIT_AUTHOR_EMAIL='libarchive-discuss at googlegroups.com' \
- GIT_AUTHOR_DATE='Mon Apr 14 19:19:05 2014 -0700' \
- git commit -m 'libarchive 3.1.2-246-ga5a5d28b (reduced)' &&
+ GIT_AUTHOR_DATE='Wed Oct 21 01:47:34 2015 -0700' \
+ git commit -m 'libarchive 3.1.2-601-g3bfe5f1 (reduced)' &&
  git commit --amend
 
 Edit the commit message to describe the procedure used to obtain the

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f940f89951027bc596edbe1a5768cc0a0ef78a0
commit 2f940f89951027bc596edbe1a5768cc0a0ef78a0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 09:07:18 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:47 2015 -0400

    libarchive: Drop use of pthread.h for CMake build
    
    CMake does not use threads so we do not need this in our libarchive.

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 6b13c2f..00550e2 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -94,6 +94,8 @@ IF(WIN32)
   SET(_WIN32_WINNT ${WINVER})
 ENDIF(WIN32)
 
+set(HAVE_PTHREAD_H 0) # no threads in CMake
+
 IF("${CMAKE_C_PLATFORM_ID}" MATCHES "^(HP-UX)$")
   ADD_DEFINITIONS(-D_XOPEN_SOURCE=500) # Ask wchar.h for mbstate_t
 ENDIF()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e4738173053450c370f6d558fff6c08e5b084f5
commit 1e4738173053450c370f6d558fff6c08e5b084f5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 09:04:44 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:47 2015 -0400

    libarchive: Do not use pthread.h API without header

diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index f4d4254..a20b9b1 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -142,11 +142,10 @@ struct arc4_stream {
 	uint8_t s[256];
 };
 
-static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-
 #define	RANDOMDEV	"/dev/urandom"
 #define	KEYSIZE		128
 #ifdef HAVE_PTHREAD_H
+static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
 #define	_ARC4_LOCK()	pthread_mutex_lock(&arc4random_mtx);
 #define	_ARC4_UNLOCK()  pthread_mutex_unlock(&arc4random_mtx);
 #else

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43d577dcb9e29842c91073056ca400963d6bee0e
commit 43d577dcb9e29842c91073056ca400963d6bee0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 23 10:24:47 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:47 2015 -0400

    libarchive: Test for Clang builtin before using it
    
    The __builtin_bswap16 builtin is not available on Clang 2.1.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
index c359d83..eff02d8 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
@@ -1712,10 +1712,13 @@ lha_crc16(uint16_t crc, const void *pp, size_t len)
 	for (;len >= 8; len -= 8) {
 		/* This if statement expects compiler optimization will
 		 * remove the stament which will not be executed. */
+#ifndef __has_builtin
+#  define __has_builtin(x) 0
+#endif
 #if defined(_MSC_VER) && _MSC_VER >= 1400  /* Visual Studio */
 #  define bswap16(x) _byteswap_ushort(x)
 #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8) \
-      || defined(__clang__)
+      || (defined(__clang__) && __has_builtin(__builtin_bswap16))
 #  define bswap16(x) __builtin_bswap16(x)
 #else
 #  define bswap16(x) ((((x) >> 8) & 0xff) | ((x) << 8))

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 08:47:57 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 08:47:57 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-383-gf68f8a1
Message-ID: <20151028124758.F1DCBC113D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  f68f8a14161ee41c52cdb0725e57e56e15b42118 (commit)
       via  b272a656552682e4042a65089703d6f78043ff18 (commit)
       via  87f1f363dfaf181854b81d84518ea57334edcc8f (commit)
       via  45cd9e63371ae09b6ad9dbc27ac4d36c19b357af (commit)
       via  c09acf4fdd961a8ba9a27f9af2800e9262cd18be (commit)
       via  2f940f89951027bc596edbe1a5768cc0a0ef78a0 (commit)
       via  1e4738173053450c370f6d558fff6c08e5b084f5 (commit)
       via  43d577dcb9e29842c91073056ca400963d6bee0e (commit)
       via  85e0bb84f5eca2f77f070bce9f83024854096307 (commit)
       via  c70491d671b363b50a41d707d5fe82b02fe29424 (commit)
       via  1bbba477c747581d318b4fe5a1f3ede36301eed7 (commit)
       via  64bdf0b7469437b101bb0f1cf641956e0b5d1bb0 (commit)
       via  8f837fc9a9fc335f87613e0c113050e1533d9efd (commit)
       via  61a0251e824559b27e751ce7ff0be72b9bb8ec69 (commit)
       via  832fe4b133f47781f4e08df1f83fdc4e3e7aa06b (commit)
       via  0b82f51a308d2ae36a449e6a02a5117199da373a (commit)
       via  5333c04cd046187dc10cd6576e8fdc1342753d36 (commit)
       via  e861e12f6ed677debd63a78ca80f9e85def77081 (commit)
       via  932848f420a738ee07997198fead5b2c2fbf4787 (commit)
       via  1a8c7bc2c649781d1163c1966245a45e0fb829ba (commit)
      from  b28101c65fe47cb15390ac1ad4c85418071468d5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f68f8a14161ee41c52cdb0725e57e56e15b42118
commit f68f8a14161ee41c52cdb0725e57e56e15b42118
Merge: b28101c b272a65
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:47:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 08:47:54 2015 -0400

    Merge topic 'update-libarchive'
    
    b272a656 cmSystemTools: Preemptively adapt to future libarchive 4.0 changes
    87f1f363 cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes
    45cd9e63 Update libarchive configuration within CMake
    c09acf4f libarchive: Update README-CMake.txt for new snapshot
    2f940f89 libarchive: Drop use of pthread.h for CMake build
    1e473817 libarchive: Do not use pthread.h API without header
    43d577dc libarchive: Test for Clang builtin before using it
    85e0bb84 libarchive: Avoid using 'uint8_t' as bitfield type
    c70491d6 libarchive: Avoid using name 'hz'
    1bbba477 libarchive: Drop outdated CMake portability snprintf
    64bdf0b7 libarchive: Avoid non-portable u_int8_t
    8f837fc9 libarchive: Use CommonCrypto APIs on OS X only when available
    61a0251e libarchive: Define O_CLOEXEC when missing
    832fe4b1 libarchive: Fix VS 7.1 Debug build
    0b82f51a libarchive: Guard bcyrpt.h with HAVE_BCRYPT_H
    5333c04c libarchive: Drop CMake-specific Borland compiler workaround
    ...


-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt                                     |    2 +
 Source/cmArchiveWrite.cxx                          |    4 +
 Source/cmSystemTools.cxx                           |    3 +
 Utilities/cmlibarchive/CMakeLists.txt              |   77 +-
 Utilities/cmlibarchive/COPYING                     |    5 +-
 Utilities/cmlibarchive/README-CMake.txt            |    8 +-
 .../build/cmake/CreatePkgConfigFile.cmake          |    6 +-
 Utilities/cmlibarchive/build/cmake/config.h.in     |   41 +-
 Utilities/cmlibarchive/libarchive/CMakeLists.txt   |   21 +-
 Utilities/cmlibarchive/libarchive/archive.h        |  186 ++--
 .../cmlibarchive/libarchive/archive_cryptor.c      |  435 ++++++++
 .../libarchive/archive_cryptor_private.h           |  152 +++
 .../{archive_crypto.c => archive_digest.c}         |   10 +-
 ...e_crypto_private.h => archive_digest_private.h} |   42 +-
 Utilities/cmlibarchive/libarchive/archive_entry.3  |    2 +-
 Utilities/cmlibarchive/libarchive/archive_entry.c  |  130 ++-
 Utilities/cmlibarchive/libarchive/archive_entry.h  |   59 +-
 .../cmlibarchive/libarchive/archive_entry_acl.3    |    2 +-
 .../cmlibarchive/libarchive/archive_entry_paths.3  |    2 +-
 .../cmlibarchive/libarchive/archive_entry_perms.3  |    2 +-
 .../cmlibarchive/libarchive/archive_entry_stat.3   |    4 +-
 .../cmlibarchive/libarchive/archive_entry_time.3   |    2 +-
 .../cmlibarchive/libarchive/archive_entry_xattr.c  |    5 +-
 Utilities/cmlibarchive/libarchive/archive_hmac.c   |  234 +++++
 .../cmlibarchive/libarchive/archive_hmac_private.h |   95 ++
 Utilities/cmlibarchive/libarchive/archive_match.c  |    9 +-
 .../cmlibarchive/libarchive/archive_pathmatch.c    |    8 +-
 .../cmlibarchive/libarchive/archive_private.h      |   19 +
 Utilities/cmlibarchive/libarchive/archive_random.c |  269 +++++
 ...write_add_filter.c => archive_random_private.h} |   50 +-
 Utilities/cmlibarchive/libarchive/archive_read.3   |    4 +-
 Utilities/cmlibarchive/libarchive/archive_read.c   |   74 +-
 ..._write_data.3 => archive_read_add_passphrase.3} |   66 +-
 .../libarchive/archive_read_add_passphrase.c       |  186 ++++
 .../libarchive/archive_read_append_filter.c        |    6 +-
 .../cmlibarchive/libarchive/archive_read_data.3    |    2 +-
 .../libarchive/archive_read_disk_entry_from_file.c |    8 +-
 .../libarchive/archive_read_disk_posix.c           |   23 +-
 .../libarchive/archive_read_disk_private.h         |    5 +
 .../archive_read_disk_set_standard_lookup.c        |    2 +-
 .../libarchive/archive_read_disk_windows.c         |   19 +-
 .../cmlibarchive/libarchive/archive_read_extract.c |   17 -
 .../libarchive/archive_read_extract2.c             |   21 +-
 .../cmlibarchive/libarchive/archive_read_filter.3  |   17 +-
 .../cmlibarchive/libarchive/archive_read_open.3    |    4 +-
 .../cmlibarchive/libarchive/archive_read_open_fd.c |   29 +
 .../libarchive/archive_read_open_memory.c          |   12 +-
 .../cmlibarchive/libarchive/archive_read_private.h |   43 +-
 .../libarchive/archive_read_set_options.c          |    7 +-
 .../libarchive/archive_read_support_filter_all.c   |    2 +
 .../archive_read_support_filter_compress.c         |   24 +-
 .../libarchive/archive_read_support_filter_lz4.c   |  728 +++++++++++++
 .../libarchive/archive_read_support_filter_lzop.c  |    7 +
 .../libarchive/archive_read_support_filter_uu.c    |    3 +-
 .../libarchive/archive_read_support_filter_xz.c    |    2 +-
 .../libarchive/archive_read_support_format_7zip.c  |   48 +-
 .../libarchive/archive_read_support_format_all.c   |    1 +
 .../libarchive/archive_read_support_format_ar.c    |   21 +-
 .../libarchive/archive_read_support_format_cpio.c  |   22 +-
 .../archive_read_support_format_iso9660.c          |   72 +-
 .../libarchive/archive_read_support_format_lha.c   |  480 +++++----
 .../libarchive/archive_read_support_format_mtree.c |  266 ++---
 .../libarchive/archive_read_support_format_rar.c   |   34 +-
 .../libarchive/archive_read_support_format_tar.c   |   44 +-
 .../libarchive/archive_read_support_format_warc.c  |  794 +++++++++++++++
 .../libarchive/archive_read_support_format_xar.c   |   34 +-
 .../libarchive/archive_read_support_format_zip.c   | 1074 +++++++++++++++++---
 Utilities/cmlibarchive/libarchive/archive_string.c |   91 +-
 Utilities/cmlibarchive/libarchive/archive_util.c   |  143 +--
 .../cmlibarchive/libarchive/archive_windows.h      |    2 +
 Utilities/cmlibarchive/libarchive/archive_write.3  |   15 +-
 Utilities/cmlibarchive/libarchive/archive_write.c  |   11 +
 .../libarchive/archive_write_add_filter.c          |    1 +
 .../libarchive/archive_write_add_filter_by_name.c  |    1 +
 .../libarchive/archive_write_add_filter_lz4.c      |  646 ++++++++++++
 .../libarchive/archive_write_add_filter_xz.c       |   44 +-
 .../cmlibarchive/libarchive/archive_write_data.3   |   14 +-
 .../cmlibarchive/libarchive/archive_write_disk.3   |   10 +-
 .../libarchive/archive_write_disk_posix.c          |   87 +-
 .../archive_write_disk_set_standard_lookup.c       |    7 +-
 .../libarchive/archive_write_disk_windows.c        |    6 +-
 .../cmlibarchive/libarchive/archive_write_filter.3 |   18 +-
 .../libarchive/archive_write_finish_entry.3        |    2 +-
 .../cmlibarchive/libarchive/archive_write_format.3 |   16 +-
 .../cmlibarchive/libarchive/archive_write_open.3   |    2 +-
 .../libarchive/archive_write_open_filename.c       |    5 +-
 .../libarchive/archive_write_private.h             |   15 +
 .../libarchive/archive_write_set_format.c          |    1 +
 .../libarchive/archive_write_set_format_by_name.c  |    1 +
 .../archive_write_set_format_filter_by_ext.c       |  142 +++
 .../libarchive/archive_write_set_format_iso9660.c  |   10 +
 .../libarchive/archive_write_set_format_mtree.c    |    4 +-
 .../libarchive/archive_write_set_format_warc.c     |  439 ++++++++
 .../libarchive/archive_write_set_format_xar.c      |   63 +-
 .../libarchive/archive_write_set_format_zip.c      |  678 ++++++++++--
 .../libarchive/archive_write_set_options.3         |   42 +
 ...write_data.3 => archive_write_set_passphrase.3} |   66 +-
 .../libarchive/archive_write_set_passphrase.c      |   95 ++
 ...archive_write_add_filter.c => archive_xxhash.h} |   55 +-
 Utilities/cmlibarchive/libarchive/libarchive.3     |    4 +-
 .../cmlibarchive/libarchive/libarchive_internals.3 |    2 +-
 Utilities/cmlibarchive/libarchive/mtree.5          |   18 -
 Utilities/cmlibarchive/libarchive/tar.5            |    2 +-
 Utilities/cmlibarchive/libarchive/xxhash.c         |  500 +++++++++
 104 files changed, 8153 insertions(+), 1190 deletions(-)
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_cryptor.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
 rename Utilities/cmlibarchive/libarchive/{archive_crypto.c => archive_digest.c} (99%)
 rename Utilities/cmlibarchive/libarchive/{archive_crypto_private.h => archive_digest_private.h} (93%)
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_hmac.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_hmac_private.h
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_random.c
 copy Utilities/cmlibarchive/libarchive/{archive_write_add_filter.c => archive_random_private.h} (50%)
 copy Utilities/cmlibarchive/libarchive/{archive_write_data.3 => archive_read_add_passphrase.3} (59%)
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_read_add_passphrase.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_read_support_filter_lz4.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_set_format_filter_by_ext.c
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_set_format_warc.c
 copy Utilities/cmlibarchive/libarchive/{archive_write_data.3 => archive_write_set_passphrase.3} (60%)
 create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_set_passphrase.c
 copy Utilities/cmlibarchive/libarchive/{archive_write_add_filter.c => archive_xxhash.h} (50%)
 create mode 100644 Utilities/cmlibarchive/libarchive/xxhash.c


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 08:48:02 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 08:48:02 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-385-gd3325c3
Message-ID: <20151028124802.03B3DC114F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  d3325c3db79e7decff881cc8113d6febb6fd136b (commit)
       via  e166203f31890e5bbe2bfa19bd5eb63e7d8c3b90 (commit)
      from  f68f8a14161ee41c52cdb0725e57e56e15b42118 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3325c3db79e7decff881cc8113d6febb6fd136b
commit d3325c3db79e7decff881cc8113d6febb6fd136b
Merge: f68f8a1 e166203
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:48:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 08:48:00 2015 -0400

    Merge topic 'fix-C-comment-syntax'
    
    e166203f CheckForPthreads.c: Do not use C++-style comments in C source


-----------------------------------------------------------------------

Summary of changes:
 Modules/CheckForPthreads.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 08:48:04 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 08:48:04 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-388-g27570a6
Message-ID: <20151028124804.84307C1155@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df (commit)
       via  6a56c8247fa874bd418c3e175c941070dafb0e76 (commit)
       via  5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0 (commit)
      from  d3325c3db79e7decff881cc8113d6febb6fd136b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df
commit 27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df
Merge: d3325c3 6a56c82
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:48:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 08:48:02 2015 -0400

    Merge topic 'fix-ctest_test-parallel-execution'
    
    6a56c824 Tests: Disable parallel test execution while running ctest_test
    5f14040c Tests: Don't overwrite RunCMake_TEST_FAILED variable


-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake         |    1 +
 Tests/RunCMake/ctest_test/TestOutputSize-check.cmake |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 08:48:07 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 08:48:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-421-g1e8c920
Message-ID: <20151028124807.5606FC1151@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  1e8c920d0409770214a4ff517f6a4c31b9830f45 (commit)
       via  79c3a2a8f72ea175533da9f323f88c507220486e (commit)
       via  c389f8bb07e900d805ca3163f47b06e3dbe4303b (commit)
       via  02533038dae9fb5b4ae1b6f7d55bb5af397400af (commit)
       via  b6278e9ff714d8bdacb54f055eac71fe073b28d8 (commit)
       via  7a6caae1a78e8d67422b144ceffdd97595f67683 (commit)
       via  0fb187cc589b83ded107d9a9a1971830efb6c751 (commit)
       via  8caf1f361b2207522d19bf4a28cecaa3a2391918 (commit)
       via  278ba2db477fdc8cccd2313eb56e0179234747a0 (commit)
       via  79c11d23405d3894a254a8c03df5ead32464b109 (commit)
       via  9b244cc0ecff0cde22b71b7097a3d84c018c6044 (commit)
       via  def6da616b81958c9f1058a4e520ac3cbc534757 (commit)
       via  a67231ac114235f0af4673235c4c07fa896c8ab6 (commit)
       via  d566f39a640297114bd3ad933bb3279440b2f38f (commit)
       via  0c97d32f7a592a768d614c19b3fd48eab245a2c4 (commit)
       via  383bfd95432990365ac5c7fc3ab190bfb05cbec1 (commit)
       via  7f6beddae372a7ae47789f5460bcdfdac39c64e6 (commit)
       via  520ca0ff6c123250c633a3618459d0161cbc4683 (commit)
       via  3e3c754b8cc3af463dcea95000daf3a18b359b7a (commit)
       via  593f347b5385a510e641eca0448f7ddf64c1c12b (commit)
       via  7b127c62d4d4c94cf96e9d406859dbd24eed7dc9 (commit)
       via  780bff5279c6c2d356e5c7726b656bd9c68532b8 (commit)
       via  6bd7bd1e06fcf92d40c762f2713626d125cb8f87 (commit)
       via  b397eae82e14fdf75eddcbfd022d9f2d5933eb1e (commit)
       via  00b8c0a8d4b59dc01276d083ccae4a8138718b12 (commit)
       via  4c6374bcc56ea7d7f7e67c518e60de94be267256 (commit)
       via  7d409f500e3403f8dbb4a0fee6ecdad94f45c35e (commit)
       via  7a1b83cb3fc79639b9e2c1bf11af2d2274e4224a (commit)
       via  736c2042c6bade0322441aafabababcbd92af52e (commit)
       via  f210cb131e5814631d6d2974cf2437632446654f (commit)
       via  bde277e811fea2532ed32ade6d7f3d6e910bfda0 (commit)
       via  cf69630e510a5c639a93a99b315fcefea9688935 (commit)
       via  3f8aa62bfb339dded326b0bc36016134a3dc845b (commit)
      from  27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e8c920d0409770214a4ff517f6a4c31b9830f45
commit 1e8c920d0409770214a4ff517f6a4c31b9830f45
Merge: 27570a6 79c3a2a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:48:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 08:48:05 2015 -0400

    Merge topic 'use-generator-target'
    
    79c3a2a8 cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget
    c389f8bb cmLocalGenerator: Port Find method away from GetGeneratorTarget
    02533038 VS6: Port to FindGeneratorTarget
    b6278e9f cmake: Port find_package mode away from GetGeneratorTarget
    7a6caae1 cmMakefile: Add imported target accessor
    0fb187cc CMP0026: Port away from GetGeneratorTarget
    8caf1f36 cmGlobalGenerator: Add FindGeneratorTarget API
    278ba2db cmGeneratorTarget: Add API for globally visible IMPORTED
    79c11d23 Xcode: Port away from GetGeneratorTarget
    9b244cc0 cmLocalGenerator: Store imported targets in a separate container.
    def6da61 cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget
    a67231ac cmTarget: Implement ALIAS in terms of name mapping
    d566f39a cmGlobalGenerator: Remove unneeded GetGeneratorTarget
    0c97d32f cmGlobalGenerator: Remove direct storage of targets
    383bfd95 cmTargetCollectLinkLanguages: Remove cmMakefile dependency
    7f6bedda cmGeneratorTarget: Port cmOptionalLinkImplementation
    ...


-----------------------------------------------------------------------

Summary of changes:
 Source/cmAddExecutableCommand.cxx              |    2 +-
 Source/cmAddLibraryCommand.cxx                 |    2 +-
 Source/cmAuxSourceDirectoryCommand.cxx         |    8 +-
 Source/cmComputeLinkInformation.cxx            |    6 +-
 Source/cmComputeTargetDepends.cxx              |    2 +-
 Source/cmExportBuildFileGenerator.cxx          |    6 +-
 Source/cmExportFileGenerator.cxx               |    5 +-
 Source/cmExportTryCompileFileGenerator.cxx     |   16 +-
 Source/cmExtraCodeBlocksGenerator.cxx          |   14 +-
 Source/cmExtraCodeLiteGenerator.cxx            |   13 +-
 Source/cmGeneratorExpressionNode.cxx           |    8 +-
 Source/cmGeneratorTarget.cxx                   |  113 +++++++++++---
 Source/cmGeneratorTarget.h                     |   20 ++-
 Source/cmGhsMultiTargetGenerator.cxx           |    4 +-
 Source/cmGlobalGenerator.cxx                   |  191 ++++++++++++++++--------
 Source/cmGlobalGenerator.h                     |   45 ++----
 Source/cmGlobalKdevelopGenerator.cxx           |    6 +-
 Source/cmGlobalNinjaGenerator.cxx              |    2 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx      |    4 +-
 Source/cmGlobalVisualStudio6Generator.cxx      |    2 +-
 Source/cmGlobalVisualStudio7Generator.cxx      |   19 ++-
 Source/cmGlobalVisualStudio7Generator.h        |    4 +-
 Source/cmGlobalVisualStudio8Generator.cxx      |   21 +--
 Source/cmGlobalVisualStudioGenerator.cxx       |    1 -
 Source/cmGlobalXCodeGenerator.cxx              |   37 ++---
 Source/cmLocalGenerator.cxx                    |   92 ++++++++++--
 Source/cmLocalGenerator.h                      |   14 ++
 Source/cmLocalNinjaGenerator.cxx               |    4 +-
 Source/cmLocalUnixMakefileGenerator3.cxx       |   18 +--
 Source/cmLocalVisualStudio6Generator.cxx       |   37 +++--
 Source/cmLocalVisualStudio7Generator.cxx       |   27 ++--
 Source/cmLocalXCodeGenerator.cxx               |   16 +-
 Source/cmMakefile.cxx                          |   78 +++++-----
 Source/cmMakefile.h                            |   23 +--
 Source/cmMakefileExecutableTargetGenerator.cxx |    6 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |    8 +-
 Source/cmMakefileUtilityTargetGenerator.cxx    |    8 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    6 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |    4 +-
 Source/cmOSXBundleGenerator.cxx                |    2 +-
 Source/cmQtAutoGeneratorInitializer.cxx        |    1 -
 Source/cmQtAutoGenerators.cxx                  |    2 +-
 Source/cmSourceFile.cxx                        |    6 +-
 Source/cmSourceFileLocation.cxx                |   12 +-
 Source/cmTarget.cxx                            |   46 +-----
 Source/cmTarget.h                              |   20 +--
 Source/cmVisualStudio10TargetGenerator.cxx     |    8 +-
 Source/cmake.cxx                               |   35 ++++-
 Source/cmake.h                                 |    7 +
 49 files changed, 622 insertions(+), 409 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 08:48:10 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 08:48:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-434-g2fd5fd1
Message-ID: <20151028124810.531F8C1155@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  2fd5fd1f4d93322e85d662c1467a46cd7da84560 (commit)
       via  13a37f5f76eb03e01e9ca225281531233ff0006c (commit)
       via  958508bb1fa8854cfe7bc4386fe83c82fed73e65 (commit)
       via  91a829c165209b96c20d17f8eb7d46d3375cc57c (commit)
       via  e0213882222798eec587a4dbed6f28555d64b8d9 (commit)
       via  0554c2c970bf12dba01b408f3d8a103ede10a30b (commit)
       via  b22e5d0ab71199b45f1f9f4e271f677dba602452 (commit)
       via  ce43ed2cc14f96c56441da9908053737efbaaf2e (commit)
       via  d90c9738da7003b966036c70727611b17d17f3a6 (commit)
       via  331023ae06b795a1733ae03dce2ce2197ca1c36a (commit)
       via  a03f3d0e01edcb617813144626400058a5c0a177 (commit)
       via  d50c4220e29ef0b7366f3e1812f0a79736f2c18e (commit)
       via  803f1901784937e40717fbf6cc675eb7aacbcce1 (commit)
      from  1e8c920d0409770214a4ff517f6a4c31b9830f45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fd5fd1f4d93322e85d662c1467a46cd7da84560
commit 2fd5fd1f4d93322e85d662c1467a46cd7da84560
Merge: 1e8c920 13a37f5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:48:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 08:48:08 2015 -0400

    Merge topic 'minor-cleanups'
    
    13a37f5f cmMakefile: Fix typo in comment
    958508bb cmMakefile: Fix style
    91a829c1 Makefiles: Remove unused variable
    e0213882 cmTarget: Remove obsolete member
    0554c2c9 cmTarget: Fix style
    b22e5d0a Remove some obsolete declarations
    ce43ed2c Use LocalGenerator when possible
    d90c9738 Makefiles: Remove some unneeded casts
    331023ae Export: Remove unused variable
    a03f3d0e cmFunctionBlocker: Constify method
    d50c4220 Xcode: Fix typo in comment
    803f1901 Xcode: Remove trailing semicolon

diff --cc Source/cmTarget.cxx
index 1eebd12,da49048..9ea1a34
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -61,9 -61,7 +61,8 @@@ cmTarget::cmTarget(
    this->HaveInstallRule = false;
    this->DLLPlatform = false;
    this->IsAndroid = false;
-   this->IsApple = false;
    this->IsImportedTarget = false;
 +  this->ImportedGloballyVisible = false;
    this->BuildInterfaceIncludesAppended = false;
  }
  
diff --cc Source/cmTarget.h
index 62e10f4,f3a45d3..97b0871
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@@ -349,9 -357,7 +348,8 @@@ private
    bool RecordDependencies;
    bool DLLPlatform;
    bool IsAndroid;
-   bool IsApple;
    bool IsImportedTarget;
 +  bool ImportedGloballyVisible;
    bool BuildInterfaceIncludesAppended;
  #if defined(_WIN32) && !defined(__CYGWIN__)
    bool LinkLibrariesForVS6Analyzed;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkDepends.h              |    1 -
 Source/cmExportBuildFileGenerator.cxx      |    1 -
 Source/cmExtraKateGenerator.cxx            |    1 -
 Source/cmExtraKateGenerator.h              |    2 --
 Source/cmFunctionBlocker.h                 |    2 +-
 Source/cmGeneratorExpressionDAGChecker.cxx |    1 -
 Source/cmGeneratorExpressionEvaluator.h    |    6 ++----
 Source/cmGeneratorExpressionNode.cxx       |    1 +
 Source/cmGeneratorExpressionNode.h         |    2 --
 Source/cmGeneratorExpressionParser.h       |    2 --
 Source/cmGlobalUnixMakefileGenerator3.cxx  |    6 ++----
 Source/cmGlobalUnixMakefileGenerator3.h    |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |    2 +-
 Source/cmInstallDirectoryGenerator.cxx     |    1 -
 Source/cmLocalNinjaGenerator.cxx           |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx   |   21 ++++++++++-----------
 Source/cmLocalVisualStudio10Generator.cxx  |    1 -
 Source/cmMakefile.cxx                      |    4 ++--
 Source/cmTarget.cxx                        |    7 ++-----
 Source/cmTarget.h                          |    2 --
 Source/cmTestGenerator.cxx                 |    2 --
 Source/cmXCodeObject.h                     |    4 ++--
 22 files changed, 25 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 08:48:40 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 08:48:40 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1156-gb941b3b
Message-ID: <20151028124844.0EFECC119D@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b941b3b4b7ae8d550418ed3278b023674e64c640 (commit)
       via  2fd5fd1f4d93322e85d662c1467a46cd7da84560 (commit)
       via  1e8c920d0409770214a4ff517f6a4c31b9830f45 (commit)
       via  27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df (commit)
       via  d3325c3db79e7decff881cc8113d6febb6fd136b (commit)
       via  f68f8a14161ee41c52cdb0725e57e56e15b42118 (commit)
       via  b28101c65fe47cb15390ac1ad4c85418071468d5 (commit)
      from  4e4866aa7e26a8151683300da019208a9cb06f4a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b941b3b4b7ae8d550418ed3278b023674e64c640
commit b941b3b4b7ae8d550418ed3278b023674e64c640
Merge: 4e4866a 2fd5fd1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:48:31 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:48:31 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 09:08:35 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 09:08:35 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1160-gffc3bed
Message-ID: <20151028130836.A0A0CC1972@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ffc3bed3929bb91079c86e40f62194f54872c1c6 (commit)
       via  5ba3209247b7c7e4e4cc7c38b8702bee4879d50f (commit)
       via  10e8ccf6e583f8bea721906b5085ecc564095a42 (commit)
       via  b935db3a113f7ee6e993ad7722269efd5ad2600e (commit)
      from  b941b3b4b7ae8d550418ed3278b023674e64c640 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffc3bed3929bb91079c86e40f62194f54872c1c6
commit ffc3bed3929bb91079c86e40f62194f54872c1c6
Merge: b941b3b 5ba3209
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 09:08:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 09:08:32 2015 -0400

    Merge topic 'revert-autorcc-qt-5.1' into next
    
    5ba32092 Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1
    10e8ccf6 Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
    b935db3a Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ba3209247b7c7e4e4cc7c38b8702bee4879d50f
commit 5ba3209247b7c7e4e4cc7c38b8702bee4879d50f
Merge: 10e8ccf b935db3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 16:33:29 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 27 16:33:29 2015 -0400

    Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10e8ccf6e583f8bea721906b5085ecc564095a42
commit 10e8ccf6e583f8bea721906b5085ecc564095a42
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 15:12:05 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 27 16:33:07 2015 -0400

    Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
    
    This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0.  The
    `-list` option is not documented and may be removed in future Qt
    versions.  Fixing this correctly will require detecting the availability
    of `--list` or `-list` based on the `rcc` version found.  For now we
    choose to support the documented option that will be supported in future
    Qt versions.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 225c03e..053c805 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -494,7 +494,7 @@ static std::string ListQt5RccInputs(cmSourceFile* sf,
 
   std::vector<std::string> command;
   command.push_back(rccCommand);
-  command.push_back("-list");
+  command.push_back("--list");
 
   std::string absFile = cmsys::SystemTools::GetRealPath(
                                               sf->GetFullPath());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b935db3a113f7ee6e993ad7722269efd5ad2600e
commit b935db3a113f7ee6e993ad7722269efd5ad2600e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 15:12:05 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 27 16:30:20 2015 -0400

    Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
    
    This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0.  The
    `-list` option is not documented and may be removed in future Qt
    versions.  Fixing this correctly will require detecting the availability
    of `--list` or `-list` based on the `rcc` version found.  For now we
    choose to support the documented option that will be supported in future
    Qt versions.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 24e7ed8..d52ab78 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -86,7 +86,7 @@ std::string cmQtAutoGeneratorInitializer::ListQt5RccInputs(cmSourceFile* sf,
 
   std::vector<std::string> command;
   command.push_back(rccCommand);
-  command.push_back("-list");
+  command.push_back("--list");
 
   std::string absFile = cmsys::SystemTools::GetRealPath(
                                               sf->GetFullPath());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 09:08:43 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 09:08:43 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1162-g2986208
Message-ID: <20151028130843.CC190C197F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2986208551bbd84b7dfe8fa28955b334f2faced8 (commit)
       via  e78fcc6329483c99e61cebffbe5d82b67a3361ae (commit)
      from  ffc3bed3929bb91079c86e40f62194f54872c1c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2986208551bbd84b7dfe8fa28955b334f2faced8
commit 2986208551bbd84b7dfe8fa28955b334f2faced8
Merge: ffc3bed e78fcc6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 09:08:42 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 09:08:42 2015 -0400

    Merge topic 'autorcc-qt-5.1-compat' into next
    
    e78fcc63 QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e78fcc6329483c99e61cebffbe5d82b67a3361ae
commit e78fcc6329483c99e61cebffbe5d82b67a3361ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 09:00:51 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 09:03:10 2015 -0400

    QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
    
    In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their
    input changes, 2014-09-17) we added use of the rcc `--list` option.
    Prior to Qt 5.2 this option was called just `-list`.  Run `rcc --help`
    to check for support for `--list` before using it and otherwise fall
    back to the `-list` option for compatibility with older versions.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 053c805..2a7f1e6 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -490,11 +490,30 @@ static std::string ListQt5RccInputs(cmSourceFile* sf,
 {
   std::string rccCommand
       = GetRccExecutable(target);
+
+  bool hasDashDashList = false;
+  {
+  std::vector<std::string> command;
+  command.push_back(rccCommand);
+  command.push_back("--help");
+  std::string rccStdOut;
+  std::string rccStdErr;
+  int retVal = 0;
+  bool result = cmSystemTools::RunSingleCommand(
+    command, &rccStdOut, &rccStdErr,
+    &retVal, 0, cmSystemTools::OUTPUT_NONE);
+  if (result && retVal == 0 &&
+      rccStdOut.find("--list") != std::string::npos)
+    {
+    hasDashDashList = true;
+    }
+  }
+
   std::vector<std::string> qrcEntries;
 
   std::vector<std::string> command;
   command.push_back(rccCommand);
-  command.push_back("--list");
+  command.push_back(hasDashDashList? "--list" : "-list");
 
   std::string absFile = cmsys::SystemTools::GetRealPath(
                                               sf->GetFullPath());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 10:17:00 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 10:17:00 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1164-g39a3b09
Message-ID: <20151028141700.24172C0D95@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  39a3b09a53ea3b8334153b97805ff4cd99593386 (commit)
       via  63e2af0f8dbae222ebaae62b532340f3d83cbc93 (commit)
      from  2986208551bbd84b7dfe8fa28955b334f2faced8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39a3b09a53ea3b8334153b97805ff4cd99593386
commit 39a3b09a53ea3b8334153b97805ff4cd99593386
Merge: 2986208 63e2af0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 10:16:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 10:16:59 2015 -0400

    Merge topic 'cpack-osx-sysroot' into next
    
    63e2af0f CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63e2af0f8dbae222ebaae62b532340f3d83cbc93
commit 63e2af0f8dbae222ebaae62b532340f3d83cbc93
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:24:27 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 10:15:39 2015 -0400

    CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)
    
    We support setting CMAKE_OSX_SYSROOT to a symbolic value like "macosx".
    Modules/Platform/Darwin-Initialize.cmake takes care of finding the
    actual SDK path on disk.  Use that result to set CPACK_OSX_SYSROOT
    instead.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 5756001..77f854d 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -586,7 +586,7 @@ _cpack_set_default(CPACK_WIX_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}")
 
 # set sysroot so SDK tools can be used
 if(CMAKE_OSX_SYSROOT)
-  _cpack_set_default(CPACK_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
+  _cpack_set_default(CPACK_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_PATH}")
 endif()
 
 if(DEFINED CPACK_COMPONENTS_ALL)

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPack.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 10:22:27 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 10:22:27 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1166-gf14b0bb
Message-ID: <20151028142228.46876C0EF5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f14b0bbbf19f09d914635688d325f72dfd450898 (commit)
       via  1bfb527f561c705169f0716108e34a2b5ba5c8bb (commit)
      from  39a3b09a53ea3b8334153b97805ff4cd99593386 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f14b0bbbf19f09d914635688d325f72dfd450898
commit f14b0bbbf19f09d914635688d325f72dfd450898
Merge: 39a3b09 1bfb527
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 10:22:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 10:22:24 2015 -0400

    Merge topic 'FindPkgConfig-better-error' into next
    
    1bfb527f FindPkgConfig: return actual error when a package is not found (#15810)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bfb527f561c705169f0716108e34a2b5ba5c8bb
commit 1bfb527f561c705169f0716108e34a2b5ba5c8bb
Author:     Benjamin Chr?tien <chretien at lirmm.fr>
AuthorDate: Tue Oct 27 13:21:50 2015 +0900
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 10:18:15 2015 -0400

    FindPkgConfig: return actual error when a package is not found (#15810)
    
    In some cases, CMake returned the following error:
    
    -- Checking for module 'foo'
    --   Package 'foo' not found
    
    When the actual error returned by pkg-config was:
    
      Package 'bar', required by 'foo', not found
    
    Now, the actual error is forwarded to the user.
    
    -- Checking for module 'foo'
    --   Package 'bar', required by 'foo', not found
    
    For the standard case (i.e. the package was indeed not found), the
    CMake error was:
    
    -- Checking for module 'foo'
    --   Package 'foo' not found
    
    But it now prints:
    
    -- Checking for module 'foo'
    --   No package 'foo' found
    
    The associated test was also updated. ${last} refers to the last
    CLI argument.

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index e822b9c..d519c1d 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -328,7 +328,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
       if (_pkg_check_modules_pkg_op)
         list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}")
       else()
-        list(APPEND _pkg_check_modules_exist_query --exists)
+        list(APPEND _pkg_check_modules_exist_query --exists --print-errors --short-errors)
       endif()
 
       _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
@@ -342,12 +342,14 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
       # execute the query
       execute_process(
         COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query}
-        RESULT_VARIABLE _pkgconfig_retval)
+        RESULT_VARIABLE _pkgconfig_retval
+        ERROR_VARIABLE _pkgconfig_error
+        ERROR_STRIP_TRAILING_WHITESPACE)
 
       # evaluate result and tell failures
       if (_pkgconfig_retval)
         if(NOT ${_is_silent})
-          message(STATUS "  Package '${_pkg_check_modules_pkg}' not found")
+          message(STATUS "  ${_pkgconfig_error}")
         endif()
 
         set(_pkg_check_modules_failed 1)
diff --git a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
index 852e841..abe14bf 100755
--- a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
+++ b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
@@ -10,9 +10,10 @@ case $1 in
     ;;
   --exists)
     shift
-    echo "Expected: $@"
+    eval last=\${$#}
+    echo "Expected: ${last}"
     echo "Found:    ${PKG_CONFIG_PATH}"
-    [ "$@" = "${PKG_CONFIG_PATH}" ] || exit 1
+    [ "${last}" = "${PKG_CONFIG_PATH}" ] || exit 1
     ;;
   *)
     exit 255

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindPkgConfig.cmake                      |    8 +++++---
 Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh |    5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 15:13:19 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 15:13:19 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1168-g1df2cc2
Message-ID: <20151028191319.D83BAC0B0B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1df2cc256c7a60d3075390a5dd7704332ab1444b (commit)
       via  3b0c074345065e623e08eb9b1d12061f6db14be1 (commit)
      from  f14b0bbbf19f09d914635688d325f72dfd450898 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1df2cc256c7a60d3075390a5dd7704332ab1444b
commit 1df2cc256c7a60d3075390a5dd7704332ab1444b
Merge: f14b0bb 3b0c074
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 15:13:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 15:13:18 2015 -0400

    Merge topic 'bootstrap-cleanup' into next
    
    3b0c0743 bootstrap: Drop unused KWSys header directories


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b0c074345065e623e08eb9b1d12061f6db14be1
commit 3b0c074345065e623e08eb9b1d12061f6db14be1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 11:29:30 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 15:10:57 2015 -0400

    bootstrap: Drop unused KWSys header directories
    
    KWSys no longer needs the cmsys/{ios,stl} directories so we no longer
    populate them.  We no longer need to create them either.

diff --git a/bootstrap b/bootstrap
index 9541cc8..b2421a1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -702,13 +702,6 @@ if [ ! -d "cmsys" ]; then
   cmake_error 4 "Cannot create directory ${cmake_bootstrap_dir}/cmsys"
 fi
 
-for a in stl ios; do
-  [ -d "cmsys/${a}" ] || mkdir "cmsys/${a}"
-  if [ ! -d "cmsys/${a}" ]; then
-    cmake_error 5 "Cannot create directory ${cmake_bootstrap_dir}/cmsys/${a}"
-  fi
-done
-
 [ -d "cmIML" ] || mkdir "cmIML"
 if [ ! -d "cmIML" ]; then
   cmake_error 12 "Cannot create directory ${cmake_bootstrap_dir}/cmIML"

-----------------------------------------------------------------------

Summary of changes:
 bootstrap |    7 -------
 1 file changed, 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Wed Oct 28 15:19:42 2015
From: brad.king at kitware.com (Brad King)
Date: Wed, 28 Oct 2015 15:19:42 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1170-g883f9c4
Message-ID: <20151028191942.5A364C0F2B@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  883f9c45c53320c48939d956c4bcd4c47b850716 (commit)
       via  77dde5cb1f760d180e145b102997a72baac16c33 (commit)
      from  1df2cc256c7a60d3075390a5dd7704332ab1444b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=883f9c45c53320c48939d956c4bcd4c47b850716
commit 883f9c45c53320c48939d956c4bcd4c47b850716
Merge: 1df2cc2 77dde5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 15:19:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 15:19:41 2015 -0400

    Merge topic 'vs-resw-files' into next
    
    77dde5cb VS: Add support for `.resw` files (#15811)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77dde5cb1f760d180e145b102997a72baac16c33
commit 77dde5cb1f760d180e145b102997a72baac16c33
Author:     Andrew Shaitorov <rain at fenomen-games.com>
AuthorDate: Thu Oct 22 20:17:27 2015 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 15:19:21 2015 -0400

    VS: Add support for `.resw` files (#15811)
    
    These are used on the WinRT & WinPhone platforms.  Build them using the
    `PRIResource` tool.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2395ce7..1de2847 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1305,6 +1305,10 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
     {
     tool = "Image";
     }
+  else if(ext == "resw")
+    {
+    tool = "PRIResource";
+    }
   else if(ext == "xml")
     {
     tool = "XML";

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Thu Oct 29 00:01:09 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Thu, 29 Oct 2015 00:01:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-435-gfbb8d08
Message-ID: <20151029040109.70AE6C1327@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  fbb8d086ba864ce6b12a9fc01e39329ba0152bf9 (commit)
      from  2fd5fd1f4d93322e85d662c1467a46cd7da84560 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbb8d086ba864ce6b12a9fc01e39329ba0152bf9
commit fbb8d086ba864ce6b12a9fc01e39329ba0152bf9
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Thu Oct 29 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Oct 29 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 97768e1..47ac3b1 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151028)
+set(CMake_VERSION_PATCH 20151029)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 08:42:21 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 08:42:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-439-ge14709e
Message-ID: <20151029124221.52972C0ACD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  e14709e5a5379f0a6fa2434551211b66561ad540 (commit)
       via  5ba3209247b7c7e4e4cc7c38b8702bee4879d50f (commit)
       via  10e8ccf6e583f8bea721906b5085ecc564095a42 (commit)
       via  b935db3a113f7ee6e993ad7722269efd5ad2600e (commit)
      from  fbb8d086ba864ce6b12a9fc01e39329ba0152bf9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e14709e5a5379f0a6fa2434551211b66561ad540
commit e14709e5a5379f0a6fa2434551211b66561ad540
Merge: fbb8d08 5ba3209
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 08:42:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 29 08:42:19 2015 -0400

    Merge topic 'revert-autorcc-qt-5.1'
    
    5ba32092 Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1
    10e8ccf6 Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
    b935db3a Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"


-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 08:42:24 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 08:42:24 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-441-gb5d9406
Message-ID: <20151029124224.14907C0ADE@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  b5d94065c07a3ba6db29297e55b0e01ba0ef1f9d (commit)
       via  e78fcc6329483c99e61cebffbe5d82b67a3361ae (commit)
      from  e14709e5a5379f0a6fa2434551211b66561ad540 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5d94065c07a3ba6db29297e55b0e01ba0ef1f9d
commit b5d94065c07a3ba6db29297e55b0e01ba0ef1f9d
Merge: e14709e e78fcc6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 08:42:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 29 08:42:22 2015 -0400

    Merge topic 'autorcc-qt-5.1-compat'
    
    e78fcc63 QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)


-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 08:42:26 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 08:42:26 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-443-g3179d9a
Message-ID: <20151029124226.93226C0AEE@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  3179d9a2415702b8ca73e8759c0dba97f26423e2 (commit)
       via  1bfb527f561c705169f0716108e34a2b5ba5c8bb (commit)
      from  b5d94065c07a3ba6db29297e55b0e01ba0ef1f9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3179d9a2415702b8ca73e8759c0dba97f26423e2
commit 3179d9a2415702b8ca73e8759c0dba97f26423e2
Merge: b5d9406 1bfb527
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 08:42:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 29 08:42:25 2015 -0400

    Merge topic 'FindPkgConfig-better-error'
    
    1bfb527f FindPkgConfig: return actual error when a package is not found (#15810)


-----------------------------------------------------------------------

Summary of changes:
 Modules/FindPkgConfig.cmake                      |    8 +++++---
 Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh |    5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 08:42:29 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 08:42:29 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-445-g7f6c613
Message-ID: <20151029124229.2133CC0AF1@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  7f6c613fd041e8b2dcbfdfc43992a6db28a4b36a (commit)
       via  3b0c074345065e623e08eb9b1d12061f6db14be1 (commit)
      from  3179d9a2415702b8ca73e8759c0dba97f26423e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f6c613fd041e8b2dcbfdfc43992a6db28a4b36a
commit 7f6c613fd041e8b2dcbfdfc43992a6db28a4b36a
Merge: 3179d9a 3b0c074
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 08:42:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 29 08:42:27 2015 -0400

    Merge topic 'bootstrap-cleanup'
    
    3b0c0743 bootstrap: Drop unused KWSys header directories


-----------------------------------------------------------------------

Summary of changes:
 bootstrap |    7 -------
 1 file changed, 7 deletions(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 08:42:31 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 08:42:31 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-447-g5cdba31
Message-ID: <20151029124231.CCC39C0ACD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  5cdba31fc631453d530abbac04bf4a455d1f10bb (commit)
       via  63e2af0f8dbae222ebaae62b532340f3d83cbc93 (commit)
      from  7f6c613fd041e8b2dcbfdfc43992a6db28a4b36a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cdba31fc631453d530abbac04bf4a455d1f10bb
commit 5cdba31fc631453d530abbac04bf4a455d1f10bb
Merge: 7f6c613 63e2af0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 08:42:30 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 29 08:42:30 2015 -0400

    Merge topic 'cpack-osx-sysroot'
    
    63e2af0f CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)


-----------------------------------------------------------------------

Summary of changes:
 Modules/CPack.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 08:42:34 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 08:42:34 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-449-g41e5605
Message-ID: <20151029124234.6E4ADC0AE7@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  41e5605d029ac92c9593d69e06c3a56e1d5c40da (commit)
       via  77dde5cb1f760d180e145b102997a72baac16c33 (commit)
      from  5cdba31fc631453d530abbac04bf4a455d1f10bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41e5605d029ac92c9593d69e06c3a56e1d5c40da
commit 41e5605d029ac92c9593d69e06c3a56e1d5c40da
Merge: 5cdba31 77dde5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 08:42:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 29 08:42:32 2015 -0400

    Merge topic 'vs-resw-files'
    
    77dde5cb VS: Add support for `.resw` files (#15811)


-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 08:42:59 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 08:42:59 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1178-g9b79e03
Message-ID: <20151029124259.77FFEC0B96@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9b79e030af1300f231df35a1114725f734520fc3 (commit)
       via  41e5605d029ac92c9593d69e06c3a56e1d5c40da (commit)
       via  5cdba31fc631453d530abbac04bf4a455d1f10bb (commit)
       via  7f6c613fd041e8b2dcbfdfc43992a6db28a4b36a (commit)
       via  3179d9a2415702b8ca73e8759c0dba97f26423e2 (commit)
       via  b5d94065c07a3ba6db29297e55b0e01ba0ef1f9d (commit)
       via  e14709e5a5379f0a6fa2434551211b66561ad540 (commit)
       via  fbb8d086ba864ce6b12a9fc01e39329ba0152bf9 (commit)
      from  883f9c45c53320c48939d956c4bcd4c47b850716 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b79e030af1300f231df35a1114725f734520fc3
commit 9b79e030af1300f231df35a1114725f734520fc3
Merge: 883f9c4 41e5605
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 08:42:50 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 29 08:42:50 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 09:07:41 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 09:07:41 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-455-g3ca9255
Message-ID: <20151029130741.22B0CC159F@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  3ca925579c2cea0a11eba7ad3ecd1a51c4d1ccef (commit)
       via  81dbab6e0888b2eb6f398333f7c5a8bf9ba8f743 (commit)
       via  e41c1be54361a4448d1deaec7114949c2aafcf88 (commit)
       via  c7c8c2c5e86c63b61b42b12b490f9f8b40f7da47 (commit)
       via  dfdaf7019477c13be9aa330a319ca538df0ec22b (commit)
       via  6b518be61bdf79900a80b50984ea164bdbf5cf3f (commit)
      from  41e5605d029ac92c9593d69e06c3a56e1d5c40da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 09:07:41 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 09:07:41 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1185-g8caf050
Message-ID: <20151029130741.4EBBEC15A0@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8caf05055b61c0b47782540e7af4c97f409cd1ee (commit)
       via  3ca925579c2cea0a11eba7ad3ecd1a51c4d1ccef (commit)
       via  81dbab6e0888b2eb6f398333f7c5a8bf9ba8f743 (commit)
       via  e41c1be54361a4448d1deaec7114949c2aafcf88 (commit)
       via  c7c8c2c5e86c63b61b42b12b490f9f8b40f7da47 (commit)
       via  dfdaf7019477c13be9aa330a319ca538df0ec22b (commit)
       via  6b518be61bdf79900a80b50984ea164bdbf5cf3f (commit)
      from  9b79e030af1300f231df35a1114725f734520fc3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8caf05055b61c0b47782540e7af4c97f409cd1ee
commit 8caf05055b61c0b47782540e7af4c97f409cd1ee
Merge: 9b79e03 3ca9255
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 09:07:13 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 29 09:07:13 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 09:07:41 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 09:07:41 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.4.0-rc2-10-g81dbab6
Message-ID: <20151029130741.B74B6C15A5@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, release has been updated
       via  81dbab6e0888b2eb6f398333f7c5a8bf9ba8f743 (commit)
       via  e41c1be54361a4448d1deaec7114949c2aafcf88 (commit)
       via  77dde5cb1f760d180e145b102997a72baac16c33 (commit)
       via  b935db3a113f7ee6e993ad7722269efd5ad2600e (commit)
       via  c7c8c2c5e86c63b61b42b12b490f9f8b40f7da47 (commit)
       via  66178ae5a0a154c11934574347b75e71772b77b9 (commit)
       via  dfdaf7019477c13be9aa330a319ca538df0ec22b (commit)
       via  e61973e1ab2c01f9ae5df145bfdc14e83a0cf1d9 (commit)
       via  6b518be61bdf79900a80b50984ea164bdbf5cf3f (commit)
       via  194011b86f0d41c9f4cd10bdc3e4bf327db3d9d2 (commit)
      from  498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_executable.rst                         |    2 +-
 Source/CPack/cmCPackDebGenerator.cxx                    |    2 +-
 Source/CTest/cmCTestMultiProcessHandler.cxx             |    9 ++++-----
 Source/cmQtAutoGeneratorInitializer.cxx                 |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx              |    4 ++++
 Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake      |   15 +++++++++++++++
 ...il-fail-ctest-result.txt => SerialFailed-result.txt} |    0
 Tests/RunCMake/CTestCommandLine/SerialFailed-stderr.txt |    1 +
 Tests/RunCMake/CTestCommandLine/SerialFailed-stdout.txt |   10 ++++++++++
 9 files changed, 37 insertions(+), 8 deletions(-)
 copy Tests/RunCMake/CTestCommandLine/{repeat-until-fail-ctest-result.txt => SerialFailed-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CTestCommandLine/SerialFailed-stderr.txt
 create mode 100644 Tests/RunCMake/CTestCommandLine/SerialFailed-stdout.txt


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 09:26:32 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 09:26:32 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1187-gffd0beb
Message-ID: <20151029132632.5A688C150C@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ffd0beb99d554a55e2a895dc4ff572bd1cefa0b0 (commit)
       via  6c0d8a5d027bfe681f45337c79d1bbba6331bbd8 (commit)
      from  8caf05055b61c0b47782540e7af4c97f409cd1ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffd0beb99d554a55e2a895dc4ff572bd1cefa0b0
commit ffd0beb99d554a55e2a895dc4ff572bd1cefa0b0
Merge: 8caf050 6c0d8a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 09:26:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 29 09:26:31 2015 -0400

    Merge topic 'README-fix-typo' into next
    
    6c0d8a5d README: Fix typo in wording


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c0d8a5d027bfe681f45337c79d1bbba6331bbd8
commit 6c0d8a5d027bfe681f45337c79d1bbba6331bbd8
Author:     Terrell Russell <terrellrussell at gmail.com>
AuthorDate: Thu Oct 29 09:22:01 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 29 09:25:52 2015 -0400

    README: Fix typo in wording

diff --git a/README.rst b/README.rst
index 5e7a323..9599a04 100644
--- a/README.rst
+++ b/README.rst
@@ -46,7 +46,7 @@ UNIX/Mac OSX/MinGW/MSYS/Cygwin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 You need to have a compiler and a make installed.
-Run the ``bootstrap`` script you find the in the source directory of CMake.
+Run the ``bootstrap`` script you find in the source directory of CMake.
 You can use the ``--help`` option to see the supported options.
 You may use the ``--prefix=<install_prefix>`` option to specify a custom
 installation directory for CMake. You can run the ``bootstrap`` script from

-----------------------------------------------------------------------

Summary of changes:
 README.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 09:29:07 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 09:29:07 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-457-gb5c75a8
Message-ID: <20151029132907.5DEC3C1602@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  b5c75a8e88debd8b003441ee88e8a82fec68e03e (commit)
       via  6c0d8a5d027bfe681f45337c79d1bbba6331bbd8 (commit)
      from  3ca925579c2cea0a11eba7ad3ecd1a51c4d1ccef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5c75a8e88debd8b003441ee88e8a82fec68e03e
commit b5c75a8e88debd8b003441ee88e8a82fec68e03e
Merge: 3ca9255 6c0d8a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 09:29:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 29 09:29:05 2015 -0400

    Merge topic 'README-fix-typo'
    
    6c0d8a5d README: Fix typo in wording


-----------------------------------------------------------------------

Summary of changes:
 README.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 09:29:21 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 09:29:21 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1189-g259ddba
Message-ID: <20151029132921.0C7B9C160A@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  259ddba4fe9349093f618e553f7505c2dcf76200 (commit)
       via  b5c75a8e88debd8b003441ee88e8a82fec68e03e (commit)
      from  ffd0beb99d554a55e2a895dc4ff572bd1cefa0b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=259ddba4fe9349093f618e553f7505c2dcf76200
commit 259ddba4fe9349093f618e553f7505c2dcf76200
Merge: ffd0beb b5c75a8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 09:29:13 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 29 09:29:13 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 13:40:06 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 13:40:06 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-459-g1f9affa
Message-ID: <20151029174006.A9B55BCA77@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  1f9affacdad90240fb1f3bd729eaa4c81bd34568 (commit)
       via  77be366c5841d08c4128ae83946a48093fdbe789 (commit)
      from  b5c75a8e88debd8b003441ee88e8a82fec68e03e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f9affacdad90240fb1f3bd729eaa4c81bd34568
commit 1f9affacdad90240fb1f3bd729eaa4c81bd34568
Merge: b5c75a8 77be366
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 13:40:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 29 13:40:04 2015 -0400

    Merge topic 'intel-fortran-2016'
    
    77be366c Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)


-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeFortranCompilerId.F.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 13:40:25 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 13:40:25 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1191-ga7d27cb
Message-ID: <20151029174025.2C57BBF8CA@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a7d27cb8910452060b063e73f6f70b77b12645e0 (commit)
       via  1f9affacdad90240fb1f3bd729eaa4c81bd34568 (commit)
      from  259ddba4fe9349093f618e553f7505c2dcf76200 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7d27cb8910452060b063e73f6f70b77b12645e0
commit a7d27cb8910452060b063e73f6f70b77b12645e0
Merge: 259ddba 1f9affa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 13:40:15 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 29 13:40:15 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 13:41:29 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 13:41:29 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-461-g4f9a02d
Message-ID: <20151029174129.B788CC0A58@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  4f9a02db41a93822547c4cafd00d545adf07eb86 (commit)
       via  1227ea38e5cd64e72f83e96705266c8307ed6ba0 (commit)
      from  1f9affacdad90240fb1f3bd729eaa4c81bd34568 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 13:41:29 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 13:41:29 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1194-g2a94c83
Message-ID: <20151029174129.E432BC0A65@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2a94c83c8babd8c42001d593dbafe6faaf291938 (commit)
       via  4f9a02db41a93822547c4cafd00d545adf07eb86 (commit)
       via  1227ea38e5cd64e72f83e96705266c8307ed6ba0 (commit)
      from  a7d27cb8910452060b063e73f6f70b77b12645e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a94c83c8babd8c42001d593dbafe6faaf291938
commit 2a94c83c8babd8c42001d593dbafe6faaf291938
Merge: a7d27cb 4f9a02d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 13:41:20 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 29 13:41:20 2015 -0400

    Merge branch 'master' into next


-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Thu Oct 29 13:41:30 2015
From: brad.king at kitware.com (Brad King)
Date: Thu, 29 Oct 2015 13:41:30 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, release,
	updated. v3.4.0-rc2-12-g1227ea3
Message-ID: <20151029174130.09816C0A66@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, release has been updated
       via  1227ea38e5cd64e72f83e96705266c8307ed6ba0 (commit)
       via  77be366c5841d08c4128ae83946a48093fdbe789 (commit)
      from  81dbab6e0888b2eb6f398333f7c5a8bf9ba8f743 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeFortranCompilerId.F.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Fri Oct 30 00:01:10 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Fri, 30 Oct 2015 00:01:10 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-462-ga375702
Message-ID: <20151030040110.047FCC1F03@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  a375702eaa961a496b9420a836c336d884e9cbf3 (commit)
      from  4f9a02db41a93822547c4cafd00d545adf07eb86 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a375702eaa961a496b9420a836c336d884e9cbf3
commit a375702eaa961a496b9420a836c336d884e9cbf3
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Fri Oct 30 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 30 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 47ac3b1..9e28cb4 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151029)
+set(CMake_VERSION_PATCH 20151030)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 30 07:41:40 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 30 Oct 2015 07:41:40 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1196-g20a2a98
Message-ID: <20151030114140.37AD3C11BF@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  20a2a98d7b2f61dd3ac74b7073a15ca84efb517d (commit)
       via  31e6571cca3267cf1f5e17df7c985521211885ef (commit)
      from  2a94c83c8babd8c42001d593dbafe6faaf291938 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20a2a98d7b2f61dd3ac74b7073a15ca84efb517d
commit 20a2a98d7b2f61dd3ac74b7073a15ca84efb517d
Merge: 2a94c83 31e6571
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 30 07:41:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 30 07:41:38 2015 -0400

    Merge topic 'fix-find_program-regression' into next
    
    31e6571c find_program: Fix regression in finding an already-known path


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31e6571cca3267cf1f5e17df7c985521211885ef
commit 31e6571cca3267cf1f5e17df7c985521211885ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 29 17:50:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 30 07:40:46 2015 -0400

    find_program: Fix regression in finding an already-known path
    
    Changes in commit v3.4.0-rc1~124^2~1 (cmFindProgramCommand: Re-implement
    search using more flexible approach, 2015-09-01) did not preserve the
    behavior of looking for the given name with no search path at all.
    Fix this and add a test case covering finding an absolute path with
    no search directories.

diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx
index e64ed87..219ad48 100644
--- a/Source/cmFindProgramCommand.cxx
+++ b/Source/cmFindProgramCommand.cxx
@@ -176,6 +176,13 @@ std::string cmFindProgramCommand::FindNormalProgramNamesPerDir()
     {
     helper.AddName(*ni);
     }
+
+  // Check for the names themselves (e.g. absolute paths).
+  if (helper.CheckDirectory(std::string()))
+    {
+    return helper.BestPath;
+    }
+
   // Search every directory.
   for (std::vector<std::string>::const_iterator
          p = this->SearchPaths.begin(); p != this->SearchPaths.end(); ++p)
@@ -200,6 +207,12 @@ std::string cmFindProgramCommand::FindNormalProgramDirsPerName()
     // Switch to searching for this name.
     helper.SetName(*ni);
 
+    // Check for the name by itself (e.g. an absolute path).
+    if (helper.CheckDirectory(std::string()))
+      {
+      return helper.BestPath;
+      }
+
     // Search every directory.
     for (std::vector<std::string>::const_iterator
            p = this->SearchPaths.begin();
diff --git a/Tests/RunCMake/find_program/DirsPerName-stdout.txt b/Tests/RunCMake/find_program/DirsPerName-stdout.txt
index f763bb0..dc1c82b 100644
--- a/Tests/RunCMake/find_program/DirsPerName-stdout.txt
+++ b/Tests/RunCMake/find_program/DirsPerName-stdout.txt
@@ -1 +1,2 @@
 -- PROG='[^']*/Tests/RunCMake/find_program/B/testB'
+-- PROG_ABS='[^']*/Tests/RunCMake/find_program/A/testA'
diff --git a/Tests/RunCMake/find_program/DirsPerName.cmake b/Tests/RunCMake/find_program/DirsPerName.cmake
index 54db6dd..6db778d 100644
--- a/Tests/RunCMake/find_program/DirsPerName.cmake
+++ b/Tests/RunCMake/find_program/DirsPerName.cmake
@@ -4,3 +4,9 @@ find_program(PROG
   NO_DEFAULT_PATH
   )
 message(STATUS "PROG='${PROG}'")
+
+find_program(PROG_ABS
+  NAMES ${CMAKE_CURRENT_SOURCE_DIR}/A/testA
+  NO_DEFAULT_PATH
+  )
+message(STATUS "PROG_ABS='${PROG_ABS}'")
diff --git a/Tests/RunCMake/find_program/NamesPerDir-stdout.txt b/Tests/RunCMake/find_program/NamesPerDir-stdout.txt
index 964e259..fd79185 100644
--- a/Tests/RunCMake/find_program/NamesPerDir-stdout.txt
+++ b/Tests/RunCMake/find_program/NamesPerDir-stdout.txt
@@ -1 +1,2 @@
 -- PROG='[^']*/Tests/RunCMake/find_program/A/testA'
+-- PROG_ABS='[^']*/Tests/RunCMake/find_program/A/testA'
diff --git a/Tests/RunCMake/find_program/NamesPerDir.cmake b/Tests/RunCMake/find_program/NamesPerDir.cmake
index 49ce49d..5f00a28 100644
--- a/Tests/RunCMake/find_program/NamesPerDir.cmake
+++ b/Tests/RunCMake/find_program/NamesPerDir.cmake
@@ -4,3 +4,9 @@ find_program(PROG
   NO_DEFAULT_PATH
   )
 message(STATUS "PROG='${PROG}'")
+
+find_program(PROG_ABS
+  NAMES ${CMAKE_CURRENT_SOURCE_DIR}/A/testA NAMES_PER_DIR
+  NO_DEFAULT_PATH
+  )
+message(STATUS "PROG_ABS='${PROG_ABS}'")

-----------------------------------------------------------------------

Summary of changes:
 Source/cmFindProgramCommand.cxx                    |   13 +++++++++++++
 Tests/RunCMake/find_program/DirsPerName-stdout.txt |    1 +
 Tests/RunCMake/find_program/DirsPerName.cmake      |    6 ++++++
 Tests/RunCMake/find_program/NamesPerDir-stdout.txt |    1 +
 Tests/RunCMake/find_program/NamesPerDir.cmake      |    6 ++++++
 5 files changed, 27 insertions(+)


hooks/post-receive
-- 
CMake

From brad.king at kitware.com  Fri Oct 30 09:10:03 2015
From: brad.king at kitware.com (Brad King)
Date: Fri, 30 Oct 2015 09:10:03 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1198-g31e92e6
Message-ID: <20151030131003.EAD72BEF76@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  31e92e6ea1fae6e3d360dbe49edf032f4efa4523 (commit)
       via  9a7f042a955e814f66b8e468f934852ed53e0376 (commit)
      from  20a2a98d7b2f61dd3ac74b7073a15ca84efb517d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31e92e6ea1fae6e3d360dbe49edf032f4efa4523
commit 31e92e6ea1fae6e3d360dbe49edf032f4efa4523
Merge: 20a2a98 9a7f042
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 30 09:10:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 30 09:10:03 2015 -0400

    Merge topic 'doc-apple-info-plist-properties' into next
    
    9a7f042a Help: Document target properties setting Info.plist fields (#15820)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a7f042a955e814f66b8e468f934852ed53e0376
commit 9a7f042a955e814f66b8e468f934852ed53e0376
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 30 09:04:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 30 09:09:40 2015 -0400

    Help: Document target properties setting Info.plist fields (#15820)
    
    Format the documentation of MACOSX_{BUNDLE,FRAMEWORK}_INFO_PLIST and
    specify for each property what field in the Info.plist file it sets.

diff --git a/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst b/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
index 097cce1..07a933f 100644
--- a/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
+++ b/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
@@ -1,29 +1,35 @@
 MACOSX_BUNDLE_INFO_PLIST
 ------------------------
 
-Specify a custom Info.plist template for a Mac OS X App Bundle.
+Specify a custom ``Info.plist`` template for a Mac OS X App Bundle.
 
-An executable target with MACOSX_BUNDLE enabled will be built as an
-application bundle on Mac OS X.  By default its Info.plist file is
-created by configuring a template called MacOSXBundleInfo.plist.in
-located in the CMAKE_MODULE_PATH.  This property specifies an
-alternative template file name which may be a full path.
+An executable target with :prop_tgt:`MACOSX_BUNDLE` enabled will be built as an
+application bundle on Mac OS X.  By default its ``Info.plist`` file is created
+by configuring a template called ``MacOSXBundleInfo.plist.in`` located in the
+:variable:`CMAKE_MODULE_PATH`.  This property specifies an alternative template
+file name which may be a full path.
 
 The following target properties may be set to specify content to be
 configured into the file:
 
-::
-
-  MACOSX_BUNDLE_INFO_STRING
-  MACOSX_BUNDLE_ICON_FILE
-  MACOSX_BUNDLE_GUI_IDENTIFIER
-  MACOSX_BUNDLE_LONG_VERSION_STRING
-  MACOSX_BUNDLE_BUNDLE_NAME
-  MACOSX_BUNDLE_SHORT_VERSION_STRING
-  MACOSX_BUNDLE_BUNDLE_VERSION
-  MACOSX_BUNDLE_COPYRIGHT
+``MACOSX_BUNDLE_BUNDLE_NAME``
+  Sets ``CFBundleName``.
+``MACOSX_BUNDLE_BUNDLE_VERSION``
+  Sets ``CFBundleVersion``.
+``MACOSX_BUNDLE_COPYRIGHT``
+  Sets ``NSHumanReadableCopyright``.
+``MACOSX_BUNDLE_GUI_IDENTIFIER``
+  Sets ``CFBundleIdentifier``.
+``MACOSX_BUNDLE_ICON_FILE``
+  Sets ``CFBundleIconFile``.
+``MACOSX_BUNDLE_INFO_STRING``
+  Sets ``CFBundleGetInfoString``.
+``MACOSX_BUNDLE_LONG_VERSION_STRING``
+  Sets ``CFBundleLongVersionString``.
+``MACOSX_BUNDLE_SHORT_VERSION_STRING``
+  Sets ``CFBundleShortVersionString``.
 
 CMake variables of the same name may be set to affect all targets in a
 directory that do not have each specific property set.  If a custom
-Info.plist is specified by this property it may of course hard-code
+``Info.plist`` is specified by this property it may of course hard-code
 all the settings instead of using the target properties.
diff --git a/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst b/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
index 729d929..548c3ac 100644
--- a/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
+++ b/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
@@ -1,25 +1,27 @@
 MACOSX_FRAMEWORK_INFO_PLIST
 ---------------------------
 
-Specify a custom Info.plist template for a Mac OS X Framework.
+Specify a custom ``Info.plist`` template for a Mac OS X Framework.
 
-A library target with FRAMEWORK enabled will be built as a framework
-on Mac OS X.  By default its Info.plist file is created by configuring
-a template called MacOSXFrameworkInfo.plist.in located in the
-CMAKE_MODULE_PATH.  This property specifies an alternative template
+A library target with :prop_tgt:`FRAMEWORK` enabled will be built as a
+framework on Mac OS X.  By default its ``Info.plist`` file is created by
+configuring a template called ``MacOSXFrameworkInfo.plist.in`` located in the
+:variable:`CMAKE_MODULE_PATH`.  This property specifies an alternative template
 file name which may be a full path.
 
 The following target properties may be set to specify content to be
 configured into the file:
 
-::
-
-  MACOSX_FRAMEWORK_ICON_FILE
-  MACOSX_FRAMEWORK_IDENTIFIER
-  MACOSX_FRAMEWORK_SHORT_VERSION_STRING
-  MACOSX_FRAMEWORK_BUNDLE_VERSION
+``MACOSX_FRAMEWORK_BUNDLE_VERSION``
+  Sets ``CFBundleVersion``.
+``MACOSX_FRAMEWORK_ICON_FILE``
+  Sets ``CFBundleIconFile``.
+``MACOSX_FRAMEWORK_IDENTIFIER``
+  Sets ``CFBundleIdentifier``.
+``MACOSX_FRAMEWORK_SHORT_VERSION_STRING``
+  Sets ``CFBundleShortVersionString``.
 
 CMake variables of the same name may be set to affect all targets in a
 directory that do not have each specific property set.  If a custom
-Info.plist is specified by this property it may of course hard-code
+``Info.plist`` is specified by this property it may of course hard-code
 all the settings instead of using the target properties.

-----------------------------------------------------------------------

Summary of changes:
 Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst    |   40 ++++++++++++++-----------
 Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst |   26 ++++++++--------
 2 files changed, 37 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
CMake

From gjasny at googlemail.com  Fri Oct 30 17:45:04 2015
From: gjasny at googlemail.com (Gregor Jasny)
Date: Fri, 30 Oct 2015 17:45:04 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, next,
	updated. v3.4.0-rc2-1201-gacd292f
Message-ID: <20151030214504.95286C1186@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  acd292f497cb88d2212be5fe0752dadb05bc9c2a (commit)
       via  136104740663b3310616bec51b2cec7f807715ce (commit)
       via  a375702eaa961a496b9420a836c336d884e9cbf3 (commit)
      from  31e92e6ea1fae6e3d360dbe49edf032f4efa4523 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acd292f497cb88d2212be5fe0752dadb05bc9c2a
commit acd292f497cb88d2212be5fe0752dadb05bc9c2a
Merge: 31e92e6 1361047
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Oct 30 17:45:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 30 17:45:03 2015 -0400

    Merge topic 'xcode-lastupgradecheck' into next
    
    13610474 Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
    a375702e CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=136104740663b3310616bec51b2cec7f807715ce
commit 136104740663b3310616bec51b2cec7f807715ce
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Oct 30 22:03:52 2015 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Fri Oct 30 22:28:04 2015 +0100

    Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
    
    This prevents the project settings upgrade warning.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index da8c814..2df07cb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3398,6 +3398,9 @@ bool cmGlobalXCodeGenerator
     group = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
     group->AddAttribute("BuildIndependentTargetsInParallel",
                         this->CreateString("YES"));
+    std::ostringstream v;
+    v << std::setfill('0') << std::setw(4) << XcodeVersion * 10;
+    group->AddAttribute("LastUpgradeCheck", this->CreateString(v.str()));
     this->RootObject->AddAttribute("attributes", group);
     if (this->XcodeVersion >= 32)
       this->RootObject->AddAttribute("compatibilityVersion",

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmGlobalXCodeGenerator.cxx |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake

From kwrobot at kitware.com  Sat Oct 31 00:01:09 2015
From: kwrobot at kitware.com (Kitware Robot)
Date: Sat, 31 Oct 2015 00:01:09 -0400 (EDT)
Subject: [Cmake-commits] CMake branch, master,
	updated. v3.4.0-rc2-463-gb7fdc8c
Message-ID: <20151031040109.8354AC1ACD@public.kitware.com>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  b7fdc8cc39cda665b921147bf729fca921207edf (commit)
      from  a375702eaa961a496b9420a836c336d884e9cbf3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7fdc8cc39cda665b921147bf729fca921207edf
commit b7fdc8cc39cda665b921147bf729fca921207edf
Author:     Kitware Robot <kwrobot at kitware.com>
AuthorDate: Sat Oct 31 00:01:07 2015 -0400
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Oct 31 00:01:07 2015 -0400

    CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 9e28cb4..5b14fd5 100644
--- 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 4)
-set(CMake_VERSION_PATCH 20151030)
+set(CMake_VERSION_PATCH 20151031)
 #set(CMake_VERSION_RC 1)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake